diff -Nru totem-3.4.3/ChangeLog totem-3.6.2/ChangeLog --- totem-3.4.3/ChangeLog 2012-07-04 10:18:26.000000000 +0000 +++ totem-3.6.2/ChangeLog 2012-10-25 13:48:45.000000000 +0000 @@ -1,261 +1,4694 @@ -commit 6dc6cedfe04375ba1099062eb09266b63a2f5e48 +commit 417c919f2475b949b66d584b76f8f58a6e2c4b87 Author: Bastien Nocera -Date: Wed Jul 4 10:54:36 2012 +0100 +Date: Thu Oct 25 12:13:16 2012 +0200 - 3.4.3 + 3.6.2 - NEWS | 5 +++++ - configure.in | 2 +- + NEWS | 5 +++++ + configure.in | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) -commit c6c7d97f976025633c19578c43667ae67fc9b808 +commit 74a993f9487e3967ce59f38a0691b6f6b5ec35cd +Author: Bastien Nocera +Date: Thu Oct 25 10:57:24 2012 +0200 + + backend: Use scaletempo instead of soundpitch plugin + + The soundpitch plugin is irreparably broken, and the scaletempo + offers the same features without the bugs, or the need to change + the pitch ratio ourselves. + + https://bugzilla.gnome.org/show_bug.cgi?id=686391 + + configure.in | 6 ++++-- + src/backend/bacon-video-widget.c | 10 +--------- + 2 files changed, 5 insertions(+), 11 deletions(-) + +commit a3e1235c803325e049f0430691249bf4e682d29f +Author: Bastien Nocera +Date: Thu Oct 25 10:52:47 2012 +0200 + + backend: Add debug when a query fails + + src/backend/bacon-video-widget.c | 2 ++ + 1 file changed, 2 insertions(+) + +commit 302afa0bb1003f9acf47a83856ec6feea8da20ef +Author: Bastien Nocera +Date: Thu Oct 25 10:52:28 2012 +0200 + + backend: Fix possible leak of ->download_buffering_element + + src/backend/bacon-video-widget.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit cf919898b99953e8eacf5a2dfe9e6cabc65ed5f5 +Author: Bastien Nocera +Date: Tue Oct 16 08:41:19 2012 +0200 + + 3.6.1 + + NEWS | 10 ++++++++++ + configure.in | 2 +- + 2 files changed, 11 insertions(+), 1 deletion(-) + +commit 91a2db7162c04afdc7894a7c80c3fc1e331ce197 +Author: Bastien Nocera +Date: Fri Oct 12 16:49:29 2012 +0200 + + grilo: Remove extra tabs + + src/plugins/grilo/totem-grilo.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 411aea54962e1eb5f51367a39b1e94125e441578 +Author: Marco Piazza +Date: Fri Oct 12 16:14:54 2012 +0200 + + grilo: Fix resolve() crashing + + We cannot pass NULL options to grl_source_resolve() + + https://bugzilla.gnome.org/show_bug.cgi?id=686003 + + src/plugins/grilo/totem-grilo.c | 14 ++++++++++++-- + 1 file changed, 12 insertions(+), 2 deletions(-) + +commit 9bf4e239a613bb8d4dce8792c48221c14230f0af +Author: Marco Piazza +Date: Fri Oct 12 16:05:14 2012 +0200 + + grilo: Add sanity check before resolving URLs + + Make sure that we only try to resolve a URL when the source supports + it, otherwise fallback to the media itself, or a simple warning. + + https://bugzilla.gnome.org/show_bug.cgi?id=686003 + + src/plugins/grilo/totem-grilo.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit 1dd7c7779f286e2746ea23d378dea22801c67a76 +Author: Marco Piazza +Date: Fri Oct 12 14:57:44 2012 +0200 + + grilo: Make sure to only ever show videos + + Set the filter type to videos for search. + + https://bugzilla.gnome.org/show_bug.cgi?id=686003 + + src/plugins/grilo/totem-grilo.c | 29 ++++++++++++++++++++++++----- + 1 file changed, 24 insertions(+), 5 deletions(-) + +commit 3aa819be9e94bf47c28a7642a44cd62268ab0024 +Author: Bastien Nocera +Date: Fri Oct 12 10:26:53 2012 +0200 + + grilo: Search page is 0-indexed + + Fix possible crash when skipping -PAGE_SIZE items when doing a + search. Spotted by Marco Piazza + + https://bugzilla.gnome.org/show_bug.cgi?id=686003 + + src/plugins/grilo/totem-grilo.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ae95ce693a9bf3a6df7b2593933d96f77125dc15 +Author: Bastien Nocera +Date: Thu Oct 11 08:31:55 2012 +0200 + + browser-plugin: Issue a warning instead of asserting + + browser-plugin/totem-plugin-viewer.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 3d899641c8ca1185554a884c99899ac19700f4b8 +Author: Philip Withnall +Date: Sun Oct 21 15:17:31 2012 +0100 + + Bug 686515 — dbusservice plugin has UnicodeDecodeErrror per song + + Fix dbusservice plugin to correctly use Python Unicode objects to represent + song metadata, rather than UTF-8 encoded strings which it would then treat + as ASCII. + + Closes: https://bugzilla.gnome.org/show_bug.cgi?id=686515 + + src/plugins/dbusservice/dbusservice.py | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit c62b90b203a253650a1de361b18a22644e1a2f3b +Author: Runa Bhattacharjee +Date: Wed Oct 17 00:18:35 2012 +0530 + + Updated Bengali India Translation + + po/bn_IN.po | 4399 ++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 2399 insertions(+), 2000 deletions(-) + +commit 52daee128098e97235cd3e7693f6d2e81e48a6e9 +Author: Arash Mousavi +Date: Fri Oct 12 18:46:02 2012 +0330 + + L10N: Updated Persian translation + + po/fa.po | 119 ++++++++++++++++++++++++--------------------------------------- + 1 file changed, 46 insertions(+), 73 deletions(-) + +commit 0cad01f6d499cb95ca071fd36a0e7b3416525d3a +Author: Arash Mousavi +Date: Fri Oct 12 18:44:13 2012 +0330 + + L10N: Updated Persian translation + + po/fa.po | 2595 +++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 1364 insertions(+), 1231 deletions(-) + +commit 9f10720ef659e25fc810b468a80bdabbbd7c7f23 +Author: Bastien Nocera +Date: Thu Oct 11 08:45:04 2012 +0200 + + browser-plugin: Make screensaver work in browser + + We need to register the application in addition to creating it. + + browser-plugin/totem-plugin-viewer.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit 110130e8fbb36128af21087f9b41839d06f3c1d7 +Author: Bastien Nocera +Date: Wed Oct 10 18:01:15 2012 +0200 + + browser-plugin: Fix MOV streams with hidden video + + We would treat MOV streams with no set height as "audio-only" because + the undefined height (-1) is smaller than the smallest our controls bar + can be. This code has apparently been broken since 2008, and nobody + noticed? + + https://bugzilla.gnome.org/show_bug.cgi?id=680714 + + browser-plugin/totemPlugin.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 076c498b114192387140f0caea473a22e7285542 +Author: Bastien Nocera +Date: Wed Oct 10 16:37:36 2012 +0200 + + main: Fix spinning cursor when launched through nautilus + + As in nautilus' bug 664147, DESKTOP_STARTUP_ID was being reset + by a call to _gdk_x11_display_make_default() as we were opening + the display in the secondary instance, which we didn't need. + + See also: + http://git.gnome.org/browse/nautilus/commit/?h=gnome-3-6&id=629c9bc27ae8f43df35943e25e78c0d5bd39cfae + + https://bugzilla.gnome.org/show_bug.cgi?id=680046 + + browser-plugin/totem-plugin-viewer.c | 3 +++ + src/backend/bacon-video-widget.c | 2 -- + src/backend/bvw-test.c | 3 +++ + src/totem-options.c | 2 +- + src/totem.c | 11 +++++++---- + 5 files changed, 14 insertions(+), 7 deletions(-) + +commit 329f1f2071f9e4e99d8070fc2e5219549e510be0 +Author: Ivaylo Valkov +Date: Tue Oct 9 05:16:48 2012 +0300 + + Updated Bulgarian translation + + po/bg.po | 2205 +++++++++++++++++++++++++++----------------------------------- + 1 file changed, 970 insertions(+), 1235 deletions(-) + +commit 91e1029e5d080ffc28bc7b283765e4363b103351 +Author: Khoem Sokhem +Date: Wed Oct 3 17:22:03 2012 +0200 + + [l10n] Added Khmer translation + + po/LINGUAS | 1 + + po/km.po | 2961 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 2962 insertions(+) + +commit cb9a17ba3c341cdc1855d0d635b62db83465cc1a +Author: Javier Jardón +Date: Tue Sep 25 04:17:22 2012 +0900 + + backend: Use gst_bus_pop_filtered() + + ... instead gst_bus_poll() + + https://bugzilla.gnome.org/show_bug.cgi?id=684736 + + src/backend/bacon-video-widget.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit adcf4041b0b53ec4cdeeab16d914383939a577a7 +Author: Javier Jardón +Date: Tue Sep 25 04:11:33 2012 +0900 + + thumbnailer: Unref GstBus after usage + + https://bugzilla.gnome.org/show_bug.cgi?id=684736 + + src/totem-video-thumbnailer.c | 23 ++++++++++++++--------- + 1 file changed, 14 insertions(+), 9 deletions(-) + +commit 8582352f477fd39786e502cc4c13593388069bf1 +Author: Javier Jardón +Date: Tue Sep 25 04:05:03 2012 +0900 + + thumbnailer: Use gst_bus_timed_pop_filtered() + + ... instead gst_bus_poll() + + https://bugzilla.gnome.org/show_bug.cgi?id=684736 + + src/totem-video-thumbnailer.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 30e1420d9b36f3581f062ee30165fb2cbb0385fb +Author: Bastien Nocera +Date: Tue Sep 25 13:00:47 2012 +0200 + + NEWS: 3.6 doesn't use yelp-tools + + As it would have changed the strings to translate, so too late for 3.6. + + NEWS | 2 -- + 1 file changed, 2 deletions(-) + +commit 0d4a17ff31b4dcb9c902136ab80dd177a295dba8 +Author: Philip Withnall +Date: Mon Sep 3 22:38:04 2012 +0100 + + Revert "Use new documentation infrastructure" + + As this would end up changing translations. + + This reverts commit b9398b668a1e5f9db497780677b8f217d11ad20b. + + Makefile.am | 4 +- + autogen.sh | 2 +- + configure.in | 4 +- + help/C/index.docbook | 1112 -------------------------------------------------- + help/C/legal.xml | 2 +- + help/C/totem.xml | 1112 ++++++++++++++++++++++++++++++++++++++++++++++++++ + help/Makefile.am | 18 +- + help/totem.omf.in | 13 + + src/totem-object.c | 2 +- + 9 files changed, 1141 insertions(+), 1128 deletions(-) + +commit b9398b668a1e5f9db497780677b8f217d11ad20b +Author: Javier Jardón +Date: Tue Sep 4 03:32:09 2012 +0900 + + Use new documentation infrastructure + + Use yelp-tools instead gnome-doc-utils + + Makefile.am | 4 +- + autogen.sh | 2 +- + configure.in | 4 +- + help/C/index.docbook | 1112 ++++++++++++++++++++++++++++++++++++++++++++++++++ + help/C/legal.xml | 2 +- + help/C/totem.xml | 1112 -------------------------------------------------- + help/Makefile.am | 18 +- + help/totem.omf.in | 13 - + src/totem-object.c | 2 +- + 9 files changed, 1128 insertions(+), 1141 deletions(-) + +commit 2f3cfef3daa34c4e0249fc39196526b461633c7a +Author: Bastien Nocera +Date: Tue Sep 25 11:33:06 2012 +0200 + + 3.6.0 + + NEWS | 10 ++++++++++ + configure.in | 4 ++-- + 2 files changed, 12 insertions(+), 2 deletions(-) + +commit 8b90ee21d2db7b078a4011969d1340b2a9cc7aea +Author: Petr Kovar +Date: Mon Sep 24 16:29:08 2012 +0200 + + Update Czech translation by Adam Matousek + + po/cs.po | 2442 +++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 1223 insertions(+), 1219 deletions(-) + +commit 50a8a87dade723b228afe124ca37cb9bab85aa50 +Author: Matthias Clasen +Date: Sun Sep 23 23:15:15 2012 -0400 + + Don't use gtk_menu_button_set_menu + + The function has been renamed to gtk_menu_button_set_popup. + + https://bugzilla.gnome.org/show_bug.cgi?id=684695 + + browser-plugin/totem-plugin-viewer.c | 4 ++-- + src/plugins/grilo/totem-search-entry.c | 6 +++--- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit c5d8a9fc45b55f4dc060891c1a0071214764c8c1 +Author: Bastien Nocera +Date: Mon Sep 24 11:40:44 2012 +0200 + + browser-plugin: Fix test suite for httpd 2.4 + + browser-plugin/tests/launch-web-server.sh | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +commit 781b373051fd784c26a71e17e4d2f246b014572d +Author: Bastien Nocera +Date: Mon Sep 24 11:40:23 2012 +0200 + + browser-plugin: Slightly better debug + + browser-plugin/totem-plugin-viewer.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 19261fe3f331ba7822e0f150aa0fb4143e455843 +Author: Bastien Nocera +Date: Mon Sep 24 11:31:44 2012 +0200 + + browser-plugin: Fix GtkBuilder signals not getting connected + + browser-plugin/Makefile.am | 2 ++ + configure.in | 1 + + 2 files changed, 3 insertions(+) + +commit e81925d7240d167234f7d586d319235eba563890 +Author: Mattias Põldaru +Date: Mon Sep 24 11:21:54 2012 +0300 + + [l10n] Updated Estonian translation + + po/et.po | 2012 ++++++++++++++++++++++---------------------------------------- + 1 file changed, 722 insertions(+), 1290 deletions(-) + +commit 4c423a78480a09733eacdc5c521fdaf058bfb627 +Author: Pēteris Krišjānis +Date: Mon Sep 24 10:56:25 2012 +0300 + + Updated Latvian translation + + po/lv.po | 693 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 344 insertions(+), 349 deletions(-) + +commit 0ebb3787226d1de0f5aeae0e01d4ddb62d9d029d +Author: Jiro Matsuzawa +Date: Sun Sep 23 18:22:24 2012 +0900 + + Updated Japanese translation. + + po/ja.po | 2452 ++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 1250 insertions(+), 1202 deletions(-) + +commit e0c2511ffbb07c67ac5ac9f5d15bc9ce39374b49 +Author: Carles Ferrando +Date: Sun Sep 23 01:13:37 2012 +0200 + + [l10n]Updated Catalan (Valencian) translation + + po/ca@valencia.po | 2339 +++++++++++++++++++++++++++-------------------------- + 1 file changed, 1174 insertions(+), 1165 deletions(-) + +commit 4d78f9280b6e258f495626017c7964b4e29b87cb +Author: Gil Forcada +Date: Sun Sep 23 01:13:30 2012 +0200 + + [l10n] Added Catalan translation + + po/ca.po | 2498 +++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 1242 insertions(+), 1256 deletions(-) + +commit 0c616059d289edfc9edc9529805b0a085f14cf70 +Author: tuhaihe +Date: Sun Sep 23 02:17:53 2012 +0800 + + update Simplified Chinese (zh_CN) translation + + po/zh_CN.po | 1344 ++++++++++++----------------------------------------------- + 1 file changed, 255 insertions(+), 1089 deletions(-) + +commit 9e0a3df983fb47934a41d0d4e410e48424c1e911 +Author: Gianvito Cavasoli +Date: Fri Sep 21 08:20:05 2012 +0200 + + [l10n] Updated Italian translation. + + po/it.po | 2327 ++++++++++++++++++++++++++------------------------------------ + 1 file changed, 976 insertions(+), 1351 deletions(-) + +commit 2643c2c936126f8c929f324f53bd164d35f3b3c2 +Author: Ani Peter +Date: Thu Sep 20 20:26:33 2012 +0530 + + Updated Malayalam file + + po/ml.po | 2882 +++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 1438 insertions(+), 1444 deletions(-) + +commit 55266545ead356f99a943cf691a008c8eaacaaf4 +Author: Mario Blättermann +Date: Thu Sep 20 13:17:59 2012 +0200 + + [l10n] Updated German translation + + po/de.po | 2295 +++++++++++++++++++++++++++++--------------------------------- + 1 file changed, 1075 insertions(+), 1220 deletions(-) + +commit 91517dd6d261085bb6cf9252b0c35de1e03a06af +Author: Chandan Kumar +Date: Thu Sep 20 11:23:19 2012 +0530 + + Updated HINDI translation + + po/hi.po | 2904 +++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 1440 insertions(+), 1464 deletions(-) + +commit 68c1fff62b02d3919253e0bc8ce829596134c2ad +Author: Bastien Nocera +Date: Tue Sep 18 11:54:26 2012 +0200 + + 3.5.92 + + NEWS | 16 ++++++++++++++++ + configure.in | 2 +- + 2 files changed, 17 insertions(+), 1 deletion(-) + +commit 32a2a3dffc96d46b539fb7dfaaa48c49ea16560b +Author: Bastien Nocera +Date: Tue Sep 18 12:06:10 2012 +0200 + + backend: Remove obsolete gst_message_parse_duration() + + src/backend/bacon-video-widget.c | 14 +++++--------- + 1 file changed, 5 insertions(+), 9 deletions(-) + +commit 60c73b30d22940b80b7f90cd6d70f5fe6c63003f +Author: Olivier Blin +Date: Fri Sep 7 19:45:26 2012 +0200 + + browser-plugin: really use GtkMenuButton + + TotemMenuButton does not exist, regression introduced in commit + 0cfb7fe90f4bfa83b87442473605e24ebb744367 + + https://bugzilla.gnome.org/show_bug.cgi?id=683429 + + data/mozilla-viewer.ui | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c7ccc8559bf02c59e6f0cf19bc104f4b6769b556 +Author: Olivier Blin +Date: Fri Sep 7 19:47:40 2012 +0200 + + browser-plugin: Register the types used by UI files + + https://bugzilla.gnome.org/show_bug.cgi?id=683429 + + browser-plugin/totem-plugin-viewer.c | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 6712da5c1b7f5543ef9fec76a4e5b08decd7c88d +Author: Tim-Philipp Müller +Date: Mon Sep 10 11:13:58 2012 +0100 + + bacon-video-widget: fix wrong argument passed to g_object_unref + + src/backend/bacon-video-widget.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7982b9f1a6aaf422b62aea20a51762ef798a5a7e +Author: Bastien Nocera +Date: Wed Sep 5 19:58:47 2012 +0100 + + build: Rename some variable for GStreamer 1.0 + + configure.in | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit b3be7caac003858849fb42cc727aab306685f96a +Author: Philip Withnall +Date: Mon Sep 3 22:38:04 2012 +0100 + + build: Update git.mk from upstream + + Update to the latest version from https://github.com/behdad/git.mk. This + adds support for yelp.m4, which we need since bug #681643 was fixed. + + git.mk | 75 ++++++++++++++++++++++++++++++++++++++++++++++-------------------- + 1 file changed, 52 insertions(+), 23 deletions(-) + +commit 0b5db26a18218d011ad2006357a55ab53afd7116 +Author: Philip Withnall +Date: Mon Sep 3 22:33:51 2012 +0100 + + main: Remove documentation lists from ‘About’ dialogue + + totem-docs.h is no longer generated by the documentation build, since the + new Yelp help macros don’t support it. + + See: https://bugzilla.gnome.org/show_bug.cgi?id=681643 + + src/totem-menu.c | 2 -- + 1 file changed, 2 deletions(-) + +commit ce1ba06d29df5f3b132ad31d5788dfb581085b0e +Author: Bastien Nocera +Date: Thu Aug 30 14:49:00 2012 +0100 + + gst: Simplify helpers + + Based on work by Tim-Philipp Müller for sushi. + + src/gst/totem-gst-pixbuf-helpers.c | 58 ++++++++++++++++---------------------- + 1 file changed, 24 insertions(+), 34 deletions(-) + +commit 0d59263475e1bd1415bc344c4602d62855d53ee5 +Author: Adrian Bunk +Date: Thu Aug 30 00:10:45 2012 +0300 + + remove the .cvsignore file + + No longer needed after the switch to git. + + https://bugzilla.gnome.org/show_bug.cgi?id=682992 + + .cvsignore | 30 ------------------------------ + 1 file changed, 30 deletions(-) + +commit e658c2ea1fa4ca3321e722eaa532bc53052c43b3 +Author: Rico Tzschichholz +Date: Sat Aug 25 20:51:29 2012 +0200 + + backend: Fix duration conversion passed though GST_MESSAGE_DURATION + + The duration is passed in nano-seconds from gstreamer to convert + it corretly using GST_MSECOND + + src/backend/bacon-video-widget.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4fa7dfeed3b4ac552d833ec5278b9b673f2d8d8e +Author: Pavel Vasin +Date: Sat Aug 25 11:20:15 2012 +0400 + + properties: fix string leaks + + Closes: https://bugzilla.gnome.org/show_bug.cgi?id=682649 + + src/totem-properties-view.c | 2 ++ + 1 file changed, 2 insertions(+) + +commit ed2508222f3b29176af1792bfa5ed5759a395798 +Author: Bastien Nocera +Date: Tue Aug 21 19:51:08 2012 +0100 + + 3.5.90 + + NEWS | 36 ++++++++++++++++++++++++++++++++++++ + configure.in | 4 ++-- + 2 files changed, 38 insertions(+), 2 deletions(-) + +commit 41117bc5b642fed40a84311873a75d6572668169 +Author: Bastien Nocera +Date: Tue Aug 21 19:50:45 2012 +0100 + + build: Bump minimum GStreamer versions + + configure.in | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 8d986238ddb68064b739c4fbb50f5c08e0d07854 +Author: Bastien Nocera +Date: Mon Aug 20 18:21:08 2012 +0100 + + backend: Get the target URI for trash and recent items + + So that we know where they actually are. + + src/backend/bacon-video-widget.c | 28 ++++++++++++++++++++++++++-- + 1 file changed, 26 insertions(+), 2 deletions(-) + +commit 127f3f54303c1f1cf732815ea07660c2fb2c78f0 +Author: Bastien Nocera +Date: Mon Aug 20 10:43:35 2012 +0100 + + build: Only build XZ tarballs + + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c08b2690f44dda2757d597085e24deacf30a532d +Author: Bastien Nocera +Date: Mon Aug 20 10:43:10 2012 +0100 + + build: We don't have a lib/ subdir anymore + + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit cea2149b0440b9cca09ad98c20392b593ceda287 +Author: Bastien Nocera +Date: Tue Aug 14 10:16:54 2012 +0100 + + thumbnailer: Increase default output size to 256 + + Rather than 128. Fills the space better, and makes the video + recognisable. + + https://bugzilla.gnome.org/show_bug.cgi?id=671004 + + src/totem-video-thumbnailer.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 58690c7440f0355575774be57a2f80d2979e9dd9 +Author: Juan A. Suarez Romero +Date: Mon Aug 6 16:44:17 2012 +0000 + + grilo: Update to latest API changes in grilo pre 0.2.0 + + https://bugzilla.gnome.org/show_bug.cgi?id=681320 + + src/plugins/grilo/totem-grilo.c | 150 ++++++++++++++++++++-------------------- + 1 file changed, 76 insertions(+), 74 deletions(-) + +commit 6ecebf7d6344d296191685708b8b9aac474d16b5 +Author: A S Alam +Date: Wed Sep 12 07:29:03 2012 +0530 + + update Punjabi Translation + + po/pa.po | 589 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 288 insertions(+), 301 deletions(-) + +commit dd129596773e03b911901601551d77dda4f59e9a +Author: Rafael Ferreira +Date: Mon Sep 17 21:56:27 2012 -0300 + + Fixed plurals in Brazilian Portuguese translation + + po/pt_BR.po | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 34452fd4572f411c2e9739d480be5c9b0fc63a46 +Author: Bruce Cowan +Date: Mon Sep 17 21:03:53 2012 +0100 + + Updated British English translation + + po/en_GB.po | 540 ++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 269 insertions(+), 271 deletions(-) + +commit 551b1086f9680864307362195dec001924514c37 +Author: Daniel Mustieles +Date: Mon Sep 17 14:12:50 2012 +0200 + + Updated Spanish translation + + help/es/es.po | 17 +++++++++-------- + 1 file changed, 9 insertions(+), 8 deletions(-) + +commit 34354935ab007df65d5b0c77971dcb53322532fe +Author: Yuri Myasoedov +Date: Mon Sep 17 15:46:22 2012 +0400 + + Updated Russian translation + + po/ru.po | 2632 +++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 1403 insertions(+), 1229 deletions(-) + +commit 296d6b3702704ebb2e9daab8b80c27ae79a24fc8 +Author: Sweta Kothari +Date: Mon Sep 17 11:30:19 2012 +0530 + + Updated gujarati file + + po/gu.po | 2460 +++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 1241 insertions(+), 1219 deletions(-) + +commit 84b443f38192d2e4db9faa563b3b38bb221d72f1 +Author: Ask H. Larsen +Date: Sat Sep 15 23:45:51 2012 +0200 + + Updated Danish translation + + po/da.po | 2793 +++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 1388 insertions(+), 1405 deletions(-) + +commit 99dd5db2559d4cbf89ed67b398eea3f3ef3831f9 +Author: Alexandre Franke +Date: Sat Sep 15 14:26:46 2012 +0200 + + Update French translation + + po/fr.po | 2228 +++++++++++++++++++++++++++----------------------------------- + 1 file changed, 977 insertions(+), 1251 deletions(-) + +commit 43a7f30182d0fdb328a01e365d699e2971697f68 +Author: Changwoo Ryu +Date: Sun Sep 9 07:46:14 2012 +0900 + + Updated Korean translation + + po/ko.po | 2424 +++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 1223 insertions(+), 1201 deletions(-) + +commit d10f34cf56ac870295cb8ac6591198103e13e898 +Author: Chao-Hsiung Liao +Date: Sat Sep 15 13:00:00 2012 +0800 + + Updated Traditional Chinese translation(Hong Kong and Taiwan) + + po/zh_HK.po | 139 ++++++++++++++++++++++++++---------------------------------- + po/zh_TW.po | 139 ++++++++++++++++++++++++++---------------------------------- + 2 files changed, 120 insertions(+), 158 deletions(-) + +commit 7a9c21c19c9f9aad43038da2d4df3c04016d5779 +Author: Aurimas Černius +Date: Thu Sep 13 22:14:28 2012 +0300 + + Updated Lithuanian translation + + po/lt.po | 2256 ++++++++++++++++++++++++++++---------------------------------- + 1 file changed, 1005 insertions(+), 1251 deletions(-) + +commit cffe2d078a06dd5a279804af036a44ac41c44bd8 +Author: Piotr Drąg +Date: Thu Sep 13 21:05:58 2012 +0200 + + Fix broken tag in Romanian help translation + + help/ro/ro.po | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4c09bc417a0e097ae367c12eac6c95bb57923922 +Author: Piotr Drąg +Date: Thu Sep 13 21:03:40 2012 +0200 + + Fix broken tag in Brazilian Portuguese help translation + + help/pt_BR/pt_BR.po | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ca1810c2cdd84f1b079dd015525a193332ec3af2 +Author: Daniel Korostil +Date: Thu Sep 13 20:01:11 2012 +0300 + + uk update + + po/uk.po | 3090 +++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 1561 insertions(+), 1529 deletions(-) + +commit 906777509a88238f4089786632b59f50c9b8d049 +Author: Sandeep Sheshrao Shedmake +Date: Thu Sep 13 13:19:29 2012 +0530 + + Updated Marathi Translations + + po/mr.po | 4012 ++++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 2187 insertions(+), 1825 deletions(-) + +commit 9aaf18ad8c82b2334f545df4944f73344d997783 +Author: Duarte Loreto +Date: Wed Sep 12 23:40:04 2012 +0100 + + Updated Portuguese translation + + po/pt.po | 2466 +++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 1231 insertions(+), 1235 deletions(-) + +commit c4cf73ac0b0b546dac114917aec73b905bd6afd4 +Author: Ville-Pekka Vainio +Date: Wed Sep 12 22:37:35 2012 +0300 + + Finnish translation update by Jiri Grönroos + + po/fi.po | 2486 ++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 1279 insertions(+), 1207 deletions(-) + +commit de4927712b457e8afec61c6607c2bf0b8076d653 +Author: Andika Triwidada +Date: Tue Sep 11 23:43:23 2012 +0700 + + Updated Indonesian translation + + po/id.po | 729 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 362 insertions(+), 367 deletions(-) + +commit dd7a087bddce852411b493f6733eaa8c1c94e693 +Author: Rafael Ferreira +Date: Tue Sep 11 09:55:09 2012 -0300 + + Updated Brazilian Portuguese translation + + po/pt_BR.po | 2450 ++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 1241 insertions(+), 1209 deletions(-) + +commit 9456ea5e99fccbc42c23879d74727072e94d963d +Author: Theppitak Karoonboonyanan +Date: Tue Sep 11 15:13:48 2012 +0700 + + Updated Thai translation. + + po/th.po | 2923 ++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 1401 insertions(+), 1522 deletions(-) + +commit 16aac1ff461f3501c34bf33e1c0e55b8e1af1173 +Author: Piotr Drąg +Date: Mon Sep 10 19:46:22 2012 +0200 + + Updated Polish translation + + po/pl.po | 2236 ++++++++++++++++++++++++++++---------------------------------- + 1 file changed, 991 insertions(+), 1245 deletions(-) + +commit 9bed5179eb815686bde3dcc6eac4aa48ec1ff7f5 +Author: Bastien Nocera +Date: Mon Sep 10 15:07:54 2012 +0100 + + main: Don't hide the titlebar on fullscreen + + https://bugzilla.gnome.org/show_bug.cgi?id=683721 + + src/totem.c | 1 - + 1 file changed, 1 deletion(-) + +commit c83729f4efa47f0829bb7151d11ebdecda84cb2b +Author: Bastien Nocera +Date: Wed Aug 1 20:00:50 2012 +0200 + + gst: Fix possible use before set in pixbuf + + src/gst/totem-gst-pixbuf-helpers.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 99a5b57c9726608dbaa46e6e8ffb2330944a676e +Author: Bastien Nocera +Date: Wed Aug 1 18:25:10 2012 +0200 + + main: Stop the cursor spinner when file gets loaded + + https://bugzilla.gnome.org/show_bug.cgi?id=680046 + + src/totem.c | 2 ++ + 1 file changed, 2 insertions(+) + +commit f32df3a4fd9bc5fbd8eaa2a1fb550e0e2d10e015 +Author: Bastien Nocera +Date: Sun Jul 22 03:04:14 2012 +0100 + + backend: Reset stop seek values correctly + + src/backend/bacon-video-widget.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit cb84d2d403cffb4cb656b4e153d50a931a6d9ef8 +Author: Fran Diéguez +Date: Mon Jul 30 03:24:09 2012 +0200 + + Updated Galician translations + + po/gl.po | 301 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 146 insertions(+), 155 deletions(-) + +commit e1174bbfb541aa41458a713d5aedb621b0af717e +Author: Мирослав Николић +Date: Sun Jul 29 15:58:59 2012 +0200 + + Updated Serbian translation + + po/sr.po | 2807 ++++++++++++++++++++++---------------------------------- + po/sr@latin.po | 2801 ++++++++++++++++++++++--------------------------------- + 2 files changed, 2205 insertions(+), 3403 deletions(-) + +commit c4c2db5f70e0a8d2c1fc36d45686fb92945eed9e +Author: Gabor Kelemen +Date: Sun Jul 29 12:50:10 2012 +0200 + + Updated Hungarian translation by Bence Lukacs + + po/hu.po | 2754 ++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 1406 insertions(+), 1348 deletions(-) + +commit e55258c9227db8b6ed327089d31c2e8723c31733 +Author: Sebastian Dröge +Date: Fri Jul 27 12:11:41 2012 +0200 + + configure: Add gstreamer-tag-1.0 to the gst helpers library dependencies + + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7d56ba468507cf7557ba1defc45f4ab74da774c1 +Author: Praveen Illa +Date: Fri Jul 27 00:00:32 2012 +0530 + + Updated Telugu Translation + + po/te.po | 1768 ++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 927 insertions(+), 841 deletions(-) + +commit be85e0c6d57c348e58249e65bbfe0f6c53fe4a66 +Author: Kjartan Maraas +Date: Wed Jul 25 16:38:44 2012 +0200 + + Updated Norwegian bokmål translation + + po/nb.po | 266 ++++++++++++++++++++++++++------------------------------------- + 1 file changed, 110 insertions(+), 156 deletions(-) + +commit 2d1bfe863c5ad4272d602ddfb30011bac61832c6 +Author: Yaron Shahrabani +Date: Tue Jul 24 22:20:32 2012 +0300 + + Updated Hebrew translation. + + po/he.po | 309 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 153 insertions(+), 156 deletions(-) + +commit b1ff72d546b81d7548666ae630b3d4a1aea6921f +Author: Nilamdyuti Goswami +Date: Fri Jul 20 18:33:15 2012 +0530 + + Assamese translation reviewed + + po/as.po | 71 +++++++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 41 insertions(+), 30 deletions(-) + +commit 4dc7dd0d32bbea3b77528f83987bb9913918fd98 +Author: Nilamdyuti Goswami +Date: Fri Jul 20 18:04:55 2012 +0530 + + Assamese translation reviewed + + po/as.po | 3113 +++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 1551 insertions(+), 1562 deletions(-) + +commit 8c524563d77d5f4374154c14647c4a21ca06985f +Author: Tom Tryfonidis +Date: Fri Jul 20 00:35:55 2012 +0300 + + Updated Greek translation + + po/el.po | 379 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 190 insertions(+), 189 deletions(-) + +commit f8802a4336de43e403a0dc48dc8ee51dff23c720 +Author: Bastien Nocera +Date: Thu Jul 19 15:42:41 2012 +0100 + + backend: Add more debug for ranges + + src/backend/bacon-video-widget.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +commit 942dfab4123f9c4a131a651c629b0243bca66c74 +Author: Matej Urbančič +Date: Thu Jul 19 10:15:53 2012 +0200 + + Updated Slovenian translation + + po/sl.po | 505 ++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 272 insertions(+), 233 deletions(-) + +commit 10fba4a5958657cea57a26ebe3311ac86424dd59 +Author: Bastien Nocera +Date: Wed Jul 18 16:15:25 2012 +0100 + + backend: Document the buffering_left struct member + + src/backend/bacon-video-widget.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 73a2fb678079033ede4608db258503ff00a47943 +Author: Bastien Nocera +Date: Tue Jul 17 17:26:20 2012 +0100 + + backend: Pause the backend when seeking + + And start playing back again when seeking has finished and + not other seek events are scheduled to take place. + + https://bugzilla.gnome.org/show_bug.cgi?id=680053 + + src/backend/bacon-video-widget.c | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 12d188e51abcdae3ce6ba50b7b6011b1927d9a10 +Author: Bastien Nocera +Date: Wed Jul 18 16:11:33 2012 +0100 + + backend: Fix "time to play until the end" when we seeked + + We were only ever checking the stream length, not the actual time + left to play until the end of the stream when download buffering. + + src/backend/bacon-video-widget.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 9d6fdf0070a6dcbacb6ad804f76c94ea653509f8 +Author: Bastien Nocera +Date: Wed Jul 18 16:07:31 2012 +0100 + + backend: Make magic constant a #define + + When we start download buffering playback, instead of waiting for + time left to buffer < time to the end of the playback, wait a little + bit (1.1x) longer. This means that we don't end up with an empty buffer + if a little glitch happens. + + src/backend/bacon-video-widget.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit dd6305c53750894cd7d8a444bb2ccaae09b5beb3 +Author: Bastien Nocera +Date: Tue Jul 17 17:25:04 2012 +0100 + + backend: Print percent as debug when buffering + + src/backend/bacon-video-widget.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 9f8072d568c48257308c746443f2b525b30a6077 +Author: Bastien Nocera +Date: Wed Jul 18 10:54:01 2012 +0100 + + browser-plugin: Add speed limit support to httpd + + For testing of download buffering + + browser-plugin/tests/launch-web-server.sh | 19 ++++++++++++++----- + 1 file changed, 14 insertions(+), 5 deletions(-) + +commit 8672a08cd3468befb34374eb9b9221c8f8323b9f +Author: Bastien Nocera +Date: Wed Jul 18 10:44:33 2012 +0100 + + browser-plugin: Simplify test http server conf creation + + browser-plugin/tests/launch-web-server.sh | 55 ++++++++++++++++--------------- + 1 file changed, 28 insertions(+), 27 deletions(-) + +commit 14244a0cf91de0f2d35d264f11f51c387cd25c52 +Author: Bastien Nocera +Date: Tue Jul 17 10:26:27 2012 +0100 + + iplayer: Remove iplayer plugin + + It was sub-par because it doesn't support RTMP streams of + good enough qualities, didn't use the same UI as other media sources + in Totem (grilo), and was very untested and fragile. + + See https://bugzilla.gnome.org/show_bug.cgi?id=680079 for Grilo support + + configure.in | 3 +- + po/POTFILES.in | 4 - + po/POTFILES.skip | 1 - + src/plugins/iplayer/Makefile.am | 12 - + src/plugins/iplayer/iplayer.plugin.in | 9 - + src/plugins/iplayer/iplayer.py | 266 --------- + src/plugins/iplayer/iplayer.ui | 41 -- + src/plugins/iplayer/iplayer2.py | 1045 --------------------------------- + src/plugins/iplayer/listparser.py | 67 --- + 9 files changed, 1 insertion(+), 1447 deletions(-) + +commit db73c59ec1422c39b3945137ea966d4fc3aab109 +Author: Chao-Hsiung Liao +Date: Tue Jul 17 15:32:26 2012 +0800 + + Updated Traditional Chinese translation(Hong Kong and Taiwan) + + po/zh_HK.po | 362 +++++++++++++++++++++++++++++------------------------------- + po/zh_TW.po | 362 +++++++++++++++++++++++++++++------------------------------- + 2 files changed, 345 insertions(+), 379 deletions(-) + +commit a540ab97e1f41ed013eb5ac7b4012a3c680241e7 +Author: Daniel Mustieles +Date: Mon Jul 16 16:46:44 2012 +0200 + + Updated Spanish translation + + po/es.po | 214 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 110 insertions(+), 104 deletions(-) + +commit b5e6ac4812d2fa8d13d35cda20cd00168f528b1f +Author: Bastien Nocera +Date: Sun Jul 15 18:08:45 2012 +0100 + + backend: Better comment in is_seekable() + + src/backend/bacon-video-widget.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 701c9b2b02d11744692a179bf069a411c57bc892 +Author: Bastien Nocera +Date: Sun Jul 15 17:12:20 2012 +0100 + + backend: Don't check the duration by hand + + The duration messages should take care of updating us, and our + initial state is gathered when we receive async-done messages. + + src/backend/bacon-video-widget.c | 11 ++--------- + 1 file changed, 2 insertions(+), 9 deletions(-) + +commit 7ddfc722b19f3bff4da5521669208433be2b2aed +Author: Bastien Nocera +Date: Sun Jul 15 17:09:51 2012 +0100 + + backend: Parse the duration message + + Instead of calling _get_stream_length() which just does more work. + + src/backend/bacon-video-widget.c | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +commit 2a9c8590aaf97d56063f7c5288e5c1aceb77c89b +Author: Bastien Nocera +Date: Sun Jul 15 18:07:55 2012 +0100 + + backend: Get the seekability when async is done + + We started playing, let's check whether the stream length + or seekability changed, rather than waiting for the first + tick of our pipeline. + + https://bugzilla.gnome.org/show_bug.cgi?id=595584 + + src/backend/bacon-video-widget.c | 2 ++ + 1 file changed, 2 insertions(+) + +commit 326aafc48580ba3835ac5cacaa3fc9221602f6a2 +Author: Bastien Nocera +Date: Sun Jul 15 16:11:12 2012 +0100 + + backend: Make X11-specific includes optional + + On the X11 windowing system actually being supported. + + src/backend/bacon-video-widget.c | 18 +++++++++++++++--- + 1 file changed, 15 insertions(+), 3 deletions(-) + +commit 2feae7227ee8bf70b4f5b27084006f3b60b6cc15 +Author: Ihar Hrachyshka +Date: Sun Jul 15 11:32:39 2012 +0300 + + Updated Belarusian translation. + + po/be.po | 380 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 199 insertions(+), 181 deletions(-) + +commit 5b1d9bab325d65f1a8a35244424523b9ceb17194 +Author: Bastien Nocera +Date: Sun Jul 15 01:03:11 2012 +0100 + + backend: Don't throw EOS when seeking past the end + + If we're already playing, seeking to the end will cause an EOS anyway. + And if we're paused, then one can carry on seeking around (though + mostly back I'm guessing). + + https://bugzilla.gnome.org/show_bug.cgi?id=667746 + + src/backend/bacon-video-widget.c | 10 ++-------- + 1 file changed, 2 insertions(+), 8 deletions(-) + +commit f46412d0a7fdfd0dfd87e0c6a9fff116bc1f0f70 +Author: Bastien Nocera +Date: Sun Jul 15 01:02:46 2012 +0100 + + main: Fix compilation failure + + For the totem_add_to_playlist_and_play() API change. + + src/totem-menu.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 25981693a9d951295f5c002decc82bfafc269eff +Author: Piotr Drąg +Date: Sun Jul 15 01:31:26 2012 +0200 + + Updated POTFILES.in + + po/POTFILES.in | 1 + + 1 file changed, 1 insertion(+) + +commit 56b6d9865c124231fa333ec937b1cf7b3c6cc7ba +Author: Bastien Nocera +Date: Sun Jul 15 00:22:14 2012 +0100 + + main: Remove add_to_recent arg + + src/plugins/grilo/totem-grilo.c | 6 ++---- + src/plugins/iplayer/iplayer.py | 2 +- + src/totem-object.c | 4 +--- + src/totem-video-list.c | 2 +- + src/totem.h | 3 +-- + 5 files changed, 6 insertions(+), 11 deletions(-) + +commit 5ea6326b91cfc30835febe8f715fa33e96fa48a2 +Author: Bastien Nocera +Date: Sun Jul 15 00:17:06 2012 +0100 + + main: Remove recent functionality + + As it's moved to the recent plugin. + + src/totem-menu.c | 88 ------------------------------------------------------ + src/totem-menu.h | 4 --- + src/totem-object.c | 11 ------- + 3 files changed, 103 deletions(-) + +commit f511986abe99d542abfbdfea6376443d93bb494a +Author: Bastien Nocera +Date: Sat Jul 14 22:54:00 2012 +0100 + + recent: Add recent-files plugin + + configure.in | 3 +- + src/plugins/recent/Makefile.am | 13 +++ + src/plugins/recent/recent.plugin.in | 9 ++ + src/plugins/recent/totem-recent.c | 182 ++++++++++++++++++++++++++++++++++++ + 4 files changed, 206 insertions(+), 1 deletion(-) + +commit 68ee8a09016f2ad1e240ef18b782859cd51ac39b +Author: Bastien Nocera +Date: Sat Jul 14 23:52:03 2012 +0100 + + main: Add current title and content-type properties + + src/totem-object.c | 30 ++++++++++++++++++++++++++++++ + 1 file changed, 30 insertions(+) + +commit 1b2d2a3f17e07046d14c27f8ab3a852d09e773e8 +Author: Bastien Nocera +Date: Sat Jul 14 23:50:30 2012 +0100 + + main: Split getting title and content-type + + We used to have a single function returning both. + + src/totem-object.c | 7 ++++--- + src/totem-playlist.c | 48 +++++++++++++++++++++++++++++++----------------- + src/totem-playlist.h | 4 ++-- + 3 files changed, 37 insertions(+), 22 deletions(-) + +commit 5b704efc59fe833f2273d72ea373b3f730ae4324 +Author: Bastien Nocera +Date: Sat Jul 14 23:10:21 2012 +0100 + + zeitgeist-dp: Use file-has-played signal + + Instead of the file-opened one, so that only files that are really + opened and played get added. + + src/plugins/zeitgeist-dp/totem-zeitgeist-dp-plugin.vala | 10 ++++------ + 1 file changed, 4 insertions(+), 6 deletions(-) + +commit b64ae73d5a6b7d8c644dc77a3281209d65b619f3 +Author: Bastien Nocera +Date: Sat Jul 14 23:11:23 2012 +0100 + + main: Emit the file-has-played signal as appropriate + + src/totem-object.c | 23 ++++++++++++++++++++--- + src/totem-private.h | 1 + + 2 files changed, 21 insertions(+), 3 deletions(-) + +commit 93c43126b163ae1c013f1abfd2e1e0bfca90a9f2 +Author: Bastien Nocera +Date: Sat Jul 14 22:16:32 2012 +0100 + + main: Add "file-has-played" signal + + src/totem-object.c | 32 ++++++++++++++++++++++++++++++++ + src/totem.h | 3 +++ + 2 files changed, 35 insertions(+) + +commit b56cc226919dfcca7f6e810d1de5e8e88445342b +Author: Bastien Nocera +Date: Sat Jul 14 22:15:48 2012 +0100 + + thumbnailer: Fix missing -lm for linker + + src/Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 483255f61b26ee26362d8f4a202f2458b133578d +Author: Bastien Nocera +Date: Sat Jul 14 23:25:33 2012 +0100 + + backend: Fix warning if the vis plugin doesn't exist + + src/backend/bacon-video-widget.c | 4 ++++ + 1 file changed, 4 insertions(+) + +commit bff8d4c61ccf5982b2c82750291e6eecb79a82b8 +Author: Bastien Nocera +Date: Sat Jul 14 23:24:53 2012 +0100 + + backend: Fix warning if there's no chapter support + + src/backend/bacon-video-widget.c | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 1b390f723c1d3146acec0c8e8a893ad5978e5787 +Author: Bastien Nocera +Date: Sat Jul 14 22:15:09 2012 +0100 + + backend: Fix compilation failure + + Code that was forward-ported from GStreamer 0.10 and didn't quite + work with GStreamer 1.0. + + src/backend/bacon-video-widget.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit cb2c65e30358ee3afd284b5a709480d10431f792 +Author: Bastien Nocera +Date: Fri Jul 13 21:10:29 2012 +0100 + + main: Handle DVD chapters as expected + + And prepare the ground for chapters support in any supported + files or streams. + + src/totem-object.c | 39 +++++++++++++++------------------------ + 1 file changed, 15 insertions(+), 24 deletions(-) + +commit 7841b1c511af57aa376f253c07f0da82e853b101 +Author: Bastien Nocera +Date: Fri Jul 13 20:45:44 2012 +0100 + + backend: Implement has_{next,previous}_track + + https://bugzilla.gnome.org/show_bug.cgi?id=515109 + + src/backend/bacon-video-widget.c | 29 +++++++++++++++++++++++++---- + 1 file changed, 25 insertions(+), 4 deletions(-) + +commit e41391000404159cae3f9505b1a5e144bec9f99d +Author: Bastien Nocera +Date: Thu Jun 28 14:35:34 2012 +0100 + + gromit: Remove verbose debug + + src/plugins/gromit/totem-gromit.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5371fcb79e487beb8d1f3a6b89098cafe74ae4cf +Author: Bastien Nocera +Date: Thu Jun 28 14:34:46 2012 +0100 + + gromit: Load configuration from ~/.config/gromit + + Instead of a file within the home directory. + + https://bugzilla.gnome.org/show_bug.cgi?id=675406 + + src/plugins/gromit/totem-gromit.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6222587a84c463997e93bbc7ee1ffca5e1a34dce +Author: Bastien Nocera +Date: Fri Jul 13 20:33:26 2012 +0100 + + build: Fix gromit plugin enablement + + configure.in | 9 +++++++++ + 1 file changed, 9 insertions(+) + +commit bd808039015718c43b510786ee1b103c76f3fdcc +Author: Piotr Drąg +Date: Fri Jul 13 18:45:45 2012 +0200 + + Updated POTFILES.in + + po/POTFILES.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d6387e98a7654733a8a0a34fb53b658448edce91 +Author: Bastien Nocera +Date: Fri Jul 13 16:01:03 2012 +0100 + + main: Fix remote Totem exiting when --help was called + + The age-old bug. Run totem &, and totem --help would exit the + already running instance. + + https://bugzilla.gnome.org/show_bug.cgi?id=679621 + + src/totem.c | 1 + + 1 file changed, 1 insertion(+) + +commit 1fde879b302bf3a98ea1d2dec11d63b4c8662688 +Author: Bastien Nocera +Date: Fri Jul 13 15:46:24 2012 +0100 + + main: Fix drag'n'drop ordering on the playlist + + Since made the processing of playlists asynchronous, adding files + to the playlist didn't insert them at the position we told them to, + because the ->tree_path used to check where to insert it was freed + before we had any chance to process the added MRLs. + + https://bugzilla.gnome.org/show_bug.cgi?id=663951 + + src/totem-playlist.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit b9ece3d9c5ec79420ae04d9b44716afa8587e726 +Author: Bastien Nocera +Date: Fri Jul 13 13:24:28 2012 +0100 + + helper: Add TODO item + + src/gst/totem-time-helpers.c | 3 +++ + 1 file changed, 3 insertions(+) + +commit 6d0bd18b59a7d5e8c0ab04ae626264dcb28fdc8f +Author: Bastien Nocera +Date: Fri Jul 13 12:15:24 2012 +0100 + + properties: Remove totem prefix from private function + + src/properties/bacon-video-widget-properties.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit de7fca7706bab4a1f6c9eaf2c23b7371839a5ffa +Author: Bastien Nocera +Date: Fri Jul 13 11:52:18 2012 +0100 + + build: Fix pkg-config usage + + We shouldn't be concatenating outputs from pkg-config, it ends up + listing libraries twice and making a mess. + + This commit also cleans up the dependencies for the thumbnailer, + audio preview and nautilus tabs, as they don't need clutter for + example. + + https://bugzilla.gnome.org/show_bug.cgi?id=679461 + + browser-plugin/Makefile.am | 17 +-- + configure.in | 105 +++++----------- + docs/reference/Makefile.am | 5 +- + po/POTFILES.in | 2 +- + src/Makefile.am | 69 +++++------ + src/backend/Makefile.am | 24 ++-- + src/backend/bacon-video-widget.c | 1 + + src/backend/video-utils.c | 35 ------ + src/backend/video-utils.h | 2 - + src/gst/Makefile.am | 63 +++++++--- + src/gst/totem-gst-helpers.c | 185 ---------------------------- + src/gst/totem-gst-helpers.h | 5 - + src/gst/totem-gst-pixbuf-helpers.c | 225 ++++++++++++++++++++++++++++++++++ + src/gst/totem-gst-pixbuf-helpers.h | 44 +++++++ + src/gst/totem-time-helpers.c | 63 ++++++++++ + src/gst/totem-time-helpers.h | 35 ++++++ + src/plugins/Makefile.plugins | 8 +- + src/plugins/grilo/Makefile.am | 6 +- + src/plugins/grilo/totem-grilo.c | 2 +- + src/plugins/skipto/totem-skipto.c | 1 - + src/plugins/skipto/totem-time-entry.c | 2 +- + src/properties/Makefile.am | 2 +- + src/totem-statusbar.c | 2 +- + src/totem-time-label.c | 2 +- + src/totem-video-thumbnailer.c | 2 + + 25 files changed, 511 insertions(+), 396 deletions(-) + +commit 9e7f5c3e89184c4d5e71cbb5f709eee919553c64 +Author: Bastien Nocera +Date: Fri Jul 13 11:05:48 2012 +0100 + + audio-preview: Remove unused switch cases + + src/totem-audio-preview.c | 27 --------------------------- + 1 file changed, 27 deletions(-) + +commit f88ef8b031de9b507571b14bd967326225e22ef4 +Author: Piotr Drąg +Date: Thu Jul 12 22:26:15 2012 +0200 + + Updated POTFILES.in + + po/POTFILES.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2ed7fc7aea8dfa0714728b650bbf34db013c8477 +Author: Bastien Nocera +Date: Thu Jul 12 18:11:51 2012 +0100 + + backend: Make sure dvdreadsrc never gets used + + resindvd isn't ported to GStreamer 1.0 yet, and dvdreadsrc is + not something we want users to think is the DVD playback experience + of Totem. + + Remove dvdreadsrc from the plugin registry so it's never auto-plugged + when looking for a dvd:// handler. + + src/backend/bacon-video-widget-gst-missing-plugins.c | 20 ++++++++++++++++---- + 1 file changed, 16 insertions(+), 4 deletions(-) + +commit 85abf8b42a8697887c5e19fbc5af526e5522e67d +Author: Bastien Nocera +Date: Thu Jul 12 17:43:30 2012 +0100 + + build: Require a newer glib for g_clear_* use + + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b4de65aff60923739bb1fade22d1ede3b54f17c1 +Author: Bastien Nocera +Date: Thu Jul 12 14:45:46 2012 +0100 + + main: Call g_set_prgname() on startup + + src/totem.c | 1 + + 1 file changed, 1 insertion(+) + +commit 2a6902df1009ceed8d61900bc2fe0e98fa4c350c +Author: Bastien Nocera +Date: Thu Jul 12 14:45:25 2012 +0100 + + backend: Use "source-setup" to set source properties + + src/backend/bacon-video-widget.c | 32 +++++--------------------------- + 1 file changed, 5 insertions(+), 27 deletions(-) + +commit 3d019b7b7442a3fbc0f4b9f5f1e41aac169863c5 +Author: Bastien Nocera +Date: Wed Jul 11 18:31:55 2012 +0100 + + main: Request the smooth scrolling events too + + src/totem-object.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 771df4dcd0d33aae756f9bc2cf58bc7c688a8926 +Author: Bastien Nocera +Date: Thu Jul 5 17:05:44 2012 +0100 + + backend: Remove GStreamer and version number from filename + + https://bugzilla.gnome.org/show_bug.cgi?id=674078 + + src/backend/Makefile.am | 2 +- + src/backend/bacon-video-widget-gst-0.10.c | 6142 ----------------------------- + src/backend/bacon-video-widget.c | 6142 +++++++++++++++++++++++++++++ + 3 files changed, 6143 insertions(+), 6143 deletions(-) + +commit 64f8b8e163cd804240a1427205c4bedb39793e59 +Author: Bastien Nocera +Date: Wed Jul 4 19:05:19 2012 +0100 + + Port to GStreamer 1.0 + + Thumbnailer, audio preview, properties page and totem tested and working. + + https://bugzilla.gnome.org/show_bug.cgi?id=674078 + + configure.in | 34 +++---- + src/backend/bacon-video-widget-gst-0.10.c | 111 ++++++++++----------- + .../bacon-video-widget-gst-missing-plugins.c | 10 +- + src/gst/totem-gst-helpers.c | 77 +++++++++----- + src/gst/totem-gst-helpers.h | 4 +- + src/test-properties-page.c | 1 + + src/totem-audio-preview.c | 4 +- + src/totem-menu.c | 1 + + src/totem-properties-main.c | 1 + + src/totem-properties-view.c | 3 + + src/totem-video-thumbnailer.c | 9 +- + 11 files changed, 145 insertions(+), 110 deletions(-) + +commit 6a15234fd8b3d127bf1d3ecb521c278f8d7be6ae +Author: Bastien Nocera +Date: Wed Jul 11 10:40:26 2012 +0100 + + backend: Use g_clear_pointer() + + src/backend/bacon-video-widget-gst-0.10.c | 110 ++++++++---------------------- + 1 file changed, 28 insertions(+), 82 deletions(-) + +commit ce87100113ee1692989ca6646d9fa4bf9f6c28b9 +Author: Bastien Nocera +Date: Thu Jul 5 18:39:01 2012 +0100 + + backend: Use g_clear_object() + + src/backend/bacon-video-widget-gst-0.10.c | 57 ++++++++----------------------- + 1 file changed, 15 insertions(+), 42 deletions(-) + +commit 193fb3c9c7974cf21d3387e3a279729ccac599ef +Author: Bastien Nocera +Date: Thu Jul 5 18:27:58 2012 +0100 + + backend: Remove unused include + + src/backend/bacon-video-widget.h | 2 -- + 1 file changed, 2 deletions(-) + +commit 5c22c419b0a41ad3b3ef7a619884745bca6be03b +Author: Bastien Nocera +Date: Thu Jul 5 18:48:14 2012 +0100 + + backend: Remove unused struct member + + src/backend/bacon-video-widget.h | 1 - + 1 file changed, 1 deletion(-) + +commit 90a07cb4e621cbe79652aed1af601319707a5eea +Author: Bastien Nocera +Date: Mon Jul 9 12:14:35 2012 +0100 + + backend: Make sure to not send EOS if we're closing + + src/backend/bacon-video-widget-gst-0.10.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit 802d2d611ef5e60fb4f50b68c4be80c7fd1ba15d +Author: Bastien Nocera +Date: Thu Jul 5 18:40:30 2012 +0100 + + main: Use g_clear_object() + + src/totem-object.c | 12 +++--------- + 1 file changed, 3 insertions(+), 9 deletions(-) + +commit 0670cb18dc87174804e6f656da620e6a3c97bb14 +Author: Bastien Nocera +Date: Thu Jul 5 18:27:34 2012 +0100 + + thumbnailer: Remove unneeded switch cases + + src/totem-video-thumbnailer.c | 52 ------------------------------------------- + 1 file changed, 52 deletions(-) + +commit eea583ddf86f70e1f9d72b0e8d13bb99abcc9f76 +Author: Yaron Shahrabani +Date: Tue Jul 10 22:56:29 2012 +0300 + + Updated Hebrew translation. + + po/he.po | 312 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 157 insertions(+), 155 deletions(-) + +commit 99f3701ef78cc7056b454c6db82644fa14459030 +Author: Kjartan Maraas +Date: Tue Jul 10 08:14:46 2012 +0200 + + Updated Norwegian bokmål translation + + po/nb.po | 241 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 123 insertions(+), 118 deletions(-) + +commit 241b16a47dd7dd84e91e0c1e958d2087d673a22e +Author: Fran Diéguez +Date: Mon Jul 9 15:11:49 2012 +0200 + + Updated Galician translations + + po/gl.po | 285 ++++++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 163 insertions(+), 122 deletions(-) + +commit 65e4ff1ddefe883ce9c2842f5a163b05cc826e0a +Author: Daniel Mustieles +Date: Fri Jul 6 12:25:52 2012 +0200 + + Updated Spanish translation + + po/es.po | 129 ++++++++++++++++++++++++++++++--------------------------------- + 1 file changed, 61 insertions(+), 68 deletions(-) + +commit 854cd3442d5b2f9c09a7738d1f1b521240605015 +Author: Bastien Nocera +Date: Thu Jul 5 14:40:40 2012 +0100 + + build: Remove gst-pbutil linking hack + + configure.in | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 2c22801ee014d329164c50e42385bdb81f172af8 +Author: Bastien Nocera +Date: Thu Jul 5 14:39:56 2012 +0100 + + build: Remove unused explicit library linkage + + And add gstreamer-audio-0.10 to the list of required libraries. + + configure.in | 5 +---- + src/backend/Makefile.am | 2 -- + src/gst/Makefile.am | 2 -- + 3 files changed, 1 insertion(+), 8 deletions(-) + +commit f6eccbcfbfd32c97368d714cde560f7fdeabac98 +Author: Bastien Nocera +Date: Thu Jul 5 10:04:13 2012 +0100 + + browser-plugin: Update for "buffering" API change + + browser-plugin/totem-plugin-viewer.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 09deaabb8efefddd3b3e424f6089ee2d29f5f57c +Author: Bastien Nocera +Date: Thu Jul 5 10:03:56 2012 +0100 + + main: Update for "buffering" API change + + src/totem-object.c | 2 +- + src/totem-statusbar.c | 14 +++++++------- + src/totem-statusbar.h | 2 +- + 3 files changed, 9 insertions(+), 9 deletions(-) + +commit 2faabdc0cf06db9e6990ad2d8495d822147f99a5 +Author: Bastien Nocera +Date: Wed Jul 4 21:06:59 2012 +0100 + + backend: Use a gdouble for percentage in "buffering" + + Just like we do in "download-buffering" + + src/backend/bacon-video-widget-gst-0.10.c | 10 ++++++---- + src/backend/bacon-video-widget.h | 2 +- + 2 files changed, 7 insertions(+), 5 deletions(-) + +commit 8d2c10d1bbdf6e652db036a53fc6c24931fff11c +Author: Bastien Nocera +Date: Wed Jul 4 21:05:34 2012 +0100 + + browser-plugin: Update for "error" signal change + + browser-plugin/totem-plugin-viewer.c | 6 ------ + 1 file changed, 6 deletions(-) + +commit 3011a5c9971e2edce4f57517b76e54de3baaa78c +Author: Bastien Nocera +Date: Wed Jul 4 21:05:20 2012 +0100 + + main: Update for "error" signal change + + src/totem-object.c | 9 ++------- + 1 file changed, 2 insertions(+), 7 deletions(-) + +commit f633ea6c95af172aa5d6c0a530971af997a64a19 +Author: Bastien Nocera +Date: Wed Jul 4 21:05:08 2012 +0100 + + backend: Remove "fatal" parameter to the "error" signal + + src/backend/bacon-video-widget-gst-0.10.c | 11 +++++------ + src/backend/bacon-video-widget.h | 3 +-- + src/backend/baconvideowidget-marshal.list | 2 +- + 3 files changed, 7 insertions(+), 9 deletions(-) + +commit 3d8447817622be12406ac78a81bb5d679e23652b +Author: Bastien Nocera +Date: Thu Jul 5 10:01:22 2012 +0100 + + main: Remove unused marshal definition file + + It moved to -> src/backend/ some time ago. + + src/baconvideowidget-marshal.list | 2 -- + 1 file changed, 2 deletions(-) + +commit d8442afe0e980f7f7e6bf02e4065632c8dd78f48 +Author: Bastien Nocera +Date: Wed Jul 4 19:46:00 2012 +0100 + + backend: Clean up vis plugins search + + Rather than looking again in the registry for a vis plugin, given + a displayable name, keep a hash table to look it up. + + src/backend/bacon-video-widget-gst-0.10.c | 78 ++++++++++++++----------------- + 1 file changed, 36 insertions(+), 42 deletions(-) + +commit 8752d3b08fb421b0abad0185da6c1a057a3e997a +Author: Rico Tzschichholz +Date: Wed Jul 4 13:20:06 2012 +0200 + + Revert "Honor aclocal flags" + + This reverts commit 6b3f4f5f88f850578065251762cd7258f837c2b1. + + Makefile.am | 2 -- + 1 file changed, 2 deletions(-) + +commit 62e936c984ff61b2db5f22a9fee01360c99f318a +Author: Rico Tzschichholz +Date: Wed Jul 4 13:09:46 2012 +0200 + + data: Add mime-type-imports.sh to EXTRA_DIST + + data/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit ee6a3d58debecc60b719b258fd42153092159c8a +Author: Bastien Nocera +Date: Wed Jul 4 11:29:02 2012 +0100 + + zeitgeist-dp: Fix for get_video_widget() API change + + src/plugins/zeitgeist-dp/totem-zeitgeist-dp-plugin.vala | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 04da9197b34012093c8fc0d97fc37c0f038bc84d +Author: Bastien Nocera +Date: Wed Jul 4 11:28:43 2012 +0100 + + rotation: Fix for get_video_widget() API change + + src/plugins/rotation/totem-rotation-plugin.vala | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a22278e6f47e380fea7e5aef7690810a77520cf5 +Author: Bastien Nocera +Date: Wed Jul 4 11:28:22 2012 +0100 + + plugins: Look for GIR files in builddir, not srcdir + + src/plugins/rotation/Makefile.am | 2 +- + src/plugins/zeitgeist-dp/Makefile.am | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit e66cb92f7f1603a31c8bcff8fffa8bb917dc6e3d +Author: Bastien Nocera +Date: Wed Jul 4 10:26:03 2012 +0100 + + backend: Don't try to install avdemux_flv + + The new name of ffdemux_flv in gst-libav. + + src/backend/bacon-video-widget-gst-missing-plugins.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8106abb2f4b99f712571420869c1538f119496f0 +Author: Bastien Nocera +Date: Tue Jul 3 19:22:04 2012 +0100 + + backend: Make av-offset property functional + + See https://bugzilla.gnome.org/show_bug.cgi?id=679341 + + src/backend/bacon-video-widget-gst-0.10.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9a391384b27d335ad9ab37ed972d2ffee2a9bb0a +Author: Bastien Nocera +Date: Tue Jul 3 17:11:07 2012 +0100 + + backend: Warn when required plugins aren't there + + src/backend/bacon-video-widget-gst-0.10.c | 19 +++++++++++++++---- + 1 file changed, 15 insertions(+), 4 deletions(-) + +commit 320fcd35725c2ce52f5d1d2061b84d6ba58ca2ac +Author: Bastien Nocera +Date: Tue Jul 3 16:24:10 2012 +0100 + + docs: Add new functions + + docs/reference/totem-sections.txt | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +commit c4b4516174672bb1d95310a4022f77fa266551fd +Author: Bastien Nocera +Date: Tue Jul 3 16:24:01 2012 +0100 + + docs: More headers to ignore + + docs/reference/Makefile.am | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit f0f4bb7d323154bdb327390b45fd48ffd6fb6ea2 +Author: Bastien Nocera +Date: Tue Jul 3 16:23:19 2012 +0100 + + docs: Remove rate related docs + + docs/reference/totem-sections.txt | 2 -- + 1 file changed, 2 deletions(-) + +commit 469fe32f565d44708f7f83bed38913667d7177cc +Author: Bastien Nocera +Date: Tue Jul 3 16:09:04 2012 +0100 + + backend: Add API docs for get_rate/set_rate + + src/backend/bacon-video-widget-gst-0.10.c | 35 +++++++++++++++++++++++-------- + 1 file changed, 26 insertions(+), 9 deletions(-) + +commit 7b98f9aa0da55e0474deb1877dcc14e3aaf78c22 +Author: Bastien Nocera +Date: Tue Jul 3 16:08:01 2012 +0100 + + backend: Remove change_rate() helper + + It's trivial code that's best implemented along with the UI. + + src/backend/bacon-video-widget-gst-0.10.c | 15 +-------------- + src/backend/bacon-video-widget.h | 2 -- + 2 files changed, 1 insertion(+), 16 deletions(-) + +commit 6b137b2b974aebe436e6a02d793d8485dd0141e5 +Author: Bastien Nocera +Date: Tue Jul 3 15:54:05 2012 +0100 + + backend: Remove bvw_reset_rate() function + + src/backend/bacon-video-widget-gst-0.10.c | 6 ------ + src/backend/bacon-video-widget.h | 1 - + 2 files changed, 7 deletions(-) + +commit c6d84b7ee418b41208519d4bf333cdca3a997758 +Author: Bastien Nocera +Date: Tue Jul 3 15:53:37 2012 +0100 + + backend: Simplify audio-sink setting + + src/backend/bacon-video-widget-gst-0.10.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 2b48197f095b973c00554778e5b312389a406c9f +Author: Bastien Nocera +Date: Tue Jul 3 15:50:12 2012 +0100 + + backend: Add av-offset property + + src/backend/bacon-video-widget-gst-0.10.c | 23 ++++++++++++++++++++++- + 1 file changed, 22 insertions(+), 1 deletion(-) + +commit 19fcc15f44e658adb2fea63097232fdc7b566832 +Author: Bastien Nocera +Date: Tue Jul 3 15:24:00 2012 +0100 + + backend: Indentation fixes + + src/backend/bacon-video-widget-gst-0.10.c | 30 ++++++++++-------------------- + 1 file changed, 10 insertions(+), 20 deletions(-) + +commit daaaeb93da3413804bb1ad83c559955fdd45d4a9 +Author: Bastien Nocera +Date: Tue Jul 3 17:13:36 2012 +0100 + + main: Make get_video_widget() work from Python + + docs/reference/totem-sections.txt | 2 +- + src/totem-object.c | 4 ++-- + src/totem.h | 3 ++- + 3 files changed, 5 insertions(+), 4 deletions(-) + +commit bbfe9f9e29248b6b581a1d0a6b8e14c1dc5fa6c8 +Author: Bastien Nocera +Date: Mon Jul 2 20:21:25 2012 +0100 + + main: Make mount comparison sturdier + + By comparing the default location, rather than comparing pointers. + + src/totem-playlist.c | 40 ++++++++++++++++++++++++++++++++++------ + 1 file changed, 34 insertions(+), 6 deletions(-) + +commit 828a5f79416c4ba7a2caaa9ea4494a1845cfaefe +Author: Bastien Nocera +Date: Mon Jul 2 20:19:55 2012 +0100 + + main: Listen to "mount-removed" signals too + + As we'd only get "mount-pre-unmount" signals when gvfs is used + to eject the device. + + https://bugzilla.gnome.org/show_bug.cgi?id=671285 + + src/totem-uri.c | 4 ++++ + 1 file changed, 4 insertions(+) + +commit c66215e23c8f0f876193eb7e5b31cc192ff874b6 +Author: Bastien Nocera +Date: Mon Jul 2 20:19:14 2012 +0100 + + main: Add sanity check to totem_playlist_clear_with_g_mount() + + src/totem-playlist.c | 2 ++ + 1 file changed, 2 insertions(+) + +commit 749e836002a29444023160a94806529fd2d071aa +Author: Bastien Nocera +Date: Mon Jul 2 20:18:16 2012 +0100 + + main: Add a GMount column to the playlist + + To keep track of it, as by the time the GMount will disappear, + it will be too late to try and look for it, and we'd have nothing to + compare it against. + + data/playlist.ui | 2 ++ + src/totem-playlist.c | 21 +++++++++++++-------- + 2 files changed, 15 insertions(+), 8 deletions(-) + +commit 7936d9031bc8b551bebf5bfb11130afd1f610ddb +Author: Bastien Nocera +Date: Mon Jul 2 19:30:00 2012 +0100 + + data: Add names for the playlist's columns + + data/playlist.ui | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +commit c93dbf7a37bc2862dec23245db8cf915ad670a94 +Author: Bastien Nocera +Date: Mon Jul 2 18:56:27 2012 +0100 + + main: Fix totem_get_mount_for_dvd() not working + + We were checking the retval of g_mount_can_eject() the wrong way + around, so we never got a mount for the DVD device in question. + + src/totem-uri.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5f18bec3684a186406ee20eacd6a01ece54011be +Author: Daniel Mustieles +Date: Mon Jul 2 17:31:02 2012 +0200 + + Updated Spanish translation + + po/es.po | 329 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 163 insertions(+), 166 deletions(-) + +commit de9cacba2c271a4b9623d9e152a08cc2600e5c0f +Author: Tom Tryfonidis +Date: Mon Jul 2 17:27:05 2012 +0300 + + Updated Greek translation + + po/el.po | 130 ++++++++++++++++++++++++++++++++++++++++++--------------------- + 1 file changed, 88 insertions(+), 42 deletions(-) + +commit 521d30baddc498800a981bd76df7177845196baa +Author: Cheng-Chia Tseng +Date: Sat Jun 30 23:11:23 2012 +0800 + + Updated Traditional Chinese translation(Hong Kong and Taiwan) + + po/zh_HK.po | 2159 ++++++++++++++++++++++++++++++---------------------------- + po/zh_TW.po | 2161 +++++++++++++++++++++++++++++++---------------------------- + 2 files changed, 2275 insertions(+), 2045 deletions(-) + +commit bf011f5788e607e202132e59c5c49fbe428160ac +Author: Bastien Nocera +Date: Fri Jun 29 20:50:06 2012 +0100 + + backend: Use correct error for _can_get_frames() + + src/backend/bacon-video-widget-gst-0.10.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit da3c449cbaa0979b42a7ba7b7ee1c7e02a6ea7dc +Author: Bastien Nocera +Date: Fri Jun 29 20:39:56 2012 +0100 + + backend: Busy errors should never happen again + + src/backend/bacon-video-widget.h | 2 -- + 1 file changed, 2 deletions(-) + +commit 811bb735711aff449e3b9d9c338562826612b44d +Author: Bastien Nocera +Date: Fri Jun 29 20:38:36 2012 +0100 + + backend: Audio playback should always be possible + + src/backend/bacon-video-widget.h | 2 -- + 1 file changed, 2 deletions(-) + +commit 59db2a700095a72deaa0f77d57cd5247565f1ab6 +Author: Bastien Nocera +Date: Fri Jun 29 20:37:56 2012 +0100 + + backend: Remove impossible errors (missing audio or video) + + src/backend/bacon-video-widget.h | 4 ---- + 1 file changed, 4 deletions(-) + +commit e2e6f7d7b03f4e3a447add573c8b39d96d83ad9b +Author: Bastien Nocera +Date: Fri Jun 29 20:27:31 2012 +0100 + + backend: Better error messages + + Using the original error messages from the xine-lib backend, + get back some user-friendliness and hack around GStreamer error + reporting limitations. + + See: + http://git.gnome.org/browse/totem/tree/src/backend/bacon-video-widget-xine.c?h=gnome-2-26#n1332 + http://git.gnome.org/browse/totem/tree/src/backend/bacon-video-widget-xine.c?h=gnome-2-26#n1602 + + https://bugzilla.gnome.org/show_bug.cgi?id=674399 + + src/backend/bacon-video-widget-gst-0.10.c | 151 ++++++++++++++++++++---------- + 1 file changed, 104 insertions(+), 47 deletions(-) + +commit fcb36c157fee3f7db1c2e27ba964f37971855a22 +Author: Bastien Nocera +Date: Fri Jun 29 20:27:07 2012 +0100 + + backend: Better error message on missing plugins + + src/backend/bacon-video-widget-gst-0.10.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit a46c4ac1f73a53d499acf482ef16b2357e754564 +Author: Bastien Nocera +Date: Fri Jun 29 20:19:47 2012 +0100 + + backend: Remove "audio busy" error + + Now that we use PulseAudio by default to playback, this should + be impossible. + + src/backend/bacon-video-widget.h | 2 -- + 1 file changed, 2 deletions(-) + +commit 88477e28df81cb7c842802807b09c4f7df5bbede +Author: Bastien Nocera +Date: Fri Jun 29 19:25:09 2012 +0100 + + backend: Simplify bvw_check_missing_auth() + + Using the new HTTP status code helper. + + src/backend/bacon-video-widget-gst-0.10.c | 65 +++++++++++++------------------ + 1 file changed, 26 insertions(+), 39 deletions(-) + +commit 642b57b737e32d37852e9fbb01b2cb37ac17de54 +Author: Bastien Nocera +Date: Fri Jun 29 19:24:14 2012 +0100 + + backend: Add helper to check HTTP status codes + + So that we can get better error messages for those. + + src/backend/bacon-video-widget-gst-0.10.c | 38 +++++++++++++++++++++++++++++++ + 1 file changed, 38 insertions(+) + +commit 337171ec6738a9b4932d4ee7a7a3fb5d761d91b0 +Author: Bastien Nocera +Date: Fri Jun 29 19:40:38 2012 +0100 + + backend: Turn error into a debug message + + src/backend/bacon-video-widget-gst-0.10.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ca371d99df1dd2dd9b859a51163828126b6c6cfc +Author: Bastien Nocera +Date: Fri Jun 29 19:40:21 2012 +0100 + + backend: Add log domain to test app + + src/backend/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit 2988b3bb64ceecd456b698532c1f54b876a0c1b0 +Author: Bastien Nocera +Date: Fri Jun 29 19:40:58 2012 +0100 + + gst: Remove duplicated error message output + + src/gst/totem-gst-helpers.c | 3 --- + 1 file changed, 3 deletions(-) + +commit be6b3d78fac05c3d046c33865bb343c721e033cf +Author: Bastien Nocera +Date: Fri Jun 29 12:05:19 2012 +0100 + + rotation: Remove dead code + + src/plugins/rotation/totem-rotation-plugin.vala | 13 +------------ + 1 file changed, 1 insertion(+), 12 deletions(-) + +commit e6ffb10388ca052dc06404ad8ad163619d131281 Author: Bastien Nocera Date: Fri Jun 29 11:58:23 2012 +0100 - main: Don't forget to clear seeking on close + main: Don't forget to clear seeking on close + + If we had opened a file, got a remembered position to restore, + but never actually got a change in the seekable property, we wouldn't + have clear the seek to position. + + This should fix bizarre behaviour if you're skipping between streams + too quickly for GStreamer to see the stream is seekable. + + https://bugzilla.gnome.org/show_bug.cgi?id=676434 + + src/totem-object.c | 3 +++ + 1 file changed, 3 insertions(+) + +commit d55038b662ceecf414fd6e7a9c10c9c2ef6acb4c +Author: Tom Tryfonidis +Date: Fri Jun 29 01:31:11 2012 +0300 + + Updated Greek translation + + po/el.po | 172 ++++++++++++++++++++++++++++++--------------------------------- + 1 file changed, 82 insertions(+), 90 deletions(-) + +commit 232f955d47a8043dd38805dd70c25dbecb10a269 +Author: Piotr Drąg +Date: Thu Jun 28 18:40:52 2012 +0200 + + Updated POTFILES.in + + po/POTFILES.in | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit 17e23d497689d36b0d661165817045907a31164e +Author: Bastien Nocera +Date: Thu Jun 28 17:27:02 2012 +0100 + + screenshot: Remove "..." from menu item + + As there's no dialogue showing up anymore. + + src/plugins/screenshot/totem-screenshot-plugin.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1249d1e8564949f4fd9c0191d1863bec5866706b +Author: Bastien Nocera +Date: Thu Jun 28 12:43:23 2012 +0100 + + screenshot: Remove UI and flash the video instead + + This matches the UI used in the shell where the captured + section of the screen flashes, and the video is automatically + saved in the user's Pictures directory. + + https://bugzilla.gnome.org/show_bug.cgi?id=674640 + + src/plugins/screenshot/Makefile.am | 8 +- + src/plugins/screenshot/gnome-screenshot-widget.c | 437 ----------------------- + src/plugins/screenshot/gnome-screenshot-widget.h | 71 ---- + src/plugins/screenshot/gnome-screenshot.ui | 148 -------- + src/plugins/screenshot/totem-screenshot-plugin.c | 154 +++++++- + src/plugins/screenshot/totem-screenshot.c | 185 ---------- + src/plugins/screenshot/totem-screenshot.h | 62 ---- + 7 files changed, 151 insertions(+), 914 deletions(-) + +commit bb598ecad02f3dc816a3329a43b1529b2b0cc81b +Author: Bastien Nocera +Date: Thu Jun 28 12:42:58 2012 +0100 + + screenshot: Add license exception + + https://bugzilla.gnome.org/show_bug.cgi?id=674640 + + src/plugins/screenshot/screenshot-filename-builder.c | 3 +++ + src/plugins/screenshot/screenshot-filename-builder.h | 3 +++ + 2 files changed, 6 insertions(+) + +commit b68db23aa20cf97447a1caee93e2cec01f1fc6a5 +Author: Bastien Nocera +Date: Thu Jun 28 12:40:50 2012 +0100 + + screenshot: Add filename builder helpers + + From gnome-screenshot + + https://bugzilla.gnome.org/show_bug.cgi?id=674640 + + .../screenshot/screenshot-filename-builder.c | 338 +++++++++++++++++++++ + .../screenshot/screenshot-filename-builder.h | 33 ++ + 2 files changed, 371 insertions(+) + +commit 54f6c5418d2178cf71d513444114103d280dd606 +Author: Bastien Nocera +Date: Thu Jun 28 16:30:12 2012 +0100 + + main: Handle smooth scroll events + + And restrict ourselves to handling smooth events on the left side + of the pane, stopping us from capturing scroll events meant for scroll + window, such as the playlist. + + https://bugzilla.gnome.org/show_bug.cgi?id=674355 + + data/totem.ui | 2 +- + src/totem-object.c | 23 ++++++++++++++++------- + 2 files changed, 17 insertions(+), 8 deletions(-) + +commit dc0529a60093522209f97736075d7c0741281988 +Author: Bastien Nocera +Date: Thu Jun 28 12:31:42 2012 +0100 + + backend: Fix startup warnings + + src/backend/totem-aspect-frame.c | 2 ++ + 1 file changed, 2 insertions(+) + +commit 5c090ceedb206f3821568c0663b97bf9db3b58d7 +Author: Bastien Nocera +Date: Thu Jun 28 12:06:34 2012 +0100 + + screenshot: Fix menu items not appearing anymore + + Since the app menu changes, the item they wanted to be inserted + before didn't exist anymore. + + src/plugins/screenshot/totem-screenshot-plugin.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 30c1d6b31ec09dfad39aab2c909904b58afa2efd +Author: Bastien Nocera +Date: Wed Jun 27 23:47:38 2012 +0100 + + screensaver: Don't wrongly use _can_get_frames() + + Make sure we don't act as if the stream had a video track + when we're actually checking whether we can take a screenshot. + + src/plugins/screensaver/totem-screensaver.c | 19 ++++++++++++++++--- + 1 file changed, 16 insertions(+), 3 deletions(-) + +commit b40dba4455fe09538401c2db08f1ff7e1b32ae7f +Author: Andika Triwidada +Date: Thu Jun 28 07:57:13 2012 +0700 + + Updated Indonesian translation + + po/id.po | 2456 +++++++++++++++++++++++++++----------------------------------- + 1 file changed, 1086 insertions(+), 1370 deletions(-) + +commit d53c765bc512a0ee5f6bb520584b068c10e4b6d7 +Author: Bastien Nocera +Date: Wed Jun 27 23:21:02 2012 +0100 + + rotation: Update for Bvw API changes + + src/plugins/rotation/bacon-video.vapi | 8 ++++---- + src/plugins/rotation/totem-rotation-plugin.vala | 6 +++--- + 2 files changed, 7 insertions(+), 7 deletions(-) + +commit 947781384bb95d1ff4bf6b93a10a9be7b7015504 +Author: Bastien Nocera +Date: Wed Jun 27 23:20:26 2012 +0100 + + backend: Rename BvwRotation member to R_ZERO + + To avoid too short nicknames when used in GSettings. + + src/backend/bacon-video-widget-gst-0.10.c | 2 +- + src/backend/bacon-video-widget.h | 16 ++++++++-------- + 2 files changed, 9 insertions(+), 9 deletions(-) + +commit c4940d910c9f110db0a1856a8b59dc0080314310 +Author: Bastien Nocera +Date: Wed Jun 27 22:19:09 2012 +0100 + + backend: Fix initial rotation state + + src/backend/totem-aspect-frame.c | 11 +++-------- + 1 file changed, 3 insertions(+), 8 deletions(-) + +commit 3ffc38eff5663a9ac5e29fad58507a437b3d9715 +Author: Bastien Nocera +Date: Wed Jun 27 22:16:02 2012 +0100 + + backend: Use gdouble for the angle + + As clutter does. + + src/backend/totem-aspect-frame.c | 16 ++++++++-------- + src/backend/totem-aspect-frame.h | 4 ++-- + 2 files changed, 10 insertions(+), 10 deletions(-) + +commit 7d66ae75cedae303bbcfe5d15c9901835922a6e8 +Author: Bastien Nocera +Date: Wed Jun 27 20:45:24 2012 +0100 + + orientation: Update for newer video widget API + + src/plugins/rotation/Makefile.am | 4 +- + src/plugins/rotation/bacon-video.vapi | 19 ++++++ + src/plugins/rotation/totem-rotation-plugin.vala | 89 ++++++------------------- + 3 files changed, 42 insertions(+), 70 deletions(-) + +commit 195c68503513dbfaee6bf537de3932ec0be49b5f +Author: Bastien Nocera +Date: Wed Jun 27 20:21:00 2012 +0100 + + backend: Expose rotation through video widget + + src/backend/bacon-video-widget-gst-0.10.c | 49 +++++++++++++++++++++++++++++++ + src/backend/bacon-video-widget.h | 21 +++++++++++++ + 2 files changed, 70 insertions(+) + +commit 521286391bfb75d7afe8394f368548572f46f3e9 +Author: Bastien Nocera +Date: Wed Jun 27 20:19:43 2012 +0100 + + backend: Add rotation support to aspect frame + + src/backend/totem-aspect-frame.c | 91 ++++++++++++++++++++++++++++++++++++++++ + src/backend/totem-aspect-frame.h | 18 ++++---- + 2 files changed, 102 insertions(+), 7 deletions(-) + +commit 350000523243b05e9daf8ac6ab654c2f3dcf11f8 +Author: Bastien Nocera +Date: Wed Jun 27 18:42:03 2012 +0100 + + zeitgeist-dp: Update for deprecated API + + src/plugins/zeitgeist-dp/totem-zeitgeist-dp-plugin.vala | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 14794778a5131e0a1f82ad949a55f51a3d8861c1 +Author: Bastien Nocera +Date: Wed Jun 27 18:08:58 2012 +0100 + + zeitgeist-dp: Update video widget vapi file + + src/plugins/zeitgeist-dp/bacon-video.vapi | 11 ++--------- + 1 file changed, 2 insertions(+), 9 deletions(-) + +commit 28ab538aae175c3e6d4486034ca43286ed37a236 +Author: Bastien Nocera +Date: Wed Jun 27 15:32:42 2012 +0100 + + backend: Avoid incorrect painting when expanded + + When expand is TRUE, the very first frame painted during the + transition will have the final full size that it's supposed to + have at the end of the transition. It looks like the video + growing onto itself. + + Don't use very custom code and clip instead. + + src/backend/totem-aspect-frame.c | 36 +++--------------------------------- + 1 file changed, 3 insertions(+), 33 deletions(-) + +commit c18276d4a9cf208535f6c043244d75487528ba65 +Author: Bastien Nocera +Date: Wed Jun 27 15:32:16 2012 +0100 + + backend: Add animation for expand transition + + src/backend/totem-aspect-frame.c | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +commit 76f5de992b7fed65183d1e6d6dd03ed583014f53 +Author: Bastien Nocera +Date: Wed Jun 27 15:13:47 2012 +0100 + + backend: Don't try to paint 0-sized actors + + If the child will end up with one of the dimensions being zero, + don't bother trying to pain it. + + src/backend/totem-aspect-frame.c | 3 +++ + 1 file changed, 3 insertions(+) + +commit f4856b75d7850bd209fe2c7f4e8ebed2ee9a2bab +Author: Bastien Nocera +Date: Wed Jun 27 12:30:55 2012 +0100 + + build: Remove dependendy on mx + + https://bugzilla.gnome.org/show_bug.cgi?id=655590 + + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 00d564c969db406d8ad173476feed063fc82254f +Author: Bastien Nocera +Date: Wed Jun 27 12:30:33 2012 +0100 + + backend: Implement aspect frame in raw clutter + + src/backend/totem-aspect-frame.c | 15 +++++++++------ + src/backend/totem-aspect-frame.h | 6 +++--- + 2 files changed, 12 insertions(+), 9 deletions(-) + +commit 34ca10f676c6a4eab9aa306c37c4a38364010b15 +Author: Bastien Nocera +Date: Wed Jun 27 12:22:02 2012 +0100 + + backend: Remove direct calls to Mx functions + + The logo frame code was non-functional, and the rest could + be replaced with totem_aspect_frame_set_child(). + + src/backend/bacon-video-widget-gst-0.10.c | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +commit 06a0a1ab0ff368b36675a3d1a433cf302a8124a9 +Author: Bastien Nocera +Date: Wed Jun 27 12:21:13 2012 +0100 + + backend: Add _set_child() helper + + Instead of calling MxBin's. + + src/backend/totem-aspect-frame.c | 9 +++++++++ + src/backend/totem-aspect-frame.h | 3 +++ + 2 files changed, 12 insertions(+) + +commit ee0cf00527862f4ce5adc557ae453f5cb83a2c59 +Author: Bastien Nocera +Date: Wed Jun 27 12:08:24 2012 +0100 + + backend: Remove useless class padding + + src/backend/totem-aspect-frame.h | 7 ------- + 1 file changed, 7 deletions(-) + +commit e3c9abb05bb878461a43f50f4740dece1a1eed4d +Author: Bastien Nocera +Date: Wed Jun 27 12:06:13 2012 +0100 + + backend: Indentation fixes + + src/backend/totem-aspect-frame.c | 30 +++++++++++++++--------------- + src/backend/totem-aspect-frame.h | 2 +- + 2 files changed, 16 insertions(+), 16 deletions(-) + +commit 6291b3634ac5dbd9e7200937f7dea14cea61a566 +Author: Bastien Nocera +Date: Wed Jun 27 11:54:37 2012 +0100 + + backend: Remove MxPadding checks + + We always use 0 for padding in all 4 directions. + + src/backend/totem-aspect-frame.c | 49 ++++++++-------------------------------- + 1 file changed, 9 insertions(+), 40 deletions(-) + +commit 4370dbeb8386385e942cea7fd884f5d740760356 +Author: Bastien Nocera +Date: Wed Jun 27 11:48:32 2012 +0100 + + backend: Remove unused "ratio" property + + src/backend/totem-aspect-frame.c | 56 +++++----------------------------------- + src/backend/totem-aspect-frame.h | 4 --- + 2 files changed, 6 insertions(+), 54 deletions(-) + +commit 015473560c26cf8ebc6f5033601cacda285c79c2 +Author: Iain Lane +Date: Tue Jun 26 22:34:33 2012 +0100 + + browser-plugin: Update seek slider position hack + + Commit b31a06a712ab39a9c9018304b9dfc5a31687016c updated the seek slider + in the main totem UI to work with change in GTK+ 3.5.2. + + Also fix the browser plugin's seek slider. + + https://bugzilla.gnome.org/show_bug.cgi?id=678931 + + browser-plugin/totem-plugin-viewer.c | 10 ---------- + 1 file changed, 10 deletions(-) + +commit 8bb27e8c397c5271c8215eb2d2d4aa3077aedee6 +Author: Gwenole Beauchesne +Date: Mon Jun 25 17:48:51 2012 +0200 + + backend: fix out-of-source build. + + bacon-video-widget-enums.h is generated into the $(top_builddir)/src/backend + directory. + + https://bugzilla.gnome.org/show_bug.cgi?id=678797 + + src/Makefile.am | 1 + + src/backend/Makefile.am | 1 + + 2 files changed, 2 insertions(+) + +commit 74510371a3b6959d8215bdf5944b29424b0bd6f9 +Author: Gwenole Beauchesne +Date: Mon Jun 25 17:42:10 2012 +0200 + + backend: fix incorrect property ID (referrer). + + Fix typo in PROP_REFERRER name. + + https://bugzilla.gnome.org/show_bug.cgi?id=678796 + + src/backend/bacon-video-widget-gst-0.10.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5c3a88e553626d59a5c5857899081d692d1672f4 +Author: tuhaihe +Date: Sat Jun 23 16:43:05 2012 +0800 + + add Simplified Chinese (zh_CN) translation + + po/zh_CN.po | 2173 ++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 1087 insertions(+), 1086 deletions(-) + +commit 18a55274bee5399faa97d409ba07a88864202912 +Author: Daniel Drake +Date: Fri Jun 22 10:13:10 2012 -0600 + + browser-plugin: Add more OGG mime types + + shared-mime-info identifies ogg media as audio/x-vorbis+ogg and + video/x-theora+ogg (easy to see in Nautilus). + + I haven't seen any websites serving these MIME types, but when + loading media from local disk (quite common for OLPC shipped content) + these MIME types do come into play. + + Add them to the list so that the browser plugin continues to be used + to play such media. + + browser-plugin/totemPlugin.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +commit e01f38a4c2fae864c1f995fcffdc29f3b9a20138 +Author: Bastien Nocera +Date: Fri Jun 22 19:00:41 2012 +0100 + + backend: Check all the plugins on startup + + So that we're not surprised if one is missing later. + + src/backend/bacon-video-widget-gst-0.10.c | 27 +++++++++++++-------------- + 1 file changed, 13 insertions(+), 14 deletions(-) + +commit 2ee5c455bce86ab420eacbcabc3e77c260e26a30 +Author: Bastien Nocera +Date: Fri Jun 22 18:58:58 2012 +0100 + + backend: Fix incorrect property_id usage + + Referer was using the user-agent property ID + + src/backend/bacon-video-widget-gst-0.10.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit cfc62d194740b7530799b30bc104354464b8d1d0 +Author: Bastien Nocera +Date: Fri Jun 22 18:58:00 2012 +0100 + + grilo: Use bigger previews by default + + src/plugins/grilo/totem-grilo.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1e66d10f1935c9c1c78a666525d342935a581a70 +Author: Bastien Nocera +Date: Fri Jun 22 18:57:26 2012 +0100 + + grilo: Use TotemSearchEntry for searching + + src/plugins/grilo/grilo.ui | 6 +- + src/plugins/grilo/totem-grilo.c | 140 +++++++++------------------------------- + 2 files changed, 33 insertions(+), 113 deletions(-) + +commit b733d400beb9420b53d49a7684a3f23a6e2aea5d +Author: Bastien Nocera +Date: Fri Jun 22 18:55:57 2012 +0100 + + grilo: Compile the recently added widgets + + src/plugins/grilo/Makefile.am | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit e18b893816987d02eb735b0d44fa43e021f1e546 +Author: Bastien Nocera +Date: Fri Jun 22 18:54:47 2012 +0100 + + grilo: Add a TotemSearchEntry + + Like GdTaggedEntry but with a drop-down to select the + source provider to use. + + src/plugins/grilo/totem-search-entry.c | 291 +++++++++++++++++++++++++++++++++ + src/plugins/grilo/totem-search-entry.h | 74 +++++++++ + 2 files changed, 365 insertions(+) + +commit 6bc56079df925a3bde9858ebefa33807274f613d +Author: Bastien Nocera +Date: Fri Jun 22 18:53:38 2012 +0100 + + grilo: Add GdTaggedEntry + + From gnome-documents. Includes changes from: + https://bugzilla.gnome.org/show_bug.cgi?id=678641 + + src/plugins/grilo/gd-tagged-entry.c | 1004 +++++++++++++++++++++++++++++++++++ + src/plugins/grilo/gd-tagged-entry.h | 89 ++++ + 2 files changed, 1093 insertions(+) + +commit 0cfb7fe90f4bfa83b87442473605e24ebb744367 +Author: Bastien Nocera +Date: Thu May 31 17:03:13 2012 +0100 + + browser-plugin: Use GtkMenuButton + + browser-plugin/totem-plugin-viewer.c | 111 +++-------------------------------- + data/mozilla-viewer.ui | 8 +-- + 2 files changed, 9 insertions(+), 110 deletions(-) + +commit e3a96021c46bcdeab2ceb3ca1e289a1df8ac906b +Author: Bastien Nocera +Date: Mon May 28 16:03:29 2012 +0100 + + grilo: Remove drop-down source selection + + We'll use a tagged entry in the future. This also adds + support for a generic "all" search. + + src/plugins/grilo/grilo.ui | 30 ++++++------------------------ + src/plugins/grilo/totem-grilo.c | 29 ++++++++++++++++------------- + 2 files changed, 22 insertions(+), 37 deletions(-) + +commit 4849f96c8f56ec20bf34d63d842dd8792af7dac2 +Author: Bastien Nocera +Date: Thu Jun 21 11:10:07 2012 +0100 + + thumbnailer: Fix error message mentioning audio preview + + src/totem-video-thumbnailer.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 172fc2478b7f348f07beb348f6863b5766388a39 +Author: Bastien Nocera +Date: Thu Jun 21 12:37:59 2012 +0100 + + thumbnailer: Thumbnail unseekable video files too + + Rather than bail because we can't look for more interesting + frames somewhere else in the file. + + src/totem-video-thumbnailer.c | 47 ++++++++++++++++++++++++++++--------------- + 1 file changed, 31 insertions(+), 16 deletions(-) + +commit ae3e78b206ceb65e3d4820a9430bf04df4d79ec7 +Author: Bastien Nocera +Date: Thu Jun 21 11:46:31 2012 +0100 + + thumbnailer: Fix debug output + + src/totem-video-thumbnailer.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 32c500670effa83ae7a1796406daa4910fc221ac +Author: Bastien Nocera +Date: Wed Jun 20 21:24:13 2012 +0100 + + thumbnailer: Exit as soon as we have an error + + Rather than waiting for the thumbnailer to timeout. + + src/totem-video-thumbnailer.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5001c263f03b9d8f2af6f1e42b65485cee7d33e5 +Author: Bastien Nocera +Date: Wed Jun 20 21:31:48 2012 +0100 + + thumbnailer: Don't seek if we don't need to + + src/totem-video-thumbnailer.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit e470b565904ec5b54f75c2d6ff5e0437208d2c9b +Author: Tom Tryfonidis +Date: Fri Jun 22 12:52:28 2012 +0300 + + Updated Greek translation + + po/el.po | 1297 +++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 640 insertions(+), 657 deletions(-) + +commit d83a4f26e556f33e50a4fc4c224536e7337e1ab2 +Author: Pavel Vasin +Date: Fri Jun 8 15:43:36 2012 +0400 + + browser-plugin: fix memory leak in NP_GetMIMEDescription + + browser-plugin/totemPluginGlue.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a0d711b0c3453d856a5d3488a02ebb105f40db09 +Author: Bastien Nocera +Date: Tue Jun 12 02:20:05 2012 +0200 + + main: Handle GDK_KEY_Pause as Pause + + Seeing as people mistranslate it. + + src/totem-object.c | 1 + + 1 file changed, 1 insertion(+) + +commit 19970f1f36e7db36a0da39bafa28b9e13bb573b7 +Author: Matej Urbančič +Date: Tue May 29 09:09:32 2012 +0200 + + Updated Slovenian translation + + po/sl.po | 1473 ++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 758 insertions(+), 715 deletions(-) + +commit 199717f0da40602f04b1c742e30d78b8168c02d9 +Author: Craig Keogh +Date: Mon May 28 12:55:25 2012 +0100 + + browser-plugin: Fix parallel build + + By making totem-plugin-viewer.c require the marshal files to + be generated. + + https://bugzilla.gnome.org/show_bug.cgi?id=676851 + + browser-plugin/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 87409014b49aece1b79eab9c1dbbdfb91fd8a91a +Author: Bastien Nocera +Date: Fri May 25 14:34:04 2012 +0100 + + main: Fix sidebar related warnings on startup + + When the last used sidebar was from a plugin, we would try + and set it before the plugins were loaded. + + src/totem-object.c | 2 +- + src/totem-sidebar.c | 7 +------ + src/totem-sidebar.h | 3 +-- + 3 files changed, 3 insertions(+), 9 deletions(-) + +commit 01b7ea25eedb668d57bed8a441e910d0b96a5c6f +Author: Philip Withnall +Date: Tue May 22 23:48:21 2012 +0100 + + i18n: Update British English translation + + po/en_GB.po | 2522 +++++++++++++++++++++++++++++------------------------------ + 1 file changed, 1257 insertions(+), 1265 deletions(-) + +commit ea61750569d7e1a9ed44f360f5774f14d1e121af +Author: Rūdolfs Mazurs +Date: Fri May 18 12:42:59 2012 +0300 + + Updated Latvian translation + + po/lv.po | 292 ++++++++++++++++++++++++++++++--------------------------------- + 1 file changed, 139 insertions(+), 153 deletions(-) + +commit 9e427fd83b1b0c5019ca6406383606ff97a29068 +Author: Rūdolfs Mazurs +Date: Fri May 18 12:40:16 2012 +0300 + + Updated Latvian translation + + po/lv.po | 2313 +++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 1167 insertions(+), 1146 deletions(-) + +commit 49c78a54c7139443aed373301329459f8a6bb50a +Author: Daniel Nylander +Date: Wed May 16 12:36:37 2012 +0200 + + Updated Swedish translation + + po/sv.po | 2374 +++++++++++++++++++++++++------------------------------------- + 1 file changed, 970 insertions(+), 1404 deletions(-) + +commit 4c92163bf2842aa6de63467261583c7d4e1bd35c +Author: A S Alam +Date: Wed May 16 07:36:08 2012 +0530 + + update Punjabi Translaiton + + po/pa.po | 2224 +++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 1112 insertions(+), 1112 deletions(-) + +commit b31a06a712ab39a9c9018304b9dfc5a31687016c +Author: Kalev Lember +Date: Thu May 10 18:41:41 2012 +0300 + + main: Update the seek slider hack for GTK+ changes + + GTK+ commit 162614aa changed the range widget's button behaviour so that + button 1 jumps to position. This is almost what we need in totem, except + that we'd want buttons 2 and 3 to also do the jumping. + + Update the seek slider hack accordingly to always force button 1 + behaviour and bump gtk+ dep to 3.5.2. + + https://bugzilla.gnome.org/show_bug.cgi?id=675838 + + configure.in | 2 +- + src/totem-object.c | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit a41f38b4dce3e13d0f0d41439e26262f3fab93be +Author: Yaron Shahrabani +Date: Sat May 5 18:01:47 2012 +0300 + + Updated Hebrew translation. + + po/he.po | 1391 ++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 717 insertions(+), 674 deletions(-) + +commit d5368321be9dd2c84906b6a27f9e41f04f5236d6 +Author: Ihar Hrachyshka +Date: Thu May 3 23:19:29 2012 +0300 + + Updated Belarusian translation. + + po/be.po | 2040 ++++++++++++++++++++++++++++---------------------------------- + 1 file changed, 905 insertions(+), 1135 deletions(-) + +commit d1b12ccf06a043d9a0cf9542f4622f677932de57 +Author: Kjartan Maraas +Date: Thu May 3 13:42:21 2012 +0200 + + Updated Norwegian bokmål translation + + po/nb.po | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++------------- + 1 file changed, 83 insertions(+), 20 deletions(-) + +commit 7e3d71aefcade2409a13051e891ef15fdf1650c1 +Author: Tom Tryfonidis +Date: Thu May 3 11:32:09 2012 +0300 + + Updated Greek translation + + po/el.po | 3014 +++++++++++++++++++++++++------------------------------------- + 1 file changed, 1203 insertions(+), 1811 deletions(-) + +commit 2ac28c3108f580f9aef79f700448822ff6f3c43c +Author: Daniel Mustieles +Date: Tue May 1 12:58:27 2012 +0200 + + Updated Spanish translation + + po/es.po | 1615 ++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 836 insertions(+), 779 deletions(-) + +commit d06f5fa6aeb978c361e05ada545ad41c7e80314b +Author: Fran Diéguez +Date: Mon Apr 30 21:12:42 2012 +0200 + + Updated Galician translations + + po/gl.po | 1518 ++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 781 insertions(+), 737 deletions(-) + +commit a79e357ddc5d0e985931fcc86323a73d889c9e41 +Author: Piotr Drąg +Date: Mon Apr 30 18:30:19 2012 +0200 + + Internationalize missing plugin.in files + + Also unify names and descriptions a bit by + capitalizing names and removing dots from + descriptions. + + po/POTFILES.in | 3 +++ + src/plugins/apple-trailers/apple-trailers.plugin.in | 4 ++-- + src/plugins/autoload-subtitles/autoload-subtitles.plugin.in | 4 ++-- + src/plugins/chapters/chapters.plugin.in | 2 +- + src/plugins/grilo/grilo.plugin.in | 2 +- + src/plugins/im-status/totem-im-status.plugin.in | 2 +- + src/plugins/iplayer/iplayer.plugin.in | 2 +- + src/plugins/media-player-keys/media-player-keys.plugin.in | 4 ++-- + src/plugins/opensubtitles/opensubtitles.plugin.in | 2 +- + src/plugins/properties/movie-properties.plugin.in | 4 ++-- + src/plugins/pythonconsole/pythonconsole.plugin.in | 2 +- + src/plugins/rotation/rotation.plugin.in | 2 +- + src/plugins/save-file/save-file.plugin.in | 2 +- + src/plugins/screensaver/screensaver.plugin.in | 4 ++-- + src/plugins/screenshot/screenshot.plugin.in | 4 ++-- + src/plugins/skipto/skipto.plugin.in | 4 ++-- + 16 files changed, 25 insertions(+), 22 deletions(-) + +commit 8e8b73ef5277c2a54c7e3c6ec88b3d992fbb45b5 +Author: Kjartan Maraas +Date: Mon Apr 30 13:04:35 2012 +0200 + + Updated Norwegian bokmål translation + + po/nb.po | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 58c0baf39cb3225b14d5b846934cec73d2654264 +Author: Kjartan Maraas +Date: Mon Apr 30 12:55:19 2012 +0200 + + Added Norwegian bokmål translation + + po/nb.po | 1436 +++++++++++++++++++++++++++++--------------------------------- + 1 file changed, 680 insertions(+), 756 deletions(-) + +commit e1c685931bdad53bd6d3093d446c73379cda0f9f +Author: Piotr Drąg +Date: Sun Apr 29 23:00:10 2012 +0200 + + Updated Polish translation + + po/pl.po | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 48458a2d20bd2fd7d8a09fd9a657f9b1f46c0fc4 +Author: Bastien Nocera +Date: Sat Apr 28 19:31:17 2012 +0100 + + plugins: Fix GIR compiler warning + + plugins/totem-plugin.h:144: Warning: Totem: multiple comment blocks documenting 'TOTEM_PLUGIN_REGISTER:' identifier. + + src/plugins/totem-plugin.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit dfc4a2793641e6a2052a76c50d87d4b1b97be86f +Author: Bastien Nocera +Date: Fri Apr 27 18:53:32 2012 +0100 + + data: Install preferences.ui + + data/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit fe0a1cdc7004e6d43590679808af806258c4ba71 +Author: Bastien Nocera +Date: Fri Apr 27 17:25:44 2012 +0100 + + backend: Use autocluttersink + + And get free hardware decoding, using either gst-vaapi and Fluendo's + hardware decoder plugins. + + https://bugzilla.gnome.org/show_bug.cgi?id=674083 + + src/backend/bacon-video-widget-gst-0.10.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ef8ef515e32a1bdfaf02110af43c010744de09e3 +Author: Josep Torra +Date: Wed Jan 25 16:46:49 2012 +0100 + + backend: Make navigation optional + + As some sinks might not implement it. + + src/backend/bacon-video-widget-gst-0.10.c | 33 ++++++++++++++++++++++++++----- + 1 file changed, 28 insertions(+), 5 deletions(-) + +commit bc6f874373f64a0036711bbfe845d76264ec097a +Author: Bastien Nocera +Date: Fri Apr 27 17:14:19 2012 +0100 + + backend: Get playbin2 to create our videobalance + + That way, we don't have to manage it ourselves, and we know + that a videobalance will be present. + + configure.in | 3 +- + src/backend/bacon-video-widget-gst-0.10.c | 101 +++++++++--------------------- + 2 files changed, 32 insertions(+), 72 deletions(-) + +commit 1c5aecb2e3efcc1e6f5655becac009c58f7ab6dc +Author: Piotr Drąg +Date: Fri Apr 27 14:53:29 2012 +0200 + + Updated POTFILES.in + + po/POTFILES.in | 49 +++++++++++++++++++++++++------------------------ + 1 file changed, 25 insertions(+), 24 deletions(-) + +commit 439ef53b42ba507728f68598f8aab01dc7179d00 +Author: Bastien Nocera +Date: Fri Apr 27 13:23:34 2012 +0100 + + backend: Remove unused connection-speed setting + + docs/reference/totem-sections.txt | 5 -- + src/backend/bacon-video-widget-gst-0.10.c | 83 ++----------------------------- + src/backend/bacon-video-widget.h | 36 -------------- + 3 files changed, 4 insertions(+), 120 deletions(-) + +commit 55cf21087dc21647bcc98b65d48631736a9bee4a +Author: Bastien Nocera +Date: Fri Apr 27 13:19:13 2012 +0100 + + backend: Move vis list zeroing + + src/backend/bacon-video-widget-gst-0.10.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5a1c8b09bc9c69ebf83f8c9621345d7938c1e8b1 +Author: Bastien Nocera +Date: Fri Apr 27 13:09:22 2012 +0100 + + data: Remove unused connection speed configuration + + data/org.gnome.totem.gschema.xml.in.in | 5 ----- + data/totem.convert | 1 - + 2 files changed, 6 deletions(-) + +commit 1e94f05059b18444d3a342522341c8ace97795c2 +Author: Bastien Nocera +Date: Fri Apr 27 13:04:40 2012 +0100 + + main: Remove connection-speed preference + + The values came from Microsoft's MMS speed switch list, which + means that it's now, 10 years on, completely outdated. + + https://bugzilla.gnome.org/show_bug.cgi?id=556227 + + data/preferences.ui | 158 ------------------------------------------------ + src/totem-preferences.c | 7 --- + 2 files changed, 165 deletions(-) + +commit 7f62fc1c870fffc52f8a57e0672a53dcb2056431 +Author: Bastien Nocera +Date: Fri Apr 27 12:54:39 2012 +0100 + + main: Simplify GtkBuilder usage in prefs + + src/totem-preferences.c | 76 +++++++++++++++++++++++++------------------------ + 1 file changed, 39 insertions(+), 37 deletions(-) + +commit 15ae524d8f7ee82b63b1a85bd2b9343a9dcd5dfc +Author: Bastien Nocera +Date: Fri Apr 27 12:38:19 2012 +0100 + + main: Use new preferences.ui file + + src/totem-preferences.c | 66 ++++++++++++++++++++++++------------------------- + src/totem-private.h | 1 + + src/totem.c | 2 ++ + 3 files changed, 36 insertions(+), 33 deletions(-) + +commit 06dd4b8601ec1e22c7373aedbd4dc763c1b73f63 +Author: Bastien Nocera +Date: Fri Apr 27 12:37:40 2012 +0100 + + data: Split preferences UI into its own file + + data/preferences.ui | 1601 +++++++++++++++++++++++++++++++++++++++++++++++++++ + data/totem.ui | 1584 -------------------------------------------------- + 2 files changed, 1601 insertions(+), 1584 deletions(-) + +commit 0d74961a3d7fff96081998a1bb3ed8b3af1a623d +Author: Bastien Nocera +Date: Fri Apr 27 12:12:16 2012 +0100 + + plugins: Make GtkBuilder files require GTK+ 3.0 + + src/plugins/chapters/chapters-edit.ui | 2 +- + src/plugins/chapters/chapters-list.ui | 2 +- + src/plugins/opensubtitles/opensubtitles.ui | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +commit 70d5dd576f78da2b83456f2c7c0a601254dadd24 +Author: Bastien Nocera +Date: Fri Apr 27 12:11:59 2012 +0100 + + data: Make GtkBuilder files require GTK+ 3.0 + + data/playlist.ui | 2 +- + data/totem.ui | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit b1d647fcda618b44ff94062c8acc99ff2180c1e7 +Author: Bastien Nocera +Date: Thu Apr 26 16:24:55 2012 +0100 + + backend: Switch default user-agent + + src/backend/bacon-video-widget-gst-0.10.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 655ef054aec09cada47e8c811216cef37672394b +Author: Bastien Nocera +Date: Thu Apr 26 16:24:23 2012 +0100 + + browser-plugin: More instance of Totem strings + + In user-visible locations. + + browser-plugin/totemPlugin.cpp | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit f0796f0d4f1a1cf2b12c9bc5149ec96e6d84d87d +Author: Bastien Nocera +Date: Mon Apr 23 18:09:04 2012 +0100 + + backend: Don't use keyframe seeks for inaccurate seeks + + Because we actually want those seeks to be rather quick, but + we don't need them to be frame perfect, so seek without any flags + rather than with GST_SEEK_FLAG_KEY_UNIT. + + See https://bugzilla.gnome.org/show_bug.cgi?id=618746#c8 + for a longer explanation + + src/backend/bacon-video-widget-gst-0.10.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 001b0441452ac9ec54022f6bc0c627883a67f314 +Author: Bastien Nocera +Date: Mon Apr 23 15:10:09 2012 +0100 + + data: Disable visualisations by default + + We'll focus on providing cover art for audio-only files instead, + and just display the totem logo otherwise. + + https://bugzilla.gnome.org/show_bug.cgi?id=651844 + + data/org.gnome.totem.gschema.xml.in.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3a053e2c6b75326853e3956850c3f5412428a9ed +Author: Bastien Nocera +Date: Wed Apr 11 12:45:13 2012 +0100 + + backend: Remove special-handling of icy/icyx schemes + + As they are now handled by the GStreamer source directly. + + https://bugzilla.gnome.org/show_bug.cgi?id=673901 + + src/backend/bacon-video-widget-gst-0.10.c | 10 ---------- + 1 file changed, 10 deletions(-) + +commit 65c83b08732569c619efb6abad3421ab6c37d340 +Author: Bastien Nocera +Date: Fri Apr 20 15:03:57 2012 +0100 + + backend: Split out the subtitle loading + + Split out the subtitle loading from _open() so it can + be handled on-the-fly (without reloading the movie itself). + + https://bugzilla.gnome.org/show_bug.cgi?id=514050 + + browser-plugin/totem-plugin-viewer.c | 3 +- + docs/reference/totem-sections.txt | 1 + + src/backend/bacon-video-widget-gst-0.10.c | 72 +++++++++++++++++++++++++++---- + src/backend/bacon-video-widget.h | 3 +- + src/backend/bvw-test.c | 2 +- + src/totem-object.c | 8 ++-- + 6 files changed, 73 insertions(+), 16 deletions(-) + +commit 211ee6a0567949d314742a30fcb254a3346f51c4 +Author: Bastien Nocera +Date: Mon Apr 23 13:10:35 2012 +0100 + + backend: Reset current time on close + + src/backend/bacon-video-widget-gst-0.10.c | 1 + + 1 file changed, 1 insertion(+) + +commit d3815159d89608ed4ab94b765c1d10882761a978 +Author: Bastien Nocera +Date: Mon Apr 23 13:10:10 2012 +0100 + + backend: Remove dupe call to set playback direction + + src/backend/bacon-video-widget-gst-0.10.c | 3 --- + 1 file changed, 3 deletions(-) + +commit 1b0b434a848e0abe016c0f2191f384d1c961ccb5 +Author: Bastien Nocera +Date: Sun Apr 22 22:45:21 2012 +0100 + + main: Add missing Preferences menu item + + Oops, it disappeared. + + src/totem-menu.c | 16 +++++++++------- + 1 file changed, 9 insertions(+), 7 deletions(-) + +commit e209dd657006809108922415d2bc70d4a1f6bac9 +Author: Bastien Nocera +Date: Sun Apr 22 21:16:44 2012 +0100 + + docs: Remove incomplete and unused API docs + + We don't expect TotemObject to be subclassed, we were missing + docs for new members, and the copy/paste still mentioned TotemPlParser + types. Moved to the private section. + + docs/reference/totem-sections.txt | 2 +- + src/totem.h | 12 ------------ + 2 files changed, 1 insertion(+), 13 deletions(-) + +commit 539add3a974c72f595e7a0f682359181fd7cb3cf +Author: Fran Diéguez +Date: Sun Apr 22 21:15:04 2012 +0200 + + Updated Galician translations + + po/gl.po | 135 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 67 insertions(+), 68 deletions(-) + +commit f80d6b227b57f7b17581bbcae3c4a11cb15ace5f +Author: Yaron Shahrabani +Date: Sun Apr 22 11:16:08 2012 +0300 + + Updated Hebrew translation. + + po/he.po | 1220 +++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 615 insertions(+), 605 deletions(-) + +commit bfdca47128283b64238ca841bb100c3b02ffd6ca +Author: Bastien Nocera +Date: Sun Apr 22 01:15:30 2012 +0100 + + backend: Remove already fixed FIXME + + Visualisation size already takes the screen's size into account. + + https://bugzilla.gnome.org/show_bug.cgi?id=369466 + + src/backend/bacon-video-widget-gst-0.10.c | 1 - + 1 file changed, 1 deletion(-) + +commit 3d0d54fe79858c006990e6e42f16809c7d16c708 +Author: Bastien Nocera +Date: Sat Apr 21 21:43:55 2012 +0100 + + main: Remove unused functions in totem-uri + + src/totem-uri.c | 167 -------------------------------------------------------- + src/totem-uri.h | 1 - + 2 files changed, 168 deletions(-) + +commit ad1cf67b07a1a3ebd6d43aec92996b54d710b80c +Author: Bastien Nocera +Date: Sat Apr 21 21:42:11 2012 +0100 + + plugins: Add autoload-subtitles plugin + + To autoload subtitles the same way we used to. + + https://bugzilla.gnome.org/show_bug.cgi?id=674469 + + configure.in | 3 +- + src/plugins/autoload-subtitles/Makefile.am | 13 + + .../autoload-subtitles.plugin.in | 9 + + .../autoload-subtitles/totem-autoload-subtitles.c | 284 +++++++++++++++++++++ + 4 files changed, 308 insertions(+), 1 deletion(-) + +commit 2575313b45c45332938761ce3780ab01a09e8e5a +Author: Bastien Nocera +Date: Sat Apr 21 21:33:20 2012 +0100 + + main: Use signal to collect subtitle URI location + + Instead of hard-coding this in our core. + + https://bugzilla.gnome.org/show_bug.cgi?id=674469 + + src/totem-object.c | 45 ++++++++++++++++++++++++--------------------- + src/totem-preferences.c | 1 - + src/totem-private.h | 1 - + src/totem.h | 2 ++ + 4 files changed, 26 insertions(+), 23 deletions(-) + +commit 5a4e51b798d19625f7c1e3811cb7fd033d96a475 +Author: Bastien Nocera +Date: Sat Apr 21 21:14:33 2012 +0100 + + backend: Remove mention of #subtitle hack + + As it only ever worked with xine-lib, not with GStreamer. + + src/backend/bacon-video-widget-gst-0.10.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit 7b56db7b8d7dc405a4720b0f10c610a70ce9f68c +Author: Bastien Nocera +Date: Sat Apr 21 21:06:01 2012 +0100 + + plugins: Add apple-trailers plugin + + Add plugin to change Totem's user-agent for the Apple Trailers site. + + https://bugzilla.gnome.org/show_bug.cgi?id=674469 + + configure.in | 3 +- + src/plugins/apple-trailers/Makefile.am | 13 ++++ + .../apple-trailers/apple-trailers.plugin.in | 9 +++ + src/plugins/apple-trailers/totem-apple-trailers.c | 81 ++++++++++++++++++++++ + 4 files changed, 105 insertions(+), 1 deletion(-) + +commit 56b360ecc090dac8403922d1c80e4911f2dc3959 +Author: Bastien Nocera +Date: Sat Apr 21 21:04:28 2012 +0100 + + main: Use a signal to get the user-agent for specific sites + + Instead of hard-coding hacks in the Totem core itself. + + https://bugzilla.gnome.org/show_bug.cgi?id=674469 + + src/totem-object.c | 47 ++++++++++++++++++++++++++++++++++++++------ + src/totem.h | 2 ++ + src/totemobject-marshal.list | 1 + + 3 files changed, 44 insertions(+), 6 deletions(-) + +commit 5e36bb66730abc7cafde4cffef7ea2ec6c2ac9c3 +Author: Bastien Nocera +Date: Sat Apr 21 15:26:32 2012 +0100 + + data: Make git status output clean + + data/Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit e987e0618cbe239e6f7e8b1646985034fdfcbdba +Author: Bastien Nocera +Date: Sat Apr 21 15:23:31 2012 +0100 + + docs: Update for latest additions and removals + + docs/reference/totem-sections.txt | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +commit 04357d01dcbf749ad0256c566916fc2413d29f34 +Author: Bastien Nocera +Date: Sat Apr 21 14:48:05 2012 +0100 + + backend: Merge helper into unique caller + + src/backend/bacon-video-widget-gst-0.10.c | 19 ++++++------------- + 1 file changed, 6 insertions(+), 13 deletions(-) + +commit cbb9f8a556849db0b58125ae976b483879151b0a +Author: Bastien Nocera +Date: Sat Apr 21 14:43:15 2012 +0100 + + backend: Remove bvw != NULL checks + + As BACON_IS_VIDEO_WIDGET (bvw) takes care of that. + + See: + https://bugzilla.gnome.org/show_bug.cgi?id=514050#c15 + + src/backend/bacon-video-widget-gst-0.10.c | 64 +------------------------------ + 1 file changed, 1 insertion(+), 63 deletions(-) + +commit 4b48b7827cf6e98c519a4d561de42f98b8a2d962 +Author: Matej Urbančič +Date: Sat Apr 21 13:10:57 2012 +0200 + + Updated Slovenian translation + + po/sl.po | 904 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 460 insertions(+), 444 deletions(-) + +commit 51e964bf071c0395cce9377b0ccf0451c3a7d64b +Author: Daniel Mustieles +Date: Fri Apr 20 14:30:38 2012 +0200 + + Updated Spanish translation + + po/es.po | 112 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 56 insertions(+), 56 deletions(-) + +commit 9e001a753bcad0947742508a76492f8cdcc8d524 +Author: Bastien Nocera +Date: Fri Apr 20 12:35:01 2012 +0100 + + backend: Nobody wants to know our backend name + + So don't export it. + + src/backend/bacon-video-widget-gst-0.10.c | 14 -------------- + src/backend/bacon-video-widget.h | 2 -- + 2 files changed, 16 deletions(-) + +commit c5a5a1ce89e0d6a170b57e767620e7539b1b12eb +Author: Bastien Nocera +Date: Fri Apr 20 12:34:44 2012 +0100 + + main: Plugins don't care about the backend name + + src/totem-object.c | 15 --------------- + src/totem.h | 1 - + 2 files changed, 16 deletions(-) + +commit 51fdaedf93dd7dfc694cfe882c3e973082ac7291 +Author: Bastien Nocera +Date: Fri Apr 20 12:34:06 2012 +0100 + + main: Remove GStreamer version from about box + + Because it's not a useful debugging tool anyway. + + src/totem-menu.c | 12 +----------- + 1 file changed, 1 insertion(+), 11 deletions(-) + +commit 5eaf018e230f3f0a2bdefc1cf2690cf3ef00b03f +Author: Bastien Nocera +Date: Fri Apr 20 12:33:44 2012 +0100 + + backend: There's no xine backend anymore + + src/backend/bacon-video-widget.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f0dc37258f477933b95c098b4cd45dec9edccb7b +Author: Bastien Nocera +Date: Fri Apr 20 12:32:35 2012 +0100 + + main: Update application name + + It's now Videos, as per design. + + data/totem.ui | 2 +- + src/totem-object.c | 2 +- + src/totem.c | 4 ++-- + 3 files changed, 4 insertions(+), 4 deletions(-) + +commit 148236dd9889bd1732d53d769c624ba077777b9a +Author: Bastien Nocera +Date: Fri Apr 20 12:27:44 2012 +0100 + + data: Update additional binaries field + + data/totem.desktop.in.in.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9dc401b1213aa9fec2f5274d0e6cb8dcefba486f +Author: Bastien Nocera +Date: Fri Apr 20 12:27:32 2012 +0100 + + data: Update totem's Name to match design + + Called "Videos" now, and we don't advertise it being + able to play songs either, there's other applications for that. + + https://bugzilla.gnome.org/show_bug.cgi?id=588974 + + data/totem.desktop.in.in.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 7224032522e95365d57d8940d60d8e22cbe7750f +Author: Cosimo Cecchi +Date: Thu Apr 19 17:06:46 2012 -0400 + + data: split audio and video mime types into two separate arrays + + This is needed for Sushi, since the two groups are handled by two + different viewers. + + https://bugzilla.gnome.org/show_bug.cgi?id=674439 + + data/mime-type-imports.sh | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 335987fc4824bed1ed5b6178b6fcf2e489ee0a11 +Author: Cosimo Cecchi +Date: Thu Apr 19 16:59:16 2012 -0400 + + backend: sync OSD window with g-s-d + + https://bugzilla.gnome.org/show_bug.cgi?id=664916 + + src/backend/gsd-osd-window.c | 258 ++++--------------------------------------- + 1 file changed, 23 insertions(+), 235 deletions(-) + +commit 41f71a0868a13ae4f3e47bd65147322dfea50744 +Author: Bastien Nocera +Date: Thu Apr 19 18:54:05 2012 +0100 + + backend: Handle HTTP proxy for RTSP sources + + https://bugzilla.gnome.org/show_bug.cgi?id=650324 + + src/backend/bacon-video-widget-gst-0.10.c | 113 +++++++++++++++++++++++------- + 1 file changed, 87 insertions(+), 26 deletions(-) + +commit 5dce97ca9b82cd5e512c6af90d4a1d40c6a9b838 +Author: Fran Diéguez +Date: Thu Apr 19 19:15:06 2012 +0200 + + Updated Galician translations + + po/gl.po | 918 ++++++++++++++++++++++++++++++--------------------------------- + 1 file changed, 439 insertions(+), 479 deletions(-) + +commit 4e90fb0c84641fb44077e16f43f2e74efe4e20d8 +Author: Daniel Mustieles +Date: Thu Apr 19 12:27:13 2012 +0200 + + Updated Spanish translation + + po/es.po | 60 ++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 32 insertions(+), 28 deletions(-) + +commit 997ac81bc22501e00ac8ab349a9e4e4a7e0b6e2c +Author: Kjartan Maraas +Date: Wed Apr 18 20:49:21 2012 +0200 + + Updated Norwegian bokmål translation + + po/nb.po | 734 ++++++++++++++++++++++----------------------------------------- + 1 file changed, 257 insertions(+), 477 deletions(-) + +commit fa19695a0b4c46093d18165f4e7d2e980852600a +Author: Bastien Nocera +Date: Wed Apr 18 19:09:40 2012 +0100 + + main: Add an "Add Directory" button to Open dialogue + + https://bugzilla.gnome.org/show_bug.cgi?id=634998 + + src/totem-uri.c | 22 ++++++++++++---------- + 1 file changed, 12 insertions(+), 10 deletions(-) + +commit 833d0b65a4e29c6c76fb0dfac9d0208ea774683d +Author: Bastien Nocera +Date: Wed Apr 18 17:57:21 2012 +0100 + + main: Update TODO item + + src/totem-object.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 883f12cfcb38906b2f36a3638d4062740cea08f2 +Author: Bastien Nocera +Date: Wed Apr 18 17:34:12 2012 +0100 + + main: Make "Esc" give away focus on sidebar button too + + https://bugzilla.gnome.org/show_bug.cgi?id=629252 + + src/totem-sidebar.c | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +commit 1491a764d59aefdc50904f2f28f30be63b43f2c3 +Author: Bastien Nocera +Date: Wed Apr 18 17:01:13 2012 +0100 + + main: Show OSD even when not in fullscreen + + https://bugzilla.gnome.org/show_bug.cgi?id=585003 + + src/totem-object.c | 19 ++++++++----------- + 1 file changed, 8 insertions(+), 11 deletions(-) + +commit dec73a90ca4fe302885dd3c2c5f694df92974b66 +Author: Bastien Nocera +Date: Wed Apr 18 16:54:26 2012 +0100 + + main: Move OSD to the backend + + And use Clutter to draw it. + + src/Makefile.am | 3 - + src/backend/Makefile.am | 7 +- + src/backend/bacon-video-osd-actor.c | 254 ++++++ + src/backend/bacon-video-osd-actor.h | 70 ++ + src/backend/bacon-video-widget-gst-0.10.c | 35 +- + src/backend/bacon-video-widget.h | 4 + + src/backend/gsd-osd-window-private.h | 70 ++ + src/backend/gsd-osd-window.c | 1231 ++++++++++++++++++++++++++++ + src/backend/gsd-osd-window.h | 86 ++ + src/gsd-osd-window-private.h | 67 -- + src/gsd-osd-window.c | 1233 ----------------------------- + src/gsd-osd-window.h | 93 --- + src/totem-fullscreen.c | 37 +- + 13 files changed, 1753 insertions(+), 1437 deletions(-) + +commit efc1377ce399e3ff863107437f64cea275fddc8b +Author: Bastien Nocera +Date: Tue Apr 17 19:28:45 2012 +0100 + + backend: Show the logo first + + src/backend/bacon-video-widget-gst-0.10.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit f6a50593c9f394026826931300cc35e96d2ecd58 +Author: Bastien Nocera +Date: Tue Apr 17 19:27:40 2012 +0100 + + backend: Make test UI use the dark theme + + src/backend/bvw-test.c | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 41a5d24d47d78d9c666b8bb3bc9abd82ceaa7fc1 +Author: Bastien Nocera +Date: Tue Apr 17 19:15:20 2012 +0100 + + backend: Use clutter colour names + + src/backend/bacon-video-widget-gst-0.10.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 09a7b18c3b94abc57fd1f258c2242653b98b04a2 +Author: Bastien Nocera +Date: Tue Apr 17 18:15:48 2012 +0100 + + backend: Update for clutter-gst deprecations + + configure.in | 2 +- + src/backend/bacon-video-widget-gst-0.10.c | 5 +++-- + 2 files changed, 4 insertions(+), 3 deletions(-) + +commit 0e641ae74d4ca8fdf8e3481f140abcdd49e213d7 +Author: Bastien Nocera +Date: Tue Apr 17 17:59:40 2012 +0100 + + backend: Update for clutter deprecations + + src/backend/bacon-video-widget-gst-0.10.c | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +commit 84cf800e6ee01312763682b174c434e002a148f3 +Author: Cheng-Chia Tseng +Date: Wed Apr 18 18:19:51 2012 +0800 + + Updated Traditional Chinese translation(Hong Kong and Taiwan) + + po/zh_HK.po | 807 ++++++++++++++++++++++++++++------------------------------- + po/zh_TW.po | 820 ++++++++++++++++++++++++++++-------------------------------- + 2 files changed, 770 insertions(+), 857 deletions(-) + +commit 84ba37197db1638084a24dd0bbab71a740de624d +Author: Bastien Nocera +Date: Tue Apr 17 17:10:19 2012 +0100 + + data: Only handle video/audio types in Javascript + + So that sushi doesn't try to handle playlist formats. + + data/mime-type-imports.sh | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 1e901a410d78c5fbddea544f9694722012cc346e +Author: Bastien Nocera +Date: Tue Apr 17 16:57:38 2012 +0100 + + data: Update Javascript filename + + data/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit b9a46707e3f1e705110499e286ca1daa8923339e +Author: Bastien Nocera +Date: Tue Apr 17 16:48:09 2012 +0100 + + data: Add script to generate a javascript header + + data/Makefile.am | 4 +++- + data/mime-type-imports.sh | 19 +++++++++++++++++++ + 2 files changed, 22 insertions(+), 1 deletion(-) + +commit a869ef65dd329fd9e4a4896c303fc018b8824c88 +Author: Bastien Nocera +Date: Tue Apr 17 16:41:10 2012 +0100 + + data: Fix comment in generated header + + data/mime-type-include.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit aff4968963426265a9dd8e267f68e3d472150cc5 +Author: Bastien Nocera +Date: Tue Apr 17 15:35:29 2012 +0100 + + main: Update OSD from gnome-settings-daemon + + src/Makefile.am | 3 +- + src/gsd-media-keys-window.c | 710 -------------------------- + src/gsd-media-keys-window.h | 74 --- + src/gsd-osd-window-private.h | 67 +++ + src/gsd-osd-window.c | 1125 ++++++++++++++++++++++++++++++------------ + src/gsd-osd-window.h | 32 +- + src/totem-fullscreen.c | 8 +- + 7 files changed, 885 insertions(+), 1134 deletions(-) + +commit 26b423cf9ee1fa2edb79040cf3e82532f5bd5611 +Author: Bastien Nocera +Date: Mon Apr 16 15:24:56 2012 +0100 + + backend: Correct "logo-mode" property name + + src/backend/bacon-video-widget-gst-0.10.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 494804e8314631dc5a9584fa7d455da773ef6b16 +Author: Bastien Nocera +Date: Mon Apr 16 15:23:10 2012 +0100 + + backend: Put sink related code in correct location + + src/backend/bacon-video-widget-gst-0.10.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit cef3ae1334e1c6cdcb36b13170913632235a0362 +Author: Sasi Bhushan +Date: Tue Apr 17 14:04:56 2012 +0530 + + Updated Telugu Translation + + po/te.po | 896 ++++++++++++++++++++++++++++++--------------------------------- + 1 file changed, 427 insertions(+), 469 deletions(-) + +commit 084e1015681bda1beeab1c5ef9433a754f37daac +Author: Piotr Drąg +Date: Mon Apr 16 21:32:11 2012 +0200 + + Updated Polish translation + + po/pl.po | 55 +++++++++++++++++++++++++++---------------------------- + 1 file changed, 27 insertions(+), 28 deletions(-) + +commit 323467712c9a88693da825c85a1b7c35d327599f +Author: Daniel Mustieles +Date: Mon Apr 16 16:32:33 2012 +0200 + + Updated Spanish translation + + po/es.po | 510 +++++++++++++++++++++++++++++---------------------------------- + 1 file changed, 236 insertions(+), 274 deletions(-) + +commit 3a1fead18a314bed420aa3692e39fbb8e9596889 +Author: Bastien Nocera +Date: Fri Apr 13 16:14:14 2012 +0100 + + build: Error out if some required plugins are missing + + configure.in | 19 +++++++++++++------ + 1 file changed, 13 insertions(+), 6 deletions(-) + +commit e1d657cf96a79e57ab64646d2ec26115434a40e0 +Author: Bastien Nocera +Date: Fri Apr 13 16:10:16 2012 +0100 + + build: Update grilo error message + + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4a54e4bace4a980b6b495f23904026cad61119fd +Author: Bastien Nocera +Date: Sat Apr 7 14:45:37 2012 +0100 + + grilo: Port to grilo 0.2 + + https://bugzilla.gnome.org/show_bug.cgi?id=673592 + + configure.in | 2 +- + src/plugins/grilo/totem-grilo.c | 28 ++++++++++++++++++++++------ + 2 files changed, 23 insertions(+), 7 deletions(-) + +commit c591fa3f5cb8b7eff5bd4651c5f2f055e5ae327a +Author: Bastien Nocera +Date: Fri Apr 13 16:02:07 2012 +0100 + + main: Fix up coding style + + src/totem-time-label.c | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +commit cc2949c4249936173f770805fbb7de70a7804ad4 +Author: Bastien Nocera +Date: Fri Apr 13 12:45:33 2012 +0100 + + playlist: Remove unused function + + src/totem-playlist.c | 34 ---------------------------------- + src/totem-playlist.h | 4 ---- + 2 files changed, 38 deletions(-) + +commit c2fa677f0b2c14787c62a40c95ddd0643904a9d5 +Author: Bastien Nocera +Date: Fri Apr 13 12:27:41 2012 +0100 + + plugins: Remove publish plugin + + The sharing functionality was too restricted (only to other Totem + instances), and the fetching of external playlists should be done + via Grilo instead. + + configure.in | 12 +- + po/POTFILES.in | 4 - + src/plugins/publish/Makefile.am | 31 - + ...g.gnome.totem.plugins.publish.gschema.xml.in.in | 28 - + src/plugins/publish/publish-plugin.glade | 164 ----- + src/plugins/publish/publish-plugin.ui | 111 ---- + src/plugins/publish/publish.convert | 3 - + src/plugins/publish/publish.plugin.in | 8 - + src/plugins/publish/totem-publish.c | 681 --------------------- + 9 files changed, 1 insertion(+), 1041 deletions(-) + +commit 0b508cd3000c09de524427719d063057bd5ce98e +Author: Yaron Shahrabani +Date: Fri Apr 13 00:59:23 2012 +0300 + + Updated Hebrew translation. + + po/he.po | 709 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 353 insertions(+), 356 deletions(-) + +commit ac281cfe0ff73c72a19397c760859ec16bd94fd6 +Author: Bastien Nocera +Date: Wed Apr 11 12:34:41 2012 +0100 + + backend: Remove ->media_device struct member + + As it's now unused. + + https://bugzilla.gnome.org/show_bug.cgi?id=673590 + + src/backend/bacon-video-widget-gst-0.10.c | 19 ------------------- + 1 file changed, 19 deletions(-) + +commit ae0b80f2eb789974c546cb9cf277865de82e1c5f +Author: Bastien Nocera +Date: Wed Apr 11 12:34:21 2012 +0100 + + backend: Remove _get_mrls() helper function + + It's not called anymore. + + https://bugzilla.gnome.org/show_bug.cgi?id=673590 + + docs/reference/totem-sections.txt | 1 - + src/backend/bacon-video-widget-gst-0.10.c | 86 ------------------------------- + src/backend/bacon-video-widget.h | 4 -- + 3 files changed, 91 deletions(-) + +commit 2acbef2c9411bbc984f65d6aad031e80aeab9005 +Author: Bastien Nocera +Date: Thu Apr 5 17:55:27 2012 +0100 + + main: Remove use of totem-disc + + https://bugzilla.gnome.org/show_bug.cgi?id=673590 + + src/totem-object.c | 162 +---------------------------------------------------- + src/totem.h | 7 --- + 2 files changed, 2 insertions(+), 167 deletions(-) + +commit d9fa4d22c9b75ff063f6cf8c0672fcee240efbfe +Author: Bastien Nocera +Date: Thu Apr 5 17:17:41 2012 +0100 + + main: Use grilo to list DVDs and co. + + https://bugzilla.gnome.org/show_bug.cgi?id=673591 + + data/totem.ui | 1 - + src/totem-menu.c | 386 ------------------------------------------------------- + src/totem-menu.h | 2 - + src/totem.c | 1 - + 4 files changed, 390 deletions(-) + +commit c9d112f54731de03ad9346e76be232abf7bc1b96 +Author: Bastien Nocera +Date: Wed Apr 11 14:07:36 2012 +0100 + + backend: Remove unneeded uses of gst_element_get_bus() + + src/backend/bacon-video-widget-gst-0.10.c | 18 +++++------------- + 1 file changed, 5 insertions(+), 13 deletions(-) + +commit 1cc2837529e84401a9e93f33cc0c5eaaac6fec3d +Author: Bastien Nocera +Date: Wed Apr 11 14:02:04 2012 +0100 + + backend: Remove non-PulseAudio sink hacks + + The goal of the original patch was to make Totem's audio output code + not wake up on a regular basis, as the audio device was still opened. + Now that PulseAudio is used pretty much everywhere we care about, remove + that code, and simplify the logic. + + Revert "Only set playbin2 to NULL on errors or after 10 seconds of doing nothing" + + This reverts commit 14b0c9e7ca8472fadf59a77bbb43786ee94b72b1. + + Conflicts: + + src/backend/bacon-video-widget-gst-0.10.c + + src/backend/bacon-video-widget-gst-0.10.c | 40 ++----------------------------- + 1 file changed, 2 insertions(+), 38 deletions(-) + +commit ce3d32f2b1ddfafe27ab6a1f982511b8ccf85e35 +Author: Alexander Saprykin +Date: Tue Apr 10 17:32:53 2012 +0400 + + Show proper names of GStreamer plugins during autoconf + + https://bugzilla.gnome.org/show_bug.cgi?id=673602 + + configure.in | 22 ++++++++++++++++------ + 1 file changed, 16 insertions(+), 6 deletions(-) + +commit b730b1faf830900e58718503aff8b55f0aaddacb +Author: Bastien Nocera +Date: Wed Apr 11 13:07:08 2012 +0100 + + data: Add keywords + + As used in gnome-shell nowadays. + + https://bugzilla.gnome.org/show_bug.cgi?id=673742 + + data/totem.desktop.in.in.in | 1 + + 1 file changed, 1 insertion(+) + +commit 5e0def001ee7afb8baeb14f10d6c8f2c6e75992b +Author: Bastien Nocera +Date: Wed Apr 11 12:33:09 2012 +0100 + + backend: Remove dvd:/vcd: MRL special handling + + Because the backends handle this themselves, and we don't + need to tell them where the media device actually is. + + src/backend/bacon-video-widget-gst-0.10.c | 12 ------------ + 1 file changed, 12 deletions(-) + +commit c276f54d8a5582218957dcb96066b371934c2448 +Author: Carles Ferrando +Date: Tue Apr 10 23:37:30 2012 +0200 + + [l10n]Updated Catalan (Valencian) translation + + po/ca@valencia.po | 670 ++++++++++++++++++++++++++---------------------------- + 1 file changed, 323 insertions(+), 347 deletions(-) + +commit 4723cf20b222f0f24876a3223c2ec30162e4fd08 +Author: Carles Ferrando +Date: Tue Apr 10 23:36:54 2012 +0200 + + [l10n]Updated Catalan (Valencian) translation + + po/ca@valencia.po | 33 +++++++++++++++++---------------- + 1 file changed, 17 insertions(+), 16 deletions(-) + +commit 5a98120d3495fc02f8b3b228a0e7377a564164a3 +Author: Bastien Nocera +Date: Tue Apr 10 19:35:32 2012 +0100 + + backend: Simplify audio/video sink creation + + We already have a failure path for the video sink, and considering + that autoaudiosink already takes care of setting up a "sync" fakesink + for us, in case of audio output failure, there's really nothing for + us to do by hand. + + src/backend/bacon-video-widget-gst-0.10.c | 81 ++----------------------------- + 1 file changed, 5 insertions(+), 76 deletions(-) + +commit 4c2cac01d47d095f62491747c66854ebaa309905 +Author: Bastien Nocera +Date: Tue Apr 10 19:27:02 2012 +0100 + + backend: Clean up audiopitch connection + + src/backend/bacon-video-widget-gst-0.10.c | 44 +++++++++++++++---------------- + 1 file changed, 21 insertions(+), 23 deletions(-) + +commit ad93817e114954dc2884c5f7128c3a43db18c920 +Author: Bastien Nocera +Date: Tue Apr 10 19:18:35 2012 +0100 + + backend: Remove impossible error messages + + We don't use the "Multimedia Systems Selector" so remove + any mention of it in error messages. + + src/backend/bacon-video-widget-gst-0.10.c | 26 ++------------------------ + 1 file changed, 2 insertions(+), 24 deletions(-) + +commit 72d9bf9fff81861f63224ad988f2c094555d351f +Author: Bastien Nocera +Date: Tue Apr 10 18:33:16 2012 +0100 + + backend: Turn helper function into a real helper + + Not a bunch of branches with different paths that weren't helping. + + src/backend/bacon-video-widget-gst-0.10.c | 90 ++++++++++++------------------- + 1 file changed, 34 insertions(+), 56 deletions(-) + +commit 2c39dca3cf4fbe63c1fc86b0a6a56ac6c6d2021d +Author: Bastien Nocera +Date: Tue Apr 10 17:50:38 2012 +0100 + + screensaver: Fix inhibition not working + + Somebody forgot to finish the copy/paste and put a reason for + inhibition. + + src/plugins/screensaver/totem-screensaver.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 040e19bdf98a3fad439ab20fb7145bf495ac85be +Author: Bastien Nocera +Date: Tue Apr 10 17:45:32 2012 +0100 + + main: Fix handling of local DVD directories + + We were hoping that GFile wouldn't touch URIs for which + it didn't handle the URI scheme. This meant that it was mangling + (or escaping things it shouldn't) dvd: URIs. + + Revert "uri: Simplify _get_full_path() code" + + This reverts commit 088cd2cf46f97c1e8a3200b3dfcb20e9f9642ca0. + + src/totem-uri.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 9549188ab6221f845aa1d776270fb62e7f7418a1 +Author: Daniel Mustieles +Date: Sun Apr 8 13:27:18 2012 +0200 + + Updated Spanish translation + + po/es.po | 641 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 316 insertions(+), 325 deletions(-) + +commit 5edea833442719c47e397ab7caaaff4994b9571f +Author: Bastien Nocera +Date: Sat Apr 7 14:45:25 2012 +0100 + + grilo: Fix compile-time warning + + src/plugins/grilo/totem-grilo.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 85dfd9430f06283562bbac6a0be3b6de2a36cf6e +Author: Bastien Nocera +Date: Thu Apr 5 17:35:45 2012 +0100 + + thumbnailer: Fix thumbnailing an archive:/// DVD image + + src/totem-video-thumbnailer.c | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +commit 42bf03207b0b05693c294ca771b3bef0cfbe8140 +Author: Bastien Nocera +Date: Wed Apr 4 15:09:14 2012 +0100 + + main: Fix (unused) argument's type in callback function + + src/totem-menu.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 25a9dbfbaeffb90da685f83e3aa018ca6cb560e9 +Author: Bastien Nocera +Date: Wed Apr 4 15:08:51 2012 +0100 + + main: Remove strings to be translated + + Internal IDs for menu items really don't need to be translated. + + src/totem-menu.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 3922b3aea5d4147b17a19cebe0a8c6a44aebcce2 +Author: Gabor Kelemen +Date: Wed Apr 4 17:03:49 2012 +0200 + + Updated Hungarian translation + + po/hu.po | 438 +++++++++++++++++++++++++++++---------------------------------- + 1 file changed, 203 insertions(+), 235 deletions(-) + +commit 4265403bfeff51f5087e05ca9ac61e08a3631f3b +Author: Bastien Nocera +Date: Thu Mar 29 17:08:28 2012 +0200 + + main: Fix some whitespace errors + + src/totem-menu.c | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +commit 9a8502cbe9050309c523e5eeafe0ad9053a2a0ea +Author: Bastien Nocera +Date: Tue Apr 3 19:02:14 2012 +0100 + + main: Fix kbd shortcuts when using ModeSwitch - If we had opened a file, got a remembered position to restore, - but never actually got a change in the seekable property, we wouldn't - have clear the seek to position. + We shouldn't pass keys to GTK+ if ISO_Level3_Shift or Mode_switch + is enabled. + + src/totem-object.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit a6ee6045edbe8d31d7be69a88c69bfe07c899578 +Author: Bastien Nocera +Date: Tue Apr 3 19:01:52 2012 +0100 + + main: Remove disabled code + + src/totem-object.c | 2 -- + 1 file changed, 2 deletions(-) + +commit 0c6958b23aaf2379b4749c0ca643b818be25bea6 +Author: Bastien Nocera +Date: Thu Mar 29 18:25:11 2012 +0200 + + main: Move application-wide menu items to app menu - This should fix bizarre behaviour if you're skipping between streams - too quickly for GStreamer to see the stream is seekable. + Using GActionEntry - https://bugzilla.gnome.org/show_bug.cgi?id=676434 + https://bugzilla.gnome.org/show_bug.cgi?id=673098 - src/totem-object.c | 3 +++ - 1 file changed, 3 insertions(+) + data/totem.ui | 116 ++++++++++++++++++---------------------------- + src/totem-menu.c | 134 ++++++++++++++++++++++++++++++++++++++--------------- + src/totem-menu.h | 2 + + src/totem-object.c | 70 ++++++++++++---------------- + src/totem.c | 5 ++ + 5 files changed, 179 insertions(+), 148 deletions(-) -commit a060948183552d86ec788a5fc300b1b482c4fe47 +commit bacf03c97466946904327c83546c59a82af9fd65 Author: Bastien Nocera -Date: Thu Jun 28 16:30:12 2012 +0100 +Date: Mon Apr 2 15:39:44 2012 +0100 - main: Handle smooth scroll events + browser-plugin: Disable autoplay for the Vegas plugin - And restrict ourselves to handling smooth events on the left side - of the pane, stopping us from capturing scroll events meant for scroll - window, such as the playlist. + https://bugzilla.gnome.org/show_bug.cgi?id=673209 + + browser-plugin/totemPlugin.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +commit ade302441c96be16c7e2d3e170b5c87d1fd38e82 +Author: Bastien Nocera +Date: Mon Apr 2 15:19:09 2012 +0100 + + main: Update copyright for GdkFullscreenFilter + + src/gd-fullscreen-filter.c | 18 +++++++++--------- + src/gd-fullscreen-filter.h | 16 ++++++++-------- + 2 files changed, 17 insertions(+), 17 deletions(-) + +commit b1f5b47b7334233e07292746db82c291fcc7fcdf +Author: Arash Mousavi +Date: Sat Mar 31 16:57:44 2012 +0430 + + Updated Persian Translations + + po/fa.po | 1415 +++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 696 insertions(+), 719 deletions(-) + +commit 246e7684f1a8adfb68e01c4991d59efd11331e3c +Author: Shixin Zeng +Date: Sat Feb 21 02:10:45 2009 -0600 + + main: comment out set_resource_limits on non-Unix - https://bugzilla.gnome.org/show_bug.cgi?id=674355 + https://bugzilla.gnome.org/show_bug.cgi?id=342926 - data/totem.ui | 2 +- - src/totem-object.c | 23 ++++++++++++++++------- - 2 files changed, 17 insertions(+), 8 deletions(-) + src/totem-resources.c | 7 +++++++ + 1 file changed, 7 insertions(+) -commit c647ed22f4daabee7868121174203e22907f7cc1 -Author: Gwenole Beauchesne -Date: Mon Jun 25 17:48:51 2012 +0200 +commit 86c2dfa75c032fd21a3a6024aec00c6bf5a7b8ee +Author: Bastien Nocera +Date: Thu Mar 29 16:03:29 2012 +0200 - backend: fix out-of-source build. + backend: Another guard against X11 calls + + src/backend/bacon-video-widget-gst-missing-plugins.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +commit 806d6e673fe1ee4f89c57998fbfc7668570dff8e +Author: Bastien Nocera +Date: Thu Mar 29 15:21:12 2012 +0200 + + main: Remove calls to gtk_main_iteration() - bacon-video-widget-enums.h is generated into the $(top_builddir)/src/backend - directory. + A good way to break things (like hang with multiple windows opened + when launched a bit too quickly because we didn't say we were done + setting up the first window) + + https://bugzilla.gnome.org/show_bug.cgi?id=663501 - src/Makefile.am | 1 + - src/backend/Makefile.am | 1 + - 2 files changed, 2 insertions(+) + src/totem-playlist.c | 2 -- + src/totem.c | 11 +---------- + 2 files changed, 1 insertion(+), 12 deletions(-) -commit 579bc9a8900a1cab38c1eb251c4fd8d2e5d3b146 -Author: Gwenole Beauchesne -Date: Mon Jun 25 17:42:10 2012 +0200 +commit 225ae24bc171b1c85d9d660d16e9839ef88597c9 +Author: Bastien Nocera +Date: Thu Mar 29 14:42:59 2012 +0200 - backend: fix incorrect property ID (referrer). + backend: Remove outdated API doc + + src/backend/bacon-video-widget-gst-0.10.c | 3 --- + 1 file changed, 3 deletions(-) + +commit e969eff422fcae809e5233e5eed9266ac5444918 +Author: Bastien Nocera +Date: Thu Mar 29 14:41:25 2012 +0200 + + backend: Use GInitable - Fix typo in PROP_REFERRER name. + https://bugzilla.gnome.org/show_bug.cgi?id=600113 + + src/backend/bacon-video-widget-gst-0.10.c | 91 ++++++++++++++++++------------- + 1 file changed, 52 insertions(+), 39 deletions(-) + +commit b964da38bab59616ca255b5c2044185eea5fce73 +Author: Philip Withnall +Date: Thu Mar 29 11:30:09 2012 +0100 + + backend: Fix some small leaks in the proxy handling code + + src/backend/bacon-video-widget-gst-0.10.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit a683fc045debe3c0205a7e703b48c4c0f84a4fea +Author: Philip Withnall +Date: Thu Mar 29 11:29:35 2012 +0100 + + backend: Handle GDesktopProxyMode in a switch - https://bugzilla.gnome.org/show_bug.cgi?id=678796 + So that gcc will warn of new unhandled values in future. - src/backend/bacon-video-widget-gst-0.10.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + src/backend/bacon-video-widget-gst-0.10.c | 16 +++++++++++----- + 1 file changed, 11 insertions(+), 5 deletions(-) -commit a824982d08d2f82f2b40918efaf355471cd5f35a +commit 07ec4f18ac677e450eea82d3ee80a04271b6cfa3 Author: Bastien Nocera -Date: Wed Jun 20 21:24:13 2012 +0100 +Date: Thu Mar 29 11:47:46 2012 +0200 - thumbnailer: Exit as soon as we have an error + Revert "main: Add guards for XInitThreads() calls" - Rather than waiting for the thumbnailer to timeout. + This reverts commit 26a564c99a4dd414ee4014e524e371188769a4e6. + + We can't optionally call XInitThreads(). We need to call it before + making any single call to X11 API, which GTK+ would already have + done if we had a display opened. As it doesn't actually require + X11, just the library to setup the locking, let it do that. - src/totem-video-thumbnailer.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + src/backend/bvw-test.c | 7 +------ + src/totem.c | 8 +------- + 2 files changed, 2 insertions(+), 13 deletions(-) -commit 084edce84d8bfd2c2157adf501d47a97cf553d1e +commit a2eb14d15e3fa650a43cdfda4ddde03170a2934c Author: Bastien Nocera -Date: Thu Jun 21 11:10:07 2012 +0100 +Date: Thu Mar 29 11:41:19 2012 +0200 - thumbnailer: Fix error message mentioning audio preview + playlist: Remove trailing whitespace - src/totem-video-thumbnailer.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + src/totem-playlist.c | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) -commit 1656a3439c06bbec6e0e36110fef67bba1120bc8 +commit da365fae376407e375b4152f8cdb096f8505e5a3 Author: Bastien Nocera -Date: Fri Jun 22 18:58:58 2012 +0100 +Date: Thu Mar 29 11:40:53 2012 +0200 - backend: Fix incorrect property_id usage + main: Don't present totem unless asked for - Referer was using the user-agent property ID + https://bugzilla.gnome.org/show_bug.cgi?id=664492 - src/backend/bacon-video-widget-gst-0.10.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + src/totem-object.c | 2 +- + src/totem.c | 2 -- + 2 files changed, 1 insertion(+), 3 deletions(-) -commit 7b9058a358804474aacb4ceecc8cbdb92c3572b7 -Author: Pavel Vasin -Date: Fri Jun 8 15:43:36 2012 +0400 +commit c37012a103c72710b2cbb142e7b10ce75c58fb74 +Author: Kjartan Maraas +Date: Thu Mar 29 10:09:42 2012 +0200 - browser-plugin: fix memory leak in NP_GetMIMEDescription + Updated Norwegian bokmål translation - browser-plugin/totemPluginGlue.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + po/nb.po | 1477 +++++++++++++++++++++++++++++--------------------------------- + 1 file changed, 682 insertions(+), 795 deletions(-) -commit 106b8dcb87ad3ec8fab4ca7865b1c01bd2aa7f29 +commit 6a805614690e29f516dbb8e606dc7890d494ce59 Author: Bastien Nocera -Date: Fri May 25 14:34:04 2012 +0100 +Date: Thu Mar 29 04:17:44 2012 +0200 - main: Fix sidebar related warnings on startup + brasero: Add guards around X11 specific code + + src/plugins/brasero-disc-recorder/totem-disc-recorder.c | 17 ++++++++++++----- + 1 file changed, 12 insertions(+), 5 deletions(-) + +commit 7da72628680b9a64f7a6918975a49991e83315cc +Author: Bastien Nocera +Date: Thu Mar 29 04:11:03 2012 +0200 + + main: Add guards around GtkPlug parenting hack + + src/totem-interface.c | 18 ++++++++++++++---- + 1 file changed, 14 insertions(+), 4 deletions(-) + +commit 26a564c99a4dd414ee4014e524e371188769a4e6 +Author: Bastien Nocera +Date: Thu Mar 29 04:10:14 2012 +0200 + + main: Add guards for XInitThreads() calls + + src/backend/bvw-test.c | 7 ++++++- + src/totem.c | 7 ++++++- + 2 files changed, 12 insertions(+), 2 deletions(-) + +commit 5d58e383a06bc4cb79e2d6a35b03af286f1823a5 +Author: Bastien Nocera +Date: Thu Mar 29 04:00:05 2012 +0200 + + main: Remove unused includes + + src/totem-object.c | 6 ------ + 1 file changed, 6 deletions(-) + +commit 430037da6527c1730fea9d16c9cf0e6e79a8a420 +Author: Bastien Nocera +Date: Thu Mar 29 03:53:37 2012 +0200 + + screenshot: Remove requirement on X11 for Save key - When the last used sidebar was from a plugin, we would try - and set it before the plugins were loaded. + Helps with: + https://bugzilla.gnome.org/show_bug.cgi?id=672735 - src/totem-object.c | 2 +- - src/totem-sidebar.c | 7 +------ - src/totem-sidebar.h | 3 +-- - 3 files changed, 3 insertions(+), 9 deletions(-) + configure.in | 21 --------------------- + src/plugins/screenshot/totem-screenshot-plugin.c | 8 +------- + 2 files changed, 1 insertion(+), 28 deletions(-) -commit 3577fbcf4e08e38fe592e69f279d7973fadfc901 +commit 8d95c56a3cfc3e1ef3d9b4ae1fbe699b8908148d Author: Bastien Nocera -Date: Tue May 15 14:47:06 2012 +0100 +Date: Thu Mar 29 03:50:03 2012 +0200 - 3.4.2 + build: We don't need XTest anymore + + As the code using it (screensaver inhibit) has been replaced. + + Helps with: + https://bugzilla.gnome.org/show_bug.cgi?id=672735 - NEWS | 5 +++++ - configure.in | 2 +- - 2 files changed, 6 insertions(+), 1 deletion(-) + browser-plugin/Makefile.am | 1 - + configure.in | 17 ----------------- + src/backend/Makefile.am | 3 +-- + 3 files changed, 1 insertion(+), 20 deletions(-) -commit 7b212b5f6a985c29d9f1a641c215a0cec8fe5175 -Author: Kjartan Maraas -Date: Mon Apr 30 13:03:13 2012 +0200 +commit 6b78ea01920f4a8b9f17020ddc77e5c37c6de736 +Author: Bastien Nocera +Date: Thu Mar 29 03:01:57 2012 +0200 - Updated Norwegian bokmål translation + backend: Fix up coding style in header - po/nb.po | 23 +++++++++++------------ - 1 file changed, 11 insertions(+), 12 deletions(-) + src/backend/bacon-video-widget.h | 13 ++++++------- + 1 file changed, 6 insertions(+), 7 deletions(-) -commit e4803c19afddb68f39f90dd251e5fc8fabc711da -Author: Piotr Drąg -Date: Sun Apr 29 23:00:10 2012 +0200 +commit 135a476948343f0bce7ce3f6af2919a6696e28ed +Author: Vasilis Liaskovitis +Date: Wed Mar 14 22:18:30 2012 +0100 - Updated Polish translation + backend: Implement variable playback rate with pitch adjustment + + https://bugzilla.gnome.org/show_bug.cgi?id=417141 - po/pl.po | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + configure.in | 15 ++++++ + src/backend/bacon-video-widget-gst-0.10.c | 87 +++++++++++++++++++++++++++++-- + src/backend/bacon-video-widget.h | 8 +++ + 3 files changed, 107 insertions(+), 3 deletions(-) -commit d4657a7679e53c6e9ff42d07cbf2cd7c66b46397 +commit 8aa70d5b8e019552271d528e849d68891a029969 Author: Bastien Nocera -Date: Wed Apr 18 17:34:12 2012 +0100 +Date: Thu Mar 29 02:38:42 2012 +0200 - main: Make "Esc" give away focus on sidebar button too + backend: Add proxy support - https://bugzilla.gnome.org/show_bug.cgi?id=629252 + https://bugzilla.gnome.org/show_bug.cgi?id=395429 - src/totem-sidebar.c | 11 +++++++---- - 1 file changed, 7 insertions(+), 4 deletions(-) + configure.in | 2 +- + src/backend/bacon-video-widget-gst-0.10.c | 68 +++++++++++++++++++++++++++++++ + 2 files changed, 69 insertions(+), 1 deletion(-) -commit d4cebbeb0a96be3c37a7c1e4faacd0e3a8b7532a -Author: Piotr Drąg -Date: Mon Apr 16 21:32:11 2012 +0200 +commit 6299d99a05f14d1454766e2f5983f34e83bdf988 +Author: Bastien Nocera +Date: Thu Mar 29 01:29:13 2012 +0200 - Updated Polish translation + main: Handle relative paths to a local instance + + https://bugzilla.gnome.org/show_bug.cgi?id=643807 - po/pl.po | 55 +++++++++++++++++++++++++++---------------------------- - 1 file changed, 27 insertions(+), 28 deletions(-) + src/totem-object.c | 21 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) -commit 0210ff462113041079e8c762cccb1cd675544ec9 -Author: Philip Withnall -Date: Mon Apr 16 16:27:05 2012 +0100 +commit 088cd2cf46f97c1e8a3200b3dfcb20e9f9642ca0 +Author: Bastien Nocera +Date: Thu Mar 29 01:09:38 2012 +0200 - 3.4.1 + uri: Simplify _get_full_path() code - NEWS | 5 +++++ - configure.in | 2 +- - 2 files changed, 6 insertions(+), 1 deletion(-) + src/totem-uri.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) -commit 5879df2414a7c6b7da5f74c6745542e690e54ef9 -Author: Carles Ferrando -Date: Tue Apr 10 23:36:54 2012 +0200 +commit afc74459dc3b92bdf5e441303c719a9b07490707 +Author: Bastien Nocera +Date: Thu Mar 29 00:45:05 2012 +0200 - [l10n]Updated Catalan (Valencian) translation + main: Fix leak handling the local command-line - po/ca@valencia.po | 33 +++++++++++++++++---------------- - 1 file changed, 17 insertions(+), 16 deletions(-) + src/totem-object.c | 3 +++ + 1 file changed, 3 insertions(+) -commit dd851682b896d9eee44c42611f4189da09511fa2 -Author: Jordi Serratosa -Date: Tue Apr 10 23:36:48 2012 +0200 +commit 4b78319a380052e297f7f8cc82d82c024568aac4 +Author: Bastien Nocera +Date: Wed Mar 28 17:09:54 2012 +0200 - [l10n] Fixes on Catalan translation + lib: Remove obsolete screensaver inhibition code - po/ca.po | 57 +++++++++++++++++++++++++++++---------------------------- - 1 file changed, 29 insertions(+), 28 deletions(-) + Makefile.am | 2 +- + configure.in | 1 - + lib/Makefile.am | 19 -- + lib/totem-scrsaver.c | 543 --------------------------------------------------- + lib/totem-scrsaver.h | 57 ------ + 5 files changed, 1 insertion(+), 621 deletions(-) -commit a25965b9a2d9b9449074e496b3df13c1bd5e6c6f -Author: Chandan Kumar -Date: Sun Apr 8 19:48:15 2012 +0530 +commit 219eaf4d5ba4f2c76fcb6db6161e1497b0ffe62e +Author: Bastien Nocera +Date: Wed Mar 28 17:07:32 2012 +0200 - Updated HINDI translation + browser-plugin: Use gtk_application_inhibit() + + To inhibit the screensaver when playing. - po/hi.po | 1256 +++++++++++++++++++++++++++++--------------------------------- - 1 file changed, 587 insertions(+), 669 deletions(-) + browser-plugin/Makefile.am | 2 -- + browser-plugin/totem-plugin-viewer.c | 25 +++++++++++++++---------- + 2 files changed, 15 insertions(+), 12 deletions(-) -commit b3745b983ecc66857ba744ec854765faa1810db9 -Author: Gabor Kelemen -Date: Wed Apr 4 17:03:49 2012 +0200 +commit 5ee79dfe8ece045cfad19ea3f41a70a800ad5e12 +Author: Bastien Nocera +Date: Wed Mar 28 17:03:21 2012 +0200 - Updated Hungarian translation + browser-plugin: Turn into a GtkApplication - po/hu.po | 438 +++++++++++++++++++++++++++++--------------------------------- - 1 file changed, 203 insertions(+), 235 deletions(-) + browser-plugin/totem-plugin-viewer.c | 15 ++++++++++----- + 1 file changed, 10 insertions(+), 5 deletions(-) -commit 171012dcfd18ce8a756d1d42fc8ba9e807ea4577 +commit 1c9970511b8691012b284a5ae02190f4405e332c Author: Bastien Nocera -Date: Tue Apr 3 19:02:14 2012 +0100 +Date: Wed Mar 28 16:55:07 2012 +0200 - main: Fix kbd shortcuts when using ModeSwitch + screensaver: Use gtk_application_inhibit() - We shouldn't pass keys to GTK+ if ISO_Level3_Shift or Mode_switch - is enabled. + Instead of our custom screensaver inhibition code. - src/totem-object.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) + src/plugins/screensaver/Makefile.am | 13 ++------ + src/plugins/screensaver/totem-screensaver.c | 46 +++++++++++++++-------------- + 2 files changed, 27 insertions(+), 32 deletions(-) -commit 9eec69b34c2f255cb4df9d3ae60e0e1dbe984e62 -Author: Arash Mousavi -Date: Sat Mar 31 16:58:27 2012 +0430 +commit 228461c1d21389c78c1c80b16ddd70387b3e870f +Author: Bastien Nocera +Date: Wed Mar 28 16:31:30 2012 +0200 - Updated Persian Translations + main: Handle the --help option locally + + Instead of the remote instance. Launching --help would + print the help from the server instance, and exit it, instead + of doing so in the local instance. + + https://bugzilla.gnome.org/show_bug.cgi?id=669326 - po/fa.po | 1415 +++++++++++++++++++++++++++++++------------------------------- - 1 file changed, 696 insertions(+), 719 deletions(-) + src/totem-object.c | 37 +++++++++++++++++++++++++++++++++++++ + src/totem-options.c | 25 +++++++++++++++++++++++++ + src/totem-options.h | 1 + + src/totem.c | 23 ++--------------------- + 4 files changed, 65 insertions(+), 21 deletions(-) -commit 2aa94499feca9e6f6dcc6383e98dfe6fcd3e7179 -Author: Andika Triwidada -Date: Thu Mar 29 21:52:36 2012 +0700 +commit f9b2dd9884c7d29a44c1adcbf8113446c32e8433 +Author: Bastien Nocera +Date: Wed Mar 28 15:27:19 2012 +0200 - [l10n] Updated Indonesian translation + main: Make TotemObject a GtkApplication + + To make it possible for us to handle the local command-line first. - po/id.po | 1556 ++++++++++++++++++++++++++++---------------------------------- - 1 file changed, 689 insertions(+), 867 deletions(-) + src/totem-object.c | 4 +--- + src/totem-private.h | 3 +-- + src/totem.c | 14 ++++++++------ + src/totem.h | 2 +- + 4 files changed, 11 insertions(+), 12 deletions(-) -commit b34f7a9f73a794657f7c525102ed5ed174063942 -Author: Kjartan Maraas -Date: Thu Mar 29 10:09:42 2012 +0200 +commit 2d2cd99e3e467ce3621de1fa997c12ddcd072a28 +Author: Bastien Nocera +Date: Wed Mar 28 14:56:09 2012 +0200 - Updated Norwegian bokmål translation + main: Process early options + + Seems that we forgot to do that for a while - po/nb.po | 1477 +++++++++++++++++++++++++++++--------------------------------- - 1 file changed, 682 insertions(+), 795 deletions(-) + src/totem.c | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) -commit ba514cc256a3073d620ab363cce2e64d448e2e58 +commit 59cbe758090c1ddbd8320dc17e47380eabe926f8 +Author: Bastien Nocera +Date: Wed Mar 28 14:54:10 2012 +0200 + + backend: Remove unused GDK threading init + + src/backend/bvw-test.c | 1 - + 1 file changed, 1 deletion(-) + +commit 1a0e860a122a26394016241f7d6b5e8c79beb51d +Author: Bastien Nocera +Date: Wed Mar 28 14:50:12 2012 +0200 + + main: Update glib requirements + + Now that 2.32 is released + + browser-plugin/totem-plugin-viewer.c | 4 ---- + configure.in | 2 +- + src/backend/bacon-video-widget-gst-0.10.c | 33 +------------------------------ + src/backend/bvw-test.c | 3 --- + src/test-properties-page.c | 3 --- + src/totem-audio-preview.c | 4 ---- + src/totem-object.c | 5 ----- + src/totem-resources.c | 4 ---- + src/totem-video-thumbnailer.c | 4 ---- + src/totem.c | 3 --- + 10 files changed, 2 insertions(+), 63 deletions(-) + +commit 401d165a7746dafb3943ee90a386050dab68111f Author: Bastien Nocera Date: Wed Mar 28 14:01:10 2012 +0200 @@ -271,16 +4704,41 @@ https://bugzilla.gnome.org/show_bug.cgi?id=669327 - src/totem.c | 3 +++ + src/totem.c | 3 +++ 1 file changed, 3 insertions(+) +commit b443b96be9d9308c13f6999a3404b6c6331cdc0a +Author: Bastien Nocera +Date: Wed Mar 28 12:22:39 2012 +0200 + + player: Use GdFullscreenFilter to simplify popups + + This fixes the case where we couldn't get the popups to show + up in fullscreen in some cases. + + data/fullscreen.ui | 4 -- + src/Makefile.am | 2 + + src/gd-fullscreen-filter.c | 132 +++++++++++++++++++++++++++++++++++++++++++++ + src/gd-fullscreen-filter.h | 75 ++++++++++++++++++++++++++ + src/totem-fullscreen.c | 56 +++++++++---------- + 5 files changed, 233 insertions(+), 36 deletions(-) + +commit a652150581f3474d85a114992cd3e71478d70ca6 +Author: Bastien Nocera +Date: Wed Mar 28 01:24:33 2012 +0200 + + main: Hide the titlebar when maximised + + src/totem.c | 1 + + 1 file changed, 1 insertion(+) + commit b95d619c46f2fc0d3165627dd3ed5949fbc1e114 Author: Reşat SABIQ Date: Wed Mar 28 00:52:30 2012 -0500 Updated Crimean Tatar (Crimean Turkish) translation - po/crh.po | 20 ++++++++++++++++---- + po/crh.po | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) commit 13c79bbff16c4eceece1d425a4c9fc3143f3637b @@ -298,8 +4756,8 @@ 3.4.0 - NEWS | 5 +++++ - configure.in | 4 ++-- + NEWS | 5 +++++ + configure.in | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) commit 3157178b05f35fce264b1b8aea8daeabb0af12d6 @@ -308,7 +4766,7 @@ i18n: Update British English translation - po/en_GB.po | 396 ++++++++++++++++++++++++++++------------------------------- + po/en_GB.po | 396 +++++++++++++++++++++++++++++------------------------------- 1 file changed, 188 insertions(+), 208 deletions(-) commit c11b6cddcc4fbb6fc011d8ea91ce47a9f91f3efd @@ -340,7 +4798,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=672774 - src/totem-object.c | 2 +- + src/totem-object.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit ce84a121a4a738b52e56e9793e2e8fd1b7ff0f71 @@ -351,8 +4809,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=671303 - src/backend/bacon-video-widget-gst-0.10.c | 3 ++- - src/totem.c | 5 +++++ + src/backend/bacon-video-widget-gst-0.10.c | 3 ++- + src/totem.c | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) commit 1c9e487c0fc8837f27552a2c6a3b60e8be0d5d5b @@ -388,7 +4846,7 @@ Updated Danish translation - po/da.po | 387 +++++++++++++++++++++++++++++--------------------------------- + po/da.po | 387 ++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 183 insertions(+), 204 deletions(-) commit 4958b79b1a4670abbc446bb8cf88847fbaf32adb @@ -425,8 +4883,8 @@ Updated Traditional Chinese translation(Hong Kong and Taiwan) - po/zh_HK.po | 381 ++++++++++++++++++++++++++++------------------------------- - po/zh_TW.po | 381 ++++++++++++++++++++++++++++------------------------------- + po/zh_HK.po | 381 ++++++++++++++++++++++++++++-------------------------------- + po/zh_TW.po | 381 ++++++++++++++++++++++++++++-------------------------------- 2 files changed, 360 insertions(+), 402 deletions(-) commit 4803505c37d5bd7855691d5b440e21c7a8d9ab6f @@ -435,7 +4893,7 @@ Updated Belarusian translation. - po/be.po | 33 +++++++++++++++++++++++---------- + po/be.po | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) commit 64aacbd89344e1538a3b10b83542e2be443658e1 @@ -462,7 +4920,7 @@ Updated Hebrew translation. - po/he.po | 926 ++++++++++++++++++++++++++++---------------------------------- + po/he.po | 926 ++++++++++++++++++++++++++++----------------------------------- 1 file changed, 418 insertions(+), 508 deletions(-) commit a442da93d972ae58485541a9ef36a74bd23e2535 @@ -552,7 +5010,7 @@ Updated German translation - po/de.po | 25 ++++++++++++++----------- + po/de.po | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) commit 879b0ab3f13d3f0219ab8f5508152a28e9103cf7 @@ -642,9 +5100,9 @@ Fix Bug 672616. Mark messages as translatable. - po/POTFILES.in | 1 + - src/plugins/chapters/totem-edit-chapter.c | 3 ++- - src/plugins/grilo/grilo.ui | 4 ++-- + po/POTFILES.in | 1 + + src/plugins/chapters/totem-edit-chapter.c | 3 ++- + src/plugins/grilo/grilo.ui | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) commit a912d50a0ab3bf0e426320d68b8f20e5fe350a06 @@ -662,8 +5120,8 @@ 3.3.92 - NEWS | 3 +++ - configure.in | 2 +- + NEWS | 3 +++ + configure.in | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) commit 2525fa4016d44c955afc458bb2915c616b0e359c @@ -681,7 +5139,7 @@ Updated Vietnamese translation - po/vi.po | 56 +++++++++++++++++++++++--------------------------------- + po/vi.po | 56 +++++++++++++++++++++++--------------------------------- 1 file changed, 23 insertions(+), 33 deletions(-) commit d00750d4775fc45b712ee90fa948699482c62603 @@ -699,7 +5157,7 @@ [l10n] Updated Estonian translation - po/et.po | 40 ++++++++++++++++++++-------------------- + po/et.po | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) commit e57d75f555eaad98ec3eee31cf94336ba885174c @@ -711,7 +5169,7 @@ Various plugins require introspection to be enabled or they will not build. - configure.in | 9 +++++++++ + configure.in | 9 +++++++++ 1 file changed, 9 insertions(+) commit 2f560894b03871d6b6117476a768757711c9fff1 @@ -738,8 +5196,8 @@ 3.3.90 - NEWS | 8 ++++++++ - configure.in | 2 +- + NEWS | 8 ++++++++ + configure.in | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) commit 03090299fb9424c8d8092666c2741fc1467557fd @@ -750,7 +5208,7 @@ Rather than the GIR bindings - src/plugins/sample-vala/Makefile.am | 2 +- + src/plugins/sample-vala/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 794e24bdbf4c977775bfa19ec0a0ecbe81819f55 @@ -761,7 +5219,7 @@ See also https://bugzilla.gnome.org/show_bug.cgi?id=667751 - src/plugins/rotation/Makefile.am | 2 +- + src/plugins/rotation/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 7321026e1cc136e1ebfd9415448cf57716774803 @@ -792,11 +5250,11 @@ https://bugzilla.gnome.org/show_bug.cgi?id=662919 - data/mime-type-include.sh | 4 ++++ - data/uri-scheme-include.sh | 1 + - src/totem-audio-preview.c | 2 +- - src/totem-properties-main.c | 2 +- - src/totem-uri.c | 6 +++--- + data/mime-type-include.sh | 4 ++++ + data/uri-scheme-include.sh | 1 + + src/totem-audio-preview.c | 2 +- + src/totem-properties-main.c | 2 +- + src/totem-uri.c | 6 +++--- 5 files changed, 10 insertions(+), 5 deletions(-) commit af8575b2c9320f4c55b2837b7f43f603acb4c10e @@ -814,7 +5272,7 @@ Updated Norwegian bokmål translation - po/nb.po | 6 +++--- + po/nb.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 6567fe5392cfd08caa7d342dc427c9ffe070b8f1 @@ -823,7 +5281,7 @@ Updated Esperanto translation - po/eo.po | 45 +++++++++++++++++++++++++++++---------------- + po/eo.po | 45 +++++++++++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 16 deletions(-) commit 96f398c0a4c80610b96c41624d9215fe9eb48a62 @@ -836,7 +5294,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=660210 - data/mime-type-list.txt | 1 + + data/mime-type-list.txt | 1 + 1 file changed, 1 insertion(+) commit 31ed4dc5a629f4e64dac4ae77a821d9511665b9b @@ -845,7 +5303,7 @@ thumbnailer: Quiet down - src/totem-video-thumbnailer.c | 2 +- + src/totem-video-thumbnailer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 54847e615c8ab545888a93fa72db108c2afff9d4 @@ -854,7 +5312,7 @@ Updated Bulgarian translation - po/bg.po | 385 ++++++++++++++++++++++++++++---------------------------------- + po/bg.po | 385 +++++++++++++++++++++++++++++---------------------------------- 1 file changed, 176 insertions(+), 209 deletions(-) commit 851cf743cb96d8b39c39480eaff8bfa1002b0282 @@ -872,7 +5330,7 @@ [l10n] Updated German translation - po/de.po | 604 +++++++++++++++++++++++++++++--------------------------------- + po/de.po | 604 ++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 284 insertions(+), 320 deletions(-) commit 310787704511438f7744213600314f55b158a636 @@ -881,7 +5339,7 @@ Updated Galician translations - help/gl/gl.po | 51 ++++++++++++++++++++++++++++++++++++++++++++++----- + help/gl/gl.po | 51 ++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 46 insertions(+), 5 deletions(-) commit 8ef36a2c74f1b9e614b7f94b8a53d4190c3bbebd @@ -890,7 +5348,7 @@ backend: Also direct seek on trash files - src/backend/bacon-video-widget-gst-0.10.c | 3 ++- + src/backend/bacon-video-widget-gst-0.10.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit cd0ca96e9f40bfebd96b65c7abacc931d786fc44 @@ -901,7 +5359,7 @@ Signed-off-by: Milo Casagrande - help/it/it.po | 2 +- + help/it/it.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit bbb45d05707e700f7ba2922340aba95ca64a5ac1 @@ -915,7 +5373,7 @@ Revert 667983c595f640e358a6e465c6fe879e4c7fbc85 - src/totem-uri.c | 7 ++++--- + src/totem-uri.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) commit afaa51d7f0af6094937c9f49217d492158fca5db @@ -933,8 +5391,8 @@ backend: Use GDK provided work area code - configure.in | 2 +- - src/backend/video-utils.c | 164 +++------------------------------------------ + configure.in | 2 +- + src/backend/video-utils.c | 164 +++------------------------------------------- 2 files changed, 9 insertions(+), 157 deletions(-) commit 667983c595f640e358a6e465c6fe879e4c7fbc85 @@ -946,7 +5404,7 @@ This should fix autoloading of subtitles which have a .txt extension. Reported to me by e-mail. - src/totem-uri.c | 7 ++++--- + src/totem-uri.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) commit 600e25e7fe61e634c2f2b1710b46a4b3fa2a3091 @@ -955,7 +5413,7 @@ Updated Japanese translation - help/ja/ja.po | 22 +++++++++++----------- + help/ja/ja.po | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) commit 98704de2fbce86246650411281fdf215f1b927d5 @@ -982,7 +5440,7 @@ Updated Vietnamese translation - po/vi.po | 14 +++++++------- + po/vi.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) commit fc2ec7616f7382510dc4178245430990973e3548 @@ -996,7 +5454,7 @@ See: bgo#666411 - src/backend/bacon-video-widget-gst-0.10.c | 7 +++++++ + src/backend/bacon-video-widget-gst-0.10.c | 7 +++++++ 1 file changed, 7 insertions(+) commit b56e6a6e4a09d9c3efb768fef4330c4a9b95be16 @@ -1016,7 +5474,7 @@ Signed-off-by: Chris Mayo - src/totem-properties-view.c | 13 ++++++++++++- + src/totem-properties-view.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) commit fbfad3ec665713525e8fadc5f33fec9991a71203 @@ -1028,7 +5486,7 @@ omf.make and xmldocs.make are installed by gnome-doc-common, which is run during autogen. - Makefile.am | 2 ++ + Makefile.am | 2 ++ 1 file changed, 2 insertions(+) commit cf8438eb164b0e8afe9344cbe63d50379860b427 @@ -1037,8 +5495,8 @@ 3.3.4 - NEWS | 5 +++++ - configure.in | 2 +- + NEWS | 5 +++++ + configure.in | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) commit 6d073979c12c5f36ccefb18d411e137c9ea475d9 @@ -1047,7 +5505,7 @@ docs: Fix builddir ≠ srcdir documentation builds - docs/reference/Makefile.am | 4 ++-- + docs/reference/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 0479688c2464ef2d48e56ac69ba4f2c3304ec6b8 @@ -1056,7 +5514,7 @@ docs: Add a missing XML include to the documentation - docs/reference/totem-docs.xml | 4 ++++ + docs/reference/totem-docs.xml | 4 ++++ 1 file changed, 4 insertions(+) commit e1b161e99950c9f40cdae0f8c8e45c729f97fc8a @@ -1065,8 +5523,8 @@ opensubtitles: Fix/Disable some pylint warnings - src/plugins/opensubtitles/hash.py | 14 +++++++------- - src/plugins/opensubtitles/opensubtitles.py | 6 ++++-- + src/plugins/opensubtitles/hash.py | 14 +++++++------- + src/plugins/opensubtitles/opensubtitles.py | 6 ++++-- 2 files changed, 11 insertions(+), 9 deletions(-) commit 709d550a4d110162a3436803f96dc0d00c4db5f0 @@ -1080,7 +5538,7 @@ Shut up, pylint. - src/plugins/Makefile.plugins | 2 +- + src/plugins/Makefile.plugins | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 290b3d6b482c7010da3881d56d762b0f353b5205 @@ -1091,8 +5549,8 @@ This means we don't error out during `make check` if pylint isn't found. - configure.in | 12 +++++++----- - src/plugins/Makefile.plugins | 4 +++- + configure.in | 12 +++++++----- + src/plugins/Makefile.plugins | 4 +++- 2 files changed, 10 insertions(+), 6 deletions(-) commit 0d09a71992f3b87f37137798c86a050a0217ff29 @@ -1101,8 +5559,8 @@ iplayer: Disable some useless pylint warnings - src/plugins/iplayer/iplayer2.py | 11 +++++++---- - src/plugins/iplayer/listparser.py | 7 ++++--- + src/plugins/iplayer/iplayer2.py | 11 +++++++---- + src/plugins/iplayer/listparser.py | 7 ++++--- 2 files changed, 11 insertions(+), 7 deletions(-) commit 21a6bfe5da5e3f2d7588fa2f41eb0fccd08777b5 @@ -1114,7 +5572,7 @@ They're automatically removed by `make maintainer-clean`, but git.mk doesn't know about them. - src/plugins/zeitgeist-dp/Makefile.am | 5 +++++ + src/plugins/zeitgeist-dp/Makefile.am | 5 +++++ 1 file changed, 5 insertions(+) commit d28b90a40882197035fdede6636a9cc81c274ab4 @@ -1129,7 +5587,7 @@ It compiles for me with Vala 0.14.1. - .../zeitgeist-dp/totem-zeitgeist-dp-plugin.vala | 37 +++++++++++++------- + .../zeitgeist-dp/totem-zeitgeist-dp-plugin.vala | 37 ++++++++++++++-------- 1 file changed, 24 insertions(+), 13 deletions(-) commit fcf76be334a05a307247dd19d7ac39d095cf6508 @@ -1138,7 +5596,7 @@ Add some unused symbols to the documentation section file - docs/reference/totem-sections.txt | 2 ++ + docs/reference/totem-sections.txt | 2 ++ 1 file changed, 2 insertions(+) commit 2516addf19b96bfee3449f648ccbeb87223993fa @@ -1150,15 +5608,15 @@ If we have GLib ≥ 2.31.0, use the new threading API instead of the old one. This doesn't bump our GLib dependency. - browser-plugin/totem-plugin-viewer.c | 2 ++ - src/backend/bacon-video-widget-gst-0.10.c | 32 +++++++++++++++++++++++++++++ - src/backend/bvw-test.c | 2 ++ - src/test-properties-page.c | 2 ++ - src/totem-audio-preview.c | 2 ++ - src/totem-object.c | 4 ++++ - src/totem-resources.c | 4 ++++ - src/totem-video-thumbnailer.c | 2 ++ - src/totem.c | 2 ++ + browser-plugin/totem-plugin-viewer.c | 2 ++ + src/backend/bacon-video-widget-gst-0.10.c | 32 +++++++++++++++++++++++++++++++ + src/backend/bvw-test.c | 2 ++ + src/test-properties-page.c | 2 ++ + src/totem-audio-preview.c | 2 ++ + src/totem-object.c | 4 ++++ + src/totem-resources.c | 4 ++++ + src/totem-video-thumbnailer.c | 2 ++ + src/totem.c | 2 ++ 9 files changed, 52 insertions(+) commit cabef55744ba1686879bbe117c2042db8a883378 @@ -1169,7 +5627,7 @@ This reverts commit 594bd021bf93a3060702508ed0513b50cadc2ab2. - configure.in | 2 +- + configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit c666edbd117d509b4ea9425b94cfb69662aacccf @@ -1178,8 +5636,8 @@ 3.3.3 - NEWS | 12 ++++++++++++ - configure.in | 2 +- + NEWS | 12 ++++++++++++ + configure.in | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) commit 594bd021bf93a3060702508ed0513b50cadc2ab2 @@ -1191,7 +5649,7 @@ Stop writing real software with toy languages. It never compiles when I need it to, and it pisses me off. - configure.in | 2 +- + configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 5dac80af167ae1e294a37ab8e6318b4df66e7735 @@ -1200,7 +5658,7 @@ build: We don't xmldocs.make and omf.make anymore - Makefile.am | 4 ---- + Makefile.am | 4 ---- 1 file changed, 4 deletions(-) commit 71408a90d504b666c74e81260e8761387dc64ce5 @@ -1215,7 +5673,7 @@ Closes: bgo#666431 - src/totem-options.c | 1 - + src/totem-options.c | 1 - 1 file changed, 1 deletion(-) commit ef06f5d853bc6eff433cf78227f0509246103a01 @@ -1228,7 +5686,7 @@ coverart display work again and fixes g_value_take_object() warnings spew. - src/backend/bacon-video-widget-gst-0.10.c | 4 +++- + src/backend/bacon-video-widget-gst-0.10.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit e2b73297118e07c69f60cc74f6955a4a82a398a9 @@ -1239,8 +5697,8 @@ Distributions can split it out if they want to... - browser-plugin/Makefile.am | 4 ---- - browser-plugin/browser-plugins.ini | 5 ----- + browser-plugin/Makefile.am | 4 ---- + browser-plugin/browser-plugins.ini | 5 ----- 2 files changed, 9 deletions(-) commit eeb1a65ecdbb554c451c705ec7a090a00bd96f06 @@ -1251,9 +5709,9 @@ But disable its use through the browser-plugins.ini file instead. - browser-plugin/Makefile.am | 4 ++++ - browser-plugin/browser-plugins.ini | 5 +++++ - configure.in | 2 +- + browser-plugin/Makefile.am | 4 ++++ + browser-plugin/browser-plugins.ini | 5 +++++ + configure.in | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) commit de3db02defcdc94573df12b88f42950b83f2087b @@ -1266,7 +5724,7 @@ to make this work. If we want to make this work, we'd need to add functionality to quvi. - browser-plugin/tests/12.html | 7 +++++++ + browser-plugin/tests/12.html | 7 +++++++ 1 file changed, 7 insertions(+) commit d353aceb607bbbf81787bb958a27f3382fac67c5 @@ -1278,7 +5736,7 @@ Rather than re-using the web browser agent. This fixes vimeo playback, as the server refuses to serve the usual browser UA. - browser-plugin/totemPlugin.cpp | 2 ++ + browser-plugin/totemPlugin.cpp | 2 ++ 1 file changed, 2 insertions(+) commit 24a7fba5003ead0f3d2b3822dfa0fb53f6b7a99e @@ -1290,7 +5748,7 @@ Otherwise we end up loading those empties as if they were the main content for the page (which they cannot be). - browser-plugin/totemPlugin.cpp | 29 ++++++++++++++++------------- + browser-plugin/totemPlugin.cpp | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) commit 21a00972a134659eaa48818770193238885a2655 @@ -1299,8 +5757,8 @@ browser-plugin: Don't handle small SWF in vegas - browser-plugin/totemPlugin.cpp | 6 ++++++ - browser-plugin/totemPlugin.h | 2 ++ + browser-plugin/totemPlugin.cpp | 6 ++++++ + browser-plugin/totemPlugin.h | 2 ++ 2 files changed, 8 insertions(+) commit 0430f43a176300e6c4e76d6e4aeda86788ce563d @@ -1312,7 +5770,7 @@ If there's a percentage sign in the size, we don't actually know its size. - browser-plugin/totemPlugin.cpp | 4 ++-- + browser-plugin/totemPlugin.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit c6c60c1b4e58f99309c0ebfbf43faf47a46f7c38 @@ -1321,7 +5779,7 @@ browser-plugin: Try to use the embed URI first - browser-plugin/totemPlugin.cpp | 27 ++++++++++++++++++--------- + browser-plugin/totemPlugin.cpp | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) commit bd1d1eb17478eb5ad61909c4005258238f7953a0 @@ -1339,12 +5797,12 @@ websites. Note that Totem doesn't contain any code specific to particular websites, as all the work is done in quvi's scripts. - browser-plugin/Makefile.am | 21 +++++++++++++ - browser-plugin/totem-plugin-viewer.c | 4 ++- - browser-plugin/totemPlugin.cpp | 30 +++++++++++++++++++ - browser-plugin/totemVegasPlugin.cpp | 54 ++++++++++++++++++++++++++++++++++ - browser-plugin/totemVegasPlugin.h | 48 ++++++++++++++++++++++++++++++ - configure.in | 12 ++++++++ + browser-plugin/Makefile.am | 21 ++++++++++++++ + browser-plugin/totem-plugin-viewer.c | 4 ++- + browser-plugin/totemPlugin.cpp | 30 ++++++++++++++++++++ + browser-plugin/totemVegasPlugin.cpp | 54 ++++++++++++++++++++++++++++++++++++ + browser-plugin/totemVegasPlugin.h | 48 ++++++++++++++++++++++++++++++++ + configure.in | 12 ++++++++ 6 files changed, 168 insertions(+), 1 deletion(-) commit aaf9c819977eef57e5d0c3107643ee0d02f96dbe @@ -1355,7 +5813,7 @@ Fixes a warning in some cases. - browser-plugin/totemPlugin.cpp | 15 ++++----------- + browser-plugin/totemPlugin.cpp | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) commit baa50e4bf3b404225e1154a2caaa5ce47ac9c14a @@ -1364,7 +5822,7 @@ browser-plugin: Create a command queue earlier - browser-plugin/totemPlugin.cpp | 4 ++-- + browser-plugin/totemPlugin.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit f5e5ce98597b9544d3d835a36af099abfd6a7295 @@ -1373,8 +5831,8 @@ browser-plugin: Queue SetPlaylist calls - browser-plugin/totemPlugin.cpp | 11 +++++++++++ - browser-plugin/totemPlugin.h | 3 ++- + browser-plugin/totemPlugin.cpp | 11 +++++++++++ + browser-plugin/totemPlugin.h | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) commit 08541cab1d667d5cf61f592cf64d261625b2d272 @@ -1385,7 +5843,7 @@ Not random files that might not belong to us. - browser-plugin/totem-plugin-viewer.c | 16 ++++++++++++---- + browser-plugin/totem-plugin-viewer.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) commit 59ac0b69b84d200dcd73e887b652f41e9e151b59 @@ -1397,7 +5855,7 @@ If SetPlaylist is not passed a local filename (because there's no local file), then we shouldn't try to copy it. - browser-plugin/totem-plugin-viewer.c | 76 ++++++++++++++++++---------------- + browser-plugin/totem-plugin-viewer.c | 76 +++++++++++++++++++----------------- 1 file changed, 40 insertions(+), 36 deletions(-) commit 1da6bb45bf2b66c6fd5193a4ec2da403297ce653 @@ -1409,7 +5867,7 @@ In the browser plugin. We don't actually need to be parented to create an OSD any more. - src/totem-fullscreen.c | 7 +------ + src/totem-fullscreen.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) commit 9d692d5e68a26e08d90a10c9431f2230897ef749 @@ -1418,7 +5876,7 @@ browser-plugin: Make error logo work again - browser-plugin/totem-plugin-viewer.c | 2 +- + browser-plugin/totem-plugin-viewer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 2b28ef471e48b83712e2f448c21b029d526e65fc @@ -1427,7 +5885,7 @@ backend: Fix warnings in the browser plugin - src/backend/bacon-video-widget-gst-0.10.c | 4 +++- + src/backend/bacon-video-widget-gst-0.10.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit b540d7983cdb63992cedf76fb88c91c8349afba3 @@ -1436,7 +5894,7 @@ lib: Fix possibly broken behaviour - lib/totem-scrsaver.c | 2 +- + lib/totem-scrsaver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit e17d2593ab068ab6ff83a82f760b6df941ed8a73 @@ -1447,7 +5905,7 @@ The GTK+/Clutter initialisation changes seems to have broken that... - browser-plugin/totem-plugin-viewer.c | 10 ++++++++++ + browser-plugin/totem-plugin-viewer.c | 10 ++++++++++ 1 file changed, 10 insertions(+) commit 7f1252ba4df41057c6dcf84700145dadc826f15a @@ -1456,7 +5914,7 @@ browser-plugin: Not an error - browser-plugin/totemPlugin.cpp | 3 +++ + browser-plugin/totemPlugin.cpp | 3 +++ 1 file changed, 3 insertions(+) commit b83097b2e9a3590f0ab17f9c1b93b776a158432a @@ -1465,7 +5923,7 @@ browser-plugin: Ensure not to share a gnome-terminal - browser-plugin/totem-plugin-viewer.c | 3 ++- + browser-plugin/totem-plugin-viewer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 8dad657aee90a014a155e3a6327f3b529f42acb5 @@ -1474,7 +5932,7 @@ browser-plugin: Quieter please - browser-plugin/totemPlugin.cpp | 2 +- + browser-plugin/totemPlugin.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 6177d7d02d545fade8e0aa6ed81e2efa7999c837 @@ -1485,7 +5943,7 @@ When starting up the viewer fails. - browser-plugin/totemPlugin.cpp | 5 ++++- + browser-plugin/totemPlugin.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit 69113fc17468e0e0f7cb80ec8ff93acd2a1e83df @@ -1496,7 +5954,7 @@ We don't need that anymore. - browser-plugin/totemPlugin.cpp | 13 +------------ + browser-plugin/totemPlugin.cpp | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) commit 8e4eb446de679d25fd0f39e10a54f98893d1c39a @@ -1505,17 +5963,17 @@ browser-plugin: White space fixes - browser-plugin/totem-plugin-viewer.c | 24 ++++++++++++------------ - browser-plugin/totemConeAudio.cpp | 2 +- - browser-plugin/totemGMPControls.cpp | 12 ++++++------ - browser-plugin/totemGMPError.cpp | 2 +- - browser-plugin/totemNPClass.h | 2 +- - browser-plugin/totemNPNGlue.cpp | 2 +- - browser-plugin/totemNPVariantWrapper.h | 2 +- - browser-plugin/totemNarrowSpacePlugin.cpp | 2 +- - browser-plugin/totemPlugin.cpp | 22 +++++++++++----------- - browser-plugin/totemPlugin.h | 10 +++++----- - browser-plugin/totemPluginGlue.cpp | 4 ++-- + browser-plugin/totem-plugin-viewer.c | 24 ++++++++++++------------ + browser-plugin/totemConeAudio.cpp | 2 +- + browser-plugin/totemGMPControls.cpp | 12 ++++++------ + browser-plugin/totemGMPError.cpp | 2 +- + browser-plugin/totemNPClass.h | 2 +- + browser-plugin/totemNPNGlue.cpp | 2 +- + browser-plugin/totemNPVariantWrapper.h | 2 +- + browser-plugin/totemNarrowSpacePlugin.cpp | 2 +- + browser-plugin/totemPlugin.cpp | 22 +++++++++++----------- + browser-plugin/totemPlugin.h | 10 +++++----- + browser-plugin/totemPluginGlue.cpp | 4 ++-- 11 files changed, 42 insertions(+), 42 deletions(-) commit 14abd80b16170aff306b5e32a727cc665f8c7c63 @@ -1526,7 +5984,7 @@ As it's not used anymore. - browser-plugin/totemPluginGlue.cpp | 18 ------------------ + browser-plugin/totemPluginGlue.cpp | 18 ------------------ 1 file changed, 18 deletions(-) commit e52a99bc9817c09c59fde2e447123547074173e5 @@ -1535,7 +5993,7 @@ browser-plugin: Remove unneeded helper library - browser-plugin/Makefile.am | 23 +++-------------------- + browser-plugin/Makefile.am | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) commit e0b4f97959db62f88ccc6543fddb59a754e7aa36 @@ -1546,9 +6004,9 @@ Still the viewer left to be ported. - browser-plugin/Makefile.am | 2 - - browser-plugin/totemPlugin.cpp | 672 ++++++++++++++++++---------------------- - browser-plugin/totemPlugin.h | 80 +++-- + browser-plugin/Makefile.am | 2 - + browser-plugin/totemPlugin.cpp | 672 +++++++++++++++++++---------------------- + browser-plugin/totemPlugin.h | 80 +++-- 3 files changed, 343 insertions(+), 411 deletions(-) commit 8170d010f91ffa7c277d4744ae8419021e6875a5 @@ -1557,7 +6015,7 @@ browser-plugin: Require a newer GIO - configure.in | 2 +- + configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 9c237e07c9be9f95664104e270e950b59fcc23d4 @@ -1566,7 +6024,7 @@ browser-plugin: Fix white-space problem - browser-plugin/totemPlugin.cpp | 6 +++--- + browser-plugin/totemPlugin.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 1f422ddcf03a5996934a15436f1de750d34c9d66 @@ -1575,7 +6033,7 @@ build: Bump release version - configure.in | 2 +- + configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 99c59ff57b5a5c8000bc540611815e7d2459a99d @@ -1584,7 +6042,7 @@ browser-plugin: Remove unused declaration - browser-plugin/totemPlugin.h | 1 - + browser-plugin/totemPlugin.h | 1 - 1 file changed, 1 deletion(-) commit bd0cb403561b8ee96a240445f50ab1d166d626c6 @@ -1596,8 +6054,8 @@ They're automatically removed by `make maintainer-clean`, but git.mk doesn't know about them. - src/plugins/rotation/Makefile.am | 5 +++++ - src/plugins/sample-vala/Makefile.am | 5 +++++ + src/plugins/rotation/Makefile.am | 5 +++++ + src/plugins/sample-vala/Makefile.am | 5 +++++ 2 files changed, 10 insertions(+) commit db66dc535f638792accfacc082f29b1d75e5458a @@ -1609,9 +6067,9 @@ They're shipped by gnome-doc-utils and copied into the build tree by autogen. - autogen.sh | 2 +- - omf.make | 55 ----------------------------------- - xmldocs.make | 92 ---------------------------------------------------------- + autogen.sh | 2 +- + omf.make | 55 ------------------------------------ + xmldocs.make | 92 ------------------------------------------------------------ 3 files changed, 1 insertion(+), 148 deletions(-) commit 226dc37981f927c96f4fbf660fb1410c3157a155 @@ -1622,8 +6080,8 @@ This fixes compilation with GTK+ deprecated symbols disabled. - src/totem-properties-view.c | 5 ++--- - src/totem-properties-view.h | 4 ++-- + src/totem-properties-view.c | 5 ++--- + src/totem-properties-view.h | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) commit 485f7897b69c9b1180da338c9cecaf9efb9c7d63 @@ -1637,11 +6095,11 @@ Helps: bgo#572713 - browser-plugin/Makefile.am | 1 + - browser-plugin/totemPluginGlue.cpp | 2 ++ - src/Makefile.am | 3 ++- - src/plugins/Makefile.plugins | 3 ++- - src/plugins/zeitgeist-dp/Makefile.am | 5 ++++- + browser-plugin/Makefile.am | 1 + + browser-plugin/totemPluginGlue.cpp | 2 ++ + src/Makefile.am | 3 ++- + src/plugins/Makefile.plugins | 3 ++- + src/plugins/zeitgeist-dp/Makefile.am | 5 ++++- 5 files changed, 11 insertions(+), 3 deletions(-) commit 5c905cc61d04ffe40bb92330e66aea4257dd0269 @@ -1650,11 +6108,11 @@ plugins: Remove the obsolete Bemused plugin - configure.in | 10 +- - po/POTFILES.in | 2 - - src/plugins/bemused/Makefile.am | 17 - - src/plugins/bemused/bemused.plugin.in | 9 - - src/plugins/bemused/totem-bemused.c | 749 --------------------------------- + configure.in | 10 +- + po/POTFILES.in | 2 - + src/plugins/bemused/Makefile.am | 17 - + src/plugins/bemused/bemused.plugin.in | 9 - + src/plugins/bemused/totem-bemused.c | 749 ---------------------------------- 5 files changed, 1 insertion(+), 786 deletions(-) commit c41553d42ef6074421585e5a1e3ef7775e798216 @@ -1663,12 +6121,12 @@ plugins: Remove YouTube plugin - configure.in | 42 +- - po/POTFILES.in | 3 - - src/plugins/youtube/Makefile.am | 23 - - src/plugins/youtube/totem-youtube.c | 843 --------------------------------- - src/plugins/youtube/youtube.plugin.in | 8 - - src/plugins/youtube/youtube.ui | 180 ------- + configure.in | 42 +- + po/POTFILES.in | 3 - + src/plugins/youtube/Makefile.am | 23 - + src/plugins/youtube/totem-youtube.c | 843 ---------------------------------- + src/plugins/youtube/youtube.plugin.in | 8 - + src/plugins/youtube/youtube.ui | 180 -------- 6 files changed, 1 insertion(+), 1098 deletions(-) commit d3d467a49fa828f1b6bb5d999c97158bd736785e @@ -1682,7 +6140,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=660966 - browser-plugin/totemPluginGlue.cpp | 4 ++++ + browser-plugin/totemPluginGlue.cpp | 4 ++++ 1 file changed, 4 insertions(+) commit 3d89b325f0eb13082bbe8c590fa02191d3d9553b @@ -1691,7 +6149,7 @@ build: Require the released version of vala - configure.in | 2 +- + configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 90e8e2519fa90ce05bfa04ab10d9530b019ebff2 @@ -1709,7 +6167,7 @@ [l10n]Updated Turkish translation - po/tr.po | 513 ++++++++++++++++++++++++++++++-------------------------------- + po/tr.po | 513 ++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 248 insertions(+), 265 deletions(-) commit add0cca367c094dad73c9ddbc79aeb204b539a2b @@ -1728,7 +6186,7 @@ Updated Japanese translation - po/ja.po | 26 +++++++++++++------------- + po/ja.po | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) commit 9749e913f4b7c9f5596d2835521675786f63ab21 @@ -1762,7 +6220,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=663900 - src/totem-video-thumbnailer.c | 2 +- + src/totem-video-thumbnailer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 186278af1877e08971a6d49cf60c4e932d5cef59 @@ -1771,7 +6229,7 @@ [l10n] Updated Estonian translation - po/et.po | 797 ++++++++++++++++++++++++++++++++------------------------------ + po/et.po | 797 +++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 416 insertions(+), 381 deletions(-) commit 8697efb92abb0e755cd2df96a084798cde4911a3 @@ -1780,7 +6238,7 @@ Updated Spanish translation - po/es.po | 22 +++++++++++----------- + po/es.po | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) commit c057ab99d07b2326aea68b809d891254e42244ea @@ -1791,7 +6249,7 @@ (closes: #663495) - src/plugins/iplayer/iplayer.py | 2 +- + src/plugins/iplayer/iplayer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 9ecaf2591f79fb30bb45908d6cc8b89ac44b6af8 @@ -1802,7 +6260,7 @@ (helps: #663495) - src/plugins/iplayer/iplayer2.py | 2 +- + src/plugins/iplayer/iplayer2.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 951390a0e7f16d83ca3881503f6fe7129db67f15 @@ -1813,7 +6271,7 @@ (helps: #663495) - src/plugins/iplayer/iplayer2.py | 3 ++- + src/plugins/iplayer/iplayer2.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit b15d0fdc7b8f7042b5fa27593321607946f06d7d @@ -1824,8 +6282,8 @@ (helps: #663495) - src/plugins/iplayer/iplayer2.py | 4 ++-- - src/plugins/iplayer/listparser.py | 12 ++++++------ + src/plugins/iplayer/iplayer2.py | 4 ++-- + src/plugins/iplayer/listparser.py | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) commit ecb55e5967338969c66c720d6b83621b61b714b3 @@ -1834,7 +6292,7 @@ Updated Telugu Translation - po/te.po | 891 +++++++++++++++++++++++++++++++------------------------------- + po/te.po | 891 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 442 insertions(+), 449 deletions(-) commit 0eacdd766bb7ee504a486872458679dd8c8df191 @@ -1848,7 +6306,7 @@ Closes: bgo#662148 (again) - configure.in | 2 +- + configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit a012b04d9ed67e37811cf6e748e8b5e64918444b @@ -1857,7 +6315,7 @@ Updated Belarusian translation. - po/be.po | 57 ++++++++++++++++++++++++--------------------------------- + po/be.po | 57 ++++++++++++++++++++++++--------------------------------- 1 file changed, 24 insertions(+), 33 deletions(-) commit 4632553c1e76e356876140ddc6973129048eeb91 @@ -1874,9 +6332,9 @@ Closes: bgo#662148 - configure.in | 2 +- - src/plugins/rotation/totem-rotation-plugin.vala | 2 +- - src/plugins/sample-vala/totem-sample-vala-plugin.vala | 2 +- + configure.in | 2 +- + src/plugins/rotation/totem-rotation-plugin.vala | 2 +- + src/plugins/sample-vala/totem-sample-vala-plugin.vala | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) commit 9b1a957aa66e7b86d76e5a86272a3e0f79822d96 @@ -1890,7 +6348,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=661346 - data/uri-schemes-list.txt | 1 + + data/uri-schemes-list.txt | 1 + 1 file changed, 1 insertion(+) commit 1dabcb641c7aee924a7f6a593712d73a23e30a0a @@ -1899,8 +6357,8 @@ 3.2.1 - NEWS | 5 +++++ - configure.in | 2 +- + NEWS | 5 +++++ + configure.in | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) commit aca970a0e301bee192d5c497b4e5f9e0aee33652 @@ -1918,7 +6376,7 @@ Updated Polish translation - po/pl.po | 24 ++++++++++++------------ + po/pl.po | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) commit e5b0838937a3e3994dbebf210f6d52dc5b9b9f60 @@ -1929,7 +6387,7 @@ Too much verbosity when browsing audio otherwise. - src/totem-video-thumbnailer.c | 2 +- + src/totem-video-thumbnailer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit f5c5ba421ffd5539806c43b1009023c2a52c628d @@ -1940,7 +6398,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=660967 - src/totem-properties-view.c | 7 +++++-- + src/totem-properties-view.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) commit 0afe4335154e21bea2a335443ec71647e3480ad2 @@ -1949,7 +6407,7 @@ Updated Slovak translation - po/sk.po | 24 +++++++++++++----------- + po/sk.po | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) commit c78219727b10e4a38493cc80b7b52ce6f2f18274 @@ -1958,7 +6416,7 @@ Updated Galician translations - help/gl/gl.po | 163 ++++++++++++++++++++++++++++++++++++++++++++++++++------- + help/gl/gl.po | 163 +++++++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 144 insertions(+), 19 deletions(-) commit a80e24fa837698ad2e0f445572297989ece851a4 @@ -1967,7 +6425,7 @@ [l10n]Updated Catalan (Valencian) translation - po/ca@valencia.po | 913 +++++++++++++++++++++++++---------------------------- + po/ca@valencia.po | 913 ++++++++++++++++++++++++++---------------------------- 1 file changed, 433 insertions(+), 480 deletions(-) commit cbba6c585fed15eb888f93109eb5103e25587bbb @@ -1976,8 +6434,8 @@ 3.2.0 - NEWS | 4 ++++ - configure.in | 4 ++-- + NEWS | 4 ++++ + configure.in | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) commit 23d1b04dba52633fb1e0d1e8c5e526d17575cbe5 @@ -1986,8 +6444,8 @@ Updated Traditional Chinese translation(Hong Kong and Taiwan) - po/zh_HK.po | 154 ++++++++++++++++++++++++++++------------------------------ - po/zh_TW.po | 156 ++++++++++++++++++++++++++++------------------------------- + po/zh_HK.po | 154 ++++++++++++++++++++++++++++------------------------------- + po/zh_TW.po | 156 ++++++++++++++++++++++++++++-------------------------------- 2 files changed, 147 insertions(+), 163 deletions(-) commit 1794db0c4fb5349e9ececc16856fa2cb5365cc05 @@ -1996,7 +6454,7 @@ Updated Japanese translation - po/ja.po | 14 +++++++------- + po/ja.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) commit 7971c4e628f5aed17f610532c4c2bab19b1969ce @@ -2005,7 +6463,7 @@ Updated Galician translations - po/gl.po | 249 ++++++++++++++++++++++++++++++-------------------------------- + po/gl.po | 249 ++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 120 insertions(+), 129 deletions(-) commit 6c8aac0ce3a7eed7cbb97a10f5de762a5a245236 @@ -2014,7 +6472,7 @@ Updated Assamese Translations:bugzilla#659595 - po/as.po | 55 +++++++++++++++++++++++++++++++++---------------------- + po/as.po | 55 +++++++++++++++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 22 deletions(-) commit 9b59f233119d30bb9254f7595d463ac8a793bf02 @@ -2032,7 +6490,7 @@ update Punjabi Translation - po/pa.po | 168 +++++++++++++++++++++++++++----------------------------------- + po/pa.po | 168 +++++++++++++++++++++++++++------------------------------------ 1 file changed, 73 insertions(+), 95 deletions(-) commit a565ab2946303cd8dc04d1906e4bc99603dba112 @@ -2041,7 +6499,7 @@ Updated Finnish translation - po/fi.po | 242 +++++++++++++++++++------------------------------------------- + po/fi.po | 242 ++++++++++++++++++++------------------------------------------- 1 file changed, 75 insertions(+), 167 deletions(-) commit 6adb5559f8a98cbc033178486e65e1c97a44f681 @@ -2079,7 +6537,7 @@ [1l0n] Updated Italian translation - po/it.po | 11 ++++++----- + po/it.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) commit d8c76a65795ec356be650071414116f7e7491bf1 @@ -2111,7 +6569,7 @@ Closes: bgo#659547 - src/plugins/pythonconsole/pythonconsole.convert | 5 ++--- + src/plugins/pythonconsole/pythonconsole.convert | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) commit e1ac1da6efc27832f887965253852ae5ad09faf9 @@ -2120,8 +6578,8 @@ 3.1.92 - NEWS | 6 ++++++ - configure.in | 2 +- + NEWS | 6 ++++++ + configure.in | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) commit 8deb47fe979d57a3b6215602abdc9a9dca527c40 @@ -2139,7 +6597,7 @@ Updated Brazilian Portuguese translation - po/pt_BR.po | 253 ++++++++++++++++++++++++++++++----------------------------- + po/pt_BR.po | 253 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 127 insertions(+), 126 deletions(-) commit 45e275bb567e5e5c6f9cc6efdbec009eaa244472 @@ -2157,7 +6615,7 @@ Updated Slovak translation - po/sk.po | 513 ++++++++++++++++++++------------------------------------------ + po/sk.po | 513 ++++++++++++++++++++------------------------------------------- 1 file changed, 164 insertions(+), 349 deletions(-) commit 56133c0a307e46258bedd1f39dafa6822d2192d4 @@ -2166,7 +6624,7 @@ Updated Danish translation of the documentation - help/da/da.po | 250 +++++++++++++++++++++++++++++---------------------------- + help/da/da.po | 250 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 127 insertions(+), 123 deletions(-) commit dece86d7fdc5b0a909d0c2c2151360de13bc4e6e @@ -2175,7 +6633,7 @@ browser-plugin: Add support for HTTP Live Streaming - browser-plugin/totemPlugin.cpp | 1 + + browser-plugin/totemPlugin.cpp | 1 + 1 file changed, 1 insertion(+) commit 5ee13bb265ccaf3f2146623671f3c917c55974a1 @@ -2186,7 +6644,7 @@ Given the right plugins. - data/mime-type-list.txt | 1 + + data/mime-type-list.txt | 1 + 1 file changed, 1 insertion(+) commit d8cd404ae55943365c7481e77eddd264b560548f @@ -2195,7 +6653,7 @@ data: Add a few more mime-type aliases - data/mime-type-list.txt | 4 ++++ + data/mime-type-list.txt | 4 ++++ 1 file changed, 4 insertions(+) commit c2b859834e9d2c12322eb7751c3d16e75470dfa3 @@ -2242,7 +6700,7 @@ Updated Spanish translation - po/es.po | 50 +++++++++++++++++++++++++------------------------- + po/es.po | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) commit 5c20c98ab4285ad27e0c92710ad39411b8bfe641 @@ -2260,7 +6718,7 @@ Updated Bulgarian translation - po/bg.po | 213 +++++++++++++++++++++++++++++++------------------------------- + po/bg.po | 213 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 108 insertions(+), 105 deletions(-) commit 08252452f9d3f46ab1df78fe42ca190ab1cc019e @@ -2271,7 +6729,7 @@ See: http://blogs.gnome.org/desrt/2011/09/08/am_maintainer_mode-is-not-cool/ - configure.in | 2 +- + configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 2f31f0e4d591f5dc1f1ce346579b2e47fa609c92 @@ -2280,8 +6738,8 @@ 3.1.91 - NEWS | 7 +++++++ - configure.in | 2 +- + NEWS | 7 +++++++ + configure.in | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) commit 9dcaa8e710db8be808e843f99dea3998b644291d @@ -2296,7 +6754,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=658269 - src/plugins/opensubtitles/hash.py | 28 ++++++++++++++++------------ + src/plugins/opensubtitles/hash.py | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) commit 761bb5636c32021381de831762d475b9218a9ad9 @@ -2307,7 +6765,7 @@ Otherwise it just won't work. - src/plugins/opensubtitles/opensubtitles.py | 6 +++--- + src/plugins/opensubtitles/opensubtitles.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 83c479adf4102b38030bcdc3816d9b39e8d7f4ae @@ -2318,7 +6776,7 @@ We need a GTK+ 3.x build, and no G_CONST_RETURN usage. - configure.in | 2 +- + configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 258ca5982e36a8bca75e818b82ea1d1877046e28 @@ -2327,7 +6785,7 @@ Fix formatting. - po/fi.po | 2 +- + po/fi.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 2334c72e3673aa970d80752aad9c826f0cde2130 @@ -2345,7 +6803,7 @@ Uploaded Ukranian - po/uk.po | 908 ++++++++++++++++++++++++++++++-------------------------------- + po/uk.po | 908 ++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 437 insertions(+), 471 deletions(-) commit b0078625d24e34121618eb64d1bde77644fced5f @@ -2354,7 +6812,7 @@ Updated Spanish translation - po/es.po | 187 ++++++++++++++++++++++++++++++-------------------------------- + po/es.po | 187 ++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 89 insertions(+), 98 deletions(-) commit c3a8a806893c1b23e41f0d532584a8648b993f90 @@ -2381,7 +6839,7 @@ Updated Latvian translation. - po/lv.po | 301 ++++++++++++++++++++++++++++++++------------------------------ + po/lv.po | 301 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 153 insertions(+), 148 deletions(-) commit 97b98a450ce570efd9e46254ceda5df6dc96ff70 @@ -2408,7 +6866,7 @@ Updated Slovenian translation - po/sl.po | 143 +++++++++++++++++++++++++++++--------------------------------- + po/sl.po | 143 ++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 67 insertions(+), 76 deletions(-) commit bfa0b1d025bb33abbac002d97855454ef71b754a @@ -2430,7 +6888,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=658224 - configure.in | 8 ++++---- + configure.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 9c87ebe1924fd73beb4de7c48dd250064ba2ff8a @@ -2441,7 +6899,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=658224 - data/totem-bugreport.py | 4 ++-- + data/totem-bugreport.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 5a4eee111fb6af3fdd215394feee721e59a8e1cb @@ -2454,7 +6912,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=654250 - lib/totem-scrsaver.c | 7 +++++++ + lib/totem-scrsaver.c | 7 +++++++ 1 file changed, 7 insertions(+) commit b568b23638af1384f068e7c03805d1ce9ef16500 @@ -2467,7 +6925,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=656988 - lib/totem-scrsaver.c | 2 +- + lib/totem-scrsaver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 8a3611910edac935220fca0144ee15f2963d2932 @@ -2478,7 +6936,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=651403 - data/playlist.ui | 1 + + data/playlist.ui | 1 + 1 file changed, 1 insertion(+) commit 7b364874f6e86faabe2a822dd6538e8970a5600b @@ -2487,7 +6945,7 @@ Updated Belarusian translation. - po/be.po | 288 ++++++++++++++++++++++++++++++++++---------------------------- + po/be.po | 288 ++++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 157 insertions(+), 131 deletions(-) commit 5d70d7a5a91f95f273f151c2f8dca5ae1141b77f @@ -2496,7 +6954,7 @@ Updated Czech translation - po/cs.po | 255 ++++++++++++++++++++++++++++++++------------------------------ + po/cs.po | 255 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 131 insertions(+), 124 deletions(-) commit 5b9865335c4ebde6856720f1d2d8f3c5b7f56866 @@ -2534,7 +6992,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=589399 - src/plugins/rotation/totem-rotation-plugin.vala | 14 +++++++++----- + src/plugins/rotation/totem-rotation-plugin.vala | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) commit 7cdc11fc1923ed7c5aec46ce8b3836b51c418c74 @@ -2553,7 +7011,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=657654 - data/properties.ui | 30 +++++++++++++++--------------- + data/properties.ui | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) commit 768fd201210df5dc6b29b9cafbc91e96b40c281a @@ -2562,7 +7020,7 @@ [l10n] Updated German translation - po/de.po | 10 +++++----- + po/de.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) commit ecefcd552a0f08da696d41f4b6a6936f51b0dcb7 @@ -2581,7 +7039,7 @@ Updated Norwegian bokmål translation - po/nb.po | 83 +++++++++++++++++++++++++++++++++++++++----------------------- + po/nb.po | 83 ++++++++++++++++++++++++++++++++++++++++------------------------ 1 file changed, 52 insertions(+), 31 deletions(-) commit 437a88bb506d95b5f540eaf8f4ecaf858df3bbb3 @@ -2590,7 +7048,7 @@ Updated Swedish translation - po/sv.po | 189 +++++++++++++++++++++----------------------------------------- + po/sv.po | 189 +++++++++++++++++++++------------------------------------------ 1 file changed, 63 insertions(+), 126 deletions(-) commit 7a6758ac19104c4596d423b55d038bc3ef521cc0 @@ -2617,7 +7075,7 @@ Updated Slovenian translation - po/sl.po | 140 +++++++++++++++++++++++++++++++++++++++----------------------- + po/sl.po | 140 ++++++++++++++++++++++++++++++++++++++++----------------------- 1 file changed, 89 insertions(+), 51 deletions(-) commit a919698b3ba5b4132fa6c3e9049d0f05f49a6f41 @@ -2626,7 +7084,7 @@ Updated Hebrew translation. - po/he.po | 83 +++++++++++++++++++++++++++++++++++++++----------------------- + po/he.po | 83 ++++++++++++++++++++++++++++++++++++++++------------------------ 1 file changed, 52 insertions(+), 31 deletions(-) commit cb9fd506ba20d390f802ca91c0e9da283b0298d5 @@ -2635,7 +7093,7 @@ Added UG translation - po/ug.po | 198 ++++++++++++++++++++++++++++++++++++-------------------------- + po/ug.po | 198 +++++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 115 insertions(+), 83 deletions(-) commit 39072684d7a4c7f55c0721f8d740f55056200102 @@ -2644,7 +7102,7 @@ Updated Indonesian translation - po/id.po | 766 +++++++++++++++++++++++++++----------------------------------- + po/id.po | 766 ++++++++++++++++++++++++++++----------------------------------- 1 file changed, 335 insertions(+), 431 deletions(-) commit c94f80f180ec8ff19753ab40fbb8153533f79991 @@ -2653,7 +7111,7 @@ Updated Galician translations - po/gl.po | 83 +++++++++++++++++++++++++++++++++++++++----------------------- + po/gl.po | 83 ++++++++++++++++++++++++++++++++++++++++------------------------ 1 file changed, 52 insertions(+), 31 deletions(-) commit 3c48e6cafe3d8ae368a0d7d123c73dffd1fc915d @@ -2662,7 +7120,7 @@ Updated Spanish translation - po/es.po | 83 +++++++++++++++++++++++++++++++++++++++----------------------- + po/es.po | 83 ++++++++++++++++++++++++++++++++++++++++------------------------ 1 file changed, 52 insertions(+), 31 deletions(-) commit 0899042273b101366bb9cd1946433eb540c16570 @@ -2671,7 +7129,7 @@ [l10n] Updated German translation - po/de.po | 714 ++++++++++++++++++++++++++++++-------------------------------- + po/de.po | 714 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 346 insertions(+), 368 deletions(-) commit e95f1fec8bcfbc15c7f815a5f704266f40d9f269 @@ -2685,8 +7143,8 @@ porting the plugin to C (and MPRIS 2.1), making most of this work redundant. I thought I'd commit it anyway for posterity's sake. - po/POTFILES.in | 1 + - src/plugins/dbusservice/dbusservice.py | 505 +++++++++++++++----------------- + po/POTFILES.in | 1 + + src/plugins/dbusservice/dbusservice.py | 505 ++++++++++++++++----------------- 2 files changed, 245 insertions(+), 261 deletions(-) commit 06517d80cb6e1eb1a189b692d4e6fa6c43cf204c @@ -2695,11 +7153,11 @@ data: Export supported URI schemes in a header file - data/Makefile.am | 11 ++++++++--- - data/mime-type-include.sh | 6 +++--- - data/uri-scheme-include.sh | 18 ++++++++++++++++++ - src/totem-object.c | 31 +++++++++++++++++++++++++++++++ - src/totem.h | 3 +++ + data/Makefile.am | 11 ++++++++--- + data/mime-type-include.sh | 6 +++--- + data/uri-scheme-include.sh | 18 ++++++++++++++++++ + src/totem-object.c | 31 +++++++++++++++++++++++++++++++ + src/totem.h | 3 +++ 5 files changed, 63 insertions(+), 6 deletions(-) commit 229399c662fb9d457cd612a444fe561dac36a98e @@ -2717,7 +7175,7 @@ Updated Norwegian bokmål translation - po/nb.po | 26 +++++++++++++++++++++----- + po/nb.po | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) commit 886b7518887d26244a05de757dba9b0a1d93e039 @@ -2726,7 +7184,7 @@ Updated Swedish translation - po/sv.po | 20 ++++++++++++++++++-- + po/sv.po | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) commit d8bb5c97e4757fdfe4014cd1cd4672e3e158940b @@ -2735,7 +7193,7 @@ Updated Galician translations - po/gl.po | 167 +++++++++++++++++++++++++++++++++++--------------------------- + po/gl.po | 167 +++++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 94 insertions(+), 73 deletions(-) commit c50432954bc31d4946766164e9bda775993435dc @@ -2744,7 +7202,7 @@ Updated Hebrew translation. - po/he.po | 20 ++++++++++++++++++-- + po/he.po | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) commit 8fb321f431eac922f16fc4c42968e9000e65bf3c @@ -2753,7 +7211,7 @@ Updated Spanish translation - po/es.po | 72 +++++++++++++++++++++++++++++++++++--------------------------- + po/es.po | 72 ++++++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 41 insertions(+), 31 deletions(-) commit 417b86ff53bc720e4fe5444608df631fc53e5860 @@ -2764,9 +7222,9 @@ Fix distcheck - NEWS | 11 +++++++++++ - configure.in | 2 +- - po/POTFILES.skip | 1 + + NEWS | 11 +++++++++++ + configure.in | 2 +- + po/POTFILES.skip | 1 + 3 files changed, 13 insertions(+), 1 deletion(-) commit 0a684af858b42a886a931ea484b32246a6916239 @@ -2779,11 +7237,11 @@ https://bugzilla.gnome.org/show_bug.cgi?id=589399 - configure.in | 14 +- - po/POTFILES.in | 2 + - src/plugins/rotation/Makefile.am | 19 ++ - src/plugins/rotation/rotation.plugin.in | 8 + - src/plugins/rotation/totem-rotation-plugin.vala | 224 +++++++++++++++++++++++ + configure.in | 14 +- + po/POTFILES.in | 2 + + src/plugins/rotation/Makefile.am | 19 ++ + src/plugins/rotation/rotation.plugin.in | 8 + + src/plugins/rotation/totem-rotation-plugin.vala | 224 ++++++++++++++++++++++++ 5 files changed, 264 insertions(+), 3 deletions(-) commit 6ad79e0a8d60083c468632e43b4f1a35ed2cfa3a @@ -2792,7 +7250,7 @@ Updated Swedish translation - po/sv.po | 703 +++++++++++++++++++++++++++++--------------------------------- + po/sv.po | 703 +++++++++++++++++++++++++++++---------------------------------- 1 file changed, 326 insertions(+), 377 deletions(-) commit 1aee7caf7aa243b6cbd02bd4d530da8b3b5cf5a7 @@ -2810,7 +7268,7 @@ Add missing header comments - po/zu.po | 3 +++ + po/zu.po | 3 +++ 1 file changed, 3 insertions(+) commit 7dac16cf0ea8f49086db420b46ce29012b187382 @@ -2838,7 +7296,7 @@ Updated Czech translation - po/cs.po | 753 +++++++++++++++++++++----------------------------------------- + po/cs.po | 753 ++++++++++++++++++++++----------------------------------------- 1 file changed, 257 insertions(+), 496 deletions(-) commit e8ad692da5d5c8209b5dd0249f026ab76c8adb16 @@ -2847,7 +7305,7 @@ Updated Hebrew translation. - po/he.po | 195 ++++++++++++++++++++++++++++++++------------------------------ + po/he.po | 195 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 100 insertions(+), 95 deletions(-) commit 7c2e326219e336ff91ec2b253ba4428cce0da7fd @@ -2856,7 +7314,7 @@ main: Use symbolic icon for the exit fullscreen button - data/fullscreen.ui | 2 +- + data/fullscreen.ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 7e4966c24990d7640900a34be51ac14235f0aebf @@ -2865,7 +7323,7 @@ Updated Slovenian translation - po/sl.po | 187 +++++++++++++++++++++++++++++++------------------------------- + po/sl.po | 187 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 95 insertions(+), 92 deletions(-) commit c24ed14057bc77b5a6439fdda06df7b115104483 @@ -2885,7 +7343,7 @@ As we weren't cleaning this up properly. - src/totem-fullscreen.c | 17 ++++++++++++++++- + src/totem-fullscreen.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) commit 67ab568f6ca558634fa13b8fa7eb4aa6d4fe8fdf @@ -2896,7 +7354,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=589399 - src/backend/bacon-video-widget-gst-0.10.c | 2 ++ + src/backend/bacon-video-widget-gst-0.10.c | 2 ++ 1 file changed, 2 insertions(+) commit 3854061c6bf0a3d301a4a4186aa2053cdbf5beae @@ -2905,7 +7363,7 @@ Updated Norwegian bokmål translation - po/nb.po | 194 +++++++++++++++++++++++++++++++------------------------------- + po/nb.po | 194 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 96 insertions(+), 98 deletions(-) commit 7232d7aea7a9943f11d4500f865e59ce0f622af2 @@ -2921,7 +7379,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=651417 - src/plugins/bemused/totem-bemused.c | 3 ++- + src/plugins/bemused/totem-bemused.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 27fe7ad91e5b5f031b3775a294d51ba3a589d5c0 @@ -2930,7 +7388,7 @@ browser-plugin: Update QuickTime docs link - browser-plugin/idl/totemINarrowSpacePlayer.idl | 2 +- + browser-plugin/idl/totemINarrowSpacePlayer.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit f767d33b62025819b45b6be39fd509e85d10b5cf @@ -2939,7 +7397,7 @@ browser-plugin: Only shrink padding vertically - data/mozilla-viewer.css | 3 ++- + data/mozilla-viewer.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 336f076141dead24494ae194a240ed8fed32a481 @@ -2948,7 +7406,7 @@ browser-plugin: Flatten the buttons - data/mozilla-viewer.css | 6 ++++++ + data/mozilla-viewer.css | 6 ++++++ 1 file changed, 6 insertions(+) commit 8ac7d4af8d8e6d12893543a10c6f0a750d2e1806 @@ -2957,7 +7415,7 @@ browser-plugin: Style the popup button as well - browser-plugin/totem-plugin-viewer.c | 5 +++++ + browser-plugin/totem-plugin-viewer.c | 5 +++++ 1 file changed, 5 insertions(+) commit e30b80376104fc89185509af4b2334920eca689e @@ -2970,7 +7428,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=654404 - browser-plugin/totem-plugin-viewer.c | 1 + + browser-plugin/totem-plugin-viewer.c | 1 + 1 file changed, 1 insertion(+) commit 9ab830e38166c10c8357b89ec83755c67a42e2a1 @@ -2979,8 +7437,8 @@ browser-plugin: Remove useless "About" dialogue - browser-plugin/totem-plugin-viewer.c | 57 ---------------------------------- - data/mozilla-viewer.ui | 9 ------ + browser-plugin/totem-plugin-viewer.c | 57 ------------------------------------ + data/mozilla-viewer.ui | 9 ------ 2 files changed, 66 deletions(-) commit 4fe6d0914c721730afcffd69f5faf758f35055ee @@ -2989,7 +7447,7 @@ browser-plugin: Use symbolic icons, not stock ones - browser-plugin/totem-plugin-viewer.c | 14 +++++++------- + browser-plugin/totem-plugin-viewer.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) commit 75dbfb13bbee0bc6097a1919692f4f007fb4602f @@ -2998,7 +7456,7 @@ browser-plugin: Use dark theme by default - browser-plugin/totem-plugin-viewer.c | 4 ++++ + browser-plugin/totem-plugin-viewer.c | 4 ++++ 1 file changed, 4 insertions(+) commit be3ad27e737ab777252ec58ff077582a7736c9a9 @@ -3007,8 +7465,8 @@ main: Move is_fullscreen member to private - src/totem-fullscreen.c | 10 ++++++---- - src/totem-fullscreen.h | 5 +---- + src/totem-fullscreen.c | 10 ++++++---- + src/totem-fullscreen.h | 5 +---- 2 files changed, 7 insertions(+), 8 deletions(-) commit 65b5a194ce08823ba8ec2a8c8a4f23537ea6d351 @@ -3017,7 +7475,7 @@ main: We rely on being composited now. Always - src/totem-fullscreen.c | 23 ++++------------------- + src/totem-fullscreen.c | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) commit 2a2b429e5a1f047cd866753026ac1771abba30fd @@ -3026,7 +7484,7 @@ main: Remove unused buttons from struct - src/totem-private.h | 5 ----- + src/totem-private.h | 5 ----- 1 file changed, 5 deletions(-) commit bdf43685545431a6ab46abb296028f996f484668 @@ -3035,7 +7493,7 @@ Updated Spanish translation - po/es.po | 540 ++++++++++++++++++++++++++------------------------------------ + po/es.po | 540 +++++++++++++++++++++++++++------------------------------------ 1 file changed, 229 insertions(+), 311 deletions(-) commit c47ce5f319d468e027b05c6eaae28c8f47c9f997 @@ -3044,7 +7502,7 @@ grilo: Fix some variable shadowing warnings from gcc - src/plugins/grilo/totem-grilo.c | 42 +++++++++++++++++++-------------------- + src/plugins/grilo/totem-grilo.c | 42 ++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) commit b1f66e88249bdd5d95ce45bdf4678191982b2041 @@ -3053,8 +7511,8 @@ Update to libpeas 1.1 deprecations - configure.in | 2 +- - src/plugins/totem-plugins-engine.c | 4 ++-- + configure.in | 2 +- + src/plugins/totem-plugins-engine.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) commit 6e7561d0bdd75be6b800339dd21b48f413c57052 @@ -3068,7 +7526,7 @@ Turns out I failed to actually get Vala to rebuild the sample-vala plugin when doing my testing, and it still fails with the GTK+ 3.0 GIR. - src/plugins/sample-vala/Makefile.am | 4 +++- + src/plugins/sample-vala/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit d2a5acfda652bd1fcabe22b06a53d2579936744b @@ -3077,8 +7535,8 @@ youtube: Fix progress bar text in the YouTube plugin - src/plugins/youtube/totem-youtube.c | 2 +- - src/plugins/youtube/youtube.ui | 5 ++++- + src/plugins/youtube/totem-youtube.c | 2 +- + src/plugins/youtube/youtube.ui | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) commit b5d6a3e6fd3ba136d99950efcb093d86c09c898a @@ -3087,7 +7545,7 @@ screenshot: Fix progress bar text in the gallery dialogue - src/plugins/screenshot/totem-gallery-progress.c | 1 + + src/plugins/screenshot/totem-gallery-progress.c | 1 + 1 file changed, 1 insertion(+) commit 74e344ff5e5446501332781acc733bce249758b0 @@ -3101,8 +7559,8 @@ Closes: bgo#654242 - src/plugins/opensubtitles/opensubtitles.py | 12 ++++++------ - src/plugins/opensubtitles/opensubtitles.ui | 5 ++++- + src/plugins/opensubtitles/opensubtitles.py | 12 ++++++------ + src/plugins/opensubtitles/opensubtitles.ui | 5 ++++- 2 files changed, 10 insertions(+), 7 deletions(-) commit 1cb6f7345ec32c92ddf83fc922965911004f32fa @@ -3134,7 +7592,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=654070 - configure.in | 91 +++++++++++++++++++++++++++++++--------------------------- + configure.in | 91 ++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 48 insertions(+), 43 deletions(-) commit f9e070003cff2bc17ba77c0e9f43582ac740b1e0 @@ -3145,7 +7603,7 @@ grl_metadata_source_cancel() was replaced. - src/plugins/grilo/totem-grilo.c | 3 +-- + src/plugins/grilo/totem-grilo.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit cd41ed1981858da9d9c53fd691f189438a3c619a @@ -3154,9 +7612,9 @@ grilo: Install totem-grilo.conf in plugin dir - configure.in | 4 ---- - src/plugins/grilo/Makefile.am | 2 +- - src/plugins/grilo/totem-grilo.c | 5 +---- + configure.in | 4 ---- + src/plugins/grilo/Makefile.am | 2 +- + src/plugins/grilo/totem-grilo.c | 5 +---- 3 files changed, 2 insertions(+), 9 deletions(-) commit 168ccc725e873d9e588c61f5d94ab457a07a2ec2 @@ -3167,7 +7625,7 @@ Closes: bgo#621976 - data/totem.1 | 5 +++++ + data/totem.1 | 5 +++++ 1 file changed, 5 insertions(+) commit 147a20a5ff4f4eec3c212af453a8e3d8e6112355 @@ -3176,7 +7634,7 @@ docs: Remove a reference to TotemPlugin from totem-dirs.c - src/plugins/totem-dirs.c | 6 ++++-- + src/plugins/totem-dirs.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) commit 1c31b67da176018776aae951092414129ebd365d @@ -3185,7 +7643,7 @@ docs: Update the plugin writing guide - docs/reference/totem-plugins.xml | 73 ++++++++++++-------------------------- + docs/reference/totem-plugins.xml | 73 +++++++++++++--------------------------- 1 file changed, 23 insertions(+), 50 deletions(-) commit aee1a5cc2d6105db1312a25b4bfc961ca48e3807 @@ -3196,10 +7654,10 @@ This makes gtk-doc happy, and we all want to make gtk-doc happy. - src/backend/bacon-video-widget-gst-0.10.c | 70 ++++++++++++++--------------- - src/totem-cell-renderer-video.c | 9 ++-- - src/totem-object.c | 18 ++++---- - src/totem-video-list.c | 9 ++-- + src/backend/bacon-video-widget-gst-0.10.c | 70 +++++++++++++++---------------- + src/totem-cell-renderer-video.c | 9 ++-- + src/totem-object.c | 18 ++++---- + src/totem-video-list.c | 9 ++-- 4 files changed, 55 insertions(+), 51 deletions(-) commit 3effa6dd566572882a8cc29755f7e4ee2424efd8 @@ -3212,12 +7670,12 @@ numeric constants, which it turns out should be denoted using 0 instead (for example). - src/backend/bacon-video-widget-gst-0.10.c | 61 +++++++++++++-------------- - src/egg-macros.h | 2 +- - src/plugins/chapters/totem-chapters-utils.c | 4 +- - src/plugins/chapters/totem-cmml-parser.c | 4 +- - src/plugins/chapters/totem-edit-chapter.c | 4 +- - src/totem-object.c | 18 ++++---- + src/backend/bacon-video-widget-gst-0.10.c | 61 ++++++++++++++--------------- + src/egg-macros.h | 2 +- + src/plugins/chapters/totem-chapters-utils.c | 4 +- + src/plugins/chapters/totem-cmml-parser.c | 4 +- + src/plugins/chapters/totem-edit-chapter.c | 4 +- + src/totem-object.c | 18 ++++----- 6 files changed, 46 insertions(+), 47 deletions(-) commit 096191538999dad46b3c0c81058236c20d991834 @@ -3228,8 +7686,8 @@ Closes: bgo#598805 - docs/reference/Makefile.am | 19 ++++--------------- - docs/reference/totem-sections.txt | 5 +++++ + docs/reference/Makefile.am | 19 ++++--------------- + docs/reference/totem-sections.txt | 5 +++++ 2 files changed, 9 insertions(+), 15 deletions(-) commit 7c19e79e6911a9c6dcf1a1e8e9d9f111962a196f @@ -3238,7 +7696,7 @@ l10n: Fix some invalid XML caused by a typo in the ro help translation - help/ro/ro.po | 4 ++-- + help/ro/ro.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 0974bf1e5d5201579321e5c28c19c7f59a4912e1 @@ -3249,7 +7707,7 @@ Silly intltool. - src/plugins/dbusservice/dbusservice.py | 6 ++++-- + src/plugins/dbusservice/dbusservice.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) commit 68c34a68c8a2e91436a372b1396041435f76d9e3 @@ -3258,7 +7716,7 @@ opensubtitles: Don't glitchily sensitise the Apply button while searching - src/plugins/opensubtitles/opensubtitles.py | 3 --- + src/plugins/opensubtitles/opensubtitles.py | 3 --- 1 file changed, 3 deletions(-) commit c086e3c5ffbae252b979ec99c3e94f0c1bf5bd21 @@ -3267,7 +7725,7 @@ opensubtitles: Don't arbitrarily show and hide the tree view headers - src/plugins/opensubtitles/opensubtitles.py | 5 ----- + src/plugins/opensubtitles/opensubtitles.py | 5 ----- 1 file changed, 5 deletions(-) commit 00deab84c2c86b93d6460dbdbf0750910d1af7a9 @@ -3276,7 +7734,7 @@ sample-vala: Remove an unnecessary Vala dependency on GTK+ - src/plugins/sample-vala/Makefile.am | 4 +--- + src/plugins/sample-vala/Makefile.am | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) commit 015eafdce9afaa34d561f1c1a19001cfa6e9cab8 @@ -3287,7 +7745,7 @@ So that grilo doesn't break the terms of service. - configure.in | 4 ++-- + configure.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit d7c623bca9d06a09751c3c9dcc933e7c668303f7 @@ -3298,7 +7756,7 @@ For searches and browsing. - src/plugins/grilo/totem-grilo.conf | 3 +++ + src/plugins/grilo/totem-grilo.conf | 3 +++ 1 file changed, 3 insertions(+) commit 8d1de246200749bdd0fab9e77784273dedf69a51 @@ -3307,7 +7765,7 @@ Updated Galician translations - po/gl.po | 509 +++++++++++++++++++++++++++----------------------------------- + po/gl.po | 509 +++++++++++++++++++++++++++------------------------------------ 1 file changed, 221 insertions(+), 288 deletions(-) commit 1a5e4f1b9a0b8ed2a547e0b956a3d87bf2c0374d @@ -3318,7 +7776,7 @@ Closes: bgo#652999 - configure.in | 41 ++++++++++++++++++++++++++++++----------- + configure.in | 41 ++++++++++++++++++++++++++++++----------- 1 file changed, 30 insertions(+), 11 deletions(-) commit f29e09c016e03b6d870af93e74742cd9715604f8 @@ -3327,7 +7785,7 @@ Updated Slovenian translation - po/sl.po | 559 ++++++++++++++++++++++++++++---------------------------------- + po/sl.po | 559 ++++++++++++++++++++++++++++----------------------------------- 1 file changed, 250 insertions(+), 309 deletions(-) commit 481871132d4175d4f7bf7523901caf7ca775ee4a @@ -3339,10 +7797,10 @@ Mostly warnings to do with not listing all members of an enum in a switch over an instance of that enum. - src/backend/bacon-video-widget-gst-0.10.c | 96 ++++++++++++++++++++++++----- - src/backend/bvw-test.c | 2 +- - src/totem-audio-preview.c | 27 ++++++++ - src/totem-video-thumbnailer.c | 57 ++++++++++++++++- + src/backend/bacon-video-widget-gst-0.10.c | 96 ++++++++++++++++++++++++++----- + src/backend/bvw-test.c | 2 +- + src/totem-audio-preview.c | 27 +++++++++ + src/totem-video-thumbnailer.c | 57 +++++++++++++++++- 4 files changed, 165 insertions(+), 17 deletions(-) commit 5b7e374270587162630ca9c903b92db3fb9c140e @@ -3351,7 +7809,7 @@ Updated Hebrew translation - po/he.po | 641 ++++++++++++++++++++++++++++---------------------------------- + po/he.po | 641 ++++++++++++++++++++++++++++----------------------------------- 1 file changed, 284 insertions(+), 357 deletions(-) commit 6d38d0fef2794f371cdb81b1998ee3e2a8d2acc8 @@ -3362,7 +7820,7 @@ Use g_strdup() instead. See commit bafff377e2207f92cdd33ebc6e770d9970e74ee1. - src/properties/bacon-video-widget-properties.c | 2 +- + src/properties/bacon-video-widget-properties.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 736793b389b3e702eeb92ae76f6b27f7daa3a8ab @@ -3371,7 +7829,7 @@ Updated Norwegian bokmål translation - po/nb.po | 482 ++++++++++++++++++-------------------------------------------- + po/nb.po | 482 +++++++++++++++++++-------------------------------------------- 1 file changed, 141 insertions(+), 341 deletions(-) commit 1d1cacfc8ecb4df38d4184bfd122d387214e8c79 @@ -3380,7 +7838,7 @@ docs: Remove outdated definitions - docs/reference/totem-sections.txt | 2 -- + docs/reference/totem-sections.txt | 2 -- 1 file changed, 2 deletions(-) commit a81b3d52acef8bdb16374594ba03cf98225facd6 @@ -3391,14 +7849,14 @@ As grilo provides us with one itself. - configure.in | 4 +- - po/POTFILES.in | 4 - - src/plugins/jamendo/Makefile.am | 22 - - src/plugins/jamendo/jamendo.convert | 3 - - src/plugins/jamendo/jamendo.plugin.in | 9 - - src/plugins/jamendo/jamendo.py | 748 -------------------- - src/plugins/jamendo/jamendo.ui | 603 ---------------- - ...g.gnome.totem.plugins.jamendo.gschema.xml.in.in | 20 - + configure.in | 4 +- + po/POTFILES.in | 4 - + src/plugins/jamendo/Makefile.am | 22 - + src/plugins/jamendo/jamendo.convert | 3 - + src/plugins/jamendo/jamendo.plugin.in | 9 - + src/plugins/jamendo/jamendo.py | 748 --------------------- + src/plugins/jamendo/jamendo.ui | 603 ----------------- + ...g.gnome.totem.plugins.jamendo.gschema.xml.in.in | 20 - 8 files changed, 1 insertion(+), 1412 deletions(-) commit dbcbecedfecc9b1a83a690ed135d088e565e36a1 @@ -3409,13 +7867,13 @@ As grilo provides us with one itself. - configure.in | 10 +- - po/POTFILES.in | 3 - - src/plugins/tracker/Makefile.am | 19 - - src/plugins/tracker/totem-tracker-widget.c | 889 ---------------------------- - src/plugins/tracker/totem-tracker-widget.h | 54 -- - src/plugins/tracker/totem-tracker.c | 79 --- - src/plugins/tracker/tracker.plugin.in | 9 - + configure.in | 10 +- + po/POTFILES.in | 3 - + src/plugins/tracker/Makefile.am | 19 - + src/plugins/tracker/totem-tracker-widget.c | 889 ----------------------------- + src/plugins/tracker/totem-tracker-widget.h | 54 -- + src/plugins/tracker/totem-tracker.c | 79 --- + src/plugins/tracker/tracker.plugin.in | 9 - 7 files changed, 1 insertion(+), 1062 deletions(-) commit 2bf7cb102628735432cec71ea42954779c95c8ed @@ -3424,7 +7882,7 @@ backend: Add missing doc - src/backend/bacon-video-widget.h | 1 + + src/backend/bacon-video-widget.h | 1 + 1 file changed, 1 insertion(+) commit 2c9998c1fe3e9674c1310bf9898edf6178ba8ae8 @@ -3433,7 +7891,7 @@ po: Add missing file - po/POTFILES.in | 1 + + po/POTFILES.in | 1 + 1 file changed, 1 insertion(+) commit 09d4692fc066a836a2d24d13893412f50658dd2b @@ -3445,7 +7903,7 @@ We were closing the plugins too early, and always thinking that the playlist was the last standing sidebar. - src/totem-object.c | 11 +++++------ + src/totem-object.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) commit 787887e14923a8391a1206f3e1b4e852533a3d3c @@ -3456,7 +7914,7 @@ As there will not be a page_id to reset to. - src/totem-sidebar.c | 3 +++ + src/totem-sidebar.c | 3 +++ 1 file changed, 3 insertions(+) commit 287d76402b0be6fe7d704a4b333b2b6d13334767 @@ -3467,7 +7925,7 @@ And clear the results view in the process. - src/plugins/grilo/totem-grilo.c | 16 ++++++++++++++++ + src/plugins/grilo/totem-grilo.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) commit beef43b4f6f6ac3a4c0a69cf9e0e766e8a152d3c @@ -3476,7 +7934,7 @@ backend: Better debugging when paused buffering - src/backend/bacon-video-widget-gst-0.10.c | 2 ++ + src/backend/bacon-video-widget-gst-0.10.c | 2 ++ 1 file changed, 2 insertions(+) commit c448f98c479715aab21e89160f2d32d963595362 @@ -3485,7 +7943,7 @@ Updated Spanish translation - po/es.po | 123 ++++++++++++++++++++++++++++++++++++-------------------------- + po/es.po | 123 +++++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 72 insertions(+), 51 deletions(-) commit f747225dd60783531b19ab749590e388ea1dd8a5 @@ -3496,7 +7954,7 @@ In the browse sidebar treeview. - src/plugins/grilo/grilo.ui | 2 +- + src/plugins/grilo/grilo.ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 82061b5e1ae4696a7bc4a839c99f92a073bf866d @@ -3507,7 +7965,7 @@ And merge everything in one column. - src/plugins/grilo/grilo.ui | 14 +------------- + src/plugins/grilo/grilo.ui | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) commit 0c25b666937026d8baae2859f80670e7a99faa2e @@ -3518,7 +7976,7 @@ When closing an expanded tree item in the browse sidebar. - src/plugins/grilo/totem-grilo.c | 2 ++ + src/plugins/grilo/totem-grilo.c | 2 ++ 1 file changed, 2 insertions(+) commit 49a8afb2fb54df122c824a932d0f5d8fca05de49 @@ -3527,7 +7985,7 @@ screenshot: Remove unused variable - src/plugins/screenshot/gnome-screenshot-widget.c | 2 -- + src/plugins/screenshot/gnome-screenshot-widget.c | 2 -- 1 file changed, 2 deletions(-) commit dd83ab0c191c3972ec46569a81f36385df9fb8fb @@ -3536,8 +7994,8 @@ main: Fix vbox/hbox deprecations - src/totem-interface.c | 3 ++- - src/totem-statusbar.c | 4 ++-- + src/totem-interface.c | 3 ++- + src/totem-statusbar.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) commit 2c31c7bd3db1d3156c0c7ea18832b03a2920c591 @@ -3563,7 +8021,7 @@ properties: Add context to time translations - src/properties/bacon-video-widget-properties.c | 12 ++++++------ + src/properties/bacon-video-widget-properties.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) commit 5a7c037ef0ee2121886770145477ddf7dc889790 @@ -3572,7 +8030,7 @@ [l10n] Updated German translation - po/de.po | 831 +++++++++++++++++++++++++++++++------------------------------- + po/de.po | 831 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 419 insertions(+), 412 deletions(-) commit 7326b169e4a7066996cd0ff8d385cf674739b770 @@ -3581,7 +8039,7 @@ playlist: Force icons only toolbar style - data/playlist.ui | 1 + + data/playlist.ui | 1 + 1 file changed, 1 insertion(+) commit 7319b5da4eea0ed18f05698ebb8dff343b07ccf7 @@ -3590,7 +8048,7 @@ Updated Slovenian translation - po/sl.po | 234 ++++++++++++++++++++++++++++++++------------------------------ + po/sl.po | 234 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 119 insertions(+), 115 deletions(-) commit e7b01e8450db5ad65f2f1096fee3e46cfc4a91ae @@ -3599,7 +8057,7 @@ Updated Galician translations - po/gl.po | 213 +++++++++++++++++++++++++++++++------------------------------- + po/gl.po | 213 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 105 insertions(+), 108 deletions(-) commit 3208cc8c2ed1089fd14c3d517fc84f0b2f8d0517 @@ -3608,7 +8066,7 @@ Updated Spanish translation - po/es.po | 254 +++++++++++++++++++++++++++++++------------------------------- + po/es.po | 254 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 128 insertions(+), 126 deletions(-) commit 5267fed0bf17534f132061c8d80a455040c0a22d @@ -3619,9 +8077,9 @@ Closes: bgo#652898 - src/backend/bacon-video-widget-gst-0.10.c | 8 ++++---- - src/backend/video-utils.c | 2 +- - src/properties/bacon-video-widget-properties.c | 10 +++++----- + src/backend/bacon-video-widget-gst-0.10.c | 8 ++++---- + src/backend/video-utils.c | 2 +- + src/properties/bacon-video-widget-properties.c | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) commit 05ba9e12ddcfb12bc2af695726e24712a2767ea0 @@ -3633,8 +8091,8 @@ This migrates Totem to the API changes in libgdata 0.9.0 and (unreleased) 0.9.1 if they're available. - configure.in | 7 +++++++ - src/plugins/youtube/totem-youtube.c | 16 ++++++++++++++++ + configure.in | 7 +++++++ + src/plugins/youtube/totem-youtube.c | 16 ++++++++++++++++ 2 files changed, 23 insertions(+) commit 3783bfa81fc649d06bd426c7b8ba14abc608a5d2 @@ -3643,7 +8101,7 @@ chapters: Minor GtkBox fixes in the chapters plugin - src/plugins/chapters/totem-chapters.c | 3 ++- + src/plugins/chapters/totem-chapters.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit de635df610be62dae82c4769f465c268b7885bf7 @@ -3652,8 +8110,8 @@ Minor GtkBox fixes in TotemTrackerWidget - src/plugins/tracker/totem-tracker-widget.c | 12 ++++++++---- - src/plugins/tracker/totem-tracker-widget.h | 4 ++-- + src/plugins/tracker/totem-tracker-widget.c | 12 ++++++++---- + src/plugins/tracker/totem-tracker-widget.h | 4 ++-- 2 files changed, 10 insertions(+), 6 deletions(-) commit 9e5c1c91226a910889b4ad371d72e903d327759d @@ -3662,8 +8120,8 @@ Minor GtkBox fixes in bacon-video-widget-properties - src/properties/bacon-video-widget-properties.c | 4 +++- - src/properties/bacon-video-widget-properties.h | 4 ++-- + src/properties/bacon-video-widget-properties.c | 4 +++- + src/properties/bacon-video-widget-properties.h | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) commit 7786834a1fb1261b331bc3983497360a4ce06d44 @@ -3672,7 +8130,7 @@ main: Fixing setting the playlist header title - src/totem-playlist.c | 4 ++-- + src/totem-playlist.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 34d6878e6862835a328c1a9195c80d64b6d57ebb @@ -3681,7 +8139,7 @@ Updated Swedish translation - po/sv.po | 809 +++++++++++++++++++++++++++++++++----------------------------- + po/sv.po | 809 +++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 429 insertions(+), 380 deletions(-) commit 91d259dc2241be2b6cee071b45cfef2ed5865f23 @@ -3692,8 +8150,8 @@ Hopefully. - src/totem-playlist.c | 5 ++++- - src/totem-playlist.h | 4 ++-- + src/totem-playlist.c | 5 ++++- + src/totem-playlist.h | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) commit 6ffe7cbac2074c825d9912e21ee4ab032c83916a @@ -3704,8 +8162,8 @@ Now that the sidebar drop-down is gone. - data/playlist.ui | 2 +- - src/totem-playlist.c | 3 ++- + data/playlist.ui | 2 +- + src/totem-playlist.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) commit 65a1810f75075c31fd423391b4e78cbb543e9f19 @@ -3714,7 +8172,7 @@ po: Add missing plugin file - po/POTFILES.in | 1 + + po/POTFILES.in | 1 + 1 file changed, 1 insertion(+) commit adc3ba965ab46a94335ffee06dacdad24322a093 @@ -3723,11 +8181,11 @@ plugins: Remove "Coherence" plugin - configure.in | 8 +- - po/POTFILES.in | 2 - - src/plugins/coherence_upnp/Makefile.am | 8 -- - .../coherence_upnp/coherence_upnp.plugin.in | 9 -- - src/plugins/coherence_upnp/coherence_upnp.py | 137 -------------------- + configure.in | 8 +- + po/POTFILES.in | 2 - + src/plugins/coherence_upnp/Makefile.am | 8 -- + .../coherence_upnp/coherence_upnp.plugin.in | 9 -- + src/plugins/coherence_upnp/coherence_upnp.py | 137 --------------------- 5 files changed, 1 insertion(+), 163 deletions(-) commit d2d3ee120b1ce6af5289c1c12d544fd08eb8ba72 @@ -3738,7 +8196,7 @@ Now that it's in GTK+ itself. - src/totem-playlist.c | 22 ++-------------------- + src/totem-playlist.c | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) commit 0153c055d5ba88c65a7b22a729ba46805ed4eb42 @@ -3747,7 +8205,7 @@ main: Make menu items for sidebars work - src/totem-sidebar.c | 11 +++++++++++ + src/totem-sidebar.c | 11 +++++++++++ 1 file changed, 11 insertions(+) commit f089ef9eb675d59968688224935adfef118cc6ca @@ -3759,7 +8217,7 @@ The widget needs to be shown, otherwise GtkNotebook will refuse to switch to that page. - src/plugins/chapters/totem-chapters.c | 1 + + src/plugins/chapters/totem-chapters.c | 1 + 1 file changed, 1 insertion(+) commit b2cd9c31c991a59d21e8d9684098d1947fa0bc86 @@ -3770,14 +8228,14 @@ And add a menu item for each sidebar element in the View menu. - data/totem.ui | 3 +- - src/Makefile.am | 2 - - src/ev-sidebar.c | 336 ----------------------------------- - src/ev-sidebar.h | 76 -------- - src/plugins/publish/totem-publish.c | 10 +- - src/totem-object.c | 23 ++- - src/totem-sidebar.c | 174 ++++++++++++++---- - src/totem-sidebar.h | 16 +- + data/totem.ui | 3 +- + src/Makefile.am | 2 - + src/ev-sidebar.c | 336 ------------------------------------ + src/ev-sidebar.h | 76 -------- + src/plugins/publish/totem-publish.c | 10 +- + src/totem-object.c | 23 ++- + src/totem-sidebar.c | 174 +++++++++++++++---- + src/totem-sidebar.h | 16 +- 8 files changed, 175 insertions(+), 465 deletions(-) commit 76ab7caaea93c2056cc8ef0cddf083f0eadde0e5 @@ -3786,7 +8244,7 @@ save-file: Add keyboard shortcut for "Save" - src/plugins/save-file/totem-save-file.c | 2 +- + src/plugins/save-file/totem-save-file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit d4b98f1b46f3c8eff01f4c6263329e78eae3d7bd @@ -3795,7 +8253,7 @@ Added Norwegian bokmål translation - po/nb.po | 8 ++++---- + po/nb.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 1eec692fda0c2b8687a1a4e70fc0fcf04ce0ea8b @@ -3804,7 +8262,7 @@ Updated Galician translations - po/gl.po | 944 ++++++++++++++++++++++++++++++++------------------------------ + po/gl.po | 944 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 481 insertions(+), 463 deletions(-) commit 6b08d46b7916bda002ce8e1f0abd8f99db3bb148 @@ -3813,7 +8271,7 @@ Updated Polish translation - po/pl.po | 916 +++++++++++++++++++++++++++++++++++--------------------------- + po/pl.po | 916 +++++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 517 insertions(+), 399 deletions(-) commit 5a87df6264d6bba18cd11e5184ff714f155debe8 @@ -3831,7 +8289,7 @@ Updated Spanish translation - po/es.po | 39 +++++++++++++++++++-------------------- + po/es.po | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) commit c8b2a6af05e7c763f4acb01fd37245436641a53c @@ -3840,7 +8298,7 @@ backend: Fix tracks not appearing with their language names - src/backend/bacon-video-widget-gst-0.10.c | 4 ++-- + src/backend/bacon-video-widget-gst-0.10.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 960bd304d44fe016382c755117eba1777dff4c87 @@ -3849,7 +8307,7 @@ Updated Indonesian translation - po/id.po | 1 - + po/id.po | 1 - 1 file changed, 1 deletion(-) commit 5045c44c37b34fee143a4f1c694b3675fc1fd742 @@ -3867,7 +8325,7 @@ build: Don't check for unused GStreamer elements - configure.in | 2 +- + configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 566b38d88265df73ebc2ef212570f08931d9462a @@ -3876,8 +8334,8 @@ 3.1.0 - NEWS | 25 +++++++++++++++++++++++++ - configure.in | 2 +- + NEWS | 25 +++++++++++++++++++++++++ + configure.in | 2 +- 2 files changed, 26 insertions(+), 1 deletion(-) commit 5f38dc094688abba5f1c878d477575e35361c883 @@ -3886,7 +8344,7 @@ po: Add missing file to list - po/POTFILES.in | 1 + + po/POTFILES.in | 1 + 1 file changed, 1 insertion(+) commit 34246406a946bd75fb885c9f85e4241878ea2216 @@ -3895,7 +8353,7 @@ skipto: Fix warning during compilation - src/plugins/skipto/totem-time-entry.c | 2 ++ + src/plugins/skipto/totem-time-entry.c | 2 ++ 1 file changed, 2 insertions(+) commit 67e7337a4c1c77ac5f0caee1601cc4b9150b83fe @@ -3904,7 +8362,7 @@ Updated Slovenian translation - po/sl.po | 463 ++++++++++++++++++++++++++++++++++---------------------------- + po/sl.po | 463 +++++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 257 insertions(+), 206 deletions(-) commit adced40bbc786ace821638f0c9ed34197c853563 @@ -3913,7 +8371,7 @@ Updated Hebrew translation. - po/he.po | 939 ++++++++++++++++++++++++++++++++------------------------------ + po/he.po | 939 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 479 insertions(+), 460 deletions(-) commit c6c13f85c051e87c96c263d07c4295ec971cb494 @@ -3922,7 +8380,7 @@ Uploaded Ukranian - po/uk.po | 735 ++++++++++++++++++++++++++++++++------------------------------ + po/uk.po | 735 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 376 insertions(+), 359 deletions(-) commit 1fdb2ccec16a908f0e4f3c652bbb34bbb87ee58c @@ -3931,7 +8389,7 @@ Updated Spanish translation - po/es.po | 435 +++++++++++++++++++++++++++++++------------------------------- + po/es.po | 435 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 215 insertions(+), 220 deletions(-) commit d9c7d16233a34a9373b31c51bb986b766e250529 @@ -3940,7 +8398,7 @@ Remove non-existing file - po/POTFILES.in | 1 - + po/POTFILES.in | 1 - 1 file changed, 1 deletion(-) commit f35c9fea3be74d134727cedda422f80725af57e8 @@ -3949,7 +8407,7 @@ Updated Norwegian bokmål translation - po/nb.po | 726 +++++++++++++++++++++++++++++--------------------------------- + po/nb.po | 726 +++++++++++++++++++++++++++++---------------------------------- 1 file changed, 336 insertions(+), 390 deletions(-) commit 4cfa6829904465b661f8d7081238d8fcd53bfeca @@ -3958,7 +8416,7 @@ Updated Czech translation - po/cs.po | 3 +++ + po/cs.po | 3 +++ 1 file changed, 3 insertions(+) commit 9175124351dc7167d15453fce7b50bfd1269af48 @@ -3967,7 +8425,7 @@ Updated Czech translation - po/cs.po | 850 ++++++++++++++++++++++++-------------------------------------- + po/cs.po | 850 ++++++++++++++++++++++++--------------------------------------- 1 file changed, 329 insertions(+), 521 deletions(-) commit 475e405468f5a55b9b912033cf0e4454e3d804a3 @@ -3976,7 +8434,7 @@ Updated Slovenian translation - po/sl.po | 693 +++++++++++++++++++++++++++++++------------------------------- + po/sl.po | 693 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 350 insertions(+), 343 deletions(-) commit 6617e87b787287498bec86ece643160a3c4208d6 @@ -3987,7 +8445,7 @@ Closes: bgo#648825 - src/plugins/opensubtitles/opensubtitles.py | 2 +- + src/plugins/opensubtitles/opensubtitles.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit a60d0709adf52d042b80c2024acba4d1f38da285 @@ -4005,7 +8463,7 @@ save-file: wrong reference to a structure field - src/plugins/save-file/totem-save-file.c | 2 +- + src/plugins/save-file/totem-save-file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 277a8e67a5abc7802906382a6a00b99c86b06f73 @@ -4030,7 +8488,7 @@ Closes: bgo#647513 - src/plugins/chapters/totem-cmml-parser.c | 9 ++++++++- + src/plugins/chapters/totem-cmml-parser.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) commit 2abb8f5e460c93c3890626f0695356fc3513c9dc @@ -4039,7 +8497,7 @@ chapters: Warn about ignored chapters when parsing a CMML file - src/plugins/chapters/totem-cmml-parser.c | 6 ++++-- + src/plugins/chapters/totem-cmml-parser.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) commit 5b86b43cb62d94a22827134bf565a859e32ebcf1 @@ -4056,7 +8514,7 @@ Closes: bgo#647513 - src/plugins/chapters/totem-cmml-parser.c | 12 ++++++++++-- + src/plugins/chapters/totem-cmml-parser.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) commit 2af5aeff47f6913731fbb968be8781e0b6b3cb10 @@ -4065,7 +8523,7 @@ Updated Vietnamese translation - po/vi.po | 4 ++-- + po/vi.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 1c5fa8cb3cd00c359ef16ee431f056b9d043b252 @@ -4074,7 +8532,7 @@ po/vi.po: import from Damned Lies - po/vi.po | 344 ++++++++++++++++++++++---------------------------------------- + po/vi.po | 344 +++++++++++++++++++++++---------------------------------------- 1 file changed, 124 insertions(+), 220 deletions(-) commit 7cb1bd569b57af2027ec455add594ef1ad516f3b @@ -4083,7 +8541,7 @@ Updated Japanese translation - po/ja.po | 908 ++++++++++++++++++++++++++++++++++++-------------------------- + po/ja.po | 908 ++++++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 522 insertions(+), 386 deletions(-) commit 52224ad0f3661294e2531d1d4410141c97fe17d5 @@ -4092,7 +8550,7 @@ Updated Spanish translation - po/es.po | 739 ++++++++++++++++++++++++++++++++------------------------------ + po/es.po | 739 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 380 insertions(+), 359 deletions(-) commit a2ab4da3308d7e79747f4847d925625a6ddc4472 @@ -4103,7 +8561,7 @@ They don't belong as instance variables of the OpenSubtitlesModel. - src/plugins/opensubtitles/opensubtitles.py | 25 +++++++++++++------------ + src/plugins/opensubtitles/opensubtitles.py | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) commit de5938e1fbe8b9b81ae4c630105b793d941754e2 @@ -4114,7 +8572,7 @@ They don't need to be stored as an instance variable. - src/plugins/opensubtitles/opensubtitles.py | 86 +++++++++++++++++++--------- + src/plugins/opensubtitles/opensubtitles.py | 86 ++++++++++++++++++++---------- 1 file changed, 58 insertions(+), 28 deletions(-) commit ba3871991bec45a36b67bf2089969d80c9337031 @@ -4125,7 +8583,7 @@ Simplifies the locking considerably. - src/plugins/opensubtitles/opensubtitles.py | 52 +++++++++++++++++++--------- + src/plugins/opensubtitles/opensubtitles.py | 52 ++++++++++++++++++++---------- 1 file changed, 35 insertions(+), 17 deletions(-) commit 509f56bac0ef87026e5907491942aefb45984f87 @@ -4138,7 +8596,7 @@ the locking somewhat. Moving the results of async operations to be stored in the threads running the operations themselves makes things cleaner. - src/plugins/opensubtitles/opensubtitles.py | 62 ++++++++++++++++++---------- + src/plugins/opensubtitles/opensubtitles.py | 62 ++++++++++++++++++++---------- 1 file changed, 41 insertions(+), 21 deletions(-) commit f41587887db02cf18f3273fbaacfadbb9e7c77e6 @@ -4151,7 +8609,7 @@ enough, the dialogue can easily be re-opened and a different set of subtitles selected without having to perform the search again. - src/plugins/opensubtitles/opensubtitles.py | 28 +++++++++++++++++----------- + src/plugins/opensubtitles/opensubtitles.py | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) commit 01027183834057ff5feeab7a615e430d181861fb @@ -4163,7 +8621,7 @@ Close the subtitle download window after successfully downloading subtitles. Closes: bgo#610777 - src/plugins/opensubtitles/opensubtitles.py | 12 +++++++----- + src/plugins/opensubtitles/opensubtitles.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) commit 15fea9a5bae5674a3c02abaf9616d6501e939b3c @@ -4172,7 +8630,7 @@ opensubtitles: Remove a frame from the download dialogue and fix some padding - src/plugins/opensubtitles/opensubtitles.ui | 112 ++++++++++------------------ + src/plugins/opensubtitles/opensubtitles.ui | 112 ++++++++++------------------- 1 file changed, 38 insertions(+), 74 deletions(-) commit 6833b7f7bf15dbaba6687d56b52230aca5af6b62 @@ -4181,7 +8639,7 @@ opensubtitles: Improve locale error handling - src/plugins/opensubtitles/opensubtitles.py | 5 +++-- + src/plugins/opensubtitles/opensubtitles.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit cb3299f89bc03bd128972c79b9c4b22120e6a5f9 @@ -4193,7 +8651,7 @@ This prevents us using freed memory if the async operations during shutdown take too long. - src/plugins/media-player-keys/totem-media-player-keys.c | 10 +++++++--- + src/plugins/media-player-keys/totem-media-player-keys.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) commit aa649822bb87cae152df5f0b8a4aaee480855aeb @@ -4204,8 +8662,8 @@ It's now unused. - src/backend/bacon-video-widget-gst-0.10.c | 21 --------------------- - src/backend/bacon-video-widget.h | 2 -- + src/backend/bacon-video-widget-gst-0.10.c | 21 --------------------- + src/backend/bacon-video-widget.h | 2 -- 2 files changed, 23 deletions(-) commit db659a507219a04c41b627126af9ae70c77db554 @@ -4214,7 +8672,7 @@ backend: Port bvw-test to GOption - src/backend/bvw-test.c | 46 +++++++++++++++++++++++++++++++++++----------- + src/backend/bvw-test.c | 46 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 35 insertions(+), 11 deletions(-) commit 1a324506b60485269bcd537b494ef6d768885b96 @@ -4223,7 +8681,7 @@ browser-plugin: Remove use of bacon_video_widget_init_backend() - browser-plugin/totem-plugin-viewer.c | 16 +++++++++++----- + browser-plugin/totem-plugin-viewer.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) commit 725594d5d8e41bc7b334632f8d106ce4f58795d5 @@ -4234,7 +8692,7 @@ Instead of calling the bacon-video-widget. - src/totem-properties-main.c | 5 +++-- + src/totem-properties-main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit da59a451624c837ffbd7cd269ae7390bc0145b88 @@ -4245,9 +8703,9 @@ To the only place that uses it. - src/backend/video-utils.c | 43 ------------------------ - src/backend/video-utils.h | 1 - - src/properties/bacon-video-widget-properties.c | 43 ++++++++++++++++++++++++ + src/backend/video-utils.c | 43 -------------------------- + src/backend/video-utils.h | 1 - + src/properties/bacon-video-widget-properties.c | 43 ++++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 44 deletions(-) commit 73f068111b97f5baa81ca370a56f7d4310aa86f8 @@ -4258,9 +8716,9 @@ There's only one place it's currently used. - src/backend/video-utils.c | 22 ---------------------- - src/backend/video-utils.h | 1 - - src/plugins/skipto/totem-time-entry.c | 22 ++++++++++++++++++++++ + src/backend/video-utils.c | 22 ---------------------- + src/backend/video-utils.h | 1 - + src/plugins/skipto/totem-time-entry.c | 22 ++++++++++++++++++++++ 3 files changed, 22 insertions(+), 23 deletions(-) commit 65f5b9e17ae3bc6f5fd93df94a182028f4edb561 @@ -4271,7 +8729,7 @@ As discussed with ebassi today. - src/backend/bacon-video-widget-gst-0.10.c | 3 +++ + src/backend/bacon-video-widget-gst-0.10.c | 3 +++ 1 file changed, 3 insertions(+) commit eff117505722d20b7ce0b1564789fd1f59b31ca5 @@ -4280,7 +8738,7 @@ backend: Fix typo in API docs - src/backend/bacon-video-widget-gst-0.10.c | 2 +- + src/backend/bacon-video-widget-gst-0.10.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 0efda5e600a055c7165269b44900d9f1875fbc05 @@ -4293,7 +8751,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=599056 - src/totem-video-thumbnailer.c | 51 ++++++++++++++++++++++++++++++++++++++++- + src/totem-video-thumbnailer.c | 51 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-) commit 7bd422e372bfc74c7d35ef6d543643ec02262aaa @@ -4305,7 +8763,7 @@ We really don't want to warn when grabbing for media player keys is cancelled. - src/plugins/media-player-keys/totem-media-player-keys.c | 6 ++++-- + src/plugins/media-player-keys/totem-media-player-keys.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) commit e72ced40b1d90fa9481b8c0ab7dde10f4a961803 @@ -4318,7 +8776,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=646950 - src/totem-uri.c | 2 ++ + src/totem-uri.c | 2 ++ 1 file changed, 2 insertions(+) commit 45cfd99bcc8e35c40b6a1b07971549e475d9b11c @@ -4329,7 +8787,7 @@ As needed for the navigation fixes not propagating properly. - configure.in | 3 ++- + configure.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 1066d8aea423ebc4dbbe3a7e4ec460c93b0237fc @@ -4344,9 +8802,9 @@ https://bugzilla.gnome.org/show_bug.cgi?id=613765 - src/backend/bacon-video-widget-gst-0.10.c | 88 +++++++++++++++++++++++++++-- - src/backend/bacon-video-widget.h | 7 +-- - src/totem-object.c | 9 +-- + src/backend/bacon-video-widget-gst-0.10.c | 88 ++++++++++++++++++++++++++++--- + src/backend/bacon-video-widget.h | 7 ++- + src/totem-object.c | 9 ++-- 3 files changed, 90 insertions(+), 14 deletions(-) commit 51972c86024039acd16f647fede4e4faf29749fe @@ -4355,7 +8813,7 @@ backend: Add debug in bacon_video_widget_dvd_event() - src/backend/bacon-video-widget-gst-0.10.c | 40 ++++++++++++++++------------- + src/backend/bacon-video-widget-gst-0.10.c | 40 +++++++++++++++++-------------- 1 file changed, 22 insertions(+), 18 deletions(-) commit 936048534600d901a59c5e3ba4d747fa13988bf6 @@ -4368,7 +8826,7 @@ we can't use it to print out the metadata type. So ref it on _init() and unref on _finalize(). - src/backend/bacon-video-widget-gst-0.10.c | 4 ++++ + src/backend/bacon-video-widget-gst-0.10.c | 4 ++++ 1 file changed, 4 insertions(+) commit e228e07e633b797cf518d1c3e795942a631c308c @@ -4377,7 +8835,7 @@ [l10n]Fixes on Catalan translation - po/ca.po | 10 +++++----- + po/ca.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) commit f9e8196baa106ceb112914ce8fd26234e3d6388c @@ -4388,7 +8846,7 @@ To get the navigation support. - configure.in | 2 +- + configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 828e9a898b9f9e79514483f067fc843cfcb4587a @@ -4397,7 +8855,7 @@ backend: Remove unused ignore_messages_mask - src/backend/bacon-video-widget-gst-0.10.c | 12 ------------ + src/backend/bacon-video-widget-gst-0.10.c | 12 ------------ 1 file changed, 12 deletions(-) commit 5dca2b1572bebea614fc465b1bdee308917a5f96 @@ -4409,11 +8867,11 @@ As its only use is video now. Also update the callers appropriately. - browser-plugin/totem-plugin-viewer.c | 3 +- - src/backend/bacon-video-widget-gst-0.10.c | 365 ++++++----------------------- - src/backend/bacon-video-widget.h | 17 +- - src/backend/bvw-test.c | 2 +- - src/totem-object.c | 3 +- + browser-plugin/totem-plugin-viewer.c | 3 +- + src/backend/bacon-video-widget-gst-0.10.c | 365 +++++++----------------------- + src/backend/bacon-video-widget.h | 17 +- + src/backend/bvw-test.c | 2 +- + src/totem-object.c | 3 +- 5 files changed, 81 insertions(+), 309 deletions(-) commit b86fccb8be192ddb857fa694918776b602d02a31 @@ -4426,7 +8884,7 @@ as the file duration. Seek would have failed there, and we wouldn't be able to get a frame. - src/totem-video-thumbnailer.c | 5 ++++- + src/totem-video-thumbnailer.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit 66adb2027a928d4ca51722c4121c08d2d1acf275 @@ -4437,7 +8895,7 @@ No need for GTK+ or the video widget anymore. - src/totem-video-thumbnailer.c | 389 ++++++++++++++++++++++++----------------- + src/totem-video-thumbnailer.c | 389 +++++++++++++++++++++++++----------------- 1 file changed, 232 insertions(+), 157 deletions(-) commit aebb0ec01c397105fc4092dddb66dac3f39d5646 @@ -4446,7 +8904,7 @@ backend: Use helper function to get the cover image - src/backend/bacon-video-widget-gst-0.10.c | 86 ++--------------------------- + src/backend/bacon-video-widget-gst-0.10.c | 86 +++---------------------------- 1 file changed, 6 insertions(+), 80 deletions(-) commit 68c8664b16ad4c0acc102193c652d3af64cd5a5e @@ -4457,8 +8915,8 @@ Thus saving us the trouble of doing that. - src/gst/totem-gst-helpers.c | 88 +++++++++++++++++++++++++++++++++++++++++++ - src/gst/totem-gst-helpers.h | 2 + + src/gst/totem-gst-helpers.c | 88 +++++++++++++++++++++++++++++++++++++++++++++ + src/gst/totem-gst-helpers.h | 2 ++ 2 files changed, 90 insertions(+) commit 785801a67b0da5360781d82a6af5179b10e4b3f2 @@ -4469,7 +8927,7 @@ Don't wait for state change for non-capture. Duh! - src/backend/bacon-video-widget-gst-0.10.c | 22 +++++++++++++++------- + src/backend/bacon-video-widget-gst-0.10.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) commit 7e74539eb9681eefc9e01fbd65c2aa37c426d7a7 @@ -4478,7 +8936,7 @@ backend: Remove some dead code - src/backend/bacon-video-widget-gst-0.10.c | 5 ----- + src/backend/bacon-video-widget-gst-0.10.c | 5 ----- 1 file changed, 5 deletions(-) commit 0bf512defe6a547187c91faa9c6860e845eba0a0 @@ -4487,7 +8945,7 @@ media-player-keys: Fix potential double-unrefs in cancellation handling - .../media-player-keys/totem-media-player-keys.c | 44 ++++++++++++-------- + .../media-player-keys/totem-media-player-keys.c | 44 +++++++++++++--------- 1 file changed, 26 insertions(+), 18 deletions(-) commit c43a55d9238135a203e5c1f1a9afd2fdf4b40504 @@ -4504,7 +8962,7 @@ Closes: bgo#645739 - src/plugins/Makefile.plugins | 2 +- + src/plugins/Makefile.plugins | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 82d02a1978c34339bc9bc514a041bb4266e08a74 @@ -4518,7 +8976,7 @@ Helps: bgo#645739 - src/plugins/iplayer/iplayer2.py | 2 +- + src/plugins/iplayer/iplayer2.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 6ff883d5d709ff986dda162958c2514ddb4bc5c9 @@ -4529,7 +8987,7 @@ Helps: bgo#645739 - src/plugins/jamendo/jamendo.py | 3 --- + src/plugins/jamendo/jamendo.py | 3 --- 1 file changed, 3 deletions(-) commit 6df002636a818c9185defdb8857696181ed4039f @@ -4543,7 +9001,7 @@ Helps: bgo#645739 - src/plugins/pythonconsole/pythonconsole.py | 2 +- + src/plugins/pythonconsole/pythonconsole.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit d43f3ee0a3876139dc4739006bc3bdb980e33fab @@ -4557,11 +9015,11 @@ Helps: bgo#645739 - src/plugins/iplayer/iplayer.py | 4 +- - src/plugins/iplayer/iplayer2.py | 1 + - src/plugins/jamendo/jamendo.py | 79 ++++++++++++++-------------- - src/plugins/opensubtitles/opensubtitles.py | 9 ++-- - src/plugins/pythonconsole/pythonconsole.py | 2 +- + src/plugins/iplayer/iplayer.py | 4 +- + src/plugins/iplayer/iplayer2.py | 1 + + src/plugins/jamendo/jamendo.py | 79 +++++++++++++++--------------- + src/plugins/opensubtitles/opensubtitles.py | 9 ++-- + src/plugins/pythonconsole/pythonconsole.py | 2 +- 5 files changed, 48 insertions(+), 47 deletions(-) commit 1bad4959dc3097b639f1875273af8d2ce6f7c3e8 @@ -4572,7 +9030,7 @@ Helps: bgo#645739 - src/plugins/pythonconsole/pythonconsole.py | 15 ++++++++------- + src/plugins/pythonconsole/pythonconsole.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) commit d8704a0ff1cf0af37ebeb686362241b596f512b1 @@ -4586,7 +9044,7 @@ Helps: bgo#645739 - src/plugins/samplepython/samplepython.py | 6 +++++- + src/plugins/samplepython/samplepython.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) commit 22f4325e41242d78c5bc85326a502a7dfe2ac81e @@ -4600,13 +9058,13 @@ Helps: bgo#645739 - configure.in | 4 ++-- - src/plugins/sample-python/Makefile.am | 14 -------------- - src/plugins/sample-python/sample-python.plugin.in | 9 --------- - src/plugins/sample-python/sample-python.py | 15 --------------- - src/plugins/samplepython/Makefile.am | 14 ++++++++++++++ - src/plugins/samplepython/samplepython.plugin.in | 9 +++++++++ - src/plugins/samplepython/samplepython.py | 15 +++++++++++++++ + configure.in | 4 ++-- + src/plugins/sample-python/Makefile.am | 14 -------------- + src/plugins/sample-python/sample-python.plugin.in | 9 --------- + src/plugins/sample-python/sample-python.py | 15 --------------- + src/plugins/samplepython/Makefile.am | 14 ++++++++++++++ + src/plugins/samplepython/samplepython.plugin.in | 9 +++++++++ + src/plugins/samplepython/samplepython.py | 15 +++++++++++++++ 7 files changed, 40 insertions(+), 40 deletions(-) commit db0a8453beb7903083fcf83306fb72afeb8f98fd @@ -4617,7 +9075,7 @@ Helps: bgo#645739 - src/plugins/opensubtitles/opensubtitles.py | 321 ++++++++++++++-------------- + src/plugins/opensubtitles/opensubtitles.py | 321 ++++++++++++++--------------- 1 file changed, 160 insertions(+), 161 deletions(-) commit b53288d4a6412e118fdfb118862036aa49483ee1 @@ -4628,7 +9086,7 @@ Helps: bgo#645739 - src/plugins/opensubtitles/opensubtitles.py | 16 ---------------- + src/plugins/opensubtitles/opensubtitles.py | 16 ---------------- 1 file changed, 16 deletions(-) commit c6d0abfdac66f7c829d0fe5322258df4103db582 @@ -4639,7 +9097,7 @@ Helps: bgo#645739 - src/plugins/opensubtitles/opensubtitles.py | 108 ++++++++++++++-------------- + src/plugins/opensubtitles/opensubtitles.py | 108 +++++++++++++++-------------- 1 file changed, 55 insertions(+), 53 deletions(-) commit a90f4c1070e0320db69e26566f8e39a742bce7a9 @@ -4650,7 +9108,7 @@ Helps: bgo#645739 - src/plugins/jamendo/jamendo.py | 144 +++++++++++++++++++++------------------- + src/plugins/jamendo/jamendo.py | 144 +++++++++++++++++++++-------------------- 1 file changed, 74 insertions(+), 70 deletions(-) commit 223252a5505e6f2ae876785722c5f6dd9f2a6c6d @@ -4661,7 +9119,7 @@ Helps: bgo#645739 - src/plugins/iplayer/iplayer2.py | 2 -- + src/plugins/iplayer/iplayer2.py | 2 -- 1 file changed, 2 deletions(-) commit 809cc090bccb8a8b27d14fadd0165bb1b778e238 @@ -4672,8 +9130,8 @@ Helps: bgo#645739 - src/plugins/iplayer/iplayer.py | 62 +++++++++++++++++++++------------------ - src/plugins/iplayer/iplayer2.py | 60 ++++++++++++++++++------------------- + src/plugins/iplayer/iplayer.py | 62 ++++++++++++++++++++++------------------- + src/plugins/iplayer/iplayer2.py | 60 +++++++++++++++++++-------------------- 2 files changed, 63 insertions(+), 59 deletions(-) commit 13f09bd259e241f6d49966845cb5c26766ef430e @@ -4684,7 +9142,7 @@ Helps: bgo#645739 - src/plugins/iplayer/iplayer2.py | 4 ++-- + src/plugins/iplayer/iplayer2.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 0c7031036717b99e6f27eaa8892b7b07bf251390 @@ -4695,8 +9153,8 @@ Helps: bgo#645739 - src/plugins/iplayer/iplayer.py | 3 +-- - src/plugins/iplayer/iplayer2.py | 49 --------------------------------------- + src/plugins/iplayer/iplayer.py | 3 +-- + src/plugins/iplayer/iplayer2.py | 49 ----------------------------------------- 2 files changed, 1 insertion(+), 51 deletions(-) commit f16279679c2c12992d838078faedffeea961b648 @@ -4710,7 +9168,7 @@ Helps: bgo#645739 - src/plugins/dbusservice/dbusservice.py | 9 +++++---- + src/plugins/dbusservice/dbusservice.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) commit c790b14919ff9bca1bf0b919683590d307e9a90b @@ -4721,7 +9179,7 @@ Helps: bgo#645739 - src/plugins/dbusservice/dbusservice.py | 40 ++++++++++++++++---------------- + src/plugins/dbusservice/dbusservice.py | 40 +++++++++++++++++----------------- 1 file changed, 20 insertions(+), 20 deletions(-) commit 1b221443abb992ebacbb0aa6c0e9c8313f1518e7 @@ -4736,14 +9194,14 @@ Helps: bgo#645739 - src/plugins/coherence_upnp/coherence_upnp.py | 11 +++++------ - src/plugins/dbusservice/dbusservice.py | 10 +++++----- - src/plugins/iplayer/iplayer.py | 22 ++++++++++----------- - src/plugins/jamendo/jamendo.py | 25 +++++++++++------------- - src/plugins/opensubtitles/opensubtitles.py | 27 +++++++++++++------------- - src/plugins/pythonconsole/console.py | 15 ++++++-------- - src/plugins/pythonconsole/pythonconsole.py | 16 +++++++-------- - src/plugins/sample-python/sample-python.py | 8 +++----- + src/plugins/coherence_upnp/coherence_upnp.py | 11 +++++------ + src/plugins/dbusservice/dbusservice.py | 10 +++++----- + src/plugins/iplayer/iplayer.py | 22 +++++++++++----------- + src/plugins/jamendo/jamendo.py | 25 +++++++++++-------------- + src/plugins/opensubtitles/opensubtitles.py | 27 +++++++++++++-------------- + src/plugins/pythonconsole/console.py | 15 ++++++--------- + src/plugins/pythonconsole/pythonconsole.py | 16 ++++++++-------- + src/plugins/sample-python/sample-python.py | 8 +++----- 8 files changed, 62 insertions(+), 72 deletions(-) commit 70e2ff0041a4e6ad629c1e572bad986045317143 @@ -4757,13 +9215,13 @@ Helps: bgo#645739 - configure.in | 4 +- - src/plugins/dbus-service/Makefile.am | 8 - - src/plugins/dbus-service/dbus-service.plugin.in | 9 - - src/plugins/dbus-service/dbus-service.py | 360 ----------------------- - src/plugins/dbusservice/Makefile.am | 8 + - src/plugins/dbusservice/dbusservice.plugin.in | 9 + - src/plugins/dbusservice/dbusservice.py | 360 +++++++++++++++++++++++ + configure.in | 4 +- + src/plugins/dbus-service/Makefile.am | 8 - + src/plugins/dbus-service/dbus-service.plugin.in | 9 - + src/plugins/dbus-service/dbus-service.py | 360 ------------------------ + src/plugins/dbusservice/Makefile.am | 8 + + src/plugins/dbusservice/dbusservice.plugin.in | 9 + + src/plugins/dbusservice/dbusservice.py | 360 ++++++++++++++++++++++++ 7 files changed, 379 insertions(+), 379 deletions(-) commit 916484b28dc4e72b9efe30a8486e50f59f9b56e3 @@ -4776,11 +9234,11 @@ Helps: bgo#645739 - src/plugins/dbus-service/dbus-service.py | 5 +++++ - src/plugins/iplayer/iplayer.py | 3 +++ - src/plugins/iplayer/iplayer2.py | 15 +++++++++++++-- - src/plugins/jamendo/jamendo.py | 18 ++++++++++++++++++ - src/plugins/opensubtitles/opensubtitles.py | 25 +++++++++++++++++++++---- + src/plugins/dbus-service/dbus-service.py | 5 +++++ + src/plugins/iplayer/iplayer.py | 3 +++ + src/plugins/iplayer/iplayer2.py | 15 +++++++++++++-- + src/plugins/jamendo/jamendo.py | 18 ++++++++++++++++++ + src/plugins/opensubtitles/opensubtitles.py | 25 +++++++++++++++++++++---- 5 files changed, 60 insertions(+), 6 deletions(-) commit c1369b32235ac8b615d1850093896475f5e165a5 @@ -4791,13 +9249,13 @@ This shuts pylint up some more. Helps: bgo#645739 - src/plugins/coherence_upnp/coherence_upnp.py | 6 ++--- - src/plugins/iplayer/iplayer.py | 6 ++--- - src/plugins/iplayer/iplayer2.py | 12 ++++----- - src/plugins/iplayer/listparser.py | 11 ++++----- - src/plugins/jamendo/jamendo.py | 34 ++++++++++++-------------- - src/plugins/opensubtitles/opensubtitles.py | 25 +++++++++---------- - src/plugins/pythonconsole/pythonconsole.py | 6 ++--- + src/plugins/coherence_upnp/coherence_upnp.py | 6 ++--- + src/plugins/iplayer/iplayer.py | 6 ++--- + src/plugins/iplayer/iplayer2.py | 12 +++++----- + src/plugins/iplayer/listparser.py | 11 ++++----- + src/plugins/jamendo/jamendo.py | 34 +++++++++++++--------------- + src/plugins/opensubtitles/opensubtitles.py | 25 +++++++++----------- + src/plugins/pythonconsole/pythonconsole.py | 6 ++--- 7 files changed, 47 insertions(+), 53 deletions(-) commit 2c24f82a9c263f50edc502ce5f182a16df258e51 @@ -4808,15 +9266,15 @@ This shuts pylint up about those problems. Helps: bgo#645739 - src/plugins/coherence_upnp/coherence_upnp.py | 53 +++--- - src/plugins/dbus-service/dbus-service.py | 81 +++++---- - src/plugins/iplayer/iplayer.py | 6 +- - src/plugins/iplayer/iplayer2.py | 241 +++++++++++++------------- - src/plugins/iplayer/listparser.py | 38 ++-- - src/plugins/jamendo/jamendo.py | 121 +++++++------ - src/plugins/opensubtitles/hash.py | 32 ++-- - src/plugins/opensubtitles/opensubtitles.py | 69 ++++---- - src/plugins/pythonconsole/pythonconsole.py | 10 +- + src/plugins/coherence_upnp/coherence_upnp.py | 53 +++--- + src/plugins/dbus-service/dbus-service.py | 81 +++++---- + src/plugins/iplayer/iplayer.py | 6 +- + src/plugins/iplayer/iplayer2.py | 241 ++++++++++++++------------- + src/plugins/iplayer/listparser.py | 38 +++-- + src/plugins/jamendo/jamendo.py | 121 +++++++------- + src/plugins/opensubtitles/hash.py | 32 ++-- + src/plugins/opensubtitles/opensubtitles.py | 69 ++++---- + src/plugins/pythonconsole/pythonconsole.py | 10 +- 9 files changed, 344 insertions(+), 307 deletions(-) commit d850392744374e4caf6fcd06cfa435967e7f5dbc @@ -4827,12 +9285,12 @@ Helps: bgo#645739 - src/plugins/coherence_upnp/coherence_upnp.py | 3 +++ - src/plugins/dbus-service/dbus-service.py | 1 - - src/plugins/iplayer/iplayer.py | 1 - - src/plugins/iplayer/iplayer2.py | 1 - - src/plugins/jamendo/jamendo.py | 9 +++++++++ - src/plugins/opensubtitles/hash.py | 1 - + src/plugins/coherence_upnp/coherence_upnp.py | 3 +++ + src/plugins/dbus-service/dbus-service.py | 1 - + src/plugins/iplayer/iplayer.py | 1 - + src/plugins/iplayer/iplayer2.py | 1 - + src/plugins/jamendo/jamendo.py | 9 +++++++++ + src/plugins/opensubtitles/hash.py | 1 - 6 files changed, 12 insertions(+), 4 deletions(-) commit e9e33d203d7f162e147f3cb9ed603fead24bc62a @@ -4848,16 +9306,16 @@ Helps: bgo#645739 - src/plugins/coherence_upnp/coherence_upnp.py | 141 ++-- - src/plugins/dbus-service/dbus-service.py | 554 ++++++++-------- - src/plugins/iplayer/iplayer.py | 446 +++++++------ - src/plugins/iplayer/iplayer2.py | 891 ++++++++++++++------------ - src/plugins/iplayer/listparser.py | 93 +-- - src/plugins/jamendo/jamendo.py | 564 ++++++++-------- - src/plugins/opensubtitles/hash.py | 78 +-- - src/plugins/opensubtitles/opensubtitles.py | 808 ++++++++++++----------- - src/plugins/pythonconsole/pythonconsole.py | 203 +++--- - src/plugins/sample-python/sample-python.py | 18 +- + src/plugins/coherence_upnp/coherence_upnp.py | 141 +++-- + src/plugins/dbus-service/dbus-service.py | 554 +++++++++-------- + src/plugins/iplayer/iplayer.py | 446 +++++++------- + src/plugins/iplayer/iplayer2.py | 891 ++++++++++++++------------- + src/plugins/iplayer/listparser.py | 93 +-- + src/plugins/jamendo/jamendo.py | 564 +++++++++-------- + src/plugins/opensubtitles/hash.py | 78 +-- + src/plugins/opensubtitles/opensubtitles.py | 808 ++++++++++++------------ + src/plugins/pythonconsole/pythonconsole.py | 203 +++--- + src/plugins/sample-python/sample-python.py | 18 +- 10 files changed, 2010 insertions(+), 1786 deletions(-) commit 72b30cdba63ddf722e74920f34341f6ae3db7a8f @@ -4868,7 +9326,7 @@ Helps: bgo#645739 - src/plugins/Makefile.plugins | 19 +++++++++++++++++++ + src/plugins/Makefile.plugins | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) commit 9729f456292e8b0500a45b1716663e579f44b645 @@ -4879,7 +9337,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=645864 - src/eggfileformatchooser.c | 5 +++++ + src/eggfileformatchooser.c | 5 +++++ 1 file changed, 5 insertions(+) commit e116133b421454c8d9708a6338a7f0d1c3846854 @@ -4894,8 +9352,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=646162 - configure.in | 2 +- - .../media-player-keys/totem-media-player-keys.c | 270 +++++++++++++------- + configure.in | 2 +- + .../media-player-keys/totem-media-player-keys.c | 270 +++++++++++++-------- 2 files changed, 174 insertions(+), 98 deletions(-) commit 2bd46773bc1648cb3456bba371e7d6edfd4d837c @@ -4906,9 +9364,9 @@ To share it between the capture code and the video widget. - src/backend/bacon-video-widget-gst-0.10.c | 68 +------------------------- - src/gst/totem-gst-helpers.c | 75 +++++++++++++++++++++++++++++ - src/gst/totem-gst-helpers.h | 3 ++ + src/backend/bacon-video-widget-gst-0.10.c | 68 +--------------------------- + src/gst/totem-gst-helpers.c | 75 +++++++++++++++++++++++++++++++ + src/gst/totem-gst-helpers.h | 3 ++ 3 files changed, 79 insertions(+), 67 deletions(-) commit cd9f4a7901bf39030eeb6e3d8773089949f7f307 @@ -4917,7 +9375,7 @@ plugins: Fix building the media-player-keys plugin - configure.in | 2 +- + configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 262ef63f437d6e9f7d2063ac963f2a78e9a2a707 @@ -4928,7 +9386,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=643715 - data/mime-type-list.txt | 2 ++ + data/mime-type-list.txt | 2 ++ 1 file changed, 2 insertions(+) commit 4030a5a41167a43af518bf926ac2936316c797e3 @@ -4939,7 +9397,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=646163 - configure.in | 28 ++-------------------------- + configure.in | 28 ++-------------------------- 1 file changed, 2 insertions(+), 26 deletions(-) commit f782e2e18269c6c6279d14699aa87fcce9d68f3b @@ -4950,10 +9408,10 @@ Until we get a solution for this directly in ClutterGst - src/backend/Makefile.am | 4 +- - src/backend/bacon-video-widget-gst-0.10.c | 9 +- - src/backend/totem-aspect-frame.c | 399 +++++++++++++++++++++++++++++ - src/backend/totem-aspect-frame.h | 91 +++++++ + src/backend/Makefile.am | 4 +- + src/backend/bacon-video-widget-gst-0.10.c | 9 +- + src/backend/totem-aspect-frame.c | 399 ++++++++++++++++++++++++++++++ + src/backend/totem-aspect-frame.h | 91 +++++++ 4 files changed, 498 insertions(+), 5 deletions(-) commit 83002fd6e010316e0f4c94a37b003c9930847923 @@ -4965,7 +9423,7 @@ We don't use the "frame" property of playbin, no need to check for it. - src/backend/bacon-video-widget-gst-0.10.c | 8 -------- + src/backend/bacon-video-widget-gst-0.10.c | 8 -------- 1 file changed, 8 deletions(-) commit ef9ab89bc818084ff6548a4c0b354fdee1d616b6 @@ -4978,12 +9436,12 @@ https://bugzilla.gnome.org/show_bug.cgi?id=611169 - data/properties.ui | 36 ++++++++++++++++++++++- - src/backend/bacon-video-widget-gst-0.10.c | 7 +++++ - src/backend/bacon-video-widget.h | 1 + - src/plugins/properties/totem-movie-properties.c | 1 + - src/properties/bacon-video-widget-properties.c | 4 ++- - src/totem-properties-view.c | 18 ++++++++++++ + data/properties.ui | 36 ++++++++++++++++++++++++- + src/backend/bacon-video-widget-gst-0.10.c | 7 +++++ + src/backend/bacon-video-widget.h | 1 + + src/plugins/properties/totem-movie-properties.c | 1 + + src/properties/bacon-video-widget-properties.c | 4 ++- + src/totem-properties-view.c | 18 +++++++++++++ 6 files changed, 65 insertions(+), 2 deletions(-) commit 7c83fe357ed55a944d57234ec31acc7d8b94d1ba @@ -4995,7 +9453,7 @@ We've already got an enum proper, no need to copy/paste something done by hand. - src/backend/bacon-video-widget-gst-0.10.c | 40 ++++++++--------------------- + src/backend/bacon-video-widget-gst-0.10.c | 40 ++++++++----------------------- 1 file changed, 10 insertions(+), 30 deletions(-) commit a47e63ced7864ccd11dcc71a8aefd0f9eabd7487 @@ -5004,7 +9462,7 @@ audio-preview: Remove GTK+ dep - src/totem-audio-preview.c | 26 +++++++++++--------------- + src/totem-audio-preview.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) commit 3187bfd489cc58e35a71e1cdbf8900e5aefd19b2 @@ -5017,13 +9475,13 @@ applications, and it ends up being of bad quality compared to the default icon, as well as murking up application discovery. - configure.in | 11 +- - po/POTFILES.in | 1 - - src/backend/bacon-video-widget-gst-0.10.c | 54 +-------- - src/backend/bacon-video-widget.h | 2 - - src/plugins/thumbnail/Makefile.am | 13 --- - src/plugins/thumbnail/thumbnail.plugin.in | 8 -- - src/plugins/thumbnail/totem-thumbnail.c | 179 ----------------------------- + configure.in | 11 +- + po/POTFILES.in | 1 - + src/backend/bacon-video-widget-gst-0.10.c | 54 +-------- + src/backend/bacon-video-widget.h | 2 - + src/plugins/thumbnail/Makefile.am | 13 --- + src/plugins/thumbnail/thumbnail.plugin.in | 8 -- + src/plugins/thumbnail/totem-thumbnail.c | 179 ------------------------------ 7 files changed, 4 insertions(+), 264 deletions(-) commit 3fc3078374f7e8485390704616792817dcacec7b @@ -5035,7 +9493,7 @@ Rather than going through gconfaudiosink, which doesn't bring us anything interesting with PulseAudio. - src/backend/bacon-video-widget-gst-0.10.c | 11 +---------- + src/backend/bacon-video-widget-gst-0.10.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) commit 80dc77a54fab67d69129e7035d541bae09146ddc @@ -5044,7 +9502,7 @@ backend: Remove useless call - src/backend/bacon-video-widget-gst-0.10.c | 3 --- + src/backend/bacon-video-widget-gst-0.10.c | 3 --- 1 file changed, 3 deletions(-) commit 0b48fa8f7253a80b7f9e80ce8556a6413ed21296 @@ -5055,12 +9513,12 @@ https://bugzilla.gnome.org/show_bug.cgi?id=639860 - src/plugins/properties/Makefile.am | 1 + - src/plugins/properties/totem-movie-properties.c | 123 +++++++++- - src/properties/bacon-video-widget-properties.c | 115 --------- - src/properties/bacon-video-widget-properties.h | 2 - - src/test-properties-page.c | 51 ++-- - src/totem-properties-view.c | 295 +++++++++++++++++------ + src/plugins/properties/Makefile.am | 1 + + src/plugins/properties/totem-movie-properties.c | 123 +++++++++- + src/properties/bacon-video-widget-properties.c | 115 --------- + src/properties/bacon-video-widget-properties.h | 2 - + src/test-properties-page.c | 51 ++-- + src/totem-properties-view.c | 295 ++++++++++++++++++------ 6 files changed, 364 insertions(+), 223 deletions(-) commit e34d6a87062913cdbbfdc5d196ea077d5bcb5508 @@ -5071,8 +9529,8 @@ So we can use GstDiscoverer instead. - src/properties/bacon-video-widget-properties.c | 115 +++++++++++++++--------- - src/properties/bacon-video-widget-properties.h | 14 ++- + src/properties/bacon-video-widget-properties.c | 115 ++++++++++++++++--------- + src/properties/bacon-video-widget-properties.h | 14 ++- 2 files changed, 83 insertions(+), 46 deletions(-) commit 1cd2c5bba6c793069dffb43a9a39c027f8a84513 @@ -5081,14 +9539,14 @@ backend: Use helper functions for GStreamer - configure.in | 1 + - src/Makefile.am | 8 +-- - src/backend/Makefile.am | 14 +++--- - src/backend/bacon-video-widget-gst-0.10.c | 47 ++---------------- - src/gst/Makefile.am | 29 +++++++++++ - src/gst/totem-gst-helpers.c | 77 +++++++++++++++++++++++++++++ - src/gst/totem-gst-helpers.h | 55 +++++++++++++++++++++ - src/totem-audio-preview.c | 31 +----------- + configure.in | 1 + + src/Makefile.am | 8 ++-- + src/backend/Makefile.am | 14 +++--- + src/backend/bacon-video-widget-gst-0.10.c | 47 ++----------------- + src/gst/Makefile.am | 29 ++++++++++++ + src/gst/totem-gst-helpers.c | 77 +++++++++++++++++++++++++++++++ + src/gst/totem-gst-helpers.h | 55 ++++++++++++++++++++++ + src/totem-audio-preview.c | 31 +------------ 8 files changed, 180 insertions(+), 82 deletions(-) commit 50dfd566bf517a5ef21de9869845dda6674ddbd5 @@ -5097,8 +9555,8 @@ build: Remove left-over XVIDMODE_LIBS usage - browser-plugin/Makefile.am | 1 - - src/backend/Makefile.am | 2 -- + browser-plugin/Makefile.am | 1 - + src/backend/Makefile.am | 2 -- 2 files changed, 3 deletions(-) commit bc13fb898e2bf78080bb9d336f567ef9aceda949 @@ -5107,7 +9565,7 @@ backend: Avoid warnings in metadata mode - src/backend/bacon-video-widget-gst-0.10.c | 3 +++ + src/backend/bacon-video-widget-gst-0.10.c | 3 +++ 1 file changed, 3 insertions(+) commit 6065ee564c12a9eed66ac78f815bf518a03543cb @@ -5124,10 +9582,10 @@ https://bugzilla.gnome.org/show_bug.cgi?id=640933 - src/backend/Makefile.am | 4 +- - src/backend/bacon-video-widget-gst-0.10.c | 34 ++--- - src/backend/gstscreenshot.c | 202 ----------------------------- - src/backend/gstscreenshot.h | 32 ----- + src/backend/Makefile.am | 4 +- + src/backend/bacon-video-widget-gst-0.10.c | 34 ++--- + src/backend/gstscreenshot.c | 202 ------------------------------ + src/backend/gstscreenshot.h | 32 ----- 4 files changed, 10 insertions(+), 262 deletions(-) commit 399549e66a4961d7287c08a01b2f6b837c8f5fbe @@ -5140,11 +9598,11 @@ https://bugzilla.gnome.org/show_bug.cgi?id=637937 - configure.in | 13 -- - src/backend/Makefile.am | 1 - - src/backend/bacon-resize.c | 350 ----------------------------- - src/backend/bacon-resize.h | 55 ----- - src/backend/bacon-video-widget-gst-0.10.c | 36 --- + configure.in | 13 -- + src/backend/Makefile.am | 1 - + src/backend/bacon-resize.c | 350 ------------------------------ + src/backend/bacon-resize.h | 55 ----- + src/backend/bacon-video-widget-gst-0.10.c | 36 --- 5 files changed, 455 deletions(-) commit e66257dc50ee62c10a3ca49501a5d560d72b2e04 @@ -5153,7 +9611,7 @@ audio-preview: Simplify flags setting - src/totem-audio-preview.c | 19 +++---------------- + src/totem-audio-preview.c | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) commit 356180dee55adff03840077d126b8704e136feb0 @@ -5165,8 +9623,8 @@ This was for Beagle, and that doesn't exist. And Tracker uses its own stuff. - src/Makefile.am | 21 +---- - src/totem-video-indexer.c | 219 --------------------------------------------- + src/Makefile.am | 21 +---- + src/totem-video-indexer.c | 219 ---------------------------------------------- 2 files changed, 1 insertion(+), 239 deletions(-) commit ff1665203de3ed2ba71aba1bad7a638da6981a00 @@ -5175,7 +9633,7 @@ browser: Update for latest bvw API changes - browser-plugin/totem-plugin-viewer.c | 44 ++++++++++------------------------ + browser-plugin/totem-plugin-viewer.c | 44 ++++++++++-------------------------- 1 file changed, 12 insertions(+), 32 deletions(-) commit 6003a451061bde43525489fa19401f20fc47adc8 @@ -5184,8 +9642,8 @@ backend: Remove audio playback type - src/backend/bacon-video-widget-gst-0.10.c | 71 +++++++++-------------------- - src/backend/bacon-video-widget.h | 2 - + src/backend/bacon-video-widget-gst-0.10.c | 71 ++++++++++--------------------- + src/backend/bacon-video-widget.h | 2 - 2 files changed, 22 insertions(+), 51 deletions(-) commit 9ef416ce9b3bc95a9cc6dca3c1e5a20b9488ddef @@ -5194,7 +9652,7 @@ audio-preview: Use GStreamer directly - src/totem-audio-preview.c | 134 +++++++++++++++++++++++++++++++++++++-------- + src/totem-audio-preview.c | 134 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 112 insertions(+), 22 deletions(-) commit cb53bbda6b56d3c2e2f78331fa436cb0382bd14e @@ -5216,19 +9674,19 @@ https://bugzilla.gnome.org/show_bug.cgi?id=646364 - configure.in | 4 +- - data/totem.ui | 33 +- - src/backend/Makefile.am | 1 + - src/backend/bacon-video-widget-gst-0.10.c | 927 +++++++---------------------- - src/backend/bacon-video-widget.h | 26 +- - src/backend/bvw-test.c | 20 +- - src/totem-audio-preview.c | 2 +- - src/totem-menu.c | 23 +- - src/totem-object.c | 92 +-- - src/totem-private.h | 4 +- - src/totem-properties-view.c | 2 +- - src/totem-video-indexer.c | 2 +- - src/totem-video-thumbnailer.c | 2 +- + configure.in | 4 +- + data/totem.ui | 33 +- + src/backend/Makefile.am | 1 + + src/backend/bacon-video-widget-gst-0.10.c | 927 +++++++----------------------- + src/backend/bacon-video-widget.h | 26 +- + src/backend/bvw-test.c | 20 +- + src/totem-audio-preview.c | 2 +- + src/totem-menu.c | 23 +- + src/totem-object.c | 92 +-- + src/totem-private.h | 4 +- + src/totem-properties-view.c | 2 +- + src/totem-video-indexer.c | 2 +- + src/totem-video-thumbnailer.c | 2 +- 13 files changed, 282 insertions(+), 856 deletions(-) commit b689d62107490d91d1e1a8060d821a160b931862 @@ -5237,8 +9695,8 @@ 3.0.0 - NEWS | 5 +++++ - configure.in | 6 +++--- + NEWS | 5 +++++ + configure.in | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) commit a2e7ade7fc6330dc2eda207af2d057ed5c402952 @@ -5247,7 +9705,7 @@ [l10n] Updated German translation, umlauts fixed - po/de.po | 6 +++--- + po/de.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 645930a673fbab1d3832f7a61016a5a20fbc0870 @@ -5284,7 +9742,7 @@ Updated Tamil translation - po/ta.po | 158 ++++++++++++++++++++++++++------------------------------------ + po/ta.po | 158 ++++++++++++++++++++++++++------------------------------------- 1 file changed, 66 insertions(+), 92 deletions(-) commit 15d48c01a1074de643a8b861ad8e22fb86113a7b @@ -5302,7 +9760,7 @@ Updated Slovak translation of locations - po/sk.po | 485 ++++++++++++++++++++++++-------------------------------------- + po/sk.po | 485 ++++++++++++++++++++++++--------------------------------------- 1 file changed, 186 insertions(+), 299 deletions(-) commit 0c0e005bd5ce149dbec47b056dbd835929d634ce @@ -5335,7 +9793,7 @@ Closes: bgo#646245 - src/plugins/jamendo/jamendo.py | 19 ++++++++++--------- + src/plugins/jamendo/jamendo.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) commit 87cdefd461dfe8d3bfa4055f78bdb514c31ccf09 @@ -5350,7 +9808,7 @@ Helps: bgo#646245 - src/plugins/jamendo/jamendo.py | 4 ++-- + src/plugins/jamendo/jamendo.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 0db439ab4e84ff49c7f4011093c7df74097dc781 @@ -5362,7 +9820,7 @@ This means the subtitle file can actually be saved, allowing subtitles to be downloaded and loaded correctly. - src/plugins/opensubtitles/opensubtitles.py | 2 +- + src/plugins/opensubtitles/opensubtitles.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 905f245233688aa6b4e9efb5e355ef7554963c13 @@ -5373,7 +9831,7 @@ Guess what? Another bug caused by GIR changes for GDK! - src/plugins/opensubtitles/opensubtitles.py | 2 +- + src/plugins/opensubtitles/opensubtitles.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit faa342e0cd52171a34be8d8f68e9b3bfcc902794 @@ -5387,7 +9845,7 @@ Closes: bgo#646231 - src/plugins/opensubtitles/opensubtitles.py | 5 +++-- + src/plugins/opensubtitles/opensubtitles.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit f7cc61859bb44a0826e7cb57143a34aa57ed7197 @@ -5396,7 +9854,7 @@ Updated British English translation - po/en_GB.po | 520 ++++++++++++++++++++++++++++++----------------------------- + po/en_GB.po | 520 +++++++++++++++++++++++++++++++----------------------------- 1 file changed, 266 insertions(+), 254 deletions(-) commit 0f2494a233597bb57ea057aef4a4366bc36e30de @@ -5405,8 +9863,8 @@ Updated Traditional Chinese translation(Hong Kong and Taiwan) - po/zh_HK.po | 475 +++++++++++++++++++++++++++++----------------------------- - po/zh_TW.po | 476 ++++++++++++++++++++++++++++++----------------------------- + po/zh_HK.po | 475 ++++++++++++++++++++++++++++++----------------------------- + po/zh_TW.po | 476 ++++++++++++++++++++++++++++++------------------------------ 2 files changed, 476 insertions(+), 475 deletions(-) commit 2b9c4d10f9912ce4561a3197025e7d616e66dca2 @@ -5437,7 +9895,7 @@ Uploaded Ukranian - po/uk.po | 318 +++++++++++++++++++++++++++++++------------------------------- + po/uk.po | 318 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 158 insertions(+), 160 deletions(-) commit cd5b927b5e0ecf569842f9e4367f548fbddbebcf @@ -5446,7 +9904,7 @@ Uploaded Ukranian - po/uk.po | 2 +- + po/uk.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit f3e954445c597e435faf0b63a9338d11cd1df4cc @@ -5455,7 +9913,7 @@ Uploaded Ukranian - po/uk.po | 529 +++++++++++++++++++++++++++++++------------------------------- + po/uk.po | 529 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 264 insertions(+), 265 deletions(-) commit 1dcf5bc1469ecfb8f75fc3aac075c1749b986733 @@ -5464,8 +9922,8 @@ 2.91.93 - NEWS | 5 +++++ - configure.in | 2 +- + NEWS | 5 +++++ + configure.in | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) commit 35f017d24464294128dfedde1d780a849f6fc2f7 @@ -5483,7 +9941,7 @@ Updated Vietnamese translation - po/vi.po | 352 +++++++++++++++++++++++++------------------------------------- + po/vi.po | 352 +++++++++++++++++++++++++-------------------------------------- 1 file changed, 141 insertions(+), 211 deletions(-) commit 27cb1314f7c25497415622d9a79986669eaea45b @@ -5513,7 +9971,7 @@ Closes: bgo#645762 - src/plugins/pythonconsole/console.py | 21 +++++++++++---------- + src/plugins/pythonconsole/console.py | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) commit edebbb33433e8e30b7c5b401a89b3367f274330a @@ -5527,7 +9985,7 @@ Helps: bgo#645762 - src/plugins/pythonconsole/pythonconsole.py | 4 ++-- + src/plugins/pythonconsole/pythonconsole.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 5f7f6ca154d8828b579aa880f24c6190ff26eff8 @@ -5542,11 +10000,11 @@ https://bugzilla.gnome.org/show_bug.cgi?id=645687 - src/plugins/coherence_upnp/coherence_upnp.py | 3 ++- - src/plugins/iplayer/iplayer.py | 3 ++- - src/plugins/jamendo/jamendo.py | 3 ++- - src/plugins/opensubtitles/opensubtitles.py | 3 ++- - src/plugins/pythonconsole/pythonconsole.py | 3 ++- + src/plugins/coherence_upnp/coherence_upnp.py | 3 ++- + src/plugins/iplayer/iplayer.py | 3 ++- + src/plugins/jamendo/jamendo.py | 3 ++- + src/plugins/opensubtitles/opensubtitles.py | 3 ++- + src/plugins/pythonconsole/pythonconsole.py | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) commit 9d3a293215de528a7eb1ae20a2b7b0d93d33fbd2 @@ -5555,7 +10013,7 @@ Updated Brazilian Portuguese translation - po/pt_BR.po | 338 ++++++++++++++++++++--------------------------------------- + po/pt_BR.po | 338 ++++++++++++++++++++---------------------------------------- 1 file changed, 113 insertions(+), 225 deletions(-) commit 80ccd409a3e746170d50f288f814d021744831b2 @@ -5600,8 +10058,8 @@ 2.91.92 - NEWS | 7 +++++++ - configure.in | 2 +- + NEWS | 7 +++++++ + configure.in | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) commit 21fac7a36355d67263333b6747711fd14b524be0 @@ -5628,7 +10086,7 @@ Updated Latvian translation. - po/lv.po | 328 ++++++++++++++++++++++++-------------------------------------- + po/lv.po | 328 ++++++++++++++++++++++++--------------------------------------- 1 file changed, 125 insertions(+), 203 deletions(-) commit d444efed21e7d650b8cc6e3d39dc52355c19b454 @@ -5646,7 +10104,7 @@ playlist: set the 'inline-toolbar' style class to the bottom toolbar - data/playlist.ui | 3 +++ + data/playlist.ui | 3 +++ 1 file changed, 3 insertions(+) commit 42bb0e4b24f4d54812d05cbe14caeab6c0199f5b @@ -5655,7 +10113,7 @@ build: Require newer plparser for previous commit - configure.in | 2 +- + configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 73c71a93b5d157653fc2c361c673ea814cac5247 @@ -5674,12 +10132,12 @@ https://bugzilla.gnome.org/show_bug.cgi?id=644949 - data/playlist.ui | 2 ++ - src/totem-menu.c | 34 +++++++++++++++++++++++++++++++--- - src/totem-menu.h | 5 +++-- - src/totem-object.c | 14 +++++++------- - src/totem-playlist.c | 23 +++++++++++++++-------- - src/totem-playlist.h | 2 +- + data/playlist.ui | 2 ++ + src/totem-menu.c | 34 +++++++++++++++++++++++++++++++--- + src/totem-menu.h | 5 +++-- + src/totem-object.c | 14 +++++++------- + src/totem-playlist.c | 23 +++++++++++++++-------- + src/totem-playlist.h | 2 +- 6 files changed, 59 insertions(+), 21 deletions(-) commit 37ddeb0c2f6c63c2fd157df20b83298134124230 @@ -5692,7 +10150,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=644949 - src/backend/bacon-video-widget-gst-0.10.c | 8 ++++++-- + src/backend/bacon-video-widget-gst-0.10.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) commit 4eef3c6fe38fc8f8b12755e6a70d47d539456c45 @@ -5701,7 +10159,7 @@ browser-plugin: More plugin info in tests/index.html - browser-plugin/tests/index.html | 31 ++++++++++++++++++++++++------- + browser-plugin/tests/index.html | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) commit eb5304574e3328323b72dd373eca4850c1d515d5 @@ -5710,8 +10168,8 @@ Updated Romanian translation - help/ro/figures/totem_start_window.png | Bin 0 -> 44851 bytes - help/ro/ro.po | 474 ++++++++++++++++---------------- + help/ro/figures/totem_start_window.png | Bin 0 -> 44851 bytes + help/ro/ro.po | 474 +++++++++++++++++---------------- 2 files changed, 239 insertions(+), 235 deletions(-) commit d81e97b4f1b10cd25bcdcdd3a4f4e8d10394ff58 @@ -5720,7 +10178,7 @@ Updated Romanian translation - po/ro.po | 2 +- + po/ro.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit bbac50659fde3ea4184235f3c6d50ed433f69a05 @@ -5729,7 +10187,7 @@ Updated Romanian translation - help/ro/ro.po | 225 +++++++++++++++++++++++++++++---------------------------- + help/ro/ro.po | 225 ++++++++++++++++++++++++++++++---------------------------- 1 file changed, 115 insertions(+), 110 deletions(-) commit 6b2ebb2d0860069d14c1aebdaeebf330cf1641e9 @@ -5766,7 +10224,7 @@ Updated Portuguese translation - po/pt.po | 8 +++++--- + po/pt.po | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) commit ba79e973c17ff12635837bee4860fad035de705b @@ -5784,7 +10242,7 @@ Updated Romanian translation - po/ro.po | 426 +++++++++++++++++++++++++++----------------------------------- + po/ro.po | 426 +++++++++++++++++++++++++++------------------------------------ 1 file changed, 182 insertions(+), 244 deletions(-) commit 8a7ef59542b1ac4bf60d2643a21abfe89e52cc2b @@ -5793,7 +10251,7 @@ Updated Romanian translation - po/ro.po | 962 ++++++++++++++++++++++++++++++++++++-------------------------- + po/ro.po | 962 +++++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 566 insertions(+), 396 deletions(-) commit 7bad171eda63ea62b203c97ce6780aaf16976514 @@ -5802,7 +10260,7 @@ Updated Swedish translation - po/sv.po | 43 +++++++++++++++++++++---------------------- + po/sv.po | 43 +++++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 22 deletions(-) commit 499028669c6a695551bafa85a198b191b76b9726 @@ -5813,7 +10271,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=640365#c8 - configure.in | 4 ++-- + configure.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit a74de8045f299c7f08a79ce40171f1e40460418c @@ -5831,7 +10289,7 @@ Updated Arabic translation - po/ar.po | 292 +++++++++++++++++++++++++++++++------------------------------- + po/ar.po | 292 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 147 insertions(+), 145 deletions(-) commit 7f41e7fbeeee51807514c1b4445b818ffcf94c73 @@ -5844,7 +10302,7 @@ but the im-status will say the contrary, and we might end up with the screen locking as soon as we go fullscreen. - src/plugins/im-status/totem-im-status.c | 2 +- + src/plugins/im-status/totem-im-status.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 5b35409fc1031ecae493660fc71555652525fbc7 @@ -5853,7 +10311,7 @@ open-location: Make dialogue modal and wider by default - src/totem-open-location.c | 3 +++ + src/totem-open-location.c | 3 +++ 1 file changed, 3 insertions(+) commit f6ddecb97e704ec659f32f22ae3876793ba79962 @@ -5862,7 +10320,7 @@ lib: Don't unhibit with '0' as the cookie - lib/totem-scrsaver.c | 18 ++++++++++-------- + lib/totem-scrsaver.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) commit a59bdebea7cda505b9d423bfc47d5711732b29cb @@ -5873,7 +10331,7 @@ Spotted by Philip Withnall - src/plugins/screensaver/totem-screensaver.c | 5 ++++- + src/plugins/screensaver/totem-screensaver.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit 04bc89e785c6d65e222a7e18c4bdcab653449e59 @@ -5882,8 +10340,8 @@ 2.91.91 - NEWS | 13 +++++++++++++ - configure.in | 2 +- + NEWS | 13 +++++++++++++ + configure.in | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) commit f72705b3fa7d92d1ad2b058e7ad720939d89a9da @@ -5895,7 +10353,7 @@ And not just when we're setting the status bar status, otherwise we might miss the fact that it's playing or not. - src/totem-object.c | 2 ++ + src/totem-object.c | 2 ++ 1 file changed, 2 insertions(+) commit 7ce94b27186235a5fa54b9b59c28f36b20b4d1db @@ -5904,7 +10362,7 @@ screensaver: Use "window" property - src/plugins/screensaver/totem-screensaver.c | 4 +++- + src/plugins/screensaver/totem-screensaver.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit a1ed327b7522e884ed79dae4b7f4f57323adf365 @@ -5915,7 +10373,7 @@ So that we can pass the actual top-level window to the session. - lib/totem-scrsaver.c | 79 +++++++++++++++++++++++--------------------------- + lib/totem-scrsaver.c | 79 ++++++++++++++++++++++++---------------------------- 1 file changed, 36 insertions(+), 43 deletions(-) commit c6fc9c4785904cda4b648dbdbd24958d1010c4a1 @@ -5924,7 +10382,7 @@ lib: Use gnome-session to Inhibit idle - lib/totem-scrsaver.c | 18 ++++++++++++------ + lib/totem-scrsaver.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) commit f4eed1f68d3b4ca37c2e7440be37aeaef882a0d5 @@ -5933,7 +10391,7 @@ lib: Remove support for old screensaver API - lib/totem-scrsaver.c | 40 ++++------------------------------------ + lib/totem-scrsaver.c | 40 ++++------------------------------------ 1 file changed, 4 insertions(+), 36 deletions(-) commit ea224952e648bfa80025798fc597c182524e74b0 @@ -5942,7 +10400,7 @@ lib: Fix refcount when trying the old Inhibit method - lib/totem-scrsaver.c | 4 ++-- + lib/totem-scrsaver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 3b33d7bd88e9e69c7d45238f7f7e1027aa59ee88 @@ -5951,7 +10409,7 @@ Fix assertions on entry to TotemScrsaver methods - lib/totem-scrsaver.c | 6 +++--- + lib/totem-scrsaver.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 146d408461b8e7396c601855f85f87cf8ad41156 @@ -5969,7 +10427,7 @@ Remove Totem from launcher name translation, as per original string - po/it.po | 4 ++-- + po/it.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 3b7b2adba908640b83ad4b126a56fabd3c578fe7 @@ -5987,10 +10445,10 @@ Fix XML validation of translated help files - help/de/de.po | 21 ++++++++++----------- - help/fi/fi.po | 2 +- - help/it/it.po | 13 +++++++------ - help/pl/pl.po | 4 ++-- + help/de/de.po | 21 ++++++++++----------- + help/fi/fi.po | 2 +- + help/it/it.po | 13 +++++++------ + help/pl/pl.po | 4 ++-- 4 files changed, 20 insertions(+), 20 deletions(-) commit 3d469bf7845978d85b72385af2c8f49ad49cf52a @@ -6021,7 +10479,7 @@ Updated Swedish translation - po/sv.po | 523 ++++++++++++++++++++++++++++++-------------------------------- + po/sv.po | 523 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 257 insertions(+), 266 deletions(-) commit 949677253486a44a55ad86362b61ba392e266bee @@ -6030,7 +10488,7 @@ update Punjabi Translation by A S Alam - po/pa.po | 686 +++++++++++++++++++++++++++++++++----------------------------- + po/pa.po | 686 +++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 365 insertions(+), 321 deletions(-) commit 7b151e335017b950af5318f5bf7501960861d07e @@ -6039,7 +10497,7 @@ Fix spacing in the preferences dialog. - data/totem.ui | 24 ++++++++++++------------ + data/totem.ui | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) commit 5b8d92697ca7855f961ca97e9b35c2cd2f125e14 @@ -6064,7 +10522,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=640933 - src/backend/bacon-video-widget-gst-0.10.c | 10 ++++------ + src/backend/bacon-video-widget-gst-0.10.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) commit 5c1512896b0728b0f3365e502eb7b21a184cb4ab @@ -6077,7 +10535,7 @@ This ensures that if a builtin plugin isn't in the active-plugins list in GSettings, it will still get loaded and activated. Closes: bgo#642877 - src/plugins/totem-plugins-engine.c | 12 ++++++++++++ + src/plugins/totem-plugins-engine.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) commit 552bb14c9c85eb047c5c3feed55005e74d328322 @@ -6088,7 +10546,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=641855 - src/totem.h | 2 +- + src/totem.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 74d27d3ac8c449530493a08f4dcdd5635156793a @@ -6102,9 +10560,9 @@ https://bugzilla.gnome.org/show_bug.cgi?id=643239 - src/backend/video-utils.c | 34 ---------------------------------- - src/backend/video-utils.h | 2 -- - src/totem-preferences.c | 41 +---------------------------------------- + src/backend/video-utils.c | 34 ---------------------------------- + src/backend/video-utils.h | 2 -- + src/totem-preferences.c | 41 +---------------------------------------- 3 files changed, 1 insertion(+), 76 deletions(-) commit 2b9c8d1d494df0003175eb6d9fe2de339783c3f5 @@ -6115,7 +10573,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=641850 - data/totem.pc.in | 2 +- + data/totem.pc.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 160feea564c4789b02b278802bafbc5f7265f790 @@ -6126,7 +10584,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=621802 - src/totem-video-thumbnailer.c | 17 ++++++++++++----- + src/totem-video-thumbnailer.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) commit 72a6fbbb6be47ea59f793e1ffacfb03efa2d4447 @@ -6135,7 +10593,7 @@ Update Simplified Chinese translation. - po/zh_CN.po | 6 ++---- + po/zh_CN.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) commit c7e5cc588b42a59cfbc735e3230bd883f7369043 @@ -6144,7 +10602,7 @@ Update Simplified Chinese translation. - po/zh_CN.po | 910 +++++++++++++++++++++++++++++++++-------------------------- + po/zh_CN.po | 910 ++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 509 insertions(+), 401 deletions(-) commit ddfe98fba2418002ef19a0097aa0c025747c4218 @@ -6156,14 +10614,14 @@ No need for the galago stack any more, we'll use gnome-session's Presence API instead. - configure.in | 12 +- - po/POTFILES.in | 4 +- - src/plugins/galago/Makefile.am | 17 -- - src/plugins/galago/galago.plugin.in | 9 - - src/plugins/galago/totem-galago.c | 162 ------------------ - src/plugins/im-status/Makefile.am | 15 ++ - src/plugins/im-status/totem-im-status.c | 203 +++++++++++++++++++++++ - src/plugins/im-status/totem-im-status.plugin.in | 9 + + configure.in | 12 +- + po/POTFILES.in | 4 +- + src/plugins/galago/Makefile.am | 17 -- + src/plugins/galago/galago.plugin.in | 9 -- + src/plugins/galago/totem-galago.c | 162 ------------------- + src/plugins/im-status/Makefile.am | 15 ++ + src/plugins/im-status/totem-im-status.c | 203 ++++++++++++++++++++++++ + src/plugins/im-status/totem-im-status.plugin.in | 9 ++ 8 files changed, 231 insertions(+), 200 deletions(-) commit 675b686bbe61930a0e8070509f7fd088fbe45153 @@ -6172,7 +10630,7 @@ Updated Norwegian bokmål translation. - po/nb.po | 268 ++++++++++++++++++++++++++++++++------------------------------ + po/nb.po | 268 +++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 140 insertions(+), 128 deletions(-) commit 24c309fec02d0dd46f45b0780c8c08d4d5745b8e @@ -6187,7 +10645,7 @@ Launch Totem on a local file, with an already running instance, with a local file already opened. - src/plugins/save-file/totem-save-file.c | 7 ++++++- + src/plugins/save-file/totem-save-file.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) commit 111c7d7a9539ed904c535634c56ac5f79debfed3 @@ -6198,7 +10656,7 @@ And D-Bus shows up. - lib/totem-scrsaver.c | 3 ++- + lib/totem-scrsaver.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit a8c83da25a7e4799d627f0da81f00cf1757bf041 @@ -6207,8 +10665,8 @@ 2.91.7 - NEWS | 11 +++++++++++ - configure.in | 2 +- + NEWS | 11 +++++++++++ + configure.in | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) commit 157466dfc55b0315fda5f7731eedb9aa27540c83 @@ -6224,7 +10682,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=630711 - lib/totem-scrsaver.c | 3 +++ + lib/totem-scrsaver.c | 3 +++ 1 file changed, 3 insertions(+) commit 5f14977a5b546a8d4501f2ef6d4d0dbe182f95ae @@ -6233,7 +10691,7 @@ main: Hide OSD when switching off fullscreen - src/totem-fullscreen.c | 2 ++ + src/totem-fullscreen.c | 2 ++ 1 file changed, 2 insertions(+) commit b03857850632082f0517826ce3242fa1392f7e57 @@ -6253,7 +10711,7 @@ "dual-types" files such as MP4, and "unhandled" types such as AVI over SMB. - src/totem-playlist.c | 8 ++++---- + src/totem-playlist.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 68c5019448636f0d2f872dfd9b0e03a1cdf6b41b @@ -6266,7 +10724,7 @@ locale-dependent. Instead, we have to use the g_ascii_*() functions, and build our own parser. Closes: bgo#642758 - src/plugins/chapters/totem-cmml-parser.c | 135 ++++++++++++++++++++++++------ + src/plugins/chapters/totem-cmml-parser.c | 135 +++++++++++++++++++++++++------ 1 file changed, 110 insertions(+), 25 deletions(-) commit 6ab1e47cdbe0c5a47553c1170ee6c2313fc7e512 @@ -6275,7 +10733,7 @@ Updated Spanish translation - help/es/es.po | 11 +++-------- + help/es/es.po | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) commit 7b009542db3c590d51e5cbd61952e541a9161af7 @@ -6302,13 +10760,13 @@ Fix warnings spotted by new gcc - browser-plugin/totem-plugin-viewer.c | 3 --- - src/ev-sidebar.c | 2 -- - src/gsd-media-keys-window.c | 4 ---- - src/gsd-osd-window.c | 3 --- - src/plugins/chapters/totem-chapters.c | 2 -- - src/totem-menu.c | 1 + - src/totem-playlist.c | 5 ----- + browser-plugin/totem-plugin-viewer.c | 3 --- + src/ev-sidebar.c | 2 -- + src/gsd-media-keys-window.c | 4 ---- + src/gsd-osd-window.c | 3 --- + src/plugins/chapters/totem-chapters.c | 2 -- + src/totem-menu.c | 1 + + src/totem-playlist.c | 5 ----- 7 files changed, 1 insertion(+), 19 deletions(-) commit c4ad54bf515917b2efc12e1bbaed0670fd01b39c @@ -6317,7 +10775,7 @@ Make the plugin dialog bigger so it is more readable. - src/totem-menu.c | 1 + + src/totem-menu.c | 1 + 1 file changed, 1 insertion(+) commit 501807bfd40899f12bad3468bcad634024690d5a @@ -6335,7 +10793,7 @@ fix insertion with tags - src/plugins/pythonconsole/console.py | 11 ++++++----- + src/plugins/pythonconsole/console.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) commit 6da33d0d064e7dd6b5144d01ea1d73a8cde5b02d @@ -6344,9 +10802,9 @@ Update totem against latest libpeas API changes. - configure.in | 2 +- - src/plugins/totem-plugins-engine.c | 2 ++ - src/totem-menu.c | 2 +- + configure.in | 2 +- + src/plugins/totem-plugins-engine.c | 2 ++ + src/totem-menu.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) commit 9a5b8113a7d524f78c0d90b50a5aea700e0c04f4 @@ -6357,7 +10815,7 @@ See also https://bugzilla.gnome.org/show_bug.cgi?id=641996 - src/backend/video-utils.c | 43 +++++++++++++++++++++++++++++++++++++++---- + src/backend/video-utils.c | 43 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 39 insertions(+), 4 deletions(-) commit 9342606a43239cda9420bc1c0090988006f50404 @@ -6368,7 +10826,7 @@ If we exit before the plugins engine was setup, please don't crash. - src/totem-object.c | 3 ++- + src/totem-object.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit f3e2132a165d855310280569d7da7ae3a50b573c @@ -6377,11 +10835,11 @@ Added zeitgeist dataprovider plugin - configure.in | 16 +- - src/plugins/zeitgeist-dp/Makefile.am | 23 ++ - src/plugins/zeitgeist-dp/bacon-video.vapi | 40 ++++ - .../zeitgeist-dp/totem-zeitgeist-dp-plugin.vala | 229 ++++++++++++++++++++ - src/plugins/zeitgeist-dp/zeitgeist-dp.plugin.in | 8 + + configure.in | 16 +- + src/plugins/zeitgeist-dp/Makefile.am | 23 +++ + src/plugins/zeitgeist-dp/bacon-video.vapi | 40 ++++ + .../zeitgeist-dp/totem-zeitgeist-dp-plugin.vala | 229 +++++++++++++++++++++ + src/plugins/zeitgeist-dp/zeitgeist-dp.plugin.in | 8 + 5 files changed, 315 insertions(+), 1 deletion(-) commit 5be9be414e03bca8741e556474ec9179e084c5f0 @@ -6400,8 +10858,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=641672 - src/totem-object.c | 4 ++++ - src/totem-private.h | 3 +++ + src/totem-object.c | 4 ++++ + src/totem-private.h | 3 +++ 2 files changed, 7 insertions(+) commit 88e941301312f685d4c1cc9e407f34b589c5ca95 @@ -6410,7 +10868,7 @@ Updated Bulgarian translation - po/bg.po | 860 +++++++++++++++++++++++++++++++++----------------------------- + po/bg.po | 860 ++++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 461 insertions(+), 399 deletions(-) commit 136979f4d635b06b6df378d3112d8d695904cdbd @@ -6419,8 +10877,8 @@ 2.91.6 - NEWS | 8 ++++++++ - configure.in | 2 +- + NEWS | 8 ++++++++ + configure.in | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) commit 6b3f4f5f88f850578065251762cd7258f837c2b1 @@ -6431,7 +10889,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=640883 - Makefile.am | 2 ++ + Makefile.am | 2 ++ 1 file changed, 2 insertions(+) commit ddb9c8bf71f344759e12627aeb3de1f26a4a58ce @@ -6444,10 +10902,10 @@ https://bugzilla.gnome.org/show_bug.cgi?id=640947 - browser-plugin/totem-plugin-viewer.c | 6 +++--- - configure.in | 2 +- - src/backend/bacon-video-widget-gst-missing-plugins.c | 8 ++++---- - src/totem-interface.c | 4 ++-- + browser-plugin/totem-plugin-viewer.c | 6 +++--- + configure.in | 2 +- + src/backend/bacon-video-widget-gst-missing-plugins.c | 8 ++++---- + src/totem-interface.c | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) commit ca6b85a24bc20deb6b78ac7f8f8dd5908b2a9f4b @@ -6469,26 +10927,26 @@ Add libtotem.la to the LIBADD variable of all C plugins. Closes: bgo#640942 - src/plugins/Makefile.plugins | 3 +++ - src/plugins/bemused/Makefile.am | 4 +++- - src/plugins/brasero-disc-recorder/Makefile.am | 4 +++- - src/plugins/chapters/Makefile.am | 4 +++- - src/plugins/galago/Makefile.am | 4 +++- - src/plugins/gromit/Makefile.am | 1 + - src/plugins/lirc/Makefile.am | 4 +++- - src/plugins/media-player-keys/Makefile.am | 4 +++- - src/plugins/ontop/Makefile.am | 1 + - src/plugins/properties/Makefile.am | 4 +++- - src/plugins/publish/Makefile.am | 4 +++- - src/plugins/sample-vala/Makefile.am | 1 + - src/plugins/save-file/Makefile.am | 4 +++- - src/plugins/screensaver/Makefile.am | 1 + - src/plugins/screenshot/Makefile.am | 1 + - src/plugins/sidebar-test/Makefile.am | 1 + - src/plugins/skipto/Makefile.am | 1 + - src/plugins/thumbnail/Makefile.am | 1 + - src/plugins/tracker/Makefile.am | 1 + - src/plugins/youtube/Makefile.am | 3 ++- + src/plugins/Makefile.plugins | 3 +++ + src/plugins/bemused/Makefile.am | 4 +++- + src/plugins/brasero-disc-recorder/Makefile.am | 4 +++- + src/plugins/chapters/Makefile.am | 4 +++- + src/plugins/galago/Makefile.am | 4 +++- + src/plugins/gromit/Makefile.am | 1 + + src/plugins/lirc/Makefile.am | 4 +++- + src/plugins/media-player-keys/Makefile.am | 4 +++- + src/plugins/ontop/Makefile.am | 1 + + src/plugins/properties/Makefile.am | 4 +++- + src/plugins/publish/Makefile.am | 4 +++- + src/plugins/sample-vala/Makefile.am | 1 + + src/plugins/save-file/Makefile.am | 4 +++- + src/plugins/screensaver/Makefile.am | 1 + + src/plugins/screenshot/Makefile.am | 1 + + src/plugins/sidebar-test/Makefile.am | 1 + + src/plugins/skipto/Makefile.am | 1 + + src/plugins/thumbnail/Makefile.am | 1 + + src/plugins/tracker/Makefile.am | 1 + + src/plugins/youtube/Makefile.am | 3 ++- 20 files changed, 41 insertions(+), 10 deletions(-) commit 3bbc968ce21b0af0f586169cec87e60493d4af7c @@ -6505,7 +10963,7 @@ Closes: bgo#638567 - src/totem-object.c | 2 +- + src/totem-object.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 8cd55a6f9d12dbd939af87b52d699983cb1060db @@ -6514,7 +10972,7 @@ 2.91.5 - configure.in | 2 +- + configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit dc565126f6459940a8b6642f4e7fa2e1e1c7ba9c @@ -6525,7 +10983,7 @@ To avoid funny surprises. - configure.in | 10 +++++----- + configure.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) commit d931270bc97eaf90e74879b07dbe07e06f8d2f09 @@ -6536,7 +10994,7 @@ To prepare for release - NEWS | 27 +++++++++++++++++++++++++++ + NEWS | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) commit b8245b585074fe4a14147e6c00a222008a1bd2ad @@ -6547,10 +11005,10 @@ https://bugzilla.gnome.org/show_bug.cgi?id=639928 - configure.in | 6 +- - src/plugins/tracker/totem-tracker-widget.c | 634 +++++++++++++++++++--------- - src/plugins/tracker/totem-tracker-widget.h | 3 +- - src/plugins/tracker/tracker.plugin.in | 2 +- + configure.in | 6 +- + src/plugins/tracker/totem-tracker-widget.c | 634 ++++++++++++++++++++--------- + src/plugins/tracker/totem-tracker-widget.h | 3 +- + src/plugins/tracker/tracker.plugin.in | 2 +- 4 files changed, 450 insertions(+), 195 deletions(-) commit 713de9f69155dc03480c54486ae6e0b42783c03d @@ -6564,8 +11022,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=640109 - browser-plugin/test-glow-button.c | 6 ++++-- - browser-plugin/totem-glow-button.c | 3 ++- + browser-plugin/test-glow-button.c | 6 ++++-- + browser-plugin/totem-glow-button.c | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) commit 34c5d2af1b24725feedbb9e0a86017849d57bb52 @@ -6574,7 +11032,7 @@ Updated Slovenian translation - po/sl.po | 136 +++++++++++++++++++++++++++++++------------------------------- + po/sl.po | 136 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 68 insertions(+), 68 deletions(-) commit 3448cb53523494ce6a85f6e4abf37f9d6e61be05 @@ -6591,7 +11049,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=560151 - src/backend/video-utils.c | 175 ++++++++++++++++++++++++++++++++++++++++++--- + src/backend/video-utils.c | 175 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 165 insertions(+), 10 deletions(-) commit 09a39f6a9fd66dfb9021180974913d00b36769c6 @@ -6600,7 +11058,7 @@ backend: Remove unused TOTEM_OBJECT_HAS_SIGNAL macro - src/backend/video-utils.h | 2 -- + src/backend/video-utils.h | 2 -- 1 file changed, 2 deletions(-) commit a904455fc8c6cec9100cd8b8da5beaf25ef4ba39 @@ -6609,8 +11067,8 @@ backend: Add copyright notices to video-utils - src/backend/video-utils.c | 26 ++++++++++++++++++++++++++ - src/backend/video-utils.h | 26 ++++++++++++++++++++++++++ + src/backend/video-utils.c | 26 ++++++++++++++++++++++++++ + src/backend/video-utils.h | 26 ++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) commit 631ddd2fd90c1845631bc91fa1c006cd754902df @@ -6624,7 +11082,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=634184 - src/plugins/media-player-keys/totem-media-player-keys.c | 15 +++++++++++++++ + src/plugins/media-player-keys/totem-media-player-keys.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) commit ac2c89083183d5e540450db5d7c1d953449984c7 @@ -6636,7 +11094,7 @@ When trying to resize for the logo mode. Nobody wants a square movie player, it's too 1990's. - src/backend/bacon-video-widget-gst-0.10.c | 5 +++++ + src/backend/bacon-video-widget-gst-0.10.c | 5 +++++ 1 file changed, 5 insertions(+) commit 8bc05fac46fec63ce647187a6059173da2326de2 @@ -6649,8 +11107,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=636964 - data/playlist.ui | 401 +++++++++++++++++--------------------------------- - src/totem-playlist.c | 10 ++ + data/playlist.ui | 401 +++++++++++++++++---------------------------------- + src/totem-playlist.c | 10 ++ 2 files changed, 145 insertions(+), 266 deletions(-) commit 56a30194dcd124ee4f286e41b6bb10de3b8e5d89 @@ -6659,7 +11117,7 @@ QA of Galician translations - po/gl.po | 66 +++++++++++++++++++++++++++++++------------------------------- + po/gl.po | 66 ++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) commit 348abf58f3a25cb69df8509ea3e7a94d923c1707 @@ -6668,7 +11126,7 @@ Updated Norwegian bokmål translation - po/nb.po | 156 +++++++++++++++++++++++++++++++------------------------------- + po/nb.po | 156 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 78 insertions(+), 78 deletions(-) commit d13664c4911bae81027527a8a423492e8e2917e0 @@ -6677,7 +11135,7 @@ Updated Arabic translation - po/ar.po | 190 ++++++++++++++++++++++++-------------------------------------- + po/ar.po | 190 ++++++++++++++++++++++++--------------------------------------- 1 file changed, 73 insertions(+), 117 deletions(-) commit 310b9e3406f661023da26a54d30d59f760cd2ee6 @@ -6686,7 +11144,7 @@ Updated Arabic translation - po/ar.po | 226 +++++++++++++++++++++++++++++++++----------------------------- + po/ar.po | 226 ++++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 122 insertions(+), 104 deletions(-) commit 576a236859bd17fa8d054b43bcd85c8c9644bc7a @@ -6695,7 +11153,7 @@ Fix renamed file - po/POTFILES.in | 2 +- + po/POTFILES.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit ada23c9ebccaf5ad31071ffc145da94910bb0b1c @@ -6711,14 +11169,14 @@ Closes: bgo#640048 - configure.in | 1 + - src/Makefile.am | 10 +- - src/plugins/properties/Makefile.am | 13 +- - .../properties/bacon-video-widget-properties.c | 324 -------------------- - .../properties/bacon-video-widget-properties.h | 56 ---- - src/properties/Makefile.am | 17 + - src/properties/bacon-video-widget-properties.c | 324 ++++++++++++++++++++ - src/properties/bacon-video-widget-properties.h | 56 ++++ + configure.in | 1 + + src/Makefile.am | 10 +- + src/plugins/properties/Makefile.am | 13 +- + .../properties/bacon-video-widget-properties.c | 324 --------------------- + .../properties/bacon-video-widget-properties.h | 56 ---- + src/properties/Makefile.am | 17 ++ + src/properties/bacon-video-widget-properties.c | 324 +++++++++++++++++++++ + src/properties/bacon-video-widget-properties.h | 56 ++++ 8 files changed, 407 insertions(+), 394 deletions(-) commit dec323d0a3cd23274f05ba8b589d12a03bfb8ecf @@ -6733,7 +11191,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=640109 - browser-plugin/totem-glow-button.c | 5 +++++ + browser-plugin/totem-glow-button.c | 5 +++++ 1 file changed, 5 insertions(+) commit 821c1c3aac63838163de9fc13f7c51376e17e63a @@ -6745,7 +11203,7 @@ gtk_container_add() changed semantics, so use gtk_box_pack_start() instead. - src/totem-menu.c | 7 +++---- + src/totem-menu.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) commit 4708e7644515882fa109ca0e2dcfd622b6f11b01 @@ -6768,7 +11226,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=636964 - data/playlist.ui | 6 +++--- + data/playlist.ui | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 988cb9d1bcbaae50600d911c426f2fa32e05af30 @@ -6779,11 +11237,11 @@ So remove its usage from the whole of totem. - data/fullscreen.ui | 1 - - data/mozilla-viewer.ui | 1 - - data/totem.ui | 5 ----- - src/plugins/jamendo/jamendo.ui | 1 - - src/plugins/skipto/skipto.ui | 1 - + data/fullscreen.ui | 1 - + data/mozilla-viewer.ui | 1 - + data/totem.ui | 5 ----- + src/plugins/jamendo/jamendo.ui | 1 - + src/plugins/skipto/skipto.ui | 1 - 5 files changed, 9 deletions(-) commit d0881c3c4e3f914a0fca241d08c468cd1a947d58 @@ -6792,7 +11250,7 @@ Updated Greek translation - po/el.po | 80 +++++++++++++++++++++++++++++++------------------------------- + po/el.po | 80 ++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 40 insertions(+), 40 deletions(-) commit c382d29949275ae4780cdebc223d38d053917753 @@ -6805,7 +11263,7 @@ or nearest to always being bilinear. This should look better for the majority of cases. - src/totem-video-thumbnailer.c | 4 ++-- + src/totem-video-thumbnailer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 1e66a251b9044d280829f164d8b69f46a5dde139 @@ -6814,7 +11272,7 @@ Updated Spanish translation - po/es.po | 106 +++++++++++++++++++++++++++++++++++++------------------------- + po/es.po | 106 +++++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 63 insertions(+), 43 deletions(-) commit da34a1a7f17d01788da976b80da62c09bcd3b7c5 @@ -6823,7 +11281,7 @@ Updated Slovenian translation - po/sl.po | 64 +++++++++++++++++++++++++++++++++++++------------------------- + po/sl.po | 64 ++++++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 38 insertions(+), 26 deletions(-) commit 38700654f99e000d50c2a11aadc8688348e3f5a0 @@ -6832,7 +11290,7 @@ Updated Czech translation - po/cs.po | 87 +++++++++++++++++++++++++++++++++++++------------------------- + po/cs.po | 87 ++++++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 52 insertions(+), 35 deletions(-) commit 055b8f9bb5f82062221aeecebf5226a6b85a2bb9 @@ -6841,7 +11299,7 @@ Updated Norwegian bokmål translation - po/nb.po | 403 ++++++++++++++++++++++++++++++++++++-------------------------- + po/nb.po | 403 ++++++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 232 insertions(+), 171 deletions(-) commit 54b432a3e63974bf241cf6b5817aef7e2cbf320b @@ -6850,7 +11308,7 @@ [l10n] Updated Estonian translation - po/et.po | 56 ++++++++++++++++++++++++++++++++++++++------------------ + po/et.po | 56 ++++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 38 insertions(+), 18 deletions(-) commit ea1025b95bec71a1bc5b5af1c93e34801b24fd46 @@ -6864,11 +11322,11 @@ Note that you might need newer versions of gtk+ and gdk-pixbuf for this to work. - configure.in | 33 +++++++++++++++++++- - src/Makefile.am | 3 +- - src/plugins/sample-vala/Makefile.am | 24 ++++++++++++++ - src/plugins/sample-vala/sample-vala.plugin.in | 8 +++++ - .../sample-vala/totem-sample-vala-plugin.vala | 23 ++++++++++++++ + configure.in | 33 +++++++++++++++++++++- + src/Makefile.am | 3 +- + src/plugins/sample-vala/Makefile.am | 24 ++++++++++++++++ + src/plugins/sample-vala/sample-vala.plugin.in | 8 ++++++ + .../sample-vala/totem-sample-vala-plugin.vala | 23 +++++++++++++++ 5 files changed, 89 insertions(+), 2 deletions(-) commit 14f2754759a0ef0b682e23d0110287a064ea6ffc @@ -6877,7 +11335,7 @@ Updated Galician translations - po/gl.po | 66 +++++++++++++++++++++++++++++++++++++++----------------------- + po/gl.po | 66 +++++++++++++++++++++++++++++++++++++++++----------------------- 1 file changed, 42 insertions(+), 24 deletions(-) commit b85d5338ac4c89cf1ec48b76916586fde417302c @@ -6886,7 +11344,7 @@ Updated Hebrew translation. - po/he.po | 104 ++++++++++++++++++++++++++++++++++++-------------------------- + po/he.po | 104 +++++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 61 insertions(+), 43 deletions(-) commit 6fd4f48046c4026ecd3e7473091d27f187b18d6c @@ -6901,7 +11359,7 @@ they try to play the video, asking them if they'd like to watch it in their web browser instead. - src/plugins/youtube/totem-youtube.c | 35 ++++++++++++++++++++++++++++++++++- + src/plugins/youtube/totem-youtube.c | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) commit f5f79b7b086282196502f8e2f8fc1db68c99976b @@ -6918,7 +11376,7 @@ All URI resolution for YouTube video playback is now done entirely by examination of the content listed in the response from the GData API. - src/plugins/youtube/totem-youtube.c | 240 ++++------------------------------- + src/plugins/youtube/totem-youtube.c | 240 ++++-------------------------------- 1 file changed, 26 insertions(+), 214 deletions(-) commit 7c25ecf79c3734c4abfbf11c87246205633aa2cb @@ -6927,7 +11385,7 @@ Update British English translation - po/en_GB.po | 428 ++++++++++++++++++++++++++++++++++------------------------- + po/en_GB.po | 428 +++++++++++++++++++++++++++++++++++------------------------- 1 file changed, 250 insertions(+), 178 deletions(-) commit a3d03ff0c605873f825f360ad27967e2ab81cc9d @@ -6936,8 +11394,8 @@ Fix capitalisation of the “Skip To” dialogue's title - src/plugins/skipto/totem-skipto-plugin.c | 2 +- - src/plugins/skipto/totem-skipto.c | 2 +- + src/plugins/skipto/totem-skipto-plugin.c | 2 +- + src/plugins/skipto/totem-skipto.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit e1f30bb15ea6f54d2b2e5d60b3b390cf2153130b @@ -6949,7 +11407,7 @@ Slightly improve a translatable string which is used purely to set the width of a label. Helps: bgo#639398 - src/plugins/skipto/totem-skipto.c | 8 +++++++- + src/plugins/skipto/totem-skipto.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) commit 8e596875cf660f9db3a80063c058d983acb3ff6a @@ -6958,7 +11416,7 @@ Updating Persian Translation - po/fa.po | 2 ++ + po/fa.po | 2 ++ 1 file changed, 2 insertions(+) commit 78eefc6fd318f4792545ceb27094699901538366 @@ -6998,8 +11456,8 @@ by using gdk_display_get_app_launch_context() instead of simply removing the functionality. - browser-plugin/totem-plugin-viewer.c | 11 ++++++++++- - src/plugins/brasero-disc-recorder/totem-disc-recorder.c | 10 +++++++++- + browser-plugin/totem-plugin-viewer.c | 11 ++++++++++- + src/plugins/brasero-disc-recorder/totem-disc-recorder.c | 10 +++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) commit 5356832819c294f46148ca47d2a15547899d7df8 @@ -7012,7 +11470,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=639168 - configure.in | 4 ++-- + configure.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit b518321abb3f5c7ae139250f3144e495b15ff406 @@ -7023,8 +11481,8 @@ As it's been removed in recent GTK+ versions. - browser-plugin/totem-plugin-viewer.c | 11 +---------- - src/plugins/brasero-disc-recorder/totem-disc-recorder.c | 10 +--------- + browser-plugin/totem-plugin-viewer.c | 11 +---------- + src/plugins/brasero-disc-recorder/totem-disc-recorder.c | 10 +--------- 2 files changed, 2 insertions(+), 19 deletions(-) commit 0bac1fe06a00ae1d1d01e814b039c9dbde356479 @@ -7037,9 +11495,9 @@ migrating to GSettings. This is a new version that doesn't use GConf. Closes: bgo#638346. - data/Makefile.am | 16 ++++++++++++++++ - data/thumbnailer.sh | 21 +++++++++++++++++++++ - data/totem.thumbnailer.in | 3 +++ + data/Makefile.am | 16 ++++++++++++++++ + data/thumbnailer.sh | 21 +++++++++++++++++++++ + data/totem.thumbnailer.in | 3 +++ 3 files changed, 40 insertions(+) commit e1d489a714f4f1b899b461e8ad13a30c0ce28d64 @@ -7048,7 +11506,7 @@ Updated Galician translations - po/gl.po | 426 ++++++++++++++++++++++++++++++++++++-------------------------- + po/gl.po | 426 ++++++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 247 insertions(+), 179 deletions(-) commit 8983fb926705df1c4a525c0219f755ae8b7dc87e @@ -7066,7 +11524,7 @@ Updated Slovenian translation - po/sl.po | 452 +++++++++++++++++++++++++++++++++++--------------------------- + po/sl.po | 452 +++++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 254 insertions(+), 198 deletions(-) commit 2711b3ca025604a99868a5b28c79628e97d91897 @@ -7075,7 +11533,7 @@ Only close the subtitles download dialogue after downloading has finished - src/plugins/opensubtitles/opensubtitles.py | 2 +- + src/plugins/opensubtitles/opensubtitles.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 31b03c01406403fd13698ef7b2cb3a80f181964c @@ -7087,7 +11545,7 @@ Close the OpenSubtitles dialogue after selecting subtitles to download and use. Closes: bgo#638296 - src/plugins/opensubtitles/opensubtitles.py | 1 + + src/plugins/opensubtitles/opensubtitles.py | 1 + 1 file changed, 1 insertion(+) commit 4ca8a9859f170b1116e5c91acd20729f20e60a3c @@ -7107,7 +11565,7 @@ Reviewed by Petr Kovar. - po/cs.po | 756 ++++++++++++++++++++++++++++++++++++-------------------------- + po/cs.po | 756 ++++++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 438 insertions(+), 318 deletions(-) commit f9757402b4373ae6a971a8e92adeec9db7baa460 @@ -7116,7 +11574,7 @@ update Punjabi Translation - po/pa.po | 643 +++++++++++++++++++++++++++++++++++++------------------------- + po/pa.po | 643 +++++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 380 insertions(+), 263 deletions(-) commit fc60b52c7bc834dd8317733016006d47cdc4241c @@ -7134,8 +11592,8 @@ 2.91.4 - NEWS | 20 ++++++++++++++++++++ - configure.in | 2 +- + NEWS | 20 ++++++++++++++++++++ + configure.in | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) commit 8b31a5c5325f481518f0aa1d4053efcdde5e24fa @@ -7144,7 +11602,7 @@ Fix the order of arguments passed to Brasero - src/plugins/brasero-disc-recorder/totem-disc-recorder.c | 4 ++-- + src/plugins/brasero-disc-recorder/totem-disc-recorder.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 1ebd9258c352ab7ee5d3eaf1b6cd504a6197f2d8 @@ -7153,9 +11611,9 @@ Fix the API documentation build - docs/reference/Makefile.am | 4 +++- - docs/reference/totem-docs.xml | 12 ++++++++---- - src/gsd-osd-window.c | 4 ++-- + docs/reference/Makefile.am | 4 +++- + docs/reference/totem-docs.xml | 12 ++++++++---- + src/gsd-osd-window.c | 4 ++-- 3 files changed, 13 insertions(+), 7 deletions(-) commit 98f94e94d93d5d0da1405341a1bbadc15c94748d @@ -7166,12 +11624,12 @@ This adds a dependency on gdk-x11-3.0 >= 2.91.7. - configure.in | 1 + - src/backend/bacon-video-widget-gst-0.10.c | 4 +- - src/backend/video-utils.c | 4 +- - .../brasero-disc-recorder/totem-disc-recorder.c | 81 +++++++++++--------- - src/plugins/youtube/totem-youtube.c | 2 +- - src/totem-interface.c | 2 +- + configure.in | 1 + + src/backend/bacon-video-widget-gst-0.10.c | 4 +- + src/backend/video-utils.c | 4 +- + .../brasero-disc-recorder/totem-disc-recorder.c | 81 ++++++++++++---------- + src/plugins/youtube/totem-youtube.c | 2 +- + src/totem-interface.c | 2 +- 6 files changed, 52 insertions(+), 42 deletions(-) commit 9784b9ffa96c872fb4c207eefea6c314c6bda5f1 @@ -7180,12 +11638,12 @@ Update EggSmClient and EggDesktopFile from libegg master - src/eggdesktopfile.c | 10 ++++++++++ - src/eggdesktopfile.h | 3 +++ - src/eggsmclient-osx.c | 2 +- - src/eggsmclient-private.h | 8 +++++++- - src/eggsmclient-xsmp.c | 5 +++++ - src/eggsmclient.c | 29 ++++++++++++++++++++++------- + src/eggdesktopfile.c | 10 ++++++++++ + src/eggdesktopfile.h | 3 +++ + src/eggsmclient-osx.c | 2 +- + src/eggsmclient-private.h | 8 +++++++- + src/eggsmclient-xsmp.c | 5 +++++ + src/eggsmclient.c | 29 ++++++++++++++++++++++------- 6 files changed, 48 insertions(+), 9 deletions(-) commit 7236532217893f725e1017b67f2dade900232bf7 @@ -7197,8 +11655,8 @@ GTK+ 2.91.7 removed the gdkconfig.h header, which EggSmClient used. This bumps our GTK+ dependency to 2.91.7. - configure.in | 2 +- - src/eggsmclient-private.h | 2 +- + configure.in | 2 +- + src/eggsmclient-private.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 313206693d31c3c36b91979f59e3b62407c346f7 @@ -7216,7 +11674,7 @@ Updated Hebrew translation. - po/he.po | 175 +++++++++++++++++++++++++++++++++++++++++--------------------- + po/he.po | 175 +++++++++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 115 insertions(+), 60 deletions(-) commit 11a4278bee885abe73b1f14f2aeb776ea09abb7f @@ -7225,7 +11683,7 @@ [l10n] Updated Estonian translation - po/et.po | 107 ++++++++++++++++++++++++++++++++++++++++++++------------------ + po/et.po | 107 +++++++++++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 77 insertions(+), 30 deletions(-) commit 3dcfb47239ba3f36b1937dab0971c59287b7ca25 @@ -7237,7 +11695,7 @@ This ensures that tarballs will be released with a fix for bgo#637465 included. Closes: bgo#637490 - configure.in | 2 +- + configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 9593beb62e3a36bb60d76074b525d07f06855efa @@ -7246,7 +11704,7 @@ Updated Spanish translation - po/es.po | 221 ++++++++++++++++++++++++++++++++++++++------------------------ + po/es.po | 221 +++++++++++++++++++++++++++++++++++++++------------------------ 1 file changed, 137 insertions(+), 84 deletions(-) commit 62082281c9a306aee4df84b8ab61e054c1757bb7 @@ -7255,7 +11713,7 @@ [l10n] Updated Estonian translation - po/et.po | 41 ++++++++++++++++++++++++++--------------- + po/et.po | 41 ++++++++++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 15 deletions(-) commit d82b84bbec4c93ef5664b4e061eb9858375d04f3 @@ -7268,7 +11726,7 @@ save or discard changes to the current movie's chapter list, if any changes are outstanding. - src/plugins/chapters/totem-chapters.c | 31 +++++++++++++++++++++++++++++++ + src/plugins/chapters/totem-chapters.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) commit 244cd469671bcd2923174cf7909bc7bb28e0f64e @@ -7288,9 +11746,9 @@ of Totem's shut down code. It breaks the reference cycle by finalising the PeasExtensionSet early, before the TotemPluginsEngine is finalised later on. - src/plugins/totem-plugins-engine.c | 47 ++++++++++++++++++++++++------------ - src/plugins/totem-plugins-engine.h | 1 + - src/totem-object.c | 3 +++ + src/plugins/totem-plugins-engine.c | 47 ++++++++++++++++++++++++++------------ + src/plugins/totem-plugins-engine.h | 1 + + src/totem-object.c | 3 +++ 3 files changed, 36 insertions(+), 15 deletions(-) commit 53c3fc7b54e7cfca147329480c776479c8941aec @@ -7299,8 +11757,8 @@ Ensure totem_plugins_engine_get_default() always returns a new reference - src/plugins/totem-dirs.c | 2 ++ - src/plugins/totem-plugins-engine.c | 2 +- + src/plugins/totem-dirs.c | 2 ++ + src/plugins/totem-plugins-engine.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) commit ba7651f5478a503c17f3e950a5fc2e139ec9cb52 @@ -7309,7 +11767,7 @@ Remove an incorrect unref from the chapters plugin - src/plugins/chapters/totem-chapters.c | 1 - + src/plugins/chapters/totem-chapters.c | 1 - 1 file changed, 1 deletion(-) commit 3da77064ae90dbc3fc0aabf2b7bf8145647f6e81 @@ -7321,7 +11779,7 @@ They might not be visible, but they'll be used by accessibility programs, so should be translatable. - src/plugins/chapters/totem-chapters.c | 4 ++-- + src/plugins/chapters/totem-chapters.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 762970b82b4635a0b7af600358c1bb1b65ff58de @@ -7330,7 +11788,7 @@ Add a shadow to the tree view in the chapters plugin - src/plugins/chapters/chapters-list.ui | 1 + + src/plugins/chapters/chapters-list.ui | 1 + 1 file changed, 1 insertion(+) commit 3fb26689fe2bc5f08f875acc960ceb6b6ea08fd0 @@ -7339,10 +11797,10 @@ Reword some of the translatable strings in the chapters plugin - src/plugins/chapters/chapters-edit.ui | 2 +- - src/plugins/chapters/chapters-list.ui | 27 +++++++++++++-------------- - src/plugins/chapters/chapters.plugin.in | 2 +- - src/plugins/chapters/totem-chapters.c | 6 +++--- + src/plugins/chapters/chapters-edit.ui | 2 +- + src/plugins/chapters/chapters-list.ui | 27 +++++++++++++-------------- + src/plugins/chapters/chapters.plugin.in | 2 +- + src/plugins/chapters/totem-chapters.c | 6 +++--- 4 files changed, 18 insertions(+), 19 deletions(-) commit 86b06052ae9d4dabe911057aebb85ea13171437e @@ -7351,7 +11809,7 @@ Updated Hebrew translation. - po/he.po | 241 +++++++++++++++++++++++++++++++++----------------------------- + po/he.po | 241 +++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 127 insertions(+), 114 deletions(-) commit b516adef02cccff9cbec0eee61bc17737b82bce2 @@ -7360,7 +11818,7 @@ Updated Spanish translation - po/es.po | 185 ++++++++++++++++++++++++++++++++------------------------------ + po/es.po | 185 +++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 97 insertions(+), 88 deletions(-) commit 1608daf3fb025bebc4fc9adb479a5e04094e3d59 @@ -7372,7 +11830,7 @@ This adds a dependency on pygobject-2.0 >= 2.27.0, as we depend on various bug fixes in it at runtime. - configure.in | 60 ++++++++++++++++++++++------------------------------------ + configure.in | 60 +++++++++++++++++++++++------------------------------------- 1 file changed, 23 insertions(+), 37 deletions(-) commit 42679707cd3281843ea2f347785ff52e682ff196 @@ -7391,12 +11849,12 @@ Closes: bgo#619039 - src/plugins/coherence_upnp/coherence_upnp.py | 14 ++++++---- - src/plugins/iplayer/iplayer.py | 8 +++--- - src/plugins/iplayer/iplayer2.py | 5 ++-- - src/plugins/jamendo/jamendo.py | 38 +++++++++++++------------- - src/plugins/opensubtitles/opensubtitles.py | 26 ++++++++++-------- - src/plugins/pythonconsole/pythonconsole.py | 16 +++++------ + src/plugins/coherence_upnp/coherence_upnp.py | 14 +++++----- + src/plugins/iplayer/iplayer.py | 8 +++--- + src/plugins/iplayer/iplayer2.py | 5 ++-- + src/plugins/jamendo/jamendo.py | 38 ++++++++++++++-------------- + src/plugins/opensubtitles/opensubtitles.py | 26 ++++++++++--------- + src/plugins/pythonconsole/pythonconsole.py | 16 ++++++------ 6 files changed, 56 insertions(+), 51 deletions(-) commit 9d086e27d2de84cccc99e768e08c3108b738c619 @@ -7407,7 +11865,7 @@ This is due to the fact that bgo#637335 is now fixed. - src/plugins/jamendo/jamendo.py | 17 ++++++++++++++++- + src/plugins/jamendo/jamendo.py | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) commit 5c599047b9e961e583efd3bbe88ca3bf6325cded @@ -7416,7 +11874,7 @@ Updated Norwegian bokmål translation - po/nb.po | 198 +++++++++++++++++++++++++++++++++++--------------------------- + po/nb.po | 198 +++++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 111 insertions(+), 87 deletions(-) commit bc24328afc82fbad3008f6369f88e61fcece9ec5 @@ -7428,9 +11886,9 @@ Requires a new GTK+, but it will just warn about an unknown property with older versions, so leave it at that for now. - data/fullscreen.ui | 1 + - data/mozilla-viewer.ui | 1 + - data/totem.ui | 1 + + data/fullscreen.ui | 1 + + data/mozilla-viewer.ui | 1 + + data/totem.ui | 1 + 3 files changed, 3 insertions(+) commit 29c3c8d614f2dc54f7f4b2c6afe73f75e713b7a5 @@ -7439,7 +11897,7 @@ main: Avoid some warnings zooming in on startup - src/totem-object.c | 6 ++++++ + src/totem-object.c | 6 ++++++ 1 file changed, 6 insertions(+) commit e3cbce54df7dccf44315be6d42cea5edd41f731e @@ -7448,7 +11906,7 @@ Fix a missing constructor argument in the OpenSubtitles plugin - src/plugins/opensubtitles/opensubtitles.py | 3 ++- + src/plugins/opensubtitles/opensubtitles.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 9ea634ef41da03ce5800f5eacc2db955fdb96ad0 @@ -7462,7 +11920,7 @@ parameter to bvw_get_navigation_iface() that prevents it from querying for the navigation interface if it isn't already set. Closes: bgo#637357 - src/backend/bacon-video-widget-gst-0.10.c | 14 +++++++------- + src/backend/bacon-video-widget-gst-0.10.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) commit 6bb1cb01b62797840c54912a8c518593d2838786 @@ -7476,8 +11934,8 @@ improve startup performance a little, as GSettings will no longer be looking for several properties which don't exist. - src/plugins/totem-plugins-engine.c | 2 +- - src/totem-preferences.c | 19 ++++++++++--------- + src/plugins/totem-plugins-engine.c | 2 +- + src/totem-preferences.c | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) commit ca5559ebaf76c951e65219aa660769cd9d49910d @@ -7491,7 +11949,7 @@ writeability of the visualization-quality key. We now handle writeability changes separately for this key so that this doesn't happen. - src/totem-preferences.c | 22 ++++++++++++++++++++-- + src/totem-preferences.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) commit 90a1762cde5c3bfdfc73d1a8f4940277d362d88f @@ -7504,11 +11962,11 @@ API freeze for 3.0 if it's to be done at all, because BvwAudioOutputType is effectively public API, since it's used in our GSettings schema. - data/org.gnome.totem.gschema.xml.in.in | 2 +- - docs/reference/totem-sections.txt | 10 +++++----- - src/backend/bacon-video-widget-gst-0.10.c | 22 +++++++++++----------- - src/backend/bacon-video-widget.h | 12 ++++++------ - src/totem-preferences.c | 2 +- + data/org.gnome.totem.gschema.xml.in.in | 2 +- + docs/reference/totem-sections.txt | 10 +++++----- + src/backend/bacon-video-widget-gst-0.10.c | 22 +++++++++++----------- + src/backend/bacon-video-widget.h | 12 ++++++------ + src/totem-preferences.c | 2 +- 5 files changed, 24 insertions(+), 24 deletions(-) commit be8183ef97c4ddad67d8392a75d469e439942cad @@ -7520,7 +11978,7 @@ vis_changed appeared to only ever be FALSE, and has been so since at least 2.30. - src/backend/bacon-video-widget-gst-0.10.c | 10 +--------- + src/backend/bacon-video-widget-gst-0.10.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) commit 16538f22c7167c7dbb6dcbbbf205d6ebb2d7cacd @@ -7532,7 +11990,7 @@ The last few straggly bits seem to be relics of the original port to GSettings. - src/backend/bacon-video-widget-gst-0.10.c | 19 +------------------ + src/backend/bacon-video-widget-gst-0.10.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) commit 769c0713d17471c8453fb39836d348ae06843b3b @@ -7543,9 +12001,9 @@ It belongs in totem-preferences.c. - data/totem.ui | 1 - - src/backend/bacon-video-widget-gst-0.10.c | 24 ++++++------------------ - src/totem-preferences.c | 18 +++++------------- + data/totem.ui | 1 - + src/backend/bacon-video-widget-gst-0.10.c | 24 ++++++------------------ + src/totem-preferences.c | 18 +++++------------- 3 files changed, 11 insertions(+), 32 deletions(-) commit 66bc7ef1d961040b60dd98897cec689eedcfa7f6 @@ -7554,7 +12012,7 @@ Add an audio-output-type property to BaconVideoWidget - src/backend/bacon-video-widget-gst-0.10.c | 23 ++++++++++++++++++++++- + src/backend/bacon-video-widget-gst-0.10.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) commit b846fd43d94a17cedd06f6aa596dce22876cb015 @@ -7566,9 +12024,9 @@ It doesn't belong in BaconVideoWidget, it belongs in totem-preferences.c. And that's where it now is. Closes: bgo#637317 - data/totem.ui | 4 -- - src/backend/bacon-video-widget-gst-0.10.c | 34 +------------- - src/totem-preferences.c | 71 +++++++---------------------- + data/totem.ui | 4 -- + src/backend/bacon-video-widget-gst-0.10.c | 34 +-------------- + src/totem-preferences.c | 71 ++++++++----------------------- 3 files changed, 19 insertions(+), 90 deletions(-) commit e8982e9aec77cafee4839dd9820bd9c01ad73c2d @@ -7577,7 +12035,7 @@ Add brightness, contrast, saturation and hue properties to BaconVideoWidget - src/backend/bacon-video-widget-gst-0.10.c | 77 ++++++++++++++++++++++++++++- + src/backend/bacon-video-widget-gst-0.10.c | 77 ++++++++++++++++++++++++++++++- 1 file changed, 76 insertions(+), 1 deletion(-) commit ecf5dd2f06e36ba0f6da9dc7af4f03918ccbd7f5 @@ -7586,7 +12044,7 @@ Minor documentation fixes to BaconVideoWidget - src/backend/bacon-video-widget-gst-0.10.c | 16 ++++++++-------- + src/backend/bacon-video-widget-gst-0.10.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) commit 43d1b4022561b64a18755d136a004f57d436db77 @@ -7595,7 +12053,7 @@ Updated Spanish translation - po/es.po | 114 +++++++++++++++++++++++++++++++++----------------------------- + po/es.po | 114 ++++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 61 insertions(+), 53 deletions(-) commit 0e49f9aaf3251e1bf3268ad5fd22c030778c97a3 @@ -7604,7 +12062,7 @@ Fix a typo in the python console plugin - src/plugins/pythonconsole/pythonconsole.py | 2 +- + src/plugins/pythonconsole/pythonconsole.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 94f7eca4af87a06c4c557582364f0f240b94c497 @@ -7615,7 +12073,7 @@ The dialogue is still broken due to bgo#637175, however. - src/plugins/jamendo/jamendo.py | 2 +- + src/plugins/jamendo/jamendo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 1b9e1114614b8629ef1d4a2e8baae6675f63ba32 @@ -7626,7 +12084,7 @@ I can't write XML. - data/totem.ui | 2 +- + data/totem.ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 8a810680960f0e7d2d9e10b6f21da21332a5bbfe @@ -7639,10 +12097,10 @@ multiple playlist entries asynchronously, they're not added to Totem's playlist out of order. Closes: bgo#636686 - src/plugins/publish/totem-publish.c | 7 +++- - src/totem-object.c | 70 +++++++++++++++-------------------- - src/totem-playlist.c | 28 ++++++++------ - src/totem-video-list.c | 7 +++- + src/plugins/publish/totem-publish.c | 7 +++- + src/totem-object.c | 70 +++++++++++++++---------------------- + src/totem-playlist.c | 28 ++++++++------- + src/totem-video-list.c | 7 +++- 4 files changed, 57 insertions(+), 55 deletions(-) commit 68702722fecd6baf8e006ab5804cbcd760182c87 @@ -7660,8 +12118,8 @@ Helps: bgo#636686 - src/totem-playlist.c | 251 ++++++++++++++++++++++++++++++++++++++++++++++++++ - src/totem-playlist.h | 16 ++++ + src/totem-playlist.c | 251 +++++++++++++++++++++++++++++++++++++++++++++++++++ + src/totem-playlist.h | 16 ++++ 2 files changed, 267 insertions(+) commit 86c5834c32e8d5d3b50042606b62b4de633ce802 @@ -7673,8 +12131,8 @@ Add a translation context and a new translators' comment for the string “Auto”. Closes: bgo#637309 - data/totem.ui | 2 +- - src/totem-menu.c | 4 ++-- + data/totem.ui | 2 +- + src/totem-menu.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) commit 95e2a5e3902709a2d5987ce634296a701c802ac8 @@ -7683,7 +12141,7 @@ Update British English translation - po/en_GB.po | 945 ++++++++++++++++++++++++++++++++++------------------------- + po/en_GB.po | 945 ++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 538 insertions(+), 407 deletions(-) commit 30c0497d5b173c09ef707e545c8fb9620eb6d972 @@ -7697,8 +12155,8 @@ “Skip To” dialogue to be resized accordingly (whenever it's displayed or a new video is loaded). Closes: bgo#622698 - src/plugins/skipto/totem-time-entry.c | 67 ++++++++++++++++++++++++++++++++- - src/plugins/skipto/totem-time-entry.h | 3 ++ + src/plugins/skipto/totem-time-entry.c | 67 ++++++++++++++++++++++++++++++++++- + src/plugins/skipto/totem-time-entry.h | 3 ++ 2 files changed, 69 insertions(+), 1 deletion(-) commit 0041fa3b8d1fadda1d1799e19443b5d3707be652 @@ -7710,7 +12168,7 @@ Disable the fullscreen button unless some media is being played. Closes: bgo#635851 - src/totem-object.c | 11 ++++++++++- + src/totem-object.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) commit fd2bd4e89b39d61f083924bbd0c068516b393f35 @@ -7722,7 +12180,7 @@ I was mistaken in bumping it; libpeas-ui became libpeas-gtk in 0.7.0, not 0.7.1. - configure.in | 2 +- + configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit a7089ee9ad19f6ea2095d4f27695c1b196415c83 @@ -7731,7 +12189,7 @@ Bug 635440 — Add the shortcut Ctrl+= for zooming in - src/totem-object.c | 14 ++++++++++++-- + src/totem-object.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) commit 0d84d5931030957210a031e74c5ff6d7fcace635 @@ -7743,9 +12201,9 @@ For version 0.7.1, libpeasui is being renamed to libpeasgtk. This implements that change, and bumps our libpeas dependency to 0.7.1 accordingly. - configure.in | 4 ++-- - src/Makefile.am | 4 ++-- - src/plugins/totem-plugins-engine.c | 2 +- + configure.in | 4 ++-- + src/Makefile.am | 4 ++-- + src/plugins/totem-plugins-engine.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) commit 33f40c087b7a6f416b4bce8549038bf24137aaae @@ -7754,11 +12212,11 @@ Bug 637191 — Port to GtkStyleContext - browser-plugin/totem-plugin-viewer.c | 33 ++++++++++++++++++++++++--------- - data/Makefile.am | 3 ++- - data/mozilla-viewer.css | 5 +++++ - src/totem-cell-renderer-video.c | 2 +- - src/totem-object.c | 9 ++++----- + browser-plugin/totem-plugin-viewer.c | 33 ++++++++++++++++++++++++--------- + data/Makefile.am | 3 ++- + data/mozilla-viewer.css | 5 +++++ + src/totem-cell-renderer-video.c | 2 +- + src/totem-object.c | 9 ++++----- 5 files changed, 36 insertions(+), 16 deletions(-) commit 38d0cd416a0c7df01619b5c8bfd289b56929c883 @@ -7769,8 +12227,8 @@ Instead of the copy/paste version we had so far. - configure.in | 2 +- - src/plugins/youtube/totem-youtube.c | 155 +---------------------------------- + configure.in | 2 +- + src/plugins/youtube/totem-youtube.c | 155 +----------------------------------- 2 files changed, 3 insertions(+), 154 deletions(-) commit a23fe8096702c221e79b536f99d30e79733780fd @@ -7788,9 +12246,9 @@ See https://bugzilla.gnome.org/show_bug.cgi?id=594222 - src/totem-object.c | 4 ++-- - src/totem-playlist.c | 11 +---------- - src/totem-playlist.h | 3 +-- + src/totem-object.c | 4 ++-- + src/totem-playlist.c | 11 +---------- + src/totem-playlist.h | 3 +-- 3 files changed, 4 insertions(+), 14 deletions(-) commit 567f0e695054a2ab9222b8a0dc75d3491b768766 @@ -7799,7 +12257,7 @@ bvw: Fix trivial debug format string error. - src/backend/bacon-video-widget-gst-0.10.c | 2 +- + src/backend/bacon-video-widget-gst-0.10.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 6ec2f1ead88c08f34f737fa6362e5e1aecd9e6f5 @@ -7808,7 +12266,7 @@ Updated Slovenian translation - po/sl.po | 188 ++++++++++++++++++++++++++++++++++---------------------------- + po/sl.po | 188 ++++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 102 insertions(+), 86 deletions(-) commit c33b15f8ddeccdff5ad0c9d5b787a119b7a3dfde @@ -7817,7 +12275,7 @@ Updated Spanish translation - po/es.po | 180 ++++++++++++++++++++++++++++++++++---------------------------- + po/es.po | 180 +++++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 100 insertions(+), 80 deletions(-) commit 996ac885d97bc1ab6c6b7059bec8fc36b8878371 @@ -7826,7 +12284,7 @@ Updated Galician translations - po/gl.po | 181 ++++++++++++++++++++++++++++++++++---------------------------- + po/gl.po | 181 +++++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 100 insertions(+), 81 deletions(-) commit e49a607f54017690c5f6aef4c352cdbc01725daf @@ -7835,7 +12293,7 @@ [l10n] Updated Estonian translation - po/et.po | 59 +++++++++++++++++++---------------------------------------- + po/et.po | 59 +++++++++++++++++++---------------------------------------- 1 file changed, 19 insertions(+), 40 deletions(-) commit 936c3a597acac8975f341203124760ffaf1c0f9d @@ -7844,7 +12302,7 @@ Updated Hebrew translation. - po/he.po | 177 ++++++++++++++++++++++++++++++++++---------------------------- + po/he.po | 177 +++++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 98 insertions(+), 79 deletions(-) commit f33006ff54496f3e046a3e3add0835bf96b06ba2 @@ -7853,7 +12311,7 @@ po: Update for source changes - po/POTFILES.in | 2 +- + po/POTFILES.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit cce123f328297fe7b6cadeba5525eae94df0f2bb @@ -7864,12 +12322,12 @@ https://bugzilla.gnome.org/show_bug.cgi?id=350261 - configure.in | 17 +- - data/org.gnome.totem.gschema.xml.in.in | 2 +- - data/totem.ui | 5 +- - src/plugins/save-file/Makefile.am | 15 ++ - src/plugins/save-file/save-file.plugin.in | 9 + - src/plugins/save-file/totem-save-file.c | 351 +++++++++++++++++++++++++++++ + configure.in | 17 +- + data/org.gnome.totem.gschema.xml.in.in | 2 +- + data/totem.ui | 5 +- + src/plugins/save-file/Makefile.am | 15 ++ + src/plugins/save-file/save-file.plugin.in | 9 + + src/plugins/save-file/totem-save-file.c | 351 ++++++++++++++++++++++++++++++ 6 files changed, 395 insertions(+), 4 deletions(-) commit 2f01bc54e3f0567f84df0a769b46017be419adce @@ -7878,7 +12336,7 @@ browser: Clean up draw button after it stops glowing - browser-plugin/totem-glow-button.c | 1 + + browser-plugin/totem-glow-button.c | 1 + 1 file changed, 1 insertion(+) commit dfb7c0a3dc7a9a2c1b769bd90bd74c03ad3faeeb @@ -7887,7 +12345,7 @@ browser: Port glow button to GtkStyleContext - browser-plugin/totem-glow-button.c | 17 +++++++++++------ + browser-plugin/totem-glow-button.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) commit b64f844f751ced52ce3775374e6eaf342467fb5f @@ -7896,7 +12354,7 @@ backend: Small source cleanup - src/backend/bacon-video-widget-gst-0.10.c | 12 ++++++------ + src/backend/bacon-video-widget-gst-0.10.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) commit 99f5ceb3403809670ee0ba2198f9e956460a5b74 @@ -7916,9 +12374,9 @@ Copied from gnome-settings-daemon. - src/gsd-media-keys-window.c | 38 +++--- - src/gsd-osd-window.c | 289 +++++++++++++++++++++++++++++++++++-------- - src/gsd-osd-window.h | 5 +- + src/gsd-media-keys-window.c | 38 +++--- + src/gsd-osd-window.c | 289 ++++++++++++++++++++++++++++++++++++-------- + src/gsd-osd-window.h | 5 +- 3 files changed, 259 insertions(+), 73 deletions(-) commit 8e7ca24a7628b4361a3e45a9c0da430777669ca2 @@ -7927,7 +12385,7 @@ screenshot: Port to GtkStyleContext - src/plugins/screenshot/gnome-screenshot-widget.c | 8 +++----- + src/plugins/screenshot/gnome-screenshot-widget.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) commit 7797891e04fe16254aaee2403022c0722e2148a0 @@ -7936,7 +12394,7 @@ main: Port video cell to GtkStyleContext - src/totem-cell-renderer-video.c | 22 ++++++++++++---------- + src/totem-cell-renderer-video.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) commit d0ebe92204382c04f5b751897e190530a5e42561 @@ -7950,7 +12408,7 @@ Cool :) - src/backend/bacon-video-widget-gst-0.10.c | 2 -- + src/backend/bacon-video-widget-gst-0.10.c | 2 -- 1 file changed, 2 deletions(-) commit b492b4dd1f95e4ae31b7b8631b96e5d44b00568e @@ -7966,7 +12424,7 @@ Also clean up the logo rendering to use Cairo exclusively. - src/backend/bacon-video-widget-gst-0.10.c | 65 ++++++++++++----------------- + src/backend/bacon-video-widget-gst-0.10.c | 65 +++++++++++++------------------ 1 file changed, 27 insertions(+), 38 deletions(-) commit 74adcc6e1d350ff6e74d6031e0ae709aca52d3fd @@ -7975,7 +12433,7 @@ brasero: Fixes for latest GTK+ 3.x changes - src/plugins/brasero-disc-recorder/totem-disc-recorder.c | 2 +- + src/plugins/brasero-disc-recorder/totem-disc-recorder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit dfa71e4808635735c4c46b704c384e05cf4deff2 @@ -7984,7 +12442,7 @@ brasero: Remove unused variable - src/plugins/brasero-disc-recorder/totem-disc-recorder.c | 4 ---- + src/plugins/brasero-disc-recorder/totem-disc-recorder.c | 4 ---- 1 file changed, 4 deletions(-) commit 7c89a390cd57b158e89b2029da5efcfafa10341c @@ -7996,8 +12454,8 @@ They're already accessible from the main Movie menu, and just clutter the right-click menu. - data/totem.ui | 2 -- - .../brasero-disc-recorder/totem-disc-recorder.c | 21 -------------------- + data/totem.ui | 2 -- + .../brasero-disc-recorder/totem-disc-recorder.c | 21 --------------------- 2 files changed, 23 deletions(-) commit 7b0fdfd1ce106d3dd1f26a0ebb66e58ce81c0009 @@ -8006,7 +12464,7 @@ Remove trailing tabs - configure.in | 2 +- + configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit aeff0aae98ca41efedf453465e638291cf8b236c @@ -8017,7 +12475,7 @@ See: bgo#635287 - src/Makefile.am | 1 + + src/Makefile.am | 1 + 1 file changed, 1 insertion(+) commit 2a431a3df87a1e63770a3b56211682353eac4322 @@ -8026,7 +12484,7 @@ Updated Slovenian translation - po/sl.po | 10 +++++----- + po/sl.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) commit 11fcbf6d9aea2d055ce5054493dc210e79f53404 @@ -8042,7 +12500,7 @@ This fixes some flicker in the display with more recent versions of GTK+ 3.x. - src/backend/bacon-video-widget-gst-0.10.c | 6 ++++-- + src/backend/bacon-video-widget-gst-0.10.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) commit ac16366ad0fa981311a707d56f0c85ab33b55acd @@ -8053,9 +12511,9 @@ Thanks to Owen Taylor for the nice tricks! - src/backend/bacon-video-widget-gst-0.10.c | 28 ++++++++---------- - src/backend/video-utils.c | 44 ----------------------------- - src/backend/video-utils.h | 3 -- + src/backend/bacon-video-widget-gst-0.10.c | 28 ++++++++------------ + src/backend/video-utils.c | 44 ------------------------------- + src/backend/video-utils.h | 3 --- 3 files changed, 11 insertions(+), 64 deletions(-) commit 6041c95a252ef493c4cded16ac6fed0f8fe9ad3c @@ -8064,8 +12522,8 @@ backend: Fix for latest GTK+ 3.x breakage - src/backend/bacon-resize.c | 12 ++++++------ - src/backend/bacon-video-widget-gst-0.10.c | 4 ++-- + src/backend/bacon-resize.c | 12 ++++++------ + src/backend/bacon-video-widget-gst-0.10.c | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) commit ba211535bec81385ad6cb3fc272a5f9419d6e2df @@ -8074,7 +12532,7 @@ backend: Remove dead code - src/backend/bacon-video-widget-gst-0.10.c | 31 ----------------------------- + src/backend/bacon-video-widget-gst-0.10.c | 31 ------------------------------- 1 file changed, 31 deletions(-) commit 52ca5b55ccef563322c731e54dbab854e5f3c5d7 @@ -8085,7 +12543,7 @@ And not video types. - src/totem-audio-preview.c | 4 ++-- + src/totem-audio-preview.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 96601954b736c31a9daa83acac777ea6946d4182 @@ -8096,9 +12554,9 @@ So that we can use it in scripts. - data/Makefile.am | 3 ++- - data/desktop.sh | 12 +++++++----- - data/uri-schemes-list.txt | 9 +++++++++ + data/Makefile.am | 3 ++- + data/desktop.sh | 12 +++++++----- + data/uri-schemes-list.txt | 9 +++++++++ 3 files changed, 18 insertions(+), 6 deletions(-) commit 994cf65023ec776573a6376faebba71300c0760a @@ -8112,9 +12570,9 @@ https://bugzilla.gnome.org/show_bug.cgi?id=549691 - configure.in | 2 +- - data/totem.ui | 2 +- - src/totem-object.c | 29 ++++++++++++++++++++++++----- + configure.in | 2 +- + data/totem.ui | 2 +- + src/totem-object.c | 29 ++++++++++++++++++++++++----- 3 files changed, 26 insertions(+), 7 deletions(-) commit f0cad3b84b35afc4d2b9cca10696ade91c1fb29d @@ -8123,7 +12581,7 @@ [l10n] Updated Estonian translation - po/et.po | 33 ++++++++++++--------------------- + po/et.po | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-) commit 3240c9cb824e8848ef8fa0529beeee1105f66154 @@ -8136,7 +12594,7 @@ app_init(), we don't need to do this again in totem_options_process_for_server(). - src/totem.c | 4 ++++ + src/totem.c | 4 ++++ 1 file changed, 4 insertions(+) commit 394aacbb50f37831e77dad87d6fad081579a6556 @@ -8145,7 +12603,7 @@ chapters: Don't warn when we'll ignore the error later - src/plugins/chapters/totem-cmml-parser.c | 2 +- + src/plugins/chapters/totem-cmml-parser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 4be551479aaafd5c939922e0a5397e34af287269 @@ -8154,7 +12612,7 @@ Fix typo in NEWS - NEWS | 2 +- + NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 0d4e63e26825384237e9295233ebc00cd978050b @@ -8163,7 +12621,7 @@ main: Remove debug messages - src/totem-options.c | 3 --- + src/totem-options.c | 3 --- 1 file changed, 3 deletions(-) commit 5c96df455511f156e86a49f7ba6f17d56d38d6b7 @@ -8172,7 +12630,7 @@ Updated Brazilian Portuguese translation - help/pt_BR/pt_BR.po | 607 ++++++++++++++++++++++++++------------------------- + help/pt_BR/pt_BR.po | 607 +++++++++++++++++++++++++++------------------------- 1 file changed, 315 insertions(+), 292 deletions(-) commit 6e1b23c62f46db25f0bb738f7fadb03e9e256975 @@ -8183,7 +12641,7 @@ We need paths, not strokes, to be able to recolour the icon. - data/icons/scalable/view-sidebar-symbolic.svg | 32 ++++++++++++------------- + data/icons/scalable/view-sidebar-symbolic.svg | 32 +++++++++++++-------------- 1 file changed, 16 insertions(+), 16 deletions(-) commit 16be75a384746d583e6e59eb70c77a140cd2faaf @@ -8194,7 +12652,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=635134 - configure.in | 2 -- + configure.in | 2 -- 1 file changed, 2 deletions(-) commit 0b9091e928d3c53556f740b0d47b7355181bb6b7 @@ -8203,7 +12661,7 @@ Added UG translation - po/ug.po | 547 +++++++++++++++++++++++++------------------------------------- + po/ug.po | 547 ++++++++++++++++++++++++++------------------------------------- 1 file changed, 222 insertions(+), 325 deletions(-) commit e173ee5c8f847d7529f78c1b18cdb68bbb9c0748 @@ -8214,7 +12672,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=635136 - src/Makefile.am | 1 + + src/Makefile.am | 1 + 1 file changed, 1 insertion(+) commit ab6356cca0290fce0b137fa34eb36cf43684c67c @@ -8228,7 +12686,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=634831 - configure.in | 2 +- + configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 52925836ae1813f50ca6949f68dbec473741bbf6 @@ -8237,7 +12695,7 @@ Fix the OpenSubtitles plugin to use the latest PyGObject GTK+ overrides - src/plugins/opensubtitles/opensubtitles.py | 14 +++++++------- + src/plugins/opensubtitles/opensubtitles.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) commit 41bf18408a8155299c0868e65d97739374d59c3d @@ -8246,7 +12704,7 @@ Fix the Python Console plugin to use the latest PyGObject GTK+ overrides - src/plugins/pythonconsole/console.py | 22 ++++++++++++---------- + src/plugins/pythonconsole/console.py | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) commit 2880c4ee64db2785cdbd184abead6e1b3fab1dab @@ -8258,7 +12716,7 @@ This is done by changing from wrapping album titles to ellipsising them instead. - src/plugins/jamendo/jamendo.py | 3 +-- + src/plugins/jamendo/jamendo.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit 85a5f9b53d524d361de10829cf86ea324c9a498d @@ -8267,7 +12725,7 @@ Fix sensitivity of album button in the Jamendo plugin - src/plugins/jamendo/jamendo.py | 11 +++++++---- + src/plugins/jamendo/jamendo.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) commit 54bfc371a3f79e7e15f54029fe558fd7717c5483 @@ -8276,7 +12734,7 @@ Fix enqueing and viewing album pages in the Jamendo plugin - src/plugins/jamendo/jamendo.py | 16 ++++++++++------ + src/plugins/jamendo/jamendo.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) commit 23dcebe216890665c4e48f0517fadbf00f85273d @@ -8285,7 +12743,7 @@ Fix row expansion and context menus in the Jamendo plugin - src/plugins/jamendo/jamendo.py | 15 ++++++++------- + src/plugins/jamendo/jamendo.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) commit 10695c57c6a1090b1de6bc0510f8a76142694d5f @@ -8294,7 +12752,7 @@ Fix the Jamendo plugin to use the latest PyGObject GTK+ overrides - src/plugins/jamendo/jamendo.py | 6 +++--- + src/plugins/jamendo/jamendo.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 4d7d4e731b87852b97f64232452025a1ea1e42d0 @@ -8303,8 +12761,8 @@ Ensure programme titles have XML entities decoded properly in iPlayer - src/plugins/iplayer/iplayer.py | 2 +- - src/plugins/iplayer/iplayer2.py | 8 ++++---- + src/plugins/iplayer/iplayer.py | 2 +- + src/plugins/iplayer/iplayer2.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) commit 70a36edbe499aa18b756ad6814efda86881b705a @@ -8313,7 +12771,7 @@ Fix the iPlayer plugin to use the latest PyGObject GTK+ overrides - src/plugins/iplayer/iplayer.py | 36 +++++++++++++++++++----------------- + src/plugins/iplayer/iplayer.py | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) commit f77023d9604e696cf4073c2e85202546d41e978d @@ -8322,7 +12780,7 @@ Update the README to reference GSettings instead of GConf - README | 2 +- + README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 2b788d9af0b59e12edf3839b2871b7d506d670e4 @@ -8331,7 +12789,7 @@ Fix a typo in the OpenSubtitles schema path - .../org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in | 2 +- + .../org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit a6963d8e10b1ff9bf58116f36ed64c76d7fa1ca7 @@ -8349,7 +12807,7 @@ [l10n] Updated Estonian translation - po/et.po | 37 +++++++++---------------------------- + po/et.po | 37 +++++++++---------------------------- 1 file changed, 9 insertions(+), 28 deletions(-) commit 9c2f03d4bff1f8eb7ad42acf60feae7e8dfd4766 @@ -8358,10 +12816,10 @@ date: Fix data paths in GSettings schemas - data/org.gnome.totem.gschema.xml.in.in | 2 +- - .../jamendo/org.gnome.totem.plugins.jamendo.gschema.xml.in.in | 2 +- - .../org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in | 2 +- - .../org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in | 2 +- + data/org.gnome.totem.gschema.xml.in.in | 2 +- + src/plugins/jamendo/org.gnome.totem.plugins.jamendo.gschema.xml.in.in | 2 +- + .../org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in | 2 +- + .../org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) commit 244a071c0f5c449b83ff38e38e9a8b8a2a3d6ec8 @@ -8379,7 +12837,7 @@ [l10n] Updated Estonian translation - po/et.po | 307 ++++++++++++++++++++++++++++++++++++++++++++------------------ + po/et.po | 307 ++++++++++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 217 insertions(+), 90 deletions(-) commit b71ea5c4b23fc1d6894143302fc82fd7ff0c2549 @@ -8388,7 +12846,7 @@ Updated Spanish translation - po/es.po | 280 ++++++++++++++++++++++++++++++-------------------------------- + po/es.po | 280 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 137 insertions(+), 143 deletions(-) commit 5fd36394dc209b44940df80aed8ed2154909376c @@ -8400,10 +12858,10 @@ Seeing as upstream is dead, and the data is exported through UPnP already. - configure.in | 11 +- - src/plugins/mythtv/Makefile.am | 15 -- - src/plugins/mythtv/mythtv.plugin.in | 9 - - src/plugins/mythtv/totem-mythtv.c | 494 ----------------------------------- + configure.in | 11 +- + src/plugins/mythtv/Makefile.am | 15 -- + src/plugins/mythtv/mythtv.plugin.in | 9 - + src/plugins/mythtv/totem-mythtv.c | 494 ------------------------------------ 4 files changed, 1 insertion(+), 528 deletions(-) commit 898c18db0cc5fb0a24c5eed46e921a5d7310dc29 @@ -8412,7 +12870,7 @@ Updated Hebrew translation. - po/he.po | 314 +++++++++++++++++++++++++++----------------------------------- + po/he.po | 314 +++++++++++++++++++++++++++------------------------------------ 1 file changed, 136 insertions(+), 178 deletions(-) commit 594ba9562a3663c22a600ff7e8b0dbe734f2b395 @@ -8421,7 +12879,7 @@ Updated Japanese translation - po/ja.po | 427 ++++++++++++++++++++++++++++++++++---------------------------- + po/ja.po | 427 ++++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 232 insertions(+), 195 deletions(-) commit 67be87d1fbfb1f1ce10f6753c9a741fee52e5f41 @@ -8430,7 +12888,7 @@ Updated Galician translations - po/gl.po | 333 +++++++++++++++++++++++++++----------------------------------- + po/gl.po | 333 ++++++++++++++++++++++++++++----------------------------------- 1 file changed, 146 insertions(+), 187 deletions(-) commit f190d08bc41232933565784dc900e9633507a173 @@ -8441,8 +12899,8 @@ Fix dist'ing with Vala disabled. - NEWS | 7 +++++++ - configure.in | 4 ++-- + NEWS | 7 +++++++ + configure.in | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) commit b1474af923716f949f578837926831269ec04449 @@ -8451,7 +12909,7 @@ Build: Fix POTFILES.in to reference the new plugin files - po/POTFILES.in | 44 ++++++++++++++++++++++---------------------- + po/POTFILES.in | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) commit 06a3f88f151e3bcb3119e2cb7b9845bb220dbd92 @@ -8462,10 +12920,10 @@ As we have no Vala support anyway. - configure.in | 36 +------------------- - src/plugins/sample-vala/Makefile.am | 22 ------------ - src/plugins/sample-vala/sample-vala.plugin.in | 8 ----- - .../sample-vala/totem-sample-vala-plugin.vala | 22 ------------ + configure.in | 36 +--------------------- + src/plugins/sample-vala/Makefile.am | 22 ------------- + src/plugins/sample-vala/sample-vala.plugin.in | 8 ----- + .../sample-vala/totem-sample-vala-plugin.vala | 22 ------------- 4 files changed, 1 insertion(+), 87 deletions(-) commit 2825c12db0bfb9fda93b785f010ed6047bc5f25c @@ -8474,7 +12932,7 @@ youtube: Fix compile-time warning - src/plugins/youtube/totem-youtube.c | 2 +- + src/plugins/youtube/totem-youtube.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 026ba988526c4a156d5cbad2934116d1650463f3 @@ -8483,7 +12941,7 @@ update Punjabi Translation by A S Alam - po/pa.po | 34 ++++------------------------------ + po/pa.po | 34 ++++------------------------------ 1 file changed, 4 insertions(+), 30 deletions(-) commit 71047797f8c4975a17f1a721d669ba55dfa4de2c @@ -8498,7 +12956,7 @@ Fixes weird looking UI since the recent Height-For-Width changes in GTK+ for 3.x. - data/totem.ui | 4 ++-- + data/totem.ui | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 473a6e8d2b95f1e0a84f2d99ab2c1c414dfafe65 @@ -8507,7 +12965,7 @@ Updated Catalan (Valencian) translation - po/ca@valencia.po | 846 +++++++++++++++++++++++++++++++---------------------- + po/ca@valencia.po | 846 +++++++++++++++++++++++++++++++----------------------- 1 file changed, 490 insertions(+), 356 deletions(-) commit 9ee03e0fd8a9d575c0b2bf6f1d9a3da3521472e3 @@ -8521,8 +12979,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=633409 - src/backend/bacon-video-widget-gst-0.10.c | 19 +++++++++++++----- - src/gsd-osd-window.c | 31 +++++++++++++++++++++++------ + src/backend/bacon-video-widget-gst-0.10.c | 19 ++++++++++++++----- + src/gsd-osd-window.c | 31 +++++++++++++++++++++++++------ 2 files changed, 39 insertions(+), 11 deletions(-) commit d818ea98b280d62e8c150ea3cc3fac1744c4d439 @@ -8540,10 +12998,10 @@ This however breaks activating the application via D-Bus. - src/totem-options.c | 107 +++++++---------------- - src/totem-options.h | 3 +- - src/totem-private.h | 2 +- - src/totem.c | 237 +++++++++++++++++++++++---------------------------- + src/totem-options.c | 107 +++++++----------------- + src/totem-options.h | 3 +- + src/totem-private.h | 2 +- + src/totem.c | 237 ++++++++++++++++++++++++---------------------------- 4 files changed, 141 insertions(+), 208 deletions(-) commit 0847cae7bb376190c74b433824c68c7a8ad85fd8 @@ -8563,7 +13021,7 @@ Replace it by gtk_widget_hide(). - browser-plugin/totem-plugin-viewer.c | 2 +- + browser-plugin/totem-plugin-viewer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 82dfa6e67f413880be14fa5929aee93a7f1a95c0 @@ -8572,7 +13030,7 @@ Update Simplified Chinese translation. - po/zh_CN.po | 162 ++++++++++++++++++++++++++++++++++++----------------------- + po/zh_CN.po | 162 +++++++++++++++++++++++++++++++++++++----------------------- 1 file changed, 99 insertions(+), 63 deletions(-) commit 03351c51014ce6cd00000beaf2aab632806ba23f @@ -8584,7 +13042,7 @@ Due to bgo#60579, PyGObject will no longer accept Python Unicode objects as strings, so we need to UTF-8 encode them explicitly. Helps: bgo#626399 - src/plugins/iplayer/iplayer.py | 3 ++- + src/plugins/iplayer/iplayer.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 090b85b9ebf8c3baa496d73f60e3fb6ed871b4e8 @@ -8596,7 +13054,7 @@ There doesn't seem to be any progress towards solving the big problem which is bgo#620912, so we just work around it. - src/plugins/iplayer/iplayer.py | 36 +++++++++++++++++++++++------------- + src/plugins/iplayer/iplayer.py | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) commit 8de995d28a40deb0d59382cf632f963187b38f85 @@ -8605,7 +13063,7 @@ Remove outdated properties from the Jamendo plugin GtkBuilder file - src/plugins/jamendo/jamendo.ui | 3 --- + src/plugins/jamendo/jamendo.ui | 3 --- 1 file changed, 3 deletions(-) commit 765d5d6dd1bec29aadf4a204b16eb77a613103f8 @@ -8614,7 +13072,7 @@ Remove an outdated hack from the Jamendo plugin - src/plugins/jamendo/jamendo.py | 16 ---------------- + src/plugins/jamendo/jamendo.py | 16 ---------------- 1 file changed, 16 deletions(-) commit 9edfcdeed3cd5d937c15049ed60c8c2a5154e55b @@ -8625,7 +13083,7 @@ This means it pretty much works now. - src/plugins/jamendo/jamendo.py | 10 +++++----- + src/plugins/jamendo/jamendo.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) commit db514ed6f5d61929a0b240f7cca7eddc9139f373 @@ -8637,8 +13095,8 @@ Since bgo#622987 now has a fix, the workaround for it in the Jamendo plugin is no longer necessary. - src/plugins/jamendo/jamendo.py | 20 ++++---------------- - src/plugins/jamendo/jamendo.ui | 6 +++--- + src/plugins/jamendo/jamendo.py | 20 ++++---------------- + src/plugins/jamendo/jamendo.ui | 6 +++--- 2 files changed, 7 insertions(+), 19 deletions(-) commit 2f9199224aa162147d9789a89da4dddb113a51e5 @@ -8647,7 +13105,7 @@ Fix for gtk_combo_box_append_text() deprecation - src/totem-preferences.c | 15 +++++++++++---- + src/totem-preferences.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) commit 666ff7e98dd4b48c7e2a1b0ebd26e363b613dd8d @@ -8656,7 +13114,7 @@ Fix warning when building against latest GTK+ 3.x - src/totem-cell-renderer-video.c | 4 ++-- + src/totem-cell-renderer-video.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 8b5aa922804b39c1d3b63eafba2ba6290fccae9b @@ -8665,7 +13123,7 @@ Fix gtk_widget_size_request deprecation - browser-plugin/totem-plugin-viewer.c | 2 +- + browser-plugin/totem-plugin-viewer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 4bdd6a36a2268744575d9f105043033114a9ae0c @@ -8674,7 +13132,7 @@ browser-plugin: No more resize grip - browser-plugin/totem-plugin-viewer.c | 1 - + browser-plugin/totem-plugin-viewer.c | 1 - 1 file changed, 1 deletion(-) commit ccc9c78873d06ed61ca705188b716acba5146846 @@ -8686,7 +13144,7 @@ The code in GTK+ to show resize grips in every window should be taking care of this for us. - src/totem-object.c | 2 -- + src/totem-object.c | 2 -- 1 file changed, 2 deletions(-) commit 191030b3edea6c10d9f3c7b24b8b12849758600d @@ -8695,7 +13153,7 @@ [l10n] Updated German translation - po/de.po | 961 ++++++++++++++++++++++++++++++++++---------------------------- + po/de.po | 961 +++++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 532 insertions(+), 429 deletions(-) commit caa14d6e6a136cb7b68bbc9c7d012ec29ebfefe0 @@ -8704,7 +13162,7 @@ Added sl for Slovenian translation - help/Makefile.am | 2 +- + help/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit c272c84c644a4932e995fec3062dd524451984c0 @@ -8722,7 +13180,7 @@ Updated Romanian translation - po/ro.po | 982 ++++++++++++++++++++++++++++++++++---------------------------- + po/ro.po | 982 +++++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 544 insertions(+), 438 deletions(-) commit 38f29dd035eb3e4ae84a2843710a2ae542a34d28 @@ -8731,8 +13189,8 @@ Some fixes for parallel builds - browser-plugin/Makefile.am | 7 +++++-- - src/plugins/media-player-keys/Makefile.am | 2 +- + browser-plugin/Makefile.am | 7 +++++-- + src/plugins/media-player-keys/Makefile.am | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) commit d8e3019fec486697748ffbb8f00b02baa1bf433b @@ -8741,7 +13199,7 @@ Updated Spanish translation - po/es.po | 135 +++++++++++++++++++++++++++++++++++++++----------------------- + po/es.po | 135 ++++++++++++++++++++++++++++++++++++++++----------------------- 1 file changed, 85 insertions(+), 50 deletions(-) commit 8eb71e3fb36af204023ded0a1946f2700154b531 @@ -8750,7 +13208,7 @@ updating translation for Punjabi - po/pa.po | 957 +++++++++++++++++++++++++++++++++++--------------------------- + po/pa.po | 957 +++++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 535 insertions(+), 422 deletions(-) commit 1c1672491442722ffff58c5ec2645096283b255f @@ -8762,7 +13220,7 @@ As explained here: http://blogs.gnome.org/jjardon/2010/10/08 /use-upstream-gettext-instead-the-glib-one/. - configure.in | 3 ++- + configure.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 82f2996a85eb166af71eed918927dfe654867147 @@ -8771,7 +13229,7 @@ List audio/mp2 as supported - data/mime-type-list.txt | 1 + + data/mime-type-list.txt | 1 + 1 file changed, 1 insertion(+) commit b337849b174efd6b11304ddcdd3cfda015ffef5b @@ -8782,7 +13240,7 @@ Missing a little ";" - data/desktop.sh | 2 +- + data/desktop.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 8e9df8979212e11ab00d51b9146e5a1e3f7caf5d @@ -8794,10 +13252,10 @@ Remove extraneous plugin file, and disable Vala plugins from the dist for now. - Makefile.am | 2 +- - NEWS | 22 ++++++++++++++++++++++ - configure.in | 2 +- - src/plugins/grilo-search/grilo-search.plugin.in | 8 -------- + Makefile.am | 2 +- + NEWS | 22 ++++++++++++++++++++++ + configure.in | 2 +- + src/plugins/grilo-search/grilo-search.plugin.in | 8 -------- 4 files changed, 24 insertions(+), 10 deletions(-) commit 735a32a984262336bc148fad37dc3be95a8738db @@ -8810,7 +13268,7 @@ http://git.gnome.org/browse/libwnck/commit/?h=gtk3&id=211a61d40b3cbac8ac38d3efe17e885b00e85f0e http://git.gnome.org/browse/libwnck/commit/?h=gtk3&id=1857f00faa225c41a3d5d1ca5bce0c10e1c7deb6 - browser-plugin/totem-glow-button.c | 218 +++++++++--------------------------- + browser-plugin/totem-glow-button.c | 218 +++++++++---------------------------- 1 file changed, 50 insertions(+), 168 deletions(-) commit 74833ef98e515104a5ef10b0e59af0b5a0244ed7 @@ -8819,9 +13277,9 @@ Add support for URI scheme handlers - data/desktop.sh | 7 +++++++ - data/mime-functions.sh | 4 ++-- - data/mime-type-include.sh | 2 +- + data/desktop.sh | 7 +++++++ + data/mime-functions.sh | 4 ++-- + data/mime-type-include.sh | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) commit 9655a4d4c860a5e11135915dc4ee6c1b93cc3365 @@ -8843,7 +13301,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=621802 - src/totem-video-thumbnailer.c | 8 ++++++-- + src/totem-video-thumbnailer.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) commit a5f081f92be3ea42143c55b35e57bd5fc0937335 @@ -8852,87 +13310,87 @@ Rename plugin files for new libpeas API - src/plugins/Makefile.plugins | 4 ++-- - src/plugins/bemused/Makefile.am | 2 +- - src/plugins/bemused/bemused.plugin.in | 9 +++++++++ - src/plugins/bemused/bemused.totem-plugin.in | 9 --------- - src/plugins/brasero-disc-recorder/Makefile.am | 2 +- - .../brasero-disc-recorder/brasero-disc-recorder.plugin.in | 9 +++++++++ - .../brasero-disc-recorder.totem-plugin.in | 9 --------- - src/plugins/chapters/Makefile.am | 2 +- - src/plugins/chapters/chapters.plugin.in | 9 +++++++++ - src/plugins/chapters/chapters.totem-plugin.in | 9 --------- - src/plugins/coherence_upnp/Makefile.am | 2 +- - src/plugins/coherence_upnp/coherence_upnp.plugin.in | 9 +++++++++ - src/plugins/coherence_upnp/coherence_upnp.totem-plugin.in | 9 --------- - src/plugins/dbus-service/Makefile.am | 2 +- - src/plugins/dbus-service/dbus-service.plugin.in | 9 +++++++++ - src/plugins/dbus-service/dbus-service.totem-plugin.in | 9 --------- - src/plugins/galago/Makefile.am | 2 +- - src/plugins/galago/galago.plugin.in | 9 +++++++++ - src/plugins/galago/galago.totem-plugin.in | 9 --------- - src/plugins/grilo-search/grilo-search.plugin.in | 8 ++++++++ - src/plugins/gromit/Makefile.am | 2 +- - src/plugins/gromit/gromit.plugin.in | 8 ++++++++ - src/plugins/gromit/gromit.totem-plugin.in | 8 -------- - src/plugins/iplayer/Makefile.am | 2 +- - src/plugins/iplayer/iplayer.plugin.in | 9 +++++++++ - src/plugins/iplayer/iplayer.totem-plugin.in | 9 --------- - src/plugins/jamendo/Makefile.am | 2 +- - src/plugins/jamendo/jamendo.plugin.in | 9 +++++++++ - src/plugins/jamendo/jamendo.totem-plugin.in | 9 --------- - src/plugins/lirc/Makefile.am | 2 +- - src/plugins/lirc/lirc.plugin.in | 8 ++++++++ - src/plugins/lirc/lirc.totem-plugin.in | 8 -------- - src/plugins/media-player-keys/Makefile.am | 2 +- - src/plugins/media-player-keys/media-player-keys.plugin.in | 9 +++++++++ - .../media-player-keys/media-player-keys.totem-plugin.in | 9 --------- - src/plugins/mythtv/Makefile.am | 2 +- - src/plugins/mythtv/mythtv.plugin.in | 9 +++++++++ - src/plugins/mythtv/mythtv.totem-plugin.in | 9 --------- - src/plugins/ontop/Makefile.am | 2 +- - src/plugins/ontop/ontop.plugin.in | 8 ++++++++ - src/plugins/ontop/ontop.totem-plugin.in | 8 -------- - src/plugins/opensubtitles/Makefile.am | 2 +- - src/plugins/opensubtitles/opensubtitles.plugin.in | 9 +++++++++ - src/plugins/opensubtitles/opensubtitles.totem-plugin.in | 9 --------- - src/plugins/properties/Makefile.am | 2 +- - src/plugins/properties/movie-properties.plugin.in | 9 +++++++++ - src/plugins/properties/movie-properties.totem-plugin.in | 9 --------- - src/plugins/publish/Makefile.am | 2 +- - src/plugins/publish/publish.plugin.in | 8 ++++++++ - src/plugins/publish/publish.totem-plugin.in | 8 -------- - src/plugins/pythonconsole/Makefile.am | 2 +- - src/plugins/pythonconsole/pythonconsole.plugin.in | 9 +++++++++ - src/plugins/pythonconsole/pythonconsole.totem-plugin.in | 9 --------- - src/plugins/sample-python/Makefile.am | 2 +- - src/plugins/sample-python/sample-python.plugin.in | 9 +++++++++ - src/plugins/sample-python/sample-python.totem-plugin.in | 9 --------- - src/plugins/sample-vala/Makefile.am | 2 +- - src/plugins/sample-vala/sample-vala.plugin.in | 8 ++++++++ - src/plugins/sample-vala/sample-vala.totem-plugin.in | 8 -------- - src/plugins/screensaver/Makefile.am | 2 +- - src/plugins/screensaver/screensaver.plugin.in | 9 +++++++++ - src/plugins/screensaver/screensaver.totem-plugin.in | 9 --------- - src/plugins/screenshot/Makefile.am | 2 +- - src/plugins/screenshot/screenshot.plugin.in | 9 +++++++++ - src/plugins/screenshot/screenshot.totem-plugin.in | 9 --------- - src/plugins/sidebar-test/Makefile.am | 2 +- - src/plugins/sidebar-test/sidebar-test.plugin.in | 9 +++++++++ - src/plugins/sidebar-test/sidebar-test.totem-plugin.in | 9 --------- - src/plugins/skipto/Makefile.am | 2 +- - src/plugins/skipto/skipto.plugin.in | 9 +++++++++ - src/plugins/skipto/skipto.totem-plugin.in | 9 --------- - src/plugins/thumbnail/Makefile.am | 2 +- - src/plugins/thumbnail/thumbnail.plugin.in | 8 ++++++++ - src/plugins/thumbnail/thumbnail.totem-plugin.in | 8 -------- - src/plugins/totem-plugins-engine.c | 2 -- - src/plugins/tracker/Makefile.am | 2 +- - src/plugins/tracker/tracker.plugin.in | 9 +++++++++ - src/plugins/tracker/tracker.totem-plugin.in | 9 --------- - src/plugins/youtube/Makefile.am | 2 +- - src/plugins/youtube/youtube.plugin.in | 8 ++++++++ - src/plugins/youtube/youtube.totem-plugin.in | 8 -------- + src/plugins/Makefile.plugins | 4 ++-- + src/plugins/bemused/Makefile.am | 2 +- + src/plugins/bemused/bemused.plugin.in | 9 +++++++++ + src/plugins/bemused/bemused.totem-plugin.in | 9 --------- + src/plugins/brasero-disc-recorder/Makefile.am | 2 +- + .../brasero-disc-recorder/brasero-disc-recorder.plugin.in | 9 +++++++++ + .../brasero-disc-recorder/brasero-disc-recorder.totem-plugin.in | 9 --------- + src/plugins/chapters/Makefile.am | 2 +- + src/plugins/chapters/chapters.plugin.in | 9 +++++++++ + src/plugins/chapters/chapters.totem-plugin.in | 9 --------- + src/plugins/coherence_upnp/Makefile.am | 2 +- + src/plugins/coherence_upnp/coherence_upnp.plugin.in | 9 +++++++++ + src/plugins/coherence_upnp/coherence_upnp.totem-plugin.in | 9 --------- + src/plugins/dbus-service/Makefile.am | 2 +- + src/plugins/dbus-service/dbus-service.plugin.in | 9 +++++++++ + src/plugins/dbus-service/dbus-service.totem-plugin.in | 9 --------- + src/plugins/galago/Makefile.am | 2 +- + src/plugins/galago/galago.plugin.in | 9 +++++++++ + src/plugins/galago/galago.totem-plugin.in | 9 --------- + src/plugins/grilo-search/grilo-search.plugin.in | 8 ++++++++ + src/plugins/gromit/Makefile.am | 2 +- + src/plugins/gromit/gromit.plugin.in | 8 ++++++++ + src/plugins/gromit/gromit.totem-plugin.in | 8 -------- + src/plugins/iplayer/Makefile.am | 2 +- + src/plugins/iplayer/iplayer.plugin.in | 9 +++++++++ + src/plugins/iplayer/iplayer.totem-plugin.in | 9 --------- + src/plugins/jamendo/Makefile.am | 2 +- + src/plugins/jamendo/jamendo.plugin.in | 9 +++++++++ + src/plugins/jamendo/jamendo.totem-plugin.in | 9 --------- + src/plugins/lirc/Makefile.am | 2 +- + src/plugins/lirc/lirc.plugin.in | 8 ++++++++ + src/plugins/lirc/lirc.totem-plugin.in | 8 -------- + src/plugins/media-player-keys/Makefile.am | 2 +- + src/plugins/media-player-keys/media-player-keys.plugin.in | 9 +++++++++ + src/plugins/media-player-keys/media-player-keys.totem-plugin.in | 9 --------- + src/plugins/mythtv/Makefile.am | 2 +- + src/plugins/mythtv/mythtv.plugin.in | 9 +++++++++ + src/plugins/mythtv/mythtv.totem-plugin.in | 9 --------- + src/plugins/ontop/Makefile.am | 2 +- + src/plugins/ontop/ontop.plugin.in | 8 ++++++++ + src/plugins/ontop/ontop.totem-plugin.in | 8 -------- + src/plugins/opensubtitles/Makefile.am | 2 +- + src/plugins/opensubtitles/opensubtitles.plugin.in | 9 +++++++++ + src/plugins/opensubtitles/opensubtitles.totem-plugin.in | 9 --------- + src/plugins/properties/Makefile.am | 2 +- + src/plugins/properties/movie-properties.plugin.in | 9 +++++++++ + src/plugins/properties/movie-properties.totem-plugin.in | 9 --------- + src/plugins/publish/Makefile.am | 2 +- + src/plugins/publish/publish.plugin.in | 8 ++++++++ + src/plugins/publish/publish.totem-plugin.in | 8 -------- + src/plugins/pythonconsole/Makefile.am | 2 +- + src/plugins/pythonconsole/pythonconsole.plugin.in | 9 +++++++++ + src/plugins/pythonconsole/pythonconsole.totem-plugin.in | 9 --------- + src/plugins/sample-python/Makefile.am | 2 +- + src/plugins/sample-python/sample-python.plugin.in | 9 +++++++++ + src/plugins/sample-python/sample-python.totem-plugin.in | 9 --------- + src/plugins/sample-vala/Makefile.am | 2 +- + src/plugins/sample-vala/sample-vala.plugin.in | 8 ++++++++ + src/plugins/sample-vala/sample-vala.totem-plugin.in | 8 -------- + src/plugins/screensaver/Makefile.am | 2 +- + src/plugins/screensaver/screensaver.plugin.in | 9 +++++++++ + src/plugins/screensaver/screensaver.totem-plugin.in | 9 --------- + src/plugins/screenshot/Makefile.am | 2 +- + src/plugins/screenshot/screenshot.plugin.in | 9 +++++++++ + src/plugins/screenshot/screenshot.totem-plugin.in | 9 --------- + src/plugins/sidebar-test/Makefile.am | 2 +- + src/plugins/sidebar-test/sidebar-test.plugin.in | 9 +++++++++ + src/plugins/sidebar-test/sidebar-test.totem-plugin.in | 9 --------- + src/plugins/skipto/Makefile.am | 2 +- + src/plugins/skipto/skipto.plugin.in | 9 +++++++++ + src/plugins/skipto/skipto.totem-plugin.in | 9 --------- + src/plugins/thumbnail/Makefile.am | 2 +- + src/plugins/thumbnail/thumbnail.plugin.in | 8 ++++++++ + src/plugins/thumbnail/thumbnail.totem-plugin.in | 8 -------- + src/plugins/totem-plugins-engine.c | 2 -- + src/plugins/tracker/Makefile.am | 2 +- + src/plugins/tracker/tracker.plugin.in | 9 +++++++++ + src/plugins/tracker/tracker.totem-plugin.in | 9 --------- + src/plugins/youtube/Makefile.am | 2 +- + src/plugins/youtube/youtube.plugin.in | 8 ++++++++ + src/plugins/youtube/youtube.totem-plugin.in | 8 -------- 81 files changed, 263 insertions(+), 257 deletions(-) commit e5703515b90ddcbd023f1383280c87074091ec8e @@ -8941,7 +13399,7 @@ Fix plugin manager creation with new libpeas - src/totem-menu.c | 2 +- + src/totem-menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit cc6e97fc6f25e1c022465d471821e6161406325b @@ -8952,7 +13410,7 @@ With help from Matthias Clasen - src/totem-cell-renderer-video.c | 23 ++++++++--------------- + src/totem-cell-renderer-video.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) commit d2f926690f3f397f991d3d941ed56a79f0a09fb9 @@ -8963,7 +13421,7 @@ With help from Matthias Clasen - src/backend/bacon-video-widget-gst-0.10.c | 50 +++++++---------------------- + src/backend/bacon-video-widget-gst-0.10.c | 50 +++++++------------------------ 1 file changed, 11 insertions(+), 39 deletions(-) commit ca74976ccb4728adffeb402c5b91959bc1eceb52 @@ -8975,7 +13433,7 @@ Including changing the defaults for the popup motion notify events so we can actually show the popups at all. - src/totem-fullscreen.c | 28 ++++++++++++++-------------- + src/totem-fullscreen.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) commit 7f38d5eddf5cfb2e5083c0e6bd6054f5e8368a1f @@ -8984,8 +13442,8 @@ Update to compile against latest libpeas - configure.in | 2 +- - src/plugins/totem-plugins-engine.c | 17 +++++------------ + configure.in | 2 +- + src/plugins/totem-plugins-engine.c | 17 +++++------------ 2 files changed, 6 insertions(+), 13 deletions(-) commit 8159ead3dd905d88c3fbfb4731b260e2ba7b540d @@ -8996,7 +13454,7 @@ So totem.c compiles with the latest GTK+ 3.x - src/totem.c | 37 ------------------------------------- + src/totem.c | 37 ------------------------------------- 1 file changed, 37 deletions(-) commit a922392c4a5f6e89aaf479d9fbb87f0dc6cfaa36 @@ -9007,11 +13465,11 @@ So it compiles with the newest GTK+ 3.x - src/Makefile.am | 2 + - src/gsd-media-keys-window.c | 432 +++------------------------------ - src/gsd-media-keys-window.h | 6 +- - src/gsd-osd-window.c | 561 +++++++++++++++++++++++++++++++++++++++++++ - src/gsd-osd-window.h | 94 ++++++++ + src/Makefile.am | 2 + + src/gsd-media-keys-window.c | 432 +++------------------------------- + src/gsd-media-keys-window.h | 6 +- + src/gsd-osd-window.c | 561 ++++++++++++++++++++++++++++++++++++++++++++ + src/gsd-osd-window.h | 94 ++++++++ 5 files changed, 700 insertions(+), 395 deletions(-) commit a1ffeedb24d694d2c7900c182b60059f87e20af5 @@ -9020,9 +13478,9 @@ Fix GdkDrawable removal in GTK+ 3.x - src/backend/bacon-video-widget-gst-0.10.c | 8 ++++---- - src/backend/video-utils.c | 16 +++++++++------- - src/backend/video-utils.h | 9 ++++++--- + src/backend/bacon-video-widget-gst-0.10.c | 8 ++++---- + src/backend/video-utils.c | 16 +++++++++------- + src/backend/video-utils.h | 9 ++++++--- 3 files changed, 19 insertions(+), 14 deletions(-) commit 64cf15c8a105f7a1ac9e0d4e4b414f23d15c7c74 @@ -9035,7 +13493,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=630683 - src/ev-sidebar.c | 10 ---------- + src/ev-sidebar.c | 10 ---------- 1 file changed, 10 deletions(-) commit a12cd32a9b2423e9a43a8a68dc9b2af63695b149 @@ -9054,7 +13512,7 @@ Updated Romanian translation - po/ro.po | 956 +++++++++++++++++++++++++++++++++++--------------------------- + po/ro.po | 956 ++++++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 546 insertions(+), 410 deletions(-) commit 6b02786483800c780fe07367de9d85216ca3550a @@ -9063,7 +13521,7 @@ Updated Bulgarian translation - po/bg.po | 846 ++++++++++++++++++++++++++++++++------------------------------ + po/bg.po | 846 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 430 insertions(+), 416 deletions(-) commit 8af0ec191177ff122c4e5b6ccae8938543f1e3e0 @@ -9072,7 +13530,7 @@ Updated Bulgarian translation - po/bg.po | 854 +++++++++++++++++++++++++++++++++++--------------------------- + po/bg.po | 854 +++++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 478 insertions(+), 376 deletions(-) commit ee11fc8117404e0ee713b82f2e41f82836182d78 @@ -9081,7 +13539,7 @@ Updated Dutch translation by Wouter Bolsterlee - po/nl.po | 909 ++++++++++++++++++++++++++++++++++++-------------------------- + po/nl.po | 909 ++++++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 523 insertions(+), 386 deletions(-) commit a61e9db7a8f96d23e886e4bf14b894e5e4add67b @@ -9092,8 +13550,8 @@ Closes: bgo#630515 - data/properties.ui | 4 ++-- - .../properties/bacon-video-widget-properties.c | 20 ++++++++++---------- + data/properties.ui | 4 ++-- + .../properties/bacon-video-widget-properties.c | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) commit c08eb7c166d95c32dfe84c1db78cce430a9b9434 @@ -9102,7 +13560,7 @@ Improve a translation comment for the command line options - src/totem-options.c | 2 +- + src/totem-options.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 11c1e75baa74dd0dc644fa86561dd5343f308d23 @@ -9111,7 +13569,7 @@ Add a translator comment in the iPlayer plugin - src/plugins/iplayer/iplayer.py | 1 + + src/plugins/iplayer/iplayer.py | 1 + 1 file changed, 1 insertion(+) commit a953719624330aba0ea7c437f4a30226b6323a69 @@ -9122,7 +13580,7 @@ Closes: bgo#630435 - src/totem-object.c | 8 ++++---- + src/totem-object.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 142dad2a6b737556378be2d7a351beba2ca6eac0 @@ -9131,7 +13589,7 @@ Updated Catalan translation - po/ca.po | 898 +++++++++++++++++++++++++++++++++++--------------------------- + po/ca.po | 898 ++++++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 513 insertions(+), 385 deletions(-) commit 3d79852cfa73852707d2fa6c493f9ca5ad21934e @@ -9160,7 +13618,7 @@ It was freeing a source, not breaking reference cycles. - src/totem-statusbar.c | 12 +++++------- + src/totem-statusbar.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) commit 73d75418fe6f634eb149154fbbe28acaae033a6a @@ -9169,8 +13627,8 @@ Seal the private members of TotemStatusbar - src/totem-statusbar.c | 122 +++++++++++++++++++++++++++++-------------------- - src/totem-statusbar.h | 20 ++------ + src/totem-statusbar.c | 122 +++++++++++++++++++++++++++++--------------------- + src/totem-statusbar.h | 20 ++------- 2 files changed, 76 insertions(+), 66 deletions(-) commit 921b3b789aac7279beb1b886279c5e9788377778 @@ -9179,10 +13637,10 @@ Add missing introspection annotations - src/plugins/totem-dirs.c | 6 +++--- - src/totem-interface.c | 30 ++++++++++++++++++++++++++++++ - src/totem-object.c | 4 ++-- - src/totem-video-list.c | 2 +- + src/plugins/totem-dirs.c | 6 +++--- + src/totem-interface.c | 30 ++++++++++++++++++++++++++++++ + src/totem-object.c | 4 ++-- + src/totem-video-list.c | 2 +- 4 files changed, 36 insertions(+), 6 deletions(-) commit 7e9c0664ca3874b4b77a400817a9c870f076f11d @@ -9191,7 +13649,7 @@ Enable g-ir-scanner warnings - src/Makefile.am | 2 +- + src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 9a383c48dcb3b5ff86c2233deac9f3ea8f033405 @@ -9200,7 +13658,7 @@ Updated Japanese translation - po/ja.po | 843 ++++++++++++++++++++++++++++++++++---------------------------- + po/ja.po | 843 ++++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 462 insertions(+), 381 deletions(-) commit 80bd764690fad9e5c99da999fc1d3f67ca9e3656 @@ -9212,7 +13670,7 @@ This silences a gcc warning about not handling all enum values in a switch statement, and makes the code more explicit. - src/backend/bacon-video-widget-gst-missing-plugins.c | 9 +++++++++ + src/backend/bacon-video-widget-gst-missing-plugins.c | 9 +++++++++ 1 file changed, 9 insertions(+) commit f800bb9d12d0b319dd36e7531d2529346978ac3f @@ -9221,7 +13679,7 @@ Remove another use of GtkDialog::has-separator - data/totem.ui | 1 - + data/totem.ui | 1 - 1 file changed, 1 deletion(-) commit b4d4d139629fca931a9b24fb71d9c1301ef903e5 @@ -9232,7 +13690,7 @@ They're long, undecipherable and generally unhelpful. Closes: bgo#629548 - src/plugins/youtube/youtube.ui | 2 ++ + src/plugins/youtube/youtube.ui | 2 ++ 1 file changed, 2 insertions(+) commit 19857f506a3ff83b14ce461072ce4edadd612557 @@ -9245,7 +13703,7 @@ tooltip. This is useful for when the URI isn't particularly interesting, or we know that it will always be too long to fit on screen. Helps: bgo#629548 - src/totem-video-list.c | 26 ++++++++++++++++++++++++-- + src/totem-video-list.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) commit fd5f7c14d84c29092501a10d396d6830a5facc03 @@ -9254,7 +13712,7 @@ Updated Spanish translation - po/es.po | 109 +++++++++++++++++++++++++++----------------------------------- + po/es.po | 109 +++++++++++++++++++++++++++------------------------------------ 1 file changed, 47 insertions(+), 62 deletions(-) commit ba8130de31b28d079203c2e883663d45b7c66668 @@ -9263,14 +13721,14 @@ Use GDK_KEY_* enums rather than the deprecated GDK_* ones - browser-plugin/totem-plugin-viewer.c | 22 +-- - src/plugins/chapters/totem-chapters.c | 4 +- - src/plugins/gromit/totem-gromit.c | 8 +- - src/plugins/screenshot/totem-screenshot-plugin.c | 4 +- - src/plugins/skipto/totem-skipto-plugin.c | 4 +- - src/totem-fullscreen.c | 2 +- - src/totem-object.c | 188 +++++++++++----------- - src/totem-playlist.c | 4 +- + browser-plugin/totem-plugin-viewer.c | 22 +-- + src/plugins/chapters/totem-chapters.c | 4 +- + src/plugins/gromit/totem-gromit.c | 8 +- + src/plugins/screenshot/totem-screenshot-plugin.c | 4 +- + src/plugins/skipto/totem-skipto-plugin.c | 4 +- + src/totem-fullscreen.c | 2 +- + src/totem-object.c | 188 +++++++++++------------ + src/totem-playlist.c | 4 +- 8 files changed, 118 insertions(+), 118 deletions(-) commit b0a0821eae5fecbaead5cb00a6e25836b8e65639 @@ -9282,8 +13740,8 @@ GtkProgressBar now implements GtkOrientable. This bumps our GTK+ dependency to 2.90.7. - configure.in | 2 +- - src/totem-statusbar.c | 4 ++-- + configure.in | 2 +- + src/totem-statusbar.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) commit 5bd014da979e7d7f63bb860fa6adb6abc636fb67 @@ -9301,7 +13759,7 @@ [l10n] Updated Estonian translation - po/et.po | 10 +++++----- + po/et.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) commit d4b8f57eb5eb2f7ef020a96dab09b405c43e07c5 @@ -9310,7 +13768,7 @@ [l10n] Updated Italian translation - po/it.po | 852 +++++++++++++++++++++++++++++++++++--------------------------- + po/it.po | 852 +++++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 480 insertions(+), 372 deletions(-) commit 1adfebe789473ea1883be740c17d9b5ab1b2601b @@ -9321,13 +13779,13 @@ It's deprecated in GTK+ 2.22 and removed in GTK+ 3. - src/plugins/chapters/totem-edit-chapter.c | 1 - - src/plugins/screenshot/totem-gallery-progress.c | 1 - - src/plugins/screenshot/totem-screenshot.c | 1 - - src/plugins/skipto/totem-skipto.c | 1 - - src/totem-menu.c | 1 - - src/totem-open-location.c | 1 - - src/totem-preferences.c | 1 - + src/plugins/chapters/totem-edit-chapter.c | 1 - + src/plugins/screenshot/totem-gallery-progress.c | 1 - + src/plugins/screenshot/totem-screenshot.c | 1 - + src/plugins/skipto/totem-skipto.c | 1 - + src/totem-menu.c | 1 - + src/totem-open-location.c | 1 - + src/totem-preferences.c | 1 - 7 files changed, 7 deletions(-) commit 3ea791dd742ec8ac7fff96eb8bbad771065589ff @@ -9338,8 +13796,8 @@ Closes: bgo#629758 - src/backend/bacon-video-widget-gst-missing-plugins.c | 2 +- - src/totem-interface.c | 2 +- + src/backend/bacon-video-widget-gst-missing-plugins.c | 2 +- + src/totem-interface.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit b02474733eb312220a3155a1d3be8ea84e0225b6 @@ -9348,7 +13806,7 @@ Add missing documentation - docs/reference/totem-docs.xml | 12 ++++++++++++ + docs/reference/totem-docs.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) commit c1df39a4c515be36bf81467ff5796d4c21aa8430 @@ -9359,7 +13817,7 @@ It's been deprecated as part of the GTK+ 3 work. Closes: bgo#629758 - lib/totem-scrsaver.c | 40 ++++++++++++++++++++-------------------- + lib/totem-scrsaver.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) commit 8ebfda372c5d84233aade7fea470a2120ab5bb33 @@ -9368,7 +13826,7 @@ Update Czech translation by Marek Cernocky - po/cs.po | 762 ++++++++++++++++++++++++++++++++++---------------------------- + po/cs.po | 762 +++++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 421 insertions(+), 341 deletions(-) commit b9db5776453e5a117bc1eb0ba7e30c1d3188c6e5 @@ -9386,7 +13844,7 @@ hindi update - po/hi.po | 9 +++++---- + po/hi.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) commit c2ad8bf6da99ddd2ae9252958d9607a94441526f @@ -9409,7 +13867,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=621802 - src/totem-video-thumbnailer.c | 14 ++++++++++---- + src/totem-video-thumbnailer.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) commit 072ef1f981cfbed6a2b65078fdf0b05b4d43ca2d @@ -9424,7 +13882,7 @@ handler. The idle handler is removed when the BaconVideoWidget is destroyed. Closes: bgo#628667 - src/backend/bacon-video-widget-gst-0.10.c | 51 ++++++++++++++++++++++------- + src/backend/bacon-video-widget-gst-0.10.c | 51 +++++++++++++++++++++++-------- 1 file changed, 39 insertions(+), 12 deletions(-) commit f048d91fe82d9ca5cb442f4b1d3240a4819d9d0b @@ -9437,7 +13895,7 @@ This should fix that, though the change is untested due to introspection problems on my computer at the moment. - src/plugins/jamendo/jamendo.py | 2 +- + src/plugins/jamendo/jamendo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 396289afbf736b0c4678575649194778d9c4dbfa @@ -9446,7 +13904,7 @@ Port Jamendo plugin to libpeas 0.5.5 - src/plugins/jamendo/jamendo.py | 4 ++-- + src/plugins/jamendo/jamendo.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 2c125a4ac8b939705db9cb482ab2853dece82efa @@ -9458,7 +13916,7 @@ It was calling intltool-merge twice, once with invalid arguments, but the error was getting hidden as nothing depended on its success value. - src/plugins/Makefile.plugins | 3 ++- + src/plugins/Makefile.plugins | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 96330e82f9d62b52cf06551da6c3f9a37cf7407d @@ -9467,7 +13925,7 @@ Fix the PEAS_CFLAGS in GIR generation - src/Makefile.am | 1 + + src/Makefile.am | 1 + 1 file changed, 1 insertion(+) commit af088fb449760a17f27da55659c1591fe1384964 @@ -9476,7 +13934,7 @@ Fix some syntax errors in the Jamendo plugin - src/plugins/jamendo/jamendo.py | 4 ++-- + src/plugins/jamendo/jamendo.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit c291cc084a60bb849f180692246f3bec267e0856 @@ -9485,7 +13943,7 @@ Clean up data/Makefile.am - data/Makefile.am | 66 +++++++++++++++++++++++++++++------------------------- + data/Makefile.am | 66 ++++++++++++++++++++++++++++++-------------------------- 1 file changed, 35 insertions(+), 31 deletions(-) commit f07dbfd1e53b24fb69c318c01254091038538a5d @@ -9494,7 +13952,7 @@ Clean up SOURCES in browser-plugin/Makefile.am - browser-plugin/Makefile.am | 83 +++++++++++++------------------------------- + browser-plugin/Makefile.am | 83 ++++++++++++++-------------------------------- 1 file changed, 24 insertions(+), 59 deletions(-) commit 42ade5333c9587519cc0993595dcf27308d7e413 @@ -9503,7 +13961,7 @@ Clean up CXXFLAGS in browser-plugin/Makefile.am - browser-plugin/Makefile.am | 39 +++++++++++---------------------------- + browser-plugin/Makefile.am | 39 +++++++++++---------------------------- 1 file changed, 11 insertions(+), 28 deletions(-) commit 26681a4eaf433ffca94c8c0b6b1a4260e17017ed @@ -9512,7 +13970,7 @@ Clean up LIBADD in browser-plugin/Makefile.am - browser-plugin/Makefile.am | 29 +++++++++-------------------- + browser-plugin/Makefile.am | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) commit b907a4aa116d17ccf193d0e382400950447c769d @@ -9521,7 +13979,7 @@ Clean up LDFLAGS in browser-plugin/Makefile.am - browser-plugin/Makefile.am | 30 ++++++++++-------------------- + browser-plugin/Makefile.am | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) commit 22f1031fb5950234d2ceb63f45f453289e9c9e2a @@ -9530,7 +13988,7 @@ Clean up browser-plugin/Makefile.am - browser-plugin/Makefile.am | 69 +++++++++++++++----------------------------- + browser-plugin/Makefile.am | 69 ++++++++++++++++------------------------------ 1 file changed, 24 insertions(+), 45 deletions(-) commit b572b6a0156b16d7e512abdc7a059cb1701ecb8c @@ -9539,7 +13997,7 @@ Clean up CPPFLAGS in browser-plugin/Makefile.am - browser-plugin/Makefile.am | 73 ++++++++------------------------------------ + browser-plugin/Makefile.am | 73 ++++++++-------------------------------------- 1 file changed, 12 insertions(+), 61 deletions(-) commit 1d8ca5aef82699a170ab8a2a65a285c402235db0 @@ -9548,7 +14006,7 @@ Clean up lib/Makefile.am - lib/Makefile.am | 35 +++++++++++------------------------ + lib/Makefile.am | 35 +++++++++++------------------------ 1 file changed, 11 insertions(+), 24 deletions(-) commit e168b073f40a0b261b212cc43b84a0fadb47cbeb @@ -9557,7 +14015,7 @@ Clean up src/Makefile.am - src/Makefile.am | 96 ++++++++++++++++++++++--------------------------------- + src/Makefile.am | 96 +++++++++++++++++++++++---------------------------------- 1 file changed, 39 insertions(+), 57 deletions(-) commit bb0dc2f84ffeb1e8a9b2fb6531280b31d1a553da @@ -9566,7 +14024,7 @@ Clean up the LDFLAGS in src/Makefile.am - src/Makefile.am | 26 +++----------------------- + src/Makefile.am | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) commit b229c9c4ed23640ecb436af8c12ce54a9ee7e8c4 @@ -9575,7 +14033,7 @@ Clean up the CFLAGS and LIBS in src/Makefile.am - src/Makefile.am | 72 ++++++++++++++++--------------------------------------- + src/Makefile.am | 72 ++++++++++++++++----------------------------------------- 1 file changed, 20 insertions(+), 52 deletions(-) commit 9b8f0f4b013b3a23f596c34ba8395e6b8784d61f @@ -9584,7 +14042,7 @@ Clean up the CPP flags in src/Makefile.am - src/Makefile.am | 33 +++++---------------------------- + src/Makefile.am | 33 +++++---------------------------- 1 file changed, 5 insertions(+), 28 deletions(-) commit 844031c4172b92a4d14b5fc098db2ffc43e40493 @@ -9596,13 +14054,13 @@ plugin_PYTHON automatically adds Python files to the distribution, so we don't need to explicitly put them in EXTRA_DIST. - src/plugins/coherence_upnp/Makefile.am | 2 -- - src/plugins/dbus-service/Makefile.am | 2 -- - src/plugins/iplayer/Makefile.am | 2 -- - src/plugins/jamendo/Makefile.am | 2 +- - src/plugins/opensubtitles/Makefile.am | 2 +- - src/plugins/pythonconsole/Makefile.am | 2 +- - src/plugins/sample-python/Makefile.am | 2 -- + src/plugins/coherence_upnp/Makefile.am | 2 -- + src/plugins/dbus-service/Makefile.am | 2 -- + src/plugins/iplayer/Makefile.am | 2 -- + src/plugins/jamendo/Makefile.am | 2 +- + src/plugins/opensubtitles/Makefile.am | 2 +- + src/plugins/pythonconsole/Makefile.am | 2 +- + src/plugins/sample-python/Makefile.am | 2 -- 7 files changed, 3 insertions(+), 11 deletions(-) commit ef64ed89ec5670ac5fb7b69804eb829d685f93c0 @@ -9614,11 +14072,11 @@ gsettings.m4 ensures that all the appropriate GSettings files are cleaned and distributed correctly, so we don't have to. - data/Makefile.am | 5 +---- - src/plugins/jamendo/Makefile.am | 12 ++++-------- - src/plugins/opensubtitles/Makefile.am | 12 ++++-------- - src/plugins/publish/Makefile.am | 12 ++++-------- - src/plugins/pythonconsole/Makefile.am | 12 ++++-------- + data/Makefile.am | 5 +---- + src/plugins/jamendo/Makefile.am | 12 ++++-------- + src/plugins/opensubtitles/Makefile.am | 12 ++++-------- + src/plugins/publish/Makefile.am | 12 ++++-------- + src/plugins/pythonconsole/Makefile.am | 12 ++++-------- 5 files changed, 17 insertions(+), 36 deletions(-) commit 72b8bd3b8c3fe5e8b075a7fe26415d2b5621d963 @@ -9627,9 +14085,9 @@ uninstall foo - src/plugins/sample-python/Makefile.am | 2 ++ - src/plugins/sample-vala/Makefile.am | 2 ++ - src/plugins/sidebar-test/Makefile.am | 2 ++ + src/plugins/sample-python/Makefile.am | 2 ++ + src/plugins/sample-vala/Makefile.am | 2 ++ + src/plugins/sidebar-test/Makefile.am | 2 ++ 3 files changed, 6 insertions(+) commit 7d0c35463544c1147efc539f4a6799bd1624c0b9 @@ -9641,20 +14099,20 @@ There's no need to add an include CPP flag for the backend directory. It's clearer to explicitly state that BVW is in the backend directory. - src/plugins/bemused/Makefile.am | 3 --- - src/plugins/bemused/totem-bemused.c | 2 +- - src/plugins/chapters/Makefile.am | 3 --- - src/plugins/chapters/totem-chapters.c | 2 +- - src/plugins/mythtv/Makefile.am | 3 --- - src/plugins/mythtv/totem-mythtv.c | 11 +++++------ - src/plugins/properties/Makefile.am | 3 --- - src/plugins/properties/bacon-video-widget-properties.c | 8 +++++--- - src/plugins/publish/Makefile.am | 3 --- - src/plugins/skipto/Makefile.am | 3 --- - src/plugins/skipto/totem-skipto.c | 4 ++-- - src/plugins/skipto/totem-time-entry.c | 2 +- - src/totem-fullscreen.h | 2 +- - src/totem-private.h | 2 +- + src/plugins/bemused/Makefile.am | 3 --- + src/plugins/bemused/totem-bemused.c | 2 +- + src/plugins/chapters/Makefile.am | 3 --- + src/plugins/chapters/totem-chapters.c | 2 +- + src/plugins/mythtv/Makefile.am | 3 --- + src/plugins/mythtv/totem-mythtv.c | 11 +++++------ + src/plugins/properties/Makefile.am | 3 --- + src/plugins/properties/bacon-video-widget-properties.c | 8 +++++--- + src/plugins/publish/Makefile.am | 3 --- + src/plugins/skipto/Makefile.am | 3 --- + src/plugins/skipto/totem-skipto.c | 4 ++-- + src/plugins/skipto/totem-time-entry.c | 2 +- + src/totem-fullscreen.h | 2 +- + src/totem-private.h | 2 +- 14 files changed, 17 insertions(+), 34 deletions(-) commit adc6fc33cf9ce71c13acbe7c4d78491a9beba497 @@ -9663,10 +14121,10 @@ Fix plugins' LIBADD and CFLAGS variables - src/plugins/lirc/Makefile.am | 4 +++- - src/plugins/ontop/Makefile.am | 1 - - src/plugins/screensaver/Makefile.am | 4 +++- - src/plugins/tracker/Makefile.am | 4 +++- + src/plugins/lirc/Makefile.am | 4 +++- + src/plugins/ontop/Makefile.am | 1 - + src/plugins/screensaver/Makefile.am | 4 +++- + src/plugins/tracker/Makefile.am | 4 +++- 4 files changed, 9 insertions(+), 4 deletions(-) commit d165d5727d9b73b0935e1156e65a01c877deba8e @@ -9684,7 +14142,7 @@ plugin, rather than the Vala files, but since Vala support (bindings) haven't been re-added to Totem, distcheck fails. - src/plugins/sample-vala/Makefile.am | 3 --- + src/plugins/sample-vala/Makefile.am | 3 --- 1 file changed, 3 deletions(-) commit 8ba2f789411ef399afd884665f6bb201a7c399b8 @@ -9693,34 +14151,34 @@ Factor out common plugin makefile magic into a new Makefile.plugins - src/plugins/Makefile.am | 2 + - src/plugins/Makefile.plugins | 24 ++++++++++++ - src/plugins/bemused/Makefile.am | 25 +++---------- - src/plugins/brasero-disc-recorder/Makefile.am | 25 ++----------- - src/plugins/chapters/Makefile.am | 41 +++++++++------------ - src/plugins/coherence_upnp/Makefile.am | 10 ++--- - src/plugins/dbus-service/Makefile.am | 10 ++--- - src/plugins/galago/Makefile.am | 26 ++----------- - src/plugins/gromit/Makefile.am | 27 ++------------ - src/plugins/iplayer/Makefile.am | 11 ++---- - src/plugins/jamendo/Makefile.am | 12 +++--- - src/plugins/lirc/Makefile.am | 29 +++------------ - src/plugins/media-player-keys/Makefile.am | 38 ++++++------------- - src/plugins/mythtv/Makefile.am | 30 ++++----------- - src/plugins/ontop/Makefile.am | 26 ++----------- - src/plugins/opensubtitles/Makefile.am | 12 +++--- - src/plugins/properties/Makefile.am | 44 ++++++---------------- - src/plugins/publish/Makefile.am | 30 +++++---------- - src/plugins/pythonconsole/Makefile.am | 12 +++--- - src/plugins/sample-python/Makefile.am | 15 ++++---- - src/plugins/sample-vala/Makefile.am | 49 ++++++------------------- - src/plugins/screensaver/Makefile.am | 26 +++---------- - src/plugins/screenshot/Makefile.am | 27 ++------------ - src/plugins/sidebar-test/Makefile.am | 29 +++------------ - src/plugins/skipto/Makefile.am | 30 +++------------ - src/plugins/thumbnail/Makefile.am | 27 ++------------ - src/plugins/tracker/Makefile.am | 23 ++---------- - src/plugins/youtube/Makefile.am | 27 +++----------- + src/plugins/Makefile.am | 2 ++ + src/plugins/Makefile.plugins | 24 +++++++++++++ + src/plugins/bemused/Makefile.am | 25 +++----------- + src/plugins/brasero-disc-recorder/Makefile.am | 25 ++------------ + src/plugins/chapters/Makefile.am | 41 ++++++++++------------ + src/plugins/coherence_upnp/Makefile.am | 10 ++---- + src/plugins/dbus-service/Makefile.am | 10 ++---- + src/plugins/galago/Makefile.am | 26 +++----------- + src/plugins/gromit/Makefile.am | 27 ++------------- + src/plugins/iplayer/Makefile.am | 11 +++--- + src/plugins/jamendo/Makefile.am | 12 +++---- + src/plugins/lirc/Makefile.am | 29 +++------------- + src/plugins/media-player-keys/Makefile.am | 38 +++++++-------------- + src/plugins/mythtv/Makefile.am | 30 ++++------------ + src/plugins/ontop/Makefile.am | 26 ++------------ + src/plugins/opensubtitles/Makefile.am | 12 +++---- + src/plugins/properties/Makefile.am | 44 ++++++------------------ + src/plugins/publish/Makefile.am | 30 ++++++---------- + src/plugins/pythonconsole/Makefile.am | 12 +++---- + src/plugins/sample-python/Makefile.am | 15 ++++---- + src/plugins/sample-vala/Makefile.am | 49 ++++++--------------------- + src/plugins/screensaver/Makefile.am | 26 +++----------- + src/plugins/screenshot/Makefile.am | 27 +++------------ + src/plugins/sidebar-test/Makefile.am | 29 ++++------------ + src/plugins/skipto/Makefile.am | 30 ++++------------ + src/plugins/thumbnail/Makefile.am | 27 ++------------- + src/plugins/tracker/Makefile.am | 23 ++----------- + src/plugins/youtube/Makefile.am | 27 +++------------ 28 files changed, 183 insertions(+), 504 deletions(-) commit d8cd4963d1642d4d5e72024012c9cf6c04052e89 @@ -9729,31 +14187,31 @@ Clean up plugin makefiles - src/plugins/bemused/Makefile.am | 24 ++++++++----------- - src/plugins/brasero-disc-recorder/Makefile.am | 24 ++++++++----------- - src/plugins/chapters/Makefile.am | 22 +++++++---------- - src/plugins/coherence_upnp/Makefile.am | 4 +--- - src/plugins/dbus-service/Makefile.am | 4 +--- - src/plugins/galago/Makefile.am | 22 +++++++---------- - src/plugins/gromit/Makefile.am | 24 ++++++++----------- - src/plugins/iplayer/Makefile.am | 9 +++---- - src/plugins/jamendo/Makefile.am | 9 +++---- - src/plugins/lirc/Makefile.am | 24 ++++++++----------- - src/plugins/media-player-keys/Makefile.am | 32 +++++++++++-------------- - src/plugins/mythtv/Makefile.am | 24 ++++++++----------- - src/plugins/ontop/Makefile.am | 24 ++++++++----------- - src/plugins/opensubtitles/Makefile.am | 8 +++---- - src/plugins/properties/Makefile.am | 27 ++++++++------------- - src/plugins/publish/Makefile.am | 26 +++++++++----------- - src/plugins/sample-python/Makefile.am | 5 ++-- - src/plugins/sample-vala/Makefile.am | 17 ++++++------- - src/plugins/screensaver/Makefile.am | 24 ++++++++----------- - src/plugins/screenshot/Makefile.am | 28 ++++++++++------------ - src/plugins/sidebar-test/Makefile.am | 22 +++++++---------- - src/plugins/skipto/Makefile.am | 30 ++++++++++------------- - src/plugins/thumbnail/Makefile.am | 24 ++++++++----------- - src/plugins/tracker/Makefile.am | 22 +++++++---------- - src/plugins/youtube/Makefile.am | 26 +++++++++----------- + src/plugins/bemused/Makefile.am | 24 +++++++++----------- + src/plugins/brasero-disc-recorder/Makefile.am | 24 +++++++++----------- + src/plugins/chapters/Makefile.am | 22 ++++++++---------- + src/plugins/coherence_upnp/Makefile.am | 4 +--- + src/plugins/dbus-service/Makefile.am | 4 +--- + src/plugins/galago/Makefile.am | 22 ++++++++---------- + src/plugins/gromit/Makefile.am | 24 +++++++++----------- + src/plugins/iplayer/Makefile.am | 9 ++++---- + src/plugins/jamendo/Makefile.am | 9 ++++---- + src/plugins/lirc/Makefile.am | 24 +++++++++----------- + src/plugins/media-player-keys/Makefile.am | 32 ++++++++++++--------------- + src/plugins/mythtv/Makefile.am | 24 +++++++++----------- + src/plugins/ontop/Makefile.am | 24 +++++++++----------- + src/plugins/opensubtitles/Makefile.am | 8 +++---- + src/plugins/properties/Makefile.am | 27 +++++++++------------- + src/plugins/publish/Makefile.am | 26 +++++++++------------- + src/plugins/sample-python/Makefile.am | 5 ++--- + src/plugins/sample-vala/Makefile.am | 17 ++++++-------- + src/plugins/screensaver/Makefile.am | 24 +++++++++----------- + src/plugins/screenshot/Makefile.am | 28 ++++++++++------------- + src/plugins/sidebar-test/Makefile.am | 22 ++++++++---------- + src/plugins/skipto/Makefile.am | 30 +++++++++++-------------- + src/plugins/thumbnail/Makefile.am | 24 +++++++++----------- + src/plugins/tracker/Makefile.am | 22 ++++++++---------- + src/plugins/youtube/Makefile.am | 26 +++++++++------------- 25 files changed, 212 insertions(+), 293 deletions(-) commit d93e5766a13357aea804f0907d7302fba8b3d97b @@ -9765,25 +14223,25 @@ Most of the defines in common_defines in the plugins' makefiles was outdated and unused. - src/plugins/bemused/Makefile.am | 7 ------- - src/plugins/brasero-disc-recorder/Makefile.am | 7 ------- - src/plugins/chapters/Makefile.am | 7 ------- - src/plugins/galago/Makefile.am | 7 ------- - src/plugins/gromit/Makefile.am | 7 ------- - src/plugins/lirc/Makefile.am | 7 ------- - src/plugins/media-player-keys/Makefile.am | 7 ------- - src/plugins/mythtv/Makefile.am | 7 ------- - src/plugins/ontop/Makefile.am | 7 ------- - src/plugins/properties/Makefile.am | 7 ------- - src/plugins/publish/Makefile.am | 7 ------- - src/plugins/sample-vala/Makefile.am | 7 ------- - src/plugins/screensaver/Makefile.am | 7 ------- - src/plugins/screenshot/Makefile.am | 7 ------- - src/plugins/sidebar-test/Makefile.am | 7 ------- - src/plugins/skipto/Makefile.am | 7 ------- - src/plugins/thumbnail/Makefile.am | 7 ------- - src/plugins/tracker/Makefile.am | 7 ------- - src/plugins/youtube/Makefile.am | 7 ------- + src/plugins/bemused/Makefile.am | 7 ------- + src/plugins/brasero-disc-recorder/Makefile.am | 7 ------- + src/plugins/chapters/Makefile.am | 7 ------- + src/plugins/galago/Makefile.am | 7 ------- + src/plugins/gromit/Makefile.am | 7 ------- + src/plugins/lirc/Makefile.am | 7 ------- + src/plugins/media-player-keys/Makefile.am | 7 ------- + src/plugins/mythtv/Makefile.am | 7 ------- + src/plugins/ontop/Makefile.am | 7 ------- + src/plugins/properties/Makefile.am | 7 ------- + src/plugins/publish/Makefile.am | 7 ------- + src/plugins/sample-vala/Makefile.am | 7 ------- + src/plugins/screensaver/Makefile.am | 7 ------- + src/plugins/screenshot/Makefile.am | 7 ------- + src/plugins/sidebar-test/Makefile.am | 7 ------- + src/plugins/skipto/Makefile.am | 7 ------- + src/plugins/thumbnail/Makefile.am | 7 ------- + src/plugins/tracker/Makefile.am | 7 ------- + src/plugins/youtube/Makefile.am | 7 ------- 19 files changed, 133 deletions(-) commit 0377eca3c0548121bee91b16c7c50a2f8d269b5e @@ -9796,30 +14254,30 @@ instance structs and init functions become very standard, so can be moved into _TOTEM_PLUGIN_REGISTER to save code. - src/plugins/bemused/totem-bemused.c | 121 ++++----- - .../brasero-disc-recorder/totem-disc-recorder.c | 131 ++++----- - src/plugins/chapters/totem-chapters.c | 104 +++---- - src/plugins/galago/totem-galago.c | 40 +-- - src/plugins/gromit/totem-gromit.c | 75 ++---- - src/plugins/lirc/totem-lirc.c | 63 ++--- - .../media-player-keys/totem-media-player-keys.c | 58 ++-- - src/plugins/mythtv/totem-mythtv.c | 113 ++++---- - src/plugins/ontop/totem-ontop.c | 25 -- - src/plugins/properties/totem-movie-properties.c | 49 ++-- - src/plugins/publish/totem-publish.c | 215 +++++++-------- - src/plugins/screensaver/totem-screensaver.c | 72 ++--- - src/plugins/screenshot/totem-gallery.c | 2 +- - src/plugins/screenshot/totem-gallery.h | 3 +- - src/plugins/screenshot/totem-screenshot-plugin.c | 35 +-- - src/plugins/screenshot/totem-screenshot-plugin.h | 14 - - src/plugins/screenshot/totem-screenshot.c | 2 +- - src/plugins/screenshot/totem-screenshot.h | 5 +- - src/plugins/sidebar-test/totem-sidebar-test.c | 23 +- - src/plugins/skipto/totem-skipto-plugin.c | 51 +--- - src/plugins/thumbnail/totem-thumbnail.c | 27 -- - src/plugins/totem-plugin.h | 22 +- - src/plugins/tracker/totem-tracker.c | 23 +- - src/plugins/youtube/totem-youtube.c | 283 ++++++++++---------- + src/plugins/bemused/totem-bemused.c | 121 ++++----- + .../brasero-disc-recorder/totem-disc-recorder.c | 131 ++++------ + src/plugins/chapters/totem-chapters.c | 104 +++----- + src/plugins/galago/totem-galago.c | 40 +-- + src/plugins/gromit/totem-gromit.c | 75 ++---- + src/plugins/lirc/totem-lirc.c | 63 ++--- + .../media-player-keys/totem-media-player-keys.c | 58 ++--- + src/plugins/mythtv/totem-mythtv.c | 113 ++++---- + src/plugins/ontop/totem-ontop.c | 25 -- + src/plugins/properties/totem-movie-properties.c | 49 ++-- + src/plugins/publish/totem-publish.c | 215 +++++++--------- + src/plugins/screensaver/totem-screensaver.c | 72 ++---- + src/plugins/screenshot/totem-gallery.c | 2 +- + src/plugins/screenshot/totem-gallery.h | 3 +- + src/plugins/screenshot/totem-screenshot-plugin.c | 35 +-- + src/plugins/screenshot/totem-screenshot-plugin.h | 14 - + src/plugins/screenshot/totem-screenshot.c | 2 +- + src/plugins/screenshot/totem-screenshot.h | 5 +- + src/plugins/sidebar-test/totem-sidebar-test.c | 23 +- + src/plugins/skipto/totem-skipto-plugin.c | 51 +--- + src/plugins/thumbnail/totem-thumbnail.c | 27 -- + src/plugins/totem-plugin.h | 22 +- + src/plugins/tracker/totem-tracker.c | 23 +- + src/plugins/youtube/totem-youtube.c | 283 ++++++++++----------- 24 files changed, 610 insertions(+), 946 deletions(-) commit a9e89c02e5c1fc10c23b25643c27af3b12ab6051 @@ -9831,25 +14289,25 @@ They should all be very standard, so we same some clutter by putting them in the _TOTEM_PLUGIN_REGISTER macro. - src/plugins/bemused/totem-bemused.c | 7 ------- - src/plugins/brasero-disc-recorder/totem-disc-recorder.c | 7 ------- - src/plugins/chapters/totem-chapters.c | 6 ------ - src/plugins/galago/totem-galago.c | 6 ------ - src/plugins/gromit/totem-gromit.c | 7 ------- - src/plugins/lirc/totem-lirc.c | 7 ------- - src/plugins/media-player-keys/totem-media-player-keys.c | 7 ------- - src/plugins/mythtv/totem-mythtv.c | 8 -------- - src/plugins/ontop/totem-ontop.c | 7 ------- - src/plugins/properties/totem-movie-properties.c | 7 ------- - src/plugins/publish/totem-publish.c | 7 ------- - src/plugins/screensaver/totem-screensaver.c | 8 -------- - src/plugins/screenshot/totem-screenshot-plugin.h | 6 ------ - src/plugins/sidebar-test/totem-sidebar-test.c | 8 -------- - src/plugins/skipto/totem-skipto-plugin.c | 6 ------ - src/plugins/thumbnail/totem-thumbnail.c | 7 ------- - src/plugins/totem-plugin.h | 4 ++++ - src/plugins/tracker/totem-tracker.c | 8 -------- - src/plugins/youtube/totem-youtube.c | 6 ------ + src/plugins/bemused/totem-bemused.c | 7 ------- + src/plugins/brasero-disc-recorder/totem-disc-recorder.c | 7 ------- + src/plugins/chapters/totem-chapters.c | 6 ------ + src/plugins/galago/totem-galago.c | 6 ------ + src/plugins/gromit/totem-gromit.c | 7 ------- + src/plugins/lirc/totem-lirc.c | 7 ------- + src/plugins/media-player-keys/totem-media-player-keys.c | 7 ------- + src/plugins/mythtv/totem-mythtv.c | 8 -------- + src/plugins/ontop/totem-ontop.c | 7 ------- + src/plugins/properties/totem-movie-properties.c | 7 ------- + src/plugins/publish/totem-publish.c | 7 ------- + src/plugins/screensaver/totem-screensaver.c | 8 -------- + src/plugins/screenshot/totem-screenshot-plugin.h | 6 ------ + src/plugins/sidebar-test/totem-sidebar-test.c | 8 -------- + src/plugins/skipto/totem-skipto-plugin.c | 6 ------ + src/plugins/thumbnail/totem-thumbnail.c | 7 ------- + src/plugins/totem-plugin.h | 4 ++++ + src/plugins/tracker/totem-tracker.c | 8 -------- + src/plugins/youtube/totem-youtube.c | 6 ------ 19 files changed, 4 insertions(+), 125 deletions(-) commit 61c4764ccb0c7103c0bae2653a7ce0323c542610 @@ -9860,11 +14318,11 @@ It was unnecessary, since it wasn't properly used by any of the skipto code. - src/plugins/skipto/Makefile.am | 1 - - src/plugins/skipto/totem-skipto-plugin.c | 28 ++++++++++--- - src/plugins/skipto/totem-skipto-plugin.h | 67 ------------------------------ - src/plugins/skipto/totem-skipto.c | 7 ++-- - src/plugins/skipto/totem-skipto.h | 3 +- + src/plugins/skipto/Makefile.am | 1 - + src/plugins/skipto/totem-skipto-plugin.c | 28 ++++++++++--- + src/plugins/skipto/totem-skipto-plugin.h | 67 -------------------------------- + src/plugins/skipto/totem-skipto.c | 7 ++-- + src/plugins/skipto/totem-skipto.h | 3 +- 5 files changed, 27 insertions(+), 79 deletions(-) commit df5f7f673be84c80743ac00b9d94b62b83b9605b @@ -9873,7 +14331,7 @@ Factor out common code in plugin macros to a new _TOTEM_PLUGIN_REGISTER macro - src/plugins/totem-plugin.h | 92 ++++++++++---------------------------------- + src/plugins/totem-plugin.h | 92 +++++++++++----------------------------------- 1 file changed, 21 insertions(+), 71 deletions(-) commit a4fa4a4000e543933287d0c7b5d588ced1acd7d3 @@ -9885,11 +14343,11 @@ That way, plugins only allocate resources when they're actually activated, and free them as soon as they're deactivated. - src/plugins/galago/totem-galago.c | 48 ++++++++------------------- - src/plugins/gromit/totem-gromit.c | 22 ++++-------- - src/plugins/mythtv/totem-mythtv.c | 29 ---------------- - src/plugins/screensaver/totem-screensaver.c | 24 ++++---------- - src/plugins/skipto/totem-skipto-plugin.c | 16 ++------- + src/plugins/galago/totem-galago.c | 48 ++++++++--------------------- + src/plugins/gromit/totem-gromit.c | 22 ++++--------- + src/plugins/mythtv/totem-mythtv.c | 29 ----------------- + src/plugins/screensaver/totem-screensaver.c | 24 +++++---------- + src/plugins/skipto/totem-skipto-plugin.c | 16 ++-------- 5 files changed, 28 insertions(+), 111 deletions(-) commit bf334cd68556d02a424a913a3e62129f83724b8e @@ -9898,7 +14356,7 @@ Remove a redundant finalize method from the chapters plugin - src/plugins/chapters/totem-chapters.c | 8 -------- + src/plugins/chapters/totem-chapters.c | 8 -------- 1 file changed, 8 deletions(-) commit 6891adac18b5ee1a4cd78ab310c244982bc3ec3e @@ -9911,10 +14369,10 @@ remove some checks for NULL strings. Spotted by Christian Persch . Closes: bgo#628779 - src/plugins/publish/totem-publish.c | 4 ++-- - src/plugins/screenshot/totem-screenshot-plugin.c | 2 +- - src/totem-preferences.c | 22 +++++++--------------- - src/totem-uri.c | 5 ++--- + src/plugins/publish/totem-publish.c | 4 ++-- + src/plugins/screenshot/totem-screenshot-plugin.c | 2 +- + src/totem-preferences.c | 22 +++++++--------------- + src/totem-uri.c | 5 ++--- 4 files changed, 12 insertions(+), 21 deletions(-) commit a3a334202e7e3e5ed4b7ca0794524eb7d833ea49 @@ -9923,7 +14381,7 @@ Tidy up src/backend/Makefile.am - src/backend/Makefile.am | 48 +++++++++++++++++++++++------------------------ + src/backend/Makefile.am | 48 +++++++++++++++++++++++------------------------- 1 file changed, 23 insertions(+), 25 deletions(-) commit 04e00fdd59a12cdaa8e7799328ff1a5ff747ca81 @@ -9935,7 +14393,7 @@ These modifications have been e-mailed to Behdad Esfahbod so that they get into the upstream (Pango) git.mk. - git.mk | 11 ++++++++++- + git.mk | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) commit ea0ed37621f336a5e71c51caacc1998959469143 @@ -9947,9 +14405,9 @@ Our transition to git.mk exposed a few files which weren't getting cleaned at the correct point. This also adds a gtk-doc file which we were missing. - Makefile.am | 26 +++++++++++++++++++++++++- - data/Makefile.am | 7 ++----- - src/plugins/sample-python/Makefile.am | 7 ++++--- + Makefile.am | 26 +++++++++++++++++++++++++- + data/Makefile.am | 7 ++----- + src/plugins/sample-python/Makefile.am | 7 ++++--- 3 files changed, 31 insertions(+), 9 deletions(-) commit 386bef4803e2b3122de2af66d5aac590eca385a4 @@ -9962,7 +14420,7 @@ use templates (we use inline documentation comments). This bumps our gtk-doc requirement to 1.14. - configure.in | 2 +- + configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 05b427a509e77a755e6b275b814f64c5a905fde5 @@ -9973,51 +14431,51 @@ Add git.mk from Pango to automatically generate and update .gitignore files. - .gitignore | 142 ------------------- - Makefile.am | 1 + - browser-plugin/Makefile.am | 2 + - data/Makefile.am | 2 + - data/icons/16x16/Makefile.am | 2 + - data/icons/22x22/Makefile.am | 2 + - data/icons/24x24/Makefile.am | 2 + - data/icons/32x32/Makefile.am | 2 + - data/icons/48x48/Makefile.am | 2 + - data/icons/Makefile.am | 2 + - data/icons/scalable/Makefile.am | 2 + - docs/Makefile.am | 2 + - docs/reference/Makefile.am | 2 + - git.mk | 187 +++++++++++++++++++++++++ - help/Makefile.am | 1 + - lib/Makefile.am | 1 + - src/Makefile.am | 2 + - src/backend/Makefile.am | 2 + - src/plugins/Makefile.am | 1 + - src/plugins/bemused/Makefile.am | 1 + - src/plugins/brasero-disc-recorder/Makefile.am | 1 + - src/plugins/chapters/Makefile.am | 1 + - src/plugins/coherence_upnp/Makefile.am | 2 + - src/plugins/dbus-service/Makefile.am | 2 + - src/plugins/galago/Makefile.am | 2 + - src/plugins/gromit/Makefile.am | 1 + - src/plugins/iplayer/Makefile.am | 2 + - src/plugins/jamendo/Makefile.am | 2 + - src/plugins/lirc/Makefile.am | 1 + - src/plugins/media-player-keys/Makefile.am | 1 + - src/plugins/mythtv/Makefile.am | 1 + - src/plugins/ontop/Makefile.am | 1 + - src/plugins/opensubtitles/Makefile.am | 2 + - src/plugins/properties/Makefile.am | 1 + - src/plugins/publish/Makefile.am | 2 + - src/plugins/pythonconsole/Makefile.am | 2 + - src/plugins/sample-python/Makefile.am | 2 + - src/plugins/sample-vala/Makefile.am | 2 + - src/plugins/screensaver/Makefile.am | 1 + - src/plugins/screenshot/Makefile.am | 2 + - src/plugins/sidebar-test/Makefile.am | 1 + - src/plugins/skipto/Makefile.am | 2 + - src/plugins/thumbnail/Makefile.am | 1 + - src/plugins/tracker/Makefile.am | 1 + - src/plugins/youtube/Makefile.am | 1 + + .gitignore | 142 ------------------- + Makefile.am | 1 + + browser-plugin/Makefile.am | 2 + + data/Makefile.am | 2 + + data/icons/16x16/Makefile.am | 2 + + data/icons/22x22/Makefile.am | 2 + + data/icons/24x24/Makefile.am | 2 + + data/icons/32x32/Makefile.am | 2 + + data/icons/48x48/Makefile.am | 2 + + data/icons/Makefile.am | 2 + + data/icons/scalable/Makefile.am | 2 + + docs/Makefile.am | 2 + + docs/reference/Makefile.am | 2 + + git.mk | 187 ++++++++++++++++++++++++++ + help/Makefile.am | 1 + + lib/Makefile.am | 1 + + src/Makefile.am | 2 + + src/backend/Makefile.am | 2 + + src/plugins/Makefile.am | 1 + + src/plugins/bemused/Makefile.am | 1 + + src/plugins/brasero-disc-recorder/Makefile.am | 1 + + src/plugins/chapters/Makefile.am | 1 + + src/plugins/coherence_upnp/Makefile.am | 2 + + src/plugins/dbus-service/Makefile.am | 2 + + src/plugins/galago/Makefile.am | 2 + + src/plugins/gromit/Makefile.am | 1 + + src/plugins/iplayer/Makefile.am | 2 + + src/plugins/jamendo/Makefile.am | 2 + + src/plugins/lirc/Makefile.am | 1 + + src/plugins/media-player-keys/Makefile.am | 1 + + src/plugins/mythtv/Makefile.am | 1 + + src/plugins/ontop/Makefile.am | 1 + + src/plugins/opensubtitles/Makefile.am | 2 + + src/plugins/properties/Makefile.am | 1 + + src/plugins/publish/Makefile.am | 2 + + src/plugins/pythonconsole/Makefile.am | 2 + + src/plugins/sample-python/Makefile.am | 2 + + src/plugins/sample-vala/Makefile.am | 2 + + src/plugins/screensaver/Makefile.am | 1 + + src/plugins/screenshot/Makefile.am | 2 + + src/plugins/sidebar-test/Makefile.am | 1 + + src/plugins/skipto/Makefile.am | 2 + + src/plugins/thumbnail/Makefile.am | 1 + + src/plugins/tracker/Makefile.am | 1 + + src/plugins/youtube/Makefile.am | 1 + 45 files changed, 255 insertions(+), 142 deletions(-) commit 0b60a176f820f8c698d36a15a48ede15e67097d8 @@ -10026,8 +14484,8 @@ Fix the port of the Galago and Tracker plugins to libpeas 0.5.4 - src/plugins/galago/totem-galago.c | 4 ++++ - src/plugins/tracker/totem-tracker.c | 6 ++++++ + src/plugins/galago/totem-galago.c | 4 ++++ + src/plugins/tracker/totem-tracker.c | 6 ++++++ 2 files changed, 10 insertions(+) commit 31eee03202e44af2a1f4016d4e338c0c73390b68 @@ -10036,9 +14494,9 @@ gcc warning fixes - src/plugins/chapters/totem-chapters.c | 42 +++++++++++++++--------------- - src/plugins/chapters/totem-cmml-parser.c | 2 +- - src/totem-fullscreen.c | 2 +- + src/plugins/chapters/totem-chapters.c | 42 ++++++++++++++++---------------- + src/plugins/chapters/totem-cmml-parser.c | 2 +- + src/totem-fullscreen.c | 2 +- 3 files changed, 23 insertions(+), 23 deletions(-) commit f014ff99c1c6666dcd4955862fda2eb909e9a0ec @@ -10047,10 +14505,10 @@ Improve naming of the visualization GSettings keys - data/org.gnome.totem.gschema.xml.in.in | 10 +++++----- - data/totem.convert | 6 +++--- - src/backend/bacon-video-widget-gst-0.10.c | 2 +- - src/totem-preferences.c | 22 +++++++++++----------- + data/org.gnome.totem.gschema.xml.in.in | 10 +++++----- + data/totem.convert | 6 +++--- + src/backend/bacon-video-widget-gst-0.10.c | 2 +- + src/totem-preferences.c | 22 +++++++++++----------- 4 files changed, 20 insertions(+), 20 deletions(-) commit 8826617a7812fdb74c95e6a190a780f19c5c9dfe @@ -10059,8 +14517,8 @@ Convert visual-quality to an enum - data/org.gnome.totem.gschema.xml.in.in | 6 +++--- - src/totem-preferences.c | 4 +++- + data/org.gnome.totem.gschema.xml.in.in | 6 +++--- + src/totem-preferences.c | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) commit 90699ee4c30cb214018ae4d8d45b1eecb95a742a @@ -10069,8 +14527,8 @@ Convert audio-output-type to an enum - data/org.gnome.totem.gschema.xml.in.in | 5 ++--- - src/backend/bacon-video-widget-gst-0.10.c | 4 ++-- + data/org.gnome.totem.gschema.xml.in.in | 5 ++--- + src/backend/bacon-video-widget-gst-0.10.c | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) commit db411c5c04f7b4d65ed049c4dc4ed808c81bc12e @@ -10079,9 +14537,9 @@ Convert connection-speed to an enum - data/org.gnome.totem.gschema.xml.in.in | 6 ++--- - src/backend/bacon-video-widget-gst-0.10.c | 4 +-- - src/totem-preferences.c | 39 ++++++++++++++++++++++++++++- + data/org.gnome.totem.gschema.xml.in.in | 6 ++--- + src/backend/bacon-video-widget-gst-0.10.c | 4 ++-- + src/totem-preferences.c | 39 ++++++++++++++++++++++++++++++- 3 files changed, 43 insertions(+), 6 deletions(-) commit 3985fe548b238dabebeb72cbfd045942af17e8b0 @@ -10092,10 +14550,10 @@ They store URIs, not paths. - data/org.gnome.totem.gschema.xml.in.in | 4 ++-- - data/totem.convert | 4 ++-- - src/plugins/screenshot/totem-screenshot-plugin.c | 4 ++-- - src/totem-uri.c | 6 +++--- + data/org.gnome.totem.gschema.xml.in.in | 4 ++-- + data/totem.convert | 4 ++-- + src/plugins/screenshot/totem-screenshot-plugin.c | 4 ++-- + src/totem-uri.c | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) commit 5b3e8745acbbff909885c4cdee722e1557eae617 @@ -10104,7 +14562,7 @@ Eradicate GConf from configure.in - configure.in | 2 -- + configure.in | 2 -- 1 file changed, 2 deletions(-) commit 551f901dd0ac62cc438b5b6d8590fef08688482a @@ -10113,21 +14571,21 @@ Port Python plugins to GSettings - configure.in | 3 ++ - po/POTFILES.in | 3 ++ - po/POTFILES.skip | 3 ++ - src/plugins/jamendo/Makefile.am | 15 ++++-- - src/plugins/jamendo/jamendo.convert | 3 ++ - src/plugins/jamendo/jamendo.py | 57 +++++--------------- - ...g.gnome.totem.plugins.jamendo.gschema.xml.in.in | 20 +++++++ - src/plugins/opensubtitles/Makefile.am | 15 ++++-- - src/plugins/opensubtitles/opensubtitles.convert | 2 + - src/plugins/opensubtitles/opensubtitles.py | 24 +++------ - ...e.totem.plugins.opensubtitles.gschema.xml.in.in | 10 ++++ - src/plugins/pythonconsole/Makefile.am | 15 ++++-- - ...e.totem.plugins.pythonconsole.gschema.xml.in.in | 10 ++++ - src/plugins/pythonconsole/pythonconsole.convert | 3 ++ - src/plugins/pythonconsole/pythonconsole.py | 8 +-- + configure.in | 3 ++ + po/POTFILES.in | 3 ++ + po/POTFILES.skip | 3 ++ + src/plugins/jamendo/Makefile.am | 15 ++++-- + src/plugins/jamendo/jamendo.convert | 3 ++ + src/plugins/jamendo/jamendo.py | 57 +++++----------------- + ...g.gnome.totem.plugins.jamendo.gschema.xml.in.in | 20 ++++++++ + src/plugins/opensubtitles/Makefile.am | 15 ++++-- + src/plugins/opensubtitles/opensubtitles.convert | 2 + + src/plugins/opensubtitles/opensubtitles.py | 24 +++------ + ...e.totem.plugins.opensubtitles.gschema.xml.in.in | 10 ++++ + src/plugins/pythonconsole/Makefile.am | 15 ++++-- + ...e.totem.plugins.pythonconsole.gschema.xml.in.in | 10 ++++ + src/plugins/pythonconsole/pythonconsole.convert | 3 ++ + src/plugins/pythonconsole/pythonconsole.py | 8 +-- 15 files changed, 116 insertions(+), 75 deletions(-) commit 84403b142e6c42b8b17a106562e3b919400d8b6c @@ -10136,35 +14594,35 @@ Port C plugins to GSettings - configure.in | 6 +- - po/POTFILES.in | 1 + - po/POTFILES.skip | 1 + - src/plugins/bemused/Makefile.am | 1 - - src/plugins/brasero-disc-recorder/Makefile.am | 1 - - src/plugins/chapters/Makefile.am | 1 - - src/plugins/chapters/totem-chapters.c | 40 +++---- - src/plugins/galago/Makefile.am | 1 - - src/plugins/gromit/Makefile.am | 1 - - src/plugins/lirc/Makefile.am | 1 - - src/plugins/media-player-keys/Makefile.am | 1 - - src/plugins/mythtv/Makefile.am | 14 +-- - src/plugins/mythtv/totem-mythtv.c | 10 -- - src/plugins/ontop/Makefile.am | 1 - - src/plugins/properties/Makefile.am | 1 - - src/plugins/publish/Makefile.am | 15 ++- - ...g.gnome.totem.plugins.publish.gschema.xml.in.in | 28 +++++ - src/plugins/publish/publish.convert | 3 + - src/plugins/publish/totem-publish.c | 121 ++++++-------------- - src/plugins/sample-vala/Makefile.am | 1 - - src/plugins/screensaver/Makefile.am | 1 - - src/plugins/screensaver/totem-screensaver.c | 29 +---- - src/plugins/screenshot/Makefile.am | 1 - - src/plugins/screenshot/totem-screenshot-plugin.c | 43 +++---- - src/plugins/sidebar-test/Makefile.am | 1 - - src/plugins/skipto/Makefile.am | 1 - - src/plugins/thumbnail/Makefile.am | 1 - - src/plugins/tracker/Makefile.am | 1 - - src/plugins/youtube/Makefile.am | 1 - + configure.in | 6 +- + po/POTFILES.in | 1 + + po/POTFILES.skip | 1 + + src/plugins/bemused/Makefile.am | 1 - + src/plugins/brasero-disc-recorder/Makefile.am | 1 - + src/plugins/chapters/Makefile.am | 1 - + src/plugins/chapters/totem-chapters.c | 40 +++---- + src/plugins/galago/Makefile.am | 1 - + src/plugins/gromit/Makefile.am | 1 - + src/plugins/lirc/Makefile.am | 1 - + src/plugins/media-player-keys/Makefile.am | 1 - + src/plugins/mythtv/Makefile.am | 14 +-- + src/plugins/mythtv/totem-mythtv.c | 10 -- + src/plugins/ontop/Makefile.am | 1 - + src/plugins/properties/Makefile.am | 1 - + src/plugins/publish/Makefile.am | 15 ++- + ...g.gnome.totem.plugins.publish.gschema.xml.in.in | 28 +++++ + src/plugins/publish/publish.convert | 3 + + src/plugins/publish/totem-publish.c | 121 ++++++--------------- + src/plugins/sample-vala/Makefile.am | 1 - + src/plugins/screensaver/Makefile.am | 1 - + src/plugins/screensaver/totem-screensaver.c | 29 +---- + src/plugins/screenshot/Makefile.am | 1 - + src/plugins/screenshot/totem-screenshot-plugin.c | 43 +++----- + src/plugins/sidebar-test/Makefile.am | 1 - + src/plugins/skipto/Makefile.am | 1 - + src/plugins/thumbnail/Makefile.am | 1 - + src/plugins/tracker/Makefile.am | 1 - + src/plugins/youtube/Makefile.am | 1 - 29 files changed, 118 insertions(+), 210 deletions(-) commit 1248407087d5ee41aa40ce454de0ffc7a823338e @@ -10173,12 +14631,12 @@ Use GSettings binding for the preferences - browser-plugin/Makefile.am | 1 - - data/totem.ui | 7 -- - lib/Makefile.am | 1 - - src/Makefile.am | 1 - - src/backend/Makefile.am | 1 - - src/totem-preferences.c | 209 ++++---------------------------------------- + browser-plugin/Makefile.am | 1 - + data/totem.ui | 7 -- + lib/Makefile.am | 1 - + src/Makefile.am | 1 - + src/backend/Makefile.am | 1 - + src/totem-preferences.c | 209 ++++----------------------------------------- 6 files changed, 18 insertions(+), 202 deletions(-) commit 02883359331a706fb59741be5d697e463aeb37f4 @@ -10187,7 +14645,7 @@ Add an active-plugins key to store the list of active plugins - data/org.gnome.totem.gschema.xml.in.in | 5 +++++ + data/org.gnome.totem.gschema.xml.in.in | 5 +++++ 1 file changed, 5 insertions(+) commit 9b403af7a43fe953dd6237f69a378086bd05d087 @@ -10198,9 +14656,9 @@ They belong in gsettings-desktop-schemas. - data/Makefile.am | 21 ++-------------- - data/handlers.sh | 47 ---------------------------------- - data/schemas.sh | 74 ------------------------------------------------------ + data/Makefile.am | 21 ++-------------- + data/handlers.sh | 47 ----------------------------------- + data/schemas.sh | 74 -------------------------------------------------------- 3 files changed, 2 insertions(+), 140 deletions(-) commit 8d65909f1207f6316b2055565b0e94c099c5e916 @@ -10209,30 +14667,30 @@ Port to GSettings - browser-plugin/totem-plugin-viewer.c | 1 - - configure.in | 10 +- - data/Makefile.am | 51 ++--- - data/handlers.sh | 49 +++-- - data/org.gnome.totem.gschema.xml.in.in | 120 +++++++++++ - data/schemas.sh | 66 +++--- - data/totem.convert | 26 +++ - data/totem.schemas.in | 332 ----------------------------- - docs/reference/totem-sections.txt | 2 +- - po/POTFILES.in | 2 +- - po/POTFILES.skip | 1 + - src/backend/bacon-video-widget-gst-0.10.c | 77 +++---- - src/plugins/totem-dirs.c | 11 +- - src/plugins/totem-plugins-engine.c | 139 +----------- - src/totem-interface.c | 1 - - src/totem-object.c | 4 +- - src/totem-options.c | 3 +- - src/totem-options.h | 1 - - src/totem-playlist.c | 76 +++---- - src/totem-preferences.c | 226 ++++++-------------- - src/totem-private.h | 3 +- - src/totem-uri.c | 23 +- - src/totem.c | 20 +- - src/totem.h | 6 +- + browser-plugin/totem-plugin-viewer.c | 1 - + configure.in | 10 +- + data/Makefile.am | 51 ++--- + data/handlers.sh | 49 +++-- + data/org.gnome.totem.gschema.xml.in.in | 120 +++++++++++ + data/schemas.sh | 66 +++--- + data/totem.convert | 26 +++ + data/totem.schemas.in | 332 ------------------------------ + docs/reference/totem-sections.txt | 2 +- + po/POTFILES.in | 2 +- + po/POTFILES.skip | 1 + + src/backend/bacon-video-widget-gst-0.10.c | 77 +++---- + src/plugins/totem-dirs.c | 11 +- + src/plugins/totem-plugins-engine.c | 139 +------------ + src/totem-interface.c | 1 - + src/totem-object.c | 4 +- + src/totem-options.c | 3 +- + src/totem-options.h | 1 - + src/totem-playlist.c | 76 +++---- + src/totem-preferences.c | 226 ++++++-------------- + src/totem-private.h | 3 +- + src/totem-uri.c | 23 ++- + src/totem.c | 20 +- + src/totem.h | 6 +- 24 files changed, 412 insertions(+), 838 deletions(-) commit d068d95ac5c21b458c42ced70dae795b5a951b24 @@ -10241,11 +14699,11 @@ Fix naming of visualization methods in BaconVideoWidget - browser-plugin/totem-plugin-viewer.c | 2 +- - docs/reference/totem-sections.txt | 14 +++--- - src/backend/bacon-video-widget-gst-0.10.c | 72 ++++++++++++++--------------- - src/backend/bacon-video-widget.h | 38 ++++++++------- - src/totem-preferences.c | 14 +++--- + browser-plugin/totem-plugin-viewer.c | 2 +- + docs/reference/totem-sections.txt | 14 +++--- + src/backend/bacon-video-widget-gst-0.10.c | 72 +++++++++++++++---------------- + src/backend/bacon-video-widget.h | 38 ++++++++-------- + src/totem-preferences.c | 14 +++--- 5 files changed, 69 insertions(+), 71 deletions(-) commit 1d94c7e07bb9675272d92a1056a35566888eab67 @@ -10254,7 +14712,7 @@ Add a visuals-quality property to BaconVideoWidget - src/backend/bacon-video-widget-gst-0.10.c | 23 ++++++++++++++++++++++- + src/backend/bacon-video-widget-gst-0.10.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) commit 06d6373ebf7a1c802099f83b7470a37d369e9a72 @@ -10263,9 +14721,9 @@ Add a connection-speed property to BaconVideoWidget - docs/reference/totem-sections.txt | 3 +++ - src/backend/bacon-video-widget-gst-0.10.c | 23 ++++++++++++++++++++- - src/backend/bacon-video-widget.h | 32 +++++++++++++++++++++++++++++ + docs/reference/totem-sections.txt | 3 +++ + src/backend/bacon-video-widget-gst-0.10.c | 23 +++++++++++++++++++++- + src/backend/bacon-video-widget.h | 32 +++++++++++++++++++++++++++++++ 3 files changed, 57 insertions(+), 1 deletion(-) commit 642b465221413dd8f1ba5e4d081256f153fe23d0 @@ -10274,8 +14732,8 @@ Generate enum types for BaconVideoWidget - docs/reference/totem-sections.txt | 16 ++++++++++++++++ - src/backend/Makefile.am | 24 +++++++++++++++++++++++- + docs/reference/totem-sections.txt | 16 ++++++++++++++++ + src/backend/Makefile.am | 24 +++++++++++++++++++++++- 2 files changed, 39 insertions(+), 1 deletion(-) commit 6d2a201ba1e8f6b189b810fd21c23914a0009c8e @@ -10284,7 +14742,7 @@ Add a remember-position property to TotemObject - src/totem-object.c | 19 ++++++++++++++++++- + src/totem-object.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) commit c5ba0c0e819067f84b363b31e8d253b14b94ee38 @@ -10293,7 +14751,7 @@ Add a deinterlacing property to BaconVideoWidget - src/backend/bacon-video-widget-gst-0.10.c | 22 +++++++++++++++++++++- + src/backend/bacon-video-widget-gst-0.10.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) commit 1eac46a08cd345e618886e6fc4778092da44c863 @@ -10302,7 +14760,7 @@ Add an autoload-subtitles property to TotemObject - src/totem-object.c | 26 ++++++++++++++++++++++++-- + src/totem-object.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) commit c34e17ebf2621499954df1214f74dd60cebe2199 @@ -10311,7 +14769,7 @@ Add an auto-resize property to BaconVideoWidget - src/backend/bacon-video-widget-gst-0.10.c | 21 ++++++++++++++++++++- + src/backend/bacon-video-widget-gst-0.10.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) commit ed884ba7a2991b3d8f192154a117e386c0e6773f @@ -10320,9 +14778,9 @@ Bug 627573 — Port from GDK to Cairo - browser-plugin/totem-glow-button.c | 47 ++++++++-------------- - src/backend/bacon-video-widget-gst-0.10.c | 16 ++++---- - src/plugins/screenshot/gnome-screenshot-widget.c | 10 ++++- + browser-plugin/totem-glow-button.c | 47 ++++++++---------------- + src/backend/bacon-video-widget-gst-0.10.c | 16 ++++---- + src/plugins/screenshot/gnome-screenshot-widget.c | 10 ++++- 3 files changed, 32 insertions(+), 41 deletions(-) commit 42f7dd46cb5ba11bc625d433a2fe193e956b7f99 @@ -10340,8 +14798,8 @@ Simplify unsupported schemes avoidance in chapters - src/plugins/chapters/totem-chapters.c | 4 +--- - src/plugins/chapters/totem-cmml-parser.c | 3 ++- + src/plugins/chapters/totem-chapters.c | 4 +--- + src/plugins/chapters/totem-cmml-parser.c | 3 ++- 2 files changed, 3 insertions(+), 4 deletions(-) commit 7c8a3e7a8453b7323291ec7d158d8074663f7947 @@ -10350,7 +14808,7 @@ Updated Swedish translation - po/sv.po | 755 ++++++++++++++++++++++++++++++++++++-------------------------- + po/sv.po | 755 +++++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 441 insertions(+), 314 deletions(-) commit fa08edd11691dda6dd22498b5b17d8c801cbcfae @@ -10359,7 +14817,7 @@ Updated Brazilian Portuguese translation by André Gondim and myself - po/pt_BR.po | 956 ++++++++++++++++++++++++++++++++++------------------------- + po/pt_BR.po | 956 ++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 547 insertions(+), 409 deletions(-) commit 9a5eb6f5b89aa48da8db0228bc0fd0a2fd43cfb8 @@ -10368,7 +14826,7 @@ Fixing a litte error in Brazilian Portuguese translation - po/pt_BR.po | 2 +- + po/pt_BR.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit d8d19a9bdb1a4feea9b76f8ba92cc0a5ef52a5df @@ -10379,7 +14837,7 @@ Otherwise they'd need to include libpeas-gtk themselves. - src/plugins/totem-plugin.h | 1 + + src/plugins/totem-plugin.h | 1 + 1 file changed, 1 insertion(+) commit a97d30e0cea752773cb0105c55409af0f606d18e @@ -10388,7 +14846,7 @@ Fix renaming typos in totem-fullscreen.c - src/totem-fullscreen.c | 2 +- + src/totem-fullscreen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 1aa563dde90b6c5a9429dc0ede2d45f5900ee34b @@ -10397,7 +14855,7 @@ Fix compile-time warning in chapters plugin - src/plugins/chapters/totem-edit-chapter.c | 1 + + src/plugins/chapters/totem-edit-chapter.c | 1 + 1 file changed, 1 insertion(+) commit f1e9c8a31a7fd516fd9647288024f8492ac116e8 @@ -10408,8 +14866,8 @@ And removed unused function. - src/backend/bacon-video-widget-gst-0.10.c | 10 +++++----- - src/totem-preferences.c | 28 ---------------------------- + src/backend/bacon-video-widget-gst-0.10.c | 10 +++++----- + src/totem-preferences.c | 28 ---------------------------- 2 files changed, 5 insertions(+), 33 deletions(-) commit aa769696289b1498e2c0cec00bc0f117ebf9f8d8 @@ -10423,7 +14881,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=331241 - src/totem-fullscreen.c | 24 +++++++++++++++++++++++- + src/totem-fullscreen.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) commit 63377577e22954c31f65da2b370366ac81a1180a @@ -10434,9 +14892,9 @@ https://bugzilla.gnome.org/show_bug.cgi?id=322226 - src/backend/bacon-video-widget-gst-0.10.c | 24 ++++++++---------------- - src/backend/bacon-video-widget.h | 4 ++-- - src/totem-preferences.c | 12 ++---------- + src/backend/bacon-video-widget-gst-0.10.c | 24 ++++++++---------------- + src/backend/bacon-video-widget.h | 4 ++-- + src/totem-preferences.c | 12 ++---------- 3 files changed, 12 insertions(+), 28 deletions(-) commit 8a5e18c87d9b90b49539f0e44444a147b8976457 @@ -10445,7 +14903,7 @@ Updated Tamil translation - po/ta.po | 203 ++++++++++++++++++++++++++++++++------------------------------ + po/ta.po | 203 +++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 105 insertions(+), 98 deletions(-) commit f7e440e40d8daa1a77f634155471a85bb1c05f7f @@ -10465,7 +14923,7 @@ So not from HTTP, RTSP, or RTMP. - src/totem-uri.c | 4 +++- + src/totem-uri.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit 4413725c61a3ef49a9aa2f52610a5b812ce2bce4 @@ -10476,7 +14934,7 @@ From HTTP, RTSP or RTMP streams - src/plugins/chapters/totem-chapters.c | 11 ++++++++--- + src/plugins/chapters/totem-chapters.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) commit c5a7cf719fd3a1066dd753266fb861500b2adbd5 @@ -10485,7 +14943,7 @@ Updated Indonesian translation - po/id.po | 686 +++++++++++++++++++++++++++++++++++++------------------------- + po/id.po | 686 +++++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 408 insertions(+), 278 deletions(-) commit bf9bc2de2469cf8c971f21bb17deb7ba781250f3 @@ -10494,7 +14952,7 @@ Updated Hungarian translation - po/hu.po | 892 ++++++++++++++++++++++++++++++++++---------------------------- + po/hu.po | 892 +++++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 495 insertions(+), 397 deletions(-) commit e1aa47f9a3c1024d5b9ca51536831982d2447834 @@ -10512,8 +14970,8 @@ Updated Serbian translation - po/sr.po | 993 ++++++++++++++++++++++++++++++++------------------------ - po/sr@latin.po | 993 ++++++++++++++++++++++++++++++++------------------------ + po/sr.po | 993 +++++++++++++++++++++++++++++++++------------------------ + po/sr@latin.po | 993 +++++++++++++++++++++++++++++++++------------------------ 2 files changed, 1140 insertions(+), 846 deletions(-) commit 116c68c4708c6e657bf6091f345682746d4f7adb @@ -10531,7 +14989,7 @@ [l10n] Updated Estonian translation - po/et.po | 4 ++-- + po/et.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 6b85b74ab02bffc88b82cf9d968e27f3c80c2862 @@ -10558,7 +15016,7 @@ [l10n] Updated Estonian translation - po/et.po | 4 ++-- + po/et.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 772a2eb06954703af267ba6920e92c6fb4ac2126 @@ -10567,7 +15025,7 @@ [l10n] Updated Estonian translation - po/et.po | 205 +++++++++++++++++++++++++++++++++++--------------------------- + po/et.po | 205 ++++++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 116 insertions(+), 89 deletions(-) commit 1fd6fdee5f05c3b462b9496439d623f412d57f59 @@ -10585,7 +15043,7 @@ Exclude chapter headers from the documentation - docs/reference/Makefile.am | 5 ++++- + docs/reference/Makefile.am | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit 2da63ea903efa9329c3a6e1a3a7a6ae29bd885a0 @@ -10594,7 +15052,7 @@ Updated French translation - po/fr.po | 512 ++++++++++++++++++++++++++++---------------------------------- + po/fr.po | 512 ++++++++++++++++++++++++++++----------------------------------- 1 file changed, 230 insertions(+), 282 deletions(-) commit 713549a7c373fd2a7cb73a9939eb3f34a8800d86 @@ -10603,7 +15061,7 @@ Updated French translation - po/fr.po | 902 +++++++++++++++++++++++++++++++++++--------------------------- + po/fr.po | 902 +++++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 505 insertions(+), 397 deletions(-) commit 203cb232547dcb8093b373e982e58a14dc181ef7 @@ -10612,7 +15070,7 @@ Fix run-time warning wrt libpeas changes - src/plugins/totem-plugins-engine.c | 1 - + src/plugins/totem-plugins-engine.c | 1 - 1 file changed, 1 deletion(-) commit a7d5b08be0f36074415ef188be1dd24ccef090a3 @@ -10623,10 +15081,10 @@ With its renaming of PeasUI to PeasGtk - configure.in | 4 ++-- - src/plugins/publish/totem-publish.c | 4 ++-- - src/plugins/totem-plugin.h | 12 ++++++------ - src/totem-menu.c | 4 ++-- + configure.in | 4 ++-- + src/plugins/publish/totem-publish.c | 4 ++-- + src/plugins/totem-plugin.h | 12 ++++++------ + src/totem-menu.c | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) commit f0c7fdcd4e45aac7c54133a74ea62bb1ab819ab5 @@ -10638,7 +15096,7 @@ Only export a stroke, both the stroke and the fill for those objects, otherwise they don't recolour as expected. - data/icons/scalable/view-sidebar-symbolic.svg | 30 ++++++++++++------------- + data/icons/scalable/view-sidebar-symbolic.svg | 30 +++++++++++++-------------- 1 file changed, 15 insertions(+), 15 deletions(-) commit 53c48b2363fea334eed04beb0f83500b3a271a2b @@ -10649,10 +15107,10 @@ And remove the arrow. - data/icons/scalable/Makefile.am | 5 +- - data/icons/scalable/view-sidebar-symbolic.svg | 88 +++++++++++++++++++++++++ - src/totem-object.c | 18 +++-- - src/totem-sidebar.c | 14 +--- + data/icons/scalable/Makefile.am | 5 +- + data/icons/scalable/view-sidebar-symbolic.svg | 88 +++++++++++++++++++++++++++ + src/totem-object.c | 18 ++++-- + src/totem-sidebar.c | 14 +---- 4 files changed, 106 insertions(+), 19 deletions(-) commit 18c681c2a64c062202b46d16764d51e28a8a703d @@ -10661,7 +15119,7 @@ Make sure "Sidebar" menu item has a label - data/totem.ui | 5 +++-- + data/totem.ui | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit 482d7fe553db54a89c59f3c70c67aea004c79f6e @@ -10670,7 +15128,7 @@ Updated Lithuanian translation (thanks to Aurimas Cernius). - po/lt.po | 944 +++++++++++++++++++++++++++++++++++--------------------------- + po/lt.po | 944 ++++++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 539 insertions(+), 405 deletions(-) commit 68216a6b7c28b0d3af7ad8d824889cb1931b038e @@ -10679,7 +15137,7 @@ update translation for Punjabi - po/pa.po | 689 +++++++++++++++++++++++++++++++++++++------------------------- + po/pa.po | 689 +++++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 409 insertions(+), 280 deletions(-) commit 8c9c10bf2e16a7c890f2eb41729d9395e63227ec @@ -10688,7 +15146,7 @@ Clean up private struct usage in skipto plugin - src/plugins/skipto/totem-skipto.c | 11 ++++++----- + src/plugins/skipto/totem-skipto.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) commit dbfc9e0cc300d7512411e8f654705a19a08ba35d @@ -10697,7 +15155,7 @@ Updated Tamil translation - po/ta.po | 683 ++++++++++++++++++++++++++++++++++++-------------------------- + po/ta.po | 683 +++++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 403 insertions(+), 280 deletions(-) commit 7884605b31298c4657775f219551d86068b5d219 @@ -10706,7 +15164,7 @@ Improve the handling of the "frames per second" plural string - .../properties/bacon-video-widget-properties.c | 34 +++++++++----------- + .../properties/bacon-video-widget-properties.c | 34 ++++++++++------------ 1 file changed, 16 insertions(+), 18 deletions(-) commit c2ebfa7ae3b7aa0e1d926e27bacd2927cc550a56 @@ -10715,8 +15173,8 @@ Add plural strings in the "Skip to" dialogue - src/plugins/skipto/skipto.ui | 6 +++--- - src/plugins/skipto/totem-skipto.c | 19 +++++++++++++++++++ + src/plugins/skipto/skipto.ui | 6 +++--- + src/plugins/skipto/totem-skipto.c | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+), 3 deletions(-) commit 38bd7ec40a4502e01684355921cb26e1701e157d @@ -10725,7 +15183,7 @@ Add a plural string for "frames per second" - .../properties/bacon-video-widget-properties.c | 20 ++++++++++++++++++-- + .../properties/bacon-video-widget-properties.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) commit 5588aa7699abb9a8bb51ae1b0bb5dec78b2d037f @@ -10736,12 +15194,12 @@ Add some extra translation comments. Closes: bgo#626422 - data/totem.ui | 8 ++++---- - src/eggfileformatchooser.c | 1 + - src/plugins/bemused/totem-bemused.c | 4 +++- - src/plugins/publish/totem-publish.c | 1 + - src/totem-menu.c | 2 ++ - src/totem-options.c | 1 + + data/totem.ui | 8 ++++---- + src/eggfileformatchooser.c | 1 + + src/plugins/bemused/totem-bemused.c | 4 +++- + src/plugins/publish/totem-publish.c | 1 + + src/totem-menu.c | 2 ++ + src/totem-options.c | 1 + 6 files changed, 12 insertions(+), 5 deletions(-) commit d61fd2d66bc4d45d0d8c86848599c8385f06e4a1 @@ -10753,9 +15211,9 @@ This means we can ignore cookies, and don't encounter the cookie sharing problem we previously had between libsoup and gvfs. Closes: bgo#619207 - configure.in | 7 +++++ - src/plugins/youtube/Makefile.am | 5 +++- - src/plugins/youtube/totem-youtube.c | 51 ++++++++++++++++++++++++----------- + configure.in | 7 +++++ + src/plugins/youtube/Makefile.am | 5 +++- + src/plugins/youtube/totem-youtube.c | 51 ++++++++++++++++++++++++++----------- 3 files changed, 47 insertions(+), 16 deletions(-) commit 06dd10fd160682f63b96861b9d2f2eba258d9712 @@ -10764,8 +15222,8 @@ Port the Galago and Tracker plugins to libpeas 0.5.4 - src/plugins/galago/totem-galago.c | 17 +++++++++++++---- - src/plugins/tracker/totem-tracker.c | 16 ++++++++++++---- + src/plugins/galago/totem-galago.c | 17 +++++++++++++---- + src/plugins/tracker/totem-tracker.c | 16 ++++++++++++---- 2 files changed, 25 insertions(+), 8 deletions(-) commit 48e0e269b4516cdae91a3fd666a6f0251df7706b @@ -10777,9 +15235,9 @@ Also fix a number of compile-time warnings, and the inability to load UI files from the uninstalled directory. - src/plugins/chapters/totem-chapters.c | 35 +++++++++++++++-------------- - src/plugins/chapters/totem-cmml-parser.c | 2 +- - src/plugins/chapters/totem-edit-chapter.c | 2 +- + src/plugins/chapters/totem-chapters.c | 35 ++++++++++++++++--------------- + src/plugins/chapters/totem-cmml-parser.c | 2 +- + src/plugins/chapters/totem-edit-chapter.c | 2 +- 3 files changed, 20 insertions(+), 19 deletions(-) commit 66d1958a89affb91380777409bd863faf668e872 @@ -10815,7 +15273,7 @@ Updated Hebrew translation. - po/he.po | 378 ++++++++++++++++++++++++++++++-------------------------------- + po/he.po | 378 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 185 insertions(+), 193 deletions(-) commit 1aaa9e376fe862ef6f8bf6f226fc858aa52d95a8 @@ -10824,7 +15282,7 @@ Sort allowed_plugins alphabetically - configure.in | 2 +- + configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit defd3ec6c6bb4dab310c47dbaa71eae2c6dc1e1d @@ -10833,13 +15291,13 @@ Port all the Python plugins to libpeas 0.5.4 - src/plugins/coherence_upnp/coherence_upnp.py | 14 +++++++------ - src/plugins/dbus-service/dbus-service.py | 12 ++++++----- - src/plugins/iplayer/iplayer.py | 13 ++++++------ - src/plugins/jamendo/jamendo.py | 13 ++++++------ - src/plugins/opensubtitles/opensubtitles.py | 19 ++++++++--------- - src/plugins/pythonconsole/pythonconsole.py | 29 ++++++++++++++------------ - src/plugins/sample-python/sample-python.py | 8 ++++--- + src/plugins/coherence_upnp/coherence_upnp.py | 14 ++++++++------ + src/plugins/dbus-service/dbus-service.py | 12 +++++++----- + src/plugins/iplayer/iplayer.py | 13 +++++++------ + src/plugins/jamendo/jamendo.py | 13 +++++++------ + src/plugins/opensubtitles/opensubtitles.py | 19 +++++++++--------- + src/plugins/pythonconsole/pythonconsole.py | 29 +++++++++++++++------------- + src/plugins/sample-python/sample-python.py | 8 +++++--- 7 files changed, 59 insertions(+), 49 deletions(-) commit 3560fbf5541902f6343dbdf237b83bb19f161ec1 @@ -10848,21 +15306,21 @@ Port all the C plugins to libpeas 0.5.4 - src/plugins/bemused/totem-bemused.c | 15 +++++---- - .../brasero-disc-recorder/totem-disc-recorder.c | 32 ++++++++++--------- - src/plugins/gromit/totem-gromit.c | 16 +++++----- - src/plugins/lirc/totem-lirc.c | 15 +++++---- - .../media-player-keys/totem-media-player-keys.c | 20 ++++++++---- - src/plugins/mythtv/totem-mythtv.c | 13 ++++---- - src/plugins/ontop/totem-ontop.c | 27 +++++++++------- - src/plugins/properties/totem-movie-properties.c | 17 ++++++---- - src/plugins/publish/totem-publish.c | 12 ++++--- - src/plugins/screensaver/totem-screensaver.c | 16 ++++++---- - src/plugins/screenshot/totem-screenshot-plugin.c | 14 ++++++--- - src/plugins/sidebar-test/totem-sidebar-test.c | 18 ++++++----- - src/plugins/skipto/totem-skipto-plugin.c | 30 +++++++++--------- - src/plugins/thumbnail/totem-thumbnail.c | 33 +++++++++++--------- - src/plugins/youtube/totem-youtube.c | 19 ++++++----- + src/plugins/bemused/totem-bemused.c | 15 ++++++---- + .../brasero-disc-recorder/totem-disc-recorder.c | 32 ++++++++++++--------- + src/plugins/gromit/totem-gromit.c | 16 +++++------ + src/plugins/lirc/totem-lirc.c | 15 ++++++---- + .../media-player-keys/totem-media-player-keys.c | 20 +++++++++---- + src/plugins/mythtv/totem-mythtv.c | 13 +++++---- + src/plugins/ontop/totem-ontop.c | 27 ++++++++++-------- + src/plugins/properties/totem-movie-properties.c | 17 +++++++---- + src/plugins/publish/totem-publish.c | 12 +++++--- + src/plugins/screensaver/totem-screensaver.c | 16 +++++++---- + src/plugins/screenshot/totem-screenshot-plugin.c | 14 +++++---- + src/plugins/sidebar-test/totem-sidebar-test.c | 18 +++++++----- + src/plugins/skipto/totem-skipto-plugin.c | 30 +++++++++++--------- + src/plugins/thumbnail/totem-thumbnail.c | 33 ++++++++++++---------- + src/plugins/youtube/totem-youtube.c | 19 ++++++++----- 15 files changed, 175 insertions(+), 122 deletions(-) commit 3f013e69936a13287a42339f7c1afbd2499c7af9 @@ -10873,9 +15331,9 @@ And update the helper macros. - configure.in | 2 +- - src/plugins/totem-plugin.h | 80 ++++++++++++++++++++++++++++++++++-- - src/plugins/totem-plugins-engine.c | 4 +- + configure.in | 2 +- + src/plugins/totem-plugin.h | 80 ++++++++++++++++++++++++++++++++++++-- + src/plugins/totem-plugins-engine.c | 4 +- 3 files changed, 80 insertions(+), 6 deletions(-) commit 22d2912eb034869a9b9881a0cedcd1e39a75edc4 @@ -10884,7 +15342,7 @@ Fix compilation following accurate seek changes - src/backend/bacon-video-widget-gst-0.10.c | 18 ++++++++++++------ + src/backend/bacon-video-widget-gst-0.10.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) commit 07e11de11a9f84209b31ebffdeec4983f91b9dae @@ -10899,7 +15357,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=626092 - lib/totem-scrsaver.c | 7 +++++++ + lib/totem-scrsaver.c | 7 +++++++ 1 file changed, 7 insertions(+) commit 9f355c1721553c3ca4f34c9b62c44bb58015a4e7 @@ -10915,7 +15373,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=588377 - src/backend/bacon-video-widget-gst-0.10.c | 89 ++++++++++++++++++++++++++--- + src/backend/bacon-video-widget-gst-0.10.c | 89 +++++++++++++++++++++++++++---- 1 file changed, 80 insertions(+), 9 deletions(-) commit 5375802211d40edcc85abca6e44a4328da62b830 @@ -10953,7 +15411,7 @@ Support all YouTube's video formats in the YouTube plugin. Closes: bgo#619207 - src/plugins/youtube/totem-youtube.c | 69 ++++++++++++++++++++++++++++++++--- + src/plugins/youtube/totem-youtube.c | 69 ++++++++++++++++++++++++++++++++++--- 1 file changed, 64 insertions(+), 5 deletions(-) commit 496984c1d4610fd1ce94853801a416c6821b1bf9 @@ -10964,9 +15422,9 @@ We use the libpeas plugin manager UI now. - data/Makefile.am | 1 - - data/plugins.ui | 437 ------------------------------------------------------ - po/POTFILES.in | 1 - + data/Makefile.am | 1 - + data/plugins.ui | 437 ------------------------------------------------------- + po/POTFILES.in | 1 - 3 files changed, 439 deletions(-) commit 13d45d3a09be162bd24c12d407fc1e71f1839966 @@ -10978,7 +15436,7 @@ The bindings for Gtk.Allocation are broken with GTK+ 3, so abort the column wrapping hack if we're using GTK+ 3. - src/plugins/jamendo/jamendo.py | 5 +++++ + src/plugins/jamendo/jamendo.py | 5 +++++ 1 file changed, 5 insertions(+) commit 5033d6449aaae55df4b41faf1b43c2944c7c7eba @@ -10990,8 +15448,8 @@ Python dicts can't be inserted into GtkTreeStores due to bgo#622987, so they need to be wrapped in a thin GObject to get the Jamendo plugin working. - src/plugins/jamendo/jamendo.py | 20 ++++++++++++++++---- - src/plugins/jamendo/jamendo.ui | 6 +++--- + src/plugins/jamendo/jamendo.py | 20 ++++++++++++++++---- + src/plugins/jamendo/jamendo.ui | 6 +++--- 2 files changed, 19 insertions(+), 7 deletions(-) commit 02cf6290cd527faa3674402c05c65722f84b906d @@ -11000,7 +15458,7 @@ hindi update - po/hi.po | 716 +++++++++++++++++++++++++++++--------------------------------- + po/hi.po | 716 ++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 338 insertions(+), 378 deletions(-) commit ffb3f3b33b50d0187f8ebba85cffd28e471939c5 @@ -11018,7 +15476,7 @@ Updated Norwegian Nynorsk translation - po/nn.po | 994 +++++++++++++++++++++++++++++++------------------------------- + po/nn.po | 994 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 501 insertions(+), 493 deletions(-) commit a5f45ecd1d10117e89d139538ee9521a4eb0f7b9 @@ -11048,7 +15506,7 @@ YouTube changed the page format again, necessitating a change in the way video URIs are scraped from the playback page. Closes: bgo#625013 - src/plugins/youtube/totem-youtube.c | 51 ++++++++++++++++------------------- + src/plugins/youtube/totem-youtube.c | 51 +++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 28 deletions(-) commit 8df5efb99c5c2c796fe302613a629f481f1f7bcb @@ -11057,7 +15515,7 @@ Updated Marathi Translations - po/mr.po | 940 ++++++++++++++++++++++++++++++-------------------------------- + po/mr.po | 940 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 457 insertions(+), 483 deletions(-) commit 7aecec85ad12c655648b387951b0000993ade816 @@ -11068,7 +15526,7 @@ So that download buffering and deinterlacing work as expected. - configure.in | 4 ++-- + configure.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 6e631db17e86baaf449cb0348c597e156792c022 @@ -11077,7 +15535,7 @@ Updated Galician translations - po/gl.po | 159 +++++--------------------------------------------------------- + po/gl.po | 159 ++++++--------------------------------------------------------- 1 file changed, 13 insertions(+), 146 deletions(-) commit f067d39e0a9f198e3d8b630b436e4c898a1ca08b @@ -11086,7 +15544,7 @@ Updated Gujarati Translations - po/gu.po | 911 +++++++++++++++++++++++++++++--------------------------------- + po/gu.po | 911 ++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 432 insertions(+), 479 deletions(-) commit 338dbc54cff9f756951aa131b4d0ae0f8a5c7a48 @@ -11095,7 +15553,7 @@ Updated Gujarati Translations - po/gu.po | 610 +++++++++++++++++++++++++++++--------------------------------- + po/gu.po | 610 +++++++++++++++++++++++++++++---------------------------------- 1 file changed, 283 insertions(+), 327 deletions(-) commit 76f69bd51c0e041fca309133afe847032d980c24 @@ -11104,7 +15562,7 @@ Updated Galician translations - po/gl.po | 205 +++++++++++++++++++++++++++++++------------------------------- + po/gl.po | 205 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 101 insertions(+), 104 deletions(-) commit 18d0907e09dd85e97cb8be60a08e2c0a4d154345 @@ -11113,7 +15571,7 @@ Update Simplified Chinese help translation. - help/zh_CN/zh_CN.po | 357 +++++++++++++++++++++++++-------------------------- + help/zh_CN/zh_CN.po | 357 +++++++++++++++++++++++++--------------------------- 1 file changed, 174 insertions(+), 183 deletions(-) commit 0ac6c8843e36042262bc655c1aa327b26ab04f76 @@ -11125,7 +15583,7 @@ Remove the window_on_top GConf key which was orphaned by the fix to bgo#171691. Closes: bgo#624607 - data/totem.schemas.in | 14 -------------- + data/totem.schemas.in | 14 -------------- 1 file changed, 14 deletions(-) commit 1ec0795d3a0c79354ace6f731e4bc47e74a83396 @@ -11134,7 +15592,7 @@ Bump libpeas requirement due to builtin API changes - configure.in | 2 +- + configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit e8b8f3966722e04d9073ed2f0ca61f5d34c56572 @@ -11143,7 +15601,7 @@ Updated Spanish translation - po/es.po | 182 +++++++++++++++++++++++++++++++------------------------------- + po/es.po | 182 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 90 insertions(+), 92 deletions(-) commit d71f1c8b4c258596ba7c97525bb98474066a5c32 @@ -11170,7 +15628,7 @@ [i18n] Updated German translation - po/de.po | 695 +++++++++++++++++++++++++++++++------------------------------- + po/de.po | 695 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 344 insertions(+), 351 deletions(-) commit 26041ac5c27ccc7c68b1cf7c90e5c7dfa2746211 @@ -11181,7 +15639,7 @@ Constness issues, shadowing and missing cases in switch statements. - browser-plugin/totem-plugin-viewer.c | 56 +++++++++++++++++++--------------- + browser-plugin/totem-plugin-viewer.c | 56 ++++++++++++++++++++---------------- 1 file changed, 32 insertions(+), 24 deletions(-) commit 81403ff7d040c10e4edbf17aadfff9599da97e5d @@ -11192,10 +15650,10 @@ Constness problems, shadowing and missing cases in switch statements. - src/totem-object.c | 9 ++++++--- - src/totem-options.c | 2 +- - src/totem-playlist.c | 1 + - src/totem.c | 32 +++++--------------------------- + src/totem-object.c | 9 ++++++--- + src/totem-options.c | 2 +- + src/totem-playlist.c | 1 + + src/totem.c | 32 +++++--------------------------- 4 files changed, 13 insertions(+), 31 deletions(-) commit b7ddff7b1b20fef6f324f4dd6954e5939223cd39 @@ -11207,10 +15665,10 @@ Duplicate declarations, unsigned/signed confusion and non-optimiseable loops. - src/plugins/bemused/totem-bemused.c | 42 ++++++++++---------- - .../brasero-disc-recorder/totem-disc-recorder.c | 2 - - src/plugins/lirc/totem-lirc.c | 10 ++--- - src/plugins/publish/totem-publish.c | 6 +-- + src/plugins/bemused/totem-bemused.c | 42 +++++++++++----------- + .../brasero-disc-recorder/totem-disc-recorder.c | 2 -- + src/plugins/lirc/totem-lirc.c | 10 ++---- + src/plugins/publish/totem-publish.c | 6 ++-- 4 files changed, 26 insertions(+), 34 deletions(-) commit 3d74f874eb62f2df06dba1cfd41eb8df790271da @@ -11223,7 +15681,7 @@ it's less likely that the screenshot interval will be rounded down to 0. To prevent this entirely, it now has a lower bound of 1ms. - src/totem-video-thumbnailer.c | 24 ++++++++++++++---------- + src/totem-video-thumbnailer.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) commit 519a608b9edd98e754a496078ca3cb5049ed532c @@ -11232,7 +15690,7 @@ Remove use of GtkNotebookPage due to removal from GTK+ - src/plugins/youtube/totem-youtube.c | 4 ++-- + src/plugins/youtube/totem-youtube.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit c73bd203eed8b8d1cb45f8746a988d8cda0d408d @@ -11244,7 +15702,7 @@ Due to the changes in bgo#621858 we can drop some code which handled hiding builtin plugins in the plugin manager. - src/plugins/totem-plugins-engine.c | 35 +++-------------------------------- + src/plugins/totem-plugins-engine.c | 35 +++-------------------------------- 1 file changed, 3 insertions(+), 32 deletions(-) commit 33675d6be663d7676cb01cc66081d4db168fe6ef @@ -11253,7 +15711,7 @@ Re-enable Python support for testing - configure.in | 3 --- + configure.in | 3 --- 1 file changed, 3 deletions(-) commit 99169b4ecb87a7b8e0cf48a3fce1a0c4425cd1a3 @@ -11262,8 +15720,8 @@ 2.90.5 - NEWS | 15 +++++++++++++++ - configure.in | 2 +- + NEWS | 15 +++++++++++++++ + configure.in | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) commit 8e1a0053c8b835176193da415524a9702a0ba686 @@ -11272,8 +15730,8 @@ Fix the documentation build - docs/reference/totem-sections.txt | 29 +++++++++++++++++++++++++++++ - src/totem-object.c | 4 ++-- + docs/reference/totem-sections.txt | 29 +++++++++++++++++++++++++++++ + src/totem-object.c | 4 ++-- 2 files changed, 31 insertions(+), 2 deletions(-) commit 54eeb96c0f1271abf66e0ee3dbdadf199f7f4b46 @@ -11285,7 +15743,7 @@ They're not stable enough to make the 2.90.5 release. Support will be re-enabled after the release. - configure.in | 3 +++ + configure.in | 3 +++ 1 file changed, 3 insertions(+) commit a87a2b1be8b536f9a14faf668684d00dd881e3ef @@ -11294,7 +15752,7 @@ Updated Norwegian bokmål translation - po/nb.po | 655 ++++++++++++++++++++++++++++++-------------------------------- + po/nb.po | 655 ++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 312 insertions(+), 343 deletions(-) commit 6635b01e3b01db6ecbc76738a78fb02e2865963c @@ -11306,7 +15764,7 @@ The PeasUIConfigurable interface broke API for 0.5.2, and the Totem plugins have been updated to the new API. - configure.in | 5 +++-- + configure.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit da410ba883ec34ae6b559c7250fb68517c75617f @@ -11315,8 +15773,8 @@ Fix the configuration dialogue in the jamendo plugin - src/plugins/jamendo/jamendo.py | 116 ++++++++++-------- - src/plugins/jamendo/jamendo.ui | 258 +++++++++++++++------------------------- + src/plugins/jamendo/jamendo.py | 116 +++++++++--------- + src/plugins/jamendo/jamendo.ui | 258 +++++++++++++++-------------------------- 2 files changed, 158 insertions(+), 216 deletions(-) commit 62c464fe8ccd462171f85deabf1e410fae5412c2 @@ -11325,7 +15783,7 @@ Add (allow-none) annotation to totem_plugin_load_interface() - src/plugins/totem-dirs.c | 2 +- + src/plugins/totem-dirs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 1402550414e07ba7b6e889e7dc0c68805e325c57 @@ -11334,7 +15792,7 @@ Fix the configuration dialogue in the publish plugin - src/plugins/publish/totem-publish.c | 64 +++++++++++++++++++---------------- + src/plugins/publish/totem-publish.c | 64 ++++++++++++++++++++----------------- 1 file changed, 35 insertions(+), 29 deletions(-) commit 854c51a5190d94357b5a25b90cc0607f31cc6906 @@ -11343,10 +15801,10 @@ Port publish plugin to libpeas - configure.in | 2 +- - src/plugins/publish/Makefile.am | 12 +-- - src/plugins/publish/publish-plugin.ui | 171 ++++++++++++--------------------- - src/plugins/publish/totem-publish.c | 64 +++++------- + configure.in | 2 +- + src/plugins/publish/Makefile.am | 12 +-- + src/plugins/publish/publish-plugin.ui | 171 ++++++++++++---------------------- + src/plugins/publish/totem-publish.c | 64 ++++++------- 4 files changed, 92 insertions(+), 157 deletions(-) commit 5c2df01379d3c5babea63dd4c1e09df9ced8ca00 @@ -11355,7 +15813,7 @@ Re-add support for configurable plugins - src/plugins/totem-plugin.h | 51 ++++++++++++++++++++++++++++++++++++++++++++ + src/plugins/totem-plugin.h | 51 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) commit 81081b9dc0dc02cb82a158358c0f829afd4e5cb3 @@ -11364,7 +15822,7 @@ Fix use of GSEALed API in the mythtv plugin - src/plugins/mythtv/totem-mythtv.c | 14 ++++++-------- + src/plugins/mythtv/totem-mythtv.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) commit 7a6ed59e66fb8c0d2cd8028ae31387cd616e51f6 @@ -11375,7 +15833,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=623790 - browser-plugin/totemConeInput.cpp | 4 +++- + browser-plugin/totemConeInput.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit db49cebaf26f8f6cd88b6146723e8e21f2fff3ab @@ -11384,7 +15842,7 @@ Fix get_selected_rows() calls in the Jamendo plugin - src/plugins/jamendo/jamendo.py | 8 +++----- + src/plugins/jamendo/jamendo.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) commit e45632bbcdaba6007217440c5ce6471bbe125536 @@ -11393,8 +15851,8 @@ Update use of GVariant API to follow API changes in GLib master - configure.in | 2 +- - src/totem.c | 2 +- + configure.in | 2 +- + src/totem.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 4b1eb1e42e9a626f0718bd8e4a09fd9663910480 @@ -11403,7 +15861,7 @@ Updated Galician translations - po/gl.po | 292 +++++++++++++++++++++++++++++++------------------------------- + po/gl.po | 292 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 148 insertions(+), 144 deletions(-) commit 40c675e8215d40bfd0d670731c878ffbd4711804 @@ -11422,7 +15880,7 @@ Remove usage of sealed fields in bacon-resize.c - src/backend/bacon-resize.c | 4 ++-- + src/backend/bacon-resize.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 4679624c01ffbedf2feefa0175fbe6627f672552 @@ -11433,7 +15891,7 @@ Ensure we don't use uninitialised memory. Closes: bgo#623497 - src/totem-video-list.c | 2 +- + src/totem-video-list.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 55c6e4d54e92c657e9517bc66ecef9b7fd86c63c @@ -11451,7 +15909,7 @@ Updated Hebrew translation. - po/he.po | 444 +++++++++++++++++++++++++++++++------------------------------- + po/he.po | 444 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 223 insertions(+), 221 deletions(-) commit b843aea57e778ed71ff5b660b0c481558fd9ce23 @@ -11460,7 +15918,7 @@ Add Esperanto translation - po/LINGUAS | 1 + + po/LINGUAS | 1 + 1 file changed, 1 insertion(+) commit a0978396fc94eae4fd666d9c77966cc73dd4208b @@ -11478,7 +15936,7 @@ [l10n] Updated Estonian translation - po/et.po | 75 +++++++++++++++++++++++++++++++------------------------------- + po/et.po | 75 ++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 38 insertions(+), 37 deletions(-) commit 020d998824fd306109201a6a76e624233cdfb954 @@ -11489,9 +15947,9 @@ Spotted by Alexander Saprykin . Closes: bgo#623127 - src/totem-object.c | 2 +- - src/totem-open-location.c | 6 ++---- - src/totem-open-location.h | 2 +- + src/totem-object.c | 2 +- + src/totem-open-location.c | 6 ++---- + src/totem-open-location.h | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) commit bd3cd0446e0d4c29c8b511bd50c4cb4a4ffc2b7f @@ -11502,7 +15960,7 @@ Closes: bgo#623127 - src/totem-open-location.c | 9 +++++++++ + src/totem-open-location.c | 9 +++++++++ 1 file changed, 9 insertions(+) commit a15e34e5df18b0a25eadeeae479f07e420c9576a @@ -11513,8 +15971,8 @@ Helps: bgo#623127 - data/uri.ui | 1 + - src/totem-open-location.c | 11 +++++++++++ + data/uri.ui | 1 + + src/totem-open-location.c | 11 +++++++++++ 2 files changed, 12 insertions(+) commit 73bf9a60cdd527ae967dbbe8ef328f5761242994 @@ -11525,7 +15983,7 @@ Helps: bgo#623127 - src/totem-open-location.c | 35 ++++++++++++----------------------- + src/totem-open-location.c | 35 ++++++++++++----------------------- 1 file changed, 12 insertions(+), 23 deletions(-) commit f9f073961ddbfd37c0036b7259e4246f5b60877f @@ -11536,8 +15994,8 @@ Closes: bgo#623281 - src/plugins/tracker/Makefile.am | 3 +-- - src/plugins/tracker/totem-tracker.c | 23 +++++++---------------- + src/plugins/tracker/Makefile.am | 3 +-- + src/plugins/tracker/totem-tracker.c | 23 +++++++---------------- 2 files changed, 8 insertions(+), 18 deletions(-) commit 2cab21039e7032242a223347403c6762a5bf47cd @@ -11546,7 +16004,7 @@ Updated Spanish translation - po/es.po | 15 ++++++++------- + po/es.po | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) commit 81b755ae00be282bcd70b8f98c8de771ce744721 @@ -11557,8 +16015,8 @@ Closes: bgo#623279 - src/plugins/galago/Makefile.am | 2 +- - src/plugins/galago/totem-galago.c | 54 +++++++++++++++++-------------------- + src/plugins/galago/Makefile.am | 2 +- + src/plugins/galago/totem-galago.c | 54 +++++++++++++++++---------------------- 2 files changed, 25 insertions(+), 31 deletions(-) commit e19f67a9f45ffe7d2977ef817b0d892dc39c2ef5 @@ -11567,7 +16025,7 @@ Updated Hebrew translation. - po/he.po | 626 +++++++++++++++++++++++++++++++------------------------------- + po/he.po | 626 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 309 insertions(+), 317 deletions(-) commit 9b9885b590a79695f3c923653cd14a66a5d67bd8 @@ -11576,7 +16034,7 @@ Updated Spanish translation - po/es.po | 671 +++++++++++++++++++++++++++++++------------------------------- + po/es.po | 671 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 331 insertions(+), 340 deletions(-) commit bd9fd4fff3960ed9ba48bb42f69da33f263981e5 @@ -11594,7 +16052,7 @@ It's required to be set for the TotemVideoList to work. - src/totem-video-list.c | 2 ++ + src/totem-video-list.c | 2 ++ 1 file changed, 2 insertions(+) commit e5394da4d2b8025e4080eb35c170653a3c31051d @@ -11603,9 +16061,9 @@ Fix binding of TotemObject.action_error() - src/plugins/screenshot/totem-screenshot-plugin.c | 4 +-- - src/totem-object.c | 34 +++++++++++----------- - src/totem.h | 6 ++-- + src/plugins/screenshot/totem-screenshot-plugin.c | 4 +-- + src/totem-object.c | 34 ++++++++++++------------ + src/totem.h | 6 ++--- 3 files changed, 22 insertions(+), 22 deletions(-) commit 0d9e72a80eccc8b8f23e0aa8ec6049cf6cc3edc1 @@ -11614,7 +16072,7 @@ More jamendo plugin fixes - src/plugins/jamendo/jamendo.py | 23 ++++++++--------------- + src/plugins/jamendo/jamendo.py | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) commit cfcf946c775172f98984e5c024e02ad71749c7c9 @@ -11623,7 +16081,7 @@ Port sample-python plugin to libpeas - src/plugins/sample-python/sample-python.py | 15 +++++++-------- + src/plugins/sample-python/sample-python.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) commit 881dfe85a7d732b590312bebae440dfc753e3e4e @@ -11632,8 +16090,8 @@ Port pythonconsole plugin to libpeas - src/plugins/pythonconsole/console.py | 59 ++++++++++++++-------------- - src/plugins/pythonconsole/pythonconsole.py | 50 ++++++++++++----------- + src/plugins/pythonconsole/console.py | 59 +++++++++++++++--------------- + src/plugins/pythonconsole/pythonconsole.py | 50 ++++++++++++++----------- 2 files changed, 58 insertions(+), 51 deletions(-) commit 1b43d0db44bedb684aee35556400e8ed3396b198 @@ -11645,7 +16103,7 @@ The interface works, but downloading subtitles is untested due to it requiring threading. - src/plugins/opensubtitles/opensubtitles.py | 84 +++++++++++++++------------- + src/plugins/opensubtitles/opensubtitles.py | 84 ++++++++++++++++-------------- 1 file changed, 44 insertions(+), 40 deletions(-) commit 6806dd04450ced2095a09709fe5ce10b37cbe02a @@ -11657,7 +16115,7 @@ The configuration dialogue doesn't work and neither does searching, as it relies on Python threading. - src/plugins/jamendo/jamendo.py | 83 ++++++++++++++++++++-------------------- + src/plugins/jamendo/jamendo.py | 83 +++++++++++++++++++++--------------------- 1 file changed, 41 insertions(+), 42 deletions(-) commit 1a15a7120357cf715d874428192743237a5bdd91 @@ -11666,7 +16124,7 @@ Port dbus-service plugin to libpeas - src/plugins/dbus-service/dbus-service.py | 33 +++++++++++++++--------------- + src/plugins/dbus-service/dbus-service.py | 33 ++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) commit c8674f3da9a3bb6879ae0efb8da855efafe826dd @@ -11678,8 +16136,8 @@ The code has been ported, but the plugin has to be disabled as it depends on the Coherence library, which still uses PyGTK. - configure.in | 5 +++++ - src/plugins/coherence_upnp/coherence_upnp.py | 19 +++++++++++-------- + configure.in | 5 +++++ + src/plugins/coherence_upnp/coherence_upnp.py | 19 +++++++++++-------- 2 files changed, 16 insertions(+), 8 deletions(-) commit 8014ce3ff6aa7cf4fbf1fbcb8220c478feb4630c @@ -11691,8 +16149,8 @@ It doesn't currently work due to lack of support for Python threads, but the interface loads. - src/plugins/iplayer/iplayer.py | 24 ++++++++++++++++-------- - src/plugins/iplayer/iplayer2.py | 10 +++++++--- + src/plugins/iplayer/iplayer.py | 24 ++++++++++++++++-------- + src/plugins/iplayer/iplayer2.py | 10 +++++++--- 2 files changed, 23 insertions(+), 11 deletions(-) commit a6ad2e75b4023b717bda0ecadd62444106698d18 @@ -11710,9 +16168,9 @@ can be tidied up in a later commit, possibly at the same time as tidying up Totem's plugin-visible API. - docs/reference/totem-sections.txt | 56 +++--- - src/totem-object.c | 344 ++++++++++++++++++------------------- - src/totem.h | 136 +++++++++------ + docs/reference/totem-sections.txt | 56 +++---- + src/totem-object.c | 344 +++++++++++++++++++------------------- + src/totem.h | 136 +++++++++------ 3 files changed, 282 insertions(+), 254 deletions(-) commit a23e06d4ea6eef6e00c7b633db37120cd022ff64 @@ -11721,8 +16179,8 @@ Re-enable Python plugins support - configure.in | 5 +---- - src/plugins/totem-plugins-engine.c | 6 ++---- + configure.in | 5 +---- + src/plugins/totem-plugins-engine.c | 6 ++---- 2 files changed, 3 insertions(+), 8 deletions(-) commit a7f2c8abebae482c2225973c4f4d94dd31841648 @@ -11733,19 +16191,19 @@ Python and Vala plugins should be ported to use the introspected bindings. - Makefile.am | 2 +- - bindings/Makefile.am | 9 - - bindings/python/Makefile.am | 65 ----- - bindings/python/__init__.py | 50 ---- - bindings/python/override_common.c | 189 ------------- - bindings/python/override_common.h | 50 ---- - bindings/python/totem.defs | 537 ------------------------------------- - bindings/python/totem.override | 117 -------- - bindings/python/totemmodule.c | 230 ---------------- - bindings/vala/Makefile.am | 3 - - bindings/vala/totem.deps | 1 - - bindings/vala/totem.vapi | 127 --------- - configure.in | 62 +---- + Makefile.am | 2 +- + bindings/Makefile.am | 9 - + bindings/python/Makefile.am | 65 ----- + bindings/python/__init__.py | 50 ---- + bindings/python/override_common.c | 189 -------------- + bindings/python/override_common.h | 50 ---- + bindings/python/totem.defs | 537 -------------------------------------- + bindings/python/totem.override | 117 --------- + bindings/python/totemmodule.c | 230 ---------------- + bindings/vala/Makefile.am | 3 - + bindings/vala/totem.deps | 1 - + bindings/vala/totem.vapi | 127 --------- + configure.in | 62 +---- 13 files changed, 5 insertions(+), 1437 deletions(-) commit 567558c62a5df85795bbcb2ceb79604e58cb20fb @@ -11757,10 +16215,10 @@ Install a limited set of headers for plugins to use, plus a pkg-config file. Closes: bgo#602753 - configure.in | 12 ++++++++++++ - data/Makefile.am | 4 ++++ - data/totem.pc.in | 11 +++++++++++ - src/Makefile.am | 4 ++++ + configure.in | 12 ++++++++++++ + data/Makefile.am | 4 ++++ + data/totem.pc.in | 11 +++++++++++ + src/Makefile.am | 4 ++++ 4 files changed, 31 insertions(+) commit 92ae2c5426274ac39fc93748b81c38e03c8e8674 @@ -11778,9 +16236,9 @@ Closes: bgo#551290 - Makefile.am | 3 +-- - configure.in | 1 + - src/Makefile.am | 51 ++++++++++++++++++++++++++++++++++++++++++++------- + Makefile.am | 3 +-- + configure.in | 1 + + src/Makefile.am | 51 ++++++++++++++++++++++++++++++++++++++++++++------- 3 files changed, 46 insertions(+), 9 deletions(-) commit fea7f1b27ea17807f5a439676dfb63f93b5578e9 @@ -11793,8 +16251,8 @@ that Totem is built from an unholy mess of noinsted libraries into the set of installed libraries. - docs/reference/Makefile.am | 2 +- - src/Makefile.am | 30 +++++++++++++++--------------- + docs/reference/Makefile.am | 2 +- + src/Makefile.am | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 16 deletions(-) commit 418c93a910536cc679661b8c411a5dd2493f9d8b @@ -11803,7 +16261,7 @@ Fix nicknames for enum values - src/totem-object.c | 62 ++++++++++++++++++++++++++-------------------------- + src/totem-object.c | 62 +++++++++++++++++++++++++++--------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) commit 723cf28b588a1f7705ebdc21d9b6e5438bfeba96 @@ -11814,9 +16272,9 @@ The enum lives there, so the type functions should do too. - docs/reference/totem-sections.txt | 4 ---- - src/totem-object.c | 31 ------------------------------- - src/totem.h | 5 ----- + docs/reference/totem-sections.txt | 4 ---- + src/totem-object.c | 31 ------------------------------- + src/totem.h | 5 ----- 3 files changed, 40 deletions(-) commit cfedb89b7f2d171ea7d4ad933213860f59d831f3 @@ -11829,8 +16287,8 @@ library when it can just as easily be directly compiled into the main Totem library. - src/Makefile.am | 10 ++++++++-- - src/plugins/Makefile.am | 42 ------------------------------------------ + src/Makefile.am | 10 ++++++++-- + src/plugins/Makefile.am | 42 ------------------------------------------ 2 files changed, 8 insertions(+), 44 deletions(-) commit 5347aa66d58b1a966886231de1bb000613a59470 @@ -11839,8 +16297,8 @@ Don't use sealed GdkDragContext fields - src/totem-object.c | 29 ++++++++++++++++------------- - src/totem-playlist.c | 11 +++++++---- + src/totem-object.c | 29 ++++++++++++++++------------- + src/totem-playlist.c | 11 +++++++---- 2 files changed, 23 insertions(+), 17 deletions(-) commit 350b94324c2120bc042f4330f76ead789f90242f @@ -11853,7 +16311,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=622151#c12 - src/totem.c | 23 +++++++++++++++-------- + src/totem.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) commit 09126747056d8381d01575c935d92c1945fa2189 @@ -11862,7 +16320,7 @@ Fix gcc warnings and whitespace in YouTube plugin - src/plugins/youtube/totem-youtube.c | 106 +++++++++++++++++------------------ + src/plugins/youtube/totem-youtube.c | 106 ++++++++++++++++++------------------ 1 file changed, 53 insertions(+), 53 deletions(-) commit a39491154701e801f3060abc0cab2e24df4c5a65 @@ -11875,7 +16333,7 @@ use a single global cancellable instance (which didn't actually work anyway). Closes: bgo#618958 - src/plugins/youtube/totem-youtube.c | 205 +++++++++++++++++++++++------------ + src/plugins/youtube/totem-youtube.c | 205 +++++++++++++++++++++++------------- 1 file changed, 133 insertions(+), 72 deletions(-) commit 0707073a6970109d06453617f1462bc8beadaec9 @@ -11886,13 +16344,13 @@ https://bugzilla.gnome.org/show_bug.cgi?id=622151 - configure.in | 4 +- - src/Makefile.am | 4 -- - src/plugins/publish/Makefile.am | 1 - - src/totem-options.c | 98 ++++++++++++++++++++++++++------------- - src/totem-options.h | 4 +- - src/totem-private.h | 3 +- - src/totem.c | 92 +++++++++++++++++++++++++++--------- + configure.in | 4 +- + src/Makefile.am | 4 -- + src/plugins/publish/Makefile.am | 1 - + src/totem-options.c | 98 +++++++++++++++++++++++++++-------------- + src/totem-options.h | 4 +- + src/totem-private.h | 3 +- + src/totem.c | 92 ++++++++++++++++++++++++++++---------- 7 files changed, 139 insertions(+), 67 deletions(-) commit 13102877454344614fda239589eb649527291f1c @@ -11906,7 +16364,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=622374 - src/totem-playlist.c | 70 ++++++++++++++++++++++++++++---------------------- + src/totem-playlist.c | 70 +++++++++++++++++++++++++++++----------------------- 1 file changed, 39 insertions(+), 31 deletions(-) commit 9792aa50caef3b29402de675d1c999ce1c7c3efb @@ -11917,7 +16375,7 @@ For the GDBus screensaver changes. - configure.in | 2 +- + configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit d58f7060fc05ec7b2b98d58a87058fda692a4011 @@ -11926,7 +16384,7 @@ Updated Galician translations - po/gl.po | 507 +++++++++++++++++++++++++++++++------------------------------- + po/gl.po | 507 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 250 insertions(+), 257 deletions(-) commit 1ebcf48674c1638e8f6c5a0d07831e6a7ca2ff11 @@ -11935,8 +16393,8 @@ 2.90.0 - NEWS | 23 +++++++++++++++++++++++ - configure.in | 2 +- + NEWS | 23 +++++++++++++++++++++++ + configure.in | 2 +- 2 files changed, 24 insertions(+), 1 deletion(-) commit a3da22c634cef93b85071dea9c5a1d99b983ca92 @@ -11945,7 +16403,7 @@ Disable Vala plugins - configure.in | 4 ++++ + configure.in | 4 ++++ 1 file changed, 4 insertions(+) commit 02e0d2b0b177e4da1e2eb26bc829e23dd3280148 @@ -11954,10 +16412,10 @@ Add missing documentation - docs/reference/totem-sections.txt | 2 +- - src/plugins/totem-dirs.c | 9 +++++++++ - src/plugins/totem-plugin.h | 9 +++++++++ - src/totem-object.c | 3 ++- + docs/reference/totem-sections.txt | 2 +- + src/plugins/totem-dirs.c | 9 +++++++++ + src/plugins/totem-plugin.h | 9 +++++++++ + src/totem-object.c | 3 ++- 4 files changed, 21 insertions(+), 2 deletions(-) commit 8e88d6ded570650cdf5bf55494c0cee440428aff @@ -11970,7 +16428,7 @@ was trying to play the new video after starting the async add MRL process, rather than after the process finished. Closes: bgo#619763 - src/totem-object.c | 80 +++++++++++++++++++++++++++++++++------------------- + src/totem-object.c | 80 ++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 51 insertions(+), 29 deletions(-) commit ee05f2b124e54e565dc6c13a947e88d024da8660 @@ -11981,8 +16439,8 @@ Remove symbols from the documentation files which no longer exist. - docs/reference/totem-sections.txt | 32 +------------------------------- - docs/reference/totem.types | 2 -- + docs/reference/totem-sections.txt | 32 +------------------------------- + docs/reference/totem.types | 2 -- 2 files changed, 1 insertion(+), 33 deletions(-) commit 87b637874399f2c6dad3ece63cc099fc3a5cd0e3 @@ -11996,7 +16454,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=621445 - lib/totem-scrsaver.c | 77 ++++++++++++++++++++++++++------------------------ + lib/totem-scrsaver.c | 77 +++++++++++++++++++++++++++------------------------- 1 file changed, 40 insertions(+), 37 deletions(-) commit 598ee954b85e626a8a5ed9aaf66a585825a704a1 @@ -12007,7 +16465,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=621866 - po/POTFILES.in | 1 - + po/POTFILES.in | 1 - 1 file changed, 1 deletion(-) commit b49863832ccce0a77ff9d34410073e36c2fb2526 @@ -12016,7 +16474,7 @@ Updated Polish translation - help/pl/pl.po | 120 ++++----------------------------------------------------- + help/pl/pl.po | 120 ++++------------------------------------------------------ 1 file changed, 7 insertions(+), 113 deletions(-) commit 58384d60d5da25c870c7c5d6ae9e9e41ec2ad087 @@ -12025,9 +16483,9 @@ remove autogerated files in help - help/bg/legal.xml | 9 - - help/bg/totem-bg.omf | 32 --- - help/bg/totem.xml | 597 -------------------------------------------------- + help/bg/legal.xml | 9 - + help/bg/totem-bg.omf | 32 --- + help/bg/totem.xml | 597 --------------------------------------------------- 3 files changed, 638 deletions(-) commit de2413eb366f7739f0c14add88b6d035c5374e1f @@ -12036,7 +16494,7 @@ Update for latest libpeas API changes - src/plugins/totem-plugins-engine.c | 6 +++--- + src/plugins/totem-plugins-engine.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 7b87251597b49210ed4778aca6d4ebdf47aa8bed @@ -12045,7 +16503,7 @@ Cleanup thumbnail plugin definition - src/plugins/thumbnail/totem-thumbnail.c | 34 ++----------------------------- + src/plugins/thumbnail/totem-thumbnail.c | 34 ++------------------------------- 1 file changed, 2 insertions(+), 32 deletions(-) commit d3b431fc06d9b8c418a43e580d1dce87f7bbd0a0 @@ -12054,8 +16512,8 @@ Cleanup skipto plugin definition - src/plugins/skipto/totem-skipto-plugin.c | 39 +++--------------------------- - src/plugins/skipto/totem-skipto-plugin.h | 2 -- + src/plugins/skipto/totem-skipto-plugin.c | 39 +++----------------------------- + src/plugins/skipto/totem-skipto-plugin.h | 2 -- 2 files changed, 3 insertions(+), 38 deletions(-) commit 79b94e1b7d53ad1dced46e6c60453179ea61c2ae @@ -12064,8 +16522,8 @@ Cleanup screenshot plugin definition - src/plugins/screenshot/totem-screenshot-plugin.c | 36 +++------------------- - src/plugins/screenshot/totem-screenshot-plugin.h | 1 - + src/plugins/screenshot/totem-screenshot-plugin.c | 36 +++--------------------- + src/plugins/screenshot/totem-screenshot-plugin.h | 1 - 2 files changed, 4 insertions(+), 33 deletions(-) commit 947e40f59c064c7f91b7ba13e2a1f0c1574329f8 @@ -12074,7 +16532,7 @@ Cleanup screensaver plugin definition - src/plugins/screensaver/totem-screensaver.c | 39 +++------------------------ + src/plugins/screensaver/totem-screensaver.c | 39 +++-------------------------- 1 file changed, 4 insertions(+), 35 deletions(-) commit 456f0245dc61c1ff135a32a41d125c1fb10fd799 @@ -12083,7 +16541,7 @@ Cleanup properties plugin definition - src/plugins/properties/totem-movie-properties.c | 39 +++-------------------- + src/plugins/properties/totem-movie-properties.c | 39 +++---------------------- 1 file changed, 4 insertions(+), 35 deletions(-) commit b499ea75220788d6b1a155466af6c104a1c81108 @@ -12092,7 +16550,7 @@ Cleanup ontop plugin definition - src/plugins/ontop/totem-ontop.c | 35 ++--------------------------------- + src/plugins/ontop/totem-ontop.c | 35 ++--------------------------------- 1 file changed, 2 insertions(+), 33 deletions(-) commit 6f7212548f6a5c58c3da581d649f6938a64427b5 @@ -12101,7 +16559,7 @@ Cleanup lirc plugin definition - src/plugins/lirc/totem-lirc.c | 44 ++--------------------------------------- + src/plugins/lirc/totem-lirc.c | 44 ++----------------------------------------- 1 file changed, 2 insertions(+), 42 deletions(-) commit aefc430b0fb60bde2d2b6f7a7fd2156ce45adb21 @@ -12110,7 +16568,7 @@ Cleanup media-player-keys plugin definition - .../media-player-keys/totem-media-player-keys.c | 48 ++------------------ + .../media-player-keys/totem-media-player-keys.c | 48 ++-------------------- 1 file changed, 4 insertions(+), 44 deletions(-) commit 1a989a4c2c0625465858f58c001b048e772606ff @@ -12119,7 +16577,7 @@ Clean up gromit plugin definition - src/plugins/gromit/totem-gromit.c | 35 ++--------------------------------- + src/plugins/gromit/totem-gromit.c | 35 ++--------------------------------- 1 file changed, 2 insertions(+), 33 deletions(-) commit 31b07e10f7807f70cdc64f87afbc6ccc42dec1f8 @@ -12128,7 +16586,7 @@ Add totem-plugin.h to the distribution - src/plugins/Makefile.am | 1 + + src/plugins/Makefile.am | 1 + 1 file changed, 1 insertion(+) commit df9ac486d233ff586d8744eac1a3d189f3c78ec2 @@ -12137,8 +16595,8 @@ Port ontop to libpeas - src/plugins/ontop/Makefile.am | 1 + - src/plugins/ontop/totem-ontop.c | 63 ++++++++++++++++++++++++++------------- + src/plugins/ontop/Makefile.am | 1 + + src/plugins/ontop/totem-ontop.c | 63 ++++++++++++++++++++++++++++------------- 2 files changed, 44 insertions(+), 20 deletions(-) commit 5ce530b8b47278b702ef03c8602d28c0f817ae4d @@ -12147,8 +16605,8 @@ Port bemused plugin to libpeas - src/plugins/bemused/Makefile.am | 1 + - src/plugins/bemused/totem-bemused.c | 46 ++++++++++------------------------- + src/plugins/bemused/Makefile.am | 1 + + src/plugins/bemused/totem-bemused.c | 46 +++++++++++-------------------------- 2 files changed, 14 insertions(+), 33 deletions(-) commit ddf3551f2877d72c4d4ecf66f78bd5ac779f09a6 @@ -12159,8 +16617,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=604830 - src/plugins/sidebar-test/Makefile.am | 1 + - src/plugins/sidebar-test/totem-sidebar-test.c | 38 +++++++------------------ + src/plugins/sidebar-test/Makefile.am | 1 + + src/plugins/sidebar-test/totem-sidebar-test.c | 38 +++++++-------------------- 2 files changed, 11 insertions(+), 28 deletions(-) commit e23c7dcef33a95bca3d0cf3b299cead2adcf569c @@ -12171,8 +16629,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=604830 - src/plugins/mythtv/Makefile.am | 1 + - src/plugins/mythtv/totem-mythtv.c | 32 ++++++++++++-------------------- + src/plugins/mythtv/Makefile.am | 1 + + src/plugins/mythtv/totem-mythtv.c | 32 ++++++++++++-------------------- 2 files changed, 13 insertions(+), 20 deletions(-) commit d269adfc8f1ea9ce75283c96baadb1b9fadfab0f @@ -12183,8 +16641,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=604830 - src/plugins/lirc/Makefile.am | 1 + - src/plugins/lirc/totem-lirc.c | 74 +++++++++++++++++++++++++++++------------ + src/plugins/lirc/Makefile.am | 1 + + src/plugins/lirc/totem-lirc.c | 74 ++++++++++++++++++++++++++++++------------- 2 files changed, 53 insertions(+), 22 deletions(-) commit 493b0537ba69d895289e469347c51cfb08ae55b7 @@ -12195,8 +16653,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=604830 - src/plugins/gromit/Makefile.am | 1 + - src/plugins/gromit/totem-gromit.c | 66 ++++++++++++++++++++++++++----------- + src/plugins/gromit/Makefile.am | 1 + + src/plugins/gromit/totem-gromit.c | 66 ++++++++++++++++++++++++++++----------- 2 files changed, 48 insertions(+), 19 deletions(-) commit f923116228d2dcad78d30c6dad02a4078dc2a651 @@ -12207,8 +16665,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=604830 - src/plugins/media-player-keys/Makefile.am | 1 + - .../media-player-keys/totem-media-player-keys.c | 71 ++++++++++++++------ + src/plugins/media-player-keys/Makefile.am | 1 + + .../media-player-keys/totem-media-player-keys.c | 71 +++++++++++++++------- 2 files changed, 50 insertions(+), 22 deletions(-) commit a303e558d9bffb1e48e89c618871b93c35c80639 @@ -12219,8 +16677,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=604830 - src/plugins/properties/Makefile.am | 1 + - src/plugins/properties/totem-movie-properties.c | 63 ++++++++++++++++------- + src/plugins/properties/Makefile.am | 1 + + src/plugins/properties/totem-movie-properties.c | 63 ++++++++++++++++++------- 2 files changed, 46 insertions(+), 18 deletions(-) commit cd95d6fe8506825397dbb9ace536b54f830471a6 @@ -12231,8 +16689,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=604830 - src/plugins/thumbnail/Makefile.am | 1 + - src/plugins/thumbnail/totem-thumbnail.c | 63 +++++++++++++++++++++---------- + src/plugins/thumbnail/Makefile.am | 1 + + src/plugins/thumbnail/totem-thumbnail.c | 63 ++++++++++++++++++++++----------- 2 files changed, 44 insertions(+), 20 deletions(-) commit 06f51a153420afa02b078e25cb9311a998007e8a @@ -12243,13 +16701,13 @@ https://bugzilla.gnome.org/show_bug.cgi?id=604830 - src/plugins/screenshot/Makefile.am | 1 + - src/plugins/screenshot/totem-gallery.c | 5 +- - src/plugins/screenshot/totem-gallery.h | 4 +- - src/plugins/screenshot/totem-screenshot-plugin.c | 69 +++++++++++++++------- - src/plugins/screenshot/totem-screenshot-plugin.h | 9 +-- - src/plugins/screenshot/totem-screenshot.c | 5 +- - src/plugins/screenshot/totem-screenshot.h | 4 +- + src/plugins/screenshot/Makefile.am | 1 + + src/plugins/screenshot/totem-gallery.c | 5 +- + src/plugins/screenshot/totem-gallery.h | 4 +- + src/plugins/screenshot/totem-screenshot-plugin.c | 69 ++++++++++++++++-------- + src/plugins/screenshot/totem-screenshot-plugin.h | 9 ++-- + src/plugins/screenshot/totem-screenshot.c | 5 +- + src/plugins/screenshot/totem-screenshot.h | 4 +- 7 files changed, 64 insertions(+), 33 deletions(-) commit 1a529aa667beee22c68276d4813317209409bf19 @@ -12260,8 +16718,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=604830 - src/plugins/brasero-disc-recorder/Makefile.am | 1 + - .../brasero-disc-recorder/totem-disc-recorder.c | 39 ++++++++------------ + src/plugins/brasero-disc-recorder/Makefile.am | 1 + + .../brasero-disc-recorder/totem-disc-recorder.c | 39 +++++++++------------- 2 files changed, 16 insertions(+), 24 deletions(-) commit 9b7c8d03af6188e9b318ad735b910b676723486f @@ -12272,8 +16730,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=604830 - src/plugins/screensaver/Makefile.am | 1 + - src/plugins/screensaver/totem-screensaver.c | 64 +++++++++++++++++++-------- + src/plugins/screensaver/Makefile.am | 1 + + src/plugins/screensaver/totem-screensaver.c | 64 ++++++++++++++++++++--------- 2 files changed, 46 insertions(+), 19 deletions(-) commit c892eb7e4092b956e85c8e1f073fe883aa8b4b48 @@ -12284,7 +16742,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=604830 - src/plugins/youtube/totem-youtube.c | 30 ++++++++++++++---------------- + src/plugins/youtube/totem-youtube.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) commit f5364cf6faeb2d474f6bf3d3caa3e2bd0da5c3a1 @@ -12295,10 +16753,10 @@ https://bugzilla.gnome.org/show_bug.cgi?id=604830 - src/plugins/skipto/Makefile.am | 1 + - src/plugins/skipto/totem-skipto-plugin.c | 69 +++++++++++++++++++----------- - src/plugins/skipto/totem-skipto-plugin.h | 7 ++- - src/plugins/skipto/totem-skipto.c | 5 ++- + src/plugins/skipto/Makefile.am | 1 + + src/plugins/skipto/totem-skipto-plugin.c | 69 ++++++++++++++++++++------------ + src/plugins/skipto/totem-skipto-plugin.h | 7 +++- + src/plugins/skipto/totem-skipto.c | 5 ++- 4 files changed, 52 insertions(+), 30 deletions(-) commit 20fff7bb5d66fbf1183ffcfa91230e7663659854 @@ -12307,7 +16765,7 @@ Remove unused totem-plugin.c - src/plugins/totem-plugin.c | 374 -------------------------------------------- + src/plugins/totem-plugin.c | 374 --------------------------------------------- 1 file changed, 374 deletions(-) commit eba99cb83fe80225f6ae2e1cc36331c3df3c2fd7 @@ -12316,7 +16774,7 @@ Re-enable plugins - src/plugins/Makefile.am | 5 ++--- + src/plugins/Makefile.am | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) commit f4e9632fc807adc931932652240e07d8fb2e45d5 @@ -12325,7 +16783,7 @@ Add helper macro for registering plugins - src/plugins/totem-plugin.h | 328 +++++--------------------------------------- + src/plugins/totem-plugin.h | 328 +++++---------------------------------------- 1 file changed, 35 insertions(+), 293 deletions(-) commit 202847fd9a4aab2c1e41a8bd103335c133dad2dc @@ -12334,7 +16792,7 @@ Fix compilation of the preferences dialogue - src/totem-preferences.c | 1 - + src/totem-preferences.c | 1 - 1 file changed, 1 deletion(-) commit afef518ca487da553e736ec91812d754ac55319e @@ -12345,7 +16803,7 @@ So we can have it installed, and not crashing when we load Totem. - src/plugins/totem-plugins-engine.c | 4 ++++ + src/plugins/totem-plugins-engine.c | 4 ++++ 1 file changed, 4 insertions(+) commit ea41955fd602f68dd7ae9ba0686595c94de34c53 @@ -12356,7 +16814,7 @@ Based on the old GConf code in Totem 2.30. - src/plugins/totem-plugins-engine.c | 32 +++++++++++++++++++++++++++++--- + src/plugins/totem-plugins-engine.c | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) commit 7bf399f1365f8e9f76edb08007b10a9c756f650b @@ -12367,42 +16825,42 @@ https://bugzilla.gnome.org/show_bug.cgi?id=604830 - .gitignore | 1 + - bindings/python/Makefile.am | 24 +- - bindings/python/__init__.py | 50 +++ - bindings/python/override_common.c | 2 +- - bindings/python/totem.defs | 70 +-- - bindings/python/totem.override | 47 +- - bindings/python/totemmodule.c | 230 ++++++++++ - bindings/vala/totem.vapi | 2 +- - configure.in | 19 +- - docs/reference/Makefile.am | 3 +- - src/Makefile.am | 21 +- - src/plugins/Makefile.am | 42 +- - src/plugins/totem-dirs.c | 182 ++++++++ - src/plugins/totem-dirs.h | 39 ++ - src/plugins/totem-module.c | 173 ------- - src/plugins/totem-module.h | 56 --- - src/plugins/totem-plugin-manager.c | 533 ---------------------- - src/plugins/totem-plugin-manager.h | 78 ---- - src/plugins/totem-plugins-engine.c | 845 ++++++++--------------------------- - src/plugins/totem-plugins-engine.h | 48 +- - src/plugins/totem-python-module.c | 566 ----------------------- - src/plugins/totem-python-module.h | 61 --- - src/plugins/totem-python-plugin.c | 282 ------------ - src/plugins/totem-python-plugin.h | 52 --- - src/plugins/totem/Makefile.am | 4 - - src/plugins/totem/__init__.py | 6 - - src/plugins/tracker/Makefile.am | 1 + - src/plugins/tracker/totem-tracker.c | 15 +- - src/plugins/youtube/Makefile.am | 1 + - src/plugins/youtube/totem-youtube.c | 14 +- - src/totem-interface.c | 4 +- - src/totem-interface.h | 3 +- - src/totem-menu.c | 4 +- - src/totem-object.c | 14 +- - src/totem-private.h | 2 + - src/totem.h | 2 +- + .gitignore | 1 + + bindings/python/Makefile.am | 24 +- + bindings/python/__init__.py | 50 +++ + bindings/python/override_common.c | 2 +- + bindings/python/totem.defs | 70 +-- + bindings/python/totem.override | 47 +- + bindings/python/totemmodule.c | 230 ++++++++++ + bindings/vala/totem.vapi | 2 +- + configure.in | 19 +- + docs/reference/Makefile.am | 3 +- + src/Makefile.am | 21 +- + src/plugins/Makefile.am | 42 +- + src/plugins/totem-dirs.c | 182 ++++++++ + src/plugins/totem-dirs.h | 39 ++ + src/plugins/totem-module.c | 173 -------- + src/plugins/totem-module.h | 56 --- + src/plugins/totem-plugin-manager.c | 533 ----------------------- + src/plugins/totem-plugin-manager.h | 78 ---- + src/plugins/totem-plugins-engine.c | 845 ++++++++---------------------------- + src/plugins/totem-plugins-engine.h | 48 +- + src/plugins/totem-python-module.c | 566 ------------------------ + src/plugins/totem-python-module.h | 61 --- + src/plugins/totem-python-plugin.c | 282 ------------ + src/plugins/totem-python-plugin.h | 52 --- + src/plugins/totem/Makefile.am | 4 - + src/plugins/totem/__init__.py | 6 - + src/plugins/tracker/Makefile.am | 1 + + src/plugins/tracker/totem-tracker.c | 15 +- + src/plugins/youtube/Makefile.am | 1 + + src/plugins/youtube/totem-youtube.c | 14 +- + src/totem-interface.c | 4 +- + src/totem-interface.h | 3 +- + src/totem-menu.c | 4 +- + src/totem-object.c | 14 +- + src/totem-private.h | 2 + + src/totem.h | 2 +- 36 files changed, 829 insertions(+), 2667 deletions(-) commit dc894da891c37c30b0acb648da9d49e2bc9c6d61 @@ -12420,7 +16878,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=621771 - browser-plugin/totemPluginGlue.cpp | 4 ++++ + browser-plugin/totemPluginGlue.cpp | 4 ++++ 1 file changed, 4 insertions(+) commit eb6a913257d852a495a3005aab6748680ee1d2bd @@ -12429,7 +16887,7 @@ Fix compile-time warnings - src/totem-object.c | 4 ++-- + src/totem-object.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit e7a8ae67f923ec05e16aca9cdc98f83a9c7862ee @@ -12438,7 +16896,7 @@ Disable Python plugin support for now - configure.in | 4 ++++ + configure.in | 4 ++++ 1 file changed, 4 insertions(+) commit c3a022f5d4228b65c86ae1cf4e16dfacca44f15e @@ -12450,12 +16908,12 @@ Copy evince screensaver code, and add the ability to set the reason outside the module itself. - browser-plugin/totem-plugin-viewer.c | 3 + - configure.in | 3 +- - lib/totem-scrsaver.c | 344 +++++++++++++++++---------- - lib/totem-scrsaver.h | 16 +- - po/POTFILES.in | 2 +- - src/plugins/screensaver/totem-screensaver.c | 3 + + browser-plugin/totem-plugin-viewer.c | 3 + + configure.in | 3 +- + lib/totem-scrsaver.c | 344 ++++++++++++++++++---------- + lib/totem-scrsaver.h | 16 +- + po/POTFILES.in | 2 +- + src/plugins/screensaver/totem-screensaver.c | 3 + 6 files changed, 241 insertions(+), 130 deletions(-) commit 781e168a0b35783a650732cfba46670534dc7065 @@ -12470,13 +16928,13 @@ https://bugzilla.gnome.org/show_bug.cgi?id=617921 - configure.in | 18 +++++++++--------- - data/playlist.ui | 4 ++-- - data/totem.ui | 22 +++++++++++----------- - src/totem-dnd-menu.c | 2 +- - src/totem-object.c | 48 ++++++++++++++++++++++++------------------------ - src/totem-playlist.c | 10 +++++----- - src/totem.c | 4 ++++ + configure.in | 18 +++++++++--------- + data/playlist.ui | 4 ++-- + data/totem.ui | 22 +++++++++++----------- + src/totem-dnd-menu.c | 2 +- + src/totem-object.c | 48 ++++++++++++++++++++++++------------------------ + src/totem-playlist.c | 10 +++++----- + src/totem.c | 4 ++++ 7 files changed, 56 insertions(+), 52 deletions(-) commit 199d02674bcfb105cb6c2e4f2cc4e00585966cfd @@ -12489,8 +16947,8 @@ Bug #618244. - configure.in | 2 +- - lib/totem-scrsaver.c | 200 ++++++++++++++++++++++++-------------------------- + configure.in | 2 +- + lib/totem-scrsaver.c | 200 +++++++++++++++++++++++++-------------------------- 2 files changed, 98 insertions(+), 104 deletions(-) commit ecb17359bc11ad2e4aa792efd1bd7c092ce5708d @@ -12501,8 +16959,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=618546 - autogen.sh | 2 +- - configure.in | 17 +++++++++-------- + autogen.sh | 2 +- + configure.in | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) commit 6117981bacc3b56d2fa7ea4c37d1db295e2fe27f @@ -12511,7 +16969,7 @@ Add little debugging for seekable in the backend - src/backend/bacon-video-widget-gst-0.10.c | 1 + + src/backend/bacon-video-widget-gst-0.10.c | 1 + 1 file changed, 1 insertion(+) commit f04d1c81319c3e25f22b06552f7c74183acbc597 @@ -12522,7 +16980,7 @@ So that we can debug download buffering problems on git master. - src/backend/bacon-video-widget-gst-0.10.c | 6 ++++-- + src/backend/bacon-video-widget-gst-0.10.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) commit c91691abdab4f017c7481c8d73e30f14143e3405 @@ -12531,7 +16989,7 @@ Updated Norwegian bokmål translation - po/nb.po | 324 +++++++++++++++++++++++++++++++------------------------------- + po/nb.po | 324 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 164 insertions(+), 160 deletions(-) commit e420d73be8966c236c6d49830a4570da6906db1b @@ -12540,7 +16998,7 @@ Updated Hebrew translation. - po/he.po | 763 +++++++++++++++++++++++++++++++------------------------------- + po/he.po | 763 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 379 insertions(+), 384 deletions(-) commit 1619e43ba466a684bf9c02d6de478f4103922c5b @@ -12566,8 +17024,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=619883 - src/totem-object.c | 14 ++------------ - src/totem-open-location.c | 5 +---- + src/totem-object.c | 14 ++------------ + src/totem-open-location.c | 5 +---- 2 files changed, 3 insertions(+), 16 deletions(-) commit 83d39acb5e16eb0e7a5d613eaea2f1870fd7b379 @@ -12576,7 +17034,7 @@ Estonian translation updated - po/et.po | 116 ++++++++++++++++++++++++++++++++++---------------------------- + po/et.po | 116 ++++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 63 insertions(+), 53 deletions(-) commit ef85a1696e57e11899e08d1af2ece53d5b741fd1 @@ -12585,7 +17043,7 @@ Update Czech translation by Marek Cernocky - po/cs.po | 591 +++++++++++++++++++++++++++++++------------------------------- + po/cs.po | 591 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 297 insertions(+), 294 deletions(-) commit 42b7ed293cfee5ce6cadc899d1d8cde7c5695d06 @@ -12596,7 +17054,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=614422 - data/mime-type-list.txt | 1 + + data/mime-type-list.txt | 1 + 1 file changed, 1 insertion(+) commit 87207e8f91ca9ec1b9bcb02c8dd6542acb483841 @@ -12605,8 +17063,8 @@ Add WebM support to Totem and browser plugin - browser-plugin/totemPlugin.cpp | 1 + - data/mime-type-list.txt | 1 + + browser-plugin/totemPlugin.cpp | 1 + + data/mime-type-list.txt | 1 + 2 files changed, 2 insertions(+) commit c5d86dfbc74024a25528b705efa65af8c78101be @@ -12620,7 +17078,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=618929 - browser-plugin/totemPlugin.cpp | 18 ++++++++++++++---- + browser-plugin/totemPlugin.cpp | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) commit 772390ad6a6399fe8b8ea438df67edda52705a77 @@ -12631,7 +17089,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=618929 - browser-plugin/totemConePlaylist.cpp | 9 ++++++++- + browser-plugin/totemConePlaylist.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) commit 611fee723b6ee506945cab398602904d62128c02 @@ -12642,7 +17100,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=618929 - browser-plugin/totemConeInput.cpp | 13 +++++++++++-- + browser-plugin/totemConeInput.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) commit e1332de49febdd4135adf193440340fbd48717dd @@ -12660,17 +17118,17 @@ https://bugzilla.gnome.org/show_bug.cgi?id=618746 - bindings/python/totem.defs | 6 ++-- - bindings/vala/totem.vapi | 4 +-- - browser-plugin/totem-plugin-viewer.c | 3 +- - src/backend/bacon-video-widget-gst-0.10.c | 11 +++++-- - src/backend/bacon-video-widget.h | 1 + - src/plugins/bemused/totem-bemused.c | 2 +- - src/plugins/skipto/totem-skipto-plugin.c | 3 +- - src/totem-menu.c | 4 +-- - src/totem-object.c | 48 +++++++++++++++-------------- - src/totem-video-thumbnailer.c | 2 +- - src/totem.h | 4 +-- + bindings/python/totem.defs | 6 ++-- + bindings/vala/totem.vapi | 4 +-- + browser-plugin/totem-plugin-viewer.c | 3 +- + src/backend/bacon-video-widget-gst-0.10.c | 11 +++++-- + src/backend/bacon-video-widget.h | 1 + + src/plugins/bemused/totem-bemused.c | 2 +- + src/plugins/skipto/totem-skipto-plugin.c | 3 +- + src/totem-menu.c | 4 +-- + src/totem-object.c | 48 ++++++++++++++++--------------- + src/totem-video-thumbnailer.c | 2 +- + src/totem.h | 4 +-- 11 files changed, 50 insertions(+), 38 deletions(-) commit daa1b3d36490c2fc05723585557843b5c08b11d2 @@ -12694,7 +17152,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=618597 - src/backend/bacon-video-widget-gst-0.10.c | 3 ++- + src/backend/bacon-video-widget-gst-0.10.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit c08176cc1e2ef645427936069c7c2ad75b31d23b @@ -12703,7 +17161,7 @@ Updated Italian translation - po/it.po | 319 +++++++++++++++++++++++++++++++------------------------------- + po/it.po | 319 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 157 insertions(+), 162 deletions(-) commit 2e89f984292219204d00b027ec9ef8c5abef45be @@ -12721,7 +17179,7 @@ Updated Galician translations - po/gl.po | 301 ++++++++++++++++++++++++++++++++------------------------------ + po/gl.po | 301 +++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 156 insertions(+), 145 deletions(-) commit ea6a516b927506dbe0ac989597f24a87e943a915 @@ -12736,7 +17194,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=618023 - src/gsd-media-keys-window.c | 15 +-------------- + src/gsd-media-keys-window.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) commit 16748a5c8af4bfbbd55d643f08dd6e084c1498af @@ -12745,7 +17203,7 @@ Updated Spanish translation - po/es.po | 312 ++++++++++++++++++++++++++++++++------------------------------ + po/es.po | 312 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 159 insertions(+), 153 deletions(-) commit c1b48193e9d16d54ea7b3ae6ddc1457d98f5a58a @@ -12754,7 +17212,7 @@ Updated German translation - po/de.po | 313 ++++++++++++++++++++++++++++++++------------------------------ + po/de.po | 313 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 160 insertions(+), 153 deletions(-) commit 5856ae9fe71fe2e8dfbda10bba417effa531d697 @@ -12779,7 +17237,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=617821 - src/plugins/totem-python-module.c | 9 +++++++-- + src/plugins/totem-python-module.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) commit 6fddb476a5477859a4a870802ee244f05df8d41b @@ -12792,7 +17250,7 @@ is for the position to stay at the end of the file, rather than back at 0. - browser-plugin/totemPlugin.cpp | 7 +++++-- + browser-plugin/totemPlugin.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) commit b71b5c5dc756104eb1817ba7c3ede5b02c3e7223 @@ -12812,7 +17270,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=617791 - src/backend/bacon-video-widget-gst-0.10.c | 21 ++++++++++++--------- + src/backend/bacon-video-widget-gst-0.10.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) commit ae5e1b16592a34f824713d655def63660f45100a @@ -12831,8 +17289,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=617639 - browser-plugin/totemPlugin.cpp | 26 ++++++++++++++++++++++++-- - browser-plugin/totemPlugin.h | 1 + + browser-plugin/totemPlugin.cpp | 26 ++++++++++++++++++++++++-- + browser-plugin/totemPlugin.h | 1 + 2 files changed, 25 insertions(+), 2 deletions(-) commit 386142b4de7d6ce15448e50b32ba714a57090df7 @@ -12846,7 +17304,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=617525 - browser-plugin/totem-plugin-viewer.c | 9 --------- + browser-plugin/totem-plugin-viewer.c | 9 --------- 1 file changed, 9 deletions(-) commit 299b49300a2f1f2b1cec920b33a65f3473f4ccaa @@ -12858,7 +17316,7 @@ There's no queue-threshold or anything like that in playbin2 anymore, so disable it altogether. - src/backend/bacon-video-widget-gst-0.10.c | 62 ----------------------------- + src/backend/bacon-video-widget-gst-0.10.c | 62 ------------------------------- 1 file changed, 62 deletions(-) commit 4b2d22d9038b5b9eb7b400470746d0268d4d399d @@ -12873,8 +17331,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=605370 - data/totem.ui | 87 ++++++++++++++++++++++++++++++----------------- - src/totem-preferences.c | 35 ++++++++++++------- + data/totem.ui | 87 +++++++++++++++++++++++++++++++------------------ + src/totem-preferences.c | 35 ++++++++++++-------- 2 files changed, 77 insertions(+), 45 deletions(-) commit 94418a2d7295de739200cc6657263076c0f2d80b @@ -12888,13 +17346,13 @@ https://bugzilla.gnome.org/show_bug.cgi?id=617283 - README | 2 -- - data/totem.1 | 2 -- - data/totem.schemas.in | 6 ++-- - data/totem.ui | 33 ++++++++++++++------- - src/totem-menu.c | 12 -------- - src/totem-object.c | 12 -------- - src/totem-preferences.c | 74 ++++++++++++++++++++++++++++------------------- + README | 2 -- + data/totem.1 | 2 -- + data/totem.schemas.in | 6 ++-- + data/totem.ui | 33 +++++++++++++++------- + src/totem-menu.c | 12 -------- + src/totem-object.c | 12 -------- + src/totem-preferences.c | 74 +++++++++++++++++++++++++++++-------------------- 7 files changed, 70 insertions(+), 71 deletions(-) commit 31f3116b58899f550afcb8f9f424b3e2c6710745 @@ -12905,7 +17363,7 @@ As it's now only used when interlaced streams are being played. - src/backend/bacon-video-widget-gst-0.10.c | 10 ++++++---- + src/backend/bacon-video-widget-gst-0.10.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) commit aab7cd10e971a60010d65aa257918da2740b2d00 @@ -12914,9 +17372,9 @@ Fix bold labels in Glade - data/plugins.ui | 8 ++++---- - data/properties.ui | 6 +++--- - data/totem.ui | 15 ++++++++------- + data/plugins.ui | 8 ++++---- + data/properties.ui | 6 +++--- + data/totem.ui | 15 ++++++++------- 3 files changed, 15 insertions(+), 14 deletions(-) commit b01b0158834b8456216b210e2aabe5706cdd2115 @@ -12925,12 +17383,12 @@ Add Orientation properties to all the GtkVBoxes - data/mozilla-viewer.ui | 1 + - data/playlist.ui | 1 + - data/plugins.ui | 7 +++++++ - data/properties.ui | 4 ++++ - data/totem.ui | 17 +++++++++++++++++ - data/uri.ui | 1 + + data/mozilla-viewer.ui | 1 + + data/playlist.ui | 1 + + data/plugins.ui | 7 +++++++ + data/properties.ui | 4 ++++ + data/totem.ui | 17 +++++++++++++++++ + data/uri.ui | 1 + 6 files changed, 31 insertions(+) commit 14cfbd5528d958c4c378baea210a19dbac43f3f1 @@ -12939,7 +17397,7 @@ Check for libICE and link to it when using the X11 backend - configure.in | 2 +- + configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit addefa4d29b287f9bcfeadd9917dda0225fa6284 @@ -12948,7 +17406,7 @@ Updated German translation - po/de.po | 716 +++++++++++++++++++++++++++++++------------------------------- + po/de.po | 716 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 354 insertions(+), 362 deletions(-) commit 548ba8b489d0cff28a59f93a6f08cbe6ae9c0381 @@ -12957,7 +17415,7 @@ Updated Norwegian bokmål translation - po/nb.po | 593 ++++++++++++++++++++++++++++++-------------------------------- + po/nb.po | 593 ++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 286 insertions(+), 307 deletions(-) commit f65917f0af65f77a3e059af94e0195522274a9c3 @@ -12966,7 +17424,7 @@ Updated Galician translation - po/gl.po | 610 +++++++++++++++++++++++++++++++------------------------------- + po/gl.po | 610 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 303 insertions(+), 307 deletions(-) commit be5afc6938ed02ef420db53256c853164994df7b @@ -12977,7 +17435,7 @@ Bug #617199. - src/totem-menu.c | 36 +++++++++++++++--------------------- + src/totem-menu.c | 36 +++++++++++++++--------------------- 1 file changed, 15 insertions(+), 21 deletions(-) commit 606a625ec64d6400f49ab95af385cb1f565fec19 @@ -12990,9 +17448,9 @@ https://bugzilla.gnome.org/show_bug.cgi?id=491627 - src/backend/bacon-video-widget-gst-0.10.c | 77 ++++++++++++++++------------- - src/backend/bacon-video-widget.h | 1 - - src/totem-object.c | 3 -- + src/backend/bacon-video-widget-gst-0.10.c | 77 +++++++++++++++++-------------- + src/backend/bacon-video-widget.h | 1 - + src/totem-object.c | 3 -- 3 files changed, 42 insertions(+), 39 deletions(-) commit b63cce8c6e66c9e8259de16cb84ea34402fe6e74 @@ -13001,7 +17459,7 @@ Updated Spanish translation - po/es.po | 645 +++++++++++++++++++++++++++++++------------------------------- + po/es.po | 645 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 322 insertions(+), 323 deletions(-) commit 909657193fafec666170c323cada71c09ed66298 @@ -13010,7 +17468,7 @@ Fix compilation - src/totem-object.c | 2 +- + src/totem-object.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 05eaadb15edb1508a45157b3993b86dd3b73ea10 @@ -13019,7 +17477,7 @@ Really remove the border width - src/totem-object.c | 13 +++---------- + src/totem-object.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) commit 961bb8f4e9f3e953f767b8dd2db8bb6d474bfeef @@ -13032,7 +17490,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=585598 - src/backend/bacon-video-widget-gst-0.10.c | 2 +- + src/backend/bacon-video-widget-gst-0.10.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit be3ef3405d53d03d0b0d422c1bcdb6b2c2fabcff @@ -13043,7 +17501,7 @@ It's a computer, it's automatic already. - data/totem.ui | 4 ++-- + data/totem.ui | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 331f2a7abbe040585d613f0ac13762d1359f70cc @@ -13060,7 +17518,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=614514 - src/totem-object.c | 6 +++--- + src/totem-object.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 61c1a5ada63e3a4c3251354d6bc2e40fb9cbb695 @@ -13073,7 +17531,7 @@ We didn't take the box' border into account it seems. - data/totem.ui | 2 +- + data/totem.ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit f5b4cad2ab5c8a9878e4dcbc846db5c33b0550a4 @@ -13082,7 +17540,7 @@ Update version number for development branch - configure.in | 4 ++-- + configure.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 024de838bd0f099cdc14b5082e23a60490d9159e @@ -13096,12 +17554,12 @@ (such that concurrent operations using a busy cursor don't trample on each others' cursors when they finish). Closes: bgo#559628 - src/plugins/publish/totem-publish.c | 2 +- - src/totem-object.c | 79 ++++++++++++----- - src/totem-playlist.c | 166 +++++++++++++++++++++++++---------- - src/totem-playlist.h | 18 ++-- - src/totem-session.c | 4 +- - src/totem-video-list.c | 2 +- + src/plugins/publish/totem-publish.c | 2 +- + src/totem-object.c | 79 ++++++++++++----- + src/totem-playlist.c | 166 ++++++++++++++++++++++++++---------- + src/totem-playlist.h | 18 ++-- + src/totem-session.c | 4 +- + src/totem-video-list.c | 2 +- 6 files changed, 192 insertions(+), 79 deletions(-) commit 7f08318121734101c280f0c48e22f4075df40c41 @@ -13112,7 +17570,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=615090 - src/plugins/iplayer/iplayer.py | 4 ++-- + src/plugins/iplayer/iplayer.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 3f8ae7afeb7bbdfb03f039e99eb5b259e892936d @@ -13121,8 +17579,8 @@ 2.30.1 - NEWS | 20 ++++++++++++++++++++ - configure.in | 2 +- + NEWS | 20 ++++++++++++++++++++ + configure.in | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) commit e17595407217defbd08c363bb5202889558ccba3 @@ -13140,7 +17598,7 @@ Updated Kannada translations - po/kn.po | 777 +++++++++++++++++++++++++++++++------------------------------- + po/kn.po | 777 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 385 insertions(+), 392 deletions(-) commit f8861bf66c1af308c31ea6d471b1f0f47ec62793 @@ -13157,7 +17615,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=614177 - src/backend/bacon-video-widget-gst-0.10.c | 2 +- + src/backend/bacon-video-widget-gst-0.10.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 540aaa7a104de22128218dd96be2c1078d2a3f8c @@ -13170,8 +17628,8 @@ libgdata we're building against. This will error out of queries if they take longer than 30 seconds. Closes: bgo#615506 - configure.in | 7 +++++++ - src/plugins/youtube/totem-youtube.c | 6 ++++++ + configure.in | 7 +++++++ + src/plugins/youtube/totem-youtube.c | 6 ++++++ 2 files changed, 13 insertions(+) commit 376f92f60f2fa7e695bdd472d0a9b9f298a300d8 @@ -13180,7 +17638,7 @@ Updated Bengali India Translation - po/bn_IN.po | 695 +++++++++++++++++++++++++++-------------------------------- + po/bn_IN.po | 695 ++++++++++++++++++++++++++++-------------------------------- 1 file changed, 320 insertions(+), 375 deletions(-) commit 013d7840fae287aa431699dbcaeb79c644cd6bc0 @@ -13189,7 +17647,7 @@ Fixed invalid multiple objects on RDF properties - totem.doap | 2 ++ + totem.doap | 2 ++ 1 file changed, 2 insertions(+) commit bff0927709eeca0046307185930fb09a60b4f407 @@ -13201,7 +17659,7 @@ So we can depend on the buffering-left time in queue2 being implemented for the bvw_buffering_done() function. - configure.in | 2 +- + configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 052768b8e5f9073f9991b73e8dac154c0da9d726 @@ -13212,7 +17670,7 @@ So we know what's going on. - src/backend/bacon-video-widget-gst-0.10.c | 21 ++++++++++++++++----- + src/backend/bacon-video-widget-gst-0.10.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) commit bd2e1e47f39f13c579114c43c452c03c0977f1e0 @@ -13221,7 +17679,7 @@ Updated Danish translation - po/da.po | 295 ++++++++++++++++++++++++++++++-------------------------------- + po/da.po | 295 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 143 insertions(+), 152 deletions(-) commit f4de4ee5c6992a2430c1888e0964f27809621462 @@ -13237,7 +17695,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=615437 - src/plugins/totem-python-module.c | 16 +++++++++++++--- + src/plugins/totem-python-module.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) commit 24c12eb129fc66f3578f4b1317bc528640e522a1 @@ -13250,7 +17708,7 @@ messages on the bus, or we might crash. Just close the D-Bus connection before showing the error message. - browser-plugin/totem-plugin-viewer.c | 13 +++++++++++-- + browser-plugin/totem-plugin-viewer.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) commit 7687ebf72c3b17c971d6eea5ec898f6bc096d596 @@ -13259,7 +17717,7 @@ Updated Marathi Translations - po/mr.po | 504 ++++++++++++++++++++++++++++---------------------------------- + po/mr.po | 504 +++++++++++++++++++++++++++++---------------------------------- 1 file changed, 231 insertions(+), 273 deletions(-) commit 58b60f0977c28f180c702993e29ed04ba915dc60 @@ -13268,7 +17726,7 @@ Updated Marathi Translations - po/mr.po | 554 +++++++++++++++++++++++++------------------------------------- + po/mr.po | 554 ++++++++++++++++++++++++++------------------------------------- 1 file changed, 227 insertions(+), 327 deletions(-) commit f0119f724c1c72cda08f324154a02fa83ab9fa30 @@ -13283,9 +17741,9 @@ - Fixes includes - Fixes configure.in to work with 0.8 and 0.9 - configure.in | 6 +++- - src/plugins/tracker/totem-tracker-widget.c | 54 ++++++++++++++++------------ - src/plugins/tracker/totem-tracker-widget.h | 2 +- + configure.in | 6 +++- + src/plugins/tracker/totem-tracker-widget.c | 54 ++++++++++++++++++------------ + src/plugins/tracker/totem-tracker-widget.h | 2 +- 3 files changed, 38 insertions(+), 24 deletions(-) commit eea5406f087a9a5f0bdb03155e119fd8e7152f79 @@ -13294,7 +17752,7 @@ Prefer the stream URI when copying the location - browser-plugin/totem-plugin-viewer.c | 4 +++- + browser-plugin/totem-plugin-viewer.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit ce11ce47ead3b058f6c405d9916019ecc5c63b1d @@ -13308,7 +17766,7 @@ But then again, QTSRCDONTUSEBROWSER is only for QtSrc, not SRC itself. - browser-plugin/totemPlugin.cpp | 3 +++ + browser-plugin/totemPlugin.cpp | 3 +++ 1 file changed, 3 insertions(+) commit df292f6c52ed3fcc02d3b09991440f07dbabb10d @@ -13320,7 +17778,7 @@ the VLC-provided plugin always uses its internal way of accessing files, and never uses the browser to load streams. - browser-plugin/totemPlugin.cpp | 4 ++-- + browser-plugin/totemPlugin.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 9e6af35511b3aed2a981d1d62fba666543850072 @@ -13329,12 +17787,12 @@ Implement SetTime in the NarrowSpace plugin - browser-plugin/org_gnome_totem_PluginViewer.xml | 3 +++ - browser-plugin/totem-plugin-viewer.c | 12 ++++++++++++ - browser-plugin/totemGMPControls.cpp | 2 +- - browser-plugin/totemNarrowSpacePlugin.cpp | 14 ++++++++++++-- - browser-plugin/totemPlugin.cpp | 19 +++++++++++++++++++ - browser-plugin/totemPlugin.h | 3 ++- + browser-plugin/org_gnome_totem_PluginViewer.xml | 3 +++ + browser-plugin/totem-plugin-viewer.c | 12 ++++++++++++ + browser-plugin/totemGMPControls.cpp | 2 +- + browser-plugin/totemNarrowSpacePlugin.cpp | 14 ++++++++++++-- + browser-plugin/totemPlugin.cpp | 19 +++++++++++++++++++ + browser-plugin/totemPlugin.h | 3 ++- 6 files changed, 49 insertions(+), 4 deletions(-) commit a5c72233b5e3857175a3781a36308bfe676e9313 @@ -13348,7 +17806,7 @@ Latest version is listed in the download section at: http://www.apple.com/quicktime/download/ - browser-plugin/totemPlugin.h | 2 +- + browser-plugin/totemPlugin.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit c8a680a9d055ae485f62792a3b60dcc3ef37d1f5 @@ -13359,7 +17817,7 @@ Instead of shifting the scale a tiny bit. - browser-plugin/totem-plugin-viewer.c | 10 ++++++++++ + browser-plugin/totem-plugin-viewer.c | 10 ++++++++++ 1 file changed, 10 insertions(+) commit 9c487aff7017df24aa2f8b22e69b9c599725e4f3 @@ -13378,10 +17836,10 @@ Helps with https://bugzilla.gnome.org/show_bug.cgi?id=608301 - browser-plugin/org_gnome_totem_PluginViewer.xml | 5 ++- - browser-plugin/totem-plugin-viewer.c | 39 +++++++++++++++++------ - browser-plugin/totemPlugin.cpp | 39 +++++++++++++++++++++-- - browser-plugin/totemPlugin.h | 3 ++ + browser-plugin/org_gnome_totem_PluginViewer.xml | 5 +++- + browser-plugin/totem-plugin-viewer.c | 39 ++++++++++++++++++------- + browser-plugin/totemPlugin.cpp | 39 +++++++++++++++++++++++-- + browser-plugin/totemPlugin.h | 3 ++ 4 files changed, 72 insertions(+), 14 deletions(-) commit eadad87158e3edcce12cc593e471ff18369b00e0 @@ -13397,7 +17855,7 @@ Instead, when pausing when still prerolling, pause, and only when the preroll has been done, stop the pipeline if pause was requested. - src/backend/bacon-video-widget-gst-0.10.c | 15 ++++++++++++++- + src/backend/bacon-video-widget-gst-0.10.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) commit 5ff367b005b7d946ce45f6d5d47abe6e7b26ab9a @@ -13409,7 +17867,7 @@ It's useful for us to know which element gave us the download buffering stats, instead of guessing ("queue2 or playbin?"). - src/backend/bacon-video-widget-gst-0.10.c | 3 ++- + src/backend/bacon-video-widget-gst-0.10.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit e09459ec8961c8ccb5f2e21bd1b621281517fadb @@ -13421,7 +17879,7 @@ Use gdk_window_ensure_native() on the GDK windows we'll be using to paint videos. - src/backend/bacon-video-widget-gst-0.10.c | 2 ++ + src/backend/bacon-video-widget-gst-0.10.c | 2 ++ 1 file changed, 2 insertions(+) commit 9aecfc7095577e2fc63680e755422ceec3b893ef @@ -13430,7 +17888,7 @@ Add gitignore file for the test files - browser-plugin/tests/.gitignore | 1 + + browser-plugin/tests/.gitignore | 1 + 1 file changed, 1 insertion(+) commit f18812985719409d504f786948d9a8bfebe9dde5 @@ -13453,7 +17911,7 @@ http://www.esnips.com/doc/7e4bc5e8-0778-40c0-9d55-ea2f2c198fec/Sample - browser-plugin/tests/Sample.qtif | Bin 0 -> 18663 bytes + browser-plugin/tests/Sample.qtif | Bin 0 -> 18663 bytes 1 file changed, 0 insertions(+), 0 deletions(-) commit 2082669fb983e9a0ae79b99ef585691c25ee54af @@ -13470,7 +17928,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=612579 - src/totem-interface.c | 35 ----------------------------------- + src/totem-interface.c | 35 ----------------------------------- 1 file changed, 35 deletions(-) commit 4150fa8888acb322323ffc1a65c224c2080a78a8 @@ -13479,7 +17937,7 @@ Fix link to codecs web page - src/totem-object.c | 2 +- + src/totem-object.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 4f6595a6f421c256c54210187ce5f0aa597072e5 @@ -13494,7 +17952,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=607556 - src/backend/bacon-video-widget-gst-0.10.c | 9 ++++++++- + src/backend/bacon-video-widget-gst-0.10.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) commit 9a03e8eccbf64b89d63bc03aad0f8ccb56d6b28f @@ -13508,7 +17966,7 @@ only take the session position into account, in preference to the one saved on disk. - src/totem-object.c | 7 +++---- + src/totem-object.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) commit c2ca1cb46e8f72c5bd483ff013d034f9874d6a02 @@ -13524,7 +17982,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=582306 - src/totem-uri.c | 44 ++++++++++++++++++++++++++++++++++++++------ + src/totem-uri.c | 44 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 6 deletions(-) commit fb551004b25cdbd2da530c14d89645b8d5c9c3ac @@ -13536,7 +17994,7 @@ Improve error reporting in the case of network errors in the BBC iPlayer plugin. Helps: bgo#613636 - src/plugins/iplayer/iplayer.py | 14 +++++++++----- + src/plugins/iplayer/iplayer.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) commit bde645c86b798f06c16f1b3547f9e0fbc8541165 @@ -13549,7 +18007,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=614125 - src/totem-object.c | 5 +++-- + src/totem-object.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit 4cdd69285b2f9fffe834b65d19876b5dc7841ef8 @@ -13562,7 +18020,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=579235 - src/backend/bacon-video-widget-gst-0.10.c | 3 ++- + src/backend/bacon-video-widget-gst-0.10.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit a699f3ec1e7eb4e317f89c4772a417e45de8f025 @@ -13575,7 +18033,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=613704 - configure.in | 6 ++---- + configure.in | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) commit 2641b76918ddac0e5bf0decf6cb0ec4a8e0d4945 @@ -13588,7 +18046,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=613958 - src/backend/bacon-resize.c | 4 ++-- + src/backend/bacon-resize.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 8f146bf0db349f12b9528df415fa1e5c8329cb53 @@ -13603,7 +18061,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=614127 - src/totem-object.c | 3 ++- + src/totem-object.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 5ecafddf9438a1189c966932009fab64f84dfeb1 @@ -13616,8 +18074,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=614976 - configure.in | 30 +---------- - src/totem-menu.c | 154 +----------------------------------------------------- + configure.in | 30 +---------- + src/totem-menu.c | 154 +------------------------------------------------------ 2 files changed, 3 insertions(+), 181 deletions(-) commit 70a7ee8a63514426263de88f9ccc71f850816afd @@ -13630,7 +18088,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=523141 - src/plugins/tracker/totem-tracker-widget.c | 2 +- + src/plugins/tracker/totem-tracker-widget.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 8814f0c880fb88f0a2476335a67b2dd1a741e0ba @@ -13643,7 +18101,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=614095 - src/backend/bacon-video-widget-gst-0.10.c | 10 ---------- + src/backend/bacon-video-widget-gst-0.10.c | 10 ---------- 1 file changed, 10 deletions(-) commit 2cb0d18763f63871666654ca1b46b864ea9c5db1 @@ -13654,7 +18112,7 @@ As playbin2 doesn't have the property in question any more. - data/totem.schemas.in | 12 ------------ + data/totem.schemas.in | 12 ------------ 1 file changed, 12 deletions(-) commit 93f289d3532912b5976cfb1260fed713cc52a495 @@ -13666,7 +18124,7 @@ Update the regex used to grab the t-param from YouTube pages. Why do Google always update YouTube just after a GNOME release? Closes: bgo#614679 - src/plugins/youtube/totem-youtube.c | 4 +++- + src/plugins/youtube/totem-youtube.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit bc3d21468318116f1d14faecea9b1f00967ac4e0 @@ -13683,7 +18141,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=613935 - src/backend/bacon-video-widget-gst-0.10.c | 37 +++++++++++++++++++++++------ + src/backend/bacon-video-widget-gst-0.10.c | 37 +++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 7 deletions(-) commit f3014142c45338389386008a81992edfcf11669e @@ -13692,8 +18150,8 @@ 2.30.0 - NEWS | 3 +++ - configure.in | 4 ++-- + NEWS | 3 +++ + configure.in | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) commit fd223c5ea50c73ac92a24e30cc3091450be46987 @@ -13702,7 +18160,7 @@ Add audio/x-aiff as a supported audio type - data/mime-type-list.txt | 1 + + data/mime-type-list.txt | 1 + 1 file changed, 1 insertion(+) commit ddef47bd2d137234ac79b9bcc736918214a9268f @@ -13711,8 +18169,8 @@ 2.29.92 - NEWS | 3 +++ - configure.in | 2 +- + NEWS | 3 +++ + configure.in | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) commit 9dfafa896eb3d584466f2d621678e39074b29b77 @@ -13730,7 +18188,7 @@ Updated Danish translation - help/da/da.po | 805 +++++++++++++++++++++++++++++---------------------------- + help/da/da.po | 805 ++++++++++++++++++++++++++++++---------------------------- 1 file changed, 415 insertions(+), 390 deletions(-) commit 4adaa9c8c566fc0edea71ceec5752bd6d0231ad8 @@ -13739,7 +18197,7 @@ Updated Greek translation for totem - po/el.po | 2 +- + po/el.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 8da6f5b4d8cf53ac6438dfb2c7b2cc7dcfbe0cf3 @@ -13748,7 +18206,7 @@ Updated Danish translation - po/da.po | 633 +++++++++++++++++++++++++++++++------------------------------- + po/da.po | 633 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 317 insertions(+), 316 deletions(-) commit f5683d5079df7420adf0011d48d36c6e10dcf56d @@ -13757,7 +18215,7 @@ Updated Bengali translation - po/bn.po | 500 +++++++++++++++++++++++++++++++------------------------------- + po/bn.po | 500 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 253 insertions(+), 247 deletions(-) commit 224d4a045cf87b4921191133160b8ad740462ccc @@ -13766,7 +18224,7 @@ Updated Ukrainian translation - po/uk.po | 275 +++++++++++++++++++++++--------------------------------------- + po/uk.po | 275 +++++++++++++++++++++++---------------------------------------- 1 file changed, 102 insertions(+), 173 deletions(-) commit 6937cb6524af60821300d4b12a45dd28d135f577 @@ -13775,7 +18233,7 @@ Updated Basque language - po/eu.po | 28 ++++++++++++++-------------- + po/eu.po | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) commit ff22093f8a255a313171fb628049988b6a819245 @@ -13784,8 +18242,8 @@ Updated Serbian translations - po/sr.po | 632 +++++++++++++++++++++++++++++--------------------------- - po/sr@latin.po | 632 +++++++++++++++++++++++++++++--------------------------- + po/sr.po | 632 ++++++++++++++++++++++++++++++--------------------------- + po/sr@latin.po | 632 ++++++++++++++++++++++++++++++--------------------------- 2 files changed, 660 insertions(+), 604 deletions(-) commit f6bdc2f5473e652f91cf5b455f8425cb7a5aa67d @@ -13803,7 +18261,7 @@ Updated Gujarati translations - po/gu.po | 4 ++-- + po/gu.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 228b3e0b397bd0578832f006a441daa2c0597b11 @@ -13812,7 +18270,7 @@ Updated Gujarati Translations - po/gu.po | 251 ++++++++++++++++++++++++++++++-------------------------------- + po/gu.po | 251 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 122 insertions(+), 129 deletions(-) commit 93bc06d51e28f06d9eafd96ef2aea5f7e2d73c74 @@ -13823,7 +18281,7 @@ Fix the API URI for the opensubtitles.org plugin. Closes: bgo#613214 - src/plugins/opensubtitles/opensubtitles.py | 2 +- + src/plugins/opensubtitles/opensubtitles.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit bd27c8110b186b2043f40371378bf56149817b00 @@ -13832,7 +18290,7 @@ Update Russian translation from Юрий Козлов - po/ru.po | 246 ++++++++++++++++++++++---------------------------------------- + po/ru.po | 246 +++++++++++++++++++++++---------------------------------------- 1 file changed, 88 insertions(+), 158 deletions(-) commit 1aa35e4a0db34fb845cd555e118c1a50bdf41a56 @@ -13841,7 +18299,7 @@ Updated Catalan translation - po/ca.po | 692 +++++++++++++++++++++++++++++++------------------------------- + po/ca.po | 692 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 346 insertions(+), 346 deletions(-) commit 8def24a33b51b430f3de8754a898e62a359222c6 @@ -13850,7 +18308,7 @@ Updated Greek translation for totem - po/el.po | 779 ++++++++++++++++++++++++++++++++++++-------------------------- + po/el.po | 779 ++++++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 451 insertions(+), 328 deletions(-) commit 0f5ec3bc4f70215ff7a9e964a36f43b5d42f12ff @@ -13859,7 +18317,7 @@ Updated Polish translation - po/pl.po | 28 ++++++++++++++-------------- + po/pl.po | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) commit 682d530de3ea55ba11493948668f5f09a0467c72 @@ -13868,7 +18326,7 @@ Updated Crimean Tatar (Crimean Turkish) translation - po/crh.po | 572 +++++++++++++++++++++++++++++++------------------------------ + po/crh.po | 572 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 289 insertions(+), 283 deletions(-) commit 174563b57e1168c5f2fe902a15b368d7bb4809a4 @@ -13877,7 +18335,7 @@ Updated Italian translation - po/it.po | 530 ++++++++++++++++++++++++++++---------------------------------- + po/it.po | 530 +++++++++++++++++++++++++++++---------------------------------- 1 file changed, 240 insertions(+), 290 deletions(-) commit 249a95b738788c7b5356a83e61e45ade0972579e @@ -13886,7 +18344,7 @@ updating for Punjabi by A S Alam - po/pa.po | 697 ++++++++++++++++++++++++++++++++------------------------------ + po/pa.po | 697 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 356 insertions(+), 341 deletions(-) commit 703e473c730d34e7fedd8c2c6ccfd4025cc7899d @@ -13895,7 +18353,7 @@ Updated Norwegian Nynorsk translation - po/nn.po | 449 ++++++++++++++++++++++++++++---------------------------------- + po/nn.po | 449 +++++++++++++++++++++++++++++---------------------------------- 1 file changed, 205 insertions(+), 244 deletions(-) commit 8c5af140549529c865df2724ed0e03bf31e91467 @@ -13904,7 +18362,7 @@ Updated Korean translation - po/ko.po | 4 ++-- + po/ko.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 2806cf0d026634c859700c4e75deefa40c18193a @@ -13913,7 +18371,7 @@ Updated Korean translation - po/ko.po | 679 ++++++++++++++++++++++++++++++++------------------------------ + po/ko.po | 679 +++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 353 insertions(+), 326 deletions(-) commit f12d33a19c7eefefdea75123925de99d95387954 @@ -13922,7 +18380,7 @@ Updated Portuguese translation - po/pt.po | 659 +++++++++++++++++++++++++++++++------------------------------- + po/pt.po | 659 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 330 insertions(+), 329 deletions(-) commit fb9744cbf6c6165607288f9af11d8c10773c00e0 @@ -13931,7 +18389,7 @@ Updated Latvian translation. - po/lv.po | 4 ++-- + po/lv.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit d7055b3598c951bdaab9f3710b883b10542a0ab0 @@ -13940,7 +18398,7 @@ Updated Latvian translation. - po/lv.po | 755 +++++++++++++++++++++++++++++--------------------------------- + po/lv.po | 755 +++++++++++++++++++++++++++++---------------------------------- 1 file changed, 350 insertions(+), 405 deletions(-) commit 917afea27f08200cad33411704a37fdd09a78a04 @@ -13959,7 +18417,7 @@ Updated Hungarian translation - po/hu.po | 566 ++++++++++++++++++++++++++++---------------------------------- + po/hu.po | 566 +++++++++++++++++++++++++++++---------------------------------- 1 file changed, 256 insertions(+), 310 deletions(-) commit b6065490a4bfc5f011281d4ad2f0c2ac553f9601 @@ -13968,7 +18426,7 @@ Updated Lithuanian translation. - po/lt.po | 617 +++++++++++++++++++++++++++++++------------------------------- + po/lt.po | 617 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 313 insertions(+), 304 deletions(-) commit f9cc47c463d0b86fdf9083f65f0f828eccc681ad @@ -13977,7 +18435,7 @@ Update Czech translation - po/cs.po | 242 ++++++++++++++++++++++++++++++-------------------------------- + po/cs.po | 242 ++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 117 insertions(+), 125 deletions(-) commit 66ea75d81e60e3045be90365cb9403d34c398907 @@ -13986,7 +18444,7 @@ Updated Finnish translation. - po/fi.po | 626 ++++++++++++++++++++++++++++++++------------------------------ + po/fi.po | 626 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 319 insertions(+), 307 deletions(-) commit 3b0e6fe4ebe014e413cbdb5be49334bf0c9df35e @@ -14004,7 +18462,7 @@ Improve the comment in the last commit to mention where we set the bus to flush=false again - src/backend/bacon-video-widget-gst-0.10.c | 4 +++- + src/backend/bacon-video-widget-gst-0.10.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit fda6b27a40f4e130b48cd2c7ab8f9bed7b8009f3 @@ -14018,7 +18476,7 @@ missing plugin message could still appear although the codec installer was started and playbin2 was stopped already. - src/backend/bacon-video-widget-gst-0.10.c | 9 ++++++--- + src/backend/bacon-video-widget-gst-0.10.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) commit 9b4946edec013bfdc0ce2ad281b1296cdc3ecb20 @@ -14036,7 +18494,7 @@ Updated Greek translation - po/el.po | 683 +++++++++++++++++++++++++++++++++----------------------------- + po/el.po | 683 ++++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 367 insertions(+), 316 deletions(-) commit 6f64e37b5ae01131e67911e76639d5c2ba727793 @@ -14045,7 +18503,7 @@ Updated British English translation - po/en_GB.po | 649 ++++++++++++++++++++++++++++++----------------------------- + po/en_GB.po | 649 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 330 insertions(+), 319 deletions(-) commit a1cc9dc7fca9d30ed94452008b853347e2198958 @@ -14056,9 +18514,9 @@ Require vala support for distcheck to work - Makefile.am | 2 +- - NEWS | 7 +++++++ - configure.in | 2 +- + Makefile.am | 2 +- + NEWS | 7 +++++++ + configure.in | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) commit 773ec65291c8b099ae25fb27aac707f503bda01c @@ -14067,7 +18525,7 @@ Enable debugging by default when using autogen.sh - autogen.sh | 2 +- + autogen.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 18b6a2a8a82cdc218d38b6ea174da4e7bc485473 @@ -14078,7 +18536,7 @@ The menu GtkBuilder bits were used before they were assigned. - browser-plugin/totem-plugin-viewer.c | 7 ++++--- + browser-plugin/totem-plugin-viewer.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) commit 0ffc54f90c73a99072db193230acb8409ee79752 @@ -14087,7 +18545,7 @@ Fix gdb hooks to use gnome-terminal - browser-plugin/totem-plugin-viewer.c | 13 +++++-------- + browser-plugin/totem-plugin-viewer.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) commit d068e771391d22ee24f217a017f60227c9ad96c7 @@ -14096,7 +18554,7 @@ Update Russian translation by Alexander Saprykin - po/ru.po | 593 +++++++++++++++++++++++++++++++++----------------------------- + po/ru.po | 593 +++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 313 insertions(+), 280 deletions(-) commit 828c36bbd3f8d268c4052970459247d3c49e72fa @@ -14105,7 +18563,7 @@ Bump GStreamer and gst-plugins-base requirements to released versions - configure.in | 4 ++-- + configure.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 2d9717e7644e956e26d1f5d74da8e28f96452da6 @@ -14114,7 +18572,7 @@ Don't spam debug log with stream-status messages - src/backend/bacon-video-widget-gst-0.10.c | 5 +++++ + src/backend/bacon-video-widget-gst-0.10.c | 5 +++++ 1 file changed, 5 insertions(+) commit 7406932a9defc5404435ac6186fdecd1f694d139 @@ -14123,7 +18581,7 @@ updated Tamil translation - po/ta.po | 112 ++++++++++++++++++++++++++++++++------------------------------ + po/ta.po | 112 +++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 58 insertions(+), 54 deletions(-) commit 5a4e330215804330f7096f901f2c4e52e99881ff @@ -14132,7 +18590,7 @@ Updated French translation - po/fr.po | 559 ++++++++++++++++++++++++++++---------------------------------- + po/fr.po | 559 ++++++++++++++++++++++++++++----------------------------------- 1 file changed, 252 insertions(+), 307 deletions(-) commit c9db96161cc7cabc72361767bfdacc93752926e6 @@ -14141,8 +18599,8 @@ Add translator comments for strings containing placeholders - src/plugins/screenshot/totem-screenshot.c | 1 + - src/totem-object.c | 1 + + src/plugins/screenshot/totem-screenshot.c | 1 + + src/totem-object.c | 1 + 2 files changed, 2 insertions(+) commit b8f37bca74f8e74ec00d16aa1dcef65f1a835c1c @@ -14151,7 +18609,7 @@ Updated French doc translation - help/fr/fr.po | 51 +++++++++++++++++++++++++++------------------------ + help/fr/fr.po | 51 +++++++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 24 deletions(-) commit a4d0c265350ad3125a70b097bae5513c6f0e2352 @@ -14163,10 +18621,10 @@ Fix some gtk-doc warnings (missing functions, unused functions) and fix the IDs in the documentation XML. - docs/reference/totem-sections.txt | 8 +++++++- - src/backend/bacon-video-widget-gst-0.10.c | 2 +- - src/totem-private.h | 2 +- - src/totem.h | 4 ++-- + docs/reference/totem-sections.txt | 8 +++++++- + src/backend/bacon-video-widget-gst-0.10.c | 2 +- + src/totem-private.h | 2 +- + src/totem.h | 4 ++-- 4 files changed, 11 insertions(+), 5 deletions(-) commit 10f2485d2fcef546b90e3352091e21e6dbd18f20 @@ -14180,20 +18638,20 @@ * potentially passing 0 to g_source_remove() due to a bad comparison * passing by value, not reference, to g_object_get() - browser-plugin/totem-glow-button.c | 6 ++---- - browser-plugin/totem-glow-button.h | 2 +- - browser-plugin/totem-plugin-viewer.c | 14 +++++++------- - src/backend/Makefile.am | 1 - - src/backend/bacon-video-widget-gst-0.10.c | 10 +++++----- - src/backend/bacon-video-widget.h | 2 +- - src/plugins/Makefile.am | 1 - - src/plugins/screenshot/Makefile.am | 3 +-- - src/plugins/skipto/Makefile.am | 3 +-- - src/totem-cell-renderer-video.c | 2 +- - src/totem-statusbar.c | 1 - - src/totem-statusbar.h | 2 +- - src/totem-time-label.c | 1 - - src/totem-time-label.h | 12 ++++++------ + browser-plugin/totem-glow-button.c | 6 ++---- + browser-plugin/totem-glow-button.h | 2 +- + browser-plugin/totem-plugin-viewer.c | 14 +++++++------- + src/backend/Makefile.am | 1 - + src/backend/bacon-video-widget-gst-0.10.c | 10 +++++----- + src/backend/bacon-video-widget.h | 2 +- + src/plugins/Makefile.am | 1 - + src/plugins/screenshot/Makefile.am | 3 +-- + src/plugins/skipto/Makefile.am | 3 +-- + src/totem-cell-renderer-video.c | 2 +- + src/totem-statusbar.c | 1 - + src/totem-statusbar.h | 2 +- + src/totem-time-label.c | 1 - + src/totem-time-label.h | 12 ++++++------ 14 files changed, 26 insertions(+), 34 deletions(-) commit e7d13ff52e591c030f0e4413e105e6ae79fcccaa @@ -14207,7 +18665,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=579874 - src/backend/bacon-video-widget-gst-0.10.c | 5 +++-- + src/backend/bacon-video-widget-gst-0.10.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit 4311a9ab3226609ea134e5de11b8f3ff1b4efd9e @@ -14216,7 +18674,7 @@ updated Tamil translation - po/ta.po | 500 +++++++++++++++++++++++++++++++------------------------------- + po/ta.po | 500 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 252 insertions(+), 248 deletions(-) commit e4762c0c9abc90457acd5b55061035d7962781e8 @@ -14225,7 +18683,7 @@ Updated Brazilian Portuguese translation - po/pt_BR.po | 806 ++++++++++++++++++++++------------------------------------- + po/pt_BR.po | 806 ++++++++++++++++++++++-------------------------------------- 1 file changed, 292 insertions(+), 514 deletions(-) commit 38c342fd4669042a7bfb784f06fa14ecf01c8fac @@ -14234,7 +18692,7 @@ Updated Basque language - po/eu.po | 81 ++++++++++++++++++++++++++++++++++++++------------------------ + po/eu.po | 81 +++++++++++++++++++++++++++++++++++++++------------------------- 1 file changed, 50 insertions(+), 31 deletions(-) commit 4196f348b9e7946bd9c568d679c47085d2b87809 @@ -14243,8 +18701,8 @@ Updated Traditional Chinese translation(Hong Kong and Taiwan) - po/zh_HK.po | 684 ++++++++++++++++++++++------------------------------------- - po/zh_TW.po | 684 ++++++++++++++++++++++------------------------------------- + po/zh_HK.po | 684 +++++++++++++++++++++++------------------------------------- + po/zh_TW.po | 684 +++++++++++++++++++++++------------------------------------- 2 files changed, 516 insertions(+), 852 deletions(-) commit ad3d9bde3a6e1db6a6a33fccb9ed90869f6ffe09 @@ -14253,7 +18711,7 @@ Updated Galician Translation - po/gl.po | 882 +++++++++++++++++++++++++++++++------------------------------- + po/gl.po | 882 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 445 insertions(+), 437 deletions(-) commit 3b6ae8054f5bd46cd9e3974931200309a602e684 @@ -14267,7 +18725,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=609844 - bindings/vala/totem.vapi | 58 +++++++++++++++++++++++++++++++++++++++++++--- + bindings/vala/totem.vapi | 58 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 55 insertions(+), 3 deletions(-) commit c8a4b9e08566ed875b8658bbc974a3db7359672d @@ -14281,8 +18739,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=609948 - browser-plugin/Makefile.am | 2 +- - src/backend/Makefile.am | 3 ++- + browser-plugin/Makefile.am | 2 +- + src/backend/Makefile.am | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) commit e6b0a67f88ecccd13edf349379f30ac36812e04c @@ -14295,7 +18753,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=609763 - src/eggfileformatchooser.c | 10 ++++++++-- + src/eggfileformatchooser.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) commit 3e0e29ce08eafbabed82664f5639051a5f7cffd1 @@ -14304,7 +18762,7 @@ Update Romanian translation - po/ro.po | 848 +++++++++++++++++++++++++++++++++++--------------------------- + po/ro.po | 848 ++++++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 479 insertions(+), 369 deletions(-) commit eb74e996cbddfa6758b2bb392fbbaf7310adf3b6 @@ -14318,28 +18776,28 @@ http://bugzilla.gnome.org/show_bug.cgi?id=594053 - browser-plugin/totem-glow-button.c | 90 ++++++++++++-------- - browser-plugin/totem-plugin-viewer.c | 28 +++--- - configure.in | 2 +- - src/backend/bacon-resize.c | 2 +- - src/backend/bacon-video-widget-gst-0.10.c | 80 +++++++++-------- - .../bacon-video-widget-gst-missing-plugins.c | 4 +- - .../brasero-disc-recorder/totem-disc-recorder.c | 2 +- - src/plugins/screenshot/gnome-screenshot-widget.c | 10 ++- - src/plugins/skipto/totem-skipto.c | 2 +- - src/plugins/totem-plugin-manager.c | 4 +- - src/plugins/totem-plugins-engine.c | 2 +- - src/totem-cell-renderer-video.c | 69 ++++++++++----- - src/totem-fullscreen.c | 8 +- - src/totem-interface.c | 4 +- - src/totem-menu.c | 6 +- - src/totem-object.c | 54 +++++++----- - src/totem-open-location.c | 4 +- - src/totem-playlist.c | 6 +- - src/totem-preferences.c | 9 +- - src/totem-sidebar.c | 15 ++-- - src/totem-statusbar.c | 19 +++-- - src/totem.c | 4 +- + browser-plugin/totem-glow-button.c | 90 +++++++++++++--------- + browser-plugin/totem-plugin-viewer.c | 28 +++---- + configure.in | 2 +- + src/backend/bacon-resize.c | 2 +- + src/backend/bacon-video-widget-gst-0.10.c | 80 ++++++++++--------- + .../bacon-video-widget-gst-missing-plugins.c | 4 +- + .../brasero-disc-recorder/totem-disc-recorder.c | 2 +- + src/plugins/screenshot/gnome-screenshot-widget.c | 10 ++- + src/plugins/skipto/totem-skipto.c | 2 +- + src/plugins/totem-plugin-manager.c | 4 +- + src/plugins/totem-plugins-engine.c | 2 +- + src/totem-cell-renderer-video.c | 69 +++++++++++------ + src/totem-fullscreen.c | 8 +- + src/totem-interface.c | 4 +- + src/totem-menu.c | 6 +- + src/totem-object.c | 54 +++++++------ + src/totem-open-location.c | 4 +- + src/totem-playlist.c | 6 +- + src/totem-preferences.c | 9 ++- + src/totem-sidebar.c | 15 ++-- + src/totem-statusbar.c | 19 +++-- + src/totem.c | 4 +- 22 files changed, 254 insertions(+), 170 deletions(-) commit 92f531972318300b40d988ca0a6780d49bad4989 @@ -14350,7 +18808,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=609768 - src/backend/bacon-video-widget-gst-0.10.c | 8 +++++++- + src/backend/bacon-video-widget-gst-0.10.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) commit 595a6b2e9c7a549d9b7aae46e5944383ea4ebf49 @@ -14362,7 +18820,7 @@ Fix the Tracker include file in the Tracker widget header. Spotted by Alex Hole . Closes: bgo#608794 - src/plugins/tracker/totem-tracker-widget.h | 2 +- + src/plugins/tracker/totem-tracker-widget.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit fcd056645e198ebc61b89d900d9b63df3fb3573a @@ -14371,7 +18829,7 @@ Updated Greek documentation translation - help/el/el.po | 28 +++++++++++++++++----------- + help/el/el.po | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) commit 1ddf863a4ea815e6186b85f8500ecdda4ea13f28 @@ -14380,7 +18838,7 @@ Updated Thai translation. - po/th.po | 615 +++++++++++++++++++++++++++++++------------------------------- + po/th.po | 615 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 308 insertions(+), 307 deletions(-) commit 6b6c80318c508c0f156404f7f004effc033ba5ec @@ -14389,7 +18847,7 @@ Updating Estonian translation - po/et.po | 40 ++++++++++++++++++++-------------------- + po/et.po | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) commit 8594966fde7c2cd67ea91c3fa55f518d29db93d0 @@ -14398,7 +18856,7 @@ Updated Slovenian translation - po/sl.po | 297 +++++++++++++++++++++++++++++--------------------------------- + po/sl.po | 297 ++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 139 insertions(+), 158 deletions(-) commit 59df2f887c22390004205e040b8a80162eaddee9 @@ -14407,8 +18865,8 @@ 2.29.4 - NEWS | 3 +++ - configure.in | 3 ++- + NEWS | 3 +++ + configure.in | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) commit e1e90a74361924e3e1a053c0690321040777e334 @@ -14417,10 +18875,10 @@ Remove Bulgarian docs special casing - configure.in | 1 - - help/Makefile.am | 3 +-- - help/bg/Makefile.am | 13 ------------- - help/bg/totem.xml | 7 ++++++- + configure.in | 1 - + help/Makefile.am | 3 +-- + help/bg/Makefile.am | 13 ------------- + help/bg/totem.xml | 7 ++++++- 4 files changed, 7 insertions(+), 17 deletions(-) commit f533b36f128d18e3a049fb22fcda06d8fcfcc2d6 @@ -14429,8 +18887,8 @@ 2.29.3 - NEWS | 25 +++++++++++++++++++++++++ - configure.in | 2 +- + NEWS | 25 +++++++++++++++++++++++++ + configure.in | 2 +- 2 files changed, 26 insertions(+), 1 deletion(-) commit e907b64b74ed031524b59da7744e0096259404cf @@ -14439,7 +18897,7 @@ Updated Bulgarian translation - po/bg.po | 575 ++++++++++++++++++++++++++++---------------------------------- + po/bg.po | 575 ++++++++++++++++++++++++++++----------------------------------- 1 file changed, 256 insertions(+), 319 deletions(-) commit 666b1da2aeea1151fb529e513d8ed1ffe25f1da4 @@ -14448,7 +18906,7 @@ Updated Bengali translation - po/bn.po | 583 +++++++++++++++++++++++++++++++++++++++----------------------- + po/bn.po | 583 +++++++++++++++++++++++++++++++++++++++------------------------ 1 file changed, 364 insertions(+), 219 deletions(-) commit b25fd88cd2be2b3643f8aca4a5f83733d40c636c @@ -14461,7 +18919,7 @@ Fixes bug #607224. - src/backend/bacon-video-widget-gst-0.10.c | 10 ++++++++++ + src/backend/bacon-video-widget-gst-0.10.c | 10 ++++++++++ 1 file changed, 10 insertions(+) commit a75edccd76990d664b962122ebcf2448b8e940e8 @@ -14470,7 +18928,7 @@ Updated Arabic translation - po/ar.po | 391 ++++++++++++++++++++++++++++++-------------------------------- + po/ar.po | 391 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 191 insertions(+), 200 deletions(-) commit 6f95bf8d38e9bc4998b19b817487b7f1a549aeaa @@ -14479,7 +18937,7 @@ Updated Norwegian bokmål translation - po/nb.po | 335 ++++++++++++++++++++++++++------------------------------------ + po/nb.po | 335 ++++++++++++++++++++++++++------------------------------------- 1 file changed, 139 insertions(+), 196 deletions(-) commit e7b1013b705f37c9645c248b028b2888ac7bd5da @@ -14497,8 +18955,8 @@ Add better debug - browser-plugin/totem-plugin-viewer.c | 21 +++++++++++++++++---- - browser-plugin/totemPlugin.cpp | 11 ++++++++++- + browser-plugin/totem-plugin-viewer.c | 21 +++++++++++++++++---- + browser-plugin/totemPlugin.cpp | 11 ++++++++++- 2 files changed, 27 insertions(+), 5 deletions(-) commit 1f01e518a3348338b9e381814c455884376fdc38 @@ -14507,9 +18965,9 @@ Implement Narrowspace's SetURL function - browser-plugin/totemNarrowSpacePlugin.cpp | 9 ++++++++- - browser-plugin/totemPlugin.cpp | 24 ++++++++++++++++++++++++ - browser-plugin/totemPlugin.h | 1 + + browser-plugin/totemNarrowSpacePlugin.cpp | 9 ++++++++- + browser-plugin/totemPlugin.cpp | 24 ++++++++++++++++++++++++ + browser-plugin/totemPlugin.h | 1 + 3 files changed, 33 insertions(+), 1 deletion(-) commit d18f2b03d9ccbac47172f364c073d7e176a06184 @@ -14518,7 +18976,7 @@ Implement more player states for Narrowspace - browser-plugin/totemPlugin.cpp | 21 +++++++++++++++++++++ + browser-plugin/totemPlugin.cpp | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) commit ff5bb8d1392a2fa4e8af18d1e97e65a3e5da937a @@ -14530,7 +18988,7 @@ All the functions after GetTimeScale were broken. It's wonder it ever worked. - browser-plugin/totemNarrowSpacePlugin.cpp | 2 +- + browser-plugin/totemNarrowSpacePlugin.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit e3062f7c98f2ecf951b84779ba7c8031a4688783 @@ -14541,7 +18999,7 @@ For consistency - browser-plugin/totemGMPSettings.cpp | 2 +- + browser-plugin/totemGMPSettings.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit e956258bc4d5e25240fc6c49ae2e5af37a882b84 @@ -14552,7 +19010,7 @@ As all the errors are handled asynchrounsly. - browser-plugin/totem-plugin-viewer.c | 38 ++++++---------------------------- + browser-plugin/totem-plugin-viewer.c | 38 ++++++------------------------------ 1 file changed, 6 insertions(+), 32 deletions(-) commit d0371fbda9523988bb7720538ffcfb9254e9a339 @@ -14566,7 +19024,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=607225 - src/backend/bacon-video-widget-gst-0.10.c | 5 +++-- + src/backend/bacon-video-widget-gst-0.10.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit 2b67674da8ed6ea91f377f071426ed3358481f3b @@ -14575,7 +19033,7 @@ Updating Estonian translation - po/et.po | 60 +++++------------------------------------------------------- + po/et.po | 60 +++++------------------------------------------------------- 1 file changed, 5 insertions(+), 55 deletions(-) commit 39e436739a71a473f60eb25f3a23f4b0ad7d9eeb @@ -14584,7 +19042,7 @@ Updated German doc translation - help/de/de.po | 57 ++++++++++++++++++++++++++++++++------------------------- + help/de/de.po | 57 ++++++++++++++++++++++++++++++++------------------------- 1 file changed, 32 insertions(+), 25 deletions(-) commit 3b04ce36bb7155ae0e68a69953dec661647f58d3 @@ -14593,7 +19051,7 @@ Fix state of the button popup when popup is dismissed - browser-plugin/totem-plugin-viewer.c | 14 ++++++++++++++ + browser-plugin/totem-plugin-viewer.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) commit 0780e46091b21750afa4ce3b9631d28e054e640a @@ -14602,7 +19060,7 @@ Updated Basque language - po/eu.po | 599 +++++++++++++++++++++++++++----------------------------------- + po/eu.po | 599 ++++++++++++++++++++++++++++----------------------------------- 1 file changed, 263 insertions(+), 336 deletions(-) commit 042ff3195f8acdca0c45830fea125fb16debdb6c @@ -14611,7 +19069,7 @@ Updated Basque language - po/eu.po | 216 +++++++++++++++++++++++++++++++------------------------------- + po/eu.po | 216 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 108 insertions(+), 108 deletions(-) commit 9021e1e8626d3ab785567959ecde35874c0ce016 @@ -14620,7 +19078,7 @@ Updated German translation - po/de.po | 728 ++++++++++++++++++++++++++++++++------------------------------ + po/de.po | 728 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 374 insertions(+), 354 deletions(-) commit e48396356cdd599b402690ac035f10eabee9d2d3 @@ -14638,7 +19096,7 @@ Updated Swedish translation - po/sv.po | 428 ++++++++++++++++++++++++++++++-------------------------------- + po/sv.po | 428 ++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 204 insertions(+), 224 deletions(-) commit 7e823b3aee592623c19e450ff12b02d3778ce0ac @@ -14661,8 +19119,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=605312 - configure.in | 2 +- - src/totem-playlist.c | 55 ++++++++++++++++++++++++++++++++++++++------------ + configure.in | 2 +- + src/totem-playlist.c | 55 +++++++++++++++++++++++++++++++++++++++------------- 2 files changed, 43 insertions(+), 14 deletions(-) commit 17b14004206910e8bee8e4226905160bc0e9d7a0 @@ -14675,7 +19133,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=597448 - src/backend/bacon-video-widget-gst-0.10.c | 8 ++++++-- + src/backend/bacon-video-widget-gst-0.10.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) commit bc39c6554c53cb141396b8c4d7be3afaac46df3b @@ -14688,26 +19146,26 @@ log handler for that domain for debug messages. Messages are suppressed unless the --debug command line option is passed. Closes: bgo#606036 - src/Makefile.am | 35 +++++++++++++++---------- - src/plugins/Makefile.am | 1 + - src/plugins/bemused/Makefile.am | 1 + - src/plugins/brasero-disc-recorder/Makefile.am | 1 + - src/plugins/galago/Makefile.am | 1 + - src/plugins/gromit/Makefile.am | 1 + - src/plugins/lirc/Makefile.am | 1 + - src/plugins/media-player-keys/Makefile.am | 1 + - src/plugins/mythtv/Makefile.am | 1 + - src/plugins/ontop/Makefile.am | 1 + - src/plugins/properties/Makefile.am | 1 + - src/plugins/publish/Makefile.am | 1 + - src/plugins/screensaver/Makefile.am | 1 + - src/plugins/screenshot/Makefile.am | 1 + - src/plugins/sidebar-test/Makefile.am | 1 + - src/plugins/skipto/Makefile.am | 1 + - src/plugins/thumbnail/Makefile.am | 1 + - src/plugins/tracker/Makefile.am | 1 + - src/plugins/youtube/Makefile.am | 1 + - src/totem.c | 21 +++++++++++++++ + src/Makefile.am | 35 ++++++++++++++++----------- + src/plugins/Makefile.am | 1 + + src/plugins/bemused/Makefile.am | 1 + + src/plugins/brasero-disc-recorder/Makefile.am | 1 + + src/plugins/galago/Makefile.am | 1 + + src/plugins/gromit/Makefile.am | 1 + + src/plugins/lirc/Makefile.am | 1 + + src/plugins/media-player-keys/Makefile.am | 1 + + src/plugins/mythtv/Makefile.am | 1 + + src/plugins/ontop/Makefile.am | 1 + + src/plugins/properties/Makefile.am | 1 + + src/plugins/publish/Makefile.am | 1 + + src/plugins/screensaver/Makefile.am | 1 + + src/plugins/screenshot/Makefile.am | 1 + + src/plugins/sidebar-test/Makefile.am | 1 + + src/plugins/skipto/Makefile.am | 1 + + src/plugins/thumbnail/Makefile.am | 1 + + src/plugins/tracker/Makefile.am | 1 + + src/plugins/youtube/Makefile.am | 1 + + src/totem.c | 21 ++++++++++++++++ 20 files changed, 60 insertions(+), 14 deletions(-) commit bebc121ec0e9678b31b40ddb4bdf2b0482374d3b @@ -14716,7 +19174,7 @@ Updated Spanish translation - help/es/es.po | 69 +++++++++++++++------------------------------------------ + help/es/es.po | 69 ++++++++++++++++------------------------------------------- 1 file changed, 18 insertions(+), 51 deletions(-) commit b87ea4345f36ed5d5eecf16cec83ff7ca708327c @@ -14725,7 +19183,7 @@ Updated Italian translation - po/it.po | 144 ++++++++++++++++++++++++++++++-------------------------------- + po/it.po | 144 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 70 insertions(+), 74 deletions(-) commit 0cb4e71dd45d53dbdd79b2bd01634b7353db5908 @@ -14734,7 +19192,7 @@ Updated Spanish translation - po/es.po | 217 ++++++++++++++++++++++++++++---------------------------------- + po/es.po | 217 +++++++++++++++++++++++++++++---------------------------------- 1 file changed, 99 insertions(+), 118 deletions(-) commit 24bc393eeb0d40ebe8ea3f28f95e0534e8043004 @@ -14748,7 +19206,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=605701 - help/C/totem.xml | 4 ++-- + help/C/totem.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 408a322e45638c7b916df2a02a21b303f869342c @@ -14759,7 +19217,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=603178 - src/totem-object.c | 17 +++++++++++++++++ + src/totem-object.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) commit 8e65acd2cc8b5f511269e3836a17b415bc3ebc8c @@ -14768,7 +19226,7 @@ Update Ukrainian translation - po/uk.po | 602 +++++++++++++++++++++++++++++++------------------------------- + po/uk.po | 602 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 305 insertions(+), 297 deletions(-) commit 94d8c4c86eb46d71101c97fa0fc741340a5bf230 @@ -14780,7 +19238,7 @@ Extend the Totem VAPI to match the Python bindings for Totem and correct some problems. Closes: bgo#605450 - bindings/vala/totem.vapi | 59 ++++++++++++++++++++++++++++++++++++---------- + bindings/vala/totem.vapi | 59 ++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 47 insertions(+), 12 deletions(-) commit 297883f72eeafa396cdd14f117a725346ef9028b @@ -14792,7 +19250,7 @@ screen_changed_cb() is only used if we HAVE_XVIDMODE, so only declare it if that's true. - src/backend/bacon-resize.c | 6 ++++-- + src/backend/bacon-resize.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) commit a040a4d5d6146c919294e625ba29bf61d99a2f9c @@ -14801,7 +19259,7 @@ Update Simplified Chinese help translation. - help/zh_CN/zh_CN.po | 324 ++++++++++++++++++++++++++++++++------------------- + help/zh_CN/zh_CN.po | 324 ++++++++++++++++++++++++++++++++-------------------- 1 file changed, 203 insertions(+), 121 deletions(-) commit d739473310854d6d04b4d8914b030f518f9f8116 @@ -14810,7 +19268,7 @@ Update Czech translation. - po/cs.po | 778 +++++++++++++++++++++++--------------------------------------- + po/cs.po | 778 ++++++++++++++++++++++++--------------------------------------- 1 file changed, 292 insertions(+), 486 deletions(-) commit 97a3234bc0ea07035626526184387c5ad0d81465 @@ -14830,7 +19288,7 @@ As there's no DVB menu items to check any more. - src/totem-menu.c | 5 ++--- + src/totem-menu.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) commit cb844acc76ccf9cd5a7c6fe808b1c330222a993c @@ -14843,12 +19301,12 @@ https://bugzilla.gnome.org/show_bug.cgi?id=515759 - src/Makefile.am | 2 - - src/backend/bacon-video-widget-gst-0.10.c | 195 +---------------------------- - src/totem-dvb-setup.c | 134 -------------------- - src/totem-dvb-setup.h | 47 ------- - src/totem-menu.c | 58 --------- - src/totem-object.c | 46 ------- + src/Makefile.am | 2 - + src/backend/bacon-video-widget-gst-0.10.c | 195 +----------------------------- + src/totem-dvb-setup.c | 134 -------------------- + src/totem-dvb-setup.h | 47 ------- + src/totem-menu.c | 58 --------- + src/totem-object.c | 46 ------- 6 files changed, 1 insertion(+), 481 deletions(-) commit 6e133cb14f516039ccd63e6a8eb83d022e2325f4 @@ -14857,7 +19315,7 @@ Updated Slovenian translation - po/sl.po | 363 ++++++++++++++++++++++++++++++-------------------------------- + po/sl.po | 363 ++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 173 insertions(+), 190 deletions(-) commit a3ee0ef291b9313d8229394ea2bcf3c60150b0ca @@ -14876,7 +19334,7 @@ Updated Spanish translation - po/es.po | 271 +++++++++++++++++++++++++++++++++----------------------------- + po/es.po | 271 +++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 143 insertions(+), 128 deletions(-) commit 48f0afb696810f6f5805bdede1720575f9553f97 @@ -14894,7 +19352,7 @@ Updating Estonian translation - po/et.po | 17 ++++++++++++----- + po/et.po | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) commit fb02c55314effa7b71f04bfbba8eff70843a5789 @@ -14903,7 +19361,7 @@ Use GDK keysyms instead of XF86 ones - src/totem-object.c | 45 ++++++++++++--------------------------------- + src/totem-object.c | 45 ++++++++++++--------------------------------- 1 file changed, 12 insertions(+), 33 deletions(-) commit a05c81bd26f4f1a1d2fce4a582104a725f997127 @@ -14912,7 +19370,7 @@ Improve Vala bindings to avoid warning - bindings/vala/totem.vapi | 3 +++ + bindings/vala/totem.vapi | 3 +++ 1 file changed, 3 insertions(+) commit 3fc702f6f66f5bd01c06807fc805e6ef48e99c68 @@ -14921,7 +19379,7 @@ Fix build of Vala plugin - src/plugins/sample-vala/Makefile.am | 26 ++++++++++++++++++-------- + src/plugins/sample-vala/Makefile.am | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) commit 1de736add46bbd792278f11b039c3300fa443013 @@ -14934,7 +19392,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=581249 - src/backend/bacon-video-widget-gst-0.10.c | 16 ++++++++++++---- + src/backend/bacon-video-widget-gst-0.10.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) commit cba6a476fdf25d7ca40c0ab99d827467a376ee9f @@ -14943,7 +19401,7 @@ Fix crasher on exit caused by signal still being caught - src/plugins/properties/totem-movie-properties.c | 9 +++++++++ + src/plugins/properties/totem-movie-properties.c | 9 +++++++++ 1 file changed, 9 insertions(+) commit b3bf617ea2582fe7c56ace86d1b8af1524e6433d @@ -14957,7 +19415,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=601688 - src/totem-object.c | 1 + + src/totem-object.c | 1 + 1 file changed, 1 insertion(+) commit 3d6c727f65bffb22d001bf8b9181ef6b191c9815 @@ -14968,8 +19426,8 @@ Bug #600110 . - src/backend/bacon-resize.c | 6 ++-- - src/backend/bacon-video-widget-gst-0.10.c | 50 ++++++++++++++++++----------- + src/backend/bacon-resize.c | 6 ++-- + src/backend/bacon-video-widget-gst-0.10.c | 50 +++++++++++++++++++------------ 2 files changed, 35 insertions(+), 21 deletions(-) commit ad170b039a517d3dff1d0bfd3236445f66834d70 @@ -14984,7 +19442,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=599795 - src/totem-playlist.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ + src/totem-playlist.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) commit 63e3be640eafce6678e87d6a592981597fac7f09 @@ -14999,9 +19457,9 @@ https://bugzilla.gnome.org/show_bug.cgi?id=313343 - src/totem-object.c | 19 +++++++++++++++++-- - src/totem-sidebar.c | 23 ++++++++++++++++++++++- - src/totem-sidebar.h | 2 +- + src/totem-object.c | 19 +++++++++++++++++-- + src/totem-sidebar.c | 23 ++++++++++++++++++++++- + src/totem-sidebar.h | 2 +- 3 files changed, 40 insertions(+), 4 deletions(-) commit 14e7f8e172446cf90d1d7f5f228ba20d16f073de @@ -15010,8 +19468,8 @@ Use gtk_drag_get_source_widget instead of storing window - src/totem-object.c | 7 ++++--- - src/totem-private.h | 4 ---- + src/totem-object.c | 7 ++++--- + src/totem-private.h | 4 ---- 2 files changed, 4 insertions(+), 7 deletions(-) commit c8baa5bdf6737a7e82025e99a83376f6ea174365 @@ -15022,10 +19480,10 @@ https://bugzilla.gnome.org/show_bug.cgi?id=573149 - data/totem.schemas.in | 14 +++++++++++++- - src/totem-object.c | 2 ++ - src/totem-preferences.c | 16 ++++++++++++++++ - src/totem-private.h | 1 + + data/totem.schemas.in | 14 +++++++++++++- + src/totem-object.c | 2 ++ + src/totem-preferences.c | 16 ++++++++++++++++ + src/totem-private.h | 1 + 4 files changed, 32 insertions(+), 1 deletion(-) commit b8b835d197551d3272c1c071c5aa6b26da82d9de @@ -15034,12 +19492,12 @@ Bug 595684 — Convert D-Bus plugin to use MPRIS API - bindings/python/totem.defs | 77 ++++ - bindings/python/totem.override | 16 +- - src/plugins/dbus-service/dbus-service.py | 372 ++++++++++++-------- - .../dbus-service/dbus-service.totem-plugin.in | 24 +- - src/totem-object.c | 75 +++- - src/totem.h | 8 + + bindings/python/totem.defs | 77 +++++ + bindings/python/totem.override | 16 +- + src/plugins/dbus-service/dbus-service.py | 372 ++++++++++++--------- + .../dbus-service/dbus-service.totem-plugin.in | 24 +- + src/totem-object.c | 75 ++++- + src/totem.h | 8 + 6 files changed, 392 insertions(+), 180 deletions(-) commit a436a3c1458d028540c920158fa91551cfdb8a78 @@ -15048,7 +19506,7 @@ Ignore OSD file in API docs - docs/reference/Makefile.am | 1 + + docs/reference/Makefile.am | 1 + 1 file changed, 1 insertion(+) commit dec5c14a272c09834ea024f36e00072674719443 @@ -15057,7 +19515,7 @@ Add httplib to not be translated - po/POTFILES.skip | 1 + + po/POTFILES.skip | 1 + 1 file changed, 1 insertion(+) commit 24f79aa035e075ab98e10ead3a07d4168c16f671 @@ -15066,11 +19524,11 @@ Fix documentation checks failing - docs/reference/Makefile.am | 6 +++++- - docs/reference/totem-sections.txt | 9 +++++---- - src/backend/bacon-video-widget-gst-0.10.c | 29 ++++++++++++++++++++++++----- - src/backend/bacon-video-widget.h | 6 ++---- - src/totem-object.c | 2 +- + docs/reference/Makefile.am | 6 +++++- + docs/reference/totem-sections.txt | 9 +++++---- + src/backend/bacon-video-widget-gst-0.10.c | 29 ++++++++++++++++++++++++----- + src/backend/bacon-video-widget.h | 6 ++---- + src/totem-object.c | 2 +- 5 files changed, 37 insertions(+), 15 deletions(-) commit 5075f29e256557c187f181b4311f56e9bf619a5b @@ -15079,7 +19537,7 @@ Fix distclean trying to clean browser-plugin/ twice - Makefile.am | 5 +++-- + Makefile.am | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit 73f665513b0f1d741d04713ebeae817c13bb9d2d @@ -15088,7 +19546,7 @@ Fix packing of the label in the status bar - src/totem-statusbar.c | 2 ++ + src/totem-statusbar.c | 2 ++ 1 file changed, 2 insertions(+) commit a926c0de57ab2a9c764432c68bdd7fca51e0f00f @@ -15097,8 +19555,8 @@ Updated zh_CN translation. - po/ChangeLog | 4 +++ - po/zh_CN.po | 99 +++++++++++++++++++++++++++++----------------------------- + po/ChangeLog | 4 +++ + po/zh_CN.po | 99 ++++++++++++++++++++++++++++++------------------------------ 2 files changed, 53 insertions(+), 50 deletions(-) commit 6d323117f05bdf74c3b9b0914beb393bb8c67874 @@ -15109,7 +19567,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=604077 - configure.in | 3 +-- + configure.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit f9309a3470ee81cbf91e7e3098946d88a271871c @@ -15118,7 +19576,7 @@ Remove more unneeded GtkActionEntries - src/totem-menu.c | 16 ---------------- + src/totem-menu.c | 16 ---------------- 1 file changed, 16 deletions(-) commit c9c15a48af7c5bf81d68b40f10da3c0ad5e4a774 @@ -15127,7 +19585,7 @@ Removed unused GtkActionEntries declarations - src/totem-menu.c | 10 ---------- + src/totem-menu.c | 10 ---------- 1 file changed, 10 deletions(-) commit a91e9ae2aa434bce2e70463c7d691b12d7a706e0 @@ -15138,7 +19596,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=603604 - src/totem-menu.c | 11 +++++------ + src/totem-menu.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) commit 78939cbd67a1c264c0bc777b81aa40bc73cf8056 @@ -15147,7 +19605,7 @@ Updated Norwegian bokmål translation. - po/nb.po | 251 +++++++++++++++++++++++++++++++++----------------------------- + po/nb.po | 251 ++++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 135 insertions(+), 116 deletions(-) commit 2933258789b8e6de00ebc1c0db0b3b628395be54 @@ -15158,7 +19616,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=589808 - src/totem-menu.c | 11 +---------- + src/totem-menu.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) commit a16c3d44bd0a84002b91ea886a3b24a4b750605a @@ -15167,7 +19625,7 @@ Updated Hebrew translation - po/he.po | 753 +++++++++++++++++++++++++++++++++++--------------------------- + po/he.po | 753 ++++++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 428 insertions(+), 325 deletions(-) commit 0b4d73463c0a391c928bc9b027ae32da38bc5b86 @@ -15178,8 +19636,8 @@ and remove compat code. - configure.in | 2 +- - src/totem-statusbar.c | 12 ------------ + configure.in | 2 +- + src/totem-statusbar.c | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) commit 3771f232ecb3ed7bf87bf4c4af3bfaa49e5cc413 @@ -15191,7 +19649,7 @@ Just the the provided hbox, instead of performing widget surgery. Bug #602096. - src/totem-statusbar.c | 4 ++++ + src/totem-statusbar.c | 4 ++++ 1 file changed, 4 insertions(+) commit b0faec52a23bf1bf2a6336de7cc4b34ef5a6a291 @@ -15200,7 +19658,7 @@ Updated Arabic translation - po/ar.po | 499 ++++++++++++++++++++++++++++++++------------------------------ + po/ar.po | 499 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 255 insertions(+), 244 deletions(-) commit fa0eab16e4c903203d0d3dff9e48cd4b45eb5a9a @@ -15209,7 +19667,7 @@ Updated Simplified Chinese translation of totem help. - help/zh_CN/zh_CN.po | 475 ++++++++++++++++++++++++++++----------------------- + help/zh_CN/zh_CN.po | 475 +++++++++++++++++++++++++++++----------------------- 1 file changed, 265 insertions(+), 210 deletions(-) commit 309f265c5db0dbe3ef09a225120ecf531b3dc6c1 @@ -15218,8 +19676,8 @@ 2.29.2 - NEWS | 5 +++++ - configure.in | 4 ++-- + NEWS | 5 +++++ + configure.in | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) commit 28e06939ad317d549fa6052f77697309d6a1f701 @@ -15228,8 +19686,8 @@ Fix distchecking problems with the nautilus extension - Makefile.am | 2 +- - configure.in | 12 +++++++++++- + Makefile.am | 2 +- + configure.in | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) commit f643cedcf72a15aa9ce1545d842e827a7473e839 @@ -15238,7 +19696,7 @@ Update Hebrew translation - po/he.po | 536 ++++++++++++++++++++++++++++++++------------------------------ + po/he.po | 536 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 274 insertions(+), 262 deletions(-) commit 7cec407f6d1e2aee6bcb7ad766e46dfd1bad38dc @@ -15247,7 +19705,7 @@ Updated Simplified Chinese translation. - po/zh_CN.po | 261 ++++++++++++++++++++++++++++++----------------------------- + po/zh_CN.po | 261 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 132 insertions(+), 129 deletions(-) commit a633140f11d4bbb6ef3f144f653f814b91df5806 @@ -15256,7 +19714,7 @@ Update Simplified Chinese help translation. - help/zh_CN/zh_CN.po | 210 +++++++++++++++++++++++++++++++++++++++------------ + help/zh_CN/zh_CN.po | 210 +++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 160 insertions(+), 50 deletions(-) commit 4bd6b1cab04ae2c3a438d2991bc647baa365ce27 @@ -15265,7 +19723,7 @@ Updating Estonian translation - po/et.po | 12 ++++++++---- + po/et.po | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) commit 79fe21d9204c81a0bede486dbe03dfac2571e9ce @@ -15276,7 +19734,7 @@ And it's fast! - src/backend/bacon-video-widget-gst-0.10.c | 28 +++++++++------------------- + src/backend/bacon-video-widget-gst-0.10.c | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) commit 6bae3c4dbcdc9427e2cd96aa8f89669e4f113485 @@ -15285,7 +19743,7 @@ Add translator comments for new image playback - src/totem-menu.c | 9 +++++---- + src/totem-menu.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) commit 7f7c31c4d6cd31f276994f1512e96cb41f9ddc16 @@ -15294,7 +19752,7 @@ Updated Slovenian translation - po/sl.po | 88 +++++++++++++++++++++++++++++++++----------------------------- + po/sl.po | 88 ++++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 47 insertions(+), 41 deletions(-) commit fbe3f57ca149afc3572399e1ee0f693f960fc174 @@ -15305,7 +19763,7 @@ Avoids errors trying to use webpages as subtitles. - browser-plugin/totem-plugin-viewer.c | 5 ++++- + browser-plugin/totem-plugin-viewer.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit c4daf7c2d505223dedc456e610522fedbdd4857d @@ -15324,7 +19782,7 @@ Updated Spanish translation - po/es.po | 81 +++++++++++++++++++++++++++++++++----------------------------- + po/es.po | 81 ++++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 43 insertions(+), 38 deletions(-) commit 3cbced4a9b7680cee0112819f6d9643e9c0d819f @@ -15333,7 +19791,7 @@ Updated Slovenian translation - po/sl.po | 209 ++++++++++++++++++++++++++++++++------------------------------ + po/sl.po | 209 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 107 insertions(+), 102 deletions(-) commit 55eb1b387893f2c955305ea709908d5ded05a7d7 @@ -15342,7 +19800,7 @@ Add note about recent totem-menu.c changes - data/mime-type-list.txt | 1 + + data/mime-type-list.txt | 1 + 1 file changed, 1 insertion(+) commit 1f53dd60262a29beabd2a6b7427d3cea35c895ae @@ -15354,7 +19812,7 @@ Show mounted archives in the Movie menu, and allow playback from those archives. - src/totem-menu.c | 223 ++++++++++++++++++++++++++++++++++++++++++++++-------- + src/totem-menu.c | 223 +++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 192 insertions(+), 31 deletions(-) commit 3a4945d16b025bc9042075dd09230fa8a657708e @@ -15363,7 +19821,7 @@ Fix some memory leaks in volume handling - src/totem-menu.c | 8 ++++++-- + src/totem-menu.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) commit 2984b6b1807c0072db2d7eca61be03655c21ca25 @@ -15372,7 +19830,7 @@ Move volume handling for the menus into its own function - src/totem-menu.c | 210 +++++++++++++++++++++++++++++------------------------- + src/totem-menu.c | 210 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 112 insertions(+), 98 deletions(-) commit a60910742a48f331ddd32148658201aa9df89417 @@ -15381,7 +19839,7 @@ Updating Estonian translation - po/et.po | 17 ++++++++++------- + po/et.po | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) commit a84cecfa5d590f578db449be041c3a464e4d702e @@ -15390,7 +19848,7 @@ Updated Spanish translation - po/es.po | 149 ++++++++++++++++++++++++++++++++------------------------------ + po/es.po | 149 +++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 78 insertions(+), 71 deletions(-) commit a4b3ab79a9a1b7eee767797a27daa9f992c6928a @@ -15403,11 +19861,11 @@ https://bugzilla.gnome.org/show_bug.cgi?id=595760 - src/plugins/screenshot/totem-gallery.c | 13 ++++++++++--- - src/plugins/screenshot/totem-screenshot-plugin.c | 12 ++++++------ - src/plugins/screenshot/totem-screenshot-plugin.h | 2 +- - src/plugins/screenshot/totem-screenshot.c | 9 ++++++--- - src/plugins/screenshot/totem-screenshot.h | 2 +- + src/plugins/screenshot/totem-gallery.c | 13 ++++++++++--- + src/plugins/screenshot/totem-screenshot-plugin.c | 12 ++++++------ + src/plugins/screenshot/totem-screenshot-plugin.h | 2 +- + src/plugins/screenshot/totem-screenshot.c | 9 ++++++--- + src/plugins/screenshot/totem-screenshot.h | 2 +- 5 files changed, 24 insertions(+), 14 deletions(-) commit 91b9cebdc00b0ca71c120e7cb9a80ad359fe74ed @@ -15419,7 +19877,7 @@ This should allow for the front-end to know which file to copy. - src/backend/bacon-video-widget-gst-0.10.c | 21 ++++++++++++++++++--- + src/backend/bacon-video-widget-gst-0.10.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) commit 5edf87a0226e71a3b873c3f0b7509e6aa4bfc3d5 @@ -15428,7 +19886,7 @@ Update NEWS - NEWS | 18 ++++++++++++++++++ + NEWS | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) commit 3e3de882d4643662b5a19e4e046944f9d8dca729 @@ -15439,8 +19897,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=595760 - src/plugins/screenshot/totem-gallery.c | 11 ++++++++++- - src/plugins/screenshot/totem-screenshot-plugin.c | 5 ++++- + src/plugins/screenshot/totem-gallery.c | 11 ++++++++++- + src/plugins/screenshot/totem-screenshot-plugin.c | 5 ++++- 2 files changed, 14 insertions(+), 2 deletions(-) commit 09dcc4deb301b3deecf5356572d7732ea2e9ac29 @@ -15451,7 +19909,7 @@ Useful if we want to copy the file later on. - src/backend/bacon-video-widget-gst-0.10.c | 27 +++++++++++++++++++++++++++ + src/backend/bacon-video-widget-gst-0.10.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) commit 298708c166793a4f50b1371f68e43f8a6129def9 @@ -15460,7 +19918,7 @@ Add test case for Cone subtitle API - browser-plugin/tests/11.html | 47 ++++++++++++++++++++++++++++++++++++++++++ + browser-plugin/tests/11.html | 47 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) commit 19e811da24496f44dbc25812aff666497bc782b0 @@ -15472,7 +19930,7 @@ Ensure the YouTube progress bar stops once a search is finished, even if there are no results. Closes: bgo#602497 - src/plugins/youtube/totem-youtube.c | 9 +++++---- + src/plugins/youtube/totem-youtube.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) commit 75e7d2f78824fb446a38f325f1b3f4e5af223c89 @@ -15481,7 +19939,7 @@ Updating Estonian translation - po/et.po | 104 +++----------------------------------------------------------- + po/et.po | 104 +++------------------------------------------------------------ 1 file changed, 5 insertions(+), 99 deletions(-) commit c59b48103c1dc00bc1926c3c3a1cd7089d2bd57e @@ -15493,9 +19951,9 @@ When using AddItem(). Makes the subtitle handling test case for OLPC work. - browser-plugin/org_gnome_totem_PluginViewer.xml | 1 + - browser-plugin/totem-plugin-viewer.c | 3 ++- - browser-plugin/totemPlugin.cpp | 10 ++++------ + browser-plugin/org_gnome_totem_PluginViewer.xml | 1 + + browser-plugin/totem-plugin-viewer.c | 3 ++- + browser-plugin/totemPlugin.cpp | 10 ++++------ 3 files changed, 7 insertions(+), 7 deletions(-) commit 5eb549916bf98dc396a993c2fea79aef197ef564 @@ -15506,7 +19964,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=560946 - browser-plugin/totem-plugin-viewer.c | 29 +++++++++++++++++++---------- + browser-plugin/totem-plugin-viewer.c | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) commit 66cbcd4cf6bf55bc35ef777d225e8fdd3a8d2529 @@ -15518,8 +19976,8 @@ This should allow us to implement a more robust Javascript handling. Not all the commands are queued right now. - browser-plugin/totemPlugin.cpp | 114 +++++++++++++++++++++++++++++++++------- - browser-plugin/totemPlugin.h | 27 ++++++++++ + browser-plugin/totemPlugin.cpp | 114 ++++++++++++++++++++++++++++++++++------- + browser-plugin/totemPlugin.h | 27 ++++++++++ 2 files changed, 123 insertions(+), 18 deletions(-) commit 03addbe4c6741245472787ba54cde0474120644c @@ -15528,7 +19986,7 @@ Fix double-free in the Cone plugin's playlist - browser-plugin/totemConePlaylist.cpp | 7 +++---- + browser-plugin/totemConePlaylist.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) commit 4357329e301e96365540c0697ed42b6ca7e518c5 @@ -15537,7 +19995,7 @@ Check number of args in playlist.add in Cone - browser-plugin/totemConePlaylist.cpp | 4 ++-- + browser-plugin/totemConePlaylist.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 3353323b0c79dbdfe5ef3ca5f71037188dae9c13 @@ -15550,16 +20008,16 @@ use Real stuff. Desperate people can probably use the HelixPlayer, though it won't play anything interesting. - browser-plugin/Makefile.am | 60 ----- - browser-plugin/README.browser-plugin | 14 -- - browser-plugin/TODO | 6 - - browser-plugin/idl/totemIComplexPlayer.idl | 193 ---------------- - browser-plugin/totem-plugin-viewer.c | 48 +--- - browser-plugin/totemComplexPlugin.cpp | 315 ------------------------- - browser-plugin/totemComplexPlugin.h | 165 ------------- - browser-plugin/totemPlugin.cpp | 346 ---------------------------- - browser-plugin/totemPlugin.h | 27 --- - configure.in | 12 - + browser-plugin/Makefile.am | 60 ----- + browser-plugin/README.browser-plugin | 14 -- + browser-plugin/TODO | 6 - + browser-plugin/idl/totemIComplexPlayer.idl | 193 ---------------- + browser-plugin/totem-plugin-viewer.c | 48 +--- + browser-plugin/totemComplexPlugin.cpp | 315 -------------------------- + browser-plugin/totemComplexPlugin.h | 165 -------------- + browser-plugin/totemPlugin.cpp | 346 ----------------------------- + browser-plugin/totemPlugin.h | 27 --- + configure.in | 12 - 10 files changed, 7 insertions(+), 1179 deletions(-) commit 99a02e3de707cb9abe351749c3526e4554ff3fd6 @@ -15570,7 +20028,7 @@ if some arguments aren't present in playlist.add - browser-plugin/totemConePlaylist.cpp | 6 ++++-- + browser-plugin/totemConePlaylist.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) commit 183b9c1b0aff35b7f15c2f809f1a7c028eedf704 @@ -15581,8 +20039,8 @@ Don't read the arrays out of bounds! Bug #560946 comment 12. - browser-plugin/totemNPClass.cpp | 6 ++++-- - browser-plugin/totemNPObject.cpp | 10 ++++++---- + browser-plugin/totemNPClass.cpp | 6 ++++-- + browser-plugin/totemNPObject.cpp | 10 ++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) commit 0912743133df061fd46e1ebb6c1c9a5e4d07e1c3 @@ -15597,8 +20055,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=593042 - data/fullscreen.ui | 4 ++++ - src/totem-fullscreen.c | 28 +++++++++++++++++++++++++++- + data/fullscreen.ui | 4 ++++ + src/totem-fullscreen.c | 28 +++++++++++++++++++++++++++- 2 files changed, 31 insertions(+), 1 deletion(-) commit ddbee71115063b9117665e892971b579d6aa5300 @@ -15607,7 +20065,7 @@ Make sure temporary copy of playlist file keeps permissions - browser-plugin/totem-plugin-viewer.c | 2 +- + browser-plugin/totem-plugin-viewer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 7d66f40d515f0e2ca010796f16beb90a9af13b87 @@ -15616,7 +20074,7 @@ Add support for authentication on the soup HTTP source - src/backend/bacon-video-widget-gst-0.10.c | 5 +++-- + src/backend/bacon-video-widget-gst-0.10.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit ea148d038c6e865d4fc763c74ba8ab209084d156 @@ -15629,7 +20087,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=567317 - src/totem-fullscreen.c | 27 ++++++++++++++++++++++++++- + src/totem-fullscreen.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) commit adb4dd9f042d9133e5c88f6e9e23e1322cdd9da4 @@ -15644,7 +20102,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=601732 - src/backend/bacon-video-widget-gst-0.10.c | 49 ++++++++++++++++++++--------- + src/backend/bacon-video-widget-gst-0.10.c | 49 ++++++++++++++++++++++--------- 1 file changed, 35 insertions(+), 14 deletions(-) commit 9efc634b38a7635cd0cb487d81272080897d02e1 @@ -15658,11 +20116,11 @@ https://bugzilla.gnome.org/show_bug.cgi?id=560946 - browser-plugin/org_gnome_totem_PluginViewer.xml | 2 ++ - browser-plugin/totem-plugin-viewer.c | 17 ++++++++++--- - browser-plugin/totemConePlaylist.cpp | 30 ++++++++++++++++++++++- - browser-plugin/totemPlugin.cpp | 26 +++++++++++++++++--- - browser-plugin/totemPlugin.h | 2 +- + browser-plugin/org_gnome_totem_PluginViewer.xml | 2 ++ + browser-plugin/totem-plugin-viewer.c | 17 ++++++++++---- + browser-plugin/totemConePlaylist.cpp | 30 ++++++++++++++++++++++++- + browser-plugin/totemPlugin.cpp | 26 +++++++++++++++++---- + browser-plugin/totemPlugin.h | 2 +- 5 files changed, 67 insertions(+), 10 deletions(-) commit 6515e371d9b99c9181d8249e67928b31fbb8f862 @@ -15671,7 +20129,7 @@ Place OSD properly when using RTL locales - src/totem-fullscreen.c | 7 ++++++- + src/totem-fullscreen.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) commit f49609cc32ebf7ca664ce3a319deabbde8b90730 @@ -15680,7 +20138,7 @@ Updated Slovenian translation - po/sl.po | 44 ++++++++++++++++++++++---------------------- + po/sl.po | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) commit 255d4030e99eecdd8f99005647fd48b3adf88761 @@ -15689,7 +20147,7 @@ Updated Simplified Chinese translation. - help/zh_CN/zh_CN.po | 214 +++++++++++++++++++++++++++++++++++++-------------- + help/zh_CN/zh_CN.po | 214 ++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 158 insertions(+), 56 deletions(-) commit f093f3c006adeb165ab0e1e2f6bfa09ea5caf447 @@ -15698,7 +20156,7 @@ Initialize a variable to NULL to fix a (correct) compiler warning - browser-plugin/totem-plugin-viewer.c | 2 +- + browser-plugin/totem-plugin-viewer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit d6d60e7d4041989aaa4e3db999f0ae071edeca85 @@ -15707,7 +20165,7 @@ Make a small array const - src/totem-playlist.c | 2 +- + src/totem-playlist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 1b62a9c299b71a4173a65ac7116ccc62a5bb0702 @@ -15719,7 +20177,7 @@ So as to get some more free CPU cycles, and avoid errors during video decoding. - src/backend/bacon-video-widget-gst-0.10.c | 15 ++++++++++++--- + src/backend/bacon-video-widget-gst-0.10.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) commit 7fa67887aaab0a3d2d4950d01cb6c38a1064a451 @@ -15730,7 +20188,7 @@ It's a no-op in metadata mode. - src/totem-properties-view.c | 7 ------- + src/totem-properties-view.c | 7 ------- 1 file changed, 7 deletions(-) commit 05cdc7f04998c9928dee3461abb076256f13f2f5 @@ -15741,7 +20199,7 @@ It's a no-op for metadata mode. - src/totem-video-indexer.c | 8 +++----- + src/totem-video-indexer.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) commit 9e880b1c29991cee2aefb7ac92a52f15b5c055c2 @@ -15752,7 +20210,7 @@ It's a no-op for capture mode. - src/totem-video-thumbnailer.c | 15 ++------------- + src/totem-video-thumbnailer.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) commit 8b27fddb722435314f49e9bdb6f5392636861358 @@ -15767,7 +20225,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=598703 - src/backend/bacon-video-widget-gst-0.10.c | 3 +++ + src/backend/bacon-video-widget-gst-0.10.c | 3 +++ 1 file changed, 3 insertions(+) commit 5856bbe379e32caa77177036f2a79f4e0763212d @@ -15779,7 +20237,7 @@ Don't forget to open the display if we're going to show a GTK+ window. - src/totem-video-thumbnailer.c | 2 +- + src/totem-video-thumbnailer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 26947d6f667405332147a576db5ca3bc12ccaa8d @@ -15791,7 +20249,7 @@ Check the value of errno before saying that nice() fails, as per the nice(3p) man page. - src/totem-video-thumbnailer.c | 14 +++++++++----- + src/totem-video-thumbnailer.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) commit 5f644765f52427eef7a297d2b9d04feccd50cd33 @@ -15813,7 +20271,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=600852 - browser-plugin/totem-plugin-viewer.c | 2 +- + browser-plugin/totem-plugin-viewer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 795304b11ab2463c06bc9cd6341f13b5d7ed0f82 @@ -15825,9 +20283,9 @@ Bump Glib required version to 2.22 Fixes https://bugzilla.gnome.org/show_bug.cgi?id=601896 - configure.in | 2 +- - src/plugins/bemused/totem-bemused.c | 2 +- - src/totem-object.c | 2 +- + configure.in | 2 +- + src/plugins/bemused/totem-bemused.c | 2 +- + src/totem-object.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) commit e79427f5fb75656ee9f7888e9a6d1ffce3f3caad @@ -15841,7 +20299,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=570651 - src/backend/bacon-video-widget-gst-0.10.c | 9 +++++++++ + src/backend/bacon-video-widget-gst-0.10.c | 9 +++++++++ 1 file changed, 9 insertions(+) commit 3cdece9999694a09422b420d8334bb2b51100b41 @@ -15853,7 +20311,7 @@ When using the middle-click of the mouse to play/pause playback, show an OSD to inform the user that something happened. - src/totem-object.c | 10 +++++++++- + src/totem-object.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) commit 1ee78ac07e61289a2011956820e9da756e484281 @@ -15862,7 +20320,7 @@ Updated Spanish translation - po/es.po | 4 ++-- + po/es.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 8a18c752979d16a286e102509054bb3ae1ac53d8 @@ -15871,7 +20329,7 @@ Updated Norwegian bokmål translation. - po/nb.po | 351 +++++++++++++++++++++++++++++++------------------------------- + po/nb.po | 351 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 173 insertions(+), 178 deletions(-) commit 14b0c9e7ca8472fadf59a77bbb43786ee94b72b1 @@ -15887,7 +20345,7 @@ See bug #599478. - src/backend/bacon-video-widget-gst-0.10.c | 44 +++++++++++++++++++++++++++-- + src/backend/bacon-video-widget-gst-0.10.c | 44 +++++++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 2 deletions(-) commit cb442f6c9fb078679c6e2e28758f8d3b98f1e829 @@ -15896,7 +20354,7 @@ Updated Slovenian translation - po/sl.po | 259 ++++++++++++++++++++++++++++++-------------------------------- + po/sl.po | 259 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 126 insertions(+), 133 deletions(-) commit ce706e97c6ed3cb6fe88046a91871cef1b13a7a8 @@ -15905,7 +20363,7 @@ Small fix on zh_CN.po - po/zh_CN.po | 4 ++-- + po/zh_CN.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 66d712940b47701333055692089791863e6ddf77 @@ -15914,7 +20372,7 @@ Updated Simplified Chinese translation. - po/zh_CN.po | 359 +++++++++++++++++++++++++++++------------------------------ + po/zh_CN.po | 359 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 179 insertions(+), 180 deletions(-) commit 04ec7ed4e6ab6a6d6cd9cbfb94a03d86d22798f5 @@ -15923,7 +20381,7 @@ Updated Spanish translation - po/es.po | 74 +++++++++++++++++++++++++++++++++----------------------------- + po/es.po | 74 ++++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 39 insertions(+), 35 deletions(-) commit c2020a730cd6dfd99abadfafe0333ccc4952c115 @@ -15938,7 +20396,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=595958 and makes reverse stepping useful - src/backend/bacon-video-widget-gst-0.10.c | 141 +++++++++++++++++++---------- + src/backend/bacon-video-widget-gst-0.10.c | 141 +++++++++++++++++++----------- 1 file changed, 91 insertions(+), 50 deletions(-) commit 4a4e421c22cea93a5c097759a5211363590b4784 @@ -15949,7 +20407,7 @@ Left-over from the reverse-stepping bug. - src/backend/bacon-video-widget-gst-0.10.c | 1 - + src/backend/bacon-video-widget-gst-0.10.c | 1 - 1 file changed, 1 deletion(-) commit dc3b8aab60c3744eb48928014fcbb74fe59e4856 @@ -15966,7 +20424,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=536896 - src/backend/bacon-video-widget-gst-0.10.c | 29 ++++++++++++++--------------- + src/backend/bacon-video-widget-gst-0.10.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) commit 2eb6b4ba64d01594cdd7d1d60443c2247cf55e7e @@ -15981,7 +20439,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=601707 - src/backend/bacon-video-widget-gst-0.10.c | 2 ++ + src/backend/bacon-video-widget-gst-0.10.c | 2 ++ 1 file changed, 2 insertions(+) commit 7ece79aa5aec0977778e28b39bc1c9e225158ed4 @@ -15993,7 +20451,7 @@ Using GtkMountOperation to request a username and password from the user. - src/backend/bacon-video-widget-gst-0.10.c | 106 ++++++++++++++++++++++++++++- + src/backend/bacon-video-widget-gst-0.10.c | 106 +++++++++++++++++++++++++++++- 1 file changed, 105 insertions(+), 1 deletion(-) commit 290dfcebaedaba8f878323b4859f0856a30cfa30 @@ -16005,7 +20463,7 @@ Getting the URI from the playbin object doesn't give you a const char, but a copy of the URI. - src/backend/bacon-video-widget-gst-0.10.c | 7 +++++-- + src/backend/bacon-video-widget-gst-0.10.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) commit 57d551421a48f3b7bd08cefdadae0c0e8e46d0b3 @@ -16018,9 +20476,9 @@ https://bugzilla.gnome.org/show_bug.cgi?id=595958 - src/backend/bacon-video-widget-gst-0.10.c | 57 ++++++++++++++++++++++++++--- - src/backend/bacon-video-widget.h | 1 + - src/totem-object.c | 6 ++- + src/backend/bacon-video-widget-gst-0.10.c | 57 +++++++++++++++++++++++++++---- + src/backend/bacon-video-widget.h | 1 + + src/totem-object.c | 6 +++- 3 files changed, 57 insertions(+), 7 deletions(-) commit 2e94d1067a5096f87a18faa11505f27d964e4013 @@ -16049,7 +20507,7 @@ Updated Spanish translation - po/es.po | 203 +++++++++++++++++++++++++++++++------------------------------- + po/es.po | 203 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 100 insertions(+), 103 deletions(-) commit 2ef4cb0fdcde35ebf35ed931e8077864c56b6984 @@ -16058,7 +20516,7 @@ Updated Swedish translation - po/sv.po | 247 ++++++++++++++++++++++++++++++-------------------------------- + po/sv.po | 247 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 120 insertions(+), 127 deletions(-) commit 9e2469523bbba1027cb638950db63fd0ff968a1d @@ -16067,7 +20525,7 @@ Updated Italian translation - po/it.po | 94 +++++++++++++++++++++++++++++++------------------------------- + po/it.po | 94 ++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 47 insertions(+), 47 deletions(-) commit 97b310d853012f52a9a41effb0a77b8c59707d95 @@ -16081,7 +20539,7 @@ Also make sure we don't start playing back again in those cases. - src/totem-object.c | 23 +++++++++++++++-------- + src/totem-object.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) commit 3c757b351c7bc518bb7acb3a71c6a5a36521f7f7 @@ -16095,7 +20553,7 @@ Also make sure that we disable the timeout when switching from download mode to normal buffering. - src/backend/bacon-video-widget-gst-0.10.c | 28 +++++++++++++++------------- + src/backend/bacon-video-widget-gst-0.10.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) commit f03c5713b591358056e9798042fadcede8c75203 @@ -16104,7 +20562,7 @@ Fix run-time warnings in test application - src/backend/bvw-test.c | 8 +------- + src/backend/bvw-test.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) commit 2bb88dc5cb0d5aed0df7e5388fde5751c65b8bb6 @@ -16115,7 +20573,7 @@ Fixes assertion failures in gst_tag_list_free(). - src/backend/bacon-video-widget-gst-0.10.c | 3 ++- + src/backend/bacon-video-widget-gst-0.10.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit ab6d49f8db445e9dc1e8b116eee34b5c8572ba94 @@ -16126,7 +20584,7 @@ Just like in the front-end - browser-plugin/totem-plugin-viewer.c | 17 ++++++----------- + browser-plugin/totem-plugin-viewer.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) commit ec63d879243ded32322a910d9c9244ddabb26813 @@ -16137,7 +20595,7 @@ When caching the stream to disk, allow direct seeking in the UI - src/backend/bacon-video-widget-gst-0.10.c | 3 +++ + src/backend/bacon-video-widget-gst-0.10.c | 3 +++ 1 file changed, 3 insertions(+) commit 7231cd429f76b3bfd72580c9d215caf5e40f45df @@ -16148,7 +20606,7 @@ So that we don't get stopped on the way during playback. - src/backend/bacon-video-widget-gst-0.10.c | 2 +- + src/backend/bacon-video-widget-gst-0.10.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 80297bca6a3ac70d18ddeaaf4fe6a08817c9c008 @@ -16161,7 +20619,7 @@ then start playback when the buffer is filled enough so that we won't have to pause to download. - src/backend/bacon-video-widget-gst-0.10.c | 55 ++++++++++++++++++++++++++--- + src/backend/bacon-video-widget-gst-0.10.c | 55 ++++++++++++++++++++++++++++--- 1 file changed, 51 insertions(+), 4 deletions(-) commit 6c3c98ea469e31a8a70ccce637a2d84990c4ef5b @@ -16173,7 +20631,7 @@ No need to keep the download buffering timeout going if we've already buffered all we can. - src/backend/bacon-video-widget-gst-0.10.c | 7 +++++++ + src/backend/bacon-video-widget-gst-0.10.c | 7 +++++++ 1 file changed, 7 insertions(+) commit ae1de70d74d55611a87a142d0a7d4e83fbef01ea @@ -16182,7 +20640,7 @@ Only start playing after mount if actually asked to - src/backend/bacon-video-widget-gst-0.10.c | 3 ++- + src/backend/bacon-video-widget-gst-0.10.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 00e199b498d8c72f4413a5db2a7447eb06d56363 @@ -16194,7 +20652,7 @@ If mounting the mount the file is on failed, then we shouldn't try to play it. - src/backend/bacon-video-widget-gst-0.10.c | 1 - + src/backend/bacon-video-widget-gst-0.10.c | 1 - 1 file changed, 1 deletion(-) commit e5d05e3dfbd68f13d90d42ff0c7afbcd526dabb2 @@ -16203,7 +20661,7 @@ Add download buffering support to browser plugin - browser-plugin/totem-plugin-viewer.c | 33 +++++++++++++++++++++++++++++++++ + browser-plugin/totem-plugin-viewer.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) commit c7d213cd13c008964838e0bc177534fbd33cb5d6 @@ -16212,7 +20670,7 @@ Add support for download buffering in movie player - src/totem-object.c | 27 +++++++++++++++++++++++++++ + src/totem-object.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) commit 919c4286504b526b20a2fc14ebd656d74e600657 @@ -16223,8 +20681,8 @@ AKA YouTube-style buffering, with on-disk cache. - src/backend/bacon-video-widget-gst-0.10.c | 79 +++++++++++++++++++++++++++++ - src/backend/bacon-video-widget.h | 1 + + src/backend/bacon-video-widget-gst-0.10.c | 79 +++++++++++++++++++++++++++++++ + src/backend/bacon-video-widget.h | 1 + 2 files changed, 80 insertions(+) commit da7d98d1714618771247c8a474cad95ee711f029 @@ -16233,7 +20691,7 @@ Add hack to allow playback of Apple trailers in the movie player - src/totem-object.c | 6 ++++++ + src/totem-object.c | 6 ++++++ 1 file changed, 6 insertions(+) commit 2b045cbd798a436a16dd5fbe4a59cabb41457a5f @@ -16242,7 +20700,7 @@ Set the download flag on playbin2 - src/backend/bacon-video-widget-gst-0.10.c | 10 ++++++++-- + src/backend/bacon-video-widget-gst-0.10.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) commit c7639d3aabe43731b22b29b536d3a364fbe7ab92 @@ -16251,7 +20709,7 @@ Split off buffering message handling into its own function - src/backend/bacon-video-widget-gst-0.10.c | 69 ++++++++++++++++------------- + src/backend/bacon-video-widget-gst-0.10.c | 69 +++++++++++++++++-------------- 1 file changed, 37 insertions(+), 32 deletions(-) commit 59d369a7ee12f83ebf64f5e96324e2132c86e3ce @@ -16260,10 +20718,10 @@ Updated Polish translation - help/pl/figures/totem_next_button.png | Bin 671 -> 0 bytes - help/pl/figures/totem_pause_button.png | Bin 1058 -> 0 bytes - help/pl/figures/totem_play_button.png | Bin 928 -> 0 bytes - help/pl/figures/totem_previous_button.png | Bin 653 -> 0 bytes + help/pl/figures/totem_next_button.png | Bin 671 -> 0 bytes + help/pl/figures/totem_pause_button.png | Bin 1058 -> 0 bytes + help/pl/figures/totem_play_button.png | Bin 928 -> 0 bytes + help/pl/figures/totem_previous_button.png | Bin 653 -> 0 bytes 4 files changed, 0 insertions(+), 0 deletions(-) commit 904447b54f1a098f5b717afb25f1d60db9525542 @@ -16289,8 +20747,8 @@ Remove volume restoring feature - data/totem.schemas.in | 12 ------------ - src/totem-object.c | 14 -------------- + data/totem.schemas.in | 12 ------------ + src/totem-object.c | 14 -------------- 2 files changed, 26 deletions(-) commit 0c11f1ba21a48bd154988ce2620f03b89fa4d2f9 @@ -16315,8 +20773,8 @@ is required because of this changeset: http://git.0pointer.de/?p=pulseaudio.git;a=commit;h=f27a50691c8fe45bac7dd6b21fac91a359def3a1 - configure.in | 2 +- - src/backend/bacon-video-widget-gst-0.10.c | 75 +++++++---------------------- + configure.in | 2 +- + src/backend/bacon-video-widget-gst-0.10.c | 75 +++++++------------------------ 2 files changed, 18 insertions(+), 59 deletions(-) commit 95b56216aee80c7e95d0e7d033ff8e1a63852813 @@ -16328,7 +20786,7 @@ Fixed the regex to correctly extract the t param for YouTube video queries again. Closes: bgo#600369 - src/plugins/youtube/totem-youtube.c | 4 ++-- + src/plugins/youtube/totem-youtube.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit ad58124059635e1630dc6d19caa9c0b05b20d88e @@ -16339,7 +20797,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=600438 - .gitignore | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + .gitignore | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) commit 1fcd7b100b9df1f2b8407115aec910ce8cbe5f9c @@ -16359,10 +20817,10 @@ https://bugzilla.gnome.org/show_bug.cgi?id=600425 - src/totem-object.c | 16 ++++++++++++---- - src/totem-options.c | 2 +- - src/totem-private.h | 3 ++- - src/totem-uri.c | 11 ++++------- + src/totem-object.c | 16 ++++++++++++---- + src/totem-options.c | 2 +- + src/totem-private.h | 3 ++- + src/totem-uri.c | 11 ++++------- 4 files changed, 19 insertions(+), 13 deletions(-) commit 99eb9ea5d04b5736f603671d29d04f3df2058efc @@ -16371,7 +20829,7 @@ Updated Spanish translation - po/es.po | 8 +++----- + po/es.po | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) commit d36bbf2e8b883fcc79027734ad854f61e10e74b1 @@ -16380,7 +20838,7 @@ Updated Spanish translation - po/es.po | 180 ++++++++++++++++++++++++++++++-------------------------------- + po/es.po | 180 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 88 insertions(+), 92 deletions(-) commit c582d4ba080c8106453ae2dbeeefc180c825c591 @@ -16389,7 +20847,7 @@ Updating Estonian translation - po/et.po | 19 +++++++++++-------- + po/et.po | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) commit d3e4383c0055e63806944e8b20ecc69dc4038ca3 @@ -16412,10 +20870,10 @@ Part of bug #581857. - browser-plugin/totem-plugin-viewer-options.h | 1 + - browser-plugin/totem-plugin-viewer.c | 16 ++++++++++- - browser-plugin/totemPlugin.cpp | 40 +++++++++++++++++++++++++- - browser-plugin/totemPlugin.h | 1 + + browser-plugin/totem-plugin-viewer-options.h | 1 + + browser-plugin/totem-plugin-viewer.c | 16 ++++++++++- + browser-plugin/totemPlugin.cpp | 40 +++++++++++++++++++++++++++- + browser-plugin/totemPlugin.h | 1 + 4 files changed, 56 insertions(+), 2 deletions(-) commit b99361abb4c9171bde8725b672f4695c8eb6413b @@ -16427,7 +20885,7 @@ When changing the user agent or the referrer while a source already exists, change them on the existing source. - src/backend/bacon-video-widget-gst-0.10.c | 36 ++++++++++++++++++++--------- + src/backend/bacon-video-widget-gst-0.10.c | 36 +++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 11 deletions(-) commit 849aab10072b15d6b6b99ac559500ec9d3bb8010 @@ -16438,8 +20896,8 @@ Part of bug #581857. - src/backend/bacon-video-widget-gst-0.10.c | 105 ++++++++++++++++++++++++++--- - src/backend/bacon-video-widget.h | 3 + + src/backend/bacon-video-widget-gst-0.10.c | 105 +++++++++++++++++++++++++++--- + src/backend/bacon-video-widget.h | 3 + 2 files changed, 100 insertions(+), 8 deletions(-) commit 0db9e34f69cc3b7fd23e3ca81cf1adc141197576 @@ -16451,9 +20909,9 @@ Instead of transporting the value via environment variable, add a gobject property for it. - browser-plugin/totem-plugin-viewer.c | 24 ++++-------- - src/backend/bacon-video-widget-gst-0.10.c | 60 ++++++++++++++++++++++++++--- - src/backend/bacon-video-widget.h | 3 ++ + browser-plugin/totem-plugin-viewer.c | 24 +++++-------- + src/backend/bacon-video-widget-gst-0.10.c | 60 ++++++++++++++++++++++++++++--- + src/backend/bacon-video-widget.h | 3 ++ 3 files changed, 66 insertions(+), 21 deletions(-) commit 24bbd72124a66ce9c8173848cbe0a05add8edfa2 @@ -16462,7 +20920,7 @@ Updated Slovenian translation - po/sl.po | 343 +++++++++++++++++++++++++++++++------------------------------- + po/sl.po | 343 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 174 insertions(+), 169 deletions(-) commit 0719ba0fae5d1bbf9967e0ab3e498996e51e9dac @@ -16471,7 +20929,7 @@ Updated Tamil translation - po/ta.po | 361 +++++++++++++++++++++++++++++++------------------------------- + po/ta.po | 361 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 182 insertions(+), 179 deletions(-) commit 4a44eaed99cd41c482bed490752306b273f497e3 @@ -16480,8 +20938,8 @@ Update tracker plugin for 0.7 API - configure.in | 2 +- - src/plugins/tracker/totem-tracker-widget.c | 383 ++++++++++++++++++++-------- + configure.in | 2 +- + src/plugins/tracker/totem-tracker-widget.c | 383 ++++++++++++++++++++--------- 2 files changed, 273 insertions(+), 112 deletions(-) commit dc268b810e33396085c8e4d1bfae7aefdee4db95 @@ -16494,7 +20952,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=598850 - browser-plugin/totemPlugin.cpp | 1 + + browser-plugin/totemPlugin.cpp | 1 + 1 file changed, 1 insertion(+) commit 7deabe5e6b2c63a18267fd38a1865273ed500503 @@ -16507,7 +20965,7 @@ as it may end up being accessed after those caps have been destroyed. Instead, store the pixel-aspect-ratio fraction values directly. - src/backend/bacon-video-widget-gst-0.10.c | 28 ++++++++++++++++------------ + src/backend/bacon-video-widget-gst-0.10.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) commit 25f582e9a05c4d038167120a1d514738f11e7a8a @@ -16524,7 +20982,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=577030 - src/totem-playlist.c | 107 ++++++++++++++++++++++++++++++++------------------ + src/totem-playlist.c | 107 ++++++++++++++++++++++++++++++++------------------- 1 file changed, 68 insertions(+), 39 deletions(-) commit c013d41bec755a9ddb7b4f8dedbd19d93ab9ec66 @@ -16533,7 +20991,7 @@ Update gst-plugins-base requirements - configure.in | 2 +- + configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit bf8610db9e396f77305761210e71b1b9cc2665bc @@ -16547,7 +21005,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=595304 - src/backend/bacon-video-widget-gst-0.10.c | 20 +++++++++++++++++--- + src/backend/bacon-video-widget-gst-0.10.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) commit 2734f8fa1d08eb1cf5cbc1c55702eaee901b8f28 @@ -16565,7 +21023,7 @@ Updated Swedish translation - po/sv.po | 345 +++++++++++++++++++++++++++++++------------------------------- + po/sv.po | 345 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 172 insertions(+), 173 deletions(-) commit 69a10e91a1c20933981a8757e312aacce32b2c81 @@ -16574,7 +21032,7 @@ Fix thumbnailer's command-line option in help - src/totem-video-thumbnailer.c | 2 +- + src/totem-video-thumbnailer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit f2c5681680e8ea377b65d2536d6d7be25fed39b6 @@ -16585,7 +21043,7 @@ The buffer is a GstMiniObject, not a GObject. - src/backend/gstscreenshot.c | 2 +- + src/backend/gstscreenshot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 38cf9321450187fe91d0b76ca65014595b6a1be8 @@ -16598,7 +21056,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=554750 - lib/totem-scrsaver.c | 3 +-- + lib/totem-scrsaver.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit a2deaf3a6cad2cecfdb3dac47562cef2062be27c @@ -16609,7 +21067,7 @@ when using WebKit, by making a temporary copy of the playlist file. - browser-plugin/totem-plugin-viewer.c | 45 +++++++++++++++++++++++++++++++--- + browser-plugin/totem-plugin-viewer.c | 45 +++++++++++++++++++++++++++++++++--- 1 file changed, 42 insertions(+), 3 deletions(-) commit af8b6fa4701429a53590be8d803429e9b8b4c846 @@ -16625,7 +21083,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=598173 - lib/totem-scrsaver.c | 8 ++++++-- + lib/totem-scrsaver.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) commit b138f4e57e33905c90f30c49aed5d8ed1a0908af @@ -16636,7 +21094,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=598679 - src/totem-interface.c | 1 + + src/totem-interface.c | 1 + 1 file changed, 1 insertion(+) commit 1afdf0783f2582f19cb1a6294be017beee7d8afe @@ -16645,7 +21103,7 @@ Remove unused new_vol variable - src/backend/bacon-video-widget-gst-0.10.c | 3 --- + src/backend/bacon-video-widget-gst-0.10.c | 3 --- 1 file changed, 3 deletions(-) commit 989de441472dc093b89aef1dcf97c2da91ffe69e @@ -16657,7 +21115,7 @@ Otherwise we might have a stuck grab when playing the next playlist item. - src/totem-object.c | 2 ++ + src/totem-object.c | 2 ++ 1 file changed, 2 insertions(+) commit 4feaa041b8349de9ca5a123f96c36cf3036e557e @@ -16671,7 +21129,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=598514 - src/totem-preferences.c | 2 +- + src/totem-preferences.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 3e8acc939bd6df4b6a43493a2f9e941bbb8b946d @@ -16680,7 +21138,7 @@ Updated Greek translation. - po/el.po | 4 ++-- + po/el.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit df00c6940fcaf45b92fcc665434a1d374bc2b7ee @@ -16689,8 +21147,8 @@ Use GDK spawn functions instead of g_spawn_* - .../brasero-disc-recorder/totem-disc-recorder.c | 20 ++++++++++---------- - src/totem-dvb-setup.c | 8 ++++++-- + .../brasero-disc-recorder/totem-disc-recorder.c | 20 ++++++++++---------- + src/totem-dvb-setup.c | 8 ++++++-- 2 files changed, 16 insertions(+), 12 deletions(-) commit 7c39986414220163419644e937600805270c6e63 @@ -16699,7 +21157,7 @@ Updating Estonian translation - po/et.po | 58 +++++++++++++++++++++------------------------------------- + po/et.po | 58 +++++++++++++++++++++------------------------------------- 1 file changed, 21 insertions(+), 37 deletions(-) commit 4f1dcdcfddb9c8dc5c81aec5c02b5fa1b719ba3a @@ -16708,7 +21166,7 @@ Updated Italian translation - po/it.po | 216 ++++++++++++++++++++++++++++++-------------------------------- + po/it.po | 216 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 105 insertions(+), 111 deletions(-) commit 878fb47eb0a1beb5da8049161ee21e1ae105a86b @@ -16726,7 +21184,7 @@ Updated Belarusian translation by Andrey Ladyko - po/be.po | 2 +- + po/be.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit a74d8dd1800b7c0bfbce6c8111f97c14ed6326a6 @@ -16749,8 +21207,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=597097 - data/playlist.ui | 1 + - src/totem-playlist.c | 17 +++++++++++++---- + data/playlist.ui | 1 + + src/totem-playlist.c | 17 +++++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) commit 58a0a43841ed911e33263186327948daf8f996bd @@ -16765,7 +21223,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=597092 - src/backend/bacon-video-widget-gst-0.10.c | 16 +++++++++++++--- + src/backend/bacon-video-widget-gst-0.10.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) commit 4106e25f466042e96d3cf19fad2773bcbd7ff310 @@ -16774,7 +21232,7 @@ .gitignore: ignore more - .gitignore | 2 ++ + .gitignore | 2 ++ 1 file changed, 2 insertions(+) commit 11d6c1ba5a3fad3bfb34d44e0a4205025c6c5b69 @@ -16789,7 +21247,7 @@ Fixes #593967. - src/plugins/totem-python-plugin.c | 4 ++++ + src/plugins/totem-python-plugin.c | 4 ++++ 1 file changed, 4 insertions(+) commit b055fb4ea078311436bbba5130e700e6bf5e93f1 @@ -16801,7 +21259,7 @@ As a workaround for a deadlock, release the global lock when asking playbin2 for a reference to the video sink. - src/backend/bacon-video-widget-gst-0.10.c | 7 +++++++ + src/backend/bacon-video-widget-gst-0.10.c | 7 +++++++ 1 file changed, 7 insertions(+) commit d51eeeaa4702eebd07d1ae76d38950a77c1f3700 @@ -16813,7 +21271,7 @@ On advice given by Sveinn í Felli , the Plural Forms can mercifully be a lot simpler. - po/is.po | 2 +- + po/is.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 1174f20889cc03cf49974423f26efdbfde8456fe @@ -16822,9 +21280,9 @@ Fixed Icelandic, Malay and Uighur translations - po/is.po | 7 ++++--- - po/ms.po | 3 ++- - po/ug.po | 4 +++- + po/is.po | 7 ++++--- + po/ms.po | 3 ++- + po/ug.po | 4 +++- 3 files changed, 9 insertions(+), 5 deletions(-) commit bc97c8be4691a268e7308aaaad6b760a64be1e97 @@ -16833,7 +21291,7 @@ Updated Spanish translation - po/es.po | 300 ++++++++++++++++++++++++++++++++------------------------------ + po/es.po | 300 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 153 insertions(+), 147 deletions(-) commit fc91c757dcb6bd625349f4c8788368d6375325d7 @@ -16845,13 +21303,13 @@ A series of small UI fixes to various dialogues and sidebars to fix spacing and padding issues, and make them pretty. - src/plugins/jamendo/jamendo.py | 1 + - src/plugins/jamendo/jamendo.ui | 184 +++++++++------------------- - src/plugins/opensubtitles/opensubtitles.py | 10 +- - src/plugins/opensubtitles/opensubtitles.ui | 72 ++++++----- - src/plugins/publish/publish-plugin.ui | 7 +- - src/plugins/youtube/youtube.ui | 5 +- - src/totem-open-location.c | 1 + + src/plugins/jamendo/jamendo.py | 1 + + src/plugins/jamendo/jamendo.ui | 184 +++++++++-------------------- + src/plugins/opensubtitles/opensubtitles.py | 10 +- + src/plugins/opensubtitles/opensubtitles.ui | 72 ++++++----- + src/plugins/publish/publish-plugin.ui | 7 +- + src/plugins/youtube/youtube.ui | 5 +- + src/totem-open-location.c | 1 + 7 files changed, 118 insertions(+), 162 deletions(-) commit 2e358177f4d81c94cc6e83c16e7f4bbcb79f504f @@ -16867,7 +21325,7 @@ Work-around that by keeping the file opened with a file descriptor. - browser-plugin/totem-plugin-viewer.c | 22 ++++++++++++++++++---- + browser-plugin/totem-plugin-viewer.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) commit 9639fa75e6b2ed726e7bc9e92ae0e0c71123421e @@ -16876,7 +21334,7 @@ Disable "Remember position" by default - data/totem.schemas.in | 2 +- + data/totem.schemas.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit b58f210029c1cf987df92da1bb112aa578a4a766 @@ -16887,7 +21345,7 @@ This stops GVfs crashing when trying to serialise a NULL value. - src/totem-uri.c | 2 +- + src/totem-uri.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 0cb7a40b56b668f67cbffe2ba0b9a296a68b7fd6 @@ -16896,7 +21354,7 @@ Updated Telugu Translation - po/te.po | 176 ++++++++++++++++++++++++++++++-------------------------------- + po/te.po | 176 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 86 insertions(+), 90 deletions(-) commit 73a42f82b124f026185a63ddd99eb61239d2c1c9 @@ -16905,7 +21363,7 @@ Update Czech translation - po/cs.po | 4 ++-- + po/cs.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit fc75f8401d320e17032803d53b9fed09c3d4f8a1 @@ -16932,7 +21390,7 @@ within a given percentage (of the stream length) of the start of the file. Re-closes: bgo#164918 - src/totem-uri.c | 34 ++++++++++++++++++++++------------ + src/totem-uri.c | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) commit d74b379b8b0e1ecb36259c21301c8c43f562703b @@ -16941,7 +21399,7 @@ Fix single-includes in egg-macros.h - src/egg-macros.h | 2 +- + src/egg-macros.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit a71822e5db8c2bb78d5b970779a39e59ef3cc81c @@ -16955,7 +21413,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=595529 - src/backend/gstscreenshot.c | 17 ++++++++++------- + src/backend/gstscreenshot.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) commit b792db18efc4ffca662bc19c15835a9647345f51 @@ -16966,7 +21424,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=595481 - src/backend/bacon-video-widget-gst-0.10.c | 3 +-- + src/backend/bacon-video-widget-gst-0.10.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit c0c91eb86ba572f3b15e674ba93c66088aa00d76 @@ -16977,7 +21435,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=595481 - src/plugins/screensaver/totem-screensaver.c | 5 +---- + src/plugins/screensaver/totem-screensaver.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) commit 8b8e3be5d3c95a27bc2a6e9b24a9a9cc763bce47 @@ -16986,7 +21444,7 @@ Updated Norwegian bokmål translation. - po/nb.po | 79 +++++++++++++++++++++++++++++++++++--------------------------- + po/nb.po | 79 ++++++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 45 insertions(+), 34 deletions(-) commit 5c64b20855b5990969038c287907d7a34df619e3 @@ -16995,7 +21453,7 @@ Updated Greek translation. - po/el.po | 844 +++++++++++++++++++++++++------------------------------------- + po/el.po | 844 +++++++++++++++++++++++++-------------------------------------- 1 file changed, 338 insertions(+), 506 deletions(-) commit d25c512ff80e2f8ff3ae80167dc5987af0540d88 @@ -17013,8 +21471,8 @@ 2.28.0 - NEWS | 7 +++++++ - configure.in | 4 ++-- + NEWS | 7 +++++++ + configure.in | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) commit d50b09363bbc5d2ba743da3c83a455cc04a3bf0e @@ -17023,7 +21481,7 @@ Upadated Oriya Translation - po/or.po | 386 ++++++++++++++++++++++++++++++-------------------------------- + po/or.po | 386 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 189 insertions(+), 197 deletions(-) commit d9212605547a9c534e838c839916514259bdd5ce @@ -17041,7 +21499,7 @@ Updated Romanian translation - po/ro.po | 354 ++++++++++++++++++++++++++++++-------------------------------- + po/ro.po | 354 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 172 insertions(+), 182 deletions(-) commit 87c950f446f67ee922cef4c8d07e0b99de3aa4c9 @@ -17050,7 +21508,7 @@ Updated Danish translation - help/da/da.po | 743 ++++++++++++++++++++++++++++----------------------------- + help/da/da.po | 743 ++++++++++++++++++++++++++++------------------------------ 1 file changed, 359 insertions(+), 384 deletions(-) commit d4dae747f159615be1b66d938dae5154c135fdec @@ -17068,7 +21526,7 @@ Updated Slovenian translation - po/sl.po | 64 +++++++++++++++++++++++++++++++------------------------------- + po/sl.po | 64 ++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) commit e28cbf68e7de1d46fa65815321cf583bcb350a91 @@ -17077,7 +21535,7 @@ Updated Japanese translation - po/ja.po | 10 +++++++--- + po/ja.po | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) commit 4a1fddcd5a2776d23a14bd06c359281d87235cc8 @@ -17104,7 +21562,7 @@ Added Ukrainian translation - po/uk.po | 767 ++++++++++++++++++++++++++++++++++---------------------------- + po/uk.po | 767 +++++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 423 insertions(+), 344 deletions(-) commit 5a35e59c5b047d110232df2e5d6655ebd877b2d3 @@ -17113,7 +21571,7 @@ Updated Polish translation - po/pl.po | 713 +++++++++++++++++++++++++++----------------------------------- + po/pl.po | 713 +++++++++++++++++++++++++++------------------------------------ 1 file changed, 304 insertions(+), 409 deletions(-) commit 0b44d0309a6bcb2642334648343954a8f9b13ac8 @@ -17137,7 +21595,7 @@ a stream - don't set the volume on the stream on startup when using pulsesink - src/backend/bacon-video-widget-gst-0.10.c | 95 +++++++++++++++++++++++------ + src/backend/bacon-video-widget-gst-0.10.c | 95 ++++++++++++++++++++++++------- 1 file changed, 76 insertions(+), 19 deletions(-) commit 8a9dddc93a1050713bd55cf72e902b6e1cab45f9 @@ -17151,8 +21609,8 @@ The baseURI might not be nil-terminated, so truncate it ourselves. - browser-plugin/totemNPVariantWrapper.h | 1 + - browser-plugin/totemPlugin.cpp | 2 +- + browser-plugin/totemNPVariantWrapper.h | 1 + + browser-plugin/totemPlugin.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) commit e7b035dd531406066f75ee9f28c4ba56ad667464 @@ -17164,16 +21622,16 @@ Don't assume the strings from NPAPI are 0-terminated. Bug #537456. - browser-plugin/npapi.h | 1 + - browser-plugin/totemConePlaylist.cpp | 4 +-- - browser-plugin/totemGMPControls.cpp | 16 ++++----- - browser-plugin/totemGMPPlayer.cpp | 4 +-- - browser-plugin/totemNPNGlue.cpp | 25 +++++++++++-- - browser-plugin/totemNPObject.cpp | 22 ++++++------ - browser-plugin/totemNPObject.h | 2 +- - browser-plugin/totemNarrowSpacePlugin.cpp | 16 ++++----- - browser-plugin/totemPlugin.cpp | 55 +++++++++++++++++++++-------- - browser-plugin/totemPlugin.h | 11 +++--- + browser-plugin/npapi.h | 1 + + browser-plugin/totemConePlaylist.cpp | 4 +-- + browser-plugin/totemGMPControls.cpp | 16 ++++----- + browser-plugin/totemGMPPlayer.cpp | 4 +-- + browser-plugin/totemNPNGlue.cpp | 25 ++++++++++++-- + browser-plugin/totemNPObject.cpp | 22 ++++++------- + browser-plugin/totemNPObject.h | 2 +- + browser-plugin/totemNarrowSpacePlugin.cpp | 16 ++++----- + browser-plugin/totemPlugin.cpp | 55 +++++++++++++++++++++++-------- + browser-plugin/totemPlugin.h | 11 ++++--- 10 files changed, 102 insertions(+), 54 deletions(-) commit f92022ca430c651846b8b83ab022ff67cced8fd6 @@ -17191,7 +21649,7 @@ Update Norwegian bokmål translation. - po/nb.po | 157 ++++++++++++++++++++++++++++++-------------------------------- + po/nb.po | 157 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 77 insertions(+), 80 deletions(-) commit f0c070e2fa9df3c0cb4730f4c202fe571e6f4ca5 @@ -17202,7 +21660,7 @@ Bug #595020. - src/eggfileformatchooser.c | 4 ++-- + src/eggfileformatchooser.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit ce1f9d073de3f9a2189cb678643fe8ef3655c658 @@ -17211,7 +21669,7 @@ Updated Finnish translation - po/fi.po | 8 ++++---- + po/fi.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 481d54f2a87ec637b68b678d13d7529240ec83eb @@ -17220,7 +21678,7 @@ Updated Danish translation - po/da.po | 12 +++++------- + po/da.po | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) commit 8d53eb3bdcb9a027fdbb9e61bde945ae0677a101 @@ -17238,7 +21696,7 @@ Updated Finnish translation - po/fi.po | 201 +++++++++++++++++++++++++++++++++++--------------------------- + po/fi.po | 201 +++++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 113 insertions(+), 88 deletions(-) commit 9480ef5d38d57bbafb7fad3240edea637025177e @@ -17250,7 +21708,7 @@ Syncronise our copy of the libegg file format chooser with libegg, to re-fix bgo#568511. Closes: bgo#594586 - src/eggfileformatchooser.c | 4 ++-- + src/eggfileformatchooser.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 3c0f4e9bd347d98eea737c8c552dccc7584655bd @@ -17259,7 +21717,7 @@ Updated Danish translation - po/da.po | 846 ++++++++++++++++++++++++++++++++++---------------------------- + po/da.po | 846 +++++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 464 insertions(+), 382 deletions(-) commit 8f151b03be0b9e07efb565998c1d13ca38d00e26 @@ -17268,7 +21726,7 @@ Updated Greek translation. - po/el.po | 797 +++++++++++++++++++++++++++++++++++--------------------------- + po/el.po | 797 ++++++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 453 insertions(+), 344 deletions(-) commit 0e0be4d75500ccaede1ba3da5c32760a77f4cb49 @@ -17277,7 +21735,7 @@ Updated Telugu Translations - po/te.po | 561 +++++++++++++------------------------------------------------- + po/te.po | 561 +++++++++++++-------------------------------------------------- 1 file changed, 112 insertions(+), 449 deletions(-) commit b319c3003ba9e3912c6cc8def2e260a1a79deb30 @@ -17286,7 +21744,7 @@ Fixed French translation - po/fr.po | 4 ++-- + po/fr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 28c4d82bc4375044597f90a4f43dc170573ba9b5 @@ -17299,10 +21757,10 @@ get any file information, so remember the display name, and use that in the recent files. - src/totem-menu.c | 8 +++++--- - src/totem-menu.h | 4 +++- - src/totem-object.c | 10 ++++++---- - src/totem-playlist.c | 17 ++++++++++++----- + src/totem-menu.c | 8 +++++--- + src/totem-menu.h | 4 +++- + src/totem-object.c | 10 ++++++---- + src/totem-playlist.c | 17 ++++++++++++----- 4 files changed, 26 insertions(+), 13 deletions(-) commit 93fa0f29dae15fb1fb8ff7e340e390bfb7038127 @@ -17315,7 +21773,7 @@ we might as well use the async functions, saves us hanging on remote files. - src/totem-menu.c | 35 ++++++++++++++++++++++++----------- + src/totem-menu.c | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) commit fa91ff0afbc93df01a302b46d9b5d236e874d702 @@ -17329,7 +21787,7 @@ So unescape it before escaping it again. - src/plugins/youtube/totem-youtube.c | 9 +++++++-- + src/plugins/youtube/totem-youtube.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) commit 2126377898121ae25d9693ec10e59dd88e2f9d8e @@ -17365,7 +21823,7 @@ Updated breton translation - po/br.po | 265 ++++++++++++++++++++++++++++++++------------------------------ + po/br.po | 265 +++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 138 insertions(+), 127 deletions(-) commit b56e81cb532172f8fc5f7d626d58428111c5b98b @@ -17374,8 +21832,8 @@ 2.27.92 - NEWS | 26 ++++++++++++++++++++++++++ - configure.in | 2 +- + NEWS | 26 ++++++++++++++++++++++++++ + configure.in | 2 +- 2 files changed, 27 insertions(+), 1 deletion(-) commit 161d5b29d7bb9293d7a6367e1259ee9728fe6cea @@ -17384,7 +21842,7 @@ Updated Gujarati Translations - po/gu.po | 98 +++++++++++++++++++++++++++++++------------------------------- + po/gu.po | 98 ++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 49 insertions(+), 49 deletions(-) commit 2e2d8159a6b55f2fc131fb5cd0992188e56c3f1e @@ -17393,7 +21851,7 @@ Minor fixes to Catalan translation - po/ca.po | 78 ++++++++++++++++++++++++++++++-------------------------------- + po/ca.po | 78 +++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 38 insertions(+), 40 deletions(-) commit 4e1ee78daaa37164b1cfdb5fe6e9192e8e4124ba @@ -17415,7 +21873,7 @@ Detect that the channels.conf file isn't in the format we expect and error out - src/backend/bacon-video-widget-gst-0.10.c | 11 +++++++++++ + src/backend/bacon-video-widget-gst-0.10.c | 11 +++++++++++ 1 file changed, 11 insertions(+) commit 1b8f5dd85f8b2de2abb0e26bbe93a2a0f2bc5b80 @@ -17424,7 +21882,7 @@ Updating for pa.po by A S Alam - po/pa.po | 776 +++++++++++++++++++++++++++++++++++--------------------------- + po/pa.po | 776 +++++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 433 insertions(+), 343 deletions(-) commit 88e6889207609cf169512bc8eb520387783baa9b @@ -17443,8 +21901,8 @@ Updated Traditional Chinese translation(Hong Kong and Taiwan) - po/zh_HK.po | 110 ++++++++++++++++++++++++++++++++------------------------- - po/zh_TW.po | 112 +++++++++++++++++++++++++++++++++-------------------------- + po/zh_HK.po | 110 ++++++++++++++++++++++++++++++++-------------------------- + po/zh_TW.po | 112 ++++++++++++++++++++++++++++++++++-------------------------- 2 files changed, 125 insertions(+), 97 deletions(-) commit 8ad61e3c67ec97986858ee13e34528ee74ba7eca @@ -17453,7 +21911,7 @@ Updated Greek translation - help/el/el.po | 596 +++++++++++++++++++++++++++++---------------------------- + help/el/el.po | 596 ++++++++++++++++++++++++++++++---------------------------- 1 file changed, 308 insertions(+), 288 deletions(-) commit 994579e892008dc8b7dbc525d541dce0c5c17c68 @@ -17462,7 +21920,7 @@ Updating Estonian translation - po/et.po | 5 +++-- + po/et.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit 1c895947d4c69ec40e6a1e51ffccc4e2487edd13 @@ -17473,7 +21931,7 @@ As we now have an accessor function for the popup itself. - src/totem-fullscreen.c | 14 ++------------ + src/totem-fullscreen.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) commit cb608927f3c43cfeb578745a3454c9b20a002518 @@ -17484,10 +21942,10 @@ With an additional sprinkling of AM_V_GEN - configure.in | 3 +++ - data/Makefile.am | 12 ++++++------ - src/Makefile.am | 12 ++++++------ - src/plugins/media-player-keys/Makefile.am | 4 ++-- + configure.in | 3 +++ + data/Makefile.am | 12 ++++++------ + src/Makefile.am | 12 ++++++------ + src/plugins/media-player-keys/Makefile.am | 4 ++-- 4 files changed, 17 insertions(+), 14 deletions(-) commit 1c99908bf844a464ebf718c545b520fa4090eef6 @@ -17507,7 +21965,7 @@ Show the controls when VLC mode wasn't explicitely asked. - browser-plugin/totemPlugin.cpp | 7 +++++-- + browser-plugin/totemPlugin.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) commit 25a45ed4e16bac71eaed6455f8cf6f5f2f6ee19d @@ -17518,8 +21976,8 @@ Use "music" instead of "audio" as the PA role. - browser-plugin/totem-plugin-viewer.c | 2 +- - src/totem-audio-preview.c | 2 +- + browser-plugin/totem-plugin-viewer.c | 2 +- + src/totem-audio-preview.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit a7580053b0f59e696b31f0253a0dea8adc4bf7f7 @@ -17531,8 +21989,8 @@ Select the directory in which the file is by default, and add the last directory used as a shortcut. - src/totem-uri.c | 25 +++++++++++++------------ - src/totem-uri.h | 2 +- + src/totem-uri.c | 25 +++++++++++++------------ + src/totem-uri.h | 2 +- 2 files changed, 14 insertions(+), 13 deletions(-) commit 0992cff4ccdc6c9eaedcb7f0583e8a91a26c5900 @@ -17544,7 +22002,7 @@ And don't use the filename to get it, because it doesn't have any path information whatsoever... - src/totem-playlist.c | 14 +++++++------- + src/totem-playlist.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) commit 633ba780182807db04efb1943ddb167f341a7802 @@ -17555,7 +22013,7 @@ Meaning that it has an emblem. - src/totem-menu.c | 2 +- + src/totem-menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 71eacd3b43b1f256fe6e2277f34de9f0cc6ca6d1 @@ -17567,8 +22025,8 @@ Remove the title vs. metadata UI updates distinction. There won't be many cases where it's important. - src/backend/bacon-video-widget-gst-0.10.c | 29 +---------------------------- - src/totem-object.c | 14 -------------- + src/backend/bacon-video-widget-gst-0.10.c | 29 +---------------------------- + src/totem-object.c | 14 -------------- 2 files changed, 1 insertion(+), 42 deletions(-) commit c3a784b72a70b9fae5ef9279faa15ea4dc49933c @@ -17580,8 +22038,8 @@ Override the HTTP user-agents for Quicktime and Windows Media Player, fixes playback of the Apple trailers. - browser-plugin/totem-plugin-viewer.c | 4 +--- - browser-plugin/totemPlugin.cpp | 21 +++++++++++++++++---- + browser-plugin/totem-plugin-viewer.c | 4 +--- + browser-plugin/totemPlugin.cpp | 21 +++++++++++++++++---- 2 files changed, 18 insertions(+), 7 deletions(-) commit d3180aafb8597a6244a9e98425c721b1a6b0a33c @@ -17590,7 +22048,7 @@ Allow overriding the HTTP user-agent in the video widget - src/backend/bacon-video-widget-gst-0.10.c | 16 ++++++++++++++++ + src/backend/bacon-video-widget-gst-0.10.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) commit 840d3f23845afbb030404c1ae116cf79f73d5b40 @@ -17599,7 +22057,7 @@ Update .gitignore - .gitignore | 85 ++++++++++++++++++++++++++++++++---------------------------- + .gitignore | 85 ++++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 46 insertions(+), 39 deletions(-) commit 83e149cec807d519772f95176873f0552eb54181 @@ -17608,7 +22066,7 @@ Update Norwegian bokmål translation. - po/nb.po | 213 ++++++++++++++++++++++++++++++++------------------------------ + po/nb.po | 213 +++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 111 insertions(+), 102 deletions(-) commit 4b47819aa913a5879fb9ce4aa4db3b8e11c8b6e9 @@ -17626,7 +22084,7 @@ Updated Marathi Translations - po/mr.po | 25 +++++++++++++++---------- + po/mr.po | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) commit e7104fbcf4ee572c58992c130474147e9daa5ba9 @@ -17662,7 +22120,7 @@ Updated Basque language - po/eu.po | 64 +++++++++++++++++++++++++++++++++++++++++--------------------- + po/eu.po | 64 ++++++++++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 42 insertions(+), 22 deletions(-) commit 305504fec9765d25885fa6abfb391e4e5dd3b1dc @@ -17671,7 +22129,7 @@ Updated French translation - po/fr.po | 182 +++++++++----------------------------------------------------- + po/fr.po | 182 +++++++++------------------------------------------------------ 1 file changed, 26 insertions(+), 156 deletions(-) commit cec00b7b3fefd0ba09c927c667eadb80ee335881 @@ -17692,8 +22150,8 @@ Remove unnecessary "invisible-char" properties from UI files. Removes one translatable string. Closes: bgo#593221 - src/plugins/jamendo/jamendo.ui | 1 - - src/plugins/screenshot/gnome-screenshot.ui | 1 - + src/plugins/jamendo/jamendo.ui | 1 - + src/plugins/screenshot/gnome-screenshot.ui | 1 - 2 files changed, 2 deletions(-) commit a10688bdc49ff417a9bc32876e77c6c983bf34c2 @@ -17705,7 +22163,7 @@ Fix the plugin manager's UI file so that the "Configure" button uses images properly, instead of embedding them as child widgets. Closes: bgo#592760 - data/plugins.ui | 74 ++++++------------------------------------------------- + data/plugins.ui | 74 +++++++-------------------------------------------------- 1 file changed, 8 insertions(+), 66 deletions(-) commit 4d6e27ba6185ee5c90837f2bcf64b4cc720ac42a @@ -17717,8 +22175,8 @@ Patch to add quotes around ^# for grep so that the build doesn't print warnings on Solaris. - data/mime-functions.sh | 4 ++-- - data/mime-type-include.sh | 2 +- + data/mime-functions.sh | 4 ++-- + data/mime-type-include.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) commit 5b19ea090b6e896d9c2b9f3a6b12fad4609d1276 @@ -17727,7 +22185,7 @@ Updated Gujarati Translations - po/gu.po | 503 ++++++++++++++++++++++---------------------------------------- + po/gu.po | 503 +++++++++++++++++++++++---------------------------------------- 1 file changed, 180 insertions(+), 323 deletions(-) commit 1c3fe9c8aba56b953dade726f902ea55c9392f60 @@ -17772,7 +22230,7 @@ Bug 593136 – Fixed typo - browser-plugin/totem-plugin-viewer.c | 2 +- + browser-plugin/totem-plugin-viewer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 574bfee312a83fd3487c177f7aa5bca7b1e239c6 @@ -17790,7 +22248,7 @@ Updated Tamil Translations - po/ta.po | 252 +++++++++++++++++++++++++++++++++----------------------------- + po/ta.po | 252 +++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 134 insertions(+), 118 deletions(-) commit 149be2e8051e3e1605f387b348585a1ec37b5ee1 @@ -17799,7 +22257,7 @@ Updated Brazilian Portuguese translation - po/pt_BR.po | 49 +++++++++++++++++++++++++++++++------------------ + po/pt_BR.po | 49 +++++++++++++++++++++++++++++++------------------ 1 file changed, 31 insertions(+), 18 deletions(-) commit 105edc4228b40f00fcf0328ea7af77bd2fa7494b @@ -17808,7 +22266,7 @@ Minor update to Catalan translation - po/ca.po | 10 ++++------ + po/ca.po | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) commit 6c9112bee1042cf10ef2694480953befc0eb1bab @@ -17835,7 +22293,7 @@ Updated German translation - po/de.po | 289 ++++++++++++++++++++++++++++++++------------------------------ + po/de.po | 289 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 149 insertions(+), 140 deletions(-) commit 629f04d99cf115418b4a6de4ef59d43c86ea8a68 @@ -17853,7 +22311,7 @@ Updated Bulgarian translation - po/bg.po | 2 +- + po/bg.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 8bf15d2c9435f5ca9b45e8ff75750f1818ea08a9 @@ -17862,7 +22320,7 @@ Updated Bulgarian translation - po/bg.po | 6 +++--- + po/bg.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 254257a24d4535b1574f9b0e86419b83150c82d8 @@ -17871,7 +22329,7 @@ Some more fixes which refers to bug #591916 - help/de/de.po | 6 +++--- + help/de/de.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 3f081898efc85b05eab304a869d04b83d3b2f15e @@ -17880,7 +22338,7 @@ Fixed bug #591916 - help/de/de.po | 4 ++-- + help/de/de.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit d8b8768e2e3a2afe8b9caf79106806c70e402ded @@ -17898,7 +22356,7 @@ Updated Spanish translation - po/es.po | 218 +++++++++++++++++++++++++++++++++----------------------------- + po/es.po | 218 +++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 115 insertions(+), 103 deletions(-) commit ffe1aeeb519ec034b2587d5a999f53768ddb2eab @@ -17916,7 +22374,7 @@ Updated Galician Translation - po/gl.po | 125 ++++++++++++++++++++++++++++++++++++-------------------------- + po/gl.po | 125 ++++++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 72 insertions(+), 53 deletions(-) commit 8569e3c7632571bf630059f9d3c4bc2387999800 @@ -17925,7 +22383,7 @@ Updating Estonian translation - po/et.po | 25 +++++++++++++++++++------ + po/et.po | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) commit 8092789a916dbb1209715033fbefa9794ec5fbd1 @@ -17934,7 +22392,7 @@ Add missing files to POTFILES.in - po/POTFILES.in | 2 ++ + po/POTFILES.in | 2 ++ 1 file changed, 2 insertions(+) commit 5f1ea570b6dbe8874b44c8a891515dd817624155 @@ -17943,7 +22401,7 @@ Updated Galician Translation - po/gl.po | 124 ++++++++++++++++++++++++++++---------------------------------- + po/gl.po | 124 ++++++++++++++++++++++++++++----------------------------------- 1 file changed, 55 insertions(+), 69 deletions(-) commit 1a2a8a0dfee33f8d2aeb4bbdbb6290afda1f5443 @@ -17963,7 +22421,7 @@ Updated French translation - po/fr.po | 748 ++++++++++++++++++++++++++++++++++---------------------------- + po/fr.po | 748 ++++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 407 insertions(+), 341 deletions(-) commit c247f4944ea86dd7a3f6bc43fc7b73d320a28fa3 @@ -18001,7 +22459,7 @@ Makes gcc happy - src/backend/bacon-video-widget-gst-0.10.c | 2 +- + src/backend/bacon-video-widget-gst-0.10.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 94119986f43e49cd31fbe2a80643a616da8fcb23 @@ -18023,7 +22481,7 @@ it's useless to start checking for metadata when we can't open the file. - src/backend/bacon-video-widget-gst-0.10.c | 14 ++++++++------ + src/backend/bacon-video-widget-gst-0.10.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) commit a984acaedf7fd15bd94061bea74fb804f9fcc858 @@ -18032,8 +22490,8 @@ Updated Traditional Chinese translation(Hong Kong and Taiwan) - po/zh_HK.po | 716 +++++++++++++++++++++++++++++++--------------------------- - po/zh_TW.po | 718 ++++++++++++++++++++++++++++++++--------------------------- + po/zh_HK.po | 716 ++++++++++++++++++++++++++++++++--------------------------- + po/zh_TW.po | 718 +++++++++++++++++++++++++++++++++--------------------------- 2 files changed, 778 insertions(+), 656 deletions(-) commit 71aa3641b10154204cbf07c33b8ea3a184d88a82 @@ -18045,7 +22503,7 @@ Add ability to disable the film borders on thumbnails for scripting purposes. - src/totem-video-thumbnailer.c | 11 +++++++---- + src/totem-video-thumbnailer.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) commit 75ef216e7fd62ff8543644f4a9130f032cb67d4e @@ -18058,17 +22516,17 @@ interface can easily be kept consistent with the GNOME Screenshot dialogue. Permission for the licence exception was gained by e-mail. Closes: bgo#589755 - src/plugins/screenshot/Makefile.am | 4 +- - src/plugins/screenshot/gnome-screenshot-widget.c | 431 ++++++++++++++++++++++ - src/plugins/screenshot/gnome-screenshot-widget.h | 71 ++++ - src/plugins/screenshot/gnome-screenshot.ui | 149 ++++++++ - src/plugins/screenshot/totem-gallery.c | 6 +- - src/plugins/screenshot/totem-screenshot-plugin.c | 35 +- - src/plugins/screenshot/totem-screenshot-plugin.h | 2 +- - src/plugins/screenshot/totem-screenshot.c | 188 ++++------ - src/plugins/screenshot/totem-screenshot.h | 13 +- - src/totem-uri.c | 13 - - src/totem-uri.h | 1 - + src/plugins/screenshot/Makefile.am | 4 +- + src/plugins/screenshot/gnome-screenshot-widget.c | 431 +++++++++++++++++++++++ + src/plugins/screenshot/gnome-screenshot-widget.h | 71 ++++ + src/plugins/screenshot/gnome-screenshot.ui | 149 ++++++++ + src/plugins/screenshot/totem-gallery.c | 6 +- + src/plugins/screenshot/totem-screenshot-plugin.c | 35 +- + src/plugins/screenshot/totem-screenshot-plugin.h | 2 +- + src/plugins/screenshot/totem-screenshot.c | 188 ++++------ + src/plugins/screenshot/totem-screenshot.h | 13 +- + src/totem-uri.c | 13 - + src/totem-uri.h | 1 - 11 files changed, 751 insertions(+), 162 deletions(-) commit 0d24ea5c04fe05785ab8a45801291e0785c33180 @@ -18089,7 +22547,7 @@ Only scale the logo pixbuf when necessary, due to now limiting the size of the logo to 256px. Closes: bgo#514089 - src/backend/bacon-video-widget-gst-0.10.c | 23 +++++++++++++---------- + src/backend/bacon-video-widget-gst-0.10.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) commit 2aff9b91410a9223822680cb577c2f2dc6f036c3 @@ -18098,7 +22556,7 @@ Bug 589808 – Set always-show-image on some menu items - src/totem-menu.c | 11 +++++++++++ + src/totem-menu.c | 11 +++++++++++ 1 file changed, 11 insertions(+) commit 32f456f8f4a4fd287673a974c58cfe2f0557d24b @@ -18110,12 +22568,12 @@ Use the new Totem logo in both the browser plugin and main player, and simplify logo handling in BVW. Closes: bgo#480200 - browser-plugin/totem-plugin-viewer.c | 54 +---------------------------- - data/Makefile.am | 1 - - data/totem_logo.png | Bin 185953 -> 0 bytes - src/Makefile.am | 1 - - src/backend/bacon-video-widget-gst-0.10.c | 44 ++++++++--------------- - src/totem.c | 2 +- + browser-plugin/totem-plugin-viewer.c | 54 +----------------------------- + data/Makefile.am | 1 - + data/totem_logo.png | Bin 185953 -> 0 bytes + src/Makefile.am | 1 - + src/backend/bacon-video-widget-gst-0.10.c | 44 ++++++++---------------- + src/totem.c | 2 +- 6 files changed, 16 insertions(+), 86 deletions(-) commit 45f656a13c4c3f0a404724279a63ee520d551b50 @@ -18127,7 +22585,7 @@ Display cover images when available. Currently doesn't display cover images instead of visualisations. Helps: bgo#581249 - src/backend/bacon-video-widget-gst-0.10.c | 83 ++++++++++++++++++++++------- + src/backend/bacon-video-widget-gst-0.10.c | 83 ++++++++++++++++++++++++------- 1 file changed, 65 insertions(+), 18 deletions(-) commit ca8812c646c744604ffbafe4dfe6230424671c0e @@ -18136,9 +22594,9 @@ Bug 588569 – Add plugin authoring tutorial - docs/reference/Makefile.am | 2 +- - docs/reference/totem-docs.xml | 5 ++ - docs/reference/totem-plugins.xml | 147 ++++++++++++++++++++++++++++++++++++++ + docs/reference/Makefile.am | 2 +- + docs/reference/totem-docs.xml | 5 ++ + docs/reference/totem-plugins.xml | 147 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 153 insertions(+), 1 deletion(-) commit 8b051630fb7472d21a5d632d206a00366cf2337e @@ -18149,85 +22607,85 @@ Patch modified to update the PO files with the changes. - data/totem.schemas.in | 2 +- - data/totem.ui | 4 ++-- - po/ar.po | 6 +++--- - po/as.po | 4 ++-- - po/ast.po | 6 +++--- - po/az.po | 4 ++-- - po/be.po | 4 ++-- - po/be@latin.po | 6 +++--- - po/bg.po | 6 +++--- - po/bn.po | 4 ++-- - po/bn_IN.po | 6 +++--- - po/br.po | 6 +++--- - po/ca.po | 6 +++--- - po/crh.po | 6 +++--- - po/cs.po | 6 +++--- - po/cy.po | 4 ++-- - po/da.po | 6 +++--- - po/de.po | 6 +++--- - po/dz.po | 4 ++-- - po/el.po | 6 +++--- - po/en_CA.po | 4 ++-- - po/en_GB.po | 6 +++--- - po/es.po | 6 +++--- - po/et.po | 6 +++--- - po/eu.po | 6 +++--- - po/fa.po | 4 ++-- - po/fi.po | 6 +++--- - po/fr.po | 6 +++--- - po/ga.po | 6 +++--- - po/gl.po | 6 +++--- - po/gu.po | 6 +++--- - po/he.po | 6 +++--- - po/hi.po | 4 ++-- - po/hr.po | 4 ++-- - po/hu.po | 6 +++--- - po/id.po | 4 ++-- - po/it.po | 6 +++--- - po/ja.po | 6 +++--- - po/ka.po | 4 ++-- - po/kn.po | 6 +++--- - po/ko.po | 6 +++--- - po/ku.po | 4 ++-- - po/lt.po | 6 +++--- - po/lv.po | 4 ++-- - po/mai.po | 6 +++--- - po/mg.po | 4 ++-- - po/mk.po | 4 ++-- - po/ml.po | 4 ++-- - po/mr.po | 4 ++-- - po/nb.po | 6 +++--- - po/ne.po | 4 ++-- - po/nl.po | 6 +++--- - po/nn.po | 4 ++-- - po/oc.po | 4 ++-- - po/or.po | 8 ++++---- - po/pa.po | 6 +++--- - po/pl.po | 6 +++--- - po/pt.po | 6 +++--- - po/pt_BR.po | 6 +++--- - po/ro.po | 6 +++--- - po/ru.po | 6 +++--- - po/rw.po | 4 ++-- - po/sk.po | 6 +++--- - po/sl.po | 6 +++--- - po/sq.po | 4 ++-- - po/sr.po | 4 ++-- - po/sr@latin.po | 4 ++-- - po/sv.po | 6 +++--- - po/ta.po | 6 +++--- - po/te.po | 4 ++-- - po/th.po | 6 +++--- - po/tr.po | 6 +++--- - po/uk.po | 6 +++--- - po/vi.po | 6 +++--- - po/wa.po | 4 ++-- - po/xh.po | 4 ++-- - po/zh_CN.po | 6 +++--- - po/zh_HK.po | 6 +++--- - po/zh_TW.po | 6 +++--- + data/totem.schemas.in | 2 +- + data/totem.ui | 4 ++-- + po/ar.po | 6 +++--- + po/as.po | 4 ++-- + po/ast.po | 6 +++--- + po/az.po | 4 ++-- + po/be.po | 4 ++-- + po/be@latin.po | 6 +++--- + po/bg.po | 6 +++--- + po/bn.po | 4 ++-- + po/bn_IN.po | 6 +++--- + po/br.po | 6 +++--- + po/ca.po | 6 +++--- + po/crh.po | 6 +++--- + po/cs.po | 6 +++--- + po/cy.po | 4 ++-- + po/da.po | 6 +++--- + po/de.po | 6 +++--- + po/dz.po | 4 ++-- + po/el.po | 6 +++--- + po/en_CA.po | 4 ++-- + po/en_GB.po | 6 +++--- + po/es.po | 6 +++--- + po/et.po | 6 +++--- + po/eu.po | 6 +++--- + po/fa.po | 4 ++-- + po/fi.po | 6 +++--- + po/fr.po | 6 +++--- + po/ga.po | 6 +++--- + po/gl.po | 6 +++--- + po/gu.po | 6 +++--- + po/he.po | 6 +++--- + po/hi.po | 4 ++-- + po/hr.po | 4 ++-- + po/hu.po | 6 +++--- + po/id.po | 4 ++-- + po/it.po | 6 +++--- + po/ja.po | 6 +++--- + po/ka.po | 4 ++-- + po/kn.po | 6 +++--- + po/ko.po | 6 +++--- + po/ku.po | 4 ++-- + po/lt.po | 6 +++--- + po/lv.po | 4 ++-- + po/mai.po | 6 +++--- + po/mg.po | 4 ++-- + po/mk.po | 4 ++-- + po/ml.po | 4 ++-- + po/mr.po | 4 ++-- + po/nb.po | 6 +++--- + po/ne.po | 4 ++-- + po/nl.po | 6 +++--- + po/nn.po | 4 ++-- + po/oc.po | 4 ++-- + po/or.po | 8 ++++---- + po/pa.po | 6 +++--- + po/pl.po | 6 +++--- + po/pt.po | 6 +++--- + po/pt_BR.po | 6 +++--- + po/ro.po | 6 +++--- + po/ru.po | 6 +++--- + po/rw.po | 4 ++-- + po/sk.po | 6 +++--- + po/sl.po | 6 +++--- + po/sq.po | 4 ++-- + po/sr.po | 4 ++-- + po/sr@latin.po | 4 ++-- + po/sv.po | 6 +++--- + po/ta.po | 6 +++--- + po/te.po | 4 ++-- + po/th.po | 6 +++--- + po/tr.po | 6 +++--- + po/uk.po | 6 +++--- + po/vi.po | 6 +++--- + po/wa.po | 4 ++-- + po/xh.po | 4 ++-- + po/zh_CN.po | 6 +++--- + po/zh_HK.po | 6 +++--- + po/zh_TW.po | 6 +++--- 79 files changed, 207 insertions(+), 207 deletions(-) commit 5cb60a8b69c253e214ed4165e9ea5318e2de5104 @@ -18238,7 +22696,7 @@ To minimise confusion. - configure.in | 4 ++-- + configure.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 2bafe8f16c9139097161f33b8f88ceb5a0d89c81 @@ -18250,7 +22708,7 @@ Since the vala plugin fails to build for me with 0.7.4 (see bug #590759). - configure.in | 2 +- + configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 057750ad34482076abef7f228620ed544683c8a2 @@ -18259,7 +22717,7 @@ Updated Irish translation - po/ga.po | 42 ++++++++++++++++++++++++++---------------- + po/ga.po | 42 ++++++++++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 16 deletions(-) commit da5da21123722ea221e9ba9efd41b68b12bd8fe6 @@ -18268,7 +22726,7 @@ Updated Norwegian bokmål translation. - po/nb.po | 697 +++++++++++++++++++++++++++++++++----------------------------- + po/nb.po | 697 ++++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 376 insertions(+), 321 deletions(-) commit 5f0e9579d87c393a8d1acd59111b1e83135c8959 @@ -18286,7 +22744,7 @@ Updated Irish translation - po/ga.po | 200 +++++++++++++++++++++++++++++++------------------------------- + po/ga.po | 200 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 100 insertions(+), 100 deletions(-) commit ce9e754fb03fa91e630c51592de942768ba21e47 @@ -18298,7 +22756,7 @@ Add key bindings for Home and End, to seek to the start of the stream and start playing the next stream, respectively. Closes: bgo#590770 - src/totem-object.c | 4 ++++ + src/totem-object.c | 4 ++++ 1 file changed, 4 insertions(+) commit 8c4db8512f18cdf0324a329029a3c6685c6ecf01 @@ -18307,7 +22765,7 @@ Updated Spanish translation - po/es.po | 565 ++++++++++++++++++++++++++++++++++---------------------------- + po/es.po | 565 +++++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 312 insertions(+), 253 deletions(-) commit 108189b30a6794391f476eee0ff0b0dbf4c60668 @@ -18337,7 +22795,7 @@ Fix compiler warning about passing incompatible pointer type. Closes: bgo#590566 - src/plugins/totem-python-module.c | 2 +- + src/plugins/totem-python-module.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 1688811a60922a9f259f4f61557f5c84f4e7c962 @@ -18348,7 +22806,7 @@ Fix compiler warning about unhandled enum value. Closes: bgo#590565 - browser-plugin/totemPlugin.cpp | 4 ++++ + browser-plugin/totemPlugin.cpp | 4 ++++ 1 file changed, 4 insertions(+) commit 7bf506ef9cb3a370423640f0692a72be5d621d42 @@ -18357,7 +22815,7 @@ Use signal blocking, rather than disconnecting - src/totem-preferences.c | 12 ++++++------ + src/totem-preferences.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) commit 3d97dc944581146ae81ca20f9b7e43d2780c89bf @@ -18368,7 +22826,7 @@ See https://bugzilla.redhat.com/show_bug.cgi?id=514914 - src/totem-menu.c | 20 +++++++++++++++----- + src/totem-menu.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) commit 267fe451b59d9ae544ae3d3cc3ebd507deb02db0 @@ -18386,7 +22844,7 @@ Updated Tamil translation - po/ta.po | 534 ++++++++++++++++++++++++++++++++++---------------------------- + po/ta.po | 534 +++++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 295 insertions(+), 239 deletions(-) commit d99946cf8933a9188f663a9e9fe0cb4808588d1f @@ -18395,7 +22853,7 @@ Updating Estonian translation - po/et.po | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++---------- + po/et.po | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 58 insertions(+), 11 deletions(-) commit 011a99b05e764798b90bcd7dff94ec4dfad49101 @@ -18406,23 +22864,23 @@ Tidied up the debugging infrastructure as well. - browser-plugin/totemNPObject.h | 40 +++------- - browser-plugin/totemPlugin.cpp | 78 ++++++++++---------- - browser-plugin/totemPluginGlue.cpp | 19 ++--- - configure.in | 13 ---- - src/Makefile.am | 3 +- - src/backend/Makefile.am | 3 +- - src/backend/debug.h | 45 ----------- - .../properties/bacon-video-widget-properties.c | 2 - - src/plugins/screenshot/totem-screenshot.c | 1 - - src/plugins/totem-python-module.c | 9 +-- - src/plugins/totem-python-plugin.c | 7 +- - src/totem-dvb-setup.c | 1 - - src/totem-menu.c | 2 +- - src/totem-object.c | 2 - - src/totem-playlist.c | 4 +- - src/totem-preferences.c | 2 - - src/totem-profile.h | 57 ++++++++++++++ + browser-plugin/totemNPObject.h | 40 +++-------- + browser-plugin/totemPlugin.cpp | 78 +++++++++++----------- + browser-plugin/totemPluginGlue.cpp | 19 +++--- + configure.in | 13 ---- + src/Makefile.am | 3 +- + src/backend/Makefile.am | 3 +- + src/backend/debug.h | 45 ------------- + .../properties/bacon-video-widget-properties.c | 2 - + src/plugins/screenshot/totem-screenshot.c | 1 - + src/plugins/totem-python-module.c | 9 ++- + src/plugins/totem-python-plugin.c | 7 +- + src/totem-dvb-setup.c | 1 - + src/totem-menu.c | 2 +- + src/totem-object.c | 2 - + src/totem-playlist.c | 4 +- + src/totem-preferences.c | 2 - + src/totem-profile.h | 57 ++++++++++++++++ 17 files changed, 128 insertions(+), 160 deletions(-) commit 9a9e4c909da87157c532d41ff4ea20e7c2e1760c @@ -18431,8 +22889,8 @@ Added missing libegg file - src/Makefile.am | 1 + - src/egg-macros.h | 154 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ + src/Makefile.am | 1 + + src/egg-macros.h | 154 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 155 insertions(+) commit a90406a1f5876696bc1598965b5c14cf04086ee3 @@ -18441,7 +22899,7 @@ Updated Czech help translation by Marek Cernocky - help/cs/cs.po | 626 ++++++++++++++++++++++++++++++--------------------------- + help/cs/cs.po | 626 +++++++++++++++++++++++++++++++--------------------------- 1 file changed, 331 insertions(+), 295 deletions(-) commit d30b179e7e5a04fe5fe4d72b50df802f04cbafc2 @@ -18450,9 +22908,9 @@ Updated files from libegg master - src/eggdesktopfile.c | 4 +- - src/eggfileformatchooser.c | 572 ++++++++++++++++++++++++++++++++++++++++++-- - src/eggfileformatchooser.h | 18 ++ + src/eggdesktopfile.c | 4 +- + src/eggfileformatchooser.c | 572 +++++++++++++++++++++++++++++++++++++++++++-- + src/eggfileformatchooser.h | 18 ++ 3 files changed, 569 insertions(+), 25 deletions(-) commit 3b42e1d9e1d2e0e3f922797a2cbff2f36c512b92 @@ -18461,8 +22919,8 @@ Added missing tooltips to menu actions - data/totem.ui | 5 +++++ - src/totem-menu.c | 8 +++----- + data/totem.ui | 5 +++++ + src/totem-menu.c | 8 +++----- 2 files changed, 8 insertions(+), 5 deletions(-) commit 6fdfd1ca71ee5d0c82ba1915df981fd26b0a7b7f @@ -18471,9 +22929,9 @@ Bug 484142 – Show menu item descriptions in status bar - src/totem-menu.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++ - src/totem-statusbar.c | 23 +++++++++++++++++++++ - src/totem-statusbar.h | 3 +++ + src/totem-menu.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++ + src/totem-statusbar.c | 23 +++++++++++++++++++++ + src/totem-statusbar.h | 3 +++ 3 files changed, 81 insertions(+) commit af11b1a7338d87bb5707490e332e7fd41547ff3f @@ -18482,14 +22940,14 @@ Use Pango attributes instead of boldify and italicise functions - data/plugins.ui | 12 +++ - data/properties.ui | 51 +++++++++++ - data/totem.ui | 23 ++++- - .../properties/bacon-video-widget-properties.c | 14 +-- - src/plugins/totem-plugin-manager.c | 13 --- - src/totem-interface.c | 92 -------------------- - src/totem-interface.h | 4 - - src/totem-preferences.c | 9 -- + data/plugins.ui | 12 +++ + data/properties.ui | 51 ++++++++++++ + data/totem.ui | 23 +++++- + .../properties/bacon-video-widget-properties.c | 14 +--- + src/plugins/totem-plugin-manager.c | 13 --- + src/totem-interface.c | 92 ---------------------- + src/totem-interface.h | 4 - + src/totem-preferences.c | 9 --- 8 files changed, 87 insertions(+), 131 deletions(-) commit 7c34a2a8b84c55537c01183dea6f8eabedcb42d0 @@ -18501,7 +22959,7 @@ Applied commit f53e438e0e530e5cbbd7ed607df498310645013d again after it was accidentally reverted in cce286bf32d4b800000aa9f731adbd8574ca5339. - src/totem-object.c | 18 +++++++++--------- + src/totem-object.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) commit 454c33d8762e8ed313994ebdf4f8b821596dd80c @@ -18513,13 +22971,13 @@ Add functionality to remember the current position of a stream when pausing or closing, by saving it in a GIO metadata attribute. Closes: bgo#164918 - data/totem.schemas.in | 11 ++++++ - data/totem.ui | 70 ++++++++++++++++++++++++++++++++++++ - src/totem-object.c | 27 +++++++------- - src/totem-preferences.c | 42 ++++++++++++++++++++++ - src/totem-private.h | 1 + - src/totem-uri.c | 90 +++++++++++++++++++++++++++++++++++++++++++++++ - src/totem-uri.h | 3 ++ + data/totem.schemas.in | 11 ++++++ + data/totem.ui | 70 ++++++++++++++++++++++++++++++++++++++ + src/totem-object.c | 27 ++++++++------- + src/totem-preferences.c | 42 +++++++++++++++++++++++ + src/totem-private.h | 1 + + src/totem-uri.c | 90 +++++++++++++++++++++++++++++++++++++++++++++++++ + src/totem-uri.h | 3 ++ 7 files changed, 232 insertions(+), 12 deletions(-) commit 70587b630000c43e7bc72d5763ba95043ab809db @@ -18532,7 +22990,7 @@ improve memory handling performance when shuffling the playlist. Closes: bgo#577605 - src/totem-playlist.c | 54 +++++++++++++++++++++++++------------------------- + src/totem-playlist.c | 54 ++++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) commit 54258966077c579f6ac94ef688fe34061f0c8a77 @@ -18550,8 +23008,8 @@ 2.27.2 - NEWS | 26 ++++++++++++++++++++++++++ - configure.in | 2 +- + NEWS | 26 ++++++++++++++++++++++++++ + configure.in | 2 +- 2 files changed, 27 insertions(+), 1 deletion(-) commit a7777d81fab0fff05e096917c6e0b3705d01b9e3 @@ -18565,15 +23023,15 @@ playbin2 is broken when loading the subtitle after we've opened the file. - browser-plugin/totem-plugin-viewer.c | 2 +- - src/backend/bacon-video-widget-gst-0.10.c | 34 ++++++++--------------------- - src/backend/bacon-video-widget.h | 3 +-- - src/backend/bvw-test.c | 2 +- - src/totem-audio-preview.c | 2 +- - src/totem-object.c | 5 ++--- - src/totem-properties-view.c | 2 +- - src/totem-video-indexer.c | 2 +- - src/totem-video-thumbnailer.c | 2 +- + browser-plugin/totem-plugin-viewer.c | 2 +- + src/backend/bacon-video-widget-gst-0.10.c | 34 ++++++++----------------------- + src/backend/bacon-video-widget.h | 3 +-- + src/backend/bvw-test.c | 2 +- + src/totem-audio-preview.c | 2 +- + src/totem-object.c | 5 ++--- + src/totem-properties-view.c | 2 +- + src/totem-video-indexer.c | 2 +- + src/totem-video-thumbnailer.c | 2 +- 9 files changed, 18 insertions(+), 36 deletions(-) commit 9eab91849905a403ac9309351edba39a3fcb0995 @@ -18586,15 +23044,15 @@ eventually be handled on-the-fly (without reloading the movie itself). - browser-plugin/totem-plugin-viewer.c | 2 +- - src/backend/bacon-video-widget-gst-0.10.c | 34 +++++++++++++++++++++-------- - src/backend/bacon-video-widget.h | 3 ++- - src/backend/bvw-test.c | 2 +- - src/totem-audio-preview.c | 2 +- - src/totem-object.c | 5 +++-- - src/totem-properties-view.c | 2 +- - src/totem-video-indexer.c | 2 +- - src/totem-video-thumbnailer.c | 2 +- + browser-plugin/totem-plugin-viewer.c | 2 +- + src/backend/bacon-video-widget-gst-0.10.c | 34 +++++++++++++++++++++++-------- + src/backend/bacon-video-widget.h | 3 ++- + src/backend/bvw-test.c | 2 +- + src/totem-audio-preview.c | 2 +- + src/totem-object.c | 5 +++-- + src/totem-properties-view.c | 2 +- + src/totem-video-indexer.c | 2 +- + src/totem-video-thumbnailer.c | 2 +- 9 files changed, 36 insertions(+), 18 deletions(-) commit f092b508ce04d1198840bebc36c834b6c3aa29de @@ -18605,7 +23063,7 @@ Remove "xine-lib feature parity" hack. - src/backend/bacon-video-widget-gst-0.10.c | 33 ++--------------------------- + src/backend/bacon-video-widget-gst-0.10.c | 33 ++----------------------------- 1 file changed, 2 insertions(+), 31 deletions(-) commit 0243c3de4daed0aff9f0e04df2e89cbb97db6ba4 @@ -18614,7 +23072,7 @@ Updated Hebrew translation - po/he.po | 859 ++++++++++++++++++++++++++++++++++---------------------------- + po/he.po | 859 ++++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 471 insertions(+), 388 deletions(-) commit 89b9926e5c78395b38b1977b9d95cd0ea7bf0c95 @@ -18623,7 +23081,7 @@ Updated Tamil translation - po/ta.po | 546 ++++++++++++++++++++++++++++++++------------------------------ + po/ta.po | 546 +++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 282 insertions(+), 264 deletions(-) commit 30fada8ad0f236db706f7896a51b0ea94ee11dc0 @@ -18632,7 +23090,7 @@ Updated Tamil translation - po/ta.po | 9 +++++---- + po/ta.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) commit 27bc9b1e4520265ad4221779dde0ec36099f273e @@ -18641,7 +23099,70 @@ Move ChangeLog to be auto-generated - ChangeLog |27047 -------------------------------------------------- - ChangeLog.pre-gitlog |27047 ++++++++++++++++++++++++++++++++++++++++++++++++++ - Makefile.am | 11 + + ChangeLog | 27047 ------------------------------------------------- + ChangeLog.pre-gitlog | 27047 +++++++++++++++++++++++++++++++++++++++++++++++++ + Makefile.am | 11 + 3 files changed, 27058 insertions(+), 27047 deletions(-) + +commit 3660f991631e8fefce44da2946fdf11378817120 +Author: Philip Withnall +Date: Mon Jul 20 22:47:57 2009 +0100 + + Fixed libgdata 0.4.0 compatibility problems + + 2009-07-20 Philip Withnall + + * src/plugins/youtube/totem-youtube.c (resolve_t_param), + (thumbnail_loaded_cb), (thumbnail_opened_cb), + (open_in_web_browser_activate_cb): Fixed compatibility problems + with libgdata 0.4.0 and removed some unnecessary error dialogues from + the YouTube plugin. + + ChangeLog | 8 ++++++++ + src/plugins/youtube/totem-youtube.c | 20 ++++++-------------- + 2 files changed, 14 insertions(+), 14 deletions(-) + +commit 1e7eb412f155459d1cd13e4606450bf3fd31b337 +Author: Philip Withnall +Date: Mon Jul 20 22:39:45 2009 +0100 + + Homogenise the Local Search plugin's appearance with Jamendo and YouTube + + 2009-07-20 Philip Withnall + + * src/plugins/tracker/totem-tracker-widget.c + (totem_tracker_widget_init): Homogenise the Local Search plugin's + appearance with the Jamendo and YouTube plugins. (Closes: #572292) + + ChangeLog | 6 ++++++ + src/plugins/tracker/totem-tracker-widget.c | 11 ++--------- + 2 files changed, 8 insertions(+), 9 deletions(-) + +commit c2db8b70b879529392b8b98a6ec27991c1c1dd83 +Author: Philip Withnall +Date: Mon Jul 20 22:28:13 2009 +0100 + + Limit the Tracker versions we build against to 0.6.x + + 2009-07-20 Philip Withnall + + * configure.in: Limit the Tracker versions we can build the Local + Search plugin against to 0.6.x. (Closes: #580726) + + ChangeLog | 5 +++++ + configure.in | 2 +- + 2 files changed, 6 insertions(+), 1 deletion(-) + +commit 4f9691981084af4a358e658a7b5addba00cf9a92 +Author: Philip Withnall +Date: Mon Jul 20 22:21:24 2009 +0100 + + Build the docs first, and the code last + + 2009-07-20 Philip Withnall + + * Makefile.am: Build the docs first, and the code last + + ChangeLog | 4 ++++ + Makefile.am | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) diff -Nru totem-3.4.3/INSTALL totem-3.6.2/INSTALL --- totem-3.4.3/INSTALL 2012-04-23 10:49:44.000000000 +0000 +++ totem-3.6.2/INSTALL 2012-08-07 14:04:39.000000000 +0000 @@ -1,8 +1,8 @@ Installation Instructions ************************* -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007, 2008, 2009 Free Software Foundation, Inc. +Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation, +Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright @@ -226,6 +226,11 @@ and if that doesn't work, install pre-built binaries of GCC for HP-UX. + HP-UX `make' updates targets which have the same time stamps as +their prerequisites, which makes it generally unusable when shipped +generated files such as `configure' are involved. Use GNU `make' +instead. + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot parse its `' header file. The option `-nodtk' can be used as a workaround. If GNU CC is not installed, it is therefore recommended diff -Nru totem-3.4.3/Makefile.am totem-3.6.2/Makefile.am --- totem-3.4.3/Makefile.am 2012-07-04 09:52:28.000000000 +0000 +++ totem-3.6.2/Makefile.am 2012-10-25 13:15:32.000000000 +0000 @@ -1,8 +1,6 @@ -NORMAL_SUBDIRS = lib po data help src docs +NORMAL_SUBDIRS = po data help src docs SUBDIRS = $(NORMAL_SUBDIRS) -ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} - if ENABLE_BROWSER_PLUGINS SUBDIRS += browser-plugin endif diff -Nru totem-3.4.3/Makefile.in totem-3.6.2/Makefile.in --- totem-3.4.3/Makefile.in 2012-07-04 09:54:52.000000000 +0000 +++ totem-3.6.2/Makefile.in 2012-10-25 13:36:18.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +14,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -41,10 +57,7 @@ COPYING ChangeLog INSTALL NEWS TODO compile config.guess \ config.sub depcomp install-sh ltmain.sh missing py-compile ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ @@ -53,12 +66,18 @@ CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = totem.spec CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -68,13 +87,19 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir dist dist-all distcheck + cscope distdir dist dist-all distcheck ETAGS = etags CTAGS = ctags +CSCOPE = cscope DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -84,6 +109,7 @@ && rm -rf "$(distdir)" \ || { sleep 5 && rm -rf "$(distdir)"; }; \ else :; fi +am__post_remove_distdir = $(am__remove_distdir) am__relativize = \ dir0=`pwd`; \ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ @@ -110,13 +136,14 @@ done; \ reldir="$$dir2" GZIP_ENV = --best -DIST_ARCHIVES = $(distdir).tar.bz2 +DIST_ARCHIVES = $(distdir).tar.xz +DIST_TARGETS = dist-xz distuninstallcheck_listfiles = find . -type f -print am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ -ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} +ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ ALL_LINGUAS = @ALL_LINGUAS@ ALL_PLUGINS = @ALL_PLUGINS@ AMTAR = @AMTAR@ @@ -130,6 +157,10 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BACKEND_CFLAGS = @BACKEND_CFLAGS@ +BACKEND_LIBS = @BACKEND_LIBS@ +BACKEND_TEST_CFLAGS = @BACKEND_TEST_CFLAGS@ +BACKEND_TEST_LIBS = @BACKEND_TEST_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ BROWSER_PLUGIN_DIR = @BROWSER_PLUGIN_DIR@ BROWSER_PLUGIN_LIBS = @BROWSER_PLUGIN_LIBS@ @@ -151,8 +182,6 @@ DBUS_LIBS = @DBUS_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DEPENDENCY_CFLAGS = @DEPENDENCY_CFLAGS@ -DEPENDENCY_LIBS = @DEPENDENCY_LIBS@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DISC_RECORDER_CFLAGS = @DISC_RECORDER_CFLAGS@ DISC_RECORDER_LIBS = @DISC_RECORDER_LIBS@ @@ -166,7 +195,6 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -EXTRA_BACKEND_LIBS = @EXTRA_BACKEND_LIBS@ FGREP = @FGREP@ FULL_LIBEXECDIR = @FULL_LIBEXECDIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ @@ -174,19 +202,21 @@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GLIB_REQS = @GLIB_REQS@ +GLOW_BUTTON_CFLAGS = @GLOW_BUTTON_CFLAGS@ +GLOW_BUTTON_LIBS = @GLOW_BUTTON_LIBS@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ -GST_CFLAGS = @GST_CFLAGS@ -GST_LIBS = @GST_LIBS@ +GST_PLUGINS_BAD_CFLAGS = @GST_PLUGINS_BAD_CFLAGS@ +GST_PLUGINS_BAD_LIBS = @GST_PLUGINS_BAD_LIBS@ GTKDOC_CHECK = @GTKDOC_CHECK@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_LIBS = @GTK_LIBS@ GTK_REQS = @GTK_REQS@ +HELPER_CFLAGS = @HELPER_CFLAGS@ +HELPER_LIBS = @HELPER_LIBS@ HELP_DIR = @HELP_DIR@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ @@ -212,11 +242,11 @@ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBEPC_CFLAGS = @LIBEPC_CFLAGS@ -LIBEPC_LIBS = @LIBEPC_LIBS@ LIBGRILO_CFLAGS = @LIBGRILO_CFLAGS@ LIBGRILO_LIBS = @LIBGRILO_LIBS@ LIBOBJS = @LIBOBJS@ +LIBPLAYER_CFLAGS = @LIBPLAYER_CFLAGS@ +LIBPLAYER_LIBS = @LIBPLAYER_LIBS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBZEITGEIST_CFLAGS = @LIBZEITGEIST_CFLAGS@ @@ -233,8 +263,6 @@ MISSING_PLUGINS_CFLAGS = @MISSING_PLUGINS_CFLAGS@ MISSING_PLUGINS_LIBS = @MISSING_PLUGINS_LIBS@ MKDIR_P = @MKDIR_P@ -MM_CFLAGS = @MM_CFLAGS@ -MM_LIBS = @MM_LIBS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ NAUTILUSDIR = @NAUTILUSDIR@ @@ -255,15 +283,21 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PEASGTK_CFLAGS = @PEASGTK_CFLAGS@ -PEASGTK_LIBS = @PEASGTK_LIBS@ -PEAS_CFLAGS = @PEAS_CFLAGS@ -PEAS_LIBS = @PEAS_LIBS@ +PIXBUF_HELPER_CFLAGS = @PIXBUF_HELPER_CFLAGS@ +PIXBUF_HELPER_LIBS = @PIXBUF_HELPER_LIBS@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +PLAYER_CFLAGS = @PLAYER_CFLAGS@ +PLAYER_LIBS = @PLAYER_LIBS@ PLUGINDIR = @PLUGINDIR@ PLUGINS = @PLUGINS@ +PLUGIN_VIEWER_CFLAGS = @PLUGIN_VIEWER_CFLAGS@ +PLUGIN_VIEWER_LIBS = @PLUGIN_VIEWER_LIBS@ +PREVIEW_CFLAGS = @PREVIEW_CFLAGS@ +PREVIEW_LIBS = @PREVIEW_LIBS@ +PROPERTIES_CFLAGS = @PROPERTIES_CFLAGS@ +PROPERTIES_LIBS = @PROPERTIES_LIBS@ PYGOBJECT_CFLAGS = @PYGOBJECT_CFLAGS@ PYGOBJECT_LIBS = @PYGOBJECT_LIBS@ PYLINT = @PYLINT@ @@ -283,6 +317,10 @@ SMCLIENT_CFLAGS = @SMCLIENT_CFLAGS@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ +THUMBNAILER_CFLAGS = @THUMBNAILER_CFLAGS@ +THUMBNAILER_LIBS = @THUMBNAILER_LIBS@ +TIME_HELPER_CFLAGS = @TIME_HELPER_CFLAGS@ +TIME_HELPER_LIBS = @TIME_HELPER_LIBS@ TOTEM_API_VERSION = @TOTEM_API_VERSION@ TOTEM_PLPARSER_REQS = @TOTEM_PLPARSER_REQS@ TOTEM_VERSION_MAJOR = @TOTEM_VERSION_MAJOR@ @@ -294,9 +332,6 @@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ XGETTEXT = @XGETTEXT@ -XMKMF = @XMKMF@ -XTEST_LIBS = @XTEST_LIBS@ -X_LIBS = @X_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -357,7 +392,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -NORMAL_SUBDIRS = lib po data help src docs +NORMAL_SUBDIRS = po data help src docs SUBDIRS = $(NORMAL_SUBDIRS) $(am__append_1) EXTRA_DIST = \ license_change \ @@ -465,12 +500,12 @@ -rm -f libtool config.lt # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -480,7 +515,11 @@ done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -494,37 +533,6 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ @@ -533,6 +541,10 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done +cscopelist-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ + done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -596,8 +608,32 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscope: cscope.files + test ! -s cscope.files \ + || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) + +clean-cscope: + -rm -f cscope.files + +cscope.files: clean-cscope cscopelist-recursive cscopelist + +cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + -rm -f cscope.out cscope.in.out cscope.po.out cscope.files distdir: $(DISTFILES) @case `sed 15q $(srcdir)/NEWS` in \ @@ -639,13 +675,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -674,39 +707,35 @@ || chmod -R a+r "$(distdir)" dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) + dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 - $(am__remove_distdir) + $(am__post_remove_distdir) dist-lzip: distdir tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz - $(am__remove_distdir) - -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) - + $(am__post_remove_distdir) dist-xz: distdir tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) + $(am__post_remove_distdir) dist-shar: distdir shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-zip: distdir -rm -f $(distdir).zip zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) + $(am__post_remove_distdir) -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 - $(am__remove_distdir) +dist dist-all: + $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' + $(am__post_remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another @@ -717,8 +746,6 @@ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ - lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.lz*) \ lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ *.tar.xz*) \ @@ -730,7 +757,7 @@ *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) + chmod -R a-w $(distdir); chmod u+w $(distdir) mkdir $(distdir)/_build mkdir $(distdir)/_inst chmod a-w $(distdir) @@ -764,7 +791,7 @@ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ && cd "$$am__cwd" \ || exit 1 - $(am__remove_distdir) + $(am__post_remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' @@ -903,12 +930,14 @@ uninstall-am: .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ - ctags-recursive install-am install-strip tags-recursive + cscopelist-recursive ctags-recursive install-am install-strip \ + tags-recursive .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am am--refresh check check-am clean clean-generic \ - clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ - dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \ + all all-am am--refresh check check-am clean clean-cscope \ + clean-generic clean-libtool cscope cscopelist \ + cscopelist-recursive ctags ctags-recursive dist dist-all \ + dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ dist-xz \ dist-zip distcheck distclean distclean-generic distclean-hdr \ distclean-libtool distclean-tags distcleancheck distdir \ distuninstallcheck dvi dvi-am html html-am info info-am \ diff -Nru totem-3.4.3/NEWS totem-3.6.2/NEWS --- totem-3.4.3/NEWS 2012-07-04 09:54:32.000000000 +0000 +++ totem-3.6.2/NEWS 2012-10-25 13:15:47.000000000 +0000 @@ -1,19 +1,79 @@ New features and significant updates in version... -3.4.3: -* Fix sidebar related warnings on startup -* Fix thumbnailer hanging on errors -* Fix problems scrolling with mouse scroll wheels - -3.4.2: -* Make "Esc" focus the video widget if the sidebar - button was selected -* Translation updates - -3.4.1: -* Remote option argument parsing fixes -* Fix for keyboard shortcuts when using ModeSwitch -* Translation updates +Major changes in 3.6.2: +- Make Ogg video streaming work again + (the soundpitch plugin in gst-plugins-bad is broken) +- Fix memory leaks when using download buffering + +Major changes in 3.6.1: + +Movie Player: +- Fix spinning cursor when launching videos from the file manager +- Fix bugs in video searches + +Browser Plugin: +- Fix screensaver not being inhibited +- Fix some streams' video canvas being hidden + +Major changes in 3.6.0: + +Browser Plugin: +- Fix the plugin not loading correctly + +Properties: +- Fix memory leaks + +Major changes in 3.5.92: + +Browser Plugin: +- Fix broken UI because of the new GtkMenuButton + +Backend: +- Fix duration conversion +- Simplify GStreamer helpers +- Fix warning related to g_object_unref() + +Properties: +- Fix string leaks + +Main: +- Remove documentation list from "About" dialogue + +Major changes in 3.5.90: + +- Plenty of build fixes to make it possible to build with Wayland support +- Increase thumbnail size to 256 px + +Movie player: +- Rename to "Videos" +- Hide titlebar when maximised +- Move some menu items to the app menu +- Command-line parsing bug fixes +- Use Grilo to list DVDs and other optical media +- Remove connection speed preferences +- Stop DVD playback when disc is ejected +- Fix ordering of the playlist after drag'n'drop + +Backend: +- Port to GStreamer 1.0 +- Add HTTP proxy support +- Much improved error messages +- Add variable rate playback +- Use Clutter for the OSD +- Disable visualisations by default +- Animate rotations +- Add av-offset support +- Prepare the ground for chapter support in non-DVDs + +Plugins: +- Make screenshot UI-less, like in gnome-shell +- Simplify the screensaver and browser plugin code +- Remove publish and iPlayer plugins +- Use Grilo 0.2 +- Better search sidebar +- Add hook for site-specific user-agents +- Add hook for custom subtitle selection through plugins +- Move recent-files handling to a plugin 3.4.0: * Mark some strings as translatable diff -Nru totem-3.4.3/aclocal.m4 totem-3.6.2/aclocal.m4 --- totem-3.4.3/aclocal.m4 2012-07-04 09:54:45.000000000 +0000 +++ totem-3.6.2/aclocal.m4 2012-10-25 13:36:16.000000000 +0000 @@ -1,8 +1,7 @@ -# generated automatically by aclocal 1.11.3 -*- Autoconf -*- +# generated automatically by aclocal 1.12.2 -*- Autoconf -*- + +# Copyright (C) 1996-2012 Free Software Foundation, Inc. -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, -# Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,20 +13,19 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, -[m4_warning([this file was generated for autoconf 2.68. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, +[m4_warning([this file was generated for autoconf 2.69. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. -To do so, use the procedure documented by the package, typically `autoreconf'.])]) +To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 2002-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 +# serial 8 # AM_AUTOMAKE_VERSION(VERSION) # ---------------------------- @@ -35,10 +33,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.11' +[am__api_version='1.12' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.3], [], +m4_if([$1], [1.12.2], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -54,24 +52,24 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.3])dnl +[AM_AUTOMAKE_VERSION([1.12.2])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. +# Copyright (C) 2001-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 +# serial 2 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to +# '$srcdir', '$srcdir/..', or '$srcdir/../..'. # # Of course, Automake must honor this variable whenever it calls a # tool from the auxiliary directory. The problem is that $srcdir (and @@ -90,7 +88,7 @@ # # The reason of the latter failure is that $top_srcdir and $ac_aux_dir # are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you +# harmless because $srcdir is '.', but things will broke when you # start a VPATH build or use an absolute $srcdir. # # So we could use something similar to $top_srcdir/$ac_aux_dir/missing, @@ -116,22 +114,21 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 9 +# serial 10 # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- # Define a conditional. AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +[AC_PREREQ([2.52])dnl + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl AC_SUBST([$1_TRUE])dnl AC_SUBST([$1_FALSE])dnl _AM_SUBST_NOTMAKE([$1_TRUE])dnl @@ -150,16 +147,15 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, -# 2010, 2011 Free Software Foundation, Inc. +# Copyright (C) 1999-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 12 +# serial 17 -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, # will think it sees a *use*, and therefore will trigger all it's # C support machinery. Also note that it means that autoscan, seeing @@ -169,7 +165,7 @@ # _AM_DEPENDENCIES(NAME) # ---------------------- # See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". +# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". # We try a few techniques and use that to set a single cache variable. # # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was @@ -182,12 +178,13 @@ AC_REQUIRE([AM_MAKE_INCLUDE])dnl AC_REQUIRE([AM_DEP_TRACK])dnl -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], UPC, [depcc="$UPC" am_compiler_list=], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) +m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], + [$1], [CXX], [depcc="$CXX" am_compiler_list=], + [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], + [$1], [UPC], [depcc="$UPC" am_compiler_list=], + [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) AC_CACHE_CHECK([dependency style of $depcc], [am_cv_$1_dependencies_compiler_type], @@ -195,8 +192,8 @@ # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're @@ -236,16 +233,16 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -254,8 +251,8 @@ test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else @@ -263,7 +260,7 @@ fi ;; msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -311,7 +308,7 @@ # AM_SET_DEPDIR # ------------- # Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES +# This macro is AC_REQUIREd in _AM_DEPENDENCIES. AC_DEFUN([AM_SET_DEPDIR], [AC_REQUIRE([AM_SET_LEADING_DOT])dnl AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl @@ -321,9 +318,13 @@ # AM_DEP_TRACK # ------------ AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors]) +[AC_ARG_ENABLE([dependency-tracking], [dnl +AS_HELP_STRING( + [--enable-dependency-tracking], + [do not reject slow dependency extractors]) +AS_HELP_STRING( + [--disable-dependency-tracking], + [speeds up one-time build])]) if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' @@ -338,14 +339,13 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -#serial 5 +# serial 6 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ @@ -364,7 +364,7 @@ # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -376,21 +376,19 @@ continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` test -z "am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`AS_DIRNAME(["$file"])` @@ -408,7 +406,7 @@ # This macro should only be invoked once -- use via AC_REQUIRE. # # This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will +# is enabled. FIXME. This creates each '.P' file that we will # need in order to bootstrap the dependency handling code. AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], @@ -418,14 +416,13 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 1996-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 16 +# serial 19 # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. @@ -471,31 +468,41 @@ # Define the identity of the package. dnl Distinguish between old-style and new-style calls. m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl +[AC_DIAGNOSE([obsolete], +[$0: two- and three-arguments forms are deprecated. For more info, see: +http://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_INIT_AUTOMAKE-invocation]) +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl AC_SUBST([PACKAGE], [$1])dnl AC_SUBST([VERSION], [$2])], [_AM_SET_OPTIONS([$1])dnl dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, +m4_if( + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + [ok:ok],, [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl _AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl # Some tools Automake needs. AC_REQUIRE([AM_SANITY_CHECK])dnl AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) +AM_MISSING_PROG([AUTOCONF], [autoconf]) +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) +AM_MISSING_PROG([AUTOHEADER], [autoheader]) +AM_MISSING_PROG([MAKEINFO], [makeinfo]) AC_REQUIRE([AM_PROG_INSTALL_SH])dnl AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl -AC_REQUIRE([AM_PROG_MKDIR_P])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +AC_SUBST([mkdir_p], ['$(MKDIR_P)']) # We need awk for the "check" target. The system "awk" is bad on # some platforms. AC_REQUIRE([AC_PROG_AWK])dnl @@ -506,28 +513,35 @@ [_AM_PROG_TAR([v7])])]) _AM_IF_OPTION([no-dependencies],, [AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl + [_AM_DEPENDENCIES([CC])], + [m4_define([AC_PROG_CC], + m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl + [_AM_DEPENDENCIES([CXX])], + [m4_define([AC_PROG_CXX], + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl + [_AM_DEPENDENCIES([OBJC])], + [m4_define([AC_PROG_OBJC], + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl +dnl Support for Objective C++ was only introduced in Autoconf 2.65, +dnl but we still cater to Autoconf 2.62. +m4_ifdef([AC_PROG_OBJCXX], +[AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], + [_AM_DEPENDENCIES([OBJCXX])], + [m4_define([AC_PROG_OBJCXX], + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])])dnl ]) _AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl -dnl The `parallel-tests' driver may need to know about EXEEXT, so add the -dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro +dnl The 'parallel-tests' driver may need to know about EXEEXT, so add the +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl ]) -dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further dnl mangled by Autoconf and run in a shell conditional statement. m4_define([_AC_COMPILER_EXEEXT], @@ -555,14 +569,13 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, -# Inc. +# Copyright (C) 2001-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 +# serial 8 # AM_PROG_INSTALL_SH # ------------------ @@ -577,9 +590,9 @@ install_sh="\${SHELL} $am_aux_dir/install-sh" esac fi -AC_SUBST(install_sh)]) +AC_SUBST([install_sh])]) -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2003-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -603,20 +616,19 @@ # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008, -# 2011 Free Software Foundation, Inc. +# Copyright (C) 1996-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 +# serial 7 # AM_MAINTAINER_MODE([DEFAULT-MODE]) # ---------------------------------- # Control maintainer-specific portions of Makefiles. -# Default is to disable them, unless `enable' is passed literally. -# For symmetry, `disable' may be passed as well. Anyway, the user +# Default is to disable them, unless 'enable' is passed literally. +# For symmetry, 'disable' may be passed as well. Anyway, the user # can override the default with the --enable/--disable switch. AC_DEFUN([AM_MAINTAINER_MODE], [m4_case(m4_default([$1], [disable]), @@ -627,10 +639,11 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) dnl maintainer-mode's default is 'disable' unless 'enable' is passed AC_ARG_ENABLE([maintainer-mode], -[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful - (and sometimes confusing) to the casual installer], - [USE_MAINTAINER_MODE=$enableval], - [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) + [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode], + am_maintainer_other[ make rules and dependencies not useful + (and sometimes confusing) to the casual installer])], + [USE_MAINTAINER_MODE=$enableval], + [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) AC_MSG_RESULT([$USE_MAINTAINER_MODE]) AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) MAINT=$MAINTAINER_MODE_TRUE @@ -642,13 +655,13 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. +# Copyright (C) 2001-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 +# serial 5 # AM_MAKE_INCLUDE() # ----------------- @@ -667,7 +680,7 @@ _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -692,8 +705,7 @@ rm -f confinc confmf ]) -# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -729,14 +741,13 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 6 +# serial 7 # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ @@ -766,49 +777,19 @@ am_missing_run="$MISSING --run " else am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) + AC_MSG_WARN(['missing' script is too old or missing]) fi ]) -# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation, -# Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 1 - -# AM_PROG_MKDIR_P -# --------------- -# Check for `mkdir -p'. -AC_DEFUN([AM_PROG_MKDIR_P], -[AC_PREREQ([2.60])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -dnl while keeping a definition of mkdir_p for backward compatibility. -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -dnl Makefile.ins that do not define MKDIR_P, so we do our own -dnl adjustment using top_builddir (which is defined more often than -dnl MKDIR_P). -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -case $mkdir_p in - [[\\/$]]* | ?:[[\\/]]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac -]) - # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 2001-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 +# serial 6 # _AM_MANGLE_OPTION(NAME) # ----------------------- @@ -819,7 +800,7 @@ # -------------------- # Set option NAME. Presently that only means defining a flag for this option. AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) +[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) # _AM_SET_OPTIONS(OPTIONS) # ------------------------ @@ -833,14 +814,13 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009, -# 2011 Free Software Foundation, Inc. +# Copyright (C) 1999-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 +# serial 9 # AM_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) # --------------------------------------------------------------------------- @@ -885,10 +865,11 @@ dnl A version check is needed. if test -n "$PYTHON"; then # If the user set $PYTHON, use it and don't search something else. - AC_MSG_CHECKING([whether $PYTHON version >= $1]) + AC_MSG_CHECKING([whether $PYTHON version is >= $1]) AM_PYTHON_CHECK_VERSION([$PYTHON], [$1], - [AC_MSG_RESULT(yes)], - [AC_MSG_ERROR(too old)]) + [AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no]) + AC_MSG_ERROR([Python interpreter is too old])]) am_display_PYTHON=$PYTHON else # Otherwise, try each interpreter until we find one that satisfies @@ -1036,7 +1017,7 @@ sys.exit(sys.hexversion < minverhex)" AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])]) -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. +# Copyright (C) 2001-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1057,22 +1038,18 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1996-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 +# serial 9 # AM_SANITY_CHECK # --------------- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -1083,32 +1060,40 @@ esac case $srcdir in *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) - AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken + alias in your environment]) + fi + if test "$[2]" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$[2]" = conftest.file ) then @@ -1118,31 +1103,52 @@ AC_MSG_ERROR([newly created file is older than distributed files! Check your system clock]) fi -AC_MSG_RESULT(yes)]) +AC_MSG_RESULT([yes]) +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi +AC_CONFIG_COMMANDS_PRE( + [AC_MSG_CHECKING([that generated files are newer than configure]) + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + AC_MSG_RESULT([done])]) +rm -f conftest.file +]) -# Copyright (C) 2009, 2011 Free Software Foundation, Inc. +# Copyright (C) 2009-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 +# serial 3 # AM_SILENT_RULES([DEFAULT]) # -------------------------- # Enable less verbose build rules; with the default set to DEFAULT -# (`yes' being less verbose, `no' or empty being verbose). +# ("yes" being less verbose, "no" or empty being verbose). AC_DEFUN([AM_SILENT_RULES], -[AC_ARG_ENABLE([silent-rules], -[ --enable-silent-rules less verbose build output (undo: `make V=1') - --disable-silent-rules verbose build output (undo: `make V=0')]) -case $enable_silent_rules in -yes) AM_DEFAULT_VERBOSITY=0;; -no) AM_DEFAULT_VERBOSITY=1;; -*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +[AC_ARG_ENABLE([silent-rules], [dnl +AS_HELP_STRING( + [--enable-silent-rules], + [less verbose build output (undo: "make V=1")]) +AS_HELP_STRING( + [--disable-silent-rules], + [verbose build output (undo: "make V=0")])dnl +]) +case $enable_silent_rules in @%:@ ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; esac dnl -dnl A few `make' implementations (e.g., NonStop OS and NextStep) +dnl A few 'make' implementations (e.g., NonStop OS and NextStep) dnl do not support nested variable expansions. dnl See automake bug#9928 and bug#10237. am_make=${MAKE-make} @@ -1160,7 +1166,7 @@ am_cv_make_support_nested_variables=no fi]) if test $am_cv_make_support_nested_variables = yes; then - dnl Using `$V' instead of `$(V)' breaks IRIX make. + dnl Using '$V' instead of '$(V)' breaks IRIX make. AM_V='$(V)' AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' else @@ -1177,37 +1183,37 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. +# Copyright (C) 2001-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 +# serial 2 # AM_PROG_INSTALL_STRIP # --------------------- -# One issue with vendor `install' (even GNU) is that you can't +# One issue with vendor 'install' (even GNU) is that you can't # specify the program used to strip binaries. This is especially # annoying in cross-compiling environments, where the build's strip # is unlikely to handle the host's binaries. # Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize +# always use install-sh in "make install-strip", and initialize # STRIPPROG with the value of the STRIP variable (set by the user). AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +# will honor the 'STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. if test "$cross_compiling" != no; then AC_CHECK_TOOL([STRIP], [strip], :) fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. +# Copyright (C) 2006-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1228,18 +1234,18 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. +# Copyright (C) 2004-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 +# serial 3 # _AM_PROG_TAR(FORMAT) # -------------------- # Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. +# FORMAT should be one of 'v7', 'ustar', or 'pax'. # # Substitute a variable $(am__tar) that is a command # writing to stdout a FORMAT-tarball containing the directory @@ -1262,7 +1268,7 @@ _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' _am_tools=${am_cv_prog_tar_$1-$_am_tools} # Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. +# Solaris sh will not grok spaces in the rhs of '-'. for _am_tool in $_am_tools do case $_am_tool in @@ -1325,15 +1331,15 @@ # Autoconf support for the Vala compiler -# Copyright (C) 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 2008-2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 +# serial 6 -# Check whether the Vala compiler exists in `PATH'. If it is found, the +# Check whether the Vala compiler exists in $PATH. If it is found, the # variable VALAC is set. Optionally a minimum release number of the # compiler can be requested. # @@ -1350,191 +1356,8784 @@ [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]) - AC_MSG_ERROR([Vala $1 not found.])])])]) + AC_MSG_ERROR([Vala $1 not found.], [77])])])]) ]) -# nls.m4 serial 5 (gettext-0.18) -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation, -dnl Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. -dnl -dnl This file can can be used in projects which are not available under -dnl the GNU General Public License or the GNU Library General Public -dnl License but which still want to provide support for the GNU gettext -dnl functionality. -dnl Please note that the actual code of the GNU gettext library is covered -dnl by the GNU Library General Public License, and the rest of the GNU -dnl gettext package package is covered by the GNU General Public License. -dnl They are *not* in the public domain. +# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- +# +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. +# Written by Gordon Matzigkeit, 1996 +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. + +m4_define([_LT_COPYING], [dnl +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. +# Written by Gordon Matzigkeit, 1996 +# +# This file is part of GNU Libtool. +# +# GNU Libtool 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. +# +# As a special exception to the GNU General Public License, +# if you distribute this file as part of a program or library that +# is built using GNU Libtool, you may include this file under the +# same distribution terms that you use for the rest of that program. +# +# GNU Libtool 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 General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Libtool; see the file COPYING. If not, a copy +# can be downloaded from http://www.gnu.org/licenses/gpl.html, or +# obtained by writing to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +]) -dnl Authors: -dnl Ulrich Drepper , 1995-2000. -dnl Bruno Haible , 2000-2003. +# serial 57 LT_INIT -AC_PREREQ([2.50]) -AC_DEFUN([AM_NLS], -[ - AC_MSG_CHECKING([whether NLS is requested]) - dnl Default is enabled NLS - AC_ARG_ENABLE([nls], - [ --disable-nls do not use Native Language Support], - USE_NLS=$enableval, USE_NLS=yes) - AC_MSG_RESULT([$USE_NLS]) - AC_SUBST([USE_NLS]) +# LT_PREREQ(VERSION) +# ------------------ +# Complain and exit if this libtool version is less that VERSION. +m4_defun([LT_PREREQ], +[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1, + [m4_default([$3], + [m4_fatal([Libtool version $1 or higher is required], + 63)])], + [$2])]) + + +# _LT_CHECK_BUILDDIR +# ------------------ +# Complain if the absolute build directory name contains unusual characters +m4_defun([_LT_CHECK_BUILDDIR], +[case `pwd` in + *\ * | *\ *) + AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;; +esac ]) -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# serial 1 (pkg-config-0.24) -# -# Copyright © 2004 Scott James Remnant . -# -# 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 -# 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 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. -# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -# ---------------------------------- -AC_DEFUN([PKG_PROG_PKG_CONFIG], -[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) -AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) -AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) +# LT_INIT([OPTIONS]) +# ------------------ +AC_DEFUN([LT_INIT], +[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT +AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl +AC_BEFORE([$0], [LT_LANG])dnl +AC_BEFORE([$0], [LT_OUTPUT])dnl +AC_BEFORE([$0], [LTDL_INIT])dnl +m4_require([_LT_CHECK_BUILDDIR])dnl + +dnl Autoconf doesn't catch unexpanded LT_ macros by default: +m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl +m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl +dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4 +dnl unless we require an AC_DEFUNed macro: +AC_REQUIRE([LTOPTIONS_VERSION])dnl +AC_REQUIRE([LTSUGAR_VERSION])dnl +AC_REQUIRE([LTVERSION_VERSION])dnl +AC_REQUIRE([LTOBSOLETE_VERSION])dnl +m4_require([_LT_PROG_LTMAIN])dnl + +_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}]) + +dnl Parse OPTIONS +_LT_SET_OPTIONS([$0], [$1]) + +# This can be used to rebuild libtool when needed +LIBTOOL_DEPS="$ltmain" + +# Always use our own libtool. +LIBTOOL='$(SHELL) $(top_builddir)/libtool' +AC_SUBST(LIBTOOL)dnl + +_LT_SETUP + +# Only expand once: +m4_define([LT_INIT]) +])# LT_INIT + +# Old names: +AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT]) +AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_PROG_LIBTOOL], []) +dnl AC_DEFUN([AM_PROG_LIBTOOL], []) -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) + +# _LT_CC_BASENAME(CC) +# ------------------- +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +m4_defun([_LT_CC_BASENAME], +[for cc_temp in $1""; do + case $cc_temp in + compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; + distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +]) + + +# _LT_FILEUTILS_DEFAULTS +# ---------------------- +# It is okay to use these file commands and assume they have been set +# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'. +m4_defun([_LT_FILEUTILS_DEFAULTS], +[: ${CP="cp -f"} +: ${MV="mv -f"} +: ${RM="rm -f"} +])# _LT_FILEUTILS_DEFAULTS + + +# _LT_SETUP +# --------- +m4_defun([_LT_SETUP], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_CANONICAL_BUILD])dnl +AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl + +_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl +dnl +_LT_DECL([], [host_alias], [0], [The host system])dnl +_LT_DECL([], [host], [0])dnl +_LT_DECL([], [host_os], [0])dnl +dnl +_LT_DECL([], [build_alias], [0], [The build system])dnl +_LT_DECL([], [build], [0])dnl +_LT_DECL([], [build_os], [0])dnl +dnl +AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([LT_PATH_LD])dnl +AC_REQUIRE([LT_PATH_NM])dnl +dnl +AC_REQUIRE([AC_PROG_LN_S])dnl +test -z "$LN_S" && LN_S="ln -s" +_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl +dnl +AC_REQUIRE([LT_CMD_MAX_LEN])dnl +_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl +_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl +dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_CHECK_SHELL_FEATURES])dnl +m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl +m4_require([_LT_CMD_RELOAD])dnl +m4_require([_LT_CHECK_MAGIC_METHOD])dnl +m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl +m4_require([_LT_CMD_OLD_ARCHIVE])dnl +m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl +m4_require([_LT_WITH_SYSROOT])dnl + +_LT_CONFIG_LIBTOOL_INIT([ +# See if we are running on zsh, and set the options which allow our +# commands through without removal of \ escapes INIT. +if test -n "\${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST +fi +]) +if test -n "${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=m4_default([$1], [0.9.0]) - AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - PKG_CONFIG="" - fi -fi[]dnl -])# PKG_PROG_PKG_CONFIG -# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# -# Check to see whether a particular set of modules exists. Similar -# to PKG_CHECK_MODULES(), but does not set variables or print errors. -# -# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -# only at the first occurence in configure.ac, so if the first place -# it's called might be skipped (such as if it is within an "if", you -# have to call PKG_CHECK_EXISTS manually -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_EXISTS], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -if test -n "$PKG_CONFIG" && \ - AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then - m4_default([$2], [:]) -m4_ifvaln([$3], [else - $3])dnl -fi]) +_LT_CHECK_OBJDIR -# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -# --------------------------------------------- -m4_define([_PKG_CONFIG], -[if test -n "$$1"; then - pkg_cv_[]$1="$$1" - elif test -n "$PKG_CONFIG"; then - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], - [pkg_failed=yes]) - else - pkg_failed=untried -fi[]dnl -])# _PKG_CONFIG +m4_require([_LT_TAG_COMPILER])dnl -# _PKG_SHORT_ERRORS_SUPPORTED +case $host_os in +aix3*) + # AIX sometimes has problems with the GCC collect2 program. For some + # reason, if we set the COLLECT_NAMES environment variable, the problems + # vanish in a puff of smoke. + if test "X${COLLECT_NAMES+set}" != Xset; then + COLLECT_NAMES= + export COLLECT_NAMES + fi + ;; +esac + +# Global variables: +ofile=libtool +can_build_shared=yes + +# All known linkers require a `.a' archive for static linking (except MSVC, +# which needs '.lib'). +libext=a + +with_gnu_ld="$lt_cv_prog_gnu_ld" + +old_CC="$CC" +old_CFLAGS="$CFLAGS" + +# Set sane defaults for various variables +test -z "$CC" && CC=cc +test -z "$LTCC" && LTCC=$CC +test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS +test -z "$LD" && LD=ld +test -z "$ac_objext" && ac_objext=o + +_LT_CC_BASENAME([$compiler]) + +# Only perform the check for file, if the check method requires it +test -z "$MAGIC_CMD" && MAGIC_CMD=file +case $deplibs_check_method in +file_magic*) + if test "$file_magic_cmd" = '$MAGIC_CMD'; then + _LT_PATH_MAGIC + fi + ;; +esac + +# Use C for the default configuration in the libtool script +LT_SUPPORTED_TAG([CC]) +_LT_LANG_C_CONFIG +_LT_LANG_DEFAULT_CONFIG +_LT_CONFIG_COMMANDS +])# _LT_SETUP + + +# _LT_PREPARE_SED_QUOTE_VARS +# -------------------------- +# Define a few sed substitution that help us do robust quoting. +m4_defun([_LT_PREPARE_SED_QUOTE_VARS], +[# Backslashify metacharacters that are still active within +# double-quoted strings. +sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' + +# Same as above, but do not quote variable references. +double_quote_subst='s/\([["`\\]]\)/\\\1/g' + +# Sed substitution to delay expansion of an escaped shell variable in a +# double_quote_subst'ed string. +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' + +# Sed substitution to delay expansion of an escaped single quote. +delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' + +# Sed substitution to avoid accidental globbing in evaled expressions +no_glob_subst='s/\*/\\\*/g' +]) + +# _LT_PROG_LTMAIN +# --------------- +# Note that this code is called both from `configure', and `config.status' +# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, +# `config.status' has no value for ac_aux_dir unless we are using Automake, +# so we pass a copy along to make sure it has a sensible value anyway. +m4_defun([_LT_PROG_LTMAIN], +[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl +_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir']) +ltmain="$ac_aux_dir/ltmain.sh" +])# _LT_PROG_LTMAIN + + + +# So that we can recreate a full libtool script including additional +# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS +# in macros and then make a single call at the end using the `libtool' +# label. + + +# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS]) +# ---------------------------------------- +# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later. +m4_define([_LT_CONFIG_LIBTOOL_INIT], +[m4_ifval([$1], + [m4_append([_LT_OUTPUT_LIBTOOL_INIT], + [$1 +])])]) + +# Initialize. +m4_define([_LT_OUTPUT_LIBTOOL_INIT]) + + +# _LT_CONFIG_LIBTOOL([COMMANDS]) +# ------------------------------ +# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later. +m4_define([_LT_CONFIG_LIBTOOL], +[m4_ifval([$1], + [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS], + [$1 +])])]) + +# Initialize. +m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS]) + + +# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS]) +# ----------------------------------------------------- +m4_defun([_LT_CONFIG_SAVE_COMMANDS], +[_LT_CONFIG_LIBTOOL([$1]) +_LT_CONFIG_LIBTOOL_INIT([$2]) +]) + + +# _LT_FORMAT_COMMENT([COMMENT]) # ----------------------------- -AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi[]dnl -])# _PKG_SHORT_ERRORS_SUPPORTED +# Add leading comment marks to the start of each line, and a trailing +# full-stop to the whole comment if one is not present already. +m4_define([_LT_FORMAT_COMMENT], +[m4_ifval([$1], [ +m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])], + [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.]) +)]) -# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -# [ACTION-IF-NOT-FOUND]) -# -# -# Note that if there is a possibility the first call to -# PKG_CHECK_MODULES might not happen, you should be sure to include an -# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac -# -# -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_MODULES], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl -AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl -pkg_failed=no -AC_MSG_CHECKING([for $1]) -_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) -_PKG_CONFIG([$1][_LIBS], [libs], [$2]) -m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS -and $1[]_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details.]) +# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?]) +# ------------------------------------------------------------------- +# CONFIGNAME is the name given to the value in the libtool script. +# VARNAME is the (base) name used in the configure script. +# VALUE may be 0, 1 or 2 for a computed quote escaped value based on +# VARNAME. Any other value will be used directly. +m4_define([_LT_DECL], +[lt_if_append_uniq([lt_decl_varnames], [$2], [, ], + [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name], + [m4_ifval([$1], [$1], [$2])]) + lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3]) + m4_ifval([$4], + [lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])]) + lt_dict_add_subkey([lt_decl_dict], [$2], + [tagged?], [m4_ifval([$5], [yes], [no])])]) +]) -if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) - _PKG_SHORT_ERRORS_SUPPORTED - if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` - else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD - m4_default([$4], [AC_MSG_ERROR( -[Package requirements ($2) were not met: +# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION]) +# -------------------------------------------------------- +m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])]) + + +# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...]) +# ------------------------------------------------ +m4_define([lt_decl_tag_varnames], +[_lt_decl_filter([tagged?], [yes], $@)]) + + +# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..]) +# --------------------------------------------------------- +m4_define([_lt_decl_filter], +[m4_case([$#], + [0], [m4_fatal([$0: too few arguments: $#])], + [1], [m4_fatal([$0: too few arguments: $#: $1])], + [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)], + [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)], + [lt_dict_filter([lt_decl_dict], $@)])[]dnl +]) -$$1_PKG_ERRORS -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. +# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...]) +# -------------------------------------------------- +m4_define([lt_decl_quote_varnames], +[_lt_decl_filter([value], [1], $@)]) + + +# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...]) +# --------------------------------------------------- +m4_define([lt_decl_dquote_varnames], +[_lt_decl_filter([value], [2], $@)]) + + +# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...]) +# --------------------------------------------------- +m4_define([lt_decl_varnames_tagged], +[m4_assert([$# <= 2])dnl +_$0(m4_quote(m4_default([$1], [[, ]])), + m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]), + m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))]) +m4_define([_lt_decl_varnames_tagged], +[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])]) + + +# lt_decl_all_varnames([SEPARATOR], [VARNAME1...]) +# ------------------------------------------------ +m4_define([lt_decl_all_varnames], +[_$0(m4_quote(m4_default([$1], [[, ]])), + m4_if([$2], [], + m4_quote(lt_decl_varnames), + m4_quote(m4_shift($@))))[]dnl +]) +m4_define([_lt_decl_all_varnames], +[lt_join($@, lt_decl_varnames_tagged([$1], + lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl +]) -_PKG_TEXT]) - ]) -elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) - m4_default([$4], [AC_MSG_FAILURE( -[The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. -_PKG_TEXT +# _LT_CONFIG_STATUS_DECLARE([VARNAME]) +# ------------------------------------ +# Quote a variable value, and forward it to `config.status' so that its +# declaration there will have the same value as in `configure'. VARNAME +# must have a single quote delimited value for this to work. +m4_define([_LT_CONFIG_STATUS_DECLARE], +[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`']) -To get pkg-config, see .]) + +# _LT_CONFIG_STATUS_DECLARATIONS +# ------------------------------ +# We delimit libtool config variables with single quotes, so when +# we write them to config.status, we have to be sure to quote all +# embedded single quotes properly. In configure, this macro expands +# each variable declared with _LT_DECL (and _LT_TAGDECL) into: +# +# ='`$ECHO "$" | $SED "$delay_single_quote_subst"`' +m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], +[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), + [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) + + +# _LT_LIBTOOL_TAGS +# ---------------- +# Output comment and list of tags supported by the script +m4_defun([_LT_LIBTOOL_TAGS], +[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl +available_tags="_LT_TAGS"dnl +]) + + +# _LT_LIBTOOL_DECLARE(VARNAME, [TAG]) +# ----------------------------------- +# Extract the dictionary values for VARNAME (optionally with TAG) and +# expand to a commented shell variable setting: +# +# # Some comment about what VAR is for. +# visible_name=$lt_internal_name +m4_define([_LT_LIBTOOL_DECLARE], +[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], + [description])))[]dnl +m4_pushdef([_libtool_name], + m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl +m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])), + [0], [_libtool_name=[$]$1], + [1], [_libtool_name=$lt_[]$1], + [2], [_libtool_name=$lt_[]$1], + [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl +m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl +]) + + +# _LT_LIBTOOL_CONFIG_VARS +# ----------------------- +# Produce commented declarations of non-tagged libtool config variables +# suitable for insertion in the LIBTOOL CONFIG section of the `libtool' +# script. Tagged libtool config variables (even for the LIBTOOL CONFIG +# section) are produced by _LT_LIBTOOL_TAG_VARS. +m4_defun([_LT_LIBTOOL_CONFIG_VARS], +[m4_foreach([_lt_var], + m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)), + [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])]) + + +# _LT_LIBTOOL_TAG_VARS(TAG) +# ------------------------- +m4_define([_LT_LIBTOOL_TAG_VARS], +[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames), + [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])]) + + +# _LT_TAGVAR(VARNAME, [TAGNAME]) +# ------------------------------ +m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])]) + + +# _LT_CONFIG_COMMANDS +# ------------------- +# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of +# variables for single and double quote escaping we saved from calls +# to _LT_DECL, we can put quote escaped variables declarations +# into `config.status', and then the shell code to quote escape them in +# for loops in `config.status'. Finally, any additional code accumulated +# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. +m4_defun([_LT_CONFIG_COMMANDS], +[AC_PROVIDE_IFELSE([LT_OUTPUT], + dnl If the libtool generation code has been placed in $CONFIG_LT, + dnl instead of duplicating it all over again into config.status, + dnl then we will have config.status run $CONFIG_LT later, so it + dnl needs to know what name is stored there: + [AC_CONFIG_COMMANDS([libtool], + [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])], + dnl If the libtool generation code is destined for config.status, + dnl expand the accumulated commands and init code now: + [AC_CONFIG_COMMANDS([libtool], + [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])]) +])#_LT_CONFIG_COMMANDS + + +# Initialize. +m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT], +[ + +# The HP-UX ksh and POSIX shell print the target directory to stdout +# if CDPATH is set. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +sed_quote_subst='$sed_quote_subst' +double_quote_subst='$double_quote_subst' +delay_variable_subst='$delay_variable_subst' +_LT_CONFIG_STATUS_DECLARATIONS +LTCC='$LTCC' +LTCFLAGS='$LTCFLAGS' +compiler='$compiler_DEFAULT' + +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +\$[]1 +_LTECHO_EOF' +} + +# Quote evaled strings. +for var in lt_decl_all_varnames([[ \ +]], lt_decl_quote_varnames); do + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in + *[[\\\\\\\`\\"\\\$]]*) + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + ;; + *) + eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" + ;; + esac +done + +# Double-quote double-evaled strings. +for var in lt_decl_all_varnames([[ \ +]], lt_decl_dquote_varnames); do + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in + *[[\\\\\\\`\\"\\\$]]*) + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + ;; + *) + eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" + ;; + esac +done + +_LT_OUTPUT_LIBTOOL_INIT +]) + +# _LT_GENERATED_FILE_INIT(FILE, [COMMENT]) +# ------------------------------------ +# Generate a child script FILE with all initialization necessary to +# reuse the environment learned by the parent script, and make the +# file executable. If COMMENT is supplied, it is inserted after the +# `#!' sequence but before initialization text begins. After this +# macro, additional text can be appended to FILE to form the body of +# the child script. The macro ends with non-zero status if the +# file could not be fully written (such as if the disk is full). +m4_ifdef([AS_INIT_GENERATED], +[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])], +[m4_defun([_LT_GENERATED_FILE_INIT], +[m4_require([AS_PREPARE])]dnl +[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl +[lt_write_fail=0 +cat >$1 <<_ASEOF || lt_write_fail=1 +#! $SHELL +# Generated by $as_me. +$2 +SHELL=\${CONFIG_SHELL-$SHELL} +export SHELL +_ASEOF +cat >>$1 <<\_ASEOF || lt_write_fail=1 +AS_SHELL_SANITIZE +_AS_PREPARE +exec AS_MESSAGE_FD>&1 +_ASEOF +test $lt_write_fail = 0 && chmod +x $1[]dnl +m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT + +# LT_OUTPUT +# --------- +# This macro allows early generation of the libtool script (before +# AC_OUTPUT is called), incase it is used in configure for compilation +# tests. +AC_DEFUN([LT_OUTPUT], +[: ${CONFIG_LT=./config.lt} +AC_MSG_NOTICE([creating $CONFIG_LT]) +_LT_GENERATED_FILE_INIT(["$CONFIG_LT"], +[# Run this file to recreate a libtool stub with the current configuration.]) + +cat >>"$CONFIG_LT" <<\_LTEOF +lt_cl_silent=false +exec AS_MESSAGE_LOG_FD>>config.log +{ + echo + AS_BOX([Running $as_me.]) +} >&AS_MESSAGE_LOG_FD + +lt_cl_help="\ +\`$as_me' creates a local libtool stub from the current configuration, +for use in further configure time tests before the real libtool is +generated. + +Usage: $[0] [[OPTIONS]] + + -h, --help print this help, then exit + -V, --version print version number, then exit + -q, --quiet do not print progress messages + -d, --debug don't remove temporary files + +Report bugs to ." + +lt_cl_version="\ +m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl +m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) +configured by $[0], generated by m4_PACKAGE_STRING. + +Copyright (C) 2011 Free Software Foundation, Inc. +This config.lt script is free software; the Free Software Foundation +gives unlimited permision to copy, distribute and modify it." + +while test $[#] != 0 +do + case $[1] in + --version | --v* | -V ) + echo "$lt_cl_version"; exit 0 ;; + --help | --h* | -h ) + echo "$lt_cl_help"; exit 0 ;; + --debug | --d* | -d ) + debug=: ;; + --quiet | --q* | --silent | --s* | -q ) + lt_cl_silent=: ;; + + -*) AC_MSG_ERROR([unrecognized option: $[1] +Try \`$[0] --help' for more information.]) ;; + + *) AC_MSG_ERROR([unrecognized argument: $[1] +Try \`$[0] --help' for more information.]) ;; + esac + shift +done + +if $lt_cl_silent; then + exec AS_MESSAGE_FD>/dev/null +fi +_LTEOF + +cat >>"$CONFIG_LT" <<_LTEOF +_LT_OUTPUT_LIBTOOL_COMMANDS_INIT +_LTEOF + +cat >>"$CONFIG_LT" <<\_LTEOF +AC_MSG_NOTICE([creating $ofile]) +_LT_OUTPUT_LIBTOOL_COMMANDS +AS_EXIT(0) +_LTEOF +chmod +x "$CONFIG_LT" + +# configure is writing to config.log, but config.lt does its own redirection, +# appending to config.log, which fails on DOS, as config.log is still kept +# open by configure. Here we exec the FD to /dev/null, effectively closing +# config.log, so it can be properly (re)opened and appended to by config.lt. +lt_cl_success=: +test "$silent" = yes && + lt_config_lt_args="$lt_config_lt_args --quiet" +exec AS_MESSAGE_LOG_FD>/dev/null +$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false +exec AS_MESSAGE_LOG_FD>>config.log +$lt_cl_success || AS_EXIT(1) +])# LT_OUTPUT + + +# _LT_CONFIG(TAG) +# --------------- +# If TAG is the built-in tag, create an initial libtool script with a +# default configuration from the untagged config vars. Otherwise add code +# to config.status for appending the configuration named by TAG from the +# matching tagged config vars. +m4_defun([_LT_CONFIG], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +_LT_CONFIG_SAVE_COMMANDS([ + m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl + m4_if(_LT_TAG, [C], [ + # See if we are running on zsh, and set the options which allow our + # commands through without removal of \ escapes. + if test -n "${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST + fi + + cfgfile="${ofile}T" + trap "$RM \"$cfgfile\"; exit 1" 1 2 15 + $RM "$cfgfile" + + cat <<_LT_EOF >> "$cfgfile" +#! $SHELL + +# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. +# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION +# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: +# NOTE: Changes made to this file will be lost: look at ltmain.sh. +# +_LT_COPYING +_LT_LIBTOOL_TAGS + +# ### BEGIN LIBTOOL CONFIG +_LT_LIBTOOL_CONFIG_VARS +_LT_LIBTOOL_TAG_VARS +# ### END LIBTOOL CONFIG + +_LT_EOF + + case $host_os in + aix3*) + cat <<\_LT_EOF >> "$cfgfile" +# AIX sometimes has problems with the GCC collect2 program. For some +# reason, if we set the COLLECT_NAMES environment variable, the problems +# vanish in a puff of smoke. +if test "X${COLLECT_NAMES+set}" != Xset; then + COLLECT_NAMES= + export COLLECT_NAMES +fi +_LT_EOF + ;; + esac + + _LT_PROG_LTMAIN + + # We use sed instead of cat because bash on DJGPP gets confused if + # if finds mixed CR/LF and LF-only lines. Since sed operates in + # text mode, it properly converts lines to CR/LF. This bash problem + # is reportedly fixed, but why not run on old versions too? + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) + + _LT_PROG_REPLACE_SHELLFNS + + mv -f "$cfgfile" "$ofile" || + (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") + chmod +x "$ofile" +], +[cat <<_LT_EOF >> "$ofile" + +dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded +dnl in a comment (ie after a #). +# ### BEGIN LIBTOOL TAG CONFIG: $1 +_LT_LIBTOOL_TAG_VARS(_LT_TAG) +# ### END LIBTOOL TAG CONFIG: $1 +_LT_EOF +])dnl /m4_if +], +[m4_if([$1], [], [ + PACKAGE='$PACKAGE' + VERSION='$VERSION' + TIMESTAMP='$TIMESTAMP' + RM='$RM' + ofile='$ofile'], []) +])dnl /_LT_CONFIG_SAVE_COMMANDS +])# _LT_CONFIG + + +# LT_SUPPORTED_TAG(TAG) +# --------------------- +# Trace this macro to discover what tags are supported by the libtool +# --tag option, using: +# autoconf --trace 'LT_SUPPORTED_TAG:$1' +AC_DEFUN([LT_SUPPORTED_TAG], []) + + +# C support is built-in for now +m4_define([_LT_LANG_C_enabled], []) +m4_define([_LT_TAGS], []) + + +# LT_LANG(LANG) +# ------------- +# Enable libtool support for the given language if not already enabled. +AC_DEFUN([LT_LANG], +[AC_BEFORE([$0], [LT_OUTPUT])dnl +m4_case([$1], + [C], [_LT_LANG(C)], + [C++], [_LT_LANG(CXX)], + [Go], [_LT_LANG(GO)], + [Java], [_LT_LANG(GCJ)], + [Fortran 77], [_LT_LANG(F77)], + [Fortran], [_LT_LANG(FC)], + [Windows Resource], [_LT_LANG(RC)], + [m4_ifdef([_LT_LANG_]$1[_CONFIG], + [_LT_LANG($1)], + [m4_fatal([$0: unsupported language: "$1"])])])dnl +])# LT_LANG + + +# _LT_LANG(LANGNAME) +# ------------------ +m4_defun([_LT_LANG], +[m4_ifdef([_LT_LANG_]$1[_enabled], [], + [LT_SUPPORTED_TAG([$1])dnl + m4_append([_LT_TAGS], [$1 ])dnl + m4_define([_LT_LANG_]$1[_enabled], [])dnl + _LT_LANG_$1_CONFIG($1)])dnl +])# _LT_LANG + + +m4_ifndef([AC_PROG_GO], [ +# NOTE: This macro has been submitted for inclusion into # +# GNU Autoconf as AC_PROG_GO. When it is available in # +# a released version of Autoconf we should remove this # +# macro and use it instead. # +m4_defun([AC_PROG_GO], +[AC_LANG_PUSH(Go)dnl +AC_ARG_VAR([GOC], [Go compiler command])dnl +AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl +_AC_ARG_VAR_LDFLAGS()dnl +AC_CHECK_TOOL(GOC, gccgo) +if test -z "$GOC"; then + if test -n "$ac_tool_prefix"; then + AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) + fi +fi +if test -z "$GOC"; then + AC_CHECK_PROG(GOC, gccgo, gccgo, false) +fi +])#m4_defun +])#m4_ifndef + + +# _LT_LANG_DEFAULT_CONFIG +# ----------------------- +m4_defun([_LT_LANG_DEFAULT_CONFIG], +[AC_PROVIDE_IFELSE([AC_PROG_CXX], + [LT_LANG(CXX)], + [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])]) + +AC_PROVIDE_IFELSE([AC_PROG_F77], + [LT_LANG(F77)], + [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])]) + +AC_PROVIDE_IFELSE([AC_PROG_FC], + [LT_LANG(FC)], + [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])]) + +dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal +dnl pulling things in needlessly. +AC_PROVIDE_IFELSE([AC_PROG_GCJ], + [LT_LANG(GCJ)], + [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], + [LT_LANG(GCJ)], + [AC_PROVIDE_IFELSE([LT_PROG_GCJ], + [LT_LANG(GCJ)], + [m4_ifdef([AC_PROG_GCJ], + [m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])]) + m4_ifdef([A][M_PROG_GCJ], + [m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])]) + m4_ifdef([LT_PROG_GCJ], + [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) + +AC_PROVIDE_IFELSE([AC_PROG_GO], + [LT_LANG(GO)], + [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) + +AC_PROVIDE_IFELSE([LT_PROG_RC], + [LT_LANG(RC)], + [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) +])# _LT_LANG_DEFAULT_CONFIG + +# Obsolete macros: +AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)]) +AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) +AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) +AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) +AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_CXX], []) +dnl AC_DEFUN([AC_LIBTOOL_F77], []) +dnl AC_DEFUN([AC_LIBTOOL_FC], []) +dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) +dnl AC_DEFUN([AC_LIBTOOL_RC], []) + + +# _LT_TAG_COMPILER +# ---------------- +m4_defun([_LT_TAG_COMPILER], +[AC_REQUIRE([AC_PROG_CC])dnl + +_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl +_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl +_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl +_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl + +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} + +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + +# Allow CC to be a program name with arguments. +compiler=$CC +])# _LT_TAG_COMPILER + + +# _LT_COMPILER_BOILERPLATE +# ------------------------ +# Check for compiler boilerplate output or warnings with +# the simple compiler test code. +m4_defun([_LT_COMPILER_BOILERPLATE], +[m4_require([_LT_DECL_SED])dnl +ac_outfile=conftest.$ac_objext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$RM conftest* +])# _LT_COMPILER_BOILERPLATE + + +# _LT_LINKER_BOILERPLATE +# ---------------------- +# Check for linker boilerplate output or warnings with +# the simple link test code. +m4_defun([_LT_LINKER_BOILERPLATE], +[m4_require([_LT_DECL_SED])dnl +ac_outfile=conftest.$ac_objext +echo "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_linker_boilerplate=`cat conftest.err` +$RM -r conftest* +])# _LT_LINKER_BOILERPLATE + +# _LT_REQUIRED_DARWIN_CHECKS +# ------------------------- +m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ + case $host_os in + rhapsody* | darwin*) + AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) + AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) + AC_CHECK_TOOL([LIPO], [lipo], [:]) + AC_CHECK_TOOL([OTOOL], [otool], [:]) + AC_CHECK_TOOL([OTOOL64], [otool64], [:]) + _LT_DECL([], [DSYMUTIL], [1], + [Tool to manipulate archived DWARF debug symbol files on Mac OS X]) + _LT_DECL([], [NMEDIT], [1], + [Tool to change global to local symbols on Mac OS X]) + _LT_DECL([], [LIPO], [1], + [Tool to manipulate fat objects and archives on Mac OS X]) + _LT_DECL([], [OTOOL], [1], + [ldd/readelf like tool for Mach-O binaries on Mac OS X]) + _LT_DECL([], [OTOOL64], [1], + [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4]) + + AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], + [lt_cv_apple_cc_single_mod=no + if test -z "${LT_MULTI_MODULE}"; then + # By default we will add the -single_module flag. You can override + # by either setting the environment variable LT_MULTI_MODULE + # non-empty at configure time, or by adding -multi_module to the + # link flags. + rm -rf libconftest.dylib* + echo "int foo(void){return 1;}" > conftest.c + echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ +-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD + $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ + -dynamiclib -Wl,-single_module conftest.c 2>conftest.err + _lt_result=$? + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test $_lt_result -eq 0; then + lt_cv_apple_cc_single_mod=yes + else + cat conftest.err >&AS_MESSAGE_LOG_FD + fi + rm -rf libconftest.dylib* + rm -f conftest.* + fi]) + + AC_CACHE_CHECK([for -exported_symbols_list linker flag], + [lt_cv_ld_exported_symbols_list], + [lt_cv_ld_exported_symbols_list=no + save_LDFLAGS=$LDFLAGS + echo "_main" > conftest.sym + LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" + AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], + [lt_cv_ld_exported_symbols_list=yes], + [lt_cv_ld_exported_symbols_list=no]) + LDFLAGS="$save_LDFLAGS" + ]) + + AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], + [lt_cv_ld_force_load=no + cat > conftest.c << _LT_EOF +int forced_loaded() { return 2;} +_LT_EOF + echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD + $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD + echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD + $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD + echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD + $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD + cat > conftest.c << _LT_EOF +int main() { return 0;} +_LT_EOF + echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD + $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err + _lt_result=$? + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then + lt_cv_ld_force_load=yes + else + cat conftest.err >&AS_MESSAGE_LOG_FD + fi + rm -f conftest.err libconftest.a conftest conftest.c + rm -rf conftest.dSYM + ]) + case $host_os in + rhapsody* | darwin1.[[012]]) + _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + darwin1.*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + darwin*) # darwin 5.x on + # if running on 10.5 or later, the deployment target defaults + # to the OS version, if on x86, and 10.4, the deployment + # target defaults to 10.4. Don't you love it? + case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in + 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + 10.[[012]]*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + 10.*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + esac + ;; + esac + if test "$lt_cv_apple_cc_single_mod" = "yes"; then + _lt_dar_single_mod='$single_module' + fi + if test "$lt_cv_ld_exported_symbols_list" = "yes"; then + _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + else + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' + fi + if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then + _lt_dsymutil='~$DSYMUTIL $lib || :' + else + _lt_dsymutil= + fi + ;; + esac +]) + + +# _LT_DARWIN_LINKER_FEATURES([TAG]) +# --------------------------------- +# Checks for linker and compiler features on darwin +m4_defun([_LT_DARWIN_LINKER_FEATURES], +[ + m4_require([_LT_REQUIRED_DARWIN_CHECKS]) + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_automatic, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported + if test "$lt_cv_ld_force_load" = "yes"; then + _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], + [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) + else + _LT_TAGVAR(whole_archive_flag_spec, $1)='' + fi + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" + case $cc_basename in + ifort*) _lt_dar_can_shared=yes ;; + *) _lt_dar_can_shared=$GCC ;; + esac + if test "$_lt_dar_can_shared" = "yes"; then + output_verbose_link_cmd=func_echo_all + _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" + _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" + _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" + _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + m4_if([$1], [CXX], +[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then + _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" + _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" + fi +],[]) + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi +]) + +# _LT_SYS_MODULE_PATH_AIX([TAGNAME]) +# ---------------------------------- +# Links a minimal program and checks the executable +# for the system default hardcoded library path. In most cases, +# this is /usr/lib:/lib, but when the MPI compilers are used +# the location of the communication and MPI libs are included too. +# If we don't find anything, use the default library path according +# to the aix ld manual. +# Store the results from the different compilers for each TAGNAME. +# Allow to override them for all tags through lt_cv_aix_libpath. +m4_defun([_LT_SYS_MODULE_PATH_AIX], +[m4_require([_LT_DECL_SED])dnl +if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else + AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], + [AC_LINK_IFELSE([AC_LANG_PROGRAM],[ + lt_aix_libpath_sed='[ + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }]' + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. + if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi],[]) + if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" + fi + ]) + aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) +fi +])# _LT_SYS_MODULE_PATH_AIX + + +# _LT_SHELL_INIT(ARG) +# ------------------- +m4_define([_LT_SHELL_INIT], +[m4_divert_text([M4SH-INIT], [$1 +])])# _LT_SHELL_INIT + + + +# _LT_PROG_ECHO_BACKSLASH +# ----------------------- +# Find how we can fake an echo command that does not interpret backslash. +# In particular, with Autoconf 2.60 or later we add some code to the start +# of the generated configure script which will find a shell with a builtin +# printf (which we can use as an echo command). +m4_defun([_LT_PROG_ECHO_BACKSLASH], +[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO + +AC_MSG_CHECKING([how to print strings]) +# Test print first, because it will be a builtin if present. +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ + test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='print -r --' +elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='printf %s\n' +else + # Use this function as a fallback that always works. + func_fallback_echo () + { + eval 'cat <<_LTECHO_EOF +$[]1 +_LTECHO_EOF' + } + ECHO='func_fallback_echo' +fi + +# func_echo_all arg... +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "$*" +} + +case "$ECHO" in + printf*) AC_MSG_RESULT([printf]) ;; + print*) AC_MSG_RESULT([print -r]) ;; + *) AC_MSG_RESULT([cat]) ;; +esac + +m4_ifdef([_AS_DETECT_SUGGESTED], +[_AS_DETECT_SUGGESTED([ + test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || ( + ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' + ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO + ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO + PATH=/empty FPATH=/empty; export PATH FPATH + test "X`printf %s $ECHO`" = "X$ECHO" \ + || test "X`print -r -- $ECHO`" = "X$ECHO" )])]) + +_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) +_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) +])# _LT_PROG_ECHO_BACKSLASH + + +# _LT_WITH_SYSROOT +# ---------------- +AC_DEFUN([_LT_WITH_SYSROOT], +[AC_MSG_CHECKING([for sysroot]) +AC_ARG_WITH([sysroot], +[ --with-sysroot[=DIR] Search for dependent libraries within DIR + (or the compiler's sysroot if not specified).], +[], [with_sysroot=no]) + +dnl lt_sysroot will always be passed unquoted. We quote it here +dnl in case the user passed a directory name. +lt_sysroot= +case ${with_sysroot} in #( + yes) + if test "$GCC" = yes; then + lt_sysroot=`$CC --print-sysroot 2>/dev/null` + fi + ;; #( + /*) + lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` + ;; #( + no|'') + ;; #( + *) + AC_MSG_RESULT([${with_sysroot}]) + AC_MSG_ERROR([The sysroot must be an absolute path.]) + ;; +esac + + AC_MSG_RESULT([${lt_sysroot:-no}]) +_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl +[dependent libraries, and in which our libraries should be installed.])]) + +# _LT_ENABLE_LOCK +# --------------- +m4_defun([_LT_ENABLE_LOCK], +[AC_ARG_ENABLE([libtool-lock], + [AS_HELP_STRING([--disable-libtool-lock], + [avoid locking (might break parallel builds)])]) +test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes + +# Some flags need to be propagated to the compiler or linker for good +# libtool support. +case $host in +ia64-*-hpux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.$ac_objext` in + *ELF-32*) + HPUX_IA64_MODE="32" + ;; + *ELF-64*) + HPUX_IA64_MODE="64" + ;; + esac + fi + rm -rf conftest* + ;; +*-*-irix6*) + # Find out which ABI we are using. + echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + if test "$lt_cv_prog_gnu_ld" = yes; then + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -melf32bsmip" + ;; + *N32*) + LD="${LD-ld} -melf32bmipn32" + ;; + *64-bit*) + LD="${LD-ld} -melf64bmip" + ;; + esac + else + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -32" + ;; + *N32*) + LD="${LD-ld} -n32" + ;; + *64-bit*) + LD="${LD-ld} -64" + ;; + esac + fi + fi + rm -rf conftest* + ;; + +x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.o` in + *32-bit*) + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_i386_fbsd" + ;; + x86_64-*linux*) + LD="${LD-ld} -m elf_i386" + ;; + ppc64-*linux*|powerpc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" + ;; + s390x-*linux*) + LD="${LD-ld} -m elf_s390" + ;; + sparc64-*linux*) + LD="${LD-ld} -m elf32_sparc" + ;; + esac + ;; + *64-bit*) + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_x86_64_fbsd" + ;; + x86_64-*linux*) + LD="${LD-ld} -m elf_x86_64" + ;; + ppc*-*linux*|powerpc*-*linux*) + LD="${LD-ld} -m elf64ppc" + ;; + s390*-*linux*|s390*-*tpf*) + LD="${LD-ld} -m elf64_s390" + ;; + sparc*-*linux*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; + +*-*-sco3.2v5*) + # On SCO OpenServer 5, we need -belf to get full-featured binaries. + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -belf" + AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, + [AC_LANG_PUSH(C) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) + AC_LANG_POP]) + if test x"$lt_cv_cc_needs_belf" != x"yes"; then + # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf + CFLAGS="$SAVE_CFLAGS" + fi + ;; +*-*solaris*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.o` in + *64-bit*) + case $lt_cv_prog_gnu_ld in + yes*) + case $host in + i?86-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD="${LD-ld}_sol2" + fi + ;; + *) + if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then + LD="${LD-ld} -64" + fi + ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; +esac + +need_locks="$enable_libtool_lock" +])# _LT_ENABLE_LOCK + + +# _LT_PROG_AR +# ----------- +m4_defun([_LT_PROG_AR], +[AC_CHECK_TOOLS(AR, [ar], false) +: ${AR=ar} +: ${AR_FLAGS=cru} +_LT_DECL([], [AR], [1], [The archiver]) +_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) + +AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], + [lt_cv_ar_at_file=no + AC_COMPILE_IFELSE([AC_LANG_PROGRAM], + [echo conftest.$ac_objext > conftest.lst + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' + AC_TRY_EVAL([lt_ar_try]) + if test "$ac_status" -eq 0; then + # Ensure the archiver fails upon bogus file names. + rm -f conftest.$ac_objext libconftest.a + AC_TRY_EVAL([lt_ar_try]) + if test "$ac_status" -ne 0; then + lt_cv_ar_at_file=@ + fi + fi + rm -f conftest.* libconftest.a + ]) + ]) + +if test "x$lt_cv_ar_at_file" = xno; then + archiver_list_spec= +else + archiver_list_spec=$lt_cv_ar_at_file +fi +_LT_DECL([], [archiver_list_spec], [1], + [How to feed a file listing to the archiver]) +])# _LT_PROG_AR + + +# _LT_CMD_OLD_ARCHIVE +# ------------------- +m4_defun([_LT_CMD_OLD_ARCHIVE], +[_LT_PROG_AR + +AC_CHECK_TOOL(STRIP, strip, :) +test -z "$STRIP" && STRIP=: +_LT_DECL([], [STRIP], [1], [A symbol stripping program]) + +AC_CHECK_TOOL(RANLIB, ranlib, :) +test -z "$RANLIB" && RANLIB=: +_LT_DECL([], [RANLIB], [1], + [Commands used to install an old-style archive]) + +# Determine commands to create old-style static archives. +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' +old_postinstall_cmds='chmod 644 $oldlib' +old_postuninstall_cmds= + +if test -n "$RANLIB"; then + case $host_os in + openbsd*) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" + ;; + *) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" + ;; + esac + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" +fi + +case $host_os in + darwin*) + lock_old_archive_extraction=yes ;; + *) + lock_old_archive_extraction=no ;; +esac +_LT_DECL([], [old_postinstall_cmds], [2]) +_LT_DECL([], [old_postuninstall_cmds], [2]) +_LT_TAGDECL([], [old_archive_cmds], [2], + [Commands used to build an old-style archive]) +_LT_DECL([], [lock_old_archive_extraction], [0], + [Whether to use a lock for old archive extraction]) +])# _LT_CMD_OLD_ARCHIVE + + +# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, +# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) +# ---------------------------------------------------------------- +# Check whether the given compiler option works +AC_DEFUN([_LT_COMPILER_OPTION], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_SED])dnl +AC_CACHE_CHECK([$1], [$2], + [$2=no + m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$3" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&AS_MESSAGE_LOG_FD + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + $2=yes + fi + fi + $RM conftest* +]) + +if test x"[$]$2" = xyes; then + m4_if([$5], , :, [$5]) +else + m4_if([$6], , :, [$6]) +fi +])# _LT_COMPILER_OPTION + +# Old name: +AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], []) + + +# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, +# [ACTION-SUCCESS], [ACTION-FAILURE]) +# ---------------------------------------------------- +# Check whether the given linker option works +AC_DEFUN([_LT_LINKER_OPTION], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_SED])dnl +AC_CACHE_CHECK([$1], [$2], + [$2=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $3" + echo "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&AS_MESSAGE_LOG_FD + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + $2=yes + fi + else + $2=yes + fi + fi + $RM -r conftest* + LDFLAGS="$save_LDFLAGS" +]) + +if test x"[$]$2" = xyes; then + m4_if([$4], , :, [$4]) +else + m4_if([$5], , :, [$5]) +fi +])# _LT_LINKER_OPTION + +# Old name: +AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], []) + + +# LT_CMD_MAX_LEN +#--------------- +AC_DEFUN([LT_CMD_MAX_LEN], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +# find the maximum length of command line arguments +AC_MSG_CHECKING([the maximum length of command line arguments]) +AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl + i=0 + teststring="ABCD" + + case $build_os in + msdosdjgpp*) + # On DJGPP, this test can blow up pretty badly due to problems in libc + # (any single argument exceeding 2000 bytes causes a buffer overrun + # during glob expansion). Even if it were fixed, the result of this + # check would be larger than it should be. + lt_cv_sys_max_cmd_len=12288; # 12K is about right + ;; + + gnu*) + # Under GNU Hurd, this test is not required because there is + # no limit to the length of command line arguments. + # Libtool will interpret -1 as no limit whatsoever + lt_cv_sys_max_cmd_len=-1; + ;; + + cygwin* | mingw* | cegcc*) + # On Win9x/ME, this test blows up -- it succeeds, but takes + # about 5 minutes as the teststring grows exponentially. + # Worse, since 9x/ME are not pre-emptively multitasking, + # you end up with a "frozen" computer, even though with patience + # the test eventually succeeds (with a max line length of 256k). + # Instead, let's just punt: use the minimum linelength reported by + # all of the supported platforms: 8192 (on NT/2K/XP). + lt_cv_sys_max_cmd_len=8192; + ;; + + mint*) + # On MiNT this can take a long time and run out of memory. + lt_cv_sys_max_cmd_len=8192; + ;; + + amigaos*) + # On AmigaOS with pdksh, this test takes hours, literally. + # So we just punt and use a minimum line length of 8192. + lt_cv_sys_max_cmd_len=8192; + ;; + + netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) + # This has been around since 386BSD, at least. Likely further. + if test -x /sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` + elif test -x /usr/sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` + else + lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs + fi + # And add a safety zone + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + ;; + + interix*) + # We know the value 262144 and hardcode it with a safety zone (like BSD) + lt_cv_sys_max_cmd_len=196608 + ;; + + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + + osf*) + # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure + # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not + # nice to cause kernel panics so lets avoid the loop below. + # First set a reasonable default. + lt_cv_sys_max_cmd_len=16384 + # + if test -x /sbin/sysconfig; then + case `/sbin/sysconfig -q proc exec_disable_arg_limit` in + *1*) lt_cv_sys_max_cmd_len=-1 ;; + esac + fi + ;; + sco3.2v5*) + lt_cv_sys_max_cmd_len=102400 + ;; + sysv5* | sco5v6* | sysv4.2uw2*) + kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` + if test -n "$kargmax"; then + lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` + else + lt_cv_sys_max_cmd_len=32768 + fi + ;; + *) + lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` + if test -n "$lt_cv_sys_max_cmd_len"; then + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + else + # Make teststring a little bigger before we do anything with it. + # a 1K string should be a reasonable start. + for i in 1 2 3 4 5 6 7 8 ; do + teststring=$teststring$teststring + done + SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} + # If test is not a shell built-in, we'll probably end up computing a + # maximum length that is only half of the actual maximum length, but + # we can't tell. + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ + = "X$teststring$teststring"; } >/dev/null 2>&1 && + test $i != 17 # 1/2 MB should be enough + do + i=`expr $i + 1` + teststring=$teststring$teststring + done + # Only check the string length outside the loop. + lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` + teststring= + # Add a significant safety factor because C++ compilers can tack on + # massive amounts of additional arguments before passing them to the + # linker. It appears as though 1/2 is a usable value. + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + fi + ;; + esac +]) +if test -n $lt_cv_sys_max_cmd_len ; then + AC_MSG_RESULT($lt_cv_sys_max_cmd_len) +else + AC_MSG_RESULT(none) +fi +max_cmd_len=$lt_cv_sys_max_cmd_len +_LT_DECL([], [max_cmd_len], [0], + [What is the maximum length of a command?]) +])# LT_CMD_MAX_LEN + +# Old name: +AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], []) + + +# _LT_HEADER_DLFCN +# ---------------- +m4_defun([_LT_HEADER_DLFCN], +[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl +])# _LT_HEADER_DLFCN + + +# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, +# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) +# ---------------------------------------------------------------- +m4_defun([_LT_TRY_DLOPEN_SELF], +[m4_require([_LT_HEADER_DLFCN])dnl +if test "$cross_compiling" = yes; then : + [$4] +else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +[#line $LINENO "configure" +#include "confdefs.h" + +#if HAVE_DLFCN_H +#include +#endif + +#include + +#ifdef RTLD_GLOBAL +# define LT_DLGLOBAL RTLD_GLOBAL +#else +# ifdef DL_GLOBAL +# define LT_DLGLOBAL DL_GLOBAL +# else +# define LT_DLGLOBAL 0 +# endif +#endif + +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ +#ifndef LT_DLLAZY_OR_NOW +# ifdef RTLD_LAZY +# define LT_DLLAZY_OR_NOW RTLD_LAZY +# else +# ifdef DL_LAZY +# define LT_DLLAZY_OR_NOW DL_LAZY +# else +# ifdef RTLD_NOW +# define LT_DLLAZY_OR_NOW RTLD_NOW +# else +# ifdef DL_NOW +# define LT_DLLAZY_OR_NOW DL_NOW +# else +# define LT_DLLAZY_OR_NOW 0 +# endif +# endif +# endif +# endif +#endif + +/* When -fvisbility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ +#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +int fnord () __attribute__((visibility("default"))); +#endif + +int fnord () { return 42; } +int main () +{ + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; + + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; + else + { + if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else puts (dlerror ()); + } + /* dlclose (self); */ + } + else + puts (dlerror ()); + + return status; +}] +_LT_EOF + if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) $1 ;; + x$lt_dlneed_uscore) $2 ;; + x$lt_dlunknown|x*) $3 ;; + esac + else : + # compilation failed + $3 + fi +fi +rm -fr conftest* +])# _LT_TRY_DLOPEN_SELF + + +# LT_SYS_DLOPEN_SELF +# ------------------ +AC_DEFUN([LT_SYS_DLOPEN_SELF], +[m4_require([_LT_HEADER_DLFCN])dnl +if test "x$enable_dlopen" != xyes; then + enable_dlopen=unknown + enable_dlopen_self=unknown + enable_dlopen_self_static=unknown +else + lt_cv_dlopen=no + lt_cv_dlopen_libs= + + case $host_os in + beos*) + lt_cv_dlopen="load_add_on" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + ;; + + mingw* | pw32* | cegcc*) + lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen_libs= + ;; + + cygwin*) + lt_cv_dlopen="dlopen" + lt_cv_dlopen_libs= + ;; + + darwin*) + # if libdl is installed we need to link against it + AC_CHECK_LIB([dl], [dlopen], + [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ + lt_cv_dlopen="dyld" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + ]) + ;; + + *) + AC_CHECK_FUNC([shl_load], + [lt_cv_dlopen="shl_load"], + [AC_CHECK_LIB([dld], [shl_load], + [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], + [AC_CHECK_FUNC([dlopen], + [lt_cv_dlopen="dlopen"], + [AC_CHECK_LIB([dl], [dlopen], + [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], + [AC_CHECK_LIB([svld], [dlopen], + [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], + [AC_CHECK_LIB([dld], [dld_link], + [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) + ]) + ]) + ]) + ]) + ]) + ;; + esac + + if test "x$lt_cv_dlopen" != xno; then + enable_dlopen=yes + else + enable_dlopen=no + fi + + case $lt_cv_dlopen in + dlopen) + save_CPPFLAGS="$CPPFLAGS" + test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + + save_LDFLAGS="$LDFLAGS" + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + + save_LIBS="$LIBS" + LIBS="$lt_cv_dlopen_libs $LIBS" + + AC_CACHE_CHECK([whether a program can dlopen itself], + lt_cv_dlopen_self, [dnl + _LT_TRY_DLOPEN_SELF( + lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, + lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) + ]) + + if test "x$lt_cv_dlopen_self" = xyes; then + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" + AC_CACHE_CHECK([whether a statically linked program can dlopen itself], + lt_cv_dlopen_self_static, [dnl + _LT_TRY_DLOPEN_SELF( + lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, + lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) + ]) + fi + + CPPFLAGS="$save_CPPFLAGS" + LDFLAGS="$save_LDFLAGS" + LIBS="$save_LIBS" + ;; + esac + + case $lt_cv_dlopen_self in + yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; + *) enable_dlopen_self=unknown ;; + esac + + case $lt_cv_dlopen_self_static in + yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; + *) enable_dlopen_self_static=unknown ;; + esac +fi +_LT_DECL([dlopen_support], [enable_dlopen], [0], + [Whether dlopen is supported]) +_LT_DECL([dlopen_self], [enable_dlopen_self], [0], + [Whether dlopen of programs is supported]) +_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0], + [Whether dlopen of statically linked programs is supported]) +])# LT_SYS_DLOPEN_SELF + +# Old name: +AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], []) + + +# _LT_COMPILER_C_O([TAGNAME]) +# --------------------------- +# Check to see if options -c and -o are simultaneously supported by compiler. +# This macro does not hard code the compiler like AC_PROG_CC_C_O. +m4_defun([_LT_COMPILER_C_O], +[m4_require([_LT_DECL_SED])dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_TAG_COMPILER])dnl +AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], + [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)], + [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no + $RM -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&AS_MESSAGE_LOG_FD + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes + fi + fi + chmod u+w . 2>&AS_MESSAGE_LOG_FD + $RM conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files + $RM out/* && rmdir out + cd .. + $RM -r conftest + $RM conftest* +]) +_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1], + [Does compiler simultaneously support -c and -o options?]) +])# _LT_COMPILER_C_O + + +# _LT_COMPILER_FILE_LOCKS([TAGNAME]) +# ---------------------------------- +# Check to see if we can do hard links to lock some files if needed +m4_defun([_LT_COMPILER_FILE_LOCKS], +[m4_require([_LT_ENABLE_LOCK])dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +_LT_COMPILER_C_O([$1]) + +hard_links="nottested" +if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user + AC_MSG_CHECKING([if we can lock with hard links]) + hard_links=yes + $RM conftest* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no + AC_MSG_RESULT([$hard_links]) + if test "$hard_links" = no; then + AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) + need_locks=warn + fi +else + need_locks=no +fi +_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?]) +])# _LT_COMPILER_FILE_LOCKS + + +# _LT_CHECK_OBJDIR +# ---------------- +m4_defun([_LT_CHECK_OBJDIR], +[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], +[rm -f .libs 2>/dev/null +mkdir .libs 2>/dev/null +if test -d .libs; then + lt_cv_objdir=.libs +else + # MS-DOS does not allow filenames that begin with a dot. + lt_cv_objdir=_libs +fi +rmdir .libs 2>/dev/null]) +objdir=$lt_cv_objdir +_LT_DECL([], [objdir], [0], + [The name of the directory that contains temporary libtool files])dnl +m4_pattern_allow([LT_OBJDIR])dnl +AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/", + [Define to the sub-directory in which libtool stores uninstalled libraries.]) +])# _LT_CHECK_OBJDIR + + +# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME]) +# -------------------------------------- +# Check hardcoding attributes. +m4_defun([_LT_LINKER_HARDCODE_LIBPATH], +[AC_MSG_CHECKING([how to hardcode library paths into programs]) +_LT_TAGVAR(hardcode_action, $1)= +if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" || + test -n "$_LT_TAGVAR(runpath_var, $1)" || + test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then + + # We can hardcode non-existent directories. + if test "$_LT_TAGVAR(hardcode_direct, $1)" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no && + test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then + # Linking always hardcodes the temporary library directory. + _LT_TAGVAR(hardcode_action, $1)=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + _LT_TAGVAR(hardcode_action, $1)=immediate + fi +else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + _LT_TAGVAR(hardcode_action, $1)=unsupported +fi +AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)]) + +if test "$_LT_TAGVAR(hardcode_action, $1)" = relink || + test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then + # Fast installation is not supported + enable_fast_install=no +elif test "$shlibpath_overrides_runpath" = yes || + test "$enable_shared" = no; then + # Fast installation is not necessary + enable_fast_install=needless +fi +_LT_TAGDECL([], [hardcode_action], [0], + [How to hardcode a shared library path into an executable]) +])# _LT_LINKER_HARDCODE_LIBPATH + + +# _LT_CMD_STRIPLIB +# ---------------- +m4_defun([_LT_CMD_STRIPLIB], +[m4_require([_LT_DECL_EGREP]) +striplib= +old_striplib= +AC_MSG_CHECKING([whether stripping libraries is possible]) +if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + AC_MSG_RESULT([yes]) +else +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) + if test -n "$STRIP" ; then + striplib="$STRIP -x" + old_striplib="$STRIP -S" + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi + ;; + *) + AC_MSG_RESULT([no]) + ;; + esac +fi +_LT_DECL([], [old_striplib], [1], [Commands to strip libraries]) +_LT_DECL([], [striplib], [1]) +])# _LT_CMD_STRIPLIB + + +# _LT_SYS_DYNAMIC_LINKER([TAG]) +# ----------------------------- +# PORTME Fill in your ld.so characteristics +m4_defun([_LT_SYS_DYNAMIC_LINKER], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_OBJDUMP])dnl +m4_require([_LT_DECL_SED])dnl +m4_require([_LT_CHECK_SHELL_FEATURES])dnl +AC_MSG_CHECKING([dynamic linker characteristics]) +m4_if([$1], + [], [ +if test "$GCC" = yes; then + case $host_os in + darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; + *) lt_awk_arg="/^libraries:/" ;; + esac + case $host_os in + mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;; + *) lt_sed_strip_eq="s,=/,/,g" ;; + esac + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` + case $lt_search_path_spec in + *\;*) + # if the path contains ";" then we assume it to be the separator + # otherwise default to the standard path separator (i.e. ":") - it is + # assumed that no part of a normal pathname contains ";" but that should + # okay in the real world where ";" in dirpaths is itself problematic. + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` + ;; + *) + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` + ;; + esac + # Ok, now we have the path, separated by spaces, we can step through it + # and add multilib dir if necessary. + lt_tmp_lt_search_path_spec= + lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + for lt_sys_path in $lt_search_path_spec; do + if test -d "$lt_sys_path/$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" + else + test -d "$lt_sys_path" && \ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi + done + lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' +BEGIN {RS=" "; FS="/|\n";} { + lt_foo=""; + lt_count=0; + for (lt_i = NF; lt_i > 0; lt_i--) { + if ($lt_i != "" && $lt_i != ".") { + if ($lt_i == "..") { + lt_count++; + } else { + if (lt_count == 0) { + lt_foo="/" $lt_i lt_foo; + } else { + lt_count--; + } + } + } + } + if (lt_foo != "") { lt_freq[[lt_foo]]++; } + if (lt_freq[[lt_foo]] == 1) { print lt_foo; } +}'` + # AWK program above erroneously prepends '/' to C:/dos/paths + # for these hosts. + case $host_os in + mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ + $SED 's,/\([[A-Za-z]]:\),\1,g'` ;; + esac + sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` +else + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +fi]) +library_names_spec= +libname_spec='lib$name' +soname_spec= +shrext_cmds=".so" +postinstall_cmds= +postuninstall_cmds= +finish_cmds= +finish_eval= +shlibpath_var= +shlibpath_overrides_runpath=unknown +version_type=none +dynamic_linker="$host_os ld.so" +sys_lib_dlsearch_path_spec="/lib /usr/lib" +need_lib_prefix=unknown +hardcode_into_libs=no + +# when you set need_version to no, make sure it does not cause -set_version +# flags to be left without arguments +need_version=unknown + +case $host_os in +aix3*) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + shlibpath_var=LIBPATH + + # AIX 3 has no versioning support, so we append a major version to the name. + soname_spec='${libname}${release}${shared_ext}$major' + ;; + +aix[[4-9]]*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + hardcode_into_libs=yes + if test "$host_cpu" = ia64; then + # AIX 5 supports IA64 + library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + else + # With GCC up to 2.95.x, collect2 would create an import file + # for dependence libraries. The import file would start with + # the line `#! .'. This would cause the generated library to + # depend on `.', always an invalid library. This was fixed in + # development snapshots of GCC prior to 3.0. + case $host_os in + aix4 | aix4.[[01]] | aix4.[[01]].*) + if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' + echo ' yes ' + echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then + : + else + can_build_shared=no + fi + ;; + esac + # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # soname into executable. Probably we can add versioning support to + # collect2, so additional links can be useful in future. + if test "$aix_use_runtimelinking" = yes; then + # If using run time linking (on AIX 4.2 or later) use lib.so + # instead of lib.a to let people know that these are not + # typical AIX shared libraries. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + else + # We preserve .a as extension for shared libraries through AIX4.2 + # and later when we are not doing run time linking. + library_names_spec='${libname}${release}.a $libname.a' + soname_spec='${libname}${release}${shared_ext}$major' + fi + shlibpath_var=LIBPATH + fi + ;; + +amigaos*) + case $host_cpu in + powerpc) + # Since July 2007 AmigaOS4 officially supports .so libraries. + # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + ;; + m68k) + library_names_spec='$libname.ixlibrary $libname.a' + # Create ${libname}_ixlibrary.a entries in /sys/libs. + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + ;; + esac + ;; + +beos*) + library_names_spec='${libname}${shared_ext}' + dynamic_linker="$host_os ld.so" + shlibpath_var=LIBRARY_PATH + ;; + +bsdi[[45]]*) + version_type=linux # correct to gnu/linux during the next big refactor + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" + sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" + # the default ld.so.conf also contains /usr/contrib/lib and + # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow + # libtool to hard-code these into programs + ;; + +cygwin* | mingw* | pw32* | cegcc*) + version_type=windows + shrext_cmds=".dll" + need_version=no + need_lib_prefix=no + + case $GCC,$cc_basename in + yes,*) + # gcc + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + + case $host_os in + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' +m4_if([$1], [],[ + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) + ;; + mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix + soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + ;; + pw32*) + # pw32 DLLs use 'pw' prefix rather than 'lib' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + ;; + esac + dynamic_linker='Win32 ld.exe' + ;; + + *,cl*) + # Native MSVC + libname_spec='$name' + soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + library_names_spec='${libname}.dll.lib' + + case $build_os in + mingw*) + sys_lib_search_path_spec= + lt_save_ifs=$IFS + IFS=';' + for lt_path in $LIB + do + IFS=$lt_save_ifs + # Let DOS variable expansion print the short 8.3 style file name. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" + done + IFS=$lt_save_ifs + # Convert to MSYS style. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` + ;; + cygwin*) + # Convert to unix form, then to dos form, then back to unix form + # but this time dos style (no spaces!) so that the unix form looks + # like /cygdrive/c/PROGRA~1:/cygdr... + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + ;; + *) + sys_lib_search_path_spec="$LIB" + if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then + # It is most probably a Windows format PATH. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + # FIXME: find the short name or the path components, as spaces are + # common. (e.g. "Program Files" -> "PROGRA~1") + ;; + esac + + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + dynamic_linker='Win32 link.exe' + ;; + + *) + # Assume MSVC wrapper + library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' + dynamic_linker='Win32 ld.exe' + ;; + esac + # FIXME: first we should search . and the directory the executable is in + shlibpath_var=PATH + ;; + +darwin* | rhapsody*) + dynamic_linker="$host_os dyld" + version_type=darwin + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' + soname_spec='${libname}${release}${major}$shared_ext' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' +m4_if([$1], [],[ + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' + ;; + +dgux*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + ;; + +freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. + if test -x /usr/bin/objformat; then + objformat=`/usr/bin/objformat` + else + case $host_os in + freebsd[[23]].*) objformat=aout ;; + *) objformat=elf ;; + esac + fi + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + need_version=no + need_lib_prefix=no + ;; + freebsd-*) + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + need_version=yes + ;; + esac + shlibpath_var=LD_LIBRARY_PATH + case $host_os in + freebsd2.*) + shlibpath_overrides_runpath=yes + ;; + freebsd3.[[01]]* | freebsdelf3.[[01]]*) + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ + freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + *) # from 4.6 on, and DragonFly + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + esac + ;; + +gnu*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + +haiku*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + dynamic_linker="$host_os runtime_loader" + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LIBRARY_PATH + shlibpath_overrides_runpath=yes + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' + hardcode_into_libs=yes + ;; + +hpux9* | hpux10* | hpux11*) + # Give a soname corresponding to the major version so that dld.sl refuses to + # link against other versions. + version_type=sunos + need_lib_prefix=no + need_version=no + case $host_cpu in + ia64*) + shrext_cmds='.so' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.so" + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + if test "X$HPUX_IA64_MODE" = X32; then + sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + else + sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + fi + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + hppa*64*) + shrext_cmds='.sl' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.sl" + shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + *) + shrext_cmds='.sl' + dynamic_linker="$host_os dld.sl" + shlibpath_var=SHLIB_PATH + shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + ;; + esac + # HP-UX runs *really* slowly unless shared libraries are mode 555, ... + postinstall_cmds='chmod 555 $lib' + # or fails outright, so override atomically: + install_override_mode=555 + ;; + +interix[[3-9]]*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + +irix5* | irix6* | nonstopux*) + case $host_os in + nonstopux*) version_type=nonstopux ;; + *) + if test "$lt_cv_prog_gnu_ld" = yes; then + version_type=linux # correct to gnu/linux during the next big refactor + else + version_type=irix + fi ;; + esac + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + case $host_os in + irix5* | nonstopux*) + libsuff= shlibsuff= + ;; + *) + case $LD in # libtool.m4 will add one of these switches to LD + *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") + libsuff= shlibsuff= libmagic=32-bit;; + *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") + libsuff=32 shlibsuff=N32 libmagic=N32;; + *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") + libsuff=64 shlibsuff=64 libmagic=64-bit;; + *) libsuff= shlibsuff= libmagic=never-match;; + esac + ;; + esac + shlibpath_var=LD_LIBRARY${shlibsuff}_PATH + shlibpath_overrides_runpath=no + sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" + sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + hardcode_into_libs=yes + ;; + +# No shared lib support for Linux oldld, aout, or coff. +linux*oldld* | linux*aout* | linux*coff*) + dynamic_linker=no + ;; + +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + + # Some binutils ld are patched to set DT_RUNPATH + AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath], + [lt_cv_shlibpath_overrides_runpath=no + save_LDFLAGS=$LDFLAGS + save_libdir=$libdir + eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ + LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" + AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], + [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], + [lt_cv_shlibpath_overrides_runpath=yes])]) + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir + ]) + shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath + + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + # Add ABI-specific directories to the system library path. + sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" + + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on + # powerpc, because MkLinux only supported shared libraries with the + # GNU dynamic linker. Since this was broken with cross compilers, + # most powerpc-linux boxes support dynamic linking these days and + # people can always --disable-shared, the test was removed, and we + # assume the GNU/Linux dynamic linker is in use. + dynamic_linker='GNU/Linux ld.so' + ;; + +netbsd*) + version_type=sunos + need_lib_prefix=no + need_version=no + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + dynamic_linker='NetBSD (a.out) ld.so' + else + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='NetBSD ld.elf_so' + fi + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + +newsos6) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; + +*nto* | *qnx*) + version_type=qnx + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='ldqnx.so' + ;; + +openbsd*) + version_type=sunos + sys_lib_dlsearch_path_spec="/usr/lib" + need_lib_prefix=no + # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. + case $host_os in + openbsd3.3 | openbsd3.3.*) need_version=yes ;; + *) need_version=no ;; + esac + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + case $host_os in + openbsd2.[[89]] | openbsd2.[[89]].*) + shlibpath_overrides_runpath=no + ;; + *) + shlibpath_overrides_runpath=yes + ;; + esac + else + shlibpath_overrides_runpath=yes + fi + ;; + +os2*) + libname_spec='$name' + shrext_cmds=".dll" + need_lib_prefix=no + library_names_spec='$libname${shared_ext} $libname.a' + dynamic_linker='OS/2 ld.exe' + shlibpath_var=LIBPATH + ;; + +osf3* | osf4* | osf5*) + version_type=osf + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; + +rdos*) + dynamic_linker=no + ;; + +solaris*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + # ldd complains unless libraries are executable + postinstall_cmds='chmod +x $lib' + ;; + +sunos4*) + version_type=sunos + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + if test "$with_gnu_ld" = yes; then + need_lib_prefix=no + fi + need_version=yes + ;; + +sysv4 | sysv4.3*) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + case $host_vendor in + sni) + shlibpath_overrides_runpath=no + need_lib_prefix=no + runpath_var=LD_RUN_PATH + ;; + siemens) + need_lib_prefix=no + ;; + motorola) + need_lib_prefix=no + need_version=no + shlibpath_overrides_runpath=no + sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' + ;; + esac + ;; + +sysv4*MP*) + if test -d /usr/nec ;then + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' + soname_spec='$libname${shared_ext}.$major' + shlibpath_var=LD_LIBRARY_PATH + fi + ;; + +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + version_type=freebsd-elf + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + if test "$with_gnu_ld" = yes; then + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' + else + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' + case $host_os in + sco3.2v5*) + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" + ;; + esac + fi + sys_lib_dlsearch_path_spec='/usr/lib' + ;; + +tpf*) + # TPF is a cross-target only. Preferred cross-host = GNU/Linux. + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + +uts4*) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + ;; + +*) + dynamic_linker=no + ;; +esac +AC_MSG_RESULT([$dynamic_linker]) +test "$dynamic_linker" = no && can_build_shared=no + +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi + +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then + sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +fi +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then + sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" +fi + +_LT_DECL([], [variables_saved_for_relink], [1], + [Variables whose values should be saved in libtool wrapper scripts and + restored at link time]) +_LT_DECL([], [need_lib_prefix], [0], + [Do we need the "lib" prefix for modules?]) +_LT_DECL([], [need_version], [0], [Do we need a version for libraries?]) +_LT_DECL([], [version_type], [0], [Library versioning type]) +_LT_DECL([], [runpath_var], [0], [Shared library runtime path variable]) +_LT_DECL([], [shlibpath_var], [0],[Shared library path variable]) +_LT_DECL([], [shlibpath_overrides_runpath], [0], + [Is shlibpath searched before the hard-coded library search path?]) +_LT_DECL([], [libname_spec], [1], [Format of library name prefix]) +_LT_DECL([], [library_names_spec], [1], + [[List of archive names. First name is the real one, the rest are links. + The last name is the one that the linker finds with -lNAME]]) +_LT_DECL([], [soname_spec], [1], + [[The coded name of the library, if different from the real name]]) +_LT_DECL([], [install_override_mode], [1], + [Permission mode override for installation of shared libraries]) +_LT_DECL([], [postinstall_cmds], [2], + [Command to use after installation of a shared archive]) +_LT_DECL([], [postuninstall_cmds], [2], + [Command to use after uninstallation of a shared archive]) +_LT_DECL([], [finish_cmds], [2], + [Commands used to finish a libtool library installation in a directory]) +_LT_DECL([], [finish_eval], [1], + [[As "finish_cmds", except a single script fragment to be evaled but + not shown]]) +_LT_DECL([], [hardcode_into_libs], [0], + [Whether we should hardcode library paths into libraries]) +_LT_DECL([], [sys_lib_search_path_spec], [2], + [Compile-time system search path for libraries]) +_LT_DECL([], [sys_lib_dlsearch_path_spec], [2], + [Run-time system search path for libraries]) +])# _LT_SYS_DYNAMIC_LINKER + + +# _LT_PATH_TOOL_PREFIX(TOOL) +# -------------------------- +# find a file program which can recognize shared library +AC_DEFUN([_LT_PATH_TOOL_PREFIX], +[m4_require([_LT_DECL_EGREP])dnl +AC_MSG_CHECKING([for $1]) +AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, +[case $MAGIC_CMD in +[[\\/*] | ?:[\\/]*]) + lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + ;; +*) + lt_save_MAGIC_CMD="$MAGIC_CMD" + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +dnl $ac_dummy forces splitting on constant user-supplied paths. +dnl POSIX.2 word splitting is done only on the output of word expansions, +dnl not every word. This closes a longstanding sh security hole. + ac_dummy="m4_if([$2], , $PATH, [$2])" + for ac_dir in $ac_dummy; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$1; then + lt_cv_path_MAGIC_CMD="$ac_dir/$1" + if test -n "$file_magic_test_file"; then + case $deplibs_check_method in + "file_magic "*) + file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | + $EGREP "$file_magic_regex" > /dev/null; then + : + else + cat <<_LT_EOF 1>&2 + +*** Warning: the command libtool uses to detect shared libraries, +*** $file_magic_cmd, produces output that libtool cannot recognize. +*** The result is that libtool may fail to recognize shared libraries +*** as such. This will affect the creation of libtool libraries that +*** depend on shared libraries, but programs linked with such libtool +*** libraries will work regardless of this problem. Nevertheless, you +*** may want to report the problem to your system manager and/or to +*** bug-libtool@gnu.org + +_LT_EOF + fi ;; + esac + fi + break + fi + done + IFS="$lt_save_ifs" + MAGIC_CMD="$lt_save_MAGIC_CMD" + ;; +esac]) +MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +if test -n "$MAGIC_CMD"; then + AC_MSG_RESULT($MAGIC_CMD) +else + AC_MSG_RESULT(no) +fi +_LT_DECL([], [MAGIC_CMD], [0], + [Used to examine libraries when file_magic_cmd begins with "file"])dnl +])# _LT_PATH_TOOL_PREFIX + +# Old name: +AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], []) + + +# _LT_PATH_MAGIC +# -------------- +# find a file program which can recognize a shared library +m4_defun([_LT_PATH_MAGIC], +[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) +if test -z "$lt_cv_path_MAGIC_CMD"; then + if test -n "$ac_tool_prefix"; then + _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) + else + MAGIC_CMD=: + fi +fi +])# _LT_PATH_MAGIC + + +# LT_PATH_LD +# ---------- +# find the pathname to the GNU or non-GNU linker +AC_DEFUN([LT_PATH_LD], +[AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_CANONICAL_BUILD])dnl +m4_require([_LT_DECL_SED])dnl +m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_PROG_ECHO_BACKSLASH])dnl + +AC_ARG_WITH([gnu-ld], + [AS_HELP_STRING([--with-gnu-ld], + [assume the C compiler uses GNU ld @<:@default=no@:>@])], + [test "$withval" = no || with_gnu_ld=yes], + [with_gnu_ld=no])dnl + +ac_prog=ld +if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. + AC_MSG_CHECKING([for ld used by $CC]) + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return which upsets mingw + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; + *) + ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; + esac + case $ac_prog in + # Accept absolute paths. + [[\\/]]* | ?:[[\\/]]*) + re_direlt='/[[^/]][[^/]]*/\.\./' + # Canonicalize the pathname of ld + ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` + while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do + ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` + done + test -z "$LD" && LD="$ac_prog" + ;; + "") + # If it fails, then pretend we aren't using GCC. + ac_prog=ld + ;; + *) + # If it is relative, then search for the first ld in PATH. + with_gnu_ld=unknown + ;; + esac +elif test "$with_gnu_ld" = yes; then + AC_MSG_CHECKING([for GNU ld]) +else + AC_MSG_CHECKING([for non-GNU ld]) +fi +AC_CACHE_VAL(lt_cv_path_LD, +[if test -z "$LD"; then + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then + lt_cv_path_LD="$ac_dir/$ac_prog" + # Check to see if the program is GNU ld. I'd rather use --version, + # but apparently some variants of GNU ld only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + case `"$lt_cv_path_LD" -v 2>&1 &1 /dev/null 2>&1; then + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + else + # Keep this pattern in sync with the one in func_win32_libid. + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' + lt_cv_file_magic_cmd='$OBJDUMP -f' + fi + ;; + +cegcc*) + # use the weaker test based on 'objdump'. See mingw*. + lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' + ;; + +darwin* | rhapsody*) + lt_cv_deplibs_check_method=pass_all + ;; + +freebsd* | dragonfly*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + case $host_cpu in + i*86 ) + # Not sure whether the presence of OpenBSD here was a mistake. + # Let's accept both of them until this is cleared up. + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` + ;; + esac + else + lt_cv_deplibs_check_method=pass_all + fi + ;; + +gnu*) + lt_cv_deplibs_check_method=pass_all + ;; + +haiku*) + lt_cv_deplibs_check_method=pass_all + ;; + +hpux10.20* | hpux11*) + lt_cv_file_magic_cmd=/usr/bin/file + case $host_cpu in + ia64*) + lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' + lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so + ;; + hppa*64*) + [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'] + lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl + ;; + *) + lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library' + lt_cv_file_magic_test_file=/usr/lib/libc.sl + ;; + esac + ;; + +interix[[3-9]]*) + # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' + ;; + +irix5* | irix6* | nonstopux*) + case $LD in + *-32|*"-32 ") libmagic=32-bit;; + *-n32|*"-n32 ") libmagic=N32;; + *-64|*"-64 ") libmagic=64-bit;; + *) libmagic=never-match;; + esac + lt_cv_deplibs_check_method=pass_all + ;; + +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu) + lt_cv_deplibs_check_method=pass_all + ;; + +netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' + else + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' + fi + ;; + +newos6*) + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=/usr/lib/libnls.so + ;; + +*nto* | *qnx*) + lt_cv_deplibs_check_method=pass_all + ;; + +openbsd*) + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' + else + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' + fi + ;; + +osf3* | osf4* | osf5*) + lt_cv_deplibs_check_method=pass_all + ;; + +rdos*) + lt_cv_deplibs_check_method=pass_all + ;; + +solaris*) + lt_cv_deplibs_check_method=pass_all + ;; + +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + lt_cv_deplibs_check_method=pass_all + ;; + +sysv4 | sysv4.3*) + case $host_vendor in + motorola) + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` + ;; + ncr) + lt_cv_deplibs_check_method=pass_all + ;; + sequent) + lt_cv_file_magic_cmd='/bin/file' + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' + ;; + sni) + lt_cv_file_magic_cmd='/bin/file' + lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" + lt_cv_file_magic_test_file=/lib/libc.so + ;; + siemens) + lt_cv_deplibs_check_method=pass_all + ;; + pc) + lt_cv_deplibs_check_method=pass_all + ;; + esac + ;; + +tpf*) + lt_cv_deplibs_check_method=pass_all + ;; +esac +]) + +file_magic_glob= +want_nocaseglob=no +if test "$build" = "$host"; then + case $host_os in + mingw* | pw32*) + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then + want_nocaseglob=yes + else + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"` + fi + ;; + esac +fi + +file_magic_cmd=$lt_cv_file_magic_cmd +deplibs_check_method=$lt_cv_deplibs_check_method +test -z "$deplibs_check_method" && deplibs_check_method=unknown + +_LT_DECL([], [deplibs_check_method], [1], + [Method to check whether dependent libraries are shared objects]) +_LT_DECL([], [file_magic_cmd], [1], + [Command to use when deplibs_check_method = "file_magic"]) +_LT_DECL([], [file_magic_glob], [1], + [How to find potential files when deplibs_check_method = "file_magic"]) +_LT_DECL([], [want_nocaseglob], [1], + [Find potential files using nocaseglob when deplibs_check_method = "file_magic"]) +])# _LT_CHECK_MAGIC_METHOD + + +# LT_PATH_NM +# ---------- +# find the pathname to a BSD- or MS-compatible name lister +AC_DEFUN([LT_PATH_NM], +[AC_REQUIRE([AC_PROG_CC])dnl +AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM, +[if test -n "$NM"; then + # Let the user override the test. + lt_cv_path_NM="$NM" +else + lt_nm_to_check="${ac_tool_prefix}nm" + if test -n "$ac_tool_prefix" && test "$build" = "$host"; then + lt_nm_to_check="$lt_nm_to_check nm" + fi + for lt_tmp_nm in $lt_nm_to_check; do + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + tmp_nm="$ac_dir/$lt_tmp_nm" + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + # Check to see if the nm accepts a BSD-compat flag. + # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # nm: unknown option "B" ignored + # Tru64's nm complains that /dev/null is an invalid object file + case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in + */dev/null* | *'Invalid file or object type'*) + lt_cv_path_NM="$tmp_nm -B" + break + ;; + *) + case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + */dev/null*) + lt_cv_path_NM="$tmp_nm -p" + break + ;; + *) + lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but + continue # so that we can try to find one that supports BSD flags + ;; + esac + ;; + esac + fi + done + IFS="$lt_save_ifs" + done + : ${lt_cv_path_NM=no} +fi]) +if test "$lt_cv_path_NM" != "no"; then + NM="$lt_cv_path_NM" +else + # Didn't find any BSD compatible name lister, look for dumpbin. + if test -n "$DUMPBIN"; then : + # Let the user override the test. + else + AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) + case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in + *COFF*) + DUMPBIN="$DUMPBIN -symbols" + ;; + *) + DUMPBIN=: + ;; + esac + fi + AC_SUBST([DUMPBIN]) + if test "$DUMPBIN" != ":"; then + NM="$DUMPBIN" + fi +fi +test -z "$NM" && NM=nm +AC_SUBST([NM]) +_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl + +AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], + [lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext + (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD) + (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&AS_MESSAGE_LOG_FD + (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) + (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) + cat conftest.err >&AS_MESSAGE_LOG_FD + (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD) + cat conftest.out >&AS_MESSAGE_LOG_FD + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" + fi + rm -f conftest*]) +])# LT_PATH_NM + +# Old names: +AU_ALIAS([AM_PROG_NM], [LT_PATH_NM]) +AU_ALIAS([AC_PROG_NM], [LT_PATH_NM]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AM_PROG_NM], []) +dnl AC_DEFUN([AC_PROG_NM], []) + +# _LT_CHECK_SHAREDLIB_FROM_LINKLIB +# -------------------------------- +# how to determine the name of the shared library +# associated with a specific link library. +# -- PORTME fill in with the dynamic library characteristics +m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB], +[m4_require([_LT_DECL_EGREP]) +m4_require([_LT_DECL_OBJDUMP]) +m4_require([_LT_DECL_DLLTOOL]) +AC_CACHE_CHECK([how to associate runtime and link libraries], +lt_cv_sharedlib_from_linklib_cmd, +[lt_cv_sharedlib_from_linklib_cmd='unknown' + +case $host_os in +cygwin* | mingw* | pw32* | cegcc*) + # two different shell functions defined in ltmain.sh + # decide which to use based on capabilities of $DLLTOOL + case `$DLLTOOL --help 2>&1` in + *--identify-strict*) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib + ;; + *) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback + ;; + esac + ;; +*) + # fallback: assume linklib IS sharedlib + lt_cv_sharedlib_from_linklib_cmd="$ECHO" + ;; +esac +]) +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO + +_LT_DECL([], [sharedlib_from_linklib_cmd], [1], + [Command to associate shared and link libraries]) +])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB + + +# _LT_PATH_MANIFEST_TOOL +# ---------------------- +# locate the manifest tool +m4_defun([_LT_PATH_MANIFEST_TOOL], +[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt +AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool], + [lt_cv_path_mainfest_tool=no + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out + cat conftest.err >&AS_MESSAGE_LOG_FD + if $GREP 'Manifest Tool' conftest.out > /dev/null; then + lt_cv_path_mainfest_tool=yes + fi + rm -f conftest*]) +if test "x$lt_cv_path_mainfest_tool" != xyes; then + MANIFEST_TOOL=: +fi +_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl +])# _LT_PATH_MANIFEST_TOOL + + +# LT_LIB_M +# -------- +# check for math library +AC_DEFUN([LT_LIB_M], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +LIBM= +case $host in +*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*) + # These system don't have libm, or don't need it + ;; +*-ncr-sysv4.3*) + AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") + AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") + ;; +*) + AC_CHECK_LIB(m, cos, LIBM="-lm") + ;; +esac +AC_SUBST([LIBM]) +])# LT_LIB_M + +# Old name: +AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_CHECK_LIBM], []) + + +# _LT_COMPILER_NO_RTTI([TAGNAME]) +# ------------------------------- +m4_defun([_LT_COMPILER_NO_RTTI], +[m4_require([_LT_TAG_COMPILER])dnl + +_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= + +if test "$GCC" = yes; then + case $cc_basename in + nvcc*) + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;; + *) + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;; + esac + + _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], + lt_cv_prog_compiler_rtti_exceptions, + [-fno-rtti -fno-exceptions], [], + [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) +fi +_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1], + [Compiler flag to turn off builtin functions]) +])# _LT_COMPILER_NO_RTTI + + +# _LT_CMD_GLOBAL_SYMBOLS +# ---------------------- +m4_defun([_LT_CMD_GLOBAL_SYMBOLS], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([AC_PROG_AWK])dnl +AC_REQUIRE([LT_PATH_NM])dnl +AC_REQUIRE([LT_PATH_LD])dnl +m4_require([_LT_DECL_SED])dnl +m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_TAG_COMPILER])dnl + +# Check for command to grab the raw symbol name followed by C symbol from nm. +AC_MSG_CHECKING([command to parse $NM output from $compiler object]) +AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], +[ +# These are sane defaults that work on at least a few old systems. +# [They come from Ultrix. What could be older than Ultrix?!! ;)] + +# Character class describing NM global symbol codes. +symcode='[[BCDEGRST]]' + +# Regexp to match symbols that can be accessed directly from C. +sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' + +# Define system-specific variables. +case $host_os in +aix*) + symcode='[[BCDT]]' + ;; +cygwin* | mingw* | pw32* | cegcc*) + symcode='[[ABCDGISTW]]' + ;; +hpux*) + if test "$host_cpu" = ia64; then + symcode='[[ABCDEGRST]]' + fi + ;; +irix* | nonstopux*) + symcode='[[BCDEGRST]]' + ;; +osf*) + symcode='[[BCDEGQRST]]' + ;; +solaris*) + symcode='[[BDRT]]' + ;; +sco3.2v5*) + symcode='[[DT]]' + ;; +sysv4.2uw2*) + symcode='[[DT]]' + ;; +sysv5* | sco5v6* | unixware* | OpenUNIX*) + symcode='[[ABDT]]' + ;; +sysv4) + symcode='[[DFNSTU]]' + ;; +esac + +# If we're using GNU nm, then use its standard symbol codes. +case `$NM -V 2>&1` in +*GNU* | *'with BFD'*) + symcode='[[ABCDGIRSTW]]' ;; +esac + +# Transform an extracted symbol line into a proper C declaration. +# Some systems (esp. on ia64) link data and code symbols differently, +# so use this general approach. +lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" + +# Transform an extracted symbol line into symbol name and symbol address +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" + +# Handle CRLF in mingw tool chain +opt_cr= +case $build_os in +mingw*) + opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp + ;; +esac + +# Try without a prefix underscore, then with it. +for ac_symprfx in "" "_"; do + + # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. + symxfrm="\\1 $ac_symprfx\\2 \\2" + + # Write the raw and C identifiers. + if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Fake it for dumpbin and say T for any non-static function + # and D for any global variable. + # Also find C++ and __fastcall symbols from MSVC++, + # which start with @ or ?. + lt_cv_sys_global_symbol_pipe="$AWK ['"\ +" {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ +" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ +" \$ 0!~/External *\|/{next};"\ +" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ +" {if(hide[section]) next};"\ +" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ +" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ +" s[1]~/^[@?]/{print s[1], s[1]; next};"\ +" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ +" ' prfx=^$ac_symprfx]" + else + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + fi + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" + + # Check to see that the pipe works correctly. + pipe_works=no + + rm -f conftest* + cat > conftest.$ac_ext <<_LT_EOF +#ifdef __cplusplus +extern "C" { +#endif +char nm_test_var; +void nm_test_func(void); +void nm_test_func(void){} +#ifdef __cplusplus +} +#endif +int main(){nm_test_var='a';nm_test_func();return(0);} +_LT_EOF + + if AC_TRY_EVAL(ac_compile); then + # Now try to grab the symbols. + nlist=conftest.nm + if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then + # Try sorting and uniquifying the output. + if sort "$nlist" | uniq > "$nlist"T; then + mv -f "$nlist"T "$nlist" + else + rm -f "$nlist"T + fi + + # Make sure that we snagged all the symbols we need. + if $GREP ' nm_test_var$' "$nlist" >/dev/null; then + if $GREP ' nm_test_func$' "$nlist" >/dev/null; then + cat <<_LT_EOF > conftest.$ac_ext +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) +/* DATA imports from DLLs on WIN32 con't be const, because runtime + relocations are performed -- see ld's documentation on pseudo-relocs. */ +# define LT@&t@_DLSYM_CONST +#elif defined(__osf__) +/* This system does not cope well with relocations in const data. */ +# define LT@&t@_DLSYM_CONST +#else +# define LT@&t@_DLSYM_CONST const +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +_LT_EOF + # Now generate the symbol file. + eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' + + cat <<_LT_EOF >> conftest.$ac_ext + +/* The mapping between symbol names and symbols. */ +LT@&t@_DLSYM_CONST struct { + const char *name; + void *address; +} +lt__PROGRAM__LTX_preloaded_symbols[[]] = +{ + { "@PROGRAM@", (void *) 0 }, +_LT_EOF + $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext + cat <<\_LT_EOF >> conftest.$ac_ext + {0, (void *) 0} +}; + +/* This works around a problem in FreeBSD linker */ +#ifdef FREEBSD_WORKAROUND +static const void *lt_preloaded_setup() { + return lt__PROGRAM__LTX_preloaded_symbols; +} +#endif + +#ifdef __cplusplus +} +#endif +_LT_EOF + # Now try linking the two files. + mv conftest.$ac_objext conftstm.$ac_objext + lt_globsym_save_LIBS=$LIBS + lt_globsym_save_CFLAGS=$CFLAGS + LIBS="conftstm.$ac_objext" + CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" + if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then + pipe_works=yes + fi + LIBS=$lt_globsym_save_LIBS + CFLAGS=$lt_globsym_save_CFLAGS + else + echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD + fi + else + echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD + fi + else + echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD + fi + else + echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD + cat conftest.$ac_ext >&5 + fi + rm -rf conftest* conftst* + + # Do not use the global_symbol_pipe unless it works. + if test "$pipe_works" = yes; then + break + else + lt_cv_sys_global_symbol_pipe= + fi +done +]) +if test -z "$lt_cv_sys_global_symbol_pipe"; then + lt_cv_sys_global_symbol_to_cdecl= +fi +if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then + AC_MSG_RESULT(failed) +else + AC_MSG_RESULT(ok) +fi + +# Response file support. +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + nm_file_list_spec='@' +elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then + nm_file_list_spec='@' +fi + +_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], + [Take the output of nm and produce a listing of raw symbols and C names]) +_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], + [Transform the output of nm in a proper C declaration]) +_LT_DECL([global_symbol_to_c_name_address], + [lt_cv_sys_global_symbol_to_c_name_address], [1], + [Transform the output of nm in a C name address pair]) +_LT_DECL([global_symbol_to_c_name_address_lib_prefix], + [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], + [Transform the output of nm in a C name address pair when lib prefix is needed]) +_LT_DECL([], [nm_file_list_spec], [1], + [Specify filename containing input files for $NM]) +]) # _LT_CMD_GLOBAL_SYMBOLS + + +# _LT_COMPILER_PIC([TAGNAME]) +# --------------------------- +m4_defun([_LT_COMPILER_PIC], +[m4_require([_LT_TAG_COMPILER])dnl +_LT_TAGVAR(lt_prog_compiler_wl, $1)= +_LT_TAGVAR(lt_prog_compiler_pic, $1)= +_LT_TAGVAR(lt_prog_compiler_static, $1)= + +m4_if([$1], [CXX], [ + # C++ specific cases for pic, static, wl, etc. + if test "$GXX" = yes; then + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + + case $host_os in + aix*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + fi + ;; + + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' + ;; + esac + ;; + + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + mingw* | cygwin* | os2* | pw32* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries + m4_if([$1], [GCJ], [], + [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + ;; + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' + ;; + *djgpp*) + # DJGPP does not support shared libraries at all + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + ;; + haiku*) + # PIC is the default for Haiku. + # The "-static" flag exists, but is broken. + _LT_TAGVAR(lt_prog_compiler_static, $1)= + ;; + interix[[3-9]]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; + sysv4*MP*) + if test -d /usr/nec; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic + fi + ;; + hpux*) + # PIC is the default for 64-bit PA HP-UX, but not for 32-bit + # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag + # sets the default TLS model and affects inlining. + case $host_cpu in + hppa*64*) + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac + ;; + *qnx* | *nto*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac + else + case $host_os in + aix[[4-9]]*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + else + _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' + fi + ;; + chorus*) + case $cc_basename in + cxch68*) + # Green Hills C++ Compiler + # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" + ;; + esac + ;; + mingw* | cygwin* | os2* | pw32* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + m4_if([$1], [GCJ], [], + [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + ;; + dgux*) + case $cc_basename in + ec++*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + ;; + ghcx*) + # Green Hills C++ Compiler + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; + *) + ;; + esac + ;; + freebsd* | dragonfly*) + # FreeBSD uses GNU C++ + ;; + hpux9* | hpux10* | hpux11*) + case $cc_basename in + CC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + if test "$host_cpu" != ia64; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' + fi + ;; + aCC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' + ;; + esac + ;; + *) + ;; + esac + ;; + interix*) + # This is c89, which is MS Visual C++ (no shared libs) + # Anyone wants to do a port? + ;; + irix5* | irix6* | nonstopux*) + case $cc_basename in + CC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + # CC pic flag -KPIC is the default. + ;; + *) + ;; + esac + ;; + linux* | k*bsd*-gnu | kopensolaris*-gnu) + case $cc_basename in + KCC*) + # KAI C++ Compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + ecpc* ) + # old Intel C++ for x86_64 which still supported -KPIC. + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + icpc* ) + # Intel C++, used to be incompatible with GCC. + # ICC 10 doesn't accept -KPIC any more. + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + pgCC* | pgcpp*) + # Portland Group C++ compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + cxx*) + # Compaq C++ + # Make sure the PIC flag is empty. It appears that all Alpha + # Linux and Compaq Tru64 Unix objects are PIC. + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*) + # IBM XL 8.0, 9.0 on PPC and BlueGene + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' + ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; + esac + ;; + esac + ;; + lynxos*) + ;; + m88k*) + ;; + mvs*) + case $cc_basename in + cxx*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' + ;; + *) + ;; + esac + ;; + netbsd*) + ;; + *qnx* | *nto*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' + ;; + osf3* | osf4* | osf5*) + case $cc_basename in + KCC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' + ;; + RCC*) + # Rational C++ 2.4.1 + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; + cxx*) + # Digital/Compaq C++ + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # Make sure the PIC flag is empty. It appears that all Alpha + # Linux and Compaq Tru64 Unix objects are PIC. + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + *) + ;; + esac + ;; + psos*) + ;; + solaris*) + case $cc_basename in + CC* | sunCC*) + # Sun C++ 4.2, 5.x and Centerline C++ + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; + gcx*) + # Green Hills C++ Compiler + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + ;; + *) + ;; + esac + ;; + sunos4*) + case $cc_basename in + CC*) + # Sun C++ 4.x + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + lcc*) + # Lucid + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + ;; + *) + ;; + esac + ;; + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + case $cc_basename in + CC*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + esac + ;; + tandem*) + case $cc_basename in + NCC*) + # NonStop-UX NCC 3.20 + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + ;; + *) + ;; + esac + ;; + vxworks*) + ;; + *) + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + ;; + esac + fi +], +[ + if test "$GCC" = yes; then + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + + case $host_os in + aix*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + fi + ;; + + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' + ;; + esac + ;; + + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + + mingw* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries + m4_if([$1], [GCJ], [], + [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + ;; + + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' + ;; + + haiku*) + # PIC is the default for Haiku. + # The "-static" flag exists, but is broken. + _LT_TAGVAR(lt_prog_compiler_static, $1)= + ;; + + hpux*) + # PIC is the default for 64-bit PA HP-UX, but not for 32-bit + # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag + # sets the default TLS model and affects inlining. + case $host_cpu in + hppa*64*) + # +Z the default + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac + ;; + + interix[[3-9]]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; + + msdosdjgpp*) + # Just because we use GCC doesn't mean we suddenly get shared libraries + # on systems that don't support them. + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + enable_shared=no + ;; + + *nto* | *qnx*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' + ;; + + sysv4*MP*) + if test -d /usr/nec; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic + fi + ;; + + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; + esac + + case $cc_basename in + nvcc*) # Cuda Compiler Driver 2.2 + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' + if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" + fi + ;; + esac + else + # PORTME Check for flag to pass linker flags through the system compiler. + case $host_os in + aix*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + else + _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' + fi + ;; + + mingw* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + m4_if([$1], [GCJ], [], + [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + ;; + + hpux9* | hpux10* | hpux11*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but + # not for PA HP-UX. + case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' + ;; + esac + # Is there a better lt_prog_compiler_static that works with the bundled CC? + _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + ;; + + irix5* | irix6* | nonstopux*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # PIC (with -KPIC) is the default. + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + + linux* | k*bsd*-gnu | kopensolaris*-gnu) + case $cc_basename in + # old Intel for x86_64 which still supported -KPIC. + ecc*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + # icc used to be incompatible with GCC. + # ICC 10 doesn't accept -KPIC any more. + icc* | ifort*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + # Lahey Fortran 8.1. + lf95*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' + _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' + ;; + nagfor*) + # NAG Fortran compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) + # Portland Group compilers (*not* the Pentium gcc compiler, + # which looks to be a dead project) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + ccc*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # All Alpha code is PIC. + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + xl* | bgxl* | bgf* | mpixl*) + # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' + ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='' + ;; + *Sun\ F* | *Sun*Fortran*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; + *Sun\ C*) + # Sun C 5.9 + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + ;; + *Intel*\ [[CF]]*Compiler*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + *Portland\ Group*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + esac + ;; + esac + ;; + + newsos6) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + *nto* | *qnx*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' + ;; + + osf3* | osf4* | osf5*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + # All OSF/1 code is PIC. + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + + rdos*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + + solaris*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + case $cc_basename in + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; + *) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; + esac + ;; + + sunos4*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + sysv4 | sysv4.2uw2* | sysv4.3*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + sysv4*MP*) + if test -d /usr/nec ;then + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + fi + ;; + + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + unicos*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + ;; + + uts4*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + + *) + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + ;; + esac + fi +]) +case $host_os in + # For platforms which do not support PIC, -DPIC is meaningless: + *djgpp*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)= + ;; + *) + _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" + ;; +esac + +AC_CACHE_CHECK([for $compiler option to produce PIC], + [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)], + [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) +_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1) + +# +# Check to make sure the PIC flag actually works. +# +if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then + _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works], + [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)], + [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [], + [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in + "" | " "*) ;; + *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;; + esac], + [_LT_TAGVAR(lt_prog_compiler_pic, $1)= + _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) +fi +_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], + [Additional compiler flags for building library objects]) + +_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], + [How to pass a linker flag through the compiler]) +# +# Check to make sure the static flag actually works. +# +wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\" +_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], + _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1), + $lt_tmp_static_flag, + [], + [_LT_TAGVAR(lt_prog_compiler_static, $1)=]) +_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], + [Compiler flag to prevent dynamic linking]) +])# _LT_COMPILER_PIC + + +# _LT_LINKER_SHLIBS([TAGNAME]) +# ---------------------------- +# See if the linker supports building shared libraries. +m4_defun([_LT_LINKER_SHLIBS], +[AC_REQUIRE([LT_PATH_LD])dnl +AC_REQUIRE([LT_PATH_NM])dnl +m4_require([_LT_PATH_MANIFEST_TOOL])dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_DECL_SED])dnl +m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl +m4_require([_LT_TAG_COMPILER])dnl +AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) +m4_if([$1], [CXX], [ + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] + case $host_os in + aix[[4-9]]*) + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm + # Also, AIX nm treats weak defined symbols like other global defined + # symbols, whereas GNU nm marks them as "W". + if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + else + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + fi + ;; + pw32*) + _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" + ;; + cygwin* | mingw* | cegcc*) + case $cc_basename in + cl*) + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + ;; + *) + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] + ;; + esac + ;; + *) + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + ;; + esac +], [ + runpath_var= + _LT_TAGVAR(allow_undefined_flag, $1)= + _LT_TAGVAR(always_export_symbols, $1)=no + _LT_TAGVAR(archive_cmds, $1)= + _LT_TAGVAR(archive_expsym_cmds, $1)= + _LT_TAGVAR(compiler_needs_object, $1)=no + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no + _LT_TAGVAR(export_dynamic_flag_spec, $1)= + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(hardcode_automatic, $1)=no + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= + _LT_TAGVAR(hardcode_libdir_separator, $1)= + _LT_TAGVAR(hardcode_minus_L, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported + _LT_TAGVAR(inherit_rpath, $1)=no + _LT_TAGVAR(link_all_deplibs, $1)=unknown + _LT_TAGVAR(module_cmds, $1)= + _LT_TAGVAR(module_expsym_cmds, $1)= + _LT_TAGVAR(old_archive_from_new_cmds, $1)= + _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)= + _LT_TAGVAR(thread_safe_flag_spec, $1)= + _LT_TAGVAR(whole_archive_flag_spec, $1)= + # include_expsyms should be a list of space-separated symbols to be *always* + # included in the symbol list + _LT_TAGVAR(include_expsyms, $1)= + # exclude_expsyms can be an extended regexp of symbols to exclude + # it will be wrapped by ` (' and `)$', so one must not match beginning or + # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', + # as well as any symbol that contains `d'. + _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] + # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out + # platforms (ab)use it in PIC code, but their linkers get confused if + # the symbol is explicitly referenced. Since portable code cannot + # rely on this symbol name, it's probably fine to never include it in + # preloaded symbol tables. + # Exclude shared library initialization/finalization symbols. +dnl Note also adjust exclude_expsyms for C++ above. + extract_expsyms_cmds= + + case $host_os in + cygwin* | mingw* | pw32* | cegcc*) + # FIXME: the MSVC++ port hasn't been tested in a loooong time + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + if test "$GCC" != yes; then + with_gnu_ld=no + fi + ;; + interix*) + # we just hope/assume this is gcc and not c89 (= MSVC++) + with_gnu_ld=yes + ;; + openbsd*) + with_gnu_ld=no + ;; + esac + + _LT_TAGVAR(ld_shlibs, $1)=yes + + # On some targets, GNU ld is compatible enough with the native linker + # that we're better off using the native interface for both. + lt_use_gnu_ld_interface=no + if test "$with_gnu_ld" = yes; then + case $host_os in + aix*) + # The AIX port of GNU ld has always aspired to compatibility + # with the native linker. However, as the warning in the GNU ld + # block says, versions before 2.19.5* couldn't really create working + # shared libraries, regardless of the interface used. + case `$LD -v 2>&1` in + *\ \(GNU\ Binutils\)\ 2.19.5*) ;; + *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;; + *\ \(GNU\ Binutils\)\ [[3-9]]*) ;; + *) + lt_use_gnu_ld_interface=yes + ;; + esac + ;; + *) + lt_use_gnu_ld_interface=yes + ;; + esac + fi + + if test "$lt_use_gnu_ld_interface" = yes; then + # If archive_cmds runs LD, not CC, wlarc should be empty + wlarc='${wl}' + + # Set some defaults for GNU ld with shared library support. These + # are reset later if shared libraries are not supported. Putting them + # here allows them to be overridden if necessary. + runpath_var=LD_RUN_PATH + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + # ancient GNU ld didn't support --whole-archive et. al. + if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then + _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + _LT_TAGVAR(whole_archive_flag_spec, $1)= + fi + supports_anon_versioning=no + case `$LD -v 2>&1` in + *GNU\ gold*) supports_anon_versioning=yes ;; + *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac + + # See if GNU ld supports shared libraries. + case $host_os in + aix[[3-9]]*) + # On AIX/PPC, the GNU linker is very broken + if test "$host_cpu" != ia64; then + _LT_TAGVAR(ld_shlibs, $1)=no + cat <<_LT_EOF 1>&2 + +*** Warning: the GNU linker, at least up to release 2.19, is reported +*** to be unable to reliably create shared libraries on AIX. +*** Therefore, libtool is disabling shared libraries support. If you +*** really care for shared libraries, you may want to install binutils +*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. +*** You will then need to restart the configuration process. + +_LT_EOF + fi + ;; + + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='' + ;; + m68k) + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + ;; + esac + ;; + + beos*) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + cygwin* | mingw* | pw32* | cegcc*) + # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, + # as there is no search path for DLLs. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=no + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' + _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + haiku*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + + interix[[3-9]]*) + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) + tmp_diet=no + if test "$host_os" = linux-dietlibc; then + case $cc_basename in + diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) + esac + fi + if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ + && test "$tmp_diet" = no + then + tmp_addflag=' $pic_flag' + tmp_sharedflag='-shared' + case $cc_basename,$host_cpu in + pgcc*) # Portland Group C compiler + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag' + ;; + pgf77* | pgf90* | pgf95* | pgfortran*) + # Portland Group f77 and f90 compilers + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_addflag=' $pic_flag -Mnomain' ;; + ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 + tmp_addflag=' -i_dynamic' ;; + efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 + tmp_addflag=' -i_dynamic -nofor_main' ;; + ifc* | ifort*) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; + lf95*) # Lahey Fortran 8.1 + _LT_TAGVAR(whole_archive_flag_spec, $1)= + tmp_sharedflag='--shared' ;; + xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) + tmp_sharedflag='-qmkshrobj' + tmp_addflag= ;; + nvcc*) # Cuda Compiler Driver 2.2 + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(compiler_needs_object, $1)=yes + ;; + esac + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C 5.9 + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(compiler_needs_object, $1)=yes + tmp_sharedflag='-G' ;; + *Sun\ F*) # Sun Fortran 8.3 + tmp_sharedflag='-G' ;; + esac + _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + + if test "x$supports_anon_versioning" = xyes; then + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi + + case $cc_basename in + xlf* | bgf* | bgxlf* | mpixlf*) + # IBM XL Fortran 10.1 on PPC cannot create shared libs itself + _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' + if test "x$supports_anon_versioning" = xyes; then + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + fi + ;; + esac + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= + else + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + fi + ;; + + solaris*) + if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then + _LT_TAGVAR(ld_shlibs, $1)=no + cat <<_LT_EOF 1>&2 + +*** Warning: The releases 2.8.* of the GNU linker cannot reliably +*** create shared libraries on Solaris systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.9.1 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. + +_LT_EOF + elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) + case `$LD -v 2>&1` in + *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) + _LT_TAGVAR(ld_shlibs, $1)=no + cat <<_LT_EOF 1>&2 + +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** reliably create shared libraries on SCO systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.16.91.0.3 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. + +_LT_EOF + ;; + *) + # For security reasons, it is highly recommended that you always + # use absolute paths for naming shared libraries, and exclude the + # DT_RUNPATH tag from executables and libraries. But doing so + # requires that you compile everything twice, which is a pain. + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + + sunos4*) + _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' + wlarc= + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + *) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + + if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then + runpath_var= + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= + _LT_TAGVAR(export_dynamic_flag_spec, $1)= + _LT_TAGVAR(whole_archive_flag_spec, $1)= + fi + else + # PORTME fill in a description of your system's linker (not GNU ld) + case $host_os in + aix3*) + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=yes + _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' + # Note: this linker hardcodes the directories in LIBPATH if there + # are no directories specified by -L. + _LT_TAGVAR(hardcode_minus_L, $1)=yes + if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + # Neither direct hardcoding nor static linking is supported with a + # broken collect2. + _LT_TAGVAR(hardcode_direct, $1)=unsupported + fi + ;; + + aix[[4-9]]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag="" + else + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm + # Also, AIX nm treats weak defined symbols like other global + # defined symbols, whereas GNU nm marks them as "W". + if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + else + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + fi + aix_use_runtimelinking=no + + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) + for ld_flag in $LDFLAGS; do + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + aix_use_runtimelinking=yes + break + fi + done + ;; + esac + + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi + + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + + _LT_TAGVAR(archive_cmds, $1)='' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' + + if test "$GCC" = yes; then + case $host_os in aix4.[[012]]|aix4.[[012]].*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`${CC} -print-prog-name=collect2` + if test -f "$collect2name" && + strings "$collect2name" | $GREP resolve_lib_name >/dev/null + then + # We have reworked collect2 + : + else + # We have old collect2 + _LT_TAGVAR(hardcode_direct, $1)=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)= + fi + ;; + esac + shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi + else + # not using gcc + if test "$host_cpu" = ia64; then + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' + else + shared_flag='${wl}-bM:SRE' + fi + fi + fi + + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to export. + _LT_TAGVAR(always_export_symbols, $1)=yes + if test "$aix_use_runtimelinking" = yes; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + _LT_TAGVAR(allow_undefined_flag, $1)='-berok' + # Determine the default libpath from the value encoded in an + # empty executable. + _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else + if test "$host_cpu" = ia64; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' + _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an + # empty executable. + _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' + if test "$with_gnu_ld" = yes; then + # We only use this code for GNU lds that support --whole-archive. + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + else + # Exported symbols can be pulled into shared objects from archives + _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' + fi + _LT_TAGVAR(archive_cmds_need_lc, $1)=yes + # This is similar to how AIX traditionally builds its shared libraries. + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + fi + fi + ;; + + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='' + ;; + m68k) + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + ;; + esac + ;; + + bsdi[[45]]*) + _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic + ;; + + cygwin* | mingw* | pw32* | cegcc*) + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + case $cc_basename in + cl*) + # Native MSVC + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; + else + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' + # The linker will not automatically build a static lib if we build a DLL. + # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' + # Don't use ranlib + _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' + _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile="$lt_outputfile.exe" + lt_tool_outputfile="$lt_tool_outputfile.exe" + ;; + esac~ + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' + ;; + *) + # Assume MSVC wrapper + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. + _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' + # FIXME: Should let the user specify the lib program. + _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + esac + ;; + + darwin* | rhapsody*) + _LT_DARWIN_LINKER_FEATURES($1) + ;; + + dgux*) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor + # support. Future versions do this automatically, but an explicit c++rt0.o + # does not break anything, and helps significantly (at the cost of a little + # extra space). + freebsd2.2*) + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + # Unfortunately, older versions of FreeBSD 2 do not have this feature. + freebsd2.*) + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. + freebsd* | dragonfly*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + hpux9*) + if test "$GCC" = yes; then + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + fi + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(hardcode_direct, $1)=yes + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + ;; + + hpux10*) + if test "$GCC" = yes && test "$with_gnu_ld" = no; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi + if test "$with_gnu_ld" = no; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + _LT_TAGVAR(hardcode_minus_L, $1)=yes + fi + ;; + + hpux11*) + if test "$GCC" = yes && test "$with_gnu_ld" = no; then + case $host_cpu in + hppa*64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + else + case $host_cpu in + hppa*64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + m4_if($1, [], [ + # Older versions of the 11.00 compiler do not understand -b yet + # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) + _LT_LINKER_OPTION([if $CC understands -b], + _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b], + [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], + [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])], + [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) + ;; + esac + fi + if test "$with_gnu_ld" = no; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + case $host_cpu in + hppa*64*|ia64*) + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + *) + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + _LT_TAGVAR(hardcode_minus_L, $1)=yes + ;; + esac + fi + ;; + + irix5* | irix6* | nonstopux*) + if test "$GCC" = yes; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + # Try to use the -exported_symbol ld option, if it does not + # work, assume that -exports_file does not work either and + # implicitly export all symbols. + # This should be the same for all languages, so no per-tag cache variable. + AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], + [lt_cv_irix_exported_symbol], + [save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + AC_LINK_IFELSE( + [AC_LANG_SOURCE( + [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], + [C++], [[int foo (void) { return 0; }]], + [Fortran 77], [[ + subroutine foo + end]], + [Fortran], [[ + subroutine foo + end]])])], + [lt_cv_irix_exported_symbol=yes], + [lt_cv_irix_exported_symbol=no]) + LDFLAGS="$save_LDFLAGS"]) + if test "$lt_cv_irix_exported_symbol" = yes; then + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + fi + else + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + fi + _LT_TAGVAR(archive_cmds_need_lc, $1)='no' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(inherit_rpath, $1)=yes + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + + netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else + _LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF + fi + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + newsos6) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + *nto* | *qnx*) + ;; + + openbsd*) + if test -f /usr/libexec/ld.so; then + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + else + case $host_os in + openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + ;; + esac + fi + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + os2*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + ;; + + osf3*) + if test "$GCC" = yes; then + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else + _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + fi + _LT_TAGVAR(archive_cmds_need_lc, $1)='no' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + ;; + + osf4* | osf5*) # as osf3* with the addition of -msym flag + if test "$GCC" = yes; then + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + else + _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ + $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' + + # Both c and cxx compiler support -rpath directly + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' + fi + _LT_TAGVAR(archive_cmds_need_lc, $1)='no' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + ;; + + solaris*) + _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' + if test "$GCC" = yes; then + wlarc='${wl}' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + else + case `$CC -V 2>&1` in + *"Compilers 5.0"*) + wlarc='' + _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' + ;; + *) + wlarc='${wl}' + _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + ;; + esac + fi + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + case $host_os in + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + *) + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. GCC discards it without `$wl', + # but is careful enough not to reorder. + # Supported since Solaris 2.6 (maybe 2.5.1?) + if test "$GCC" = yes; then + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + else + _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' + fi + ;; + esac + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + + sunos4*) + if test "x$host_vendor" = xsequent; then + # Use $CC to link under sequent, because it throws in some extra .o + # files that make .init and .fini sections work. + _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' + fi + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + sysv4) + case $host_vendor in + sni) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true??? + ;; + siemens) + ## LD is ld it makes a PLAMLIB + ## CC just makes a GrossModule. + _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' + _LT_TAGVAR(hardcode_direct, $1)=no + ;; + motorola) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie + ;; + esac + runpath_var='LD_RUN_PATH' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + sysv4.3*) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' + ;; + + sysv4*MP*) + if test -d /usr/nec; then + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + runpath_var=LD_RUN_PATH + hardcode_runpath_var=yes + _LT_TAGVAR(ld_shlibs, $1)=yes + fi + ;; + + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) + _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + runpath_var='LD_RUN_PATH' + + if test "$GCC" = yes; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; + + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' + runpath_var='LD_RUN_PATH' + + if test "$GCC" = yes; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; + + uts4*) + _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + + *) + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + + if test x$host_vendor = xsni; then + case $host in + sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym' + ;; + esac + fi + fi +]) +AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) +test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no + +_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld + +_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl +_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl +_LT_DECL([], [extract_expsyms_cmds], [2], + [The commands to extract the exported symbol list from a shared archive]) + +# +# Do we need to explicitly link libc? +# +case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in +x|xyes) + # Assume -lc should be added + _LT_TAGVAR(archive_cmds_need_lc, $1)=yes + + if test "$enable_shared" = yes && test "$GCC" = yes; then + case $_LT_TAGVAR(archive_cmds, $1) in + *'~'*) + # FIXME: we may have to deal with multi-command sequences. + ;; + '$CC '*) + # Test whether the compiler implicitly links with -lc since on some + # systems, -lgcc has to come before -lc. If gcc already passes -lc + # to ld, don't add -lc before -lgcc. + AC_CACHE_CHECK([whether -lc should be explicitly linked in], + [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1), + [$RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + if AC_TRY_EVAL(ac_compile) 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) + pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) + _LT_TAGVAR(allow_undefined_flag, $1)= + if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) + then + lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no + else + lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes + fi + _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $RM conftest* + ]) + _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1) + ;; + esac + fi + ;; +esac + +_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0], + [Whether or not to add -lc for building shared libraries]) +_LT_TAGDECL([allow_libtool_libs_with_static_runtimes], + [enable_shared_with_static_runtimes], [0], + [Whether or not to disallow shared libs when runtime libs are static]) +_LT_TAGDECL([], [export_dynamic_flag_spec], [1], + [Compiler flag to allow reflexive dlopens]) +_LT_TAGDECL([], [whole_archive_flag_spec], [1], + [Compiler flag to generate shared objects directly from archives]) +_LT_TAGDECL([], [compiler_needs_object], [1], + [Whether the compiler copes with passing no objects directly]) +_LT_TAGDECL([], [old_archive_from_new_cmds], [2], + [Create an old-style archive from a shared archive]) +_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2], + [Create a temporary old-style archive to link instead of a shared archive]) +_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive]) +_LT_TAGDECL([], [archive_expsym_cmds], [2]) +_LT_TAGDECL([], [module_cmds], [2], + [Commands used to build a loadable module if different from building + a shared archive.]) +_LT_TAGDECL([], [module_expsym_cmds], [2]) +_LT_TAGDECL([], [with_gnu_ld], [1], + [Whether we are building with GNU ld or not]) +_LT_TAGDECL([], [allow_undefined_flag], [1], + [Flag that allows shared libraries with undefined symbols to be built]) +_LT_TAGDECL([], [no_undefined_flag], [1], + [Flag that enforces no undefined symbols]) +_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], + [Flag to hardcode $libdir into a binary during linking. + This must work even if $libdir does not exist]) +_LT_TAGDECL([], [hardcode_libdir_separator], [1], + [Whether we need a single "-rpath" flag with a separated argument]) +_LT_TAGDECL([], [hardcode_direct], [0], + [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes + DIR into the resulting binary]) +_LT_TAGDECL([], [hardcode_direct_absolute], [0], + [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes + DIR into the resulting binary and the resulting library dependency is + "absolute", i.e impossible to change by setting ${shlibpath_var} if the + library is relocated]) +_LT_TAGDECL([], [hardcode_minus_L], [0], + [Set to "yes" if using the -LDIR flag during linking hardcodes DIR + into the resulting binary]) +_LT_TAGDECL([], [hardcode_shlibpath_var], [0], + [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR + into the resulting binary]) +_LT_TAGDECL([], [hardcode_automatic], [0], + [Set to "yes" if building a shared library automatically hardcodes DIR + into the library and all subsequent libraries and executables linked + against it]) +_LT_TAGDECL([], [inherit_rpath], [0], + [Set to yes if linker adds runtime paths of dependent libraries + to runtime path list]) +_LT_TAGDECL([], [link_all_deplibs], [0], + [Whether libtool must link a program against all its dependency libraries]) +_LT_TAGDECL([], [always_export_symbols], [0], + [Set to "yes" if exported symbols are required]) +_LT_TAGDECL([], [export_symbols_cmds], [2], + [The commands to list exported symbols]) +_LT_TAGDECL([], [exclude_expsyms], [1], + [Symbols that should not be listed in the preloaded symbols]) +_LT_TAGDECL([], [include_expsyms], [1], + [Symbols that must always be exported]) +_LT_TAGDECL([], [prelink_cmds], [2], + [Commands necessary for linking programs (against libraries) with templates]) +_LT_TAGDECL([], [postlink_cmds], [2], + [Commands necessary for finishing linking programs]) +_LT_TAGDECL([], [file_list_spec], [1], + [Specify filename containing input files]) +dnl FIXME: Not yet implemented +dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1], +dnl [Compiler flag to generate thread safe objects]) +])# _LT_LINKER_SHLIBS + + +# _LT_LANG_C_CONFIG([TAG]) +# ------------------------ +# Ensure that the configuration variables for a C compiler are suitably +# defined. These variables are subsequently used by _LT_CONFIG to write +# the compiler configuration to `libtool'. +m4_defun([_LT_LANG_C_CONFIG], +[m4_require([_LT_DECL_EGREP])dnl +lt_save_CC="$CC" +AC_LANG_PUSH(C) + +# Source file extension for C test sources. +ac_ext=c + +# Object file extension for compiled C test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="int some_variable = 0;" + +# Code to be used in simple link tests +lt_simple_link_test_code='int main(){return(0);}' + +_LT_TAG_COMPILER +# Save the default compiler, since it gets overwritten when the other +# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. +compiler_DEFAULT=$CC + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +if test -n "$compiler"; then + _LT_COMPILER_NO_RTTI($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_SYS_DYNAMIC_LINKER($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + LT_SYS_DLOPEN_SELF + _LT_CMD_STRIPLIB + + # Report which library types will actually be built + AC_MSG_CHECKING([if libtool supports shared libraries]) + AC_MSG_RESULT([$can_build_shared]) + + AC_MSG_CHECKING([whether to build shared libraries]) + test "$can_build_shared" = "no" && enable_shared=no + + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. + case $host_os in + aix3*) + test "$enable_shared" = yes && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; + + aix[[4-9]]*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi + ;; + esac + AC_MSG_RESULT([$enable_shared]) + + AC_MSG_CHECKING([whether to build static libraries]) + # Make sure either enable_shared or enable_static is yes. + test "$enable_shared" = yes || enable_static=yes + AC_MSG_RESULT([$enable_static]) + + _LT_CONFIG($1) +fi +AC_LANG_POP +CC="$lt_save_CC" +])# _LT_LANG_C_CONFIG + + +# _LT_LANG_CXX_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for a C++ compiler are suitably +# defined. These variables are subsequently used by _LT_CONFIG to write +# the compiler configuration to `libtool'. +m4_defun([_LT_LANG_CXX_CONFIG], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_EGREP])dnl +m4_require([_LT_PATH_MANIFEST_TOOL])dnl +if test -n "$CXX" && ( test "X$CXX" != "Xno" && + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || + (test "X$CXX" != "Xg++"))) ; then + AC_PROG_CXXCPP +else + _lt_caught_CXX_error=yes +fi + +AC_LANG_PUSH(C++) +_LT_TAGVAR(archive_cmds_need_lc, $1)=no +_LT_TAGVAR(allow_undefined_flag, $1)= +_LT_TAGVAR(always_export_symbols, $1)=no +_LT_TAGVAR(archive_expsym_cmds, $1)= +_LT_TAGVAR(compiler_needs_object, $1)=no +_LT_TAGVAR(export_dynamic_flag_spec, $1)= +_LT_TAGVAR(hardcode_direct, $1)=no +_LT_TAGVAR(hardcode_direct_absolute, $1)=no +_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +_LT_TAGVAR(hardcode_libdir_separator, $1)= +_LT_TAGVAR(hardcode_minus_L, $1)=no +_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported +_LT_TAGVAR(hardcode_automatic, $1)=no +_LT_TAGVAR(inherit_rpath, $1)=no +_LT_TAGVAR(module_cmds, $1)= +_LT_TAGVAR(module_expsym_cmds, $1)= +_LT_TAGVAR(link_all_deplibs, $1)=unknown +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds +_LT_TAGVAR(no_undefined_flag, $1)= +_LT_TAGVAR(whole_archive_flag_spec, $1)= +_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no + +# Source file extension for C++ test sources. +ac_ext=cpp + +# Object file extension for compiled C++ test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# No sense in running all these tests if we already determined that +# the CXX compiler isn't working. Some variables (like enable_shared) +# are currently assumed to apply to all compilers on this platform, +# and will be corrupted by setting them based on a non-working compiler. +if test "$_lt_caught_CXX_error" != yes; then + # Code to be used in simple compile tests + lt_simple_compile_test_code="int some_variable = 0;" + + # Code to be used in simple link tests + lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }' + + # ltmain only uses $CC for tagged configurations so make sure $CC is set. + _LT_TAG_COMPILER + + # save warnings/boilerplate of simple test code + _LT_COMPILER_BOILERPLATE + _LT_LINKER_BOILERPLATE + + # Allow CC to be a program name with arguments. + lt_save_CC=$CC + lt_save_CFLAGS=$CFLAGS + lt_save_LD=$LD + lt_save_GCC=$GCC + GCC=$GXX + lt_save_with_gnu_ld=$with_gnu_ld + lt_save_path_LD=$lt_cv_path_LD + if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then + lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx + else + $as_unset lt_cv_prog_gnu_ld + fi + if test -n "${lt_cv_path_LDCXX+set}"; then + lt_cv_path_LD=$lt_cv_path_LDCXX + else + $as_unset lt_cv_path_LD + fi + test -z "${LDCXX+set}" || LD=$LDCXX + CC=${CXX-"c++"} + CFLAGS=$CXXFLAGS + compiler=$CC + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) + + if test -n "$compiler"; then + # We don't want -fno-exception when compiling C++ code, so set the + # no_builtin_flag separately + if test "$GXX" = yes; then + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' + else + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= + fi + + if test "$GXX" = yes; then + # Set up default GNU C++ configuration + + LT_PATH_LD + + # Check if GNU C++ uses GNU ld as the underlying linker, since the + # archiving commands below assume that GNU ld is being used. + if test "$with_gnu_ld" = yes; then + _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + + # If archive_cmds runs LD, not CC, wlarc should be empty + # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to + # investigate it a little bit more. (MM) + wlarc='${wl}' + + # ancient GNU ld didn't support --whole-archive et. al. + if eval "`$CC -print-prog-name=ld` --help 2>&1" | + $GREP 'no-whole-archive' > /dev/null; then + _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + else + _LT_TAGVAR(whole_archive_flag_spec, $1)= + fi + else + with_gnu_ld=no + wlarc= + + # A generic and very simple default shared library creation + # command for GNU C++ for the case where it uses the native + # linker, instead of GNU ld. If possible, this setting should + # overridden to take advantage of the native linker features on + # the platform it is being used on. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + fi + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + + else + GXX=no + with_gnu_ld=no + wlarc= + fi + + # PORTME: fill in a description of your system's C++ link characteristics + AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) + _LT_TAGVAR(ld_shlibs, $1)=yes + case $host_os in + aix3*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + aix[[4-9]]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag="" + else + aix_use_runtimelinking=no + + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) + for ld_flag in $LDFLAGS; do + case $ld_flag in + *-brtl*) + aix_use_runtimelinking=yes + break + ;; + esac + done + ;; + esac + + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi + + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + + _LT_TAGVAR(archive_cmds, $1)='' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' + + if test "$GXX" = yes; then + case $host_os in aix4.[[012]]|aix4.[[012]].*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`${CC} -print-prog-name=collect2` + if test -f "$collect2name" && + strings "$collect2name" | $GREP resolve_lib_name >/dev/null + then + # We have reworked collect2 + : + else + # We have old collect2 + _LT_TAGVAR(hardcode_direct, $1)=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)= + fi + esac + shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi + else + # not using gcc + if test "$host_cpu" = ia64; then + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' + else + shared_flag='${wl}-bM:SRE' + fi + fi + fi + + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to + # export. + _LT_TAGVAR(always_export_symbols, $1)=yes + if test "$aix_use_runtimelinking" = yes; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + _LT_TAGVAR(allow_undefined_flag, $1)='-berok' + # Determine the default libpath from the value encoded in an empty + # executable. + _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + else + if test "$host_cpu" = ia64; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' + _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an + # empty executable. + _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' + if test "$with_gnu_ld" = yes; then + # We only use this code for GNU lds that support --whole-archive. + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + else + # Exported symbols can be pulled into shared objects from archives + _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' + fi + _LT_TAGVAR(archive_cmds_need_lc, $1)=yes + # This is similar to how AIX traditionally builds its shared + # libraries. + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + fi + fi + ;; + + beos*) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + chorus*) + case $cc_basename in + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + + cygwin* | mingw* | pw32* | cegcc*) + case $GXX,$cc_basename in + ,cl* | no,cl*) + # Native MSVC + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; + else + $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' + # The linker will not automatically build a static lib if we build a DLL. + # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + # Don't use ranlib + _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' + _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile="$lt_outputfile.exe" + lt_tool_outputfile="$lt_tool_outputfile.exe" + ;; + esac~ + func_to_tool_file "$lt_outputfile"~ + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' + ;; + *) + # g++ + # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, + # as there is no search path for DLLs. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=no + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + darwin* | rhapsody*) + _LT_DARWIN_LINKER_FEATURES($1) + ;; + + dgux*) + case $cc_basename in + ec++*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + ghcx*) + # Green Hills C++ Compiler + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + + freebsd2.*) + # C++ shared libraries reported to be fairly broken before + # switch to ELF + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + + freebsd-elf*) + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + ;; + + freebsd* | dragonfly*) + # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF + # conventions + _LT_TAGVAR(ld_shlibs, $1)=yes + ;; + + gnu*) + ;; + + haiku*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + + hpux9*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, + # but as the default + # location of the library. + + case $cc_basename in + CC*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + aCC*) + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + ;; + *) + if test "$GXX" = yes; then + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + + hpux10*|hpux11*) + if test $with_gnu_ld = no; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + case $host_cpu in + hppa*64*|ia64*) + ;; + *) + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + ;; + esac + fi + case $host_cpu in + hppa*64*|ia64*) + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + *) + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, + # but as the default + # location of the library. + ;; + esac + + case $cc_basename in + CC*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + aCC*) + case $host_cpu in + hppa*64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + ;; + *) + if test "$GXX" = yes; then + if test $with_gnu_ld = no; then + case $host_cpu in + hppa*64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + ia64*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + fi + else + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + + interix[[3-9]]*) + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + irix5* | irix6*) + case $cc_basename in + CC*) + # SGI C++ + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + + # Archives containing C++ object files must be created using + # "CC -ar", where "CC" is the IRIX C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' + ;; + *) + if test "$GXX" = yes; then + if test "$with_gnu_ld" = no; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' + fi + fi + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + esac + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + _LT_TAGVAR(inherit_rpath, $1)=yes + ;; + + linux* | k*bsd*-gnu | kopensolaris*-gnu) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler + + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. + _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + + # Archives containing C++ object files must be created using + # "CC -Bstatic", where "CC" is the KAI C++ compiler. + _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' + ;; + icpc* | ecpc* ) + # Intel C++ + with_gnu_ld=yes + # version 8.0 and above of icpc choke on multiply defined symbols + # if we add $predep_objects and $postdep_objects, however 7.1 and + # earlier do not add the objects themselves. + case `$CC -V 2>&1` in + *"Version 7."*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + ;; + *) # Version 8.0 or newer + tmp_idyn= + case $host_cpu in + ia64*) tmp_idyn=' -i_dynamic';; + esac + _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + ;; + esac + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + ;; + pgCC* | pgcpp*) + # Portland Group C++ compiler + case `$CC -V` in + *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*) + _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' + _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ + $RANLIB $oldlib' + _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + ;; + *) # Version 6 and above use weak symbols + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + ;; + esac + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + ;; + cxx*) + # Compaq C++ + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' + + runpath_var=LD_RUN_PATH + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' + ;; + xl* | mpixl* | bgxl*) + # IBM XL 8.0 on PPC, with GNU ld + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + if test "x$supports_anon_versioning" = xyes; then + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi + ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' + _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(compiler_needs_object, $1)=yes + + # Not sure whether something based on + # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 + # would be better. + output_verbose_link_cmd='func_echo_all' + + # Archives containing C++ object files must be created using + # "CC -xar", where "CC" is the Sun C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' + ;; + esac + ;; + esac + ;; + + lynxos*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + + m88k*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + + mvs*) + case $cc_basename in + cxx*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + + netbsd*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' + wlarc= + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + fi + # Workaround some broken pre-1.5 toolchains + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' + ;; + + *nto* | *qnx*) + _LT_TAGVAR(ld_shlibs, $1)=yes + ;; + + openbsd2*) + # C++ shared libraries are fairly broken + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + + openbsd*) + if test -f /usr/libexec/ld.so; then + _LT_TAGVAR(hardcode_direct, $1)=yes + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + fi + output_verbose_link_cmd=func_echo_all + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + + osf3* | osf4* | osf5*) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler + + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. + _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + # Archives containing C++ object files must be created using + # the KAI C++ compiler. + case $host in + osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;; + *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;; + esac + ;; + RCC*) + # Rational C++ 2.4.1 + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + cxx*) + case $host in + osf3*) + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + ;; + *) + _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ + echo "-hidden">> $lib.exp~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ + $RM $lib.exp' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' + ;; + esac + + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + # + # There doesn't appear to be a way to prevent this compiler from + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + ;; + *) + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + case $host in + osf3*) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + ;; + esac + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=: + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + + else + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; + esac + ;; + + psos*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + + sunos4*) + case $cc_basename in + CC*) + # Sun C++ 4.x + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + lcc*) + # Lucid + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + + solaris*) + case $cc_basename in + CC* | sunCC*) + # Sun C++ 4.2, 5.x and Centerline C++ + _LT_TAGVAR(archive_cmds_need_lc,$1)=yes + _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' + _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + case $host_os in + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + *) + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. + # Supported since Solaris 2.6 (maybe 2.5.1?) + _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' + ;; + esac + _LT_TAGVAR(link_all_deplibs, $1)=yes + + output_verbose_link_cmd='func_echo_all' + + # Archives containing C++ object files must be created using + # "CC -xar", where "CC" is the Sun C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' + ;; + gcx*) + # Green Hills C++ Compiler + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + + # The C++ compiler must be used to create the archive. + _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' + ;; + *) + # GNU C++ compiler with Solaris linker + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' + if $CC --version | $GREP -v '^2\.7' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + else + # g++ 2.7 appears to require `-G' NOT `-shared' on this + # platform. + _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. + output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + fi + + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' + case $host_os in + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + *) + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + ;; + esac + fi + ;; + esac + ;; + + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) + _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + runpath_var='LD_RUN_PATH' + + case $cc_basename in + CC*) + _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' + _LT_TAGVAR(hardcode_libdir_separator, $1)=':' + _LT_TAGVAR(link_all_deplibs, $1)=yes + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' + runpath_var='LD_RUN_PATH' + + case $cc_basename in + CC*) + _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~ + '"$_LT_TAGVAR(old_archive_cmds, $1)" + _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~ + '"$_LT_TAGVAR(reload_cmds, $1)" + ;; + *) + _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + + tandem*) + case $cc_basename in + NCC*) + # NonStop-UX NCC 3.20 + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + ;; + + vxworks*) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + + *) + # FIXME: insert proper C++ library support + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + esac + + AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) + test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no + + _LT_TAGVAR(GCC, $1)="$GXX" + _LT_TAGVAR(LD, $1)="$LD" + + ## CAVEAT EMPTOR: + ## There is no encapsulation within the following macros, do not change + ## the running order or otherwise move them around unless you know exactly + ## what you are doing... + _LT_SYS_HIDDEN_LIBDEPS($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_SYS_DYNAMIC_LINKER($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) + fi # test -n "$compiler" + + CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS + LDCXX=$LD + LD=$lt_save_LD + GCC=$lt_save_GCC + with_gnu_ld=$lt_save_with_gnu_ld + lt_cv_path_LDCXX=$lt_cv_path_LD + lt_cv_path_LD=$lt_save_path_LD + lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld + lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld +fi # test "$_lt_caught_CXX_error" != yes + +AC_LANG_POP +])# _LT_LANG_CXX_CONFIG + + +# _LT_FUNC_STRIPNAME_CNF +# ---------------------- +# func_stripname_cnf prefix suffix name +# strip PREFIX and SUFFIX off of NAME. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +# +# This function is identical to the (non-XSI) version of func_stripname, +# except this one can be used by m4 code that may be executed by configure, +# rather than the libtool script. +m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl +AC_REQUIRE([_LT_DECL_SED]) +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) +func_stripname_cnf () +{ + case ${2} in + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; + esac +} # func_stripname_cnf +])# _LT_FUNC_STRIPNAME_CNF + +# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) +# --------------------------------- +# Figure out "hidden" library dependencies from verbose +# compiler output when linking a shared library. +# Parse the compiler output and extract the necessary +# objects, libraries and library flags. +m4_defun([_LT_SYS_HIDDEN_LIBDEPS], +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl +AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl +# Dependencies to place before and after the object being linked: +_LT_TAGVAR(predep_objects, $1)= +_LT_TAGVAR(postdep_objects, $1)= +_LT_TAGVAR(predeps, $1)= +_LT_TAGVAR(postdeps, $1)= +_LT_TAGVAR(compiler_lib_search_path, $1)= + +dnl we can't use the lt_simple_compile_test_code here, +dnl because it contains code intended for an executable, +dnl not a library. It's possible we should let each +dnl tag define a new lt_????_link_test_code variable, +dnl but it's only used here... +m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF +int a; +void foo (void) { a = 0; } +_LT_EOF +], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF +class Foo +{ +public: + Foo (void) { a = 0; } +private: + int a; +}; +_LT_EOF +], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF + subroutine foo + implicit none + integer*4 a + a=0 + return + end +_LT_EOF +], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF + subroutine foo + implicit none + integer a + a=0 + return + end +_LT_EOF +], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF +public class foo { + private int a; + public void bar (void) { + a = 0; + } +}; +_LT_EOF +], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF +package foo +func foo() { +} +_LT_EOF +]) + +_lt_libdeps_save_CFLAGS=$CFLAGS +case "$CC $CFLAGS " in #( +*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; +*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; +*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; +esac + +dnl Parse the compiler output and extract the necessary +dnl objects, libraries and library flags. +if AC_TRY_EVAL(ac_compile); then + # Parse the compiler output and extract the necessary + # objects, libraries and library flags. + + # Sentinel used to keep track of whether or not we are before + # the conftest object file. + pre_test_object_deps_done=no + + for p in `eval "$output_verbose_link_cmd"`; do + case ${prev}${p} in + + -L* | -R* | -l*) + # Some compilers place space between "-{L,R}" and the path. + # Remove the space. + if test $p = "-L" || + test $p = "-R"; then + prev=$p + continue + fi + + # Expand the sysroot to ease extracting the directories later. + if test -z "$prev"; then + case $p in + -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; + -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; + -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; + esac + fi + case $p in + =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; + esac + if test "$pre_test_object_deps_done" = no; then + case ${prev} in + -L | -R) + # Internal compiler library paths should come after those + # provided the user. The postdeps already come after the + # user supplied libs so there is no need to process them. + if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then + _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}" + else + _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}" + fi + ;; + # The "-l" case would never come before the object being + # linked, so don't bother handling this case. + esac + else + if test -z "$_LT_TAGVAR(postdeps, $1)"; then + _LT_TAGVAR(postdeps, $1)="${prev}${p}" + else + _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" + fi + fi + prev= + ;; + + *.lto.$objext) ;; # Ignore GCC LTO objects + *.$objext) + # This assumes that the test object file only shows up + # once in the compiler output. + if test "$p" = "conftest.$objext"; then + pre_test_object_deps_done=yes + continue + fi + + if test "$pre_test_object_deps_done" = no; then + if test -z "$_LT_TAGVAR(predep_objects, $1)"; then + _LT_TAGVAR(predep_objects, $1)="$p" + else + _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p" + fi + else + if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then + _LT_TAGVAR(postdep_objects, $1)="$p" + else + _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p" + fi + fi + ;; + + *) ;; # Ignore the rest. + + esac + done + + # Clean up. + rm -f a.out a.exe +else + echo "libtool.m4: error: problem compiling $1 test program" +fi + +$RM -f confest.$objext +CFLAGS=$_lt_libdeps_save_CFLAGS + +# PORTME: override above test on systems where it is broken +m4_if([$1], [CXX], +[case $host_os in +interix[[3-9]]*) + # Interix 3.5 installs completely hosed .la files for C++, so rather than + # hack all around it, let's just trust "g++" to DTRT. + _LT_TAGVAR(predep_objects,$1)= + _LT_TAGVAR(postdep_objects,$1)= + _LT_TAGVAR(postdeps,$1)= + ;; + +linux*) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as + # -library=stlport4 depends on it. + case " $CXX $CXXFLAGS " in + *" -library=stlport4 "*) + solaris_use_stlport4=yes + ;; + esac + + if test "$solaris_use_stlport4" != yes; then + _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' + fi + ;; + esac + ;; + +solaris*) + case $cc_basename in + CC* | sunCC*) + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as + # -library=stlport4 depends on it. + case " $CXX $CXXFLAGS " in + *" -library=stlport4 "*) + solaris_use_stlport4=yes + ;; + esac + + # Adding this requires a known-good setup of shared libraries for + # Sun compiler versions before 5.6, else PIC objects from an old + # archive will be linked into the output, leading to subtle bugs. + if test "$solaris_use_stlport4" != yes; then + _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' + fi + ;; + esac + ;; +esac +]) + +case " $_LT_TAGVAR(postdeps, $1) " in +*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;; +esac + _LT_TAGVAR(compiler_lib_search_dirs, $1)= +if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then + _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` +fi +_LT_TAGDECL([], [compiler_lib_search_dirs], [1], + [The directories searched by this compiler when creating a shared library]) +_LT_TAGDECL([], [predep_objects], [1], + [Dependencies to place before and after the objects being linked to + create a shared library]) +_LT_TAGDECL([], [postdep_objects], [1]) +_LT_TAGDECL([], [predeps], [1]) +_LT_TAGDECL([], [postdeps], [1]) +_LT_TAGDECL([], [compiler_lib_search_path], [1], + [The library search path used internally by the compiler when linking + a shared library]) +])# _LT_SYS_HIDDEN_LIBDEPS + + +# _LT_LANG_F77_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for a Fortran 77 compiler are +# suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to `libtool'. +m4_defun([_LT_LANG_F77_CONFIG], +[AC_LANG_PUSH(Fortran 77) +if test -z "$F77" || test "X$F77" = "Xno"; then + _lt_disable_F77=yes +fi + +_LT_TAGVAR(archive_cmds_need_lc, $1)=no +_LT_TAGVAR(allow_undefined_flag, $1)= +_LT_TAGVAR(always_export_symbols, $1)=no +_LT_TAGVAR(archive_expsym_cmds, $1)= +_LT_TAGVAR(export_dynamic_flag_spec, $1)= +_LT_TAGVAR(hardcode_direct, $1)=no +_LT_TAGVAR(hardcode_direct_absolute, $1)=no +_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +_LT_TAGVAR(hardcode_libdir_separator, $1)= +_LT_TAGVAR(hardcode_minus_L, $1)=no +_LT_TAGVAR(hardcode_automatic, $1)=no +_LT_TAGVAR(inherit_rpath, $1)=no +_LT_TAGVAR(module_cmds, $1)= +_LT_TAGVAR(module_expsym_cmds, $1)= +_LT_TAGVAR(link_all_deplibs, $1)=unknown +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds +_LT_TAGVAR(no_undefined_flag, $1)= +_LT_TAGVAR(whole_archive_flag_spec, $1)= +_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no + +# Source file extension for f77 test sources. +ac_ext=f + +# Object file extension for compiled f77 test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# No sense in running all these tests if we already determined that +# the F77 compiler isn't working. Some variables (like enable_shared) +# are currently assumed to apply to all compilers on this platform, +# and will be corrupted by setting them based on a non-working compiler. +if test "$_lt_disable_F77" != yes; then + # Code to be used in simple compile tests + lt_simple_compile_test_code="\ + subroutine t + return + end +" + + # Code to be used in simple link tests + lt_simple_link_test_code="\ + program t + end +" + + # ltmain only uses $CC for tagged configurations so make sure $CC is set. + _LT_TAG_COMPILER + + # save warnings/boilerplate of simple test code + _LT_COMPILER_BOILERPLATE + _LT_LINKER_BOILERPLATE + + # Allow CC to be a program name with arguments. + lt_save_CC="$CC" + lt_save_GCC=$GCC + lt_save_CFLAGS=$CFLAGS + CC=${F77-"f77"} + CFLAGS=$FFLAGS + compiler=$CC + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) + GCC=$G77 + if test -n "$compiler"; then + AC_MSG_CHECKING([if libtool supports shared libraries]) + AC_MSG_RESULT([$can_build_shared]) + + AC_MSG_CHECKING([whether to build shared libraries]) + test "$can_build_shared" = "no" && enable_shared=no + + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. + case $host_os in + aix3*) + test "$enable_shared" = yes && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; + aix[[4-9]]*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi + ;; + esac + AC_MSG_RESULT([$enable_shared]) + + AC_MSG_CHECKING([whether to build static libraries]) + # Make sure either enable_shared or enable_static is yes. + test "$enable_shared" = yes || enable_static=yes + AC_MSG_RESULT([$enable_static]) + + _LT_TAGVAR(GCC, $1)="$G77" + _LT_TAGVAR(LD, $1)="$LD" + + ## CAVEAT EMPTOR: + ## There is no encapsulation within the following macros, do not change + ## the running order or otherwise move them around unless you know exactly + ## what you are doing... + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_SYS_DYNAMIC_LINKER($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) + fi # test -n "$compiler" + + GCC=$lt_save_GCC + CC="$lt_save_CC" + CFLAGS="$lt_save_CFLAGS" +fi # test "$_lt_disable_F77" != yes + +AC_LANG_POP +])# _LT_LANG_F77_CONFIG + + +# _LT_LANG_FC_CONFIG([TAG]) +# ------------------------- +# Ensure that the configuration variables for a Fortran compiler are +# suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to `libtool'. +m4_defun([_LT_LANG_FC_CONFIG], +[AC_LANG_PUSH(Fortran) + +if test -z "$FC" || test "X$FC" = "Xno"; then + _lt_disable_FC=yes +fi + +_LT_TAGVAR(archive_cmds_need_lc, $1)=no +_LT_TAGVAR(allow_undefined_flag, $1)= +_LT_TAGVAR(always_export_symbols, $1)=no +_LT_TAGVAR(archive_expsym_cmds, $1)= +_LT_TAGVAR(export_dynamic_flag_spec, $1)= +_LT_TAGVAR(hardcode_direct, $1)=no +_LT_TAGVAR(hardcode_direct_absolute, $1)=no +_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +_LT_TAGVAR(hardcode_libdir_separator, $1)= +_LT_TAGVAR(hardcode_minus_L, $1)=no +_LT_TAGVAR(hardcode_automatic, $1)=no +_LT_TAGVAR(inherit_rpath, $1)=no +_LT_TAGVAR(module_cmds, $1)= +_LT_TAGVAR(module_expsym_cmds, $1)= +_LT_TAGVAR(link_all_deplibs, $1)=unknown +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds +_LT_TAGVAR(no_undefined_flag, $1)= +_LT_TAGVAR(whole_archive_flag_spec, $1)= +_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no + +# Source file extension for fc test sources. +ac_ext=${ac_fc_srcext-f} + +# Object file extension for compiled fc test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# No sense in running all these tests if we already determined that +# the FC compiler isn't working. Some variables (like enable_shared) +# are currently assumed to apply to all compilers on this platform, +# and will be corrupted by setting them based on a non-working compiler. +if test "$_lt_disable_FC" != yes; then + # Code to be used in simple compile tests + lt_simple_compile_test_code="\ + subroutine t + return + end +" + + # Code to be used in simple link tests + lt_simple_link_test_code="\ + program t + end +" + + # ltmain only uses $CC for tagged configurations so make sure $CC is set. + _LT_TAG_COMPILER + + # save warnings/boilerplate of simple test code + _LT_COMPILER_BOILERPLATE + _LT_LINKER_BOILERPLATE + + # Allow CC to be a program name with arguments. + lt_save_CC="$CC" + lt_save_GCC=$GCC + lt_save_CFLAGS=$CFLAGS + CC=${FC-"f95"} + CFLAGS=$FCFLAGS + compiler=$CC + GCC=$ac_cv_fc_compiler_gnu + + _LT_TAGVAR(compiler, $1)=$CC + _LT_CC_BASENAME([$compiler]) + + if test -n "$compiler"; then + AC_MSG_CHECKING([if libtool supports shared libraries]) + AC_MSG_RESULT([$can_build_shared]) + + AC_MSG_CHECKING([whether to build shared libraries]) + test "$can_build_shared" = "no" && enable_shared=no + + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. + case $host_os in + aix3*) + test "$enable_shared" = yes && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; + aix[[4-9]]*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi + ;; + esac + AC_MSG_RESULT([$enable_shared]) + + AC_MSG_CHECKING([whether to build static libraries]) + # Make sure either enable_shared or enable_static is yes. + test "$enable_shared" = yes || enable_static=yes + AC_MSG_RESULT([$enable_static]) + + _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu" + _LT_TAGVAR(LD, $1)="$LD" + + ## CAVEAT EMPTOR: + ## There is no encapsulation within the following macros, do not change + ## the running order or otherwise move them around unless you know exactly + ## what you are doing... + _LT_SYS_HIDDEN_LIBDEPS($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_SYS_DYNAMIC_LINKER($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) + fi # test -n "$compiler" + + GCC=$lt_save_GCC + CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS +fi # test "$_lt_disable_FC" != yes + +AC_LANG_POP +])# _LT_LANG_FC_CONFIG + + +# _LT_LANG_GCJ_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for the GNU Java Compiler compiler +# are suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to `libtool'. +m4_defun([_LT_LANG_GCJ_CONFIG], +[AC_REQUIRE([LT_PROG_GCJ])dnl +AC_LANG_SAVE + +# Source file extension for Java test sources. +ac_ext=java + +# Object file extension for compiled Java test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="class foo {}" + +# Code to be used in simple link tests +lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_COMPILER + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +# Allow CC to be a program name with arguments. +lt_save_CC=$CC +lt_save_CFLAGS=$CFLAGS +lt_save_GCC=$GCC +GCC=yes +CC=${GCJ-"gcj"} +CFLAGS=$GCJFLAGS +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_TAGVAR(LD, $1)="$LD" +_LT_CC_BASENAME([$compiler]) + +# GCJ did not exist at the time GCC didn't implicitly link libc in. +_LT_TAGVAR(archive_cmds_need_lc, $1)=no + +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds + +if test -n "$compiler"; then + _LT_COMPILER_NO_RTTI($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) +fi + +AC_LANG_RESTORE + +GCC=$lt_save_GCC +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS +])# _LT_LANG_GCJ_CONFIG + + +# _LT_LANG_GO_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for the GNU Go compiler +# are suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to `libtool'. +m4_defun([_LT_LANG_GO_CONFIG], +[AC_REQUIRE([LT_PROG_GO])dnl +AC_LANG_SAVE + +# Source file extension for Go test sources. +ac_ext=go + +# Object file extension for compiled Go test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="package main; func main() { }" + +# Code to be used in simple link tests +lt_simple_link_test_code='package main; func main() { }' + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_COMPILER + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +# Allow CC to be a program name with arguments. +lt_save_CC=$CC +lt_save_CFLAGS=$CFLAGS +lt_save_GCC=$GCC +GCC=yes +CC=${GOC-"gccgo"} +CFLAGS=$GOFLAGS +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_TAGVAR(LD, $1)="$LD" +_LT_CC_BASENAME([$compiler]) + +# Go did not exist at the time GCC didn't implicitly link libc in. +_LT_TAGVAR(archive_cmds_need_lc, $1)=no + +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds + +if test -n "$compiler"; then + _LT_COMPILER_NO_RTTI($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) +fi + +AC_LANG_RESTORE + +GCC=$lt_save_GCC +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS +])# _LT_LANG_GO_CONFIG + + +# _LT_LANG_RC_CONFIG([TAG]) +# ------------------------- +# Ensure that the configuration variables for the Windows resource compiler +# are suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to `libtool'. +m4_defun([_LT_LANG_RC_CONFIG], +[AC_REQUIRE([LT_PROG_RC])dnl +AC_LANG_SAVE + +# Source file extension for RC test sources. +ac_ext=rc + +# Object file extension for compiled RC test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' + +# Code to be used in simple link tests +lt_simple_link_test_code="$lt_simple_compile_test_code" + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_COMPILER + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +# Allow CC to be a program name with arguments. +lt_save_CC="$CC" +lt_save_CFLAGS=$CFLAGS +lt_save_GCC=$GCC +GCC= +CC=${RC-"windres"} +CFLAGS= +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_CC_BASENAME([$compiler]) +_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes + +if test -n "$compiler"; then + : + _LT_CONFIG($1) +fi + +GCC=$lt_save_GCC +AC_LANG_RESTORE +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS +])# _LT_LANG_RC_CONFIG + + +# LT_PROG_GCJ +# ----------- +AC_DEFUN([LT_PROG_GCJ], +[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ], + [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ], + [AC_CHECK_TOOL(GCJ, gcj,) + test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" + AC_SUBST(GCJFLAGS)])])[]dnl +]) + +# Old name: +AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([LT_AC_PROG_GCJ], []) + + +# LT_PROG_GO +# ---------- +AC_DEFUN([LT_PROG_GO], +[AC_CHECK_TOOL(GOC, gccgo,) +]) + + +# LT_PROG_RC +# ---------- +AC_DEFUN([LT_PROG_RC], +[AC_CHECK_TOOL(RC, windres,) +]) + +# Old name: +AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([LT_AC_PROG_RC], []) + + +# _LT_DECL_EGREP +# -------------- +# If we don't have a new enough Autoconf to choose the best grep +# available, choose the one first in the user's PATH. +m4_defun([_LT_DECL_EGREP], +[AC_REQUIRE([AC_PROG_EGREP])dnl +AC_REQUIRE([AC_PROG_FGREP])dnl +test -z "$GREP" && GREP=grep +_LT_DECL([], [GREP], [1], [A grep program that handles long lines]) +_LT_DECL([], [EGREP], [1], [An ERE matcher]) +_LT_DECL([], [FGREP], [1], [A literal string matcher]) +dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too +AC_SUBST([GREP]) +]) + + +# _LT_DECL_OBJDUMP +# -------------- +# If we don't have a new enough Autoconf to choose the best objdump +# available, choose the one first in the user's PATH. +m4_defun([_LT_DECL_OBJDUMP], +[AC_CHECK_TOOL(OBJDUMP, objdump, false) +test -z "$OBJDUMP" && OBJDUMP=objdump +_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) +AC_SUBST([OBJDUMP]) +]) + +# _LT_DECL_DLLTOOL +# ---------------- +# Ensure DLLTOOL variable is set. +m4_defun([_LT_DECL_DLLTOOL], +[AC_CHECK_TOOL(DLLTOOL, dlltool, false) +test -z "$DLLTOOL" && DLLTOOL=dlltool +_LT_DECL([], [DLLTOOL], [1], [DLL creation program]) +AC_SUBST([DLLTOOL]) +]) + +# _LT_DECL_SED +# ------------ +# Check for a fully-functional sed program, that truncates +# as few characters as possible. Prefer GNU sed if found. +m4_defun([_LT_DECL_SED], +[AC_PROG_SED +test -z "$SED" && SED=sed +Xsed="$SED -e 1s/^X//" +_LT_DECL([], [SED], [1], [A sed program that does not truncate output]) +_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"], + [Sed that helps us avoid accidentally triggering echo(1) options like -n]) +])# _LT_DECL_SED + +m4_ifndef([AC_PROG_SED], [ +# NOTE: This macro has been submitted for inclusion into # +# GNU Autoconf as AC_PROG_SED. When it is available in # +# a released version of Autoconf we should remove this # +# macro and use it instead. # + +m4_defun([AC_PROG_SED], +[AC_MSG_CHECKING([for a sed that does not truncate output]) +AC_CACHE_VAL(lt_cv_path_SED, +[# Loop through the user's path and test for sed and gsed. +# Then use that list of sed's as ones to test for truncation. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for lt_ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then + lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" + fi + done + done +done +IFS=$as_save_IFS +lt_ac_max=0 +lt_ac_count=0 +# Add /usr/xpg4/bin/sed as it is typically found on Solaris +# along with /bin/sed that truncates output. +for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do + test ! -f $lt_ac_sed && continue + cat /dev/null > conftest.in + lt_ac_count=0 + echo $ECHO_N "0123456789$ECHO_C" >conftest.in + # Check for GNU sed and select it if it is found. + if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then + lt_cv_path_SED=$lt_ac_sed + break + fi + while true; do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo >>conftest.nl + $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break + cmp -s conftest.out conftest.nl || break + # 10000 chars as input seems more than enough + test $lt_ac_count -gt 10 && break + lt_ac_count=`expr $lt_ac_count + 1` + if test $lt_ac_count -gt $lt_ac_max; then + lt_ac_max=$lt_ac_count + lt_cv_path_SED=$lt_ac_sed + fi + done +done +]) +SED=$lt_cv_path_SED +AC_SUBST([SED]) +AC_MSG_RESULT([$SED]) +])#AC_PROG_SED +])#m4_ifndef + +# Old name: +AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([LT_AC_PROG_SED], []) + + +# _LT_CHECK_SHELL_FEATURES +# ------------------------ +# Find out whether the shell is Bourne or XSI compatible, +# or has some other useful features. +m4_defun([_LT_CHECK_SHELL_FEATURES], +[AC_MSG_CHECKING([whether the shell understands some XSI constructs]) +# Try some XSI features +xsi_shell=no +( _lt_dummy="a/b/c" + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ + = c,a/b,b/c, \ + && eval 'test $(( 1 + 1 )) -eq 2 \ + && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ + && xsi_shell=yes +AC_MSG_RESULT([$xsi_shell]) +_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell']) + +AC_MSG_CHECKING([whether the shell understands "+="]) +lt_shell_append=no +( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \ + >/dev/null 2>&1 \ + && lt_shell_append=yes +AC_MSG_RESULT([$lt_shell_append]) +_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append']) + +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then + lt_unset=unset +else + lt_unset=false +fi +_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl + +# test EBCDIC or ASCII +case `echo X|tr X '\101'` in + A) # ASCII based system + # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr + lt_SP2NL='tr \040 \012' + lt_NL2SP='tr \015\012 \040\040' + ;; + *) # EBCDIC based system + lt_SP2NL='tr \100 \n' + lt_NL2SP='tr \r\n \100\100' + ;; +esac +_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl +_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl +])# _LT_CHECK_SHELL_FEATURES + + +# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) +# ------------------------------------------------------ +# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and +# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. +m4_defun([_LT_PROG_FUNCTION_REPLACE], +[dnl { +sed -e '/^$1 ()$/,/^} # $1 /c\ +$1 ()\ +{\ +m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) +} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: +]) + + +# _LT_PROG_REPLACE_SHELLFNS +# ------------------------- +# Replace existing portable implementations of several shell functions with +# equivalent extended shell implementations where those features are available.. +m4_defun([_LT_PROG_REPLACE_SHELLFNS], +[if test x"$xsi_shell" = xyes; then + _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl + case ${1} in + */*) func_dirname_result="${1%/*}${2}" ;; + * ) func_dirname_result="${3}" ;; + esac]) + + _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl + func_basename_result="${1##*/}"]) + + _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl + case ${1} in + */*) func_dirname_result="${1%/*}${2}" ;; + * ) func_dirname_result="${3}" ;; + esac + func_basename_result="${1##*/}"]) + + _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl + # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are + # positional parameters, so assign one to ordinary parameter first. + func_stripname_result=${3} + func_stripname_result=${func_stripname_result#"${1}"} + func_stripname_result=${func_stripname_result%"${2}"}]) + + _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl + func_split_long_opt_name=${1%%=*} + func_split_long_opt_arg=${1#*=}]) + + _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl + func_split_short_opt_arg=${1#??} + func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) + + _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl + case ${1} in + *.lo) func_lo2o_result=${1%.lo}.${objext} ;; + *) func_lo2o_result=${1} ;; + esac]) + + _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) + + _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) + + _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) +fi + +if test x"$lt_shell_append" = xyes; then + _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) + + _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl + func_quote_for_eval "${2}" +dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ + eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) + + # Save a `func_append' function call where possible by direct use of '+=' + sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") + test 0 -eq $? || _lt_function_replace_fail=: +else + # Save a `func_append' function call even when '+=' is not available + sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") + test 0 -eq $? || _lt_function_replace_fail=: +fi + +if test x"$_lt_function_replace_fail" = x":"; then + AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) +fi +]) + +# _LT_PATH_CONVERSION_FUNCTIONS +# ----------------------------- +# Determine which file name conversion functions should be used by +# func_to_host_file (and, implicitly, by func_to_host_path). These are needed +# for certain cross-compile configurations and native mingw. +m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_CANONICAL_BUILD])dnl +AC_MSG_CHECKING([how to convert $build file names to $host format]) +AC_CACHE_VAL(lt_cv_to_host_file_cmd, +[case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 + ;; + esac + ;; + *-*-cygwin* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin + ;; + esac + ;; + * ) # unhandled hosts (and "normal" native builds) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; +esac +]) +to_host_file_cmd=$lt_cv_to_host_file_cmd +AC_MSG_RESULT([$lt_cv_to_host_file_cmd]) +_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd], + [0], [convert $build file names to $host format])dnl + +AC_MSG_CHECKING([how to convert $build file names to toolchain format]) +AC_CACHE_VAL(lt_cv_to_tool_file_cmd, +[#assume ordinary cross tools, or native build. +lt_cv_to_tool_file_cmd=func_convert_file_noop +case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 + ;; + esac + ;; +esac +]) +to_tool_file_cmd=$lt_cv_to_tool_file_cmd +AC_MSG_RESULT([$lt_cv_to_tool_file_cmd]) +_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], + [0], [convert $build files to toolchain format])dnl +])# _LT_PATH_CONVERSION_FUNCTIONS + +# Helper functions for option handling. -*- Autoconf -*- +# +# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, +# Inc. +# Written by Gary V. Vaughan, 2004 +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. + +# serial 7 ltoptions.m4 + +# This is to help aclocal find these macros, as it can't see m4_define. +AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) + + +# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME) +# ------------------------------------------ +m4_define([_LT_MANGLE_OPTION], +[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])]) + + +# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME) +# --------------------------------------- +# Set option OPTION-NAME for macro MACRO-NAME, and if there is a +# matching handler defined, dispatch to it. Other OPTION-NAMEs are +# saved as a flag. +m4_define([_LT_SET_OPTION], +[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl +m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]), + _LT_MANGLE_DEFUN([$1], [$2]), + [m4_warning([Unknown $1 option `$2'])])[]dnl +]) + + +# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET]) +# ------------------------------------------------------------ +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +m4_define([_LT_IF_OPTION], +[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])]) + + +# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET) +# ------------------------------------------------------- +# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME +# are set. +m4_define([_LT_UNLESS_OPTIONS], +[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), + [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option), + [m4_define([$0_found])])])[]dnl +m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3 +])[]dnl +]) + + +# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST) +# ---------------------------------------- +# OPTION-LIST is a space-separated list of Libtool options associated +# with MACRO-NAME. If any OPTION has a matching handler declared with +# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about +# the unknown option and exit. +m4_defun([_LT_SET_OPTIONS], +[# Set options +m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), + [_LT_SET_OPTION([$1], _LT_Option)]) + +m4_if([$1],[LT_INIT],[ + dnl + dnl Simply set some default values (i.e off) if boolean options were not + dnl specified: + _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no + ]) + _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no + ]) + dnl + dnl If no reference was made to various pairs of opposing options, then + dnl we run the default mode handler for the pair. For example, if neither + dnl `shared' nor `disable-shared' was passed, we enable building of shared + dnl archives by default: + _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED]) + _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC]) + _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC]) + _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install], + [_LT_ENABLE_FAST_INSTALL]) + ]) +])# _LT_SET_OPTIONS + + + +# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME) +# ----------------------------------------- +m4_define([_LT_MANGLE_DEFUN], +[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])]) + + +# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE) +# ----------------------------------------------- +m4_define([LT_OPTION_DEFINE], +[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl +])# LT_OPTION_DEFINE + + +# dlopen +# ------ +LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes +]) + +AU_DEFUN([AC_LIBTOOL_DLOPEN], +[_LT_SET_OPTION([LT_INIT], [dlopen]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you +put the `dlopen' option into LT_INIT's first parameter.]) +]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], []) + + +# win32-dll +# --------- +# Declare package support for building win32 dll's. +LT_OPTION_DEFINE([LT_INIT], [win32-dll], +[enable_win32_dll=yes + +case $host in +*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) + AC_CHECK_TOOL(AS, as, false) + AC_CHECK_TOOL(DLLTOOL, dlltool, false) + AC_CHECK_TOOL(OBJDUMP, objdump, false) + ;; +esac + +test -z "$AS" && AS=as +_LT_DECL([], [AS], [1], [Assembler program])dnl + +test -z "$DLLTOOL" && DLLTOOL=dlltool +_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl + +test -z "$OBJDUMP" && OBJDUMP=objdump +_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl +])# win32-dll + +AU_DEFUN([AC_LIBTOOL_WIN32_DLL], +[AC_REQUIRE([AC_CANONICAL_HOST])dnl +_LT_SET_OPTION([LT_INIT], [win32-dll]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you +put the `win32-dll' option into LT_INIT's first parameter.]) +]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], []) + + +# _LT_ENABLE_SHARED([DEFAULT]) +# ---------------------------- +# implement the --enable-shared flag, and supports the `shared' and +# `disable-shared' LT_INIT options. +# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +m4_define([_LT_ENABLE_SHARED], +[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl +AC_ARG_ENABLE([shared], + [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@], + [build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])], + [p=${PACKAGE-default} + case $enableval in + yes) enable_shared=yes ;; + no) enable_shared=no ;; + *) + enable_shared=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_shared=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac], + [enable_shared=]_LT_ENABLE_SHARED_DEFAULT) + + _LT_DECL([build_libtool_libs], [enable_shared], [0], + [Whether or not to build shared libraries]) +])# _LT_ENABLE_SHARED + +LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])]) +LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])]) + +# Old names: +AC_DEFUN([AC_ENABLE_SHARED], +[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared]) +]) + +AC_DEFUN([AC_DISABLE_SHARED], +[_LT_SET_OPTION([LT_INIT], [disable-shared]) +]) + +AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) +AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AM_ENABLE_SHARED], []) +dnl AC_DEFUN([AM_DISABLE_SHARED], []) + + + +# _LT_ENABLE_STATIC([DEFAULT]) +# ---------------------------- +# implement the --enable-static flag, and support the `static' and +# `disable-static' LT_INIT options. +# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +m4_define([_LT_ENABLE_STATIC], +[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl +AC_ARG_ENABLE([static], + [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@], + [build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])], + [p=${PACKAGE-default} + case $enableval in + yes) enable_static=yes ;; + no) enable_static=no ;; + *) + enable_static=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_static=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac], + [enable_static=]_LT_ENABLE_STATIC_DEFAULT) + + _LT_DECL([build_old_libs], [enable_static], [0], + [Whether or not to build static libraries]) +])# _LT_ENABLE_STATIC + +LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])]) +LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])]) + +# Old names: +AC_DEFUN([AC_ENABLE_STATIC], +[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static]) +]) + +AC_DEFUN([AC_DISABLE_STATIC], +[_LT_SET_OPTION([LT_INIT], [disable-static]) +]) + +AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) +AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AM_ENABLE_STATIC], []) +dnl AC_DEFUN([AM_DISABLE_STATIC], []) + + + +# _LT_ENABLE_FAST_INSTALL([DEFAULT]) +# ---------------------------------- +# implement the --enable-fast-install flag, and support the `fast-install' +# and `disable-fast-install' LT_INIT options. +# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +m4_define([_LT_ENABLE_FAST_INSTALL], +[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl +AC_ARG_ENABLE([fast-install], + [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], + [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], + [p=${PACKAGE-default} + case $enableval in + yes) enable_fast_install=yes ;; + no) enable_fast_install=no ;; + *) + enable_fast_install=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_fast_install=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac], + [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT) + +_LT_DECL([fast_install], [enable_fast_install], [0], + [Whether or not to optimize for fast installation])dnl +])# _LT_ENABLE_FAST_INSTALL + +LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])]) +LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])]) + +# Old names: +AU_DEFUN([AC_ENABLE_FAST_INSTALL], +[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you put +the `fast-install' option into LT_INIT's first parameter.]) +]) + +AU_DEFUN([AC_DISABLE_FAST_INSTALL], +[_LT_SET_OPTION([LT_INIT], [disable-fast-install]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you put +the `disable-fast-install' option into LT_INIT's first parameter.]) +]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], []) +dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) + + +# _LT_WITH_PIC([MODE]) +# -------------------- +# implement the --with-pic flag, and support the `pic-only' and `no-pic' +# LT_INIT options. +# MODE is either `yes' or `no'. If omitted, it defaults to `both'. +m4_define([_LT_WITH_PIC], +[AC_ARG_WITH([pic], + [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], + [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], + [lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for lt_pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac], + [pic_mode=default]) + +test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) + +_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl +])# _LT_WITH_PIC + +LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])]) +LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])]) + +# Old name: +AU_DEFUN([AC_LIBTOOL_PICMODE], +[_LT_SET_OPTION([LT_INIT], [pic-only]) +AC_DIAGNOSE([obsolete], +[$0: Remove this warning and the call to _LT_SET_OPTION when you +put the `pic-only' option into LT_INIT's first parameter.]) +]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_PICMODE], []) + + +m4_define([_LTDL_MODE], []) +LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive], + [m4_define([_LTDL_MODE], [nonrecursive])]) +LT_OPTION_DEFINE([LTDL_INIT], [recursive], + [m4_define([_LTDL_MODE], [recursive])]) +LT_OPTION_DEFINE([LTDL_INIT], [subproject], + [m4_define([_LTDL_MODE], [subproject])]) + +m4_define([_LTDL_TYPE], []) +LT_OPTION_DEFINE([LTDL_INIT], [installable], + [m4_define([_LTDL_TYPE], [installable])]) +LT_OPTION_DEFINE([LTDL_INIT], [convenience], + [m4_define([_LTDL_TYPE], [convenience])]) + +# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- +# +# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. +# Written by Gary V. Vaughan, 2004 +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. + +# serial 6 ltsugar.m4 + +# This is to help aclocal find these macros, as it can't see m4_define. +AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])]) + + +# lt_join(SEP, ARG1, [ARG2...]) +# ----------------------------- +# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their +# associated separator. +# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier +# versions in m4sugar had bugs. +m4_define([lt_join], +[m4_if([$#], [1], [], + [$#], [2], [[$2]], + [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])]) +m4_define([_lt_join], +[m4_if([$#$2], [2], [], + [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])]) + + +# lt_car(LIST) +# lt_cdr(LIST) +# ------------ +# Manipulate m4 lists. +# These macros are necessary as long as will still need to support +# Autoconf-2.59 which quotes differently. +m4_define([lt_car], [[$1]]) +m4_define([lt_cdr], +[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])], + [$#], 1, [], + [m4_dquote(m4_shift($@))])]) +m4_define([lt_unquote], $1) + + +# lt_append(MACRO-NAME, STRING, [SEPARATOR]) +# ------------------------------------------ +# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'. +# Note that neither SEPARATOR nor STRING are expanded; they are appended +# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked). +# No SEPARATOR is output if MACRO-NAME was previously undefined (different +# than defined and empty). +# +# This macro is needed until we can rely on Autoconf 2.62, since earlier +# versions of m4sugar mistakenly expanded SEPARATOR but not STRING. +m4_define([lt_append], +[m4_define([$1], + m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])]) + + + +# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...]) +# ---------------------------------------------------------- +# Produce a SEP delimited list of all paired combinations of elements of +# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list +# has the form PREFIXmINFIXSUFFIXn. +# Needed until we can rely on m4_combine added in Autoconf 2.62. +m4_define([lt_combine], +[m4_if(m4_eval([$# > 3]), [1], + [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl +[[m4_foreach([_Lt_prefix], [$2], + [m4_foreach([_Lt_suffix], + ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[, + [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])]) + + +# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ]) +# ----------------------------------------------------------------------- +# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited +# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ. +m4_define([lt_if_append_uniq], +[m4_ifdef([$1], + [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1], + [lt_append([$1], [$2], [$3])$4], + [$5])], + [lt_append([$1], [$2], [$3])$4])]) + + +# lt_dict_add(DICT, KEY, VALUE) +# ----------------------------- +m4_define([lt_dict_add], +[m4_define([$1($2)], [$3])]) + + +# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE) +# -------------------------------------------- +m4_define([lt_dict_add_subkey], +[m4_define([$1($2:$3)], [$4])]) + + +# lt_dict_fetch(DICT, KEY, [SUBKEY]) +# ---------------------------------- +m4_define([lt_dict_fetch], +[m4_ifval([$3], + m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]), + m4_ifdef([$1($2)], [m4_defn([$1($2)])]))]) + + +# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE]) +# ----------------------------------------------------------------- +m4_define([lt_if_dict_fetch], +[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4], + [$5], + [$6])]) + + +# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...]) +# -------------------------------------------------------------- +m4_define([lt_dict_filter], +[m4_if([$5], [], [], + [lt_join(m4_quote(m4_default([$4], [[, ]])), + lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]), + [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl +]) + +# ltversion.m4 -- version numbers -*- Autoconf -*- +# +# Copyright (C) 2004 Free Software Foundation, Inc. +# Written by Scott James Remnant, 2004 +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. + +# @configure_input@ + +# serial 3337 ltversion.m4 +# This file is part of GNU Libtool + +m4_define([LT_PACKAGE_VERSION], [2.4.2]) +m4_define([LT_PACKAGE_REVISION], [1.3337]) + +AC_DEFUN([LTVERSION_VERSION], +[macro_version='2.4.2' +macro_revision='1.3337' +_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) +_LT_DECL(, macro_revision, 0) +]) + +# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- +# +# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc. +# Written by Scott James Remnant, 2004. +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. + +# serial 5 lt~obsolete.m4 + +# These exist entirely to fool aclocal when bootstrapping libtool. +# +# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN) +# which have later been changed to m4_define as they aren't part of the +# exported API, or moved to Autoconf or Automake where they belong. +# +# The trouble is, aclocal is a bit thick. It'll see the old AC_DEFUN +# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us +# using a macro with the same name in our local m4/libtool.m4 it'll +# pull the old libtool.m4 in (it doesn't see our shiny new m4_define +# and doesn't know about Autoconf macros at all.) +# +# So we provide this file, which has a silly filename so it's always +# included after everything else. This provides aclocal with the +# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything +# because those macros already exist, or will be overwritten later. +# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. +# +# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. +# Yes, that means every name once taken will need to remain here until +# we give up compatibility with versions before 1.7, at which point +# we need to keep only those names which we still refer to. + +# This is to help aclocal find these macros, as it can't see m4_define. +AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])]) + +m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])]) +m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])]) +m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])]) +m4_ifndef([_LT_AC_SHELL_INIT], [AC_DEFUN([_LT_AC_SHELL_INIT])]) +m4_ifndef([_LT_AC_SYS_LIBPATH_AIX], [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])]) +m4_ifndef([_LT_PROG_LTMAIN], [AC_DEFUN([_LT_PROG_LTMAIN])]) +m4_ifndef([_LT_AC_TAGVAR], [AC_DEFUN([_LT_AC_TAGVAR])]) +m4_ifndef([AC_LTDL_ENABLE_INSTALL], [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])]) +m4_ifndef([AC_LTDL_PREOPEN], [AC_DEFUN([AC_LTDL_PREOPEN])]) +m4_ifndef([_LT_AC_SYS_COMPILER], [AC_DEFUN([_LT_AC_SYS_COMPILER])]) +m4_ifndef([_LT_AC_LOCK], [AC_DEFUN([_LT_AC_LOCK])]) +m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE], [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])]) +m4_ifndef([_LT_AC_TRY_DLOPEN_SELF], [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])]) +m4_ifndef([AC_LIBTOOL_PROG_CC_C_O], [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])]) +m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])]) +m4_ifndef([AC_LIBTOOL_OBJDIR], [AC_DEFUN([AC_LIBTOOL_OBJDIR])]) +m4_ifndef([AC_LTDL_OBJDIR], [AC_DEFUN([AC_LTDL_OBJDIR])]) +m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])]) +m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP], [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])]) +m4_ifndef([AC_PATH_MAGIC], [AC_DEFUN([AC_PATH_MAGIC])]) +m4_ifndef([AC_PROG_LD_GNU], [AC_DEFUN([AC_PROG_LD_GNU])]) +m4_ifndef([AC_PROG_LD_RELOAD_FLAG], [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])]) +m4_ifndef([AC_DEPLIBS_CHECK_METHOD], [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])]) +m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])]) +m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])]) +m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])]) +m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])]) +m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])]) +m4_ifndef([LT_AC_PROG_EGREP], [AC_DEFUN([LT_AC_PROG_EGREP])]) +m4_ifndef([LT_AC_PROG_SED], [AC_DEFUN([LT_AC_PROG_SED])]) +m4_ifndef([_LT_CC_BASENAME], [AC_DEFUN([_LT_CC_BASENAME])]) +m4_ifndef([_LT_COMPILER_BOILERPLATE], [AC_DEFUN([_LT_COMPILER_BOILERPLATE])]) +m4_ifndef([_LT_LINKER_BOILERPLATE], [AC_DEFUN([_LT_LINKER_BOILERPLATE])]) +m4_ifndef([_AC_PROG_LIBTOOL], [AC_DEFUN([_AC_PROG_LIBTOOL])]) +m4_ifndef([AC_LIBTOOL_SETUP], [AC_DEFUN([AC_LIBTOOL_SETUP])]) +m4_ifndef([_LT_AC_CHECK_DLFCN], [AC_DEFUN([_LT_AC_CHECK_DLFCN])]) +m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER], [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])]) +m4_ifndef([_LT_AC_TAGCONFIG], [AC_DEFUN([_LT_AC_TAGCONFIG])]) +m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])]) +m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) +m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) +m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) +m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) +m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) +m4_ifndef([_LT_AC_LANG_CXX_CONFIG], [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])]) +m4_ifndef([_LT_AC_LANG_F77_CONFIG], [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])]) +m4_ifndef([_LT_AC_LANG_GCJ_CONFIG], [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])]) +m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) +m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) +m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) +m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])]) +m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])]) +m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])]) +m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])]) +m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])]) +m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) +m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) + +# nls.m4 serial 5 (gettext-0.18) +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation, +dnl Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. +dnl +dnl This file can can be used in projects which are not available under +dnl the GNU General Public License or the GNU Library General Public +dnl License but which still want to provide support for the GNU gettext +dnl functionality. +dnl Please note that the actual code of the GNU gettext library is covered +dnl by the GNU Library General Public License, and the rest of the GNU +dnl gettext package package is covered by the GNU General Public License. +dnl They are *not* in the public domain. + +dnl Authors: +dnl Ulrich Drepper , 1995-2000. +dnl Bruno Haible , 2000-2003. + +AC_PREREQ([2.50]) + +AC_DEFUN([AM_NLS], +[ + AC_MSG_CHECKING([whether NLS is requested]) + dnl Default is enabled NLS + AC_ARG_ENABLE([nls], + [ --disable-nls do not use Native Language Support], + USE_NLS=$enableval, USE_NLS=yes) + AC_MSG_RESULT([$USE_NLS]) + AC_SUBST([USE_NLS]) +]) + +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 1 (pkg-config-0.24) +# +# Copyright © 2004 Scott James Remnant . +# +# 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 +# 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 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# PKG_PROG_PKG_CONFIG([MIN-VERSION]) +# ---------------------------------- +AC_DEFUN([PKG_PROG_PKG_CONFIG], +[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) +AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) +AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=m4_default([$1], [0.9.0]) + AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + PKG_CONFIG="" + fi +fi[]dnl +])# PKG_PROG_PKG_CONFIG + +# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# +# Check to see whether a particular set of modules exists. Similar +# to PKG_CHECK_MODULES(), but does not set variables or print errors. +# +# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +# only at the first occurence in configure.ac, so if the first place +# it's called might be skipped (such as if it is within an "if", you +# have to call PKG_CHECK_EXISTS manually +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_EXISTS], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +if test -n "$PKG_CONFIG" && \ + AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then + m4_default([$2], [:]) +m4_ifvaln([$3], [else + $3])dnl +fi]) + +# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +# --------------------------------------------- +m4_define([_PKG_CONFIG], +[if test -n "$$1"; then + pkg_cv_[]$1="$$1" + elif test -n "$PKG_CONFIG"; then + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes ], + [pkg_failed=yes]) + else + pkg_failed=untried +fi[]dnl +])# _PKG_CONFIG + +# _PKG_SHORT_ERRORS_SUPPORTED +# ----------------------------- +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi[]dnl +])# _PKG_SHORT_ERRORS_SUPPORTED + + +# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +# [ACTION-IF-NOT-FOUND]) +# +# +# Note that if there is a possibility the first call to +# PKG_CHECK_MODULES might not happen, you should be sure to include an +# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +# +# +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_MODULES], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl + +pkg_failed=no +AC_MSG_CHECKING([for $1]) + +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) + +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +and $1[]_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details.]) + +if test $pkg_failed = yes; then + AC_MSG_RESULT([no]) + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` + else + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD + + m4_default([$4], [AC_MSG_ERROR( +[Package requirements ($2) were not met: + +$$1_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +_PKG_TEXT])[]dnl + ]) +elif test $pkg_failed = untried; then + AC_MSG_RESULT([no]) + m4_default([$4], [AC_MSG_FAILURE( +[The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +_PKG_TEXT + +To get pkg-config, see .])[]dnl ]) else $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS @@ -1544,6 +10143,46 @@ fi[]dnl ])# PKG_CHECK_MODULES + +# PKG_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable pkgconfigdir as the location where a module +# should install pkg-config .pc files. By default the directory is +# $libdir/pkgconfig, but the default can be changed by passing +# DIRECTORY. The user can override through the --with-pkgconfigdir +# parameter. +AC_DEFUN([PKG_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([pkgconfigdir], + [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, + [with_pkgconfigdir=]pkg_default) +AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_INSTALLDIR + + +# PKG_NOARCH_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable noarch_pkgconfigdir as the location where a +# module should install arch-independent pkg-config .pc files. By +# default the directory is $datadir/pkgconfig, but the default can be +# changed by passing DIRECTORY. The user can override through the +# --with-noarch-pkgconfigdir parameter. +AC_DEFUN([PKG_NOARCH_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([noarch-pkgconfigdir], + [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, + [with_noarch_pkgconfigdir=]pkg_default) +AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_NOARCH_INSTALLDIR + # gnome-common.m4 # # serial 3 @@ -2268,8 +10907,3 @@ _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) ]) -m4_include([m4/libtool.m4]) -m4_include([m4/ltoptions.m4]) -m4_include([m4/ltsugar.m4]) -m4_include([m4/ltversion.m4]) -m4_include([m4/lt~obsolete.m4]) diff -Nru totem-3.4.3/browser-plugin/Makefile.am totem-3.6.2/browser-plugin/Makefile.am --- totem-3.4.3/browser-plugin/Makefile.am 2012-07-04 09:52:28.000000000 +0000 +++ totem-3.6.2/browser-plugin/Makefile.am 2012-10-09 15:41:59.000000000 +0000 @@ -8,7 +8,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir) \ - -I$(top_srcdir)/lib \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/backend \ -I$(top_builddir)/src \ @@ -69,12 +68,12 @@ totem-glow-button.h \ test-glow-button.c -test_glow_button_LDADD = \ - $(DEPENDENCY_LIBS) \ +test_glow_button_LDADD = \ + $(GLOW_BUTTON_LIBS) \ -lm -test_glow_button_CFLAGS = \ - $(DEPENDENCY_CFLAGS) \ +test_glow_button_CFLAGS = \ + $(GLOW_BUTTON_CFLAGS) \ $(WARN_CFLAGS) \ $(AM_CFLAGS) @@ -82,7 +81,7 @@ libexec_PROGRAMS = totem-plugin-viewer # Are we a bit thick, Mister? -totem-plugin-viewer.c: totem-plugin-viewer-interface.h +totem-plugin-viewer.c: totem-plugin-viewer-interface.h $(MARSHAL_FILES) totem_plugin_viewer_SOURCES = \ totem-glow-button.c \ @@ -99,21 +98,16 @@ $(AM_CPPFLAGS) totem_plugin_viewer_CFLAGS = \ - $(DEPENDENCY_CFLAGS) \ + $(PLUGIN_VIEWER_CFLAGS) \ $(WARN_CFLAGS) \ - $(DBUS_CFLAGS) \ - $(SN_CFLAGS) \ $(AM_CFLAGS) totem_plugin_viewer_LDADD = \ $(top_builddir)/src/backend/libbaconvideowidget.la \ $(top_builddir)/src/libtotem_player.la \ - $(top_builddir)/lib/libtotemscrsaver.la \ - $(DEPENDENCY_LIBS) \ - $(SN_LIBS) \ - $(DBUS_LIBS) \ - $(XTEST_LIBS) \ - $(X_LIBS) + $(PLUGIN_VIEWER_LIBS) + +totem_plugin_viewer_LDFLAGS = -export-dynamic totem-plugin-viewer-interface.h: org_gnome_totem_PluginViewer.xml $(DBUS_BIND) --prefix=totem_embedded --mode=glib-server $< > $@ diff -Nru totem-3.4.3/browser-plugin/Makefile.in totem-3.6.2/browser-plugin/Makefile.in --- totem-3.4.3/browser-plugin/Makefile.in 2012-07-04 09:54:47.000000000 +0000 +++ totem-3.6.2/browser-plugin/Makefile.in 2012-10-25 13:36:18.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,6 +16,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,12 +69,10 @@ # Totem Cone Plugin @ENABLE_CONE_PLUGIN_TRUE@am__append_5 = libtotem-cone-plugin.la subdir = browser-plugin -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in TODO +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/depcomp TODO ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -125,6 +139,7 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = libtotem_cone_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ $(libtotem_cone_plugin_la_CXXFLAGS) $(CXXFLAGS) \ @@ -252,14 +267,23 @@ totem_plugin_viewer_OBJECTS = $(am_totem_plugin_viewer_OBJECTS) totem_plugin_viewer_DEPENDENCIES = \ $(top_builddir)/src/backend/libbaconvideowidget.la \ - $(top_builddir)/src/libtotem_player.la \ - $(top_builddir)/lib/libtotemscrsaver.la $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(top_builddir)/src/libtotem_player.la $(am__DEPENDENCIES_1) totem_plugin_viewer_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(totem_plugin_viewer_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ + $(totem_plugin_viewer_CFLAGS) $(CFLAGS) \ + $(totem_plugin_viewer_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -272,17 +296,16 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ @@ -291,17 +314,16 @@ $(AM_CXXFLAGS) $(CXXFLAGS) AM_V_CXX = $(am__v_CXX_@AM_V@) am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -am__v_CXXLD_0 = @echo " CXXLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = SOURCES = $(libtotem_cone_plugin_la_SOURCES) \ $(libtotem_gmp_plugin_la_SOURCES) \ $(libtotem_mully_plugin_la_SOURCES) \ @@ -314,6 +336,11 @@ $(am__libtotem_narrowspace_plugin_la_SOURCES_DIST) \ $(am__libtotem_vegas_plugin_la_SOURCES_DIST) \ $(test_glow_button_SOURCES) $(totem_plugin_viewer_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -325,7 +352,6 @@ AM_CFLAGS = @AM_CFLAGS@ AM_CPPFLAGS = \ -I$(top_srcdir) \ - -I$(top_srcdir)/lib \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/backend \ -I$(top_builddir)/src \ @@ -342,6 +368,10 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BACKEND_CFLAGS = @BACKEND_CFLAGS@ +BACKEND_LIBS = @BACKEND_LIBS@ +BACKEND_TEST_CFLAGS = @BACKEND_TEST_CFLAGS@ +BACKEND_TEST_LIBS = @BACKEND_TEST_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ BROWSER_PLUGIN_DIR = @BROWSER_PLUGIN_DIR@ BROWSER_PLUGIN_LIBS = @BROWSER_PLUGIN_LIBS@ @@ -363,8 +393,6 @@ DBUS_LIBS = @DBUS_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DEPENDENCY_CFLAGS = @DEPENDENCY_CFLAGS@ -DEPENDENCY_LIBS = @DEPENDENCY_LIBS@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DISC_RECORDER_CFLAGS = @DISC_RECORDER_CFLAGS@ DISC_RECORDER_LIBS = @DISC_RECORDER_LIBS@ @@ -378,7 +406,6 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -EXTRA_BACKEND_LIBS = @EXTRA_BACKEND_LIBS@ FGREP = @FGREP@ FULL_LIBEXECDIR = @FULL_LIBEXECDIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ @@ -386,19 +413,21 @@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GLIB_REQS = @GLIB_REQS@ +GLOW_BUTTON_CFLAGS = @GLOW_BUTTON_CFLAGS@ +GLOW_BUTTON_LIBS = @GLOW_BUTTON_LIBS@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ -GST_CFLAGS = @GST_CFLAGS@ -GST_LIBS = @GST_LIBS@ +GST_PLUGINS_BAD_CFLAGS = @GST_PLUGINS_BAD_CFLAGS@ +GST_PLUGINS_BAD_LIBS = @GST_PLUGINS_BAD_LIBS@ GTKDOC_CHECK = @GTKDOC_CHECK@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_LIBS = @GTK_LIBS@ GTK_REQS = @GTK_REQS@ +HELPER_CFLAGS = @HELPER_CFLAGS@ +HELPER_LIBS = @HELPER_LIBS@ HELP_DIR = @HELP_DIR@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ @@ -424,11 +453,11 @@ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBEPC_CFLAGS = @LIBEPC_CFLAGS@ -LIBEPC_LIBS = @LIBEPC_LIBS@ LIBGRILO_CFLAGS = @LIBGRILO_CFLAGS@ LIBGRILO_LIBS = @LIBGRILO_LIBS@ LIBOBJS = @LIBOBJS@ +LIBPLAYER_CFLAGS = @LIBPLAYER_CFLAGS@ +LIBPLAYER_LIBS = @LIBPLAYER_LIBS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBZEITGEIST_CFLAGS = @LIBZEITGEIST_CFLAGS@ @@ -445,8 +474,6 @@ MISSING_PLUGINS_CFLAGS = @MISSING_PLUGINS_CFLAGS@ MISSING_PLUGINS_LIBS = @MISSING_PLUGINS_LIBS@ MKDIR_P = @MKDIR_P@ -MM_CFLAGS = @MM_CFLAGS@ -MM_LIBS = @MM_LIBS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ NAUTILUSDIR = @NAUTILUSDIR@ @@ -467,15 +494,21 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PEASGTK_CFLAGS = @PEASGTK_CFLAGS@ -PEASGTK_LIBS = @PEASGTK_LIBS@ -PEAS_CFLAGS = @PEAS_CFLAGS@ -PEAS_LIBS = @PEAS_LIBS@ +PIXBUF_HELPER_CFLAGS = @PIXBUF_HELPER_CFLAGS@ +PIXBUF_HELPER_LIBS = @PIXBUF_HELPER_LIBS@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +PLAYER_CFLAGS = @PLAYER_CFLAGS@ +PLAYER_LIBS = @PLAYER_LIBS@ PLUGINDIR = @PLUGINDIR@ PLUGINS = @PLUGINS@ +PLUGIN_VIEWER_CFLAGS = @PLUGIN_VIEWER_CFLAGS@ +PLUGIN_VIEWER_LIBS = @PLUGIN_VIEWER_LIBS@ +PREVIEW_CFLAGS = @PREVIEW_CFLAGS@ +PREVIEW_LIBS = @PREVIEW_LIBS@ +PROPERTIES_CFLAGS = @PROPERTIES_CFLAGS@ +PROPERTIES_LIBS = @PROPERTIES_LIBS@ PYGOBJECT_CFLAGS = @PYGOBJECT_CFLAGS@ PYGOBJECT_LIBS = @PYGOBJECT_LIBS@ PYLINT = @PYLINT@ @@ -495,6 +528,10 @@ SMCLIENT_CFLAGS = @SMCLIENT_CFLAGS@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ +THUMBNAILER_CFLAGS = @THUMBNAILER_CFLAGS@ +THUMBNAILER_LIBS = @THUMBNAILER_LIBS@ +TIME_HELPER_CFLAGS = @TIME_HELPER_CFLAGS@ +TIME_HELPER_LIBS = @TIME_HELPER_LIBS@ TOTEM_API_VERSION = @TOTEM_API_VERSION@ TOTEM_PLPARSER_REQS = @TOTEM_PLPARSER_REQS@ TOTEM_VERSION_MAJOR = @TOTEM_VERSION_MAJOR@ @@ -506,9 +543,6 @@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ XGETTEXT = @XGETTEXT@ -XMKMF = @XMKMF@ -XTEST_LIBS = @XTEST_LIBS@ -X_LIBS = @X_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -617,11 +651,11 @@ test-glow-button.c test_glow_button_LDADD = \ - $(DEPENDENCY_LIBS) \ + $(GLOW_BUTTON_LIBS) \ -lm test_glow_button_CFLAGS = \ - $(DEPENDENCY_CFLAGS) \ + $(GLOW_BUTTON_CFLAGS) \ $(WARN_CFLAGS) \ $(AM_CFLAGS) @@ -640,22 +674,16 @@ $(AM_CPPFLAGS) totem_plugin_viewer_CFLAGS = \ - $(DEPENDENCY_CFLAGS) \ + $(PLUGIN_VIEWER_CFLAGS) \ $(WARN_CFLAGS) \ - $(DBUS_CFLAGS) \ - $(SN_CFLAGS) \ $(AM_CFLAGS) totem_plugin_viewer_LDADD = \ $(top_builddir)/src/backend/libbaconvideowidget.la \ $(top_builddir)/src/libtotem_player.la \ - $(top_builddir)/lib/libtotemscrsaver.la \ - $(DEPENDENCY_LIBS) \ - $(SN_LIBS) \ - $(DBUS_LIBS) \ - $(XTEST_LIBS) \ - $(X_LIBS) + $(PLUGIN_VIEWER_LIBS) +totem_plugin_viewer_LDFLAGS = -export-dynamic @ENABLE_GMP_PLUGIN_TRUE@libtotem_gmp_plugin_la_SOURCES = \ @ENABLE_GMP_PLUGIN_TRUE@ $(plugin_sources) \ @ENABLE_GMP_PLUGIN_TRUE@ totemGMPControls.cpp \ @@ -787,7 +815,6 @@ $(am__aclocal_m4_deps): install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" @list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -795,6 +822,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \ } @@ -810,12 +839,14 @@ clean-pluginLTLIBRARIES: -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(plugin_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } libtotem-cone-plugin.la: $(libtotem_cone_plugin_la_OBJECTS) $(libtotem_cone_plugin_la_DEPENDENCIES) $(EXTRA_libtotem_cone_plugin_la_DEPENDENCIES) $(AM_V_CXXLD)$(libtotem_cone_plugin_la_LINK) $(am_libtotem_cone_plugin_la_rpath) $(libtotem_cone_plugin_la_OBJECTS) $(libtotem_cone_plugin_la_LIBADD) $(LIBS) libtotem-gmp-plugin.la: $(libtotem_gmp_plugin_la_OBJECTS) $(libtotem_gmp_plugin_la_DEPENDENCIES) $(EXTRA_libtotem_gmp_plugin_la_DEPENDENCIES) @@ -828,8 +859,11 @@ $(AM_V_CXXLD)$(libtotem_vegas_plugin_la_LINK) $(am_libtotem_vegas_plugin_la_rpath) $(libtotem_vegas_plugin_la_OBJECTS) $(libtotem_vegas_plugin_la_LIBADD) $(LIBS) install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p || test -f $$p1; \ @@ -938,25 +972,22 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/totem_plugin_viewer-totem-plugin-viewer.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ -@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ -@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ -@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< @@ -1032,25 +1063,22 @@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(totem_plugin_viewer_CPPFLAGS) $(CPPFLAGS) $(totem_plugin_viewer_CFLAGS) $(CFLAGS) -c -o totem_plugin_viewer-marshal.obj `if test -f 'marshal.c'; then $(CYGPATH_W) 'marshal.c'; else $(CYGPATH_W) '$(srcdir)/marshal.c'; fi` .cpp.o: -@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ -@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cpp.obj: -@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ -@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cpp.lo: -@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ -@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< @@ -1390,6 +1418,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -1536,13 +1578,13 @@ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-libexecPROGRAMS clean-libtool clean-noinstPROGRAMS \ - clean-pluginLTLIBRARIES ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-libexecPROGRAMS \ - install-man install-pdf install-pdf-am \ + clean-pluginLTLIBRARIES cscopelist ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am \ + install-libexecPROGRAMS install-man install-pdf install-pdf-am \ install-pluginLTLIBRARIES install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ @@ -1557,7 +1599,7 @@ $(AM_V_GEN)($(GLIB_GENMARSHAL) --prefix=totempluginviewer_marshal --internal --body --header $< > $@) # Are we a bit thick, Mister? -totem-plugin-viewer.c: totem-plugin-viewer-interface.h +totem-plugin-viewer.c: totem-plugin-viewer-interface.h $(MARSHAL_FILES) totem-plugin-viewer-interface.h: org_gnome_totem_PluginViewer.xml $(DBUS_BIND) --prefix=totem_embedded --mode=glib-server $< > $@ diff -Nru totem-3.4.3/browser-plugin/marshal.c totem-3.6.2/browser-plugin/marshal.c --- totem-3.4.3/browser-plugin/marshal.c 2012-04-17 14:28:16.000000000 +0000 +++ totem-3.6.2/browser-plugin/marshal.c 2012-10-25 13:48:26.000000000 +0000 @@ -8,7 +8,7 @@ #ifdef G_ENABLE_DEBUG #define g_marshal_value_peek_boolean(v) g_value_get_boolean (v) -#define g_marshal_value_peek_char(v) g_value_get_char (v) +#define g_marshal_value_peek_char(v) g_value_get_schar (v) #define g_marshal_value_peek_uchar(v) g_value_get_uchar (v) #define g_marshal_value_peek_int(v) g_value_get_int (v) #define g_marshal_value_peek_uint(v) g_value_get_uint (v) diff -Nru totem-3.4.3/browser-plugin/totem-plugin-viewer.c totem-3.6.2/browser-plugin/totem-plugin-viewer.c --- totem-3.4.3/browser-plugin/totem-plugin-viewer.c 2012-07-04 09:52:28.000000000 +0000 +++ totem-3.6.2/browser-plugin/totem-plugin-viewer.c 2012-10-25 08:53:22.000000000 +0000 @@ -40,7 +40,6 @@ #include #include -#include #include @@ -89,8 +88,6 @@ #define TOTEM_IS_EMBEDDED_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), TOTEM_TYPE_EMBEDDED)) #define TOTEM_EMBEDDED_GET_CLASS(o)(G_TYPE_INSTANCE_GET_CLASS ((o), TOTEM_TYPE_EMBEDDED, TotemEmbeddedClass)) -typedef GObjectClass TotemEmbeddedClass; - typedef struct { char *uri; char *subtitle; @@ -99,8 +96,12 @@ int starttime; } TotemPlItem; +typedef struct { + GtkApplicationClass parent; +} TotemEmbeddedClass; + typedef struct _TotemEmbedded { - GObject parent; + GtkApplication parent; DBusGConnection *conn; GtkWidget *window; @@ -108,7 +109,6 @@ GtkWidget *pp_button; GtkWidget *pp_fs_button; TotemStatusbar *statusbar; - TotemScrsaver *scrsaver; int width, height; char *user_agent; const char *mimetype; @@ -123,6 +123,7 @@ BaconVideoWidget *bvw; TotemStates state; GdkCursor *cursor; + guint inhibit_id; /* Playlist, a GList of TotemPlItem */ GList *playlist, *current; @@ -176,7 +177,7 @@ TOTEM_EMBEDDED_UNKNOWN_COMMAND }; -G_DEFINE_TYPE (TotemEmbedded, totem_embedded, G_TYPE_OBJECT); +G_DEFINE_TYPE (TotemEmbedded, totem_embedded, GTK_TYPE_APPLICATION); static void totem_embedded_init (TotemEmbedded *emb) { } static gboolean totem_embedded_do_command (TotemEmbedded *emb, const char *command, GError **err); @@ -377,8 +378,19 @@ break; } - if (emb->scrsaver != NULL) - totem_scrsaver_set_state (emb->scrsaver, (state == TOTEM_STATE_PLAYING) ? FALSE : TRUE); + if (state == TOTEM_STATE_PLAYING) { + if (emb->inhibit_id == 0) { + emb->inhibit_id = gtk_application_inhibit (GTK_APPLICATION (emb), + NULL, + GTK_APPLICATION_INHIBIT_IDLE, + _("Playing a movie")); + } + } else { + if (emb->inhibit_id != 0) { + gtk_application_uninhibit (GTK_APPLICATION (emb), emb->inhibit_id); + emb->inhibit_id = 0; + } + } gtk_image_set_from_icon_name (GTK_IMAGE (image), id, GTK_ICON_SIZE_MENU); gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (emb->pp_fs_button), id); @@ -439,7 +451,8 @@ bacon_video_widget_set_logo_mode (emb->bvw, FALSE); - retval = bacon_video_widget_open (emb->bvw, uri, emb->current_subtitle_uri, NULL); + retval = bacon_video_widget_open (emb->bvw, uri, NULL); + bacon_video_widget_set_text_subtitle (emb->bvw, emb->current_subtitle_uri); g_free (uri); /* FIXME we shouldn't even do that here */ @@ -1183,95 +1196,6 @@ } } -static void -popup_menu_position_func (GtkMenu *menu, gint *x, gint *y, gboolean *push_in, GtkWidget *button) -{ - GtkWidget *widget = GTK_WIDGET (button); - GtkRequisition menu_req; - GtkTextDirection direction; - GtkAllocation allocation; - - gtk_widget_get_preferred_size (GTK_WIDGET (menu), NULL, &menu_req); - - direction = gtk_widget_get_direction (widget); - - gdk_window_get_origin (gtk_widget_get_window (widget), x, y); - gtk_widget_get_allocation (widget, &allocation); - *x += allocation.x; - *y += allocation.y; - - if (direction == GTK_TEXT_DIR_LTR) - *x += MAX (allocation.width - menu_req.width, 0); - else if (menu_req.width > allocation.width) - *x -= menu_req.width - allocation.width; - - /* This might not work properly if the popup button is right at the - * top of the screen, but really, what are the chances */ - *y -= menu_req.height; - - *push_in = FALSE; -} - -static void -popup_menu_over_arrow (GtkToggleButton *button, - GtkMenu *menu, - GdkEventButton *event) -{ - gtk_menu_popup (menu, NULL, NULL, - (GtkMenuPositionFunc) popup_menu_position_func, - button, - event ? event->button : 0, - event ? event->time : gtk_get_current_event_time ()); -} - -static void -on_popup_button_toggled (GtkToggleButton *button, TotemEmbedded *emb) -{ - GtkMenu *menu; - - menu = GTK_MENU (gtk_builder_get_object (emb->menuxml, "menu")); - - if (gtk_toggle_button_get_active (button) && !gtk_widget_get_visible (GTK_WIDGET (menu))) { - /* we get here only when the menu is activated by a key - * press, so that we can select the first menu item */ - popup_menu_over_arrow (button, menu, NULL); - gtk_menu_shell_select_first (GTK_MENU_SHELL (menu), FALSE); - } -} - -static gboolean -on_popup_button_button_pressed (GtkToggleButton *button, - GdkEventButton *event, - TotemEmbedded *emb) -{ - if (event->button == 1) { - GtkMenu *menu; - - menu = GTK_MENU (gtk_builder_get_object (emb->menuxml, "menu")); - if (!gtk_widget_get_visible (GTK_WIDGET (menu))) { - popup_menu_over_arrow (button, menu, event); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE); - } else { - gtk_menu_popdown (menu); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), FALSE); - } - - return TRUE; - } - - return FALSE; -} - -static void -on_popup_menu_unmap (GtkWidget *menu, - TotemEmbedded *emb) -{ - GtkWidget *button; - - button = GTK_WIDGET (gtk_builder_get_object (emb->xml, "popup_button")); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), FALSE); -} - static char * resolve_redirect (const char *old_mrl, const char *mrl) { @@ -1418,7 +1342,7 @@ g_error_free (emb->error); emb->error = NULL; } else if (!gtk_widget_get_visible (GTK_WIDGET (menu))) { - g_message ("emitting signal"); + g_message ("emitting signal button press"); g_signal_emit (emb, signals[BUTTON_PRESS], 0, event->time, event->button); @@ -1499,7 +1423,6 @@ on_error_event (BaconVideoWidget *bvw, char *message, gboolean playback_stopped, - gboolean fatal, TotemEmbedded *emb) { if (playback_stopped) { @@ -1528,11 +1451,6 @@ } } - if (fatal) { - /* FIXME: report error back to plugin */ - exit (1); - } - totem_embedded_set_error (emb, BVW_ERROR_GENERIC, message); totem_embedded_set_error_logo (emb, NULL); } @@ -1579,7 +1497,7 @@ } static void -on_buffering (BaconVideoWidget *bvw, guint percentage, TotemEmbedded *emb) +on_buffering (BaconVideoWidget *bvw, gdouble percentage, TotemEmbedded *emb) { // g_message ("Buffering: %d %%", percentage); } @@ -1623,13 +1541,6 @@ static gboolean on_seek_start (GtkWidget *widget, GdkEventButton *event, TotemEmbedded *emb) { - /* HACK: we want the behaviour you get with the middle button, so we - * mangle the event. clicking with other buttons moves the slider in - * step increments, clicking with the middle button moves the slider to - * the location of the click. - */ - event->button = 2; - emb->seeking = TRUE; totem_time_label_set_seeking (TOTEM_TIME_LABEL (emb->fs->time_label), TRUE); @@ -1640,9 +1551,6 @@ static gboolean cb_on_seek (GtkWidget *widget, GdkEventButton *event, TotemEmbedded *emb) { - /* HACK: see on_seek_start */ - event->button = 2; - bacon_video_widget_seek (emb->bvw, gtk_range_get_value (GTK_RANGE (widget)) / 65535, NULL); totem_time_label_set_seeking (TOTEM_TIME_LABEL (emb->fs->time_label), @@ -1742,7 +1650,6 @@ { GtkWidget *child, *container, *image; GtkWidget *popup_button; - GtkWidget *menu; GError *err = NULL; emb->xml = totem_interface_load ("mozilla-viewer.ui", TRUE, @@ -1868,11 +1775,15 @@ g_signal_connect (G_OBJECT (emb->pp_button), "clicked", G_CALLBACK (on_play_pause), emb); + /* popup */ + emb->menuxml = totem_interface_load ("mozilla-viewer.ui", TRUE, + GTK_WINDOW (emb->window), emb); + g_assert (emb->menuxml); + popup_button = GTK_WIDGET (gtk_builder_get_object (emb->xml, "popup_button")); - g_signal_connect (G_OBJECT (popup_button), "toggled", - G_CALLBACK (on_popup_button_toggled), emb); - g_signal_connect (G_OBJECT (popup_button), "button-press-event", - G_CALLBACK (on_popup_button_button_pressed), emb); + gtk_menu_button_set_popup (GTK_MENU_BUTTON (popup_button), + (GtkWidget *) gtk_builder_get_object (emb->menuxml, "menu")); + gtk_menu_button_set_direction (GTK_MENU_BUTTON (popup_button), GTK_ARROW_UP); emb->volume = GTK_WIDGET (gtk_builder_get_object (emb->xml, "volume_button")); gtk_scale_button_set_adjustment (GTK_SCALE_BUTTON (emb->fs->volume), @@ -1884,13 +1795,8 @@ emb->statusbar = TOTEM_STATUSBAR (gtk_builder_get_object (emb->xml, "statusbar")); - if (!emb->hidden) { + if (!emb->hidden) gtk_widget_set_size_request (emb->window, width, height); - emb->scrsaver = totem_scrsaver_new (); - g_object_set (emb->scrsaver, - "reason", _("Playing a movie"), - NULL); - } #ifdef GNOME_ENABLE_DEBUG child = GTK_WIDGET (gtk_builder_get_object (emb->xml, "controls")); @@ -1955,15 +1861,6 @@ gtk_widget_show (emb->window); } - /* popup */ - emb->menuxml = totem_interface_load ("mozilla-viewer.ui", TRUE, - GTK_WINDOW (emb->window), emb); - g_assert (emb->menuxml); - - menu = GTK_WIDGET (gtk_builder_get_object (emb->menuxml, "menu")); - g_signal_connect (G_OBJECT (menu), "unmap", - G_CALLBACK (on_popup_menu_unmap), emb); - /* Set the logo and the button glow */ if (!emb->hidden && emb->autostart == FALSE) { totem_glow_button_set_glow (TOTEM_GLOW_BUTTON (emb->pp_button), TRUE); @@ -2228,10 +2125,6 @@ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); textdomain (GETTEXT_PACKAGE); -#if !GLIB_CHECK_VERSION (2, 31, 0) - g_thread_init (NULL); -#endif - g_set_application_name (_("Movie browser plugin")); gtk_window_set_default_icon_name ("totem"); @@ -2291,6 +2184,11 @@ } #endif + if (gtk_clutter_init (NULL, NULL) != CLUTTER_INIT_SUCCESS) { + g_warning ("Could not initialise clutter-gtk"); + return 1; + } + context = g_option_context_new ("- Play audio and video inside a web browser"); baconoptiongroup = bacon_video_widget_get_option_group(); g_option_context_add_main_entries (context, option_entries, GETTEXT_PACKAGE); @@ -2304,6 +2202,10 @@ exit (1); } + g_type_ensure (TOTEM_TYPE_GLOW_BUTTON); + g_type_ensure (TOTEM_TYPE_STATUSBAR); + g_type_ensure (TOTEM_TYPE_TIME_LABEL); + if (arg_audioonly != FALSE) g_setenv("PULSE_PROP_media.role", "video", TRUE); else @@ -2356,7 +2258,16 @@ gtk_settings = gtk_settings_get_default (); g_object_set (G_OBJECT (gtk_settings), "gtk-application-prefer-dark-theme", TRUE, NULL); - emb = g_object_new (TOTEM_TYPE_EMBEDDED, NULL); + emb = g_object_new (TOTEM_TYPE_EMBEDDED, + "application-id", svcname, + "flags", G_APPLICATION_NON_UNIQUE, + NULL); + + if (g_application_register (G_APPLICATION (emb), NULL, &e) == FALSE) { + g_warning ("Failed to register application: %s", e->message); + g_error_free (e); + return 1; + } emb->state = TOTEM_STATE_INVALID; emb->width = -1; diff -Nru totem-3.4.3/browser-plugin/totemPlugin.cpp totem-3.6.2/browser-plugin/totemPlugin.cpp --- totem-3.4.3/browser-plugin/totemPlugin.cpp 2012-07-04 09:52:28.000000000 +0000 +++ totem-3.6.2/browser-plugin/totemPlugin.cpp 2012-10-10 16:03:04.000000000 +0000 @@ -119,8 +119,10 @@ { "application/ogg", "ogg", NULL }, { "audio/ogg", "oga", NULL }, { "audio/x-ogg", "ogg", NULL }, + { "audio/x-vorbis+ogg", "ogg", NULL }, { "video/ogg", "ogv", NULL }, { "video/x-ogg", "ogg", NULL }, + { "video/x-theora+ogg", "ogg", NULL }, { "application/annodex", "anx", NULL }, { "audio/annodex", "axa", NULL }, { "video/annodex", "axv", NULL }, @@ -131,7 +133,7 @@ { "application/x-nsv-vp3-mp3", "nsv", "video/x-nsv" }, { "video/flv", "flv", "application/x-flash-video" }, { "video/webm", "webm", NULL }, - { "application/x-totem-plugin", "", "Totem Multimedia plugin" }, + { "application/x-totem-plugin", "", "Videos multimedia plugin" }, { "audio/midi", "mid, midi", NULL }, #else #error Unknown plugin type @@ -140,7 +142,7 @@ static const char kPluginDescription[] = #if defined(TOTEM_GMP_PLUGIN) - "Windows Media Player Plug-in 10 (compatible; Totem)"; + "Windows Media Player Plug-in 10 (compatible; Videos)"; #elif defined(TOTEM_NARROWSPACE_PLUGIN) "QuickTime Plug-in " TOTEM_NARROWSPACE_VERSION; #elif defined(TOTEM_VEGAS_PLUGIN) @@ -148,7 +150,7 @@ #elif defined(TOTEM_MULLY_PLUGIN) "DivX\xC2\xAE Web Player"; #elif defined(TOTEM_CONE_PLUGIN) - "VLC Multimedia Plugin (compatible Totem " VERSION ")"; + "VLC Multimedia Plugin (compatible Videos " VERSION ")"; #else #error Unknown plugin type #endif @@ -159,7 +161,7 @@ #elif defined(TOTEM_VEGAS_PLUGIN) "Shockwave Flash 11.1 r102"; #else - "The Totem " PACKAGE_VERSION " plugin handles video and audio streams."; + "The Videos " PACKAGE_VERSION " plugin handles video and audio streams."; #endif static const char kPluginUserAgent[] = @@ -168,7 +170,7 @@ #elif defined(TOTEM_GMP_PLUGIN) "Windows-Media-Player/10.00.00.4019"; #elif defined(TOTEM_VEGAS_PLUGIN) - "Totem/"VERSION; + "Videos/"VERSION; #else ""; #endif @@ -2056,6 +2058,8 @@ } g_free (oldSrc); } + + mAutoPlay = FALSE; #endif #if 0 //def TOTEM_MULLY_PLUGIN @@ -2147,7 +2151,7 @@ } #endif /* TOTEM_GMP_PLUGIN */ #if defined(TOTEM_NARROWSPACE_PLUGIN) - if (height <= 16 && !mControllerHidden) { + if (height > 0 && height <= 16 && !mControllerHidden) { mAudioOnly = true; } #endif /* TOTEM_NARROWSPACE_PLUGIN */ diff -Nru totem-3.4.3/config.h.in totem-3.6.2/config.h.in --- totem-3.4.3/config.h.in 2012-07-04 09:55:02.000000000 +0000 +++ totem-3.6.2/config.h.in 2012-10-25 13:37:14.000000000 +0000 @@ -45,12 +45,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H -/* defined if you have X11/XF86keysym.h */ -#undef HAVE_XFREE - -/* defined if you have XTest library */ -#undef HAVE_XTEST - /* Define to the sub-directory in which libtool stores uninstalled libraries. */ #undef LT_OBJDIR diff -Nru totem-3.4.3/configure totem-3.6.2/configure --- totem-3.4.3/configure 2012-07-04 09:54:46.000000000 +0000 +++ totem-3.6.2/configure 2012-10-25 13:36:17.000000000 +0000 @@ -1,13 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for totem 3.4.3. +# Generated by GNU Autoconf 2.69 for totem 3.6.2. # # Report bugs to . # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -136,6 +134,31 @@ # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -169,7 +192,8 @@ else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -222,21 +246,25 @@ if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - # Preserve -v and -x to the replacement shell. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; - esac - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -340,6 +368,14 @@ } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -461,6 +497,10 @@ chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -495,16 +535,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -516,28 +556,8 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -631,8 +651,8 @@ # Identity of this package. PACKAGE_NAME='totem' PACKAGE_TARNAME='totem' -PACKAGE_VERSION='3.4.3' -PACKAGE_STRING='totem 3.4.3' +PACKAGE_VERSION='3.6.2' +PACKAGE_STRING='totem 3.6.2' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=totem' PACKAGE_URL='' @@ -723,6 +743,10 @@ ENABLE_GMP_PLUGIN_TRUE ENABLE_BROWSER_PLUGINS_FALSE ENABLE_BROWSER_PLUGINS_TRUE +GLOW_BUTTON_LIBS +GLOW_BUTTON_CFLAGS +PLUGIN_VIEWER_LIBS +PLUGIN_VIEWER_CFLAGS DBUS_BIND DBUS_LIBS DBUS_CFLAGS @@ -743,14 +767,28 @@ SAVE_FILE_CHECK_CFLAGS DISC_RECORDER_LIBS DISC_RECORDER_CFLAGS -LIBEPC_LIBS -LIBEPC_CFLAGS LIRC_LIBS MEDIA_PLAYER_KEYS_LIBS MEDIA_PLAYER_KEYS_CFLAGS ENABLE_VALA_FALSE ENABLE_VALA_TRUE VALAC +PROPERTIES_LIBS +PROPERTIES_CFLAGS +PREVIEW_LIBS +PREVIEW_CFLAGS +THUMBNAILER_LIBS +THUMBNAILER_CFLAGS +PIXBUF_HELPER_LIBS +PIXBUF_HELPER_CFLAGS +TIME_HELPER_LIBS +TIME_HELPER_CFLAGS +HELPER_LIBS +HELPER_CFLAGS +LIBPLAYER_LIBS +LIBPLAYER_CFLAGS +PLAYER_LIBS +PLAYER_CFLAGS ENABLE_PYTHON_FALSE ENABLE_PYTHON_TRUE PYLINT @@ -765,20 +803,6 @@ PYTHON_PREFIX PYTHON_VERSION PYTHON -PEASGTK_LIBS -PEASGTK_CFLAGS -PEAS_LIBS -PEAS_CFLAGS -X_LIBS -XTEST_LIBS -XMKMF -EXTRA_BACKEND_LIBS -GTK_LIBS -GTK_CFLAGS -MM_LIBS -MM_CFLAGS -DEPENDENCY_LIBS -DEPENDENCY_CFLAGS WITH_SMCLIENT_QUARTZ_FALSE WITH_SMCLIENT_QUARTZ_TRUE WITH_SMCLIENT_WIN32_FALSE @@ -789,8 +813,12 @@ WITH_SMCLIENT_TRUE SMCLIENT_LIBS SMCLIENT_CFLAGS -GST_LIBS -GST_CFLAGS +GST_PLUGINS_BAD_LIBS +GST_PLUGINS_BAD_CFLAGS +BACKEND_TEST_LIBS +BACKEND_TEST_CFLAGS +BACKEND_LIBS +BACKEND_CFLAGS MISSING_PLUGINS_LIBS MISSING_PLUGINS_CFLAGS PLUGINDIR @@ -1004,7 +1032,6 @@ enable_libtool_lock enable_easy_codec_installation with_smclient -with_x enable_python enable_vala with_plugins @@ -1046,28 +1073,35 @@ CXXCPP MISSING_PLUGINS_CFLAGS MISSING_PLUGINS_LIBS -GST_CFLAGS -GST_LIBS +BACKEND_CFLAGS +BACKEND_LIBS +BACKEND_TEST_CFLAGS +BACKEND_TEST_LIBS +GST_PLUGINS_BAD_CFLAGS +GST_PLUGINS_BAD_LIBS SMCLIENT_CFLAGS SMCLIENT_LIBS -DEPENDENCY_CFLAGS -DEPENDENCY_LIBS -MM_CFLAGS -MM_LIBS -GTK_CFLAGS -GTK_LIBS -XMKMF -PEAS_CFLAGS -PEAS_LIBS -PEASGTK_CFLAGS -PEASGTK_LIBS PYTHON PYGOBJECT_CFLAGS PYGOBJECT_LIBS +PLAYER_CFLAGS +PLAYER_LIBS +LIBPLAYER_CFLAGS +LIBPLAYER_LIBS +HELPER_CFLAGS +HELPER_LIBS +TIME_HELPER_CFLAGS +TIME_HELPER_LIBS +PIXBUF_HELPER_CFLAGS +PIXBUF_HELPER_LIBS +THUMBNAILER_CFLAGS +THUMBNAILER_LIBS +PREVIEW_CFLAGS +PREVIEW_LIBS +PROPERTIES_CFLAGS +PROPERTIES_LIBS MEDIA_PLAYER_KEYS_CFLAGS MEDIA_PLAYER_KEYS_LIBS -LIBEPC_CFLAGS -LIBEPC_LIBS DISC_RECORDER_CFLAGS DISC_RECORDER_LIBS SAVE_FILE_CHECK_CFLAGS @@ -1085,6 +1119,10 @@ BROWSER_PLUGIN_LIBS DBUS_CFLAGS DBUS_LIBS +PLUGIN_VIEWER_CFLAGS +PLUGIN_VIEWER_LIBS +GLOW_BUTTON_CFLAGS +GLOW_BUTTON_LIBS NAUTILUS_CFLAGS NAUTILUS_LIBS GTKDOC_DEPS_CFLAGS @@ -1544,8 +1582,6 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1631,7 +1667,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures totem 3.4.3 to adapt to many kinds of systems. +\`configure' configures totem 3.6.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1693,10 +1729,6 @@ --program-suffix=SUFFIX append SUFFIX to installed program names --program-transform-name=PROGRAM run sed PROGRAM on installed program names -X features: - --x-includes=DIR X include files are in DIR - --x-libraries=DIR X library files are in DIR - System types: --build=BUILD configure for building on BUILD [guessed] --host=HOST cross-compile to build programs to run on HOST [BUILD] @@ -1705,7 +1737,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of totem 3.4.3:";; + short | recursive ) echo "Configuration of totem 3.6.2:";; esac cat <<\_ACEOF @@ -1713,13 +1745,16 @@ --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --disable-maintainer-mode disable make rules and dependencies not useful - (and sometimes confusing) to the casual installer - --enable-silent-rules less verbose build output (undo: `make V=1') - --disable-silent-rules verbose build output (undo: `make V=0') + --disable-maintainer-mode + disable make rules and dependencies not useful (and + sometimes confusing) to the casual installer + --enable-silent-rules less verbose build output (undo: "make V=1") + --disable-silent-rules verbose build output (undo: "make V=0") --disable-nls do not use Native Language Support - --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors + --enable-dependency-tracking + do not reject slow dependency extractors + --disable-dependency-tracking + speeds up one-time build --disable-scrollkeeper do not make updates to the scrollkeeper database --enable-introspection=[no/auto/yes] Enable introspection for this build @@ -1775,7 +1810,6 @@ (or the compiler's sysroot if not specified). --with-smclient which smclient backend to use (auto/no/xsmp/win32/quartz) - --with-x use the X Window System --with-plugins Which Totem plugins to compile (default: auto; "all", "none" and "autodetect" are valid) --with-nautilusdir=DIR Installation path for Nautilus extension [auto] @@ -1802,39 +1836,61 @@ C compiler flags for MISSING_PLUGINS, overriding pkg-config MISSING_PLUGINS_LIBS linker flags for MISSING_PLUGINS, overriding pkg-config - GST_CFLAGS C compiler flags for GST, overriding pkg-config - GST_LIBS linker flags for GST, overriding pkg-config + BACKEND_CFLAGS + C compiler flags for BACKEND, overriding pkg-config + BACKEND_LIBS + linker flags for BACKEND, overriding pkg-config + BACKEND_TEST_CFLAGS + C compiler flags for BACKEND_TEST, overriding pkg-config + BACKEND_TEST_LIBS + linker flags for BACKEND_TEST, overriding pkg-config + GST_PLUGINS_BAD_CFLAGS + C compiler flags for GST_PLUGINS_BAD, overriding pkg-config + GST_PLUGINS_BAD_LIBS + linker flags for GST_PLUGINS_BAD, overriding pkg-config SMCLIENT_CFLAGS C compiler flags for SMCLIENT, overriding pkg-config SMCLIENT_LIBS linker flags for SMCLIENT, overriding pkg-config - DEPENDENCY_CFLAGS - C compiler flags for DEPENDENCY, overriding pkg-config - DEPENDENCY_LIBS - linker flags for DEPENDENCY, overriding pkg-config - MM_CFLAGS C compiler flags for MM, overriding pkg-config - MM_LIBS linker flags for MM, overriding pkg-config - GTK_CFLAGS C compiler flags for GTK, overriding pkg-config - GTK_LIBS linker flags for GTK, overriding pkg-config - XMKMF Path to xmkmf, Makefile generator for X Window System - PEAS_CFLAGS C compiler flags for PEAS, overriding pkg-config - PEAS_LIBS linker flags for PEAS, overriding pkg-config - PEASGTK_CFLAGS - C compiler flags for PEASGTK, overriding pkg-config - PEASGTK_LIBS - linker flags for PEASGTK, overriding pkg-config PYTHON the Python interpreter PYGOBJECT_CFLAGS C compiler flags for PYGOBJECT, overriding pkg-config PYGOBJECT_LIBS linker flags for PYGOBJECT, overriding pkg-config + PLAYER_CFLAGS + C compiler flags for PLAYER, overriding pkg-config + PLAYER_LIBS linker flags for PLAYER, overriding pkg-config + LIBPLAYER_CFLAGS + C compiler flags for LIBPLAYER, overriding pkg-config + LIBPLAYER_LIBS + linker flags for LIBPLAYER, overriding pkg-config + HELPER_CFLAGS + C compiler flags for HELPER, overriding pkg-config + HELPER_LIBS linker flags for HELPER, overriding pkg-config + TIME_HELPER_CFLAGS + C compiler flags for TIME_HELPER, overriding pkg-config + TIME_HELPER_LIBS + linker flags for TIME_HELPER, overriding pkg-config + PIXBUF_HELPER_CFLAGS + C compiler flags for PIXBUF_HELPER, overriding pkg-config + PIXBUF_HELPER_LIBS + linker flags for PIXBUF_HELPER, overriding pkg-config + THUMBNAILER_CFLAGS + C compiler flags for THUMBNAILER, overriding pkg-config + THUMBNAILER_LIBS + linker flags for THUMBNAILER, overriding pkg-config + PREVIEW_CFLAGS + C compiler flags for PREVIEW, overriding pkg-config + PREVIEW_LIBS + linker flags for PREVIEW, overriding pkg-config + PROPERTIES_CFLAGS + C compiler flags for PROPERTIES, overriding pkg-config + PROPERTIES_LIBS + linker flags for PROPERTIES, overriding pkg-config MEDIA_PLAYER_KEYS_CFLAGS C compiler flags for MEDIA_PLAYER_KEYS, overriding pkg-config MEDIA_PLAYER_KEYS_LIBS linker flags for MEDIA_PLAYER_KEYS, overriding pkg-config - LIBEPC_CFLAGS - C compiler flags for LIBEPC, overriding pkg-config - LIBEPC_LIBS linker flags for LIBEPC, overriding pkg-config DISC_RECORDER_CFLAGS C compiler flags for DISC_RECORDER, overriding pkg-config DISC_RECORDER_LIBS @@ -1867,6 +1923,14 @@ linker flags for BROWSER_PLUGIN, overriding pkg-config DBUS_CFLAGS C compiler flags for DBUS, overriding pkg-config DBUS_LIBS linker flags for DBUS, overriding pkg-config + PLUGIN_VIEWER_CFLAGS + C compiler flags for PLUGIN_VIEWER, overriding pkg-config + PLUGIN_VIEWER_LIBS + linker flags for PLUGIN_VIEWER, overriding pkg-config + GLOW_BUTTON_CFLAGS + C compiler flags for GLOW_BUTTON, overriding pkg-config + GLOW_BUTTON_LIBS + linker flags for GLOW_BUTTON, overriding pkg-config NAUTILUS_CFLAGS C compiler flags for NAUTILUS, overriding pkg-config NAUTILUS_LIBS @@ -1942,10 +2006,10 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -totem configure 3.4.3 -generated by GNU Autoconf 2.68 +totem configure 3.6.2 +generated by GNU Autoconf 2.69 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -2021,7 +2085,7 @@ test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -2319,7 +2383,7 @@ test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -2432,8 +2496,8 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by totem $as_me 3.4.3, which was -generated by GNU Autoconf 2.68. Invocation command line was +It was created by totem $as_me 3.6.2, which was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2808,7 +2872,7 @@ ac_config_headers="$ac_config_headers config.h" -am__api_version='1.11' +am__api_version='1.12' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -2876,7 +2940,7 @@ # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -2934,9 +2998,6 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 $as_echo_n "checking whether build environment is sane... " >&6; } -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -2947,32 +3008,40 @@ esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$*" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$*" != "X $srcdir/configure conftest.file" \ - && test "$*" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - as_fn_error $? "ls -t appears to fail. Make sure there is not a broken -alias in your environment" "$LINENO" 5 - fi + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$*" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken + alias in your environment" "$LINENO" 5 + fi + if test "$2" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$2" = conftest.file ) then @@ -2984,6 +3053,16 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi + +rm -f conftest.file + test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. @@ -3010,8 +3089,8 @@ am_missing_run="$MISSING --run " else am_missing_run= - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 -$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi if test x"${install_sh}" != xset; then @@ -3023,10 +3102,10 @@ esac fi -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. +# will honor the 'STRIP' environment variable to overrule this program. if test "$cross_compiling" != no; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. @@ -3045,7 +3124,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3085,7 +3164,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3136,7 +3215,7 @@ test -z "$as_dir" && as_dir=. for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( 'mkdir (GNU coreutils) '* | \ 'mkdir (coreutils) '* | \ @@ -3165,12 +3244,6 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 $as_echo "$MKDIR_P" >&6; } -mkdir_p="$MKDIR_P" -case $mkdir_p in - [\\/$]* | ?:[\\/]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac - for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -3189,7 +3262,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3275,7 +3348,7 @@ # Define the identity of the package. PACKAGE='totem' - VERSION='3.4.3' + VERSION='3.6.2' cat >>confdefs.h <<_ACEOF @@ -3303,13 +3376,100 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +mkdir_p='$(MKDIR_P)' + # We need awk for the "check" target. The system "awk" is bad on # some platforms. # Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AMTAR='$${TAR-tar}' -am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5 +$as_echo_n "checking how to create a ustar tar archive... " >&6; } +# Loop over all known methods to create a tar archive until one works. +_am_tools='gnutar plaintar pax cpio none' +_am_tools=${am_cv_prog_tar_ustar-$_am_tools} +# Do not fold the above two line into one, because Tru64 sh and +# Solaris sh will not grok spaces in the rhs of '-'. +for _am_tool in $_am_tools +do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; + do + { echo "$as_me:$LINENO: $_am_tar --version" >&5 + ($_am_tar --version) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && break + done + am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x ustar -w "$$tardir"' + am__tar_='pax -L -x ustar -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H ustar -L' + am__tar_='find "$tardir" -print | cpio -o -H ustar -L' + am__untar='cpio -i -H ustar -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_ustar}" && break + + # tar/untar a dummy directory, and stop if the command works + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5 + (tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + rm -rf conftest.dir + if test -s conftest.tar; then + { echo "$as_me:$LINENO: $am__untar &5 + ($am__untar &5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + grep GrepMe conftest.dir/file >/dev/null 2>&1 && break + fi +done +rm -rf conftest.dir + +if ${am_cv_prog_tar_ustar+:} false; then : + $as_echo_n "(cached) " >&6 +else + am_cv_prog_tar_ustar=$_am_tool +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5 +$as_echo "$am_cv_prog_tar_ustar" >&6; } @@ -3322,10 +3482,10 @@ enableval=$enable_silent_rules; fi -case $enable_silent_rules in -yes) AM_DEFAULT_VERBOSITY=0;; -no) AM_DEFAULT_VERBOSITY=1;; -*) AM_DEFAULT_VERBOSITY=0;; +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=0;; esac am_make=${MAKE-make} { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 @@ -3397,7 +3557,7 @@ _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -3463,7 +3623,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3503,7 +3663,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3556,7 +3716,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3597,7 +3757,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -3655,7 +3815,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3699,7 +3859,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4145,8 +4305,7 @@ /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -4242,8 +4401,8 @@ # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're @@ -4278,16 +4437,16 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -4296,8 +4455,8 @@ test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else @@ -4305,7 +4464,7 @@ fi ;; msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -4400,7 +4559,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4440,7 +4599,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4480,7 +4639,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4664,7 +4823,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4704,7 +4863,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4744,7 +4903,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4784,7 +4943,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4835,7 +4994,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4943,6 +5102,7 @@ + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. @@ -4963,7 +5123,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5006,7 +5166,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5273,7 +5433,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5317,7 +5477,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CXX="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5513,8 +5673,8 @@ # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're @@ -5549,16 +5709,16 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -5567,8 +5727,8 @@ test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else @@ -5576,7 +5736,7 @@ fi ;; msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -5943,7 +6103,7 @@ for ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue + as_fn_executable_p "$ac_path_SED" || continue # Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED case `"$ac_path_SED" --version 2>&1` in @@ -6019,7 +6179,7 @@ for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -6085,7 +6245,7 @@ for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -6152,7 +6312,7 @@ for ac_prog in fgrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue + as_fn_executable_p "$ac_path_FGREP" || continue # Check for GNU ac_path_FGREP and select it if it is found. # Check for GNU $ac_path_FGREP case `"$ac_path_FGREP" --version 2>&1` in @@ -6408,7 +6568,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6452,7 +6612,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6865,7 +7025,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6905,7 +7065,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OBJDUMP="objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7211,7 +7371,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7251,7 +7411,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DLLTOOL="dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7354,7 +7514,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AR="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7398,7 +7558,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_AR="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7523,7 +7683,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7563,7 +7723,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7622,7 +7782,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7662,7 +7822,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8311,7 +8471,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8351,7 +8511,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8431,7 +8591,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8471,7 +8631,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8523,7 +8683,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8563,7 +8723,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_NMEDIT="nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8615,7 +8775,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_LIPO="${ac_tool_prefix}lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8655,7 +8815,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_LIPO="lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8707,7 +8867,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL="${ac_tool_prefix}otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8747,7 +8907,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL="otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8799,7 +8959,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8839,7 +8999,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL64="otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9794,10 +9954,6 @@ $RM -r conftest* -## CAVEAT EMPTOR: -## There is no encapsulation within the following macros, do not change -## the running order or otherwise move them around unless you know exactly -## what you are doing... if test -n "$compiler"; then lt_prog_compiler_no_builtin_flag= @@ -16820,16 +16976,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -16889,28 +17045,16 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -16951,8 +17095,8 @@ Report bugs to ." lt_cl_version="\ -totem config.lt 3.4.3 -configured by $0, generated by GNU Autoconf 2.68. +totem config.lt 3.6.2 +configured by $0, generated by GNU Autoconf 2.69. Copyright (C) 2011 Free Software Foundation, Inc. This config.lt script is free software; the Free Software Foundation @@ -18185,6 +18329,7 @@ + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. @@ -18205,7 +18350,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -18248,7 +18393,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -18317,7 +18462,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GLIB_GENMARSHAL="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -18357,7 +18502,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GLIB_MKENUMS="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -18381,9 +18526,9 @@ # Requirements -GLIB_REQS=2.27.92 +GLIB_REQS=2.33.0 GIO_REQS=2.27.92 -GTK_REQS=3.3.6 +GTK_REQS=3.5.2 TOTEM_PLPARSER_REQS=2.32.4 GNOMEICON_REQS=2.15.90 DBUS_REQS=0.82 @@ -18391,14 +18536,17 @@ PEAS_REQS=1.1.0 PYTHON_REQS=2.3 PYGOBJECT_REQS=2.90.3 +GRILO_REQS=0.2.0 +LIBXML_REQS=2.6.0 +# Used in the pkg-config file for plugins TOTEM_VERSION_MAJOR=3 -TOTEM_VERSION_MINOR=4 -TOTEM_VERSION_MICRO=3 +TOTEM_VERSION_MINOR=6 +TOTEM_VERSION_MICRO=2 @@ -18412,20 +18560,20 @@ # The full list of plugins -allowed_plugins="brasero-disc-recorder chapters dbusservice im-status gromit iplayer lirc media-player-keys ontop opensubtitles properties publish pythonconsole rotation save-file samplepython sample-vala screensaver screenshot sidebar-test skipto zeitgeist-dp grilo" +allowed_plugins="apple-trailers autoload-subtitles brasero-disc-recorder chapters dbusservice im-status gromit lirc media-player-keys ontop opensubtitles properties pythonconsole recent rotation save-file samplepython sample-vala screensaver screenshot sidebar-test skipto zeitgeist-dp grilo" PLUGINDIR='${libdir}/totem/plugins' -GST_MAJORMINOR=0.10 -GST_REQS=0.10.30 -GSTPLUG_REQS=0.10.30 +GST_MAJORMINOR=1.0 +GST_REQS=0.11.93 +GST_PLUG_BASE_REQS=0.11.93 +GSTPLUG_REQS=0.11.93 CLUTTER_REQS=1.6.8 -CLUTTER_GST_REQS=1.3.9 +CLUTTER_GST_REQS=1.5.5 CLUTTER_GTK_REQS=1.0.2 -HAVE_GSTREAMER=no - +MISSING_PLUGINS_MODULES="" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable easy codec installation support" >&5 $as_echo_n "checking whether to enable easy codec installation support... " >&6; } # Check whether --enable-easy-codec-installation was given. @@ -18448,6 +18596,7 @@ $as_echo "$enable_easy_codec_installation" >&6; } if test "x$enable_easy_codec_installation" != "xno"; then + MISSING_PLUGINS_MODULES="gstreamer-pbutils-1.0" pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MISSING_PLUGINS" >&5 @@ -18457,12 +18606,13 @@ pkg_cv_MISSING_PLUGINS_CFLAGS="$MISSING_PLUGINS_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-plugins-base-0.10\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gstreamer-plugins-base-0.10") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$MISSING_PLUGINS_MODULES\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$MISSING_PLUGINS_MODULES") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_MISSING_PLUGINS_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-plugins-base-0.10" 2>/dev/null` + pkg_cv_MISSING_PLUGINS_CFLAGS=`$PKG_CONFIG --cflags "$MISSING_PLUGINS_MODULES" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -18473,12 +18623,13 @@ pkg_cv_MISSING_PLUGINS_LIBS="$MISSING_PLUGINS_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-plugins-base-0.10\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gstreamer-plugins-base-0.10") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$MISSING_PLUGINS_MODULES\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$MISSING_PLUGINS_MODULES") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_MISSING_PLUGINS_LIBS=`$PKG_CONFIG --libs "gstreamer-plugins-base-0.10" 2>/dev/null` + pkg_cv_MISSING_PLUGINS_LIBS=`$PKG_CONFIG --libs "$MISSING_PLUGINS_MODULES" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -18498,14 +18649,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - MISSING_PLUGINS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gstreamer-plugins-base-0.10" 2>&1` + MISSING_PLUGINS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$MISSING_PLUGINS_MODULES" 2>&1` else - MISSING_PLUGINS_PKG_ERRORS=`$PKG_CONFIG --print-errors "gstreamer-plugins-base-0.10" 2>&1` + MISSING_PLUGINS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$MISSING_PLUGINS_MODULES" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$MISSING_PLUGINS_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (gstreamer-plugins-base-0.10) were not met: + as_fn_error $? "Package requirements ($MISSING_PLUGINS_MODULES) were not met: $MISSING_PLUGINS_PKG_ERRORS @@ -18515,7 +18666,6 @@ Alternatively, you may set the environment variables MISSING_PLUGINS_CFLAGS and MISSING_PLUGINS_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 - elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -18531,14 +18681,12 @@ To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } - else MISSING_PLUGINS_CFLAGS=$pkg_cv_MISSING_PLUGINS_CFLAGS MISSING_PLUGINS_LIBS=$pkg_cv_MISSING_PLUGINS_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - MISSING_PLUGINS_LIBS="$MISSING_PLUGINS_LIBS -lgstpbutils-0.10" $as_echo "#define ENABLE_MISSING_PLUGIN_INSTALLATION 1" >>confdefs.h @@ -18546,38 +18694,45 @@ fi fi -MM="gstreamer-0.10 >= $GST_REQS gstreamer-base-0.10 >= $GST_REQS gstreamer-plugins-base-0.10 >= $GSTPLUG_REQS gstreamer-tag-0.10 >= $GSTPLUG_REQS clutter-1.0 >= $CLUTTER_REQS clutter-gst-1.0 >= $CLUTTER_GST_REQS clutter-gtk-1.0 mx-1.0" +# ================================================================ +# Backend requirements +# ================================================================ + +BACKEND_MODULES="gstreamer-1.0 >= $GST_REQS gstreamer-base-1.0 >= $GST_REQS gstreamer-plugins-base-1.0 >= $GST_PLUG_BASE_REQS $MISSING_PLUGINS_MODULES gstreamer-tag-1.0 >= $GSTPLUG_REQS gstreamer-audio-1.0 gstreamer-video-1.0 clutter-1.0 >= $CLUTTER_REQS clutter-gst-2.0 >= $CLUTTER_GST_REQS clutter-gtk-1.0 cairo gnome-icon-theme >= $GNOMEICON_REQS gsettings-desktop-schemas" + pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GST" >&5 -$as_echo_n "checking for GST... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BACKEND" >&5 +$as_echo_n "checking for BACKEND... " >&6; } -if test -n "$GST_CFLAGS"; then - pkg_cv_GST_CFLAGS="$GST_CFLAGS" +if test -n "$BACKEND_CFLAGS"; then + pkg_cv_BACKEND_CFLAGS="$BACKEND_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$MM\""; } >&5 - ($PKG_CONFIG --exists --print-errors "$MM") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$BACKEND_MODULES\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$BACKEND_MODULES") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GST_CFLAGS=`$PKG_CONFIG --cflags "$MM" 2>/dev/null` + pkg_cv_BACKEND_CFLAGS=`$PKG_CONFIG --cflags "$BACKEND_MODULES" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi else pkg_failed=untried fi -if test -n "$GST_LIBS"; then - pkg_cv_GST_LIBS="$GST_LIBS" +if test -n "$BACKEND_LIBS"; then + pkg_cv_BACKEND_LIBS="$BACKEND_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$MM\""; } >&5 - ($PKG_CONFIG --exists --print-errors "$MM") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$BACKEND_MODULES\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$BACKEND_MODULES") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GST_LIBS=`$PKG_CONFIG --libs "$MM" 2>/dev/null` + pkg_cv_BACKEND_LIBS=`$PKG_CONFIG --libs "$BACKEND_MODULES" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -18597,24 +18752,23 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$MM" 2>&1` + BACKEND_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$BACKEND_MODULES" 2>&1` else - GST_PKG_ERRORS=`$PKG_CONFIG --print-errors "$MM" 2>&1` + BACKEND_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$BACKEND_MODULES" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$GST_PKG_ERRORS" >&5 + echo "$BACKEND_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements ($MM) were not met: + as_fn_error $? "Package requirements ($BACKEND_MODULES) were not met: -$GST_PKG_ERRORS +$BACKEND_PKG_ERRORS Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables GST_CFLAGS -and GST_LIBS to avoid the need to call pkg-config. +Alternatively, you may set the environment variables BACKEND_CFLAGS +and BACKEND_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 - elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -18624,73 +18778,276 @@ is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables GST_CFLAGS -and GST_LIBS to avoid the need to call pkg-config. +Alternatively, you may set the environment variables BACKEND_CFLAGS +and BACKEND_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } - else - GST_CFLAGS=$pkg_cv_GST_CFLAGS - GST_LIBS=$pkg_cv_GST_LIBS + BACKEND_CFLAGS=$pkg_cv_BACKEND_CFLAGS + BACKEND_LIBS=$pkg_cv_BACKEND_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } fi -GST_LIBS="$GST_LIBS -lgstbase-$GST_MAJORMINOR -lgstinterfaces-$GST_MAJORMINOR -lgstvideo-$GST_MAJORMINOR -lgstaudio-$GST_MAJORMINOR -lgstpbutils-$GST_MAJORMINOR -lgsttag-$GST_MAJORMINOR" -EXTRA_BACKEND_LIBS="-lgstinterfaces-$GST_MAJORMINOR -lgstvideo-$GST_MAJORMINOR -lgstaudio-$GST_MAJORMINOR -lgstpbutils-$GST_MAJORMINOR" +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BACKEND_TEST" >&5 +$as_echo_n "checking for BACKEND_TEST... " >&6; } + +if test -n "$BACKEND_TEST_CFLAGS"; then + pkg_cv_BACKEND_TEST_CFLAGS="$BACKEND_TEST_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$BACKEND_MODULES gtk+-3.0 >= \$GTK_REQS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$BACKEND_MODULES gtk+-3.0 >= $GTK_REQS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_BACKEND_TEST_CFLAGS=`$PKG_CONFIG --cflags "$BACKEND_MODULES gtk+-3.0 >= $GTK_REQS" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$BACKEND_TEST_LIBS"; then + pkg_cv_BACKEND_TEST_LIBS="$BACKEND_TEST_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$BACKEND_MODULES gtk+-3.0 >= \$GTK_REQS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$BACKEND_MODULES gtk+-3.0 >= $GTK_REQS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_BACKEND_TEST_LIBS=`$PKG_CONFIG --libs "$BACKEND_MODULES gtk+-3.0 >= $GTK_REQS" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + BACKEND_TEST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$BACKEND_MODULES gtk+-3.0 >= $GTK_REQS" 2>&1` + else + BACKEND_TEST_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$BACKEND_MODULES gtk+-3.0 >= $GTK_REQS" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$BACKEND_TEST_PKG_ERRORS" >&5 + + as_fn_error $? "Package requirements ($BACKEND_MODULES gtk+-3.0 >= $GTK_REQS) were not met: + +$BACKEND_TEST_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables BACKEND_TEST_CFLAGS +and BACKEND_TEST_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables BACKEND_TEST_CFLAGS +and BACKEND_TEST_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5; } +else + BACKEND_TEST_CFLAGS=$pkg_cv_BACKEND_TEST_CFLAGS + BACKEND_TEST_LIBS=$pkg_cv_BACKEND_TEST_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +fi -gst010_toolsdir=`$PKG_CONFIG --variable=toolsdir gstreamer-0.10` -gst010_inspect="$gst010_toolsdir/gst-inspect-0.10" +gst10_toolsdir=`$PKG_CONFIG --variable=toolsdir gstreamer-1.0` +gst10_inspect="$gst10_toolsdir/gst-inspect-1.0" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking GStreamer 0.10 inspection tool" >&5 -$as_echo_n "checking GStreamer 0.10 inspection tool... " >&6; } -if test -r "$gst010_inspect"; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking GStreamer 1.0 inspection tool" >&5 +$as_echo_n "checking GStreamer 1.0 inspection tool... " >&6; } +if test -r "$gst10_inspect"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } as_fn_error $? " - Cannot find required GStreamer-0.10 tool 'gst-inspect-0.10'. - It should be part of gstreamer-0_10-utils. Please install it. + Cannot find required GStreamer-1.0 tool 'gst-inspect-1.0'. + It should be part of gstreamer-1_0-utils. Please install it. " "$LINENO" 5 fi -for base_element in playbin2 ffmpegcolorspace videoscale +set -- playback videoscale +for base_element in playbin videoscale do - { $as_echo "$as_me:${as_lineno-$LINENO}: checking GStreamer 0.10 $base_element plugin" >&5 -$as_echo_n "checking GStreamer 0.10 $base_element plugin... " >&6; } - if $gst010_inspect $base_element >/dev/null 2>/dev/null; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking GStreamer 1.0 $base_element element" >&5 +$as_echo_n "checking GStreamer 1.0 $base_element element... " >&6; } + if $gst10_inspect $base_element >/dev/null 2>/dev/null; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } as_fn_error $? " - Cannot find required GStreamer-0.10 plugin '$base_element'. + Cannot find required GStreamer-1.0 plugin '$1'. It should be part of gst-plugins-base. Please install it. " "$LINENO" 5 + fi + shift; done +set -- autodetect goom for good_element in autoaudiosink goom do - { $as_echo "$as_me:${as_lineno-$LINENO}: checking GStreamer 0.10 $good_element plugin" >&5 -$as_echo_n "checking GStreamer 0.10 $good_element plugin... " >&6; } - if $gst010_inspect $good_element >/dev/null 2>/dev/null; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking GStreamer 1.0 $good_element element" >&5 +$as_echo_n "checking GStreamer 1.0 $good_element element... " >&6; } + if $gst10_inspect $good_element >/dev/null 2>/dev/null; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } as_fn_error $? " - Cannot find required GStreamer-0.10 plugin '$good_element'. + Cannot find required GStreamer-1.0 plugin '$1'. It should be part of gst-plugins-good. Please install it. " "$LINENO" 5 fi + shift; +done + + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GST_PLUGINS_BAD" >&5 +$as_echo_n "checking for GST_PLUGINS_BAD... " >&6; } + +if test -n "$GST_PLUGINS_BAD_CFLAGS"; then + pkg_cv_GST_PLUGINS_BAD_CFLAGS="$GST_PLUGINS_BAD_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-plugins-bad-1.0 >= 1.0.2\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gstreamer-plugins-bad-1.0 >= 1.0.2") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GST_PLUGINS_BAD_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-plugins-bad-1.0 >= 1.0.2" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$GST_PLUGINS_BAD_LIBS"; then + pkg_cv_GST_PLUGINS_BAD_LIBS="$GST_PLUGINS_BAD_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-plugins-bad-1.0 >= 1.0.2\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gstreamer-plugins-bad-1.0 >= 1.0.2") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GST_PLUGINS_BAD_LIBS=`$PKG_CONFIG --libs "gstreamer-plugins-bad-1.0 >= 1.0.2" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + GST_PLUGINS_BAD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gstreamer-plugins-bad-1.0 >= 1.0.2" 2>&1` + else + GST_PLUGINS_BAD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gstreamer-plugins-bad-1.0 >= 1.0.2" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GST_PLUGINS_BAD_PKG_ERRORS" >&5 + + as_fn_error $? "Package requirements (gstreamer-plugins-bad-1.0 >= 1.0.2) were not met: + +$GST_PLUGINS_BAD_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables GST_PLUGINS_BAD_CFLAGS +and GST_PLUGINS_BAD_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables GST_PLUGINS_BAD_CFLAGS +and GST_PLUGINS_BAD_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5; } +else + GST_PLUGINS_BAD_CFLAGS=$pkg_cv_GST_PLUGINS_BAD_CFLAGS + GST_PLUGINS_BAD_LIBS=$pkg_cv_GST_PLUGINS_BAD_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +fi + +set -- scaletempo +for bad_element in scaletempo +do + { $as_echo "$as_me:${as_lineno-$LINENO}: checking GStreamer 1.0 $bad_element element" >&5 +$as_echo_n "checking GStreamer 1.0 $bad_element element... " >&6; } + if $gst10_inspect $bad_element >/dev/null 2>/dev/null; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + as_fn_error $? " + Cannot find required GStreamer-1.0 plugin '$1'. + It should be part of gst-plugins-bad. Please install it. + " "$LINENO" 5 + fi + shift; done { $as_echo "$as_me:${as_lineno-$LINENO}: checking which smclient backend to use" >&5 @@ -18726,6 +19083,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SMCLIENT_CFLAGS=`$PKG_CONFIG --cflags "sm ice" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -18742,6 +19100,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SMCLIENT_LIBS=`$PKG_CONFIG --libs "sm ice" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -18761,9 +19120,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SMCLIENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "sm ice" 2>&1` + SMCLIENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "sm ice" 2>&1` else - SMCLIENT_PKG_ERRORS=`$PKG_CONFIG --print-errors "sm ice" 2>&1` + SMCLIENT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "sm ice" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$SMCLIENT_PKG_ERRORS" >&5 @@ -18778,7 +19137,6 @@ Alternatively, you may set the environment variables SMCLIENT_CFLAGS and SMCLIENT_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 - elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -18794,7 +19152,6 @@ To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } - else SMCLIENT_CFLAGS=$pkg_cv_SMCLIENT_CFLAGS SMCLIENT_LIBS=$pkg_cv_SMCLIENT_LIBS @@ -18863,302 +19220,296 @@ +# ================================================================ +# Python plugins +# ================================================================ +# We don't Python or PyGObject at compile time, but they are needed for the Python plugins at runtime, so we check anyway. +# We need pylint for `make check`. -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DEPENDENCY" >&5 -$as_echo_n "checking for DEPENDENCY... " >&6; } - -if test -n "$DEPENDENCY_CFLAGS"; then - pkg_cv_DEPENDENCY_CFLAGS="$DEPENDENCY_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" - glib-2.0 >= \$GLIB_REQS - gio-2.0 >= \$GIO_REQS - gtk+-3.0 >= \$GTK_REQS - gdk-x11-3.0 >= \$GTK_REQS - gmodule-2.0 - totem-plparser >= \$TOTEM_PLPARSER_REQS - gstreamer-tag-0.10 >= 0.10.26 - clutter-gtk-1.0 >= \$CLUTTER_GTK_REQS - cairo\""; } >&5 - ($PKG_CONFIG --exists --print-errors " - glib-2.0 >= $GLIB_REQS - gio-2.0 >= $GIO_REQS - gtk+-3.0 >= $GTK_REQS - gdk-x11-3.0 >= $GTK_REQS - gmodule-2.0 - totem-plparser >= $TOTEM_PLPARSER_REQS - gstreamer-tag-0.10 >= 0.10.26 - clutter-gtk-1.0 >= $CLUTTER_GTK_REQS - cairo") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_DEPENDENCY_CFLAGS=`$PKG_CONFIG --cflags " - glib-2.0 >= $GLIB_REQS - gio-2.0 >= $GIO_REQS - gtk+-3.0 >= $GTK_REQS - gdk-x11-3.0 >= $GTK_REQS - gmodule-2.0 - totem-plparser >= $TOTEM_PLPARSER_REQS - gstreamer-tag-0.10 >= 0.10.26 - clutter-gtk-1.0 >= $CLUTTER_GTK_REQS - cairo" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$DEPENDENCY_LIBS"; then - pkg_cv_DEPENDENCY_LIBS="$DEPENDENCY_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" - glib-2.0 >= \$GLIB_REQS - gio-2.0 >= \$GIO_REQS - gtk+-3.0 >= \$GTK_REQS - gdk-x11-3.0 >= \$GTK_REQS - gmodule-2.0 - totem-plparser >= \$TOTEM_PLPARSER_REQS - gstreamer-tag-0.10 >= 0.10.26 - clutter-gtk-1.0 >= \$CLUTTER_GTK_REQS - cairo\""; } >&5 - ($PKG_CONFIG --exists --print-errors " - glib-2.0 >= $GLIB_REQS - gio-2.0 >= $GIO_REQS - gtk+-3.0 >= $GTK_REQS - gdk-x11-3.0 >= $GTK_REQS - gmodule-2.0 - totem-plparser >= $TOTEM_PLPARSER_REQS - gstreamer-tag-0.10 >= 0.10.26 - clutter-gtk-1.0 >= $CLUTTER_GTK_REQS - cairo") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_DEPENDENCY_LIBS=`$PKG_CONFIG --libs " - glib-2.0 >= $GLIB_REQS - gio-2.0 >= $GIO_REQS - gtk+-3.0 >= $GTK_REQS - gdk-x11-3.0 >= $GTK_REQS - gmodule-2.0 - totem-plparser >= $TOTEM_PLPARSER_REQS - gstreamer-tag-0.10 >= 0.10.26 - clutter-gtk-1.0 >= $CLUTTER_GTK_REQS - cairo" 2>/dev/null` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Python plugin support is requested" >&5 +$as_echo_n "checking whether Python plugin support is requested... " >&6; } +# Check whether --enable-python was given. +if test "${enable_python+set}" = set; then : + enableval=$enable_python; enable_python=$enableval else - pkg_failed=yes -fi - else - pkg_failed=untried + enable_python=autodetect fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_python" >&5 +$as_echo "$enable_python" >&6; } +have_python=no +have_pygobject=no +PYTHON_MODULES="" -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +# Test for the Python run time and PyGObject. Test for pylint as well, for `make check`. +if test "x$enable_python" != "xno"; then -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - DEPENDENCY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " - glib-2.0 >= $GLIB_REQS - gio-2.0 >= $GIO_REQS - gtk+-3.0 >= $GTK_REQS - gdk-x11-3.0 >= $GTK_REQS - gmodule-2.0 - totem-plparser >= $TOTEM_PLPARSER_REQS - gstreamer-tag-0.10 >= 0.10.26 - clutter-gtk-1.0 >= $CLUTTER_GTK_REQS - cairo" 2>&1` - else - DEPENDENCY_PKG_ERRORS=`$PKG_CONFIG --print-errors " - glib-2.0 >= $GLIB_REQS - gio-2.0 >= $GIO_REQS - gtk+-3.0 >= $GTK_REQS - gdk-x11-3.0 >= $GTK_REQS - gmodule-2.0 - totem-plparser >= $TOTEM_PLPARSER_REQS - gstreamer-tag-0.10 >= 0.10.26 - clutter-gtk-1.0 >= $CLUTTER_GTK_REQS - cairo" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$DEPENDENCY_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements ( - glib-2.0 >= $GLIB_REQS - gio-2.0 >= $GIO_REQS - gtk+-3.0 >= $GTK_REQS - gdk-x11-3.0 >= $GTK_REQS - gmodule-2.0 - totem-plparser >= $TOTEM_PLPARSER_REQS - gstreamer-tag-0.10 >= 0.10.26 - clutter-gtk-1.0 >= $CLUTTER_GTK_REQS - cairo) were not met: -$DEPENDENCY_PKG_ERRORS -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. -Alternatively, you may set the environment variables DEPENDENCY_CFLAGS -and DEPENDENCY_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details." "$LINENO" 5 -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + if test -n "$PYTHON"; then + # If the user set $PYTHON, use it and don't search something else. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version is >= $PYTHON_REQS" >&5 +$as_echo_n "checking whether $PYTHON version is >= $PYTHON_REQS... " >&6; } + prog="import sys +# split strings by '.' and convert to numeric. Append some zeros +# because we need at least 4 digits for the hex conversion. +# map returns an iterator in Python 3.0 and a list in 2.x +minver = list(map(int, '$PYTHON_REQS'.split('.'))) + [0, 0, 0] +minverhex = 0 +# xrange is not present in Python 3.0 and range returns an iterator +for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i] +sys.exit(sys.hexversion < minverhex)" + if { echo "$as_me:$LINENO: $PYTHON -c "$prog"" >&5 + ($PYTHON -c "$prog") >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables DEPENDENCY_CFLAGS -and DEPENDENCY_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see . -See \`config.log' for more details" "$LINENO" 5; } + as_fn_error $? "Python interpreter is too old" "$LINENO" 5 +fi + am_display_PYTHON=$PYTHON + else + # Otherwise, try each interpreter until we find one that satisfies + # VERSION. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= $PYTHON_REQS" >&5 +$as_echo_n "checking for a Python interpreter with version >= $PYTHON_REQS... " >&6; } +if ${am_cv_pathless_PYTHON+:} false; then : + $as_echo_n "(cached) " >&6 +else + for am_cv_pathless_PYTHON in python python2 python3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do + test "$am_cv_pathless_PYTHON" = none && break + prog="import sys +# split strings by '.' and convert to numeric. Append some zeros +# because we need at least 4 digits for the hex conversion. +# map returns an iterator in Python 3.0 and a list in 2.x +minver = list(map(int, '$PYTHON_REQS'.split('.'))) + [0, 0, 0] +minverhex = 0 +# xrange is not present in Python 3.0 and range returns an iterator +for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i] +sys.exit(sys.hexversion < minverhex)" + if { echo "$as_me:$LINENO: $am_cv_pathless_PYTHON -c "$prog"" >&5 + ($am_cv_pathless_PYTHON -c "$prog") >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then : + break +fi + done +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_pathless_PYTHON" >&5 +$as_echo "$am_cv_pathless_PYTHON" >&6; } + # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON. + if test "$am_cv_pathless_PYTHON" = none; then + PYTHON=: + else + # Extract the first word of "$am_cv_pathless_PYTHON", so it can be a program name with args. +set dummy $am_cv_pathless_PYTHON; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PYTHON+:} false; then : + $as_echo_n "(cached) " >&6 else - DEPENDENCY_CFLAGS=$pkg_cv_DEPENDENCY_CFLAGS - DEPENDENCY_LIBS=$pkg_cv_DEPENDENCY_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + case $PYTHON in + [\\/]* | ?:[\\/]*) + ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + ;; +esac +fi +PYTHON=$ac_cv_path_PYTHON +if test -n "$PYTHON"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5 +$as_echo "$PYTHON" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MM" >&5 -$as_echo_n "checking for MM... " >&6; } + fi + am_display_PYTHON=$am_cv_pathless_PYTHON + fi -if test -n "$MM_CFLAGS"; then - pkg_cv_MM_CFLAGS="$MM_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$MM\""; } >&5 - ($PKG_CONFIG --exists --print-errors "$MM") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_MM_CFLAGS=`$PKG_CONFIG --cflags "$MM" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$MM_LIBS"; then - pkg_cv_MM_LIBS="$MM_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$MM\""; } >&5 - ($PKG_CONFIG --exists --print-errors "$MM") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_MM_LIBS=`$PKG_CONFIG --libs "$MM" 2>/dev/null` + + if test "$PYTHON" = :; then + have_python=no + else + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5 +$as_echo_n "checking for $am_display_PYTHON version... " >&6; } +if ${am_cv_python_version+:} false; then : + $as_echo_n "(cached) " >&6 else - pkg_failed=yes -fi - else - pkg_failed=untried + am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"` fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5 +$as_echo "$am_cv_python_version" >&6; } + PYTHON_VERSION=$am_cv_python_version -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + PYTHON_PREFIX='${prefix}' -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes + PYTHON_EXEC_PREFIX='${exec_prefix}' + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5 +$as_echo_n "checking for $am_display_PYTHON platform... " >&6; } +if ${am_cv_python_platform+:} false; then : + $as_echo_n "(cached) " >&6 else - _pkg_short_errors_supported=no + am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"` fi - if test $_pkg_short_errors_supported = yes; then - MM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$MM" 2>&1` - else - MM_PKG_ERRORS=`$PKG_CONFIG --print-errors "$MM" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$MM_PKG_ERRORS" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5 +$as_echo "$am_cv_python_platform" >&6; } + PYTHON_PLATFORM=$am_cv_python_platform - as_fn_error $? "Package requirements ($MM) were not met: -$MM_PKG_ERRORS -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. -Alternatively, you may set the environment variables MM_CFLAGS -and MM_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details." "$LINENO" 5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5 +$as_echo_n "checking for $am_display_PYTHON script directory... " >&6; } +if ${am_cv_python_pythondir+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "x$prefix" = xNONE + then + am_py_prefix=$ac_default_prefix + else + am_py_prefix=$prefix + fi + am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null` + case $am_cv_python_pythondir in + $am_py_prefix*) + am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` + am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"` + ;; + *) + case $am_py_prefix in + /usr|/System*) ;; + *) + am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages + ;; + esac + ;; + esac -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5 +$as_echo "$am_cv_python_pythondir" >&6; } + pythondir=$am_cv_python_pythondir -Alternatively, you may set the environment variables MM_CFLAGS -and MM_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -To get pkg-config, see . -See \`config.log' for more details" "$LINENO" 5; } + pkgpythondir=\${pythondir}/$PACKAGE + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5 +$as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; } +if ${am_cv_python_pyexecdir+:} false; then : + $as_echo_n "(cached) " >&6 else - MM_CFLAGS=$pkg_cv_MM_CFLAGS - MM_LIBS=$pkg_cv_MM_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + if test "x$exec_prefix" = xNONE + then + am_py_exec_prefix=$am_py_prefix + else + am_py_exec_prefix=$exec_prefix + fi + am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null` + case $am_cv_python_pyexecdir in + $am_py_exec_prefix*) + am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` + am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"` + ;; + *) + case $am_py_exec_prefix in + /usr|/System*) ;; + *) + am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages + ;; + esac + ;; + esac fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5 +$as_echo "$am_cv_python_pyexecdir" >&6; } + pyexecdir=$am_cv_python_pyexecdir + + + + pkgpyexecdir=\${pyexecdir}/$PACKAGE + have_python=yes + fi + + + if test "x$PYTHON" = "x:"; then + have_python=no + fi + + PYTHON_MODULES="pygobject-3.0 >= $PYGOBJECT_REQS" + pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5 -$as_echo_n "checking for GTK... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PYGOBJECT" >&5 +$as_echo_n "checking for PYGOBJECT... " >&6; } -if test -n "$GTK_CFLAGS"; then - pkg_cv_GTK_CFLAGS="$GTK_CFLAGS" +if test -n "$PYGOBJECT_CFLAGS"; then + pkg_cv_PYGOBJECT_CFLAGS="$PYGOBJECT_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 gthread-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-3.0 gthread-2.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$PYTHON_MODULES\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$PYTHON_MODULES") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 gthread-2.0" 2>/dev/null` + pkg_cv_PYGOBJECT_CFLAGS=`$PKG_CONFIG --cflags "$PYTHON_MODULES" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi else pkg_failed=untried fi -if test -n "$GTK_LIBS"; then - pkg_cv_GTK_LIBS="$GTK_LIBS" +if test -n "$PYGOBJECT_LIBS"; then + pkg_cv_PYGOBJECT_LIBS="$PYGOBJECT_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 gthread-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-3.0 gthread-2.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$PYTHON_MODULES\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$PYTHON_MODULES") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 gthread-2.0" 2>/dev/null` + pkg_cv_PYGOBJECT_LIBS=`$PKG_CONFIG --libs "$PYTHON_MODULES" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -19178,388 +19529,218 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-3.0 gthread-2.0" 2>&1` + PYGOBJECT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$PYTHON_MODULES" 2>&1` else - GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-3.0 gthread-2.0" 2>&1` + PYGOBJECT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$PYTHON_MODULES" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$GTK_PKG_ERRORS" >&5 - - as_fn_error $? "Package requirements (gtk+-3.0 gthread-2.0) were not met: - -$GTK_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -Alternatively, you may set the environment variables GTK_CFLAGS -and GTK_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details." "$LINENO" 5 + echo "$PYGOBJECT_PKG_ERRORS" >&5 + have_pygobject=no elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables GTK_CFLAGS -and GTK_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see . -See \`config.log' for more details" "$LINENO" 5; } - + have_pygobject=no else - GTK_CFLAGS=$pkg_cv_GTK_CFLAGS - GTK_LIBS=$pkg_cv_GTK_LIBS + PYGOBJECT_CFLAGS=$pkg_cv_PYGOBJECT_CFLAGS + PYGOBJECT_LIBS=$pkg_cv_PYGOBJECT_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - -fi -GTK_LIBS="$GTK_LIBS $EXTRA_BACKEND_LIBS" - - - - -if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" - \$ISO_CODES - gnome-icon-theme >= \$GNOMEICON_REQS\""; } >&5 - ($PKG_CONFIG --exists --print-errors " - $ISO_CODES - gnome-icon-theme >= $GNOMEICON_REQS") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - : -fi - -have_x11=no -gdk_targets=$(pkg-config --variable=targets gtk+-3.0) -for gdk_target in $gdk_targets; do - if test x$gdk_target = xx11; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5 -$as_echo_n "checking for X... " >&6; } - - -# Check whether --with-x was given. -if test "${with_x+set}" = set; then : - withval=$with_x; + have_pygobject=yes fi - -# $have_x is `yes', `no', `disabled', or empty when we do not yet know. -if test "x$with_x" = xno; then - # The user explicitly disabled X. - have_x=disabled -else - case $x_includes,$x_libraries in #( - *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #( - *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then : + # Extract the first word of "pylint", so it can be a program name with args. +set dummy pylint; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PYLINT+:} false; then : $as_echo_n "(cached) " >&6 else - # One or both of the vars are not set, and there is no cached value. -ac_x_includes=no ac_x_libraries=no -rm -f -r conftest.dir -if mkdir conftest.dir; then - cd conftest.dir - cat >Imakefile <<'_ACEOF' -incroot: - @echo incroot='${INCROOT}' -usrlibdir: - @echo usrlibdir='${USRLIBDIR}' -libdir: - @echo libdir='${LIBDIR}' -_ACEOF - if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then - # GNU make sometimes prints "make[1]: Entering ...", which would confuse us. - for ac_var in incroot usrlibdir libdir; do - eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" - done - # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. - for ac_extension in a so sl dylib la dll; do - if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && - test -f "$ac_im_libdir/libX11.$ac_extension"; then - ac_im_usrlibdir=$ac_im_libdir; break - fi - done - # Screen out bogus values from the imake configuration. They are - # bogus both because they are the default anyway, and because - # using them would break gcc on systems where it needs fixed includes. - case $ac_im_incroot in - /usr/include) ac_x_includes= ;; - *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; - esac - case $ac_im_usrlibdir in - /usr/lib | /usr/lib64 | /lib | /lib64) ;; - *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; - esac - fi - cd .. - rm -f -r conftest.dir -fi - -# Standard set of common directories for X headers. -# Check X11 before X11Rn because it is often a symlink to the current release. -ac_x_header_dirs=' -/usr/X11/include -/usr/X11R7/include -/usr/X11R6/include -/usr/X11R5/include -/usr/X11R4/include - -/usr/include/X11 -/usr/include/X11R7 -/usr/include/X11R6 -/usr/include/X11R5 -/usr/include/X11R4 - -/usr/local/X11/include -/usr/local/X11R7/include -/usr/local/X11R6/include -/usr/local/X11R5/include -/usr/local/X11R4/include - -/usr/local/include/X11 -/usr/local/include/X11R7 -/usr/local/include/X11R6 -/usr/local/include/X11R5 -/usr/local/include/X11R4 - -/usr/X386/include -/usr/x386/include -/usr/XFree86/include/X11 - -/usr/include -/usr/local/include -/usr/unsupported/include -/usr/athena/include -/usr/local/x11r5/include -/usr/lpp/Xamples/include - -/usr/openwin/include -/usr/openwin/share/include' - -if test "$ac_x_includes" = no; then - # Guess where to find include files, by looking for Xlib.h. - # First, try using that file with no special directory specified. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - # We can compile using X headers with no special include directory. -ac_x_includes= -else - for ac_dir in $ac_x_header_dirs; do - if test -r "$ac_dir/X11/Xlib.h"; then - ac_x_includes=$ac_dir - break + case $PYLINT in + [\\/]* | ?:[\\/]*) + ac_cv_path_PYLINT="$PYLINT" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PYLINT="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 fi done -fi -rm -f conftest.err conftest.i conftest.$ac_ext -fi # $ac_x_includes = no - -if test "$ac_x_libraries" = no; then - # Check for the libraries. - # See if we find them without any special options. - # Don't add to $LIBS permanently. - ac_save_LIBS=$LIBS - LIBS="-lX11 $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -XrmInitialize () - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - LIBS=$ac_save_LIBS -# We can link X programs with no special library path. -ac_x_libraries= -else - LIBS=$ac_save_LIBS -for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` -do - # Don't even attempt the hair of trying to link an X program! - for ac_extension in a so sl dylib la dll; do - if test -r "$ac_dir/libX11.$ac_extension"; then - ac_x_libraries=$ac_dir - break 2 - fi done -done -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi # $ac_x_libraries = no +IFS=$as_save_IFS -case $ac_x_includes,$ac_x_libraries in #( - no,* | *,no | *\'*) - # Didn't find X, or a directory has "'" in its name. - ac_cv_have_x="have_x=no";; #( - *) - # Record where we found X for the cache. - ac_cv_have_x="have_x=yes\ - ac_x_includes='$ac_x_includes'\ - ac_x_libraries='$ac_x_libraries'" + test -z "$ac_cv_path_PYLINT" && ac_cv_path_PYLINT="no" + ;; esac fi -;; #( - *) have_x=yes;; - esac - eval "$ac_cv_have_x" -fi # $with_x != no - -if test "$have_x" != yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5 -$as_echo "$have_x" >&6; } - no_x=yes +PYLINT=$ac_cv_path_PYLINT +if test -n "$PYLINT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYLINT" >&5 +$as_echo "$PYLINT" >&6; } else - # If each of the values was on the command line, it overrides each guess. - test "x$x_includes" = xNONE && x_includes=$ac_x_includes - test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries - # Update the cache value to reflect the command line values. - ac_cv_have_x="have_x=yes\ - ac_x_includes='$x_includes'\ - ac_x_libraries='$x_libraries'" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: libraries $x_libraries, headers $x_includes" >&5 -$as_echo "libraries $x_libraries, headers $x_includes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - have_x11=yes - - if test x"$x_includes" != x"NONE" && test -n "$x_includes" ; then - X_INCLUDES=-I`echo $x_includes | sed -e "s/:/ -I/g"` - fi - if test x"$x_libraries" != x"NONE" && test -n "$x_libraries" ; then - X_LIBRARIES=-L`echo $x_libraries | sed -e "s/:/ -L/g"` - fi - CFLAGS="$X_INCLUDES $CFLAGS" - LIBS="$X_LIBRARIES $LIBS" - - XTEST_LIBS="" - enable_xtest=no - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XTestFakeKeyEvent in -lXtst" >&5 -$as_echo_n "checking for XTestFakeKeyEvent in -lXtst... " >&6; } -if ${ac_cv_lib_Xtst_XTestFakeKeyEvent+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lXtst $X_LIBRARIES $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char XTestFakeKeyEvent (); -int -main () -{ -return XTestFakeKeyEvent (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_Xtst_XTestFakeKeyEvent=yes -else - ac_cv_lib_Xtst_XTestFakeKeyEvent=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + +# Output the results of the Python checks +if test "x$have_python" != "xyes" -o "x$have_pygobject" != "xyes" -o "x$PYLINT" = "xno"; then + if test "x$enable_python" = "xyes"; then + as_fn_error $? "python >= $PYTHON_REQS, $PYTHON_MODULES or pylint not found" "$LINENO" 5 + elif test "x$enable_python" = "xautodetect"; then + enable_python=no + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: python >= $PYTHON_REQS, $PYTHON_MODULES or pylint not found; disabling Python support" >&5 +$as_echo "$as_me: WARNING: python >= $PYTHON_REQS, $PYTHON_MODULES or pylint not found; disabling Python support" >&2;} + fi +elif test "x$enable_python" != "xno"; then + enable_python=yes fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xtst_XTestFakeKeyEvent" >&5 -$as_echo "$ac_cv_lib_Xtst_XTestFakeKeyEvent" >&6; } -if test "x$ac_cv_lib_Xtst_XTestFakeKeyEvent" = xyes; then : - XTEST_LIBS="-lX11 -lXtst $X_LIBRARIES" - enable_xtest=yes - -$as_echo "#define HAVE_XTEST 1" >>confdefs.h + if test "x$enable_python" = "xyes"; then + ENABLE_PYTHON_TRUE= + ENABLE_PYTHON_FALSE='#' +else + ENABLE_PYTHON_TRUE='#' + ENABLE_PYTHON_FALSE= fi +# ================================================================ +# Player requirements +#================================================================ - X_LIBS="" - X_LIBS="$X_LIBRARIES -lX11" +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PLAYER" >&5 +$as_echo_n "checking for PLAYER... " >&6; } +if test -n "$PLAYER_CFLAGS"; then + pkg_cv_PLAYER_CFLAGS="$PLAYER_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$BACKEND_MODULES glib-2.0 >= \$GLIB_REQS gio-2.0 >= \$GIO_REQS gtk+-3.0 >= \$GTK_REQS gdk-x11-3.0 >= \$GTK_REQS gmodule-2.0 totem-plparser >= \$TOTEM_PLPARSER_REQS libpeas-1.0 >= \$PEAS_REQS libpeas-gtk-1.0 >= \$PEAS_REQS \$PYTHON_MODULES\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$BACKEND_MODULES glib-2.0 >= $GLIB_REQS gio-2.0 >= $GIO_REQS gtk+-3.0 >= $GTK_REQS gdk-x11-3.0 >= $GTK_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS libpeas-1.0 >= $PEAS_REQS libpeas-gtk-1.0 >= $PEAS_REQS $PYTHON_MODULES") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_PLAYER_CFLAGS=`$PKG_CONFIG --cflags "$BACKEND_MODULES glib-2.0 >= $GLIB_REQS gio-2.0 >= $GIO_REQS gtk+-3.0 >= $GTK_REQS gdk-x11-3.0 >= $GTK_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS libpeas-1.0 >= $PEAS_REQS libpeas-gtk-1.0 >= $PEAS_REQS $PYTHON_MODULES" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$PLAYER_LIBS"; then + pkg_cv_PLAYER_LIBS="$PLAYER_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$BACKEND_MODULES glib-2.0 >= \$GLIB_REQS gio-2.0 >= \$GIO_REQS gtk+-3.0 >= \$GTK_REQS gdk-x11-3.0 >= \$GTK_REQS gmodule-2.0 totem-plparser >= \$TOTEM_PLPARSER_REQS libpeas-1.0 >= \$PEAS_REQS libpeas-gtk-1.0 >= \$PEAS_REQS \$PYTHON_MODULES\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$BACKEND_MODULES glib-2.0 >= $GLIB_REQS gio-2.0 >= $GIO_REQS gtk+-3.0 >= $GTK_REQS gdk-x11-3.0 >= $GTK_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS libpeas-1.0 >= $PEAS_REQS libpeas-gtk-1.0 >= $PEAS_REQS $PYTHON_MODULES") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_PLAYER_LIBS=`$PKG_CONFIG --libs "$BACKEND_MODULES glib-2.0 >= $GLIB_REQS gio-2.0 >= $GIO_REQS gtk+-3.0 >= $GTK_REQS gdk-x11-3.0 >= $GTK_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS libpeas-1.0 >= $PEAS_REQS libpeas-gtk-1.0 >= $PEAS_REQS $PYTHON_MODULES" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi - have_xfree=no - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - #include - int main(int argc,char **argv) { - return 0; - } -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - have_xfree=yes +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11 XFree86 headers" >&5 -$as_echo_n "checking for X11 XFree86 headers... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_xfree" >&5 -$as_echo "$have_xfree" >&6; } - if test x"$have_xfree" = "xyes" ; then + if test $_pkg_short_errors_supported = yes; then + PLAYER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$BACKEND_MODULES glib-2.0 >= $GLIB_REQS gio-2.0 >= $GIO_REQS gtk+-3.0 >= $GTK_REQS gdk-x11-3.0 >= $GTK_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS libpeas-1.0 >= $PEAS_REQS libpeas-gtk-1.0 >= $PEAS_REQS $PYTHON_MODULES" 2>&1` + else + PLAYER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$BACKEND_MODULES glib-2.0 >= $GLIB_REQS gio-2.0 >= $GIO_REQS gtk+-3.0 >= $GTK_REQS gdk-x11-3.0 >= $GTK_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS libpeas-1.0 >= $PEAS_REQS libpeas-gtk-1.0 >= $PEAS_REQS $PYTHON_MODULES" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$PLAYER_PKG_ERRORS" >&5 -$as_echo "#define HAVE_XFREE 1" >>confdefs.h + as_fn_error $? "Package requirements ($BACKEND_MODULES glib-2.0 >= $GLIB_REQS gio-2.0 >= $GIO_REQS gtk+-3.0 >= $GTK_REQS gdk-x11-3.0 >= $GTK_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS libpeas-1.0 >= $PEAS_REQS libpeas-gtk-1.0 >= $PEAS_REQS $PYTHON_MODULES) were not met: - fi +$PLAYER_PKG_ERRORS - break - fi -done +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables PLAYER_CFLAGS +and PLAYER_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables PLAYER_CFLAGS +and PLAYER_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5; } +else + PLAYER_CFLAGS=$pkg_cv_PLAYER_CFLAGS + PLAYER_LIBS=$pkg_cv_PLAYER_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +fi pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PEAS" >&5 -$as_echo_n "checking for PEAS... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBPLAYER" >&5 +$as_echo_n "checking for LIBPLAYER... " >&6; } -if test -n "$PEAS_CFLAGS"; then - pkg_cv_PEAS_CFLAGS="$PEAS_CFLAGS" +if test -n "$LIBPLAYER_CFLAGS"; then + pkg_cv_LIBPLAYER_CFLAGS="$LIBPLAYER_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpeas-1.0 >= \$PEAS_REQS\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libpeas-1.0 >= $PEAS_REQS") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQS gio-2.0 >= \$GIO_REQS gtk+-3.0 >= \$GTK_REQS gdk-x11-3.0 >= \$GTK_REQS clutter-gtk-1.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQS gio-2.0 >= $GIO_REQS gtk+-3.0 >= $GTK_REQS gdk-x11-3.0 >= $GTK_REQS clutter-gtk-1.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_PEAS_CFLAGS=`$PKG_CONFIG --cflags "libpeas-1.0 >= $PEAS_REQS" 2>/dev/null` + pkg_cv_LIBPLAYER_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQS gio-2.0 >= $GIO_REQS gtk+-3.0 >= $GTK_REQS gdk-x11-3.0 >= $GTK_REQS clutter-gtk-1.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi else pkg_failed=untried fi -if test -n "$PEAS_LIBS"; then - pkg_cv_PEAS_LIBS="$PEAS_LIBS" +if test -n "$LIBPLAYER_LIBS"; then + pkg_cv_LIBPLAYER_LIBS="$LIBPLAYER_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpeas-1.0 >= \$PEAS_REQS\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libpeas-1.0 >= $PEAS_REQS") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQS gio-2.0 >= \$GIO_REQS gtk+-3.0 >= \$GTK_REQS gdk-x11-3.0 >= \$GTK_REQS clutter-gtk-1.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQS gio-2.0 >= $GIO_REQS gtk+-3.0 >= $GTK_REQS gdk-x11-3.0 >= $GTK_REQS clutter-gtk-1.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_PEAS_LIBS=`$PKG_CONFIG --libs "libpeas-1.0 >= $PEAS_REQS" 2>/dev/null` + pkg_cv_LIBPLAYER_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQS gio-2.0 >= $GIO_REQS gtk+-3.0 >= $GTK_REQS gdk-x11-3.0 >= $GTK_REQS clutter-gtk-1.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -19579,24 +19760,23 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - PEAS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libpeas-1.0 >= $PEAS_REQS" 2>&1` + LIBPLAYER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= $GLIB_REQS gio-2.0 >= $GIO_REQS gtk+-3.0 >= $GTK_REQS gdk-x11-3.0 >= $GTK_REQS clutter-gtk-1.0" 2>&1` else - PEAS_PKG_ERRORS=`$PKG_CONFIG --print-errors "libpeas-1.0 >= $PEAS_REQS" 2>&1` + LIBPLAYER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= $GLIB_REQS gio-2.0 >= $GIO_REQS gtk+-3.0 >= $GTK_REQS gdk-x11-3.0 >= $GTK_REQS clutter-gtk-1.0" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$PEAS_PKG_ERRORS" >&5 + echo "$LIBPLAYER_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (libpeas-1.0 >= $PEAS_REQS) were not met: + as_fn_error $? "Package requirements (glib-2.0 >= $GLIB_REQS gio-2.0 >= $GIO_REQS gtk+-3.0 >= $GTK_REQS gdk-x11-3.0 >= $GTK_REQS clutter-gtk-1.0) were not met: -$PEAS_PKG_ERRORS +$LIBPLAYER_PKG_ERRORS Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables PEAS_CFLAGS -and PEAS_LIBS to avoid the need to call pkg-config. +Alternatively, you may set the environment variables LIBPLAYER_CFLAGS +and LIBPLAYER_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 - elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -19606,51 +19786,52 @@ is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables PEAS_CFLAGS -and PEAS_LIBS to avoid the need to call pkg-config. +Alternatively, you may set the environment variables LIBPLAYER_CFLAGS +and LIBPLAYER_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } - else - PEAS_CFLAGS=$pkg_cv_PEAS_CFLAGS - PEAS_LIBS=$pkg_cv_PEAS_LIBS + LIBPLAYER_CFLAGS=$pkg_cv_LIBPLAYER_CFLAGS + LIBPLAYER_LIBS=$pkg_cv_LIBPLAYER_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } fi pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PEASGTK" >&5 -$as_echo_n "checking for PEASGTK... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for HELPER" >&5 +$as_echo_n "checking for HELPER... " >&6; } -if test -n "$PEASGTK_CFLAGS"; then - pkg_cv_PEASGTK_CFLAGS="$PEASGTK_CFLAGS" +if test -n "$HELPER_CFLAGS"; then + pkg_cv_HELPER_CFLAGS="$HELPER_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpeas-gtk-1.0 >= \$PEAS_REQS\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libpeas-gtk-1.0 >= $PEAS_REQS") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-1.0 gstreamer-tag-1.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gstreamer-1.0 gstreamer-tag-1.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_PEASGTK_CFLAGS=`$PKG_CONFIG --cflags "libpeas-gtk-1.0 >= $PEAS_REQS" 2>/dev/null` + pkg_cv_HELPER_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-1.0 gstreamer-tag-1.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi else pkg_failed=untried fi -if test -n "$PEASGTK_LIBS"; then - pkg_cv_PEASGTK_LIBS="$PEASGTK_LIBS" +if test -n "$HELPER_LIBS"; then + pkg_cv_HELPER_LIBS="$HELPER_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpeas-gtk-1.0 >= \$PEAS_REQS\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libpeas-gtk-1.0 >= $PEAS_REQS") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-1.0 gstreamer-tag-1.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gstreamer-1.0 gstreamer-tag-1.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_PEASGTK_LIBS=`$PKG_CONFIG --libs "libpeas-gtk-1.0 >= $PEAS_REQS" 2>/dev/null` + pkg_cv_HELPER_LIBS=`$PKG_CONFIG --libs "gstreamer-1.0 gstreamer-tag-1.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -19670,24 +19851,23 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - PEASGTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libpeas-gtk-1.0 >= $PEAS_REQS" 2>&1` + HELPER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gstreamer-1.0 gstreamer-tag-1.0" 2>&1` else - PEASGTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "libpeas-gtk-1.0 >= $PEAS_REQS" 2>&1` + HELPER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gstreamer-1.0 gstreamer-tag-1.0" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$PEASGTK_PKG_ERRORS" >&5 + echo "$HELPER_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (libpeas-gtk-1.0 >= $PEAS_REQS) were not met: + as_fn_error $? "Package requirements (gstreamer-1.0 gstreamer-tag-1.0) were not met: -$PEASGTK_PKG_ERRORS +$HELPER_PKG_ERRORS Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables PEASGTK_CFLAGS -and PEASGTK_LIBS to avoid the need to call pkg-config. +Alternatively, you may set the environment variables HELPER_CFLAGS +and HELPER_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 - elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -19697,305 +19877,325 @@ is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables PEASGTK_CFLAGS -and PEASGTK_LIBS to avoid the need to call pkg-config. +Alternatively, you may set the environment variables HELPER_CFLAGS +and HELPER_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } - else - PEASGTK_CFLAGS=$pkg_cv_PEASGTK_CFLAGS - PEASGTK_LIBS=$pkg_cv_PEASGTK_LIBS + HELPER_CFLAGS=$pkg_cv_HELPER_CFLAGS + HELPER_LIBS=$pkg_cv_HELPER_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } fi -# ================================================================ -# Python plugins -# ================================================================ -# We don't Python or PyGObject at compile time, but they are needed for the Python plugins at runtime, so we check anyway. -# We need pylint for `make check`. +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIME_HELPER" >&5 +$as_echo_n "checking for TIME_HELPER... " >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Python plugin support is requested" >&5 -$as_echo_n "checking whether Python plugin support is requested... " >&6; } -# Check whether --enable-python was given. -if test "${enable_python+set}" = set; then : - enableval=$enable_python; enable_python=$enableval +if test -n "$TIME_HELPER_CFLAGS"; then + pkg_cv_TIME_HELPER_CFLAGS="$TIME_HELPER_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_TIME_HELPER_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else - enable_python=autodetect + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$TIME_HELPER_LIBS"; then + pkg_cv_TIME_HELPER_LIBS="$TIME_HELPER_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_TIME_HELPER_LIBS=`$PKG_CONFIG --libs "glib-2.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_python" >&5 -$as_echo "$enable_python" >&6; } -have_python=no -have_pygobject=no -# Test for the Python run time and PyGObject. Test for pylint as well, for `make check`. -if test "x$enable_python" != "xno"; then +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + TIME_HELPER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0" 2>&1` + else + TIME_HELPER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$TIME_HELPER_PKG_ERRORS" >&5 + as_fn_error $? "Package requirements (glib-2.0) were not met: +$TIME_HELPER_PKG_ERRORS +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. +Alternatively, you may set the environment variables TIME_HELPER_CFLAGS +and TIME_HELPER_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. +Alternatively, you may set the environment variables TIME_HELPER_CFLAGS +and TIME_HELPER_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. - if test -n "$PYTHON"; then - # If the user set $PYTHON, use it and don't search something else. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version >= $PYTHON_REQS" >&5 -$as_echo_n "checking whether $PYTHON version >= $PYTHON_REQS... " >&6; } - prog="import sys -# split strings by '.' and convert to numeric. Append some zeros -# because we need at least 4 digits for the hex conversion. -# map returns an iterator in Python 3.0 and a list in 2.x -minver = list(map(int, '$PYTHON_REQS'.split('.'))) + [0, 0, 0] -minverhex = 0 -# xrange is not present in Python 3.0 and range returns an iterator -for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i] -sys.exit(sys.hexversion < minverhex)" - if { echo "$as_me:$LINENO: $PYTHON -c "$prog"" >&5 - ($PYTHON -c "$prog") >&5 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - as_fn_error $? "too old" "$LINENO" 5 -fi - am_display_PYTHON=$PYTHON - else - # Otherwise, try each interpreter until we find one that satisfies - # VERSION. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= $PYTHON_REQS" >&5 -$as_echo_n "checking for a Python interpreter with version >= $PYTHON_REQS... " >&6; } -if ${am_cv_pathless_PYTHON+:} false; then : - $as_echo_n "(cached) " >&6 +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5; } else + TIME_HELPER_CFLAGS=$pkg_cv_TIME_HELPER_CFLAGS + TIME_HELPER_LIBS=$pkg_cv_TIME_HELPER_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } - for am_cv_pathless_PYTHON in python python2 python3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do - test "$am_cv_pathless_PYTHON" = none && break - prog="import sys -# split strings by '.' and convert to numeric. Append some zeros -# because we need at least 4 digits for the hex conversion. -# map returns an iterator in Python 3.0 and a list in 2.x -minver = list(map(int, '$PYTHON_REQS'.split('.'))) + [0, 0, 0] -minverhex = 0 -# xrange is not present in Python 3.0 and range returns an iterator -for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i] -sys.exit(sys.hexversion < minverhex)" - if { echo "$as_me:$LINENO: $am_cv_pathless_PYTHON -c "$prog"" >&5 - ($am_cv_pathless_PYTHON -c "$prog") >&5 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then : - break -fi - done fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_pathless_PYTHON" >&5 -$as_echo "$am_cv_pathless_PYTHON" >&6; } - # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON. - if test "$am_cv_pathless_PYTHON" = none; then - PYTHON=: - else - # Extract the first word of "$am_cv_pathless_PYTHON", so it can be a program name with args. -set dummy $am_cv_pathless_PYTHON; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PYTHON+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $PYTHON in - [\\/]* | ?:[\\/]*) - ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - ;; -esac -fi -PYTHON=$ac_cv_path_PYTHON -if test -n "$PYTHON"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5 -$as_echo "$PYTHON" >&6; } +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PIXBUF_HELPER" >&5 +$as_echo_n "checking for PIXBUF_HELPER... " >&6; } + +if test -n "$PIXBUF_HELPER_CFLAGS"; then + pkg_cv_PIXBUF_HELPER_CFLAGS="$PIXBUF_HELPER_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdk-pixbuf-2.0 gstreamer-tag-1.0 >= \$GSTPLUG_REQS gstreamer-video-1.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gdk-pixbuf-2.0 gstreamer-tag-1.0 >= $GSTPLUG_REQS gstreamer-video-1.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_PIXBUF_HELPER_CFLAGS=`$PKG_CONFIG --cflags "gdk-pixbuf-2.0 gstreamer-tag-1.0 >= $GSTPLUG_REQS gstreamer-video-1.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$PIXBUF_HELPER_LIBS"; then + pkg_cv_PIXBUF_HELPER_LIBS="$PIXBUF_HELPER_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdk-pixbuf-2.0 gstreamer-tag-1.0 >= \$GSTPLUG_REQS gstreamer-video-1.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gdk-pixbuf-2.0 gstreamer-tag-1.0 >= $GSTPLUG_REQS gstreamer-video-1.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_PIXBUF_HELPER_LIBS=`$PKG_CONFIG --libs "gdk-pixbuf-2.0 gstreamer-tag-1.0 >= $GSTPLUG_REQS gstreamer-video-1.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried fi - fi - am_display_PYTHON=$am_cv_pathless_PYTHON - fi - - - if test "$PYTHON" = :; then - have_python=no - else +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5 -$as_echo_n "checking for $am_display_PYTHON version... " >&6; } -if ${am_cv_python_version+:} false; then : - $as_echo_n "(cached) " >&6 +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes else - am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"` + _pkg_short_errors_supported=no fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5 -$as_echo "$am_cv_python_version" >&6; } - PYTHON_VERSION=$am_cv_python_version - + if test $_pkg_short_errors_supported = yes; then + PIXBUF_HELPER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gdk-pixbuf-2.0 gstreamer-tag-1.0 >= $GSTPLUG_REQS gstreamer-video-1.0" 2>&1` + else + PIXBUF_HELPER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gdk-pixbuf-2.0 gstreamer-tag-1.0 >= $GSTPLUG_REQS gstreamer-video-1.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$PIXBUF_HELPER_PKG_ERRORS" >&5 + as_fn_error $? "Package requirements (gdk-pixbuf-2.0 gstreamer-tag-1.0 >= $GSTPLUG_REQS gstreamer-video-1.0) were not met: - PYTHON_PREFIX='${prefix}' +$PIXBUF_HELPER_PKG_ERRORS - PYTHON_EXEC_PREFIX='${exec_prefix}' +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. +Alternatively, you may set the environment variables PIXBUF_HELPER_CFLAGS +and PIXBUF_HELPER_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. +Alternatively, you may set the environment variables PIXBUF_HELPER_CFLAGS +and PIXBUF_HELPER_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5 -$as_echo_n "checking for $am_display_PYTHON platform... " >&6; } -if ${am_cv_python_platform+:} false; then : - $as_echo_n "(cached) " >&6 +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5; } else - am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"` -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5 -$as_echo "$am_cv_python_platform" >&6; } - PYTHON_PLATFORM=$am_cv_python_platform - + PIXBUF_HELPER_CFLAGS=$pkg_cv_PIXBUF_HELPER_CFLAGS + PIXBUF_HELPER_LIBS=$pkg_cv_PIXBUF_HELPER_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +fi +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for THUMBNAILER" >&5 +$as_echo_n "checking for THUMBNAILER... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5 -$as_echo_n "checking for $am_display_PYTHON script directory... " >&6; } -if ${am_cv_python_pythondir+:} false; then : - $as_echo_n "(cached) " >&6 +if test -n "$THUMBNAILER_CFLAGS"; then + pkg_cv_THUMBNAILER_CFLAGS="$THUMBNAILER_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= \$GTK_REQS totem-plparser >= \$TOTEM_PLPARSER_REQS gstreamer-tag-1.0 >= \$GSTPLUG_REQS gstreamer-video-1.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= $GTK_REQS totem-plparser >= $TOTEM_PLPARSER_REQS gstreamer-tag-1.0 >= $GSTPLUG_REQS gstreamer-video-1.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_THUMBNAILER_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= $GTK_REQS totem-plparser >= $TOTEM_PLPARSER_REQS gstreamer-tag-1.0 >= $GSTPLUG_REQS gstreamer-video-1.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else - if test "x$prefix" = xNONE - then - am_py_prefix=$ac_default_prefix - else - am_py_prefix=$prefix - fi - am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null` - case $am_cv_python_pythondir in - $am_py_prefix*) - am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` - am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"` - ;; - *) - case $am_py_prefix in - /usr|/System*) ;; - *) - am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages - ;; - esac - ;; - esac - + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$THUMBNAILER_LIBS"; then + pkg_cv_THUMBNAILER_LIBS="$THUMBNAILER_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= \$GTK_REQS totem-plparser >= \$TOTEM_PLPARSER_REQS gstreamer-tag-1.0 >= \$GSTPLUG_REQS gstreamer-video-1.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= $GTK_REQS totem-plparser >= $TOTEM_PLPARSER_REQS gstreamer-tag-1.0 >= $GSTPLUG_REQS gstreamer-video-1.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_THUMBNAILER_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= $GTK_REQS totem-plparser >= $TOTEM_PLPARSER_REQS gstreamer-tag-1.0 >= $GSTPLUG_REQS gstreamer-video-1.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5 -$as_echo "$am_cv_python_pythondir" >&6; } - pythondir=$am_cv_python_pythondir - - pkgpythondir=\${pythondir}/$PACKAGE +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5 -$as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; } -if ${am_cv_python_pyexecdir+:} false; then : - $as_echo_n "(cached) " >&6 +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes else - if test "x$exec_prefix" = xNONE - then - am_py_exec_prefix=$am_py_prefix - else - am_py_exec_prefix=$exec_prefix - fi - am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null` - case $am_cv_python_pyexecdir in - $am_py_exec_prefix*) - am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` - am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"` - ;; - *) - case $am_py_exec_prefix in - /usr|/System*) ;; - *) - am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages - ;; - esac - ;; - esac - + _pkg_short_errors_supported=no fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5 -$as_echo "$am_cv_python_pyexecdir" >&6; } - pyexecdir=$am_cv_python_pyexecdir - + if test $_pkg_short_errors_supported = yes; then + THUMBNAILER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0 >= $GTK_REQS totem-plparser >= $TOTEM_PLPARSER_REQS gstreamer-tag-1.0 >= $GSTPLUG_REQS gstreamer-video-1.0" 2>&1` + else + THUMBNAILER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0 >= $GTK_REQS totem-plparser >= $TOTEM_PLPARSER_REQS gstreamer-tag-1.0 >= $GSTPLUG_REQS gstreamer-video-1.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$THUMBNAILER_PKG_ERRORS" >&5 + as_fn_error $? "Package requirements (gtk+-3.0 >= $GTK_REQS totem-plparser >= $TOTEM_PLPARSER_REQS gstreamer-tag-1.0 >= $GSTPLUG_REQS gstreamer-video-1.0) were not met: - pkgpyexecdir=\${pyexecdir}/$PACKAGE +$THUMBNAILER_PKG_ERRORS +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. - have_python=yes - fi +Alternatively, you may set the environment variables THUMBNAILER_CFLAGS +and THUMBNAILER_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. +Alternatively, you may set the environment variables THUMBNAILER_CFLAGS +and THUMBNAILER_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. - if test "x$PYTHON" = "x:"; then - have_python=no - fi +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5; } +else + THUMBNAILER_CFLAGS=$pkg_cv_THUMBNAILER_CFLAGS + THUMBNAILER_LIBS=$pkg_cv_THUMBNAILER_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +fi pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PYGOBJECT" >&5 -$as_echo_n "checking for PYGOBJECT... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PREVIEW" >&5 +$as_echo_n "checking for PREVIEW... " >&6; } -if test -n "$PYGOBJECT_CFLAGS"; then - pkg_cv_PYGOBJECT_CFLAGS="$PYGOBJECT_CFLAGS" +if test -n "$PREVIEW_CFLAGS"; then + pkg_cv_PREVIEW_CFLAGS="$PREVIEW_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pygobject-3.0 >= \$PYGOBJECT_REQS\""; } >&5 - ($PKG_CONFIG --exists --print-errors "pygobject-3.0 >= $PYGOBJECT_REQS") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-1.0 >= \$GST_REQS gio-2.0 >= \$GIO_REQS gdk-pixbuf-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gstreamer-1.0 >= $GST_REQS gio-2.0 >= $GIO_REQS gdk-pixbuf-2.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_PYGOBJECT_CFLAGS=`$PKG_CONFIG --cflags "pygobject-3.0 >= $PYGOBJECT_REQS" 2>/dev/null` + pkg_cv_PREVIEW_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-1.0 >= $GST_REQS gio-2.0 >= $GIO_REQS gdk-pixbuf-2.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi else pkg_failed=untried fi -if test -n "$PYGOBJECT_LIBS"; then - pkg_cv_PYGOBJECT_LIBS="$PYGOBJECT_LIBS" +if test -n "$PREVIEW_LIBS"; then + pkg_cv_PREVIEW_LIBS="$PREVIEW_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pygobject-3.0 >= \$PYGOBJECT_REQS\""; } >&5 - ($PKG_CONFIG --exists --print-errors "pygobject-3.0 >= $PYGOBJECT_REQS") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-1.0 >= \$GST_REQS gio-2.0 >= \$GIO_REQS gdk-pixbuf-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gstreamer-1.0 >= $GST_REQS gio-2.0 >= $GIO_REQS gdk-pixbuf-2.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_PYGOBJECT_LIBS=`$PKG_CONFIG --libs "pygobject-3.0 >= $PYGOBJECT_REQS" 2>/dev/null` + pkg_cv_PREVIEW_LIBS=`$PKG_CONFIG --libs "gstreamer-1.0 >= $GST_REQS gio-2.0 >= $GIO_REQS gdk-pixbuf-2.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -20015,89 +20215,136 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - PYGOBJECT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "pygobject-3.0 >= $PYGOBJECT_REQS" 2>&1` + PREVIEW_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gstreamer-1.0 >= $GST_REQS gio-2.0 >= $GIO_REQS gdk-pixbuf-2.0" 2>&1` else - PYGOBJECT_PKG_ERRORS=`$PKG_CONFIG --print-errors "pygobject-3.0 >= $PYGOBJECT_REQS" 2>&1` + PREVIEW_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gstreamer-1.0 >= $GST_REQS gio-2.0 >= $GIO_REQS gdk-pixbuf-2.0" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$PYGOBJECT_PKG_ERRORS" >&5 + echo "$PREVIEW_PKG_ERRORS" >&5 - have_pygobject=no + as_fn_error $? "Package requirements (gstreamer-1.0 >= $GST_REQS gio-2.0 >= $GIO_REQS gdk-pixbuf-2.0) were not met: + +$PREVIEW_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables PREVIEW_CFLAGS +and PREVIEW_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - have_pygobject=no + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables PREVIEW_CFLAGS +and PREVIEW_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5; } else - PYGOBJECT_CFLAGS=$pkg_cv_PYGOBJECT_CFLAGS - PYGOBJECT_LIBS=$pkg_cv_PYGOBJECT_LIBS + PREVIEW_CFLAGS=$pkg_cv_PREVIEW_CFLAGS + PREVIEW_LIBS=$pkg_cv_PREVIEW_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - have_pygobject=yes + fi - # Extract the first word of "pylint", so it can be a program name with args. -set dummy pylint; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PYLINT+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $PYLINT in - [\\/]* | ?:[\\/]*) - ac_cv_path_PYLINT="$PYLINT" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_PYLINT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - test -z "$ac_cv_path_PYLINT" && ac_cv_path_PYLINT="no" - ;; -esac +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PROPERTIES" >&5 +$as_echo_n "checking for PROPERTIES... " >&6; } + +if test -n "$PROPERTIES_CFLAGS"; then + pkg_cv_PROPERTIES_CFLAGS="$PROPERTIES_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= \$GTK_REQS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= $GTK_REQS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_PROPERTIES_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= $GTK_REQS" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes fi -PYLINT=$ac_cv_path_PYLINT -if test -n "$PYLINT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYLINT" >&5 -$as_echo "$PYLINT" >&6; } + else + pkg_failed=untried +fi +if test -n "$PROPERTIES_LIBS"; then + pkg_cv_PROPERTIES_LIBS="$PROPERTIES_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= \$GTK_REQS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= $GTK_REQS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_PROPERTIES_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= $GTK_REQS" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no fi + if test $_pkg_short_errors_supported = yes; then + PROPERTIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0 >= $GTK_REQS" 2>&1` + else + PROPERTIES_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0 >= $GTK_REQS" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$PROPERTIES_PKG_ERRORS" >&5 + as_fn_error $? "Package requirements (gtk+-3.0 >= $GTK_REQS) were not met: -fi +$PROPERTIES_PKG_ERRORS -# Output the results of the Python checks -if test "x$have_python" != "xyes" -o "x$have_pygobject" != "xyes" -o "x$PYLINT" = "xno"; then - if test "x$enable_python" = "xyes"; then - as_fn_error $? "python >= $PYTHON_REQS, pygobject-3.0 >= $PYGOBJECT_REQS or pylint not found" "$LINENO" 5 - elif test "x$enable_python" = "xautodetect"; then - enable_python=no - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: python >= $PYTHON_REQS, pygobject-3.0 >= $PYGOBJECT_REQS or pylint not found; disabling Python support" >&5 -$as_echo "$as_me: WARNING: python >= $PYTHON_REQS, pygobject-3.0 >= $PYGOBJECT_REQS or pylint not found; disabling Python support" >&2;} - fi -elif test "x$enable_python" != "xno"; then - enable_python=yes -fi +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. - if test "x$enable_python" = "xyes"; then - ENABLE_PYTHON_TRUE= - ENABLE_PYTHON_FALSE='#' +Alternatively, you may set the environment variables PROPERTIES_CFLAGS +and PROPERTIES_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables PROPERTIES_CFLAGS +and PROPERTIES_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5; } else - ENABLE_PYTHON_TRUE='#' - ENABLE_PYTHON_FALSE= -fi + PROPERTIES_CFLAGS=$pkg_cv_PROPERTIES_CFLAGS + PROPERTIES_LIBS=$pkg_cv_PROPERTIES_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Vala plugin support is requested" >&5 $as_echo_n "checking whether Vala plugin support is requested... " >&6; } @@ -20129,7 +20376,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_VALAC="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -20172,7 +20419,7 @@ 2) : { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - as_fn_error $? "Vala $VALA_REQS not found." "$LINENO" 5 ;; #( + as_fn_error 77 "Vala $VALA_REQS not found." "$LINENO" 5 ;; #( *) : ;; esac @@ -20212,6 +20459,11 @@ fi } +plugin_error() +{ + as_fn_error $? "$1" "$LINENO" 5 +} + # Check whether --with-plugins was given. if test "${with_plugins+set}" = set; then : @@ -20259,6 +20511,15 @@ case ${plugin} in gromit) + have_x11=no + gdk_targets=$(pkg-config --variable=targets gtk+-3.0) + for gdk_target in $gdk_targets; do + if test x$gdk_target = xx11; then + have_x11=yes + break + fi + done + if test "${have_x11}" != "yes" ; then plugin_error_or_ignore "the gromit plugin is not supported on non-X11 targets" add_plugin="0" @@ -20274,12 +20535,13 @@ pkg_cv_MEDIA_PLAYER_KEYS_CFLAGS="$MEDIA_PLAYER_KEYS_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0 >= 2.24\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gio-2.0 >= 2.24") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gio-2.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_MEDIA_PLAYER_KEYS_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0 >= 2.24" 2>/dev/null` + pkg_cv_MEDIA_PLAYER_KEYS_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -20290,12 +20552,13 @@ pkg_cv_MEDIA_PLAYER_KEYS_LIBS="$MEDIA_PLAYER_KEYS_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0 >= 2.24\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gio-2.0 >= 2.24") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gio-2.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_MEDIA_PLAYER_KEYS_LIBS=`$PKG_CONFIG --libs "gio-2.0 >= 2.24" 2>/dev/null` + pkg_cv_MEDIA_PLAYER_KEYS_LIBS=`$PKG_CONFIG --libs "gio-2.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -20315,9 +20578,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - MEDIA_PLAYER_KEYS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gio-2.0 >= 2.24" 2>&1` + MEDIA_PLAYER_KEYS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gio-2.0" 2>&1` else - MEDIA_PLAYER_KEYS_PKG_ERRORS=`$PKG_CONFIG --print-errors "gio-2.0 >= 2.24" 2>&1` + MEDIA_PLAYER_KEYS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gio-2.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$MEDIA_PLAYER_KEYS_PKG_ERRORS" >&5 @@ -20335,7 +20598,7 @@ HAVE_MEDIA_PLAYER_KEYS=yes fi if test "${HAVE_MEDIA_PLAYER_KEYS}" != "yes" ; then - plugin_error_or_ignore "you need gio >= 2.24 installed for the media-player-keys plugin" + plugin_error "you need gio installed for the media-player-keys plugin" add_plugin="0" fi ;; @@ -20396,82 +20659,6 @@ add_plugin="0" fi ;; - publish) - # FIXME - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBEPC" >&5 -$as_echo_n "checking for LIBEPC... " >&6; } - -if test -n "$LIBEPC_CFLAGS"; then - pkg_cv_LIBEPC_CFLAGS="$LIBEPC_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libepc-ui-1.0 > 0.4.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libepc-ui-1.0 > 0.4.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_LIBEPC_CFLAGS=`$PKG_CONFIG --cflags "libepc-ui-1.0 > 0.4.0" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$LIBEPC_LIBS"; then - pkg_cv_LIBEPC_LIBS="$LIBEPC_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libepc-ui-1.0 > 0.4.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libepc-ui-1.0 > 0.4.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_LIBEPC_LIBS=`$PKG_CONFIG --libs "libepc-ui-1.0 > 0.4.0" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - LIBEPC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libepc-ui-1.0 > 0.4.0" 2>&1` - else - LIBEPC_PKG_ERRORS=`$PKG_CONFIG --print-errors "libepc-ui-1.0 > 0.4.0" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$LIBEPC_PKG_ERRORS" >&5 - - HAVE_LIBEPC=no -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - HAVE_LIBEPC=no -else - LIBEPC_CFLAGS=$pkg_cv_LIBEPC_CFLAGS - LIBEPC_LIBS=$pkg_cv_LIBEPC_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - HAVE_LIBEPC=yes -fi - if test "${HAVE_LIBEPC}" != "yes" ; then - plugin_error_or_ignore "you need the easy-publish-and-consume library installed for the publish plugin" - add_plugin="0" - fi - ;; rotation) if test "${with_vala}" != "yes" ; then plugin_error_or_ignore "you need vala installed to use the rotation plugin" @@ -20506,6 +20693,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DISC_RECORDER_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= 2.6.0 gtk+-x11-3.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -20522,6 +20710,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DISC_RECORDER_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= 2.6.0 gtk+-x11-3.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -20541,9 +20730,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DISC_RECORDER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libxml-2.0 >= 2.6.0 gtk+-x11-3.0" 2>&1` + DISC_RECORDER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libxml-2.0 >= 2.6.0 gtk+-x11-3.0" 2>&1` else - DISC_RECORDER_PKG_ERRORS=`$PKG_CONFIG --print-errors "libxml-2.0 >= 2.6.0 gtk+-x11-3.0" 2>&1` + DISC_RECORDER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libxml-2.0 >= 2.6.0 gtk+-x11-3.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$DISC_RECORDER_PKG_ERRORS" >&5 @@ -20581,6 +20770,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SAVE_FILE_CHECK_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0 >= 2.26 libnautilus-extension >= 2.91.3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -20597,6 +20787,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SAVE_FILE_CHECK_LIBS=`$PKG_CONFIG --libs "gio-2.0 >= 2.26 libnautilus-extension >= 2.91.3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -20616,9 +20807,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SAVE_FILE_CHECK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gio-2.0 >= 2.26 libnautilus-extension >= 2.91.3" 2>&1` + SAVE_FILE_CHECK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gio-2.0 >= 2.26 libnautilus-extension >= 2.91.3" 2>&1` else - SAVE_FILE_CHECK_PKG_ERRORS=`$PKG_CONFIG --print-errors "gio-2.0 >= 2.26 libnautilus-extension >= 2.91.3" 2>&1` + SAVE_FILE_CHECK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gio-2.0 >= 2.26 libnautilus-extension >= 2.91.3" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$SAVE_FILE_CHECK_PKG_ERRORS" >&5 @@ -20654,6 +20845,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SAVE_FILE_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0 >= 2.26" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -20670,6 +20862,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SAVE_FILE_LIBS=`$PKG_CONFIG --libs "gio-2.0 >= 2.26" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -20689,9 +20882,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SAVE_FILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gio-2.0 >= 2.26" 2>&1` + SAVE_FILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gio-2.0 >= 2.26" 2>&1` else - SAVE_FILE_PKG_ERRORS=`$PKG_CONFIG --print-errors "gio-2.0 >= 2.26" 2>&1` + SAVE_FILE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gio-2.0 >= 2.26" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$SAVE_FILE_PKG_ERRORS" >&5 @@ -20706,7 +20899,6 @@ Alternatively, you may set the environment variables SAVE_FILE_CFLAGS and SAVE_FILE_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 - elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -20722,7 +20914,6 @@ To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } - else SAVE_FILE_CFLAGS=$pkg_cv_SAVE_FILE_CFLAGS SAVE_FILE_LIBS=$pkg_cv_SAVE_FILE_LIBS @@ -20742,12 +20933,13 @@ pkg_cv_CHAPTERS_CFLAGS="$CHAPTERS_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.6.0 gtk+-3.0 glib-2.0 >= 2.15.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.6.0 gtk+-3.0 glib-2.0 >= 2.15.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= \$LIBXML_REQS gtk+-3.0 glib-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= $LIBXML_REQS gtk+-3.0 glib-2.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_CHAPTERS_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= 2.6.0 gtk+-3.0 glib-2.0 >= 2.15.0" 2>/dev/null` + pkg_cv_CHAPTERS_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= $LIBXML_REQS gtk+-3.0 glib-2.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -20758,12 +20950,13 @@ pkg_cv_CHAPTERS_LIBS="$CHAPTERS_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.6.0 gtk+-3.0 glib-2.0 >= 2.15.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.6.0 gtk+-3.0 glib-2.0 >= 2.15.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= \$LIBXML_REQS gtk+-3.0 glib-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= $LIBXML_REQS gtk+-3.0 glib-2.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_CHAPTERS_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= 2.6.0 gtk+-3.0 glib-2.0 >= 2.15.0" 2>/dev/null` + pkg_cv_CHAPTERS_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= $LIBXML_REQS gtk+-3.0 glib-2.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -20783,9 +20976,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - CHAPTERS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libxml-2.0 >= 2.6.0 gtk+-3.0 glib-2.0 >= 2.15.0" 2>&1` + CHAPTERS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libxml-2.0 >= $LIBXML_REQS gtk+-3.0 glib-2.0" 2>&1` else - CHAPTERS_PKG_ERRORS=`$PKG_CONFIG --print-errors "libxml-2.0 >= 2.6.0 gtk+-3.0 glib-2.0 >= 2.15.0" 2>&1` + CHAPTERS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libxml-2.0 >= $LIBXML_REQS gtk+-3.0 glib-2.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$CHAPTERS_PKG_ERRORS" >&5 @@ -20803,7 +20996,7 @@ BUILD_CHAPTERS=yes fi if test "${BUILD_CHAPTERS}" != "yes" ; then - plugin_error_or_ignore "you need gtk+-3.0, glib-2.0 >= 2.15.0 and libxml-2.0 >= 2.6.0 to use the chapters plugin" + plugin_error "you need gtk+-3.0, glib-2.0 >= 2.15.0 and libxml-2.0 >= 2.6.0 to use the chapters plugin" add_plugin="0" fi ;; @@ -20830,6 +21023,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBZEITGEIST_CFLAGS=`$PKG_CONFIG --cflags "zeitgeist-1.0 >= 0.3.6" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -20846,6 +21040,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBZEITGEIST_LIBS=`$PKG_CONFIG --libs "zeitgeist-1.0 >= 0.3.6" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -20865,9 +21060,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBZEITGEIST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "zeitgeist-1.0 >= 0.3.6" 2>&1` + LIBZEITGEIST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "zeitgeist-1.0 >= 0.3.6" 2>&1` else - LIBZEITGEIST_PKG_ERRORS=`$PKG_CONFIG --print-errors "zeitgeist-1.0 >= 0.3.6" 2>&1` + LIBZEITGEIST_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "zeitgeist-1.0 >= 0.3.6" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$LIBZEITGEIST_PKG_ERRORS" >&5 @@ -20900,12 +21095,13 @@ pkg_cv_LIBGRILO_CFLAGS="$LIBGRILO_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"grilo-0.1 >= 0.1.16\""; } >&5 - ($PKG_CONFIG --exists --print-errors "grilo-0.1 >= 0.1.16") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"grilo-0.2 >= \$GRILO_REQS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "grilo-0.2 >= $GRILO_REQS") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBGRILO_CFLAGS=`$PKG_CONFIG --cflags "grilo-0.1 >= 0.1.16" 2>/dev/null` + pkg_cv_LIBGRILO_CFLAGS=`$PKG_CONFIG --cflags "grilo-0.2 >= $GRILO_REQS" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -20916,12 +21112,13 @@ pkg_cv_LIBGRILO_LIBS="$LIBGRILO_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"grilo-0.1 >= 0.1.16\""; } >&5 - ($PKG_CONFIG --exists --print-errors "grilo-0.1 >= 0.1.16") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"grilo-0.2 >= \$GRILO_REQS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "grilo-0.2 >= $GRILO_REQS") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBGRILO_LIBS=`$PKG_CONFIG --libs "grilo-0.1 >= 0.1.16" 2>/dev/null` + pkg_cv_LIBGRILO_LIBS=`$PKG_CONFIG --libs "grilo-0.2 >= $GRILO_REQS" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -20941,9 +21138,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBGRILO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "grilo-0.1 >= 0.1.16" 2>&1` + LIBGRILO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "grilo-0.2 >= $GRILO_REQS" 2>&1` else - LIBGRILO_PKG_ERRORS=`$PKG_CONFIG --print-errors "grilo-0.1 >= 0.1.16" 2>&1` + LIBGRILO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "grilo-0.2 >= $GRILO_REQS" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$LIBGRILO_PKG_ERRORS" >&5 @@ -20961,7 +21158,7 @@ HAVE_LIBGRILO=yes fi if test "${HAVE_LIBGRILO}" != "yes" ; then - plugin_error_or_ignore "you need libgrilo >= 0.1.16 installed for the Grilo plugin" + plugin_error "you need libgrilo >= $GRILO_REQS installed for the Grilo plugin" add_plugin="0" fi ;; @@ -21020,10 +21217,12 @@ if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 gio-2.0 >= \$GIO_REQS + gmodule-export-2.0 x11 totem-plparser-mini >= \$TOTEM_PLPARSER_REQS\""; } >&5 ($PKG_CONFIG --exists --print-errors "glib-2.0 gio-2.0 >= $GIO_REQS + gmodule-export-2.0 x11 totem-plparser-mini >= $TOTEM_PLPARSER_REQS") 2>&5 ac_status=$? @@ -21031,8 +21230,10 @@ test $ac_status = 0; }; then pkg_cv_BROWSER_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 gio-2.0 >= $GIO_REQS + gmodule-export-2.0 x11 totem-plparser-mini >= $TOTEM_PLPARSER_REQS" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -21045,10 +21246,12 @@ if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 gio-2.0 >= \$GIO_REQS + gmodule-export-2.0 x11 totem-plparser-mini >= \$TOTEM_PLPARSER_REQS\""; } >&5 ($PKG_CONFIG --exists --print-errors "glib-2.0 gio-2.0 >= $GIO_REQS + gmodule-export-2.0 x11 totem-plparser-mini >= $TOTEM_PLPARSER_REQS") 2>&5 ac_status=$? @@ -21056,8 +21259,10 @@ test $ac_status = 0; }; then pkg_cv_BROWSER_PLUGIN_LIBS=`$PKG_CONFIG --libs "glib-2.0 gio-2.0 >= $GIO_REQS + gmodule-export-2.0 x11 totem-plparser-mini >= $TOTEM_PLPARSER_REQS" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -21077,13 +21282,15 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - BROWSER_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 + BROWSER_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 gio-2.0 >= $GIO_REQS + gmodule-export-2.0 x11 totem-plparser-mini >= $TOTEM_PLPARSER_REQS" 2>&1` else - BROWSER_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 + BROWSER_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 gio-2.0 >= $GIO_REQS + gmodule-export-2.0 x11 totem-plparser-mini >= $TOTEM_PLPARSER_REQS" 2>&1` fi @@ -21135,6 +21342,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= $DBUS_REQS" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -21151,6 +21359,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-glib-1 >= $DBUS_REQS" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -21170,9 +21379,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1 >= $DBUS_REQS" 2>&1` + DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dbus-glib-1 >= $DBUS_REQS" 2>&1` else - DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1 >= $DBUS_REQS" 2>&1` + DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dbus-glib-1 >= $DBUS_REQS" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$DBUS_PKG_ERRORS" >&5 @@ -21210,7 +21419,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_DBUS_BIND="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -21283,6 +21492,189 @@ if test "$have_no_rtti_flag" = "yes"; then AM_CXXFLAGS="-fno-rtti $AM_CXXFLAGS" fi + + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PLUGIN_VIEWER" >&5 +$as_echo_n "checking for PLUGIN_VIEWER... " >&6; } + +if test -n "$PLUGIN_VIEWER_CFLAGS"; then + pkg_cv_PLUGIN_VIEWER_CFLAGS="$PLUGIN_VIEWER_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$BACKEND_MODULES gtk+-3.0 >= \$GTK_REQS totem-plparser >= \$TOTEM_PLPARSER_REQS gdk-x11-3.0 >= \$GTK_REQS dbus-glib-1 >= \$DBUS_REQS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$BACKEND_MODULES gtk+-3.0 >= $GTK_REQS totem-plparser >= $TOTEM_PLPARSER_REQS gdk-x11-3.0 >= $GTK_REQS dbus-glib-1 >= $DBUS_REQS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_PLUGIN_VIEWER_CFLAGS=`$PKG_CONFIG --cflags "$BACKEND_MODULES gtk+-3.0 >= $GTK_REQS totem-plparser >= $TOTEM_PLPARSER_REQS gdk-x11-3.0 >= $GTK_REQS dbus-glib-1 >= $DBUS_REQS" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$PLUGIN_VIEWER_LIBS"; then + pkg_cv_PLUGIN_VIEWER_LIBS="$PLUGIN_VIEWER_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$BACKEND_MODULES gtk+-3.0 >= \$GTK_REQS totem-plparser >= \$TOTEM_PLPARSER_REQS gdk-x11-3.0 >= \$GTK_REQS dbus-glib-1 >= \$DBUS_REQS\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$BACKEND_MODULES gtk+-3.0 >= $GTK_REQS totem-plparser >= $TOTEM_PLPARSER_REQS gdk-x11-3.0 >= $GTK_REQS dbus-glib-1 >= $DBUS_REQS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_PLUGIN_VIEWER_LIBS=`$PKG_CONFIG --libs "$BACKEND_MODULES gtk+-3.0 >= $GTK_REQS totem-plparser >= $TOTEM_PLPARSER_REQS gdk-x11-3.0 >= $GTK_REQS dbus-glib-1 >= $DBUS_REQS" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + PLUGIN_VIEWER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$BACKEND_MODULES gtk+-3.0 >= $GTK_REQS totem-plparser >= $TOTEM_PLPARSER_REQS gdk-x11-3.0 >= $GTK_REQS dbus-glib-1 >= $DBUS_REQS" 2>&1` + else + PLUGIN_VIEWER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$BACKEND_MODULES gtk+-3.0 >= $GTK_REQS totem-plparser >= $TOTEM_PLPARSER_REQS gdk-x11-3.0 >= $GTK_REQS dbus-glib-1 >= $DBUS_REQS" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$PLUGIN_VIEWER_PKG_ERRORS" >&5 + + as_fn_error $? "Package requirements ($BACKEND_MODULES gtk+-3.0 >= $GTK_REQS totem-plparser >= $TOTEM_PLPARSER_REQS gdk-x11-3.0 >= $GTK_REQS dbus-glib-1 >= $DBUS_REQS) were not met: + +$PLUGIN_VIEWER_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables PLUGIN_VIEWER_CFLAGS +and PLUGIN_VIEWER_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables PLUGIN_VIEWER_CFLAGS +and PLUGIN_VIEWER_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5; } +else + PLUGIN_VIEWER_CFLAGS=$pkg_cv_PLUGIN_VIEWER_CFLAGS + PLUGIN_VIEWER_LIBS=$pkg_cv_PLUGIN_VIEWER_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +fi + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLOW_BUTTON" >&5 +$as_echo_n "checking for GLOW_BUTTON... " >&6; } + +if test -n "$GLOW_BUTTON_CFLAGS"; then + pkg_cv_GLOW_BUTTON_CFLAGS="$GLOW_BUTTON_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-3.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GLOW_BUTTON_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$GLOW_BUTTON_LIBS"; then + pkg_cv_GLOW_BUTTON_LIBS="$GLOW_BUTTON_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-3.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GLOW_BUTTON_LIBS=`$PKG_CONFIG --libs "gtk+-3.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + GLOW_BUTTON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0" 2>&1` + else + GLOW_BUTTON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GLOW_BUTTON_PKG_ERRORS" >&5 + + as_fn_error $? "Package requirements (gtk+-3.0) were not met: + +$GLOW_BUTTON_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables GLOW_BUTTON_CFLAGS +and GLOW_BUTTON_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables GLOW_BUTTON_CFLAGS +and GLOW_BUTTON_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5; } +else + GLOW_BUTTON_CFLAGS=$pkg_cv_GLOW_BUTTON_CFLAGS + GLOW_BUTTON_LIBS=$pkg_cv_GLOW_BUTTON_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +fi fi if test "$enable_browser_plugins" = "yes"; then @@ -21423,12 +21815,13 @@ pkg_cv_NAUTILUS_CFLAGS="$NAUTILUS_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 gthread-2.0 libnautilus-extension\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-3.0 gthread-2.0 libnautilus-extension") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 gthread-2.0 libnautilus-extension gstreamer-tag-1.0 >= \$GSTPLUG_REQS \$MISSING_PLUGINS_MODULES\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-3.0 gthread-2.0 libnautilus-extension gstreamer-tag-1.0 >= $GSTPLUG_REQS $MISSING_PLUGINS_MODULES") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_NAUTILUS_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 gthread-2.0 libnautilus-extension" 2>/dev/null` + pkg_cv_NAUTILUS_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 gthread-2.0 libnautilus-extension gstreamer-tag-1.0 >= $GSTPLUG_REQS $MISSING_PLUGINS_MODULES" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -21439,12 +21832,13 @@ pkg_cv_NAUTILUS_LIBS="$NAUTILUS_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 gthread-2.0 libnautilus-extension\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-3.0 gthread-2.0 libnautilus-extension") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 gthread-2.0 libnautilus-extension gstreamer-tag-1.0 >= \$GSTPLUG_REQS \$MISSING_PLUGINS_MODULES\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-3.0 gthread-2.0 libnautilus-extension gstreamer-tag-1.0 >= $GSTPLUG_REQS $MISSING_PLUGINS_MODULES") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_NAUTILUS_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 gthread-2.0 libnautilus-extension" 2>/dev/null` + pkg_cv_NAUTILUS_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 gthread-2.0 libnautilus-extension gstreamer-tag-1.0 >= $GSTPLUG_REQS $MISSING_PLUGINS_MODULES" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -21464,9 +21858,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - NAUTILUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-3.0 gthread-2.0 libnautilus-extension" 2>&1` + NAUTILUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0 gthread-2.0 libnautilus-extension gstreamer-tag-1.0 >= $GSTPLUG_REQS $MISSING_PLUGINS_MODULES" 2>&1` else - NAUTILUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-3.0 gthread-2.0 libnautilus-extension" 2>&1` + NAUTILUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0 gthread-2.0 libnautilus-extension gstreamer-tag-1.0 >= $GSTPLUG_REQS $MISSING_PLUGINS_MODULES" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$NAUTILUS_PKG_ERRORS" >&5 @@ -21494,9 +21888,6 @@ fi -NAUTILUS_LIBS="$NAUTILUS_LIBS $EXTRA_BACKEND_LIBS" - - if test x$HAVE_NAUTILUS = "xyes"; then $as_echo "#define HAVE_NAUTILUS 1" >>confdefs.h @@ -21538,6 +21929,7 @@ + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. @@ -21558,7 +21950,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -21601,7 +21993,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -21674,7 +22066,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GLIB_COMPILE_SCHEMAS="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -21979,7 +22371,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -22021,7 +22413,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GTKDOC_REBASE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -22065,7 +22457,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GTKDOC_MKPDF="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -22134,6 +22526,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GTKDOC_DEPS_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -22150,6 +22543,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GTKDOC_DEPS_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -22169,9 +22563,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>&1` + GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>&1` else - GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>&1` + GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GTKDOC_DEPS_PKG_ERRORS" >&5 @@ -22186,7 +22580,6 @@ Alternatively, you may set the environment variables GTKDOC_DEPS_CFLAGS and GTKDOC_DEPS_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 - elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -22202,7 +22595,6 @@ To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } - else GTKDOC_DEPS_CFLAGS=$pkg_cv_GTKDOC_DEPS_CFLAGS GTKDOC_DEPS_LIBS=$pkg_cv_GTKDOC_DEPS_LIBS @@ -22326,7 +22718,7 @@ -ac_config_files="$ac_config_files Makefile totem.spec lib/Makefile src/Makefile src/gst/Makefile src/properties/Makefile src/plugins/Makefile src/plugins/dbusservice/Makefile src/plugins/screensaver/Makefile src/plugins/screenshot/Makefile src/plugins/ontop/Makefile src/plugins/im-status/Makefile src/plugins/gromit/Makefile src/plugins/iplayer/Makefile src/plugins/lirc/Makefile src/plugins/media-player-keys/Makefile src/plugins/opensubtitles/Makefile src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in src/plugins/properties/Makefile src/plugins/rotation/Makefile src/plugins/save-file/Makefile src/plugins/sidebar-test/Makefile src/plugins/skipto/Makefile src/plugins/samplepython/Makefile src/plugins/sample-vala/Makefile src/plugins/pythonconsole/Makefile src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in src/plugins/publish/Makefile src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in src/plugins/brasero-disc-recorder/Makefile src/plugins/chapters/Makefile src/plugins/zeitgeist-dp/Makefile src/plugins/grilo/Makefile src/backend/Makefile browser-plugin/Makefile data/Makefile data/org.gnome.totem.gschema.xml.in data/totem.desktop.in.in data/totem.pc data/icons/Makefile data/icons/16x16/Makefile data/icons/22x22/Makefile data/icons/24x24/Makefile data/icons/32x32/Makefile data/icons/48x48/Makefile data/icons/256x256/Makefile data/icons/scalable/Makefile po/Makefile.in help/Makefile docs/Makefile docs/reference/Makefile docs/reference/version.xml" +ac_config_files="$ac_config_files Makefile totem.spec src/Makefile src/gst/Makefile src/properties/Makefile src/plugins/Makefile src/plugins/apple-trailers/Makefile src/plugins/autoload-subtitles/Makefile src/plugins/dbusservice/Makefile src/plugins/screensaver/Makefile src/plugins/screenshot/Makefile src/plugins/ontop/Makefile src/plugins/im-status/Makefile src/plugins/gromit/Makefile src/plugins/lirc/Makefile src/plugins/media-player-keys/Makefile src/plugins/opensubtitles/Makefile src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in src/plugins/properties/Makefile src/plugins/recent/Makefile src/plugins/rotation/Makefile src/plugins/save-file/Makefile src/plugins/sidebar-test/Makefile src/plugins/skipto/Makefile src/plugins/samplepython/Makefile src/plugins/sample-vala/Makefile src/plugins/pythonconsole/Makefile src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in src/plugins/brasero-disc-recorder/Makefile src/plugins/chapters/Makefile src/plugins/zeitgeist-dp/Makefile src/plugins/grilo/Makefile src/backend/Makefile browser-plugin/Makefile data/Makefile data/org.gnome.totem.gschema.xml.in data/totem.desktop.in.in data/totem.pc data/icons/Makefile data/icons/16x16/Makefile data/icons/22x22/Makefile data/icons/24x24/Makefile data/icons/32x32/Makefile data/icons/48x48/Makefile data/icons/256x256/Makefile data/icons/scalable/Makefile po/Makefile.in help/Makefile docs/Makefile docs/reference/Makefile docs/reference/version.xml" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -22441,6 +22833,14 @@ as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +$as_echo_n "checking that generated files are newer than configure... " >&6; } + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 +$as_echo "done" >&6; } if test -n "$EXEEXT"; then am__EXEEXT_TRUE= am__EXEEXT_FALSE='#' @@ -22847,16 +23247,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -22916,28 +23316,16 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -22958,8 +23346,8 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by totem $as_me 3.4.3, which was -generated by GNU Autoconf 2.68. Invocation command line was +This file was extended by totem $as_me 3.6.2, which was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -23024,11 +23412,11 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -totem config.status 3.4.3 -configured by $0, generated by GNU Autoconf 2.68, +totem config.status 3.6.2 +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -23119,7 +23507,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' @@ -23534,23 +23922,24 @@ "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "totem.spec") CONFIG_FILES="$CONFIG_FILES totem.spec" ;; - "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "src/gst/Makefile") CONFIG_FILES="$CONFIG_FILES src/gst/Makefile" ;; "src/properties/Makefile") CONFIG_FILES="$CONFIG_FILES src/properties/Makefile" ;; "src/plugins/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/Makefile" ;; + "src/plugins/apple-trailers/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/apple-trailers/Makefile" ;; + "src/plugins/autoload-subtitles/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/autoload-subtitles/Makefile" ;; "src/plugins/dbusservice/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/dbusservice/Makefile" ;; "src/plugins/screensaver/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/screensaver/Makefile" ;; "src/plugins/screenshot/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/screenshot/Makefile" ;; "src/plugins/ontop/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/ontop/Makefile" ;; "src/plugins/im-status/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/im-status/Makefile" ;; "src/plugins/gromit/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/gromit/Makefile" ;; - "src/plugins/iplayer/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/iplayer/Makefile" ;; "src/plugins/lirc/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/lirc/Makefile" ;; "src/plugins/media-player-keys/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/media-player-keys/Makefile" ;; "src/plugins/opensubtitles/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/opensubtitles/Makefile" ;; "src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in") CONFIG_FILES="$CONFIG_FILES src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in" ;; "src/plugins/properties/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/properties/Makefile" ;; + "src/plugins/recent/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/recent/Makefile" ;; "src/plugins/rotation/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/rotation/Makefile" ;; "src/plugins/save-file/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/save-file/Makefile" ;; "src/plugins/sidebar-test/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/sidebar-test/Makefile" ;; @@ -23559,8 +23948,6 @@ "src/plugins/sample-vala/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/sample-vala/Makefile" ;; "src/plugins/pythonconsole/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/pythonconsole/Makefile" ;; "src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in") CONFIG_FILES="$CONFIG_FILES src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in" ;; - "src/plugins/publish/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/publish/Makefile" ;; - "src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in") CONFIG_FILES="$CONFIG_FILES src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in" ;; "src/plugins/brasero-disc-recorder/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/brasero-disc-recorder/Makefile" ;; "src/plugins/chapters/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/chapters/Makefile" ;; "src/plugins/zeitgeist-dp/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/zeitgeist-dp/Makefile" ;; @@ -24194,7 +24581,7 @@ # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -24228,21 +24615,19 @@ continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` test -z "am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`$as_dirname -- "$file" || @@ -25224,20 +25609,6 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: Nautilus properties page disabled" >&5 $as_echo "$as_me: Nautilus properties page disabled" >&6;} fi -if test x$enable_xtest = xyes ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: ** XTest (legacy screensaver) support enabled" >&5 -$as_echo "$as_me: ** XTest (legacy screensaver) support enabled" >&6;} -else - { $as_echo "$as_me:${as_lineno-$LINENO}: XTest (legacy screensaver) support disabled" >&5 -$as_echo "$as_me: XTest (legacy screensaver) support disabled" >&6;} -fi -if test x$have_xfree = xyes ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: ** XFree86 multimedia keys support enabled" >&5 -$as_echo "$as_me: ** XFree86 multimedia keys support enabled" >&6;} -else - { $as_echo "$as_me:${as_lineno-$LINENO}: XFree86 multimedia keys support disabled" >&5 -$as_echo "$as_me: XFree86 multimedia keys support disabled" >&6;} -fi if test "$with_smclient" != "no" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: ** SM client support enabled" >&5 $as_echo "$as_me: ** SM client support enabled" >&6;} diff -Nru totem-3.4.3/configure.in totem-3.6.2/configure.in --- totem-3.4.3/configure.in 2012-07-04 09:52:56.000000000 +0000 +++ totem-3.6.2/configure.in 2012-10-25 13:15:47.000000000 +0000 @@ -1,8 +1,8 @@ AC_PREREQ(2.52) m4_define(totem_version_major, 3) -m4_define(totem_version_minor, 4) -m4_define(totem_version_micro, 3) +m4_define(totem_version_minor, 6) +m4_define(totem_version_micro, 2) # The version of the API exposed to plugins m4_define(totem_api_version_major, 1) @@ -16,7 +16,7 @@ AC_CONFIG_SRCDIR([src/totem.c]) AC_CONFIG_HEADERS([config.h]) -AM_INIT_AUTOMAKE([1.11 dist-bzip2 no-dist-gzip check-news subdir-objects]) +AM_INIT_AUTOMAKE([1.11 dist-xz tar-ustar no-dist-gzip check-news]) # Enable silent build when available (Automake 1.11) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) @@ -41,9 +41,9 @@ AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums]) # Requirements -GLIB_REQS=2.27.92 +GLIB_REQS=2.33.0 GIO_REQS=2.27.92 -GTK_REQS=3.3.6 +GTK_REQS=3.5.2 TOTEM_PLPARSER_REQS=2.32.4 GNOMEICON_REQS=2.15.90 DBUS_REQS=0.82 @@ -51,7 +51,10 @@ PEAS_REQS=1.1.0 PYTHON_REQS=2.3 PYGOBJECT_REQS=2.90.3 +GRILO_REQS=0.2.0 +LIBXML_REQS=2.6.0 +# Used in the pkg-config file for plugins AC_SUBST(GLIB_REQS) AC_SUBST(GTK_REQS) AC_SUBST(TOTEM_PLPARSER_REQS) @@ -68,24 +71,24 @@ AC_DEFINE_UNQUOTED(TOTEM_API_VERSION, ["$TOTEM_API_VERSION"], [Define to the Totem plugin API version]) # The full list of plugins -allowed_plugins="brasero-disc-recorder chapters dbusservice im-status gromit iplayer lirc media-player-keys ontop opensubtitles properties publish pythonconsole rotation save-file samplepython sample-vala screensaver screenshot sidebar-test skipto zeitgeist-dp grilo" +allowed_plugins="apple-trailers autoload-subtitles brasero-disc-recorder chapters dbusservice im-status gromit lirc media-player-keys ontop opensubtitles properties pythonconsole recent rotation save-file samplepython sample-vala screensaver screenshot sidebar-test skipto zeitgeist-dp grilo" PLUGINDIR='${libdir}/totem/plugins' AC_SUBST(PLUGINDIR) dnl the two versions here implicate the gstreamer core and gst-plugins dnl release versions. -GST_MAJORMINOR=0.10 -GST_REQS=0.10.30 -GSTPLUG_REQS=0.10.30 +GST_MAJORMINOR=1.0 +GST_REQS=0.11.93 +GST_PLUG_BASE_REQS=0.11.93 +GSTPLUG_REQS=0.11.93 CLUTTER_REQS=1.6.8 -CLUTTER_GST_REQS=1.3.9 +CLUTTER_GST_REQS=1.5.5 CLUTTER_GTK_REQS=1.0.2 -HAVE_GSTREAMER=no - dnl Check for the required GStreamer versions for missing plugins dnl installation, unless this has been disabled. +MISSING_PLUGINS_MODULES="" AC_MSG_CHECKING([whether to enable easy codec installation support]) AC_ARG_ENABLE([easy-codec-installation], [ @@ -106,64 +109,94 @@ AC_MSG_RESULT([$enable_easy_codec_installation]) if test "x$enable_easy_codec_installation" != "xno"; then - PKG_CHECK_MODULES(MISSING_PLUGINS, gstreamer-plugins-base-0.10, + MISSING_PLUGINS_MODULES="gstreamer-pbutils-1.0" + PKG_CHECK_MODULES(MISSING_PLUGINS, $MISSING_PLUGINS_MODULES, [ - MISSING_PLUGINS_LIBS="$MISSING_PLUGINS_LIBS -lgstpbutils-0.10" AC_DEFINE([ENABLE_MISSING_PLUGIN_INSTALLATION], 1, [Whether we can and want to do installation of missing plugins]) ]) fi -MM="gstreamer-0.10 >= $GST_REQS gstreamer-base-0.10 >= $GST_REQS gstreamer-plugins-base-0.10 >= $GSTPLUG_REQS gstreamer-tag-0.10 >= $GSTPLUG_REQS clutter-1.0 >= $CLUTTER_REQS clutter-gst-1.0 >= $CLUTTER_GST_REQS clutter-gtk-1.0 mx-1.0" -PKG_CHECK_MODULES(GST, $MM) -GST_LIBS="$GST_LIBS -lgstbase-$GST_MAJORMINOR -lgstinterfaces-$GST_MAJORMINOR -lgstvideo-$GST_MAJORMINOR -lgstaudio-$GST_MAJORMINOR -lgstpbutils-$GST_MAJORMINOR -lgsttag-$GST_MAJORMINOR" -AC_SUBST(GST_LIBS) -EXTRA_BACKEND_LIBS="-lgstinterfaces-$GST_MAJORMINOR -lgstvideo-$GST_MAJORMINOR -lgstaudio-$GST_MAJORMINOR -lgstpbutils-$GST_MAJORMINOR" +# ================================================================ +# Backend requirements +# ================================================================ + +BACKEND_MODULES="gstreamer-1.0 >= $GST_REQS gstreamer-base-1.0 >= $GST_REQS gstreamer-plugins-base-1.0 >= $GST_PLUG_BASE_REQS $MISSING_PLUGINS_MODULES gstreamer-tag-1.0 >= $GSTPLUG_REQS gstreamer-audio-1.0 gstreamer-video-1.0 clutter-1.0 >= $CLUTTER_REQS clutter-gst-2.0 >= $CLUTTER_GST_REQS clutter-gtk-1.0 cairo gnome-icon-theme >= $GNOMEICON_REQS gsettings-desktop-schemas" + +PKG_CHECK_MODULES(BACKEND, $BACKEND_MODULES) +PKG_CHECK_MODULES(BACKEND_TEST, $BACKEND_MODULES gtk+-3.0 >= $GTK_REQS) dnl Check for required plugins -gst010_toolsdir=`$PKG_CONFIG --variable=toolsdir gstreamer-0.10` -gst010_inspect="$gst010_toolsdir/gst-inspect-0.10" +gst10_toolsdir=`$PKG_CONFIG --variable=toolsdir gstreamer-1.0` +gst10_inspect="$gst10_toolsdir/gst-inspect-1.0" dnl Give error and exit if we don't have the gst_inspect tool -AC_MSG_CHECKING([GStreamer 0.10 inspection tool]) -if test -r "$gst010_inspect"; then +AC_MSG_CHECKING([GStreamer 1.0 inspection tool]) +if test -r "$gst10_inspect"; then AC_MSG_RESULT([yes]) else AC_MSG_RESULT([no]) AC_MSG_ERROR([ - Cannot find required GStreamer-0.10 tool 'gst-inspect-0.10'. - It should be part of gstreamer-0_10-utils. Please install it. + Cannot find required GStreamer-1.0 tool 'gst-inspect-1.0'. + It should be part of gstreamer-1_0-utils. Please install it. ]) fi dnl Check for elements from gst-plugins-base -for base_element in playbin2 ffmpegcolorspace videoscale +dnl Set plugins which contain below elements +set -- playback videoscale +for base_element in playbin videoscale do - AC_MSG_CHECKING([GStreamer 0.10 $base_element plugin]) - if $gst010_inspect $base_element >/dev/null 2>/dev/null; then + AC_MSG_CHECKING([GStreamer 1.0 $base_element element]) + if $gst10_inspect $base_element >/dev/null 2>/dev/null; then AC_MSG_RESULT([yes]) else AC_MSG_RESULT([no]) AC_MSG_ERROR([ - Cannot find required GStreamer-0.10 plugin '$base_element'. + Cannot find required GStreamer-1.0 plugin '$1'. It should be part of gst-plugins-base. Please install it. ]) + fi + shift; done dnl Check for elements from gst-plugins-good +dnl Set plugins which contain below elements +set -- autodetect goom for good_element in autoaudiosink goom do - AC_MSG_CHECKING([GStreamer 0.10 $good_element plugin]) - if $gst010_inspect $good_element >/dev/null 2>/dev/null; then + AC_MSG_CHECKING([GStreamer 1.0 $good_element element]) + if $gst10_inspect $good_element >/dev/null 2>/dev/null; then AC_MSG_RESULT([yes]) else AC_MSG_RESULT([no]) AC_MSG_ERROR([ - Cannot find required GStreamer-0.10 plugin '$good_element'. + Cannot find required GStreamer-1.0 plugin '$1'. It should be part of gst-plugins-good. Please install it. ]) fi + shift; +done + +dnl Check for elements from gst-plugins-bad +dnl Set plugins which contain below elements +PKG_CHECK_MODULES(GST_PLUGINS_BAD, gstreamer-plugins-bad-1.0 >= 1.0.2) + +set -- scaletempo +for bad_element in scaletempo +do + AC_MSG_CHECKING([GStreamer 1.0 $bad_element element]) + if $gst10_inspect $bad_element >/dev/null 2>/dev/null; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + AC_MSG_ERROR([ + Cannot find required GStreamer-1.0 plugin '$1'. + It should be part of gst-plugins-bad. Please install it. + ]) + fi + shift; done dnl Check the smclient backend @@ -210,93 +243,6 @@ AM_CONDITIONAL([WITH_SMCLIENT_WIN32],[test "$with_smclient" = "win32"]) AM_CONDITIONAL([WITH_SMCLIENT_QUARTZ],[test "$with_smclient" = "quartz"]) -dnl Pkg-config checks - -PKG_CHECK_MODULES([DEPENDENCY],[ - glib-2.0 >= $GLIB_REQS - gio-2.0 >= $GIO_REQS - gtk+-3.0 >= $GTK_REQS - gdk-x11-3.0 >= $GTK_REQS - gmodule-2.0 - totem-plparser >= $TOTEM_PLPARSER_REQS - gstreamer-tag-0.10 >= 0.10.26 - clutter-gtk-1.0 >= $CLUTTER_GTK_REQS - cairo]) - -PKG_CHECK_MODULES(MM, $MM) - -PKG_CHECK_MODULES([GTK],[gtk+-3.0 gthread-2.0]) -GTK_LIBS="$GTK_LIBS $EXTRA_BACKEND_LIBS" -AC_SUBST(GTK_LIBS) - -AC_SUBST([EXTRA_BACKEND_LIBS]) - -PKG_CHECK_EXISTS([ - $ISO_CODES - gnome-icon-theme >= $GNOMEICON_REQS]) - -dnl ************************* -dnl X11 related functionality -dnl ************************* -have_x11=no -gdk_targets=$(pkg-config --variable=targets gtk+-3.0) -for gdk_target in $gdk_targets; do - if test x$gdk_target = xx11; then - AC_PATH_X - - have_x11=yes - - if test x"$x_includes" != x"NONE" && test -n "$x_includes" ; then - X_INCLUDES=-I`echo $x_includes | sed -e "s/:/ -I/g"` - fi - if test x"$x_libraries" != x"NONE" && test -n "$x_libraries" ; then - X_LIBRARIES=-L`echo $x_libraries | sed -e "s/:/ -L/g"` - fi - CFLAGS="$X_INCLUDES $CFLAGS" - LIBS="$X_LIBRARIES $LIBS" - - XTEST_LIBS="" - enable_xtest=no - AC_CHECK_LIB(Xtst, XTestFakeKeyEvent, - XTEST_LIBS="-lX11 -lXtst $X_LIBRARIES" - enable_xtest=yes - AC_DEFINE(HAVE_XTEST, 1, [defined if you have XTest library]), - , - $X_LIBRARIES) - AC_SUBST(XTEST_LIBS) - - X_LIBS="" - - dnl Explicitely link against libX11 to avoid problems with crappy linkers - X_LIBS="$X_LIBRARIES -lX11" - AC_SUBST(X_LIBS) - - dnl Multimedia keys - have_xfree=no - AC_COMPILE_IFELSE([ - #include - int main(int argc,char **argv) { - return 0; - } - ], - have_xfree=yes - ) - AC_MSG_CHECKING(for X11 XFree86 headers) - AC_MSG_RESULT([$have_xfree]) - if test x"$have_xfree" = "xyes" ; then - AC_DEFINE(HAVE_XFREE, 1, [defined if you have X11/XF86keysym.h]) - fi - - break - fi -done - -dnl ================================================================ -dnl Plugins support -dnl ================================================================ - -PKG_CHECK_MODULES(PEAS, libpeas-1.0 >= $PEAS_REQS) -PKG_CHECK_MODULES(PEASGTK, libpeas-gtk-1.0 >= $PEAS_REQS) # ================================================================ # Python plugins @@ -313,6 +259,7 @@ have_python=no have_pygobject=no +PYTHON_MODULES="" # Test for the Python run time and PyGObject. Test for pylint as well, for `make check`. if test "x$enable_python" != "xno"; then @@ -321,17 +268,18 @@ have_python=no fi - PKG_CHECK_MODULES([PYGOBJECT],[pygobject-3.0 >= $PYGOBJECT_REQS],[have_pygobject=yes],[have_pygobject=no]) + PYTHON_MODULES="pygobject-3.0 >= $PYGOBJECT_REQS" + PKG_CHECK_MODULES([PYGOBJECT],[$PYTHON_MODULES],[have_pygobject=yes],[have_pygobject=no]) AC_PATH_PROG([PYLINT], [pylint], [no]) fi # Output the results of the Python checks if test "x$have_python" != "xyes" -o "x$have_pygobject" != "xyes" -o "x$PYLINT" = "xno"; then if test "x$enable_python" = "xyes"; then - AC_MSG_ERROR([python >= $PYTHON_REQS, pygobject-3.0 >= $PYGOBJECT_REQS or pylint not found]) + AC_MSG_ERROR([python >= $PYTHON_REQS, $PYTHON_MODULES or pylint not found]) elif test "x$enable_python" = "xautodetect"; then enable_python=no - AC_MSG_WARN([python >= $PYTHON_REQS, pygobject-3.0 >= $PYGOBJECT_REQS or pylint not found; disabling Python support]) + AC_MSG_WARN([python >= $PYTHON_REQS, $PYTHON_MODULES or pylint not found; disabling Python support]) fi elif test "x$enable_python" != "xno"; then enable_python=yes @@ -339,6 +287,19 @@ AM_CONDITIONAL([ENABLE_PYTHON],[test "x$enable_python" = "xyes"]) +# ================================================================ +# Player requirements +#================================================================ + +PKG_CHECK_MODULES(PLAYER, $BACKEND_MODULES glib-2.0 >= $GLIB_REQS gio-2.0 >= $GIO_REQS gtk+-3.0 >= $GTK_REQS gdk-x11-3.0 >= $GTK_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS libpeas-1.0 >= $PEAS_REQS libpeas-gtk-1.0 >= $PEAS_REQS $PYTHON_MODULES) +PKG_CHECK_MODULES(LIBPLAYER, glib-2.0 >= $GLIB_REQS gio-2.0 >= $GIO_REQS gtk+-3.0 >= $GTK_REQS gdk-x11-3.0 >= $GTK_REQS clutter-gtk-1.0) +PKG_CHECK_MODULES(HELPER, gstreamer-1.0 gstreamer-tag-1.0) +PKG_CHECK_MODULES(TIME_HELPER, glib-2.0) +PKG_CHECK_MODULES(PIXBUF_HELPER, gdk-pixbuf-2.0 gstreamer-tag-1.0 >= $GSTPLUG_REQS gstreamer-video-1.0) +PKG_CHECK_MODULES(THUMBNAILER, gtk+-3.0 >= $GTK_REQS totem-plparser >= $TOTEM_PLPARSER_REQS gstreamer-tag-1.0 >= $GSTPLUG_REQS gstreamer-video-1.0) +PKG_CHECK_MODULES(PREVIEW, gstreamer-1.0 >= $GST_REQS gio-2.0 >= $GIO_REQS gdk-pixbuf-2.0) +PKG_CHECK_MODULES(PROPERTIES, gtk+-3.0 >= $GTK_REQS) + dnl ================================================================ dnl Vala plugins dnl ================================================================ @@ -375,6 +336,11 @@ fi } +plugin_error() +{ + AC_MSG_ERROR([$1]) +} + AC_ARG_WITH([plugins], [AS_HELP_STRING([--with-plugins],[Which Totem plugins to compile (default: auto; "all", "none" and "autodetect" are valid)])], [], [with_plugins=autodetect]) @@ -417,16 +383,25 @@ case ${plugin} in gromit) + have_x11=no + gdk_targets=$(pkg-config --variable=targets gtk+-3.0) + for gdk_target in $gdk_targets; do + if test x$gdk_target = xx11; then + have_x11=yes + break + fi + done + if test "${have_x11}" != "yes" ; then plugin_error_or_ignore "the gromit plugin is not supported on non-X11 targets" add_plugin="0" fi ;; media-player-keys) - PKG_CHECK_MODULES(MEDIA_PLAYER_KEYS, gio-2.0 >= 2.24, + PKG_CHECK_MODULES(MEDIA_PLAYER_KEYS, gio-2.0, [HAVE_MEDIA_PLAYER_KEYS=yes], [HAVE_MEDIA_PLAYER_KEYS=no]) if test "${HAVE_MEDIA_PLAYER_KEYS}" != "yes" ; then - plugin_error_or_ignore "you need gio >= 2.24 installed for the media-player-keys plugin" + plugin_error "you need gio installed for the media-player-keys plugin" add_plugin="0" fi ;; @@ -444,14 +419,6 @@ add_plugin="0" fi ;; - publish) - # FIXME - PKG_CHECK_MODULES(LIBEPC, libepc-ui-1.0 > 0.4.0, [HAVE_LIBEPC=yes], [HAVE_LIBEPC=no]) - if test "${HAVE_LIBEPC}" != "yes" ; then - plugin_error_or_ignore "you need the easy-publish-and-consume library installed for the publish plugin" - add_plugin="0" - fi - ;; rotation) if test "${with_vala}" != "yes" ; then plugin_error_or_ignore "you need vala installed to use the rotation plugin" @@ -492,10 +459,10 @@ fi ;; chapters) - PKG_CHECK_MODULES(CHAPTERS, libxml-2.0 >= 2.6.0 gtk+-3.0 glib-2.0 >= 2.15.0, + PKG_CHECK_MODULES(CHAPTERS, libxml-2.0 >= $LIBXML_REQS gtk+-3.0 glib-2.0, [BUILD_CHAPTERS=yes], [BUILD_CHAPTERS=no]) if test "${BUILD_CHAPTERS}" != "yes" ; then - plugin_error_or_ignore "you need gtk+-3.0, glib-2.0 >= 2.15.0 and libxml-2.0 >= 2.6.0 to use the chapters plugin" + plugin_error "you need gtk+-3.0, glib-2.0 >= 2.15.0 and libxml-2.0 >= 2.6.0 to use the chapters plugin" add_plugin="0" fi ;; @@ -516,10 +483,10 @@ fi ;; grilo) - PKG_CHECK_MODULES(LIBGRILO, grilo-0.1 >= 0.1.16, + PKG_CHECK_MODULES(LIBGRILO, grilo-0.2 >= $GRILO_REQS, [HAVE_LIBGRILO=yes], [HAVE_LIBGRILO=no]) if test "${HAVE_LIBGRILO}" != "yes" ; then - plugin_error_or_ignore "you need libgrilo >= 0.1.16 installed for the Grilo plugin" + plugin_error "you need libgrilo >= $GRILO_REQS installed for the Grilo plugin" add_plugin="0" fi ;; @@ -560,6 +527,7 @@ PKG_CHECK_MODULES([BROWSER_PLUGIN], [glib-2.0 gio-2.0 >= $GIO_REQS + gmodule-export-2.0 x11 totem-plparser-mini >= $TOTEM_PLPARSER_REQS], [],[enable_browser_plugins=no]) @@ -600,6 +568,9 @@ if test "$have_no_rtti_flag" = "yes"; then AM_CXXFLAGS="-fno-rtti $AM_CXXFLAGS" fi + + PKG_CHECK_MODULES(PLUGIN_VIEWER, $BACKEND_MODULES gtk+-3.0 >= $GTK_REQS totem-plparser >= $TOTEM_PLPARSER_REQS gdk-x11-3.0 >= $GTK_REQS dbus-glib-1 >= $DBUS_REQS) + PKG_CHECK_MODULES(GLOW_BUTTON, gtk+-3.0) fi AM_CONDITIONAL([ENABLE_BROWSER_PLUGINS], [test "$enable_browser_plugins" = "yes"]) @@ -661,7 +632,7 @@ [ENABLE_NAUTILUS=yes]) dnl Default value if test x$ENABLE_NAUTILUS = "xyes" ; then - PKG_CHECK_MODULES(NAUTILUS, gtk+-3.0 gthread-2.0 libnautilus-extension, + PKG_CHECK_MODULES(NAUTILUS, gtk+-3.0 gthread-2.0 libnautilus-extension gstreamer-tag-1.0 >= $GSTPLUG_REQS $MISSING_PLUGINS_MODULES, [HAVE_NAUTILUS=yes], [HAVE_NAUTILUS=no]) fi @@ -670,9 +641,6 @@ [ac_with_nautilusdir=$withval], [ac_with_nautilusdir=""]) -NAUTILUS_LIBS="$NAUTILUS_LIBS $EXTRA_BACKEND_LIBS" -AC_SUBST(NAUTILUS_CFLAGS) -AC_SUBST(NAUTILUS_LIBS) if test x$HAVE_NAUTILUS = "xyes"; then AC_DEFINE(HAVE_NAUTILUS, 1, [defined if you build the nautilus plugin]) if test "${ac_with_nautilusdir}" = ""; then @@ -742,23 +710,24 @@ AC_OUTPUT([ Makefile totem.spec -lib/Makefile src/Makefile src/gst/Makefile src/properties/Makefile src/plugins/Makefile +src/plugins/apple-trailers/Makefile +src/plugins/autoload-subtitles/Makefile src/plugins/dbusservice/Makefile src/plugins/screensaver/Makefile src/plugins/screenshot/Makefile src/plugins/ontop/Makefile src/plugins/im-status/Makefile src/plugins/gromit/Makefile -src/plugins/iplayer/Makefile src/plugins/lirc/Makefile src/plugins/media-player-keys/Makefile src/plugins/opensubtitles/Makefile src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in src/plugins/properties/Makefile +src/plugins/recent/Makefile src/plugins/rotation/Makefile src/plugins/save-file/Makefile src/plugins/sidebar-test/Makefile @@ -767,8 +736,6 @@ src/plugins/sample-vala/Makefile src/plugins/pythonconsole/Makefile src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in -src/plugins/publish/Makefile -src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in src/plugins/brasero-disc-recorder/Makefile src/plugins/chapters/Makefile src/plugins/zeitgeist-dp/Makefile @@ -862,16 +829,6 @@ else AC_MSG_NOTICE([ Nautilus properties page disabled]) fi -if test x$enable_xtest = xyes ; then - AC_MSG_NOTICE([** XTest (legacy screensaver) support enabled]) -else - AC_MSG_NOTICE([ XTest (legacy screensaver) support disabled]) -fi -if test x$have_xfree = xyes ; then - AC_MSG_NOTICE([** XFree86 multimedia keys support enabled]) -else - AC_MSG_NOTICE([ XFree86 multimedia keys support disabled]) -fi if test "$with_smclient" != "no" ; then AC_MSG_NOTICE([** SM client support enabled]) else diff -Nru totem-3.4.3/data/Makefile.am totem-3.6.2/data/Makefile.am --- totem-3.4.3/data/Makefile.am 2012-07-04 09:52:28.000000000 +0000 +++ totem-3.6.2/data/Makefile.am 2012-10-25 13:15:32.000000000 +0000 @@ -26,6 +26,7 @@ fullscreen.ui \ playlist.ui \ mozilla-viewer.ui \ + preferences.ui \ properties.ui \ uri.ui \ video-list.ui \ @@ -82,15 +83,18 @@ $(thumbnailer_DATA) # Content type handling -nodist_noinst_HEADERS = totem-mime-types.h nautilus-audio-mime-types.h totem-uri-schemes.h +nodist_noinst_HEADERS = totem-mime-types.h nautilus-audio-mime-types.h totem-uri-schemes.h totemMimeTypes.js totem-mime-types.h: mime-type-include.sh mime-type-list.txt mime-functions.sh $(AM_V_GEN) $(srcdir)/mime-type-include.sh $(srcdir)/mime-type-list.txt > $@ nautilus-audio-mime-types.h: mime-type-include.sh mime-type-list.txt mime-functions.sh $(AM_V_GEN) $(srcdir)/mime-type-include.sh --nautilus $(srcdir)/mime-type-list.txt > $@ +totemMimeTypes.js: mime-type-imports.sh mime-type-list.txt mime-functions.sh + $(AM_V_GEN) $(srcdir)/mime-type-imports.sh $(srcdir)/mime-type-list.txt > $@ totem-uri-schemes.h: mime-type-include.sh mime-type-list.txt mime-functions.sh $(AM_V_GEN) $(srcdir)/uri-scheme-include.sh $(srcdir)/uri-schemes-list.txt > $@ EXTRA_DIST += \ + mime-type-imports.sh \ mime-type-include.sh \ mime-type-list.txt \ uri-scheme-include.sh \ @@ -100,7 +104,8 @@ totem-mime-types.h \ totem-uri-schemes.h \ nautilus-audio-mime-types.h \ - totem-uri-schemes.h + totem-uri-schemes.h \ + totemMimeTypes.js # GSettings schemas, enum files and conversion file gsettings_ENUM_NAMESPACE = org.gnome.totem diff -Nru totem-3.4.3/data/Makefile.in totem-3.6.2/data/Makefile.in --- totem-3.4.3/data/Makefile.in 2012-07-04 09:54:47.000000000 +0000 +++ totem-3.6.2/data/Makefile.in 2012-10-25 13:36:18.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -41,10 +57,7 @@ $(srcdir)/org.gnome.totem.gschema.xml.in.in \ $(srcdir)/totem.desktop.in.in.in $(srcdir)/totem.pc.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -84,12 +97,18 @@ "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(stuffdir)" \ "$(DESTDIR)$(thumbnailerdir)" SCRIPTS = $(bugreport_SCRIPTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -99,6 +118,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac man1dir = $(mandir)/man1 NROFF = nroff MANS = $(man_MANS) @@ -154,6 +178,10 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BACKEND_CFLAGS = @BACKEND_CFLAGS@ +BACKEND_LIBS = @BACKEND_LIBS@ +BACKEND_TEST_CFLAGS = @BACKEND_TEST_CFLAGS@ +BACKEND_TEST_LIBS = @BACKEND_TEST_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ BROWSER_PLUGIN_DIR = @BROWSER_PLUGIN_DIR@ BROWSER_PLUGIN_LIBS = @BROWSER_PLUGIN_LIBS@ @@ -175,8 +203,6 @@ DBUS_LIBS = @DBUS_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DEPENDENCY_CFLAGS = @DEPENDENCY_CFLAGS@ -DEPENDENCY_LIBS = @DEPENDENCY_LIBS@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DISC_RECORDER_CFLAGS = @DISC_RECORDER_CFLAGS@ DISC_RECORDER_LIBS = @DISC_RECORDER_LIBS@ @@ -190,7 +216,6 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -EXTRA_BACKEND_LIBS = @EXTRA_BACKEND_LIBS@ FGREP = @FGREP@ FULL_LIBEXECDIR = @FULL_LIBEXECDIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ @@ -198,19 +223,21 @@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GLIB_REQS = @GLIB_REQS@ +GLOW_BUTTON_CFLAGS = @GLOW_BUTTON_CFLAGS@ +GLOW_BUTTON_LIBS = @GLOW_BUTTON_LIBS@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ -GST_CFLAGS = @GST_CFLAGS@ -GST_LIBS = @GST_LIBS@ +GST_PLUGINS_BAD_CFLAGS = @GST_PLUGINS_BAD_CFLAGS@ +GST_PLUGINS_BAD_LIBS = @GST_PLUGINS_BAD_LIBS@ GTKDOC_CHECK = @GTKDOC_CHECK@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_LIBS = @GTK_LIBS@ GTK_REQS = @GTK_REQS@ +HELPER_CFLAGS = @HELPER_CFLAGS@ +HELPER_LIBS = @HELPER_LIBS@ HELP_DIR = @HELP_DIR@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ @@ -236,11 +263,11 @@ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBEPC_CFLAGS = @LIBEPC_CFLAGS@ -LIBEPC_LIBS = @LIBEPC_LIBS@ LIBGRILO_CFLAGS = @LIBGRILO_CFLAGS@ LIBGRILO_LIBS = @LIBGRILO_LIBS@ LIBOBJS = @LIBOBJS@ +LIBPLAYER_CFLAGS = @LIBPLAYER_CFLAGS@ +LIBPLAYER_LIBS = @LIBPLAYER_LIBS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBZEITGEIST_CFLAGS = @LIBZEITGEIST_CFLAGS@ @@ -257,8 +284,6 @@ MISSING_PLUGINS_CFLAGS = @MISSING_PLUGINS_CFLAGS@ MISSING_PLUGINS_LIBS = @MISSING_PLUGINS_LIBS@ MKDIR_P = @MKDIR_P@ -MM_CFLAGS = @MM_CFLAGS@ -MM_LIBS = @MM_LIBS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ NAUTILUSDIR = @NAUTILUSDIR@ @@ -279,15 +304,21 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PEASGTK_CFLAGS = @PEASGTK_CFLAGS@ -PEASGTK_LIBS = @PEASGTK_LIBS@ -PEAS_CFLAGS = @PEAS_CFLAGS@ -PEAS_LIBS = @PEAS_LIBS@ +PIXBUF_HELPER_CFLAGS = @PIXBUF_HELPER_CFLAGS@ +PIXBUF_HELPER_LIBS = @PIXBUF_HELPER_LIBS@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +PLAYER_CFLAGS = @PLAYER_CFLAGS@ +PLAYER_LIBS = @PLAYER_LIBS@ PLUGINDIR = @PLUGINDIR@ PLUGINS = @PLUGINS@ +PLUGIN_VIEWER_CFLAGS = @PLUGIN_VIEWER_CFLAGS@ +PLUGIN_VIEWER_LIBS = @PLUGIN_VIEWER_LIBS@ +PREVIEW_CFLAGS = @PREVIEW_CFLAGS@ +PREVIEW_LIBS = @PREVIEW_LIBS@ +PROPERTIES_CFLAGS = @PROPERTIES_CFLAGS@ +PROPERTIES_LIBS = @PROPERTIES_LIBS@ PYGOBJECT_CFLAGS = @PYGOBJECT_CFLAGS@ PYGOBJECT_LIBS = @PYGOBJECT_LIBS@ PYLINT = @PYLINT@ @@ -307,6 +338,10 @@ SMCLIENT_CFLAGS = @SMCLIENT_CFLAGS@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ +THUMBNAILER_CFLAGS = @THUMBNAILER_CFLAGS@ +THUMBNAILER_LIBS = @THUMBNAILER_LIBS@ +TIME_HELPER_CFLAGS = @TIME_HELPER_CFLAGS@ +TIME_HELPER_LIBS = @TIME_HELPER_LIBS@ TOTEM_API_VERSION = @TOTEM_API_VERSION@ TOTEM_PLPARSER_REQS = @TOTEM_PLPARSER_REQS@ TOTEM_VERSION_MAJOR = @TOTEM_VERSION_MAJOR@ @@ -318,9 +353,6 @@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ XGETTEXT = @XGETTEXT@ -XMKMF = @XMKMF@ -XTEST_LIBS = @XTEST_LIBS@ -X_LIBS = @X_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -384,13 +416,13 @@ SUBDIRS = icons EXTRA_DIST = $(bugreport_SCRIPTS) $(man_MANS) \ totem-video-thumbnailer.pod $(stuff_DATA) desktop.sh \ - $(thumbnailer_in_files) thumbnailer.sh mime-type-include.sh \ - mime-type-list.txt uri-scheme-include.sh uri-schemes-list.txt \ - mime-functions.sh $(convert_DATA) + $(thumbnailer_in_files) thumbnailer.sh mime-type-imports.sh \ + mime-type-include.sh mime-type-list.txt uri-scheme-include.sh \ + uri-schemes-list.txt mime-functions.sh $(convert_DATA) CLEANFILES = $(desktop_in_files) $(desktop_DATA) $(thumbnailer_DATA) \ totem-mime-types.h totem-uri-schemes.h \ nautilus-audio-mime-types.h totem-uri-schemes.h \ - $(gsettings_SCHEMAS) + totemMimeTypes.js $(gsettings_SCHEMAS) # Bug reporting information script bugreportdir = $(libexecdir)/totem @@ -409,6 +441,7 @@ fullscreen.ui \ playlist.ui \ mozilla-viewer.ui \ + preferences.ui \ properties.ui \ uri.ui \ video-list.ui \ @@ -433,7 +466,7 @@ thumbnailer_DATA = $(thumbnailer_in_files:.thumbnailer.in=.thumbnailer) # Content type handling -nodist_noinst_HEADERS = totem-mime-types.h nautilus-audio-mime-types.h totem-uri-schemes.h +nodist_noinst_HEADERS = totem-mime-types.h nautilus-audio-mime-types.h totem-uri-schemes.h totemMimeTypes.js # GSettings schemas, enum files and conversion file gsettings_ENUM_NAMESPACE = org.gnome.totem @@ -486,8 +519,11 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-bugreportSCRIPTS: $(bugreport_SCRIPTS) @$(NORMAL_INSTALL) - test -z "$(bugreportdir)" || $(MKDIR_P) "$(DESTDIR)$(bugreportdir)" @list='$(bugreport_SCRIPTS)'; test -n "$(bugreportdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bugreportdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bugreportdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ @@ -524,11 +560,18 @@ -rm -rf .libs _libs install-man1: $(man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" - @list=''; test -n "$(man1dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.1[a-z]*$$/p'; \ + @list1=''; \ + list2='$(man_MANS)'; \ + test -n "$(man1dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.1[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -560,8 +603,11 @@ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) install-convertDATA: $(convert_DATA) @$(NORMAL_INSTALL) - test -z "$(convertdir)" || $(MKDIR_P) "$(DESTDIR)$(convertdir)" @list='$(convert_DATA)'; test -n "$(convertdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(convertdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(convertdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -578,8 +624,11 @@ dir='$(DESTDIR)$(convertdir)'; $(am__uninstall_files_from_dir) install-desktopDATA: $(desktop_DATA) @$(NORMAL_INSTALL) - test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)" @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(desktopdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(desktopdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -596,8 +645,11 @@ dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir) install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) - test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -614,8 +666,11 @@ dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) install-stuffDATA: $(stuff_DATA) @$(NORMAL_INSTALL) - test -z "$(stuffdir)" || $(MKDIR_P) "$(DESTDIR)$(stuffdir)" @list='$(stuff_DATA)'; test -n "$(stuffdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(stuffdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(stuffdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -632,8 +687,11 @@ dir='$(DESTDIR)$(stuffdir)'; $(am__uninstall_files_from_dir) install-thumbnailerDATA: $(thumbnailer_DATA) @$(NORMAL_INSTALL) - test -z "$(thumbnailerdir)" || $(MKDIR_P) "$(DESTDIR)$(thumbnailerdir)" @list='$(thumbnailer_DATA)'; test -n "$(thumbnailerdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(thumbnailerdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(thumbnailerdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -650,12 +708,12 @@ dir='$(DESTDIR)$(thumbnailerdir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -665,7 +723,11 @@ done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -679,37 +741,6 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ @@ -718,6 +749,10 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done +cscopelist-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ + done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -781,6 +816,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -791,10 +840,10 @@ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ if test -n "$$list" && \ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ + echo "error: found man pages containing the 'missing help2man' replacement text:" >&2; \ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ + echo " typically 'make maintainer-clean' will remove them" >&2; \ exit 1; \ else :; fi; \ else :; fi @@ -829,13 +878,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -968,29 +1014,30 @@ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook uninstall-man: uninstall-man1 -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-data-am install-strip tags-recursive \ - uninstall-am +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ + cscopelist-recursive ctags-recursive install-am \ + install-data-am install-strip tags-recursive uninstall-am .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am \ - install-bugreportSCRIPTS install-convertDATA install-data \ - install-data-am install-data-hook install-desktopDATA \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-man1 install-pdf install-pdf-am \ - install-pkgconfigDATA install-ps install-ps-am install-strip \ - install-stuffDATA install-thumbnailerDATA installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-bugreportSCRIPTS \ - uninstall-convertDATA uninstall-desktopDATA uninstall-hook \ - uninstall-man uninstall-man1 uninstall-pkgconfigDATA \ - uninstall-stuffDATA uninstall-thumbnailerDATA + cscopelist cscopelist-recursive ctags ctags-recursive \ + distclean distclean-generic distclean-libtool distclean-tags \ + distdir dvi dvi-am html html-am info info-am install \ + install-am install-bugreportSCRIPTS install-convertDATA \ + install-data install-data-am install-data-hook \ + install-desktopDATA install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-man1 install-pdf \ + install-pdf-am install-pkgconfigDATA install-ps install-ps-am \ + install-strip install-stuffDATA install-thumbnailerDATA \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-recursive uninstall uninstall-am \ + uninstall-bugreportSCRIPTS uninstall-convertDATA \ + uninstall-desktopDATA uninstall-hook uninstall-man \ + uninstall-man1 uninstall-pkgconfigDATA uninstall-stuffDATA \ + uninstall-thumbnailerDATA totem-video-thumbnailer.1: totem-video-thumbnailer.pod $(AM_V_GEN) pod2man -c "" -s 1 -q none -n totem-video-thumbnailer -r GNOME $< > $@ @@ -1018,6 +1065,8 @@ $(AM_V_GEN) $(srcdir)/mime-type-include.sh $(srcdir)/mime-type-list.txt > $@ nautilus-audio-mime-types.h: mime-type-include.sh mime-type-list.txt mime-functions.sh $(AM_V_GEN) $(srcdir)/mime-type-include.sh --nautilus $(srcdir)/mime-type-list.txt > $@ +totemMimeTypes.js: mime-type-imports.sh mime-type-list.txt mime-functions.sh + $(AM_V_GEN) $(srcdir)/mime-type-imports.sh $(srcdir)/mime-type-list.txt > $@ totem-uri-schemes.h: mime-type-include.sh mime-type-list.txt mime-functions.sh $(AM_V_GEN) $(srcdir)/uri-scheme-include.sh $(srcdir)/uri-schemes-list.txt > $@ diff -Nru totem-3.4.3/data/fullscreen.ui totem-3.6.2/data/fullscreen.ui --- totem-3.4.3/data/fullscreen.ui 2012-07-04 09:52:28.000000000 +0000 +++ totem-3.6.2/data/fullscreen.ui 2012-10-09 16:42:34.000000000 +0000 @@ -17,7 +17,6 @@ GDK_GRAVITY_NORTH_WEST True False - @@ -27,7 +26,6 @@ True GTK_RELIEF_NORMAL True - @@ -110,7 +108,6 @@ GDK_GRAVITY_SOUTH_WEST True False - @@ -184,7 +181,6 @@ tcw_seek_adjustment - 0 diff -Nru totem-3.4.3/data/icons/16x16/Makefile.in totem-3.6.2/data/icons/16x16/Makefile.in --- totem-3.4.3/data/icons/16x16/Makefile.in 2012-07-04 09:54:47.000000000 +0000 +++ totem-3.6.2/data/icons/16x16/Makefile.in 2012-10-25 13:36:18.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -37,24 +53,32 @@ subdir = data/icons/16x16 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -100,6 +124,10 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BACKEND_CFLAGS = @BACKEND_CFLAGS@ +BACKEND_LIBS = @BACKEND_LIBS@ +BACKEND_TEST_CFLAGS = @BACKEND_TEST_CFLAGS@ +BACKEND_TEST_LIBS = @BACKEND_TEST_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ BROWSER_PLUGIN_DIR = @BROWSER_PLUGIN_DIR@ BROWSER_PLUGIN_LIBS = @BROWSER_PLUGIN_LIBS@ @@ -121,8 +149,6 @@ DBUS_LIBS = @DBUS_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DEPENDENCY_CFLAGS = @DEPENDENCY_CFLAGS@ -DEPENDENCY_LIBS = @DEPENDENCY_LIBS@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DISC_RECORDER_CFLAGS = @DISC_RECORDER_CFLAGS@ DISC_RECORDER_LIBS = @DISC_RECORDER_LIBS@ @@ -136,7 +162,6 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -EXTRA_BACKEND_LIBS = @EXTRA_BACKEND_LIBS@ FGREP = @FGREP@ FULL_LIBEXECDIR = @FULL_LIBEXECDIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ @@ -144,19 +169,21 @@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GLIB_REQS = @GLIB_REQS@ +GLOW_BUTTON_CFLAGS = @GLOW_BUTTON_CFLAGS@ +GLOW_BUTTON_LIBS = @GLOW_BUTTON_LIBS@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ -GST_CFLAGS = @GST_CFLAGS@ -GST_LIBS = @GST_LIBS@ +GST_PLUGINS_BAD_CFLAGS = @GST_PLUGINS_BAD_CFLAGS@ +GST_PLUGINS_BAD_LIBS = @GST_PLUGINS_BAD_LIBS@ GTKDOC_CHECK = @GTKDOC_CHECK@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_LIBS = @GTK_LIBS@ GTK_REQS = @GTK_REQS@ +HELPER_CFLAGS = @HELPER_CFLAGS@ +HELPER_LIBS = @HELPER_LIBS@ HELP_DIR = @HELP_DIR@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ @@ -182,11 +209,11 @@ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBEPC_CFLAGS = @LIBEPC_CFLAGS@ -LIBEPC_LIBS = @LIBEPC_LIBS@ LIBGRILO_CFLAGS = @LIBGRILO_CFLAGS@ LIBGRILO_LIBS = @LIBGRILO_LIBS@ LIBOBJS = @LIBOBJS@ +LIBPLAYER_CFLAGS = @LIBPLAYER_CFLAGS@ +LIBPLAYER_LIBS = @LIBPLAYER_LIBS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBZEITGEIST_CFLAGS = @LIBZEITGEIST_CFLAGS@ @@ -203,8 +230,6 @@ MISSING_PLUGINS_CFLAGS = @MISSING_PLUGINS_CFLAGS@ MISSING_PLUGINS_LIBS = @MISSING_PLUGINS_LIBS@ MKDIR_P = @MKDIR_P@ -MM_CFLAGS = @MM_CFLAGS@ -MM_LIBS = @MM_LIBS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ NAUTILUSDIR = @NAUTILUSDIR@ @@ -225,15 +250,21 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PEASGTK_CFLAGS = @PEASGTK_CFLAGS@ -PEASGTK_LIBS = @PEASGTK_LIBS@ -PEAS_CFLAGS = @PEAS_CFLAGS@ -PEAS_LIBS = @PEAS_LIBS@ +PIXBUF_HELPER_CFLAGS = @PIXBUF_HELPER_CFLAGS@ +PIXBUF_HELPER_LIBS = @PIXBUF_HELPER_LIBS@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +PLAYER_CFLAGS = @PLAYER_CFLAGS@ +PLAYER_LIBS = @PLAYER_LIBS@ PLUGINDIR = @PLUGINDIR@ PLUGINS = @PLUGINS@ +PLUGIN_VIEWER_CFLAGS = @PLUGIN_VIEWER_CFLAGS@ +PLUGIN_VIEWER_LIBS = @PLUGIN_VIEWER_LIBS@ +PREVIEW_CFLAGS = @PREVIEW_CFLAGS@ +PREVIEW_LIBS = @PREVIEW_LIBS@ +PROPERTIES_CFLAGS = @PROPERTIES_CFLAGS@ +PROPERTIES_LIBS = @PROPERTIES_LIBS@ PYGOBJECT_CFLAGS = @PYGOBJECT_CFLAGS@ PYGOBJECT_LIBS = @PYGOBJECT_LIBS@ PYLINT = @PYLINT@ @@ -253,6 +284,10 @@ SMCLIENT_CFLAGS = @SMCLIENT_CFLAGS@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ +THUMBNAILER_CFLAGS = @THUMBNAILER_CFLAGS@ +THUMBNAILER_LIBS = @THUMBNAILER_LIBS@ +TIME_HELPER_CFLAGS = @TIME_HELPER_CFLAGS@ +TIME_HELPER_LIBS = @TIME_HELPER_LIBS@ TOTEM_API_VERSION = @TOTEM_API_VERSION@ TOTEM_PLPARSER_REQS = @TOTEM_PLPARSER_REQS@ TOTEM_VERSION_MAJOR = @TOTEM_VERSION_MAJOR@ @@ -264,9 +299,6 @@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ XGETTEXT = @XGETTEXT@ -XMKMF = @XMKMF@ -XTEST_LIBS = @XTEST_LIBS@ -X_LIBS = @X_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -373,8 +405,11 @@ -rm -rf .libs _libs install-iconDATA: $(icon_DATA) @$(NORMAL_INSTALL) - test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)" @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(icondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(icondir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -391,8 +426,11 @@ dir='$(DESTDIR)$(icondir)'; $(am__uninstall_files_from_dir) install-tviconDATA: $(tvicon_DATA) @$(NORMAL_INSTALL) - test -z "$(tvicondir)" || $(MKDIR_P) "$(DESTDIR)$(tvicondir)" @list='$(tvicon_DATA)'; test -n "$(tvicondir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(tvicondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(tvicondir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -413,6 +451,8 @@ ctags: CTAGS CTAGS: +cscope cscopelist: + distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ diff -Nru totem-3.4.3/data/icons/22x22/Makefile.in totem-3.6.2/data/icons/22x22/Makefile.in --- totem-3.4.3/data/icons/22x22/Makefile.in 2012-07-04 09:54:47.000000000 +0000 +++ totem-3.6.2/data/icons/22x22/Makefile.in 2012-10-25 13:36:18.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -37,24 +53,32 @@ subdir = data/icons/22x22 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -100,6 +124,10 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BACKEND_CFLAGS = @BACKEND_CFLAGS@ +BACKEND_LIBS = @BACKEND_LIBS@ +BACKEND_TEST_CFLAGS = @BACKEND_TEST_CFLAGS@ +BACKEND_TEST_LIBS = @BACKEND_TEST_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ BROWSER_PLUGIN_DIR = @BROWSER_PLUGIN_DIR@ BROWSER_PLUGIN_LIBS = @BROWSER_PLUGIN_LIBS@ @@ -121,8 +149,6 @@ DBUS_LIBS = @DBUS_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DEPENDENCY_CFLAGS = @DEPENDENCY_CFLAGS@ -DEPENDENCY_LIBS = @DEPENDENCY_LIBS@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DISC_RECORDER_CFLAGS = @DISC_RECORDER_CFLAGS@ DISC_RECORDER_LIBS = @DISC_RECORDER_LIBS@ @@ -136,7 +162,6 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -EXTRA_BACKEND_LIBS = @EXTRA_BACKEND_LIBS@ FGREP = @FGREP@ FULL_LIBEXECDIR = @FULL_LIBEXECDIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ @@ -144,19 +169,21 @@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GLIB_REQS = @GLIB_REQS@ +GLOW_BUTTON_CFLAGS = @GLOW_BUTTON_CFLAGS@ +GLOW_BUTTON_LIBS = @GLOW_BUTTON_LIBS@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ -GST_CFLAGS = @GST_CFLAGS@ -GST_LIBS = @GST_LIBS@ +GST_PLUGINS_BAD_CFLAGS = @GST_PLUGINS_BAD_CFLAGS@ +GST_PLUGINS_BAD_LIBS = @GST_PLUGINS_BAD_LIBS@ GTKDOC_CHECK = @GTKDOC_CHECK@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_LIBS = @GTK_LIBS@ GTK_REQS = @GTK_REQS@ +HELPER_CFLAGS = @HELPER_CFLAGS@ +HELPER_LIBS = @HELPER_LIBS@ HELP_DIR = @HELP_DIR@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ @@ -182,11 +209,11 @@ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBEPC_CFLAGS = @LIBEPC_CFLAGS@ -LIBEPC_LIBS = @LIBEPC_LIBS@ LIBGRILO_CFLAGS = @LIBGRILO_CFLAGS@ LIBGRILO_LIBS = @LIBGRILO_LIBS@ LIBOBJS = @LIBOBJS@ +LIBPLAYER_CFLAGS = @LIBPLAYER_CFLAGS@ +LIBPLAYER_LIBS = @LIBPLAYER_LIBS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBZEITGEIST_CFLAGS = @LIBZEITGEIST_CFLAGS@ @@ -203,8 +230,6 @@ MISSING_PLUGINS_CFLAGS = @MISSING_PLUGINS_CFLAGS@ MISSING_PLUGINS_LIBS = @MISSING_PLUGINS_LIBS@ MKDIR_P = @MKDIR_P@ -MM_CFLAGS = @MM_CFLAGS@ -MM_LIBS = @MM_LIBS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ NAUTILUSDIR = @NAUTILUSDIR@ @@ -225,15 +250,21 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PEASGTK_CFLAGS = @PEASGTK_CFLAGS@ -PEASGTK_LIBS = @PEASGTK_LIBS@ -PEAS_CFLAGS = @PEAS_CFLAGS@ -PEAS_LIBS = @PEAS_LIBS@ +PIXBUF_HELPER_CFLAGS = @PIXBUF_HELPER_CFLAGS@ +PIXBUF_HELPER_LIBS = @PIXBUF_HELPER_LIBS@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +PLAYER_CFLAGS = @PLAYER_CFLAGS@ +PLAYER_LIBS = @PLAYER_LIBS@ PLUGINDIR = @PLUGINDIR@ PLUGINS = @PLUGINS@ +PLUGIN_VIEWER_CFLAGS = @PLUGIN_VIEWER_CFLAGS@ +PLUGIN_VIEWER_LIBS = @PLUGIN_VIEWER_LIBS@ +PREVIEW_CFLAGS = @PREVIEW_CFLAGS@ +PREVIEW_LIBS = @PREVIEW_LIBS@ +PROPERTIES_CFLAGS = @PROPERTIES_CFLAGS@ +PROPERTIES_LIBS = @PROPERTIES_LIBS@ PYGOBJECT_CFLAGS = @PYGOBJECT_CFLAGS@ PYGOBJECT_LIBS = @PYGOBJECT_LIBS@ PYLINT = @PYLINT@ @@ -253,6 +284,10 @@ SMCLIENT_CFLAGS = @SMCLIENT_CFLAGS@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ +THUMBNAILER_CFLAGS = @THUMBNAILER_CFLAGS@ +THUMBNAILER_LIBS = @THUMBNAILER_LIBS@ +TIME_HELPER_CFLAGS = @TIME_HELPER_CFLAGS@ +TIME_HELPER_LIBS = @TIME_HELPER_LIBS@ TOTEM_API_VERSION = @TOTEM_API_VERSION@ TOTEM_PLPARSER_REQS = @TOTEM_PLPARSER_REQS@ TOTEM_VERSION_MAJOR = @TOTEM_VERSION_MAJOR@ @@ -264,9 +299,6 @@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ XGETTEXT = @XGETTEXT@ -XMKMF = @XMKMF@ -XTEST_LIBS = @XTEST_LIBS@ -X_LIBS = @X_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -373,8 +405,11 @@ -rm -rf .libs _libs install-iconDATA: $(icon_DATA) @$(NORMAL_INSTALL) - test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)" @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(icondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(icondir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -391,8 +426,11 @@ dir='$(DESTDIR)$(icondir)'; $(am__uninstall_files_from_dir) install-tviconDATA: $(tvicon_DATA) @$(NORMAL_INSTALL) - test -z "$(tvicondir)" || $(MKDIR_P) "$(DESTDIR)$(tvicondir)" @list='$(tvicon_DATA)'; test -n "$(tvicondir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(tvicondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(tvicondir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -413,6 +451,8 @@ ctags: CTAGS CTAGS: +cscope cscopelist: + distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ diff -Nru totem-3.4.3/data/icons/24x24/Makefile.in totem-3.6.2/data/icons/24x24/Makefile.in --- totem-3.4.3/data/icons/24x24/Makefile.in 2012-07-04 09:54:47.000000000 +0000 +++ totem-3.6.2/data/icons/24x24/Makefile.in 2012-10-25 13:36:19.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -37,24 +53,32 @@ subdir = data/icons/24x24 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -100,6 +124,10 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BACKEND_CFLAGS = @BACKEND_CFLAGS@ +BACKEND_LIBS = @BACKEND_LIBS@ +BACKEND_TEST_CFLAGS = @BACKEND_TEST_CFLAGS@ +BACKEND_TEST_LIBS = @BACKEND_TEST_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ BROWSER_PLUGIN_DIR = @BROWSER_PLUGIN_DIR@ BROWSER_PLUGIN_LIBS = @BROWSER_PLUGIN_LIBS@ @@ -121,8 +149,6 @@ DBUS_LIBS = @DBUS_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DEPENDENCY_CFLAGS = @DEPENDENCY_CFLAGS@ -DEPENDENCY_LIBS = @DEPENDENCY_LIBS@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DISC_RECORDER_CFLAGS = @DISC_RECORDER_CFLAGS@ DISC_RECORDER_LIBS = @DISC_RECORDER_LIBS@ @@ -136,7 +162,6 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -EXTRA_BACKEND_LIBS = @EXTRA_BACKEND_LIBS@ FGREP = @FGREP@ FULL_LIBEXECDIR = @FULL_LIBEXECDIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ @@ -144,19 +169,21 @@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GLIB_REQS = @GLIB_REQS@ +GLOW_BUTTON_CFLAGS = @GLOW_BUTTON_CFLAGS@ +GLOW_BUTTON_LIBS = @GLOW_BUTTON_LIBS@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ -GST_CFLAGS = @GST_CFLAGS@ -GST_LIBS = @GST_LIBS@ +GST_PLUGINS_BAD_CFLAGS = @GST_PLUGINS_BAD_CFLAGS@ +GST_PLUGINS_BAD_LIBS = @GST_PLUGINS_BAD_LIBS@ GTKDOC_CHECK = @GTKDOC_CHECK@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_LIBS = @GTK_LIBS@ GTK_REQS = @GTK_REQS@ +HELPER_CFLAGS = @HELPER_CFLAGS@ +HELPER_LIBS = @HELPER_LIBS@ HELP_DIR = @HELP_DIR@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ @@ -182,11 +209,11 @@ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBEPC_CFLAGS = @LIBEPC_CFLAGS@ -LIBEPC_LIBS = @LIBEPC_LIBS@ LIBGRILO_CFLAGS = @LIBGRILO_CFLAGS@ LIBGRILO_LIBS = @LIBGRILO_LIBS@ LIBOBJS = @LIBOBJS@ +LIBPLAYER_CFLAGS = @LIBPLAYER_CFLAGS@ +LIBPLAYER_LIBS = @LIBPLAYER_LIBS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBZEITGEIST_CFLAGS = @LIBZEITGEIST_CFLAGS@ @@ -203,8 +230,6 @@ MISSING_PLUGINS_CFLAGS = @MISSING_PLUGINS_CFLAGS@ MISSING_PLUGINS_LIBS = @MISSING_PLUGINS_LIBS@ MKDIR_P = @MKDIR_P@ -MM_CFLAGS = @MM_CFLAGS@ -MM_LIBS = @MM_LIBS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ NAUTILUSDIR = @NAUTILUSDIR@ @@ -225,15 +250,21 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PEASGTK_CFLAGS = @PEASGTK_CFLAGS@ -PEASGTK_LIBS = @PEASGTK_LIBS@ -PEAS_CFLAGS = @PEAS_CFLAGS@ -PEAS_LIBS = @PEAS_LIBS@ +PIXBUF_HELPER_CFLAGS = @PIXBUF_HELPER_CFLAGS@ +PIXBUF_HELPER_LIBS = @PIXBUF_HELPER_LIBS@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +PLAYER_CFLAGS = @PLAYER_CFLAGS@ +PLAYER_LIBS = @PLAYER_LIBS@ PLUGINDIR = @PLUGINDIR@ PLUGINS = @PLUGINS@ +PLUGIN_VIEWER_CFLAGS = @PLUGIN_VIEWER_CFLAGS@ +PLUGIN_VIEWER_LIBS = @PLUGIN_VIEWER_LIBS@ +PREVIEW_CFLAGS = @PREVIEW_CFLAGS@ +PREVIEW_LIBS = @PREVIEW_LIBS@ +PROPERTIES_CFLAGS = @PROPERTIES_CFLAGS@ +PROPERTIES_LIBS = @PROPERTIES_LIBS@ PYGOBJECT_CFLAGS = @PYGOBJECT_CFLAGS@ PYGOBJECT_LIBS = @PYGOBJECT_LIBS@ PYLINT = @PYLINT@ @@ -253,6 +284,10 @@ SMCLIENT_CFLAGS = @SMCLIENT_CFLAGS@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ +THUMBNAILER_CFLAGS = @THUMBNAILER_CFLAGS@ +THUMBNAILER_LIBS = @THUMBNAILER_LIBS@ +TIME_HELPER_CFLAGS = @TIME_HELPER_CFLAGS@ +TIME_HELPER_LIBS = @TIME_HELPER_LIBS@ TOTEM_API_VERSION = @TOTEM_API_VERSION@ TOTEM_PLPARSER_REQS = @TOTEM_PLPARSER_REQS@ TOTEM_VERSION_MAJOR = @TOTEM_VERSION_MAJOR@ @@ -264,9 +299,6 @@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ XGETTEXT = @XGETTEXT@ -XMKMF = @XMKMF@ -XTEST_LIBS = @XTEST_LIBS@ -X_LIBS = @X_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -373,8 +405,11 @@ -rm -rf .libs _libs install-iconDATA: $(icon_DATA) @$(NORMAL_INSTALL) - test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)" @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(icondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(icondir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -391,8 +426,11 @@ dir='$(DESTDIR)$(icondir)'; $(am__uninstall_files_from_dir) install-tviconDATA: $(tvicon_DATA) @$(NORMAL_INSTALL) - test -z "$(tvicondir)" || $(MKDIR_P) "$(DESTDIR)$(tvicondir)" @list='$(tvicon_DATA)'; test -n "$(tvicondir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(tvicondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(tvicondir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -413,6 +451,8 @@ ctags: CTAGS CTAGS: +cscope cscopelist: + distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ diff -Nru totem-3.4.3/data/icons/256x256/Makefile.in totem-3.6.2/data/icons/256x256/Makefile.in --- totem-3.4.3/data/icons/256x256/Makefile.in 2012-07-04 09:54:47.000000000 +0000 +++ totem-3.6.2/data/icons/256x256/Makefile.in 2012-10-25 13:36:19.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -37,24 +53,32 @@ subdir = data/icons/256x256 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -100,6 +124,10 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BACKEND_CFLAGS = @BACKEND_CFLAGS@ +BACKEND_LIBS = @BACKEND_LIBS@ +BACKEND_TEST_CFLAGS = @BACKEND_TEST_CFLAGS@ +BACKEND_TEST_LIBS = @BACKEND_TEST_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ BROWSER_PLUGIN_DIR = @BROWSER_PLUGIN_DIR@ BROWSER_PLUGIN_LIBS = @BROWSER_PLUGIN_LIBS@ @@ -121,8 +149,6 @@ DBUS_LIBS = @DBUS_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DEPENDENCY_CFLAGS = @DEPENDENCY_CFLAGS@ -DEPENDENCY_LIBS = @DEPENDENCY_LIBS@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DISC_RECORDER_CFLAGS = @DISC_RECORDER_CFLAGS@ DISC_RECORDER_LIBS = @DISC_RECORDER_LIBS@ @@ -136,7 +162,6 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -EXTRA_BACKEND_LIBS = @EXTRA_BACKEND_LIBS@ FGREP = @FGREP@ FULL_LIBEXECDIR = @FULL_LIBEXECDIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ @@ -144,19 +169,21 @@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GLIB_REQS = @GLIB_REQS@ +GLOW_BUTTON_CFLAGS = @GLOW_BUTTON_CFLAGS@ +GLOW_BUTTON_LIBS = @GLOW_BUTTON_LIBS@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ -GST_CFLAGS = @GST_CFLAGS@ -GST_LIBS = @GST_LIBS@ +GST_PLUGINS_BAD_CFLAGS = @GST_PLUGINS_BAD_CFLAGS@ +GST_PLUGINS_BAD_LIBS = @GST_PLUGINS_BAD_LIBS@ GTKDOC_CHECK = @GTKDOC_CHECK@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_LIBS = @GTK_LIBS@ GTK_REQS = @GTK_REQS@ +HELPER_CFLAGS = @HELPER_CFLAGS@ +HELPER_LIBS = @HELPER_LIBS@ HELP_DIR = @HELP_DIR@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ @@ -182,11 +209,11 @@ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBEPC_CFLAGS = @LIBEPC_CFLAGS@ -LIBEPC_LIBS = @LIBEPC_LIBS@ LIBGRILO_CFLAGS = @LIBGRILO_CFLAGS@ LIBGRILO_LIBS = @LIBGRILO_LIBS@ LIBOBJS = @LIBOBJS@ +LIBPLAYER_CFLAGS = @LIBPLAYER_CFLAGS@ +LIBPLAYER_LIBS = @LIBPLAYER_LIBS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBZEITGEIST_CFLAGS = @LIBZEITGEIST_CFLAGS@ @@ -203,8 +230,6 @@ MISSING_PLUGINS_CFLAGS = @MISSING_PLUGINS_CFLAGS@ MISSING_PLUGINS_LIBS = @MISSING_PLUGINS_LIBS@ MKDIR_P = @MKDIR_P@ -MM_CFLAGS = @MM_CFLAGS@ -MM_LIBS = @MM_LIBS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ NAUTILUSDIR = @NAUTILUSDIR@ @@ -225,15 +250,21 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PEASGTK_CFLAGS = @PEASGTK_CFLAGS@ -PEASGTK_LIBS = @PEASGTK_LIBS@ -PEAS_CFLAGS = @PEAS_CFLAGS@ -PEAS_LIBS = @PEAS_LIBS@ +PIXBUF_HELPER_CFLAGS = @PIXBUF_HELPER_CFLAGS@ +PIXBUF_HELPER_LIBS = @PIXBUF_HELPER_LIBS@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +PLAYER_CFLAGS = @PLAYER_CFLAGS@ +PLAYER_LIBS = @PLAYER_LIBS@ PLUGINDIR = @PLUGINDIR@ PLUGINS = @PLUGINS@ +PLUGIN_VIEWER_CFLAGS = @PLUGIN_VIEWER_CFLAGS@ +PLUGIN_VIEWER_LIBS = @PLUGIN_VIEWER_LIBS@ +PREVIEW_CFLAGS = @PREVIEW_CFLAGS@ +PREVIEW_LIBS = @PREVIEW_LIBS@ +PROPERTIES_CFLAGS = @PROPERTIES_CFLAGS@ +PROPERTIES_LIBS = @PROPERTIES_LIBS@ PYGOBJECT_CFLAGS = @PYGOBJECT_CFLAGS@ PYGOBJECT_LIBS = @PYGOBJECT_LIBS@ PYLINT = @PYLINT@ @@ -253,6 +284,10 @@ SMCLIENT_CFLAGS = @SMCLIENT_CFLAGS@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ +THUMBNAILER_CFLAGS = @THUMBNAILER_CFLAGS@ +THUMBNAILER_LIBS = @THUMBNAILER_LIBS@ +TIME_HELPER_CFLAGS = @TIME_HELPER_CFLAGS@ +TIME_HELPER_LIBS = @TIME_HELPER_LIBS@ TOTEM_API_VERSION = @TOTEM_API_VERSION@ TOTEM_PLPARSER_REQS = @TOTEM_PLPARSER_REQS@ TOTEM_VERSION_MAJOR = @TOTEM_VERSION_MAJOR@ @@ -264,9 +299,6 @@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ XGETTEXT = @XGETTEXT@ -XMKMF = @XMKMF@ -XTEST_LIBS = @XTEST_LIBS@ -X_LIBS = @X_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -371,8 +403,11 @@ -rm -rf .libs _libs install-iconDATA: $(icon_DATA) @$(NORMAL_INSTALL) - test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)" @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(icondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(icondir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -393,6 +428,8 @@ ctags: CTAGS CTAGS: +cscope cscopelist: + distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ diff -Nru totem-3.4.3/data/icons/32x32/Makefile.in totem-3.6.2/data/icons/32x32/Makefile.in --- totem-3.4.3/data/icons/32x32/Makefile.in 2012-07-04 09:54:47.000000000 +0000 +++ totem-3.6.2/data/icons/32x32/Makefile.in 2012-10-25 13:36:19.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -37,24 +53,32 @@ subdir = data/icons/32x32 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -100,6 +124,10 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BACKEND_CFLAGS = @BACKEND_CFLAGS@ +BACKEND_LIBS = @BACKEND_LIBS@ +BACKEND_TEST_CFLAGS = @BACKEND_TEST_CFLAGS@ +BACKEND_TEST_LIBS = @BACKEND_TEST_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ BROWSER_PLUGIN_DIR = @BROWSER_PLUGIN_DIR@ BROWSER_PLUGIN_LIBS = @BROWSER_PLUGIN_LIBS@ @@ -121,8 +149,6 @@ DBUS_LIBS = @DBUS_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DEPENDENCY_CFLAGS = @DEPENDENCY_CFLAGS@ -DEPENDENCY_LIBS = @DEPENDENCY_LIBS@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DISC_RECORDER_CFLAGS = @DISC_RECORDER_CFLAGS@ DISC_RECORDER_LIBS = @DISC_RECORDER_LIBS@ @@ -136,7 +162,6 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -EXTRA_BACKEND_LIBS = @EXTRA_BACKEND_LIBS@ FGREP = @FGREP@ FULL_LIBEXECDIR = @FULL_LIBEXECDIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ @@ -144,19 +169,21 @@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GLIB_REQS = @GLIB_REQS@ +GLOW_BUTTON_CFLAGS = @GLOW_BUTTON_CFLAGS@ +GLOW_BUTTON_LIBS = @GLOW_BUTTON_LIBS@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ -GST_CFLAGS = @GST_CFLAGS@ -GST_LIBS = @GST_LIBS@ +GST_PLUGINS_BAD_CFLAGS = @GST_PLUGINS_BAD_CFLAGS@ +GST_PLUGINS_BAD_LIBS = @GST_PLUGINS_BAD_LIBS@ GTKDOC_CHECK = @GTKDOC_CHECK@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_LIBS = @GTK_LIBS@ GTK_REQS = @GTK_REQS@ +HELPER_CFLAGS = @HELPER_CFLAGS@ +HELPER_LIBS = @HELPER_LIBS@ HELP_DIR = @HELP_DIR@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ @@ -182,11 +209,11 @@ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBEPC_CFLAGS = @LIBEPC_CFLAGS@ -LIBEPC_LIBS = @LIBEPC_LIBS@ LIBGRILO_CFLAGS = @LIBGRILO_CFLAGS@ LIBGRILO_LIBS = @LIBGRILO_LIBS@ LIBOBJS = @LIBOBJS@ +LIBPLAYER_CFLAGS = @LIBPLAYER_CFLAGS@ +LIBPLAYER_LIBS = @LIBPLAYER_LIBS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBZEITGEIST_CFLAGS = @LIBZEITGEIST_CFLAGS@ @@ -203,8 +230,6 @@ MISSING_PLUGINS_CFLAGS = @MISSING_PLUGINS_CFLAGS@ MISSING_PLUGINS_LIBS = @MISSING_PLUGINS_LIBS@ MKDIR_P = @MKDIR_P@ -MM_CFLAGS = @MM_CFLAGS@ -MM_LIBS = @MM_LIBS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ NAUTILUSDIR = @NAUTILUSDIR@ @@ -225,15 +250,21 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PEASGTK_CFLAGS = @PEASGTK_CFLAGS@ -PEASGTK_LIBS = @PEASGTK_LIBS@ -PEAS_CFLAGS = @PEAS_CFLAGS@ -PEAS_LIBS = @PEAS_LIBS@ +PIXBUF_HELPER_CFLAGS = @PIXBUF_HELPER_CFLAGS@ +PIXBUF_HELPER_LIBS = @PIXBUF_HELPER_LIBS@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +PLAYER_CFLAGS = @PLAYER_CFLAGS@ +PLAYER_LIBS = @PLAYER_LIBS@ PLUGINDIR = @PLUGINDIR@ PLUGINS = @PLUGINS@ +PLUGIN_VIEWER_CFLAGS = @PLUGIN_VIEWER_CFLAGS@ +PLUGIN_VIEWER_LIBS = @PLUGIN_VIEWER_LIBS@ +PREVIEW_CFLAGS = @PREVIEW_CFLAGS@ +PREVIEW_LIBS = @PREVIEW_LIBS@ +PROPERTIES_CFLAGS = @PROPERTIES_CFLAGS@ +PROPERTIES_LIBS = @PROPERTIES_LIBS@ PYGOBJECT_CFLAGS = @PYGOBJECT_CFLAGS@ PYGOBJECT_LIBS = @PYGOBJECT_LIBS@ PYLINT = @PYLINT@ @@ -253,6 +284,10 @@ SMCLIENT_CFLAGS = @SMCLIENT_CFLAGS@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ +THUMBNAILER_CFLAGS = @THUMBNAILER_CFLAGS@ +THUMBNAILER_LIBS = @THUMBNAILER_LIBS@ +TIME_HELPER_CFLAGS = @TIME_HELPER_CFLAGS@ +TIME_HELPER_LIBS = @TIME_HELPER_LIBS@ TOTEM_API_VERSION = @TOTEM_API_VERSION@ TOTEM_PLPARSER_REQS = @TOTEM_PLPARSER_REQS@ TOTEM_VERSION_MAJOR = @TOTEM_VERSION_MAJOR@ @@ -264,9 +299,6 @@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ XGETTEXT = @XGETTEXT@ -XMKMF = @XMKMF@ -XTEST_LIBS = @XTEST_LIBS@ -X_LIBS = @X_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -373,8 +405,11 @@ -rm -rf .libs _libs install-iconDATA: $(icon_DATA) @$(NORMAL_INSTALL) - test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)" @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(icondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(icondir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -391,8 +426,11 @@ dir='$(DESTDIR)$(icondir)'; $(am__uninstall_files_from_dir) install-tviconDATA: $(tvicon_DATA) @$(NORMAL_INSTALL) - test -z "$(tvicondir)" || $(MKDIR_P) "$(DESTDIR)$(tvicondir)" @list='$(tvicon_DATA)'; test -n "$(tvicondir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(tvicondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(tvicondir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -413,6 +451,8 @@ ctags: CTAGS CTAGS: +cscope cscopelist: + distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ diff -Nru totem-3.4.3/data/icons/48x48/Makefile.in totem-3.6.2/data/icons/48x48/Makefile.in --- totem-3.4.3/data/icons/48x48/Makefile.in 2012-07-04 09:54:47.000000000 +0000 +++ totem-3.6.2/data/icons/48x48/Makefile.in 2012-10-25 13:36:19.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -37,24 +53,32 @@ subdir = data/icons/48x48 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -100,6 +124,10 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BACKEND_CFLAGS = @BACKEND_CFLAGS@ +BACKEND_LIBS = @BACKEND_LIBS@ +BACKEND_TEST_CFLAGS = @BACKEND_TEST_CFLAGS@ +BACKEND_TEST_LIBS = @BACKEND_TEST_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ BROWSER_PLUGIN_DIR = @BROWSER_PLUGIN_DIR@ BROWSER_PLUGIN_LIBS = @BROWSER_PLUGIN_LIBS@ @@ -121,8 +149,6 @@ DBUS_LIBS = @DBUS_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DEPENDENCY_CFLAGS = @DEPENDENCY_CFLAGS@ -DEPENDENCY_LIBS = @DEPENDENCY_LIBS@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DISC_RECORDER_CFLAGS = @DISC_RECORDER_CFLAGS@ DISC_RECORDER_LIBS = @DISC_RECORDER_LIBS@ @@ -136,7 +162,6 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -EXTRA_BACKEND_LIBS = @EXTRA_BACKEND_LIBS@ FGREP = @FGREP@ FULL_LIBEXECDIR = @FULL_LIBEXECDIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ @@ -144,19 +169,21 @@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GLIB_REQS = @GLIB_REQS@ +GLOW_BUTTON_CFLAGS = @GLOW_BUTTON_CFLAGS@ +GLOW_BUTTON_LIBS = @GLOW_BUTTON_LIBS@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ -GST_CFLAGS = @GST_CFLAGS@ -GST_LIBS = @GST_LIBS@ +GST_PLUGINS_BAD_CFLAGS = @GST_PLUGINS_BAD_CFLAGS@ +GST_PLUGINS_BAD_LIBS = @GST_PLUGINS_BAD_LIBS@ GTKDOC_CHECK = @GTKDOC_CHECK@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_LIBS = @GTK_LIBS@ GTK_REQS = @GTK_REQS@ +HELPER_CFLAGS = @HELPER_CFLAGS@ +HELPER_LIBS = @HELPER_LIBS@ HELP_DIR = @HELP_DIR@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ @@ -182,11 +209,11 @@ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBEPC_CFLAGS = @LIBEPC_CFLAGS@ -LIBEPC_LIBS = @LIBEPC_LIBS@ LIBGRILO_CFLAGS = @LIBGRILO_CFLAGS@ LIBGRILO_LIBS = @LIBGRILO_LIBS@ LIBOBJS = @LIBOBJS@ +LIBPLAYER_CFLAGS = @LIBPLAYER_CFLAGS@ +LIBPLAYER_LIBS = @LIBPLAYER_LIBS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBZEITGEIST_CFLAGS = @LIBZEITGEIST_CFLAGS@ @@ -203,8 +230,6 @@ MISSING_PLUGINS_CFLAGS = @MISSING_PLUGINS_CFLAGS@ MISSING_PLUGINS_LIBS = @MISSING_PLUGINS_LIBS@ MKDIR_P = @MKDIR_P@ -MM_CFLAGS = @MM_CFLAGS@ -MM_LIBS = @MM_LIBS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ NAUTILUSDIR = @NAUTILUSDIR@ @@ -225,15 +250,21 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PEASGTK_CFLAGS = @PEASGTK_CFLAGS@ -PEASGTK_LIBS = @PEASGTK_LIBS@ -PEAS_CFLAGS = @PEAS_CFLAGS@ -PEAS_LIBS = @PEAS_LIBS@ +PIXBUF_HELPER_CFLAGS = @PIXBUF_HELPER_CFLAGS@ +PIXBUF_HELPER_LIBS = @PIXBUF_HELPER_LIBS@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +PLAYER_CFLAGS = @PLAYER_CFLAGS@ +PLAYER_LIBS = @PLAYER_LIBS@ PLUGINDIR = @PLUGINDIR@ PLUGINS = @PLUGINS@ +PLUGIN_VIEWER_CFLAGS = @PLUGIN_VIEWER_CFLAGS@ +PLUGIN_VIEWER_LIBS = @PLUGIN_VIEWER_LIBS@ +PREVIEW_CFLAGS = @PREVIEW_CFLAGS@ +PREVIEW_LIBS = @PREVIEW_LIBS@ +PROPERTIES_CFLAGS = @PROPERTIES_CFLAGS@ +PROPERTIES_LIBS = @PROPERTIES_LIBS@ PYGOBJECT_CFLAGS = @PYGOBJECT_CFLAGS@ PYGOBJECT_LIBS = @PYGOBJECT_LIBS@ PYLINT = @PYLINT@ @@ -253,6 +284,10 @@ SMCLIENT_CFLAGS = @SMCLIENT_CFLAGS@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ +THUMBNAILER_CFLAGS = @THUMBNAILER_CFLAGS@ +THUMBNAILER_LIBS = @THUMBNAILER_LIBS@ +TIME_HELPER_CFLAGS = @TIME_HELPER_CFLAGS@ +TIME_HELPER_LIBS = @TIME_HELPER_LIBS@ TOTEM_API_VERSION = @TOTEM_API_VERSION@ TOTEM_PLPARSER_REQS = @TOTEM_PLPARSER_REQS@ TOTEM_VERSION_MAJOR = @TOTEM_VERSION_MAJOR@ @@ -264,9 +299,6 @@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ XGETTEXT = @XGETTEXT@ -XMKMF = @XMKMF@ -XTEST_LIBS = @XTEST_LIBS@ -X_LIBS = @X_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -373,8 +405,11 @@ -rm -rf .libs _libs install-iconDATA: $(icon_DATA) @$(NORMAL_INSTALL) - test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)" @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(icondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(icondir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -391,8 +426,11 @@ dir='$(DESTDIR)$(icondir)'; $(am__uninstall_files_from_dir) install-tviconDATA: $(tvicon_DATA) @$(NORMAL_INSTALL) - test -z "$(tvicondir)" || $(MKDIR_P) "$(DESTDIR)$(tvicondir)" @list='$(tvicon_DATA)'; test -n "$(tvicondir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(tvicondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(tvicondir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -413,6 +451,8 @@ ctags: CTAGS CTAGS: +cscope cscopelist: + distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ diff -Nru totem-3.4.3/data/icons/Makefile.in totem-3.6.2/data/icons/Makefile.in --- totem-3.4.3/data/icons/Makefile.in 2012-07-04 09:54:47.000000000 +0000 +++ totem-3.6.2/data/icons/Makefile.in 2012-10-25 13:36:19.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +14,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -36,22 +52,25 @@ subdir = data/icons DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -61,6 +80,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -110,6 +134,10 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BACKEND_CFLAGS = @BACKEND_CFLAGS@ +BACKEND_LIBS = @BACKEND_LIBS@ +BACKEND_TEST_CFLAGS = @BACKEND_TEST_CFLAGS@ +BACKEND_TEST_LIBS = @BACKEND_TEST_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ BROWSER_PLUGIN_DIR = @BROWSER_PLUGIN_DIR@ BROWSER_PLUGIN_LIBS = @BROWSER_PLUGIN_LIBS@ @@ -131,8 +159,6 @@ DBUS_LIBS = @DBUS_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DEPENDENCY_CFLAGS = @DEPENDENCY_CFLAGS@ -DEPENDENCY_LIBS = @DEPENDENCY_LIBS@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DISC_RECORDER_CFLAGS = @DISC_RECORDER_CFLAGS@ DISC_RECORDER_LIBS = @DISC_RECORDER_LIBS@ @@ -146,7 +172,6 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -EXTRA_BACKEND_LIBS = @EXTRA_BACKEND_LIBS@ FGREP = @FGREP@ FULL_LIBEXECDIR = @FULL_LIBEXECDIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ @@ -154,19 +179,21 @@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GLIB_REQS = @GLIB_REQS@ +GLOW_BUTTON_CFLAGS = @GLOW_BUTTON_CFLAGS@ +GLOW_BUTTON_LIBS = @GLOW_BUTTON_LIBS@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ -GST_CFLAGS = @GST_CFLAGS@ -GST_LIBS = @GST_LIBS@ +GST_PLUGINS_BAD_CFLAGS = @GST_PLUGINS_BAD_CFLAGS@ +GST_PLUGINS_BAD_LIBS = @GST_PLUGINS_BAD_LIBS@ GTKDOC_CHECK = @GTKDOC_CHECK@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_LIBS = @GTK_LIBS@ GTK_REQS = @GTK_REQS@ +HELPER_CFLAGS = @HELPER_CFLAGS@ +HELPER_LIBS = @HELPER_LIBS@ HELP_DIR = @HELP_DIR@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ @@ -192,11 +219,11 @@ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBEPC_CFLAGS = @LIBEPC_CFLAGS@ -LIBEPC_LIBS = @LIBEPC_LIBS@ LIBGRILO_CFLAGS = @LIBGRILO_CFLAGS@ LIBGRILO_LIBS = @LIBGRILO_LIBS@ LIBOBJS = @LIBOBJS@ +LIBPLAYER_CFLAGS = @LIBPLAYER_CFLAGS@ +LIBPLAYER_LIBS = @LIBPLAYER_LIBS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBZEITGEIST_CFLAGS = @LIBZEITGEIST_CFLAGS@ @@ -213,8 +240,6 @@ MISSING_PLUGINS_CFLAGS = @MISSING_PLUGINS_CFLAGS@ MISSING_PLUGINS_LIBS = @MISSING_PLUGINS_LIBS@ MKDIR_P = @MKDIR_P@ -MM_CFLAGS = @MM_CFLAGS@ -MM_LIBS = @MM_LIBS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ NAUTILUSDIR = @NAUTILUSDIR@ @@ -235,15 +260,21 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PEASGTK_CFLAGS = @PEASGTK_CFLAGS@ -PEASGTK_LIBS = @PEASGTK_LIBS@ -PEAS_CFLAGS = @PEAS_CFLAGS@ -PEAS_LIBS = @PEAS_LIBS@ +PIXBUF_HELPER_CFLAGS = @PIXBUF_HELPER_CFLAGS@ +PIXBUF_HELPER_LIBS = @PIXBUF_HELPER_LIBS@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +PLAYER_CFLAGS = @PLAYER_CFLAGS@ +PLAYER_LIBS = @PLAYER_LIBS@ PLUGINDIR = @PLUGINDIR@ PLUGINS = @PLUGINS@ +PLUGIN_VIEWER_CFLAGS = @PLUGIN_VIEWER_CFLAGS@ +PLUGIN_VIEWER_LIBS = @PLUGIN_VIEWER_LIBS@ +PREVIEW_CFLAGS = @PREVIEW_CFLAGS@ +PREVIEW_LIBS = @PREVIEW_LIBS@ +PROPERTIES_CFLAGS = @PROPERTIES_CFLAGS@ +PROPERTIES_LIBS = @PROPERTIES_LIBS@ PYGOBJECT_CFLAGS = @PYGOBJECT_CFLAGS@ PYGOBJECT_LIBS = @PYGOBJECT_LIBS@ PYLINT = @PYLINT@ @@ -263,6 +294,10 @@ SMCLIENT_CFLAGS = @SMCLIENT_CFLAGS@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ +THUMBNAILER_CFLAGS = @THUMBNAILER_CFLAGS@ +THUMBNAILER_LIBS = @THUMBNAILER_LIBS@ +TIME_HELPER_CFLAGS = @TIME_HELPER_CFLAGS@ +TIME_HELPER_LIBS = @TIME_HELPER_LIBS@ TOTEM_API_VERSION = @TOTEM_API_VERSION@ TOTEM_PLPARSER_REQS = @TOTEM_PLPARSER_REQS@ TOTEM_VERSION_MAJOR = @TOTEM_VERSION_MAJOR@ @@ -274,9 +309,6 @@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ XGETTEXT = @XGETTEXT@ -XMKMF = @XMKMF@ -XTEST_LIBS = @XTEST_LIBS@ -X_LIBS = @X_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -380,12 +412,12 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -395,7 +427,11 @@ done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -409,37 +445,6 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ @@ -448,6 +453,10 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done +cscopelist-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ + done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -511,6 +520,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -546,13 +569,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -673,22 +693,23 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ + cscopelist-recursive ctags-recursive install-am install-strip \ + tags-recursive .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am + cscopelist cscopelist-recursive ctags ctags-recursive \ + distclean distclean-generic distclean-libtool distclean-tags \ + distdir dvi dvi-am html html-am info info-am install \ + install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-recursive uninstall uninstall-am -include $(top_srcdir)/git.mk diff -Nru totem-3.4.3/data/icons/scalable/Makefile.in totem-3.6.2/data/icons/scalable/Makefile.in --- totem-3.4.3/data/icons/scalable/Makefile.in 2012-07-04 09:54:48.000000000 +0000 +++ totem-3.6.2/data/icons/scalable/Makefile.in 2012-10-25 13:36:19.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -37,24 +53,32 @@ subdir = data/icons/scalable DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -101,6 +125,10 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BACKEND_CFLAGS = @BACKEND_CFLAGS@ +BACKEND_LIBS = @BACKEND_LIBS@ +BACKEND_TEST_CFLAGS = @BACKEND_TEST_CFLAGS@ +BACKEND_TEST_LIBS = @BACKEND_TEST_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ BROWSER_PLUGIN_DIR = @BROWSER_PLUGIN_DIR@ BROWSER_PLUGIN_LIBS = @BROWSER_PLUGIN_LIBS@ @@ -122,8 +150,6 @@ DBUS_LIBS = @DBUS_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DEPENDENCY_CFLAGS = @DEPENDENCY_CFLAGS@ -DEPENDENCY_LIBS = @DEPENDENCY_LIBS@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DISC_RECORDER_CFLAGS = @DISC_RECORDER_CFLAGS@ DISC_RECORDER_LIBS = @DISC_RECORDER_LIBS@ @@ -137,7 +163,6 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -EXTRA_BACKEND_LIBS = @EXTRA_BACKEND_LIBS@ FGREP = @FGREP@ FULL_LIBEXECDIR = @FULL_LIBEXECDIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ @@ -145,19 +170,21 @@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GLIB_REQS = @GLIB_REQS@ +GLOW_BUTTON_CFLAGS = @GLOW_BUTTON_CFLAGS@ +GLOW_BUTTON_LIBS = @GLOW_BUTTON_LIBS@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ -GST_CFLAGS = @GST_CFLAGS@ -GST_LIBS = @GST_LIBS@ +GST_PLUGINS_BAD_CFLAGS = @GST_PLUGINS_BAD_CFLAGS@ +GST_PLUGINS_BAD_LIBS = @GST_PLUGINS_BAD_LIBS@ GTKDOC_CHECK = @GTKDOC_CHECK@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_LIBS = @GTK_LIBS@ GTK_REQS = @GTK_REQS@ +HELPER_CFLAGS = @HELPER_CFLAGS@ +HELPER_LIBS = @HELPER_LIBS@ HELP_DIR = @HELP_DIR@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ @@ -183,11 +210,11 @@ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBEPC_CFLAGS = @LIBEPC_CFLAGS@ -LIBEPC_LIBS = @LIBEPC_LIBS@ LIBGRILO_CFLAGS = @LIBGRILO_CFLAGS@ LIBGRILO_LIBS = @LIBGRILO_LIBS@ LIBOBJS = @LIBOBJS@ +LIBPLAYER_CFLAGS = @LIBPLAYER_CFLAGS@ +LIBPLAYER_LIBS = @LIBPLAYER_LIBS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBZEITGEIST_CFLAGS = @LIBZEITGEIST_CFLAGS@ @@ -204,8 +231,6 @@ MISSING_PLUGINS_CFLAGS = @MISSING_PLUGINS_CFLAGS@ MISSING_PLUGINS_LIBS = @MISSING_PLUGINS_LIBS@ MKDIR_P = @MKDIR_P@ -MM_CFLAGS = @MM_CFLAGS@ -MM_LIBS = @MM_LIBS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ NAUTILUSDIR = @NAUTILUSDIR@ @@ -226,15 +251,21 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PEASGTK_CFLAGS = @PEASGTK_CFLAGS@ -PEASGTK_LIBS = @PEASGTK_LIBS@ -PEAS_CFLAGS = @PEAS_CFLAGS@ -PEAS_LIBS = @PEAS_LIBS@ +PIXBUF_HELPER_CFLAGS = @PIXBUF_HELPER_CFLAGS@ +PIXBUF_HELPER_LIBS = @PIXBUF_HELPER_LIBS@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +PLAYER_CFLAGS = @PLAYER_CFLAGS@ +PLAYER_LIBS = @PLAYER_LIBS@ PLUGINDIR = @PLUGINDIR@ PLUGINS = @PLUGINS@ +PLUGIN_VIEWER_CFLAGS = @PLUGIN_VIEWER_CFLAGS@ +PLUGIN_VIEWER_LIBS = @PLUGIN_VIEWER_LIBS@ +PREVIEW_CFLAGS = @PREVIEW_CFLAGS@ +PREVIEW_LIBS = @PREVIEW_LIBS@ +PROPERTIES_CFLAGS = @PROPERTIES_CFLAGS@ +PROPERTIES_LIBS = @PROPERTIES_LIBS@ PYGOBJECT_CFLAGS = @PYGOBJECT_CFLAGS@ PYGOBJECT_LIBS = @PYGOBJECT_LIBS@ PYLINT = @PYLINT@ @@ -254,6 +285,10 @@ SMCLIENT_CFLAGS = @SMCLIENT_CFLAGS@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ +THUMBNAILER_CFLAGS = @THUMBNAILER_CFLAGS@ +THUMBNAILER_LIBS = @THUMBNAILER_LIBS@ +TIME_HELPER_CFLAGS = @TIME_HELPER_CFLAGS@ +TIME_HELPER_LIBS = @TIME_HELPER_LIBS@ TOTEM_API_VERSION = @TOTEM_API_VERSION@ TOTEM_PLPARSER_REQS = @TOTEM_PLPARSER_REQS@ TOTEM_VERSION_MAJOR = @TOTEM_VERSION_MAJOR@ @@ -265,9 +300,6 @@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ XGETTEXT = @XGETTEXT@ -XMKMF = @XMKMF@ -XTEST_LIBS = @XTEST_LIBS@ -X_LIBS = @X_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -374,8 +406,11 @@ -rm -rf .libs _libs install-sidebariconDATA: $(sidebaricon_DATA) @$(NORMAL_INSTALL) - test -z "$(sidebaricondir)" || $(MKDIR_P) "$(DESTDIR)$(sidebaricondir)" @list='$(sidebaricon_DATA)'; test -n "$(sidebaricondir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(sidebaricondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(sidebaricondir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -392,8 +427,11 @@ dir='$(DESTDIR)$(sidebaricondir)'; $(am__uninstall_files_from_dir) install-tviconDATA: $(tvicon_DATA) @$(NORMAL_INSTALL) - test -z "$(tvicondir)" || $(MKDIR_P) "$(DESTDIR)$(tvicondir)" @list='$(tvicon_DATA)'; test -n "$(tvicondir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(tvicondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(tvicondir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -414,6 +452,8 @@ ctags: CTAGS CTAGS: +cscope cscopelist: + distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ diff -Nru totem-3.4.3/data/mime-type-imports.sh totem-3.6.2/data/mime-type-imports.sh --- totem-3.4.3/data/mime-type-imports.sh 1970-01-01 00:00:00.000000000 +0000 +++ totem-3.6.2/data/mime-type-imports.sh 2012-08-29 23:07:45.000000000 +0000 @@ -0,0 +1,25 @@ +#!/bin/sh + +. `dirname $0`/mime-functions.sh + +echo_mime () { + echo " \"$i\"," +} + + +echo "/* generated with mime-type-imports.sh in the totem module, don't edit or" +echo " commit in the sushi module without filing a bug against totem */" + +echo "let audioTypes = [" +get_audio_mimetypes $1; +for i in $MIMETYPES ; do + echo_mime; +done +echo -e "];\n" +echo "let videoTypes = [" +get_video_mimetypes $1; +for i in $MIMETYPES ; do + echo_mime; +done +echo "];" + diff -Nru totem-3.4.3/data/mime-type-include.sh totem-3.6.2/data/mime-type-include.sh --- totem-3.4.3/data/mime-type-include.sh 2012-07-04 09:52:28.000000000 +0000 +++ totem-3.6.2/data/mime-type-include.sh 2012-08-29 23:07:45.000000000 +0000 @@ -9,7 +9,7 @@ if [ x"$1" = "x--nautilus" ] ; then get_audio_mimetypes $2; - echo "/* generated with mime-types-include.sh in the totem module, don't edit or " + echo "/* generated with mime-type-include.sh in the totem module, don't edit or " echo " commit in the nautilus module without filing a bug against totem */" echo "static const char *audio_mime_types[] = {" diff -Nru totem-3.4.3/data/mozilla-viewer.ui totem-3.6.2/data/mozilla-viewer.ui --- totem-3.4.3/data/mozilla-viewer.ui 2012-07-04 09:52:28.000000000 +0000 +++ totem-3.6.2/data/mozilla-viewer.ui 2012-10-10 15:59:24.000000000 +0000 @@ -106,14 +106,8 @@ - + True - - - True - GTK_ARROW_UP - - 0 diff -Nru totem-3.4.3/data/org.gnome.totem.gschema.xml.in.in totem-3.6.2/data/org.gnome.totem.gschema.xml.in.in --- totem-3.4.3/data/org.gnome.totem.gschema.xml.in.in 2012-07-04 09:52:28.000000000 +0000 +++ totem-3.6.2/data/org.gnome.totem.gschema.xml.in.in 2012-08-29 23:07:45.000000000 +0000 @@ -7,7 +7,7 @@ <_description>Allow the screensaver to activate when playing audio. Disable if you have monitor-powered speakers. - true + false <_summary>Show visual effects when no video is displayed <_description>Show visual effects when playing an audio only file. @@ -35,11 +35,6 @@ false <_summary>Resize the canvas automatically on file load - - 'lan' - <_summary>Network connection speed - <_description>Approximate network connection speed, used to select quality on media over the network. - false <_summary>Repeat mode diff -Nru totem-3.4.3/data/playlist.ui totem-3.6.2/data/playlist.ui --- totem-3.4.3/data/playlist.ui 2012-07-04 09:52:28.000000000 +0000 +++ totem-3.6.2/data/playlist.ui 2012-08-29 23:07:45.000000000 +0000 @@ -39,22 +39,24 @@ - + - + - + - + - + - + - + - + + + diff -Nru totem-3.4.3/data/preferences.ui totem-3.6.2/data/preferences.ui --- totem-3.4.3/data/preferences.ui 1970-01-01 00:00:00.000000000 +0000 +++ totem-3.6.2/data/preferences.ui 2012-08-29 23:07:45.000000000 +0000 @@ -0,0 +1,1443 @@ + + + + + + + + + + + + Normal + + + Large + + + Extra Large + + + + + + + + + + + + + + + + + + + Stereo + + + 4-channel + + + 4.1-channel + + + 5.0-channel + + + 5.1-channel + + + AC3 Passthrough + + + + + + 0 + 65535 + 1000 + 2000 + 250 + 32767 + + + + 0 + 65535 + 1000 + 2000 + 250 + 32767 + + + + 0 + 65535 + 1000 + 2000 + 250 + 32767 + + + + 0 + 65535 + 1000 + 2000 + 250 + 32767 + + + + 0 + 0 + 1 + 10 + 0 + 0 + + + + + 5 + Totem Preferences + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_CENTER_ON_PARENT + False + False + False + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST + True + False + + + + True + False + 2 + vertical + + + + True + GTK_BUTTONBOX_END + + + + True + True + True + gtk-close + True + GTK_RELIEF_NORMAL + True + + + + + + 0 + False + True + GTK_PACK_END + + + + + + 5 + True + True + True + True + GTK_POS_TOP + False + False + + + + 12 + True + False + 18 + vertical + + + + True + False + 6 + vertical + + + + True + Playback + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + + + + 0 + False + False + + + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + True + True + Start playing files from last position + True + GTK_RELIEF_NORMAL + True + False + False + True + + + + + 0 + False + True + + + + + 0 + False + True + + + + + True + False + 6 + vertical + + + + True + Text Subtitles + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + + + + 0 + False + False + + + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + True + 3 + 2 + False + 6 + 12 + + + + True + True + _Load subtitle files when movie is loaded + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + 2 + 0 + 1 + fill + + + + + + + True + _Font: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + font_sel_button + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 1 + 2 + fill + + + + + + + True + _Encoding: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + subtitle_encoding_combo + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 2 + 3 + fill + + + + + + + True + False + True + + + + 1 + 2 + 2 + 3 + fill + fill + + + + + + True + True + True + True + False + False + True + + + + 1 + 2 + 1 + 2 + + + + + + + + 0 + False + True + + + + + 0 + False + True + + + + + + True + False + 6 + vertical + + + + True + External Chapters + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + + + + 0 + False + False + + + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + True + 1 + 2 + False + 6 + 12 + + + + True + True + Load _chapter files when movie is loaded + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + 2 + 0 + 1 + fill + + + + + + + + 0 + False + True + + + + + 0 + False + True + + + + + False + True + + + + + + True + General + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + + + + + 12 + True + False + 18 + vertical + + + + True + False + 6 + vertical + + + + True + Display + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + + + + 0 + False + False + + + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + True + True + _Resize the window when a new video is loaded + True + GTK_RELIEF_NORMAL + True + False + False + True + + + + + 0 + False + False + + + + + True + 12 + + + Disable _deinterlacing of interlaced videos + True + False + False + False + True + True + + + + + False + False + 3 + + + + + True + 12 + + + True + + + True + Disable screensaver when playing + + + 0 + + + + + Video + True + True + False + False + True + tpw_audio_toggle_button + + + 1 + + + + + Video or Audio + True + True + False + False + True + True + + + + 2 + + + + + + + False + False + 3 + + + + + + + 0 + False + True + + + + + + True + False + 6 + vertical + + + + True + Visual Effects + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + + + + 0 + False + False + + + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + True + False + 6 + vertical + + + + True + True + Show _visual effects when an audio file is played + True + GTK_RELIEF_NORMAL + True + False + False + True + + + + 0 + False + False + + + + + + True + 2 + 2 + False + 6 + 12 + + + + True + _Type of visualization: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + tpw_visuals_type_combobox + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 0 + 1 + fill + + + + + + + True + Visualization _size: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + tpw_visuals_size_combobox + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 1 + 2 + fill + + + + + + + True + tpw_visuals_size_liststore + False + True + + + + 0 + + + + + 1 + 2 + 1 + 2 + fill + fill + + + + + + True + False + True + tpw_visuals_type_liststore + + + + + 0 + + + + + 1 + 2 + 0 + 1 + fill + + + + + 0 + False + True + + + + + + + 0 + False + True + + + + + 0 + False + True + + + + + + True + False + 6 + vertical + + + + True + False + 6 + + + + True + Color Balance + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + + + + 0 + False + False + + + + + 0 + False + False + + + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + True + 5 + 2 + False + 6 + 12 + + + + True + _Brightness: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + tpw_bright_scale + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 0 + 1 + fill + + + + + + + True + Co_ntrast: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + tpw_contrast_scale + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 1 + 2 + fill + + + + + + + True + True + False + GTK_POS_TOP + 1 + False + tpw_bright_adjustment + + + 1 + 2 + 0 + 1 + + + + + + + True + True + False + GTK_POS_TOP + 1 + False + tpw_contrast_adjustment + + + 1 + 2 + 1 + 2 + fill + fill + + + + + + True + Sat_uration: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + tpw_saturation_scale + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 2 + 3 + fill + + + + + + + True + _Hue: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + tpw_hue_scale + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 3 + 4 + fill + + + + + + + True + True + False + GTK_POS_TOP + 1 + False + tpw_saturation_adjustment + + + 1 + 2 + 2 + 3 + fill + fill + + + + + + True + True + False + GTK_POS_TOP + 1 + False + tpw_hue_adjustment + + + 1 + 2 + 3 + 4 + fill + fill + + + + + + True + False + 0 + GTK_BUTTONBOX_END + + + + True + True + Reset to _Defaults + True + GTK_RELIEF_NORMAL + True + + + + 0 + False + False + + + + + 1 + 2 + 4 + 5 + shrink|fill + + + + + + + 0 + False + True + + + + + 0 + False + True + + + + + False + True + + + + + + True + Display + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + + + + + 12 + True + False + 18 + vertical + + + + True + False + 0 + vertical + + + + True + False + 6 + vertical + + + + True + Audio Output + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + + + + 0 + False + False + + + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + True + False + 12 + + + + True + _Audio output type: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + tpw_sound_output_combobox + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + tpw_sound_output_liststore + False + True + + + + 0 + + + + + 0 + False + True + + + + + + + 0 + False + True + + + + + 0 + False + False + + + + + + + 0 + False + True + + + + + False + True + + + + + + True + Audio + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + + + + 0 + False + True + + + + +tpw_close_button + + diff -Nru totem-3.4.3/data/totem.convert totem-3.6.2/data/totem.convert --- totem-3.4.3/data/totem.convert 2012-07-04 09:52:28.000000000 +0000 +++ totem-3.6.2/data/totem.convert 2012-08-29 23:07:45.000000000 +0000 @@ -7,7 +7,6 @@ hue = /apps/totem/hue saturation = /apps/totem/saturation auto-resize = /apps/totem/auto_resize -connection-speed = /apps/totem/connection_speed repeat = /apps/totem/repeat shuffle = /apps/totem/shuffle disable-deinterlacing = /apps/totem/disable_deinterlacing diff -Nru totem-3.4.3/data/totem.desktop.in.in.in totem-3.6.2/data/totem.desktop.in.in.in --- totem-3.4.3/data/totem.desktop.in.in.in 2012-07-04 09:52:29.000000000 +0000 +++ totem-3.6.2/data/totem.desktop.in.in.in 2012-08-29 23:07:45.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] -_Name=Movie Player -_Comment=Play movies and songs +_Name=Videos +_Comment=Play movies +_Keywords=Video;Movie;Film;Clip;Series;Player;DVD;TV;Disc; Exec=totem %U Icon=totem Terminal=false @@ -11,6 +12,6 @@ X-GNOME-Bugzilla-Product=totem X-GNOME-Bugzilla-Component=general X-GNOME-Bugzilla-Version=@VERSION@ -X-GNOME-Bugzilla-OtherBinaries=totem-video-indexer;totem-video-thumbnailer;totem-audio-preview; +X-GNOME-Bugzilla-OtherBinaries=totem-video-thumbnailer;totem-audio-preview; X-GNOME-Bugzilla-ExtraInfoScript=@FULL_LIBEXECDIR@/totem/totem-bugreport.py StartupNotify=true diff -Nru totem-3.4.3/data/totem.ui totem-3.6.2/data/totem.ui --- totem-3.4.3/data/totem.ui 2012-07-04 09:52:29.000000000 +0000 +++ totem-3.6.2/data/totem.ui 2012-10-09 16:42:34.000000000 +0000 @@ -2,7 +2,52 @@ - + + + +
+ + _Open + app.open + <Ctrl>O + + + Open _Location + app.open-location + <Ctrl>L + +
+
+ + _Fullscreen + app.fullscreen + F11 + +
+
+ + Prefere_nces + app.preferences + +
+
+ + Shuff_le + app.shuffle + + + _Repeat + app.repeat + +
+
+ + _Quit + app.quit + <Ctrl>Q + +
+ @@ -13,23 +58,6 @@ - - _Open... - gtk-open - Open a file - - - - - - - Open _Location... - Open a non-local file - - - - - _Eject media-eject-symbolic @@ -56,15 +84,6 @@ - - - _Quit - gtk-quit - Quit the program - - - - @@ -80,14 +99,6 @@ - - Prefere_nces - gtk-preferences - Configure the application - - - - Plugins... Configure plugins to extend the application @@ -101,15 +112,6 @@ - - _Fullscreen - view-fullscreen-symbolic - Switch to fullscreen - - - - - Fit Window to Movie @@ -260,22 +262,6 @@ - - _Repeat Mode - Set the repeat mode - False - - - - - - Shuff_le Mode - Set the shuffle mode - False - - - - Show _Controls Show controls @@ -399,10 +385,7 @@ - - - @@ -412,20 +395,13 @@ - - - - - - - @@ -485,7 +461,6 @@ - @@ -500,137 +475,6 @@ - - - - - - - 14.4 Kbps Modem - - - 19.2 Kbps Modem - - - 28.8 Kbps Modem - - - 33.6 Kbps Modem - - - 34.4 Kbps Modem - - - 56 Kbps Modem/ISDN - - - 112 Kbps Dual ISDN/DSL - - - 256 Kbps DSL/Cable - - - 384 Kbps DSL/Cable - - - 512 Kbps DSL/Cable - - - 1.5 Mbps T1/Intranet/LAN - - - Intranet/LAN - - - - - - - - - - - Normal - - - Large - - - Extra Large - - - - - - - - - - - - - - - - - - - Stereo - - - 4-channel - - - 4.1-channel - - - 5.0-channel - - - 5.1-channel - - - AC3 Passthrough - - - - - - 0 - 65535 - 1000 - 2000 - 250 - 32767 - - - - 0 - 65535 - 1000 - 2000 - 250 - 32767 - - - - 0 - 65535 - 1000 - 2000 - 250 - 32767 - - - - 0 - 65535 - 1000 - 2000 - 250 - 32767 - - 0 0 @@ -641,1461 +485,8 @@ - - 5 - Totem Preferences - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_CENTER_ON_PARENT - False - False - False - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - True - False - 2 - vertical - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-close - True - GTK_RELIEF_NORMAL - True - - - - - - 0 - False - True - GTK_PACK_END - - - - - - 5 - True - True - True - True - GTK_POS_TOP - False - False - - - - 12 - True - False - 18 - vertical - - - - True - False - 6 - vertical - - - - True - Playback - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - - - - 0 - False - False - - - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - True - Start playing files from last position - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - - 0 - False - True - - - - - 0 - False - True - - - - True - False - 6 - vertical - - - - True - Networking - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - - - - 0 - False - False - - - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - False - 12 - - - - True - Connection _speed: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - tpw_speed_combobox - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - tpw_speed_liststore - False - True - - - - 0 - - - - - 0 - False - True - - - - - - - 0 - False - True - - - - - 0 - False - True - - - - - - True - False - 6 - vertical - - - - True - Text Subtitles - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - - - - 0 - False - False - - - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - 3 - 2 - False - 6 - 12 - - - - True - True - _Load subtitle files when movie is loaded - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - 2 - 0 - 1 - fill - - - - - - - True - _Font: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - font_sel_button - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - _Encoding: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - subtitle_encoding_combo - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 2 - 3 - fill - - - - - - - True - False - True - - - - 1 - 2 - 2 - 3 - fill - fill - - - - - - True - True - True - True - False - False - True - - - - 1 - 2 - 1 - 2 - - - - - - - - 0 - False - True - - - - - 0 - False - True - - - - - - True - False - 6 - vertical - - - - True - External Chapters - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - - - - 0 - False - False - - - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - 1 - 2 - False - 6 - 12 - - - - True - True - Load _chapter files when movie is loaded - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - 2 - 0 - 1 - fill - - - - - - - - 0 - False - True - - - - - 0 - False - True - - - - - False - True - - - - - - True - General - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - - - - - 12 - True - False - 18 - vertical - - - - True - False - 6 - vertical - - - - True - Display - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - - - - 0 - False - False - - - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - True - _Resize the window when a new video is loaded - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - - 0 - False - False - - - - - True - 12 - - - Disable _deinterlacing of interlaced videos - True - False - False - False - True - True - - - - - False - False - 3 - - - - - True - 12 - - - True - - - True - Disable screensaver when playing - - - 0 - - - - - Video - True - True - False - False - True - tpw_audio_toggle_button - - - 1 - - - - - Video or Audio - True - True - False - False - True - True - - - - 2 - - - - - - - False - False - 3 - - - - - - - 0 - False - True - - - - - - True - False - 6 - vertical - - - - True - Visual Effects - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - - - - 0 - False - False - - - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - False - 6 - vertical - - - - True - True - Show _visual effects when an audio file is played - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - 0 - False - False - - - - - - True - 2 - 2 - False - 6 - 12 - - - - True - _Type of visualization: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - tpw_visuals_type_combobox - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - Visualization _size: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - tpw_visuals_size_combobox - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - tpw_visuals_size_liststore - False - True - - - - 0 - - - - - 1 - 2 - 1 - 2 - fill - fill - - - - - - True - False - True - tpw_visuals_type_liststore - - - - - 0 - - - - - 1 - 2 - 0 - 1 - fill - - - - - 0 - False - True - - - - - - - 0 - False - True - - - - - 0 - False - True - - - - - - True - False - 6 - vertical - - - - True - False - 6 - - - - True - Color Balance - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - - - - 0 - False - False - - - - - 0 - False - False - - - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - 5 - 2 - False - 6 - 12 - - - - True - _Brightness: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - tpw_bright_scale - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - Co_ntrast: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - tpw_contrast_scale - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - True - False - GTK_POS_TOP - 1 - False - tpw_bright_adjustment - - - 1 - 2 - 0 - 1 - - - - - - - True - True - False - GTK_POS_TOP - 1 - False - tpw_contrast_adjustment - - - 1 - 2 - 1 - 2 - fill - fill - - - - - - True - Sat_uration: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - tpw_saturation_scale - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 2 - 3 - fill - - - - - - - True - _Hue: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - tpw_hue_scale - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 3 - 4 - fill - - - - - - - True - True - False - GTK_POS_TOP - 1 - False - tpw_saturation_adjustment - - - 1 - 2 - 2 - 3 - fill - fill - - - - - - True - True - False - GTK_POS_TOP - 1 - False - tpw_hue_adjustment - - - 1 - 2 - 3 - 4 - fill - fill - - - - - - True - False - 0 - GTK_BUTTONBOX_END - - - - True - True - Reset to _Defaults - True - GTK_RELIEF_NORMAL - True - - - - 0 - False - False - - - - - 1 - 2 - 4 - 5 - shrink|fill - - - - - - - 0 - False - True - - - - - 0 - False - True - - - - - False - True - - - - - - True - Display - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - - - - - 12 - True - False - 18 - vertical - - - - True - False - 0 - vertical - - - - True - False - 6 - vertical - - - - True - Audio Output - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - - - - 0 - False - False - - - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - False - 12 - - - - True - _Audio output type: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - tpw_sound_output_combobox - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - tpw_sound_output_liststore - False - True - - - - 0 - - - - - 0 - False - True - - - - - - - 0 - False - True - - - - - 0 - False - False - - - - - - - 0 - False - True - - - - - False - True - - - - - - True - Audio - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - - - - 0 - False - True - - - - -tpw_close_button - - - Movie Player + + Videos GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False diff -Nru totem-3.4.3/debian/changelog totem-3.6.2/debian/changelog --- totem-3.4.3/debian/changelog 2012-09-18 16:22:24.000000000 +0000 +++ totem-3.6.2/debian/changelog 2012-10-26 12:19:57.000000000 +0000 @@ -1,3 +1,60 @@ +totem (3.6.2-0ubuntu1~ubuntu12.10.1) quantal; urgency=low + + * Upload to PPA. + + -- Iain Lane Fri, 26 Oct 2012 13:16:45 +0100 + +totem (3.6.2-0ubuntu1) UNRELEASED; urgency=low + + * New upstream release. + - Make Ogg video streaming work again (the soundpitch plugin in + gst-plugins-bad is broken) + - Fix memory leaks when using download buffering + - Fix spinning cursor when launching videos from the file manager + - Fix bugs in video searches + - Fix screensaver not being inhibited (browser plugin) + - Fix some streams' video canvas being hidden (browser plugin) + * debian/rules: Build with --fail-missing, to ensure we install everything. + - Ignore libtotem.{,l}a since we delibrately don't install these. + * debian/control: Refresh BDs to match configure.in + + -- Iain Lane Fri, 26 Oct 2012 13:16:44 +0100 + +totem (3.6.0-0ubuntu1~12.10.1) quantal; urgency=low + + [ Rico Tzschichholz ] + * New upstream release. (LP: #1042018) + - In GNOME3 PPA since it uses gstreamer1.0 and the Ubuntu image won't + be using that until 13.04. + - Adds proxy support (LP: #477160) + * debian/control.in: + - Replace gstreamer0.10 dependencies with gstreamer1.0 + - Bump minimum glib & gtk + - Drop mx dependency + - Build-depend on gsettings-desktop-schemas-dev (>= 3.5.5) + - Build-depend and depend on gstreamer1.0-plugins-bad + (TODO: look into moving soundtouch to -good) + - Build-depend on grilo (TODO: needs MIR) (LP: #1035701) + * debian/totem-plugins-extra.install: + - iplayer has been dropped + - Add grilo plugin (but it doesn't seem to be working yet) + * Refreshed debian/patches/91_quicklist_entries.patch + * Dropped git patches + + [ Jeremy Bicha ] + * debian/control.in: + - Point to GNOME3 team bzr branch + - Update totem-plugins-extra description & dependencies + + -- Jeremy Bicha Sun, 07 Oct 2012 11:48:48 -0400 + +totem (3.4.3-0ubuntu5) quantal-proposed; urgency=low + + * debian/patches/git_fix_mov_in_browser.patch + - git patch fixes display video in the browser (lp: #1065324) + + -- Doug McMahon Wed, 10 Oct 2012 20:43:06 -0400 + totem (3.4.3-0ubuntu4) quantal; urgency=low * debian/rules: re-enable hardening, make sure both PIE and BINDNOW are used diff -Nru totem-3.4.3/debian/control totem-3.6.2/debian/control --- totem-3.4.3/debian/control 2012-09-18 16:22:26.000000000 +0000 +++ totem-3.6.2/debian/control 2012-10-26 12:19:59.000000000 +0000 @@ -7,14 +7,14 @@ Priority: optional Maintainer: Ubuntu Desktop Team XSBC-Original-Maintainer: Debian GNOME Maintainers -Uploaders: Debian GNOME Maintainers , Jeremy Bicha , Michael Biebl +Uploaders: Debian GNOME Maintainers , Jeremy Bicha Build-Depends: debhelper (>= 8), dpkg-dev (>= 1.16.1.1), cdbs (>= 0.4.90), dh-autoreconf, python (>= 2.6.6-3~), python-gi-dev (>= 2.90.3), - libglib2.0-dev (>= 2.27.92), + libglib2.0-dev (>= 2.33.0), libatk1.0-dev (>= 1.29.4), libgdk-pixbuf2.0-dev (>= 2.23.0), libgtk-3-dev (>= 3.5.2), @@ -24,13 +24,15 @@ libxml2-dev (>= 2.6.0), liblircclient-dev (>= 0.6.6), gnome-pkg-tools (>= 0.10), - scrollkeeper, - libgstreamer0.10-dev (>= 0.10.30), - libgstreamer-plugins-base0.10-dev (>= 0.10.30), - gstreamer0.10-tools (>= 0.10.26), - gstreamer0.10-gconf, - gstreamer0.10-plugins-base (>= 0.10.26), - gstreamer0.10-plugins-good, + libgrilo-0.2-dev (>= 0.2.0), + libgstreamer1.0-dev (>= 0.11.93), + libgstreamer-plugins-base1.0-dev (>= 0.11.93), + gstreamer1.0-tools (>= 0.11.93), + gstreamer1.0-plugins-base (>= 0.11.93), + gstreamer1.0-plugins-base-apps (>= 0.11.93), + gstreamer1.0-plugins-bad (>= 1.0.2), + libgstreamer-plugins-bad1.0-dev (>= 1.0.2), + gstreamer1.0-plugins-good (>= 0.11.93), librsvg2-dev (>= 2.16.0-2), librsvg2-common (>= 2.16.0-2), libnautilus-extension-dev (>= 2.91.4), @@ -48,15 +50,15 @@ libgdata-dev (>= 0.8.0), gobject-introspection (>= 0.9.12-4~), libgirepository1.0-dev (>= 0.9.12), - libmx-dev, + gsettings-desktop-schemas-dev (>= 3.5.5), valac-0.18, gtk-doc-tools (>= 1.14), - libclutter-gst-dev, - libclutter-gtk-1.0-dev, + libclutter-gst-2.0-dev (>= 1.5.5), + libclutter-gtk-1.0-dev (>= 1.0.2), libzeitgeist-dev, Standards-Version: 3.9.3 Homepage: http://www.gnome.org/projects/totem/ -Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/totem/ubuntu +Vcs-Bzr: https://code.launchpad.net/~gnome3-team/totem/ubuntu Package: libtotem0 Architecture: any @@ -75,9 +77,11 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, - gstreamer0.10-plugins-base (>= 0.10.26), - gstreamer0.10-plugins-good (>= 0.10.7), - gstreamer0.10-x, + gstreamer1.0-clutter, + gstreamer1.0-plugins-base (>= 0.11.93), + gstreamer1.0-plugins-bad (>= 0.11.93), + gstreamer1.0-plugins-good (>= 0.11.93), + gstreamer1.0-x, gnome-icon-theme (>= 2.15.90), gnome-icon-theme-symbolic, totem-common (= ${source:Version}) @@ -86,12 +90,10 @@ totem-mozilla (<< 2.20.0-3), totem-gstreamer (<< 2.27.1) Recommends: totem-plugins, - gstreamer0.10-pulseaudio, + gstreamer1.0-pulseaudio, Suggests: gnome-codec-install, - gstreamer0.10-pulseaudio (>= 0.10.16-5), - gstreamer0.10-plugins-ugly, - gstreamer0.10-plugins-bad, - gstreamer0.10-ffmpeg, + gstreamer1.0-plugins-ugly, + gstreamer1.0-libav, totem-mozilla Description: Simple media player for the GNOME desktop based on GStreamer Totem is a simple yet featureful media player for GNOME which can read @@ -201,8 +203,6 @@ Depends: totem (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}, - python-beautifulsoup, - python-feedparser Recommends: gromit Description: Extra plugins for the Totem media player Totem is a simple yet featureful media player for GNOME which can read @@ -210,8 +210,8 @@ . This package contains a set of extra plugins for Totem, which allow to: . + * Discover and browse media using the Grilo DLNA plugin * Annotate the screen with the Gromit tool - * Stream BBC programs . Additional plugins can be written in C, Python or Vala. @@ -237,8 +237,8 @@ ${misc:Depends}, libtotem0 (= ${binary:Version}), gir1.2-totem-1.0 (= ${binary:Version}), - libglib2.0-dev, - libgtk-3-dev, + libglib2.0-dev (>= 2.33.0), + libgtk-3-dev (>= 3.5.2), libtotem-plparser-dev Breaks: totem (<< 3.0.1-2) Replaces: totem (<< 3.0.1-2) diff -Nru totem-3.4.3/debian/control.in totem-3.6.2/debian/control.in --- totem-3.4.3/debian/control.in 2012-09-18 16:22:24.000000000 +0000 +++ totem-3.6.2/debian/control.in 2012-10-26 12:19:57.000000000 +0000 @@ -10,7 +10,7 @@ dh-autoreconf, python (>= 2.6.6-3~), python-gi-dev (>= 2.90.3), - libglib2.0-dev (>= 2.27.92), + libglib2.0-dev (>= 2.33.0), libatk1.0-dev (>= 1.29.4), libgdk-pixbuf2.0-dev (>= 2.23.0), libgtk-3-dev (>= 3.5.2), @@ -20,13 +20,15 @@ libxml2-dev (>= 2.6.0), liblircclient-dev (>= 0.6.6), gnome-pkg-tools (>= 0.10), - scrollkeeper, - libgstreamer0.10-dev (>= 0.10.30), - libgstreamer-plugins-base0.10-dev (>= 0.10.30), - gstreamer0.10-tools (>= 0.10.26), - gstreamer0.10-gconf, - gstreamer0.10-plugins-base (>= 0.10.26), - gstreamer0.10-plugins-good, + libgrilo-0.2-dev (>= 0.2.0), + libgstreamer1.0-dev (>= 0.11.93), + libgstreamer-plugins-base1.0-dev (>= 0.11.93), + gstreamer1.0-tools (>= 0.11.93), + gstreamer1.0-plugins-base (>= 0.11.93), + gstreamer1.0-plugins-base-apps (>= 0.11.93), + gstreamer1.0-plugins-bad (>= 1.0.2), + libgstreamer-plugins-bad1.0-dev (>= 1.0.2), + gstreamer1.0-plugins-good (>= 0.11.93), librsvg2-dev (>= 2.16.0-2), librsvg2-common (>= 2.16.0-2), libnautilus-extension-dev (>= 2.91.4), @@ -44,15 +46,15 @@ libgdata-dev (>= 0.8.0), gobject-introspection (>= 0.9.12-4~), libgirepository1.0-dev (>= 0.9.12), - libmx-dev, + gsettings-desktop-schemas-dev (>= 3.5.5), valac-0.18, gtk-doc-tools (>= 1.14), - libclutter-gst-dev, - libclutter-gtk-1.0-dev, + libclutter-gst-2.0-dev (>= 1.5.5), + libclutter-gtk-1.0-dev (>= 1.0.2), libzeitgeist-dev, Standards-Version: 3.9.3 Homepage: http://www.gnome.org/projects/totem/ -Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/totem/ubuntu +Vcs-Bzr: https://code.launchpad.net/~gnome3-team/totem/ubuntu Package: libtotem0 Architecture: any @@ -71,9 +73,11 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, - gstreamer0.10-plugins-base (>= 0.10.26), - gstreamer0.10-plugins-good (>= 0.10.7), - gstreamer0.10-x, + gstreamer1.0-clutter, + gstreamer1.0-plugins-base (>= 0.11.93), + gstreamer1.0-plugins-bad (>= 0.11.93), + gstreamer1.0-plugins-good (>= 0.11.93), + gstreamer1.0-x, gnome-icon-theme (>= 2.15.90), gnome-icon-theme-symbolic, totem-common (= ${source:Version}) @@ -82,12 +86,10 @@ totem-mozilla (<< 2.20.0-3), totem-gstreamer (<< 2.27.1) Recommends: totem-plugins, - gstreamer0.10-pulseaudio, + gstreamer1.0-pulseaudio, Suggests: gnome-codec-install, - gstreamer0.10-pulseaudio (>= 0.10.16-5), - gstreamer0.10-plugins-ugly, - gstreamer0.10-plugins-bad, - gstreamer0.10-ffmpeg, + gstreamer1.0-plugins-ugly, + gstreamer1.0-libav, totem-mozilla Description: Simple media player for the GNOME desktop based on GStreamer Totem is a simple yet featureful media player for GNOME which can read @@ -197,8 +199,6 @@ Depends: totem (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}, - python-beautifulsoup, - python-feedparser Recommends: gromit Description: Extra plugins for the Totem media player Totem is a simple yet featureful media player for GNOME which can read @@ -206,8 +206,8 @@ . This package contains a set of extra plugins for Totem, which allow to: . + * Discover and browse media using the Grilo DLNA plugin * Annotate the screen with the Gromit tool - * Stream BBC programs . Additional plugins can be written in C, Python or Vala. @@ -233,8 +233,8 @@ ${misc:Depends}, libtotem0 (= ${binary:Version}), gir1.2-totem-1.0 (= ${binary:Version}), - libglib2.0-dev, - libgtk-3-dev, + libglib2.0-dev (>= 2.33.0), + libgtk-3-dev (>= 3.5.2), libtotem-plparser-dev Breaks: totem (<< 3.0.1-2) Replaces: totem (<< 3.0.1-2) diff -Nru totem-3.4.3/debian/patches/91_quicklist_entries.patch totem-3.6.2/debian/patches/91_quicklist_entries.patch --- totem-3.4.3/debian/patches/91_quicklist_entries.patch 2012-09-18 16:22:24.000000000 +0000 +++ totem-3.6.2/debian/patches/91_quicklist_entries.patch 2012-10-26 12:19:57.000000000 +0000 @@ -8,7 +8,7 @@ --- totem-3.0.1.orig/data/totem.desktop.in.in.in +++ totem-3.0.1/data/totem.desktop.in.in.in @@ -14,3 +14,29 @@ X-GNOME-Bugzilla-Version=@VERSION@ - X-GNOME-Bugzilla-OtherBinaries=totem-video-indexer;totem-video-thumbnailer;totem-audio-preview; + X-GNOME-Bugzilla-OtherBinaries=totem-video-thumbnailer;totem-audio-preview; X-GNOME-Bugzilla-ExtraInfoScript=@FULL_LIBEXECDIR@/totem/totem-bugreport.py StartupNotify=true +Actions=Play;Next;Previous;Mute;Fullscreen; diff -Nru totem-3.4.3/debian/patches/git_fix_mov_in_browser.patch totem-3.6.2/debian/patches/git_fix_mov_in_browser.patch --- totem-3.4.3/debian/patches/git_fix_mov_in_browser.patch 1970-01-01 00:00:00.000000000 +0000 +++ totem-3.6.2/debian/patches/git_fix_mov_in_browser.patch 2012-10-26 12:19:57.000000000 +0000 @@ -0,0 +1,27 @@ +From 110130e8fbb36128af21087f9b41839d06f3c1d7 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Wed, 10 Oct 2012 16:01:15 +0000 +Subject: browser-plugin: Fix MOV streams with hidden video + +We would treat MOV streams with no set height as "audio-only" because +the undefined height (-1) is smaller than the smallest our controls bar +can be. This code has apparently been broken since 2008, and nobody +noticed? + +https://bugzilla.gnome.org/show_bug.cgi?id=680714 +--- +diff --git a/browser-plugin/totemPlugin.cpp b/browser-plugin/totemPlugin.cpp +index f820656..9d97e36 100644 +--- a/browser-plugin/totemPlugin.cpp ++++ b/browser-plugin/totemPlugin.cpp +@@ -2147,7 +2147,7 @@ totemPlugin::Init (NPMIMEType mimetype, + } + #endif /* TOTEM_GMP_PLUGIN */ + #if defined(TOTEM_NARROWSPACE_PLUGIN) +- if (height <= 16 && !mControllerHidden) { ++ if (height > 0 && height <= 16 && !mControllerHidden) { + mAudioOnly = true; + } + #endif /* TOTEM_NARROWSPACE_PLUGIN */ +-- +cgit v0.9.0.2 diff -Nru totem-3.4.3/debian/patches/git_no_browser_slider_hack.patch totem-3.6.2/debian/patches/git_no_browser_slider_hack.patch --- totem-3.4.3/debian/patches/git_no_browser_slider_hack.patch 2012-09-18 16:22:24.000000000 +0000 +++ totem-3.6.2/debian/patches/git_no_browser_slider_hack.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,43 +0,0 @@ -From 015473560c26cf8ebc6f5033601cacda285c79c2 Mon Sep 17 00:00:00 2001 -From: Iain Lane -Date: Tue, 26 Jun 2012 21:34:33 +0000 -Subject: browser-plugin: Update seek slider position hack - -Commit b31a06a712ab39a9c9018304b9dfc5a31687016c updated the seek slider -in the main totem UI to work with change in GTK+ 3.5.2. - -Also fix the browser plugin's seek slider. - -https://bugzilla.gnome.org/show_bug.cgi?id=678931 ---- -diff --git a/browser-plugin/totem-plugin-viewer.c b/browser-plugin/totem-plugin-viewer.c -index 54bafa9..c4443be 100644 ---- a/browser-plugin/totem-plugin-viewer.c -+++ b/browser-plugin/totem-plugin-viewer.c -@@ -1547,13 +1547,6 @@ property_notify_cb_volume (BaconVideoWidget *bvw, - static gboolean - on_seek_start (GtkWidget *widget, GdkEventButton *event, TotemEmbedded *emb) - { -- /* HACK: we want the behaviour you get with the middle button, so we -- * mangle the event. clicking with other buttons moves the slider in -- * step increments, clicking with the middle button moves the slider to -- * the location of the click. -- */ -- event->button = 2; -- - emb->seeking = TRUE; - totem_time_label_set_seeking (TOTEM_TIME_LABEL (emb->fs->time_label), - TRUE); -@@ -1564,9 +1557,6 @@ on_seek_start (GtkWidget *widget, GdkEventButton *event, TotemEmbedded *emb) - static gboolean - cb_on_seek (GtkWidget *widget, GdkEventButton *event, TotemEmbedded *emb) - { -- /* HACK: see on_seek_start */ -- event->button = 2; -- - bacon_video_widget_seek (emb->bvw, - gtk_range_get_value (GTK_RANGE (widget)) / 65535, NULL); - totem_time_label_set_seeking (TOTEM_TIME_LABEL (emb->fs->time_label), --- -cgit v0.9.0.2 - diff -Nru totem-3.4.3/debian/patches/git_no_slider_hack.patch totem-3.6.2/debian/patches/git_no_slider_hack.patch --- totem-3.4.3/debian/patches/git_no_slider_hack.patch 2012-09-18 16:22:24.000000000 +0000 +++ totem-3.6.2/debian/patches/git_no_slider_hack.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,45 +0,0 @@ -From b31a06a712ab39a9c9018304b9dfc5a31687016c Mon Sep 17 00:00:00 2001 -From: Kalev Lember -Date: Thu, 10 May 2012 15:41:41 +0000 -Subject: main: Update the seek slider hack for GTK+ changes - -GTK+ commit 162614aa changed the range widget's button behaviour so that -button 1 jumps to position. This is almost what we need in totem, except -that we'd want buttons 2 and 3 to also do the jumping. - -Update the seek slider hack accordingly to always force button 1 -behaviour and bump gtk+ dep to 3.5.2. - -https://bugzilla.gnome.org/show_bug.cgi?id=675838 ---- -diff --git a/src/totem-object.c b/src/totem-object.c -index 22f6266..4b8e31e 100644 ---- a/src/totem-object.c -+++ b/src/totem-object.c -@@ -2592,12 +2592,12 @@ property_notify_cb_seekable (BaconVideoWidget *bvw, GParamSpec *spec, TotemObjec - gboolean - seek_slider_pressed_cb (GtkWidget *widget, GdkEventButton *event, TotemObject *totem) - { -- /* HACK: we want the behaviour you get with the middle button, so we -+ /* HACK: we want the behaviour you get with the left button, so we - * mangle the event. clicking with other buttons moves the slider in -- * step increments, clicking with the middle button moves the slider to -+ * step increments, clicking with the left button moves the slider to - * the location of the click. - */ -- event->button = 2; -+ event->button = GDK_BUTTON_PRIMARY; - - totem->seek_lock = TRUE; - if (bacon_video_widget_can_direct_seek (totem->bvw) == FALSE) { -@@ -2636,7 +2636,7 @@ seek_slider_released_cb (GtkWidget *widget, GdkEventButton *event, TotemObject * - gdouble val; - - /* HACK: see seek_slider_pressed_cb */ -- event->button = 2; -+ event->button = GDK_BUTTON_PRIMARY; - - /* set to FALSE here to avoid triggering a final seek when - * syncing the adjustments while being in direct seek mode */ --- -cgit v0.9.0.2 diff -Nru totem-3.4.3/debian/patches/git_use_keywords.patch totem-3.6.2/debian/patches/git_use_keywords.patch --- totem-3.4.3/debian/patches/git_use_keywords.patch 2012-09-18 16:22:24.000000000 +0000 +++ totem-3.6.2/debian/patches/git_use_keywords.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -From b730b1faf830900e58718503aff8b55f0aaddacb Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Wed, 11 Apr 2012 12:07:08 +0000 -Subject: data: Add keywords - -As used in gnome-shell nowadays. - -https://bugzilla.gnome.org/show_bug.cgi?id=673742 ---- -diff --git a/data/totem.desktop.in.in.in b/data/totem.desktop.in.in.in -index 84e8892..19bfd6a 100644 ---- a/data/totem.desktop.in.in.in -+++ b/data/totem.desktop.in.in.in -@@ -1,6 +1,7 @@ - [Desktop Entry] - _Name=Movie Player - _Comment=Play movies and songs -+_Keywords=Video;Movie;Film;Clip;Series;Player;DVD;TV;Disc; - Exec=totem %U - Icon=totem - Terminal=false --- -cgit v0.9.0.2 - diff -Nru totem-3.4.3/debian/patches/series totem-3.6.2/debian/patches/series --- totem-3.4.3/debian/patches/series 2012-09-18 16:22:24.000000000 +0000 +++ totem-3.6.2/debian/patches/series 2012-10-26 12:19:57.000000000 +0000 @@ -3,6 +3,3 @@ #02_revert_clutter.patch correct_desktop_mimetypes.patch 91_quicklist_entries.patch -git_use_keywords.patch -git_no_browser_slider_hack.patch -git_no_slider_hack.patch diff -Nru totem-3.4.3/debian/rules totem-3.6.2/debian/rules --- totem-3.4.3/debian/rules 2012-09-18 16:22:24.000000000 +0000 +++ totem-3.6.2/debian/rules 2012-10-26 12:19:57.000000000 +0000 @@ -24,6 +24,7 @@ DEB_DH_GIREPOSITORY_ARGS += -lsrc DEB_DH_MAKESHLIBS_ARGS_totem += -X/usr/lib/nautilus/ DEB_DH_MAKESHLIBS_ARGS_libtotem0 += -V'libtotem0 (>= $(DEB_VERSION)), libtotem0 (<< $(DEB_GNOME_NEXTVERSION))' +DEB_DH_INSTALL_ARGS += --fail-missing -Xlibtotem.a -Xlibtotem.la binary-install/totem:: dh_python2 -ptotem /usr/lib/totem/totem diff -Nru totem-3.4.3/debian/totem-plugins-extra.install totem-3.6.2/debian/totem-plugins-extra.install --- totem-3.4.3/debian/totem-plugins-extra.install 2012-09-18 16:22:24.000000000 +0000 +++ totem-3.6.2/debian/totem-plugins-extra.install 2012-10-26 12:19:57.000000000 +0000 @@ -1,2 +1,2 @@ +usr/lib/totem/plugins/grilo usr/lib/totem/plugins/gromit -usr/lib/totem/plugins/iplayer diff -Nru totem-3.4.3/debian/totem-plugins.install totem-3.6.2/debian/totem-plugins.install --- totem-3.4.3/debian/totem-plugins.install 2012-09-18 16:22:24.000000000 +0000 +++ totem-3.6.2/debian/totem-plugins.install 2012-10-26 12:19:57.000000000 +0000 @@ -1,3 +1,3 @@ -usr/lib/totem/plugins/[!gci]* +usr/lib/totem/plugins/[!gc]* usr/lib/totem/plugins/chapters usr/lib/totem/plugins/im-status diff -Nru totem-3.4.3/docs/Makefile.in totem-3.6.2/docs/Makefile.in --- totem-3.4.3/docs/Makefile.in 2012-07-04 09:54:48.000000000 +0000 +++ totem-3.6.2/docs/Makefile.in 2012-10-25 13:36:19.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +14,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -36,22 +52,25 @@ subdir = docs DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -61,6 +80,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -110,6 +134,10 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BACKEND_CFLAGS = @BACKEND_CFLAGS@ +BACKEND_LIBS = @BACKEND_LIBS@ +BACKEND_TEST_CFLAGS = @BACKEND_TEST_CFLAGS@ +BACKEND_TEST_LIBS = @BACKEND_TEST_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ BROWSER_PLUGIN_DIR = @BROWSER_PLUGIN_DIR@ BROWSER_PLUGIN_LIBS = @BROWSER_PLUGIN_LIBS@ @@ -131,8 +159,6 @@ DBUS_LIBS = @DBUS_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DEPENDENCY_CFLAGS = @DEPENDENCY_CFLAGS@ -DEPENDENCY_LIBS = @DEPENDENCY_LIBS@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DISC_RECORDER_CFLAGS = @DISC_RECORDER_CFLAGS@ DISC_RECORDER_LIBS = @DISC_RECORDER_LIBS@ @@ -146,7 +172,6 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -EXTRA_BACKEND_LIBS = @EXTRA_BACKEND_LIBS@ FGREP = @FGREP@ FULL_LIBEXECDIR = @FULL_LIBEXECDIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ @@ -154,19 +179,21 @@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GLIB_REQS = @GLIB_REQS@ +GLOW_BUTTON_CFLAGS = @GLOW_BUTTON_CFLAGS@ +GLOW_BUTTON_LIBS = @GLOW_BUTTON_LIBS@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ -GST_CFLAGS = @GST_CFLAGS@ -GST_LIBS = @GST_LIBS@ +GST_PLUGINS_BAD_CFLAGS = @GST_PLUGINS_BAD_CFLAGS@ +GST_PLUGINS_BAD_LIBS = @GST_PLUGINS_BAD_LIBS@ GTKDOC_CHECK = @GTKDOC_CHECK@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_LIBS = @GTK_LIBS@ GTK_REQS = @GTK_REQS@ +HELPER_CFLAGS = @HELPER_CFLAGS@ +HELPER_LIBS = @HELPER_LIBS@ HELP_DIR = @HELP_DIR@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ @@ -192,11 +219,11 @@ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBEPC_CFLAGS = @LIBEPC_CFLAGS@ -LIBEPC_LIBS = @LIBEPC_LIBS@ LIBGRILO_CFLAGS = @LIBGRILO_CFLAGS@ LIBGRILO_LIBS = @LIBGRILO_LIBS@ LIBOBJS = @LIBOBJS@ +LIBPLAYER_CFLAGS = @LIBPLAYER_CFLAGS@ +LIBPLAYER_LIBS = @LIBPLAYER_LIBS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBZEITGEIST_CFLAGS = @LIBZEITGEIST_CFLAGS@ @@ -213,8 +240,6 @@ MISSING_PLUGINS_CFLAGS = @MISSING_PLUGINS_CFLAGS@ MISSING_PLUGINS_LIBS = @MISSING_PLUGINS_LIBS@ MKDIR_P = @MKDIR_P@ -MM_CFLAGS = @MM_CFLAGS@ -MM_LIBS = @MM_LIBS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ NAUTILUSDIR = @NAUTILUSDIR@ @@ -235,15 +260,21 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PEASGTK_CFLAGS = @PEASGTK_CFLAGS@ -PEASGTK_LIBS = @PEASGTK_LIBS@ -PEAS_CFLAGS = @PEAS_CFLAGS@ -PEAS_LIBS = @PEAS_LIBS@ +PIXBUF_HELPER_CFLAGS = @PIXBUF_HELPER_CFLAGS@ +PIXBUF_HELPER_LIBS = @PIXBUF_HELPER_LIBS@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +PLAYER_CFLAGS = @PLAYER_CFLAGS@ +PLAYER_LIBS = @PLAYER_LIBS@ PLUGINDIR = @PLUGINDIR@ PLUGINS = @PLUGINS@ +PLUGIN_VIEWER_CFLAGS = @PLUGIN_VIEWER_CFLAGS@ +PLUGIN_VIEWER_LIBS = @PLUGIN_VIEWER_LIBS@ +PREVIEW_CFLAGS = @PREVIEW_CFLAGS@ +PREVIEW_LIBS = @PREVIEW_LIBS@ +PROPERTIES_CFLAGS = @PROPERTIES_CFLAGS@ +PROPERTIES_LIBS = @PROPERTIES_LIBS@ PYGOBJECT_CFLAGS = @PYGOBJECT_CFLAGS@ PYGOBJECT_LIBS = @PYGOBJECT_LIBS@ PYLINT = @PYLINT@ @@ -263,6 +294,10 @@ SMCLIENT_CFLAGS = @SMCLIENT_CFLAGS@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ +THUMBNAILER_CFLAGS = @THUMBNAILER_CFLAGS@ +THUMBNAILER_LIBS = @THUMBNAILER_LIBS@ +TIME_HELPER_CFLAGS = @TIME_HELPER_CFLAGS@ +TIME_HELPER_LIBS = @TIME_HELPER_LIBS@ TOTEM_API_VERSION = @TOTEM_API_VERSION@ TOTEM_PLPARSER_REQS = @TOTEM_PLPARSER_REQS@ TOTEM_VERSION_MAJOR = @TOTEM_VERSION_MAJOR@ @@ -274,9 +309,6 @@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ XGETTEXT = @XGETTEXT@ -XMKMF = @XMKMF@ -XTEST_LIBS = @XTEST_LIBS@ -X_LIBS = @X_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -379,12 +411,12 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -394,7 +426,11 @@ done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -408,37 +444,6 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ @@ -447,6 +452,10 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done +cscopelist-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ + done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -510,6 +519,20 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -545,13 +568,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -672,22 +692,23 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ + cscopelist-recursive ctags-recursive install-am install-strip \ + tags-recursive .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am + cscopelist cscopelist-recursive ctags ctags-recursive \ + distclean distclean-generic distclean-libtool distclean-tags \ + distdir dvi dvi-am html html-am info info-am install \ + install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-recursive uninstall uninstall-am -include $(top_srcdir)/git.mk diff -Nru totem-3.4.3/docs/reference/Makefile.am totem-3.6.2/docs/reference/Makefile.am --- totem-3.4.3/docs/reference/Makefile.am 2012-07-04 09:52:29.000000000 +0000 +++ totem-3.6.2/docs/reference/Makefile.am 2012-08-29 23:07:45.000000000 +0000 @@ -107,7 +107,13 @@ totem-tracker-widget.h \ totem-marshal.h \ gsd-media-keys-window.h \ - gsd-osd-window.h + gsd-osd-window.h \ + bacon-video-osd-actor.h \ + totem-search-entry.h \ + gd-tagged-entry.h \ + gd-fullscreen-filter.h \ + gsd-osd-window-private.h \ + screenshot-filename-builder.h # Images to copy into HTML directory. # e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png @@ -132,11 +138,10 @@ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/backend \ -I$(top_srcdir)/src/plugins \ - $(DEPENDENCY_CFLAGS) \ - $(PEAS_CFLAGS) + $(PLAYER_CFLAGS) GTKDOC_LIBS = \ $(top_builddir)/src/libtotem.la \ - $(DEPENDENCY_LIBS) + $(PLAYER_LIBS) # This includes the standard gtk-doc make rules, copied by gtkdocize. include $(top_srcdir)/gtk-doc.make diff -Nru totem-3.4.3/docs/reference/Makefile.in totem-3.6.2/docs/reference/Makefile.in --- totem-3.4.3/docs/reference/Makefile.in 2012-07-04 09:54:48.000000000 +0000 +++ totem-3.6.2/docs/reference/Makefile.in 2012-10-25 13:36:19.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.12.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -21,6 +20,23 @@ # Everything below here is generic # #################################### VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -43,26 +59,36 @@ $(srcdir)/version.xml.in $(top_srcdir)/gtk-doc.make subdir = docs/reference ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = version.xml CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = $(am__tty_colors_dummy) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -79,6 +105,10 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BACKEND_CFLAGS = @BACKEND_CFLAGS@ +BACKEND_LIBS = @BACKEND_LIBS@ +BACKEND_TEST_CFLAGS = @BACKEND_TEST_CFLAGS@ +BACKEND_TEST_LIBS = @BACKEND_TEST_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ BROWSER_PLUGIN_DIR = @BROWSER_PLUGIN_DIR@ BROWSER_PLUGIN_LIBS = @BROWSER_PLUGIN_LIBS@ @@ -100,8 +130,6 @@ DBUS_LIBS = @DBUS_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DEPENDENCY_CFLAGS = @DEPENDENCY_CFLAGS@ -DEPENDENCY_LIBS = @DEPENDENCY_LIBS@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DISC_RECORDER_CFLAGS = @DISC_RECORDER_CFLAGS@ DISC_RECORDER_LIBS = @DISC_RECORDER_LIBS@ @@ -115,7 +143,6 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -EXTRA_BACKEND_LIBS = @EXTRA_BACKEND_LIBS@ FGREP = @FGREP@ FULL_LIBEXECDIR = @FULL_LIBEXECDIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ @@ -123,19 +150,21 @@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GLIB_REQS = @GLIB_REQS@ +GLOW_BUTTON_CFLAGS = @GLOW_BUTTON_CFLAGS@ +GLOW_BUTTON_LIBS = @GLOW_BUTTON_LIBS@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ -GST_CFLAGS = @GST_CFLAGS@ -GST_LIBS = @GST_LIBS@ +GST_PLUGINS_BAD_CFLAGS = @GST_PLUGINS_BAD_CFLAGS@ +GST_PLUGINS_BAD_LIBS = @GST_PLUGINS_BAD_LIBS@ GTKDOC_CHECK = @GTKDOC_CHECK@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_LIBS = @GTK_LIBS@ GTK_REQS = @GTK_REQS@ +HELPER_CFLAGS = @HELPER_CFLAGS@ +HELPER_LIBS = @HELPER_LIBS@ HELP_DIR = @HELP_DIR@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ @@ -161,11 +190,11 @@ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LIBEPC_CFLAGS = @LIBEPC_CFLAGS@ -LIBEPC_LIBS = @LIBEPC_LIBS@ LIBGRILO_CFLAGS = @LIBGRILO_CFLAGS@ LIBGRILO_LIBS = @LIBGRILO_LIBS@ LIBOBJS = @LIBOBJS@ +LIBPLAYER_CFLAGS = @LIBPLAYER_CFLAGS@ +LIBPLAYER_LIBS = @LIBPLAYER_LIBS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBZEITGEIST_CFLAGS = @LIBZEITGEIST_CFLAGS@ @@ -182,8 +211,6 @@ MISSING_PLUGINS_CFLAGS = @MISSING_PLUGINS_CFLAGS@ MISSING_PLUGINS_LIBS = @MISSING_PLUGINS_LIBS@ MKDIR_P = @MKDIR_P@ -MM_CFLAGS = @MM_CFLAGS@ -MM_LIBS = @MM_LIBS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ NAUTILUSDIR = @NAUTILUSDIR@ @@ -204,15 +231,21 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PEASGTK_CFLAGS = @PEASGTK_CFLAGS@ -PEASGTK_LIBS = @PEASGTK_LIBS@ -PEAS_CFLAGS = @PEAS_CFLAGS@ -PEAS_LIBS = @PEAS_LIBS@ +PIXBUF_HELPER_CFLAGS = @PIXBUF_HELPER_CFLAGS@ +PIXBUF_HELPER_LIBS = @PIXBUF_HELPER_LIBS@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +PLAYER_CFLAGS = @PLAYER_CFLAGS@ +PLAYER_LIBS = @PLAYER_LIBS@ PLUGINDIR = @PLUGINDIR@ PLUGINS = @PLUGINS@ +PLUGIN_VIEWER_CFLAGS = @PLUGIN_VIEWER_CFLAGS@ +PLUGIN_VIEWER_LIBS = @PLUGIN_VIEWER_LIBS@ +PREVIEW_CFLAGS = @PREVIEW_CFLAGS@ +PREVIEW_LIBS = @PREVIEW_LIBS@ +PROPERTIES_CFLAGS = @PROPERTIES_CFLAGS@ +PROPERTIES_LIBS = @PROPERTIES_LIBS@ PYGOBJECT_CFLAGS = @PYGOBJECT_CFLAGS@ PYGOBJECT_LIBS = @PYGOBJECT_LIBS@ PYLINT = @PYLINT@ @@ -232,6 +265,10 @@ SMCLIENT_CFLAGS = @SMCLIENT_CFLAGS@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ +THUMBNAILER_CFLAGS = @THUMBNAILER_CFLAGS@ +THUMBNAILER_LIBS = @THUMBNAILER_LIBS@ +TIME_HELPER_CFLAGS = @TIME_HELPER_CFLAGS@ +TIME_HELPER_LIBS = @TIME_HELPER_LIBS@ TOTEM_API_VERSION = @TOTEM_API_VERSION@ TOTEM_PLPARSER_REQS = @TOTEM_PLPARSER_REQS@ TOTEM_VERSION_MAJOR = @TOTEM_VERSION_MAJOR@ @@ -243,9 +280,6 @@ WARN_CFLAGS = @WARN_CFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ XGETTEXT = @XGETTEXT@ -XMKMF = @XMKMF@ -XTEST_LIBS = @XTEST_LIBS@ -X_LIBS = @X_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -413,7 +447,13 @@ totem-tracker-widget.h \ totem-marshal.h \ gsd-media-keys-window.h \ - gsd-osd-window.h + gsd-osd-window.h \ + bacon-video-osd-actor.h \ + totem-search-entry.h \ + gd-tagged-entry.h \ + gd-fullscreen-filter.h \ + gsd-osd-window-private.h \ + screenshot-filename-builder.h # Images to copy into HTML directory. @@ -439,12 +479,11 @@ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/backend \ -I$(top_srcdir)/src/plugins \ - $(DEPENDENCY_CFLAGS) \ - $(PEAS_CFLAGS) + $(PLAYER_CFLAGS) GTKDOC_LIBS = \ $(top_builddir)/src/libtotem.la \ - $(DEPENDENCY_LIBS) + $(PLAYER_LIBS) @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -543,6 +582,8 @@ ctags: CTAGS CTAGS: +cscope cscopelist: + check-TESTS: $(TESTS) @failed=0; all=0; xfail=0; xpass=0; skip=0; \ @@ -554,7 +595,7 @@ if test -f ./$$tst; then dir=./; \ elif test -f $$tst; then dir=; \ else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + if $(TESTS_ENVIRONMENT) $${dir}$$tst $(AM_TESTS_FD_REDIRECT); then \ all=`expr $$all + 1`; \ case " $(XFAIL_TESTS) " in \ *[\ \ ]$$tst[\ \ ]*) \ diff -Nru totem-3.4.3/docs/reference/html/BaconVideoWidget.html totem-3.6.2/docs/reference/html/BaconVideoWidget.html --- totem-3.4.3/docs/reference/html/BaconVideoWidget.html 2012-07-04 10:18:33.000000000 +0000 +++ totem-3.6.2/docs/reference/html/BaconVideoWidget.html 2012-10-25 13:48:52.000000000 +0000 @@ -3,7 +3,7 @@ BaconVideoWidget - + @@ -56,17 +56,16 @@ BaconVideoWidgetClass; enum BvwAspectRatio; enum BvwAudioOutputType; -enum BvwConnectionSpeed; enum BvwDVDEvent; enum BvwMetadataType; +enum BvwRotation; enum BvwVisualizationQuality; enum BvwVideoProperty; enum BvwZoomMode; enum BvwError; -GtkWidget * bacon_video_widget_new (GError **error); +GtkWidget * bacon_video_widget_new (GError **error); gboolean bacon_video_widget_open (BaconVideoWidget *bvw, const char *mrl, - const char *subtitle_uri, GError **error); gboolean bacon_video_widget_play (BaconVideoWidget *bvw, GError **error); @@ -98,12 +97,6 @@ gboolean bacon_video_widget_get_auto_resize (BaconVideoWidget *bvw); void bacon_video_widget_set_auto_resize (BaconVideoWidget *bvw, gboolean auto_resize); -char * bacon_video_widget_get_backend_name (BaconVideoWidget *bvw); -int bacon_video_widget_get_connection_speed - (BaconVideoWidget *bvw); -void bacon_video_widget_set_connection_speed - (BaconVideoWidget *bvw, - int speed); GdkPixbuf * bacon_video_widget_get_current_frame (BaconVideoWidget *bvw); gint64 bacon_video_widget_get_current_time (BaconVideoWidget *bvw); @@ -126,14 +119,13 @@ void bacon_video_widget_get_metadata (BaconVideoWidget *bvw, BvwMetadataType type, GValue *value); -gchar ** bacon_video_widget_get_mrls (BaconVideoWidget *bvw, - TotemDiscMediaType type, - const char *device, - GError **error); GOptionGroup * bacon_video_widget_get_option_group (void); double bacon_video_widget_get_position (BaconVideoWidget *bvw); void bacon_video_widget_set_referrer (BaconVideoWidget *bvw, const char *referrer); +BvwRotation bacon_video_widget_get_rotation (BaconVideoWidget *bvw); +void bacon_video_widget_set_rotation (BaconVideoWidget *bvw, + BvwRotation rotation); void bacon_video_widget_set_scale_ratio (BaconVideoWidget *bvw, float ratio); gboolean bacon_video_widget_get_show_cursor (BaconVideoWidget *bvw); @@ -148,6 +140,9 @@ int bacon_video_widget_get_subtitle (BaconVideoWidget *bvw); void bacon_video_widget_set_subtitle (BaconVideoWidget *bvw, int subtitle); +void bacon_video_widget_set_text_subtitle + (BaconVideoWidget *bvw, + const gchar *subtitle_uri); void bacon_video_widget_set_subtitle_encoding (BaconVideoWidget *bvw, const char *encoding); @@ -184,6 +179,11 @@ (BaconVideoWidget *bvw); gboolean bacon_video_widget_is_playing (BaconVideoWidget *bvw); gboolean bacon_video_widget_is_seekable (BaconVideoWidget *bvw); +gfloat bacon_video_widget_get_rate (BaconVideoWidget *bvw); +gboolean bacon_video_widget_set_rate (BaconVideoWidget *bvw, + gfloat new_rate); +void bacon_video_widget_popup_osd (BaconVideoWidget *bvw, + const char *icon_name); gboolean bacon_video_widget_step (BaconVideoWidget *bvw, gboolean forward, GError **error); @@ -194,8 +194,8 @@ 
   GObject
    +----GInitiallyUnowned
-         +----GtkWidget
-               +----GtkContainer
+         +----GtkWidget
+               +----GtkContainer
                      +----GtkClutterEmbed
                            +----BaconVideoWidget
@@ -204,15 +204,15 @@

Implemented Interfaces

BaconVideoWidget implements - AtkImplementorIface and GtkBuildable.

+ AtkImplementorIface, GtkBuildable and GInitable.

Properties

   "audio-output-type"        BvwAudioOutputType    : Read / Write
   "auto-resize"              gboolean              : Read / Write
+  "av-offset"                gint64                : Read / Write
   "brightness"               gint                  : Read / Write
-  "connection-speed"         BvwConnectionSpeed    : Read / Write
   "contrast"                 gint                  : Read / Write
   "deinterlacing"            gboolean              : Read / Write
   "download-filename"        gchar*                : Read / Write
@@ -287,8 +287,11 @@
 The pixel aspect ratios available in which to display videos using
 bacon_video_widget_set_aspect_ratio().
 

-

+

+++
@@ -333,8 +336,11 @@
 

 The audio output types available for use with bacon_video_widget_set_audio_output_type().
 

-

 


 
 

 
BVW_RATIO_AUTO

+

+++
@@ -371,93 +377,6 @@
 

-
enum BvwConnectionSpeed

-
typedef enum {
-	BVW_SPEED_14_4_MODEM = 0,
-	BVW_SPEED_19_2_MODEM,
-	BVW_SPEED_28_8_MODEM,
-	BVW_SPEED_33_6_MODEM,
-	BVW_SPEED_34_4_MODEM,
-	BVW_SPEED_56_ISDN,
-	BVW_SPEED_112_ISDN,
-	BVW_SPEED_256_DSL,
-	BVW_SPEED_384_DSL,
-	BVW_SPEED_512_DSL,
-	BVW_SPEED_1500_T1,
-	BVW_SPEED_LAN
-} BvwConnectionSpeed;
-

-

-The different connection speeds understood by bacon_video_widget_set_connection_speed().
-

-

 


 
 

 
BVW_AUDIO_SOUND_STEREO

 
 

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-


BVW_SPEED_14_4_MODEM
14.4 Kbps Modem
-
BVW_SPEED_19_2_MODEM
19.2 Kbps Modem
-
BVW_SPEED_28_8_MODEM
28.8 Kbps Modem
-
BVW_SPEED_33_6_MODEM
33.6 Kbps Modem
-
BVW_SPEED_34_4_MODEM
34.4 Kbps Modem
-
BVW_SPEED_56_ISDN
56 Kbps Modem/ISDN
-
BVW_SPEED_112_ISDN
112 Kbps Dual ISDN/DSL
-
BVW_SPEED_256_DSL
256 Kbps DSL/Cable
-
BVW_SPEED_384_DSL
384 Kbps DSL/Cable
-
BVW_SPEED_512_DSL
512 Kbps DSL/Cable
-
BVW_SPEED_1500_T1
1.5 Mbps T1/Intranet/LAN
-
BVW_SPEED_LAN
Intranet/LAN
-

-
-
-

enum BvwDVDEvent

typedef enum {
 	BVW_DVD_ROOT_MENU,
@@ -481,8 +400,11 @@
 The DVD navigation actions available to fire as DVD events to
 the BaconVideoWidget.
 

-

+

+++
@@ -594,8 +516,11 @@
 The different metadata available for querying from a BaconVideoWidget
 stream with bacon_video_widget_get_metadata().
 

-

 


 
 

 
BVW_DVD_ROOT_MENU

+

+++
@@ -702,6 +627,49 @@
 

+
enum BvwRotation

+
typedef enum {
+	BVW_ROTATION_R_ZERO = 0,
+	BVW_ROTATION_R_90R  = 1,
+	BVW_ROTATION_R_180  = 2,
+	BVW_ROTATION_R_90L  = 3
+} BvwRotation;
+

+

+The rotation is used by the video widget, as set by
+bacon_video_widget_set_rotation().
+

+

 


 
 

 
BVW_INFO_TITLE

 
 

++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+




BVW_ROTATION_R_ZERO
No rotation
+
BVW_ROTATION_R_90R
Rotate 90 degrees to the right
+
BVW_ROTATION_R_180
Rotate 180 degrees
+
BVW_ROTATION_R_90L
Rotate 90 degrees to the left
+

+
+
+

enum BvwVisualizationQuality

typedef enum {
 	BVW_VISUALIZATION_SMALL = 0,
@@ -714,8 +682,11 @@
 The different visualisation sizes or qualities available for use
 with bacon_video_widget_set_visualization_quality().
 

-

+

+++
@@ -754,8 +725,11 @@
 The video properties queryable with bacon_video_widget_get_video_property(),
 and settable with bacon_video_widget_set_video_property().
 

-

 


 
 

 
BVW_VISUALIZATION_SMALL

+

+++
@@ -792,8 +766,11 @@
 The zoom mode used by the video widget, as set by
 bacon_video_widget_set_zoom().
 

-

 


 
 

 
BVW_VIDEO_BRIGHTNESS

+

+++
@@ -813,10 +790,7 @@
 
enum BvwError
typedef enum {
 	/* Plugins */
-	BVW_ERROR_AUDIO_PLUGIN,
 	BVW_ERROR_NO_PLUGIN_FOR_FILE,
-	BVW_ERROR_VIDEO_PLUGIN,
-	BVW_ERROR_AUDIO_BUSY,
 	/* File */
 	BVW_ERROR_BROKEN_FILE,
 	BVW_ERROR_FILE_GENERIC,
@@ -826,7 +800,6 @@
 	/* Devices */
 	BVW_ERROR_DVD_ENCRYPTED,
 	BVW_ERROR_INVALID_DEVICE,
-	BVW_ERROR_DEVICE_BUSY,
 	/* Network */
 	BVW_ERROR_UNKNOWN_HOST,
 	BVW_ERROR_NETWORK_UNREACHABLE,
@@ -835,7 +808,6 @@
 	BVW_ERROR_INVALID_LOCATION,
 	BVW_ERROR_GENERIC,
 	BVW_ERROR_CODEC_NOT_HANDLED,
-	BVW_ERROR_AUDIO_ONLY,
 	BVW_ERROR_CANNOT_CAPTURE,
 	BVW_ERROR_READ_ERROR,
 	BVW_ERROR_PLUGIN_LOAD,
@@ -845,27 +817,15 @@
 

 Error codes for BaconVideoWidget operations.
 

-

 


 
 

 
BVW_ZOOM_NONE

 

+

+++
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -904,11 +864,6 @@
 
-
-
-
-
@@ -939,11 +894,6 @@
 
-
-
-
-
@@ -969,19 +919,18 @@
 

 
bacon_video_widget_new ()

-
GtkWidget *         bacon_video_widget_new              (GError **error);

+
GtkWidget *         bacon_video_widget_new              (GError **error);

 

 Creates a new BaconVideoWidget.
 

 

-width and height give the initial or expected video height. Set them to -1 if the
-video size is unknown. For small videos, BaconVideoWidget will be configured differently.
-

-

 A BvwError will be returned on error.
 

-

 


 
 
BVW_ERROR_AUDIO_PLUGIN
Error loading audio output plugin or device.
-

 
BVW_ERROR_NO_PLUGIN_FOR_FILE
A required GStreamer plugin or xine feature is missing.
-
BVW_ERROR_VIDEO_PLUGIN
Error loading video output plugin or device.
-
BVW_ERROR_AUDIO_BUSY
Audio output device is busy.
+A required GStreamer plugin is missing.
 
 

 

 

 
BVW_ERROR_DEVICE_BUSY
The device was busy.
-

 
BVW_ERROR_UNKNOWN_HOST

 The host for a given stream could not be resolved.
 
 

 
BVW_ERROR_AUDIO_ONLY
An audio-only stream could not be played due to missing audio output support.
-

 
BVW_ERROR_CANNOT_CAPTURE

 Error determining frame capture support for a video with bacon_video_widget_can_get_frames().
 
 

+

+++
@@ -990,7 +939,7 @@
 
-
@@ -1001,13 +950,9 @@
 
bacon_video_widget_open ()
gboolean            bacon_video_widget_open             (BaconVideoWidget *bvw,
                                                          const char *mrl,
-                                                         const char *subtitle_uri,
                                                          GError **error);

-Opens the given mrl in bvw for playing. If subtitle_uri is not NULL, the given
-subtitle file is also loaded. Alternatively, the subtitle URI can be passed in mrl
-by adding it after subtitle:. For example:
-http://example.com/video.mpgsubtitle:/home/user/subtitle.ass.
+Opens the given mrl in bvw for playing.
 

 If there was a filesystem error, a BVW_ERROR_GENERIC error will be returned. Otherwise,
@@ -1016,8 +961,11 @@
 

 On success, the MRL is loaded and waiting to be played with bacon_video_widget_play().
 

-

 


 
 

 
error :

 

 
Returns :
a new BaconVideoWidget, or NULL; destroy with gtk_widget_destroy()
+a new BaconVideoWidget, or NULL; destroy with gtk_widget_destroy()
 
 

 
 
 
 

+

+++
@@ -1029,11 +977,6 @@
 
-
-
-
-
@@ -1058,8 +1001,11 @@
 Errors from the GStreamer backend will be returned asynchronously via the
 "error" signal, even if this function returns TRUE.
 

-

 


 
 

 
bvw :
an MRL
 

 
subtitle_uri :
the URI of a subtitle file, or NULL
-

 
error :

 a GError, or NULL
 

+

+++
@@ -1089,8 +1035,11 @@
 

 If a live stream is being played, playback is stopped entirely.
 

-

 


 
 

 
bvw :

+

+++

 


 

 
bvw :

 a BaconVideoWidget
@@ -1108,8 +1057,11 @@
 Seeks the currently-playing stream to position as a percentage of the total
 stream length.
 

-

+

+++
@@ -1143,8 +1095,11 @@
 

 Seeks the currently-playing stream to the absolute position time, in milliseconds.
 

-

 


 
 

 
bvw :

+

+++
@@ -1179,8 +1134,11 @@
 

 Stops playing the current stream and resets to the first position in the stream.
 

-

 


 
 

 
bvw :

+

+++

 


 

 
bvw :

 a BaconVideoWidget
@@ -1195,8 +1153,11 @@
 

 Closes the current stream and frees the resources associated with it.
 

-

+

+++

 


 

 
bvw :

 a BaconVideoWidget
@@ -1211,8 +1172,11 @@
 

 Determines whether direct seeking is possible for the current stream.
 

-

+

+++
@@ -1240,8 +1204,11 @@
 Frames cannot be returned for audio-only streams, unless visualisations
 are enabled.
 

-

 


 
 

 
bvw :

+

+++
@@ -1272,8 +1239,11 @@
 The volume cannot be set if the audio output type is set to
 BVW_AUDIO_SOUND_AC3PASSTHRU.
 

-

 


 
 

 
bvw :

+

+++
@@ -1300,8 +1270,11 @@
 

 This is a no-op if the current stream is not navigable.
 

-

 


 
 

 
bvw :

+

+++
@@ -1323,8 +1296,11 @@
 Returns whether the widget is currently displaying a menu,
 such as a DVD menu.
 

-

 


 
 

 
bvw :

+

+++
@@ -1347,8 +1323,11 @@
 Returns the current aspect ratio used by the widget, from
 BvwAspectRatio.
 

-

 


 
 

 
bvw :

+

+++
@@ -1373,8 +1352,11 @@
 

 Changes to this take effect immediately.
 

-

 


 
 

 
bvw :

+

+++
@@ -1397,8 +1379,11 @@
 Returns the current audio output type (e.g. how many speaker channels)
 from BvwAudioOutputType.
 

-

 


 
 

 
bvw :

+

+++
@@ -1422,8 +1407,11 @@
 

 Sets the audio output type (number of speaker channels) in the video widget.
 

-

 


 
 

 
bvw :

+

+++
@@ -1444,8 +1432,11 @@
 

 Returns whether the widget will automatically resize to fit videos.
 

-

 


 
 

 
bvw :

+

+++
@@ -1470,8 +1461,11 @@
 they are loaded. Changes to this will take effect when the next media file is
 loaded.
 

-

 


 
 

 
bvw :

+

+++
@@ -1488,79 +1482,6 @@
 

-
bacon_video_widget_get_backend_name ()

-
char *              bacon_video_widget_get_backend_name (BaconVideoWidget *bvw);

-

-Returns the name string for bvw. For the GStreamer backend, it is the output
-of gst_version_string(). *
-

-

 


 
 

 
bvw :

 
 

--
-
-
-
-
-
-
-
-
-
-


bvw :
a BaconVideoWidget
-
Returns :
the backend's name; free with g_free()
-

-
-

-

-
bacon_video_widget_get_connection_speed ()

-
int                 bacon_video_widget_get_connection_speed
-                                                        (BaconVideoWidget *bvw);

-

-Returns the current connection speed, where 0 is the lowest speed
-and 11 is the highest.
-

-

--
-
-
-
-
-
-
-
-
-
-


bvw :
a BaconVideoWidget
-
Returns :
the connection speed index

-

-

-

-
bacon_video_widget_set_connection_speed ()

-
void                bacon_video_widget_set_connection_speed
-                                                        (BaconVideoWidget *bvw,
-                                                         int speed);

-

-Sets the connection speed from the given speed index, where 0 is the lowest speed
-and 11 is the highest.
-

-

--
-
-
-
-
-
-
-
-
-
-


bvw :
a BaconVideoWidget
-
speed :
the connection speed index

-

-

-

 
bacon_video_widget_get_current_frame ()

 
GdkPixbuf *         bacon_video_widget_get_current_frame
                                                         (BaconVideoWidget *bvw);

@@ -1569,8 +1490,11 @@
 stream. This will wait for any pending seeks to complete before
 capturing the frame.
 

-

+

+++
@@ -1593,8 +1517,11 @@
 Returns the current position in the stream, as the time (in milliseconds)
 since the beginning of the stream.
 

-

 


 
 

 
bvw :

+

+++
@@ -1617,8 +1544,11 @@
 

 Returns whether deinterlacing of videos is enabled for this widget.
 

-

 


 
 

 
bvw :

+

+++
@@ -1642,8 +1572,11 @@
 

 Sets whether the widget should deinterlace videos.
 

-

 


 
 

 
bvw :

+

+++
@@ -1666,8 +1599,11 @@
 

 Sets whether the widget renders the stream in fullscreen mode.
 

-

 


 
 

 
bvw :

+

+++
@@ -1690,8 +1626,11 @@
 Returns a list of audio language tags, each in the form AUDIO x,
 where x is the language index.
 

-

 


 
 

 
bvw :

+

+++
@@ -1716,8 +1655,11 @@
 

 If the widget is not playing, or the default language is in use, -1 will be returned.
 

-

 


 
 

 
bvw :

+

+++
@@ -1740,8 +1682,11 @@
 Sets the audio language index for bvw. If language is -1, the default language will
 be used.
 

-

 


 
 

 
bvw :

+

+++
@@ -1763,8 +1708,11 @@
 

 Sets the logo displayed on the video widget when no stream is loaded.
 

-

 


 
 

 
bvw :

+

+++
@@ -1785,8 +1733,11 @@
 

 Gets whether the logo is displayed when no stream is loaded.
 

-

 


 
 

 
bvw :

+

+++
@@ -1812,8 +1763,11 @@
 and the video widget will take up no space. Otherwise, the logo will be
 displayed and will requisition a corresponding amount of space.
 

-

 


 
 

 
bvw :

+

+++
@@ -1840,8 +1794,11 @@
 

 Free the GValue with g_value_unset().
 

-

 


 
 

 
bvw :

+

+++
@@ -1862,59 +1819,6 @@
 

-
bacon_video_widget_get_mrls ()

-
gchar **            bacon_video_widget_get_mrls         (BaconVideoWidget *bvw,
-                                                         TotemDiscMediaType type,
-                                                         const char *device,
-                                                         GError **error);

-

-Returns an array of MRLs available for the given device and media type.
-

-

-device should typically be the number of the device (e.g. 0 for the first
-DVD drive.
-

-

-type can be any value from TotemDiscMediaType, but a BVW_ERROR_INVALID_LOCATION error
-will be returned if type is MEDIA_TYPE_CDDA, as CDDA support has been removed from
-Totem (and hence BaconVideoWidget).
-

-

-A BVW_ERROR_NO_PLUGIN_FOR_FILE error will be returned if the required GStreamer elements do
-not exist for the given type (for the GStreamer backend). *
-If device does not exist, a BVW_ERROR_INVALID_DEVICE error will be returned.
-

-

 


 
 

 
bvw :

 
 

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-


bvw :
a BaconVideoWidget
-
type :
the media type
device :
the device name
error :
a GError, or NULL
-
Returns :
a NULL-terminated array of MRLs, or NULL; free with g_strfreev()
-

-

-

-

 
bacon_video_widget_get_option_group ()

 
GOptionGroup *      bacon_video_widget_get_option_group (void);

 

@@ -1924,8 +1828,11 @@
 

 Applications must call either this exactly once.
 

-

+

+++

 


 

 
Returns :

 a GOptionGroup giving command-line options for BaconVideoWidget
@@ -1941,8 +1848,11 @@
 Returns the current position in the stream, as a value between
 0 and 1.
 

-

+

+++
@@ -1965,8 +1875,11 @@
 

 Sets the HTTP referrer URI to use when fetching HTTP ressources.
 

-

 


 
 

 
bvw :

+

+++
@@ -1983,6 +1896,57 @@
 

+
bacon_video_widget_get_rotation ()

+
BvwRotation         bacon_video_widget_get_rotation     (BaconVideoWidget *bvw);

+

+Returns the angle of rotation of the video, in degrees.
+

+

 


 
 

 
bvw :

 
 

++++
+
+
+
+
+
+
+
+
+
+
+




bvw :
a BaconVideoWidget
+
Returns :
a BvwRotation.

+
+

+

+
bacon_video_widget_set_rotation ()

+
void                bacon_video_widget_set_rotation     (BaconVideoWidget *bvw,
+                                                         BvwRotation rotation);

+

+Sets the rotation to be applied to the video when it is displayed.
+

+

++++
+
+
+
+
+
+
+
+
+
+
+




bvw :
a BaconVideoWidget
+
rotation :
the BvwRotation of the video in degrees

+

+

+

 
bacon_video_widget_set_scale_ratio ()

 
void                bacon_video_widget_set_scale_ratio  (BaconVideoWidget *bvw,
                                                          float ratio);

@@ -1991,8 +1955,11 @@
 displayed. If ratio is set to 0, the highest ratio possible will
 be chosen.
 

-

+

+++
@@ -2013,8 +1980,11 @@
 

 Returns whether the cursor is shown when it is over the video widget.
 

-

 


 
 

 
bvw :

+

+++
@@ -2039,8 +2009,11 @@
 widget. If show_cursor is FALSE, the cursor will be invisible
 when it is moved over the video widget.
 

-

 


 
 

 
bvw :

+

+++
@@ -2064,8 +2037,11 @@
 

 Sets whether to show visualisations when playing audio-only streams.
 

-

 


 
 

 
bvw :

+

+++
@@ -2088,8 +2064,11 @@
 

 Returns the total length of the stream, in milliseconds.
 

-

 


 
 

 
bvw :

+

+++
@@ -2112,8 +2091,11 @@
 Returns a list of subtitle tags, each in the form TEXT x,
 where x is the subtitle index.
 

-

 


 
 

 
bvw :

+

+++
@@ -2139,8 +2121,11 @@
 If the widget is not playing, -2 will be returned. If no subtitles are
 being used, -1 is returned.
 

-

 


 
 

 
bvw :

+

+++
@@ -2163,8 +2148,11 @@
 Sets the subtitle index for bvw. If subtitle is -1, no subtitles will
 be used.
 

-

 


 
 

 
bvw :

+

+++
@@ -2180,6 +2168,36 @@
 

+
bacon_video_widget_set_text_subtitle ()

+
void                bacon_video_widget_set_text_subtitle
+                                                        (BaconVideoWidget *bvw,
+                                                         const gchar *subtitle_uri);

+

+Sets the URI for the text subtitle file to be displayed alongside
+the current video. Use NULL if you want to unload the current text subtitle
+file being used.
+

+

 


 
 

 
bvw :

 
 

++++
+
+
+
+
+
+
+
+
+
+
+




bvw :
a BaconVideoWidget
+
subtitle_uri :
the URI of a subtitle file, or NULL. [allow-none]
+

+

+

+

 
bacon_video_widget_set_subtitle_encoding ()

 
void                bacon_video_widget_set_subtitle_encoding
                                                         (BaconVideoWidget *bvw,
@@ -2188,8 +2206,11 @@
 Sets the encoding system for the subtitles, so that they can be decoded
 properly.
 

-

+

+++
@@ -2216,8 +2237,11 @@
 font is a Pango font description string, as understood by
 pango_font_description_from_string().
 

-

 


 
 

 
bvw :

+

+++
@@ -2239,8 +2263,11 @@
 

 Sets the HTTP user agent string to use when fetching HTTP ressources.
 

-

 


 
 

 
bvw :

+

+++
@@ -2267,8 +2294,11 @@
 It is returned as a percentage in the full range of integer values; from 0
 to 65535 (inclusive), where 32768 is the default.
 

-

 


 
 

 
bvw :

+

+++
@@ -2301,8 +2331,11 @@
 It should be given as a percentage in the full range of integer values; from 0
 to 65535 (inclusive), where 32768 is the default.
 

-

 


 
 

 
bvw :

+

+++
@@ -2329,8 +2362,11 @@
 

 Returns a list of the visualisations available when playing audio-only streams.
 

-

 


 
 

 
bvw :

+

+++
@@ -2358,8 +2394,11 @@
 If name is NULL, visualisations will be disabled. Otherwise, name
 should be from the list returned by bacon_video_widget_get_visualization_list().
 

-

 


 
 

 
bvw :

+

+++
@@ -2383,8 +2422,11 @@
 

 Sets the quality/size of displayed visualisations.
 

-

 


 
 

 
bvw :

+

+++
@@ -2405,8 +2447,11 @@
 

 Returns the current volume level, as a percentage between 0 and 1.
 

-

 


 
 

 
bvw :

+

+++
@@ -2432,8 +2477,11 @@
 

 If bacon_video_widget_can_set_volume() returns FALSE, this is a no-op.
 

-

 


 
 

 
bvw :

+

+++
@@ -2455,8 +2503,11 @@
 

 Returns the zoom mode applied to videos displayed by the widget.
 

-

 


 
 

 
bvw :

+

+++
@@ -2479,8 +2530,11 @@
 

 Sets the zoom type applied to the video when it is displayed.
 

-

 


 
 

 
bvw :

+

+++
@@ -2503,8 +2557,11 @@
 Returns whether the widget is currently playing a stream with
 multiple angles.
 

-

 


 
 

 
bvw :

+

+++
@@ -2527,8 +2584,11 @@
 

 Select the next angle, or video track in the playing stream.
 

-

 


 
 

 
bvw :

+

+++

 


 

 
bvw :

 a BaconVideoWidget
@@ -2544,8 +2604,11 @@
 Determines whether there is another track after the current one, typically
 as a chapter on a DVD.
 

-

+

+++
@@ -2569,8 +2632,11 @@
 Determines whether there is another track before the current one, typically
 as a chapter on a DVD.
 

-

 


 
 

 
bvw :

+

+++
@@ -2592,8 +2658,11 @@
 

 Returns whether the widget is currently playing a stream.
 

-

 


 
 

 
bvw :

+

+++
@@ -2618,8 +2687,11 @@
 

 If no stream is loaded, FALSE is returned.
 

-

 


 
 

 
bvw :

+

+++
@@ -2636,6 +2708,68 @@
 

+
bacon_video_widget_get_rate ()

+
gfloat              bacon_video_widget_get_rate         (BaconVideoWidget *bvw);

+

+Get the current playback rate, with 1.0 being normal rate.
+

+

 


 
 

 
bvw :

 
 

++++
+
+
+
+
+
+
+
+
+
+
+




bvw :
a BaconVideoWidget
+
Returns :
the current playback rate

+
+

+

+
bacon_video_widget_set_rate ()

+
gboolean            bacon_video_widget_set_rate         (BaconVideoWidget *bvw,
+                                                         gfloat new_rate);

+

+Sets the current playback rate.
+

+

++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+




bvw :
a BaconVideoWidget
+
new_rate :
the new playback rate
Returns :

+TRUE on success, FALSE on failure.

+

+

+

+
bacon_video_widget_popup_osd ()

+
void                bacon_video_widget_popup_osd        (BaconVideoWidget *bvw,
+                                                         const char *icon_name);

+

+

+

 
bacon_video_widget_step ()

 
gboolean            bacon_video_widget_step             (BaconVideoWidget *bvw,
                                                          gboolean forward,
@@ -2643,8 +2777,11 @@
 

 Step one frame forward, if forward is TRUE, or backwards, if forward is FALSE
 

-

+

+++
@@ -2690,22 +2827,24 @@
 

-
The "brightness" property

-
  "brightness"               gint                  : Read / Write

+
The "av-offset" property

+
  "av-offset"                gint64                : Read / Write

 

-The brightness of the video display.
+Control the synchronisation offset between the audio and video streams.
+Positive values make the audio ahead of the video and negative values
+make the audio go behind the video.
 

-
Allowed values: [0,65535]

-
Default value: 32768

+
Default value: 0

 

-
The "connection-speed" property

-
  "connection-speed"         BvwConnectionSpeed    : Read / Write

+
The "brightness" property

+
  "brightness"               gint                  : Read / Write

 

-The connection speed to use when calculating how much of a network stream to buffer.
+The brightness of the video display.
 

-
Default value: BVW_SPEED_LAN

+
Allowed values: [0,65535]

+
Default value: 32768

 

@@ -2866,14 +3005,17 @@
 

 
The "buffering" signal

 
void                user_function                      (BaconVideoWidget *percentage,
-                                                        gint              arg1,
+                                                        gdouble           arg1,
                                                         gpointer          user_data)       : Run Last

 

 Emitted regularly when a network stream is being buffered, to provide status updates on the buffering
 progress.
 

-

 


 
 

 
bvw :

 
 
 
 
 
 

+

+++
@@ -2899,8 +3041,11 @@
 

 Query the new list of audio languages with bacon_video_widget_get_languages().
 

-

 


 
 

 
percentage :

+

+++
@@ -2917,8 +3062,11 @@
 Emitted regularly when a network stream is being cached on disk, to provide status
  updates on the buffering level of the stream.
 

-

 


 

 
user_data :

 user data set when the signal handler was connected.

+

+++
@@ -2940,8 +3088,11 @@
 

 Emitted when the end of the current stream is reached.
 

-

 


 
 

 
percentage :

+

+++
@@ -2954,14 +3105,16 @@
 
void                user_function                      (BaconVideoWidget *message,
                                                         gchar            *playback_stopped,
                                                         gboolean          fatal,
-                                                        gboolean          arg3,
                                                         gpointer          user_data)             : Run Last

 Emitted when the backend wishes to asynchronously report an error. If fatal is TRUE,
 playback of this stream cannot be restarted.
 

-

 


 

 
user_data :

 user data set when the signal handler was connected.
 

+

+++
@@ -2996,8 +3149,11 @@
 

 Call bacon_video_widget_get_metadata() to query the updated metadata.
 

-

 


 
 

 
message :

+

+++
@@ -3013,8 +3169,11 @@
 

 Emitted when a redirect response is received from a stream's server.
 

-

 


 

 
user_data :

 user data set when the signal handler was connected.

+

+++
@@ -3042,8 +3201,11 @@
 

 Note that this signal is only available for the GStreamer backend.
 

-

 


 
 

 
new_mrl :

+

+++
@@ -3082,8 +3244,11 @@
 

 Emitted every time an important time event happens, or at regular intervals when playing a stream.
 

-

 


 
 

 
details :

+

+++
diff -Nru totem-3.4.3/docs/reference/html/TotemCellRendererVideo.html totem-3.6.2/docs/reference/html/TotemCellRendererVideo.html
--- totem-3.4.3/docs/reference/html/TotemCellRendererVideo.html	2012-07-04 10:18:33.000000000 +0000
+++ totem-3.6.2/docs/reference/html/TotemCellRendererVideo.html	2012-10-25 13:48:52.000000000 +0000
@@ -3,7 +3,7 @@
 TotemCellRendererVideo
-
+
@@ -35,7 +35,7 @@
 

 


 
 

 
current_time :

 
 
 
 
 

 
 
TotemCellRendererVideo

-
TotemCellRendererVideo — a GtkCellRenderer widget for listing videos

+
TotemCellRendererVideo — a GtkCellRenderer widget for listing videos

 		
 
 

@@ -58,7 +58,7 @@
 
   GObject
    +----GInitiallyUnowned
-         +----GtkCellRenderer
+         +----GtkCellRenderer
                +----TotemCellRendererVideo
 

 

@@ -74,7 +74,7 @@
 

 
Description

 

-TotemCellRendererVideo is a GtkCellRenderer for rendering video thumbnails, typically in a TotemVideoList.
+TotemCellRendererVideo is a GtkCellRenderer for rendering video thumbnails, typically in a TotemVideoList.
 It supports drawing a video thumbnail, and the video's title underneath.
 

 

@@ -97,10 +97,13 @@
 

 The class structure for the TotemCellRendererVideo type.
 

-

+

+++
-
+

 


 
GtkCellRendererClass parent;
GtkCellRendererClass parent;

 the parent class
 

 

@@ -115,8 +118,11 @@
 the renderer will display a generic placeholder thumbnail if a
 proper one is not available.
 

-

+

+++
@@ -146,7 +152,7 @@
 
The "thumbnail" property
  "thumbnail"                GdkPixbuf*            : Read / Write

-A GdkPixbuf of a thumbnail of the video to display. When rendered, it will scale to the width of the parent GtkTreeView,
+A GdkPixbuf of a thumbnail of the video to display. When rendered, it will scale to the width of the parent GtkTreeView,
 so can be as large as reasonable.
 

diff -Nru totem-3.4.3/docs/reference/html/TotemObject.html totem-3.6.2/docs/reference/html/TotemObject.html
--- totem-3.4.3/docs/reference/html/TotemObject.html	2012-07-04 10:18:33.000000000 +0000
+++ totem-3.6.2/docs/reference/html/TotemObject.html	2012-10-25 13:48:52.000000000 +0000
@@ -3,7 +3,7 @@
 TotemObject
-
+
@@ -27,6 +27,8 @@
                    | 
                   Object Hierarchy
                    | 
+                  Implemented Interfaces
+                   | 
                   Properties
                    | 
                   Signals
@@ -52,7 +54,6 @@
 
 typedef             Totem;
                     TotemObject;
-                    TotemObjectClass;
 enum                TotemRemoteCommand;
 enum                TotemRemoteSetting;
 #define             TOTEM_GSETTINGS_SCHEMA
@@ -73,14 +74,8 @@
 voidtotem_object_add_to_playlist_and_play
                                                         (TotemObject *totem,
                                                          const char *uri,
-                                                         const char *display_name,
-                                                         gboolean add_to_recent);
+                                                         const char *display_name);
 voidtotem_object_action_play            (TotemObject *totem);
-voidtotem_action_play_media             (TotemObject *totem,
-                                                         TotemDiscMediaType type,
-                                                         const char *device);
-voidtotem_action_play_media_device      (TotemObject *totem,
-                                                         const char *device);
 voidtotem_object_action_play_pause      (TotemObject *totem);
 voidtotem_action_pause                  (TotemObject *totem);
 voidtotem_object_action_stop            (TotemObject *totem);
@@ -125,11 +120,10 @@
 gbooleantotem_object_is_playing             (TotemObject *totem);
 gbooleantotem_object_is_paused              (TotemObject *totem);
 gbooleantotem_object_is_seekable            (TotemObject *totem);
-GtkWindow *         totem_object_get_main_window        (TotemObject *totem);
-GtkUIManager *      totem_object_get_ui_manager         (TotemObject *totem);
-GtkWidget *         totem_get_video_widget              (TotemObject *totem);
-char *              totem_get_video_widget_backend_name (TotemObject *totem);
+GtkWindow *         totem_object_get_main_window        (TotemObject *totem);
+GtkUIManager *      totem_object_get_ui_manager         (TotemObject *totem);
 char *              totem_object_get_current_mrl        (TotemObject *totem);
+GtkWidget *         totem_object_get_video_widget       (TotemObject *totem);
 gint64totem_get_current_time              (TotemObject *totem);
 voidtotem_object_set_current_subtitle   (TotemObject *totem,
                                                          const char *subtitle_uri);
@@ -144,7 +138,7 @@
 voidtotem_object_add_sidebar_page       (TotemObject *totem,
                                                          const char *page_id,
                                                          const char *title,
-                                                         GtkWidget *main_widget);
+                                                         GtkWidget *main_widget);
 voidtotem_object_remove_sidebar_page    (TotemObject *totem,
                                                          const char *page_id);
 const gchar * const * totem_object_get_supported_content_types
@@ -157,13 +151,22 @@
 
Object Hierarchy
   GObject
-   +----TotemObject
+   +----GApplication
+         +----GtkApplication
+               +----TotemObject
 

+
Implemented Interfaces

+

+TotemObject implements
+ GActionGroup and  GActionMap.

+

+

 
Properties

 
-  "autoload-subtitles"       gboolean              : Read / Write
+  "current-content-type"     gchar*                : Read
+  "current-display-name"     gchar*                : Read
   "current-mrl"              gchar*                : Read
   "current-time"             gint64                : Read
   "fullscreen"               gboolean              : Read
@@ -177,7 +180,10 @@
 
Signals

 
   "file-closed"                                    : Run Last
+  "file-has-played"                                : Run Last
   "file-opened"                                    : Run Last
+  "get-text-subtitle"                              : Run Last
+  "get-user-agent"                                 : Run Last
   "metadata-updated"                               : Run Last
 

 

@@ -207,49 +213,6 @@
 

-
TotemObjectClass

-
typedef struct {
-	GObjectClass parent_class;
-
-	void (*file_opened)			(TotemObject *totem, const char *mrl);
-	void (*file_closed)			(TotemObject *totem);
-	void (*metadata_updated)		(TotemObject *totem,
-						 const char *artist,
-						 const char *title,
-						 const char *album,
-						 guint track_num);
-} TotemObjectClass;
-

-

-The class structure for the TotemPlParser type.
-

-

 


 
 

 
use_placeholder :

 
 
 
 
 
 
 
                                                                                                                                                                                                                   
 
 
 
 
 

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-


GObjectClass parent_class;
the parent class
file_opened ()
the generic signal handler for the "file-opened" signal,
-which can be overridden by inheriting classes
file_closed ()
the generic signal handler for the "file-closed" signal,
-which can be overridden by inheriting classes
metadata_updated ()
the generic signal handler for the "metadata-updated" signal,
-which can be overridden by inheriting classes

-
-

-

 
enum TotemRemoteCommand

 
typedef enum {
 	TOTEM_REMOTE_COMMAND_UNKNOWN = 0,
@@ -286,8 +249,11 @@
 

 Represents a command which can be sent to a running Totem instance remotely.
 

-

+

+++
@@ -448,8 +414,11 @@
 

 Represents a boolean setting or preference on a remote Totem instance.
 

-

 


 
 

 
TOTEM_REMOTE_COMMAND_UNKNOWN

+

+++
@@ -481,8 +450,11 @@
 Initialises the plugin engine and activates all the
 enabled plugins.
 

-

 


 
 

 
TOTEM_REMOTE_SETTING_SHUFFLE

+

+++

 


 

 
totem :

 a TotemObject
@@ -498,8 +470,11 @@
 Shuts down the plugin engine and deactivates all the
 plugins.
 

-

+

+++

 


 

 
totem :

 a TotemObject
@@ -516,8 +491,11 @@
 Emits the "file-opened" signal on totem, with the
 specified mrl.
 

-

+

+++
@@ -538,8 +516,11 @@
 

 Emits the "file-closed" signal on totem.
 

-

 


 
 

 
totem :

+

+++

 


 

 
totem :

 a TotemObject
@@ -559,8 +540,11 @@
 Emits the "metadata-updated" signal on totem,
 with the specified stream data.
 

-

+

+++
@@ -599,8 +583,11 @@
 Displays a non-blocking error dialog with the
 given title and reason.
 

-

 


 
 

 
totem :

+

+++
@@ -625,8 +612,11 @@
 

 Closes Totem.
 

-

 


 
 

 
totem :

+

+++

 


 

 
totem :

 a TotemObject
@@ -640,13 +630,15 @@
 
void                totem_object_add_to_playlist_and_play
                                                         (TotemObject *totem,
                                                          const char *uri,
-                                                         const char *display_name,
-                                                         gboolean add_to_recent);

+                                                         const char *display_name);
 

 Add uri to the playlist and play it immediately.
 

-

+

+++
@@ -661,10 +653,6 @@
 
-
-
-
-

 


 
 

 
totem :
display_name :

 the display name of the URI
 
add_to_recent :
if TRUE, add the URI to the recent items list

 
 

 
@@ -676,8 +664,11 @@
 Plays the current stream. If Totem is already playing, it continues
 to play. If the stream cannot be played, and error dialog is displayed.
 

-

+

+++

 


 

 
totem :

 a TotemObject
@@ -687,75 +678,17 @@
 
 

 

-
totem_action_play_media ()

-
void                totem_action_play_media             (TotemObject *totem,
-                                                         TotemDiscMediaType type,
-                                                         const char *device);

-

-Attempts to play the media found on device (for example, a DVD in a drive or a DVB
-tuner) by first adding it to the playlist, then playing it.
-

-

-An error dialog will be displayed if Totem cannot support media of type.
-

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


totem :
a TotemObject
-
type :
the type of disc media
device :
the media's device path

-

-

-

-
totem_action_play_media_device ()

-
void                totem_action_play_media_device      (TotemObject *totem,
-                                                         const char *device);

-

-Attempts to play the media device (for example, a DVD drive or CD drive)
-with the given device path by first adding it to the playlist, then
-playing it.
-

-

-An error dialog will be displayed if Totem cannot read or play what's on
-the media device.
-

-

--
-
-
-
-
-
-
-
-
-
-


totem :
a TotemObject
-
device :
the media device's path

-

-

-

 
totem_object_action_play_pause ()

 
void                totem_object_action_play_pause      (TotemObject *totem);

 

 Gets the current MRL from the playlist and attempts to play it.
 If the stream is already playing, playback is paused.
 

-

+

+++

 


 

 
totem :

 a TotemObject
@@ -771,8 +704,11 @@
 Pauses the current stream. If Totem is already paused, it continues
 to be paused.
 

-

+

+++

 


 

 
totem :

 a TotemObject
@@ -787,8 +723,11 @@
 

 Stops the current stream.
 

-

+

+++

 


 

 
totem :

 a TotemObject
@@ -804,8 +743,11 @@
 

 Sets Totem's fullscreen state according to state.
 

-

+

+++
@@ -829,8 +771,11 @@
 Toggles Totem's fullscreen state; if Totem is fullscreened, calling
 this makes it unfullscreened and vice-versa.
 

-

 


 
 

 
totem :

+

+++

 


 

 
totem :

 a TotemObject
@@ -846,8 +791,11 @@
 If a DVD is being played, goes to the next chapter. If a normal stream
 is being played, plays the next entry in the playlist.
 

-

+

+++

 


 

 
totem :

 a TotemObject
@@ -864,8 +812,11 @@
 is being played, goes to the start of the stream if possible. If seeking is
 not possible, plays the previous entry in the playlist.
 

-

+

+++

 


 

 
totem :

 a TotemObject
@@ -881,8 +832,11 @@
 Switches to the next angle, if watching a DVD. If not watching a DVD, this is a
 no-op.
 

-

+

+++

 


 

 
totem :

 a TotemObject
@@ -899,8 +853,11 @@
 

 Returns the value of setting for this instance of Totem.
 

-

+

+++
@@ -930,8 +887,11 @@
 

 Sets setting to value on this instance of Totem.
 

-

 


 
 

 
totem :

+

+++
@@ -960,8 +920,11 @@
 Seeks to an absolute time in the stream, or displays an
 error dialog if that's not possible.
 

-

 


 
 

 
totem :

+

+++
@@ -989,8 +952,11 @@
 Seeks to an offset from the current position in the stream,
 or displays an error dialog if that's not possible.
 

-

 


 
 

 
totem :

+

+++
@@ -1016,8 +982,11 @@
 

 Sets the volume, with 1.0 being the maximum, and 0.0 being the minimum level.
 

-

 


 
 

 
totem :

+

+++
@@ -1040,8 +1009,11 @@
 Sets the volume relative to its current level, with 1.0 being the
 maximum, and 0.0 being the minimum level.
 

-

 


 
 

 
totem :

+

+++
@@ -1062,8 +1034,11 @@
 

 Toggles the mute status.
 

-

 


 
 

 
totem :

+

+++

 


 

 
totem :

 a TotemObject
@@ -1079,8 +1054,11 @@
 Toggles the aspect ratio selected in the menu to the
 next one in the list.
 

-

+

+++

 


 

 
totem :

 a TotemObject
@@ -1095,8 +1073,11 @@
 

 Gets the current aspect ratio as defined in BvwAspectRatio.
 

-

+

+++
@@ -1119,8 +1100,11 @@
 Sets the aspect ratio selected in the menu to ratio,
 as defined in BvwAspectRatio.
 

-

 


 
 

 
totem :

+

+++
@@ -1142,8 +1126,11 @@
 If Totem's not fullscreened, this toggles the state of the "Show Controls"
 menu entry, and consequently shows or hides the controls in the UI.
 

-

 


 
 

 
totem :

+

+++

 


 

 
totem :

 a TotemObject
@@ -1160,8 +1147,11 @@
 Sets the video scale ratio, as a float where, for example,
 1.0 is 1:1 and 2.0 is 2:1.
 

-

+

+++
@@ -1188,8 +1178,11 @@
 If index is higher than the current length of the playlist, this
 has the effect of restarting the current playlist entry.
 

-

 


 
 

 
totem :

+

+++
@@ -1218,8 +1211,11 @@
 If Totem's fullscreened and the operation is executed correctly,
 the controls will appear as if the user had moved the mouse.
 

-

 


 
 

 
totem :

+

+++
@@ -1246,8 +1242,11 @@
 

 Returns TRUE if Totem is fullscreened.
 

-

 


 
 

 
totem :

+

+++
@@ -1269,8 +1268,11 @@
 

 Returns TRUE if Totem is playing a stream.
 

-

 


 
 

 
totem :

+

+++
@@ -1292,8 +1294,11 @@
 

 Returns TRUE if playback is paused.
 

-

 


 
 

 
totem :

+

+++
@@ -1315,8 +1320,11 @@
 

 Returns TRUE if the current stream is seekable.
 

-

 


 
 

 
totem :

+

+++
@@ -1334,12 +1342,15 @@
 

 
totem_object_get_main_window ()

-
GtkWindow *         totem_object_get_main_window        (TotemObject *totem);

+
GtkWindow *         totem_object_get_main_window        (TotemObject *totem);

 

 Gets Totem's main window and increments its reference count.
 

-

 


 
 

 
totem :

 

+

+++
@@ -1357,12 +1368,15 @@
 

 
totem_object_get_ui_manager ()

-
GtkUIManager *      totem_object_get_ui_manager         (TotemObject *totem);

+
GtkUIManager *      totem_object_get_ui_manager         (TotemObject *totem);

 

 Gets Totem's UI manager, but does not change its reference count.
 

-

 


 
 

 
totem :

 

+

+++
@@ -1379,13 +1393,17 @@
 

-
totem_get_video_widget ()

-
GtkWidget *         totem_get_video_widget              (TotemObject *totem);

+
totem_object_get_current_mrl ()

+
char *              totem_object_get_current_mrl        (TotemObject *totem);

 

-Gets Totem's video widget and increments its reference count.
+Get the MRL of the current stream, or NULL if nothing's playing.
+Free with g_free().
 

-

 


 
 

 
totem :

 
 

+

+++
@@ -1394,22 +1412,23 @@
 
-
+

 


 
 

 
totem :

 

 
Returns :
Totem's video widget. [transfer full]
-a newly-allocated string containing the MRL of the current stream
 

 
 

 
 

 

-
totem_get_video_widget_backend_name ()

-
char *              totem_get_video_widget_backend_name (TotemObject *totem);

+
totem_object_get_video_widget ()

+
GtkWidget *         totem_object_get_video_widget       (TotemObject *totem);

 

-Gets the name string of the backend video widget, typically the video library's
-version string (e.g. what's returned by gst_version_string()). Free with g_free().
+Gets Totem's video widget and increments its reference count.
 

-

+

+++
@@ -1418,31 +1437,9 @@
 
-
-
-
-

 


 
 

 
totem :

 

 
Returns :
a newly-allocated string of the name of the backend video widget

-

-

-

-
totem_object_get_current_mrl ()

-
char *              totem_object_get_current_mrl        (TotemObject *totem);

-

-Get the MRL of the current stream, or NULL if nothing's playing.
-Free with g_free().
-

-

--
-
-
-
-
-
-
-


totem :
a TotemObject
+Totem's video widget. [transfer full]
 
 
Returns :
a newly-allocated string containing the MRL of the current stream

 
 

 

@@ -1453,8 +1450,11 @@
 

 Gets the current position's time in the stream as a gint64.
 

-

+

+++
@@ -1477,8 +1477,11 @@
 Add the subtitle_uri subtitle file to the playlist, setting it as the subtitle for the current
 playlist entry.
 

-

 


 
 

 
totem :

+

+++
@@ -1499,8 +1502,11 @@
 

 Returns the length of the current playlist.
 

-

 


 
 

 
totem :

+

+++
@@ -1522,8 +1528,11 @@
 Returns the 0-based index of the current entry in the playlist. If
 there is no current entry in the playlist, -1 is returned.
 

-

 


 
 

 
totem :

+

+++
@@ -1547,8 +1556,11 @@
 

 Gets the title of the playlist entry at index.
 

-

 


 
 

 
totem :

+

+++
@@ -1574,8 +1586,11 @@
 

 Gets the title of the current entry in the playlist.
 

-

 


 
 

 
totem :

+

+++
@@ -1597,8 +1612,11 @@
 

 Gets the current volume level, as a value between 0.0 and 1.0.
 

-

 


 
 

 
totem :

+

+++
@@ -1619,8 +1637,11 @@
 

 Gets the application name and version (e.g. "Totem 2.28.0").
 

-

 


 
 

 
totem :

+

+++
@@ -1633,14 +1654,17 @@
 
void                totem_object_add_sidebar_page       (TotemObject *totem,
                                                          const char *page_id,
                                                          const char *title,
-                                                         GtkWidget *main_widget);

+                                                         GtkWidget *main_widget);

 Adds a sidebar page to Totem's sidebar with the given page_id.
 main_widget is added into the page and shown automatically, while
 title is displayed as the page's title in the tab bar.
 

-

 


 

 
Returns :

 a newly-allocated string of the name and version of the application
 

+

+++
@@ -1672,8 +1696,11 @@
 If page_id doesn't exist in the sidebar, this function does
 nothing.
 

-

 


 
 

 
totem :

+

+++
@@ -1695,8 +1722,11 @@
 

 Get the full list of file content types which Totem supports playing.
 

-

 


 
 

 
totem :

+

+++

 


 

 
Returns :

 a NULL-terminated array of the content types Totem supports. [array zero-terminated=1][transfer none]
@@ -1713,8 +1743,11 @@
 

 Get the full list of URI schemes which Totem supports accessing.
 

-

+

+++

 


 

 
Returns :

 a NULL-terminated array of the URI schemes Totem supports. [array zero-terminated=1][transfer none]
@@ -1727,12 +1760,21 @@
 

 
Property Details

 

-
The "autoload-subtitles" property

-
  "autoload-subtitles"       gboolean              : Read / Write

+
The "current-content-type" property

+
  "current-content-type"     gchar*                : Read

 

-If TRUE, Totem will automatically load any subtitle files it finds for each newly opened video.
+The content-type of the current stream.
 

-
Default value: FALSE

+
Default value: NULL

+

+

+

+
The "current-display-name" property

+
  "current-display-name"     gchar*                : Read

+

+The display name of the current stream.
+

+
Default value: NULL

 

 

 

@@ -1807,8 +1849,11 @@
 

 The "file-closed" signal is emitted when Totem closes a stream.
 

-

+

+++
@@ -1823,6 +1868,36 @@
 

+
The "file-has-played" signal

+
void                user_function                      (TotemObject *totem,
+                                                        gchar       *mrl,
+                                                        gpointer     user_data)      : Run Last

+

+The "file-has-played" signal is emitted when a new stream has started playing in Totem.
+

+

 


 
 

 
totem :

 
 

++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+




totem :
the TotemObject which received the signal
mrl :
the MRL of the opened stream
user_data :
user data set when the signal handler was connected.

+

+

+

 
The "file-opened" signal

 
void                user_function                      (TotemObject *totem,
                                                         gchar       *mrl,
@@ -1830,8 +1905,42 @@
 

 The "file-opened" signal is emitted when a new stream is opened by Totem.
 

-

+

++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+




totem :
the TotemObject which received the signal
mrl :
the MRL of the opened stream
user_data :
user data set when the signal handler was connected.

+

+

+

+
The "get-text-subtitle" signal

+
gchar*              user_function                      (TotemObject *totem,
+                                                        gchar       *mrl,
+                                                        gpointer     user_data)      : Run Last

+

+The "get-text-subtitle" signal is emitted before opening a stream, so that plugins
+have the opportunity to detect or download text subtitles for the stream if necessary.
+

+

+++
@@ -1845,6 +1954,47 @@
 
+
+
+
+
+
+

 


 
 

 
totem :
user_data :

 user data set when the signal handler was connected.
 
Returns :
allocated string representing the URI of the subtitle to use for mrl
+

+

+

+

+
The "get-user-agent" signal

+
gchar*              user_function                      (TotemObject *totem,
+                                                        gchar       *mrl,
+                                                        gpointer     user_data)      : Run Last

+

+The "get-user-agent" signal is emitted before opening a stream, so that plugins
+have the opportunity to return the user-agent to be set.
+

+

++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+




totem :
the TotemObject which received the signal
mrl :
the MRL of the opened stream
user_data :
user data set when the signal handler was connected.
Returns :
allocated string representing the user-agent to use for mrl
+

 
 

 

@@ -1861,8 +2011,11 @@
 The "metadata-updated" signal is emitted when the metadata of a stream is updated, typically
 when it's being loaded.
 

-

+

+++
diff -Nru totem-3.4.3/docs/reference/html/TotemVideoList.html totem-3.6.2/docs/reference/html/TotemVideoList.html
--- totem-3.4.3/docs/reference/html/TotemVideoList.html	2012-07-04 10:18:33.000000000 +0000
+++ totem-3.6.2/docs/reference/html/TotemVideoList.html	2012-10-25 13:48:52.000000000 +0000
@@ -3,7 +3,7 @@
 TotemVideoList
-
+
@@ -39,7 +39,7 @@
 

 


 
 

 
totem :

 
 
 
 
 

 
 
TotemVideoList

-
TotemVideoList — a GtkTreeView widget for listing videos

+
TotemVideoList — a GtkTreeView widget for listing videos

 		
 
 

@@ -55,7 +55,7 @@
                     TotemVideoList;
                     TotemVideoListClass;
 TotemVideoList *    totem_video_list_new                (void);
-GtkUIManager *      totem_video_list_get_ui_manager     (TotemVideoList *self);
+GtkUIManager *      totem_video_list_get_ui_manager     (TotemVideoList *self);
 
 

 

@@ -63,9 +63,9 @@
 
   GObject
    +----GInitiallyUnowned
-         +----GtkWidget
-               +----GtkContainer
-                     +----GtkTreeView
+         +----GtkWidget
+               +----GtkContainer
+                     +----GtkTreeView
                            +----TotemVideoList
 

 

@@ -73,7 +73,7 @@
 
Implemented Interfaces

 

 TotemVideoList implements
- AtkImplementorIface,  GtkBuildable and  GtkScrollable.

+ AtkImplementorIface,  GtkBuildable and  GtkScrollable.

 
 

 
Properties

@@ -93,8 +93,8 @@
 

 
Description

 

-TotemVideoList is a GtkTreeView designed for listing videos by their thumbnails using TotemCellRendererVideo.
-It supports tooltips, loading the videos by activating tree view rows, and GtkUIManager actions in the popup menu.
+TotemVideoList is a GtkTreeView designed for listing videos by their thumbnails using TotemCellRendererVideo.
+It supports tooltips, loading the videos by activating tree view rows, and GtkUIManager actions in the popup menu.
 

 

 Note that it requires "totem" to be set to an instance of TotemObject to work.
@@ -120,8 +120,11 @@
 

 The class structure for the TotemVideoList type.
 

-

+

+++
@@ -142,8 +145,11 @@
 

 Creates a new TotemVideoList with default properties.
 

-

 


 
 

 
GtkTreeViewClass parent;

+

+++

 


 

 
Returns :

 a new TotemVideoList
@@ -154,12 +160,15 @@
 

 

 
totem_video_list_get_ui_manager ()

-
GtkUIManager *      totem_video_list_get_ui_manager     (TotemVideoList *self);

+
GtkUIManager *      totem_video_list_get_ui_manager     (TotemVideoList *self);

 

-Returns the GtkUIManager in use by self.
+Returns the GtkUIManager in use by self.
 

-

+

+++
@@ -169,7 +178,7 @@
 
@@ -182,7 +191,7 @@
 
The "mrl-column" property
  "mrl-column"               gint                  : Read / Write

-The column number of the GtkTreeModel column containing MRLs of the videos in the video list.
+The column number of the GtkTreeModel column containing MRLs of the videos in the video list.
 If it's set to -1, video rows will not be activatable (e.g. by double-clicking them).
 
Allowed values: >= G_MAXULONG

@@ -204,7 +213,7 @@
 
The "tooltip-column" property
  "tooltip-column"           gint                  : Read / Write

-The column number of the GtkTreeModel column containing tooltips to be displayed by the video list.
+The column number of the GtkTreeModel column containing tooltips to be displayed by the video list.
 If it's set to -1, no tooltips shall be displayed.
 
Allowed values: >= G_MAXULONG

@@ -224,17 +233,20 @@
 

 
The "starting-video" signal

 
gboolean            user_function                      (TotemVideoList *video_list,
-                                                        GtkTreePath    *tree_path,
+                                                        GtkTreePath    *tree_path,
                                                         gpointer        user_data)       : Run Last

 

 The "starting-video" signal is emitted when a video row is activated, just before the video is
-added to the playlist. It allows for the video's MRL in the GtkTreeModel to be modified, for example.
+added to the playlist. It allows for the video's MRL in the GtkTreeModel to be modified, for example.
 

 

 If this returns TRUE, the video will be played; otherwise, it will not.
 

-

 


 
 

 
self :

 
Returns :

 
-self's GtkUIManager. [transfer none]
+self's GtkUIManager. [transfer none]
 
 

 
 
 
 
 
 
 

+

+++
@@ -242,7 +254,7 @@
 
-
+
diff -Nru totem-3.4.3/docs/reference/html/annotation-glossary.html totem-3.6.2/docs/reference/html/annotation-glossary.html
--- totem-3.4.3/docs/reference/html/annotation-glossary.html	2012-07-04 10:18:33.000000000 +0000
+++ totem-3.6.2/docs/reference/html/annotation-glossary.html	2012-10-25 13:48:52.000000000 +0000
@@ -3,7 +3,7 @@
 Annotation glossary
-
+
@@ -19,8 +19,8 @@
 

 


 
 

 
video_list :

 

 
tree_path :
the GtkTreePath of the video row about to be playedthe GtkTreePath of the video row about to be played
 

 

 
user_data :

 
 
 
 
  
 

 

-

-Annotation glossary

+

+Annotation glossary

 

 

 Annotation Glossary

@@ -51,10 +51,6 @@
 
 
totem_action_pause, totem_action_pause ()
 

-
totem_action_play_media, totem_action_play_media ()
-

-
totem_action_play_media_device, totem_action_play_media_device ()
-

 
totem_action_seek_relative, totem_action_seek_relative ()
 

 
totem_action_set_aspect_ratio, totem_action_set_aspect_ratio ()
@@ -100,9 +96,9 @@
 

 
BaconVideoWidget:auto-resize, The "auto-resize" property
 

-
BaconVideoWidget:brightness, The "brightness" property
+
BaconVideoWidget:av-offset, The "av-offset" property
 

-
BaconVideoWidget:connection-speed, The "connection-speed" property
+
BaconVideoWidget:brightness, The "brightness" property
 

 
BaconVideoWidget:contrast, The "contrast" property
 

@@ -154,10 +150,6 @@
 
 
bacon_video_widget_get_auto_resize, bacon_video_widget_get_auto_resize ()
 

-
bacon_video_widget_get_backend_name, bacon_video_widget_get_backend_name ()
-

-
bacon_video_widget_get_connection_speed, bacon_video_widget_get_connection_speed ()
-

 
bacon_video_widget_get_current_frame, bacon_video_widget_get_current_frame ()
 

 
bacon_video_widget_get_current_time, bacon_video_widget_get_current_time ()
@@ -172,12 +164,14 @@
 

 
bacon_video_widget_get_metadata, bacon_video_widget_get_metadata ()
 

-
bacon_video_widget_get_mrls, bacon_video_widget_get_mrls ()
-

 
bacon_video_widget_get_option_group, bacon_video_widget_get_option_group ()
 

 
bacon_video_widget_get_position, bacon_video_widget_get_position ()
 

+
bacon_video_widget_get_rate, bacon_video_widget_get_rate ()
+

+
bacon_video_widget_get_rotation, bacon_video_widget_get_rotation ()
+

 
bacon_video_widget_get_show_cursor, bacon_video_widget_get_show_cursor ()
 

 
bacon_video_widget_get_stream_length, bacon_video_widget_get_stream_length ()
@@ -214,6 +208,8 @@
 

 
bacon_video_widget_play, bacon_video_widget_play ()
 

+
bacon_video_widget_popup_osd, bacon_video_widget_popup_osd ()
+

 
bacon_video_widget_seek, bacon_video_widget_seek ()
 

 
bacon_video_widget_seek_time, bacon_video_widget_seek_time ()
@@ -224,8 +220,6 @@
 

 
bacon_video_widget_set_auto_resize, bacon_video_widget_set_auto_resize ()
 

-
bacon_video_widget_set_connection_speed, bacon_video_widget_set_connection_speed ()
-

 
bacon_video_widget_set_deinterlacing, bacon_video_widget_set_deinterlacing ()
 

 
bacon_video_widget_set_fullscreen, bacon_video_widget_set_fullscreen ()
@@ -238,8 +232,12 @@
 

 
bacon_video_widget_set_next_angle, bacon_video_widget_set_next_angle ()
 

+
bacon_video_widget_set_rate, bacon_video_widget_set_rate ()
+

 
bacon_video_widget_set_referrer, bacon_video_widget_set_referrer ()
 

+
bacon_video_widget_set_rotation, bacon_video_widget_set_rotation ()
+

 
bacon_video_widget_set_scale_ratio, bacon_video_widget_set_scale_ratio ()
 

 
bacon_video_widget_set_show_cursor, bacon_video_widget_set_show_cursor ()
@@ -252,6 +250,8 @@
 

 
bacon_video_widget_set_subtitle_font, bacon_video_widget_set_subtitle_font ()
 

+
bacon_video_widget_set_text_subtitle, bacon_video_widget_set_text_subtitle ()
+

 
bacon_video_widget_set_user_agent, bacon_video_widget_set_user_agent ()
 

 
bacon_video_widget_set_video_property, bacon_video_widget_set_video_property ()
@@ -272,14 +272,14 @@
 

 
BvwAudioOutputType, enum BvwAudioOutputType
 

-
BvwConnectionSpeed, enum BvwConnectionSpeed
-

 
BvwDVDEvent, enum BvwDVDEvent
 

 
BvwError, enum BvwError
 

 
BvwMetadataType, enum BvwMetadataType
 

+
BvwRotation, enum BvwRotation
+

 
BvwVideoProperty, enum BvwVideoProperty
 

 
BvwVisualizationQuality, enum BvwVisualizationQuality
@@ -325,10 +325,6 @@
 

 
totem_get_short_title, totem_get_short_title ()
 

-
totem_get_video_widget, totem_get_video_widget ()
-

-
totem_get_video_widget_backend_name, totem_get_video_widget_backend_name ()
-

 
TOTEM_GSETTINGS_SCHEMA, TOTEM_GSETTINGS_SCHEMA
 

 
@@ -358,11 +354,19 @@
 
 
TotemObject::file-closed, The "file-closed" signal
 

+
TotemObject::file-has-played, The "file-has-played" signal
+

 
TotemObject::file-opened, The "file-opened" signal
 

+
TotemObject::get-text-subtitle, The "get-text-subtitle" signal
+

+
TotemObject::get-user-agent, The "get-user-agent" signal
+

 
TotemObject::metadata-updated, The "metadata-updated" signal
 

-
TotemObject:autoload-subtitles, The "autoload-subtitles" property
+
TotemObject:current-content-type, The "current-content-type" property
+

+
TotemObject:current-display-name, The "current-display-name" property
 

 
TotemObject:current-mrl, The "current-mrl" property
 

@@ -378,8 +382,6 @@
 
 
TotemObject:stream-length, The "stream-length" property
 

-
TotemObjectClass, TotemObjectClass
-

 
totem_object_action_error, totem_object_action_error ()
 

 
totem_object_action_exit, totem_object_action_exit ()
@@ -428,6 +430,8 @@
 

 
totem_object_get_version, totem_object_get_version ()
 

+
totem_object_get_video_widget, totem_object_get_video_widget ()
+

 
totem_object_get_volume, totem_object_get_volume ()
 

 
totem_object_is_paused, totem_object_is_paused ()
diff -Nru totem-3.4.3/docs/reference/html/api-index-deprecated.html totem-3.6.2/docs/reference/html/api-index-deprecated.html
--- totem-3.4.3/docs/reference/html/api-index-deprecated.html	2012-07-04 10:18:33.000000000 +0000
+++ totem-3.6.2/docs/reference/html/api-index-deprecated.html	2012-10-25 13:48:52.000000000 +0000
@@ -3,7 +3,7 @@
 
 
 Index of deprecated symbols
-
+
 
 
 
@@ -20,8 +20,8 @@
 
Next
 

 

-

-Index of deprecated symbols

+

+Index of deprecated symbols

 
 

 

diff -Nru totem-3.4.3/docs/reference/html/api-index-full.html totem-3.6.2/docs/reference/html/api-index-full.html
--- totem-3.4.3/docs/reference/html/api-index-full.html	2012-07-04 10:18:33.000000000 +0000
+++ totem-3.6.2/docs/reference/html/api-index-full.html	2012-10-25 13:48:52.000000000 +0000
@@ -3,7 +3,7 @@
 
 
 Index of all symbols
-
+
 
 
 
@@ -47,8 +47,8 @@
 

 

 

-

-Index of all symbols

+

+Index of all symbols

 

 

 Totem, typedef in TotemObject
@@ -72,14 +72,6 @@
 

 

 

-totem_action_play_media, function in TotemObject
-

-

-

-totem_action_play_media_device, function in TotemObject
-

-

-

 totem_action_seek_relative, function in TotemObject
 

 

@@ -161,11 +153,11 @@
 
 

 

-BaconVideoWidget:brightness, object property in BaconVideoWidget
+BaconVideoWidget:av-offset, object property in BaconVideoWidget
 

 

 

-BaconVideoWidget:connection-speed, object property in BaconVideoWidget
+BaconVideoWidget:brightness, object property in BaconVideoWidget
 

 

 

@@ -269,14 +261,6 @@
 

 

 

-bacon_video_widget_get_backend_name, function in BaconVideoWidget
-

-

-

-bacon_video_widget_get_connection_speed, function in BaconVideoWidget
-

-

-

 bacon_video_widget_get_current_frame, function in BaconVideoWidget
 

 

@@ -305,15 +289,19 @@
 
 

 

-bacon_video_widget_get_mrls, function in BaconVideoWidget
+bacon_video_widget_get_option_group, function in BaconVideoWidget
 

 

 

-bacon_video_widget_get_option_group, function in BaconVideoWidget
+bacon_video_widget_get_position, function in BaconVideoWidget
 

 

 

-bacon_video_widget_get_position, function in BaconVideoWidget
+bacon_video_widget_get_rate, function in BaconVideoWidget
+

+

+

+bacon_video_widget_get_rotation, function in BaconVideoWidget
 

 

 

@@ -389,6 +377,10 @@
 

 

 

+bacon_video_widget_popup_osd, function in BaconVideoWidget
+

+

+

 bacon_video_widget_seek, function in BaconVideoWidget
 

 

@@ -409,10 +401,6 @@
 
 

 

-bacon_video_widget_set_connection_speed, function in BaconVideoWidget
-

-

-

 bacon_video_widget_set_deinterlacing, function in BaconVideoWidget
 

 

@@ -437,10 +425,18 @@
 
 

 

+bacon_video_widget_set_rate, function in BaconVideoWidget
+

+

+

 bacon_video_widget_set_referrer, function in BaconVideoWidget
 

 

 

+bacon_video_widget_set_rotation, function in BaconVideoWidget
+

+

+

 bacon_video_widget_set_scale_ratio, function in BaconVideoWidget
 

 

@@ -465,6 +461,10 @@
 
 

 

+bacon_video_widget_set_text_subtitle, function in BaconVideoWidget
+

+

+

 bacon_video_widget_set_user_agent, function in BaconVideoWidget
 

 

@@ -505,10 +505,6 @@
 
 

 

-BvwConnectionSpeed, enum in BaconVideoWidget
-

-

-

 BvwDVDEvent, enum in BaconVideoWidget
 

 

@@ -521,6 +517,10 @@
 
 

 

+BvwRotation, enum in BaconVideoWidget
+

+

+

 BvwVideoProperty, enum in BaconVideoWidget
 

 

@@ -584,14 +584,6 @@
 
 

 

-totem_get_video_widget, function in TotemObject
-

-

-

-totem_get_video_widget_backend_name, function in TotemObject
-

-

-

 TOTEM_GSETTINGS_SCHEMA, macro in TotemObject
 

 

@@ -627,15 +619,31 @@
 
 

 

+TotemObject::file-has-played, object signal in TotemObject
+

+

+

 TotemObject::file-opened, object signal in TotemObject
 

 

 

+TotemObject::get-text-subtitle, object signal in TotemObject
+

+

+

+TotemObject::get-user-agent, object signal in TotemObject
+

+

+

 TotemObject::metadata-updated, object signal in TotemObject
 

 

 

-TotemObject:autoload-subtitles, object property in TotemObject
+TotemObject:current-content-type, object property in TotemObject
+

+

+

+TotemObject:current-display-name, object property in TotemObject
 

 

 

@@ -667,10 +675,6 @@
 

 

 

-TotemObjectClass, struct in TotemObject
-

-

-

 totem_object_action_error, function in TotemObject
 

 

@@ -767,6 +771,10 @@
 
 

 

+totem_object_get_video_widget, function in TotemObject
+

+

+

 totem_object_get_volume, function in TotemObject
 

 

diff -Nru totem-3.4.3/docs/reference/html/core-api.html totem-3.6.2/docs/reference/html/core-api.html
--- totem-3.4.3/docs/reference/html/core-api.html	2012-07-04 10:18:33.000000000 +0000
+++ totem-3.6.2/docs/reference/html/core-api.html	2012-10-25 13:48:52.000000000 +0000
@@ -3,7 +3,7 @@
 
 
 Core API
-
+
 
 
 
@@ -20,8 +20,8 @@
 
Next
 

 

-

-Core API

+

+Core API

 

 

 TotemObject — main Totem object
diff -Nru totem-3.4.3/docs/reference/html/index.html totem-3.6.2/docs/reference/html/index.html
--- totem-3.4.3/docs/reference/html/index.html	2012-07-04 10:18:33.000000000 +0000
+++ totem-3.6.2/docs/reference/html/index.html	2012-10-25 13:48:52.000000000 +0000
@@ -3,7 +3,7 @@
 
 
 Totem Reference Manual
-
+
 
 
 
@@ -15,7 +15,7 @@
 

 

 

-			for Totem 3.4.3
+			for Totem 3.6.2
 . The latest version of this documentation can be found online at
 			http://library.gnome.org/devel/totem/.
 		

@@ -45,10 +45,10 @@
 
Widgets

 

 

-TotemVideoList — a GtkTreeView widget for listing videos
+TotemVideoLista GtkTreeView widget for listing videos
 

 

-TotemCellRendererVideo — a GtkCellRenderer widget for listing videos
+TotemCellRendererVideoa GtkCellRenderer widget for listing videos
 

 

 
Index of all symbols

diff -Nru totem-3.4.3/docs/reference/html/index.sgml totem-3.6.2/docs/reference/html/index.sgml
--- totem-3.4.3/docs/reference/html/index.sgml	2012-07-04 10:18:33.000000000 +0000
+++ totem-3.6.2/docs/reference/html/index.sgml	2012-10-25 13:48:52.000000000 +0000
@@ -4,13 +4,13 @@
 
 
 
+
 
 
 
 
 
 
-
 
 
 
@@ -54,8 +54,6 @@
 
 
 
-
-
 
 
 
@@ -84,9 +82,8 @@
 
 
 
-
-
 
+
 
 
 
@@ -100,7 +97,8 @@
 
 
 
-
+
+
 
 
 
@@ -110,7 +108,10 @@
 
 
 
+
 
+
+
 
 
 
@@ -154,19 +155,6 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 
 
@@ -204,6 +192,11 @@
 
 
 
+
+
+
+
+
 
 
 
@@ -218,10 +211,7 @@
 
 
 
-
 
-
-
 
 
 
@@ -229,14 +219,12 @@
 
 
 
-
 
 
 
 
 
 
-
 
 
 
@@ -260,9 +248,6 @@
 
 
 
-
-
-
 
 
 
@@ -275,10 +260,11 @@
 
 
 
-
 
 
 
+
+
 
 
 
@@ -287,6 +273,7 @@
 
 
 
+
 
 
 
@@ -305,12 +292,15 @@
 
 
 
+
+
+
 
 
 
 
+
 
-
 
 
 
diff -Nru totem-3.4.3/docs/reference/html/ix02.html totem-3.6.2/docs/reference/html/ix02.html
--- totem-3.4.3/docs/reference/html/ix02.html	2012-07-04 10:18:33.000000000 +0000
+++ totem-3.6.2/docs/reference/html/ix02.html	2012-10-25 13:48:52.000000000 +0000
@@ -3,7 +3,7 @@
 
 
 Index of new symbols in 2.90.0
-
+
 
 
 
@@ -23,8 +23,8 @@
 
G

 

 

-

-Index of new symbols in 2.90.0

+

+Index of new symbols in 2.90.0

 
G

 

 totem_get_plugin_paths, function in TotemPlugin
diff -Nru totem-3.4.3/docs/reference/html/ix03.html totem-3.6.2/docs/reference/html/ix03.html
--- totem-3.4.3/docs/reference/html/ix03.html	2012-07-04 10:18:33.000000000 +0000
+++ totem-3.6.2/docs/reference/html/ix03.html	2012-10-25 13:48:52.000000000 +0000
@@ -3,7 +3,7 @@
 
 
 Index of new symbols in 2.90.6
-
+
 
 
 
@@ -23,8 +23,8 @@
 
V

 

 

-

-Index of new symbols in 2.90.6

+

+Index of new symbols in 2.90.6

 
V

 

 TotemVideoList:show-tooltip-uri, object property in TotemVideoList
diff -Nru totem-3.4.3/docs/reference/html/ix04.html totem-3.6.2/docs/reference/html/ix04.html
--- totem-3.4.3/docs/reference/html/ix04.html	2012-07-04 10:18:33.000000000 +0000
+++ totem-3.6.2/docs/reference/html/ix04.html	2012-10-25 13:48:52.000000000 +0000
@@ -3,7 +3,7 @@
 
 
 Index of new symbols in 3.0
-
+
 
 
 
@@ -20,8 +20,8 @@
 
Next
 

 

-

-Index of new symbols in 3.0

+

+Index of new symbols in 3.0

 
 

 

diff -Nru totem-3.4.3/docs/reference/html/ix05.html totem-3.6.2/docs/reference/html/ix05.html
--- totem-3.4.3/docs/reference/html/ix05.html	2012-07-04 10:18:33.000000000 +0000
+++ totem-3.6.2/docs/reference/html/ix05.html	2012-10-25 13:48:52.000000000 +0000
@@ -3,7 +3,7 @@
 
 
 Index of new symbols in 3.1.5
-
+
 
 
 
@@ -23,8 +23,8 @@
 
O

 

 

-

-Index of new symbols in 3.1.5

+

+Index of new symbols in 3.1.5

 
O

 

 totem_object_get_supported_content_types, function in TotemObject
diff -Nru totem-3.4.3/docs/reference/html/totem-Interface.html totem-3.6.2/docs/reference/html/totem-Interface.html
--- totem-3.4.3/docs/reference/html/totem-Interface.html	2012-07-04 10:18:33.000000000 +0000
+++ totem-3.6.2/docs/reference/html/totem-Interface.html	2012-10-25 13:48:52.000000000 +0000
@@ -3,7 +3,7 @@
 
 
 Interface
-
+
 
 
 
@@ -46,15 +46,15 @@
 
 void                totem_interface_error               (const char *title,
                                                          const char *reason,
-                                                         GtkWindow *parent);
+                                                         GtkWindow *parent);
 void                totem_interface_error_blocking      (const char *title,
                                                          const char *reason,
-                                                         GtkWindow *parent);
+                                                         GtkWindow *parent);
 void                totem_interface_error_with_link     (const char *title,
                                                          const char *reason,
                                                          const char *uri,
                                                          const char *label,
-                                                         GtkWindow *parent);
+                                                         GtkWindow *parent);
 
 

 

@@ -69,13 +69,16 @@
 
totem_interface_error ()

 
void                totem_interface_error               (const char *title,
                                                          const char *reason,
-                                                         GtkWindow *parent);

+                                                         GtkWindow *parent);
 

 Display a modal error dialogue with title as its primary error text, and reason
 as its secondary text.
 

-

+

+++
@@ -87,7 +90,7 @@
 
-
@@ -98,13 +101,16 @@
 
totem_interface_error_blocking ()
void                totem_interface_error_blocking      (const char *title,
                                                          const char *reason,
-                                                         GtkWindow *parent);

+                                                         GtkWindow *parent);

 Display a modal error dialogue like totem_interface_error() which blocks until the user has
 dismissed it.
 

-

 


 
 

 
title :

 

 
parent :
the error dialogue's parent GtkWindow
+the error dialogue's parent GtkWindow
 
 

 
 
 

+

+++
@@ -116,7 +122,7 @@
 
-
@@ -129,13 +135,16 @@
                                                          const char *reason,
                                                          const char *uri,
                                                          const char *label,
-                                                         GtkWindow *parent);
+                                                         GtkWindow *parent);

 Display a modal error dialogue like totem_interface_error(),
 but add a button which will open uri in a browser window.
 

-

 


 
 

 
title :

 

 
parent :
the error dialogue's parent GtkWindow
+the error dialogue's parent GtkWindow
 
 

 
 

+

+++
@@ -155,7 +164,7 @@
 
-
diff -Nru totem-3.4.3/docs/reference/html/totem-TotemPlugin.html totem-3.6.2/docs/reference/html/totem-TotemPlugin.html
--- totem-3.4.3/docs/reference/html/totem-TotemPlugin.html	2012-07-04 10:18:33.000000000 +0000
+++ totem-3.6.2/docs/reference/html/totem-TotemPlugin.html	2012-10-25 13:48:52.000000000 +0000
@@ -3,7 +3,7 @@
 TotemPlugin
-
+
@@ -52,10 +52,10 @@
                                                          type_name)
 char *              totem_plugin_find_file              (const char *plugin_name,
                                                          const char *file);
-GtkBuilder *        totem_plugin_load_interface         (const char *plugin_name,
+GtkBuilder *        totem_plugin_load_interface         (const char *plugin_name,
                                                          const char *name,
                                                          gboolean fatal,
-                                                         GtkWindow *parent,
+                                                         GtkWindow *parent,
                                                          gpointer user_data);
 char **             totem_get_plugin_paths              (void);
 
@@ -79,8 +79,11 @@
 Registers a plugin with the Totem plugin system, including registering the type specified in the parameters and declaring its activate and
 deactivate functions.
 

-

 


 
 

 
title :

 

 
parent :
the error dialogue's parent GtkWindow
+the error dialogue's parent GtkWindow
 
 

 
 
 
 
 
 

+

+++
@@ -105,8 +108,11 @@
 Registers a configurable plugin with the Totem plugin system, including registering the type specified in the parameters and declaring its activate
 and deactivate and widget creation functions.
 

-

 


 
 

 
TYPE_NAME :

+

+++
@@ -137,8 +143,11 @@
 This should be used by plugins to find plugin-specific
 resource files.
 

-

 


 
 

 
TYPE_NAME :

+

+++
@@ -159,10 +168,10 @@
 

 
totem_plugin_load_interface ()

-
GtkBuilder *        totem_plugin_load_interface         (const char *plugin_name,
+
GtkBuilder *        totem_plugin_load_interface         (const char *plugin_name,
                                                          const char *name,
                                                          gboolean fatal,
-                                                         GtkWindow *parent,
+                                                         GtkWindow *parent,
                                                          gpointer user_data);

 

 Loads an interface file (GtkBuilder UI file) for a plugin, given its filename and
@@ -171,8 +180,11 @@
 

 This should be used instead of attempting to load interfaces manually in plugins.
 

-

 


 
 

 
plugin_name :

 

+

+++
@@ -189,7 +201,7 @@
 
-
@@ -199,7 +211,7 @@
 
-
@@ -212,8 +224,11 @@
 

 Return a NULL-terminated array of paths to directories which can contain Totem plugins. This respects the GSettings disable_user_plugins setting.
 

-

 


 
 

 
plugin_name :

 

 
parent :
the interface's parent GtkWindow. [allow-none]
+the interface's parent GtkWindow. [allow-none]
 
 

 

 

 
Returns :
the GtkBuilder instance for the interface. [transfer full]
+the GtkBuilder instance for the interface. [transfer full]
 
 

 

+

+++

 


 

 
Returns :

 a NULL-terminated array of paths to plugin directories. [transfer full]
diff -Nru totem-3.4.3/docs/reference/html/totem-plugins.html totem-3.6.2/docs/reference/html/totem-plugins.html
--- totem-3.4.3/docs/reference/html/totem-plugins.html	2012-07-04 10:18:33.000000000 +0000
+++ totem-3.6.2/docs/reference/html/totem-plugins.html	2012-10-25 13:48:52.000000000 +0000
@@ -3,7 +3,7 @@
 
 
 Writing Totem Plugins
-
+
 
 
 
@@ -29,10 +29,10 @@
 
 

 

-
Introduction

+
Introduction

 
Totem is extensible by means of small, dynamically-loadable plugins, which add functionality wanted by some but not others.

 

-
Locations

+
Locations

 
Totem plugins can either be installed in the system path
 				(e.g. /usr/lib/totem/plugins/), or in a user's home directory
 				(e.g. ~/.local/share/totem/plugins/). In either case, each plugin resides in a
@@ -41,13 +41,13 @@
 				directory. This gives the code name of the plugin, as well as some metadata about the plugin such as its human-readable
 				name, description and author.

 

-
Example 1. Example Plugin Directory

+
Example 1. Example Plugin Directory

 

 
A system-installed plugin called subtitle-downloader would reside in
 					/usr/lib/totem/plugins/subtitle-downloader, and would (at a
 					minimum) have the following files:
 					

-
    
+
      
 
    • subtitle-downloader.plugin
      • 
 
    • libsubtitle-downloader.so
      • 
 
    
@@ -62,7 +62,7 @@
 

 

 

-
The .plugin File

+
The .plugin File

 
The file should use the following template:
 				

 
[Plugin]
@@ -85,14 +85,14 @@
 

 

 

-
Writing a Plugin

+
Writing a Plugin

 
Writing a plugin in C is a matter of creating a new GObject which inherits
 				from PeasExtensionBase and which implements
 				PeasActivatable. The following code will create a simple plugin
 				called foobar:
 				

 

-
Example 2. Example Plugin Code

+
Example 2. Example Plugin Code

 

   
diff -Nru totem-3.4.3/docs/reference/html/totem.devhelp2 totem-3.6.2/docs/reference/html/totem.devhelp2
--- totem-3.4.3/docs/reference/html/totem.devhelp2	2012-07-04 10:18:33.000000000 +0000
+++ totem-3.6.2/docs/reference/html/totem.devhelp2	2012-10-25 13:48:52.000000000 +0000
@@ -26,12 +26,11 @@
     
-    
-    
-    
+    
+    
+    
     
     
-    
     
     
     
@@ -44,8 +43,6 @@
     
     
     
-    
-    
     
     
     
@@ -74,9 +71,8 @@
     
     
     
-    
-    
     
+    
     
     
     
@@ -89,7 +85,8 @@
     
     
     
-    
+    
+    
     
     
     
@@ -98,7 +95,10 @@
     
     
     
+    
     
+    
+    
     
     
     
@@ -112,9 +112,9 @@
     
     
     
-    
     
     
+    
     
     
     
@@ -138,9 +138,6 @@
     
     
     
-    
-    
-    
     
     
     
@@ -153,10 +150,11 @@
     
     
     
-    
     
     
     
+    
+    
     
     
     
@@ -165,6 +163,7 @@
     
     
     
+    
     
     
     
@@ -183,11 +182,14 @@
     
     
     
+    
+    
+    
     
     
     
+    
     
-    
     
     
     
@@ -271,18 +273,6 @@
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
     
     
     
@@ -318,6 +308,10 @@
     
     
     
+    
+    
+    
+    
     
     
     
@@ -328,10 +322,7 @@
     
     
     
-    
     
-    
-    
     
     
     
@@ -339,14 +330,12 @@
     
     
     
-    
     
     
     
     
     
     
-    
     
     
     
diff -Nru totem-3.4.3/docs/reference/html/tutorials.html totem-3.6.2/docs/reference/html/tutorials.html
--- totem-3.4.3/docs/reference/html/tutorials.html	2012-07-04 10:18:33.000000000 +0000
+++ totem-3.6.2/docs/reference/html/tutorials.html	2012-10-25 13:48:52.000000000 +0000
@@ -3,7 +3,7 @@
 
 
 Tutorials
-
+
 
 
 
@@ -20,8 +20,8 @@
 

     
   
   
Next
 

 

-

-Tutorials

+

+Tutorials

 

 Writing Totem Plugins — brief tutorial on writing Totem plugins
 

diff -Nru totem-3.4.3/docs/reference/html/widget-api.html totem-3.6.2/docs/reference/html/widget-api.html
--- totem-3.4.3/docs/reference/html/widget-api.html	2012-07-04 10:18:33.000000000 +0000
+++ totem-3.6.2/docs/reference/html/widget-api.html	2012-10-25 13:48:52.000000000 +0000
@@ -3,7 +3,7 @@
 
 
 Widgets
-
+
 
 
 
@@ -20,14 +20,14 @@
 
Next
 

 

-

-Widgets

+

+Widgets

 

 

-TotemVideoList — a GtkTreeView widget for listing videos
+TotemVideoLista GtkTreeView widget for listing videos
 

 

-TotemCellRendererVideo — a GtkCellRenderer widget for listing videos
+TotemCellRendererVideoa GtkCellRenderer widget for listing videos
 

 

 

diff -Nru totem-3.4.3/docs/reference/totem-sections.txt totem-3.6.2/docs/reference/totem-sections.txt
--- totem-3.4.3/docs/reference/totem-sections.txt	2012-07-04 10:18:33.000000000 +0000
+++ totem-3.6.2/docs/reference/totem-sections.txt	2012-10-25 13:48:52.000000000 +0000
@@ -3,7 +3,6 @@
 TotemObject
 Totem
 TotemObject
-TotemObjectClass
 TotemRemoteCommand
 TotemRemoteSetting
 TOTEM_GSETTINGS_SCHEMA
@@ -16,8 +15,6 @@
 totem_object_action_exit
 totem_object_add_to_playlist_and_play
 totem_object_action_play
-totem_action_play_media
-totem_action_play_media_device
 totem_object_action_play_pause
 totem_action_pause
 totem_object_action_stop
@@ -46,9 +43,8 @@
 totem_object_is_seekable
 totem_object_get_main_window
 totem_object_get_ui_manager
-totem_get_video_widget
-totem_get_video_widget_backend_name
 totem_object_get_current_mrl
+totem_object_get_video_widget
 totem_get_current_time
 totem_object_set_current_subtitle
 totem_object_get_playlist_length
@@ -77,6 +73,7 @@
 totem_remote_setting_get_type
 totem_remote_setting_quark
 
+TotemObjectClass
 totem_action_set_mrl
 totem_action_set_mrl_and_play
 totem_action_set_mrl_with_warning
@@ -179,9 +176,9 @@
 BaconVideoWidgetClass
 BvwAspectRatio
 BvwAudioOutputType
-BvwConnectionSpeed
 BvwDVDEvent
 BvwMetadataType
+BvwRotation
 BvwVisualizationQuality
 BvwVideoProperty
 BvwZoomMode
@@ -205,9 +202,6 @@
 bacon_video_widget_set_audio_output_type
 bacon_video_widget_get_auto_resize
 bacon_video_widget_set_auto_resize
-bacon_video_widget_get_backend_name
-bacon_video_widget_get_connection_speed
-bacon_video_widget_set_connection_speed
 bacon_video_widget_get_current_frame
 bacon_video_widget_get_current_time
 bacon_video_widget_get_deinterlacing
@@ -220,10 +214,11 @@
 bacon_video_widget_get_logo_mode
 bacon_video_widget_set_logo_mode
 bacon_video_widget_get_metadata
-bacon_video_widget_get_mrls
 bacon_video_widget_get_option_group
 bacon_video_widget_get_position
 bacon_video_widget_set_referrer
+bacon_video_widget_get_rotation
+bacon_video_widget_set_rotation
 bacon_video_widget_set_scale_ratio
 bacon_video_widget_get_show_cursor
 bacon_video_widget_set_show_cursor
@@ -232,6 +227,7 @@
 bacon_video_widget_get_subtitles
 bacon_video_widget_get_subtitle
 bacon_video_widget_set_subtitle
+bacon_video_widget_set_text_subtitle
 bacon_video_widget_set_subtitle_encoding
 bacon_video_widget_set_subtitle_font
 bacon_video_widget_set_user_agent
@@ -250,25 +246,26 @@
 bacon_video_widget_has_previous_track
 bacon_video_widget_is_playing
 bacon_video_widget_is_seekable
+bacon_video_widget_get_rate
+bacon_video_widget_set_rate
+bacon_video_widget_popup_osd
 bacon_video_widget_step
 
 BVW_TYPE_ASPECT_RATIO
 BVW_TYPE_AUDIO_OUTPUT_TYPE
-BVW_TYPE_CONNECTION_SPEED
 BVW_TYPE_DVD_EVENT
 BVW_TYPE_ERROR
 BVW_TYPE_METADATA_TYPE
-BVW_TYPE_USE_TYPE
+BVW_TYPE_ROTATION
 BVW_TYPE_VIDEO_PROPERTY
 BVW_TYPE_VISUALIZATION_QUALITY
 BVW_TYPE_ZOOM_MODE
 bvw_aspect_ratio_get_type
 bvw_audio_output_type_get_type
-bvw_connection_speed_get_type
 bvw_dvd_event_get_type
 bvw_error_get_type
 bvw_metadata_type_get_type
-bvw_use_type_get_type
+bvw_rotation_get_type
 bvw_video_property_get_type
 bvw_visualization_quality_get_type
 bvw_zoom_mode_get_type
diff -Nru totem-3.4.3/docs/reference/version.xml totem-3.6.2/docs/reference/version.xml
--- totem-3.4.3/docs/reference/version.xml	2012-07-04 09:55:00.000000000 +0000
+++ totem-3.6.2/docs/reference/version.xml	2012-10-25 13:36:43.000000000 +0000
@@ -1 +1 @@
-3.4.3
+3.6.2
diff -Nru totem-3.4.3/help/Makefile.in totem-3.6.2/help/Makefile.in
--- totem-3.4.3/help/Makefile.in	2012-07-04 09:54:48.000000000 +0000
+++ totem-3.6.2/help/Makefile.in	2012-10-25 13:36:19.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.12.2 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -39,6 +38,23 @@
 
 ################################################################################
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -61,24 +77,32 @@
 	$(top_srcdir)/gnome-doc-utils.make ChangeLog
 subdir = help
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
@@ -95,6 +119,10 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BACKEND_CFLAGS = @BACKEND_CFLAGS@
+BACKEND_LIBS = @BACKEND_LIBS@
+BACKEND_TEST_CFLAGS = @BACKEND_TEST_CFLAGS@
+BACKEND_TEST_LIBS = @BACKEND_TEST_LIBS@
 BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
 BROWSER_PLUGIN_DIR = @BROWSER_PLUGIN_DIR@
 BROWSER_PLUGIN_LIBS = @BROWSER_PLUGIN_LIBS@
@@ -116,8 +144,6 @@
 DBUS_LIBS = @DBUS_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DEPENDENCY_CFLAGS = @DEPENDENCY_CFLAGS@
-DEPENDENCY_LIBS = @DEPENDENCY_LIBS@
 DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DISC_RECORDER_CFLAGS = @DISC_RECORDER_CFLAGS@
 DISC_RECORDER_LIBS = @DISC_RECORDER_LIBS@
@@ -131,7 +157,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-EXTRA_BACKEND_LIBS = @EXTRA_BACKEND_LIBS@
 FGREP = @FGREP@
 FULL_LIBEXECDIR = @FULL_LIBEXECDIR@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
@@ -139,19 +164,21 @@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GLIB_REQS = @GLIB_REQS@
+GLOW_BUTTON_CFLAGS = @GLOW_BUTTON_CFLAGS@
+GLOW_BUTTON_LIBS = @GLOW_BUTTON_LIBS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
-GST_CFLAGS = @GST_CFLAGS@
-GST_LIBS = @GST_LIBS@
+GST_PLUGINS_BAD_CFLAGS = @GST_PLUGINS_BAD_CFLAGS@
+GST_PLUGINS_BAD_LIBS = @GST_PLUGINS_BAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
 GTK_REQS = @GTK_REQS@
+HELPER_CFLAGS = @HELPER_CFLAGS@
+HELPER_LIBS = @HELPER_LIBS@
 HELP_DIR = @HELP_DIR@
 HTML_DIR = @HTML_DIR@
 INSTALL = @INSTALL@
@@ -177,11 +204,11 @@
 INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBEPC_CFLAGS = @LIBEPC_CFLAGS@
-LIBEPC_LIBS = @LIBEPC_LIBS@
 LIBGRILO_CFLAGS = @LIBGRILO_CFLAGS@
 LIBGRILO_LIBS = @LIBGRILO_LIBS@
 LIBOBJS = @LIBOBJS@
+LIBPLAYER_CFLAGS = @LIBPLAYER_CFLAGS@
+LIBPLAYER_LIBS = @LIBPLAYER_LIBS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBZEITGEIST_CFLAGS = @LIBZEITGEIST_CFLAGS@
@@ -198,8 +225,6 @@
 MISSING_PLUGINS_CFLAGS = @MISSING_PLUGINS_CFLAGS@
 MISSING_PLUGINS_LIBS = @MISSING_PLUGINS_LIBS@
 MKDIR_P = @MKDIR_P@
-MM_CFLAGS = @MM_CFLAGS@
-MM_LIBS = @MM_LIBS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 NAUTILUSDIR = @NAUTILUSDIR@
@@ -220,15 +245,21 @@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PEASGTK_CFLAGS = @PEASGTK_CFLAGS@
-PEASGTK_LIBS = @PEASGTK_LIBS@
-PEAS_CFLAGS = @PEAS_CFLAGS@
-PEAS_LIBS = @PEAS_LIBS@
+PIXBUF_HELPER_CFLAGS = @PIXBUF_HELPER_CFLAGS@
+PIXBUF_HELPER_LIBS = @PIXBUF_HELPER_LIBS@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLAYER_CFLAGS = @PLAYER_CFLAGS@
+PLAYER_LIBS = @PLAYER_LIBS@
 PLUGINDIR = @PLUGINDIR@
 PLUGINS = @PLUGINS@
+PLUGIN_VIEWER_CFLAGS = @PLUGIN_VIEWER_CFLAGS@
+PLUGIN_VIEWER_LIBS = @PLUGIN_VIEWER_LIBS@
+PREVIEW_CFLAGS = @PREVIEW_CFLAGS@
+PREVIEW_LIBS = @PREVIEW_LIBS@
+PROPERTIES_CFLAGS = @PROPERTIES_CFLAGS@
+PROPERTIES_LIBS = @PROPERTIES_LIBS@
 PYGOBJECT_CFLAGS = @PYGOBJECT_CFLAGS@
 PYGOBJECT_LIBS = @PYGOBJECT_LIBS@
 PYLINT = @PYLINT@
@@ -248,6 +279,10 @@
 SMCLIENT_CFLAGS = @SMCLIENT_CFLAGS@
 SMCLIENT_LIBS = @SMCLIENT_LIBS@
 STRIP = @STRIP@
+THUMBNAILER_CFLAGS = @THUMBNAILER_CFLAGS@
+THUMBNAILER_LIBS = @THUMBNAILER_LIBS@
+TIME_HELPER_CFLAGS = @TIME_HELPER_CFLAGS@
+TIME_HELPER_LIBS = @TIME_HELPER_LIBS@
 TOTEM_API_VERSION = @TOTEM_API_VERSION@
 TOTEM_PLPARSER_REQS = @TOTEM_PLPARSER_REQS@
 TOTEM_VERSION_MAJOR = @TOTEM_VERSION_MAJOR@
@@ -259,9 +294,6 @@
 WARN_CFLAGS = @WARN_CFLAGS@
 WARN_CXXFLAGS = @WARN_CXXFLAGS@
 XGETTEXT = @XGETTEXT@
-XMKMF = @XMKMF@
-XTEST_LIBS = @XTEST_LIBS@
-X_LIBS = @X_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -507,6 +539,8 @@
 ctags: CTAGS
 CTAGS:
 
+cscope cscopelist:
+
 
 distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
diff -Nru totem-3.4.3/help/es/es.po totem-3.6.2/help/es/es.po
--- totem-3.4.3/help/es/es.po	2012-07-04 10:18:30.000000000 +0000
+++ totem-3.6.2/help/es/es.po	2012-10-25 13:48:49.000000000 +0000
@@ -5,10 +5,11 @@
 msgstr ""
 "Project-Id-Version: totem.help.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-13 07:22+0000\n"
+"POT-Creation-Date: 2012-09-15 21:46+0000\n"
 "PO-Revision-Date: 2010-01-06 21:09+0100\n"
 "Last-Translator: Jorge González \n"
 "Language-Team: Español \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -319,9 +320,9 @@
 "library, and enables you to play movies or songs."
 msgstr ""
 "La aplicación Reproductor de películas Totem es "
-"un reproductor de películas para el escritorio GNOME basado en el «framework» "
-"GStreamer y en la biblioteca xine, y le permite reproducir películas o "
-"canciones."
+"un reproductor de películas para el escritorio GNOME basado en el "
+"«framework» GStreamer y en la biblioteca xine, y le permite reproducir "
+"películas o canciones."
 
 #: C/totem.xml:160(para)
 msgid ""
@@ -811,8 +812,8 @@
 "hour, \"mm\" is the minute and \"ss\" is the second to skip to."
 msgstr ""
 "La caja incrementable también permite usar un lenguaje más natural. Puede "
-"introducir tiempos en el formato «hh:mm:ss», «mm:ss» o «ss», donde «hh» es la "
-"hora, «mm» es el minuto y «ss» el segundo al que saltar."
+"introducir tiempos en el formato «hh:mm:ss», «mm:ss» o «ss», donde «hh» es "
+"la hora, «mm» es el minuto y «ss» el segundo al que saltar."
 
 #: C/totem.xml:484(term)
 msgid "To move to the next movie or song"
@@ -1447,7 +1448,7 @@
 msgstr ""
 "Si el servidor de medios lo permite, elegir "
 "Eliminar del menú "
-"contextual de un archivo le permitirá borrar ese archivo del servidor de "
+"contextual de un archivo le permitirá eliminar ese archivo del servidor de "
 "medios."
 
 #: C/totem.xml:782(title)
@@ -1867,7 +1868,7 @@
 "Los archivos de subtítulos descargados se cachean (de forma predeterminada "
 "en ~/.cache/totem/subtitles), así no se necesitan "
 "descargar de nuevo al reproducir la película otra vez. Al descargar los "
-"subtítulos para una película, se borrará cualquier otro subtítulo descargado "
+"subtítulos para una película, se eliminará cualquier otro subtítulo descargado "
 "para esa película."
 
 #: C/totem.xml:910(title)
diff -Nru totem-3.4.3/help/es/totem.xml totem-3.6.2/help/es/totem.xml
--- totem-3.4.3/help/es/totem.xml	2012-07-04 10:18:29.000000000 +0000
+++ totem-3.6.2/help/es/totem.xml	2012-10-25 13:48:48.000000000 +0000
@@ -529,7 +529,7 @@
       El complemento Cliente de DLNA/UPnP Coherence permite que el Reproductor de películas Totem reproduzca contenido multimedia de servidores de medios UPnP (tales como servidores Coherence) en la red local.
       Con el complemento Cliente de DLNA/UPnP Coherence activado elija F9VerBarra lateral o pulse el botón Barra lateral para mostrar la barra lateral. Seleccione Cliente de DLNA/UPnP Coherence de la lista desplegable en la parte superior de la barra lateral para mostrar la barra lateral del Cliente de DLNA/UPnP Coherence.
       La vista de árbol en la barra lateral listará los servidores multimedia disponibles. Pulsar sobre uno lo expandirá para mostrar los tipos de medios que puede servir y pulsar sobre una carpeta de medios la expandirá para listar los archivos multimedia disponibles. Pulsar dos veces sobre un archivo multimedia lo añadirá a la lista de reproducción del Reproductor de películas Totem y lo reproducirá. Puede pulsar con el botón derecho del ratón sobre un archivo y elegir Reproducir o Encolar para reproducir el archivo inmediatamente o añadirlo a la lista de reproducción, respectivamente.
-      Si el servidor de medios lo permite, elegir Eliminar del menú contextual de un archivo le permitirá borrar ese archivo del servidor de medios.
+      Si el servidor de medios lo permite, elegir Eliminar del menú contextual de un archivo le permitirá eliminar ese archivo del servidor de medios.
     
     
       Anotaciones Gromit
@@ -611,7 +611,7 @@
        Los subtítulos sólo se pueden descargar para películas locales; no para archivos de sonido, DVD, flujos DVB, VCD o flujos HTTP. Para buscar subtítulos para la película actualmente en reproducción, elija VerDescargar subtítulos para la película, que mostrará el diálogo Descargar subtítulos para la película.
       Seleccione el idioma en el que quiere tener los subtítulos desde la lista desplegable en la parte superior del diálogo, después pulse el botón Buscar para buscar los subtítulos para la película actual. Los subtítulos se buscan en función del contenido de la película, en lugar del nombre de archivo o de etiquetas.
       Los resultados de búsqueda se listan en la vista de árbol en el medio del diálogo. Actualmente los subtítulos sólo se pueden usar en una película recargando la película con los subtítulos, de tal forma que después de seleccionar el archivo de subtítulo que quiere descargar, pulse el botón Reproducir con subtítulos para descargar los subtítulos y recargar la película.
-        Los archivos de subtítulos descargados se cachean (de forma predeterminada en ~/.cache/totem/subtitles), así no se necesitan descargar de nuevo al reproducir la película otra vez. Al descargar los subtítulos para una película, se borrará cualquier otro subtítulo descargado para esa película.
+        Los archivos de subtítulos descargados se cachean (de forma predeterminada en ~/.cache/totem/subtitles), así no se necesitan descargar de nuevo al reproducir la película otra vez. Al descargar los subtítulos para una película, se eliminará cualquier otro subtítulo descargado para esa película.
     
     
       Miniatura
diff -Nru totem-3.4.3/help/pt_BR/pt_BR.po totem-3.6.2/help/pt_BR/pt_BR.po
--- totem-3.4.3/help/pt_BR/pt_BR.po	2012-07-04 10:18:30.000000000 +0000
+++ totem-3.6.2/help/pt_BR/pt_BR.po	2012-10-25 13:48:49.000000000 +0000
@@ -1854,7 +1854,7 @@
 "previously downloaded subtitles for that movie are deleted."
 msgstr ""
 "Arquivos de legenda baixados são guardados no cache (em ~ /.cache/"
-"totem/subtitles, por padrão), de modo que não necessitem ser "
+"totem/subtitles, por padrão), de modo que não necessitem ser "
 "baixados novamente ao reproduzir o filme novamente. Ao baixar novas legendas "
 "para um filme,  quaisquer legendas baixadas anteriormente para o filme são "
 "excluídas."
diff -Nru totem-3.4.3/help/pt_BR/totem.xml totem-3.6.2/help/pt_BR/totem.xml
--- totem-3.4.3/help/pt_BR/totem.xml	2012-07-04 10:18:29.000000000 +0000
+++ totem-3.6.2/help/pt_BR/totem.xml	2012-10-25 13:48:48.000000000 +0000
@@ -611,7 +611,7 @@
       Legendas podem apenas ser baixadas de filmes locais e não de arquivos de música, DVDs, fluxos DVB, VCDs ou fluxos HTTP. Para pesquisar por legendas para o filme que está sendo reproduzido, vá até VerBaixar a legenda do filme, o qual exibirá o diálogo Baixe a legenda do filme.
       Selecione o idioma que você deseja para suas legendas na lista suspensa no topo do diálogo, e então clique no botão Localizar para pesquisar por legendas para o filme atual. Legendas são encontradas com base no conteúdo do filme, em preferência ao seu nome de arquivo ou etiquetas.
       Os resultados de pesquisa são listados na visão em árvore no meio do diálogo. Atualmente, legendas podem apenas serem usadas com um filme após recarregar-lo com as legendas, assim após selecionar o arquivo de legenda que você deseja baixar, clique no botão Reproduzir com legenda para baixar as legendas e recarregar o filme.
-        Arquivos de legenda baixados são guardados no cache (em ~ /.cache/totem/subtitlesfilename>, por padr
+        Arquivos de legenda baixados são guardados no cache (em ~ /.cache/totem/subtitles, por padrão), de modo que não necessitem ser baixados novamente ao reproduzir o filme novamente. Ao baixar novas legendas para um filme,  quaisquer legendas baixadas anteriormente para o filme são excluídas.
     
     
       Miniatura
diff -Nru totem-3.4.3/help/ro/ro.po totem-3.6.2/help/ro/ro.po
--- totem-3.4.3/help/ro/ro.po	2012-07-04 10:18:30.000000000 +0000
+++ totem-3.6.2/help/ro/ro.po	2012-10-25 13:48:49.000000000 +0000
@@ -212,7 +212,7 @@
 msgstr ""
 "ACEST DOCUMENT ȘI VERSIUNILE MODIFICATE ALE ACESTUI DOCUMENT SUNT FURNIZATE "
 "ÎN CONFORMITATE CU TERMENII GNU FREE DOCUMENTATION LICENSE CU ÎNȚELEGEREA "
-"CĂ: "
+"CĂ: "
 
 #: C/totem.xml:61(firstname)
 msgid "Chee Bin"
diff -Nru totem-3.4.3/help/ro/totem.xml totem-3.6.2/help/ro/totem.xml
--- totem-3.4.3/help/ro/totem.xml	2012-07-04 10:18:29.000000000 +0000
+++ totem-3.6.2/help/ro/totem.xml	2012-10-25 13:48:48.000000000 +0000
@@ -50,7 +50,14 @@
 
 	Multe dintre numele utilizate de companii pentru a distinge produsele și serviciile lor sunt revendicate ca mărci comerciale. Atunci când aceste nume apar în orice documentație GNOME, și membrii proiectului de documentare GNOME sunt informați despre aceste mărci comerciale, ele sunt scrise cu majuscule sau cu majusculă inițială.
 
-	ACEST DOCUMENT ȘI VERSIUNILE MODIFICATE ALE ACESTUI DOCUMENT SUNT FURNIZATE ÎN CONFORMITATE CU TERMENII GNU FREE DOCUMENTATION LICENSE CU ÎNȚELEGEREA CĂ: 
+	ACEST DOCUMENT ȘI VERSIUNILE MODIFICATE ALE ACESTUI DOCUMENT SUNT FURNIZATE ÎN CONFORMITATE CU TERMENII GNU FREE DOCUMENTATION LICENSE CU ÎNȚELEGEREA CĂ: 
+		
+		  DOCUMENTUL ESTE OFERIT "CA ATARE", FĂRĂ NICIUN FEL DE GARANȚIE, FIE EXPLICITĂ SAU IMPLICITĂ, INCLUSIVĂ, FĂRĂ LIMITARE, GARANȚIILE CĂ DOCUMENTUL SAU O VERSIUNE MODIFICATĂ A LUI ESTE FĂRĂ DEFECTE VANDABILE, PENTRU UN ANUMIT SCOP ANUME SAU NEÎNCĂLCABILĂ. RISCUL PENTRU CALITATEA, PRECIZIA, ȘI PERFORMANȚA DOCUMENTULUI SAU A VERSIUNILOR MODIFICATE VA FI AL DUMNEAVOASTRĂ. AR TREBUI CA ORICE DOCUMENT SAU VERSIUNE MODIFICATĂ A LUI SĂ SE DOVEDEASCĂ A FI INCOMPLET ÎN ORICE PRIVINȚĂ, TU (NU AUTORUL INIȚIAL SAU ORICE ALT CONTRIBUITOR) ASUMĂ-ȚI COSTUL ORICĂRUI SERVICIU NECESAR, REPARAȚII SAU CORECTĂRI. ACEASTĂ RESPONSABILITATE DE GARANȚIE CONSTITUIE O PARTE ESENȚIALĂ A ACESTEI LICENȚE. NU ESTE AUTORIZAT NICI UN FOLOS AL ORICĂRUI ALT DOCUMENT SAU VERSIUNE MODIFICATĂ A LUI ÎN ACEST SCOP CU EXCEPȚIA RESPECTĂRII ACESTOR TERMENI; ȘI
+		
+		
+		  ÎN NICIO CIRCUMSTANȚĂ ȘI ÎN NICI O TEORIE LEGALĂ, DACĂ ÎN PREJUDICIUL (INCLUSIV NEGLIJENȚA), CONTRACTUL, SAU ÎN CAZ CONTRAR, ESTE AUTORUL, SCRIITORUL INIȚIAL, ORICE CONTRIBUITOR SAU ORICE DISTRIBUITOR AL DOCUMENTULUI SAU VERSIUNEA MODIFICATĂ A ACESTUIA SAU ORICE FURNIZOR AL UNEIA DINTRE PĂRȚI, RĂSPUNZĂTOR PENTRU ORICE PERSOANĂ PENTRU ORICE DIRECTE, INDIRECTE, SPECIALE, INCIDENTALE SAU PAGUBE SUBSECVENȚE DE ORICE CARACTER INCLUSIV, FĂRĂ LIMITARE, DESPĂGUBIRI PENTRU PIERDERILE DE BUNĂVOINȚĂ, ÎNTRERUPERE A ACTIVITĂȚII, DEFECȚIUNE DE CALCULATOR, SAU ORICE ALTCEVA ȘI TOATE CELELALTE DAUNE SAU PIERDERI REZULTATE DIN SAU LEGATE DE UTILIZAREA DOCUMENTULUI ȘI VERSIUNILOR MODIFICATE ALE ACESTUIA, CHIAR DACĂ ACESTE PĂRȚI AU FOST INFORMATE DE POSIBILITATEA UNOR ASTFEL DE DAUNE.
+		
+	  
   
 
 
diff -Nru totem-3.4.3/lib/Makefile.am totem-3.6.2/lib/Makefile.am
--- totem-3.4.3/lib/Makefile.am	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/lib/Makefile.am	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-noinst_LTLIBRARIES = libtotemscrsaver.la
-
-libtotemscrsaver_la_SOURCES = \
-	totem-scrsaver.c	\
-	totem-scrsaver.h
-
-libtotemscrsaver_la_CPPFLAGS = $(DISABLE_DEPRECATED)
-
-libtotemscrsaver_la_CFLAGS = \
-	$(DEPENDENCY_CFLAGS)	\
-	$(WARN_CFLAGS)		\
-	$(DBUS_CFLAGS)
-
-libtotemscrsaver_la_LIBADD = \
-	$(DEPENDENCY_LIBS)	\
-	$(DBUS_LIBS)		\
-	$(XTEST_LIBS)
-
--include $(top_srcdir)/git.mk
diff -Nru totem-3.4.3/lib/Makefile.in totem-3.6.2/lib/Makefile.in
--- totem-3.4.3/lib/Makefile.in	2012-07-04 09:54:48.000000000 +0000
+++ totem-3.6.2/lib/Makefile.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,651 +0,0 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = lib
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-LTLIBRARIES = $(noinst_LTLIBRARIES)
-am__DEPENDENCIES_1 =
-libtotemscrsaver_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-am_libtotemscrsaver_la_OBJECTS =  \
-	libtotemscrsaver_la-totem-scrsaver.lo
-libtotemscrsaver_la_OBJECTS = $(am_libtotemscrsaver_la_OBJECTS)
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-libtotemscrsaver_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(libtotemscrsaver_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_@AM_V@)
-am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_@AM_V@)
-am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = $(libtotemscrsaver_la_SOURCES)
-DIST_SOURCES = $(libtotemscrsaver_la_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
-ALL_LINGUAS = @ALL_LINGUAS@
-ALL_PLUGINS = @ALL_PLUGINS@
-AMTAR = @AMTAR@
-AM_CFLAGS = @AM_CFLAGS@
-AM_CPPFLAGS = @AM_CPPFLAGS@
-AM_CXXFLAGS = @AM_CXXFLAGS@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_LDFLAGS = @AM_LDFLAGS@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-BROWSER_PLUGIN_DIR = @BROWSER_PLUGIN_DIR@
-BROWSER_PLUGIN_LIBS = @BROWSER_PLUGIN_LIBS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CHAPTERS_CFLAGS = @CHAPTERS_CFLAGS@
-CHAPTERS_LIBS = @CHAPTERS_LIBS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DBUS_BIND = @DBUS_BIND@
-DBUS_CFLAGS = @DBUS_CFLAGS@
-DBUS_LIBS = @DBUS_LIBS@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DEPENDENCY_CFLAGS = @DEPENDENCY_CFLAGS@
-DEPENDENCY_LIBS = @DEPENDENCY_LIBS@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
-DISC_RECORDER_CFLAGS = @DISC_RECORDER_CFLAGS@
-DISC_RECORDER_LIBS = @DISC_RECORDER_LIBS@
-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
-DLLTOOL = @DLLTOOL@
-DOC_USER_FORMATS = @DOC_USER_FORMATS@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-EXTRA_BACKEND_LIBS = @EXTRA_BACKEND_LIBS@
-FGREP = @FGREP@
-FULL_LIBEXECDIR = @FULL_LIBEXECDIR@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-GLIB_MKENUMS = @GLIB_MKENUMS@
-GLIB_REQS = @GLIB_REQS@
-GMSGFMT = @GMSGFMT@
-GREP = @GREP@
-GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
-GST_CFLAGS = @GST_CFLAGS@
-GST_LIBS = @GST_LIBS@
-GTKDOC_CHECK = @GTKDOC_CHECK@
-GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
-GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
-GTKDOC_MKPDF = @GTKDOC_MKPDF@
-GTKDOC_REBASE = @GTKDOC_REBASE@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTK_REQS = @GTK_REQS@
-HELP_DIR = @HELP_DIR@
-HTML_DIR = @HTML_DIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
-INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
-INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
-INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
-INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
-INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
-INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
-INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
-INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
-INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
-INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
-INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBEPC_CFLAGS = @LIBEPC_CFLAGS@
-LIBEPC_LIBS = @LIBEPC_LIBS@
-LIBGRILO_CFLAGS = @LIBGRILO_CFLAGS@
-LIBGRILO_LIBS = @LIBGRILO_LIBS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBZEITGEIST_CFLAGS = @LIBZEITGEIST_CFLAGS@
-LIBZEITGEIST_LIBS = @LIBZEITGEIST_LIBS@
-LIPO = @LIPO@
-LIRC_LIBS = @LIRC_LIBS@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MEDIA_PLAYER_KEYS_CFLAGS = @MEDIA_PLAYER_KEYS_CFLAGS@
-MEDIA_PLAYER_KEYS_LIBS = @MEDIA_PLAYER_KEYS_LIBS@
-MISSING_PLUGINS_CFLAGS = @MISSING_PLUGINS_CFLAGS@
-MISSING_PLUGINS_LIBS = @MISSING_PLUGINS_LIBS@
-MKDIR_P = @MKDIR_P@
-MM_CFLAGS = @MM_CFLAGS@
-MM_LIBS = @MM_LIBS@
-MSGFMT = @MSGFMT@
-MSGMERGE = @MSGMERGE@
-NAUTILUSDIR = @NAUTILUSDIR@
-NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
-NAUTILUS_LIBS = @NAUTILUS_LIBS@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OMF_DIR = @OMF_DIR@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PEASGTK_CFLAGS = @PEASGTK_CFLAGS@
-PEASGTK_LIBS = @PEASGTK_LIBS@
-PEAS_CFLAGS = @PEAS_CFLAGS@
-PEAS_LIBS = @PEAS_LIBS@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PLUGINDIR = @PLUGINDIR@
-PLUGINS = @PLUGINS@
-PYGOBJECT_CFLAGS = @PYGOBJECT_CFLAGS@
-PYGOBJECT_LIBS = @PYGOBJECT_LIBS@
-PYLINT = @PYLINT@
-PYTHON = @PYTHON@
-PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
-PYTHON_PLATFORM = @PYTHON_PLATFORM@
-PYTHON_PREFIX = @PYTHON_PREFIX@
-PYTHON_VERSION = @PYTHON_VERSION@
-RANLIB = @RANLIB@
-SAVE_FILE_CFLAGS = @SAVE_FILE_CFLAGS@
-SAVE_FILE_CHECK_CFLAGS = @SAVE_FILE_CHECK_CFLAGS@
-SAVE_FILE_CHECK_LIBS = @SAVE_FILE_CHECK_LIBS@
-SAVE_FILE_LIBS = @SAVE_FILE_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SMCLIENT_CFLAGS = @SMCLIENT_CFLAGS@
-SMCLIENT_LIBS = @SMCLIENT_LIBS@
-STRIP = @STRIP@
-TOTEM_API_VERSION = @TOTEM_API_VERSION@
-TOTEM_PLPARSER_REQS = @TOTEM_PLPARSER_REQS@
-TOTEM_VERSION_MAJOR = @TOTEM_VERSION_MAJOR@
-TOTEM_VERSION_MICRO = @TOTEM_VERSION_MICRO@
-TOTEM_VERSION_MINOR = @TOTEM_VERSION_MINOR@
-USE_NLS = @USE_NLS@
-VALAC = @VALAC@
-VERSION = @VERSION@
-WARN_CFLAGS = @WARN_CFLAGS@
-WARN_CXXFLAGS = @WARN_CXXFLAGS@
-XGETTEXT = @XGETTEXT@
-XMKMF = @XMKMF@
-XTEST_LIBS = @XTEST_LIBS@
-X_LIBS = @X_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-gsettingsschemadir = @gsettingsschemadir@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-intltool__v_merge_options_ = @intltool__v_merge_options_@
-intltool__v_merge_options_0 = @intltool__v_merge_options_0@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-pkgpyexecdir = @pkgpyexecdir@
-pkgpythondir = @pkgpythondir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-pyexecdir = @pyexecdir@
-pythondir = @pythondir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-noinst_LTLIBRARIES = libtotemscrsaver.la
-libtotemscrsaver_la_SOURCES = \
-	totem-scrsaver.c	\
-	totem-scrsaver.h
-
-libtotemscrsaver_la_CPPFLAGS = $(DISABLE_DEPRECATED)
-libtotemscrsaver_la_CFLAGS = \
-	$(DEPENDENCY_CFLAGS)	\
-	$(WARN_CFLAGS)		\
-	$(DBUS_CFLAGS)
-
-libtotemscrsaver_la_LIBADD = \
-	$(DEPENDENCY_LIBS)	\
-	$(DBUS_LIBS)		\
-	$(XTEST_LIBS)
-
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu lib/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libtotemscrsaver.la: $(libtotemscrsaver_la_OBJECTS) $(libtotemscrsaver_la_DEPENDENCIES) $(EXTRA_libtotemscrsaver_la_DEPENDENCIES) 
-	$(AM_V_CCLD)$(libtotemscrsaver_la_LINK)  $(libtotemscrsaver_la_OBJECTS) $(libtotemscrsaver_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotemscrsaver_la-totem-scrsaver.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
-
-libtotemscrsaver_la-totem-scrsaver.lo: totem-scrsaver.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotemscrsaver_la_CPPFLAGS) $(CPPFLAGS) $(libtotemscrsaver_la_CFLAGS) $(CFLAGS) -MT libtotemscrsaver_la-totem-scrsaver.lo -MD -MP -MF $(DEPDIR)/libtotemscrsaver_la-totem-scrsaver.Tpo -c -o libtotemscrsaver_la-totem-scrsaver.lo `test -f 'totem-scrsaver.c' || echo '$(srcdir)/'`totem-scrsaver.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtotemscrsaver_la-totem-scrsaver.Tpo $(DEPDIR)/libtotemscrsaver_la-totem-scrsaver.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='totem-scrsaver.c' object='libtotemscrsaver_la-totem-scrsaver.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotemscrsaver_la_CPPFLAGS) $(CPPFLAGS) $(libtotemscrsaver_la_CFLAGS) $(CFLAGS) -c -o libtotemscrsaver_la-totem-scrsaver.lo `test -f 'totem-scrsaver.c' || echo '$(srcdir)/'`totem-scrsaver.c
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES)
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am
-
-
--include $(top_srcdir)/git.mk
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff -Nru totem-3.4.3/lib/totem-scrsaver.c totem-3.6.2/lib/totem-scrsaver.c
--- totem-3.4.3/lib/totem-scrsaver.c	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/lib/totem-scrsaver.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,543 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
-
-   Copyright (C) 2004-2006 Bastien Nocera 
-   Copyright © 2010 Christian Persch
-   Copyright © 2010 Carlos Garcia Campos
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301  USA.
-
-   Authors: Bastien Nocera 
-            Christian Persch
-            Carlos Garcia Campos
- */
-
-#include "config.h"
-
-#include 
-
-#include 
-
-#ifdef GDK_WINDOWING_X11
-#include 
-#include 
-
-#ifdef HAVE_XTEST
-#include 
-#endif /* HAVE_XTEST */
-#endif /* GDK_WINDOWING_X11 */
-
-#include "totem-scrsaver.h"
-
-#define GS_SERVICE   "org.gnome.SessionManager"
-#define GS_PATH      "/org/gnome/SessionManager"
-#define GS_INTERFACE "org.gnome.SessionManager"
-/* From org.gnome.SessionManager.xml */
-#define GS_NO_IDLE_FLAG 8
-
-#define XSCREENSAVER_MIN_TIMEOUT 60
-
-enum {
-	PROP_0,
-	PROP_REASON,
-	PROP_WINDOW
-};
-
-static void totem_scrsaver_finalize   (GObject *object);
-
-struct TotemScrsaverPrivate {
-	/* Whether the screensaver is disabled */
-	gboolean disabled;
-	/* The reason for the inhibition */
-	char *reason;
-
-	GDBusProxy *gs_proxy;
-        gboolean have_session_dbus;
-	guint32 cookie;
-	GtkWindow *window;
-
-	/* To save the screensaver info */
-	int timeout;
-	int interval;
-	int prefer_blanking;
-	int allow_exposures;
-
-	/* For use with XTest */
-	int keycode1, keycode2;
-	int *keycode;
-	gboolean have_xtest;
-};
-
-G_DEFINE_TYPE(TotemScrsaver, totem_scrsaver, G_TYPE_OBJECT)
-
-static gboolean
-screensaver_is_running_dbus (TotemScrsaver *scr)
-{
-        return scr->priv->have_session_dbus;
-}
-
-static void
-on_inhibit_cb (GObject      *source_object,
-	       GAsyncResult *res,
-	       gpointer      user_data)
-{
-	GDBusProxy    *proxy = G_DBUS_PROXY (source_object);
-	TotemScrsaver *scr = TOTEM_SCRSAVER (user_data);
-	GVariant      *value;
-	GError        *error = NULL;
-
-	value = g_dbus_proxy_call_finish (proxy, res, &error);
-	if (!value) {
-		g_warning ("Problem inhibiting the screensaver: %s", error->message);
-		g_object_unref (scr);
-		g_error_free (error);
-
-		return;
-	}
-
-	/* save the cookie */
-	if (g_variant_is_of_type (value, G_VARIANT_TYPE ("(u)")))
-		g_variant_get (value, "(u)", &scr->priv->cookie);
-	else
-		scr->priv->cookie = 0;
-	g_variant_unref (value);
-
-	g_object_unref (scr);
-}
-
-static void
-on_uninhibit_cb (GObject      *source_object,
-		 GAsyncResult *res,
-		 gpointer      user_data)
-{
-	GDBusProxy    *proxy = G_DBUS_PROXY (source_object);
-	TotemScrsaver *scr = TOTEM_SCRSAVER (user_data);
-	GVariant      *value;
-	GError        *error = NULL;
-
-	value = g_dbus_proxy_call_finish (proxy, res, &error);
-	if (!value) {
-		g_warning ("Problem uninhibiting the screensaver: %s", error->message);
-		g_object_unref (scr);
-		g_error_free (error);
-
-		return;
-	}
-
-	/* clear the cookie */
-	scr->priv->cookie = 0;
-	g_variant_unref (value);
-
-	g_object_unref (scr);
-}
-
-static void
-screensaver_inhibit_dbus (TotemScrsaver *scr,
-			  gboolean	 inhibit)
-{
-        TotemScrsaverPrivate *priv = scr->priv;
-        GdkWindow *window;
-
-        if (!priv->have_session_dbus)
-                return;
-
-	g_object_ref (scr);
-
-	if (inhibit) {
-		guint xid;
-
-		g_return_if_fail (scr->priv->reason != NULL);
-
-		xid = 0;
-		if (scr->priv->window != NULL) {
-			window = gtk_widget_get_window (GTK_WIDGET (scr->priv->window));
-			if (window != NULL)
-				xid = gdk_x11_window_get_xid (window);
-		}
-
-
-		g_dbus_proxy_call (priv->gs_proxy,
-				   "Inhibit",
-				   g_variant_new ("(susu)",
-						  g_get_application_name (),
-						  xid,
-						  scr->priv->reason,
-						  GS_NO_IDLE_FLAG),
-				   G_DBUS_CALL_FLAGS_NO_AUTO_START,
-				   -1,
-				   NULL,
-				   on_inhibit_cb,
-				   scr);
-	} else {
-		if (priv->cookie > 0) {
-			g_dbus_proxy_call (priv->gs_proxy,
-					   "Uninhibit",
-					   g_variant_new ("(u)", priv->cookie),
-					   G_DBUS_CALL_FLAGS_NO_AUTO_START,
-					   -1,
-					   NULL,
-					   on_uninhibit_cb,
-					   scr);
-		}
-	}
-}
-
-static void
-screensaver_enable_dbus (TotemScrsaver *scr)
-{
-	screensaver_inhibit_dbus (scr, FALSE);
-}
-
-static void
-screensaver_disable_dbus (TotemScrsaver *scr)
-{
-	screensaver_inhibit_dbus (scr, TRUE);
-}
-
-static void
-screensaver_dbus_proxy_new_cb (GObject      *source,
-                               GAsyncResult *result,
-                               gpointer      user_data)
-{
-	TotemScrsaver *scr = TOTEM_SCRSAVER (user_data);
-	TotemScrsaverPrivate *priv = scr->priv;
-
-	priv->gs_proxy = g_dbus_proxy_new_for_bus_finish (result, NULL);
-	if (!priv->gs_proxy)
-		return;
-
-	priv->have_session_dbus = TRUE;
-	if (priv->reason != NULL && scr->priv->disabled)
-		screensaver_disable_dbus (scr);
-}
-
-static void
-screensaver_init_dbus (TotemScrsaver *scr)
-{
-        g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION,
-	                          G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES | G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
-	                          NULL,
-	                          GS_SERVICE,
-	                          GS_PATH,
-	                          GS_INTERFACE,
-	                          NULL,
-	                          screensaver_dbus_proxy_new_cb,
-	                          scr);
-}
-
-static void
-screensaver_finalize_dbus (TotemScrsaver *scr)
-{
-	if (scr->priv->gs_proxy) {
-		g_object_unref (scr->priv->gs_proxy);
-	}
-}
-
-#ifdef GDK_WINDOWING_X11
-static void
-screensaver_enable_x11 (TotemScrsaver *scr)
-{
-
-#ifdef HAVE_XTEST
-	if (scr->priv->have_xtest != FALSE)
-	{
-		g_source_remove_by_user_data (scr);
-		return;
-	}
-#endif /* HAVE_XTEST */
-
-	XLockDisplay (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
-	XSetScreenSaver (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
-			scr->priv->timeout,
-			scr->priv->interval,
-			scr->priv->prefer_blanking,
-			scr->priv->allow_exposures);
-	XUnlockDisplay (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
-}
-
-#ifdef HAVE_XTEST
-static gboolean
-fake_event (TotemScrsaver *scr)
-{
-	if (scr->priv->disabled)
-	{
-		/* If the video window isn't focused, don't send out the
-		 * events. Note that it probably breaks when popups are used
-		 * but we can't do much about that... */
-		if (scr->priv->window != NULL &&
-		    gtk_window_has_toplevel_focus (scr->priv->window) == FALSE)
-			return TRUE;
-
-		XLockDisplay (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
-		XTestFakeKeyEvent (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), *scr->priv->keycode,
-				True, CurrentTime);
-		XTestFakeKeyEvent (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), *scr->priv->keycode,
-				False, CurrentTime);
-		XUnlockDisplay (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
-		/* Swap the keycode */
-		if (scr->priv->keycode == &scr->priv->keycode1)
-			scr->priv->keycode = &scr->priv->keycode2;
-		else
-			scr->priv->keycode = &scr->priv->keycode1;
-	}
-
-	return TRUE;
-}
-#endif /* HAVE_XTEST */
-
-static void
-screensaver_disable_x11 (TotemScrsaver *scr)
-{
-
-#ifdef HAVE_XTEST
-	if (scr->priv->have_xtest != FALSE)
-	{
-		XLockDisplay (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
-		XGetScreenSaver(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &scr->priv->timeout,
-				&scr->priv->interval,
-				&scr->priv->prefer_blanking,
-				&scr->priv->allow_exposures);
-		XUnlockDisplay (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
-
-		if (scr->priv->timeout != 0) {
-			g_timeout_add_seconds (scr->priv->timeout / 2,
-					       (GSourceFunc) fake_event, scr);
-		} else {
-			g_timeout_add_seconds (XSCREENSAVER_MIN_TIMEOUT / 2,
-					       (GSourceFunc) fake_event, scr);
-		}
-
-		return;
-	}
-#endif /* HAVE_XTEST */
-
-	XLockDisplay (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
-	XGetScreenSaver(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &scr->priv->timeout,
-			&scr->priv->interval,
-			&scr->priv->prefer_blanking,
-			&scr->priv->allow_exposures);
-	XSetScreenSaver(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), 0, 0,
-			DontPreferBlanking, DontAllowExposures);
-	XUnlockDisplay (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
-}
-
-static void
-screensaver_init_x11 (TotemScrsaver *scr)
-{
-#ifdef HAVE_XTEST
-	int a, b, c, d;
-
-	XLockDisplay (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
-	scr->priv->have_xtest = (XTestQueryExtension (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &a, &b, &c, &d) == True);
-	if (scr->priv->have_xtest != FALSE)
-	{
-		scr->priv->keycode1 = XKeysymToKeycode (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), XK_Alt_L);
-		if (scr->priv->keycode1 == 0) {
-			g_warning ("scr->priv->keycode1 not existant");
-		}
-		scr->priv->keycode2 = XKeysymToKeycode (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), XK_Alt_R);
-		if (scr->priv->keycode2 == 0) {
-			scr->priv->keycode2 = XKeysymToKeycode (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), XK_Alt_L);
-			if (scr->priv->keycode2 == 0) {
-				g_warning ("scr->priv->keycode2 not existant");
-			}
-		}
-		scr->priv->keycode = &scr->priv->keycode1;
-	}
-	XUnlockDisplay (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
-#endif /* HAVE_XTEST */
-}
-
-static void
-screensaver_finalize_x11 (TotemScrsaver *scr)
-{
-	g_source_remove_by_user_data (scr);
-}
-#endif
-
-static void
-totem_scrsaver_get_property (GObject *object,
-			     guint property_id,
-			     GValue *value,
-			     GParamSpec *pspec)
-{
-	TotemScrsaver *scr;
-
-	scr = TOTEM_SCRSAVER (object);
-
-	switch (property_id)
-	{
-	case PROP_REASON:
-		g_value_set_string (value, scr->priv->reason);
-		break;
-	case PROP_WINDOW:
-		g_value_set_object (value, scr->priv->window);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-	}
-}
-
-static void
-totem_scrsaver_set_property (GObject *object,
-			     guint property_id,
-			     const GValue *value,
-			     GParamSpec *pspec)
-{
-	TotemScrsaver *scr;
-
-	scr = TOTEM_SCRSAVER (object);
-
-	switch (property_id)
-	{
-	case PROP_REASON:
-		g_free (scr->priv->reason);
-		scr->priv->reason = g_value_dup_string (value);
-		break;
-	case PROP_WINDOW:
-		if (scr->priv->window)
-			g_object_unref (scr->priv->window);
-		scr->priv->window = g_value_dup_object (value);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-	}
-}
-
-static void
-totem_scrsaver_class_init (TotemScrsaverClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-	g_type_class_add_private (klass, sizeof (TotemScrsaverPrivate));
-
-	object_class->set_property = totem_scrsaver_set_property;
-	object_class->get_property = totem_scrsaver_get_property;
-	object_class->finalize = totem_scrsaver_finalize;
-
-	g_object_class_install_property (object_class, PROP_REASON,
-					 g_param_spec_string ("reason", NULL, NULL,
-							      NULL, G_PARAM_READWRITE));
-	g_object_class_install_property (object_class, PROP_WINDOW,
-					 g_param_spec_object ("window", NULL, NULL,
-							      GTK_TYPE_WINDOW, G_PARAM_READWRITE));
-}
-
-/**
- * totem_scrsaver_new:
- *
- * Creates a #TotemScrsaver object.
- * If the GNOME screen saver is running, it uses its DBUS interface to
- * inhibit the screensaver; otherwise it falls back to using the X
- * screensaver functionality for this.
- *
- * Returns: a newly created #TotemScrsaver
- */
-TotemScrsaver *
-totem_scrsaver_new (void)
-{
-	return TOTEM_SCRSAVER (g_object_new (TOTEM_TYPE_SCRSAVER, NULL));
-}
-
-static void
-totem_scrsaver_init (TotemScrsaver *scr)
-{
-	scr->priv = G_TYPE_INSTANCE_GET_PRIVATE (scr,
-						 TOTEM_TYPE_SCRSAVER,
-						 TotemScrsaverPrivate);
-
-	screensaver_init_dbus (scr);
-#ifdef GDK_WINDOWING_X11
-	screensaver_init_x11 (scr);
-#else
-#warning Unimplemented
-#endif
-}
-
-void
-totem_scrsaver_disable (TotemScrsaver *scr)
-{
-	g_return_if_fail (TOTEM_IS_SCRSAVER (scr));
-
-	if (scr->priv->disabled != FALSE)
-		return;
-
-	scr->priv->disabled = TRUE;
-
-	if (screensaver_is_running_dbus (scr) != FALSE)
-		screensaver_disable_dbus (scr);
-	else
-#ifdef GDK_WINDOWING_X11
-		screensaver_disable_x11 (scr);
-#else
-#warning Unimplemented
-	{}
-#endif
-}
-
-void
-totem_scrsaver_enable (TotemScrsaver *scr)
-{
-	g_return_if_fail (TOTEM_IS_SCRSAVER (scr));
-
-	if (scr->priv->disabled == FALSE)
-		return;
-
-	scr->priv->disabled = FALSE;
-
-	if (screensaver_is_running_dbus (scr) != FALSE)
-		screensaver_enable_dbus (scr);
-	else
-#ifdef GDK_WINDOWING_X11
-		screensaver_enable_x11 (scr);
-#else
-#warning Unimplemented
-	{}
-#endif
-}
-
-void
-totem_scrsaver_set_state (TotemScrsaver *scr, gboolean enable)
-{
-	g_return_if_fail (TOTEM_IS_SCRSAVER (scr));
-
-	if (scr->priv->disabled == !enable)
-		return;
-
-	if (enable == FALSE)
-		totem_scrsaver_disable (scr);
-	else
-		totem_scrsaver_enable (scr);
-}
-
-static void
-totem_scrsaver_finalize (GObject *object)
-{
-	TotemScrsaver *scr = TOTEM_SCRSAVER (object);
-
-	g_free (scr->priv->reason);
-	if (scr->priv->window != NULL)
-		g_object_unref (scr->priv->window);
-
-	screensaver_finalize_dbus (scr);
-#ifdef GDK_WINDOWING_X11
-	screensaver_finalize_x11 (scr);
-#else
-#warning Unimplemented
-	{}
-#endif
-
-        G_OBJECT_CLASS (totem_scrsaver_parent_class)->finalize (object);
-}
diff -Nru totem-3.4.3/lib/totem-scrsaver.h totem-3.6.2/lib/totem-scrsaver.h
--- totem-3.4.3/lib/totem-scrsaver.h	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/lib/totem-scrsaver.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,57 +0,0 @@
-/* 
-   Copyright (C) 2004, Bastien Nocera 
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301  USA.
-
-   Author: Bastien Nocera 
- */
-
-#ifndef TOTEM_SCRSAVER_H
-#define TOTEM_SCRSAVER_H
-
-#include 
-
-G_BEGIN_DECLS
-
-#define TOTEM_TYPE_SCRSAVER		(totem_scrsaver_get_type ())
-#define TOTEM_SCRSAVER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), TOTEM_TYPE_SCRSAVER, TotemScrsaver))
-#define TOTEM_SCRSAVER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), TOTEM_TYPE_SCRSAVER, TotemScrsaverClass))
-#define TOTEM_IS_SCRSAVER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TOTEM_TYPE_SCRSAVER))
-#define TOTEM_IS_SCRSAVER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TOTEM_TYPE_SCRSAVER))
-
-typedef struct TotemScrsaver TotemScrsaver;
-typedef struct TotemScrsaverClass TotemScrsaverClass;
-typedef struct TotemScrsaverPrivate TotemScrsaverPrivate;
-
-struct TotemScrsaver {
-	GObject parent;
-	TotemScrsaverPrivate *priv;
-};
-
-struct TotemScrsaverClass {
-	GObjectClass parent_class;
-};
-
-GType totem_scrsaver_get_type		(void) G_GNUC_CONST;
-TotemScrsaver *totem_scrsaver_new       (void);
-void totem_scrsaver_enable		(TotemScrsaver *scr);
-void totem_scrsaver_disable		(TotemScrsaver *scr);
-void totem_scrsaver_set_state		(TotemScrsaver *scr,
-					 gboolean enable);
-
-G_END_DECLS
-
-#endif /* !TOTEM_SCRSAVER_H */
diff -Nru totem-3.4.3/m4/libtool.m4 totem-3.6.2/m4/libtool.m4
--- totem-3.4.3/m4/libtool.m4	2012-07-03 15:47:33.000000000 +0000
+++ totem-3.6.2/m4/libtool.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,7986 +0,0 @@
-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-#
-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-#                 Foundation, Inc.
-#   Written by Gordon Matzigkeit, 1996
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-m4_define([_LT_COPYING], [dnl
-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-#                 Foundation, Inc.
-#   Written by Gordon Matzigkeit, 1996
-#
-#   This file is part of GNU Libtool.
-#
-# GNU Libtool 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.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING.  If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-])
-
-# serial 57 LT_INIT
-
-
-# LT_PREREQ(VERSION)
-# ------------------
-# Complain and exit if this libtool version is less that VERSION.
-m4_defun([LT_PREREQ],
-[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
-       [m4_default([$3],
-		   [m4_fatal([Libtool version $1 or higher is required],
-		             63)])],
-       [$2])])
-
-
-# _LT_CHECK_BUILDDIR
-# ------------------
-# Complain if the absolute build directory name contains unusual characters
-m4_defun([_LT_CHECK_BUILDDIR],
-[case `pwd` in
-  *\ * | *\	*)
-    AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
-esac
-])
-
-
-# LT_INIT([OPTIONS])
-# ------------------
-AC_DEFUN([LT_INIT],
-[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
-AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
-AC_BEFORE([$0], [LT_LANG])dnl
-AC_BEFORE([$0], [LT_OUTPUT])dnl
-AC_BEFORE([$0], [LTDL_INIT])dnl
-m4_require([_LT_CHECK_BUILDDIR])dnl
-
-dnl Autoconf doesn't catch unexpanded LT_ macros by default:
-m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
-m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
-dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
-dnl unless we require an AC_DEFUNed macro:
-AC_REQUIRE([LTOPTIONS_VERSION])dnl
-AC_REQUIRE([LTSUGAR_VERSION])dnl
-AC_REQUIRE([LTVERSION_VERSION])dnl
-AC_REQUIRE([LTOBSOLETE_VERSION])dnl
-m4_require([_LT_PROG_LTMAIN])dnl
-
-_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
-
-dnl Parse OPTIONS
-_LT_SET_OPTIONS([$0], [$1])
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-_LT_SETUP
-
-# Only expand once:
-m4_define([LT_INIT])
-])# LT_INIT
-
-# Old names:
-AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
-AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
-dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
-
-
-# _LT_CC_BASENAME(CC)
-# -------------------
-# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
-m4_defun([_LT_CC_BASENAME],
-[for cc_temp in $1""; do
-  case $cc_temp in
-    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
-    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
-])
-
-
-# _LT_FILEUTILS_DEFAULTS
-# ----------------------
-# It is okay to use these file commands and assume they have been set
-# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
-m4_defun([_LT_FILEUTILS_DEFAULTS],
-[: ${CP="cp -f"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-])# _LT_FILEUTILS_DEFAULTS
-
-
-# _LT_SETUP
-# ---------
-m4_defun([_LT_SETUP],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
-AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
-
-_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
-dnl
-_LT_DECL([], [host_alias], [0], [The host system])dnl
-_LT_DECL([], [host], [0])dnl
-_LT_DECL([], [host_os], [0])dnl
-dnl
-_LT_DECL([], [build_alias], [0], [The build system])dnl
-_LT_DECL([], [build], [0])dnl
-_LT_DECL([], [build_os], [0])dnl
-dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([LT_PATH_LD])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-dnl
-AC_REQUIRE([AC_PROG_LN_S])dnl
-test -z "$LN_S" && LN_S="ln -s"
-_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
-dnl
-AC_REQUIRE([LT_CMD_MAX_LEN])dnl
-_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
-_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
-dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_CHECK_SHELL_FEATURES])dnl
-m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
-m4_require([_LT_CMD_RELOAD])dnl
-m4_require([_LT_CHECK_MAGIC_METHOD])dnl
-m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
-m4_require([_LT_CMD_OLD_ARCHIVE])dnl
-m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-m4_require([_LT_WITH_SYSROOT])dnl
-
-_LT_CONFIG_LIBTOOL_INIT([
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}" ; then
-   setopt NO_GLOB_SUBST
-fi
-])
-if test -n "${ZSH_VERSION+set}" ; then
-   setopt NO_GLOB_SUBST
-fi
-
-_LT_CHECK_OBJDIR
-
-m4_require([_LT_TAG_COMPILER])dnl
-
-case $host_os in
-aix3*)
-  # AIX sometimes has problems with the GCC collect2 program.  For some
-  # reason, if we set the COLLECT_NAMES environment variable, the problems
-  # vanish in a puff of smoke.
-  if test "X${COLLECT_NAMES+set}" != Xset; then
-    COLLECT_NAMES=
-    export COLLECT_NAMES
-  fi
-  ;;
-esac
-
-# Global variables:
-ofile=libtool
-can_build_shared=yes
-
-# All known linkers require a `.a' archive for static linking (except MSVC,
-# which needs '.lib').
-libext=a
-
-with_gnu_ld="$lt_cv_prog_gnu_ld"
-
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-
-# Set sane defaults for various variables
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-test -z "$LD" && LD=ld
-test -z "$ac_objext" && ac_objext=o
-
-_LT_CC_BASENAME([$compiler])
-
-# Only perform the check for file, if the check method requires it
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    _LT_PATH_MAGIC
-  fi
-  ;;
-esac
-
-# Use C for the default configuration in the libtool script
-LT_SUPPORTED_TAG([CC])
-_LT_LANG_C_CONFIG
-_LT_LANG_DEFAULT_CONFIG
-_LT_CONFIG_COMMANDS
-])# _LT_SETUP
-
-
-# _LT_PREPARE_SED_QUOTE_VARS
-# --------------------------
-# Define a few sed substitution that help us do robust quoting.
-m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
-[# Backslashify metacharacters that are still active within
-# double-quoted strings.
-sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\([["`\\]]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-])
-
-# _LT_PROG_LTMAIN
-# ---------------
-# Note that this code is called both from `configure', and `config.status'
-# now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
-# `config.status' has no value for ac_aux_dir unless we are using Automake,
-# so we pass a copy along to make sure it has a sensible value anyway.
-m4_defun([_LT_PROG_LTMAIN],
-[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
-_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
-ltmain="$ac_aux_dir/ltmain.sh"
-])# _LT_PROG_LTMAIN
-
-
-## ------------------------------------- ##
-## Accumulate code for creating libtool. ##
-## ------------------------------------- ##
-
-# So that we can recreate a full libtool script including additional
-# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
-# in macros and then make a single call at the end using the `libtool'
-# label.
-
-
-# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
-# ----------------------------------------
-# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-m4_define([_LT_CONFIG_LIBTOOL_INIT],
-[m4_ifval([$1],
-          [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
-                     [$1
-])])])
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_INIT])
-
-
-# _LT_CONFIG_LIBTOOL([COMMANDS])
-# ------------------------------
-# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-m4_define([_LT_CONFIG_LIBTOOL],
-[m4_ifval([$1],
-          [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
-                     [$1
-])])])
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
-
-
-# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
-# -----------------------------------------------------
-m4_defun([_LT_CONFIG_SAVE_COMMANDS],
-[_LT_CONFIG_LIBTOOL([$1])
-_LT_CONFIG_LIBTOOL_INIT([$2])
-])
-
-
-# _LT_FORMAT_COMMENT([COMMENT])
-# -----------------------------
-# Add leading comment marks to the start of each line, and a trailing
-# full-stop to the whole comment if one is not present already.
-m4_define([_LT_FORMAT_COMMENT],
-[m4_ifval([$1], [
-m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
-              [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
-)])
-
-
-
-## ------------------------ ##
-## FIXME: Eliminate VARNAME ##
-## ------------------------ ##
-
-
-# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
-# -------------------------------------------------------------------
-# CONFIGNAME is the name given to the value in the libtool script.
-# VARNAME is the (base) name used in the configure script.
-# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
-# VARNAME.  Any other value will be used directly.
-m4_define([_LT_DECL],
-[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
-    [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
-	[m4_ifval([$1], [$1], [$2])])
-    lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
-    m4_ifval([$4],
-	[lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
-    lt_dict_add_subkey([lt_decl_dict], [$2],
-	[tagged?], [m4_ifval([$5], [yes], [no])])])
-])
-
-
-# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
-# --------------------------------------------------------
-m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
-
-
-# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
-# ------------------------------------------------
-m4_define([lt_decl_tag_varnames],
-[_lt_decl_filter([tagged?], [yes], $@)])
-
-
-# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
-# ---------------------------------------------------------
-m4_define([_lt_decl_filter],
-[m4_case([$#],
-  [0], [m4_fatal([$0: too few arguments: $#])],
-  [1], [m4_fatal([$0: too few arguments: $#: $1])],
-  [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
-  [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
-  [lt_dict_filter([lt_decl_dict], $@)])[]dnl
-])
-
-
-# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
-# --------------------------------------------------
-m4_define([lt_decl_quote_varnames],
-[_lt_decl_filter([value], [1], $@)])
-
-
-# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
-# ---------------------------------------------------
-m4_define([lt_decl_dquote_varnames],
-[_lt_decl_filter([value], [2], $@)])
-
-
-# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
-# ---------------------------------------------------
-m4_define([lt_decl_varnames_tagged],
-[m4_assert([$# <= 2])dnl
-_$0(m4_quote(m4_default([$1], [[, ]])),
-    m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
-    m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
-m4_define([_lt_decl_varnames_tagged],
-[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
-
-
-# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
-# ------------------------------------------------
-m4_define([lt_decl_all_varnames],
-[_$0(m4_quote(m4_default([$1], [[, ]])),
-     m4_if([$2], [],
-	   m4_quote(lt_decl_varnames),
-	m4_quote(m4_shift($@))))[]dnl
-])
-m4_define([_lt_decl_all_varnames],
-[lt_join($@, lt_decl_varnames_tagged([$1],
-			lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
-])
-
-
-# _LT_CONFIG_STATUS_DECLARE([VARNAME])
-# ------------------------------------
-# Quote a variable value, and forward it to `config.status' so that its
-# declaration there will have the same value as in `configure'.  VARNAME
-# must have a single quote delimited value for this to work.
-m4_define([_LT_CONFIG_STATUS_DECLARE],
-[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
-
-
-# _LT_CONFIG_STATUS_DECLARATIONS
-# ------------------------------
-# We delimit libtool config variables with single quotes, so when
-# we write them to config.status, we have to be sure to quote all
-# embedded single quotes properly.  In configure, this macro expands
-# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
-#
-#    ='`$ECHO "$" | $SED "$delay_single_quote_subst"`'
-m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
-[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
-    [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
-
-
-# _LT_LIBTOOL_TAGS
-# ----------------
-# Output comment and list of tags supported by the script
-m4_defun([_LT_LIBTOOL_TAGS],
-[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
-available_tags="_LT_TAGS"dnl
-])
-
-
-# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
-# -----------------------------------
-# Extract the dictionary values for VARNAME (optionally with TAG) and
-# expand to a commented shell variable setting:
-#
-#    # Some comment about what VAR is for.
-#    visible_name=$lt_internal_name
-m4_define([_LT_LIBTOOL_DECLARE],
-[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
-					   [description])))[]dnl
-m4_pushdef([_libtool_name],
-    m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
-m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
-    [0], [_libtool_name=[$]$1],
-    [1], [_libtool_name=$lt_[]$1],
-    [2], [_libtool_name=$lt_[]$1],
-    [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
-m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
-])
-
-
-# _LT_LIBTOOL_CONFIG_VARS
-# -----------------------
-# Produce commented declarations of non-tagged libtool config variables
-# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
-# script.  Tagged libtool config variables (even for the LIBTOOL CONFIG
-# section) are produced by _LT_LIBTOOL_TAG_VARS.
-m4_defun([_LT_LIBTOOL_CONFIG_VARS],
-[m4_foreach([_lt_var],
-    m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
-    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
-
-
-# _LT_LIBTOOL_TAG_VARS(TAG)
-# -------------------------
-m4_define([_LT_LIBTOOL_TAG_VARS],
-[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
-    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
-
-
-# _LT_TAGVAR(VARNAME, [TAGNAME])
-# ------------------------------
-m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
-
-
-# _LT_CONFIG_COMMANDS
-# -------------------
-# Send accumulated output to $CONFIG_STATUS.  Thanks to the lists of
-# variables for single and double quote escaping we saved from calls
-# to _LT_DECL, we can put quote escaped variables declarations
-# into `config.status', and then the shell code to quote escape them in
-# for loops in `config.status'.  Finally, any additional code accumulated
-# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
-m4_defun([_LT_CONFIG_COMMANDS],
-[AC_PROVIDE_IFELSE([LT_OUTPUT],
-	dnl If the libtool generation code has been placed in $CONFIG_LT,
-	dnl instead of duplicating it all over again into config.status,
-	dnl then we will have config.status run $CONFIG_LT later, so it
-	dnl needs to know what name is stored there:
-        [AC_CONFIG_COMMANDS([libtool],
-            [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
-    dnl If the libtool generation code is destined for config.status,
-    dnl expand the accumulated commands and init code now:
-    [AC_CONFIG_COMMANDS([libtool],
-        [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
-])#_LT_CONFIG_COMMANDS
-
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
-[
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-sed_quote_subst='$sed_quote_subst'
-double_quote_subst='$double_quote_subst'
-delay_variable_subst='$delay_variable_subst'
-_LT_CONFIG_STATUS_DECLARATIONS
-LTCC='$LTCC'
-LTCFLAGS='$LTCFLAGS'
-compiler='$compiler_DEFAULT'
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
-  eval 'cat <<_LTECHO_EOF
-\$[]1
-_LTECHO_EOF'
-}
-
-# Quote evaled strings.
-for var in lt_decl_all_varnames([[ \
-]], lt_decl_quote_varnames); do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-    *[[\\\\\\\`\\"\\\$]]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-# Double-quote double-evaled strings.
-for var in lt_decl_all_varnames([[ \
-]], lt_decl_dquote_varnames); do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-    *[[\\\\\\\`\\"\\\$]]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-_LT_OUTPUT_LIBTOOL_INIT
-])
-
-# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
-# ------------------------------------
-# Generate a child script FILE with all initialization necessary to
-# reuse the environment learned by the parent script, and make the
-# file executable.  If COMMENT is supplied, it is inserted after the
-# `#!' sequence but before initialization text begins.  After this
-# macro, additional text can be appended to FILE to form the body of
-# the child script.  The macro ends with non-zero status if the
-# file could not be fully written (such as if the disk is full).
-m4_ifdef([AS_INIT_GENERATED],
-[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
-[m4_defun([_LT_GENERATED_FILE_INIT],
-[m4_require([AS_PREPARE])]dnl
-[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
-[lt_write_fail=0
-cat >$1 <<_ASEOF || lt_write_fail=1
-#! $SHELL
-# Generated by $as_me.
-$2
-SHELL=\${CONFIG_SHELL-$SHELL}
-export SHELL
-_ASEOF
-cat >>$1 <<\_ASEOF || lt_write_fail=1
-AS_SHELL_SANITIZE
-_AS_PREPARE
-exec AS_MESSAGE_FD>&1
-_ASEOF
-test $lt_write_fail = 0 && chmod +x $1[]dnl
-m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
-
-# LT_OUTPUT
-# ---------
-# This macro allows early generation of the libtool script (before
-# AC_OUTPUT is called), incase it is used in configure for compilation
-# tests.
-AC_DEFUN([LT_OUTPUT],
-[: ${CONFIG_LT=./config.lt}
-AC_MSG_NOTICE([creating $CONFIG_LT])
-_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
-[# Run this file to recreate a libtool stub with the current configuration.])
-
-cat >>"$CONFIG_LT" <<\_LTEOF
-lt_cl_silent=false
-exec AS_MESSAGE_LOG_FD>>config.log
-{
-  echo
-  AS_BOX([Running $as_me.])
-} >&AS_MESSAGE_LOG_FD
-
-lt_cl_help="\
-\`$as_me' creates a local libtool stub from the current configuration,
-for use in further configure time tests before the real libtool is
-generated.
-
-Usage: $[0] [[OPTIONS]]
-
-  -h, --help      print this help, then exit
-  -V, --version   print version number, then exit
-  -q, --quiet     do not print progress messages
-  -d, --debug     don't remove temporary files
-
-Report bugs to ."
-
-lt_cl_version="\
-m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
-m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
-configured by $[0], generated by m4_PACKAGE_STRING.
-
-Copyright (C) 2011 Free Software Foundation, Inc.
-This config.lt script is free software; the Free Software Foundation
-gives unlimited permision to copy, distribute and modify it."
-
-while test $[#] != 0
-do
-  case $[1] in
-    --version | --v* | -V )
-      echo "$lt_cl_version"; exit 0 ;;
-    --help | --h* | -h )
-      echo "$lt_cl_help"; exit 0 ;;
-    --debug | --d* | -d )
-      debug=: ;;
-    --quiet | --q* | --silent | --s* | -q )
-      lt_cl_silent=: ;;
-
-    -*) AC_MSG_ERROR([unrecognized option: $[1]
-Try \`$[0] --help' for more information.]) ;;
-
-    *) AC_MSG_ERROR([unrecognized argument: $[1]
-Try \`$[0] --help' for more information.]) ;;
-  esac
-  shift
-done
-
-if $lt_cl_silent; then
-  exec AS_MESSAGE_FD>/dev/null
-fi
-_LTEOF
-
-cat >>"$CONFIG_LT" <<_LTEOF
-_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
-_LTEOF
-
-cat >>"$CONFIG_LT" <<\_LTEOF
-AC_MSG_NOTICE([creating $ofile])
-_LT_OUTPUT_LIBTOOL_COMMANDS
-AS_EXIT(0)
-_LTEOF
-chmod +x "$CONFIG_LT"
-
-# configure is writing to config.log, but config.lt does its own redirection,
-# appending to config.log, which fails on DOS, as config.log is still kept
-# open by configure.  Here we exec the FD to /dev/null, effectively closing
-# config.log, so it can be properly (re)opened and appended to by config.lt.
-lt_cl_success=:
-test "$silent" = yes &&
-  lt_config_lt_args="$lt_config_lt_args --quiet"
-exec AS_MESSAGE_LOG_FD>/dev/null
-$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
-exec AS_MESSAGE_LOG_FD>>config.log
-$lt_cl_success || AS_EXIT(1)
-])# LT_OUTPUT
-
-
-# _LT_CONFIG(TAG)
-# ---------------
-# If TAG is the built-in tag, create an initial libtool script with a
-# default configuration from the untagged config vars.  Otherwise add code
-# to config.status for appending the configuration named by TAG from the
-# matching tagged config vars.
-m4_defun([_LT_CONFIG],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-_LT_CONFIG_SAVE_COMMANDS([
-  m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
-  m4_if(_LT_TAG, [C], [
-    # See if we are running on zsh, and set the options which allow our
-    # commands through without removal of \ escapes.
-    if test -n "${ZSH_VERSION+set}" ; then
-      setopt NO_GLOB_SUBST
-    fi
-
-    cfgfile="${ofile}T"
-    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
-    $RM "$cfgfile"
-
-    cat <<_LT_EOF >> "$cfgfile"
-#! $SHELL
-
-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-_LT_COPYING
-_LT_LIBTOOL_TAGS
-
-# ### BEGIN LIBTOOL CONFIG
-_LT_LIBTOOL_CONFIG_VARS
-_LT_LIBTOOL_TAG_VARS
-# ### END LIBTOOL CONFIG
-
-_LT_EOF
-
-  case $host_os in
-  aix3*)
-    cat <<\_LT_EOF >> "$cfgfile"
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
-fi
-_LT_EOF
-    ;;
-  esac
-
-  _LT_PROG_LTMAIN
-
-  # We use sed instead of cat because bash on DJGPP gets confused if
-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-  # text mode, it properly converts lines to CR/LF.  This bash problem
-  # is reportedly fixed, but why not run on old versions too?
-  sed '$q' "$ltmain" >> "$cfgfile" \
-     || (rm -f "$cfgfile"; exit 1)
-
-  _LT_PROG_REPLACE_SHELLFNS
-
-   mv -f "$cfgfile" "$ofile" ||
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
-],
-[cat <<_LT_EOF >> "$ofile"
-
-dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
-dnl in a comment (ie after a #).
-# ### BEGIN LIBTOOL TAG CONFIG: $1
-_LT_LIBTOOL_TAG_VARS(_LT_TAG)
-# ### END LIBTOOL TAG CONFIG: $1
-_LT_EOF
-])dnl /m4_if
-],
-[m4_if([$1], [], [
-    PACKAGE='$PACKAGE'
-    VERSION='$VERSION'
-    TIMESTAMP='$TIMESTAMP'
-    RM='$RM'
-    ofile='$ofile'], [])
-])dnl /_LT_CONFIG_SAVE_COMMANDS
-])# _LT_CONFIG
-
-
-# LT_SUPPORTED_TAG(TAG)
-# ---------------------
-# Trace this macro to discover what tags are supported by the libtool
-# --tag option, using:
-#    autoconf --trace 'LT_SUPPORTED_TAG:$1'
-AC_DEFUN([LT_SUPPORTED_TAG], [])
-
-
-# C support is built-in for now
-m4_define([_LT_LANG_C_enabled], [])
-m4_define([_LT_TAGS], [])
-
-
-# LT_LANG(LANG)
-# -------------
-# Enable libtool support for the given language if not already enabled.
-AC_DEFUN([LT_LANG],
-[AC_BEFORE([$0], [LT_OUTPUT])dnl
-m4_case([$1],
-  [C],			[_LT_LANG(C)],
-  [C++],		[_LT_LANG(CXX)],
-  [Go],			[_LT_LANG(GO)],
-  [Java],		[_LT_LANG(GCJ)],
-  [Fortran 77],		[_LT_LANG(F77)],
-  [Fortran],		[_LT_LANG(FC)],
-  [Windows Resource],	[_LT_LANG(RC)],
-  [m4_ifdef([_LT_LANG_]$1[_CONFIG],
-    [_LT_LANG($1)],
-    [m4_fatal([$0: unsupported language: "$1"])])])dnl
-])# LT_LANG
-
-
-# _LT_LANG(LANGNAME)
-# ------------------
-m4_defun([_LT_LANG],
-[m4_ifdef([_LT_LANG_]$1[_enabled], [],
-  [LT_SUPPORTED_TAG([$1])dnl
-  m4_append([_LT_TAGS], [$1 ])dnl
-  m4_define([_LT_LANG_]$1[_enabled], [])dnl
-  _LT_LANG_$1_CONFIG($1)])dnl
-])# _LT_LANG
-
-
-m4_ifndef([AC_PROG_GO], [
-############################################################
-# NOTE: This macro has been submitted for inclusion into   #
-#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
-#  a released version of Autoconf we should remove this    #
-#  macro and use it instead.                               #
-############################################################
-m4_defun([AC_PROG_GO],
-[AC_LANG_PUSH(Go)dnl
-AC_ARG_VAR([GOC],     [Go compiler command])dnl
-AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
-_AC_ARG_VAR_LDFLAGS()dnl
-AC_CHECK_TOOL(GOC, gccgo)
-if test -z "$GOC"; then
-  if test -n "$ac_tool_prefix"; then
-    AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
-  fi
-fi
-if test -z "$GOC"; then
-  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
-fi
-])#m4_defun
-])#m4_ifndef
-
-
-# _LT_LANG_DEFAULT_CONFIG
-# -----------------------
-m4_defun([_LT_LANG_DEFAULT_CONFIG],
-[AC_PROVIDE_IFELSE([AC_PROG_CXX],
-  [LT_LANG(CXX)],
-  [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
-
-AC_PROVIDE_IFELSE([AC_PROG_F77],
-  [LT_LANG(F77)],
-  [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
-
-AC_PROVIDE_IFELSE([AC_PROG_FC],
-  [LT_LANG(FC)],
-  [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
-
-dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal
-dnl pulling things in needlessly.
-AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-  [LT_LANG(GCJ)],
-  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-    [LT_LANG(GCJ)],
-    [AC_PROVIDE_IFELSE([LT_PROG_GCJ],
-      [LT_LANG(GCJ)],
-      [m4_ifdef([AC_PROG_GCJ],
-	[m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
-       m4_ifdef([A][M_PROG_GCJ],
-	[m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
-       m4_ifdef([LT_PROG_GCJ],
-	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
-
-AC_PROVIDE_IFELSE([AC_PROG_GO],
-  [LT_LANG(GO)],
-  [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
-
-AC_PROVIDE_IFELSE([LT_PROG_RC],
-  [LT_LANG(RC)],
-  [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
-])# _LT_LANG_DEFAULT_CONFIG
-
-# Obsolete macros:
-AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
-AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
-AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
-AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
-AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
-dnl AC_DEFUN([AC_LIBTOOL_F77], [])
-dnl AC_DEFUN([AC_LIBTOOL_FC], [])
-dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
-dnl AC_DEFUN([AC_LIBTOOL_RC], [])
-
-
-# _LT_TAG_COMPILER
-# ----------------
-m4_defun([_LT_TAG_COMPILER],
-[AC_REQUIRE([AC_PROG_CC])dnl
-
-_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
-_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
-_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
-_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-])# _LT_TAG_COMPILER
-
-
-# _LT_COMPILER_BOILERPLATE
-# ------------------------
-# Check for compiler boilerplate output or warnings with
-# the simple compiler test code.
-m4_defun([_LT_COMPILER_BOILERPLATE],
-[m4_require([_LT_DECL_SED])dnl
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$RM conftest*
-])# _LT_COMPILER_BOILERPLATE
-
-
-# _LT_LINKER_BOILERPLATE
-# ----------------------
-# Check for linker boilerplate output or warnings with
-# the simple link test code.
-m4_defun([_LT_LINKER_BOILERPLATE],
-[m4_require([_LT_DECL_SED])dnl
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$RM -r conftest*
-])# _LT_LINKER_BOILERPLATE
-
-# _LT_REQUIRED_DARWIN_CHECKS
-# -------------------------
-m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
-  case $host_os in
-    rhapsody* | darwin*)
-    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
-    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
-    AC_CHECK_TOOL([LIPO], [lipo], [:])
-    AC_CHECK_TOOL([OTOOL], [otool], [:])
-    AC_CHECK_TOOL([OTOOL64], [otool64], [:])
-    _LT_DECL([], [DSYMUTIL], [1],
-      [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
-    _LT_DECL([], [NMEDIT], [1],
-      [Tool to change global to local symbols on Mac OS X])
-    _LT_DECL([], [LIPO], [1],
-      [Tool to manipulate fat objects and archives on Mac OS X])
-    _LT_DECL([], [OTOOL], [1],
-      [ldd/readelf like tool for Mach-O binaries on Mac OS X])
-    _LT_DECL([], [OTOOL64], [1],
-      [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
-
-    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
-      [lt_cv_apple_cc_single_mod=no
-      if test -z "${LT_MULTI_MODULE}"; then
-	# By default we will add the -single_module flag. You can override
-	# by either setting the environment variable LT_MULTI_MODULE
-	# non-empty at configure time, or by adding -multi_module to the
-	# link flags.
-	rm -rf libconftest.dylib*
-	echo "int foo(void){return 1;}" > conftest.c
-	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
--dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
-	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
-        _lt_result=$?
-	# If there is a non-empty error log, and "single_module"
-	# appears in it, assume the flag caused a linker warning
-        if test -s conftest.err && $GREP single_module conftest.err; then
-	  cat conftest.err >&AS_MESSAGE_LOG_FD
-	# Otherwise, if the output was created with a 0 exit code from
-	# the compiler, it worked.
-	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
-	  lt_cv_apple_cc_single_mod=yes
-	else
-	  cat conftest.err >&AS_MESSAGE_LOG_FD
-	fi
-	rm -rf libconftest.dylib*
-	rm -f conftest.*
-      fi])
-
-    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
-      [lt_cv_ld_exported_symbols_list],
-      [lt_cv_ld_exported_symbols_list=no
-      save_LDFLAGS=$LDFLAGS
-      echo "_main" > conftest.sym
-      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-	[lt_cv_ld_exported_symbols_list=yes],
-	[lt_cv_ld_exported_symbols_list=no])
-	LDFLAGS="$save_LDFLAGS"
-    ])
-
-    AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
-      [lt_cv_ld_force_load=no
-      cat > conftest.c << _LT_EOF
-int forced_loaded() { return 2;}
-_LT_EOF
-      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
-      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
-      echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
-      $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
-      echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
-      $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
-      cat > conftest.c << _LT_EOF
-int main() { return 0;}
-_LT_EOF
-      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
-      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
-      _lt_result=$?
-      if test -s conftest.err && $GREP force_load conftest.err; then
-	cat conftest.err >&AS_MESSAGE_LOG_FD
-      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
-	lt_cv_ld_force_load=yes
-      else
-	cat conftest.err >&AS_MESSAGE_LOG_FD
-      fi
-        rm -f conftest.err libconftest.a conftest conftest.c
-        rm -rf conftest.dSYM
-    ])
-    case $host_os in
-    rhapsody* | darwin1.[[012]])
-      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-    darwin1.*)
-      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-    darwin*) # darwin 5.x on
-      # if running on 10.5 or later, the deployment target defaults
-      # to the OS version, if on x86, and 10.4, the deployment
-      # target defaults to 10.4. Don't you love it?
-      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-	10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-	10.[[012]]*)
-	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-	10.*)
-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-      esac
-    ;;
-  esac
-    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
-      _lt_dar_single_mod='$single_module'
-    fi
-    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
-    else
-      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    fi
-    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
-      _lt_dsymutil='~$DSYMUTIL $lib || :'
-    else
-      _lt_dsymutil=
-    fi
-    ;;
-  esac
-])
-
-
-# _LT_DARWIN_LINKER_FEATURES([TAG])
-# ---------------------------------
-# Checks for linker and compiler features on darwin
-m4_defun([_LT_DARWIN_LINKER_FEATURES],
-[
-  m4_require([_LT_REQUIRED_DARWIN_CHECKS])
-  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-  _LT_TAGVAR(hardcode_direct, $1)=no
-  _LT_TAGVAR(hardcode_automatic, $1)=yes
-  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-  if test "$lt_cv_ld_force_load" = "yes"; then
-    _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
-    m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
-                  [FC],  [_LT_TAGVAR(compiler_needs_object, $1)=yes])
-  else
-    _LT_TAGVAR(whole_archive_flag_spec, $1)=''
-  fi
-  _LT_TAGVAR(link_all_deplibs, $1)=yes
-  _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
-  case $cc_basename in
-     ifort*) _lt_dar_can_shared=yes ;;
-     *) _lt_dar_can_shared=$GCC ;;
-  esac
-  if test "$_lt_dar_can_shared" = "yes"; then
-    output_verbose_link_cmd=func_echo_all
-    _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-    m4_if([$1], [CXX],
-[   if test "$lt_cv_apple_cc_single_mod" != "yes"; then
-      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
-      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
-    fi
-],[])
-  else
-  _LT_TAGVAR(ld_shlibs, $1)=no
-  fi
-])
-
-# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
-# ----------------------------------
-# Links a minimal program and checks the executable
-# for the system default hardcoded library path. In most cases,
-# this is /usr/lib:/lib, but when the MPI compilers are used
-# the location of the communication and MPI libs are included too.
-# If we don't find anything, use the default library path according
-# to the aix ld manual.
-# Store the results from the different compilers for each TAGNAME.
-# Allow to override them for all tags through lt_cv_aix_libpath.
-m4_defun([_LT_SYS_MODULE_PATH_AIX],
-[m4_require([_LT_DECL_SED])dnl
-if test "${lt_cv_aix_libpath+set}" = set; then
-  aix_libpath=$lt_cv_aix_libpath
-else
-  AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
-  [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
-  lt_aix_libpath_sed='[
-      /Import File Strings/,/^$/ {
-	  /^0/ {
-	      s/^0  *\([^ ]*\) *$/\1/
-	      p
-	  }
-      }]'
-  _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  # Check for a 64-bit object if we didn't find anything.
-  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
-    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  fi],[])
-  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
-    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
-  fi
-  ])
-  aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
-fi
-])# _LT_SYS_MODULE_PATH_AIX
-
-
-# _LT_SHELL_INIT(ARG)
-# -------------------
-m4_define([_LT_SHELL_INIT],
-[m4_divert_text([M4SH-INIT], [$1
-])])# _LT_SHELL_INIT
-
-
-
-# _LT_PROG_ECHO_BACKSLASH
-# -----------------------
-# Find how we can fake an echo command that does not interpret backslash.
-# In particular, with Autoconf 2.60 or later we add some code to the start
-# of the generated configure script which will find a shell with a builtin
-# printf (which we can use as an echo command).
-m4_defun([_LT_PROG_ECHO_BACKSLASH],
-[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-
-AC_MSG_CHECKING([how to print strings])
-# Test print first, because it will be a builtin if present.
-if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
-   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
-  ECHO='print -r --'
-elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
-  ECHO='printf %s\n'
-else
-  # Use this function as a fallback that always works.
-  func_fallback_echo ()
-  {
-    eval 'cat <<_LTECHO_EOF
-$[]1
-_LTECHO_EOF'
-  }
-  ECHO='func_fallback_echo'
-fi
-
-# func_echo_all arg...
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
-    $ECHO "$*" 
-}
-
-case "$ECHO" in
-  printf*) AC_MSG_RESULT([printf]) ;;
-  print*) AC_MSG_RESULT([print -r]) ;;
-  *) AC_MSG_RESULT([cat]) ;;
-esac
-
-m4_ifdef([_AS_DETECT_SUGGESTED],
-[_AS_DETECT_SUGGESTED([
-  test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
-    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-    PATH=/empty FPATH=/empty; export PATH FPATH
-    test "X`printf %s $ECHO`" = "X$ECHO" \
-      || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
-
-_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
-_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
-])# _LT_PROG_ECHO_BACKSLASH
-
-
-# _LT_WITH_SYSROOT
-# ----------------
-AC_DEFUN([_LT_WITH_SYSROOT],
-[AC_MSG_CHECKING([for sysroot])
-AC_ARG_WITH([sysroot],
-[  --with-sysroot[=DIR] Search for dependent libraries within DIR
-                        (or the compiler's sysroot if not specified).],
-[], [with_sysroot=no])
-
-dnl lt_sysroot will always be passed unquoted.  We quote it here
-dnl in case the user passed a directory name.
-lt_sysroot=
-case ${with_sysroot} in #(
- yes)
-   if test "$GCC" = yes; then
-     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
-   fi
-   ;; #(
- /*)
-   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
-   ;; #(
- no|'')
-   ;; #(
- *)
-   AC_MSG_RESULT([${with_sysroot}])
-   AC_MSG_ERROR([The sysroot must be an absolute path.])
-   ;;
-esac
-
- AC_MSG_RESULT([${lt_sysroot:-no}])
-_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
-[dependent libraries, and in which our libraries should be installed.])])
-
-# _LT_ENABLE_LOCK
-# ---------------
-m4_defun([_LT_ENABLE_LOCK],
-[AC_ARG_ENABLE([libtool-lock],
-  [AS_HELP_STRING([--disable-libtool-lock],
-    [avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.$ac_objext` in
-      *ELF-32*)
-	HPUX_IA64_MODE="32"
-	;;
-      *ELF-64*)
-	HPUX_IA64_MODE="64"
-	;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    if test "$lt_cv_prog_gnu_ld" = yes; then
-      case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -melf32bsmip"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -melf32bmipn32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -melf64bmip"
-	;;
-      esac
-    else
-      case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -32"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -n32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -64"
-	  ;;
-      esac
-    fi
-  fi
-  rm -rf conftest*
-  ;;
-
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
-      *32-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_i386_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_i386"
-	    ;;
-	  ppc64-*linux*|powerpc64-*linux*)
-	    LD="${LD-ld} -m elf32ppclinux"
-	    ;;
-	  s390x-*linux*)
-	    LD="${LD-ld} -m elf_s390"
-	    ;;
-	  sparc64-*linux*)
-	    LD="${LD-ld} -m elf32_sparc"
-	    ;;
-	esac
-	;;
-      *64-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_x86_64_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_x86_64"
-	    ;;
-	  ppc*-*linux*|powerpc*-*linux*)
-	    LD="${LD-ld} -m elf64ppc"
-	    ;;
-	  s390*-*linux*|s390*-*tpf*)
-	    LD="${LD-ld} -m elf64_s390"
-	    ;;
-	  sparc*-*linux*)
-	    LD="${LD-ld} -m elf64_sparc"
-	    ;;
-	esac
-	;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-    [AC_LANG_PUSH(C)
-     AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-     AC_LANG_POP])
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-*-*solaris*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
-    *64-bit*)
-      case $lt_cv_prog_gnu_ld in
-      yes*)
-        case $host in
-        i?86-*-solaris*)
-          LD="${LD-ld} -m elf_x86_64"
-          ;;
-        sparc*-*-solaris*)
-          LD="${LD-ld} -m elf64_sparc"
-          ;;
-        esac
-        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
-        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
-          LD="${LD-ld}_sol2"
-        fi
-        ;;
-      *)
-	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-	  LD="${LD-ld} -64"
-	fi
-	;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-esac
-
-need_locks="$enable_libtool_lock"
-])# _LT_ENABLE_LOCK
-
-
-# _LT_PROG_AR
-# -----------
-m4_defun([_LT_PROG_AR],
-[AC_CHECK_TOOLS(AR, [ar], false)
-: ${AR=ar}
-: ${AR_FLAGS=cru}
-_LT_DECL([], [AR], [1], [The archiver])
-_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
-
-AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
-  [lt_cv_ar_at_file=no
-   AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
-     [echo conftest.$ac_objext > conftest.lst
-      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
-      AC_TRY_EVAL([lt_ar_try])
-      if test "$ac_status" -eq 0; then
-	# Ensure the archiver fails upon bogus file names.
-	rm -f conftest.$ac_objext libconftest.a
-	AC_TRY_EVAL([lt_ar_try])
-	if test "$ac_status" -ne 0; then
-          lt_cv_ar_at_file=@
-        fi
-      fi
-      rm -f conftest.* libconftest.a
-     ])
-  ])
-
-if test "x$lt_cv_ar_at_file" = xno; then
-  archiver_list_spec=
-else
-  archiver_list_spec=$lt_cv_ar_at_file
-fi
-_LT_DECL([], [archiver_list_spec], [1],
-  [How to feed a file listing to the archiver])
-])# _LT_PROG_AR
-
-
-# _LT_CMD_OLD_ARCHIVE
-# -------------------
-m4_defun([_LT_CMD_OLD_ARCHIVE],
-[_LT_PROG_AR
-
-AC_CHECK_TOOL(STRIP, strip, :)
-test -z "$STRIP" && STRIP=:
-_LT_DECL([], [STRIP], [1], [A symbol stripping program])
-
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-test -z "$RANLIB" && RANLIB=:
-_LT_DECL([], [RANLIB], [1],
-    [Commands used to install an old-style archive])
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
-  case $host_os in
-  openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
-    ;;
-  *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
-    ;;
-  esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
-fi
-
-case $host_os in
-  darwin*)
-    lock_old_archive_extraction=yes ;;
-  *)
-    lock_old_archive_extraction=no ;;
-esac
-_LT_DECL([], [old_postinstall_cmds], [2])
-_LT_DECL([], [old_postuninstall_cmds], [2])
-_LT_TAGDECL([], [old_archive_cmds], [2],
-    [Commands used to build an old-style archive])
-_LT_DECL([], [lock_old_archive_extraction], [0],
-    [Whether to use a lock for old archive extraction])
-])# _LT_CMD_OLD_ARCHIVE
-
-
-# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
-# ----------------------------------------------------------------
-# Check whether the given compiler option works
-AC_DEFUN([_LT_COMPILER_OPTION],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_SED])dnl
-AC_CACHE_CHECK([$1], [$2],
-  [$2=no
-   m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$3"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       $2=yes
-     fi
-   fi
-   $RM conftest*
-])
-
-if test x"[$]$2" = xyes; then
-    m4_if([$5], , :, [$5])
-else
-    m4_if([$6], , :, [$6])
-fi
-])# _LT_COMPILER_OPTION
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
-
-
-# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#                  [ACTION-SUCCESS], [ACTION-FAILURE])
-# ----------------------------------------------------
-# Check whether the given linker option works
-AC_DEFUN([_LT_LINKER_OPTION],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_SED])dnl
-AC_CACHE_CHECK([$1], [$2],
-  [$2=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $3"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&AS_MESSAGE_LOG_FD
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         $2=yes
-       fi
-     else
-       $2=yes
-     fi
-   fi
-   $RM -r conftest*
-   LDFLAGS="$save_LDFLAGS"
-])
-
-if test x"[$]$2" = xyes; then
-    m4_if([$4], , :, [$4])
-else
-    m4_if([$5], , :, [$5])
-fi
-])# _LT_LINKER_OPTION
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
-
-
-# LT_CMD_MAX_LEN
-#---------------
-AC_DEFUN([LT_CMD_MAX_LEN],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-# find the maximum length of command line arguments
-AC_MSG_CHECKING([the maximum length of command line arguments])
-AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
-  i=0
-  teststring="ABCD"
-
-  case $build_os in
-  msdosdjgpp*)
-    # On DJGPP, this test can blow up pretty badly due to problems in libc
-    # (any single argument exceeding 2000 bytes causes a buffer overrun
-    # during glob expansion).  Even if it were fixed, the result of this
-    # check would be larger than it should be.
-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-    ;;
-
-  gnu*)
-    # Under GNU Hurd, this test is not required because there is
-    # no limit to the length of command line arguments.
-    # Libtool will interpret -1 as no limit whatsoever
-    lt_cv_sys_max_cmd_len=-1;
-    ;;
-
-  cygwin* | mingw* | cegcc*)
-    # On Win9x/ME, this test blows up -- it succeeds, but takes
-    # about 5 minutes as the teststring grows exponentially.
-    # Worse, since 9x/ME are not pre-emptively multitasking,
-    # you end up with a "frozen" computer, even though with patience
-    # the test eventually succeeds (with a max line length of 256k).
-    # Instead, let's just punt: use the minimum linelength reported by
-    # all of the supported platforms: 8192 (on NT/2K/XP).
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  mint*)
-    # On MiNT this can take a long time and run out of memory.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  amigaos*)
-    # On AmigaOS with pdksh, this test takes hours, literally.
-    # So we just punt and use a minimum line length of 8192.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-    # This has been around since 386BSD, at least.  Likely further.
-    if test -x /sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-    elif test -x /usr/sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-    else
-      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
-    fi
-    # And add a safety zone
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    ;;
-
-  interix*)
-    # We know the value 262144 and hardcode it with a safety zone (like BSD)
-    lt_cv_sys_max_cmd_len=196608
-    ;;
-
-  os2*)
-    # The test takes a long time on OS/2.
-    lt_cv_sys_max_cmd_len=8192
-    ;;
-
-  osf*)
-    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-    # nice to cause kernel panics so lets avoid the loop below.
-    # First set a reasonable default.
-    lt_cv_sys_max_cmd_len=16384
-    #
-    if test -x /sbin/sysconfig; then
-      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-      esac
-    fi
-    ;;
-  sco3.2v5*)
-    lt_cv_sys_max_cmd_len=102400
-    ;;
-  sysv5* | sco5v6* | sysv4.2uw2*)
-    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
-    if test -n "$kargmax"; then
-      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[	 ]]//'`
-    else
-      lt_cv_sys_max_cmd_len=32768
-    fi
-    ;;
-  *)
-    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len"; then
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    else
-      # Make teststring a little bigger before we do anything with it.
-      # a 1K string should be a reasonable start.
-      for i in 1 2 3 4 5 6 7 8 ; do
-        teststring=$teststring$teststring
-      done
-      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-      # If test is not a shell built-in, we'll probably end up computing a
-      # maximum length that is only half of the actual maximum length, but
-      # we can't tell.
-      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
-	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
-	      test $i != 17 # 1/2 MB should be enough
-      do
-        i=`expr $i + 1`
-        teststring=$teststring$teststring
-      done
-      # Only check the string length outside the loop.
-      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
-      teststring=
-      # Add a significant safety factor because C++ compilers can tack on
-      # massive amounts of additional arguments before passing them to the
-      # linker.  It appears as though 1/2 is a usable value.
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-    fi
-    ;;
-  esac
-])
-if test -n $lt_cv_sys_max_cmd_len ; then
-  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
-else
-  AC_MSG_RESULT(none)
-fi
-max_cmd_len=$lt_cv_sys_max_cmd_len
-_LT_DECL([], [max_cmd_len], [0],
-    [What is the maximum length of a command?])
-])# LT_CMD_MAX_LEN
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])
-
-
-# _LT_HEADER_DLFCN
-# ----------------
-m4_defun([_LT_HEADER_DLFCN],
-[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
-])# _LT_HEADER_DLFCN
-
-
-# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
-#                      ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-# ----------------------------------------------------------------
-m4_defun([_LT_TRY_DLOPEN_SELF],
-[m4_require([_LT_HEADER_DLFCN])dnl
-if test "$cross_compiling" = yes; then :
-  [$4]
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<_LT_EOF
-[#line $LINENO "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include 
-#endif
-
-#include 
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-/* When -fvisbility=hidden is used, assume the code has been annotated
-   correspondingly for the symbols needed.  */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-int fnord () __attribute__((visibility("default")));
-#endif
-
-int fnord () { return 42; }
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else
-        {
-	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
-          else puts (dlerror ());
-	}
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
-
-  return status;
-}]
-_LT_EOF
-  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) $1 ;;
-      x$lt_dlneed_uscore) $2 ;;
-      x$lt_dlunknown|x*) $3 ;;
-    esac
-  else :
-    # compilation failed
-    $3
-  fi
-fi
-rm -fr conftest*
-])# _LT_TRY_DLOPEN_SELF
-
-
-# LT_SYS_DLOPEN_SELF
-# ------------------
-AC_DEFUN([LT_SYS_DLOPEN_SELF],
-[m4_require([_LT_HEADER_DLFCN])dnl
-if test "x$enable_dlopen" != xyes; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen="load_add_on"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  mingw* | pw32* | cegcc*)
-    lt_cv_dlopen="LoadLibrary"
-    lt_cv_dlopen_libs=
-    ;;
-
-  cygwin*)
-    lt_cv_dlopen="dlopen"
-    lt_cv_dlopen_libs=
-    ;;
-
-  darwin*)
-  # if libdl is installed we need to link against it
-    AC_CHECK_LIB([dl], [dlopen],
-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
-    lt_cv_dlopen="dyld"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ])
-    ;;
-
-  *)
-    AC_CHECK_FUNC([shl_load],
-	  [lt_cv_dlopen="shl_load"],
-      [AC_CHECK_LIB([dld], [shl_load],
-	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
-	[AC_CHECK_FUNC([dlopen],
-	      [lt_cv_dlopen="dlopen"],
-	  [AC_CHECK_LIB([dl], [dlopen],
-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
-	    [AC_CHECK_LIB([svld], [dlopen],
-		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
-	      [AC_CHECK_LIB([dld], [dld_link],
-		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
-	      ])
-	    ])
-	  ])
-	])
-      ])
-    ;;
-  esac
-
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
-    enable_dlopen=no
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS="$LDFLAGS"
-    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS="$LIBS"
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    AC_CACHE_CHECK([whether a program can dlopen itself],
-	  lt_cv_dlopen_self, [dnl
-	  _LT_TRY_DLOPEN_SELF(
-	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
-	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
-    ])
-
-    if test "x$lt_cv_dlopen_self" = xyes; then
-      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
-	  lt_cv_dlopen_self_static, [dnl
-	  _LT_TRY_DLOPEN_SELF(
-	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
-	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
-      ])
-    fi
-
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-_LT_DECL([dlopen_support], [enable_dlopen], [0],
-	 [Whether dlopen is supported])
-_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
-	 [Whether dlopen of programs is supported])
-_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
-	 [Whether dlopen of statically linked programs is supported])
-])# LT_SYS_DLOPEN_SELF
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
-
-
-# _LT_COMPILER_C_O([TAGNAME])
-# ---------------------------
-# Check to see if options -c and -o are simultaneously supported by compiler.
-# This macro does not hard code the compiler like AC_PROG_CC_C_O.
-m4_defun([_LT_COMPILER_C_O],
-[m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_TAG_COMPILER])dnl
-AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
-  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
-  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-     fi
-   fi
-   chmod u+w . 2>&AS_MESSAGE_LOG_FD
-   $RM conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-   $RM out/* && rmdir out
-   cd ..
-   $RM -r conftest
-   $RM conftest*
-])
-_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
-	[Does compiler simultaneously support -c and -o options?])
-])# _LT_COMPILER_C_O
-
-
-# _LT_COMPILER_FILE_LOCKS([TAGNAME])
-# ----------------------------------
-# Check to see if we can do hard links to lock some files if needed
-m4_defun([_LT_COMPILER_FILE_LOCKS],
-[m4_require([_LT_ENABLE_LOCK])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-_LT_COMPILER_C_O([$1])
-
-hard_links="nottested"
-if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  AC_MSG_CHECKING([if we can lock with hard links])
-  hard_links=yes
-  $RM conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  AC_MSG_RESULT([$hard_links])
-  if test "$hard_links" = no; then
-    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
-])# _LT_COMPILER_FILE_LOCKS
-
-
-# _LT_CHECK_OBJDIR
-# ----------------
-m4_defun([_LT_CHECK_OBJDIR],
-[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
-[rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
-  lt_cv_objdir=.libs
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null])
-objdir=$lt_cv_objdir
-_LT_DECL([], [objdir], [0],
-         [The name of the directory that contains temporary libtool files])dnl
-m4_pattern_allow([LT_OBJDIR])dnl
-AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
-  [Define to the sub-directory in which libtool stores uninstalled libraries.])
-])# _LT_CHECK_OBJDIR
-
-
-# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
-# --------------------------------------
-# Check hardcoding attributes.
-m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
-[AC_MSG_CHECKING([how to hardcode library paths into programs])
-_LT_TAGVAR(hardcode_action, $1)=
-if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
-   test -n "$_LT_TAGVAR(runpath_var, $1)" ||
-   test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
-
-  # We can hardcode non-existent directories.
-  if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
-     test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
-    # Linking always hardcodes the temporary library directory.
-    _LT_TAGVAR(hardcode_action, $1)=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    _LT_TAGVAR(hardcode_action, $1)=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  _LT_TAGVAR(hardcode_action, $1)=unsupported
-fi
-AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
-
-if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
-   test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-_LT_TAGDECL([], [hardcode_action], [0],
-    [How to hardcode a shared library path into an executable])
-])# _LT_LINKER_HARDCODE_LIBPATH
-
-
-# _LT_CMD_STRIPLIB
-# ----------------
-m4_defun([_LT_CMD_STRIPLIB],
-[m4_require([_LT_DECL_EGREP])
-striplib=
-old_striplib=
-AC_MSG_CHECKING([whether stripping libraries is possible])
-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  AC_MSG_RESULT([yes])
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-  darwin*)
-    if test -n "$STRIP" ; then
-      striplib="$STRIP -x"
-      old_striplib="$STRIP -S"
-      AC_MSG_RESULT([yes])
-    else
-      AC_MSG_RESULT([no])
-    fi
-    ;;
-  *)
-    AC_MSG_RESULT([no])
-    ;;
-  esac
-fi
-_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
-_LT_DECL([], [striplib], [1])
-])# _LT_CMD_STRIPLIB
-
-
-# _LT_SYS_DYNAMIC_LINKER([TAG])
-# -----------------------------
-# PORTME Fill in your ld.so characteristics
-m4_defun([_LT_SYS_DYNAMIC_LINKER],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_OBJDUMP])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_CHECK_SHELL_FEATURES])dnl
-AC_MSG_CHECKING([dynamic linker characteristics])
-m4_if([$1],
-	[], [
-if test "$GCC" = yes; then
-  case $host_os in
-    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-    *) lt_awk_arg="/^libraries:/" ;;
-  esac
-  case $host_os in
-    mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
-    *) lt_sed_strip_eq="s,=/,/,g" ;;
-  esac
-  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
-  case $lt_search_path_spec in
-  *\;*)
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
-    ;;
-  *)
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
-    ;;
-  esac
-  # Ok, now we have the path, separated by spaces, we can step through it
-  # and add multilib dir if necessary.
-  lt_tmp_lt_search_path_spec=
-  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
-  for lt_sys_path in $lt_search_path_spec; do
-    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
-      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
-    else
-      test -d "$lt_sys_path" && \
-	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-    fi
-  done
-  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
-BEGIN {RS=" "; FS="/|\n";} {
-  lt_foo="";
-  lt_count=0;
-  for (lt_i = NF; lt_i > 0; lt_i--) {
-    if ($lt_i != "" && $lt_i != ".") {
-      if ($lt_i == "..") {
-        lt_count++;
-      } else {
-        if (lt_count == 0) {
-          lt_foo="/" $lt_i lt_foo;
-        } else {
-          lt_count--;
-        }
-      }
-    }
-  }
-  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
-  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
-}'`
-  # AWK program above erroneously prepends '/' to C:/dos/paths
-  # for these hosts.
-  case $host_os in
-    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
-      $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
-  esac
-  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi])
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix[[4-9]]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[[01]] | aix4.[[01]].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib.so
-      # instead of lib.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  case $host_cpu in
-  powerpc)
-    # Since July 2007 AmigaOS4 officially supports .so libraries.
-    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    ;;
-  m68k)
-    library_names_spec='$libname.ixlibrary $libname.a'
-    # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-    ;;
-  esac
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi[[45]]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32* | cegcc*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$cc_basename in
-  yes,*)
-    # gcc
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname~
-      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-      fi'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-m4_if([$1], [],[
-      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
-      ;;
-    mingw* | cegcc*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    dynamic_linker='Win32 ld.exe'
-    ;;
-
-  *,cl*)
-    # Native MSVC
-    libname_spec='$name'
-    soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-    library_names_spec='${libname}.dll.lib'
-
-    case $build_os in
-    mingw*)
-      sys_lib_search_path_spec=
-      lt_save_ifs=$IFS
-      IFS=';'
-      for lt_path in $LIB
-      do
-        IFS=$lt_save_ifs
-        # Let DOS variable expansion print the short 8.3 style file name.
-        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
-        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
-      done
-      IFS=$lt_save_ifs
-      # Convert to MSYS style.
-      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
-      ;;
-    cygwin*)
-      # Convert to unix form, then to dos form, then back to unix form
-      # but this time dos style (no spaces!) so that the unix form looks
-      # like /cygdrive/c/PROGRA~1:/cygdr...
-      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
-      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
-      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-      ;;
-    *)
-      sys_lib_search_path_spec="$LIB"
-      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
-        # It is most probably a Windows format PATH.
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      # FIXME: find the short name or the path components, as spaces are
-      # common. (e.g. "Program Files" -> "PROGRA~1")
-      ;;
-    esac
-
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-    dynamic_linker='Win32 link.exe'
-    ;;
-
-  *)
-    # Assume MSVC wrapper
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    dynamic_linker='Win32 ld.exe'
-    ;;
-  esac
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-m4_if([$1], [],[
-  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd[[23]].*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2.*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
-  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  *) # from 4.6 on, and DragonFly
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-gnu*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-haiku*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  dynamic_linker="$host_os runtime_loader"
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case $host_cpu in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-  hppa*64*)
-    shrext_cmds='.sl'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-  *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
-  postinstall_cmds='chmod 555 $lib'
-  # or fails outright, so override atomically:
-  install_override_mode=555
-  ;;
-
-interix[[3-9]]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux # correct to gnu/linux during the next big refactor
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-
-  # Some binutils ld are patched to set DT_RUNPATH
-  AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
-    [lt_cv_shlibpath_overrides_runpath=no
-    save_LDFLAGS=$LDFLAGS
-    save_libdir=$libdir
-    eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
-	 LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
-    AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-      [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
-	 [lt_cv_shlibpath_overrides_runpath=yes])])
-    LDFLAGS=$save_LDFLAGS
-    libdir=$save_libdir
-    ])
-  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
-
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Add ABI-specific directories to the system library path.
-  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-*nto* | *qnx*)
-  version_type=qnx
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='ldqnx.so'
-  ;;
-
-openbsd*)
-  version_type=sunos
-  sys_lib_dlsearch_path_spec="/usr/lib"
-  need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
-    *)				need_version=no  ;;
-  esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[[89]] | openbsd2.[[89]].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
-
-os2*)
-  libname_spec='$name'
-  shrext_cmds=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-rdos*)
-  dynamic_linker=no
-  ;;
-
-solaris*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux # correct to gnu/linux during the next big refactor
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=freebsd-elf
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  if test "$with_gnu_ld" = yes; then
-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-  else
-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    case $host_os in
-      sco3.2v5*)
-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-	;;
-    esac
-  fi
-  sys_lib_dlsearch_path_spec='/usr/lib'
-  ;;
-
-tpf*)
-  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-uts4*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-AC_MSG_RESULT([$dynamic_linker])
-test "$dynamic_linker" = no && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-fi
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-fi
-
-_LT_DECL([], [variables_saved_for_relink], [1],
-    [Variables whose values should be saved in libtool wrapper scripts and
-    restored at link time])
-_LT_DECL([], [need_lib_prefix], [0],
-    [Do we need the "lib" prefix for modules?])
-_LT_DECL([], [need_version], [0], [Do we need a version for libraries?])
-_LT_DECL([], [version_type], [0], [Library versioning type])
-_LT_DECL([], [runpath_var], [0],  [Shared library runtime path variable])
-_LT_DECL([], [shlibpath_var], [0],[Shared library path variable])
-_LT_DECL([], [shlibpath_overrides_runpath], [0],
-    [Is shlibpath searched before the hard-coded library search path?])
-_LT_DECL([], [libname_spec], [1], [Format of library name prefix])
-_LT_DECL([], [library_names_spec], [1],
-    [[List of archive names.  First name is the real one, the rest are links.
-    The last name is the one that the linker finds with -lNAME]])
-_LT_DECL([], [soname_spec], [1],
-    [[The coded name of the library, if different from the real name]])
-_LT_DECL([], [install_override_mode], [1],
-    [Permission mode override for installation of shared libraries])
-_LT_DECL([], [postinstall_cmds], [2],
-    [Command to use after installation of a shared archive])
-_LT_DECL([], [postuninstall_cmds], [2],
-    [Command to use after uninstallation of a shared archive])
-_LT_DECL([], [finish_cmds], [2],
-    [Commands used to finish a libtool library installation in a directory])
-_LT_DECL([], [finish_eval], [1],
-    [[As "finish_cmds", except a single script fragment to be evaled but
-    not shown]])
-_LT_DECL([], [hardcode_into_libs], [0],
-    [Whether we should hardcode library paths into libraries])
-_LT_DECL([], [sys_lib_search_path_spec], [2],
-    [Compile-time system search path for libraries])
-_LT_DECL([], [sys_lib_dlsearch_path_spec], [2],
-    [Run-time system search path for libraries])
-])# _LT_SYS_DYNAMIC_LINKER
-
-
-# _LT_PATH_TOOL_PREFIX(TOOL)
-# --------------------------
-# find a file program which can recognize shared library
-AC_DEFUN([_LT_PATH_TOOL_PREFIX],
-[m4_require([_LT_DECL_EGREP])dnl
-AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-[case $MAGIC_CMD in
-[[\\/*] |  ?:[\\/]*])
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-dnl $ac_dummy forces splitting on constant user-supplied paths.
-dnl POSIX.2 word splitting is done only on the output of word expansions,
-dnl not every word.  This closes a longstanding sh security hole.
-  ac_dummy="m4_if([$2], , $PATH, [$2])"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$1; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<_LT_EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-_LT_EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
-  ;;
-esac])
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  AC_MSG_RESULT($MAGIC_CMD)
-else
-  AC_MSG_RESULT(no)
-fi
-_LT_DECL([], [MAGIC_CMD], [0],
-	 [Used to examine libraries when file_magic_cmd begins with "file"])dnl
-])# _LT_PATH_TOOL_PREFIX
-
-# Old name:
-AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
-
-
-# _LT_PATH_MAGIC
-# --------------
-# find a file program which can recognize a shared library
-m4_defun([_LT_PATH_MAGIC],
-[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
-  else
-    MAGIC_CMD=:
-  fi
-fi
-])# _LT_PATH_MAGIC
-
-
-# LT_PATH_LD
-# ----------
-# find the pathname to the GNU or non-GNU linker
-AC_DEFUN([LT_PATH_LD],
-[AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
-
-AC_ARG_WITH([gnu-ld],
-    [AS_HELP_STRING([--with-gnu-ld],
-	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
-    [test "$withval" = no || with_gnu_ld=yes],
-    [with_gnu_ld=no])dnl
-
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by $CC])
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [[\\/]]* | ?:[[\\/]]*)
-      re_direlt='/[[^/]][[^/]]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
-      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(lt_cv_path_LD,
-[if test -z "$LD"; then
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 &1 /dev/null 2>&1; then
-    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-    lt_cv_file_magic_cmd='func_win32_libid'
-  else
-    # Keep this pattern in sync with the one in func_win32_libid.
-    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
-    lt_cv_file_magic_cmd='$OBJDUMP -f'
-  fi
-  ;;
-
-cegcc*)
-  # use the weaker test based on 'objdump'. See mingw*.
-  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-freebsd* | dragonfly*)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-haiku*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20* | hpux11*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  case $host_cpu in
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  hppa*64*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]']
-    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-    ;;
-  *)
-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  esac
-  ;;
-
-interix[[3-9]]*)
-  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
-  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $LD in
-  *-32|*"-32 ") libmagic=32-bit;;
-  *-n32|*"-n32 ") libmagic=N32;;
-  *-64|*"-64 ") libmagic=64-bit;;
-  *) libmagic=never-match;;
-  esac
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-netbsd*)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
-  fi
-  ;;
-
-newos6*)
-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-*nto* | *qnx*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-openbsd*)
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-  fi
-  ;;
-
-osf3* | osf4* | osf5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-rdos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.3*)
-  case $host_vendor in
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  sequent)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
-    ;;
-  sni)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
-    lt_cv_file_magic_test_file=/lib/libc.so
-    ;;
-  siemens)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  pc)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  esac
-  ;;
-
-tpf*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-esac
-])
-
-file_magic_glob=
-want_nocaseglob=no
-if test "$build" = "$host"; then
-  case $host_os in
-  mingw* | pw32*)
-    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
-      want_nocaseglob=yes
-    else
-      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
-    fi
-    ;;
-  esac
-fi
-
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
-
-_LT_DECL([], [deplibs_check_method], [1],
-    [Method to check whether dependent libraries are shared objects])
-_LT_DECL([], [file_magic_cmd], [1],
-    [Command to use when deplibs_check_method = "file_magic"])
-_LT_DECL([], [file_magic_glob], [1],
-    [How to find potential files when deplibs_check_method = "file_magic"])
-_LT_DECL([], [want_nocaseglob], [1],
-    [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
-])# _LT_CHECK_MAGIC_METHOD
-
-
-# LT_PATH_NM
-# ----------
-# find the pathname to a BSD- or MS-compatible name lister
-AC_DEFUN([LT_PATH_NM],
-[AC_REQUIRE([AC_PROG_CC])dnl
-AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
-[if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  lt_nm_to_check="${ac_tool_prefix}nm"
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-    lt_nm_to_check="$lt_nm_to_check nm"
-  fi
-  for lt_tmp_nm in $lt_nm_to_check; do
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-      IFS="$lt_save_ifs"
-      test -z "$ac_dir" && ac_dir=.
-      tmp_nm="$ac_dir/$lt_tmp_nm"
-      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-	# Check to see if the nm accepts a BSD-compat flag.
-	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
-	#   nm: unknown option "B" ignored
-	# Tru64's nm complains that /dev/null is an invalid object file
-	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-	*/dev/null* | *'Invalid file or object type'*)
-	  lt_cv_path_NM="$tmp_nm -B"
-	  break
-	  ;;
-	*)
-	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	  */dev/null*)
-	    lt_cv_path_NM="$tmp_nm -p"
-	    break
-	    ;;
-	  *)
-	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	    continue # so that we can try to find one that supports BSD flags
-	    ;;
-	  esac
-	  ;;
-	esac
-      fi
-    done
-    IFS="$lt_save_ifs"
-  done
-  : ${lt_cv_path_NM=no}
-fi])
-if test "$lt_cv_path_NM" != "no"; then
-  NM="$lt_cv_path_NM"
-else
-  # Didn't find any BSD compatible name lister, look for dumpbin.
-  if test -n "$DUMPBIN"; then :
-    # Let the user override the test.
-  else
-    AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
-    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
-    *COFF*)
-      DUMPBIN="$DUMPBIN -symbols"
-      ;;
-    *)
-      DUMPBIN=:
-      ;;
-    esac
-  fi
-  AC_SUBST([DUMPBIN])
-  if test "$DUMPBIN" != ":"; then
-    NM="$DUMPBIN"
-  fi
-fi
-test -z "$NM" && NM=nm
-AC_SUBST([NM])
-_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
-
-AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
-  [lt_cv_nm_interface="BSD nm"
-  echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
-  (eval "$ac_compile" 2>conftest.err)
-  cat conftest.err >&AS_MESSAGE_LOG_FD
-  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
-  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-  cat conftest.err >&AS_MESSAGE_LOG_FD
-  (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
-  cat conftest.out >&AS_MESSAGE_LOG_FD
-  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-    lt_cv_nm_interface="MS dumpbin"
-  fi
-  rm -f conftest*])
-])# LT_PATH_NM
-
-# Old names:
-AU_ALIAS([AM_PROG_NM], [LT_PATH_NM])
-AU_ALIAS([AC_PROG_NM], [LT_PATH_NM])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_PROG_NM], [])
-dnl AC_DEFUN([AC_PROG_NM], [])
-
-# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
-# --------------------------------
-# how to determine the name of the shared library
-# associated with a specific link library.
-#  -- PORTME fill in with the dynamic library characteristics
-m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
-[m4_require([_LT_DECL_EGREP])
-m4_require([_LT_DECL_OBJDUMP])
-m4_require([_LT_DECL_DLLTOOL])
-AC_CACHE_CHECK([how to associate runtime and link libraries],
-lt_cv_sharedlib_from_linklib_cmd,
-[lt_cv_sharedlib_from_linklib_cmd='unknown'
-
-case $host_os in
-cygwin* | mingw* | pw32* | cegcc*)
-  # two different shell functions defined in ltmain.sh
-  # decide which to use based on capabilities of $DLLTOOL
-  case `$DLLTOOL --help 2>&1` in
-  *--identify-strict*)
-    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
-    ;;
-  *)
-    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
-    ;;
-  esac
-  ;;
-*)
-  # fallback: assume linklib IS sharedlib
-  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
-  ;;
-esac
-])
-sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
-test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
-
-_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
-    [Command to associate shared and link libraries])
-])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
-
-
-# _LT_PATH_MANIFEST_TOOL
-# ----------------------
-# locate the manifest tool
-m4_defun([_LT_PATH_MANIFEST_TOOL],
-[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
-test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
-AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
-  [lt_cv_path_mainfest_tool=no
-  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
-  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
-  cat conftest.err >&AS_MESSAGE_LOG_FD
-  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
-    lt_cv_path_mainfest_tool=yes
-  fi
-  rm -f conftest*])
-if test "x$lt_cv_path_mainfest_tool" != xyes; then
-  MANIFEST_TOOL=:
-fi
-_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
-])# _LT_PATH_MANIFEST_TOOL
-
-
-# LT_LIB_M
-# --------
-# check for math library
-AC_DEFUN([LT_LIB_M],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-LIBM=
-case $host in
-*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
-  # These system don't have libm, or don't need it
-  ;;
-*-ncr-sysv4.3*)
-  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
-  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
-  ;;
-*)
-  AC_CHECK_LIB(m, cos, LIBM="-lm")
-  ;;
-esac
-AC_SUBST([LIBM])
-])# LT_LIB_M
-
-# Old name:
-AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_CHECK_LIBM], [])
-
-
-# _LT_COMPILER_NO_RTTI([TAGNAME])
-# -------------------------------
-m4_defun([_LT_COMPILER_NO_RTTI],
-[m4_require([_LT_TAG_COMPILER])dnl
-
-_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-
-if test "$GCC" = yes; then
-  case $cc_basename in
-  nvcc*)
-    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
-  *)
-    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
-  esac
-
-  _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
-    lt_cv_prog_compiler_rtti_exceptions,
-    [-fno-rtti -fno-exceptions], [],
-    [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
-fi
-_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
-	[Compiler flag to turn off builtin functions])
-])# _LT_COMPILER_NO_RTTI
-
-
-# _LT_CMD_GLOBAL_SYMBOLS
-# ----------------------
-m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-AC_REQUIRE([LT_PATH_LD])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_TAG_COMPILER])dnl
-
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-AC_MSG_CHECKING([command to parse $NM output from $compiler object])
-AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
-[
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-
-# Character class describing NM global symbol codes.
-symcode='[[BCDEGRST]]'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
-
-# Define system-specific variables.
-case $host_os in
-aix*)
-  symcode='[[BCDT]]'
-  ;;
-cygwin* | mingw* | pw32* | cegcc*)
-  symcode='[[ABCDGISTW]]'
-  ;;
-hpux*)
-  if test "$host_cpu" = ia64; then
-    symcode='[[ABCDEGRST]]'
-  fi
-  ;;
-irix* | nonstopux*)
-  symcode='[[BCDEGRST]]'
-  ;;
-osf*)
-  symcode='[[BCDEGQRST]]'
-  ;;
-solaris*)
-  symcode='[[BDRT]]'
-  ;;
-sco3.2v5*)
-  symcode='[[DT]]'
-  ;;
-sysv4.2uw2*)
-  symcode='[[DT]]'
-  ;;
-sysv5* | sco5v6* | unixware* | OpenUNIX*)
-  symcode='[[ABDT]]'
-  ;;
-sysv4)
-  symcode='[[DFNSTU]]'
-  ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
-  symcode='[[ABCDGIRSTW]]' ;;
-esac
-
-# Transform an extracted symbol line into a proper C declaration.
-# Some systems (esp. on ia64) link data and code symbols differently,
-# so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
-
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
-  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-  ;;
-esac
-
-# Try without a prefix underscore, then with it.
-for ac_symprfx in "" "_"; do
-
-  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-  symxfrm="\\1 $ac_symprfx\\2 \\2"
-
-  # Write the raw and C identifiers.
-  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-    # Fake it for dumpbin and say T for any non-static function
-    # and D for any global variable.
-    # Also find C++ and __fastcall symbols from MSVC++,
-    # which start with @ or ?.
-    lt_cv_sys_global_symbol_pipe="$AWK ['"\
-"     {last_section=section; section=\$ 3};"\
-"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
-"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
-"     \$ 0!~/External *\|/{next};"\
-"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
-"     {if(hide[section]) next};"\
-"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
-"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
-"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
-"     ' prfx=^$ac_symprfx]"
-  else
-    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[	 ]]\($symcode$symcode*\)[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-  fi
-  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
-
-  # Check to see that the pipe works correctly.
-  pipe_works=no
-
-  rm -f conftest*
-  cat > conftest.$ac_ext <<_LT_EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(void);
-void nm_test_func(void){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-_LT_EOF
-
-  if AC_TRY_EVAL(ac_compile); then
-    # Now try to grab the symbols.
-    nlist=conftest.nm
-    if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
-      # Try sorting and uniquifying the output.
-      if sort "$nlist" | uniq > "$nlist"T; then
-	mv -f "$nlist"T "$nlist"
-      else
-	rm -f "$nlist"T
-      fi
-
-      # Make sure that we snagged all the symbols we need.
-      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
-	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
-	  cat <<_LT_EOF > conftest.$ac_ext
-/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-/* DATA imports from DLLs on WIN32 con't be const, because runtime
-   relocations are performed -- see ld's documentation on pseudo-relocs.  */
-# define LT@&t@_DLSYM_CONST
-#elif defined(__osf__)
-/* This system does not cope well with relocations in const data.  */
-# define LT@&t@_DLSYM_CONST
-#else
-# define LT@&t@_DLSYM_CONST const
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-_LT_EOF
-	  # Now generate the symbol file.
-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
-
-	  cat <<_LT_EOF >> conftest.$ac_ext
-
-/* The mapping between symbol names and symbols.  */
-LT@&t@_DLSYM_CONST struct {
-  const char *name;
-  void       *address;
-}
-lt__PROGRAM__LTX_preloaded_symbols[[]] =
-{
-  { "@PROGRAM@", (void *) 0 },
-_LT_EOF
-	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
-	  cat <<\_LT_EOF >> conftest.$ac_ext
-  {0, (void *) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt__PROGRAM__LTX_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-_LT_EOF
-	  # Now try linking the two files.
-	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_globsym_save_LIBS=$LIBS
-	  lt_globsym_save_CFLAGS=$CFLAGS
-	  LIBS="conftstm.$ac_objext"
-	  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
-	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
-	    pipe_works=yes
-	  fi
-	  LIBS=$lt_globsym_save_LIBS
-	  CFLAGS=$lt_globsym_save_CFLAGS
-	else
-	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
-	fi
-      else
-	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
-      fi
-    else
-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
-    fi
-  else
-    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
-    cat conftest.$ac_ext >&5
-  fi
-  rm -rf conftest* conftst*
-
-  # Do not use the global_symbol_pipe unless it works.
-  if test "$pipe_works" = yes; then
-    break
-  else
-    lt_cv_sys_global_symbol_pipe=
-  fi
-done
-])
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
-  lt_cv_sys_global_symbol_to_cdecl=
-fi
-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  AC_MSG_RESULT(failed)
-else
-  AC_MSG_RESULT(ok)
-fi
-
-# Response file support.
-if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-  nm_file_list_spec='@'
-elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
-  nm_file_list_spec='@'
-fi
-
-_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
-    [Take the output of nm and produce a listing of raw symbols and C names])
-_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
-    [Transform the output of nm in a proper C declaration])
-_LT_DECL([global_symbol_to_c_name_address],
-    [lt_cv_sys_global_symbol_to_c_name_address], [1],
-    [Transform the output of nm in a C name address pair])
-_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
-    [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
-    [Transform the output of nm in a C name address pair when lib prefix is needed])
-_LT_DECL([], [nm_file_list_spec], [1],
-    [Specify filename containing input files for $NM])
-]) # _LT_CMD_GLOBAL_SYMBOLS
-
-
-# _LT_COMPILER_PIC([TAGNAME])
-# ---------------------------
-m4_defun([_LT_COMPILER_PIC],
-[m4_require([_LT_TAG_COMPILER])dnl
-_LT_TAGVAR(lt_prog_compiler_wl, $1)=
-_LT_TAGVAR(lt_prog_compiler_pic, $1)=
-_LT_TAGVAR(lt_prog_compiler_static, $1)=
-
-m4_if([$1], [CXX], [
-  # C++ specific cases for pic, static, wl, etc.
-  if test "$GXX" = yes; then
-    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
-    case $host_os in
-    aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-        ;;
-      m68k)
-            # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the `-m68020' flag to GCC prevents building anything better,
-            # like `-m68040'.
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-        ;;
-      esac
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-    mingw* | cygwin* | os2* | pw32* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      m4_if([$1], [GCJ], [],
-	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-      ;;
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-      ;;
-    *djgpp*)
-      # DJGPP does not support shared libraries at all
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-      ;;
-    haiku*)
-      # PIC is the default for Haiku.
-      # The "-static" flag exists, but is broken.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)=
-      ;;
-    interix[[3-9]]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-      fi
-      ;;
-    hpux*)
-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-      # sets the default TLS model and affects inlining.
-      case $host_cpu in
-      hppa*64*)
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	;;
-      esac
-      ;;
-    *qnx* | *nto*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-      ;;
-    *)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-    esac
-  else
-    case $host_os in
-      aix[[4-9]]*)
-	# All AIX code is PIC.
-	if test "$host_cpu" = ia64; then
-	  # AIX 5 now supports IA64 processor
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	else
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-	fi
-	;;
-      chorus*)
-	case $cc_basename in
-	cxch68*)
-	  # Green Hills C++ Compiler
-	  # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
-	  ;;
-	esac
-	;;
-      mingw* | cygwin* | os2* | pw32* | cegcc*)
-	# This hack is so that the source file can tell whether it is being
-	# built for inclusion in a dll (and should export symbols for example).
-	m4_if([$1], [GCJ], [],
-	  [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-	;;
-      dgux*)
-	case $cc_basename in
-	  ec++*)
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    ;;
-	  ghcx*)
-	    # Green Hills C++ Compiler
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      freebsd* | dragonfly*)
-	# FreeBSD uses GNU C++
-	;;
-      hpux9* | hpux10* | hpux11*)
-	case $cc_basename in
-	  CC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-	    if test "$host_cpu" != ia64; then
-	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	    fi
-	    ;;
-	  aCC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-	    case $host_cpu in
-	    hppa*64*|ia64*)
-	      # +Z the default
-	      ;;
-	    *)
-	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	      ;;
-	    esac
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      interix*)
-	# This is c89, which is MS Visual C++ (no shared libs)
-	# Anyone wants to do a port?
-	;;
-      irix5* | irix6* | nonstopux*)
-	case $cc_basename in
-	  CC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    # CC pic flag -KPIC is the default.
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
-	case $cc_basename in
-	  KCC*)
-	    # KAI C++ Compiler
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	    ;;
-	  ecpc* )
-	    # old Intel C++ for x86_64 which still supported -KPIC.
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	    ;;
-	  icpc* )
-	    # Intel C++, used to be incompatible with GCC.
-	    # ICC 10 doesn't accept -KPIC any more.
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	    ;;
-	  pgCC* | pgcpp*)
-	    # Portland Group C++ compiler
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	  cxx*)
-	    # Compaq C++
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    ;;
-	  xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
-	    # IBM XL 8.0, 9.0 on PPC and BlueGene
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
-	    ;;
-	  *)
-	    case `$CC -V 2>&1 | sed 5q` in
-	    *Sun\ C*)
-	      # Sun C++ 5.9
-	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-	      ;;
-	    esac
-	    ;;
-	esac
-	;;
-      lynxos*)
-	;;
-      m88k*)
-	;;
-      mvs*)
-	case $cc_basename in
-	  cxx*)
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      netbsd*)
-	;;
-      *qnx* | *nto*)
-        # QNX uses GNU C++, but need to define -shared option too, otherwise
-        # it will coredump.
-        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-        ;;
-      osf3* | osf4* | osf5*)
-	case $cc_basename in
-	  KCC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-	    ;;
-	  RCC*)
-	    # Rational C++ 2.4.1
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  cxx*)
-	    # Digital/Compaq C++
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      psos*)
-	;;
-      solaris*)
-	case $cc_basename in
-	  CC* | sunCC*)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-	    ;;
-	  gcx*)
-	    # Green Hills C++ Compiler
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sunos4*)
-	case $cc_basename in
-	  CC*)
-	    # Sun C++ 4.x
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	  lcc*)
-	    # Lucid
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-	case $cc_basename in
-	  CC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	esac
-	;;
-      tandem*)
-	case $cc_basename in
-	  NCC*)
-	    # NonStop-UX NCC 3.20
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      vxworks*)
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-	;;
-    esac
-  fi
-],
-[
-  if test "$GCC" = yes; then
-    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-        ;;
-      m68k)
-            # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the `-m68020' flag to GCC prevents building anything better,
-            # like `-m68040'.
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-        ;;
-      esac
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      m4_if([$1], [GCJ], [],
-	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-      ;;
-
-    haiku*)
-      # PIC is the default for Haiku.
-      # The "-static" flag exists, but is broken.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)=
-      ;;
-
-    hpux*)
-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-      # sets the default TLS model and affects inlining.
-      case $host_cpu in
-      hppa*64*)
-	# +Z the default
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	;;
-      esac
-      ;;
-
-    interix[[3-9]]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      enable_shared=no
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-      fi
-      ;;
-
-    *)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-    esac
-
-    case $cc_basename in
-    nvcc*) # Cuda Compiler Driver 2.2
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
-      if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
-        _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
-      fi
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      else
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      m4_if([$1], [GCJ], [],
-	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # PIC (with -KPIC) is the default.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
-      case $cc_basename in
-      # old Intel for x86_64 which still supported -KPIC.
-      ecc*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-        ;;
-      # icc used to be incompatible with GCC.
-      # ICC 10 doesn't accept -KPIC any more.
-      icc* | ifort*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-        ;;
-      # Lahey Fortran 8.1.
-      lf95*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
-	;;
-      nagfor*)
-	# NAG Fortran compiler
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	;;
-      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-	# which looks to be a dead project)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-        ;;
-      ccc*)
-        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-        # All Alpha code is PIC.
-        _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-        ;;
-      xl* | bgxl* | bgf* | mpixl*)
-	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
-	;;
-      *)
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
-	  ;;
-	*Sun\ F* | *Sun*Fortran*)
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-	  ;;
-	*Sun\ C*)
-	  # Sun C 5.9
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	  ;;
-        *Intel*\ [[CF]]*Compiler*)
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	  ;;
-	*Portland\ Group*)
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  ;;
-	esac
-	;;
-      esac
-      ;;
-
-    newsos6)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-      ;;
-
-    osf3* | osf4* | osf5*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # All OSF/1 code is PIC.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    rdos*)
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    solaris*)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
-      esac
-      ;;
-
-    sunos4*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    unicos*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      ;;
-
-    uts4*)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    *)
-      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      ;;
-    esac
-  fi
-])
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-    ;;
-  *)
-    _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
-    ;;
-esac
-
-AC_CACHE_CHECK([for $compiler option to produce PIC],
-  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
-  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
-_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
-  _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works],
-    [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)],
-    [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [],
-    [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in
-     "" | " "*) ;;
-     *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;;
-     esac],
-    [_LT_TAGVAR(lt_prog_compiler_pic, $1)=
-     _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
-fi
-_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
-	[Additional compiler flags for building library objects])
-
-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
-	[How to pass a linker flag through the compiler])
-#
-# Check to make sure the static flag actually works.
-#
-wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"
-_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
-  _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1),
-  $lt_tmp_static_flag,
-  [],
-  [_LT_TAGVAR(lt_prog_compiler_static, $1)=])
-_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
-	[Compiler flag to prevent dynamic linking])
-])# _LT_COMPILER_PIC
-
-
-# _LT_LINKER_SHLIBS([TAGNAME])
-# ----------------------------
-# See if the linker supports building shared libraries.
-m4_defun([_LT_LINKER_SHLIBS],
-[AC_REQUIRE([LT_PATH_LD])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-m4_require([_LT_PATH_MANIFEST_TOOL])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-m4_require([_LT_TAG_COMPILER])dnl
-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-m4_if([$1], [CXX], [
-  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
-  case $host_os in
-  aix[[4-9]]*)
-    # If we're using GNU nm, then we don't want the "-C" option.
-    # -C means demangle to AIX nm, but means don't demangle with GNU nm
-    # Also, AIX nm treats weak defined symbols like other global defined
-    # symbols, whereas GNU nm marks them as "W".
-    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-    else
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-    fi
-    ;;
-  pw32*)
-    _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
-    ;;
-  cygwin* | mingw* | cegcc*)
-    case $cc_basename in
-    cl*)
-      _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
-      ;;
-    *)
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
-      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
-      ;;
-    esac
-    ;;
-  *)
-    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-    ;;
-  esac
-], [
-  runpath_var=
-  _LT_TAGVAR(allow_undefined_flag, $1)=
-  _LT_TAGVAR(always_export_symbols, $1)=no
-  _LT_TAGVAR(archive_cmds, $1)=
-  _LT_TAGVAR(archive_expsym_cmds, $1)=
-  _LT_TAGVAR(compiler_needs_object, $1)=no
-  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-  _LT_TAGVAR(export_dynamic_flag_spec, $1)=
-  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  _LT_TAGVAR(hardcode_automatic, $1)=no
-  _LT_TAGVAR(hardcode_direct, $1)=no
-  _LT_TAGVAR(hardcode_direct_absolute, $1)=no
-  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-  _LT_TAGVAR(hardcode_libdir_separator, $1)=
-  _LT_TAGVAR(hardcode_minus_L, $1)=no
-  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-  _LT_TAGVAR(inherit_rpath, $1)=no
-  _LT_TAGVAR(link_all_deplibs, $1)=unknown
-  _LT_TAGVAR(module_cmds, $1)=
-  _LT_TAGVAR(module_expsym_cmds, $1)=
-  _LT_TAGVAR(old_archive_from_new_cmds, $1)=
-  _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)=
-  _LT_TAGVAR(thread_safe_flag_spec, $1)=
-  _LT_TAGVAR(whole_archive_flag_spec, $1)=
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  _LT_TAGVAR(include_expsyms, $1)=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
-  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  # Exclude shared library initialization/finalization symbols.
-dnl Note also adjust exclude_expsyms for C++ above.
-  extract_expsyms_cmds=
-
-  case $host_os in
-  cygwin* | mingw* | pw32* | cegcc*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++)
-    with_gnu_ld=yes
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-  esac
-
-  _LT_TAGVAR(ld_shlibs, $1)=yes
-
-  # On some targets, GNU ld is compatible enough with the native linker
-  # that we're better off using the native interface for both.
-  lt_use_gnu_ld_interface=no
-  if test "$with_gnu_ld" = yes; then
-    case $host_os in
-      aix*)
-	# The AIX port of GNU ld has always aspired to compatibility
-	# with the native linker.  However, as the warning in the GNU ld
-	# block says, versions before 2.19.5* couldn't really create working
-	# shared libraries, regardless of the interface used.
-	case `$LD -v 2>&1` in
-	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
-	  *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;;
-	  *\ \(GNU\ Binutils\)\ [[3-9]]*) ;;
-	  *)
-	    lt_use_gnu_ld_interface=yes
-	    ;;
-	esac
-	;;
-      *)
-	lt_use_gnu_ld_interface=yes
-	;;
-    esac
-  fi
-
-  if test "$lt_use_gnu_ld_interface" = yes; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
-
-    # Set some defaults for GNU ld with shared library support. These
-    # are reset later if shared libraries are not supported. Putting them
-    # here allows them to be overridden if necessary.
-    runpath_var=LD_RUN_PATH
-    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
-      _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-    else
-      _LT_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-    supports_anon_versioning=no
-    case `$LD -v 2>&1` in
-      *GNU\ gold*) supports_anon_versioning=yes ;;
-      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-      *\ 2.11.*) ;; # other 2.11 versions
-      *) supports_anon_versioning=yes ;;
-    esac
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix[[3-9]]*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.19, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to install binutils
-*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
-*** You will then need to restart the configuration process.
-
-_LT_EOF
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-            _LT_TAGVAR(archive_expsym_cmds, $1)=''
-        ;;
-      m68k)
-            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-            _LT_TAGVAR(hardcode_minus_L, $1)=yes
-        ;;
-      esac
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	# Joseph Beckenbach  says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-      # as there is no search path for DLLs.
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_TAGVAR(always_export_symbols, $1)=no
-      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
-      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
-
-      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname.def;
-	else
-	  echo EXPORTS > $output_objdir/$soname.def;
-	  cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    haiku*)
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    interix[[3-9]]*)
-      _LT_TAGVAR(hardcode_direct, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-      # Instead, shared libraries are loaded at an image base (0x10000000 by
-      # default) and relocated if they conflict, which is a slow very memory
-      # consuming and fragmenting process.  To avoid this, we pick a random,
-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      ;;
-
-    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
-      tmp_diet=no
-      if test "$host_os" = linux-dietlibc; then
-	case $cc_basename in
-	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
-	esac
-      fi
-      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-	 && test "$tmp_diet" = no
-      then
-	tmp_addflag=' $pic_flag'
-	tmp_sharedflag='-shared'
-	case $cc_basename,$host_cpu in
-        pgcc*)				# Portland Group C compiler
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag'
-	  ;;
-	pgf77* | pgf90* | pgf95* | pgfortran*)
-					# Portland Group f77 and f90 compilers
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag -Mnomain' ;;
-	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
-	  tmp_addflag=' -i_dynamic' ;;
-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
-	  tmp_addflag=' -nofor_main' ;;
-	lf95*)				# Lahey Fortran 8.1
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)=
-	  tmp_sharedflag='--shared' ;;
-	xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
-	  tmp_sharedflag='-qmkshrobj'
-	  tmp_addflag= ;;
-	nvcc*)	# Cuda Compiler Driver 2.2
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  _LT_TAGVAR(compiler_needs_object, $1)=yes
-	  ;;
-	esac
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)			# Sun C 5.9
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  _LT_TAGVAR(compiler_needs_object, $1)=yes
-	  tmp_sharedflag='-G' ;;
-	*Sun\ F*)			# Sun Fortran 8.3
-	  tmp_sharedflag='-G' ;;
-	esac
-	_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
-        if test "x$supports_anon_versioning" = xyes; then
-          _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-	    echo "local: *; };" >> $output_objdir/$libname.ver~
-	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-        fi
-
-	case $cc_basename in
-	xlf* | bgf* | bgxlf* | mpixlf*)
-	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
-	  if test "x$supports_anon_versioning" = xyes; then
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-	      echo "local: *; };" >> $output_objdir/$libname.ver~
-	      $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
-	  fi
-	  ;;
-	esac
-      else
-        _LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris*)
-      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-*** reliably create shared libraries on SCO systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-	;;
-	*)
-	  # For security reasons, it is highly recommended that you always
-	  # use absolute paths for naming shared libraries, and exclude the
-	  # DT_RUNPATH tag from executables and libraries.  But doing so
-	  # requires that you compile everything twice, which is a pain.
-	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	  else
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	  fi
-	;;
-      esac
-      ;;
-
-    sunos4*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-    esac
-
-    if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
-      runpath_var=
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)=
-      _LT_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_TAGVAR(always_export_symbols, $1)=yes
-      _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	_LT_TAGVAR(hardcode_direct, $1)=unsupported
-      fi
-      ;;
-
-    aix[[4-9]]*)
-      if test "$host_cpu" = ia64; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=""
-      else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	# Also, AIX nm treats weak defined symbols like other global
-	# defined symbols, whereas GNU nm marks them as "W".
-	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-	else
-	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
-
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
-	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
-	  for ld_flag in $LDFLAGS; do
-	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-	    aix_use_runtimelinking=yes
-	    break
-	  fi
-	  done
-	  ;;
-	esac
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      _LT_TAGVAR(archive_cmds, $1)=''
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
-
-      if test "$GCC" = yes; then
-	case $host_os in aix4.[[012]]|aix4.[[012]].*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" &&
-	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-	  then
-	  # We have reworked collect2
-	  :
-	  else
-	  # We have old collect2
-	  _LT_TAGVAR(hardcode_direct, $1)=unsupported
-	  # It fails to find uninstalled libraries when the uninstalled
-	  # path is not listed in the libpath.  Setting hardcode_minus_L
-	  # to unsupported forces relinking
-	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	  _LT_TAGVAR(hardcode_libdir_separator, $1)=
-	  fi
-	  ;;
-	esac
-	shared_flag='-shared'
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag="$shared_flag "'${wl}-G'
-	fi
-      else
-	# not using gcc
-	if test "$host_cpu" = ia64; then
-	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	# chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-	else
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='${wl}-G'
-	  else
-	    shared_flag='${wl}-bM:SRE'
-	  fi
-	fi
-      fi
-
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      _LT_TAGVAR(always_export_symbols, $1)=yes
-      if test "$aix_use_runtimelinking" = yes; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
-        # Determine the default libpath from the value encoded in an
-        # empty executable.
-        _LT_SYS_MODULE_PATH_AIX([$1])
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-      else
-	if test "$host_cpu" = ia64; then
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-	  _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an
-	 # empty executable.
-	 _LT_SYS_MODULE_PATH_AIX([$1])
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	  # Warning - without using the other run time loading flags,
-	  # -berok will link without error, but may produce a broken library.
-	  _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-	  _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	  if test "$with_gnu_ld" = yes; then
-	    # We only use this code for GNU lds that support --whole-archive.
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	  else
-	    # Exported symbols can be pulled into shared objects from archives
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-	  fi
-	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
-	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-	fi
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-            _LT_TAGVAR(archive_expsym_cmds, $1)=''
-        ;;
-      m68k)
-            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-            _LT_TAGVAR(hardcode_minus_L, $1)=yes
-        ;;
-      esac
-      ;;
-
-    bsdi[[45]]*)
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      case $cc_basename in
-      cl*)
-	# Native MSVC
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	_LT_TAGVAR(always_export_symbols, $1)=yes
-	_LT_TAGVAR(file_list_spec, $1)='@'
-	# Tell ltmain to make .lib files, not .a files.
-	libext=lib
-	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=".dll"
-	# FIXME: Setting linknames here is a bad hack.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	    sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
-	  else
-	    sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
-	  fi~
-	  $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-	  linknames='
-	# The linker will not automatically build a static lib if we build a DLL.
-	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-	_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
-	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
-	# Don't use ranlib
-	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
-	_LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
-	  lt_tool_outputfile="@TOOL_OUTPUT@"~
-	  case $lt_outputfile in
-	    *.exe|*.EXE) ;;
-	    *)
-	      lt_outputfile="$lt_outputfile.exe"
-	      lt_tool_outputfile="$lt_tool_outputfile.exe"
-	      ;;
-	  esac~
-	  if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
-	    $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-	    $RM "$lt_outputfile.manifest";
-	  fi'
-	;;
-      *)
-	# Assume MSVC wrapper
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	# Tell ltmain to make .lib files, not .a files.
-	libext=lib
-	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=".dll"
-	# FIXME: Setting linknames here is a bad hack.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
-	# The linker will automatically build a .lib file if we build a DLL.
-	_LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-	# FIXME: Should let the user specify the lib program.
-	_LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
-	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-	;;
-      esac
-      ;;
-
-    darwin* | rhapsody*)
-      _LT_DARWIN_LINKER_FEATURES($1)
-      ;;
-
-    dgux*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2.*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    hpux9*)
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
-	_LT_TAGVAR(hardcode_direct, $1)=yes
-	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	_LT_TAGVAR(hardcode_minus_L, $1)=yes
-      fi
-      ;;
-
-    hpux11*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	case $host_cpu in
-	hppa*64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case $host_cpu in
-	hppa*64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	m4_if($1, [], [
-	  # Older versions of the 11.00 compiler do not understand -b yet
-	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
-	  _LT_LINKER_OPTION([if $CC understands -b],
-	    _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
-	    [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
-	    [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
-	  [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
-	  ;;
-	esac
-      fi
-      if test "$with_gnu_ld" = no; then
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  _LT_TAGVAR(hardcode_direct, $1)=no
-	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	  ;;
-	*)
-	  _LT_TAGVAR(hardcode_direct, $1)=yes
-	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	# Try to use the -exported_symbol ld option, if it does not
-	# work, assume that -exports_file does not work either and
-	# implicitly export all symbols.
-	# This should be the same for all languages, so no per-tag cache variable.
-	AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
-	  [lt_cv_irix_exported_symbol],
-	  [save_LDFLAGS="$LDFLAGS"
-	   LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-	   AC_LINK_IFELSE(
-	     [AC_LANG_SOURCE(
-	        [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
-			      [C++], [[int foo (void) { return 0; }]],
-			      [Fortran 77], [[
-      subroutine foo
-      end]],
-			      [Fortran], [[
-      subroutine foo
-      end]])])],
-	      [lt_cv_irix_exported_symbol=yes],
-	      [lt_cv_irix_exported_symbol=no])
-           LDFLAGS="$save_LDFLAGS"])
-	if test "$lt_cv_irix_exported_symbol" = yes; then
-          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-	fi
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
-      fi
-      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_TAGVAR(inherit_rpath, $1)=yes
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    newsos6)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *nto* | *qnx*)
-      ;;
-
-    openbsd*)
-      if test -f /usr/libexec/ld.so; then
-	_LT_TAGVAR(hardcode_direct, $1)=yes
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	else
-	  case $host_os in
-	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-	     _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	     ;;
-	   *)
-	     _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	     ;;
-	  esac
-	fi
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    os2*)
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
-
-    osf3*)
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      else
-	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
-
-	# Both c and cxx compiler support -rpath directly
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-      fi
-      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      ;;
-
-    solaris*)
-      _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
-      if test "$GCC" = yes; then
-	wlarc='${wl}'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-      else
-	case `$CC -V 2>&1` in
-	*"Compilers 5.0"*)
-	  wlarc=''
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
-	  ;;
-	*)
-	  wlarc='${wl}'
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-	  ;;
-	esac
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      case $host_os in
-      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-      *)
-	# The compiler driver will combine and reorder linker options,
-	# but understands `-z linker_flag'.  GCC discards it without `$wl',
-	# but is careful enough not to reorder.
-	# Supported since Solaris 2.6 (maybe 2.5.1?)
-	if test "$GCC" = yes; then
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-	else
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-	fi
-	;;
-      esac
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    sunos4*)
-      if test "x$host_vendor" = xsequent; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
-	  _LT_TAGVAR(hardcode_direct, $1)=no
-        ;;
-	motorola)
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    sysv4.3*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	_LT_TAGVAR(ld_shlibs, $1)=yes
-      fi
-      ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6*)
-      # Note: We can NOT use -z defs as we might desire, because we do not
-      # link with -lc, and that would cause any symbols used from libc to
-      # always be unresolved, which means just about no library would
-      # ever link correctly.  If we're not using GNU ld we use -z text
-      # though, which does catch some bad symbols but isn't as heavy-handed
-      # as -z defs.
-      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    uts4*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *)
-      _LT_TAGVAR(ld_shlibs, $1)=no
-      ;;
-    esac
-
-    if test x$host_vendor = xsni; then
-      case $host in
-      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
-	;;
-      esac
-    fi
-  fi
-])
-AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
-
-_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl
-_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl
-_LT_DECL([], [extract_expsyms_cmds], [2],
-    [The commands to extract the exported symbol list from a shared archive])
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in
-x|xyes)
-  # Assume -lc should be added
-  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $_LT_TAGVAR(archive_cmds, $1) in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      AC_CACHE_CHECK([whether -lc should be explicitly linked in],
-	[lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
-	[$RM conftest*
-	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-	if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
-	  soname=conftest
-	  lib=conftest
-	  libobjs=conftest.$ac_objext
-	  deplibs=
-	  wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
-	  pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
-	  compiler_flags=-v
-	  linker_flags=-v
-	  verstring=
-	  output_objdir=.
-	  libname=conftest
-	  lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
-	  _LT_TAGVAR(allow_undefined_flag, $1)=
-	  if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
-	  then
-	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-	  else
-	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-	  fi
-	  _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
-	else
-	  cat conftest.err 1>&5
-	fi
-	$RM conftest*
-	])
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0],
-    [Whether or not to add -lc for building shared libraries])
-_LT_TAGDECL([allow_libtool_libs_with_static_runtimes],
-    [enable_shared_with_static_runtimes], [0],
-    [Whether or not to disallow shared libs when runtime libs are static])
-_LT_TAGDECL([], [export_dynamic_flag_spec], [1],
-    [Compiler flag to allow reflexive dlopens])
-_LT_TAGDECL([], [whole_archive_flag_spec], [1],
-    [Compiler flag to generate shared objects directly from archives])
-_LT_TAGDECL([], [compiler_needs_object], [1],
-    [Whether the compiler copes with passing no objects directly])
-_LT_TAGDECL([], [old_archive_from_new_cmds], [2],
-    [Create an old-style archive from a shared archive])
-_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2],
-    [Create a temporary old-style archive to link instead of a shared archive])
-_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive])
-_LT_TAGDECL([], [archive_expsym_cmds], [2])
-_LT_TAGDECL([], [module_cmds], [2],
-    [Commands used to build a loadable module if different from building
-    a shared archive.])
-_LT_TAGDECL([], [module_expsym_cmds], [2])
-_LT_TAGDECL([], [with_gnu_ld], [1],
-    [Whether we are building with GNU ld or not])
-_LT_TAGDECL([], [allow_undefined_flag], [1],
-    [Flag that allows shared libraries with undefined symbols to be built])
-_LT_TAGDECL([], [no_undefined_flag], [1],
-    [Flag that enforces no undefined symbols])
-_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
-    [Flag to hardcode $libdir into a binary during linking.
-    This must work even if $libdir does not exist])
-_LT_TAGDECL([], [hardcode_libdir_separator], [1],
-    [Whether we need a single "-rpath" flag with a separated argument])
-_LT_TAGDECL([], [hardcode_direct], [0],
-    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
-    DIR into the resulting binary])
-_LT_TAGDECL([], [hardcode_direct_absolute], [0],
-    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
-    DIR into the resulting binary and the resulting library dependency is
-    "absolute", i.e impossible to change by setting ${shlibpath_var} if the
-    library is relocated])
-_LT_TAGDECL([], [hardcode_minus_L], [0],
-    [Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-    into the resulting binary])
-_LT_TAGDECL([], [hardcode_shlibpath_var], [0],
-    [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-    into the resulting binary])
-_LT_TAGDECL([], [hardcode_automatic], [0],
-    [Set to "yes" if building a shared library automatically hardcodes DIR
-    into the library and all subsequent libraries and executables linked
-    against it])
-_LT_TAGDECL([], [inherit_rpath], [0],
-    [Set to yes if linker adds runtime paths of dependent libraries
-    to runtime path list])
-_LT_TAGDECL([], [link_all_deplibs], [0],
-    [Whether libtool must link a program against all its dependency libraries])
-_LT_TAGDECL([], [always_export_symbols], [0],
-    [Set to "yes" if exported symbols are required])
-_LT_TAGDECL([], [export_symbols_cmds], [2],
-    [The commands to list exported symbols])
-_LT_TAGDECL([], [exclude_expsyms], [1],
-    [Symbols that should not be listed in the preloaded symbols])
-_LT_TAGDECL([], [include_expsyms], [1],
-    [Symbols that must always be exported])
-_LT_TAGDECL([], [prelink_cmds], [2],
-    [Commands necessary for linking programs (against libraries) with templates])
-_LT_TAGDECL([], [postlink_cmds], [2],
-    [Commands necessary for finishing linking programs])
-_LT_TAGDECL([], [file_list_spec], [1],
-    [Specify filename containing input files])
-dnl FIXME: Not yet implemented
-dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1],
-dnl    [Compiler flag to generate thread safe objects])
-])# _LT_LINKER_SHLIBS
-
-
-# _LT_LANG_C_CONFIG([TAG])
-# ------------------------
-# Ensure that the configuration variables for a C compiler are suitably
-# defined.  These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_C_CONFIG],
-[m4_require([_LT_DECL_EGREP])dnl
-lt_save_CC="$CC"
-AC_LANG_PUSH(C)
-
-# Source file extension for C test sources.
-ac_ext=c
-
-# Object file extension for compiled C test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}'
-
-_LT_TAG_COMPILER
-# Save the default compiler, since it gets overwritten when the other
-# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
-compiler_DEFAULT=$CC
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-if test -n "$compiler"; then
-  _LT_COMPILER_NO_RTTI($1)
-  _LT_COMPILER_PIC($1)
-  _LT_COMPILER_C_O($1)
-  _LT_COMPILER_FILE_LOCKS($1)
-  _LT_LINKER_SHLIBS($1)
-  _LT_SYS_DYNAMIC_LINKER($1)
-  _LT_LINKER_HARDCODE_LIBPATH($1)
-  LT_SYS_DLOPEN_SELF
-  _LT_CMD_STRIPLIB
-
-  # Report which library types will actually be built
-  AC_MSG_CHECKING([if libtool supports shared libraries])
-  AC_MSG_RESULT([$can_build_shared])
-
-  AC_MSG_CHECKING([whether to build shared libraries])
-  test "$can_build_shared" = "no" && enable_shared=no
-
-  # On AIX, shared libraries and static libraries use the same namespace, and
-  # are all built from PIC.
-  case $host_os in
-  aix3*)
-    test "$enable_shared" = yes && enable_static=no
-    if test -n "$RANLIB"; then
-      archive_cmds="$archive_cmds~\$RANLIB \$lib"
-      postinstall_cmds='$RANLIB $lib'
-    fi
-    ;;
-
-  aix[[4-9]]*)
-    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-      test "$enable_shared" = yes && enable_static=no
-    fi
-    ;;
-  esac
-  AC_MSG_RESULT([$enable_shared])
-
-  AC_MSG_CHECKING([whether to build static libraries])
-  # Make sure either enable_shared or enable_static is yes.
-  test "$enable_shared" = yes || enable_static=yes
-  AC_MSG_RESULT([$enable_static])
-
-  _LT_CONFIG($1)
-fi
-AC_LANG_POP
-CC="$lt_save_CC"
-])# _LT_LANG_C_CONFIG
-
-
-# _LT_LANG_CXX_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for a C++ compiler are suitably
-# defined.  These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_CXX_CONFIG],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_PATH_MANIFEST_TOOL])dnl
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-    (test "X$CXX" != "Xg++"))) ; then
-  AC_PROG_CXXCPP
-else
-  _lt_caught_CXX_error=yes
-fi
-
-AC_LANG_PUSH(C++)
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(compiler_needs_object, $1)=no
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for C++ test sources.
-ac_ext=cpp
-
-# Object file extension for compiled C++ test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the CXX compiler isn't working.  Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_caught_CXX_error" != yes; then
-  # Code to be used in simple compile tests
-  lt_simple_compile_test_code="int some_variable = 0;"
-
-  # Code to be used in simple link tests
-  lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
-
-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-  _LT_TAG_COMPILER
-
-  # save warnings/boilerplate of simple test code
-  _LT_COMPILER_BOILERPLATE
-  _LT_LINKER_BOILERPLATE
-
-  # Allow CC to be a program name with arguments.
-  lt_save_CC=$CC
-  lt_save_CFLAGS=$CFLAGS
-  lt_save_LD=$LD
-  lt_save_GCC=$GCC
-  GCC=$GXX
-  lt_save_with_gnu_ld=$with_gnu_ld
-  lt_save_path_LD=$lt_cv_path_LD
-  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
-    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
-  else
-    $as_unset lt_cv_prog_gnu_ld
-  fi
-  if test -n "${lt_cv_path_LDCXX+set}"; then
-    lt_cv_path_LD=$lt_cv_path_LDCXX
-  else
-    $as_unset lt_cv_path_LD
-  fi
-  test -z "${LDCXX+set}" || LD=$LDCXX
-  CC=${CXX-"c++"}
-  CFLAGS=$CXXFLAGS
-  compiler=$CC
-  _LT_TAGVAR(compiler, $1)=$CC
-  _LT_CC_BASENAME([$compiler])
-
-  if test -n "$compiler"; then
-    # We don't want -fno-exception when compiling C++ code, so set the
-    # no_builtin_flag separately
-    if test "$GXX" = yes; then
-      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-    else
-      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-    fi
-
-    if test "$GXX" = yes; then
-      # Set up default GNU C++ configuration
-
-      LT_PATH_LD
-
-      # Check if GNU C++ uses GNU ld as the underlying linker, since the
-      # archiving commands below assume that GNU ld is being used.
-      if test "$with_gnu_ld" = yes; then
-        _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
-        # If archive_cmds runs LD, not CC, wlarc should be empty
-        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
-        #     investigate it a little bit more. (MM)
-        wlarc='${wl}'
-
-        # ancient GNU ld didn't support --whole-archive et. al.
-        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
-	  $GREP 'no-whole-archive' > /dev/null; then
-          _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-        else
-          _LT_TAGVAR(whole_archive_flag_spec, $1)=
-        fi
-      else
-        with_gnu_ld=no
-        wlarc=
-
-        # A generic and very simple default shared library creation
-        # command for GNU C++ for the case where it uses the native
-        # linker, instead of GNU ld.  If possible, this setting should
-        # overridden to take advantage of the native linker features on
-        # the platform it is being used on.
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-      fi
-
-      # Commands to make compiler produce verbose output that lists
-      # what "hidden" libraries, object files and flags are used when
-      # linking a shared library.
-      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-
-    else
-      GXX=no
-      with_gnu_ld=no
-      wlarc=
-    fi
-
-    # PORTME: fill in a description of your system's C++ link characteristics
-    AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-    _LT_TAGVAR(ld_shlibs, $1)=yes
-    case $host_os in
-      aix3*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-      aix[[4-9]]*)
-        if test "$host_cpu" = ia64; then
-          # On IA64, the linker does run time linking by default, so we don't
-          # have to do anything special.
-          aix_use_runtimelinking=no
-          exp_sym_flag='-Bexport'
-          no_entry_flag=""
-        else
-          aix_use_runtimelinking=no
-
-          # Test if we are trying to use run time linking or normal
-          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-          # need to do runtime linking.
-          case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
-	    for ld_flag in $LDFLAGS; do
-	      case $ld_flag in
-	      *-brtl*)
-	        aix_use_runtimelinking=yes
-	        break
-	        ;;
-	      esac
-	    done
-	    ;;
-          esac
-
-          exp_sym_flag='-bexport'
-          no_entry_flag='-bnoentry'
-        fi
-
-        # When large executables or shared objects are built, AIX ld can
-        # have problems creating the table of contents.  If linking a library
-        # or program results in "error TOC overflow" add -mminimal-toc to
-        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-        _LT_TAGVAR(archive_cmds, $1)=''
-        _LT_TAGVAR(hardcode_direct, $1)=yes
-        _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-        _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-        _LT_TAGVAR(link_all_deplibs, $1)=yes
-        _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
-
-        if test "$GXX" = yes; then
-          case $host_os in aix4.[[012]]|aix4.[[012]].*)
-          # We only want to do this on AIX 4.2 and lower, the check
-          # below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" &&
-	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-	  then
-	    # We have reworked collect2
-	    :
-	  else
-	    # We have old collect2
-	    _LT_TAGVAR(hardcode_direct, $1)=unsupported
-	    # It fails to find uninstalled libraries when the uninstalled
-	    # path is not listed in the libpath.  Setting hardcode_minus_L
-	    # to unsupported forces relinking
-	    _LT_TAGVAR(hardcode_minus_L, $1)=yes
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=
-	  fi
-          esac
-          shared_flag='-shared'
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag="$shared_flag "'${wl}-G'
-	  fi
-        else
-          # not using gcc
-          if test "$host_cpu" = ia64; then
-	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	  # chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-          else
-	    if test "$aix_use_runtimelinking" = yes; then
-	      shared_flag='${wl}-G'
-	    else
-	      shared_flag='${wl}-bM:SRE'
-	    fi
-          fi
-        fi
-
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
-        # It seems that -bexpall does not export symbols beginning with
-        # underscore (_), so it is better to generate a list of symbols to
-	# export.
-        _LT_TAGVAR(always_export_symbols, $1)=yes
-        if test "$aix_use_runtimelinking" = yes; then
-          # Warning - without using the other runtime loading flags (-brtl),
-          # -berok will link without error, but may produce a broken library.
-          _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
-          # Determine the default libpath from the value encoded in an empty
-          # executable.
-          _LT_SYS_MODULE_PATH_AIX([$1])
-          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-
-          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-        else
-          if test "$host_cpu" = ia64; then
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-	    _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-          else
-	    # Determine the default libpath from the value encoded in an
-	    # empty executable.
-	    _LT_SYS_MODULE_PATH_AIX([$1])
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	    # Warning - without using the other run time loading flags,
-	    # -berok will link without error, but may produce a broken library.
-	    _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-	    _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	    if test "$with_gnu_ld" = yes; then
-	      # We only use this code for GNU lds that support --whole-archive.
-	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	    else
-	      # Exported symbols can be pulled into shared objects from archives
-	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-	    fi
-	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-	    # This is similar to how AIX traditionally builds its shared
-	    # libraries.
-	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-          fi
-        fi
-        ;;
-
-      beos*)
-	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	  # Joseph Beckenbach  says some releases of gcc
-	  # support --undefined.  This deserves some investigation.  FIXME
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	else
-	  _LT_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-
-      chorus*)
-        case $cc_basename in
-          *)
-	  # FIXME: insert proper C++ library support
-	  _LT_TAGVAR(ld_shlibs, $1)=no
-	  ;;
-        esac
-        ;;
-
-      cygwin* | mingw* | pw32* | cegcc*)
-	case $GXX,$cc_basename in
-	,cl* | no,cl*)
-	  # Native MSVC
-	  # hardcode_libdir_flag_spec is actually meaningless, as there is
-	  # no search path for DLLs.
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	  _LT_TAGVAR(always_export_symbols, $1)=yes
-	  _LT_TAGVAR(file_list_spec, $1)='@'
-	  # Tell ltmain to make .lib files, not .a files.
-	  libext=lib
-	  # Tell ltmain to make .dll files, not .so files.
-	  shrext_cmds=".dll"
-	  # FIXME: Setting linknames here is a bad hack.
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	      $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
-	    else
-	      $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
-	    fi~
-	    $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-	    linknames='
-	  # The linker will not automatically build a static lib if we build a DLL.
-	  # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-	  # Don't use ranlib
-	  _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
-	  _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
-	    lt_tool_outputfile="@TOOL_OUTPUT@"~
-	    case $lt_outputfile in
-	      *.exe|*.EXE) ;;
-	      *)
-		lt_outputfile="$lt_outputfile.exe"
-		lt_tool_outputfile="$lt_tool_outputfile.exe"
-		;;
-	    esac~
-	    func_to_tool_file "$lt_outputfile"~
-	    if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
-	      $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-	      $RM "$lt_outputfile.manifest";
-	    fi'
-	  ;;
-	*)
-	  # g++
-	  # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-	  # as there is no search path for DLLs.
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
-	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	  _LT_TAGVAR(always_export_symbols, $1)=no
-	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-
-	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	    # If the export-symbols file already is a .def file (1st line
-	    # is EXPORTS), use it as is; otherwise, prepend...
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	      cp $export_symbols $output_objdir/$soname.def;
-	    else
-	      echo EXPORTS > $output_objdir/$soname.def;
-	      cat $export_symbols >> $output_objdir/$soname.def;
-	    fi~
-	    $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	  else
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	  fi
-	  ;;
-	esac
-	;;
-      darwin* | rhapsody*)
-        _LT_DARWIN_LINKER_FEATURES($1)
-	;;
-
-      dgux*)
-        case $cc_basename in
-          ec++*)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          ghcx*)
-	    # Green Hills C++ Compiler
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-        esac
-        ;;
-
-      freebsd2.*)
-        # C++ shared libraries reported to be fairly broken before
-	# switch to ELF
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-
-      freebsd-elf*)
-        _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-        ;;
-
-      freebsd* | dragonfly*)
-        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-        # conventions
-        _LT_TAGVAR(ld_shlibs, $1)=yes
-        ;;
-
-      gnu*)
-        ;;
-
-      haiku*)
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-        _LT_TAGVAR(link_all_deplibs, $1)=yes
-        ;;
-
-      hpux9*)
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-        _LT_TAGVAR(hardcode_direct, $1)=yes
-        _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-				             # but as the default
-				             # location of the library.
-
-        case $cc_basename in
-          CC*)
-            # FIXME: insert proper C++ library support
-            _LT_TAGVAR(ld_shlibs, $1)=no
-            ;;
-          aCC*)
-            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-            # Commands to make compiler produce verbose output that lists
-            # what "hidden" libraries, object files and flags are used when
-            # linking a shared library.
-            #
-            # There doesn't appear to be a way to prevent this compiler from
-            # explicitly linking system object files so we need to strip them
-            # from the output so that they don't get included in the library
-            # dependencies.
-            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-            ;;
-          *)
-            if test "$GXX" = yes; then
-              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-            else
-              # FIXME: insert proper C++ library support
-              _LT_TAGVAR(ld_shlibs, $1)=no
-            fi
-            ;;
-        esac
-        ;;
-
-      hpux10*|hpux11*)
-        if test $with_gnu_ld = no; then
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	  _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-          case $host_cpu in
-            hppa*64*|ia64*)
-              ;;
-            *)
-	      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-              ;;
-          esac
-        fi
-        case $host_cpu in
-          hppa*64*|ia64*)
-            _LT_TAGVAR(hardcode_direct, $1)=no
-            _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-            ;;
-          *)
-            _LT_TAGVAR(hardcode_direct, $1)=yes
-            _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-            _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-					         # but as the default
-					         # location of the library.
-            ;;
-        esac
-
-        case $cc_basename in
-          CC*)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          aCC*)
-	    case $host_cpu in
-	      hppa*64*)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	      ia64*)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	      *)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	    esac
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-	    ;;
-          *)
-	    if test "$GXX" = yes; then
-	      if test $with_gnu_ld = no; then
-	        case $host_cpu in
-	          hppa*64*)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	          ia64*)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	          *)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	        esac
-	      fi
-	    else
-	      # FIXME: insert proper C++ library support
-	      _LT_TAGVAR(ld_shlibs, $1)=no
-	    fi
-	    ;;
-        esac
-        ;;
-
-      interix[[3-9]]*)
-	_LT_TAGVAR(hardcode_direct, $1)=no
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-	# Instead, shared libraries are loaded at an image base (0x10000000 by
-	# default) and relocated if they conflict, which is a slow very memory
-	# consuming and fragmenting process.  To avoid this, we pick a random,
-	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-	;;
-      irix5* | irix6*)
-        case $cc_basename in
-          CC*)
-	    # SGI C++
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-
-	    # Archives containing C++ object files must be created using
-	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-	    # necessary to make sure instantiated templates are included
-	    # in the archive.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
-	    ;;
-          *)
-	    if test "$GXX" = yes; then
-	      if test "$with_gnu_ld" = no; then
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	      else
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
-	      fi
-	    fi
-	    _LT_TAGVAR(link_all_deplibs, $1)=yes
-	    ;;
-        esac
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-        _LT_TAGVAR(inherit_rpath, $1)=yes
-        ;;
-
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
-        case $cc_basename in
-          KCC*)
-	    # Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	    # KCC will only create a shared library if the output file
-	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
-	    # to its proper name (with version) after linking.
-	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
-	    # Archives containing C++ object files must be created using
-	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-	    ;;
-	  icpc* | ecpc* )
-	    # Intel C++
-	    with_gnu_ld=yes
-	    # version 8.0 and above of icpc choke on multiply defined symbols
-	    # if we add $predep_objects and $postdep_objects, however 7.1 and
-	    # earlier do not add the objects themselves.
-	    case `$CC -V 2>&1` in
-	      *"Version 7."*)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-		;;
-	      *)  # Version 8.0 or newer
-	        tmp_idyn=
-	        case $host_cpu in
-		  ia64*) tmp_idyn=' -i_dynamic';;
-		esac
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-		;;
-	    esac
-	    _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	    ;;
-          pgCC* | pgcpp*)
-            # Portland Group C++ compiler
-	    case `$CC -V` in
-	    *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
-	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
-		compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
-	      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
-		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
-		$RANLIB $oldlib'
-	      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-	      ;;
-	    *) # Version 6 and above use weak symbols
-	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-	      ;;
-	    esac
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-            ;;
-	  cxx*)
-	    # Compaq C++
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-
-	    runpath_var=LD_RUN_PATH
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
-	    ;;
-	  xl* | mpixl* | bgxl*)
-	    # IBM XL 8.0 on PPC, with GNU ld
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    if test "x$supports_anon_versioning" = xyes; then
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-		cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-		echo "local: *; };" >> $output_objdir/$libname.ver~
-		$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-	    fi
-	    ;;
-	  *)
-	    case `$CC -V 2>&1 | sed 5q` in
-	    *Sun\ C*)
-	      # Sun C++ 5.9
-	      _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	      _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
-	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	      _LT_TAGVAR(compiler_needs_object, $1)=yes
-
-	      # Not sure whether something based on
-	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
-	      # would be better.
-	      output_verbose_link_cmd='func_echo_all'
-
-	      # Archives containing C++ object files must be created using
-	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	      # necessary to make sure instantiated templates are included
-	      # in the archive.
-	      _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-	      ;;
-	    esac
-	    ;;
-	esac
-	;;
-
-      lynxos*)
-        # FIXME: insert proper C++ library support
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	;;
-
-      m88k*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-	;;
-
-      mvs*)
-        case $cc_basename in
-          cxx*)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-	  *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-	esac
-	;;
-
-      netbsd*)
-        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-	  wlarc=
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	  _LT_TAGVAR(hardcode_direct, $1)=yes
-	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	fi
-	# Workaround some broken pre-1.5 toolchains
-	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-	;;
-
-      *nto* | *qnx*)
-        _LT_TAGVAR(ld_shlibs, $1)=yes
-	;;
-
-      openbsd2*)
-        # C++ shared libraries are fairly broken
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	;;
-
-      openbsd*)
-	if test -f /usr/libexec/ld.so; then
-	  _LT_TAGVAR(hardcode_direct, $1)=yes
-	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-	  fi
-	  output_verbose_link_cmd=func_echo_all
-	else
-	  _LT_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-
-      osf3* | osf4* | osf5*)
-        case $cc_basename in
-          KCC*)
-	    # Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	    # KCC will only create a shared library if the output file
-	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
-	    # to its proper name (with version) after linking.
-	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	    # Archives containing C++ object files must be created using
-	    # the KAI C++ compiler.
-	    case $host in
-	      osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;;
-	      *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;;
-	    esac
-	    ;;
-          RCC*)
-	    # Rational C++ 2.4.1
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          cxx*)
-	    case $host in
-	      osf3*)
-	        _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-		;;
-	      *)
-	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-	          echo "-hidden">> $lib.exp~
-	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
-	          $RM $lib.exp'
-	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-		;;
-	    esac
-
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-	    ;;
-	  *)
-	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	      _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	      case $host in
-	        osf3*)
-	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-		  ;;
-	        *)
-	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-		  ;;
-	      esac
-
-	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	      # Commands to make compiler produce verbose output that lists
-	      # what "hidden" libraries, object files and flags are used when
-	      # linking a shared library.
-	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-
-	    else
-	      # FIXME: insert proper C++ library support
-	      _LT_TAGVAR(ld_shlibs, $1)=no
-	    fi
-	    ;;
-        esac
-        ;;
-
-      psos*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-
-      sunos4*)
-        case $cc_basename in
-          CC*)
-	    # Sun C++ 4.x
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          lcc*)
-	    # Lucid
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-        esac
-        ;;
-
-      solaris*)
-        case $cc_basename in
-          CC* | sunCC*)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-            _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
-	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	      $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	    _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	    case $host_os in
-	      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-	      *)
-		# The compiler driver will combine and reorder linker options,
-		# but understands `-z linker_flag'.
-	        # Supported since Solaris 2.6 (maybe 2.5.1?)
-		_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-	        ;;
-	    esac
-	    _LT_TAGVAR(link_all_deplibs, $1)=yes
-
-	    output_verbose_link_cmd='func_echo_all'
-
-	    # Archives containing C++ object files must be created using
-	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	    # necessary to make sure instantiated templates are included
-	    # in the archive.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-	    ;;
-          gcx*)
-	    # Green Hills C++ Compiler
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-
-	    # The C++ compiler must be used to create the archive.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-	    ;;
-          *)
-	    # GNU C++ compiler with Solaris linker
-	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	      _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
-	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-		  $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	        # Commands to make compiler produce verbose output that lists
-	        # what "hidden" libraries, object files and flags are used when
-	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-	      else
-	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
-	        # platform.
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-		  $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	        # Commands to make compiler produce verbose output that lists
-	        # what "hidden" libraries, object files and flags are used when
-	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-	      fi
-
-	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
-	      case $host_os in
-		solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-		*)
-		  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-		  ;;
-	      esac
-	    fi
-	    ;;
-        esac
-        ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      runpath_var='LD_RUN_PATH'
-
-      case $cc_basename in
-        CC*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-      esac
-      ;;
-
-      sysv5* | sco3.2v5* | sco5v6*)
-	# Note: We can NOT use -z defs as we might desire, because we do not
-	# link with -lc, and that would cause any symbols used from libc to
-	# always be unresolved, which means just about no library would
-	# ever link correctly.  If we're not using GNU ld we use -z text
-	# though, which does catch some bad symbols but isn't as heavy-handed
-	# as -z defs.
-	_LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-	_LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-	_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
-	_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-	_LT_TAGVAR(link_all_deplibs, $1)=yes
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-	runpath_var='LD_RUN_PATH'
-
-	case $cc_basename in
-          CC*)
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
-	      '"$_LT_TAGVAR(old_archive_cmds, $1)"
-	    _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
-	      '"$_LT_TAGVAR(reload_cmds, $1)"
-	    ;;
-	  *)
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    ;;
-	esac
-      ;;
-
-      tandem*)
-        case $cc_basename in
-          NCC*)
-	    # NonStop-UX NCC 3.20
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-        esac
-        ;;
-
-      vxworks*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-
-      *)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-    esac
-
-    AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-    test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-    _LT_TAGVAR(GCC, $1)="$GXX"
-    _LT_TAGVAR(LD, $1)="$LD"
-
-    ## CAVEAT EMPTOR:
-    ## There is no encapsulation within the following macros, do not change
-    ## the running order or otherwise move them around unless you know exactly
-    ## what you are doing...
-    _LT_SYS_HIDDEN_LIBDEPS($1)
-    _LT_COMPILER_PIC($1)
-    _LT_COMPILER_C_O($1)
-    _LT_COMPILER_FILE_LOCKS($1)
-    _LT_LINKER_SHLIBS($1)
-    _LT_SYS_DYNAMIC_LINKER($1)
-    _LT_LINKER_HARDCODE_LIBPATH($1)
-
-    _LT_CONFIG($1)
-  fi # test -n "$compiler"
-
-  CC=$lt_save_CC
-  CFLAGS=$lt_save_CFLAGS
-  LDCXX=$LD
-  LD=$lt_save_LD
-  GCC=$lt_save_GCC
-  with_gnu_ld=$lt_save_with_gnu_ld
-  lt_cv_path_LDCXX=$lt_cv_path_LD
-  lt_cv_path_LD=$lt_save_path_LD
-  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-fi # test "$_lt_caught_CXX_error" != yes
-
-AC_LANG_POP
-])# _LT_LANG_CXX_CONFIG
-
-
-# _LT_FUNC_STRIPNAME_CNF
-# ----------------------
-# func_stripname_cnf prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-#
-# This function is identical to the (non-XSI) version of func_stripname,
-# except this one can be used by m4 code that may be executed by configure,
-# rather than the libtool script.
-m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
-AC_REQUIRE([_LT_DECL_SED])
-AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
-func_stripname_cnf ()
-{
-  case ${2} in
-  .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
-  *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
-  esac
-} # func_stripname_cnf
-])# _LT_FUNC_STRIPNAME_CNF
-
-# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
-# ---------------------------------
-# Figure out "hidden" library dependencies from verbose
-# compiler output when linking a shared library.
-# Parse the compiler output and extract the necessary
-# objects, libraries and library flags.
-m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
-# Dependencies to place before and after the object being linked:
-_LT_TAGVAR(predep_objects, $1)=
-_LT_TAGVAR(postdep_objects, $1)=
-_LT_TAGVAR(predeps, $1)=
-_LT_TAGVAR(postdeps, $1)=
-_LT_TAGVAR(compiler_lib_search_path, $1)=
-
-dnl we can't use the lt_simple_compile_test_code here,
-dnl because it contains code intended for an executable,
-dnl not a library.  It's possible we should let each
-dnl tag define a new lt_????_link_test_code variable,
-dnl but it's only used here...
-m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF
-int a;
-void foo (void) { a = 0; }
-_LT_EOF
-], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF
-class Foo
-{
-public:
-  Foo (void) { a = 0; }
-private:
-  int a;
-};
-_LT_EOF
-], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF
-      subroutine foo
-      implicit none
-      integer*4 a
-      a=0
-      return
-      end
-_LT_EOF
-], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF
-      subroutine foo
-      implicit none
-      integer a
-      a=0
-      return
-      end
-_LT_EOF
-], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF
-public class foo {
-  private int a;
-  public void bar (void) {
-    a = 0;
-  }
-};
-_LT_EOF
-], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
-package foo
-func foo() {
-}
-_LT_EOF
-])
-
-_lt_libdeps_save_CFLAGS=$CFLAGS
-case "$CC $CFLAGS " in #(
-*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
-*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
-*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
-esac
-
-dnl Parse the compiler output and extract the necessary
-dnl objects, libraries and library flags.
-if AC_TRY_EVAL(ac_compile); then
-  # Parse the compiler output and extract the necessary
-  # objects, libraries and library flags.
-
-  # Sentinel used to keep track of whether or not we are before
-  # the conftest object file.
-  pre_test_object_deps_done=no
-
-  for p in `eval "$output_verbose_link_cmd"`; do
-    case ${prev}${p} in
-
-    -L* | -R* | -l*)
-       # Some compilers place space between "-{L,R}" and the path.
-       # Remove the space.
-       if test $p = "-L" ||
-          test $p = "-R"; then
-	 prev=$p
-	 continue
-       fi
-
-       # Expand the sysroot to ease extracting the directories later.
-       if test -z "$prev"; then
-         case $p in
-         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
-         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
-         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
-         esac
-       fi
-       case $p in
-       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
-       esac
-       if test "$pre_test_object_deps_done" = no; then
-	 case ${prev} in
-	 -L | -R)
-	   # Internal compiler library paths should come after those
-	   # provided the user.  The postdeps already come after the
-	   # user supplied libs so there is no need to process them.
-	   if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
-	     _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
-	   else
-	     _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
-	   fi
-	   ;;
-	 # The "-l" case would never come before the object being
-	 # linked, so don't bother handling this case.
-	 esac
-       else
-	 if test -z "$_LT_TAGVAR(postdeps, $1)"; then
-	   _LT_TAGVAR(postdeps, $1)="${prev}${p}"
-	 else
-	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
-	 fi
-       fi
-       prev=
-       ;;
-
-    *.lto.$objext) ;; # Ignore GCC LTO objects
-    *.$objext)
-       # This assumes that the test object file only shows up
-       # once in the compiler output.
-       if test "$p" = "conftest.$objext"; then
-	 pre_test_object_deps_done=yes
-	 continue
-       fi
-
-       if test "$pre_test_object_deps_done" = no; then
-	 if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
-	   _LT_TAGVAR(predep_objects, $1)="$p"
-	 else
-	   _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
-	 fi
-       else
-	 if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
-	   _LT_TAGVAR(postdep_objects, $1)="$p"
-	 else
-	   _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
-	 fi
-       fi
-       ;;
-
-    *) ;; # Ignore the rest.
-
-    esac
-  done
-
-  # Clean up.
-  rm -f a.out a.exe
-else
-  echo "libtool.m4: error: problem compiling $1 test program"
-fi
-
-$RM -f confest.$objext
-CFLAGS=$_lt_libdeps_save_CFLAGS
-
-# PORTME: override above test on systems where it is broken
-m4_if([$1], [CXX],
-[case $host_os in
-interix[[3-9]]*)
-  # Interix 3.5 installs completely hosed .la files for C++, so rather than
-  # hack all around it, let's just trust "g++" to DTRT.
-  _LT_TAGVAR(predep_objects,$1)=
-  _LT_TAGVAR(postdep_objects,$1)=
-  _LT_TAGVAR(postdeps,$1)=
-  ;;
-
-linux*)
-  case `$CC -V 2>&1 | sed 5q` in
-  *Sun\ C*)
-    # Sun C++ 5.9
-
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-
-    if test "$solaris_use_stlport4" != yes; then
-      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
-
-solaris*)
-  case $cc_basename in
-  CC* | sunCC*)
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-
-    # Adding this requires a known-good setup of shared libraries for
-    # Sun compiler versions before 5.6, else PIC objects from an old
-    # archive will be linked into the output, leading to subtle bugs.
-    if test "$solaris_use_stlport4" != yes; then
-      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
-esac
-])
-
-case " $_LT_TAGVAR(postdeps, $1) " in
-*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
-esac
- _LT_TAGVAR(compiler_lib_search_dirs, $1)=
-if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
- _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
-fi
-_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
-    [The directories searched by this compiler when creating a shared library])
-_LT_TAGDECL([], [predep_objects], [1],
-    [Dependencies to place before and after the objects being linked to
-    create a shared library])
-_LT_TAGDECL([], [postdep_objects], [1])
-_LT_TAGDECL([], [predeps], [1])
-_LT_TAGDECL([], [postdeps], [1])
-_LT_TAGDECL([], [compiler_lib_search_path], [1],
-    [The library search path used internally by the compiler when linking
-    a shared library])
-])# _LT_SYS_HIDDEN_LIBDEPS
-
-
-# _LT_LANG_F77_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for a Fortran 77 compiler are
-# suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_F77_CONFIG],
-[AC_LANG_PUSH(Fortran 77)
-if test -z "$F77" || test "X$F77" = "Xno"; then
-  _lt_disable_F77=yes
-fi
-
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for f77 test sources.
-ac_ext=f
-
-# Object file extension for compiled f77 test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the F77 compiler isn't working.  Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_F77" != yes; then
-  # Code to be used in simple compile tests
-  lt_simple_compile_test_code="\
-      subroutine t
-      return
-      end
-"
-
-  # Code to be used in simple link tests
-  lt_simple_link_test_code="\
-      program t
-      end
-"
-
-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-  _LT_TAG_COMPILER
-
-  # save warnings/boilerplate of simple test code
-  _LT_COMPILER_BOILERPLATE
-  _LT_LINKER_BOILERPLATE
-
-  # Allow CC to be a program name with arguments.
-  lt_save_CC="$CC"
-  lt_save_GCC=$GCC
-  lt_save_CFLAGS=$CFLAGS
-  CC=${F77-"f77"}
-  CFLAGS=$FFLAGS
-  compiler=$CC
-  _LT_TAGVAR(compiler, $1)=$CC
-  _LT_CC_BASENAME([$compiler])
-  GCC=$G77
-  if test -n "$compiler"; then
-    AC_MSG_CHECKING([if libtool supports shared libraries])
-    AC_MSG_RESULT([$can_build_shared])
-
-    AC_MSG_CHECKING([whether to build shared libraries])
-    test "$can_build_shared" = "no" && enable_shared=no
-
-    # On AIX, shared libraries and static libraries use the same namespace, and
-    # are all built from PIC.
-    case $host_os in
-      aix3*)
-        test "$enable_shared" = yes && enable_static=no
-        if test -n "$RANLIB"; then
-          archive_cmds="$archive_cmds~\$RANLIB \$lib"
-          postinstall_cmds='$RANLIB $lib'
-        fi
-        ;;
-      aix[[4-9]]*)
-	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-	  test "$enable_shared" = yes && enable_static=no
-	fi
-        ;;
-    esac
-    AC_MSG_RESULT([$enable_shared])
-
-    AC_MSG_CHECKING([whether to build static libraries])
-    # Make sure either enable_shared or enable_static is yes.
-    test "$enable_shared" = yes || enable_static=yes
-    AC_MSG_RESULT([$enable_static])
-
-    _LT_TAGVAR(GCC, $1)="$G77"
-    _LT_TAGVAR(LD, $1)="$LD"
-
-    ## CAVEAT EMPTOR:
-    ## There is no encapsulation within the following macros, do not change
-    ## the running order or otherwise move them around unless you know exactly
-    ## what you are doing...
-    _LT_COMPILER_PIC($1)
-    _LT_COMPILER_C_O($1)
-    _LT_COMPILER_FILE_LOCKS($1)
-    _LT_LINKER_SHLIBS($1)
-    _LT_SYS_DYNAMIC_LINKER($1)
-    _LT_LINKER_HARDCODE_LIBPATH($1)
-
-    _LT_CONFIG($1)
-  fi # test -n "$compiler"
-
-  GCC=$lt_save_GCC
-  CC="$lt_save_CC"
-  CFLAGS="$lt_save_CFLAGS"
-fi # test "$_lt_disable_F77" != yes
-
-AC_LANG_POP
-])# _LT_LANG_F77_CONFIG
-
-
-# _LT_LANG_FC_CONFIG([TAG])
-# -------------------------
-# Ensure that the configuration variables for a Fortran compiler are
-# suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_FC_CONFIG],
-[AC_LANG_PUSH(Fortran)
-
-if test -z "$FC" || test "X$FC" = "Xno"; then
-  _lt_disable_FC=yes
-fi
-
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for fc test sources.
-ac_ext=${ac_fc_srcext-f}
-
-# Object file extension for compiled fc test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the FC compiler isn't working.  Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_FC" != yes; then
-  # Code to be used in simple compile tests
-  lt_simple_compile_test_code="\
-      subroutine t
-      return
-      end
-"
-
-  # Code to be used in simple link tests
-  lt_simple_link_test_code="\
-      program t
-      end
-"
-
-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-  _LT_TAG_COMPILER
-
-  # save warnings/boilerplate of simple test code
-  _LT_COMPILER_BOILERPLATE
-  _LT_LINKER_BOILERPLATE
-
-  # Allow CC to be a program name with arguments.
-  lt_save_CC="$CC"
-  lt_save_GCC=$GCC
-  lt_save_CFLAGS=$CFLAGS
-  CC=${FC-"f95"}
-  CFLAGS=$FCFLAGS
-  compiler=$CC
-  GCC=$ac_cv_fc_compiler_gnu
-
-  _LT_TAGVAR(compiler, $1)=$CC
-  _LT_CC_BASENAME([$compiler])
-
-  if test -n "$compiler"; then
-    AC_MSG_CHECKING([if libtool supports shared libraries])
-    AC_MSG_RESULT([$can_build_shared])
-
-    AC_MSG_CHECKING([whether to build shared libraries])
-    test "$can_build_shared" = "no" && enable_shared=no
-
-    # On AIX, shared libraries and static libraries use the same namespace, and
-    # are all built from PIC.
-    case $host_os in
-      aix3*)
-        test "$enable_shared" = yes && enable_static=no
-        if test -n "$RANLIB"; then
-          archive_cmds="$archive_cmds~\$RANLIB \$lib"
-          postinstall_cmds='$RANLIB $lib'
-        fi
-        ;;
-      aix[[4-9]]*)
-	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-	  test "$enable_shared" = yes && enable_static=no
-	fi
-        ;;
-    esac
-    AC_MSG_RESULT([$enable_shared])
-
-    AC_MSG_CHECKING([whether to build static libraries])
-    # Make sure either enable_shared or enable_static is yes.
-    test "$enable_shared" = yes || enable_static=yes
-    AC_MSG_RESULT([$enable_static])
-
-    _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
-    _LT_TAGVAR(LD, $1)="$LD"
-
-    ## CAVEAT EMPTOR:
-    ## There is no encapsulation within the following macros, do not change
-    ## the running order or otherwise move them around unless you know exactly
-    ## what you are doing...
-    _LT_SYS_HIDDEN_LIBDEPS($1)
-    _LT_COMPILER_PIC($1)
-    _LT_COMPILER_C_O($1)
-    _LT_COMPILER_FILE_LOCKS($1)
-    _LT_LINKER_SHLIBS($1)
-    _LT_SYS_DYNAMIC_LINKER($1)
-    _LT_LINKER_HARDCODE_LIBPATH($1)
-
-    _LT_CONFIG($1)
-  fi # test -n "$compiler"
-
-  GCC=$lt_save_GCC
-  CC=$lt_save_CC
-  CFLAGS=$lt_save_CFLAGS
-fi # test "$_lt_disable_FC" != yes
-
-AC_LANG_POP
-])# _LT_LANG_FC_CONFIG
-
-
-# _LT_LANG_GCJ_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for the GNU Java Compiler compiler
-# are suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_GCJ_CONFIG],
-[AC_REQUIRE([LT_PROG_GCJ])dnl
-AC_LANG_SAVE
-
-# Source file extension for Java test sources.
-ac_ext=java
-
-# Object file extension for compiled Java test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_TAG_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-lt_save_CFLAGS=$CFLAGS
-lt_save_GCC=$GCC
-GCC=yes
-CC=${GCJ-"gcj"}
-CFLAGS=$GCJFLAGS
-compiler=$CC
-_LT_TAGVAR(compiler, $1)=$CC
-_LT_TAGVAR(LD, $1)="$LD"
-_LT_CC_BASENAME([$compiler])
-
-# GCJ did not exist at the time GCC didn't implicitly link libc in.
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-if test -n "$compiler"; then
-  _LT_COMPILER_NO_RTTI($1)
-  _LT_COMPILER_PIC($1)
-  _LT_COMPILER_C_O($1)
-  _LT_COMPILER_FILE_LOCKS($1)
-  _LT_LINKER_SHLIBS($1)
-  _LT_LINKER_HARDCODE_LIBPATH($1)
-
-  _LT_CONFIG($1)
-fi
-
-AC_LANG_RESTORE
-
-GCC=$lt_save_GCC
-CC=$lt_save_CC
-CFLAGS=$lt_save_CFLAGS
-])# _LT_LANG_GCJ_CONFIG
-
-
-# _LT_LANG_GO_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for the GNU Go compiler
-# are suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_GO_CONFIG],
-[AC_REQUIRE([LT_PROG_GO])dnl
-AC_LANG_SAVE
-
-# Source file extension for Go test sources.
-ac_ext=go
-
-# Object file extension for compiled Go test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="package main; func main() { }"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='package main; func main() { }'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_TAG_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-lt_save_CFLAGS=$CFLAGS
-lt_save_GCC=$GCC
-GCC=yes
-CC=${GOC-"gccgo"}
-CFLAGS=$GOFLAGS
-compiler=$CC
-_LT_TAGVAR(compiler, $1)=$CC
-_LT_TAGVAR(LD, $1)="$LD"
-_LT_CC_BASENAME([$compiler])
-
-# Go did not exist at the time GCC didn't implicitly link libc in.
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-if test -n "$compiler"; then
-  _LT_COMPILER_NO_RTTI($1)
-  _LT_COMPILER_PIC($1)
-  _LT_COMPILER_C_O($1)
-  _LT_COMPILER_FILE_LOCKS($1)
-  _LT_LINKER_SHLIBS($1)
-  _LT_LINKER_HARDCODE_LIBPATH($1)
-
-  _LT_CONFIG($1)
-fi
-
-AC_LANG_RESTORE
-
-GCC=$lt_save_GCC
-CC=$lt_save_CC
-CFLAGS=$lt_save_CFLAGS
-])# _LT_LANG_GO_CONFIG
-
-
-# _LT_LANG_RC_CONFIG([TAG])
-# -------------------------
-# Ensure that the configuration variables for the Windows resource compiler
-# are suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_RC_CONFIG],
-[AC_REQUIRE([LT_PROG_RC])dnl
-AC_LANG_SAVE
-
-# Source file extension for RC test sources.
-ac_ext=rc
-
-# Object file extension for compiled RC test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="$lt_simple_compile_test_code"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_TAG_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-lt_save_CFLAGS=$CFLAGS
-lt_save_GCC=$GCC
-GCC=
-CC=${RC-"windres"}
-CFLAGS=
-compiler=$CC
-_LT_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-
-if test -n "$compiler"; then
-  :
-  _LT_CONFIG($1)
-fi
-
-GCC=$lt_save_GCC
-AC_LANG_RESTORE
-CC=$lt_save_CC
-CFLAGS=$lt_save_CFLAGS
-])# _LT_LANG_RC_CONFIG
-
-
-# LT_PROG_GCJ
-# -----------
-AC_DEFUN([LT_PROG_GCJ],
-[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
-  [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
-    [AC_CHECK_TOOL(GCJ, gcj,)
-      test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-      AC_SUBST(GCJFLAGS)])])[]dnl
-])
-
-# Old name:
-AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
-
-
-# LT_PROG_GO
-# ----------
-AC_DEFUN([LT_PROG_GO],
-[AC_CHECK_TOOL(GOC, gccgo,)
-])
-
-
-# LT_PROG_RC
-# ----------
-AC_DEFUN([LT_PROG_RC],
-[AC_CHECK_TOOL(RC, windres,)
-])
-
-# Old name:
-AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([LT_AC_PROG_RC], [])
-
-
-# _LT_DECL_EGREP
-# --------------
-# If we don't have a new enough Autoconf to choose the best grep
-# available, choose the one first in the user's PATH.
-m4_defun([_LT_DECL_EGREP],
-[AC_REQUIRE([AC_PROG_EGREP])dnl
-AC_REQUIRE([AC_PROG_FGREP])dnl
-test -z "$GREP" && GREP=grep
-_LT_DECL([], [GREP], [1], [A grep program that handles long lines])
-_LT_DECL([], [EGREP], [1], [An ERE matcher])
-_LT_DECL([], [FGREP], [1], [A literal string matcher])
-dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
-AC_SUBST([GREP])
-])
-
-
-# _LT_DECL_OBJDUMP
-# --------------
-# If we don't have a new enough Autoconf to choose the best objdump
-# available, choose the one first in the user's PATH.
-m4_defun([_LT_DECL_OBJDUMP],
-[AC_CHECK_TOOL(OBJDUMP, objdump, false)
-test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
-AC_SUBST([OBJDUMP])
-])
-
-# _LT_DECL_DLLTOOL
-# ----------------
-# Ensure DLLTOOL variable is set.
-m4_defun([_LT_DECL_DLLTOOL],
-[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
-AC_SUBST([DLLTOOL])
-])
-
-# _LT_DECL_SED
-# ------------
-# Check for a fully-functional sed program, that truncates
-# as few characters as possible.  Prefer GNU sed if found.
-m4_defun([_LT_DECL_SED],
-[AC_PROG_SED
-test -z "$SED" && SED=sed
-Xsed="$SED -e 1s/^X//"
-_LT_DECL([], [SED], [1], [A sed program that does not truncate output])
-_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
-    [Sed that helps us avoid accidentally triggering echo(1) options like -n])
-])# _LT_DECL_SED
-
-m4_ifndef([AC_PROG_SED], [
-############################################################
-# NOTE: This macro has been submitted for inclusion into   #
-#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
-#  a released version of Autoconf we should remove this    #
-#  macro and use it instead.                               #
-############################################################
-
-m4_defun([AC_PROG_SED],
-[AC_MSG_CHECKING([for a sed that does not truncate output])
-AC_CACHE_VAL(lt_cv_path_SED,
-[# Loop through the user's path and test for sed and gsed.
-# Then use that list of sed's as ones to test for truncation.
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for lt_ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
-        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
-      fi
-    done
-  done
-done
-IFS=$as_save_IFS
-lt_ac_max=0
-lt_ac_count=0
-# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-# along with /bin/sed that truncates output.
-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-  test ! -f $lt_ac_sed && continue
-  cat /dev/null > conftest.in
-  lt_ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-  # Check for GNU sed and select it if it is found.
-  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
-    lt_cv_path_SED=$lt_ac_sed
-    break
-  fi
-  while true; do
-    cat conftest.in conftest.in >conftest.tmp
-    mv conftest.tmp conftest.in
-    cp conftest.in conftest.nl
-    echo >>conftest.nl
-    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
-    cmp -s conftest.out conftest.nl || break
-    # 10000 chars as input seems more than enough
-    test $lt_ac_count -gt 10 && break
-    lt_ac_count=`expr $lt_ac_count + 1`
-    if test $lt_ac_count -gt $lt_ac_max; then
-      lt_ac_max=$lt_ac_count
-      lt_cv_path_SED=$lt_ac_sed
-    fi
-  done
-done
-])
-SED=$lt_cv_path_SED
-AC_SUBST([SED])
-AC_MSG_RESULT([$SED])
-])#AC_PROG_SED
-])#m4_ifndef
-
-# Old name:
-AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([LT_AC_PROG_SED], [])
-
-
-# _LT_CHECK_SHELL_FEATURES
-# ------------------------
-# Find out whether the shell is Bourne or XSI compatible,
-# or has some other useful features.
-m4_defun([_LT_CHECK_SHELL_FEATURES],
-[AC_MSG_CHECKING([whether the shell understands some XSI constructs])
-# Try some XSI features
-xsi_shell=no
-( _lt_dummy="a/b/c"
-  test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
-      = c,a/b,b/c, \
-    && eval 'test $(( 1 + 1 )) -eq 2 \
-    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
-  && xsi_shell=yes
-AC_MSG_RESULT([$xsi_shell])
-_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
-
-AC_MSG_CHECKING([whether the shell understands "+="])
-lt_shell_append=no
-( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
-    >/dev/null 2>&1 \
-  && lt_shell_append=yes
-AC_MSG_RESULT([$lt_shell_append])
-_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
-
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  lt_unset=unset
-else
-  lt_unset=false
-fi
-_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
-
-# test EBCDIC or ASCII
-case `echo X|tr X '\101'` in
- A) # ASCII based system
-    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-  lt_SP2NL='tr \040 \012'
-  lt_NL2SP='tr \015\012 \040\040'
-  ;;
- *) # EBCDIC based system
-  lt_SP2NL='tr \100 \n'
-  lt_NL2SP='tr \r\n \100\100'
-  ;;
-esac
-_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl
-_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
-])# _LT_CHECK_SHELL_FEATURES
-
-
-# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
-# ------------------------------------------------------
-# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
-# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
-m4_defun([_LT_PROG_FUNCTION_REPLACE],
-[dnl {
-sed -e '/^$1 ()$/,/^} # $1 /c\
-$1 ()\
-{\
-m4_bpatsubsts([$2], [$], [\\], [^\([	 ]\)], [\\\1])
-} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-])
-
-
-# _LT_PROG_REPLACE_SHELLFNS
-# -------------------------
-# Replace existing portable implementations of several shell functions with
-# equivalent extended shell implementations where those features are available..
-m4_defun([_LT_PROG_REPLACE_SHELLFNS],
-[if test x"$xsi_shell" = xyes; then
-  _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
-    case ${1} in
-      */*) func_dirname_result="${1%/*}${2}" ;;
-      *  ) func_dirname_result="${3}" ;;
-    esac])
-
-  _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
-    func_basename_result="${1##*/}"])
-
-  _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
-    case ${1} in
-      */*) func_dirname_result="${1%/*}${2}" ;;
-      *  ) func_dirname_result="${3}" ;;
-    esac
-    func_basename_result="${1##*/}"])
-
-  _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
-    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
-    # positional parameters, so assign one to ordinary parameter first.
-    func_stripname_result=${3}
-    func_stripname_result=${func_stripname_result#"${1}"}
-    func_stripname_result=${func_stripname_result%"${2}"}])
-
-  _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
-    func_split_long_opt_name=${1%%=*}
-    func_split_long_opt_arg=${1#*=}])
-
-  _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
-    func_split_short_opt_arg=${1#??}
-    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
-
-  _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
-    case ${1} in
-      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
-      *)    func_lo2o_result=${1} ;;
-    esac])
-
-  _LT_PROG_FUNCTION_REPLACE([func_xform], [    func_xform_result=${1%.*}.lo])
-
-  _LT_PROG_FUNCTION_REPLACE([func_arith], [    func_arith_result=$(( $[*] ))])
-
-  _LT_PROG_FUNCTION_REPLACE([func_len], [    func_len_result=${#1}])
-fi
-
-if test x"$lt_shell_append" = xyes; then
-  _LT_PROG_FUNCTION_REPLACE([func_append], [    eval "${1}+=\\${2}"])
-
-  _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
-    func_quote_for_eval "${2}"
-dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
-    eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
-
-  # Save a `func_append' function call where possible by direct use of '+='
-  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
-    && mv -f "$cfgfile.tmp" "$cfgfile" \
-      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-  test 0 -eq $? || _lt_function_replace_fail=:
-else
-  # Save a `func_append' function call even when '+=' is not available
-  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
-    && mv -f "$cfgfile.tmp" "$cfgfile" \
-      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-  test 0 -eq $? || _lt_function_replace_fail=:
-fi
-
-if test x"$_lt_function_replace_fail" = x":"; then
-  AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
-fi
-])
-
-# _LT_PATH_CONVERSION_FUNCTIONS
-# -----------------------------
-# Determine which file name conversion functions should be used by
-# func_to_host_file (and, implicitly, by func_to_host_path).  These are needed
-# for certain cross-compile configurations and native mingw.
-m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_MSG_CHECKING([how to convert $build file names to $host format])
-AC_CACHE_VAL(lt_cv_to_host_file_cmd,
-[case $host in
-  *-*-mingw* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
-        ;;
-      *-*-cygwin* )
-        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
-        ;;
-      * ) # otherwise, assume *nix
-        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
-        ;;
-    esac
-    ;;
-  *-*-cygwin* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
-        ;;
-      *-*-cygwin* )
-        lt_cv_to_host_file_cmd=func_convert_file_noop
-        ;;
-      * ) # otherwise, assume *nix
-        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
-        ;;
-    esac
-    ;;
-  * ) # unhandled hosts (and "normal" native builds)
-    lt_cv_to_host_file_cmd=func_convert_file_noop
-    ;;
-esac
-])
-to_host_file_cmd=$lt_cv_to_host_file_cmd
-AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
-_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
-         [0], [convert $build file names to $host format])dnl
-
-AC_MSG_CHECKING([how to convert $build file names to toolchain format])
-AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
-[#assume ordinary cross tools, or native build.
-lt_cv_to_tool_file_cmd=func_convert_file_noop
-case $host in
-  *-*-mingw* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
-        ;;
-    esac
-    ;;
-esac
-])
-to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
-_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
-         [0], [convert $build files to toolchain format])dnl
-])# _LT_PATH_CONVERSION_FUNCTIONS
diff -Nru totem-3.4.3/m4/ltoptions.m4 totem-3.6.2/m4/ltoptions.m4
--- totem-3.4.3/m4/ltoptions.m4	2012-07-03 15:47:34.000000000 +0000
+++ totem-3.6.2/m4/ltoptions.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,384 +0,0 @@
-# Helper functions for option handling.                    -*- Autoconf -*-
-#
-#   Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
-#   Inc.
-#   Written by Gary V. Vaughan, 2004
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# serial 7 ltoptions.m4
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
-
-
-# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
-# ------------------------------------------
-m4_define([_LT_MANGLE_OPTION],
-[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
-
-
-# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
-# ---------------------------------------
-# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
-# matching handler defined, dispatch to it.  Other OPTION-NAMEs are
-# saved as a flag.
-m4_define([_LT_SET_OPTION],
-[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
-m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
-        _LT_MANGLE_DEFUN([$1], [$2]),
-    [m4_warning([Unknown $1 option `$2'])])[]dnl
-])
-
-
-# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
-# ------------------------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-m4_define([_LT_IF_OPTION],
-[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
-
-
-# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
-# -------------------------------------------------------
-# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
-# are set.
-m4_define([_LT_UNLESS_OPTIONS],
-[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
-	    [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
-		      [m4_define([$0_found])])])[]dnl
-m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
-])[]dnl
-])
-
-
-# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
-# ----------------------------------------
-# OPTION-LIST is a space-separated list of Libtool options associated
-# with MACRO-NAME.  If any OPTION has a matching handler declared with
-# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
-# the unknown option and exit.
-m4_defun([_LT_SET_OPTIONS],
-[# Set options
-m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
-    [_LT_SET_OPTION([$1], _LT_Option)])
-
-m4_if([$1],[LT_INIT],[
-  dnl
-  dnl Simply set some default values (i.e off) if boolean options were not
-  dnl specified:
-  _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
-  ])
-  _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
-  ])
-  dnl
-  dnl If no reference was made to various pairs of opposing options, then
-  dnl we run the default mode handler for the pair.  For example, if neither
-  dnl `shared' nor `disable-shared' was passed, we enable building of shared
-  dnl archives by default:
-  _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
-  _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
-  _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
-  _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
-  		   [_LT_ENABLE_FAST_INSTALL])
-  ])
-])# _LT_SET_OPTIONS
-
-
-## --------------------------------- ##
-## Macros to handle LT_INIT options. ##
-## --------------------------------- ##
-
-# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
-# -----------------------------------------
-m4_define([_LT_MANGLE_DEFUN],
-[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
-
-
-# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
-# -----------------------------------------------
-m4_define([LT_OPTION_DEFINE],
-[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
-])# LT_OPTION_DEFINE
-
-
-# dlopen
-# ------
-LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
-])
-
-AU_DEFUN([AC_LIBTOOL_DLOPEN],
-[_LT_SET_OPTION([LT_INIT], [dlopen])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `dlopen' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
-
-
-# win32-dll
-# ---------
-# Declare package support for building win32 dll's.
-LT_OPTION_DEFINE([LT_INIT], [win32-dll],
-[enable_win32_dll=yes
-
-case $host in
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
-  AC_CHECK_TOOL(AS, as, false)
-  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-  AC_CHECK_TOOL(OBJDUMP, objdump, false)
-  ;;
-esac
-
-test -z "$AS" && AS=as
-_LT_DECL([], [AS],      [1], [Assembler program])dnl
-
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
-
-test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
-])# win32-dll
-
-AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-_LT_SET_OPTION([LT_INIT], [win32-dll])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `win32-dll' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
-
-
-# _LT_ENABLE_SHARED([DEFAULT])
-# ----------------------------
-# implement the --enable-shared flag, and supports the `shared' and
-# `disable-shared' LT_INIT options.
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-m4_define([_LT_ENABLE_SHARED],
-[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
-AC_ARG_ENABLE([shared],
-    [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
-	[build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_shared=yes ;;
-    no) enable_shared=no ;;
-    *)
-      enable_shared=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_shared=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
-
-    _LT_DECL([build_libtool_libs], [enable_shared], [0],
-	[Whether or not to build shared libraries])
-])# _LT_ENABLE_SHARED
-
-LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
-LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
-
-# Old names:
-AC_DEFUN([AC_ENABLE_SHARED],
-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
-])
-
-AC_DEFUN([AC_DISABLE_SHARED],
-[_LT_SET_OPTION([LT_INIT], [disable-shared])
-])
-
-AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
-AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_ENABLE_SHARED], [])
-dnl AC_DEFUN([AM_DISABLE_SHARED], [])
-
-
-
-# _LT_ENABLE_STATIC([DEFAULT])
-# ----------------------------
-# implement the --enable-static flag, and support the `static' and
-# `disable-static' LT_INIT options.
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-m4_define([_LT_ENABLE_STATIC],
-[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
-AC_ARG_ENABLE([static],
-    [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
-	[build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_static=yes ;;
-    no) enable_static=no ;;
-    *)
-     enable_static=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_static=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
-
-    _LT_DECL([build_old_libs], [enable_static], [0],
-	[Whether or not to build static libraries])
-])# _LT_ENABLE_STATIC
-
-LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
-LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
-
-# Old names:
-AC_DEFUN([AC_ENABLE_STATIC],
-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
-])
-
-AC_DEFUN([AC_DISABLE_STATIC],
-[_LT_SET_OPTION([LT_INIT], [disable-static])
-])
-
-AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
-AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_ENABLE_STATIC], [])
-dnl AC_DEFUN([AM_DISABLE_STATIC], [])
-
-
-
-# _LT_ENABLE_FAST_INSTALL([DEFAULT])
-# ----------------------------------
-# implement the --enable-fast-install flag, and support the `fast-install'
-# and `disable-fast-install' LT_INIT options.
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-m4_define([_LT_ENABLE_FAST_INSTALL],
-[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
-AC_ARG_ENABLE([fast-install],
-    [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
-    [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_fast_install=yes ;;
-    no) enable_fast_install=no ;;
-    *)
-      enable_fast_install=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_fast_install=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
-
-_LT_DECL([fast_install], [enable_fast_install], [0],
-	 [Whether or not to optimize for fast installation])dnl
-])# _LT_ENABLE_FAST_INSTALL
-
-LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
-LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
-
-# Old names:
-AU_DEFUN([AC_ENABLE_FAST_INSTALL],
-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the `fast-install' option into LT_INIT's first parameter.])
-])
-
-AU_DEFUN([AC_DISABLE_FAST_INSTALL],
-[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the `disable-fast-install' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
-dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
-
-
-# _LT_WITH_PIC([MODE])
-# --------------------
-# implement the --with-pic flag, and support the `pic-only' and `no-pic'
-# LT_INIT options.
-# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
-m4_define([_LT_WITH_PIC],
-[AC_ARG_WITH([pic],
-    [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
-	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-    [lt_p=${PACKAGE-default}
-    case $withval in
-    yes|no) pic_mode=$withval ;;
-    *)
-      pic_mode=default
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for lt_pkg in $withval; do
-	IFS="$lt_save_ifs"
-	if test "X$lt_pkg" = "X$lt_p"; then
-	  pic_mode=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [pic_mode=default])
-
-test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
-
-_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
-])# _LT_WITH_PIC
-
-LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
-LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
-
-# Old name:
-AU_DEFUN([AC_LIBTOOL_PICMODE],
-[_LT_SET_OPTION([LT_INIT], [pic-only])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `pic-only' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
-
-## ----------------- ##
-## LTDL_INIT Options ##
-## ----------------- ##
-
-m4_define([_LTDL_MODE], [])
-LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
-		 [m4_define([_LTDL_MODE], [nonrecursive])])
-LT_OPTION_DEFINE([LTDL_INIT], [recursive],
-		 [m4_define([_LTDL_MODE], [recursive])])
-LT_OPTION_DEFINE([LTDL_INIT], [subproject],
-		 [m4_define([_LTDL_MODE], [subproject])])
-
-m4_define([_LTDL_TYPE], [])
-LT_OPTION_DEFINE([LTDL_INIT], [installable],
-		 [m4_define([_LTDL_TYPE], [installable])])
-LT_OPTION_DEFINE([LTDL_INIT], [convenience],
-		 [m4_define([_LTDL_TYPE], [convenience])])
diff -Nru totem-3.4.3/m4/ltsugar.m4 totem-3.6.2/m4/ltsugar.m4
--- totem-3.4.3/m4/ltsugar.m4	2012-07-03 15:47:34.000000000 +0000
+++ totem-3.6.2/m4/ltsugar.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,123 +0,0 @@
-# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
-#
-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
-# Written by Gary V. Vaughan, 2004
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# serial 6 ltsugar.m4
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
-
-
-# lt_join(SEP, ARG1, [ARG2...])
-# -----------------------------
-# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
-# associated separator.
-# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
-# versions in m4sugar had bugs.
-m4_define([lt_join],
-[m4_if([$#], [1], [],
-       [$#], [2], [[$2]],
-       [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
-m4_define([_lt_join],
-[m4_if([$#$2], [2], [],
-       [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
-
-
-# lt_car(LIST)
-# lt_cdr(LIST)
-# ------------
-# Manipulate m4 lists.
-# These macros are necessary as long as will still need to support
-# Autoconf-2.59 which quotes differently.
-m4_define([lt_car], [[$1]])
-m4_define([lt_cdr],
-[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
-       [$#], 1, [],
-       [m4_dquote(m4_shift($@))])])
-m4_define([lt_unquote], $1)
-
-
-# lt_append(MACRO-NAME, STRING, [SEPARATOR])
-# ------------------------------------------
-# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
-# Note that neither SEPARATOR nor STRING are expanded; they are appended
-# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
-# No SEPARATOR is output if MACRO-NAME was previously undefined (different
-# than defined and empty).
-#
-# This macro is needed until we can rely on Autoconf 2.62, since earlier
-# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
-m4_define([lt_append],
-[m4_define([$1],
-	   m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
-
-
-
-# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
-# ----------------------------------------------------------
-# Produce a SEP delimited list of all paired combinations of elements of
-# PREFIX-LIST with SUFFIX1 through SUFFIXn.  Each element of the list
-# has the form PREFIXmINFIXSUFFIXn.
-# Needed until we can rely on m4_combine added in Autoconf 2.62.
-m4_define([lt_combine],
-[m4_if(m4_eval([$# > 3]), [1],
-       [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
-[[m4_foreach([_Lt_prefix], [$2],
-	     [m4_foreach([_Lt_suffix],
-		]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
-	[_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
-
-
-# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
-# -----------------------------------------------------------------------
-# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
-# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
-m4_define([lt_if_append_uniq],
-[m4_ifdef([$1],
-	  [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
-		 [lt_append([$1], [$2], [$3])$4],
-		 [$5])],
-	  [lt_append([$1], [$2], [$3])$4])])
-
-
-# lt_dict_add(DICT, KEY, VALUE)
-# -----------------------------
-m4_define([lt_dict_add],
-[m4_define([$1($2)], [$3])])
-
-
-# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
-# --------------------------------------------
-m4_define([lt_dict_add_subkey],
-[m4_define([$1($2:$3)], [$4])])
-
-
-# lt_dict_fetch(DICT, KEY, [SUBKEY])
-# ----------------------------------
-m4_define([lt_dict_fetch],
-[m4_ifval([$3],
-	m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
-    m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
-
-
-# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
-# -----------------------------------------------------------------
-m4_define([lt_if_dict_fetch],
-[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
-	[$5],
-    [$6])])
-
-
-# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
-# --------------------------------------------------------------
-m4_define([lt_dict_filter],
-[m4_if([$5], [], [],
-  [lt_join(m4_quote(m4_default([$4], [[, ]])),
-           lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
-		      [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
-])
diff -Nru totem-3.4.3/m4/ltversion.m4 totem-3.6.2/m4/ltversion.m4
--- totem-3.4.3/m4/ltversion.m4	2012-07-03 15:47:34.000000000 +0000
+++ totem-3.6.2/m4/ltversion.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-# ltversion.m4 -- version numbers			-*- Autoconf -*-
-#
-#   Copyright (C) 2004 Free Software Foundation, Inc.
-#   Written by Scott James Remnant, 2004
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# @configure_input@
-
-# serial 3337 ltversion.m4
-# This file is part of GNU Libtool
-
-m4_define([LT_PACKAGE_VERSION], [2.4.2])
-m4_define([LT_PACKAGE_REVISION], [1.3337])
-
-AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4.2'
-macro_revision='1.3337'
-_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
-_LT_DECL(, macro_revision, 0)
-])
diff -Nru totem-3.4.3/m4/lt~obsolete.m4 totem-3.6.2/m4/lt~obsolete.m4
--- totem-3.4.3/m4/lt~obsolete.m4	2012-07-03 15:47:34.000000000 +0000
+++ totem-3.6.2/m4/lt~obsolete.m4	1970-01-01 00:00:00.000000000 +0000
@@ -1,98 +0,0 @@
-# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
-#
-#   Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
-#   Written by Scott James Remnant, 2004.
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# serial 5 lt~obsolete.m4
-
-# These exist entirely to fool aclocal when bootstrapping libtool.
-#
-# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
-# which have later been changed to m4_define as they aren't part of the
-# exported API, or moved to Autoconf or Automake where they belong.
-#
-# The trouble is, aclocal is a bit thick.  It'll see the old AC_DEFUN
-# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
-# using a macro with the same name in our local m4/libtool.m4 it'll
-# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
-# and doesn't know about Autoconf macros at all.)
-#
-# So we provide this file, which has a silly filename so it's always
-# included after everything else.  This provides aclocal with the
-# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
-# because those macros already exist, or will be overwritten later.
-# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. 
-#
-# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
-# Yes, that means every name once taken will need to remain here until
-# we give up compatibility with versions before 1.7, at which point
-# we need to keep only those names which we still refer to.
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
-
-m4_ifndef([AC_LIBTOOL_LINKER_OPTION],	[AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
-m4_ifndef([AC_PROG_EGREP],		[AC_DEFUN([AC_PROG_EGREP])])
-m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
-m4_ifndef([_LT_AC_SHELL_INIT],		[AC_DEFUN([_LT_AC_SHELL_INIT])])
-m4_ifndef([_LT_AC_SYS_LIBPATH_AIX],	[AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
-m4_ifndef([_LT_PROG_LTMAIN],		[AC_DEFUN([_LT_PROG_LTMAIN])])
-m4_ifndef([_LT_AC_TAGVAR],		[AC_DEFUN([_LT_AC_TAGVAR])])
-m4_ifndef([AC_LTDL_ENABLE_INSTALL],	[AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
-m4_ifndef([AC_LTDL_PREOPEN],		[AC_DEFUN([AC_LTDL_PREOPEN])])
-m4_ifndef([_LT_AC_SYS_COMPILER],	[AC_DEFUN([_LT_AC_SYS_COMPILER])])
-m4_ifndef([_LT_AC_LOCK],		[AC_DEFUN([_LT_AC_LOCK])])
-m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE],	[AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
-m4_ifndef([_LT_AC_TRY_DLOPEN_SELF],	[AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
-m4_ifndef([AC_LIBTOOL_PROG_CC_C_O],	[AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
-m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
-m4_ifndef([AC_LIBTOOL_OBJDIR],		[AC_DEFUN([AC_LIBTOOL_OBJDIR])])
-m4_ifndef([AC_LTDL_OBJDIR],		[AC_DEFUN([AC_LTDL_OBJDIR])])
-m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
-m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP],	[AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
-m4_ifndef([AC_PATH_MAGIC],		[AC_DEFUN([AC_PATH_MAGIC])])
-m4_ifndef([AC_PROG_LD_GNU],		[AC_DEFUN([AC_PROG_LD_GNU])])
-m4_ifndef([AC_PROG_LD_RELOAD_FLAG],	[AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
-m4_ifndef([AC_DEPLIBS_CHECK_METHOD],	[AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
-m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
-m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
-m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
-m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS],	[AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
-m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP],	[AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
-m4_ifndef([LT_AC_PROG_EGREP],		[AC_DEFUN([LT_AC_PROG_EGREP])])
-m4_ifndef([LT_AC_PROG_SED],		[AC_DEFUN([LT_AC_PROG_SED])])
-m4_ifndef([_LT_CC_BASENAME],		[AC_DEFUN([_LT_CC_BASENAME])])
-m4_ifndef([_LT_COMPILER_BOILERPLATE],	[AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
-m4_ifndef([_LT_LINKER_BOILERPLATE],	[AC_DEFUN([_LT_LINKER_BOILERPLATE])])
-m4_ifndef([_AC_PROG_LIBTOOL],		[AC_DEFUN([_AC_PROG_LIBTOOL])])
-m4_ifndef([AC_LIBTOOL_SETUP],		[AC_DEFUN([AC_LIBTOOL_SETUP])])
-m4_ifndef([_LT_AC_CHECK_DLFCN],		[AC_DEFUN([_LT_AC_CHECK_DLFCN])])
-m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER],	[AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
-m4_ifndef([_LT_AC_TAGCONFIG],		[AC_DEFUN([_LT_AC_TAGCONFIG])])
-m4_ifndef([AC_DISABLE_FAST_INSTALL],	[AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
-m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
-m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
-m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
-m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
-m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
-m4_ifndef([_LT_AC_LANG_CXX_CONFIG],	[AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
-m4_ifndef([_LT_AC_LANG_F77_CONFIG],	[AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
-m4_ifndef([_LT_AC_LANG_GCJ_CONFIG],	[AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
-m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
-m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
-m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
-m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS],	[AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
-m4_ifndef([_LT_AC_PROG_CXXCPP],		[AC_DEFUN([_LT_AC_PROG_CXXCPP])])
-m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS],	[AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
-m4_ifndef([_LT_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
-m4_ifndef([_LT_PROG_F77],		[AC_DEFUN([_LT_PROG_F77])])
-m4_ifndef([_LT_PROG_FC],		[AC_DEFUN([_LT_PROG_FC])])
-m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])
diff -Nru totem-3.4.3/po/LINGUAS totem-3.6.2/po/LINGUAS
--- totem-3.4.3/po/LINGUAS	2012-01-10 16:10:03.000000000 +0000
+++ totem-3.6.2/po/LINGUAS	2012-10-25 13:15:32.000000000 +0000
@@ -43,6 +43,7 @@
 ja
 ka
 kk
+km
 kn
 ko
 ku
diff -Nru totem-3.4.3/po/POTFILES.in totem-3.6.2/po/POTFILES.in
--- totem-3.4.3/po/POTFILES.in	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/po/POTFILES.in	2012-10-25 13:15:32.000000000 +0000
@@ -1,19 +1,24 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
 [encoding: UTF-8]
+browser-plugin/totem-plugin-viewer.c
 [type: gettext/glade]data/fullscreen.ui
+data/org.gnome.totem.gschema.xml.in.in
 [type: gettext/glade]data/playlist.ui
+[type: gettext/glade]data/preferences.ui
 [type: gettext/glade]data/properties.ui
-[type: gettext/glade]data/video-list.ui
 data/totem.desktop.in.in.in
 [type: gettext/glade]data/totem.ui
-data/org.gnome.totem.gschema.xml.in.in
 [type: gettext/glade]data/uri.ui
+[type: gettext/glade]data/video-list.ui
+src/backend/bacon-video-widget.c
 src/eggdesktopfile.c
 src/eggfileformatchooser.c
 src/eggsmclient.c
+src/gst/totem-time-helpers.c
 src/properties/bacon-video-widget-properties.c
 src/totem-audio-preview.c
+src/totem.c
 src/totem-cell-renderer-video.c
 src/totem-dnd-menu.c
 src/totem-fullscreen.c
@@ -29,68 +34,58 @@
 src/totem-sidebar.c
 src/totem-statusbar.c
 src/totem-subtitle-encoding.c
-src/totem-video-list.c
-src/totem-video-thumbnailer.c
 src/totem-time-label.c
 src/totem-uri.c
-src/totem.c
-src/backend/bacon-video-widget-gst-0.10.c
-src/backend/video-utils.c
-src/plugins/totem-plugins-engine.c
-src/plugins/brasero-disc-recorder/totem-disc-recorder.c
+src/totem-video-list.c
+src/totem-video-thumbnailer.c
+[type: gettext/ini]src/plugins/apple-trailers/apple-trailers.plugin.in
+[type: gettext/ini]src/plugins/autoload-subtitles/autoload-subtitles.plugin.in
 [type: gettext/ini]src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in
-[type: gettext/ini]src/plugins/chapters/chapters.plugin.in
+src/plugins/brasero-disc-recorder/totem-disc-recorder.c
 [type: gettext/glade]src/plugins/chapters/chapters-edit.ui
 [type: gettext/glade]src/plugins/chapters/chapters-list.ui
+[type: gettext/ini]src/plugins/chapters/chapters.plugin.in
 src/plugins/chapters/totem-chapters.c
 src/plugins/chapters/totem-cmml-parser.c
 src/plugins/chapters/totem-edit-chapter.c
 [type: gettext/ini]src/plugins/dbusservice/dbusservice.plugin.in
 src/plugins/dbusservice/dbusservice.py
-[type: gettext/ini]src/plugins/im-status/totem-im-status.plugin.in
-src/plugins/im-status/totem-im-status.c
+[type: gettext/ini]src/plugins/grilo/grilo.plugin.in
+[type: gettext/glade]src/plugins/grilo/grilo.ui
+src/plugins/grilo/totem-grilo.c
 [type: gettext/ini]src/plugins/gromit/gromit.plugin.in
 src/plugins/gromit/totem-gromit.c
-[type: gettext/ini]src/plugins/iplayer/iplayer.plugin.in
-src/plugins/iplayer/iplayer.py
-src/plugins/iplayer/iplayer2.py
-[type: gettext/glade]src/plugins/iplayer/iplayer.ui
+src/plugins/im-status/totem-im-status.c
+[type: gettext/ini]src/plugins/im-status/totem-im-status.plugin.in
 [type: gettext/ini]src/plugins/lirc/lirc.plugin.in
 src/plugins/lirc/totem-lirc.c
 [type: gettext/ini]src/plugins/media-player-keys/media-player-keys.plugin.in
-[type: gettext/glade]src/plugins/opensubtitles/opensubtitles.ui
+[type: gettext/ini]src/plugins/ontop/ontop.plugin.in
 [type: gettext/ini]src/plugins/opensubtitles/opensubtitles.plugin.in
 src/plugins/opensubtitles/opensubtitles.py
+[type: gettext/glade]src/plugins/opensubtitles/opensubtitles.ui
 src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in
-[type: gettext/ini]src/plugins/ontop/ontop.plugin.in
-src/plugins/properties/totem-movie-properties.c
 [type: gettext/ini]src/plugins/properties/movie-properties.plugin.in
-src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in
-src/plugins/publish/totem-publish.c
-[type: gettext/ini]src/plugins/publish/publish.plugin.in
-[type: gettext/glade]src/plugins/publish/publish-plugin.ui
+src/plugins/properties/totem-movie-properties.c
 src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in
+[type: gettext/ini]src/plugins/pythonconsole/pythonconsole.plugin.in
+src/plugins/pythonconsole/pythonconsole.py
+[type: gettext/ini]src/plugins/recent/recent.plugin.in
 [type: gettext/ini]src/plugins/rotation/rotation.plugin.in
 src/plugins/rotation/totem-rotation-plugin.vala
+[type: gettext/ini]src/plugins/save-file/save-file.plugin.in
 src/plugins/save-file/totem-save-file.c
 [type: gettext/ini]src/plugins/screensaver/screensaver.plugin.in
 src/plugins/screensaver/totem-screensaver.c
-[type: gettext/ini]src/plugins/screenshot/screenshot.plugin.in
 [type: gettext/glade]src/plugins/screenshot/gallery.ui
-[type: gettext/glade]src/plugins/screenshot/gnome-screenshot.ui
-src/plugins/screenshot/gnome-screenshot-widget.c
+src/plugins/screenshot/screenshot-filename-builder.c
+[type: gettext/ini]src/plugins/screenshot/screenshot.plugin.in
 src/plugins/screenshot/totem-gallery.c
 src/plugins/screenshot/totem-gallery-progress.c
-src/plugins/screenshot/totem-screenshot.c
 src/plugins/screenshot/totem-screenshot-plugin.c
 [type: gettext/ini]src/plugins/skipto/skipto.plugin.in
+[type: gettext/glade]src/plugins/skipto/skipto.ui
 src/plugins/skipto/totem-skipto.c
 src/plugins/skipto/totem-skipto-plugin.c
 src/plugins/skipto/totem-time-entry.c
-[type: gettext/glade]src/plugins/skipto/skipto.ui
-browser-plugin/totem-plugin-viewer.c
-[type: gettext/ini]src/plugins/pythonconsole/pythonconsole.plugin.in
-src/plugins/pythonconsole/pythonconsole.py
-[type: gettext/ini]src/plugins/grilo/grilo.plugin.in
-src/plugins/grilo/totem-grilo.c
-[type: gettext/glade] src/plugins/grilo/grilo.ui
+src/plugins/totem-plugins-engine.c
diff -Nru totem-3.4.3/po/POTFILES.skip totem-3.6.2/po/POTFILES.skip
--- totem-3.4.3/po/POTFILES.skip	2012-01-10 16:10:03.000000000 +0000
+++ totem-3.6.2/po/POTFILES.skip	2012-08-29 23:07:45.000000000 +0000
@@ -14,7 +14,6 @@
 src/backend/gstscreenshot.c
 src/totem-video-indexer.c
 src/totem-video-thumbnailer.c
-src/plugins/iplayer/httplib2.py
 src/plugins/jamendo/org.gnome.totem.plugins.jamendo.gschema.xml.in
 src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in
 src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in
diff -Nru totem-3.4.3/po/as.po totem-3.6.2/po/as.po
--- totem-3.4.3/po/as.po	2012-04-02 14:15:40.000000000 +0000
+++ totem-3.6.2/po/as.po	2012-10-25 13:15:32.000000000 +0000
@@ -10,23 +10,235 @@
 "Project-Id-Version: as\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
 "cgi?product=totem&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-03-23 06:16+0000\n"
-"PO-Revision-Date: 2012-03-23 18:33+0530\n"
+"POT-Creation-Date: 2012-07-20 12:35+0000\n"
+"PO-Revision-Date: 2012-07-20 18:31+0530\n"
 "Last-Translator: Nilamdyuti Goswami \n"
 "Language-Team: as_IN \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1)\n"
 "X-Generator: Lokalize 1.0\n"
 
+#: ../browser-plugin/totem-plugin-viewer.c:352 ../src/totem-object.c:1180
+#: ../src/totem-object.c:1650 ../src/totem-statusbar.c:115
+msgid "Stopped"
+msgstr "বন্ধ"
+
+#: ../browser-plugin/totem-plugin-viewer.c:364 ../src/totem-object.c:1173
+msgid "Paused"
+msgstr "স্থগিত"
+
+#: ../browser-plugin/totem-plugin-viewer.c:368 ../src/totem-object.c:1166
+msgid "Playing"
+msgstr "চলোৱা হৈছে"
+
+#: ../browser-plugin/totem-plugin-viewer.c:386
+#: ../src/plugins/screensaver/totem-screensaver.c:97
+msgid "Playing a movie"
+msgstr "চলচিত্ৰ চলোৱা হৈছে"
+
+#: ../browser-plugin/totem-plugin-viewer.c:443
+msgid "No URI to play"
+msgstr "চলোৱাৰ বাবে কোনো URI নাই"
+
+#: ../browser-plugin/totem-plugin-viewer.c:676
+#: ../browser-plugin/totem-plugin-viewer.c:1700
+msgid "Totem Movie Player"
+msgstr "Totem চলচিত্ৰ প্লেয়াৰ"
+
+#. translators: this is:
+#. * Open With ApplicationName
+#. * as in nautilus' right-click menu
+#: ../browser-plugin/totem-plugin-viewer.c:1120
+#, c-format
+msgid "_Open with \"%s\""
+msgstr "\"%s\" সহযোগে খোলক (_O)"
+
+#: ../browser-plugin/totem-plugin-viewer.c:1341 ../src/totem-object.c:2475
+msgid "An error occurred"
+msgstr "ত্ৰুটি উৎপন্ন হৈছে"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2033
+msgid "No playlist or playlist empty"
+msgstr "প্লেলিস্ট পৰিষ্কাৰ অথবা অনুপস্থিত"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2128
+msgid "Movie browser plugin"
+msgstr "চলচিত্ৰ ব্ৰাউজাৰ প্লাগিন"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144 ../src/totem.c:239
+msgid "Could not initialize the thread-safe libraries."
+msgstr "থ্ৰেড-চেইফ লাইব্ৰৰি চলোৱা নাযায়।"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144
+msgid "Verify your system installation. The Totem plugin will now exit."
+msgstr "আপোনাৰ চিস্টেমৰ ইনস্টলেষণ পৰীক্ষা কৰক। Totem প্লাগিন এতিয়া বন্ধ কৰা হ'ব।"
+
 #: ../data/fullscreen.ui.h:1
 msgid "Leave Fullscreen"
-msgstr "পূৰ্ণপৰ্দা মোড ত্যাগ কৰক"
+msgstr "পূৰ্ণপৰ্দা ত্যাগ কৰক"
 
-#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:144
+#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:81
 msgid "Time:"
-msgstr "অতিবাহিত সময়:"
+msgstr "সময়:"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
+msgid "Allow the screensaver to activate when playing audio"
+msgstr "অডিঅ' চলোৱাৰ সময় স্ক্ৰিনছেভাৰ সক্ৰিয় কৰাৰ অনুমতি দিয়ক"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
+msgid ""
+"Allow the screensaver to activate when playing audio. Disable if you have "
+"monitor-powered speakers."
+msgstr ""
+"অডিঅ' চলোৱাৰ সময় স্ক্ৰিনছেভাৰ সক্ৰিয় কৰাৰ অনুমতি দিয়ক। মনিটৰ চালিত স্পিকাৰৰ "
+"ক্ষেত্ৰত এইটো অসামৰ্থবান কৰক।"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
+msgid "Show visual effects when no video is displayed"
+msgstr "কোনো ভিডিঅ' প্ৰদৰ্শন না কৰা হ'লে দৃশ্যমান প্ৰভাৱ দেখুৱাওক"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
+msgid "Show visual effects when playing an audio only file."
+msgstr "কেৱল অডিঅ' লগত নথিপত্ৰ চলোৱা হ'লে দৃশ্যমান প্ৰভাৱ দেখুৱাওক।"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
+msgid "Name of the visual effects plugin"
+msgstr "দৃশ্যমান প্ৰভাৱ প্লাগিনৰ নাম"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
+msgid "The brightness of the video"
+msgstr "ভিডিঅ'ৰ উজ্জ্বলতাৰ মাত্ৰা"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
+msgid "The contrast of the video"
+msgstr "ভিডিঅ'ৰ কনট্ৰাস্টৰ মাত্ৰা"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
+msgid "The hue of the video"
+msgstr "ভিডিঅ'ৰ হিউ ৰ মাত্ৰা"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
+msgid "The saturation of the video"
+msgstr "ভিডিঅ'ৰ সংপৃক্তকৰন মাত্ৰা"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
+msgid "Resize the canvas automatically on file load"
+msgstr "নথিপত্ৰ ল'ড হ'লে স্বচালিতভাবে কেনভাচৰ মাপ পুনৰআকাৰ কৰা হব"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
+msgid "Repeat mode"
+msgstr "পুনৰাবৃত্তি অৱস্থা"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
+msgid "Shuffle mode"
+msgstr "সানমিহলি অৱস্থা"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
+msgid "Whether to disable deinterlacing for interlaced movies"
+msgstr "সংযুক্ত চলচিত্ৰসমূহৰ কাৰণে অসংযুক্তকৰন অসামৰ্থবান কৰা হব নে"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
+msgid "Whether to enable debug for the playback engine"
+msgstr "প্লেবেক ইঞ্জিনৰ বাবে ডিবাগ সামৰ্থবান কৰা হব নে"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
+msgid "Type of audio output to use"
+msgstr "ব্যৱহাৰৰ বাবে অডিঅ' আউটপুটৰ ধৰণ"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
+msgid "Visualization quality setting"
+msgstr "কল্পনাকৰন বৈশিষ্ট্য সংহতি"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
+msgid "Quality setting for the audio visualization."
+msgstr "অডিঅ' কল্পনাকৰনৰ বাবে বৈশিষ্ট সংহতি।"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
+msgid "Network buffering threshold"
+msgstr "নেটৱৰ্ক বাফাৰৰ ডেউৰী"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
+msgid ""
+"Amount of data to buffer for network streams before starting to display the "
+"stream (in seconds)."
+msgstr ""
+"নেটৱৰ্ক স্ট্ৰিমৰ ক্ষেত্ৰত স্ট্ৰিম প্ৰদৰ্শনৰ পূৰ্বে যি পৰিমান তথ্য বাফাৰ কৰা হ'ব "
+"(ছেকেণ্ডত)।"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
+msgid "Subtitle font"
+msgstr "উপশীৰ্ষকসমূহৰ ফন্ট"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
+msgid "Pango font description for subtitle rendering."
+msgstr "উপশীৰ্ষকসমূহত ৰেন্ডাৰিং ৰ বাবে Pango ফন্টৰ বিবৰণ"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
+msgid "Subtitle encoding"
+msgstr "উপশীৰ্ষকসমূহৰ এনক'ডিং"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
+msgid "Encoding character set for subtitle."
+msgstr "উপশীৰ্ষকসমূহত ব্যৱহৃত এনক'ডিং"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
+msgid "Default location for the \"Open...\" dialogs"
+msgstr "\"খোলক...\" ডাইলগসমূহৰ ক্ষেত্ৰত নিৰ্ধাৰিত অবিকল্পিত অৱস্থান"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
+msgid ""
+"Default location for the \"Open...\" dialogs. Default is the current "
+"directory."
+msgstr ""
+"\"খোলক...\" ডাইলগসমূহৰ ক্ষেত্ৰত নিৰ্ধাৰিত অবিকল্পিত অৱস্থান, বৰ্তমান ডাইৰেকটৰি "
+"অবিকল্পিত ৰূপে চিহ্নিত হয়"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
+msgid "Default location for the \"Take Screenshot\" dialogs"
+msgstr "\"স্ক্ৰিনশ্বট লওক\" শীৰ্ষক ডাইলগৰ অবিকল্পিত অৱস্থান"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
+msgid ""
+"Default location for the \"Take Screenshot\" dialogs. Default is the "
+"Pictures directory."
+msgstr ""
+"\"স্ক্ৰিনশ্বট লওক\" শীৰ্ষক ডাইলগৰ অবিকল্পিত অৱস্থান। অবিকল্পিতৰূপে Pictures "
+"ডাইৰেকটৰি চিহ্নিত কৰা হয়।"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
+msgid "Whether to disable the plugins in the user's home directory"
+msgstr "ব্যৱহাৰকাৰীৰ ডাইৰেকটৰিত প্লাগিন অসামৰ্থবান কৰা হ'ব নে"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
+msgid "Whether to disable the keyboard shortcuts"
+msgstr "কিবৰ্ড চৰ্টকাটসমূহ অসামৰ্থবান কৰা হব নে"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
+msgid "Whether to autoload text subtitle files when a movie is loaded"
+msgstr "এটা চলচিত্ৰ ল'ড হওতে লিখনী উপশীৰ্ষক স্বল'ড কৰা হব নে"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
+msgid "Whether to autoload external chapter files when a movie is loaded"
+msgstr "যেতিয়া এটা চলচিত্ৰ ল'ড হয় বহিৰ্তম পাঠ নথিপত্ৰসমূহ স্বচালিতভাৱে ল'ড হব নে"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
+msgid ""
+"Whether to remember the position of played audio/video files when pausing or "
+"closing them"
+msgstr "চলমান অডিঅ'/ভিডিঅ' স্থগিত অথবা বন্ধ কৰা হ'লে, ব্যাঘাতৰ স্থান মনত ৰখা হ'ব নে।"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
+msgid "Active plugins list"
+msgstr "সক্ৰিয় প্লাগিনসমূহৰ তালিকা"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+msgid ""
+"A list of the names of the plugins which are currently active (loaded and "
+"running)."
+msgstr "বৰ্তমানে সক্ৰিয় হৈ থকা প্লাগিনসমূহৰ নামৰ তালিকা (ল'ড হৈ থকা আৰু চলি থকা)।"
 
 #: ../data/playlist.ui.h:1
 msgid "_Remove"
@@ -38,23 +250,23 @@
 
 #: ../data/playlist.ui.h:3 ../data/video-list.ui.h:3
 msgid "_Copy Location"
-msgstr "অৱস্থান নকল কৰক(_C)"
+msgstr "অৱস্থান কপি কৰক (_C)"
 
 #: ../data/playlist.ui.h:4 ../data/video-list.ui.h:4
 msgid "Copy the location to the clipboard"
-msgstr "নিৰ্বাচিত অৱস্থান ক্লিপ-বোৰ্ডত নকল কৰক"
+msgstr "নিৰ্বাচিত অৱস্থান ক্লিপবৰ্ডত কপি কৰক"
 
-#: ../data/playlist.ui.h:5 ../data/totem.ui.h:78
+#: ../data/playlist.ui.h:5 ../data/totem.ui.h:71
 msgid "_Select Text Subtitles..."
-msgstr "অনুবাদলিপিৰ লিখনি নিৰ্বাচন কৰক...(_S)"
+msgstr "লিখনী উপশীৰ্ষকসমূহ বাছক...(_S)"
 
-#: ../data/playlist.ui.h:6 ../data/totem.ui.h:79
+#: ../data/playlist.ui.h:6 ../data/totem.ui.h:72
 msgid "Select a file to use for text subtitles"
-msgstr "a নথিপত্ৰ উল্লিখিত সময় অবধি"
+msgstr "লিখনী উপশীৰ্ষকসমূহৰ বাবে ব্যৱহাৰ কৰিবলে এটা নথিপত্ৰ বাছক"
 
 #: ../data/playlist.ui.h:7
 msgid "Add..."
-msgstr "যোগ কৰক."
+msgstr "যোগ কৰক..."
 
 #: ../data/playlist.ui.h:8
 msgid "Remove"
@@ -62,31 +274,186 @@
 
 #: ../data/playlist.ui.h:9
 msgid "Save Playlist..."
-msgstr "সংৰক্ষণ কৰক প্লে-লিস্ট."
+msgstr "প্লেলিস্ট সংৰক্ষণ কৰক..."
 
 #: ../data/playlist.ui.h:10
 msgid "Move Up"
-msgstr "উপৰলৈ"
+msgstr "ওপৰলৈ স্থানান্তৰ কৰক"
 
 #: ../data/playlist.ui.h:11
 msgid "Move Down"
-msgstr "তললৈ নিয়ক"
+msgstr "তললৈ স্থানান্তৰ কৰক"
+
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:2
+msgid "Normal"
+msgstr "স্বাভাবিক"
+
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:4
+msgid "Large"
+msgstr "বৃহৎ"
+
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:6
+msgid "Extra Large"
+msgstr "অতি বৃহৎ"
+
+#: ../data/preferences.ui.h:7 ../src/backend/bacon-video-widget.c:5498
+#: ../src/totem-properties-view.c:231
+msgid "Stereo"
+msgstr "স্টিৰিও"
+
+#: ../data/preferences.ui.h:8
+msgid "4-channel"
+msgstr "4-চেনেল"
+
+#: ../data/preferences.ui.h:9
+msgid "4.1-channel"
+msgstr "4.1-চেনেল"
+
+#: ../data/preferences.ui.h:10
+msgid "5.0-channel"
+msgstr "5.0-চেনেল"
+
+#: ../data/preferences.ui.h:11
+msgid "5.1-channel"
+msgstr "5.1-চেনেল"
+
+#: ../data/preferences.ui.h:12
+msgid "AC3 Passthrough"
+msgstr "AC3 পাছথ্ৰু"
+
+#: ../data/preferences.ui.h:13
+msgid "Totem Preferences"
+msgstr "Totem পছন্দসমূহ"
+
+#: ../data/preferences.ui.h:14
+msgid "Playback"
+msgstr "চলাওক"
+
+#: ../data/preferences.ui.h:15
+msgid "Start playing files from last position"
+msgstr "সৰ্বশেষ স্থানৰ পৰা আৰম্ভ কৰি নথিপত্ৰ চলাওক"
+
+#: ../data/preferences.ui.h:16
+msgid "Text Subtitles"
+msgstr "লিখনী উপশীৰ্ষকসমূহ"
+
+#: ../data/preferences.ui.h:17
+msgid "_Load subtitle files when movie is loaded"
+msgstr "চলচিত্ৰ ল'ড হৈ গলে উপশীৰ্ষক নথিপত্ৰসমূহ ল'ড কৰক (_L)"
+
+#: ../data/preferences.ui.h:18
+msgid "_Font:"
+msgstr "ফন্ট (_F):"
+
+#: ../data/preferences.ui.h:19
+msgid "_Encoding:"
+msgstr "এনক'ডিং (_E):"
 
-#: ../data/properties.ui.h:1 ../data/totem.ui.h:122
+#: ../data/preferences.ui.h:20
+msgid "External Chapters"
+msgstr "বহিৰ্তম পাঠসমূহ"
+
+#: ../data/preferences.ui.h:21
+msgid "Load _chapter files when movie is loaded"
+msgstr "চলচিত্ৰ ল'ড হৈ গলে পাঠ নথিপত্ৰসমূহ ল'ড কৰক (_c)"
+
+#: ../data/preferences.ui.h:22 ../data/properties.ui.h:1
 msgid "General"
 msgstr "সাধাৰণ"
 
+#. Tab label in the Preferences dialogue
+#: ../data/preferences.ui.h:24
+msgid "Display"
+msgstr "প্ৰদৰ্শন"
+
+#: ../data/preferences.ui.h:25
+msgid "_Resize the window when a new video is loaded"
+msgstr "যেতিয়া এটা নতুন ভিডিঅ' ল'ড হয় তেতিয়া উইন্ডোটো পুনৰ আকাৰ দিয়ক (_R)"
+
+#: ../data/preferences.ui.h:26
+msgid "Disable _deinterlacing of interlaced videos"
+msgstr "সংযুক্ত ভিডিঅ'সমূহৰ অসংযুক্তকৰন অসামৰ্থবান কৰক (_d)"
+
+#: ../data/preferences.ui.h:27
+msgid "Disable screensaver when playing "
+msgstr "চলোৱাৰ সময়ত স্ক্ৰিনচেভাৰ অসামৰ্থবান কৰক "
+
+#: ../data/preferences.ui.h:28 ../data/properties.ui.h:9
+#: ../src/totem-properties-view.c:273
+msgid "Video"
+msgstr "ভিডিঅ'"
+
+#: ../data/preferences.ui.h:29
+msgid "Video or Audio"
+msgstr "ভিডিঅ' বা অডিঅ'"
+
+#: ../data/preferences.ui.h:30
+msgid "Visual Effects"
+msgstr "দৃশ্যমান প্ৰভাৱসমূহ"
+
+#: ../data/preferences.ui.h:31
+msgid "Show _visual effects when an audio file is played"
+msgstr "এটা অডিঅ' নথিপত্ৰ চলোৱাৰ সময়ত দৃশ্যমান প্ৰভাৱসমূহ দেখুৱাওক (_v)"
+
+#: ../data/preferences.ui.h:32
+msgid "_Type of visualization:"
+msgstr "কল্পনাকৰনৰ ধৰণ (_T):"
+
+#: ../data/preferences.ui.h:33
+msgid "Visualization _size:"
+msgstr "কল্পনাকৰনৰ আকাৰ (_s):"
+
+#: ../data/preferences.ui.h:34
+msgid "Color Balance"
+msgstr "ৰঙৰ ভাৰসাম্যতা"
+
+#: ../data/preferences.ui.h:35
+msgid "_Brightness:"
+msgstr "উজ্জ্বলতা (_B):"
+
+#: ../data/preferences.ui.h:36
+msgid "Co_ntrast:"
+msgstr "কনট্ৰাস্ট (_n):"
+
+#: ../data/preferences.ui.h:37
+msgid "Sat_uration:"
+msgstr "সংপৃক্তকৰণ (_u):"
+
+#: ../data/preferences.ui.h:38
+msgid "_Hue:"
+msgstr "হিউ (_H):"
+
+#: ../data/preferences.ui.h:39
+msgid "Reset to _Defaults"
+msgstr "অবিকল্পিতলে পুনৰ সংহতি কৰক (_D)"
+
+#: ../data/preferences.ui.h:40
+msgid "Audio Output"
+msgstr "অডিঅ' আউটপুট"
+
+#: ../data/preferences.ui.h:41
+msgid "_Audio output type:"
+msgstr "অডিঅ' আউটপুট ধৰণ:"
+
+#: ../data/preferences.ui.h:42 ../data/properties.ui.h:14
+#: ../src/totem-properties-view.c:271
+msgid "Audio"
+msgstr "অডিঅ'"
+
 #: ../data/properties.ui.h:2
 msgid "Title:"
-msgstr "Title:"
+msgstr "শীৰ্ষক:"
 
 #: ../data/properties.ui.h:3
 msgid "Artist:"
-msgstr "Artist:"
+msgstr "শিল্পী:"
 
 #: ../data/properties.ui.h:4
 msgid "Duration:"
-msgstr "Duration:"
+msgstr "অৱধি:"
 
 #: ../data/properties.ui.h:5
 msgid "Year:"
@@ -94,784 +461,478 @@
 
 #: ../data/properties.ui.h:6
 msgid "Album:"
-msgstr "Album:"
+msgstr "এলবাম:"
 
 #: ../data/properties.ui.h:7
 msgid "Comment:"
-msgstr "বক্তব্য:"
+msgstr "মন্তব্য:"
 
 #: ../data/properties.ui.h:8
 msgid "Container:"
 msgstr "বৈয়াম:"
 
-#: ../data/properties.ui.h:9 ../data/totem.ui.h:128
-#: ../src/totem-properties-view.c:270
-msgid "Video"
-msgstr "ভিডিঅ'"
-
 #: ../data/properties.ui.h:10
 msgid "Dimensions:"
 msgstr "মাত্ৰা:"
 
 #: ../data/properties.ui.h:11
 msgid "Codec:"
-msgstr "Codec:"
+msgstr "ক'ডেক:"
 
 #: ../data/properties.ui.h:12
 msgid "Framerate:"
-msgstr "Framerate:"
+msgstr "ফ্ৰেইমৰেইট:"
 
 #: ../data/properties.ui.h:13
 msgid "Bitrate:"
-msgstr "Bitrate:"
-
-#: ../data/properties.ui.h:14 ../data/totem.ui.h:142
-#: ../src/totem-properties-view.c:268
-msgid "Audio"
-msgstr "অডিঅ'"
+msgstr "বিটৰেইট:"
 
 #: ../data/properties.ui.h:15
 msgid "Sample rate:"
-msgstr "Sample rate:"
+msgstr "নমুনা হাৰ:"
 
 #: ../data/properties.ui.h:16
 msgid "Channels:"
-msgstr "Channels:"
-
-#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
-msgid "_Add to Playlist"
-msgstr "যোগ কৰক প্লে-লিস্ট"
-
-#: ../data/video-list.ui.h:2
-msgid "Add the video to the playlist"
-msgstr "যোগ কৰক"
+msgstr "চেনেলসমূহ:"
 
 #. Title
-#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:143
-#: ../src/totem-object.c:1667
-msgid "Movie Player"
-msgstr "মুভি প্লেয়াৰ"
+#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:80 ../src/totem.c:238
+#: ../src/totem.c:247 ../src/totem-menu.c:790 ../src/totem-object.c:1658
+msgid "Videos"
+msgstr "Videos"
 
 #: ../data/totem.desktop.in.in.in.h:2
-msgid "Play movies and songs"
-msgstr "চলচ্চিত্ৰ ও সংগীত পৰিবেশন"
+msgid "Play movies"
+msgstr "চলচিত্ৰসমূহ চলাওক"
+
+#: ../data/totem.desktop.in.in.in.h:3
+msgid "Video;Movie;Film;Clip;Series;Player;DVD;TV;Disc;"
+msgstr "ভিডিঅ';চলচিত্ৰ;চলচিত্ৰ;ক্লিপ;ক্ৰম;প্লেয়াৰ;DVD;TV;ডিস্ক;"
 
 #: ../data/totem.ui.h:1
-msgid "_Movie"
-msgstr "চলচ্চিত্ৰ (_M)"
+msgid "_Open"
+msgstr "খোলক (_O)"
 
 #: ../data/totem.ui.h:2
-msgid "_Open..."
-msgstr "খোলক(_O)..."
+msgid "Open _Location"
+msgstr "অৱস্থান খোলক (_L)"
 
 #: ../data/totem.ui.h:3
-msgid "Open a file"
-msgstr "এটা নথিপত্ৰ খোলো"
+msgid "_Fullscreen"
+msgstr "পূৰ্ণপৰ্দা (_F)"
 
 #: ../data/totem.ui.h:4
-msgid "Open _Location..."
-msgstr "নিৰ্দিষ্ট অৱস্থান খোলক (_L)..."
+msgid "Prefere_nces"
+msgstr "পছন্দসমূহ (_n)"
 
 #: ../data/totem.ui.h:5
-msgid "Open a non-local file"
-msgstr "স্থানীয় অৱস্থান বহিৰ্ভূত নথিপত্ৰ খোলক"
+msgid "Shuff_le"
+msgstr "সানমিহলি (_l)"
 
 #: ../data/totem.ui.h:6
-msgid "_Eject"
-msgstr "বহিষ্কাৰ (_E)"
+msgid "_Repeat"
+msgstr "পুনৰাবৃত্তি (_R)"
 
 #: ../data/totem.ui.h:7
-msgid "Eject the current disc"
-msgstr "বৰ্তমান ডিস্ক বাহিৰ কৰক"
+msgid "_Quit"
+msgstr "প্ৰস্থান কৰক (_Q)"
 
 #: ../data/totem.ui.h:8
-msgid "_Properties"
-msgstr "বৈশিষ্টেবলী (_P)"
+msgid "_Movie"
+msgstr "চলচিত্ৰ (_M)"
 
 #: ../data/totem.ui.h:9
-msgid "View the properties of the current stream"
-msgstr "বৰ্তমানে স্ট্ৰিমৰ বৈশিষ্ট্য প্ৰদৰ্শন কৰা হ'ব"
+msgid "_Eject"
+msgstr "বাহিৰ কৰক (_E)"
 
 #: ../data/totem.ui.h:10
-msgid "Play / P_ause"
-msgstr "Play"
+msgid "Eject the current disc"
+msgstr "বৰ্তমান ডিস্ক বাহিৰ কৰক"
 
 #: ../data/totem.ui.h:11
-msgid "Play or pause the movie"
-msgstr "চলচ্চিত্ৰ চলোৱা অথবা থামানো হ'ব"
+msgid "_Properties"
+msgstr "বৈশিষ্টসমূহ (_P)"
 
 #: ../data/totem.ui.h:12
-msgid "_Quit"
-msgstr "প্ৰস্থান (_Q)"
+msgid "View the properties of the current stream"
+msgstr "বৰ্তমানে স্ট্ৰিমৰ বৈশিষ্ট্য দৰ্শন কৰক"
 
 #: ../data/totem.ui.h:13
-msgid "Quit the program"
-msgstr "প্ৰোগ্ৰামৰ পৰা প্ৰস্থান কৰক"
+msgid "Play / P_ause"
+msgstr "চলাওক/বিৰাম দিয়ক (_a)"
 
 #: ../data/totem.ui.h:14
-msgid "_Edit"
-msgstr "সম্পাদনা (_E)"
+msgid "Play or pause the movie"
+msgstr "চলচিত্ৰ চলাওক অথবা বিৰাম দিয়ক"
 
 #: ../data/totem.ui.h:15
-msgid "_Clear Playlist"
-msgstr "প্লে-লিস্ট ফাঁকা কৰক (_C)"
+msgid "_Edit"
+msgstr "সম্পাদনা (_E)"
 
 #: ../data/totem.ui.h:16
-msgid "Clear the playlist"
-msgstr "Clear"
+msgid "_Clear Playlist"
+msgstr "প্লেলিস্ট পৰিষ্কাৰ কৰক (_C)"
 
 #: ../data/totem.ui.h:17
-msgid "Prefere_nces"
-msgstr "পছন্দ(_n)"
+msgid "Clear the playlist"
+msgstr "প্লেলিস্ট পৰিষ্কাৰ কৰক"
 
 #: ../data/totem.ui.h:18
-msgid "Configure the application"
-msgstr "এপ্লিকেশন বিন্যাস কৰক"
-
-#: ../data/totem.ui.h:19
 msgid "Plugins..."
-msgstr "প্লাগ-ইন..."
+msgstr "প্লাগিনসমূহ..."
 
-#: ../data/totem.ui.h:20
+#: ../data/totem.ui.h:19
 msgid "Configure plugins to extend the application"
-msgstr "এপ্লিকেশনৰ বৈশিষ্ট্য বৃদ্ধি কৰাৰ বাবে প্লাগ-ইন বিন্যাস কৰক"
+msgstr "অনুপ্ৰয়োগৰ বৈশিষ্ট্য বৃদ্ধি কৰাৰ বাবে প্লাগিন সংৰূপণ কৰক"
 
-#: ../data/totem.ui.h:21
+#: ../data/totem.ui.h:20
 msgid "_View"
-msgstr "প্ৰদৰ্শন (_V)"
-
-#: ../data/totem.ui.h:22
-msgid "_Fullscreen"
-msgstr "সম্পূৰ্ণ পৰ্দাজুড়ে প্ৰদৰ্শন (_F)"
-
-#: ../data/totem.ui.h:23
-msgid "Switch to fullscreen"
-msgstr "পুৰো স্ক্ৰীন জুড়ে চোৱাও"
+msgstr "দৰ্শন কৰক (_V)"
 
-#: ../data/totem.ui.h:24
+#: ../data/totem.ui.h:21
 msgid "Fit Window to Movie"
-msgstr "চলচ্চিত্ৰ অনুযায়ী উইন্ডোৰ মাপ পৰিবৰ্তন কৰা হ'ব"
+msgstr "চলচিত্ৰ অনুযায়ী উইন্ডোক খাপ খুৱাওক"
 
-#: ../data/totem.ui.h:25
+#: ../data/totem.ui.h:22
 msgid "_Resize 1:2"
-msgstr "মাপ পৰিবৰ্তন ১:২ (_R)"
+msgstr "পুনৰআকাৰ 1:2 (_R)"
 
-#: ../data/totem.ui.h:26
+#: ../data/totem.ui.h:23
 msgid "Resize to half the original video size"
-msgstr "Resize to half the original video size"
+msgstr "প্ৰকৃত ভিডিঅ' আকাৰৰ অৰ্দ্ধেকলৈ পুনৰ আকাৰ কৰক"
 
-#: ../data/totem.ui.h:27
+#: ../data/totem.ui.h:24
 msgid "Resize _1:1"
-msgstr "মাপ পৰিবৰ্তন ১:১ (_1)"
+msgstr "পুনৰআকাৰ ১:১ (_1)"
 
-#: ../data/totem.ui.h:28
+#: ../data/totem.ui.h:25
 msgid "Resize to the original video size"
-msgstr "Resize to the original video size"
+msgstr "প্ৰকৃত ভিডিঅ' আকাৰলে পুনৰ আকাৰ দিয়ক"
 
-#: ../data/totem.ui.h:29
+#: ../data/totem.ui.h:26
 msgid "Resize _2:1"
-msgstr "মাপ পৰিবৰ্তন ১:১ (_2)"
+msgstr "পুনৰআকাৰ ১:১ (_2)"
 
-#: ../data/totem.ui.h:30
+#: ../data/totem.ui.h:27
 msgid "Resize to double the original video size"
-msgstr "Resize to double the original video size"
+msgstr "প্ৰকৃত ভিডিঅ' আকাৰৰ দুগুন আকাৰলে পুনৰ আকাৰ কৰক"
 
-#: ../data/totem.ui.h:31
+#: ../data/totem.ui.h:28
 msgid "_Aspect Ratio"
 msgstr "এসপেক্টৰ অনুপাত (_A)"
 
-#: ../data/totem.ui.h:32
-msgid "Switch An_gles"
-msgstr "এঙ্গেল পৰিবৰ্তন কৰক (_g)"
-
-#: ../data/totem.ui.h:33
-msgid "Switch camera angles"
-msgstr "Switch camera angles"
-
-#: ../data/totem.ui.h:34
-msgid "_Go"
-msgstr "গন্তব্য (_G)"
-
-#: ../data/totem.ui.h:35
-msgid "_DVD Menu"
-msgstr "DVD তালিকা (_D)"
-
-#: ../data/totem.ui.h:36
-msgid "Go to the DVD menu"
-msgstr "DVD তালিকা প্ৰদৰ্শন"
-
-#: ../data/totem.ui.h:37
-msgid "_Title Menu"
-msgstr "শিৰোনাম তালিকা (_T)"
-
-#: ../data/totem.ui.h:38
-msgid "Go to the title menu"
-msgstr "শিৰোনাম তালিকা প্ৰদৰ্শন"
-
-#: ../data/totem.ui.h:39
-msgid "A_udio Menu"
-msgstr "অডিঅ' তালিকা (_u)"
-
-#: ../data/totem.ui.h:40
-msgid "Go to the audio menu"
-msgstr "অডিঅ' তালিকা প্ৰদৰ্শন"
-
-#: ../data/totem.ui.h:41
-msgid "_Angle Menu"
-msgstr "এঙ্গেল তালিকা (_A)"
-
-#: ../data/totem.ui.h:42
-msgid "Go to the angle menu"
-msgstr "এঙ্গেল তালিকা প্ৰদৰ্শন"
-
-#: ../data/totem.ui.h:43
-msgid "_Chapter Menu"
-msgstr "অধ্যায় তালিকা (_C)"
-
-#: ../data/totem.ui.h:44
-msgid "Go to the chapter menu"
-msgstr "চেপ্টাৰ তালিকা প্ৰদৰ্শন"
-
-#: ../data/totem.ui.h:45
-msgid "_Next Chapter/Movie"
-msgstr "পৰবৰ্তী অধ্যায়/চলচ্চিত্ৰ (_N)"
-
-#: ../data/totem.ui.h:46
-msgid "Next chapter or movie"
-msgstr "পৰবৰ্তি অধ্যায় অথবা চলচ্চিত্ৰ"
-
-#: ../data/totem.ui.h:47
-msgid "_Previous Chapter/Movie"
-msgstr "পূৰ্ববৰ্তী অধ্যায়/চলচ্চিত্ৰ (_P)"
-
-#: ../data/totem.ui.h:48
-msgid "Previous chapter or movie"
-msgstr "পূৰ্ববৰ্তী অধ্যায় অথবা চলচ্চিত্ৰ"
-
-#: ../data/totem.ui.h:49
-msgid "_Sound"
-msgstr "শব্দ (_S)"
-
-#: ../data/totem.ui.h:50
-msgid "Volume _Up"
-msgstr "শব্দেৰ মাত্ৰা বৃদ্ধি কৰক (_U)"
-
-#: ../data/totem.ui.h:51
-msgid "Increase volume"
-msgstr "Increase volume"
-
-#: ../data/totem.ui.h:52
-msgid "Volume _Down"
-msgstr "শব্দেৰ মাত্ৰা হ্ৰাস কৰক (_D)"
-
-#: ../data/totem.ui.h:53
-msgid "Decrease volume"
-msgstr "Decrease volume"
-
-#: ../data/totem.ui.h:54
-msgid "_Help"
-msgstr "সাহায্য (_H)"
-
-#: ../data/totem.ui.h:55
-msgid "_Contents"
-msgstr "বিষয়বস্তু (_C)"
-
-#: ../data/totem.ui.h:56
-msgid "Help contents"
-msgstr "সহায়িকাৰ বিষয়বস্তু"
-
-#: ../data/totem.ui.h:57
-msgid "_About"
-msgstr "বিষয়ে (_A)"
-
-#: ../data/totem.ui.h:58
-msgid "About this application"
-msgstr "এপ্লিকেশনৰ বিষয়ে"
-
-#: ../data/totem.ui.h:59
-msgid "_Repeat Mode"
-msgstr "পুনৰাবৃত্তি মোড (_R)"
-
-#: ../data/totem.ui.h:60
-msgid "Set the repeat mode"
-msgstr "পুনৰাবৃত্তি মোড নিৰ্ধাৰণ কৰক"
-
-#: ../data/totem.ui.h:61
-msgid "Shuff_le Mode"
-msgstr "পাঁচমিশেলি মোড (_l)"
-
-#: ../data/totem.ui.h:62
-msgid "Set the shuffle mode"
-msgstr "পাচঁমিশেলি মোড নিৰ্ধাৰণ কৰক"
-
-#: ../data/totem.ui.h:63
-msgid "Show _Controls"
-msgstr "নিয়ন্ত্ৰক বাটন প্ৰদৰ্শন কৰা হ'ব (_C)"
-
-#: ../data/totem.ui.h:64
-msgid "Show controls"
-msgstr "নিয়ন্ত্ৰক বাটন প্ৰদৰ্শন কৰা হ'ব"
-
-#: ../data/totem.ui.h:65
-msgid "S_idebar"
-msgstr "সাইড-বাৰ (_i)"
-
-#: ../data/totem.ui.h:66
-msgid "Show or hide the sidebar"
-msgstr "সাইড-বাৰ প্ৰদৰ্শন অথবা আড়াল কৰক"
-
-#: ../data/totem.ui.h:67
-msgctxt "Aspect ratio"
-msgid "Auto"
-msgstr "স্বয়ংক্ৰিয়"
-
-#: ../data/totem.ui.h:68
-msgid "Sets automatic aspect ratio"
-msgstr "স্বয়ংক্ৰিয়ৰূপে এস্পেক্টৰ অনুপাত নিৰ্ধাৰণ কৰি"
-
-#: ../data/totem.ui.h:69
-msgid "Square"
-msgstr "চৌকো"
-
-#: ../data/totem.ui.h:70
-msgid "Sets square aspect ratio"
-msgstr "চতুষ্কোন এস্পেক্ট অনুপাত নিৰ্ধাৰণ কৰি"
-
-#: ../data/totem.ui.h:71
-msgid "4:3 (TV)"
-msgstr "৪:৩ (টেলিভিশান)"
-
-#: ../data/totem.ui.h:72
-msgid "Sets 4:3 (TV) aspect ratio"
-msgstr "৪:৩ (টেলিভিশন) এস্পেক্ট অনুপাত নিৰ্ধাৰণ কৰি"
-
-#: ../data/totem.ui.h:73
-msgid "16:9 (Widescreen)"
-msgstr "16:9 (Widescreen)"
-
-#: ../data/totem.ui.h:74
-msgid "Sets 16:9 (widescreen) aspect ratio"
-msgstr "Sets 16:9 (widescreen) aspect ratio"
-
-#: ../data/totem.ui.h:75
-msgid "2.11:1 (DVB)"
-msgstr "2.11:1 (DVB)"
-
-#: ../data/totem.ui.h:76
-msgid "Sets 2.11:1 (DVB) aspect ratio"
-msgstr "২.১১:১ (DVB) এস্পেক্ট অনুপাত নিৰ্ধাৰণ কৰি"
-
-#: ../data/totem.ui.h:77
-msgid "S_ubtitles"
-msgstr "অনুবাদলিপি (_u)"
-
-#: ../data/totem.ui.h:80
-msgid "_Languages"
-msgstr "ভাষা (_L)"
-
-#: ../data/totem.ui.h:81
-msgid "Zoom In"
-msgstr "ডাঙৰ কৰি চোৱানো"
-
-#: ../data/totem.ui.h:82
-msgid "Zoom in"
-msgstr "ডাঙৰ কৰি চোৱানো হ'ব"
-
-#: ../data/totem.ui.h:83
-msgid "Skip _Forward"
-msgstr "এগিয়ে যাওক (_F)"
-
-#: ../data/totem.ui.h:84
-msgid "Skip forward"
-msgstr "এগিয়ে যাওক"
-
-#: ../data/totem.ui.h:85
-msgid "Skip _Backwards"
-msgstr "পিছিয়ে যান (_B)"
-
-#: ../data/totem.ui.h:86
-msgid "Skip backwards"
-msgstr "পিছিয়ে যান"
-
-#: ../data/totem.ui.h:87
-msgid "14.4 Kbps Modem"
-msgstr "14.4 Kbps Modem"
-
-#: ../data/totem.ui.h:88
-msgid "19.2 Kbps Modem"
-msgstr "19.2 Kbps Modem"
-
-#: ../data/totem.ui.h:89
-msgid "28.8 Kbps Modem"
-msgstr "28.8 Kbps Modem"
-
-#: ../data/totem.ui.h:90
-msgid "33.6 Kbps Modem"
-msgstr "33.6 Kbps Modem"
-
-#: ../data/totem.ui.h:91
-msgid "34.4 Kbps Modem"
-msgstr "34.4 Kbps Modem"
-
-#: ../data/totem.ui.h:92
-msgid "56 Kbps Modem/ISDN"
-msgstr "56 Kbps Modem/ISDN"
-
-#: ../data/totem.ui.h:93
-msgid "112 Kbps Dual ISDN/DSL"
-msgstr "112 Kbps Dual ISDN/DSL"
-
-#: ../data/totem.ui.h:94
-msgid "256 Kbps DSL/Cable"
-msgstr "256 Kbps DSL/Cable"
-
-#: ../data/totem.ui.h:95
-msgid "384 Kbps DSL/Cable"
-msgstr "384 Kbps DSL/Cable"
-
-#: ../data/totem.ui.h:96
-msgid "512 Kbps DSL/Cable"
-msgstr "512 Kbps DSL/Cable"
-
-#: ../data/totem.ui.h:97
-msgid "1.5 Mbps T1/Intranet/LAN"
-msgstr "1.5 Mbps T1/Intranet/LAN"
-
-#: ../data/totem.ui.h:98
-msgid "Intranet/LAN"
-msgstr "ইন্ট্ৰানেট/LAN"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:100
-msgid "Normal"
-msgstr "স্বাভাবিক"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:102
-msgid "Large"
-msgstr "বৃহৎ"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:104
-msgid "Extra Large"
-msgstr "অধিক বৃহৎ"
-
-#: ../data/totem.ui.h:105 ../src/totem-properties-view.c:228
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5593
-msgid "Stereo"
-msgstr "স্টিৰিও"
-
-#: ../data/totem.ui.h:106
-msgid "4-channel"
-msgstr "4-channel"
-
-#: ../data/totem.ui.h:107
-msgid "4.1-channel"
-msgstr "4.1-channel"
-
-#: ../data/totem.ui.h:108
-msgid "5.0-channel"
-msgstr "5.0-channel"
-
-#: ../data/totem.ui.h:109
-msgid "5.1-channel"
-msgstr "5.1-channel"
-
-#: ../data/totem.ui.h:110
-msgid "AC3 Passthrough"
-msgstr "AC3 Passthrough"
+#: ../data/totem.ui.h:29
+msgid "Switch An_gles"
+msgstr "কোণ পৰিবৰ্তন কৰক (_g)"
 
-#: ../data/totem.ui.h:111
-msgid "Totem Preferences"
-msgstr "পছন্দ"
+#: ../data/totem.ui.h:30
+msgid "Switch camera angles"
+msgstr "কেমেৰা কোণ পৰিবৰ্তন কৰক"
 
-#: ../data/totem.ui.h:112
-msgid "Playback"
-msgstr "চলোৱা হ'ব"
+#: ../data/totem.ui.h:31
+msgid "_Go"
+msgstr "যাওক (_G)"
 
-#: ../data/totem.ui.h:113
-msgid "Start playing files from last position"
-msgstr "সৰ্বশেষ স্থানৰ পৰা আৰম্ভ কৰি নথিপত্ৰ চলোৱা হ'ব"
+#: ../data/totem.ui.h:32
+msgid "_DVD Menu"
+msgstr "DVD মেনু (_D)"
 
-#: ../data/totem.ui.h:114
-msgid "Networking"
-msgstr "নেটৱৰ্ক ব্যৱস্থা"
+#: ../data/totem.ui.h:33
+msgid "Go to the DVD menu"
+msgstr "DVD মেনুলে যাওক"
 
-#: ../data/totem.ui.h:115
-msgid "Connection _speed:"
-msgstr "Connection _speed:"
+#: ../data/totem.ui.h:34
+msgid "_Title Menu"
+msgstr "শীৰ্ষক মেনু (_T)"
 
-#: ../data/totem.ui.h:116
-msgid "Text Subtitles"
-msgstr "টেক্সট"
+#: ../data/totem.ui.h:35
+msgid "Go to the title menu"
+msgstr "শীৰ্ষক মেনুলে যাওক"
 
-#: ../data/totem.ui.h:117
-msgid "_Load subtitle files when movie is loaded"
-msgstr "যেতিয়া কথাছবি লোড হৈ যায় তেতিয়া চাবটাইটেল নথিপত্ৰসমূহ লোড কৰক (_L)"
+#: ../data/totem.ui.h:36
+msgid "A_udio Menu"
+msgstr "অডিঅ' মেনু (_u)"
 
-#: ../data/totem.ui.h:118
-msgid "_Font:"
-msgstr "ফন্ট:"
+#: ../data/totem.ui.h:37
+msgid "Go to the audio menu"
+msgstr "অডিঅ' মেনুলে যাওক"
 
-#: ../data/totem.ui.h:119
-msgid "_Encoding:"
-msgstr "_Encoding:"
+#: ../data/totem.ui.h:38
+msgid "_Angle Menu"
+msgstr "কোণ মেনু (_A)"
 
-#: ../data/totem.ui.h:120
-msgid "External Chapters"
-msgstr "বহিৰ্তম পাঠসমূহ"
+#: ../data/totem.ui.h:39
+msgid "Go to the angle menu"
+msgstr "কোণ মেনুলে যাওক"
 
-#: ../data/totem.ui.h:121
-msgid "Load _chapter files when movie is loaded"
-msgstr "যেতিয়া কথাছবি লোড হয় তেতিয়া পাঠ নথিপত্ৰসমূহ লোড কৰক (_c)"
+#: ../data/totem.ui.h:40
+msgid "_Chapter Menu"
+msgstr "পাঠ মেনু (_C)"
 
-#. Tab label in the Preferences dialogue
-#: ../data/totem.ui.h:124
-msgid "Display"
-msgstr "ডিসপ্লে"
+#: ../data/totem.ui.h:41
+msgid "Go to the chapter menu"
+msgstr "পাঠ মেনুলে যাওক"
 
-#: ../data/totem.ui.h:125
-msgid "_Resize the window when a new video is loaded"
-msgstr "যেতিয়া এটা নতুন ভিডিঅ' লোড হয় তেতিয়া উইন্ডোটো পুনৰ আকাৰ দিয়ক (_R)"
+#: ../data/totem.ui.h:42
+msgid "_Next Chapter/Movie"
+msgstr "পৰবৰ্তী পাঠ/চলচিত্ৰ (_N)"
 
-#: ../data/totem.ui.h:126
-msgid "Disable _deinterlacing of interlaced videos"
-msgstr "সংযুক্ত ভিডিঅ'সমূহৰ অসংযুক্তকৰন অসামৰ্থবান কৰক (_d)"
+#: ../data/totem.ui.h:43
+msgid "Next chapter or movie"
+msgstr "পৰবৰ্তি পাঠ অথবা চলচিত্ৰ"
 
-#: ../data/totem.ui.h:127
-msgid "Disable screensaver when playing "
-msgstr "বজোৱাৰ সময়ত স্ক্ৰিনচেভাৰ অসামৰ্থবান কৰক "
+#: ../data/totem.ui.h:44
+msgid "_Previous Chapter/Movie"
+msgstr "পূৰ্ববৰ্তী পাঠ/চলচিত্ৰ (_P)"
 
-#: ../data/totem.ui.h:129
-msgid "Video or Audio"
-msgstr "ভিডিঅ' বা অডিঅ'"
+#: ../data/totem.ui.h:45
+msgid "Previous chapter or movie"
+msgstr "পূৰ্ববৰ্তী পাঠ অথবা চলচিত্ৰ"
 
-#: ../data/totem.ui.h:130
-msgid "Visual Effects"
-msgstr "ভিসুয়াল"
+#: ../data/totem.ui.h:46
+msgid "_Sound"
+msgstr "শব্দ (_S)"
 
-#: ../data/totem.ui.h:131
-msgid "Show _visual effects when an audio file is played"
-msgstr "নথিপত্ৰ হলো"
+#: ../data/totem.ui.h:47
+msgid "Volume _Up"
+msgstr "ভলিউম বৃদ্ধি কৰক (_U)"
 
-#: ../data/totem.ui.h:132
-msgid "_Type of visualization:"
-msgstr "ধৰন সৰ্বমোট:"
+#: ../data/totem.ui.h:48
+msgid "Increase volume"
+msgstr "ভলিউম বৃদ্ধি কৰক"
 
-#: ../data/totem.ui.h:133
-msgid "Visualization _size:"
-msgstr "Visualisation _size:"
+#: ../data/totem.ui.h:49
+msgid "Volume _Down"
+msgstr "ভলিউম কম কৰক (_D)"
 
-#: ../data/totem.ui.h:134
-msgid "Color Balance"
-msgstr "Color Balance"
+#: ../data/totem.ui.h:50
+msgid "Decrease volume"
+msgstr "ভলিউম কম কৰক"
 
-#: ../data/totem.ui.h:135
-msgid "_Brightness:"
-msgstr "_Brightness:"
+#: ../data/totem.ui.h:51
+msgid "_Help"
+msgstr "সহায় (_H)"
 
-#: ../data/totem.ui.h:136
-msgid "Co_ntrast:"
-msgstr "Co_ntrast:"
+#: ../data/totem.ui.h:52
+msgid "_Contents"
+msgstr "সমল (_C)"
 
-#: ../data/totem.ui.h:137
-msgid "Sat_uration:"
-msgstr "Sat_uration:"
+#: ../data/totem.ui.h:53
+msgid "Help contents"
+msgstr "সহায়ৰ সমল"
 
-#: ../data/totem.ui.h:138
-msgid "_Hue:"
-msgstr "_Hue:"
+#: ../data/totem.ui.h:54
+msgid "_About"
+msgstr "বিষয়ে (_A)"
 
-#: ../data/totem.ui.h:139
-msgid "Reset to _Defaults"
-msgstr "অবিকল্পিত মান পুনৰায় স্থাপন কৰক"
+#: ../data/totem.ui.h:55
+msgid "About this application"
+msgstr "এই অনুপ্ৰয়োগৰ বিষয়ে"
 
-#: ../data/totem.ui.h:140
-msgid "Audio Output"
-msgstr "অডিঅ'"
+#: ../data/totem.ui.h:56
+msgid "Show _Controls"
+msgstr "নিয়ন্ত্ৰণসমূহ দেখুৱাওক (_C)"
 
-#: ../data/totem.ui.h:141
-msgid "_Audio output type:"
-msgstr "অডিঅ' ধৰন:"
+#: ../data/totem.ui.h:57
+msgid "Show controls"
+msgstr "নিয়ন্ত্ৰণসমূহ দেখুৱাওক"
 
-#: ../data/totem.ui.h:145
-msgid "Time seek bar"
-msgstr "সময় প্ৰাপ্ত কৰিবলৈ ব্যৱহৃত বাৰ"
+#: ../data/totem.ui.h:58
+msgid "S_idebar"
+msgstr "কাষবাৰ (_i)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
-msgid "Allow the screensaver to activate when playing audio"
-msgstr "অডিঅ' চলোৱাৰ সময় স্ক্ৰিন-ছেভাৰ সক্ৰিয় কৰাৰ সুবিধা উপলব্ধ কৰা হ'ব"
+#: ../data/totem.ui.h:59
+msgid "Show or hide the sidebar"
+msgstr "কাষবাৰ দেখুৱাওক অথবা লুকাওক"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
-msgid ""
-"Allow the screensaver to activate when playing audio. Disable if you have "
-"monitor-powered speakers."
-msgstr ""
-"অডিঅ' চলোৱাৰ সময় স্ক্ৰিন-ছেভাৰ সক্ৰিয় কৰাৰ সুবিধা উপলব্ধ কৰা হ'ব । মনিটৰৰ পৰা "
-"বিদ্যুৎ প্ৰয়োগ কৰি চালিত স্পিকাৰৰ ক্ষেত্ৰত এইটো নিষ্ক্ৰিয় কৰক ।"
+#: ../data/totem.ui.h:60
+msgctxt "Aspect ratio"
+msgid "Auto"
+msgstr "স্বচালিত"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
-msgid "Show visual effects when no video is displayed"
-msgstr "কোনো ভিডিঅ' প্ৰদৰ্শন না কৰা হ'লে ভিজুয়াল ইফেক্ট প্ৰদৰ্শন কৰা হ'ব"
+#: ../data/totem.ui.h:61
+msgid "Sets automatic aspect ratio"
+msgstr "স্বচালিতৰূপে এস্পেক্টৰ অনুপাত সংহতি কৰক"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
-msgid "Show visual effects when playing an audio only file."
-msgstr "শুধুমাত্ৰ অডিঅ' সহ নথিপত্ৰ চলোৱা হ'লে ভিজুয়াল ইফেক্ট প্ৰদৰ্শন কৰা হ'ব ।"
+#: ../data/totem.ui.h:62
+msgid "Square"
+msgstr "বৰ্গ"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
-msgid "Name of the visual effects plugin"
-msgstr "ভিজুয়াল ইফেক্ট প্লাগ-ইনৰ নাম"
+#: ../data/totem.ui.h:63
+msgid "Sets square aspect ratio"
+msgstr "বৰ্গ এস্পেক্ট অনুপাত সংহতি কৰে"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
-msgid "The brightness of the video"
-msgstr "ভিডিঅ' ৰ উজ্জ্বলতাৰ মাত্ৰা"
+#: ../data/totem.ui.h:64
+msgid "4:3 (TV)"
+msgstr "4:3 (TV)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
-msgid "The contrast of the video"
-msgstr "ভিডিঅ' ৰ বৈপৰিত্যেৰ মাত্ৰা"
+#: ../data/totem.ui.h:65
+msgid "Sets 4:3 (TV) aspect ratio"
+msgstr "4:3 (TV) এস্পেক্ট অনুপাত সংহতি কৰে"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
-msgid "The hue of the video"
-msgstr "ভিডিঅ' ৰ হিউ ৰ মাত্ৰা"
+#: ../data/totem.ui.h:66
+msgid "16:9 (Widescreen)"
+msgstr "16:9 (বহলপৰ্দা)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
-msgid "The saturation of the video"
-msgstr "ভিডিঅ' ৰ স্যাচুৰেশন মাত্ৰা"
+#: ../data/totem.ui.h:67
+msgid "Sets 16:9 (widescreen) aspect ratio"
+msgstr "16:9 (বহলপৰ্দা) এস্পেক্ট অনুপাত সংহতি কৰে"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
-msgid "Resize the canvas automatically on file load"
-msgstr "নথিপত্ৰ লোড হ'লে স্বয়ংক্ৰিয়ভাবে ক্যানভাসেৰ মাপ পুনৰায় নিৰ্ধাৰণ কৰা হ'ব"
+#: ../data/totem.ui.h:68
+msgid "2.11:1 (DVB)"
+msgstr "2.11:1 (DVB)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
-msgid "Network connection speed"
-msgstr "নেটৱৰ্ক সংযোগ যোৱাি"
+#: ../data/totem.ui.h:69
+msgid "Sets 2.11:1 (DVB) aspect ratio"
+msgstr "২.১১:১ (DVB) এস্পেক্ট অনুপাত সংহতি কৰে"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
-msgid ""
-"Approximate network connection speed, used to select quality on media over "
-"the network."
-msgstr "আনুমানিক নেটৱাৰ্ক সংযোগ গতি, নেটৱাৰ্কৰ উপৰত মাধ্যমৰ বৈশিষ্ট বাচিবলে ব্যৱহৃত।"
+#: ../data/totem.ui.h:70
+msgid "S_ubtitles"
+msgstr "উপশীৰ্ষকসমূহ (_u)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
-msgid "Repeat mode"
-msgstr "পুনৰাবৃত্তি মোড"
+#: ../data/totem.ui.h:73
+msgid "_Languages"
+msgstr "ভাষাসমূহ (_L)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
-msgid "Shuffle mode"
-msgstr "ওলটপালট কৰাৰ মোড"
+#: ../data/totem.ui.h:74
+msgid "Zoom In"
+msgstr "ডাঙৰ কৰক"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
-msgid "Whether to disable deinterlacing for interlaced movies"
-msgstr "সংযুক্ত কথাছবিসমূহৰ কাৰণে অসংযুক্তকৰন অসামৰ্থবান কৰা হব নে"
+#: ../data/totem.ui.h:75
+msgid "Zoom in"
+msgstr "ডাঙৰ কৰক"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
-msgid "Whether to enable debug for the playback engine"
-msgstr "প্লেব্যাক ইঞ্জিনৰ বাবে ডিবাগ সক্ৰিয় কৰা হ'ব কিনা"
+#: ../data/totem.ui.h:76
+msgid "Skip _Forward"
+msgstr "আগলৈ যাওক (_F)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
-msgid "Type of audio output to use"
-msgstr "ব্যৱহাৰৰ বাবে অডিঅ' আউটপুটৰ ধৰন"
+#: ../data/totem.ui.h:77
+msgid "Skip forward"
+msgstr "আগলৈ যাওক"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
-msgid "Visualization quality setting"
-msgstr "ভিছুৱেলাইজেছন প্ৰদৰ্শন সংক্ৰান্ত বৈশিষ্ট্য"
+#: ../data/totem.ui.h:78
+msgid "Skip _Backwards"
+msgstr "পিছলৈ যাওক (_B)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
-msgid "Quality setting for the audio visualization."
-msgstr "অডিঅ' চক্ষকৰনৰ বাবে বৈশিষ্ট সংহতি।"
+#: ../data/totem.ui.h:79
+msgid "Skip backwards"
+msgstr "পিছলৈ যাওক"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
-msgid "Network buffering threshold"
-msgstr "নেটৱৰ্ক বাফাৰৰ প্ৰান্তিক মাপ"
+#: ../data/totem.ui.h:82
+msgid "Time seek bar"
+msgstr "সময় সন্ধান বাৰ"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
-msgid ""
-"Amount of data to buffer for network streams before starting to display the "
-"stream (in seconds)."
-msgstr ""
-"নেটৱৰ্ক স্ট্ৰিমৰ ক্ষেত্ৰত স্ট্ৰিম প্ৰদৰ্শনৰ পূৰ্বে যি পৰিমান তথ্য বাফাৰ কৰা হ'ব (ছেকেণ্ডে "
-"ব্যক্ত)"
+#: ../data/uri.ui.h:1
+msgid "Enter the _address of the file you would like to open:"
+msgstr "আপুনি খোলিব বিচৰা নথিপত্ৰৰ ঠিকনা সুমুৱাওক (_a):"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
-msgid "Subtitle font"
-msgstr "অনুবাদলিপিৰ ফন্ট"
+#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
+msgid "_Add to Playlist"
+msgstr "প্লেলিস্টত যোগ কৰক (_A)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
-msgid "Pango font description for subtitle rendering."
-msgstr "অনুবাদলিপিত ৰেন্ডাৰিং ৰ বাবে Pango ফন্টৰ বিবৰণ"
+#: ../data/video-list.ui.h:2
+msgid "Add the video to the playlist"
+msgstr "ভিডিঅ'ক প্লেলিস্টত যোগ কৰক"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
-msgid "Subtitle encoding"
-msgstr "অনুবাদলিপিৰ এনকোডিং"
+#: ../src/backend/bacon-video-widget.c:1643
+msgid "Password requested for RTSP server"
+msgstr "RTSP চাৰ্ভাৰৰ বাবে অনুৰোধিত পাছৱাৰ্ড"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
-msgid "Encoding character set for subtitle."
-msgstr "অনুবাদলিপিত ব্যৱহৃত এনকোডিং"
+#: ../src/backend/bacon-video-widget.c:2944
+#, c-format
+msgid "Audio Track #%d"
+msgstr "অডিঅ' ট্ৰেক সংখ্যা #%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
-msgid "Default location for the \"Open...\" dialogs"
-msgstr "\"খোলক...\" সম্বাদ বক্সসমূহৰ ক্ষেত্ৰত নিৰ্ধাৰিত অবিকল্পিত অৱস্থান"
+#: ../src/backend/bacon-video-widget.c:2948
+#, c-format
+msgid "Subtitle #%d"
+msgstr "উপশীৰ্ষকসমূহ #%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
-msgid ""
-"Default location for the \"Open...\" dialogs. Default is the current "
-"directory."
-msgstr ""
-"\"খোলক...\" সম্বাদ বক্সসমূহৰ ক্ষেত্ৰত নিৰ্ধাৰিত অবিকল্পিত অৱস্থান, বৰ্তমান পঞ্জিকা "
-"অবিকল্পিত ৰূপে চিহ্নিত হয়"
+#: ../src/backend/bacon-video-widget.c:3345
+msgid "The server you are trying to connect to is not known."
+msgstr "সংযোগ স্থাপনেৰ জন্য চিহ্নিত সাৰ্ভাৰটি সনাক্ত কৰতে ব্যৰ্থ।"
+
+#: ../src/backend/bacon-video-widget.c:3348
+msgid "The connection to this server was refused."
+msgstr "চিহ্নিত সাৰ্ভাৰেৰ সাথে সংযোগ প্ৰত্যাখ্যাওক কৰা হয়েছে।"
+
+#: ../src/backend/bacon-video-widget.c:3351
+msgid "The specified movie could not be found."
+msgstr "নিৰ্ধাৰিত চলচিত্ৰ পাওয়া যায়নি।"
+
+#: ../src/backend/bacon-video-widget.c:3358
+msgid "The server refused access to this file or stream."
+msgstr "সাৰ্ভাৰেৰ দ্বাৰা এই নথিপত্ৰ অথবা স্ট্ৰিমেৰ ব্যবহাৰ প্ৰতিৰোধ কৰা হয়েছে।"
+
+#: ../src/backend/bacon-video-widget.c:3364
+msgid "Authentication is required to access this file or stream."
+msgstr "অনুমোদন ব্যবস্থা হলো নথিপত্ৰ."
+
+#: ../src/backend/bacon-video-widget.c:3371
+msgid "You are not allowed to open this file."
+msgstr "এই নথিপত্ৰটি খোলাৰ অনুমতি আপোনাৰ নেই।"
+
+#: ../src/backend/bacon-video-widget.c:3376
+msgid "This location is not a valid one."
+msgstr "এই অৱস্থান এটা বৈধ অৱস্থান নহয়।"
+
+#: ../src/backend/bacon-video-widget.c:3384
+msgid "The movie could not be read."
+msgstr "চলচিত্ৰ পঢ়িব পৰা নগল।"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
-msgid "Default location for the \"Take Screenshot\" dialogs"
-msgstr "\"পৰ্দাৰ ছবি লওক\" শীৰ্ষক সম্বাদ বক্সৰ অবিকল্পিত অৱস্থান"
+#. should be exactly one missing thing (source or converter)
+#: ../src/backend/bacon-video-widget.c:3407
+#: ../src/backend/bacon-video-widget.c:3415
+#, c-format
+msgid "The playback of this movie requires a %s plugin which is not installed."
+msgid_plural ""
+"The playback of this movie requires the following decoders which are not "
+"installed:\n"
+"\n"
+"%s"
+msgstr[0] "এই চলচিত্ৰ প্ৰদৰ্শনৰ বাবে %s প্লাগিনৰ প্ৰয়োজন, যি ইনস্টল নাই।"
+msgstr[1] ""
+"এই চলচিত্ৰ প্ৰদৰ্শনৰ বাবে নিম্নলিখিত ডিক'ডাৰসমূহৰ প্ৰয়োজন, যি ইনস্টল নাই:\n"
+"\n"
+"%s"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
+#: ../src/backend/bacon-video-widget.c:3426
 msgid ""
-"Default location for the \"Take Screenshot\" dialogs. Default is the "
-"Pictures directory."
+"An audio or video stream is not handled due to missing codecs. You might "
+"need to install additional plugins to be able to play some types of movies"
 msgstr ""
-"\"পৰ্দাৰ ছবি লওক\" শীৰ্ষক সম্বাদ বক্সৰ অবিকল্পিত অৱস্থান। অবিকল্পিতৰূপে Pictures "
-"পঞ্জিকা চিহ্নিত কৰা হয়।"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
-msgid "Whether to disable the plugins in the user's home directory"
-msgstr "ব্যৱহাৰকৰ্তাৰ ব্যক্তিযোৱা পঞ্জিকাত প্লাগ-ইন নিষ্ক্ৰিয় কৰা হ'ব নে নহয়"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
-msgid "Whether to disable the keyboard shortcuts"
-msgstr "কি-বৰ্ড চৰ্টকাটসমূহ অসামৰ্থবান কৰা হব নে"
+"সন্ধানহিন ক'ডেকসমূহৰ বাবে এটা অডিঅ' অথবা ভিডিঅ' স্ট্ৰিম ব্যৱস্থাপনা কৰা নহয়। "
+"কিছুমান চলচিত্ৰ চলাবলে আপুনি কিছুমান অতিৰিক্ত প্লাগিন ইনস্টল কৰিব লাগিব"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
-msgid "Whether to autoload text subtitle files when a movie is loaded"
-msgstr "a হলো"
+#: ../src/backend/bacon-video-widget.c:3436
+msgid ""
+"This file cannot be played over the network. Try downloading it locally "
+"first."
+msgstr "এই নথিপত্ৰ নেটৱাৰ্কত চলাব নোৱাৰি। ইয়াক প্ৰথমতে স্থানীয়ভাৱে ডাউনল'ড কৰি চাওক।"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
-msgid "Whether to autoload external chapter files when a movie is loaded"
-msgstr "যেতিয়া এটা কথাছবি লোড হয় বহিৰ্তম পাঠ নথিপত্ৰসমূহ স্বচালিতভাৱে লোড হব নে"
+#: ../src/backend/bacon-video-widget.c:5494 ../src/totem-properties-view.c:227
+msgid "Surround"
+msgstr "চাৰিওফালে"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
-msgid ""
-"Whether to remember the position of played audio/video files when pausing or "
-"closing them"
-msgstr "চলমান অডিঅ'/ভিডিঅ' স্থগিত অথবা বন্ধ কৰা হ'লে, ব্যাঘাতৰ স্থান মনত ৰখা হ'ব নে নহয়।"
+#: ../src/backend/bacon-video-widget.c:5496 ../src/totem-properties-view.c:229
+msgid "Mono"
+msgstr "ম'নো"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:35
-msgid "Active plugins list"
-msgstr "সকৰিয় প্লাগিনসমূহৰ তালিকা"
+#: ../src/backend/bacon-video-widget.c:5781
+msgid "Media contains no supported video streams."
+msgstr "কোনো সমৰ্থিত ভিডিঅ' স্ট্ৰিম মাধ্যমত উপস্থিত নাই।"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:36
+#: ../src/backend/bacon-video-widget.c:5963
 msgid ""
-"A list of the names of the plugins which are currently active (loaded and "
-"running)."
-msgstr "বৰ্তমানে সক্ৰিয় হৈ থকা প্লাগিনসমূহৰ নামৰ তালিকা (লোড হৈ থকা আৰু চলি থকা)।"
-
-#: ../data/uri.ui.h:1
-msgid "Enter the _address of the file you would like to open:"
-msgstr "সৰ্বমোট নথিপত্ৰ:"
+"Some necessary plug-ins are missing. Make sure that the program is correctly "
+"installed."
+msgstr ""
+"কিছুমান প্ৰয়োজনীয় প্লাগিন সন্ধানহিন। সুনিশ্চিত কৰক যে প্ৰগ্ৰাম সঠিকভাৱে ইনস্টল আছে।"
 
 #: ../src/eggdesktopfile.c:165
 #, c-format
 msgid "File is not a valid .desktop file"
-msgstr "এইটো বৈধ .desktop নথিপত্ৰ নহয়"
+msgstr "নথিপত্ৰটো এটা বৈধ .desktop নথিপত্ৰ নহয়"
 
 #: ../src/eggdesktopfile.c:188
 #, c-format
@@ -886,7 +947,7 @@
 #: ../src/eggdesktopfile.c:1110
 #, c-format
 msgid "Application does not accept documents on command line"
-msgstr "এপ্লিকেশন দ্বাৰা আদেশ-শাৰীৰ মাধ্যমে নথিপত্ৰ গ্ৰহণ কৰা নহয়"
+msgstr "অনুপ্ৰয়োগ দ্বাৰা কমান্ড-শাৰীৰ মাধ্যমে নথিপত্ৰ গ্ৰহণ কৰা নহয়"
 
 #: ../src/eggdesktopfile.c:1178
 #, c-format
@@ -896,7 +957,7 @@
 #: ../src/eggdesktopfile.c:1383
 #, c-format
 msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
-msgstr "'Type=Link' ডেস্কটপ নিবেশৰ ক্ষেত্ৰত নথিপত্ৰৰ URI উল্লেখ কৰা সম্ভৱ নহয়"
+msgstr "'Type=Link' ডেস্কটপ প্ৰৱিষ্টিৰৰ ক্ষেত্ৰত নথিপত্ৰৰ URI উল্লেখ কৰা সম্ভৱ নহয়"
 
 #: ../src/eggdesktopfile.c:1404
 #, c-format
@@ -906,11 +967,11 @@
 #: ../src/eggfileformatchooser.c:240
 #, c-format
 msgid "File _Format: %s"
-msgstr "নথিপত্ৰৰ বিন্যাস: %s (_F)"
+msgstr "নথিপত্ৰৰ বিন্যাস (_F): %s"
 
 #: ../src/eggfileformatchooser.c:379
 msgid "All Files"
-msgstr "সৰ্বধৰনৰ নথিপত্ৰ"
+msgstr "সকলো নথিপত্ৰ"
 
 #: ../src/eggfileformatchooser.c:380
 msgid "All Supported Files"
@@ -918,7 +979,7 @@
 
 #: ../src/eggfileformatchooser.c:389
 msgid "By Extension"
-msgstr "এক্সটেনশন অনুযায়ী"
+msgstr "সম্পসাৰন অনুযায়ী"
 
 #: ../src/eggfileformatchooser.c:404
 msgid "File Format"
@@ -926,19 +987,19 @@
 
 #: ../src/eggfileformatchooser.c:422
 msgid "Extension(s)"
-msgstr "এক্সটেনশন(সমূহ)"
+msgstr "সম্পসাৰন(সমূহ)"
 
 #. Translators: the parameter is a filename
 #: ../src/eggfileformatchooser.c:657
 #, c-format
 msgid ""
-"The program was not able to find out the file format you want to use for `%"
-"s'. Please make sure to use a known extension for that file or manually "
+"The program was not able to find out the file format you want to use for `"
+"%s'. Please make sure to use a known extension for that file or manually "
 "choose a file format from the list below."
 msgstr ""
-"`%s' ৰ বাবে ব্যৱহাৰৰ উদ্দেশ্যে নথিপত্ৰৰ বিন্যাস এই প্ৰোগ্ৰাম দ্বাৰা চিনাক্ত কৰা সম্ভৱ "
-"নহয় । অনুগ্ৰহ কৰি এই নথিপত্ৰৰ বাবে এটা পৰিচিত এনক্সটেশন  প্ৰয়োগ কৰক অথবা "
-"নিম্নলিখিত তালিকাৰ পৰা এটা নথিপত্ৰৰ বিন্যাস নিৰ্বাচন কৰক ।"
+"`%s' ৰ বাবে ব্যৱহাৰৰ উদ্দেশ্যে নথিপত্ৰৰ বিন্যাস এই প্ৰগ্ৰাম দ্বাৰা চিনাক্ত কৰা সম্ভৱ "
+"নহয়। অনুগ্ৰহ কৰি এই নথিপত্ৰৰ বাবে এটা পৰিচিত সম্পসাৰন প্ৰয়োগ কৰক অথবা নিম্নলিখিত "
+"মেনুৰ পৰা এটা নথিপত্ৰৰ বিন্যাস বাছক।"
 
 #: ../src/eggfileformatchooser.c:664
 msgid "File format not recognized"
@@ -946,11 +1007,11 @@
 
 #: ../src/eggsmclient.c:226
 msgid "Disable connection to session manager"
-msgstr "অধিবেশন পৰিচালন ব্যৱস্থাৰ সৈতে সংযোগ বিচ্ছিন্ন কৰা হ'ব"
+msgstr "অধিবেশন ব্যৱস্থাপকৰ সৈতে সংযোগ বিচ্ছিন্ন কৰা হ'ব"
 
 #: ../src/eggsmclient.c:229
 msgid "Specify file containing saved configuration"
-msgstr "সংৰক্ষিত বিন্যাস ধাৰণকৰ্তা নথিপত্ৰ উল্লেখ কৰক"
+msgstr "সংৰক্ষিত সংৰূপ ধাৰণকৰ্তা নথিপত্ৰ উল্লেখ কৰক"
 
 #: ../src/eggsmclient.c:229
 msgid "FILE"
@@ -958,7 +1019,7 @@
 
 #: ../src/eggsmclient.c:232
 msgid "Specify session management ID"
-msgstr "অধিবেশন পৰিচালনৰ ID উল্লেখ কৰক"
+msgstr "অধিবেশন ব্যৱস্থাপনাৰ ID উল্লেখ কৰক"
 
 #: ../src/eggsmclient.c:232
 msgid "ID"
@@ -966,11 +1027,36 @@
 
 #: ../src/eggsmclient.c:253
 msgid "Session management options:"
-msgstr "অধিবেশন পৰিচালন সংক্ৰান্ত বিকল্প:"
+msgstr "অধিবেশন ব্যৱস্থাপনা বিকল্প:"
+
+#: ../src/eggsmclient.c:254
+msgid "Show session management options"
+msgstr "অধিবেশন ব্যৱস্থাপনা বিকল্প দেখুৱাওক"
+
+#. hour:minutes:seconds
+#. Translators: This is a time format, like "9:05:02" for 9
+#. * hours, 5 minutes, and 2 seconds. You may change ":" to
+#. * the separator that your locale uses or use "%Id" instead
+#. * of "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:56
+#: ../src/plugins/skipto/totem-time-entry.c:57
+#, c-format
+msgctxt "long time format"
+msgid "%d:%02d:%02d"
+msgstr "%d:%02d:%02d"
 
-#: ../src/eggsmclient.c:254
-msgid "Show session management options"
-msgstr "অধিবেশন পৰিচালন সংক্ৰান্ত বিকল্প প্ৰদৰ্শন কৰা হ'ব"
+#. minutes:seconds
+#. Translators: This is a time format, like "5:02" for 5
+#. * minutes and 2 seconds. You may change ":" to the
+#. * separator that your locale uses or use "%Id" instead of
+#. * "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:65
+#, c-format
+msgctxt "short time format"
+msgid "%d:%02d"
+msgstr "%d:%02d"
 
 #. Title
 #. Artist
@@ -1022,12 +1108,12 @@
 #. Sample rate
 #: ../src/properties/bacon-video-widget-properties.c:138
 msgid "0 Hz"
-msgstr "০ হাৰ্টজ"
+msgstr "০ Hz"
 
 #. Channels
 #: ../src/properties/bacon-video-widget-properties.c:140
 msgid "0 Channels"
-msgstr "০ চেনেল"
+msgstr "০ চেনেলসমূহ"
 
 #: ../src/properties/bacon-video-widget-properties.c:156
 #, c-format
@@ -1048,7 +1134,7 @@
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d ছেকেণ্ড"
-msgstr[1] "%d ছেকেণ্ডড"
+msgstr[1] "%d ছেকেণ্ড"
 
 #. 5 hours 2 minutes 12 seconds
 #: ../src/properties/bacon-video-widget-properties.c:167
@@ -1073,269 +1159,187 @@
 #, c-format
 msgid "%d frame per second"
 msgid_plural "%d frames per second"
-msgstr[0] "প্ৰতি ছেকেণ্ডে %d ফ্ৰেম"
-msgstr[1] "প্ৰতি ছেকেণ্ডে %d ফ্ৰেমসমূহ"
+msgstr[0] "প্ৰতি ছেকেণ্ড %d ফ্ৰেম"
+msgstr[1] "প্ৰতি ছেকেণ্ড %d ফ্ৰেমসমূহ"
 
-#: ../src/totem-audio-preview.c:168
+#: ../src/totem-audio-preview.c:137
 msgid "Audio Preview"
-msgstr "অডিঅ' প্ৰি-ভিউ"
+msgstr "অডিঅ' পূৰ্বদৰ্শন"
+
+#: ../src/totem.c:239
+msgid "Verify your system installation. Totem will now exit."
+msgstr "আপোনাৰ চিস্টেমৰ ইনস্টলেষণ পৰীক্ষা কৰক। Totem এতিয়া বন্ধ কৰা হ'ব।"
 
 #: ../src/totem-cell-renderer-video.c:126
 msgid "Unknown video"
-msgstr "অজ্ঞাত"
+msgstr "অজ্ঞাত ভিডিঅ'"
 
 #: ../src/totem-dnd-menu.c:94
 msgid "_Play Now"
-msgstr "এতিয়া চলোৱা হ'ব (_P)"
+msgstr "এতিয়া চলাওক (_P)"
 
 #: ../src/totem-dnd-menu.c:103
 msgid "Cancel"
-msgstr "বাতিল"
+msgstr "বাতিল কৰক"
 
-#: ../src/totem-fullscreen.c:616
+#: ../src/totem-fullscreen.c:573
 msgid "No File"
-msgstr "নথিপত্ৰ নাই ।"
+msgstr "কোনো নথিপত্ৰ নাই।"
 
 #: ../src/totem-interface.c:181 ../src/totem-interface.c:224
 #, c-format
 msgid "Couldn't load the '%s' interface. %s"
-msgstr "'%s' সংযোগমাধ্যম লোড কৰা নাযায় । %s"
+msgstr "'%s' আন্তঃপৃষ্ঠ ল'ড কৰা নাযায়। %s"
 
 #: ../src/totem-interface.c:181
 msgid "The file does not exist."
-msgstr "নথিপত্ৰ বৰ্তমানে উপস্থিত নাই ।"
+msgstr "নথিপত্ৰ বৰ্তমানে উপস্থিত নাই।"
 
 #: ../src/totem-interface.c:183 ../src/totem-interface.c:185
 #: ../src/totem-interface.c:226 ../src/totem-interface.c:228
 msgid "Make sure that Totem is properly installed."
-msgstr "Totem সঠিকভাবে সংস্থাপন কৰা হৈছে কিনা পৰীক্ষা কৰক ।"
+msgstr "Totem সঠিকভাবে ইনস্টল কৰা হৈছে নে পৰীক্ষা কৰক।"
 
-#: ../src/totem-interface.c:347
+#: ../src/totem-interface.c:357
 msgid ""
 "Totem 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."
 msgstr ""
-"Totem এটা মুক্ত সফ্টৱেৰ; Free Software Foundation দ্বাৰা প্ৰকাশিত GNU General "
-"Public License ৰ শৰ্তানুযায়ী এইটো বিতৰণ ও পৰিবৰ্তন কৰা যাব; প্ৰমাণপত্ৰৰ সংস্কৰণ ২ "
-"অথবা (আপনাৰ সুবিধানুযায়ী) ঊৰ্ধ্বতন কোনো সংস্কৰণৰ অধীন ।"
-
-#: ../src/totem-interface.c:351
+"Totem এটা বিনামুলিয়া চফ্টৱেৰ; আপুনি Free Software Foundation ৰ দ্বাৰা প্ৰকাশিত "
+"GNU General Public License ৰ চুক্তিসমূহৰ অন্তৰ্গত ইয়াক পুনৰ বিলাব পাৰিব অথবা সলনি "
+"কৰিব পাৰিব; হৈতো লাইচেঞ্চৰ সংস্কৰণ ২, অথবা (আপুনাৰ বিকল্পত) যিকোনো পৰৱৰ্তী সংস্কৰণ।"
+
+#: ../src/totem-interface.c:361
+#| msgid ""
+#| "Totem 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 General Public License for more "
+#| "details."
 msgid ""
 "Totem 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 General Public License for more "
 "details."
 msgstr ""
-"Totem বিতৰণ কৰাৰ মূল উদ্দেশ্য যে ব্যৱহাৰকৰ্তাৰা এৰ দ্বাৰা উপকৃত হ'বন, কিন্তু এইটোৰ "
-"বাবে কোনো সুস্পষ্ট ৱৰেন্টি উপস্থিত নাই; বাণিজ্যিক ও কোনো সুনিৰ্দিষ্ট কৰ্ম সাধনৰ বাবে "
-"অন্তৰ্নিহীত ৱৰেন্টিও অনুপস্থিত । অধিক জানতে GNU General Public License পড়ুন ।"
-
-#: ../src/totem-interface.c:355
+"Totem এইটো আশাত বিলোৱা হৈছে যে ই ব্যৱহাৰযোগ্য হ'ব, কিন্তু কোনো ৱাৰেন্টি নথকাকৈ; "
+"ব্যৱসায়ীক অথবা কোনো এটা বিশেষ কাৰণৰ যোগ্যতাৰ বাবে বুজুৱা ৱাৰেন্টি নথকাকৈ। অধিক "
+"যানিবলৈ GNU General Public License চাওক।"
+
+#: ../src/totem-interface.c:365
+#| msgid ""
+#| "You should have received a copy of the GNU General Public License along "
+#| "with Totem; if not, write to the Free Software Foundation, Inc., 59 "
+#| "Temple Place, Suite 330, Boston, MA 02111-1307 USA"
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Totem; if not, write to the Free Software Foundation, Inc., 59 Temple Place, "
 "Suite 330, Boston, MA  02111-1307  USA"
 msgstr ""
-"Totem ৰ সৈতে GNU General Public License ৰ এটা প্ৰতিলিপি উপলব্ধ হৱ উচিত; না "
-"থাকলে নিম্নলিখিত ঠিকানায় লিখে তা সংগ্ৰহ কৰক Free Software Foundation, Inc., 51 "
-"Fraনকলin Street, Fifth Floor, Boston, MA 02110-1301, USA"
+"আপুনি হৈতো Totem ৰ সৈতে ইতিমধ্যে GNU General Public License ৰ এটা কপি প্ৰাপ্ত "
+"কৰিছে; যদি নহয়, Free Software Foundation, Inc., 59 Temple Place, Suite 330, "
+"Boston, MA 02111-1307 USA লে লিখক"
 
-#: ../src/totem-interface.c:358
+#: ../src/totem-interface.c:368
 msgid ""
 "Totem contains an exception to allow the use of proprietary GStreamer "
 "plugins."
 msgstr ""
-"Totem দ্বাৰা প্ৰোপ্ৰাইটাৰি GStreamer প্লাগ-ইন ব্যৱহাৰৰ বাবে প্ৰযোজ্য অনুমোদন উপস্থিত "
-"ৰয়েছে ।"
+"Totem দ্বাৰা অধিকাৰী GStreamer প্লাগিন ব্যৱহাৰৰ বাবে প্ৰযোজ্য অনুমোদন উপস্থিত আছে।"
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:190
+#: ../src/totem-menu.c:291
 msgid "None"
 msgstr "শূণ্য"
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:195
+#: ../src/totem-menu.c:296
 msgctxt "Language"
 msgid "Auto"
-msgstr "স্বয়ংক্ৰিয়"
-
-#. Translators:
-#. * This is not a JPEG image, but a disc image, for example,
-#. * an ISO file
-#: ../src/totem-menu.c:765
-#, c-format
-msgid "Play Image '%s'"
-msgstr "'%s' ছবি চলাওক"
-
-#: ../src/totem-menu.c:768 ../src/totem-menu.c:851
-#, c-format
-msgid "device%d"
-msgstr "ডিভাইস%d"
-
-#: ../src/totem-menu.c:848
-#, c-format
-msgid "Play Disc '%s'"
-msgstr "'%s' নামক ডিস্ক চালান"
+msgstr "স্বচালিত"
 
-#. This lists the back-end type and version, such as
-#. * Movie Player using GStreamer 0.10.1
-#: ../src/totem-menu.c:1189
-#, c-format
-msgid "Movie Player using %s"
-msgstr "%s প্ৰয়োগকৰ্তা মুভি প্লেয়াৰ"
-
-#: ../src/totem-menu.c:1193
+#: ../src/totem-menu.c:789
 msgid "Copyright © 2002-2009 Bastien Nocera"
-msgstr "Copyright © 2002-2009 Bastien Nocera"
+msgstr "স্বত্বাধিকাৰ © ২০০২-২০০৯ বাচটিয়ান নচেৰা"
 
-#: ../src/totem-menu.c:1198
+#: ../src/totem-menu.c:794
 msgid "translator-credits"
-msgstr "অমিতাক্ষ ফুকন (aphukan@fedoraproject.org)"
+msgstr ""
+"অমিতাক্ষ ফুকন (aphukan@fedoraproject.org), নীলমদ্যুতি গোস্বামী (ngoswami@redhat."
+"com)"
 
-#: ../src/totem-menu.c:1202
+#: ../src/totem-menu.c:798
 msgid "Totem Website"
-msgstr "Totem ৱেব-সাইট"
+msgstr "Totem ৱেবছাইট"
 
-#: ../src/totem-menu.c:1236
+#: ../src/totem-menu.c:829
 msgid "Configure Plugins"
-msgstr "প্লাগ-ইন বিন্যাস কৰক"
+msgstr "প্লাগিন সংৰূপণ কৰক"
+
+#: ../src/totem-object.c:162
+#, c-format
+msgid ""
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"%s\n"
+"কমান্ড-শাৰীৰ পৰা ব্যৱহাৰযোগ্য বিকল্পৰ সম্পূৰ্ণ তালিকা চোৱাৰ বাবে '%s --help' ব্যৱহাৰ "
+"কৰক।\n"
 
 #. Translators: %s is the totem version number
-#: ../src/totem-object.c:471
+#: ../src/totem-object.c:591
 #, c-format
 msgid "Totem %s"
 msgstr "Totem %s"
 
-#: ../src/totem-object.c:1047 ../browser-plugin/totem-plugin-viewer.c:367
-msgid "Playing"
-msgstr "Playing"
-
-#: ../src/totem-object.c:1049 ../src/totem-options.c:52
+#: ../src/totem-object.c:1168 ../src/totem-options.c:52
 msgid "Pause"
 msgstr "স্থগিত"
 
-#: ../src/totem-object.c:1054 ../browser-plugin/totem-plugin-viewer.c:363
-msgid "Paused"
-msgstr "স্থগিত"
-
-#: ../src/totem-object.c:1056 ../src/totem-object.c:1066
+#: ../src/totem-object.c:1175 ../src/totem-object.c:1185
 #: ../src/totem-options.c:51
 msgid "Play"
 msgstr "Play"
 
-#: ../src/totem-object.c:1061 ../src/totem-object.c:1659
-#: ../src/totem-statusbar.c:115 ../browser-plugin/totem-plugin-viewer.c:351
-msgid "Stopped"
-msgstr "স্থগিত"
-
-#: ../src/totem-object.c:1142 ../src/totem-object.c:1169
-#: ../src/totem-object.c:1799 ../src/totem-object.c:1963
+#: ../src/totem-object.c:1267 ../src/totem-object.c:1294
+#: ../src/totem-object.c:1787 ../src/totem-object.c:1942
 #, c-format
 msgid "Totem could not play '%s'."
-msgstr "Totem সহযোগে '%s' চলোৱা নাযায় ।"
-
-#: ../src/totem-object.c:1246
-#, c-format
-msgid ""
-"Totem could not play this media (%s) although a plugin is present to handle "
-"it."
-msgstr "সঠিক প্লাগ-ইন উপস্থিত থাকা সত্বেও Totem দ্বাৰা এই মিডিয়া (%s) চলোৱা সম্ভৱ নহয় ।"
-
-#: ../src/totem-object.c:1247
-msgid ""
-"You might want to check that a disc is present in the drive and that it is "
-"correctly configured."
-msgstr "ড্ৰাইভে ডিস্ক আছে কিনা এবং তা সঠিকভাবে বিন্যাস কৰা হৈছে কিনা পৰীক্ষা কৰক ।"
-
-#: ../src/totem-object.c:1255
-msgid "More information about media plugins"
-msgstr "অতিৰিক্ত"
-
-#: ../src/totem-object.c:1256
-msgid ""
-"Please install the necessary plugins and restart Totem to be able to play "
-"this media."
-msgstr "এই মিডিয়া চলোৱাৰ বাবে সঠিক প্লাগ-ইন সংস্থাপন কৰি Totem পুনৰায় চালু কৰক ।"
-
-#: ../src/totem-object.c:1258
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because it does not have the "
-"appropriate plugins to be able to read from the disc."
-msgstr ""
-"Totem cannot play this type of media (%s) because it does not have the "
-"appropriate plugins to be able to read from the disc."
-
-#: ../src/totem-object.c:1260
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because you do not have the "
-"appropriate plugins to handle it."
-msgstr ""
-"সঠিক প্লাগ-ইন উপস্থিত না থাকাৰ ফলত Totem ৰ পক্ষে এই ধৰনৰ মিডিয়া (%s) চলোৱা সম্ভৱ "
-"নহয় ।"
-
-#: ../src/totem-object.c:1263
-#, c-format
-msgid "Totem cannot play this type of media (%s) because it is not supported."
-msgstr "এই ধৰনৰ মিডিয়া (%s) Totem দ্বাৰা সমৰ্থিত নোহোৱাৰ ফলত এইটো চলোৱা নাযাব ।"
-
-#: ../src/totem-object.c:1264
-msgid "Please insert another disc to play back."
-msgstr "চলোৱাৰ বাবে অনুগ্ৰহ কৰি এটা ডিস্ক ভৰাওক ।"
-
-#: ../src/totem-object.c:1300
-msgid "Totem was not able to play this disc."
-msgstr "Totem দ্বাৰা এই ডিস্ক চলোৱা সম্ভৱ নহয় ।"
-
-#: ../src/totem-object.c:1301 ../src/totem-object.c:4229
-msgid "No reason."
-msgstr "কাৰণ নাই ।"
-
-#: ../src/totem-object.c:1315
-msgid "Totem does not support playback of Audio CDs"
-msgstr "সৰ্বমোট অডিঅ'"
+msgstr "Totem এ '%s' চলাব নোৱাৰে।"
 
-#: ../src/totem-object.c:1316
-msgid "Please consider using a music player or a CD extractor to play this CD"
-msgstr "a a"
-
-#: ../src/totem-object.c:1805
+#: ../src/totem-object.c:1793
 msgid "No error message"
-msgstr "সমস্যাজড়িত বাৰ্তা নাই"
+msgstr "ত্ৰুটি বাৰ্তা নাই"
 
-#: ../src/totem-object.c:2154
+#: ../src/totem-object.c:2133
 msgid "Totem could not display the help contents."
-msgstr "Totem দ্বাৰা সহায়িকাৰ বিষয় বস্তু প্ৰদৰ্শন কৰা নাযায় ।"
-
-#: ../src/totem-object.c:2493 ../src/totem-object.c:2495
-#: ../browser-plugin/totem-plugin-viewer.c:1417
-msgid "An error occurred"
-msgstr "সমস্যা উৎপন্ন হৈছে"
+msgstr "Totem দ্বাৰা সহায়ৰ সমল প্ৰদৰ্শন কৰা নাযায়।"
 
-#: ../src/totem-object.c:4064 ../src/totem-object.c:4066
+#: ../src/totem-object.c:4019 ../src/totem-object.c:4021
 msgid "Previous Chapter/Movie"
-msgstr "পূৰ্ববৰ্তী অধ্যায়/চলচ্চিত্ৰ"
+msgstr "পূৰ্ববৰ্তী পাঠ/চলচিত্ৰ"
 
-#: ../src/totem-object.c:4073 ../src/totem-object.c:4075
+#: ../src/totem-object.c:4028 ../src/totem-object.c:4030
 msgid "Play / Pause"
-msgstr "চলোৱা / থামানো হ'ব"
+msgstr "চলোৱা / বিৰাম দিয়ক"
 
-#: ../src/totem-object.c:4083 ../src/totem-object.c:4085
+#: ../src/totem-object.c:4038 ../src/totem-object.c:4040
 msgid "Next Chapter/Movie"
-msgstr "পৰবৰ্তী অধ্যায়/চলচ্চিত্ৰ"
+msgstr "পৰবৰ্তী পাঠ/চলচিত্ৰ"
 
-#. Translators: this is the tooltip text for the fullscreen button in the controls box in Totem's main window.
 #. Translators: this is the accessibility text for the fullscreen button in the controls box in Totem's main window.
-#: ../src/totem-object.c:4097 ../src/totem-object.c:4099
+#: ../src/totem-object.c:4051 ../src/totem-object.c:4053
 msgid "Fullscreen"
-msgstr "সম্পূৰ্ণ পৰ্দা"
+msgstr "পূৰ্ণপৰ্দা"
 
-#: ../src/totem-object.c:4229
+#: ../src/totem-object.c:4184
 msgid "Totem could not startup."
-msgstr "Totem আৰম্ভ কৰা নাযায় ।"
+msgstr "Totem আৰম্ভ কৰা নাযায়।"
+
+#: ../src/totem-object.c:4184
+msgid "No reason."
+msgstr "কাৰণ নাই।"
 
 #: ../src/totem-open-location.c:182
 msgid "Open Location..."
@@ -1343,11 +1347,11 @@
 
 #: ../src/totem-options.c:49
 msgid "Enable debug"
-msgstr "ডি-বাগ ব্যৱস্থা সক্ৰিয় কৰা হ'ব"
+msgstr "ডিবাগ ব্যৱস্থা সামৰ্থবান কৰক"
 
 #: ../src/totem-options.c:50
 msgid "Play/Pause"
-msgstr "চলোৱা/থামানো হ'ব"
+msgstr "চলোৱা/বিৰাম দিয়ক"
 
 #: ../src/totem-options.c:53
 msgid "Next"
@@ -1359,168 +1363,162 @@
 
 #: ../src/totem-options.c:55
 msgid "Seek Forwards"
-msgstr "পৰবৰ্তী অংশে অনুসন্ধান"
+msgstr "আগফালে সন্ধান কৰক"
 
 #: ../src/totem-options.c:56
 msgid "Seek Backwards"
-msgstr "পূৰ্ববৰ্তী অংশে অনুসন্ধান"
+msgstr "পিছফালে সন্ধান কৰক"
 
 #: ../src/totem-options.c:57
 msgid "Volume Up"
-msgstr "শব্দেৰ মাত্ৰা বৃদ্ধি কৰক"
+msgstr "ভলিউম বৃদ্ধি কৰক"
 
 #: ../src/totem-options.c:58
 msgid "Volume Down"
-msgstr "শব্দেৰ মাত্ৰা হ্ৰাস কৰক"
+msgstr "ভলিউম কম কৰক"
 
 #: ../src/totem-options.c:59
 msgid "Mute sound"
-msgstr "নিঃশব্দ কৰক"
+msgstr "মৌন কৰক"
 
 #: ../src/totem-options.c:60
 msgid "Toggle Fullscreen"
-msgstr "সম্পূৰ্ণ পৰ্দা জুড়ে প্ৰদৰ্শন কৰা হ'ব/ন'হ'ব"
+msgstr "পূৰ্ণপৰ্দা পৰিবৰ্তন কৰক"
 
 #: ../src/totem-options.c:61
 msgid "Show/Hide Controls"
-msgstr "নিয়ন্ত্ৰক বাটন প্ৰদৰ্শন/আড়াল কৰা হ'ব"
+msgstr "নিয়ন্ত্ৰণসমূহ দেখুৱাওক/লুকাওক"
 
 #: ../src/totem-options.c:62
 msgid "Quit"
-msgstr "Quit"
+msgstr "প্ৰস্থান কৰক"
 
 #: ../src/totem-options.c:63
 msgid "Enqueue"
-msgstr "সাৰিবদ্ধ কৰা হ'ব"
+msgstr "শাৰীবদ্ধ কৰা হ'ব"
 
 #: ../src/totem-options.c:64
 msgid "Replace"
-msgstr "প্ৰতিস্থাপন"
+msgstr "প্ৰতিস্থাপন কৰক"
 
 #: ../src/totem-options.c:65
 msgid "Seek"
-msgstr "সিক"
+msgstr "সন্ধান কৰক"
 
 #. Translators: help for a (hidden) command line option to specify (the zero-based index of) a playlist entry to start playing once Totem's finished loading
 #: ../src/totem-options.c:67
 msgid "Playlist index"
-msgstr "প্লে-লিস্টৰ ইনডেক্স"
+msgstr "প্লেলিস্টৰ সূচী"
 
 #: ../src/totem-options.c:69
 msgid "Movies to play"
-msgstr "চলোৱাৰ বাবে চিহ্নিত চলচ্চিত্ৰ ।"
+msgstr "চলোৱাৰ বাবে চিহ্নিত চলচিত্ৰ।"
+
+#: ../src/totem-options.c:79
+msgid "- Play movies and songs"
+msgstr "- চলচিত্ৰ আৰু সংগীত চলাওক"
 
-#: ../src/totem-options.c:117
+#: ../src/totem-options.c:142
 msgid "Can't enqueue and replace at the same time"
-msgstr "একে সময়তে শাৰীত অানিব আৰু সলাব নোৱাৰি"
+msgstr "একে সময়তে শাৰীত অানিব আৰু চলাব নোৱাৰি"
 
 #. By extension entry
-#: ../src/totem-playlist.c:161
+#: ../src/totem-playlist.c:162
 msgid "MP3 ShoutCast playlist"
-msgstr "MP3 ShoutCast প্লে-লিস্ট"
+msgstr "MP3 ShoutCast প্লেলিস্ট"
 
-#: ../src/totem-playlist.c:162
+#: ../src/totem-playlist.c:163
 msgid "MP3 audio (streamed)"
 msgstr "MP3 অডিঅ' (স্ট্ৰিম কৰা)"
 
-#: ../src/totem-playlist.c:163
+#: ../src/totem-playlist.c:164
 msgid "MP3 audio (streamed, DOS format)"
 msgstr "MP3 অডিঅ' (স্ট্ৰিম কৰা, DOS বিন্যাস)"
 
-#: ../src/totem-playlist.c:164
+#: ../src/totem-playlist.c:165
 msgid "XML Shareable Playlist"
-msgstr "XML সহযোগে যৌথভাবে ব্যৱহাৰযোগ্য প্লে-লিস্ট"
+msgstr "XML অংশীদাৰী প্লেলিস্ট"
 
 #. This is "Title 3", where title is a DVD title
 #. * Note: NOT a DVD chapter
-#: ../src/totem-playlist.c:347
+#: ../src/totem-playlist.c:348
 #, c-format
 msgid "Title %d"
-msgstr "শিৰোনাম %d"
+msgstr "শীৰ্ষক %d"
 
-#: ../src/totem-playlist.c:446
+#: ../src/totem-playlist.c:447
 msgid "Could not save the playlist"
-msgstr "প্লে-লিস্ট সংৰক্ষণ কৰা নাযায়"
+msgstr "প্লেলিস্ট সংৰক্ষণ কৰা নাযায়"
 
-#: ../src/totem-playlist.c:1021
+#: ../src/totem-playlist.c:1022
 msgid "Save Playlist"
-msgstr "প্লে-লিস্ট সংৰক্ষণ কৰক"
+msgstr "প্লেলিস্ট সংৰক্ষণ কৰক"
 
 #. translators: Playlist is the default saved playlist filename,
 #. * without the suffix
-#: ../src/totem-playlist.c:1033 ../src/totem-playlist.c:1264
-#: ../src/totem-sidebar.c:142
+#: ../src/totem-playlist.c:1034 ../src/totem-playlist.c:1263
+#: ../src/totem-sidebar.c:145
 msgid "Playlist"
-msgstr "প্লে-লিস্ট"
+msgstr "প্লেলিস্ট"
 
-#: ../src/totem-playlist.c:1857
+#: ../src/totem-playlist.c:1862
 #, c-format
 msgid "The playlist '%s' could not be parsed. It might be damaged."
-msgstr "সম্ভৱত ক্ষতিগ্ৰস্ত হৱৰ ফলত '%s' প্লে-লিস্টটো পঢ়া নাযায়।"
+msgstr "সম্ভৱত ক্ষতিগ্ৰস্ত হোৱাৰ ফলত '%s' প্লেলিস্টটো পঢ়া নাযায়।"
 
-#: ../src/totem-playlist.c:1858
+#: ../src/totem-playlist.c:1863
 msgid "Playlist error"
-msgstr "প্লে-লিস্ট সংক্ৰান্ত সমস্যা"
+msgstr "প্লেলিস্ট ত্ৰুটি"
 
-#: ../src/totem-preferences.c:295
+#: ../src/totem-preferences.c:297
 msgid "Preferences"
-msgstr "পছন্দ"
+msgstr "পছন্দসমূহ"
 
-#: ../src/totem-preferences.c:451
+#: ../src/totem-preferences.c:445
 msgid "Select Subtitle Font"
-msgstr "অনুবাদলিপিৰ ফন্ট নিৰ্বাচন"
+msgstr "উপশীৰ্ষকসমূহৰ ফন্ট বাছক"
 
-#: ../src/totem-properties-main.c:115 ../src/totem-properties-view.c:266
+#: ../src/totem-properties-main.c:116 ../src/totem-properties-view.c:269
 msgid "Audio/Video"
 msgstr "অডিঅ'/ভিডিঅ'"
 
-#: ../src/totem-properties-view.c:128
+#: ../src/totem-properties-view.c:131
 msgid "N/A"
 msgstr "অপ্ৰযোজ্য"
 
-#: ../src/totem-properties-view.c:157
+#: ../src/totem-properties-view.c:160
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 msgctxt "Stream bit rate"
 msgid "N/A"
 msgstr "অপ্ৰযোজ্য"
 
-#: ../src/totem-properties-view.c:160
+#: ../src/totem-properties-view.c:163
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 #, c-format
 msgid "%d kbps"
-msgstr "%d কিলোবাইট/ছেকেণ্ড"
+msgstr "%d kbps"
 
-#: ../src/totem-properties-view.c:177
+#: ../src/totem-properties-view.c:180
 #: ../src/plugins/properties/totem-movie-properties.c:149
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../src/totem-properties-view.c:209
+#: ../src/totem-properties-view.c:212
 #: ../src/plugins/properties/totem-movie-properties.c:166
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: ../src/totem-properties-view.c:216
+#: ../src/totem-properties-view.c:219
 #: ../src/plugins/properties/totem-movie-properties.c:166
 msgctxt "Sample rate"
 msgid "N/A"
 msgstr "অপ্ৰযোজ্য"
 
-#: ../src/totem-properties-view.c:224
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5589
-msgid "Surround"
-msgstr "সাৰাউন্ড"
-
-#: ../src/totem-properties-view.c:226
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5591
-msgid "Mono"
-msgstr "মোনো"
-
-#: ../src/totem-properties-view.c:236
+#: ../src/totem-properties-view.c:239
 msgctxt "Number of audio channels"
 msgid "N/A"
 msgstr "অপ্ৰযোজ্য"
@@ -1544,7 +1542,7 @@
 #: ../src/totem-statusbar.c:143 ../src/totem-time-label.c:67
 #, c-format
 msgid "Seek to %s / %s"
-msgstr "%s / %s অনুসন্ধান কৰা হ'ব"
+msgstr "%s / %s সন্ধান কৰা হ'ব"
 
 #: ../src/totem-statusbar.c:239
 msgid "Buffering"
@@ -1553,8 +1551,8 @@
 #. eg: 75 %
 #: ../src/totem-statusbar.c:250
 #, c-format
-msgid "%d %%"
-msgstr "%d %%"
+msgid "%lf %%"
+msgstr "%lf %%"
 
 #. eg: Paused, 0:32 / 1:05
 #: ../src/totem-statusbar.c:325
@@ -1565,12 +1563,12 @@
 #. eg: Buffering, 75 %
 #: ../src/totem-statusbar.c:330
 #, c-format
-msgid "%s, %d %%"
-msgstr "%s, %d %%"
+msgid "%s, %f %%"
+msgstr "%s, %f %%"
 
 #: ../src/totem-subtitle-encoding.c:156
 msgid "Current Locale"
-msgstr "বৰ্তমানে ব্যৱহৃত লোকেইল"
+msgstr "বৰ্তমানে স্থানীয়"
 
 #: ../src/totem-subtitle-encoding.c:159 ../src/totem-subtitle-encoding.c:161
 #: ../src/totem-subtitle-encoding.c:163 ../src/totem-subtitle-encoding.c:165
@@ -1588,7 +1586,7 @@
 
 #: ../src/totem-subtitle-encoding.c:178
 msgid "Celtic"
-msgstr "সেল্টিক"
+msgstr "চেল্টিক"
 
 #: ../src/totem-subtitle-encoding.c:181 ../src/totem-subtitle-encoding.c:183
 #: ../src/totem-subtitle-encoding.c:185 ../src/totem-subtitle-encoding.c:187
@@ -1613,15 +1611,15 @@
 #: ../src/totem-subtitle-encoding.c:213 ../src/totem-subtitle-encoding.c:215
 #: ../src/totem-subtitle-encoding.c:217 ../src/totem-subtitle-encoding.c:219
 msgid "Cyrillic"
-msgstr "সিৰিলিক"
+msgstr "চিৰিলিক"
 
 #: ../src/totem-subtitle-encoding.c:222
 msgid "Cyrillic/Russian"
-msgstr "সিৰিলিক/ৰুশি"
+msgstr "চিৰিলিক/ৰুশি"
 
 #: ../src/totem-subtitle-encoding.c:225 ../src/totem-subtitle-encoding.c:227
 msgid "Cyrillic/Ukrainian"
-msgstr "সিৰিলিক/ইউক্ৰেনিয়ান"
+msgstr "চিৰিলিক/ইউক্ৰেনিয়ান"
 
 #: ../src/totem-subtitle-encoding.c:230
 msgid "Georgian"
@@ -1647,7 +1645,7 @@
 
 #: ../src/totem-subtitle-encoding.c:255
 msgid "Hebrew Visual"
-msgstr "হিব্ৰু ভিজুয়াল"
+msgstr "হিব্ৰু দৃশ্যমান"
 
 #: ../src/totem-subtitle-encoding.c:258
 msgid "Hindi"
@@ -1655,7 +1653,7 @@
 
 #: ../src/totem-subtitle-encoding.c:261
 msgid "Icelandic"
-msgstr "আইসল্যান্ডিক"
+msgstr "আইচল্যান্ডিক"
 
 #: ../src/totem-subtitle-encoding.c:264 ../src/totem-subtitle-encoding.c:266
 #: ../src/totem-subtitle-encoding.c:268
@@ -1696,7 +1694,7 @@
 #: ../src/totem-subtitle-encoding.c:310 ../src/totem-subtitle-encoding.c:312
 #: ../src/totem-subtitle-encoding.c:314
 msgid "Unicode"
-msgstr "ইউনিকোড"
+msgstr "ইউনিক'ড"
 
 #: ../src/totem-subtitle-encoding.c:317 ../src/totem-subtitle-encoding.c:319
 #: ../src/totem-subtitle-encoding.c:321 ../src/totem-subtitle-encoding.c:323
@@ -1707,279 +1705,132 @@
 #: ../src/totem-subtitle-encoding.c:328 ../src/totem-subtitle-encoding.c:330
 #: ../src/totem-subtitle-encoding.c:332
 msgid "Vietnamese"
-msgstr "ভিয়েতনামিস"
-
-#: ../src/totem-video-list.c:330
-msgid "No video URI"
-msgstr "কোনো URI উপস্থিত নাই"
-
-#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
-#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
-#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
-#: ../src/totem-video-thumbnailer.c:872
-#, c-format
-msgid ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-msgstr ""
-"%s: %s\n"
-"
%s: %d×%d\n"
-"
%s: %s"
-
-#: ../src/totem-video-thumbnailer.c:873
-msgid "Filename"
-msgstr "নথিপত্ৰৰ নাম"
-
-#: ../src/totem-video-thumbnailer.c:875
-msgid "Resolution"
-msgstr "ৰিছোলিউছন"
-
-#: ../src/totem-video-thumbnailer.c:878
-msgid "Duration"
-msgstr "অৱকাল"
+msgstr "ভিয়েতনামিচ"
 
-#: ../src/totem-uri.c:506 ../src/plugins/chapters/totem-chapters.c:998
+#: ../src/totem-uri.c:343 ../src/plugins/chapters/totem-chapters.c:998
 msgid "All files"
-msgstr "সৰ্বধৰনৰ নথিপত্ৰ"
+msgstr "সকলো নথিপত্ৰ"
 
-#: ../src/totem-uri.c:511 ../src/plugins/chapters/totem-chapters.c:995
+#: ../src/totem-uri.c:348 ../src/plugins/chapters/totem-chapters.c:995
 msgid "Supported files"
 msgstr "সমৰ্থিত নথিপত্ৰ"
 
-#: ../src/totem-uri.c:523
+#: ../src/totem-uri.c:360
 msgid "Audio files"
 msgstr "অডিঅ' নথিপত্ৰ"
 
-#: ../src/totem-uri.c:531
+#: ../src/totem-uri.c:368
 msgid "Video files"
 msgstr "ভিডিঅ' নথিপত্ৰ"
 
-#: ../src/totem-uri.c:541
+#: ../src/totem-uri.c:378
 msgid "Subtitle files"
-msgstr "Subtitle files"
+msgstr "উপশীৰ্ষক নথিপত্ৰসমূহ"
 
-#: ../src/totem-uri.c:593
+#: ../src/totem-uri.c:430
 msgid "Select Text Subtitles"
-msgstr "অনুবাদলিপি নিৰ্বাচন কৰক"
+msgstr "উপশীৰ্ষকসমূহ লিখনী বাছক"
 
-#: ../src/totem-uri.c:656
+#: ../src/totem-uri.c:495
 msgid "Select Movies or Playlists"
-msgstr "চলচ্চিত্ৰ অথবা প্লে-লিস্ট নিৰ্বাচন কৰক"
-
-#. Options parsing
-#: ../src/totem.c:201
-msgid "- Play movies and songs"
-msgstr "- চলচ্চিত্ৰ ও সংগীত পৰিবেশন"
-
-#: ../src/totem.c:212
-#, c-format
-msgid ""
-"%s\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"%s\n"
-"আদেশ-শাৰীৰ পৰা ব্যৱহাৰযোগ্য বিকল্পৰ সম্পূৰ্ণ তালিকা চোৱাৰ বাবে '%s --help' ব্যৱহাৰ "
-"কৰক ।\n"
-
-#: ../src/totem.c:254 ../src/totem.c:265
-#: ../browser-plugin/totem-plugin-viewer.c:663
-#: ../browser-plugin/totem-plugin-viewer.c:1793
-msgid "Totem Movie Player"
-msgstr "Totem চলচ্চিত্ৰ বাদন ব্যৱস্থা"
-
-#: ../src/totem.c:255 ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Could not initialize the thread-safe libraries."
-msgstr "থ্ৰেড-সেফ লাইব্ৰৰি চালু কৰা নাযায় ।"
-
-#: ../src/totem.c:255
-msgid "Verify your system installation. Totem will now exit."
-msgstr "আপনাৰ প্ৰণালীৰ সংস্থাপনেশন পৰীক্ষা কৰক । Totem এতিয়া বন্ধ কৰা হ'ব ।"
+msgstr "চলচিত্ৰ অথবা প্লেলিস্ট বাছক"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:1589
-msgid "Password requested for RTSP server"
-msgstr "RTSP চাৰ্ভাৰৰ বাবে অনুৰোধিত পাছওৱাৰ্ড"
+#: ../src/totem-uri.c:499
+msgid "Add Directory"
+msgstr "ডাইৰেকটৰি যোগ কৰক"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2858
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2862
-#, c-format
-msgid "Audio Track #%d"
-msgstr "অডিঅ' ট্ৰেক সংখ্যা #%d"
+#: ../src/totem-video-list.c:330
+msgid "No video URI"
+msgstr "কোনো ভিডিঅ' URI নাই"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2890
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2894
+#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
+#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
+#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
+#: ../src/totem-video-thumbnailer.c:841
 #, c-format
-msgid "Subtitle #%d"
-msgstr "অনুবাদলিপি #%d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3298
-msgid ""
-"The requested audio output was not found. Please select another audio output "
-"in the Multimedia Systems Selector."
-msgstr ""
-"অনুৰোধ কৰা অডিঅ' আউটপুট পাৱ নাযায় । মাল্টি-মিডিয়া প্ৰণালী নিৰ্বাচন ব্যৱস্থায় অনুগ্ৰহ "
-"কৰি অন্য এটা অডিঅ' আউটপুট নিৰ্বাচন কৰক ।"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3303
-msgid "Location not found."
-msgstr "অৱস্থান পাৱ নাযায় ।"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3307
-msgid "Could not open location; you might not have permission to open the file."
-msgstr "অৱস্থান খোলা নাযায়; সম্ভৱত এই নথিপত্ৰ খুলিবলৈ আপনি অনুমতিপ্ৰাপ্ত নন ।"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3318
-msgid ""
-"The video output is in use by another application. Please close other video "
-"applications, or select another video output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"ভিডিঅ' আউটপুট অন্য এটা এপ্লিকেশনৰ দ্বাৰা ব্যৱহৃত হৈছে । অনুগ্ৰহ কৰি অন্য ভিডিঅ' "
-"এপ্লিকেশন বন্ধ কৰক অথবা মাল্টি-মিডিয়া প্ৰণালী নিৰ্বাচন ব্যৱস্থায় অন্য এটা ভিডিঅ' "
-"আউটপুট ব্যৱস্থা নিৰ্বাচন কৰক ।"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3324
 msgid ""
-"The audio output is in use by another application. Please select another "
-"audio output in the Multimedia Systems Selector. You may want to consider "
-"using a sound server."
-msgstr ""
-"অডিঅ' আউটপুট অন্য এটা এপ্লিকেশনৰ দ্বাৰা ব্যৱহৃত হৈছে । অনুগ্ৰহ কৰি মাল্টি-মিডিয়া "
-"প্ৰণালী নিৰ্বাচন ব্যৱস্থায় অন্য এটা অডিঅ' আউটপুট ব্যৱস্থা নিৰ্বাচন কৰক । সাউন্ড সেৱক "
-"ব্যৱহাৰ সম্পৰ্কে বিবেচনা কৰা যাব ।"
-
-#. should be exactly one missing thing (source or converter)
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3342
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3348
-#, c-format
-msgid "The playback of this movie requires a %s plugin which is not installed."
-msgid_plural ""
-"The playback of this movie requires the following decoders which are not "
-"installed:\n"
-"\n"
-"%s"
-msgstr[0] "এই চলচ্চিত্ৰ প্ৰদৰ্শনৰ বাবে %s প্লাগ-ইনৰ প্ৰয়োজন, যি ইনস্টল নাই।"
-msgstr[1] ""
-"এই চলচ্চিত্ৰ প্ৰদৰ্শনৰ বাবে নিম্নলিখিত ডিকোডাৰসমূহৰ প্ৰয়োজন, যি ইনস্টল নাই:\n"
-"\n"
-"%s"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3374
-msgid "Cannot play this file over the network. Try downloading it to disk first."
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 msgstr ""
-"নেটৱৰ্কেৰ মাধ্যমে এই নথিপত্ৰ চলোৱা নাযাব । প্ৰতমে এইটো ডিস্কে ডাউনলোড কৰাৰ "
-"প্ৰচেষ্টা কৰক ।"
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5878
-msgid "Media contains no supported video streams."
-msgstr "কোনো সমৰ্থিত ভিডিঅ' স্ট্ৰিম মিডিয়াত উপস্থিত নাই ।"
+#: ../src/totem-video-thumbnailer.c:842
+msgid "Filename"
+msgstr "নথিপত্ৰৰ নাম"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6052
-msgid ""
-"Failed to create a GStreamer play object. Please check your GStreamer "
-"installation."
-msgstr ""
-"GStreamer প্লে অবজেক্ট নিৰ্মাণ কৰা নাযায় । অনুগ্ৰহ কৰি আপনাৰ প্ৰণালীে সংস্থাপন কৰা "
-"GStreamer পৰীক্ষা কৰক ।"
+#: ../src/totem-video-thumbnailer.c:844
+msgid "Resolution"
+msgstr "বিভেদন"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6172
-msgid ""
-"Failed to open audio output. You may not have permission to open the sound "
-"device, or the sound server may not be running. Please select another audio "
-"output in the Multimedia Systems Selector."
-msgstr ""
-"অডিঅ' আউটপুট খুলিবলৈ সমস্যা ।. সম্ভৱত আপনি সাউন্ড ডিভাইস খুলিবলৈ অনুমতিপ্ৰাপ্ত নন "
-"অথবা সাউন্ড সেৱক বৰ্তমানে সক্ৰিয় নহয় । অনুগ্ৰহ কৰি মাল্টি-মিডিয়া প্ৰণালী নিৰ্বাচন "
-"ব্যৱস্থায় অন্য এটা অডিঅ' আউটপুট নিৰ্বাচন কৰক ।"
+#: ../src/totem-video-thumbnailer.c:847
+msgid "Duration"
+msgstr "অৱধি"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6192
-msgid ""
-"Could not find the audio output. You may need to install additional "
-"GStreamer plugins, or select another audio output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"অডিঅ' আউটপুট পাৱ নাযায় । সম্ভৱত অতিৰিক্ত GStreamer প্লাগ-ইন সংস্থাপন কৰা আবশ্যক "
-"অথবা মাল্টি-মিডিয়া প্ৰণালী নিৰ্বাচন ব্যৱস্থায় অন্য এটা অডিঅ' আউটপুট নিৰ্বাচন কৰক ।"
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:1
+msgid "Apple Trailers"
+msgstr "Apple ট্ৰেইলাৰসমূহ"
+
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:2
+msgid "Sets the user agent for the Apple Trailers site"
+msgstr "Apple ট্ৰেইলাৰসমূহ ছাইটৰ বাবে ব্যৱহাৰকাৰী সহায়ক সংহতি কৰে"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:1
+msgid "Autoload Subtitles"
+msgstr "স্বল'ড উপশীৰ্ষকসমূহ"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:2
+msgid "Autoloads text subtitles"
+msgstr "স্বল'ড লিখনী উপশীৰ্ষকসমূহ"
 
-#. hour:minutes:seconds
-#. Translators: This is a time format, like "9:05:02" for 9
-#. * hours, 5 minutes, and 2 seconds. You may change ":" to
-#. * the separator that your locale uses or use "%Id" instead
-#. * of "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:83 ../src/plugins/skipto/totem-time-entry.c:57
-#, c-format
-msgctxt "long time format"
-msgid "%d:%02d:%02d"
-msgstr "%d:%02d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
+msgid "Video Disc Recorder"
+msgstr "ভিডিঅ' ডিস্ক ৰেকৰ্ডাৰ"
 
-#. minutes:seconds
-#. Translators: This is a time format, like "5:02" for 5
-#. * minutes and 2 seconds. You may change ":" to the
-#. * separator that your locale uses or use "%Id" instead of
-#. * "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:92
-#, c-format
-msgctxt "short time format"
-msgid "%d:%02d"
-msgstr "%d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
+msgid "Records (S)VCDs or video DVDs"
+msgstr "(S)VCD অথবা DVD ৰেকৰ্ড কৰিবলৈ ব্যৱহৃত হয়"
 
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:65
 msgid "_Create Video Disc..."
-msgstr "ভিডিঅ' ডিস্ক নিৰ্মাণ কৰক...(_C)"
+msgstr "ভিডিঅ' ডিস্ক সৃষ্টি কৰক (_C)..."
 
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:66
 msgid "Create a video DVD or a (S)VCD from the currently opened movie"
-msgstr "বৰ্তমানে চলমান চলচ্চিত্ৰৰ পৰা ভিডিঅ' DVD অথবা (S)VCD নিৰ্মাণ কৰক"
+msgstr "বৰ্তমানে চলমান চলচিত্ৰৰ পৰা ভিডিঅ' DVD অথবা (S)VCD সৃষ্টি কৰক"
 
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:68
 msgid "Copy Vide_o DVD..."
-msgstr "ভিডিঅ' DVD নকল কৰক...(_o)"
+msgstr "ভিডিঅ' DVD কপি কৰক (_o)..."
 
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:69
 msgid "Copy the currently playing video DVD"
-msgstr "বৰ্তমানে চলমান ভিডিঅ' DVD নকল কৰক"
+msgstr "বৰ্তমানে চলমান ভিডিঅ' DVD কপি কৰক"
 
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:71
 msgid "Copy (S)VCD..."
-msgstr "(S)VCD নকল কৰক..."
+msgstr "(S)VCD কপি কৰক..."
 
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:72
 msgid "Copy the currently playing (S)VCD"
-msgstr "বৰ্তমানে চলমান (S)VCD নকল কৰক"
+msgstr "বৰ্তমানে চলমান (S)VCD কপি কৰক"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:129
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:136
 msgid "The video disc could not be duplicated."
-msgstr "ভিডিঅ' ডিস্কৰ প্ৰতিলিপি সৃষ্টি কৰিবলৈ ব্যৰ্থ ।"
+msgstr "ভিডিঅ' ডিস্কৰ প্ৰতিলিপি সৃষ্টি কৰিবলৈ ব্যৰ্থ।"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:131
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:276
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:138
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:283
 msgid "The movie could not be recorded."
-msgstr "চলচ্চিত্ৰ ৰেকৰ্ড কৰিবলৈ ব্যৰ্থ ।"
+msgstr "চলচিত্ৰ ৰেকৰ্ড কৰিবলৈ ব্যৰ্থ।"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:157
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:167
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:263
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:164
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:174
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:270
 msgid "Unable to write a project."
-msgstr "প্ৰকল্প লিখিবলৈ ব্যৰ্থ ।"
-
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
-msgid "Video Disc Recorder"
-msgstr "ভিডিঅ' ডিস্ক ৰেকৰ্ডাৰ"
-
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
-msgid "Records (S)VCDs or video DVDs"
-msgstr "(S)VCD অথবা DVD ৰেকৰ্ড কৰিবলৈ ব্যৱহৃত হয়"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:1
-#: ../src/plugins/chapters/totem-chapters.c:1139
-msgid "Chapters"
-msgstr "পাঠসমূহ"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:2
-msgid "Support chapter markers in movies."
-msgstr "চলচ্চিত্ৰসমূহত সমৰ্থিত পাঠ চিহ্নক "
+msgstr "প্ৰকল্প লিখিবলৈ ব্যৰ্থ।"
 
 #: ../src/plugins/chapters/chapters-edit.ui.h:1
 msgid "Name for new chapter:"
@@ -1999,7 +1850,7 @@
 
 #: ../src/plugins/chapters/chapters-list.ui.h:4
 msgid "Go to the chapter in the movie"
-msgstr "চলচ্চিত্ৰত থকা পাঠলৈ যাওক"
+msgstr "চলচিত্ৰত থকা পাঠলৈ যাওক"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:5
 msgid "Add Chapter..."
@@ -2015,7 +1866,7 @@
 
 #: ../src/plugins/chapters/chapters-list.ui.h:8
 msgid "Save Changes"
-msgstr "পৰিৱৰ্তনসমূহ সঞ্চয় কৰক"
+msgstr "পৰিৱৰ্তনসমূহ সংৰক্ষণ কৰক"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:9
 msgid "No chapter data"
@@ -2023,11 +1874,11 @@
 
 #: ../src/plugins/chapters/chapters-list.ui.h:10
 msgid "Load Chapters..."
-msgstr "পাঠসমুহ লোড কৰক..."
+msgstr "পাঠসমুহ ল'ড কৰক..."
 
 #: ../src/plugins/chapters/chapters-list.ui.h:11
 msgid "Load chapters from an external CMML file"
-msgstr "এটা বহিৰ্তম CMML নথিপত্ৰৰ পৰা পাঠসমূহ লোড কৰক"
+msgstr "এটা বহিৰ্তম CMML নথিপত্ৰৰ পৰা পাঠসমূহ ল'ড কৰক"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:12
 msgid "Add New Chapters"
@@ -2035,7 +1886,16 @@
 
 #: ../src/plugins/chapters/chapters-list.ui.h:13
 msgid "Create a new chapter list for the movie"
-msgstr "চলচ্চিত্ৰৰ বাবে এটা নতুন পাঠ তালিকা সৃষ্টি কৰক"
+msgstr "চলচিত্ৰৰ বাবে এটা নতুন পাঠ মেনু সৃষ্টি কৰক"
+
+#: ../src/plugins/chapters/chapters.plugin.in.h:1
+#: ../src/plugins/chapters/totem-chapters.c:1139
+msgid "Chapters"
+msgstr "পাঠসমূহ"
+
+#: ../src/plugins/chapters/chapters.plugin.in.h:2
+msgid "Support chapter markers in movies"
+msgstr "চলচিত্ৰসমূহত পাঠ চিহ্নক সমৰ্থন কৰক"
 
 #: ../src/plugins/chapters/totem-chapters.c:56
 #, c-format
@@ -2064,11 +1924,11 @@
 
 #: ../src/plugins/chapters/totem-chapters.c:842
 msgid "Error occurred while saving chapters"
-msgstr "পাঠসমূহ সঞ্চয় কৰোতে ত্ৰুটি"
+msgstr "পাঠসমূহ সংৰক্ষণ কৰোতে ত্ৰুটি"
 
 #: ../src/plugins/chapters/totem-chapters.c:843
 msgid "Please check you have permission to write to the folder containing the movie."
-msgstr "অনুগ্ৰহ কৰি নিৰিক্ষণ কৰক চলচ্চিত্ৰ থকা ফোল্ডাৰত লিখিব আপোনাৰ অনুমতি আছে নে।"
+msgstr "অনুগ্ৰহ কৰি নীৰিক্ষণ কৰক চলচিত্ৰ থকা ফোল্ডাৰত লিখিব আপোনাৰ অনুমতি আছে নে।"
 
 #: ../src/plugins/chapters/totem-chapters.c:976
 msgid "Open Chapter File"
@@ -2084,28 +1944,27 @@
 
 #: ../src/plugins/chapters/totem-chapters.c:1184
 msgid "Save changes to chapter list before closing?"
-msgstr "বন্ধ কৰাৰ আগতে পাঠ তালিকালে পৰিৱৰ্তন সঞ্চয় কৰিব নে?"
+msgstr "বন্ধ কৰাৰ আগতে পাঠ তালিকালে পৰিৱৰ্তন সংৰক্ষণ কৰিব নে?"
 
 #. Translators: close Totem without saving changes to the chapter list of the current movie.
 #: ../src/plugins/chapters/totem-chapters.c:1189
 msgid "Close without Saving"
-msgstr "সঞ্চয় নকৰাকে বন্ধ কৰক"
+msgstr "সংৰক্ষণ নকৰাকে বন্ধ কৰক"
 
 #. Translators: save changes to the chapter list of the current movie before closing Totem.
 #: ../src/plugins/chapters/totem-chapters.c:1191
 msgid "Save"
-msgstr "সঞ্চয়"
+msgstr "সংৰক্ষণ"
 
 #: ../src/plugins/chapters/totem-chapters.c:1194
 msgid "If you don't save, changes to the chapter list will be lost."
-msgstr "যদি আপুনি সঞ্চয় নকৰে, পাঠ তালিকালে হোৱা পৰিৱৰ্তনসমূহ নাথাকিব।"
+msgstr "যদি আপুনি সংৰক্ষণ নকৰে, পাঠ তালিকালে হোৱা পৰিৱৰ্তনসমূহ নাথাকিব।"
 
 #: ../src/plugins/chapters/totem-cmml-parser.c:651
 msgid "Failed to parse CMML file"
 msgstr "CMML নথিপত্ৰ বিশ্লেষণ কৰিবলে অক্ষম"
 
 #: ../src/plugins/chapters/totem-edit-chapter.c:95
-#| msgid "Add Chapter..."
 msgid "Add Chapter"
 msgstr "পাঠ যোগ কৰক"
 
@@ -2118,8 +1977,8 @@
 "Plugin for sending notifications of currently playing movies to the D-Bus "
 "subsystem."
 msgstr ""
-"বৰ্তমানে চলমান চলচ্চিত্ৰৰ পৰা  D-Bus উপ-প্ৰণালীত সূচনাপ্ৰদানৰ বাবে এই প্লাগ-ইন "
-"ব্যৱহৃত হয় ।"
+"বৰ্তমানে চলমান চলচিত্ৰৰ পৰা D-Bus উপ-চিস্টেমত সূচনাপ্ৰদানৰ বাবে এই প্লাগিন ব্যৱহৃত "
+"হয়।"
 
 #: ../src/plugins/dbusservice/dbusservice.py:213
 #: ../src/plugins/dbusservice/dbusservice.py:243
@@ -2142,113 +2001,97 @@
 msgid "The URI ‘%s’ is not supported."
 msgstr "URI ‘%s’ সমৰ্থিত নহয়।"
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
-msgid "Instant Messenger status"
-msgstr "ইনস্টেন্ট মেসেঞ্জাৰৰ অৱস্থা"
+#: ../src/plugins/grilo/grilo.plugin.in.h:1
+msgid "Grilo Browser"
+msgstr "Grilo ব্ৰাউছাৰ"
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
-msgid "Set your Instant Messenger status to away when a movie is playing"
-msgstr "চলচ্চিত্ৰ চলাকালীন ইনস্টেন্ট মেসেঞ্জাৰ-এ নিজেকে অনুপস্থিত ৰূপে চিহ্নিত কৰক"
+#: ../src/plugins/grilo/grilo.plugin.in.h:2
+msgid "A plugin to let you browse media content from various sources"
+msgstr "বহু উৎসৰ পৰা মিডিয়া সমল ব্ৰাউছ কৰিবলে এটা প্লাগিন"
 
-#: ../src/plugins/gromit/gromit.plugin.in.h:1
-msgid "Gromit Annotations"
-msgstr "Gromit এনোটেশন"
+#: ../src/plugins/grilo/grilo.ui.h:1
+msgid "Add to Playlist"
+msgstr "প্লেলিস্টলে যোগ কৰক"
 
-#: ../src/plugins/gromit/gromit.plugin.in.h:2
-msgid "Presentation helper to make annotations on screen"
-msgstr "পৰ্দায় এনোটেশন নিৰ্মাণৰ বাবে প্ৰেসেন্টেশন সহায়তা ব্যৱস্থা"
+#: ../src/plugins/grilo/grilo.ui.h:2
+msgid "Copy Location"
+msgstr "অৱস্থান কপি কৰক"
 
-#: ../src/plugins/gromit/totem-gromit.c:231
-msgid "The gromit binary was not found."
-msgstr "gromit বাইনাৰি পাৱ নাযায় ।"
+#: ../src/plugins/grilo/grilo.ui.h:3 ../src/plugins/grilo/totem-grilo.c:1184
+msgid "Browse"
+msgstr "ব্ৰাউছ কৰক"
 
-#. Add the interface to Totem's sidebar
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:1
-#: ../src/plugins/iplayer/iplayer.py:46
-msgid "BBC iPlayer"
-msgstr "BBC iPlayer"
-
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:2
-msgid "Stream BBC programs from the last 7 days from the BBC iPlayer service."
-msgstr "যোৱা ৭ দিনত BBC দ্বাৰা প্ৰচাৰিত কাৰ্যক্ৰম BBC iPlayer সেৱাৰ পৰা স্ট্ৰিম কৰক ।"
-
-#: ../src/plugins/iplayer/iplayer.py:72
-msgid "Error listing channel categories"
-msgstr "চেনেলৰ বিভাগৰ তালিকা প্ৰদৰ্শনত ত্ৰুটি"
+#: ../src/plugins/grilo/grilo.ui.h:4 ../src/plugins/grilo/totem-grilo.c:1227
+msgid "Search"
+msgstr "সন্ধান কৰক"
 
-#: ../src/plugins/iplayer/iplayer.py:73
-msgid ""
-"There was an unknown error getting the list of television channels available "
-"on BBC iPlayer."
-msgstr ""
-"BBC iPlayer-এ উপলব্ধ টেলিভিছন চেনেলৰ তালিকা প্ৰাপ্ত কৰিবলৈ অজ্ঞাত সমস্যা চোৱা "
-"দিছে ।"
+#: ../src/plugins/grilo/totem-grilo.c:454
+msgid "Browse Error"
+msgstr "ব্ৰাউছাৰ ত্ৰুটি"
+
+#: ../src/plugins/grilo/totem-grilo.c:609
+msgid "Search Error"
+msgstr "সন্ধানত ত্ৰুটি"
+
+#: ../src/plugins/gromit/gromit.plugin.in.h:1
+msgid "Gromit Annotations"
+msgstr "Gromit টীকা"
 
-#. Append a dummy child row so that the expander's visible; we can
-#. then queue off the expander to load the programme listing for this
-#. category
-#: ../src/plugins/iplayer/iplayer.py:84
-msgid "Loading…"
-msgstr "লোড কৰা হৈছে…"
-
-#. Translators: the "programme feed" is the list of TV shows
-#. available to watch online
-#: ../src/plugins/iplayer/iplayer.py:136
-msgid "Error getting programme feed"
-msgstr "প্ৰোগ্ৰামৰ ফিড প্ৰাপ্ত কৰিবলৈ ত্ৰুটি"
+#: ../src/plugins/gromit/gromit.plugin.in.h:2
+msgid "Presentation helper to make annotations on screen"
+msgstr "পৰ্দাত টীকা নিৰ্মাণৰ বাবে পৰিৱেশন সহায়তা ব্যৱস্থা"
 
-#: ../src/plugins/iplayer/iplayer.py:137
-msgid ""
-"There was an error getting the list of programmes for this channel and "
-"category combination."
-msgstr ""
-"উল্লিখিত বিভাগ অনুযায়ী এই চেনেলৰ বাবে উপলব্ধ সুসংযোৱা প্ৰোগ্ৰামৰ তালিকা প্ৰাপ্ত "
-"কৰিবলৈ অজ্ঞাত ত্ৰুটি দেখা দিছে ।"
+#: ../src/plugins/gromit/totem-gromit.c:231
+msgid "The gromit binary was not found."
+msgstr "gromit লাইব্ৰেৰী পোৱা নাযায়।"
 
-#: ../src/plugins/iplayer/iplayer2.py:298
-msgid ""
-msgstr ""
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
+msgid "Instant Messenger Status"
+msgstr "Instant Messenger ৰ অৱস্থা"
 
-#: ../src/plugins/iplayer/iplayer2.py:299
-#, python-format
-msgid "Programme unavailable (\"%s\")"
-msgstr "প্ৰোগ্ৰাম উপলব্ধ নহয় (\"%s\")"
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
+msgid "Set your Instant Messenger status to away when a movie is playing"
+msgstr "চলচিত্ৰ চলাকালীন তৎক্ষনাত বাৰ্তাবাহকে নিজকে অনুপস্থিত ৰূপে চিহ্নিত কৰে"
 
 #: ../src/plugins/lirc/lirc.plugin.in.h:1
 msgid "Infrared Remote Control"
-msgstr "ইনফ্ৰা ৰেড ৰিমোট কন্ট্ৰোল"
+msgstr "ইনফ্ৰা ৰেড ৰিম'ট কন্ট্ৰোল"
 
 #: ../src/plugins/lirc/lirc.plugin.in.h:2
 msgid "Support infrared remote control"
-msgstr "ইনফ্ৰা ৰেড ৰিমোট কন্ট্ৰোলৰ সহায়তা"
+msgstr "ইনফ্ৰা ৰেড ৰিম'ট কন্ট্ৰোলৰ সহায়তা"
 
 #: ../src/plugins/lirc/totem-lirc.c:242
 msgid "Couldn't initialize lirc."
-msgstr "lirc আৰম্ভ কৰিবলৈ ব্যৰ্থ ।"
+msgstr "lirc আৰম্ভ কৰিবলৈ ব্যৰ্থ।"
 
 #: ../src/plugins/lirc/totem-lirc.c:254
 msgid "Couldn't read lirc configuration."
-msgstr "lirc বিন্যাস পড়তে ব্যৰ্থ ।"
+msgstr "lirc সংৰূপ পঢ়োতে ব্যৰ্থ।"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
-msgid "Download Movie Subtitles"
-msgstr "চলচ্চিত্ৰৰ অনুবাদলিপি ডাউনলোড কৰক"
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:1
+msgid "Media Player Keys"
+msgstr "চলচিত্ৰ প্লেয়াৰ কি'সমূহ"
+
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:2
+msgid "Support additional media player keys"
+msgstr "অতিৰিক্ত মাধ্যম প্লেয়াৰ কি'সমূহ সমৰ্থন কৰক"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
-msgid "Subtitle _language:"
-msgstr "অনুবাদলিপিৰ ভাষা: (_l)"
+#: ../src/plugins/ontop/ontop.plugin.in.h:1
+msgid "Always On Top"
+msgstr "সদায় ওপৰত"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
-msgid "_Play with Subtitle"
-msgstr "অনুবাদলিপি সহ চলোৱা হ'ব (_P)"
+#: ../src/plugins/ontop/ontop.plugin.in.h:2
+msgid "Keep the main window on top when playing a movie"
+msgstr "চলচিত্ৰ চলোৱাৰ সময়, প্ৰধান উইন্ডো সদায় ওপৰত ৰাখক"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:1
 msgid "Subtitle Downloader"
-msgstr "অনুবাদলিপি ডাউনলোড ব্যৱস্থা"
+msgstr "উপশীৰ্ষকসমূহ ডাউনল'ডাৰ"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:2
-msgid "Look for subtitles for the currently playing movie."
-msgstr "বৰ্তমানে চলমান চলচ্চিত্ৰৰ অনুবাদলিপি অনুসন্ধান কৰক"
+msgid "Look for subtitles for the currently playing movie"
+msgstr "বৰ্তমানে চলি থকা চলচিত্ৰৰ বাবে উপশীৰ্ষকসমূহ সন্ধান কৰক"
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:42
 msgid "Brazilian Portuguese"
@@ -2261,16 +2104,16 @@
 #: ../src/plugins/opensubtitles/opensubtitles.py:225
 #: ../src/plugins/opensubtitles/opensubtitles.py:645
 msgid "Downloading the subtitles…"
-msgstr "অনুবাদলিপি ডাউনলোড কৰা হৈছে..."
+msgstr "উপশীৰ্ষকসমূহ ডাউনল'ড কৰা হৈছে..."
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:290
 msgid "Could not contact the OpenSubtitles website"
-msgstr "OpenSubtitles ৱেব-ছাইটৰ সৈতে সংযোগ স্থাপন কৰিবলৈ ব্যৰ্থ"
+msgstr "OpenSubtitles ৱেবছাইটৰ সৈতে সংযোগ স্থাপন কৰিবলৈ ব্যৰ্থ"
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:323
 #: ../src/plugins/opensubtitles/opensubtitles.py:341
 msgid "Could not contact the OpenSubtitles website."
-msgstr "OpenSubtitles ৱেব-ছাইটৰ সৈতে সংযোগ স্থাপন কৰিব নোৱাৰি।"
+msgstr "OpenSubtitles ৱেবছাইটৰ সৈতে সংযোগ স্থাপন কৰিব নোৱাৰি।"
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:329
 msgid "No results found."
@@ -2278,7 +2121,7 @@
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:478
 msgid "Subtitles"
-msgstr "অনুবাদলিপি"
+msgstr "উপশীৰ্ষকসমূহ"
 
 #. translators comment:
 #. This is the file-type of the subtitle file detected
@@ -2294,180 +2137,204 @@
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:525
 msgid "Download movie subtitles from OpenSubtitles"
-msgstr "OpenSubtitlesৰ পৰা চলচ্চিত্ৰৰ অনুবাদলিপি ডাউনলোড কৰক"
+msgstr "OpenSubtitles ৰ পৰা চলচিত্ৰৰ উপশীৰ্ষকসমূহ ডাউনল'ড কৰক"
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:527
 msgid "_Download Movie Subtitles…"
-msgstr "চলচ্চিত্ৰৰ অনুবাদলিপি ডাউনলোড কৰক... (_D)"
+msgstr "চলচিত্ৰৰ উপশীৰ্ষকসমূহ ডাউনল'ড কৰক (_D)... "
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:589
 msgid "Searching subtitles…"
-msgstr "অনুবাদলিপি অনুসন্ধান কৰা হৈছে..."
+msgstr "উপশীৰ্ষকসমূহ সন্ধান কৰা হৈছে..."
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
+msgid "Download Movie Subtitles"
+msgstr "চলচিত্ৰৰ উপশীৰ্ষকসমূহ ডাউনল'ড কৰক"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
+msgid "Subtitle _language:"
+msgstr "উপশীৰ্ষকসমূহৰ ভাষা (_l):"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
+msgid "_Play with Subtitle"
+msgstr "উপশীৰ্ষকসমূহৰ লগত চলাওক (_P)"
 
 #: ../src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in.h:1
 msgid "Subtitle language"
-msgstr "অনুবাদলিপিৰ ভাষা"
+msgstr "উপশীৰ্ষকসমূহৰ ভাষা"
 
 #: ../src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in.h:2
 msgid "The language to search for subtitles for movies in."
-msgstr "চলচ্চিত্ৰৰ বাবে অনুবাদলিপিৰ কাৰণে বিচাৰিব লগিয়া ভাষা।"
-
-#: ../src/plugins/ontop/ontop.plugin.in.h:1
-msgid "Always On Top"
-msgstr "সৰ্বদা ওপৰত ৰখা হ'ব"
+msgstr "চলচিত্ৰৰ বাবে উপশীৰ্ষকসমূহৰ কাৰণে বিচাৰিব লগিয়া ভাষা।"
 
-#: ../src/plugins/ontop/ontop.plugin.in.h:2
-msgid "Keep the main window on top when playing a movie"
-msgstr "চলচ্চিত্ৰ চলোৱাৰ সময়, প্ৰধান উইন্ডোৰ সৰ্বদা ওপৰত প্ৰদৰ্শন কৰা হ'ব"
+#: ../src/plugins/properties/movie-properties.plugin.in.h:1
+msgid "Movie Properties"
+msgstr "চলচিত্ৰ বৈশিষ্টসমূহ"
+
+#: ../src/plugins/properties/movie-properties.plugin.in.h:2
+msgid "Adds movie properties to the sidebar"
+msgstr "চলচিত্ৰ বৈশিষ্টসমূহক কাষবাৰলে যোগ কৰক"
 
 #: ../src/plugins/properties/totem-movie-properties.c:246
 msgid "Properties"
-msgstr "বৈশিষ্টেবলী"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:1
-msgid "Publisher protocol to use"
-msgstr "ব্যৱহৃত হব লগা প্ৰকাশক প্ৰটকল"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:2
-msgid "The transport protocol to use when publishing playlists over the network."
-msgstr "ব্যৱহৃত হব লগিয়া পৰিৱহন প্ৰটকল যেতিয়া প্লে-লিস্টসমূহ নেটৱাৰ্কত প্ৰকাশ কৰা হৈ আছে।"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:3
-msgid "Format for network service name"
-msgstr "নেটৱাৰ্ক সেৱা নামৰ কাৰণে বিন্যাস"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:5
-#, no-c-format
-msgid ""
-"A format string used to build the network service name used when publishing "
-"playlists over the network. The following format placeholders can be used: • "
-"%a: the program name as returned by g_get_application_name() • %h: the "
-"machine's host name in title case • %u: the user's login name in title case "
-"• %U: the user's real name • %%: the percent sign"
-msgstr ""
-"প্লে-লিস্টসমূহ নেটৱাৰ্কত প্ৰকাশ কৰোতে ব্যৱহৃত নেটৱাৰক সেৱাৰ নাম বনাওতে ব্যৱহৃত বিন্যাস "
-"স্ট্ৰিং। নিম্নলিখিত বিন্যাস স্থানধৰোতা ব্যৱহাৰ কৰিব পাৰি: • %a: প্ৰগ্ৰামৰ নাম যেনেকা "
-"g_get_application_name() এ ঘুৰাই দিছে • %h: মেচিনটোৰ হস্ট নাম শীৰ্ষক ক্ষেত্ৰত • %"
-"u: ব্যৱহাৰকাৰীৰ লগিন নাম শীৰ্ষক ক্ষেত্ৰত • %U: ব্যৱহাৰকাৰীৰ প্ৰকৃত নাম • %%: শতাংশ "
-"চিহ্ন"
-
-#. Translators: computers on the local network which are publishing their playlists over the network
-#: ../src/plugins/publish/totem-publish.c:552
-msgid "Neighbors"
-msgstr "চুবুৰীয়াস"
-
-#: ../src/plugins/publish/publish.plugin.in.h:1
-msgid "Publish Playlist"
-msgstr "প্লে-লিস্ট"
-
-#: ../src/plugins/publish/publish.plugin.in.h:2
-msgid "Share the current playlist via HTTP"
-msgstr "অংশ HTTP"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:1
-msgid "Service _Name:"
-msgstr "সেৱাৰ নাম: (_N)"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:3
-#, no-c-format
-msgid ""
-"The name used for announcing the playlist service on the network.\n"
-"All occurrences of the string %u will be replaced by your name,\n"
-"and %h will be replaced by your computer's host name."
-msgstr ""
-"নেটৱৰ্কেত প্লে-লিস্ট সেৱাৰ ঘোষনাৰ বাবে ব্যৱহৃত নাম ।\n"
-"%u ৰ পৰিবৰ্তে সকলো স্থানত আপোনাৰ নাম প্ৰতিস্থাপন কৰা হ'ব,\n"
-"আৰু %h ৰ পৰিবৰ্তে কম্পিউটাৰৰ গৃহস্থ-নাম স্থাপন কৰা হ'ব।"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:6
-msgid "Use _encrypted transport protocol (HTTPS)"
-msgstr "এনক্ৰিপশনসহ সম্প্ৰচাৰ প্ৰোটোকল প্ৰয়োগ কৰক (HTTPS) (_e)"
+msgstr "বৈশিষ্টসমূহ"
 
 #: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:1
 msgid "rpdb2 password"
-msgstr "rpdb2 পাছওৱাৰ্ড"
+msgstr "rpdb2 পাছৱাৰ্ড"
 
 #: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:2
 msgid ""
 "A password to protect the rpdb2 server for debugging Totem from unauthorized "
 "remote access. If this is empty, a default of 'totem' will be used."
 msgstr ""
-"Totem ডিবাগৰ কাৰণে ব্যৱহৃত rpdb2 চাৰ্ভাৰক অপ্ৰাধিকৰণ দুৰৱৰ্তী প্ৰবেশাধিকাৰৰ পৰা "
-"সুৰক্ষা দিবলে এটা পাছওৱাৰ্ড। এইটো যদি খালি হয়, 'totem' -ৰ এটা অবিকল্পিত ব্যৱহাৰ "
-"কৰা হব।"
+"Totem ডিবাগৰ কাৰণে ব্যৱহৃত rpdb2 চাৰ্ভাৰক অপ্ৰাধিকৰণ দুৰৱৰ্তী অভিগমৰ পৰা সুৰক্ষা "
+"দিবলে এটা পাছৱাৰ্ড। এইটো যদি খালি হয়, 'totem' ৰ এটা অবিকল্পিত ব্যৱহাৰ কৰা হব।"
+
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
+msgid "Python Console"
+msgstr "Python কনচৌল"
+
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
+msgid "Interactive Python console"
+msgstr "ভাৱবিনিময়ী Python কনচৌল"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:88
+msgid "Python Console Menu"
+msgstr "Python কনচৌল মেনু"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:93
+msgid "_Python Console"
+msgstr "Python কনচৌল (_P)"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:94
+msgid "Show Totem's Python console"
+msgstr "Totem ৰ python কনচৌল দেখুৱাওক"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:100
+msgid "Python Debugger"
+msgstr "Python ডিবাগাৰ"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:101
+msgid "Enable remote Python debugging with rpdb2"
+msgstr "rpdb2 ৰ সহায়ত দূৰবৰ্তী অৱস্থানৰ পৰা python ডিবাগ প্ৰক্ৰিয়া সামৰ্থবান কৰক"
+
+#. pylint: disable-msg=E1101
+#: ../src/plugins/pythonconsole/pythonconsole.py:125
+#, python-format
+msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
+msgstr "'totem_object' ৰ সহায়ত Totem.Object ব্যৱহাৰ কৰা যাব :\\n%s"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:129
+msgid "Totem Python Console"
+msgstr "Totem Python কনচৌল"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:139
+msgid ""
+"After you press OK, Totem will wait until you connect to it with winpdb or "
+"rpdb2. If you have not set a debugger password in DConf, it will use the "
+"default password ('totem')."
+msgstr ""
+"'ঠিক আছে' টিপা হ'লে, winpdb অথবা rpdb2 ৰ সৈতে সংযোগ স্থাপন নকৰা অবধি Totem "
+"দ্বাৰা অপেক্ষা কৰা হ'ব। DConf ত ডিবাগাৰ পাছৱাৰ্ড নিৰ্ধাৰণ নকৰিলে অবিকল্পিত "
+"পাছৱাৰ্ড প্ৰয়োগ কৰা হ'ব ('totem')।"
+
+#: ../src/plugins/recent/recent.plugin.in.h:1
+msgid "Recent files"
+msgstr "শেহতীয়া নথিপত্ৰসমূহ"
+
+#: ../src/plugins/recent/recent.plugin.in.h:2
+msgid "Adds files that have been played to recent files"
+msgstr "শেহতীয়া নথিপত্ৰসমূহলে চলোৱা নথিপত্ৰসমূহ যোগ কৰক"
 
 #: ../src/plugins/rotation/rotation.plugin.in.h:1
 msgid "Rotation Plugin"
 msgstr "ঘূৰ্ণন প্লাগিন"
 
 #: ../src/plugins/rotation/rotation.plugin.in.h:2
-msgid "Allows videos to be rotated if they're in the wrong orientation."
-msgstr "ভিডিঅ'সমূহ ঘুৰোৱাৰ অনুমতি দিয়ে যদি সিহত ভুল দিশত থাকে।"
+msgid "Allows videos to be rotated if they are in the wrong orientation"
+msgstr "ভিডিঅ'সমূহ ঘুৰোৱাৰ অনুমতি দিয়ে যদি সিহত ভুল দিশত থাকে"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:60
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:50
 msgid "_Rotate Clockwise"
 msgstr "উত্তৰাৱৰ্তী ঘুৰাওক (_R)"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:62
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:52
 msgid "Rotate Counterc_lockwise"
 msgstr "দক্ষিণাৱৰ্তী ঘুৰাওক (_l)"
 
+#: ../src/plugins/save-file/save-file.plugin.in.h:1
+msgid "Save Copy"
+msgstr "কপি সংৰক্ষণ কৰক"
+
+#: ../src/plugins/save-file/save-file.plugin.in.h:2
+msgid "Save a copy of the currently playing movie"
+msgstr "বৰ্তমানে চলি থকা চলচিত্ৰৰ এটা কপি সংৰক্ষণ কৰক"
+
 #: ../src/plugins/save-file/totem-save-file.c:63
 msgid "Save a Copy..."
-msgstr "এটা কপি সঞ্চয় কৰক..."
+msgstr "এটা কপি সংৰক্ষণ কৰক..."
 
 #: ../src/plugins/save-file/totem-save-file.c:64
 msgid "Save a copy of the movie"
-msgstr "চলচ্চিত্ৰৰ এটা কপি সঞ্চয় কৰক"
+msgstr "চলচিত্ৰৰ এটা কপি সংৰক্ষণ কৰক"
 
 #: ../src/plugins/save-file/totem-save-file.c:129
 msgid "Save a Copy"
-msgstr "এটা কপি সঞ্চয় কৰক"
+msgstr "এটা কপি সংৰক্ষণ কৰক"
 
 #. translators: Movie is the default saved movie filename,
 #. * without the suffix
 #: ../src/plugins/save-file/totem-save-file.c:161
 msgid "Movie"
-msgstr "চলচ্চিত্ৰ"
+msgstr "চলচিত্ৰ"
 
 #: ../src/plugins/save-file/totem-save-file.c:183
 msgid "Movie stream"
-msgstr "চলচ্চিত্ৰ স্ট্ৰিম"
+msgstr "চলচিত্ৰ স্ট্ৰিম"
 
-#: ../src/plugins/screensaver/totem-screensaver.c:116
-#: ../browser-plugin/totem-plugin-viewer.c:1891
-msgid "Playing a movie"
-msgstr "চলচ্চিত্ৰ চলোৱা হৈছে"
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:1
+msgid "Screen Saver"
+msgstr "স্ক্ৰিন ছেভাৰ"
+
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:2
+msgid "Deactivates the screen saver when a movie is playing"
+msgstr "চলিচিত্ৰ চলাৰ সময়ত স্ক্ৰিনচেভাৰ নিষ্ক্ৰিয় কৰে"
 
 #: ../src/plugins/screenshot/gallery.ui.h:1
 msgid "Screenshot width (in pixels):"
-msgstr "স্ক্ৰিন-ছটৰ প্ৰস্থেৰ মাপ (পিক্সেল অনুযায়ী):"
+msgstr "স্ক্ৰিনশ্বটৰ প্ৰস্থেৰ মাপ (পিক্সেল অনুযায়ী):"
 
 #: ../src/plugins/screenshot/gallery.ui.h:2
 msgid "Calculate the number of screenshots"
-msgstr "স্ক্ৰিন-ছটৰ সংখ্যা গণনা কৰক"
+msgstr "স্ক্ৰিনশ্বটৰ সংখ্যা গণনা কৰক"
 
 #: ../src/plugins/screenshot/gallery.ui.h:3
 msgid "Number of screenshots:"
-msgstr "স্ক্ৰিন-ছটৰ সংখ্যা:"
+msgstr "স্ক্ৰিনশ্বটৰ সংখ্যা:"
 
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:1
-msgid "_Name:"
-msgstr "নাম:(_N)"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:2
-msgid "Save in _folder:"
-msgstr "চিহ্নিত ফোল্ডাৰে সংৰক্ষণ কৰা হ'ব: (_f)"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:3
-msgid "Select a folder"
-msgstr "এটা ফোল্ডাৰ নিৰ্বাচন কৰক"
-
-#. Write the screenshot to the temporary file
-#: ../src/plugins/screenshot/gnome-screenshot-widget.c:385
-#: ../src/plugins/screenshot/totem-screenshot.c:64
-msgid "Screenshot.png"
-msgstr "Screenshot.png"
+#. translators: this is the name of the file that gets made up
+#. * with the screenshot if the entire screen is taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:147
+#, c-format
+msgid "Screenshot from %s.png"
+msgstr "%s.png ৰ পৰা স্ক্ৰিনশ্বট"
+
+#. translators: this is the name of the file that gets
+#. * made up with the screenshot if the entire screen is
+#. * taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:154
+#, c-format
+msgid "Screenshot from %s - %d.png"
+msgstr "%s - %d.png ৰ পৰা স্ক্ৰিনশ্বট"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:1
+msgid "Screenshot"
+msgstr "স্ক্ৰিনশ্বট"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:2
+msgid "Allows screenshots and galleries to be taken of videos"
+msgstr "বিডিঅ'সমূহৰ স্ক্ৰিনশ্বট আৰু গেলাৰীসমূহ লোৱাৰ অনুমতি দিয়ে"
 
 #: ../src/plugins/screenshot/totem-gallery.c:91
 msgid "Save Gallery"
@@ -2480,12 +2347,12 @@
 #: ../src/plugins/screenshot/totem-gallery.c:115
 #, c-format
 msgid "Gallery-%s-%d.jpg"
-msgstr "গেলাৰি-%s-%d.jpg"
+msgstr "Gallery-%s-%d.jpg"
 
 #. Set up the window
 #: ../src/plugins/screenshot/totem-gallery-progress.c:101
 msgid "Creating Gallery..."
-msgstr "গেলেৰি নিৰ্মাণ কৰা হৈছে..."
+msgstr "গেলেৰি সৃষ্টি কৰা হৈছে..."
 
 #. Set the progress label
 #: ../src/plugins/screenshot/totem-gallery-progress.c:107
@@ -2493,184 +2360,360 @@
 msgid "Saving gallery as \"%s\""
 msgstr "\"%s\" নামে গেলেৰি সংৰক্ষণ কৰা হৈছে"
 
-#: ../src/plugins/screenshot/totem-screenshot.c:113
-msgid "There was an error saving the screenshot."
-msgstr "পৰ্দাৰ ছবি সংৰক্ষণ কৰিবলৈ সমস্যা ।"
-
-#: ../src/plugins/screenshot/totem-screenshot.c:139
-msgid "Save Screenshot"
-msgstr "পৰ্দাৰ ছবি সংৰক্ষণ কৰক"
-
-#. Create the screenshot widget
-#. Translators: %s is the movie title and %d is an auto-incrementing number to make filename unique
-#: ../src/plugins/screenshot/totem-screenshot.c:160
-#, c-format
-msgid "Screenshot-%s-%d.png"
-msgstr "স্ক্ৰিনষট-%s-%d.png"
-
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:88
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:220
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "Totem could not get a screenshot of the video."
-msgstr "Totem দ্বাৰা ভিডিঅ'ৰ ছবি গ্ৰহণ কৰা সম্ভৱ নহয় ।"
+msgstr "Totem দ্বাৰা ভিডিঅ'ৰ ছবি গ্ৰহণ কৰা সম্ভৱ নহয়।"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "This is not supposed to happen; please file a bug report."
-msgstr "এই আচৰণ প্ৰত্যাশিত নহয়; অনুগ্ৰহ কৰি বাগ ৰিপোৰ্ট নথিভুক্ত কৰক"
+msgstr "এই আচৰণ প্ৰত্যাশিত নহয়; অনুগ্ৰহ কৰি বাগ সংবাদ নথিভুক্ত কৰক"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
-msgid "Take _Screenshot..."
-msgstr "পৰ্দাৰ ছবি লওক...(_S)"
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
+msgid "Take _Screenshot"
+msgstr "স্ক্ৰিনশ্বট লওক (_S)"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
 msgid "Take a screenshot"
-msgstr "পৰ্দাৰ ছবি লওক"
+msgstr "স্ক্ৰিনশ্বট লওক"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create Screenshot _Gallery..."
-msgstr "স্ক্ৰিন-ছটৰ গেলেৰি নিৰ্মাণ কৰক...(_G)"
+msgstr "স্ক্ৰিনশ্বটৰ গেলেৰি সৃষ্টি কৰক (_G)..."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create a gallery of screenshots"
-msgstr "স্ক্ৰিন-ছটৰ গেলেৰি নিৰ্মাণ কৰক"
+msgstr "স্ক্ৰিনশ্বটৰ গেলেৰি সৃষ্টি কৰক"
+
+#: ../src/plugins/skipto/skipto.plugin.in.h:1
+#: ../src/plugins/skipto/totem-skipto.c:196
+msgid "Skip To"
+msgstr "বাদ দি যাওক"
+
+#: ../src/plugins/skipto/skipto.plugin.in.h:2
+msgid "Provides the \"Skip to\" dialog"
+msgstr "\"বাদ দি যাওক\" ডাইলগ প্ৰদান কৰে"
+
+#: ../src/plugins/skipto/skipto.ui.h:1
+msgid "_Skip to:"
+msgstr "এড়িয়ে যাও (_S):"
 
 #. Update the "seconds" label so that it always has the correct singular/plural form
 #. Translators: label for the seconds selector in the "Skip to" dialogue
-#: ../src/plugins/skipto/totem-skipto.c:160
+#: ../src/plugins/skipto/totem-skipto.c:159
 msgid "second"
 msgid_plural "seconds"
-msgstr[0] "ছেকেন্ড"
-msgstr[1] "ছেকেন্ডসমূহ"
+msgstr[0] "ছেকেণ্ড"
+msgstr[1] "ছেকেণ্ড"
 
 #. Fix the label width at the maximum necessary for the plural labels, to prevent it changing size when we change the spinner value
 #. Translators: you should translate this string to a number (written in digits) which corresponds to the longer character length of the
 #. * translations for "second" and "seconds", as translated elsewhere in this file. For example, in English, "second" is 6 characters long and
 #. * "seconds" is 7 characters long, so this string should be translated to "7". See: bgo#639398
-#: ../src/plugins/skipto/totem-skipto.c:190
+#: ../src/plugins/skipto/totem-skipto.c:189
 msgctxt "Skip To label length"
 msgid "7"
 msgstr "৭"
 
-#: ../src/plugins/skipto/totem-skipto.c:197
-msgid "Skip To"
-msgstr "বাদ দি যাওক"
-
 #: ../src/plugins/skipto/totem-skipto-plugin.c:182
 msgid "_Skip To..."
-msgstr "বাদ দি যাওক... (_S)"
+msgstr "বাদ দি যাওক (_S)... "
 
 #: ../src/plugins/skipto/totem-skipto-plugin.c:182
 msgid "Skip to a specific time"
-msgstr "চিহ্নিত সময়ে এগিয়ে যাওক"
+msgstr "চিহ্নিত সময়ত আগলৈ যাওক"
 
-#: ../src/plugins/skipto/skipto.ui.h:1
-msgid "_Skip to:"
-msgstr "এড়িয়ে যাও:"
+#~ msgid "Play movies and songs"
+#~ msgstr "চলচিত্ৰ আৰু সংগীত চলাওক"
 
-#: ../browser-plugin/totem-plugin-viewer.c:431
-msgid "No URI to play"
-msgstr "চলোৱাৰ বাবে কোনো URI চিহ্নিত কৰা নহয়"
+#~ msgid "Open a non-local file"
+#~ msgstr "এটা অ-স্থানীয় নথিপত্ৰ খোলক"
 
-#. translators: this is:
-#. * Open With ApplicationName
-#. * as in nautilus' right-click menu
-#: ../browser-plugin/totem-plugin-viewer.c:1107
-#, c-format
-msgid "_Open with \"%s\""
-msgstr "\"%s\" সহযোগে খোলক (_O)"
+#~ msgid "Quit the program"
+#~ msgstr "প্ৰগ্ৰামৰ পৰা প্ৰস্থান কৰক"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2136
-msgid "No playlist or playlist empty"
-msgstr "প্লে-লিস্ট ফাঁকা অথবা অনুপস্থিত"
+#~ msgid "Configure the application"
+#~ msgstr "অনুপ্ৰয়োগ সংৰূপণ কৰক"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2235
-msgid "Movie browser plugin"
-msgstr "চলচ্চিত্ৰ ব্ৰাউজাৰ প্লাগ-ইন"
+#~ msgid "Switch to fullscreen"
+#~ msgstr "পূৰ্ণপৰ্দাত যাওক"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Verify your system installation. The Totem plugin will now exit."
-msgstr "আপনাৰ প্ৰণালীৰ সংস্থাপনেশন পৰীক্ষা কৰক । Totem প্লাগ-ইন এতিয়া বন্ধ কৰা হ'ব ।"
+#~ msgid "Set the repeat mode"
+#~ msgstr "পুনৰাবৃত্তি অৱস্থা সংহতি কৰক"
 
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
-msgid "Python Console"
-msgstr "Python কন্সোল"
+#~ msgid "Set the shuffle mode"
+#~ msgstr "সানমিহলি অৱস্থা সংহতি কৰক"
 
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
-msgid "Interactive Python console."
-msgstr "ইন্টাৰেক্টিভ python কন্সোল ।"
+#~ msgid "14.4 Kbps Modem"
+#~ msgstr "14.4 Kbps মডেম"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:88
-msgid "Python Console Menu"
-msgstr "Python কন্সোল তালিকা"
+#~ msgid "19.2 Kbps Modem"
+#~ msgstr "19.2 Kbps মডেম"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:93
-msgid "_Python Console"
-msgstr "Python কন্সোল (_P)"
+#~ msgid "28.8 Kbps Modem"
+#~ msgstr "28.8 Kbps মডেম"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:94
-msgid "Show Totem's Python console"
-msgstr "Totem ৰ python কন্সোল প্ৰদৰ্শন কৰা হ'ব"
+#~ msgid "33.6 Kbps Modem"
+#~ msgstr "33.6 Kbps মডেম"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:100
-msgid "Python Debugger"
-msgstr "Python ডিবাগাৰ"
+#~ msgid "34.4 Kbps Modem"
+#~ msgstr "34.4 Kbps মডেম"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:101
-msgid "Enable remote Python debugging with rpdb2"
-msgstr "rpdb2 ৰ সহায়ত দূৰবৰ্তী অৱস্থানৰ পৰা python ডিবাগ প্ৰক্ৰিয়া সক্ৰিয় কৰক"
+#~ msgid "56 Kbps Modem/ISDN"
+#~ msgstr "56 Kbps মডেম/ISDN"
 
-#. pylint: disable-msg=E1101
-#: ../src/plugins/pythonconsole/pythonconsole.py:125
-#, python-format
-msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
-msgstr "'totem_object' ৰ সহায়ত Totem ব্যৱহাৰ কৰা যাব :\\n%s"
+#~ msgid "112 Kbps Dual ISDN/DSL"
+#~ msgstr "112 Kbps দ্বৈত ISDN/DSL"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:129
-msgid "Totem Python Console"
-msgstr "Totem Python কন্সোল"
+#~ msgid "256 Kbps DSL/Cable"
+#~ msgstr "256 Kbps DSL/কেবুল"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:139
-msgid ""
-"After you press OK, Totem will wait until you connect to it with winpdb or "
-"rpdb2. If you have not set a debugger password in DConf, it will use the "
-"default password ('totem')."
-msgstr ""
-"'ঠিক আছে' টিপা হ'লে, winpdb অথবা rpdb2 ৰ সৈতে সংযোগ স্থাপন নকৰা অবধি Totem "
-"দ্বাৰা অপেক্ষা কৰা হ'ব । DConf ত ডিবাগাৰ গুপ্তশব্দ নিৰ্ধাৰণ নকৰিলে অবিকল্পিত গুপ্তশব্দ "
-"প্ৰয়োগ কৰা হ'ব ('totem')।"
+#~ msgid "384 Kbps DSL/Cable"
+#~ msgstr "384 Kbps DSL/কেবুল"
 
-#: ../src/plugins/grilo/grilo.plugin.in.h:1
-msgid "Grilo Browser"
-msgstr "Grilo ব্ৰাউছাৰ"
+#~ msgid "512 Kbps DSL/Cable"
+#~ msgstr "512 Kbps DSL/কেবুল"
 
-#: ../src/plugins/grilo/grilo.plugin.in.h:2
-msgid "A plugin to let you browse media content from various sources."
-msgstr "বহু উৎসৰ পৰা মিডিয়া সমল ব্ৰাউছ কৰিবলে এটা প্লাগিন।"
+#~ msgid "1.5 Mbps T1/Intranet/LAN"
+#~ msgstr "1.5 Mbps T1/ইন্ট্ৰানেট/LAN"
 
-#: ../src/plugins/grilo/totem-grilo.c:452
-msgid "Browse Error"
-msgstr "ব্ৰাউছাৰ ত্ৰুটি"
+#~ msgid "Intranet/LAN"
+#~ msgstr "ইন্ট্ৰানেট/LAN"
 
-#: ../src/plugins/grilo/totem-grilo.c:599
-msgid "Search Error"
-msgstr "সন্ধানত ত্ৰুটি"
+#~ msgid "Networking"
+#~ msgstr "নেটৱাৰ্কিং"
 
-#: ../src/plugins/grilo/totem-grilo.c:1219 ../src/plugins/grilo/grilo.ui.h:3
-msgid "Browse"
-msgstr "ব্ৰাউছ কৰক"
+#~ msgid "Connection _speed:"
+#~ msgstr "সংযোগ গতি (_s):"
 
-#: ../src/plugins/grilo/totem-grilo.c:1285 ../src/plugins/grilo/grilo.ui.h:4
-msgid "Search"
-msgstr "সন্ধান কৰক"
+#~ msgid "Network connection speed"
+#~ msgstr "নেটৱৰ্ক সংযোগ গতি"
 
-#: ../src/plugins/grilo/grilo.ui.h:1
-#| msgid "_Add to Playlist"
-msgid "Add to Playlist"
-msgstr "প্লেলিস্টলে যোগ কৰক"
+#~ msgid ""
+#~ "Approximate network connection speed, used to select quality on media "
+#~ "over the network."
+#~ msgstr ""
+#~ "আনুমানিক নেটৱাৰ্ক সংযোগ গতি, নেটৱাৰ্কৰ ওপৰত মাধ্যমৰ বৈশিষ্ট বাচিবলে ব্যৱহৃত।"
 
-#: ../src/plugins/grilo/grilo.ui.h:2
-#| msgid "_Copy Location"
-msgid "Copy Location"
-msgstr "অৱস্থান নকল কৰক"
+#~ msgid "Play Image '%s'"
+#~ msgstr "'%s' ছবি চলাওক"
+
+#~ msgid "device%d"
+#~ msgstr "ডিভাইচ %d"
+
+#~ msgid "Play Disc '%s'"
+#~ msgstr "'%s' নামক ডিস্ক চলাওক"
+
+#~ msgid "Movie Player using %s"
+#~ msgstr "%s প্ৰয়োগকৰ্তা চলচিত্ৰ প্লেয়াৰ"
+
+#~ msgid ""
+#~ "Totem could not play this media (%s) although a plugin is present to "
+#~ "handle it."
+#~ msgstr ""
+#~ "সঠিক প্লাগিন উপস্থিত থাকা সত্বেও Totem দ্বাৰা এই মাধ্যম (%s) চলোৱা সম্ভৱ নহয়।"
+
+#~ msgid ""
+#~ "You might want to check that a disc is present in the drive and that it "
+#~ "is correctly configured."
+#~ msgstr "ড্ৰাইভে ডিস্ক আছে নে আৰু তাক সঠিকভাবে সংৰূপণ কৰা হৈছে নে পৰীক্ষা কৰক।"
+
+#~ msgid "More information about media plugins"
+#~ msgstr "মাধ্যম প্লাগিনসমূহৰ বিষয়ে অধিক তথ্য"
+
+#~ msgid ""
+#~ "Please install the necessary plugins and restart Totem to be able to play "
+#~ "this media."
+#~ msgstr "এই মাধ্যম চলোৱাৰ বাবে সঠিক প্লাগিন ইনস্টল কৰি Totem পুনৰ চলাওক।"
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it does not have the "
+#~ "appropriate plugins to be able to read from the disc."
+#~ msgstr ""
+#~ "Totem এ এই মাধ্যম (%s) চলাব নোৱাৰে কাৰণ ডিস্কৰ পৰা পঢ়িবলে ইয়াৰ ওচৰত সঠিক "
+#~ "প্লাগিন নাই।"
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because you do not have the "
+#~ "appropriate plugins to handle it."
+#~ msgstr ""
+#~ "সঠিক প্লাগিন উপস্থিত নথকা বাবে Totem দ্বাৰা এই ধৰণৰ মাধ্যম (%s) চলোৱা সম্ভৱ "
+#~ "নহয়।"
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it is not supported."
+#~ msgstr "এই ধৰণৰ মাধ্যম (%s) Totem দ্বাৰা সমৰ্থিত নোহোৱাৰ ফলত এইটো চলোৱা নাযাব।"
+
+#~ msgid "Please insert another disc to play back."
+#~ msgstr "চলোৱাৰ বাবে অনুগ্ৰহ কৰি এটা ডিস্ক সুমুৱাওক।"
+
+#~ msgid "Totem was not able to play this disc."
+#~ msgstr "Totem দ্বাৰা এই ডিস্ক চলোৱা সম্ভৱ নহয়।"
+
+#~ msgid "Totem does not support playback of Audio CDs"
+#~ msgstr "Totem এ অডিঅ' CDসমূহৰ প্লেবেক সমৰ্থন নকৰে"
+
+#~ msgid ""
+#~ "Please consider using a music player or a CD extractor to play this CD"
+#~ msgstr ""
+#~ "এই CD চলাবলে এটা সংগীত প্লেয়াৰ অথবা এটা CD নিষ্কাষক ব্যৱহাৰ কৰাৰ কথা ভাবি "
+#~ "চাওক"
+
+#~ msgid ""
+#~ "The requested audio output was not found. Please select another audio "
+#~ "output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "অনুৰোধ কৰা অডিঅ' আউটপুট পোৱা নাযায়। মাল্টিমিডিয়া চিস্টেম নিৰ্বাচন ব্যৱস্থাত "
+#~ "অনুগ্ৰহ কৰি অন্য এটা অডিঅ' আউটপুট বাছক।"
+
+#~ msgid "Location not found."
+#~ msgstr "অৱস্থান পোৱা নাযায়।"
+
+#~ msgid ""
+#~ "Could not open location; you might not have permission to open the file."
+#~ msgstr "অৱস্থান খোলা নাযায়; সম্ভৱত এই নথিপত্ৰ খুলিবলৈ আপুনি অনুমতিপ্ৰাপ্ত নন।"
+
+#~ msgid ""
+#~ "The video output is in use by another application. Please close other "
+#~ "video applications, or select another video output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "ভিডিঅ' আউটপুট অন্য এটা অনুপ্ৰয়োগৰ দ্বাৰা ব্যৱহৃত হৈছে। অনুগ্ৰহ কৰি অন্য ভিডিঅ' "
+#~ "অনুপ্ৰয়োগ বন্ধ কৰক অথবা মাল্টিমিডিয়া চিস্টেম নিৰ্বাচন ব্যৱস্থাত অন্য এটা ভিডিঅ' "
+#~ "আউটপুট ব্যৱস্থা বাছক।"
+
+#~ msgid ""
+#~ "The audio output is in use by another application. Please select another "
+#~ "audio output in the Multimedia Systems Selector. You may want to consider "
+#~ "using a sound server."
+#~ msgstr ""
+#~ "অডিঅ' আউটপুট অন্য এটা অনুপ্ৰয়োগৰ দ্বাৰা ব্যৱহৃত হৈছে। অনুগ্ৰহ কৰি মাল্টিমিডিয়া "
+#~ "চিস্টেম নিৰ্বাচন ব্যৱস্থাত অন্য এটা অডিঅ' আউটপুট ব্যৱস্থা বাছক। শব্দ চাৰ্ভাৰ ব্যৱহাৰ "
+#~ "সম্পৰ্কে বিবেচনা কৰা যাব।"
+
+#~ msgid ""
+#~ "Failed to create a GStreamer play object. Please check your GStreamer "
+#~ "installation."
+#~ msgstr ""
+#~ "GStreamer প্লে অবজেক্ট নিৰ্মাণ কৰা নাযায়। অনুগ্ৰহ কৰি আপোনাৰ GStreamer পৰীক্ষা "
+#~ "কৰক।"
+
+#~ msgid ""
+#~ "Failed to open audio output. You may not have permission to open the "
+#~ "sound device, or the sound server may not be running. Please select "
+#~ "another audio output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "অডিঅ' আউটপুট খুলিবলৈ ত্ৰুটি। সম্ভৱত আপুনি শব্দ ডিভাইচ খুলিবলৈ অনুমতিপ্ৰাপ্ত নন অথবা "
+#~ "শব্দ চাৰ্ভাৰ বৰ্তমানে সক্ৰিয় নহয়। অনুগ্ৰহ কৰি মাল্টিমিডিয়া চিস্টেম নিৰ্বাচন "
+#~ "ব্যৱস্থাত অন্য এটা অডিঅ' আউটপুট বাছক।"
+
+#~ msgid ""
+#~ "Could not find the audio output. You may need to install additional "
+#~ "GStreamer plugins, or select another audio output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "অডিঅ' আউটপুট পোৱা নাযায়। সম্ভৱত অতিৰিক্ত GStreamer প্লাগিন ইনস্টল কৰা আবশ্যক "
+#~ "অথবা মাল্টিমিডিয়া চিস্টেম নিৰ্বাচন ব্যৱস্থাত অন্য এটা অডিঅ' আউটপুট বাছক।"
+
+#~ msgid "BBC iPlayer"
+#~ msgstr "BBC iPlayer"
+
+#~ msgid ""
+#~ "Stream BBC programs from the last 7 days from the BBC iPlayer service."
+#~ msgstr ""
+#~ "যোৱা ৭ দিনত BBC দ্বাৰা প্ৰচাৰিত কাৰ্যক্ৰম BBC iPlayer সেৱাৰ পৰা স্ট্ৰিম কৰক।"
+
+#~ msgid "Error listing channel categories"
+#~ msgstr "চেনেলৰ বিভাগসমূহ তালিকাভুক্ত কৰোতে ত্ৰুটি"
+
+#~ msgid ""
+#~ "There was an unknown error getting the list of television channels "
+#~ "available on BBC iPlayer."
+#~ msgstr ""
+#~ "BBC iPlayer এ উপলব্ধ টেলিভিছন চেনেলৰ তালিকা প্ৰাপ্ত কৰোতে অজ্ঞাত ত্ৰুটি দেখা "
+#~ "দিছে।"
+
+#~ msgid "Loading…"
+#~ msgstr "ল'ড কৰা হৈছে…"
+
+#~ msgid "Error getting programme feed"
+#~ msgstr "প্ৰগ্ৰামৰ ফিড প্ৰাপ্ত কৰিবলৈ ত্ৰুটি"
+
+#~ msgid ""
+#~ "There was an error getting the list of programmes for this channel and "
+#~ "category combination."
+#~ msgstr ""
+#~ "উল্লিখিত বিভাগ অনুযায়ী এই চেনেলৰ বাবে উপলব্ধ সুসংগত প্ৰগ্ৰামৰ তালিকা প্ৰাপ্ত "
+#~ "কৰিবলৈ অজ্ঞাত ত্ৰুটি দেখা দিছে।"
+
+#~ msgid ""
+#~ msgstr ""
+
+#~ msgid "Programme unavailable (\"%s\")"
+#~ msgstr "প্ৰগ্ৰাম উপলব্ধ নহয় (\"%s\")"
+
+#~ msgid "Publisher protocol to use"
+#~ msgstr "ব্যৱহৃত হব লগা প্ৰকাশক প্ৰটোকল"
+
+#~ msgid ""
+#~ "The transport protocol to use when publishing playlists over the network."
+#~ msgstr ""
+#~ "ব্যৱহৃত হব লগিয়া পৰিৱহন প্ৰটোকল যেতিয়া প্লেলিস্টসমূহ নেটৱাৰ্কত প্ৰকাশ কৰা হৈ আছে।"
+
+#~ msgid "Format for network service name"
+#~ msgstr "নেটৱাৰ্ক সেৱা নামৰ কাৰণে বিন্যাস"
+
+#~ msgid ""
+#~ "A format string used to build the network service name used when "
+#~ "publishing playlists over the network. The following format placeholders "
+#~ "can be used: • %a: the program name as returned by g_get_application_name"
+#~ "() • %h: the machine's host name in title case • %u: the user's login "
+#~ "name in title case • %U: the user's real name • %%: the percent sign"
+#~ msgstr ""
+#~ "প্লেলিস্টসমূহ নেটৱাৰ্কত প্ৰকাশ কৰোতে ব্যৱহৃত নেটৱাৰক সেৱাৰ নাম বনাওতে ব্যৱহৃত "
+#~ "বিন্যাস স্ট্ৰিং। নিম্নলিখিত বিন্যাস স্থানধৰোতা ব্যৱহাৰ কৰিব পাৰি: • %a: প্ৰগ্ৰামৰ "
+#~ "নাম যেনেকা g_get_application_name() এ ঘুৰাই দিছে • %h: মেচিনটোৰ হস্ট নাম "
+#~ "শীৰ্ষক ক্ষেত্ৰত • %u: ব্যৱহাৰকাৰীৰ লগিন নাম শীৰ্ষক ক্ষেত্ৰত • %U: ব্যৱহাৰকাৰীৰ "
+#~ "প্ৰকৃত নাম • %%: শতাংশ চিহ্ন"
+
+#~ msgid "Neighbors"
+#~ msgstr "প্ৰতিৱেশী"
+
+#~ msgid "Publish Playlist"
+#~ msgstr "প্লেলিস্ট"
+
+#~ msgid "Share the current playlist via HTTP"
+#~ msgstr "বৰ্তমান প্লেলিস্ট HTTP ৰ সহায়ত অংশীদাৰী"
+
+#~ msgid "Service _Name:"
+#~ msgstr "সেৱাৰ নাম (_N):"
+
+#~ msgid ""
+#~ "The name used for announcing the playlist service on the network.\n"
+#~ "All occurrences of the string %u will be replaced by your name,\n"
+#~ "and %h will be replaced by your computer's host name."
+#~ msgstr ""
+#~ "নেটৱাৰ্কত প্লেলিস্ট সেৱাৰ ঘোষনাৰ বাবে ব্যৱহৃত নাম।\n"
+#~ "%u ৰ পৰিবৰ্তে সকলো স্থানত আপোনাৰ নাম প্ৰতিস্থাপন কৰা হ'ব,\n"
+#~ "আৰু %h ৰ পৰিবৰ্তে কমপিউটাৰৰ হস্ট নাম স্থাপন কৰা হ'ব।"
+
+#~ msgid "Use _encrypted transport protocol (HTTPS)"
+#~ msgstr "ইনক্ৰিপ্টেড পৰিবহন প্ৰটোকল প্ৰয়োগ কৰক (HTTPS) (_e)"
+
+#~ msgid "_Name:"
+#~ msgstr "নাম (_N):"
+
+#~ msgid "Save in _folder:"
+#~ msgstr "ফোল্ডাৰত সংৰক্ষণ কৰক (_f):"
+
+#~ msgid "Select a folder"
+#~ msgstr "এটা ফোল্ডাৰ বাছক"
+
+#~ msgid "There was an error saving the screenshot."
+#~ msgstr "স্ক্ৰিনশ্বট সংৰক্ষণ কৰিবলৈ ত্ৰুটি।"
+
+#~ msgid "Save Screenshot"
+#~ msgstr "স্ক্ৰিনশ্বট সংৰক্ষণ কৰক"
 
 #~ msgid "Bemused"
 #~ msgstr "Bemused"
@@ -2682,10 +2725,10 @@
 #~ msgstr "নামবিহীন %d"
 
 #~ msgid "Totem Bemused Server"
-#~ msgstr "Totem Bemused সেৱক"
+#~ msgstr "Totem Bemused চাৰ্ভাৰ"
 
 #~ msgid "Totem Bemused Server version 1.0"
-#~ msgstr "Totem Bemused সেৱক সংস্কৰণ ১.০"
+#~ msgstr "Totem Bemused চাৰ্ভাৰ সংস্কৰণ ১.০"
 
 #~ msgid "A plugin to let you browse YouTube videos."
 #~ msgstr "অ."
@@ -2699,9 +2742,6 @@
 #~ msgid "Search Results"
 #~ msgstr "বিচাৰক ফলাফল"
 
-#~ msgid "Videos"
-#~ msgstr "Videos"
-
 #~ msgid "_Open in Web Browser"
 #~ msgstr "ৱেব-ব্ৰাউজাৰ খোলক (_O)"
 
@@ -2712,20 +2752,20 @@
 #~ msgstr "YouTube"
 
 #~ msgid "Cancelling query…"
-#~ msgstr "অনুসন্ধান বাতিল কৰা হৈছে…"
+#~ msgstr "সন্ধান বাতিল কৰা হৈছে…"
 
 #~ msgid "Error Searching for Videos"
-#~ msgstr "ভিডিঅ' অনুসন্ধান কৰিবলৈ ত্ৰুটি"
+#~ msgstr "ভিডিঅ' সন্ধান কৰিবলৈ ত্ৰুটি"
 
 #~ msgid ""
 #~ "The response from the server could not be understood. Please check you "
 #~ "are running the latest version of libgdata."
 #~ msgstr ""
-#~ "সেৱকৰ পৰা প্ৰাপ্ত উত্তৰ বোধগম্য নহয় । libgdata ৰ সাম্প্ৰতিকতম সংস্কৰণ সঞ্চালিত "
-#~ "হৈছে নে নহয় পৰীক্ষা কৰক ।"
+#~ "চাৰ্ভাৰৰ পৰা প্ৰাপ্ত উত্তৰ বোধগম্য নহয়। libgdata ৰ সাম্প্ৰতিকতম সংস্কৰণ সঞ্চালিত "
+#~ "হৈছে নে পৰীক্ষা কৰক।"
 
 #~ msgid "Fetching search results…"
-#~ msgstr "অনুসন্ধানৰ ফলাফল প্ৰাপ্ত কৰা হৈছে..."
+#~ msgstr "সন্ধানৰ ফলাফল প্ৰাপ্ত কৰা হৈছে..."
 
 #~ msgid "Fetching related videos…"
 #~ msgstr "সম্বন্ধীয় ভিডিঅ' আহৰণ কৰা হৈছে..."
@@ -2759,13 +2799,13 @@
 #~ msgstr "ছোট কৰি চোৱানো"
 
 #~ msgid "Zoom Reset"
-#~ msgstr "জুম প্ৰদৰ্শনৰ মান পুনৰায় নিৰ্ধাৰণ"
+#~ msgstr "জুম প্ৰদৰ্শনৰ মান পুনৰ নিৰ্ধাৰণ"
 
 #~ msgid "Zoom out"
 #~ msgstr "ছোট কৰি চোৱানো হ'ব"
 
 #~ msgid "Zoom reset"
-#~ msgstr "জুম প্ৰদৰ্শনৰ মান পুনৰায় নিৰ্ধাৰণ"
+#~ msgstr "জুম প্ৰদৰ্শনৰ মান পুনৰ নিৰ্ধাৰণ"
 
 #~ msgid ""
 #~ "The playback of this movie requires the following decoders which are not "
@@ -2773,31 +2813,30 @@
 #~ "\n"
 #~ "%s"
 #~ msgstr ""
-#~ "এই চলচ্চিত্ৰৰ বাবে আবশ্যক নিম্নলিখিত ডিকোডাৰসমূহ সংস্থাপন কৰা নহয়:\n"
+#~ "এই চলচিত্ৰৰ বাবে আবশ্যক নিম্নলিখিত ডিক'ডাৰসমূহ ইনস্টল কৰা নহয়:\n"
 #~ "\n"
 #~ "%s"
 
 #~ msgid "Media file could not be played."
-#~ msgstr "মিডিয়া নথিপত্ৰ চলোৱা নাযায় ।"
+#~ msgstr "মাধ্যম নথিপত্ৰ চলোৱা নাযায়।"
 
 #~ msgid "Too old version of GStreamer installed."
-#~ msgstr "GStreamer ৰ অত্যন্ত পুৰোনো সংস্কৰণ সংস্থাপন কৰা হৈছে ।"
+#~ msgstr "GStreamer ৰ অত্যন্ত পুৰোনো সংস্কৰণ ইনস্টল কৰা হৈছে।"
 
 #~ msgid ""
 #~ "Failed to open video output. It may not be available. Please select "
 #~ "another video output in the Multimedia Systems Selector."
 #~ msgstr ""
-#~ "ভিডিঅ' আউটপুট খোলা নাযায় । সম্ভৱত এইটো উপস্থিত নাই । অনুগ্ৰহ কৰি মাল্টি-মিডিয়া "
-#~ "প্ৰণালী নিৰ্বাচন ব্যৱস্থায় অন্য এটা ভিডিঅ' আউটপুট নিৰ্বাচন কৰক ।"
+#~ "ভিডিঅ' আউটপুট খোলা নাযায়। সম্ভৱত এইটো উপস্থিত নাই। অনুগ্ৰহ কৰি মাল্টিমিডিয়া "
+#~ "চিস্টেম নিৰ্বাচন ব্যৱস্থাত অন্য এটা ভিডিঅ' আউটপুট বাছক।"
 
 #~ msgid ""
 #~ "Could not find the video output. You may need to install additional "
 #~ "GStreamer plugins, or select another video output in the Multimedia "
 #~ "Systems Selector."
 #~ msgstr ""
-#~ "ভিডিঅ' আউটপুট পাৱ নাযায় । সম্ভৱত অতিৰিক্ত GStreamer প্লাগ-ইন সংস্থাপন কৰা "
-#~ "আবশ্যক অথবা মাল্টি-মিডিয়া প্ৰণালী নিৰ্বাচন ব্যৱস্থায় অন্য এটা ভিডিঅ' আউটপুট "
-#~ "নিৰ্বাচন কৰক ।"
+#~ "ভিডিঅ' আউটপুট পোৱা নাযায়। সম্ভৱত অতিৰিক্ত GStreamer প্লাগিন ইনস্টল কৰা আবশ্যক "
+#~ "অথবা মাল্টিমিডিয়া চিস্টেম নিৰ্বাচন ব্যৱস্থাত অন্য এটা ভিডিঅ' আউটপুট বাছক।"
 
 #~ msgid "%s"
 #~ msgstr "%s"
@@ -2844,10 +2883,10 @@
 #~ "Listen to the large collection of Creative Commons licensed music on "
 #~ "Jamendo."
 #~ msgstr ""
-#~ "Creative Commons ৰ শৰ্তাধীন উপলব্ধ বৃহৎ পৰিমাণ সংগীতৰ সংকলন Jamendo ৰ মাধ্যমে 
উপভোগ কৰক ।"
+#~ "Creative Commons ৰ শৰ্তাধীন উপলব্ধ বৃহৎ পৰিমাণ সংগীতৰ সংকলন Jamendo ৰ মাধ্যমে 
উপভোগ কৰক।"
 
 #~ msgid "You need to install the Python simplejson module."
-#~ msgstr "Python simplejson মডিউল সংস্থাপন কৰা আবশ্যক ।"
+#~ msgstr "Python simplejson মডিউল ইনস্টল কৰা আবশ্যক।"
 
 #~ msgid "Artist: %s"
 #~ msgstr "শিল্পী: %s"
@@ -2859,7 +2898,7 @@
 #~ msgstr "%x"
 
 #~ msgid "Genre: %s"
-#~ msgstr "ধৰন: %s"
+#~ msgstr "ধৰণ: %s"
 
 #~ msgid "Released on: %s"
 #~ msgstr "মুক্তি: %s"
@@ -2884,14 +2923,14 @@
 #~ "Failed to connect to Jamendo server.\n"
 #~ "%s."
 #~ msgstr ""
-#~ "Jamendo সেৱকৰ সৈতে সংযোগ স্থাপন কৰিবলৈ ব্যৰ্থ ।\n"
+#~ "Jamendo চাৰ্ভাৰৰ সৈতে সংযোগ স্থাপন কৰিবলৈ ব্যৰ্থ।\n"
 #~ "%s."
 
 #~ msgid "The Jamendo server returned code %s."
-#~ msgstr "Jamendo সেৱকৰ পৰা %s কোড প্ৰাপ্ত হৈছে ।"
+#~ msgstr "Jamendo চাৰ্ভাৰৰ পৰা %s ক'ড প্ৰাপ্ত হৈছে।"
 
 #~ msgid "An error occurred while fetching albums."
-#~ msgstr "সংকলন প্ৰাপ্তিসময়ত সমস্যা দেখা দিছে ।"
+#~ msgstr "সংকলন প্ৰাপ্তিসময়ত ত্ৰুটি দেখা দিছে।"
 
 #~ msgid "%H:%M:%S"
 #~ msgstr "%H:%M:%S"
@@ -2903,7 +2942,7 @@
 #~ msgstr "en"
 
 #~ msgid "Audio format to download from Jamendo"
-#~ msgstr "Jamendo -ৰ পৰা ডাউনলোড কৰিব লগা অডিঅ' বিন্যাস"
+#~ msgstr "Jamendo ৰ পৰা ডাউনল'ড কৰিব লগা অডিঅ' বিন্যাস"
 
 #~| msgid "Number of screenshots:"
 #~ msgid "Number of results per page"
@@ -2914,7 +2953,7 @@
 #~ msgstr "ফলাফলৰ প্ৰতি পাতত প্ৰদৰ্শন হব লগিয়া Jamendo বিচৰা ফলাফলসমূহৰ সংখ্যা।"
 
 #~ msgid "The preferred audio format to download tracks from Jamendo in."
-#~ msgstr "Jamendo in পৰা ডাউনলোড কৰিব লগা পছন্দৰ অডিঅ' বিন্যাস।"
+#~ msgstr "Jamendo in পৰা ডাউনল'ড কৰিব লগা পছন্দৰ অডিঅ' বিন্যাস।"
 
 #~| msgid "_Languages"
 #~ msgid "Language"
@@ -2939,7 +2978,7 @@
 #~ msgstr "স্থানীয় বিচাৰক"
 
 #~ msgid "Set the window icon to the thumbnail of the playing movie"
-#~ msgstr "সঞ্চালিত চলচ্চিত্ৰৰ উইন্ডো আইকন থাম্‌ব-নেইল ৰূপে স্থাপিত হ'ব"
+#~ msgstr "সঞ্চালিত চলচিত্ৰৰ উইন্ডো আইকন থাম্‌ব-নেইল ৰূপে স্থাপিত হ'ব"
 
 #~ msgid "Thumbnail"
 #~ msgstr "থাম্‌ব-নাইল"
@@ -2948,10 +2987,10 @@
 #~ msgstr "বিচাৰক উল্লিখিত সময় অবধি"
 
 #~ msgid "Browser Plugin using %s"
-#~ msgstr "%s প্ৰয়োগকৰ্তা ব্ৰাউজাৰ প্লাগ-ইন"
+#~ msgstr "%s প্ৰয়োগকৰ্তা ব্ৰাউজাৰ প্লাগিন"
 
 #~ msgid "Totem Browser Plugin"
-#~ msgstr "Totem Browser প্লাগ-ইন"
+#~ msgstr "Totem Browser প্লাগিন"
 
 #~ msgid "Author:"
 #~ msgstr "লেখক:"
@@ -2978,60 +3017,60 @@
 #~ "Approximate network connection speed, used to select quality on media "
 #~ "over the network: \"0\" for 14.4 Kbps Modem, \"1\" for 19.2 Kbps Modem, "
 #~ "\"2\" for 28.8 Kbps Modem, \"3\" for 33.6 Kbps Modem, \"4\" for 34.4 Kbps "
-#~ "Modem, \"5\" for 56 Kbps Modem/ISDN, \"6\" for 112 Kbps Dual ISDN/DSL, \"7"
-#~ "\" for 256 Kbps DSL/Cable, \"8\" for 384 Kbps DSL/Cable, \"9\" for 512 "
+#~ "Modem, \"5\" for 56 Kbps Modem/ISDN, \"6\" for 112 Kbps Dual ISDN/DSL, "
+#~ "\"7\" for 256 Kbps DSL/Cable, \"8\" for 384 Kbps DSL/Cable, \"9\" for 512 "
 #~ "Kbps DSL/Cable, \"10\" for 1.5 Mbps T1/Intranet/LAN, \"11\" for Intranet/"
 #~ "LAN."
 #~ msgstr ""
-#~ "নেটৱৰ্ক সংযোগৰ আনুমানিক যোৱাি । নেটৱৰ্কেৰ মাধ্যমে সঞ্চাৰৰ সময় মিডিয়াৰ গুণমান "
+#~ "নেটৱৰ্ক সংযোগৰ আনুমানিক যোৱাি। নেটৱাৰ্কৰ মাধ্যমে সঞ্চাৰৰ সময় মাধ্যমৰ গুণমান "
 #~ "নিৰ্বাচন কৰিবলৈ ব্যৱহৃত হয়: ১৪.৪ কিলোবাইট/ছেকেণ্ডৰ মোডেমৰ বাবে \"0\", ১৯.২ "
-#~ "কিলোবাইট/ছেকেণ্ডৰ মোডেমৰ বাবে \"1\", ২৮.৮ কিলোবাইট/ছেকেণ্ডৰ মোডেমৰ বাবে \"2"
-#~ "\", ৩৩.৬ কিলোবাইট/ছেকেণ্ডৰ মোডেমৰ বাবে \"3\", ৩৪.৪ কিলোবাইট/ছেকেণ্ডৰ মোডেমৰ "
-#~ "বাবে \"4\", ৫৬ কিলোবাইট/ছেকেণ্ডৰ মোডেম/ISDN ৰ বাবে \"5\", ১১২ কিলোবাইট/"
-#~ "ছেকেণ্ডৰ ডুয়াল ISDN/DSL ৰ বাবে \"6\", ১১২ কিলোবাইট/ছেকেণ্ডৰ DSL/কেবলৰ বাবে "
-#~ "\"7\", ৩৮৪ কিলোবাইট/ছেকেণ্ডৰ DSL/কেবলৰ বাবে \"8\", ৫১২ কিলোবাইট/ছেকেণ্ডৰ "
-#~ "DSL/কেবলৰ বাবে \"9\", ১.৫ মেগাবাইট/ছেকেণ্ডৰ T1/ইনট্ৰানেট/LAN ৰ বাবে \"10\", "
-#~ "ইনট্ৰানেট/LAN ৰ বাবে \"11\" ।"
+#~ "কিলোবাইট/ছেকেণ্ডৰ মোডেমৰ বাবে \"1\", ২৮.৮ কিলোবাইট/ছেকেণ্ডৰ মোডেমৰ বাবে "
+#~ "\"2\", ৩৩.৬ কিলোবাইট/ছেকেণ্ডৰ মোডেমৰ বাবে \"3\", ৩৪.৪ কিলোবাইট/ছেকেণ্ডৰ "
+#~ "মোডেমৰ বাবে \"4\", ৫৬ কিলোবাইট/ছেকেণ্ডৰ মোডেম/ISDN ৰ বাবে \"5\", ১১২ "
+#~ "কিলোবাইট/ছেকেণ্ডৰ ডুয়াল ISDN/DSL ৰ বাবে \"6\", ১১২ কিলোবাইট/ছেকেণ্ডৰ DSL/"
+#~ "কেবলৰ বাবে \"7\", ৩৮৪ কিলোবাইট/ছেকেণ্ডৰ DSL/কেবলৰ বাবে \"8\", ৫১২ কিলোবাইট/"
+#~ "ছেকেণ্ডৰ DSL/কেবলৰ বাবে \"9\", ১.৫ মেগাবাইট/ছেকেণ্ডৰ T1/ইনট্ৰানেট/LAN ৰ বাবে "
+#~ "\"10\", ইনট্ৰানেট/LAN ৰ বাবে \"11\"।"
 
 #~ msgid "Buffer size"
 #~ msgstr "বাফাৰৰ মাপ"
 
 #~ msgid "Enable deinterlacing"
-#~ msgstr "ডি-ইন্টাৰলেসিং সক্ৰিয় কৰা হ'ব"
+#~ msgstr "ডি-ইন্টাৰলেসিং সামৰ্থবান কৰক"
 
 #~ msgid "Maximum amount of data to decode ahead of display (in seconds)"
-#~ msgstr "প্ৰদৰ্শনৰ পূৰ্বে সৰ্বোচ্চ যে পৰিমান তথ্য ডি-কোড কৰা হ'ব (ছেকেণ্ডে ব্যক্ত)"
+#~ msgstr "প্ৰদৰ্শনৰ পূৰ্বে সৰ্বোচ্চ যে পৰিমান তথ্য ডি-ক'ড কৰা হ'ব (ছেকেণ্ড ব্যক্ত)"
 
 #~ msgid ""
 #~ "Quality settings for the audio visualization: \"0\" for small, \"1\" for "
 #~ "normal, \"2\" for large, \"3\" for extra large."
 #~ msgstr ""
-#~ "অডিঅ' ৰ সৈতে প্ৰদৰ্শিত ভিছুৱেলাইজেছনৰ গুণমান: ক্ষুদ্ৰ মাপৰ বাবে \"0\", স্বাভাবিক "
-#~ "মাপৰ বাবে \"1\", ডাঙৰ মাপৰ বাবে \"2\", অত্যাধিক ডাঙৰ মাপৰ বাবে \"3\" ।"
+#~ "অডিঅ' ৰ সৈতে প্ৰদৰ্শিত কল্পনাকৰনৰ গুণমান: ক্ষুদ্ৰ মাপৰ বাবে \"0\", স্বাভাবিক মাপৰ "
+#~ "বাবে \"1\", ডাঙৰ মাপৰ বাবে \"2\", অত্যাধিক ডাঙৰ মাপৰ বাবে \"3\"।"
 
 #~ msgid "Sound volume"
-#~ msgstr "শব্দেৰ মাত্ৰা"
+#~ msgstr "ভলিউম"
 
 #~ msgid "Sound volume, in percent, between 0 and 100"
-#~ msgstr "শব্দেৰ মাত্ৰা, শতাংশে ব্যক্ত, ০ৰ পৰা ১০০ ত"
+#~ msgstr "ভলিউম, শতাংশে ব্যক্ত, ০ৰ পৰা ১০০ ত"
 
 #~ msgid ""
 #~ "Type of audio output to use: \"0\" for stereo, \"1\" for 4-channel "
 #~ "output, \"2\" for 5.0 channel output, \"3\" for 5.1 channel output, \"4\" "
 #~ "for AC3 Passthrough."
 #~ msgstr ""
-#~ "ব্যৱহাৰৰ বাবে অডিঅ' আউটপুটৰ ধৰন: স্টিৰিও ৰ ক্ষেত্ৰত \"0\" , ৪-চেনেল বিশিষ্ট "
+#~ "ব্যৱহাৰৰ বাবে অডিঅ' আউটপুটৰ ধৰণ: স্টিৰিও ৰ ক্ষেত্ৰত \"0\" , ৪-চেনেল বিশিষ্ট "
 #~ "আউটপুটৰ ক্ষেত্ৰত \"1\", ৫.০ চেনেল বিশিষ্ট আউটপুটৰ ক্ষেত্ৰত \"2\", ৫.০ চেনেল "
-#~ "বিশিষ্ট আউটপুটৰ ক্ষেত্ৰত \"3\", AC3 পাসথ্ৰু ৰ ক্ষেত্ৰত \"4\" ।"
+#~ "বিশিষ্ট আউটপুটৰ ক্ষেত্ৰত \"3\", AC3 পাসথ্ৰু ৰ ক্ষেত্ৰত \"4\"।"
 
 #~ msgid "UTF-8"
 #~ msgstr "UTF-8"
 
 #~ msgid "Whether the main window should stay on top"
-#~ msgstr "প্ৰধান উইন্ডো ওপৰত স্থাপিত হ'ব কিনা"
+#~ msgstr "প্ৰধান উইন্ডো ওপৰত স্থাপিত হ'ব নে"
 
 #~ msgid "Whether the main window should stay on top of the other ones"
-#~ msgstr "প্ৰধান উইন্ডো অন্যান্য সকলো উইন্ডোৰ ওপৰত স্থাপিত হ'ব কিনা"
+#~ msgstr "প্ৰধান উইন্ডো অন্যান্য সকলো উইন্ডোৰ ওপৰত স্থাপিত হ'ব নে"
 
 #~ msgid "Could not launch URL \"%s\": %s"
 #~ msgstr "Could not launch URL \"%s\": %s"
@@ -3049,32 +3088,30 @@
 #~ msgstr "'%s' ত TV চাওক"
 
 #~ msgid "Sets 16:9 (Anamorphic) aspect ratio"
-#~ msgstr "১৬:৯ (এনামোৰফিক) এস্পেক্ট অনুপাত নিৰ্ধাৰণ কৰি"
+#~ msgstr "16:9 (এনামোৰফিক) এস্পেক্ট অনুপাত সংহতি কৰক"
 
 #~ msgid ""
 #~ "Totem cannot play TV, because no TV adapters are present or they are not "
 #~ "supported."
 #~ msgstr ""
 #~ "Totem দ্বাৰা TV চলোৱা সম্ভৱ ন'হ'ব, কাৰণ TV এডাপ্টাৰ বৰ্তমানে উপস্থিত নহয় অথবা "
-#~ "সমৰ্থিত নহয় ।"
+#~ "সমৰ্থিত নহয়।"
 
 #~ msgid "Please insert a supported TV adapter."
-#~ msgstr "অনুগ্ৰহ কৰি এটা সমৰ্থিত TV এডাপ্টাৰ যোগ কৰক ।"
+#~ msgstr "অনুগ্ৰহ কৰি এটা সমৰ্থিত TV এডাপ্টাৰ যোগ কৰক।"
 
 #~| msgid "More information about media plugins"
 #~ msgid "More information about watching TV"
 #~ msgstr "TV প্ৰদৰ্শন সম্বন্ধে অধিক তথ্য"
 
 #~ msgid "Totem is missing a channels listing to be able to tune the receiver."
-#~ msgstr ""
-#~ "ৰিছিভাৰ টিউন কৰাৰ উদ্দেশ্যে আবশ্যক চেনেলৰ তালিকা Totem ৰ বাবে উপলব্ধ নাই ।"
+#~ msgstr "ৰিছিভাৰ টিউন কৰাৰ উদ্দেশ্যে আবশ্যক চেনেলৰ মেনু Totem ৰ বাবে উপলব্ধ নাই।"
 
 #~ msgid ""
 #~ "Please follow the instructions provided in the link to create a channels "
 #~ "listing."
 #~ msgstr ""
-#~ "চেনেলৰ তালিকা নিৰ্মাণৰ বাবে অনুগ্ৰহ কৰি প্ৰদত্ত লিঙ্কত উপস্থিত নিৰ্দেশাবলী অনুসৰণ "
-#~ "কৰক ।"
+#~ "চেনেলৰ মেনু নিৰ্মাণৰ বাবে অনুগ্ৰহ কৰি প্ৰদত্ত লিঙ্কত উপস্থিত নিৰ্দেশাবলী অনুসৰণ কৰক।"
 
 #~| msgid ""
 #~| "Totem cannot play this type of media (%s) because you do not have the "
@@ -3082,55 +3119,54 @@
 #~ msgid ""
 #~ "Totem cannot play this type of media (%s) because the TV device is busy."
 #~ msgstr ""
-#~ "এই ধৰনৰ মিডিয়া (%s) Totem দ্বাৰা চলোৱা সম্ভৱ নহয় কাৰণ TV যন্ত্ৰ বৰ্তমানে মুক্ত "
-#~ "নহয় ।"
+#~ "এই ধৰণৰ মাধ্যম (%s) Totem দ্বাৰা চলোৱা সম্ভৱ নহয় কাৰণ TV যন্ত্ৰ বৰ্তমানে মুক্ত "
+#~ "নহয়।"
 
 #~ msgid "Please try again later."
-#~ msgstr "অনুগ্ৰহ কৰি পিছত প্ৰচেষ্টা কৰক ।"
+#~ msgstr "অনুগ্ৰহ কৰি পিছত চেষ্টা কৰক।"
 
 #~ msgid "TV signal lost"
-#~ msgstr "TV সংকেত পাৱ নাযায়"
+#~ msgstr "TV সংকেত পোৱা নাযায়"
 
 #~ msgid "Please verify your hardware setup."
-#~ msgstr "অনুগ্ৰহ কৰি হাৰ্ডৱেৰ ছেট-আপ পৰীক্ষা কৰক ।"
+#~ msgstr "অনুগ্ৰহ কৰি হাৰ্ডৱেৰ ছেট-আপ পৰীক্ষা কৰক।"
 
 #~| msgid "Don't connect to an already running instance"
 #~ msgid "Don't connect to an already-running instance"
 #~ msgstr "চলমান কোনো ইনস্টেন্সৰ সৈতে সংযোগ স্থাপন কৰা ন'হ'ব"
 
 #~ msgid "Enable visual effects?"
-#~ msgstr "ভিজুয়াল ইফেক্ট সক্ৰিয় কৰা হ'ব কি?"
+#~ msgstr "দৃশ্যমান প্ৰভাৱ সামৰ্থবান কৰক কি?"
 
 #~ msgid ""
 #~ "It seems you are running Totem remotely.\n"
 #~ "Are you sure you want to enable the visual effects?"
 #~ msgstr ""
-#~ "সম্ভৱত আপনি দূৰবৰ্তী অৱস্থানৰ পৰা Totem চালাচ্ছেন ।\n"
-#~ "আপনি কি নিশ্চিতৰূপে ভিজুয়াল ইফেক্ট সক্ৰিয় কৰিবলৈ ইচ্ছুক?"
+#~ "সম্ভৱত আপুনি দূৰবৰ্তী অৱস্থানৰ পৰা Totem চালাচ্ছেন।\n"
+#~ "আপুনি কি নিশ্চিতৰূপে দৃশ্যমান প্ৰভাৱ সক্ৰিয় কৰিবলৈ ইচ্ছুক?"
 
 #~ msgid ""
 #~ "Changing the visuals effect type will require a restart to take effect."
-#~ msgstr "ভিজুয়াল ইফেক্ট সংক্ৰান্ত পৰিবৰ্তন প্ৰয়োগ কৰাৰ বাবে ৰি-স্টাৰ্ট কৰা আবশ্যক ।"
+#~ msgstr "দৃশ্যমান প্ৰভাৱ পৰিবৰ্তন প্ৰয়োগ কৰাৰ বাবে ৰি-স্টাৰ্ট কৰা আবশ্যক।"
 
 #~ msgid ""
 #~ "The change of audio output type will only take effect when Totem is "
 #~ "restarted."
 #~ msgstr ""
-#~ "অডিঅ' আউটপুটৰ প্ৰকৃতি সংক্ৰান্ত পৰিবৰ্তনসমূহ প্ৰয়োগ কৰাৰ বাবে Totem পুনৰায় আৰম্ভ "
-#~ "কৰা আবশ্যক ।"
+#~ "অডিঅ' আউটপুটৰ প্ৰকৃতি পৰিবৰ্তনসমূহ প্ৰয়োগ কৰাৰ বাবে Totem পুনৰ আৰম্ভ কৰা আবশ্যক।"
 
 #~| msgid "Could not save the playlist"
 #~ msgid "Could not open link"
 #~ msgstr "লিংক খুলিবলৈ ব্যৰ্থ"
 
 #~ msgid "Totem could not initialize the configuration engine."
-#~ msgstr "Totem দ্বাৰা এই বিন্যাস ইঞ্জিনটি আৰম্ভ কৰা নাযায় ।"
+#~ msgstr "Totem দ্বাৰা এই বিন্যাস ইঞ্জিনটি আৰম্ভ কৰা নাযায়।"
 
 #~ msgid "Make sure that GNOME is properly installed."
-#~ msgstr "GNOME সঠিকৰূপে সংস্থাপন কৰা হৈছে কিনা পৰীক্ষা কৰক ।"
+#~ msgstr "GNOME সঠিকৰূপে ইনস্টল কৰা হৈছে নে পৰীক্ষা কৰক।"
 
 #~ msgid "Plugin"
-#~ msgstr "প্লাগ-ইন"
+#~ msgstr "প্লাগিন"
 
 #~ msgid "Enabled"
 #~ msgstr "সক্ৰিয়"
@@ -3139,17 +3175,17 @@
 #~ "Unable to activate plugin %s.\n"
 #~ "%s"
 #~ msgstr ""
-#~ "%s প্লাগ-ইন সক্ৰিয় কৰিবলৈ ব্যৰ্থ ।\n"
+#~ "%s প্লাগিন সক্ৰিয় কৰিবলৈ ব্যৰ্থ।\n"
 #~ "%s"
 
 #~ msgid "Unable to activate plugin %s"
-#~ msgstr "%s প্লাগ-ইন সক্ৰিয় কৰিবলৈ ব্যৰ্থ"
+#~ msgstr "%s প্লাগিন সক্ৰিয় কৰিবলৈ ব্যৰ্থ"
 
 #~ msgid "Plugin Error"
-#~ msgstr "প্লাগ-ইন সংক্ৰান্ত ত্ৰুটি"
+#~ msgstr "প্লাগিন ত্ৰুটি"
 
 #~ msgid "Jamendo Plugin Configuration"
-#~ msgstr "Jamendo প্লাগ-ইন বিন্যাস"
+#~ msgstr "Jamendo প্লাগিন বিন্যাস"
 
 #~ msgid "Recordings"
 #~ msgstr "Recordings"
@@ -3165,28 +3201,24 @@
 #~ msgstr "ভাষা"
 
 #~ msgid "_Download Movie Subtitles..."
-#~ msgstr "চলচ্চিত্ৰৰ অনুবাদলিপি ডাউনলোড কৰক...(_D)"
+#~ msgstr "চলচিত্ৰৰ উপশীৰ্ষকসমূহ ডাউনল'ড কৰক...(_D)"
 
 #~| msgid "Screenshot%d.png"
 #~ msgid "Screenshot%d.jpg"
 #~ msgstr "Screenshot%d.jpg"
 
-#~| msgid "Could not load the \"Skip to\" dialogue interface."
-#~ msgid "Could not load the \"Skip to\" dialog interface."
-#~ msgstr "\"চিহ্নিত স্থানলৈ যাওক\" সম্বাদ সংযোগমাধ্যম লোড কৰা নাযায় ।"
-
 #~| msgid "Could not get metadata for file %s."
 #~ msgid "Could not get metadata for file %s: %s"
 #~ msgstr "নথিপত্ৰ %s ৰ বাবে মিটাডাটা প্ৰাপ্ত কৰা নাযায়: %s"
 
 #~ msgid "Error Looking Up Video URI"
-#~ msgstr "ভিডিঅ' URI অনুসন্ধান কৰিবলৈ ত্ৰুটি"
+#~ msgstr "ভিডিঅ' URI সন্ধান কৰিবলৈ ত্ৰুটি"
 
 #~ msgid "Totem could not play '%s'"
 #~ msgstr "Totem সহযোগে '%s' চলোৱা নাযায়"
 
 #~ msgid "The Totem plugin could not be started."
-#~ msgstr "Totem প্লাগ-ইন আৰম্ভ কৰিবলৈ ব্যৰ্থ ।"
+#~ msgstr "Totem প্লাগিন আৰম্ভ কৰিবলৈ ব্যৰ্থ।"
 
 #~ msgid "TV-Out"
 #~ msgstr "TV ছোট আকাৰ"
@@ -3198,7 +3230,7 @@
 #~ msgstr "TV"
 
 #~ msgid "_Allow the screensaver to activate even when audio-only is playing"
-#~ msgstr "সক্ৰিয় কৰক হলো"
+#~ msgstr "সামৰ্থবান কৰক হলো"
 
 #~ msgid "_No TV-out"
 #~ msgstr "না TV"
@@ -3213,7 +3245,7 @@
 #~ msgstr "GNOME"
 
 #~ msgid "Print playing movie"
-#~ msgstr "সঞ্চালিত চলচ্চিত্ৰ প্ৰিন্ট কৰক"
+#~ msgstr "সঞ্চালিত চলচিত্ৰ প্ৰিন্ট কৰক"
 
 #~ msgid "Unknown file extension."
 #~ msgstr "অজানা নথিপত্ৰ এক্সেটেনশন।"
@@ -3222,8 +3254,8 @@
 #~ "The change of this setting will only take effect for the next movie, or "
 #~ "when Totem is restarted."
 #~ msgstr ""
-#~ "পৰবৰ্তী চলচ্চিত্ৰ অথবা Totem পুনৰায় আৰম্ভ কৰা হলে এই বৈশিষ্ট্যেৰ পৰিবৰ্তনগুলি "
-#~ "প্ৰয়োগ কৰা হ'ব।"
+#~ "পৰবৰ্তী চলচিত্ৰ অথবা Totem পুনৰ আৰম্ভ কৰা হলে এই বৈশিষ্ট্যেৰ পৰিবৰ্তনগুলি প্ৰয়োগ "
+#~ "কৰা হ'ব।"
 
 #~ msgid "Totem could not parse the command-line options"
 #~ msgstr "Totem দ্বাৰা কমান্ড-লাইনৰ পৰা ব্যবহাৰযোগ্য বিকল্প পাৰ্স কৰা যায়নি"
@@ -3235,18 +3267,8 @@
 #~ "Couldn't load the '%s' audio driver\n"
 #~ "Check that the device is not busy."
 #~ msgstr ""
-#~ "'%s' অডিও ড্ৰাইভাৰ লোড কৰা সম্ভব যায়নি\n"
-#~ "ডিভাইসটি বৰ্তমানে ব্যস্ত কিনা পৰীক্ষা কৰক।"
-
-#~ msgid ""
-#~ "No video output is available. Make sure that the program is correctly "
-#~ "installed."
-#~ msgstr ""
-#~ "কোনো ভিডিও আউটপুট উপলব্ধ নেই। প্ৰোগ্ৰাম সঠিকৰূপে ইনস্টল কৰা হয়েছে কিনা পৰীক্ষা "
-#~ "কৰক।"
-
-#~ msgid "The server you are trying to connect to is not known."
-#~ msgstr "সংযোগ স্থাপনেৰ জন্য চিহ্নিত সাৰ্ভাৰটি সনাক্ত কৰতে ব্যৰ্থ।"
+#~ "'%s' অডিও ড্ৰাইভাৰ ল'ড কৰা সম্ভব যায়নি\n"
+#~ "ডিভাইচটি বৰ্তমানে ব্যস্ত নে পৰীক্ষা কৰক।"
 
 #~ msgid "The device name you specified (%s) seems to be invalid."
 #~ msgstr "উল্লিখিত ডিভাইসেৰ নাম (%s) সম্ভবত বৈধ নয়।"
@@ -3254,75 +3276,53 @@
 #~ msgid "The server you are trying to connect to (%s) is unreachable."
 #~ msgstr "সংযোগ স্থাপনেৰ জন্য চিহ্নিত সাৰ্ভাৰেৰ (%s) সাথে সংযোগ কৰতে ব্যৰ্থ।"
 
-#~ msgid "The connection to this server was refused."
-#~ msgstr "চিহ্নিত সাৰ্ভাৰেৰ সাথে সংযোগ প্ৰত্যাখ্যান কৰা হয়েছে।"
-
-#~ msgid "The specified movie could not be found."
-#~ msgstr "নিৰ্ধাৰিত চলচ্চিত্ৰ পাওয়া যায়নি।"
-
 #~ msgid ""
 #~ "The source seems encrypted, and can't be read. Are you trying to play an "
 #~ "encrypted DVD without libdvdcss?"
 #~ msgstr ""
-#~ "উৎস সম্ভবত এনক্ৰিপ্ট কৰা হয়েছে এবং পড়া সম্ভব নয়। আপনি কি libdvdcss বিনা কোনো "
-#~ "এনক্ৰিপ্ট কৰা DVD চলোৱাৰ প্ৰচেষ্টা কৰছেন?"
+#~ "উৎস সম্ভবত এনক্ৰিপ্ট কৰা হয়েছে আৰু পড়া সম্ভব নয়। আপুনি কি libdvdcss বিনা কোনো "
+#~ "এনক্ৰিপ্ট কৰা DVD চলোৱাৰ চেষ্টা কৰছেন?"
 
 #~ msgid "A problem occurred while loading a library or a decoder (%s)."
-#~ msgstr "লাইব্ৰাৰি অথবা ডিকোডাৰ (%s) লোড কৰতে সমস্যা।"
+#~ msgstr "লাইব্ৰাৰি অথবা ডিক'ডাৰ (%s) ল'ড কৰতে ত্ৰুটি।"
 
 #~ msgid "This file is encrypted and cannot be played back."
-#~ msgstr "চিহ্নিত নথিপত্ৰটি এনক্ৰিপ্ট কৰা অবস্থায় ৰয়েছে।"
+#~ msgstr "চিহ্নিত নথিপত্ৰটি এনক্ৰিপ্ট কৰা অবস্থায় আছে।"
 
 #~ msgid "For security reasons, this movie can not be played back."
-#~ msgstr "নিৰাপত্তা জড়িত কাৰণে এই চলচ্চিত্ৰ চালানো সম্ভব নয়।"
+#~ msgstr "নিৰাপত্তা জড়িত কাৰণে এই চলচিত্ৰ চালানো সম্ভব নয়।"
 
 #~ msgid "The audio device is busy. Is another application using it?"
 #~ msgstr ""
-#~ "অডিও ডিভাইস বৰ্তমানে ব্যস্ত। অন্য কোনো অ্যাপ্লিকেশনেৰ দ্বাৰা এটি ব্যবহৃত হচ্ছে কি?"
+#~ "অডিও ডিভাইচ বৰ্তমানে ব্যস্ত। অন্য কোনো অ্যাপ্লিকেশনেৰ দ্বাৰা এটি ব্যবহৃত হচ্ছে কি?"
 
 #~ msgid "Authentication is required to access this file."
 #~ msgstr "অনুমোদন ব্যবস্থা হলো নথিপত্ৰ."
 
-#~ msgid "Authentication is required to access this file or stream."
-#~ msgstr "অনুমোদন ব্যবস্থা হলো নথিপত্ৰ."
-
-#~ msgid "You are not allowed to open this file."
-#~ msgstr "এই নথিপত্ৰটি খোলাৰ অনুমতি আপনাৰ নেই।"
-
-#~ msgid "The server refused access to this file or stream."
-#~ msgstr "সাৰ্ভাৰেৰ দ্বাৰা এই নথিপত্ৰ অথবা স্ট্ৰিমেৰ ব্যবহাৰ প্ৰতিৰোধ কৰা হয়েছে।"
-
 #~ msgid "The file you tried to play is an empty file."
-#~ msgstr "আপনি একটি ফাঁকা নথিপত্ৰ চলোৱাৰ প্ৰচেষ্টা কৰেছিলেন।"
+#~ msgstr "আপুনি একটি পৰিষ্কাৰ নথিপত্ৰ চলোৱাৰ চেষ্টা কৰেছিলেন।"
 
 #~ msgid "There is no input plugin to handle the location of this movie"
-#~ msgstr "চলচ্চিত্ৰেৰ অবস্থান ব্যবস্থাপনাৰ জন্য কোনো ইনপুট প্লাগ-ইন উপস্থিত নেই।"
+#~ msgstr "চলচ্চিত্ৰেৰ অবস্থান ব্যবস্থাপনাৰ জন্য কোনো ইনপুট প্লাগিন উপস্থিত নেই।"
 
 #~ msgid "There is no plugin to handle this movie."
-#~ msgstr "এই চলচ্চিত্ৰ চলোৱাৰ জন্য যথাযত প্লাগ-ইন উপস্থিত নেই।"
+#~ msgstr "এই চলচিত্ৰ চলোৱাৰ জন্য যথাযত প্লাগিন উপস্থিত নেই।"
 
 #~ msgid "This movie is broken and can not be played further."
-#~ msgstr "এই চলচ্চিত্ৰটি ক্ষতিগ্ৰস্ত ও এৰ পৰবৰ্তী অংশ পড়া যাবে না।"
+#~ msgstr "এই চলচিত্ৰটি ক্ষতিগ্ৰস্ত আৰু এৰ পৰবৰ্তী অংশ পড়া যাবে না।"
 
 #~ msgid "This movie could not be opened."
-#~ msgstr "এই চলচ্চিত্ৰটি পড়া যায়নি।"
+#~ msgstr "এই চলচিত্ৰটি পড়া যায়নি।"
 
 #~ msgid ""
 #~ "Video codec '%s' is not handled. You might need to install additional "
 #~ "plugins to be able to play some types of movies"
 #~ msgstr ""
-#~ "'%s' নামক ভিডিও কোডেক ব্যবস্থাপনা কৰা যায়নি। কিছু বিশেষ ধৰনেৰ চলচ্চিত্ৰ চলোৱাৰ "
-#~ "জন্য সম্ভবত অতিৰিক্ত প্লাগ-ইন ইনস্টল কৰা আবশ্যক।"
-
-#~ msgid ""
-#~ "Audio codec '%s' is not handled. You might need to install additional "
-#~ "plugins to be able to play some types of movies"
-#~ msgstr ""
-#~ "'%s' নামক অডিও কোডেক ব্যবস্থাপনা কৰা যায়নি। কিছু বিশেষ ধৰনেৰ চলচ্চিত্ৰ চলোৱাৰ "
-#~ "জন্য সম্ভবত অতিৰিক্ত প্লাগ-ইন ইনস্টল কৰা আবশ্যক।"
+#~ "'%s' নামক ভিডিও কোডেক ব্যবস্থাপনা কৰা যায়নি। কিছু বিশেষ ধৰনেৰ চলচিত্ৰ চলোৱাৰ "
+#~ "জন্য সম্ভবত অতিৰিক্ত প্লাগিন ইনস্টল কৰা আবশ্যক।"
 
 #~ msgid "This is an audio-only file, and there is no audio output available."
-#~ msgstr "শুধুমাত্ৰ অডিও নথিপত্ৰ হওয়া সত্বেও এৰৰ পৰা কোনো অডিও আউটপুট উপলব্ধ নেই।"
+#~ msgstr "কেৱল অডিও নথিপত্ৰ হওয়া সত্বেও এৰৰ পৰা কোনো অডিও আউটপুট উপলব্ধ নেই।"
 
 #~ msgid "Language %d"
 #~ msgstr "ভাষা %d"
@@ -3331,10 +3331,10 @@
 #~ msgstr "আহৰণেৰ জন্য ভিডিও উপস্থিত নেই।"
 
 #~ msgid "Video codec is not handled."
-#~ msgstr "ভিডিও কোডেক-ৰ ব্যবস্থাপনা কৰা সম্ভব নয়।"
+#~ msgstr "ভিডিও কোডেকৰ ব্যবস্থাপনা কৰা সম্ভব নয়।"
 
 #~ msgid "Movie is not playing."
-#~ msgstr "চলচ্চিত্ৰ চলতে ব্যৰ্থ।"
+#~ msgstr "চলচিত্ৰ চলতে ব্যৰ্থ।"
 
 #~ msgid "long time format|%d:%02d:%02d"
 #~ msgstr "%d:%02d:%02d"
@@ -3358,4 +3358,4 @@
 #~ msgstr "%s খোলা হচ্ছে"
 
 #~ msgid "Could not initialise the thread-safe libraries."
-#~ msgstr "থ্ৰেড-সেফ লাইব্ৰেৰি আৰম্ভ কৰা যায়নি।"
+#~ msgstr "থ্ৰেড-চেইফ লাইব্ৰেৰি আৰম্ভ কৰা যায়নি।"
diff -Nru totem-3.4.3/po/be.po totem-3.6.2/po/be.po
--- totem-3.4.3/po/be.po	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/po/be.po	2012-08-29 23:07:45.000000000 +0000
@@ -1,6 +1,6 @@
 # Vital Khilko ,2002, 2003.
 # Ales Nyakhaychyk , 2003, 2006, 2008.
-# Ihar Hrachyshka , 2006, 2007, 2011.
+# Ihar Hrachyshka , 2006, 2007, 2011, 2012.
 # Andrey Ladyko , 2009.
 #
 msgid ""
@@ -8,25 +8,240 @@
 "Project-Id-Version: totem.master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=totem&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-03-23 21:04+0000\n"
-"PO-Revision-Date: 2012-03-24 22:44+0300\n"
+"POT-Creation-Date: 2012-07-14 23:31+0000\n"
+"PO-Revision-Date: 2012-07-15 11:32+0300\n"
 "Last-Translator: Ihar Hrachyshka \n"
 "Language-Team: Belarusian \n"
+"Language: be\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: be\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: ../browser-plugin/totem-plugin-viewer.c:352 ../src/totem-object.c:1180
+#: ../src/totem-object.c:1650 ../src/totem-statusbar.c:115
+msgid "Stopped"
+msgstr "Спынена"
+
+#: ../browser-plugin/totem-plugin-viewer.c:364 ../src/totem-object.c:1173
+msgid "Paused"
+msgstr "Прыпынена"
+
+#: ../browser-plugin/totem-plugin-viewer.c:368 ../src/totem-object.c:1166
+msgid "Playing"
+msgstr "Прайграванне"
+
+#: ../browser-plugin/totem-plugin-viewer.c:386
+#: ../src/plugins/screensaver/totem-screensaver.c:97
+msgid "Playing a movie"
+msgstr "Прайграванне фільма"
+
+#: ../browser-plugin/totem-plugin-viewer.c:443
+msgid "No URI to play"
+msgstr "Няма URI-адрасу для грання"
+
+#: ../browser-plugin/totem-plugin-viewer.c:676
+#: ../browser-plugin/totem-plugin-viewer.c:1700
+msgid "Totem Movie Player"
+msgstr "Totem: прайгравальнік фільмаў"
+
+#. translators: this is:
+#. * Open With ApplicationName
+#. * as in nautilus' right-click menu
+#: ../browser-plugin/totem-plugin-viewer.c:1120
+#, c-format
+msgid "_Open with \"%s\""
+msgstr "_Адкрыць у \"%s\""
+
+#: ../browser-plugin/totem-plugin-viewer.c:1341 ../src/totem-object.c:2475
+msgid "An error occurred"
+msgstr "Узнікла памылка"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2033
+msgid "No playlist or playlist empty"
+msgstr "Няма спіса прайгравання або ён пусты"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2128
+msgid "Movie browser plugin"
+msgstr "Плугін фільмаў для сеціўнага аглядальніка"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144 ../src/totem.c:239
+msgid "Could not initialize the thread-safe libraries."
+msgstr "Не ўдалося ініцыяваць бібліятэкі, сумяшчальныя з ніцямі."
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144
+msgid "Verify your system installation. The Totem plugin will now exit."
+msgstr ""
+"Праверце правільнасць усталявання сістэмы. Плугін Totem заканчвае працу."
 
 #: ../data/fullscreen.ui.h:1
 msgid "Leave Fullscreen"
 msgstr "Выйсці з поўнаэкраннага рэжыму"
 
-#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:144
+#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:81
 msgid "Time:"
 msgstr "Час:"
 
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
+msgid "Allow the screensaver to activate when playing audio"
+msgstr "Ці трэба дазволіць запуск ахоўніка экрана пры аўдыяпрайграванні"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
+msgid ""
+"Allow the screensaver to activate when playing audio. Disable if you have "
+"monitor-powered speakers."
+msgstr ""
+"Ці трэба дазволіць запуск ахоўніка экрана пры аўдыяпрайграванні. Выключыце "
+"гэту опцыю, калі вашы калонкі сілкуюцца ад манітора."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
+msgid "Show visual effects when no video is displayed"
+msgstr "Паказваць візуальныя эфекты, калі няма відэа"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
+msgid "Show visual effects when playing an audio only file."
+msgstr "Паказваць візуальныя эфекты, калі прайграецца файл без відэа."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
+msgid "Name of the visual effects plugin"
+msgstr "Назва плугіна візуальных эфектаў"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
+msgid "The brightness of the video"
+msgstr "Яркасць відэа"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
+msgid "The contrast of the video"
+msgstr "Кантраснасць відэа"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
+msgid "The hue of the video"
+msgstr "Тон відэа"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
+msgid "The saturation of the video"
+msgstr "Насычанасць відэа"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
+msgid "Resize the canvas automatically on file load"
+msgstr "Аўтаматычна змяняць памер акна пры адкрыцці файла"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
+msgid "Repeat mode"
+msgstr "Рэжым паўтору"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
+msgid "Shuffle mode"
+msgstr "Рэжым тасавання"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
+msgid "Whether to disable deinterlacing for interlaced movies"
+msgstr "Ці трэба выключыць дэінтэрлэйсінг для церазрадковага відэа"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
+msgid "Whether to enable debug for the playback engine"
+msgstr "Ці трэба ўключаць адладку рухавіка прайгравання"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
+msgid "Type of audio output to use"
+msgstr "Тып аўдыявываду"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
+msgid "Visualization quality setting"
+msgstr "Настройка якасці візуалізацыі"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
+msgid "Quality setting for the audio visualization."
+msgstr "Настройка якасці аўдыявізуалізацыі."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
+msgid "Network buffering threshold"
+msgstr "Парог сеткавага буферавання"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
+msgid ""
+"Amount of data to buffer for network streams before starting to display the "
+"stream (in seconds)."
+msgstr ""
+"Колькасць сеткавых даных для буферавання, патрэбная для пачатку паказу (у "
+"секундах)."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
+msgid "Subtitle font"
+msgstr "Шрыфт субцітраў"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
+msgid "Pango font description for subtitle rendering."
+msgstr "Апісанне Pango-шрыфту для паказу субцітраў."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
+msgid "Subtitle encoding"
+msgstr "Кадаванне субцітраў"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
+msgid "Encoding character set for subtitle."
+msgstr "Знаказбор для кадавання субцітраў."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
+msgid "Default location for the \"Open...\" dialogs"
+msgstr "Прадвызначанае месцазнаходжанне для дыялогаў \"Адкрыць...\""
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
+msgid ""
+"Default location for the \"Open...\" dialogs. Default is the current "
+"directory."
+msgstr ""
+"Прадвызначанае месцазнаходжанне для дыялогаў \"Адкрыць...\". Прадвызначана "
+"гэта бягучы каталог."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
+msgid "Default location for the \"Take Screenshot\" dialogs"
+msgstr ""
+"Прадвызначанае месцазнаходжанне для дыялогаў \"Зрабіць экранны здымак\""
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
+msgid ""
+"Default location for the \"Take Screenshot\" dialogs. Default is the "
+"Pictures directory."
+msgstr ""
+"Прадвызначанае месцазнаходжанне для дыялогаў \"Зрабіць экранны здымак\". "
+"Прадвызначана гэта каталог Малюнкі."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
+msgid "Whether to disable the plugins in the user's home directory"
+msgstr "Ці трэба выключыць плугіны з дамашняга каталога карыстальніка"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
+msgid "Whether to disable the keyboard shortcuts"
+msgstr "Ці трэба выключыць клавіятурныя скароты"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
+msgid "Whether to autoload text subtitle files when a movie is loaded"
+msgstr "Ці трэба аўтаматычна загружаць субцітры пры адкрыцці фільма"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
+msgid "Whether to autoload external chapter files when a movie is loaded"
+msgstr "Ці трэба аўтаматычна загружаць файлы раздзелаў пры адкрыцці фільма"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
+msgid ""
+"Whether to remember the position of played audio/video files when pausing or "
+"closing them"
+msgstr ""
+"Ці трэба запамінаць пазіцыю ў аўдыя- ці відэафайле пры ўключэнні паўзы ці "
+"яго закрыцці"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
+msgid "Active plugins list"
+msgstr "Спіс актыўных плугінаў"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+msgid ""
+"A list of the names of the plugins which are currently active (loaded and "
+"running)."
+msgstr "Спіс назваў актыўных плугінаў (загружаных і дзейных)."
+
 #: ../data/playlist.ui.h:1
 msgid "_Remove"
 msgstr "_Выдаліць"
@@ -43,11 +258,11 @@
 msgid "Copy the location to the clipboard"
 msgstr "Скапіраваць месцазнаходжанне ў буфер абмену"
 
-#: ../data/playlist.ui.h:5 ../data/totem.ui.h:78
+#: ../data/playlist.ui.h:5 ../data/totem.ui.h:71
 msgid "_Select Text Subtitles..."
 msgstr "_Выбраць субцітры..."
 
-#: ../data/playlist.ui.h:6 ../data/totem.ui.h:79
+#: ../data/playlist.ui.h:6 ../data/totem.ui.h:72
 msgid "Select a file to use for text subtitles"
 msgstr "Выберыце файл з субцітрамі"
 
@@ -71,10 +286,165 @@
 msgid "Move Down"
 msgstr "Пасунуць ніжэй"
 
-#: ../data/properties.ui.h:1 ../data/totem.ui.h:122
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:2
+msgid "Normal"
+msgstr "Звычайны"
+
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:4
+msgid "Large"
+msgstr "Вялікі"
+
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:6
+msgid "Extra Large"
+msgstr "Вялізны"
+
+#: ../data/preferences.ui.h:7 ../src/backend/bacon-video-widget.c:5473
+#: ../src/totem-properties-view.c:231
+msgid "Stereo"
+msgstr "Стэрэа"
+
+#: ../data/preferences.ui.h:8
+msgid "4-channel"
+msgstr "4-канальны"
+
+#: ../data/preferences.ui.h:9
+msgid "4.1-channel"
+msgstr "4.1-канальны"
+
+#: ../data/preferences.ui.h:10
+msgid "5.0-channel"
+msgstr "5.0-канальны"
+
+#: ../data/preferences.ui.h:11
+msgid "5.1-channel"
+msgstr "5.1-канальны"
+
+#: ../data/preferences.ui.h:12
+msgid "AC3 Passthrough"
+msgstr "AC3 Passthrough"
+
+#: ../data/preferences.ui.h:13
+msgid "Totem Preferences"
+msgstr "Настройкі Totem"
+
+#: ../data/preferences.ui.h:14
+msgid "Playback"
+msgstr "Прайграванне"
+
+#: ../data/preferences.ui.h:15
+msgid "Start playing files from last position"
+msgstr "Пачаць прайграваць файлы з мінулага месца"
+
+#: ../data/preferences.ui.h:16
+msgid "Text Subtitles"
+msgstr "Субцітры"
+
+#: ../data/preferences.ui.h:17
+msgid "_Load subtitle files when movie is loaded"
+msgstr "_Загружаць файлы субцітраў пры адкрыцці фільма"
+
+#: ../data/preferences.ui.h:18
+msgid "_Font:"
+msgstr "_Шрыфт:"
+
+#: ../data/preferences.ui.h:19
+msgid "_Encoding:"
+msgstr "_Кадаванне:"
+
+#: ../data/preferences.ui.h:20
+msgid "External Chapters"
+msgstr "Вонкавыя раздзелы"
+
+#: ../data/preferences.ui.h:21
+msgid "Load _chapter files when movie is loaded"
+msgstr "_Загружаць файлы раздзелаў пры адкрыцці фільма"
+
+#: ../data/preferences.ui.h:22 ../data/properties.ui.h:1
 msgid "General"
 msgstr "Агульнае"
 
+#. Tab label in the Preferences dialogue
+#: ../data/preferences.ui.h:24
+msgid "Display"
+msgstr "Паказ"
+
+#: ../data/preferences.ui.h:25
+msgid "_Resize the window when a new video is loaded"
+msgstr "_Змяняць памер акна пры адкрыцці новага відэа"
+
+#: ../data/preferences.ui.h:26
+msgid "Disable _deinterlacing of interlaced videos"
+msgstr "Выключыць д_эінтэрлэйсінг для церазрадковага відэа"
+
+#: ../data/preferences.ui.h:27
+msgid "Disable screensaver when playing "
+msgstr "Выключаць ахоўніка экрана пры прайграванні "
+
+#: ../data/preferences.ui.h:28 ../data/properties.ui.h:9
+#: ../src/totem-properties-view.c:273
+msgid "Video"
+msgstr "Відэа"
+
+#: ../data/preferences.ui.h:29
+msgid "Video or Audio"
+msgstr "Відэа ці гук"
+
+#: ../data/preferences.ui.h:30
+msgid "Visual Effects"
+msgstr "Візуальныя эфекты"
+
+#: ../data/preferences.ui.h:31
+msgid "Show _visual effects when an audio file is played"
+msgstr "Паказваць _візуальныя эфекты для гукавых файлаў"
+
+#: ../data/preferences.ui.h:32
+msgid "_Type of visualization:"
+msgstr "_Тып візуалізацыі:"
+
+#: ../data/preferences.ui.h:33
+msgid "Visualization _size:"
+msgstr "Па_мер візуалізацыі:"
+
+#: ../data/preferences.ui.h:34
+msgid "Color Balance"
+msgstr "Баланс колераў"
+
+#: ../data/preferences.ui.h:35
+msgid "_Brightness:"
+msgstr "_Яркасць:"
+
+#: ../data/preferences.ui.h:36
+msgid "Co_ntrast:"
+msgstr "_Кантраснасць:"
+
+#: ../data/preferences.ui.h:37
+msgid "Sat_uration:"
+msgstr "_Насычанасць:"
+
+#: ../data/preferences.ui.h:38
+msgid "_Hue:"
+msgstr "_Тон:"
+
+#: ../data/preferences.ui.h:39
+msgid "Reset to _Defaults"
+msgstr "Вярнуць _прадвызначаныя настройкі"
+
+#: ../data/preferences.ui.h:40
+msgid "Audio Output"
+msgstr "Вывад гуку"
+
+#: ../data/preferences.ui.h:41
+msgid "_Audio output type:"
+msgstr "_Тып вываду гуку:"
+
+#: ../data/preferences.ui.h:42 ../data/properties.ui.h:14
+#: ../src/totem-properties-view.c:271
+msgid "Audio"
+msgstr "Гук"
+
 #: ../data/properties.ui.h:2
 msgid "Title:"
 msgstr "Назва:"
@@ -103,11 +473,6 @@
 msgid "Container:"
 msgstr "Кантэйнер:"
 
-#: ../data/properties.ui.h:9 ../data/totem.ui.h:128
-#: ../src/totem-properties-view.c:270
-msgid "Video"
-msgstr "Відэа"
-
 #: ../data/properties.ui.h:10
 msgid "Dimensions:"
 msgstr "Памер:"
@@ -124,11 +489,6 @@
 msgid "Bitrate:"
 msgstr "Частата бітаў:"
 
-#: ../data/properties.ui.h:14 ../data/totem.ui.h:142
-#: ../src/totem-properties-view.c:268
-msgid "Audio"
-msgstr "Гук"
-
 #: ../data/properties.ui.h:15
 msgid "Sample rate:"
 msgstr "Частата сэмплаў:"
@@ -137,740 +497,448 @@
 msgid "Channels:"
 msgstr "Каналы:"
 
-#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
-msgid "_Add to Playlist"
-msgstr "_Дадаць у спіс прайгравання"
-
-#: ../data/video-list.ui.h:2
-msgid "Add the video to the playlist"
-msgstr "Дадаць відэа ў спіс прайгравання"
-
 #. Title
-#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:143
-#: ../src/totem-object.c:1667
-msgid "Movie Player"
-msgstr "Прайгравальнік фільмаў"
+#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:80 ../src/totem.c:238
+#: ../src/totem.c:247 ../src/totem-menu.c:790 ../src/totem-object.c:1658
+msgid "Videos"
+msgstr "Відэа"
 
 #: ../data/totem.desktop.in.in.in.h:2
-msgid "Play movies and songs"
-msgstr "Грае фільмы і песні"
+msgid "Play movies"
+msgstr "Прайграванне фільмаў"
+
+#: ../data/totem.desktop.in.in.in.h:3
+msgid "Video;Movie;Film;Clip;Series;Player;DVD;TV;Disc;"
+msgstr "Відэа;Фільм;Кіно;Кліп;Серыял;Прайгравальнік;DVD;TV;ТВ;Дыск;"
 
 #: ../data/totem.ui.h:1
-msgid "_Movie"
-msgstr "_Фільм"
+msgid "_Open"
+msgstr "_Адкрыць"
 
 #: ../data/totem.ui.h:2
-msgid "_Open..."
-msgstr "_Адкрыць..."
+msgid "Open _Location"
+msgstr "Адкрыць _адрас"
 
 #: ../data/totem.ui.h:3
-msgid "Open a file"
-msgstr "Адкрыць файл"
+msgid "_Fullscreen"
+msgstr "На ўвес_ь экран"
 
 #: ../data/totem.ui.h:4
-msgid "Open _Location..."
-msgstr "Адкрыць _адрас..."
+msgid "Prefere_nces"
+msgstr "_Настройкі"
 
 #: ../data/totem.ui.h:5
-msgid "Open a non-local file"
-msgstr "Адкрыць аддалены файл"
+msgid "Shuff_le"
+msgstr "_Тасаваць"
 
 #: ../data/totem.ui.h:6
+msgid "_Repeat"
+msgstr "_Паўтараць"
+
+#: ../data/totem.ui.h:7
+msgid "_Quit"
+msgstr "В_ыйсці"
+
+#: ../data/totem.ui.h:8
+msgid "_Movie"
+msgstr "_Фільм"
+
+#: ../data/totem.ui.h:9
 msgid "_Eject"
 msgstr "_Выняць"
 
-#: ../data/totem.ui.h:7
+#: ../data/totem.ui.h:10
 msgid "Eject the current disc"
 msgstr "Выняць устаўлены дыск"
 
-#: ../data/totem.ui.h:8
+#: ../data/totem.ui.h:11
 msgid "_Properties"
 msgstr "_Уласцівасці"
 
-#: ../data/totem.ui.h:9
+#: ../data/totem.ui.h:12
 msgid "View the properties of the current stream"
 msgstr "Паказаць уласцівасці бягучага струменя"
 
-#: ../data/totem.ui.h:10
+#: ../data/totem.ui.h:13
 msgid "Play / P_ause"
 msgstr "З_айграць/прыпыніць"
 
-#: ../data/totem.ui.h:11
+#: ../data/totem.ui.h:14
 msgid "Play or pause the movie"
 msgstr "Зайграць ці прыпыніць фільм"
 
-#: ../data/totem.ui.h:12
-msgid "_Quit"
-msgstr "В_ыйсці"
-
-#: ../data/totem.ui.h:13
-msgid "Quit the program"
-msgstr "Выйсці з праграмы"
-
-#: ../data/totem.ui.h:14
+#: ../data/totem.ui.h:15
 msgid "_Edit"
 msgstr "_Праўка"
 
-#: ../data/totem.ui.h:15
+#: ../data/totem.ui.h:16
 msgid "_Clear Playlist"
 msgstr "А_чысціць спіс прайгравання"
 
-#: ../data/totem.ui.h:16
+#: ../data/totem.ui.h:17
 msgid "Clear the playlist"
 msgstr "Ачысціць спіс прайгравання"
 
-#: ../data/totem.ui.h:17
-msgid "Prefere_nces"
-msgstr "_Настройкі"
-
 #: ../data/totem.ui.h:18
-msgid "Configure the application"
-msgstr "Настройка праграмы"
-
-#: ../data/totem.ui.h:19
 msgid "Plugins..."
 msgstr "Плугіны..."
 
-#: ../data/totem.ui.h:20
+#: ../data/totem.ui.h:19
 msgid "Configure plugins to extend the application"
 msgstr "Настройка плугінаў для пашырэння функцыянальнасці праграмы"
 
-#: ../data/totem.ui.h:21
+#: ../data/totem.ui.h:20
 msgid "_View"
 msgstr "_Від"
 
-#: ../data/totem.ui.h:22
-msgid "_Fullscreen"
-msgstr "На ўвес_ь экран"
-
-#: ../data/totem.ui.h:23
-msgid "Switch to fullscreen"
-msgstr "Перайсці ў поўнаэкранны рэжым"
-
-#: ../data/totem.ui.h:24
+#: ../data/totem.ui.h:21
 msgid "Fit Window to Movie"
 msgstr "Дапасаваць акно да памераў фільма"
 
-#: ../data/totem.ui.h:25
+#: ../data/totem.ui.h:22
 msgid "_Resize 1:2"
 msgstr "_Памер 1:2"
 
-#: ../data/totem.ui.h:26
+#: ../data/totem.ui.h:23
 msgid "Resize to half the original video size"
 msgstr "Паменшыць памер відэа ў два разы"
 
-#: ../data/totem.ui.h:27
+#: ../data/totem.ui.h:24
 msgid "Resize _1:1"
 msgstr "Памер _1:1"
 
-#: ../data/totem.ui.h:28
+#: ../data/totem.ui.h:25
 msgid "Resize to the original video size"
 msgstr "Вярнуць арыгінальны памер відэа"
 
-#: ../data/totem.ui.h:29
+#: ../data/totem.ui.h:26
 msgid "Resize _2:1"
 msgstr "Памер _2:1"
 
-#: ../data/totem.ui.h:30
+#: ../data/totem.ui.h:27
 msgid "Resize to double the original video size"
 msgstr "Павялічыць памер відэа ў два разы"
 
-#: ../data/totem.ui.h:31
+#: ../data/totem.ui.h:28
 msgid "_Aspect Ratio"
 msgstr "_Прапорцыі відэа"
 
-#: ../data/totem.ui.h:32
+#: ../data/totem.ui.h:29
 msgid "Switch An_gles"
 msgstr "Змяніць _вугал"
 
-#: ../data/totem.ui.h:33
+#: ../data/totem.ui.h:30
 msgid "Switch camera angles"
 msgstr "Змяніць вугал камеры"
 
-#: ../data/totem.ui.h:34
+#: ../data/totem.ui.h:31
 msgid "_Go"
 msgstr "Пера_ход"
 
-#: ../data/totem.ui.h:35
+#: ../data/totem.ui.h:32
 msgid "_DVD Menu"
 msgstr "Мен_ю DVD"
 
-#: ../data/totem.ui.h:36
+#: ../data/totem.ui.h:33
 msgid "Go to the DVD menu"
 msgstr "Перайсці да меню DVD"
 
-#: ../data/totem.ui.h:37
+#: ../data/totem.ui.h:34
 msgid "_Title Menu"
 msgstr "_Загалоўнае меню"
 
-#: ../data/totem.ui.h:38
+#: ../data/totem.ui.h:35
 msgid "Go to the title menu"
 msgstr "Перайсці да загалоўнага меню"
 
-#: ../data/totem.ui.h:39
+#: ../data/totem.ui.h:36
 msgid "A_udio Menu"
 msgstr "_Гукавое меню"
 
-#: ../data/totem.ui.h:40
+#: ../data/totem.ui.h:37
 msgid "Go to the audio menu"
 msgstr "Перайсці да гукавога меню"
 
-#: ../data/totem.ui.h:41
+#: ../data/totem.ui.h:38
 msgid "_Angle Menu"
 msgstr "Меню вуглоў"
 
-#: ../data/totem.ui.h:42
+#: ../data/totem.ui.h:39
 msgid "Go to the angle menu"
 msgstr "Перайсці да меню вуглоў"
 
-#: ../data/totem.ui.h:43
+#: ../data/totem.ui.h:40
 msgid "_Chapter Menu"
 msgstr "Меню _раздзелаў"
 
-#: ../data/totem.ui.h:44
+#: ../data/totem.ui.h:41
 msgid "Go to the chapter menu"
 msgstr "Перайсці да меню раздзелаў"
 
-#: ../data/totem.ui.h:45
+#: ../data/totem.ui.h:42
 msgid "_Next Chapter/Movie"
 msgstr "_Наступны раздзел ці фільм"
 
-#: ../data/totem.ui.h:46
+#: ../data/totem.ui.h:43
 msgid "Next chapter or movie"
 msgstr "Наступны раздзел або фільм"
 
-#: ../data/totem.ui.h:47
+#: ../data/totem.ui.h:44
 msgid "_Previous Chapter/Movie"
 msgstr "_Папярэдні раздзел ці фільм"
 
-#: ../data/totem.ui.h:48
+#: ../data/totem.ui.h:45
 msgid "Previous chapter or movie"
 msgstr "Папярэдні раздзел або фільм"
 
-#: ../data/totem.ui.h:49
+#: ../data/totem.ui.h:46
 msgid "_Sound"
 msgstr "_Гук"
 
-#: ../data/totem.ui.h:50
+#: ../data/totem.ui.h:47
 msgid "Volume _Up"
 msgstr "Па_вялічыць гучнасць"
 
-#: ../data/totem.ui.h:51
+#: ../data/totem.ui.h:48
 msgid "Increase volume"
 msgstr "Павялічыць гучнасць"
 
-#: ../data/totem.ui.h:52
+#: ../data/totem.ui.h:49
 msgid "Volume _Down"
 msgstr "Па_меншыць гучнасць"
 
-#: ../data/totem.ui.h:53
+#: ../data/totem.ui.h:50
 msgid "Decrease volume"
 msgstr "Паменшыць гучнасць"
 
-#: ../data/totem.ui.h:54
+#: ../data/totem.ui.h:51
 msgid "_Help"
 msgstr "_Дапамога"
 
-#: ../data/totem.ui.h:55
+#: ../data/totem.ui.h:52
 msgid "_Contents"
 msgstr "_Змест"
 
-#: ../data/totem.ui.h:56
+#: ../data/totem.ui.h:53
 msgid "Help contents"
 msgstr "Змест даведкі"
 
-#: ../data/totem.ui.h:57
+#: ../data/totem.ui.h:54
 msgid "_About"
 msgstr "_Аб праграме"
 
-#: ../data/totem.ui.h:58
+#: ../data/totem.ui.h:55
 msgid "About this application"
 msgstr "Аб гэтай праграме"
 
-#: ../data/totem.ui.h:59
-msgid "_Repeat Mode"
-msgstr "_Рэжым паўтору"
-
-#: ../data/totem.ui.h:60
-msgid "Set the repeat mode"
-msgstr "Настроіць рэжым паўтору"
-
-#: ../data/totem.ui.h:61
-msgid "Shuff_le Mode"
-msgstr "Рэжым _тасавання"
-
-#: ../data/totem.ui.h:62
-msgid "Set the shuffle mode"
-msgstr "Настроіць рэжым тасавання"
-
-#: ../data/totem.ui.h:63
+#: ../data/totem.ui.h:56
 msgid "Show _Controls"
 msgstr "Паказваць кіроўныя _элементы"
 
-#: ../data/totem.ui.h:64
-msgid "Show controls"
-msgstr "Паказваць кіроўныя элементы"
-
-#: ../data/totem.ui.h:65
-msgid "S_idebar"
-msgstr "_Бакавая паліца"
-
-#: ../data/totem.ui.h:66
-msgid "Show or hide the sidebar"
-msgstr "Паказаць ці схаваць бакавую паліцу"
-
-#: ../data/totem.ui.h:67
-msgctxt "Aspect ratio"
-msgid "Auto"
-msgstr "Аўтаматычна"
-
-#: ../data/totem.ui.h:68
-msgid "Sets automatic aspect ratio"
-msgstr "Ужыць аўтаматычна вызначаныя прапорцыі відэа"
-
-#: ../data/totem.ui.h:69
-msgid "Square"
-msgstr "Квадрат"
-
-#: ../data/totem.ui.h:70
-msgid "Sets square aspect ratio"
-msgstr "Ужыць квадратныя прапорцыі відэа"
-
-#: ../data/totem.ui.h:71
-msgid "4:3 (TV)"
-msgstr "4:3 (TV)"
-
-#: ../data/totem.ui.h:72
-msgid "Sets 4:3 (TV) aspect ratio"
-msgstr "Ужыць прапорцыі відэа 4:3 (TV)"
-
-#: ../data/totem.ui.h:73
-msgid "16:9 (Widescreen)"
-msgstr "16:9 (шырокі экран)"
-
-#: ../data/totem.ui.h:74
-msgid "Sets 16:9 (widescreen) aspect ratio"
-msgstr "Ужыць прапорцыі відэа 16:9 (для шырокага экрана)"
-
-#: ../data/totem.ui.h:75
-msgid "2.11:1 (DVB)"
-msgstr "2.11:1 (DVB)"
-
-#: ../data/totem.ui.h:76
-msgid "Sets 2.11:1 (DVB) aspect ratio"
-msgstr "Ужыць прапорцыі відэа 2.11:1 (DVB)"
-
-#: ../data/totem.ui.h:77
-msgid "S_ubtitles"
-msgstr "_Субцітры"
-
-#: ../data/totem.ui.h:80
-msgid "_Languages"
-msgstr "_Мовы"
-
-#: ../data/totem.ui.h:81
-msgid "Zoom In"
-msgstr "Наблізіць"
-
-#: ../data/totem.ui.h:82
-msgid "Zoom in"
-msgstr "Наблізіць"
-
-#: ../data/totem.ui.h:83
-msgid "Skip _Forward"
-msgstr "Пераскочыць _наперад"
-
-#: ../data/totem.ui.h:84
-msgid "Skip forward"
-msgstr "Пераскочыць у часе наперад"
-
-#: ../data/totem.ui.h:85
-msgid "Skip _Backwards"
-msgstr "Пераскочыць на_зад"
-
-#: ../data/totem.ui.h:86
-msgid "Skip backwards"
-msgstr "Пераскочыць у часе назад"
-
-#: ../data/totem.ui.h:87
-msgid "14.4 Kbps Modem"
-msgstr "14.4 кбіт/с мадэм"
-
-#: ../data/totem.ui.h:88
-msgid "19.2 Kbps Modem"
-msgstr "19.2 кбіт/с мадэм"
-
-#: ../data/totem.ui.h:89
-msgid "28.8 Kbps Modem"
-msgstr "28.8 кбіт/с мадэм"
-
-#: ../data/totem.ui.h:90
-msgid "33.6 Kbps Modem"
-msgstr "33.6 кбіт/с мадэм"
-
-#: ../data/totem.ui.h:91
-msgid "34.4 Kbps Modem"
-msgstr "34.4 кбіт/с мадэм"
-
-#: ../data/totem.ui.h:92
-msgid "56 Kbps Modem/ISDN"
-msgstr "56 кбіт/с мадэм/ISDN"
-
-#: ../data/totem.ui.h:93
-msgid "112 Kbps Dual ISDN/DSL"
-msgstr "112 кбіт/с Dual ISDN/DSL"
-
-#: ../data/totem.ui.h:94
-msgid "256 Kbps DSL/Cable"
-msgstr "256 кбіт/с DSL/кабель"
-
-#: ../data/totem.ui.h:95
-msgid "384 Kbps DSL/Cable"
-msgstr "384 кбіт/с DSL/кабель"
-
-#: ../data/totem.ui.h:96
-msgid "512 Kbps DSL/Cable"
-msgstr "512 кбіт/с DSL/кабель"
-
-#: ../data/totem.ui.h:97
-msgid "1.5 Mbps T1/Intranet/LAN"
-msgstr "1.5 Мбіт/с T1/Intranet/LAN"
-
-#: ../data/totem.ui.h:98
-msgid "Intranet/LAN"
-msgstr "Intranet/LAN"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:100
-msgid "Normal"
-msgstr "Звычайны"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:102
-msgid "Large"
-msgstr "Вялікі"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:104
-msgid "Extra Large"
-msgstr "Вялізны"
-
-#: ../data/totem.ui.h:105 ../src/totem-properties-view.c:228
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5593
-msgid "Stereo"
-msgstr "Стэрэа"
-
-#: ../data/totem.ui.h:106
-msgid "4-channel"
-msgstr "4-канальны"
-
-#: ../data/totem.ui.h:107
-msgid "4.1-channel"
-msgstr "4.1-канальны"
-
-#: ../data/totem.ui.h:108
-msgid "5.0-channel"
-msgstr "5.0-канальны"
-
-#: ../data/totem.ui.h:109
-msgid "5.1-channel"
-msgstr "5.1-канальны"
-
-#: ../data/totem.ui.h:110
-msgid "AC3 Passthrough"
-msgstr "AC3 Passthrough"
-
-#: ../data/totem.ui.h:111
-msgid "Totem Preferences"
-msgstr "Настройкі Totem"
-
-#: ../data/totem.ui.h:112
-msgid "Playback"
-msgstr "Прайграванне"
-
-#: ../data/totem.ui.h:113
-msgid "Start playing files from last position"
-msgstr "Пачаць прайграваць файлы з мінулага месца"
-
-#: ../data/totem.ui.h:114
-msgid "Networking"
-msgstr "Сетка"
-
-#: ../data/totem.ui.h:115
-msgid "Connection _speed:"
-msgstr "_Хуткасць злучэння:"
-
-#: ../data/totem.ui.h:116
-msgid "Text Subtitles"
-msgstr "Субцітры"
-
-#: ../data/totem.ui.h:117
-msgid "_Load subtitle files when movie is loaded"
-msgstr "_Загружаць файлы субцітраў пры адкрыцці фільма"
-
-#: ../data/totem.ui.h:118
-msgid "_Font:"
-msgstr "_Шрыфт:"
-
-#: ../data/totem.ui.h:119
-msgid "_Encoding:"
-msgstr "_Кадаванне:"
-
-#: ../data/totem.ui.h:120
-msgid "External Chapters"
-msgstr "Вонкавыя раздзелы"
-
-#: ../data/totem.ui.h:121
-msgid "Load _chapter files when movie is loaded"
-msgstr "_Загружаць файлы раздзелаў пры адкрыцці фільма"
-
-#. Tab label in the Preferences dialogue
-#: ../data/totem.ui.h:124
-msgid "Display"
-msgstr "Паказ"
-
-#: ../data/totem.ui.h:125
-msgid "_Resize the window when a new video is loaded"
-msgstr "_Змяняць памер акна пры адкрыцці новага відэа"
-
-#: ../data/totem.ui.h:126
-msgid "Disable _deinterlacing of interlaced videos"
-msgstr "Выключыць д_эінтэрлэйсінг для церазрадковага відэа"
-
-#: ../data/totem.ui.h:127
-msgid "Disable screensaver when playing "
-msgstr "Выключаць ахоўніка экрана пры прайграванні "
-
-#: ../data/totem.ui.h:129
-msgid "Video or Audio"
-msgstr "Відэа ці гук"
-
-#: ../data/totem.ui.h:130
-msgid "Visual Effects"
-msgstr "Візуальныя эфекты"
-
-#: ../data/totem.ui.h:131
-msgid "Show _visual effects when an audio file is played"
-msgstr "Паказваць _візуальныя эфекты для гукавых файлаў"
-
-#: ../data/totem.ui.h:132
-msgid "_Type of visualization:"
-msgstr "_Тып візуалізацыі:"
-
-#: ../data/totem.ui.h:133
-msgid "Visualization _size:"
-msgstr "Па_мер візуалізацыі:"
-
-#: ../data/totem.ui.h:134
-msgid "Color Balance"
-msgstr "Баланс колераў"
-
-#: ../data/totem.ui.h:135
-msgid "_Brightness:"
-msgstr "_Яркасць:"
-
-#: ../data/totem.ui.h:136
-msgid "Co_ntrast:"
-msgstr "_Кантраснасць:"
-
-#: ../data/totem.ui.h:137
-msgid "Sat_uration:"
-msgstr "_Насычанасць:"
-
-#: ../data/totem.ui.h:138
-msgid "_Hue:"
-msgstr "_Тон:"
-
-#: ../data/totem.ui.h:139
-msgid "Reset to _Defaults"
-msgstr "Вярнуць _прадвызначаныя настройкі"
+#: ../data/totem.ui.h:57
+msgid "Show controls"
+msgstr "Паказваць кіроўныя элементы"
 
-#: ../data/totem.ui.h:140
-msgid "Audio Output"
-msgstr "Вывад гуку"
+#: ../data/totem.ui.h:58
+msgid "S_idebar"
+msgstr "_Бакавая паліца"
 
-#: ../data/totem.ui.h:141
-msgid "_Audio output type:"
-msgstr "_Тып вываду гуку:"
+#: ../data/totem.ui.h:59
+msgid "Show or hide the sidebar"
+msgstr "Паказаць ці схаваць бакавую паліцу"
 
-#: ../data/totem.ui.h:145
-msgid "Time seek bar"
-msgstr "Стужка пракруткі часу"
+#: ../data/totem.ui.h:60
+msgctxt "Aspect ratio"
+msgid "Auto"
+msgstr "Аўтаматычна"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
-msgid "Allow the screensaver to activate when playing audio"
-msgstr "Ці трэба дазволіць запуск ахоўніка экрана пры аўдыяпрайграванні"
+#: ../data/totem.ui.h:61
+msgid "Sets automatic aspect ratio"
+msgstr "Ужыць аўтаматычна вызначаныя прапорцыі відэа"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
-msgid ""
-"Allow the screensaver to activate when playing audio. Disable if you have "
-"monitor-powered speakers."
-msgstr ""
-"Ці трэба дазволіць запуск ахоўніка экрана пры аўдыяпрайграванні. Выключыце "
-"гэту опцыю, калі вашы калонкі сілкуюцца ад манітора."
+#: ../data/totem.ui.h:62
+msgid "Square"
+msgstr "Квадрат"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
-msgid "Show visual effects when no video is displayed"
-msgstr "Паказваць візуальныя эфекты, калі няма відэа"
+#: ../data/totem.ui.h:63
+msgid "Sets square aspect ratio"
+msgstr "Ужыць квадратныя прапорцыі відэа"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
-msgid "Show visual effects when playing an audio only file."
-msgstr "Паказваць візуальныя эфекты, калі прайграецца файл без відэа."
+#: ../data/totem.ui.h:64
+msgid "4:3 (TV)"
+msgstr "4:3 (TV)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
-msgid "Name of the visual effects plugin"
-msgstr "Назва плугіна візуальных эфектаў"
+#: ../data/totem.ui.h:65
+msgid "Sets 4:3 (TV) aspect ratio"
+msgstr "Ужыць прапорцыі відэа 4:3 (TV)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
-msgid "The brightness of the video"
-msgstr "Яркасць відэа"
+#: ../data/totem.ui.h:66
+msgid "16:9 (Widescreen)"
+msgstr "16:9 (шырокі экран)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
-msgid "The contrast of the video"
-msgstr "Кантраснасць відэа"
+#: ../data/totem.ui.h:67
+msgid "Sets 16:9 (widescreen) aspect ratio"
+msgstr "Ужыць прапорцыі відэа 16:9 (для шырокага экрана)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
-msgid "The hue of the video"
-msgstr "Тон відэа"
+#: ../data/totem.ui.h:68
+msgid "2.11:1 (DVB)"
+msgstr "2.11:1 (DVB)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
-msgid "The saturation of the video"
-msgstr "Насычанасць відэа"
+#: ../data/totem.ui.h:69
+msgid "Sets 2.11:1 (DVB) aspect ratio"
+msgstr "Ужыць прапорцыі відэа 2.11:1 (DVB)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
-msgid "Resize the canvas automatically on file load"
-msgstr "Аўтаматычна змяняць памер акна пры адкрыцці файла"
+#: ../data/totem.ui.h:70
+msgid "S_ubtitles"
+msgstr "_Субцітры"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
-msgid "Network connection speed"
-msgstr "Хуткасць сеткавага злучэння"
+#: ../data/totem.ui.h:73
+msgid "_Languages"
+msgstr "_Мовы"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
-msgid ""
-"Approximate network connection speed, used to select quality on media over "
-"the network."
-msgstr ""
-"Прыблізная хуткасць сеткавага злучэння, якая выкарыстоўваецца для выбару "
-"якасці для сеткавых медыяў."
+#: ../data/totem.ui.h:74
+msgid "Zoom In"
+msgstr "Наблізіць"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
-msgid "Repeat mode"
-msgstr "Рэжым паўтору"
+#: ../data/totem.ui.h:75
+msgid "Zoom in"
+msgstr "Наблізіць"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
-msgid "Shuffle mode"
-msgstr "Рэжым тасавання"
+#: ../data/totem.ui.h:76
+msgid "Skip _Forward"
+msgstr "Пераскочыць _наперад"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
-msgid "Whether to disable deinterlacing for interlaced movies"
-msgstr "Ці трэба выключыць дэінтэрлэйсінг для церазрадковага відэа"
+#: ../data/totem.ui.h:77
+msgid "Skip forward"
+msgstr "Пераскочыць у часе наперад"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
-msgid "Whether to enable debug for the playback engine"
-msgstr "Ці трэба ўключаць адладку рухавіка прайгравання"
+#: ../data/totem.ui.h:78
+msgid "Skip _Backwards"
+msgstr "Пераскочыць на_зад"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
-msgid "Type of audio output to use"
-msgstr "Тып аўдыявываду"
+#: ../data/totem.ui.h:79
+msgid "Skip backwards"
+msgstr "Пераскочыць у часе назад"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
-msgid "Visualization quality setting"
-msgstr "Настройка якасці візуалізацыі"
+#: ../data/totem.ui.h:82
+msgid "Time seek bar"
+msgstr "Стужка пракруткі часу"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
-msgid "Quality setting for the audio visualization."
-msgstr "Настройка якасці аўдыявізуалізацыі."
+#: ../data/uri.ui.h:1
+msgid "Enter the _address of the file you would like to open:"
+msgstr "Упішыце _адрас файла, які трэба адкрыць:"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
-msgid "Network buffering threshold"
-msgstr "Парог сеткавага буферавання"
+#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
+msgid "_Add to Playlist"
+msgstr "_Дадаць у спіс прайгравання"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
-msgid ""
-"Amount of data to buffer for network streams before starting to display the "
-"stream (in seconds)."
-msgstr ""
-"Колькасць сеткавых даных для буферавання, патрэбная для пачатку паказу (у "
-"секундах)."
+#: ../data/video-list.ui.h:2
+msgid "Add the video to the playlist"
+msgstr "Дадаць відэа ў спіс прайгравання"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
-msgid "Subtitle font"
-msgstr "Шрыфт субцітраў"
+#: ../src/backend/bacon-video-widget.c:1629
+msgid "Password requested for RTSP server"
+msgstr "Для RTSP-сервера запатрабаваны пароль"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
-msgid "Pango font description for subtitle rendering."
-msgstr "Апісанне Pango-шрыфту для паказу субцітраў."
+#: ../src/backend/bacon-video-widget.c:2916
+#, c-format
+msgid "Audio Track #%d"
+msgstr "Гукавая сцежка №%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
-msgid "Subtitle encoding"
-msgstr "Кадаванне субцітраў"
+#: ../src/backend/bacon-video-widget.c:2920
+#, c-format
+msgid "Subtitle #%d"
+msgstr "Субцітры №%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
-msgid "Encoding character set for subtitle."
-msgstr "Знаказбор для кадавання субцітраў."
+#: ../src/backend/bacon-video-widget.c:3317
+msgid "The server you are trying to connect to is not known."
+msgstr "Сервер, з якім вы спрабуеце злучыцца, невядомы."
+
+#: ../src/backend/bacon-video-widget.c:3320
+msgid "The connection to this server was refused."
+msgstr "Адмоўлена ў злучэнні з гэтым серверам."
+
+#: ../src/backend/bacon-video-widget.c:3323
+msgid "The specified movie could not be found."
+msgstr "Не ўдалося адшукаць патрэбны фільм."
+
+#: ../src/backend/bacon-video-widget.c:3330
+msgid "The server refused access to this file or stream."
+msgstr "Сервер адмовіў у доступе да гэтага файла ці струменя."
+
+#: ../src/backend/bacon-video-widget.c:3336
+msgid "Authentication is required to access this file or stream."
+msgstr "Для доступу да гэтага файла ці струменя трэба прайсці ідэнтыфікацыю."
+
+#: ../src/backend/bacon-video-widget.c:3343
+msgid "You are not allowed to open this file."
+msgstr "Вам не дазволена адкрываць гэты файл."
+
+#: ../src/backend/bacon-video-widget.c:3348
+msgid "This location is not a valid one."
+msgstr "Гэта хібнае месцапалажэнне."
+
+#: ../src/backend/bacon-video-widget.c:3356
+msgid "The movie could not be read."
+msgstr "Не ўдалося прачытаць гэты фільм."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
-msgid "Default location for the \"Open...\" dialogs"
-msgstr "Прадвызначанае месцазнаходжанне для дыялогаў \"Адкрыць...\""
+#. should be exactly one missing thing (source or converter)
+#: ../src/backend/bacon-video-widget.c:3379
+#: ../src/backend/bacon-video-widget.c:3387
+#, c-format
+msgid "The playback of this movie requires a %s plugin which is not installed."
+msgid_plural ""
+"The playback of this movie requires the following decoders which are not "
+"installed:\n"
+"\n"
+"%s"
+msgstr[0] "Каб прайграць гэты фільм, патрэбны плугін %s, але ён не ўсталяваны."
+msgstr[1] ""
+"Каб прайграць гэты фільм, патрэбныя наступныя дэкадавальнікі, але яны не "
+"ўсталяваныя:\n"
+"\n"
+"%s"
+msgstr[2] ""
+"Каб прайграць гэты фільм, патрэбныя наступныя дэкадавальнікі, але яны не "
+"ўсталяваныя:\n"
+"\n"
+"%s"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
+#: ../src/backend/bacon-video-widget.c:3398
 msgid ""
-"Default location for the \"Open...\" dialogs. Default is the current "
-"directory."
-msgstr ""
-"Прадвызначанае месцазнаходжанне для дыялогаў \"Адкрыць...\". Прадвызначана "
-"гэта бягучы каталог."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
-msgid "Default location for the \"Take Screenshot\" dialogs"
+"An audio or video stream is not handled due to missing codecs. You might "
+"need to install additional plugins to be able to play some types of movies"
 msgstr ""
-"Прадвызначанае месцазнаходжанне для дыялогаў \"Зрабіць экранны здымак\""
+"Гукавы ці відэаструмень не апрацаваны з прычыны адсутнасці кодэкаў. Каб "
+"магчы прайграваць пэўныя тыпы фільмаў, патрабуецца ўсталяваць дадатковыя плугіны."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
+#: ../src/backend/bacon-video-widget.c:3408
 msgid ""
-"Default location for the \"Take Screenshot\" dialogs. Default is the "
-"Pictures directory."
+"This file cannot be played over the network. Try downloading it locally "
+"first."
 msgstr ""
-"Прадвызначанае месцазнаходжанне для дыялогаў \"Зрабіць экранны здымак\". "
-"Прадвызначана гэта каталог Малюнкі."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
-msgid "Whether to disable the plugins in the user's home directory"
-msgstr "Ці трэба выключыць плугіны з дамашняга каталога карыстальніка"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
-msgid "Whether to disable the keyboard shortcuts"
-msgstr "Ці трэба выключыць клавіятурныя скароты"
+"Гэты файл не даступны для прайгравання праз сетку. Паспрабуйце спачатку сцягнуць яго "
+"на дыск."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
-msgid "Whether to autoload text subtitle files when a movie is loaded"
-msgstr "Ці трэба аўтаматычна загружаць субцітры пры адкрыцці фільма"
+#: ../src/backend/bacon-video-widget.c:5469 ../src/totem-properties-view.c:227
+msgid "Surround"
+msgstr "Аб'ёмны гук"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
-msgid "Whether to autoload external chapter files when a movie is loaded"
-msgstr "Ці трэба аўтаматычна загружаць файлы раздзелаў пры адкрыцці фільма"
+#: ../src/backend/bacon-video-widget.c:5471 ../src/totem-properties-view.c:229
+msgid "Mono"
+msgstr "Мона"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
-msgid ""
-"Whether to remember the position of played audio/video files when pausing or "
-"closing them"
+#: ../src/backend/bacon-video-widget.c:5756
+msgid "Media contains no supported video streams."
 msgstr ""
-"Ці трэба запамінаць пазіцыю ў аўдыя- ці відэафайле пры ўключэнні паўзы ці "
-"яго закрыцці"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:35
-msgid "Active plugins list"
-msgstr "Спіс актыўных плугінаў"
+"Медыяфайл не ўтрымлівае відэаструменяў, якія б падтрымліваліся праграмай."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:36
+#: ../src/backend/bacon-video-widget.c:5938
 msgid ""
-"A list of the names of the plugins which are currently active (loaded and "
-"running)."
-msgstr "Спіс назваў актыўных плугінаў (загружаных і дзейных)."
-
-#: ../data/uri.ui.h:1
-msgid "Enter the _address of the file you would like to open:"
-msgstr "Упішыце _адрас файла, які трэба адкрыць:"
+"Some necessary plug-ins are missing. Make sure that the program is correctly "
+"installed."
+msgstr ""
+"Адсутнічаюць некаторыя патрэбныя плугіны. Спраўдзіце карэктнасць усталявання праграмы."
 
 #: ../src/eggdesktopfile.c:165
 #, c-format
@@ -937,8 +1005,8 @@
 #: ../src/eggfileformatchooser.c:657
 #, c-format
 msgid ""
-"The program was not able to find out the file format you want to use for `%"
-"s'. Please make sure to use a known extension for that file or manually "
+"The program was not able to find out the file format you want to use for `"
+"%s'. Please make sure to use a known extension for that file or manually "
 "choose a file format from the list below."
 msgstr ""
 "Праграма не здолела высветліць фармат файла, які трэба ўжыць для \"%s\". "
@@ -977,6 +1045,31 @@
 msgid "Show session management options"
 msgstr "Паказаць опцыі для кіравання сеансам"
 
+#. hour:minutes:seconds
+#. Translators: This is a time format, like "9:05:02" for 9
+#. * hours, 5 minutes, and 2 seconds. You may change ":" to
+#. * the separator that your locale uses or use "%Id" instead
+#. * of "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:56
+#: ../src/plugins/skipto/totem-time-entry.c:57
+#, c-format
+msgctxt "long time format"
+msgid "%d:%02d:%02d"
+msgstr "%d:%02d:%02d"
+
+#. minutes:seconds
+#. Translators: This is a time format, like "5:02" for 5
+#. * minutes and 2 seconds. You may change ":" to the
+#. * separator that your locale uses or use "%Id" instead of
+#. * "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:65
+#, c-format
+msgctxt "short time format"
+msgid "%d:%02d"
+msgstr "%d:%02d"
+
 #. Title
 #. Artist
 #. Album
@@ -1085,10 +1178,15 @@
 msgstr[1] "%d кадраў на секунду"
 msgstr[2] "%d кадраў на секунду"
 
-#: ../src/totem-audio-preview.c:168
+#: ../src/totem-audio-preview.c:137
 msgid "Audio Preview"
 msgstr "Папярэдняе праслухоўванне"
 
+#: ../src/totem.c:239
+msgid "Verify your system installation. Totem will now exit."
+msgstr ""
+"Праверце правільнасць усталявання сістэмы. Тым часам Totem заканчвае працу."
+
 #: ../src/totem-cell-renderer-video.c:126
 msgid "Unknown video"
 msgstr "Невядомае відэа"
@@ -1101,7 +1199,7 @@
 msgid "Cancel"
 msgstr "Скасаваць"
 
-#: ../src/totem-fullscreen.c:616
+#: ../src/totem-fullscreen.c:573
 msgid "No File"
 msgstr "Няма файла"
 
@@ -1119,7 +1217,7 @@
 msgid "Make sure that Totem is properly installed."
 msgstr "Праверце правільнасць усталявання Totem."
 
-#: ../src/totem-interface.c:347
+#: ../src/totem-interface.c:357
 msgid ""
 "Totem 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 "
@@ -1130,7 +1228,7 @@
 "згодна з умовамі Агульнай Грамадскай Ліцэнзіі GNU (GPL), апублікаванай "
 "Фондам свабоднага апраграмавання, версіі 2 ці любой пазнейшай."
 
-#: ../src/totem-interface.c:351
+#: ../src/totem-interface.c:361
 msgid ""
 "Totem is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -1141,7 +1239,7 @@
 "гарантый, у тым ліку камерцыйнай вартасці праграмы і наогул яе карысці. "
 "Падрабязней глядзіце ў тэксце Агульнай Грамадскай Ліцэнзіі GNU (GPL)."
 
-#: ../src/totem-interface.c:355
+#: ../src/totem-interface.c:365
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Totem; if not, write to the Free Software Foundation, Inc., 59 Temple Place, "
@@ -1152,53 +1250,28 @@
 "апраграмавання на адрас: the Free Software Foundation, Inc., 59 Temple "
 "Place, Suite 330, Boston, MA  02111-1307  USA"
 
-#: ../src/totem-interface.c:358
+#: ../src/totem-interface.c:368
 msgid ""
 "Totem contains an exception to allow the use of proprietary GStreamer "
 "plugins."
 msgstr "Totem дазваляе выкарыстоўваць уласніцкія плугіны GStreamer."
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:190
+#: ../src/totem-menu.c:291
 msgid "None"
 msgstr "Няма"
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:195
+#: ../src/totem-menu.c:296
 msgctxt "Language"
 msgid "Auto"
 msgstr "Аўтаматычна"
 
-#. Translators:
-#. * This is not a JPEG image, but a disc image, for example,
-#. * an ISO file
-#: ../src/totem-menu.c:765
-#, c-format
-msgid "Play Image '%s'"
-msgstr "Зайграць вобраз дыска \"%s\""
-
-#: ../src/totem-menu.c:768 ../src/totem-menu.c:851
-#, c-format
-msgid "device%d"
-msgstr "прыстасаванне%d"
-
-#: ../src/totem-menu.c:848
-#, c-format
-msgid "Play Disc '%s'"
-msgstr "Зайграць дыск \"%s\""
-
-#. This lists the back-end type and version, such as
-#. * Movie Player using GStreamer 0.10.1
-#: ../src/totem-menu.c:1189
-#, c-format
-msgid "Movie Player using %s"
-msgstr "Прайгравальнік фільмаў (%s)"
-
-#: ../src/totem-menu.c:1193
+#: ../src/totem-menu.c:789
 msgid "Copyright © 2002-2009 Bastien Nocera"
 msgstr "Аўтарскія правы © 2002-2009 Bastien Nocera"
 
-#: ../src/totem-menu.c:1198
+#: ../src/totem-menu.c:794
 msgid "translator-credits"
 msgstr ""
 "Віталь Хілько \n"
@@ -1206,154 +1279,78 @@
 "Алесь Няхайчык \n"
 "Andrey Ladyko "
 
-#: ../src/totem-menu.c:1202
+#: ../src/totem-menu.c:798
 msgid "Totem Website"
 msgstr "Сеціўная пляцоўка Totem"
 
-#: ../src/totem-menu.c:1236
+#: ../src/totem-menu.c:829
 msgid "Configure Plugins"
 msgstr "Настройка плугінаў"
 
+#: ../src/totem-object.c:162
+#, c-format
+msgid ""
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"%s\n"
+"Каб убачыць поўны спіс наяўных опцый загаднага радка, выканайце \"%s --help"
+"\".\n"
+
 #. Translators: %s is the totem version number
-#: ../src/totem-object.c:471
+#: ../src/totem-object.c:591
 #, c-format
 msgid "Totem %s"
 msgstr "Totem %s"
 
-#: ../src/totem-object.c:1047 ../browser-plugin/totem-plugin-viewer.c:367
-msgid "Playing"
-msgstr "Прайграванне"
-
-#: ../src/totem-object.c:1049 ../src/totem-options.c:52
+#: ../src/totem-object.c:1168 ../src/totem-options.c:52
 msgid "Pause"
 msgstr "Прыпыніць"
 
-#: ../src/totem-object.c:1054 ../browser-plugin/totem-plugin-viewer.c:363
-msgid "Paused"
-msgstr "Прыпынена"
-
-#: ../src/totem-object.c:1056 ../src/totem-object.c:1066
+#: ../src/totem-object.c:1175 ../src/totem-object.c:1185
 #: ../src/totem-options.c:51
 msgid "Play"
 msgstr "Зайграць"
 
-#: ../src/totem-object.c:1061 ../src/totem-object.c:1659
-#: ../src/totem-statusbar.c:115 ../browser-plugin/totem-plugin-viewer.c:351
-msgid "Stopped"
-msgstr "Спынена"
-
-#: ../src/totem-object.c:1142 ../src/totem-object.c:1169
-#: ../src/totem-object.c:1799 ../src/totem-object.c:1963
+#: ../src/totem-object.c:1267 ../src/totem-object.c:1294
+#: ../src/totem-object.c:1787 ../src/totem-object.c:1942
 #, c-format
 msgid "Totem could not play '%s'."
 msgstr "Totem не здолеў зайграць \"%s\"."
 
-#: ../src/totem-object.c:1246
-#, c-format
-msgid ""
-"Totem could not play this media (%s) although a plugin is present to handle "
-"it."
-msgstr ""
-"Totem не здолеў зайграць гэта (%s), хаця плугін для працы з ім усталяваны."
-
-#: ../src/totem-object.c:1247
-msgid ""
-"You might want to check that a disc is present in the drive and that it is "
-"correctly configured."
-msgstr "Праверце наяўнасць дыска ў прыводзе і яго настройкі."
-
-#: ../src/totem-object.c:1255
-msgid "More information about media plugins"
-msgstr "Больш звестак пра мультымедыйныя плугіны"
-
-#: ../src/totem-object.c:1256
-msgid ""
-"Please install the necessary plugins and restart Totem to be able to play "
-"this media."
-msgstr ""
-"Усталюйце патрэбныя плугіны і перазапусціце Totem, каб змагчы гэта прайграць."
-
-#: ../src/totem-object.c:1258
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because it does not have the "
-"appropriate plugins to be able to read from the disc."
-msgstr ""
-"Totem не можа прайграць медыі гэтага тыпу (%s), бо не мае патрэбных плугінаў "
-"для чытання з такога дыска."
-
-#: ../src/totem-object.c:1260
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because you do not have the "
-"appropriate plugins to handle it."
-msgstr ""
-"Totem не можа прайграць медыі гэтага тыпу (%s), бо не мае патрэбных плугінаў "
-"для працы з імі."
-
-#: ../src/totem-object.c:1263
-#, c-format
-msgid "Totem cannot play this type of media (%s) because it is not supported."
-msgstr ""
-"Totem не можа прайграць медыі гэтага тыпу (%s), бо ён не падтрымліваецца."
-
-#: ../src/totem-object.c:1264
-msgid "Please insert another disc to play back."
-msgstr "Устаўце іншы дыск для прайгравання."
-
-#: ../src/totem-object.c:1300
-msgid "Totem was not able to play this disc."
-msgstr "Totem не здолеў зайграць гэты дыск."
-
-#: ../src/totem-object.c:1301 ../src/totem-object.c:4229
-msgid "No reason."
-msgstr "Без дай прычыны."
-
-#: ../src/totem-object.c:1315
-msgid "Totem does not support playback of Audio CDs"
-msgstr "Totem не падтрымлівае прайграванне Audio CD"
-
-#: ../src/totem-object.c:1316
-msgid "Please consider using a music player or a CD extractor to play this CD"
-msgstr ""
-"Паспрабуйце прайграваць гэты дыск з дапамогай музычнага прайгравальніка або "
-"праграмы для капіравання дыскаў"
-
-#: ../src/totem-object.c:1805
+#: ../src/totem-object.c:1793
 msgid "No error message"
 msgstr "Няма тэксту памылкі"
 
-#: ../src/totem-object.c:2154
+#: ../src/totem-object.c:2133
 msgid "Totem could not display the help contents."
 msgstr "Totem не здолеў паказаць змест даведкі."
 
-#: ../src/totem-object.c:2493 ../src/totem-object.c:2495
-#: ../browser-plugin/totem-plugin-viewer.c:1417
-msgid "An error occurred"
-msgstr "Узнікла памылка"
-
-#: ../src/totem-object.c:4064 ../src/totem-object.c:4066
+#: ../src/totem-object.c:4019 ../src/totem-object.c:4021
 msgid "Previous Chapter/Movie"
 msgstr "Папярэдні раздзел ці фільм"
 
-#: ../src/totem-object.c:4073 ../src/totem-object.c:4075
+#: ../src/totem-object.c:4028 ../src/totem-object.c:4030
 msgid "Play / Pause"
 msgstr "Зайграць ці прыпыніць"
 
-#: ../src/totem-object.c:4083 ../src/totem-object.c:4085
+#: ../src/totem-object.c:4038 ../src/totem-object.c:4040
 msgid "Next Chapter/Movie"
 msgstr "Наступны раздзел ці фільм"
 
-#. Translators: this is the tooltip text for the fullscreen button in the controls box in Totem's main window.
 #. Translators: this is the accessibility text for the fullscreen button in the controls box in Totem's main window.
-#: ../src/totem-object.c:4097 ../src/totem-object.c:4099
+#: ../src/totem-object.c:4051 ../src/totem-object.c:4053
 msgid "Fullscreen"
 msgstr "_На ўвесь экран"
 
-#: ../src/totem-object.c:4229
+#: ../src/totem-object.c:4184
 msgid "Totem could not startup."
 msgstr "Не ўдалося запусціць Totem."
 
+#: ../src/totem-object.c:4184
+msgid "No reason."
+msgstr "Без дай прычыны."
+
 #: ../src/totem-open-location.c:182
 msgid "Open Location..."
 msgstr "Адкрыць адрас..."
@@ -1427,119 +1424,113 @@
 msgid "Movies to play"
 msgstr "Фільмы для прайгравання"
 
-#: ../src/totem-options.c:117
+#: ../src/totem-options.c:79
+msgid "- Play movies and songs"
+msgstr "- Прайгравальнік фільмаў і песень"
+
+#: ../src/totem-options.c:142
 msgid "Can't enqueue and replace at the same time"
 msgstr "Немагчыма адначасова дадаць у чаргу і замяніць"
 
 #. By extension entry
-#: ../src/totem-playlist.c:161
+#: ../src/totem-playlist.c:162
 msgid "MP3 ShoutCast playlist"
 msgstr "Спіс прайгравання MP3 ShoutCast"
 
-#: ../src/totem-playlist.c:162
+#: ../src/totem-playlist.c:163
 msgid "MP3 audio (streamed)"
 msgstr "Гук MP3 (струмень)"
 
-#: ../src/totem-playlist.c:163
+#: ../src/totem-playlist.c:164
 msgid "MP3 audio (streamed, DOS format)"
 msgstr "Гук MP3 (струмень, фармат DOS)"
 
-#: ../src/totem-playlist.c:164
+#: ../src/totem-playlist.c:165
 msgid "XML Shareable Playlist"
 msgstr "Спіс прайгравання XML Shareable"
 
 #. This is "Title 3", where title is a DVD title
 #. * Note: NOT a DVD chapter
-#: ../src/totem-playlist.c:347
+#: ../src/totem-playlist.c:348
 #, c-format
 msgid "Title %d"
 msgstr "Загаловак %d"
 
-#: ../src/totem-playlist.c:446
+#: ../src/totem-playlist.c:447
 msgid "Could not save the playlist"
 msgstr "Не ўдалося захаваць спіс прайгравання"
 
-#: ../src/totem-playlist.c:1021
+#: ../src/totem-playlist.c:1022
 msgid "Save Playlist"
 msgstr "Захаваць спіс прайгравання"
 
 #. translators: Playlist is the default saved playlist filename,
 #. * without the suffix
-#: ../src/totem-playlist.c:1033 ../src/totem-playlist.c:1264
-#: ../src/totem-sidebar.c:142
+#: ../src/totem-playlist.c:1034 ../src/totem-playlist.c:1263
+#: ../src/totem-sidebar.c:145
 msgid "Playlist"
 msgstr "Спіс прайгравання"
 
-#: ../src/totem-playlist.c:1857
+#: ../src/totem-playlist.c:1862
 #, c-format
 msgid "The playlist '%s' could not be parsed. It might be damaged."
 msgstr ""
 "Не ўдалося разабраць структуру спіса прайгравання \"%s\". Відаць, ён "
 "пашкоджаны."
 
-#: ../src/totem-playlist.c:1858
+#: ../src/totem-playlist.c:1863
 msgid "Playlist error"
 msgstr "Памылка ў спісе прайгравання"
 
-#: ../src/totem-preferences.c:295
+#: ../src/totem-preferences.c:297
 msgid "Preferences"
 msgstr "Настройкі"
 
-#: ../src/totem-preferences.c:451
+#: ../src/totem-preferences.c:445
 msgid "Select Subtitle Font"
 msgstr "Выбраць шрыфт для субцітраў"
 
-#: ../src/totem-properties-main.c:115 ../src/totem-properties-view.c:266
+#: ../src/totem-properties-main.c:116 ../src/totem-properties-view.c:269
 msgid "Audio/Video"
 msgstr "Гук/відэа"
 
-#: ../src/totem-properties-view.c:128
+#: ../src/totem-properties-view.c:131
 msgid "N/A"
 msgstr "Невядома"
 
-#: ../src/totem-properties-view.c:157
+#: ../src/totem-properties-view.c:160
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 msgctxt "Stream bit rate"
 msgid "N/A"
 msgstr "Невядома"
 
-#: ../src/totem-properties-view.c:160
+#: ../src/totem-properties-view.c:163
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 #, c-format
 msgid "%d kbps"
 msgstr "%d кбіт/с"
 
-#: ../src/totem-properties-view.c:177
+#: ../src/totem-properties-view.c:180
 #: ../src/plugins/properties/totem-movie-properties.c:149
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../src/totem-properties-view.c:209
+#: ../src/totem-properties-view.c:212
 #: ../src/plugins/properties/totem-movie-properties.c:166
 #, c-format
 msgid "%d Hz"
 msgstr "%d Гц"
 
-#: ../src/totem-properties-view.c:216
+#: ../src/totem-properties-view.c:219
 #: ../src/plugins/properties/totem-movie-properties.c:166
 msgctxt "Sample rate"
 msgid "N/A"
 msgstr "Невядома"
 
-#: ../src/totem-properties-view.c:224
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5589
-msgid "Surround"
-msgstr "Аб'ёмны гук"
-
-#: ../src/totem-properties-view.c:226
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5591
-msgid "Mono"
-msgstr "Мона"
-
-#: ../src/totem-properties-view.c:236
+#: ../src/totem-properties-view.c:239
 msgctxt "Number of audio channels"
 msgid "N/A"
 msgstr "Невядома"
@@ -1572,8 +1563,8 @@
 #. eg: 75 %
 #: ../src/totem-statusbar.c:250
 #, c-format
-msgid "%d %%"
-msgstr "%d %%"
+msgid "%lf %%"
+msgstr "%lf %%"
 
 #. eg: Paused, 0:32 / 1:05
 #: ../src/totem-statusbar.c:325
@@ -1584,8 +1575,8 @@
 #. eg: Buffering, 75 %
 #: ../src/totem-statusbar.c:330
 #, c-format
-msgid "%s, %d %%"
-msgstr "%s, %d %%"
+msgid "%s, %f %%"
+msgstr "%s, %f %%"
 
 #: ../src/totem-subtitle-encoding.c:156
 msgid "Current Locale"
@@ -1728,231 +1719,91 @@
 msgid "Vietnamese"
 msgstr "В'етнамскае"
 
-#: ../src/totem-video-list.c:330
-msgid "No video URI"
-msgstr "Няма URI-адрасу відэа"
-
-#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
-#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
-#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
-#: ../src/totem-video-thumbnailer.c:872
-#, c-format
-msgid ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-msgstr ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-
-#: ../src/totem-video-thumbnailer.c:873
-msgid "Filename"
-msgstr "Назва файла"
-
-#: ../src/totem-video-thumbnailer.c:875
-msgid "Resolution"
-msgstr "Памер"
-
-#: ../src/totem-video-thumbnailer.c:878
-msgid "Duration"
-msgstr "Працягласць"
-
-#: ../src/totem-uri.c:506 ../src/plugins/chapters/totem-chapters.c:998
+#: ../src/totem-uri.c:343 ../src/plugins/chapters/totem-chapters.c:998
 msgid "All files"
 msgstr "Усе файлы"
 
-#: ../src/totem-uri.c:511 ../src/plugins/chapters/totem-chapters.c:995
+#: ../src/totem-uri.c:348 ../src/plugins/chapters/totem-chapters.c:995
 msgid "Supported files"
 msgstr "Падтрыманыя файлы"
 
-#: ../src/totem-uri.c:523
+#: ../src/totem-uri.c:360
 msgid "Audio files"
 msgstr "Гукавыя файлы"
 
-#: ../src/totem-uri.c:531
+#: ../src/totem-uri.c:368
 msgid "Video files"
 msgstr "Відэафайлы"
 
-#: ../src/totem-uri.c:541
+#: ../src/totem-uri.c:378
 msgid "Subtitle files"
 msgstr "Файлы субцітраў"
 
-#: ../src/totem-uri.c:593
+#: ../src/totem-uri.c:430
 msgid "Select Text Subtitles"
 msgstr "Выбар субцітраў"
 
-#: ../src/totem-uri.c:656
+#: ../src/totem-uri.c:495
 msgid "Select Movies or Playlists"
 msgstr "Выбар фільмаў ці спісаў прайгравання"
 
-#. Options parsing
-#: ../src/totem.c:201
-msgid "- Play movies and songs"
-msgstr "- Прайгравальнік фільмаў і песень"
-
-#: ../src/totem.c:212
-#, c-format
-msgid ""
-"%s\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"%s\n"
-"Каб убачыць поўны спіс наяўных опцый загаднага радка, выканайце \"%s --help"
-"\".\n"
-
-#: ../src/totem.c:254 ../src/totem.c:265
-#: ../browser-plugin/totem-plugin-viewer.c:663
-#: ../browser-plugin/totem-plugin-viewer.c:1793
-msgid "Totem Movie Player"
-msgstr "Totem: прайгравальнік фільмаў"
-
-#: ../src/totem.c:255 ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Could not initialize the thread-safe libraries."
-msgstr "Не ўдалося ініцыяваць бібліятэкі, сумяшчальныя з ніцямі."
-
-#: ../src/totem.c:255
-msgid "Verify your system installation. Totem will now exit."
-msgstr ""
-"Праверце правільнасць усталявання сістэмы. Тым часам Totem заканчвае працу."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:1589
-msgid "Password requested for RTSP server"
-msgstr "Для RTSP-сервера запатрабаваны пароль"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2858
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2862
-#, c-format
-msgid "Audio Track #%d"
-msgstr "Гукавая сцежка №%d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2890
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2894
-#, c-format
-msgid "Subtitle #%d"
-msgstr "Субцітры №%d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3298
-msgid ""
-"The requested audio output was not found. Please select another audio output "
-"in the Multimedia Systems Selector."
-msgstr ""
-"Запатрабаваны вывад гуку не знойдзены. Выберыце іншы тып вываду гуку ў "
-"дыялозе выбару мультымедыйных сістэм."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3303
-msgid "Location not found."
-msgstr "Адрас не знойдзены."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3307
-msgid ""
-"Could not open location; you might not have permission to open the file."
-msgstr "Не ўдалося адкрыць адрас. Відаць, вы не маеце адпаведнага дазволу."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3318
-msgid ""
-"The video output is in use by another application. Please close other video "
-"applications, or select another video output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"Відэавывад ужо заняты іншай праграмай. Закрыйце іншыя відэапраграмы або "
-"змяніце тып відэавываду ў дыялозе выбару мультымедыйных сістэм."
+#: ../src/totem-uri.c:499
+msgid "Add Directory"
+msgstr "Дадаць каталог"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3324
-msgid ""
-"The audio output is in use by another application. Please select another "
-"audio output in the Multimedia Systems Selector. You may want to consider "
-"using a sound server."
-msgstr ""
-"Вывад гуку ўжо заняты іншай праграмай. Закрыйце іншыя відэапраграмы або "
-"змяніце тып відэавываду ў дыялозе выбару мультымедыйных сістэм. Магчыма, вам "
-"варта пачаць выкарыстоўваць які-небудзь гукавы сервер."
+#: ../src/totem-video-list.c:330
+msgid "No video URI"
+msgstr "Няма URI-адрасу відэа"
 
-#. should be exactly one missing thing (source or converter)
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3342
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3348
+#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
+#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
+#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
+#: ../src/totem-video-thumbnailer.c:841
 #, c-format
-msgid "The playback of this movie requires a %s plugin which is not installed."
-msgid_plural ""
-"The playback of this movie requires the following decoders which are not "
-"installed:\n"
-"\n"
-"%s"
-msgstr[0] "Каб прайграць гэты фільм, патрэбны плугін %s, але ён не ўсталяваны."
-msgstr[1] ""
-"Каб прайграць гэты фільм, патрэбныя наступныя дэкадавальнікі, але яны не "
-"ўсталяваныя:\n"
-"\n"
-"%s"
-msgstr[2] ""
-"Каб прайграць гэты фільм, патрэбныя наступныя дэкадавальнікі, але яны не "
-"ўсталяваныя:\n"
-"\n"
-"%s"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3374
 msgid ""
-"Cannot play this file over the network. Try downloading it to disk first."
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 msgstr ""
-"Не ўдалося прайграць гэты файл праз сетку. Паспрабуйце спачатку сцягнуць яго "
-"на дыск."
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5878
-msgid "Media contains no supported video streams."
-msgstr ""
-"Медыяфайл не ўтрымлівае відэаструменяў, якія б падтрымліваліся праграмай."
+#: ../src/totem-video-thumbnailer.c:842
+msgid "Filename"
+msgstr "Назва файла"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6052
-msgid ""
-"Failed to create a GStreamer play object. Please check your GStreamer "
-"installation."
-msgstr ""
-"Не ўдалося стварыць аб'ект прайгравання GStreamer. Праверце правільнасць "
-"усталявання GStreamer."
+#: ../src/totem-video-thumbnailer.c:844
+msgid "Resolution"
+msgstr "Памер"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6172
-msgid ""
-"Failed to open audio output. You may not have permission to open the sound "
-"device, or the sound server may not be running. Please select another audio "
-"output in the Multimedia Systems Selector."
-msgstr ""
-"Не ўдалося адкрыць выхад для гуку. Магчыма, вы не маеце дазволу на адкрыццё "
-"гукавога прыстасавання, або гукавы сервер не працуе. Выберыце іншы тып "
-"вываду гуку ў дыялозе выбару мультымедыйных сістэм."
+#: ../src/totem-video-thumbnailer.c:847
+msgid "Duration"
+msgstr "Працягласць"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6192
-msgid ""
-"Could not find the audio output. You may need to install additional "
-"GStreamer plugins, or select another audio output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"Не ўдалося адшукаць выхад для гуку. Магчыма, вам трэба ўсталяваць дадатковыя "
-"плугіны GStreamer або выбраць іншы тып вываду гуку ў дыялозе выбару "
-"мультымедыйных сістэм."
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:1
+msgid "Apple Trailers"
+msgstr "Трэйлеры Apple"
+
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:2
+msgid "Sets the user agent for the Apple Trailers site"
+msgstr "Прызначае кліенцкага агента карыстальніка для пляцоўкі трэйлераў Apple"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:1
+msgid "Autoload Subtitles"
+msgstr "Аўтаматычнае сцягванне субцітраў"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:2
+msgid "Autoloads text subtitles"
+msgstr "Аўтаматычнае сцягванне субцітраў"
 
-#. hour:minutes:seconds
-#. Translators: This is a time format, like "9:05:02" for 9
-#. * hours, 5 minutes, and 2 seconds. You may change ":" to
-#. * the separator that your locale uses or use "%Id" instead
-#. * of "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:83 ../src/plugins/skipto/totem-time-entry.c:57
-#, c-format
-msgctxt "long time format"
-msgid "%d:%02d:%02d"
-msgstr "%d:%02d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
+msgid "Video Disc Recorder"
+msgstr "Запіс відэадыскаў"
 
-#. minutes:seconds
-#. Translators: This is a time format, like "5:02" for 5
-#. * minutes and 2 seconds. You may change ":" to the
-#. * separator that your locale uses or use "%Id" instead of
-#. * "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:92
-#, c-format
-msgctxt "short time format"
-msgid "%d:%02d"
-msgstr "%d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
+msgid "Records (S)VCDs or video DVDs"
+msgstr "Запіс (S)VCD ці Video DVD"
 
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:65
 msgid "_Create Video Disc..."
@@ -1978,38 +1829,21 @@
 msgid "Copy the currently playing (S)VCD"
 msgstr "Скапіраваць адкрыты (S)VCD"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:129
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:136
 msgid "The video disc could not be duplicated."
 msgstr "Немагчыма скапіраваць гэты відэадыск."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:131
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:276
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:138
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:283
 msgid "The movie could not be recorded."
 msgstr "Не ўдалося запісаць гэты фільм."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:157
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:167
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:263
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:164
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:174
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:270
 msgid "Unable to write a project."
 msgstr "Не ўдалося запісаць праект."
 
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
-msgid "Video Disc Recorder"
-msgstr "Запіс відэадыскаў"
-
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
-msgid "Records (S)VCDs or video DVDs"
-msgstr "Запіс (S)VCD ці Video DVD"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:1
-#: ../src/plugins/chapters/totem-chapters.c:1139
-msgid "Chapters"
-msgstr "Раздзелы"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:2
-msgid "Support chapter markers in movies."
-msgstr "Падтрымка раздзелаў для фільмаў."
-
 #: ../src/plugins/chapters/chapters-edit.ui.h:1
 msgid "Name for new chapter:"
 msgstr "Назва новага раздзела:"
@@ -2062,9 +1896,18 @@
 msgid "Add New Chapters"
 msgstr "Дадаць новыя раздзелы"
 
-#: ../src/plugins/chapters/chapters-list.ui.h:13
-msgid "Create a new chapter list for the movie"
-msgstr "Стварыць новы спіс раздзелаў для фільма"
+#: ../src/plugins/chapters/chapters-list.ui.h:13
+msgid "Create a new chapter list for the movie"
+msgstr "Стварыць новы спіс раздзелаў для фільма"
+
+#: ../src/plugins/chapters/chapters.plugin.in.h:1
+#: ../src/plugins/chapters/totem-chapters.c:1139
+msgid "Chapters"
+msgstr "Раздзелы"
+
+#: ../src/plugins/chapters/chapters.plugin.in.h:2
+msgid "Support chapter markers in movies"
+msgstr "Падтрымка раздзелаў для фільмаў"
 
 #: ../src/plugins/chapters/totem-chapters.c:56
 #, c-format
@@ -2173,14 +2016,38 @@
 msgid "The URI ‘%s’ is not supported."
 msgstr "URI-адрас \"%s\" не падтрымліваецца."
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
-msgid "Instant Messenger status"
-msgstr "Статус сеціўнага камунікатара"
+#: ../src/plugins/grilo/grilo.plugin.in.h:1
+msgid "Grilo Browser"
+msgstr "Аглядальнік Grilo"
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
-msgid "Set your Instant Messenger status to away when a movie is playing"
+#: ../src/plugins/grilo/grilo.plugin.in.h:2
+msgid "A plugin to let you browse media content from various sources"
 msgstr ""
-"Пераводзіць сеціўны камунікатар у стан адсутнасці, пакуль прайграецца фільм"
+"Плугін, які дазваляе глядзець мультымедыйнае змесціва з разнастайных крыніц"
+
+#: ../src/plugins/grilo/grilo.ui.h:1
+msgid "Add to Playlist"
+msgstr "Дадаць у спіс прайгравання"
+
+#: ../src/plugins/grilo/grilo.ui.h:2
+msgid "Copy Location"
+msgstr "Скапіраваць адрас"
+
+#: ../src/plugins/grilo/grilo.ui.h:3 ../src/plugins/grilo/totem-grilo.c:1184
+msgid "Browse"
+msgstr "Агляд"
+
+#: ../src/plugins/grilo/grilo.ui.h:4 ../src/plugins/grilo/totem-grilo.c:1227
+msgid "Search"
+msgstr "Пошук"
+
+#: ../src/plugins/grilo/totem-grilo.c:454
+msgid "Browse Error"
+msgstr "Памылка агляду"
+
+#: ../src/plugins/grilo/totem-grilo.c:609
+msgid "Search Error"
+msgstr "Памылка пошуку"
 
 #: ../src/plugins/gromit/gromit.plugin.in.h:1
 msgid "Gromit Annotations"
@@ -2195,6 +2062,24 @@
 msgid "The gromit binary was not found."
 msgstr "Выканальны файл gromit не знойдзены."
 
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
+msgid "Instant Messenger Status"
+msgstr "Статус сеціўнага камунікатара"
+
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
+msgid "Set your Instant Messenger status to away when a movie is playing"
+msgstr ""
+"Пераводзіць сеціўны камунікатар у стан адсутнасці, пакуль прайграецца фільм"
+
+#: ../src/plugins/iplayer/iplayer2.py:298
+msgid ""
+msgstr "<прычына не вызначана>"
+
+#: ../src/plugins/iplayer/iplayer2.py:299
+#, python-format
+msgid "Programme unavailable (\"%s\")"
+msgstr "Праграма адсутнічае (\"%s\")"
+
 #. Add the interface to Totem's sidebar
 #: ../src/plugins/iplayer/iplayer.plugin.in.h:1
 #: ../src/plugins/iplayer/iplayer.py:46
@@ -2202,8 +2087,8 @@
 msgstr "BBC iPlayer"
 
 #: ../src/plugins/iplayer/iplayer.plugin.in.h:2
-msgid "Stream BBC programs from the last 7 days from the BBC iPlayer service."
-msgstr "Прайграванне праграм BBC за апошнія сем дзён са службы BBC iPlayer."
+msgid "Stream BBC programs from the last 7 days from the BBC iPlayer service"
+msgstr "Прайграванне праграм BBC за апошнія сем дзён са службы BBC iPlayer"
 
 #: ../src/plugins/iplayer/iplayer.py:72
 msgid "Error listing channel categories"
@@ -2238,15 +2123,6 @@
 "Узнікла памылка атрымання спіса праграм для гэтага спалучэння канала і "
 "катэгорыі."
 
-#: ../src/plugins/iplayer/iplayer2.py:298
-msgid ""
-msgstr "<прычына не вызначана>"
-
-#: ../src/plugins/iplayer/iplayer2.py:299
-#, python-format
-msgid "Programme unavailable (\"%s\")"
-msgstr "Праграма адсутнічае (\"%s\")"
-
 #: ../src/plugins/lirc/lirc.plugin.in.h:1
 msgid "Infrared Remote Control"
 msgstr "ІЧ-пульт дыстанцыйнага кіравання"
@@ -2263,25 +2139,29 @@
 msgid "Couldn't read lirc configuration."
 msgstr "Не ўдалося прачытаць канфігурацыю lirc."
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
-msgid "Download Movie Subtitles"
-msgstr "Сцягванне субцітраў да фільмаў"
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:1
+msgid "Media Player Keys"
+msgstr "Клавішы медыяпрайгравальніка"
+
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:2
+msgid "Support additional media player keys"
+msgstr "Падтрымка дадатковых клавіш медыяпрайгравальніка"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
-msgid "Subtitle _language:"
-msgstr "_Мова субцітраў:"
+#: ../src/plugins/ontop/ontop.plugin.in.h:1
+msgid "Always On Top"
+msgstr "Заўсёды наверсе"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
-msgid "_Play with Subtitle"
-msgstr "_Зайграць з субцітрамі"
+#: ../src/plugins/ontop/ontop.plugin.in.h:2
+msgid "Keep the main window on top when playing a movie"
+msgstr "Трымаць асноўнае акно над астатнімі падчас прагляду фільма"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:1
 msgid "Subtitle Downloader"
 msgstr "Сцягванне субцітраў"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:2
-msgid "Look for subtitles for the currently playing movie."
-msgstr "Пошук субцітраў да адкрытага фільма."
+msgid "Look for subtitles for the currently playing movie"
+msgstr "Пошук субцітраў да адкрытага фільма"
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:42
 msgid "Brazilian Portuguese"
@@ -2337,6 +2217,18 @@
 msgid "Searching subtitles…"
 msgstr "Пошук субцітраў..."
 
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
+msgid "Download Movie Subtitles"
+msgstr "Сцягванне субцітраў да фільмаў"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
+msgid "Subtitle _language:"
+msgstr "_Мова субцітраў:"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
+msgid "_Play with Subtitle"
+msgstr "_Зайграць з субцітрамі"
+
 #: ../src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in.h:1
 msgid "Subtitle language"
 msgstr "Мова субцітраў"
@@ -2345,79 +2237,18 @@
 msgid "The language to search for subtitles for movies in."
 msgstr "Мова для пошуку субцітраў да фільмаў."
 
-#: ../src/plugins/ontop/ontop.plugin.in.h:1
-msgid "Always On Top"
-msgstr "Заўсёды наверсе"
-
-#: ../src/plugins/ontop/ontop.plugin.in.h:2
-msgid "Keep the main window on top when playing a movie"
-msgstr "Трымаць асноўнае акно над астатнімі падчас прагляду фільма"
+#: ../src/plugins/properties/movie-properties.plugin.in.h:1
+msgid "Movie Properties"
+msgstr "Уласцівасці фільма"
+
+#: ../src/plugins/properties/movie-properties.plugin.in.h:2
+msgid "Adds movie properties to the sidebar"
+msgstr "Дадае ўласцівасці фільма на бакавую паліцу"
 
 #: ../src/plugins/properties/totem-movie-properties.c:246
 msgid "Properties"
 msgstr "Уласцівасці"
 
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:1
-msgid "Publisher protocol to use"
-msgstr "Пратакол публікацыі"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:2
-msgid ""
-"The transport protocol to use when publishing playlists over the network."
-msgstr "Транспартны пратакол для публікацыі спісаў прайгравання ў сетцы."
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:3
-msgid "Format for network service name"
-msgstr "Фармат назвы сеткавай паслугі"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:5
-#, no-c-format
-msgid ""
-"A format string used to build the network service name used when publishing "
-"playlists over the network. The following format placeholders can be used: • "
-"%a: the program name as returned by g_get_application_name() • %h: the "
-"machine's host name in title case • %u: the user's login name in title case "
-"• %U: the user's real name • %%: the percent sign"
-msgstr ""
-"Фармат для ўтварэння назвы сеткавай паслугі пры публікацыі спісаў "
-"прайгравання ў сетцы. Можна ўжыць наступныя месцазаступнікі: • %a: назва "
-"праграмы, вернутая функцыяй g_get_application_name() • %h: назва машыны ў "
-"верхнім рэгістры • %u: імя карыстальніка ў верхнім рэгістры • %U: сапраўднае "
-"імя карыстальніка • %%: знак працэнтаў"
-
-#. Translators: computers on the local network which are publishing their playlists over the network
-#: ../src/plugins/publish/totem-publish.c:552
-msgid "Neighbors"
-msgstr "Суседзі"
-
-#: ../src/plugins/publish/publish.plugin.in.h:1
-msgid "Publish Playlist"
-msgstr "Публікацыя спіса прайгравання"
-
-#: ../src/plugins/publish/publish.plugin.in.h:2
-msgid "Share the current playlist via HTTP"
-msgstr "Агульнадаступная публікацыя бягучага спіса прайгравання праз HTTP"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:1
-msgid "Service _Name:"
-msgstr "_Назва службы:"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:3
-#, no-c-format
-msgid ""
-"The name used for announcing the playlist service on the network.\n"
-"All occurrences of the string %u will be replaced by your name,\n"
-"and %h will be replaced by your computer's host name."
-msgstr ""
-"Назва службы публікацыі спіса прайгравання для апавяшчэння суседзяў па "
-"сетцы.\n"
-"Спалучэнне %u будзе заменена на ваша імя,\n"
-"а %h - на назву хоста вашага камп'ютара."
-
-#: ../src/plugins/publish/publish-plugin.ui.h:6
-msgid "Use _encrypted transport protocol (HTTPS)"
-msgstr "Ужыць за_шыфраваны пратакол транспарту (HTTPS)"
-
 #: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:1
 msgid "rpdb2 password"
 msgstr "Пароль rpdb2"
@@ -2431,22 +2262,86 @@
 "аддаленага доступу. Калі гэта настройка мае пустое значэнне, "
 "выкарыстоўваецца прадвызначанае значэнне \"totem\"."
 
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
+msgid "Python Console"
+msgstr "Кансоль Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
+msgid "Interactive Python console"
+msgstr "Інтэрактыўная кансоль Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:88
+msgid "Python Console Menu"
+msgstr "Меню кансолі Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:93
+msgid "_Python Console"
+msgstr "_Кансоль Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:94
+msgid "Show Totem's Python console"
+msgstr "Паказаць кансоль Python для Totem"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:100
+msgid "Python Debugger"
+msgstr "Адладчык Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:101
+msgid "Enable remote Python debugging with rpdb2"
+msgstr "Уключыць падтрымку аддаленай адладкі Python з дапамогай rpdb2"
+
+#. pylint: disable-msg=E1101
+#: ../src/plugins/pythonconsole/pythonconsole.py:125
+#, python-format
+msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
+msgstr "Атрымаць доступ да Totem.Object можна праз \"totem_object\" :\\n%s"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:129
+msgid "Totem Python Console"
+msgstr "Кансоль Python для Totem"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:139
+msgid ""
+"After you press OK, Totem will wait until you connect to it with winpdb or "
+"rpdb2. If you have not set a debugger password in DConf, it will use the "
+"default password ('totem')."
+msgstr ""
+"Пасля націску на кнопку Добра, Totem будзе чакаць злучэння з winpdb або "
+"rpdb2. Калі вы не вызначылі пароль адладчыка ў DConf, будзе ўжыты "
+"прадвызначаны пароль  (\"totem\")."
+
+#: ../src/plugins/recent/recent.plugin.in.h:1
+msgid "Recent files"
+msgstr "Нядаўнія файлы"
+
+#: ../src/plugins/recent/recent.plugin.in.h:2
+msgid "Adds files that have been played to recent files"
+msgstr "Дадае нядаўнія файлы ў адпаведны спіс"
+
 #: ../src/plugins/rotation/rotation.plugin.in.h:1
 msgid "Rotation Plugin"
 msgstr "Плугін павароту"
 
 #: ../src/plugins/rotation/rotation.plugin.in.h:2
-msgid "Allows videos to be rotated if they're in the wrong orientation."
-msgstr "Дазваляе паварочваць відэа з памылковай арыентацыяй."
+msgid "Allows videos to be rotated if they are in the wrong orientation"
+msgstr "Дазваляе паварочваць відэа з памылковай арыентацыяй"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:60
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:50
 msgid "_Rotate Clockwise"
 msgstr "Па_вярнуць па ходу гадзіннікавай стрэлцы"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:62
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:52
 msgid "Rotate Counterc_lockwise"
 msgstr "Павярнуць супраць _гадзіннікавай стрэлкі"
 
+#: ../src/plugins/save-file/save-file.plugin.in.h:1
+msgid "Save Copy"
+msgstr "Захаванне копіі"
+
+#: ../src/plugins/save-file/save-file.plugin.in.h:2
+msgid "Save a copy of the currently playing movie"
+msgstr "Захаванне копіі адкрытага фільма"
+
 #: ../src/plugins/save-file/totem-save-file.c:63
 msgid "Save a Copy..."
 msgstr "Захаваць копію..."
@@ -2469,10 +2364,13 @@
 msgid "Movie stream"
 msgstr "Струмень фільма"
 
-#: ../src/plugins/screensaver/totem-screensaver.c:116
-#: ../browser-plugin/totem-plugin-viewer.c:1891
-msgid "Playing a movie"
-msgstr "Прайграванне фільма"
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:1
+msgid "Screen Saver"
+msgstr "Ахоўнік экрана"
+
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:2
+msgid "Deactivates the screen saver when a movie is playing"
+msgstr "Выключэнне ахоўніка экрана пры прайграванні фільма"
 
 #: ../src/plugins/screenshot/gallery.ui.h:1
 msgid "Screenshot width (in pixels):"
@@ -2486,23 +2384,28 @@
 msgid "Number of screenshots:"
 msgstr "Колькасць экранных здымкаў:"
 
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:1
-msgid "_Name:"
-msgstr "_Назва:"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:2
-msgid "Save in _folder:"
-msgstr "Захаваць у _папцы:"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:3
-msgid "Select a folder"
-msgstr "Выбраць папку"
-
-#. Write the screenshot to the temporary file
-#: ../src/plugins/screenshot/gnome-screenshot-widget.c:385
-#: ../src/plugins/screenshot/totem-screenshot.c:64
-msgid "Screenshot.png"
-msgstr "Экранны_здымак.png"
+#. translators: this is the name of the file that gets made up
+#. * with the screenshot if the entire screen is taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:147
+#, c-format
+msgid "Screenshot from %s.png"
+msgstr "Экранны здымак з %s.png"
+
+#. translators: this is the name of the file that gets
+#. * made up with the screenshot if the entire screen is
+#. * taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:154
+#, c-format
+msgid "Screenshot from %s - %d.png"
+msgstr "Экранны здымак з %s - %d.png"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:1
+msgid "Screenshot"
+msgstr "Экранны здымак"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:2
+msgid "Allows screenshots and galleries to be taken of videos"
+msgstr "Дазваляе ствараць экранныя здымкі і іх галерэі на аснове відэа"
 
 #: ../src/plugins/screenshot/totem-gallery.c:91
 msgid "Save Gallery"
@@ -2528,49 +2431,47 @@
 msgid "Saving gallery as \"%s\""
 msgstr "Захаванне галерэі \"%s\""
 
-#: ../src/plugins/screenshot/totem-screenshot.c:113
-msgid "There was an error saving the screenshot."
-msgstr "Узнікла памылка захавання экраннага здымка."
-
-#: ../src/plugins/screenshot/totem-screenshot.c:139
-msgid "Save Screenshot"
-msgstr "Захаванне экраннага здымка"
-
-#. Create the screenshot widget
-#. Translators: %s is the movie title and %d is an auto-incrementing number to make filename unique
-#: ../src/plugins/screenshot/totem-screenshot.c:160
-#, c-format
-msgid "Screenshot-%s-%d.png"
-msgstr "Экранны_здымак-%s-%d.png"
-
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:88
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:220
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "Totem could not get a screenshot of the video."
 msgstr "Totem не здолеў зрабіць экранны здымак гэтага відэа."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "This is not supposed to happen; please file a bug report."
 msgstr "Гэта не павінна было здарыцца. Заявіце пра гэтую хібу."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
-msgid "Take _Screenshot..."
-msgstr "Зрабіць _экранны здымак..."
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
+msgid "Take _Screenshot"
+msgstr "Зрабіць _экранны здымак"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
 msgid "Take a screenshot"
 msgstr "Зрабіць экранны здымак"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create Screenshot _Gallery..."
 msgstr "Стварыць _галерэю экранных здымкаў..."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create a gallery of screenshots"
 msgstr "Стварыць галерэю экранных здымкаў"
 
+#: ../src/plugins/skipto/skipto.plugin.in.h:1
+#: ../src/plugins/skipto/totem-skipto.c:196
+msgid "Skip To"
+msgstr "Пераскочыць да..."
+
+#: ../src/plugins/skipto/skipto.plugin.in.h:2
+msgid "Provides the \"Skip to\" dialog"
+msgstr "Дадае дыялогавае акенца \"Пераскочыць да...\""
+
+#: ../src/plugins/skipto/skipto.ui.h:1
+msgid "_Skip to:"
+msgstr "_Пераскочыць да:"
+
 #. Update the "seconds" label so that it always has the correct singular/plural form
 #. Translators: label for the seconds selector in the "Skip to" dialogue
-#: ../src/plugins/skipto/totem-skipto.c:160
+#: ../src/plugins/skipto/totem-skipto.c:159
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "секунда"
@@ -2581,15 +2482,11 @@
 #. Translators: you should translate this string to a number (written in digits) which corresponds to the longer character length of the
 #. * translations for "second" and "seconds", as translated elsewhere in this file. For example, in English, "second" is 6 characters long and
 #. * "seconds" is 7 characters long, so this string should be translated to "7". See: bgo#639398
-#: ../src/plugins/skipto/totem-skipto.c:190
+#: ../src/plugins/skipto/totem-skipto.c:189
 msgctxt "Skip To label length"
 msgid "7"
 msgstr "7"
 
-#: ../src/plugins/skipto/totem-skipto.c:197
-msgid "Skip To"
-msgstr "Пераскочыць да..."
-
 #: ../src/plugins/skipto/totem-skipto-plugin.c:182
 msgid "_Skip To..."
 msgstr "_Пераскочыць да..."
@@ -2598,112 +2495,3 @@
 msgid "Skip to a specific time"
 msgstr "Пераскочыць да пэўнага часу"
 
-#: ../src/plugins/skipto/skipto.ui.h:1
-msgid "_Skip to:"
-msgstr "_Пераскочыць да:"
-
-#: ../browser-plugin/totem-plugin-viewer.c:431
-msgid "No URI to play"
-msgstr "Няма URI-адрасу для грання"
-
-#. translators: this is:
-#. * Open With ApplicationName
-#. * as in nautilus' right-click menu
-#: ../browser-plugin/totem-plugin-viewer.c:1107
-#, c-format
-msgid "_Open with \"%s\""
-msgstr "_Адкрыць у \"%s\""
-
-#: ../browser-plugin/totem-plugin-viewer.c:2136
-msgid "No playlist or playlist empty"
-msgstr "Няма спіса прайгравання або ён пусты"
-
-#: ../browser-plugin/totem-plugin-viewer.c:2235
-msgid "Movie browser plugin"
-msgstr "Плугін фільмаў для сеціўнага аглядальніка"
-
-#: ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Verify your system installation. The Totem plugin will now exit."
-msgstr ""
-"Праверце правільнасць усталявання сістэмы. Плугін Totem заканчвае працу."
-
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
-msgid "Python Console"
-msgstr "Кансоль Python"
-
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
-msgid "Interactive Python console."
-msgstr "Інтэрактыўная кансоль Python."
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:88
-msgid "Python Console Menu"
-msgstr "Меню кансолі Python"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:93
-msgid "_Python Console"
-msgstr "_Кансоль Python"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:94
-msgid "Show Totem's Python console"
-msgstr "Паказаць кансоль Python для Totem"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:100
-msgid "Python Debugger"
-msgstr "Адладчык Python"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:101
-msgid "Enable remote Python debugging with rpdb2"
-msgstr "Уключыць падтрымку аддаленай адладкі Python з дапамогай rpdb2"
-
-#. pylint: disable-msg=E1101
-#: ../src/plugins/pythonconsole/pythonconsole.py:125
-#, python-format
-msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
-msgstr "Атрымаць доступ да Totem.Object можна праз \"totem_object\" :\\n%s"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:129
-msgid "Totem Python Console"
-msgstr "Кансоль Python для Totem"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:139
-msgid ""
-"After you press OK, Totem will wait until you connect to it with winpdb or "
-"rpdb2. If you have not set a debugger password in DConf, it will use the "
-"default password ('totem')."
-msgstr ""
-"Пасля націску на кнопку Добра, Totem будзе чакаць злучэння з winpdb або "
-"rpdb2. Калі вы не вызначылі пароль адладчыка ў DConf, будзе ўжыты "
-"прадвызначаны пароль  (\"totem\")."
-
-#: ../src/plugins/grilo/grilo.plugin.in.h:1
-msgid "Grilo Browser"
-msgstr "Аглядальнік Grilo"
-
-#: ../src/plugins/grilo/grilo.plugin.in.h:2
-msgid "A plugin to let you browse media content from various sources."
-msgstr ""
-"Плугін, які дазваляе глядзець мультымедыйнае змесціва з разнастайных крыніц."
-
-#: ../src/plugins/grilo/totem-grilo.c:452
-msgid "Browse Error"
-msgstr "Памылка агляду"
-
-#: ../src/plugins/grilo/totem-grilo.c:599
-msgid "Search Error"
-msgstr "Памылка пошуку"
-
-#: ../src/plugins/grilo/totem-grilo.c:1219 ../src/plugins/grilo/grilo.ui.h:3
-msgid "Browse"
-msgstr "Агляд"
-
-#: ../src/plugins/grilo/totem-grilo.c:1285 ../src/plugins/grilo/grilo.ui.h:4
-msgid "Search"
-msgstr "Пошук"
-
-#: ../src/plugins/grilo/grilo.ui.h:1
-msgid "Add to Playlist"
-msgstr "Дадаць у спіс прайгравання"
-
-#: ../src/plugins/grilo/grilo.ui.h:2
-msgid "Copy Location"
-msgstr "Скапіраваць адрас"
diff -Nru totem-3.4.3/po/bg.po totem-3.6.2/po/bg.po
--- totem-3.4.3/po/bg.po	2012-04-02 14:15:40.000000000 +0000
+++ totem-3.6.2/po/bg.po	2012-10-25 13:15:32.000000000 +0000
@@ -4,18 +4,19 @@
 # Copyright (C) 2011 Krasimir "Bfaf" Chonov .
 # This file is distributed under the same license as the totem package.
 # Evgeni Boevski , 2003.
-# Alexander Shopov , 2004, 2005, 2007, 2008, 2009, 2010, 2011, 2012.
+# Alexander Shopov , 2004, 2005, 2007, 2008, 2009, 2010, 2011.
 # Vladimir Petkov , 2006, 2007.
 # Damyan Ivanov , 2010, 2011.
 # Krasimir Chonov , 2011.
+# Ivaylo Valkov , 2012.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: totem master\n"
+"Project-Id-Version: totem gnome-3-6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 06:45+0200\n"
-"PO-Revision-Date: 2012-03-23 06:45+0200\n"
-"Last-Translator: Krasimir Chonov \n"
+"POT-Creation-Date: 2012-10-09 05:15+0300\n"
+"PO-Revision-Date: 2012-10-09 05:15+0300\n"
+"Last-Translator: Ivaylo Valkov \n"
 "Language-Team: Bulgarian \n"
 "Language: bg\n"
 "MIME-Version: 1.0\n"
@@ -23,14 +24,229 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ../browser-plugin/totem-plugin-viewer.c:352 ../src/totem-object.c:1180
+#: ../src/totem-object.c:1650 ../src/totem-statusbar.c:115
+msgid "Stopped"
+msgstr "Спрян"
+
+#: ../browser-plugin/totem-plugin-viewer.c:364 ../src/totem-object.c:1173
+msgid "Paused"
+msgstr "На пауза"
+
+#: ../browser-plugin/totem-plugin-viewer.c:368 ../src/totem-object.c:1166
+msgid "Playing"
+msgstr "Изпълнява се"
+
+#: ../browser-plugin/totem-plugin-viewer.c:386
+#: ../src/plugins/screensaver/totem-screensaver.c:97
+msgid "Playing a movie"
+msgstr "Изпълнение на филм"
+
+#: ../browser-plugin/totem-plugin-viewer.c:443
+msgid "No URI to play"
+msgstr "Няма адрес за изпълнение"
+
+#: ../browser-plugin/totem-plugin-viewer.c:676
+#: ../browser-plugin/totem-plugin-viewer.c:1700
+msgid "Totem Movie Player"
+msgstr "Изпълнение на филми (Totem)"
+
+#. translators: this is:
+#. * Open With ApplicationName
+#. * as in nautilus' right-click menu
+#: ../browser-plugin/totem-plugin-viewer.c:1120
+#, c-format
+msgid "_Open with \"%s\""
+msgstr "_Отваряне с „%s“"
+
+#: ../browser-plugin/totem-plugin-viewer.c:1341 ../src/totem-object.c:2475
+msgid "An error occurred"
+msgstr "Получи се грешка"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2033
+msgid "No playlist or playlist empty"
+msgstr "Или няма списък за изпълнение, или той е празен"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2128
+msgid "Movie browser plugin"
+msgstr "Приставка за филми за браузъри"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144 ../src/totem.c:240
+msgid "Could not initialize the thread-safe libraries."
+msgstr ""
+"Библиотеките за безопасна работа с нишки не могат да бъдат инициализирани."
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144
+msgid "Verify your system installation. The Totem plugin will now exit."
+msgstr "Проверете системата си. Приставката на Totem ще бъде спряна."
+
 #: ../data/fullscreen.ui.h:1
 msgid "Leave Fullscreen"
 msgstr "Изход от цял екран"
 
-#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:144
+#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:81
 msgid "Time:"
 msgstr "Време:"
 
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
+msgid "Allow the screensaver to activate when playing audio"
+msgstr "Предпазителят на екрани да може да се включва, когато е пуснато аудио"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
+msgid ""
+"Allow the screensaver to activate when playing audio. Disable if you have "
+"monitor-powered speakers."
+msgstr ""
+"Предпазителят на екрани да може да се включва, когато е пуснато аудио. "
+"Изключете го, ако тонколоните се захранват от монитора."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
+msgid "Show visual effects when no video is displayed"
+msgstr "Показване на визуални ефекти при липса на видео изображение"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
+msgid "Show visual effects when playing an audio only file."
+msgstr "Показване на визуални ефекти при изпълнение на файлове само с аудио."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
+msgid "Name of the visual effects plugin"
+msgstr "Име на приставките за визуални ефекти"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
+msgid "The brightness of the video"
+msgstr "Яркостта на видеосигнала"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
+msgid "The contrast of the video"
+msgstr "Контрастът на видеосигнала"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
+msgid "The hue of the video"
+msgstr "Нюанс на видеосигнала"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
+msgid "The saturation of the video"
+msgstr "Наситеност на видеосигнала"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
+msgid "Resize the canvas automatically on file load"
+msgstr "Автоматично оразмеряване на прозореца на клипа при зареждане на файл"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
+msgid "Repeat mode"
+msgstr "Режим „Повторение“"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
+msgid "Shuffle mode"
+msgstr "Режим „Разбъркано“"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
+msgid "Whether to disable deinterlacing for interlaced movies"
+msgstr "Забраняване на корекцията на презредови филми"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
+msgid "Whether to enable debug for the playback engine"
+msgstr "Позволяване на откриване на грешки в ядрото за изпълнение"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
+msgid "Type of audio output to use"
+msgstr "Използван вид на изхода на звука"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
+msgid "Visualization quality setting"
+msgstr "Качество на визуализацията"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
+msgid "Quality setting for the audio visualization."
+msgstr "Настройка на качеството за визуализациите към аудиото."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
+msgid "Network buffering threshold"
+msgstr "Праг на буфериране на мрежови данни"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
+msgid ""
+"Amount of data to buffer for network streams before starting to display the "
+"stream (in seconds)."
+msgstr ""
+"Обем данни, идващи по мрежата, които да се сложат в междинен буфер, преди да "
+"започне визуализацията на потока (в секунди)"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
+msgid "Subtitle font"
+msgstr "Шрифт за субтитрите"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
+msgid "Pango font description for subtitle rendering."
+msgstr "Описание на Pango на шрифта за субтитри."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
+msgid "Subtitle encoding"
+msgstr "Кодиране на субтитрите"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
+msgid "Encoding character set for subtitle."
+msgstr "Кодова таблица на субтитрите"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
+msgid "Default location for the \"Open...\" dialogs"
+msgstr "Стандартно местоположение за диалоговите прозорци „Отваряне…“"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
+msgid ""
+"Default location for the \"Open...\" dialogs. Default is the current "
+"directory."
+msgstr ""
+"Стандартно местоположение използвано от диалоговите прозорци „Отваряне…“, "
+"стандартно е текущата папка."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
+msgid "Default location for the \"Take Screenshot\" dialogs"
+msgstr "Стандартно местоположение за диалоговите прозорци „Снимане на кадър“"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
+msgid ""
+"Default location for the \"Take Screenshot\" dialogs. Default is the "
+"Pictures directory."
+msgstr ""
+"Стандартно местоположение използвано от диалоговите прозорци „Снимане на "
+"кадър“, стандартно е папката „Изображения“."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
+msgid "Whether to disable the plugins in the user's home directory"
+msgstr "Дали да се изключат приставките в домашната директория на потребителя"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
+msgid "Whether to disable the keyboard shortcuts"
+msgstr "Дали да се изключат клавишните комбинации"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
+msgid "Whether to autoload text subtitle files when a movie is loaded"
+msgstr "Дали субтитрите да се зареждат автоматично с филмите"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
+msgid "Whether to autoload external chapter files when a movie is loaded"
+msgstr "Дали външните глави да се зареждат автоматично с филма"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
+msgid ""
+"Whether to remember the position of played audio/video files when pausing or "
+"closing them"
+msgstr ""
+"Дали да се запомня положението, до което се е стигнало в пуснатото аудио/"
+"видео, при пауза или затварянето им"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
+msgid "Active plugins list"
+msgstr "Списък на активните приставки"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+msgid ""
+"A list of the names of the plugins which are currently active (loaded and "
+"running)."
+msgstr ""
+"Списък с имената на действащите в момента приставки (заредени и включени)."
+
 #: ../data/playlist.ui.h:1
 msgid "_Remove"
 msgstr "П_ремахване"
@@ -47,11 +263,11 @@
 msgid "Copy the location to the clipboard"
 msgstr "Копиране на местоположението в буфера за обмен"
 
-#: ../data/playlist.ui.h:5 ../data/totem.ui.h:78
+#: ../data/playlist.ui.h:5 ../data/totem.ui.h:71
 msgid "_Select Text Subtitles..."
 msgstr "_Шрифт за субтитрите…"
 
-#: ../data/playlist.ui.h:6 ../data/totem.ui.h:79
+#: ../data/playlist.ui.h:6 ../data/totem.ui.h:72
 msgid "Select a file to use for text subtitles"
 msgstr "Избор на файл със субтитри"
 
@@ -75,10 +291,165 @@
 msgid "Move Down"
 msgstr "Преместване надолу"
 
-#: ../data/properties.ui.h:1 ../data/totem.ui.h:122
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:2
+msgid "Normal"
+msgstr "нормален"
+
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:4
+msgid "Large"
+msgstr "голям"
+
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:6
+msgid "Extra Large"
+msgstr "извънредно голям"
+
+#: ../data/preferences.ui.h:7 ../src/backend/bacon-video-widget.c:5518
+#: ../src/totem-properties-view.c:232
+msgid "Stereo"
+msgstr "стерео"
+
+#: ../data/preferences.ui.h:8
+msgid "4-channel"
+msgstr "4 канален"
+
+#: ../data/preferences.ui.h:9
+msgid "4.1-channel"
+msgstr "4.1 канален"
+
+#: ../data/preferences.ui.h:10
+msgid "5.0-channel"
+msgstr "5.0 канален"
+
+#: ../data/preferences.ui.h:11
+msgid "5.1-channel"
+msgstr "5.1 канален"
+
+#: ../data/preferences.ui.h:12
+msgid "AC3 Passthrough"
+msgstr "директен AC3"
+
+#: ../data/preferences.ui.h:13
+msgid "Totem Preferences"
+msgstr "Настройки на Totem"
+
+#: ../data/preferences.ui.h:14
+msgid "Playback"
+msgstr "Изпълнение"
+
+#: ../data/preferences.ui.h:15
+msgid "Start playing files from last position"
+msgstr "При пускане да се продължава от мястото, докъдето се е стигнало"
+
+#: ../data/preferences.ui.h:16
+msgid "Text Subtitles"
+msgstr "Текстови субтитри"
+
+#: ../data/preferences.ui.h:17
+msgid "_Load subtitle files when movie is loaded"
+msgstr "_Зареждане на субтитри заедно с филма"
+
+#: ../data/preferences.ui.h:18
+msgid "_Font:"
+msgstr "_Шрифт:"
+
+#: ../data/preferences.ui.h:19
+msgid "_Encoding:"
+msgstr "_Кодова таблица:"
+
+#: ../data/preferences.ui.h:20
+msgid "External Chapters"
+msgstr "Външни глави"
+
+#: ../data/preferences.ui.h:21
+msgid "Load _chapter files when movie is loaded"
+msgstr "Зареждане на файловете на _главите заедно с филма"
+
+#: ../data/preferences.ui.h:22 ../data/properties.ui.h:1
 msgid "General"
 msgstr "Общи"
 
+#. Tab label in the Preferences dialogue
+#: ../data/preferences.ui.h:24
+msgid "Display"
+msgstr "Визуални"
+
+#: ../data/preferences.ui.h:25
+msgid "_Resize the window when a new video is loaded"
+msgstr "_Оразмеряване на прозореца при зареждане на видео"
+
+#: ../data/preferences.ui.h:26
+msgid "Disable _deinterlacing of interlaced videos"
+msgstr "Без _корекция на презредови видео потоци"
+
+#: ../data/preferences.ui.h:27
+msgid "Disable screensaver when playing "
+msgstr "Изключване на предпазителя на екрана при изпълнение"
+
+#: ../data/preferences.ui.h:28 ../data/properties.ui.h:9
+#: ../src/totem-properties-view.c:275
+msgid "Video"
+msgstr "Видео"
+
+#: ../data/preferences.ui.h:29
+msgid "Video or Audio"
+msgstr "Видео или звук"
+
+#: ../data/preferences.ui.h:30
+msgid "Visual Effects"
+msgstr "Визуални ефекти"
+
+#: ../data/preferences.ui.h:31
+msgid "Show _visual effects when an audio file is played"
+msgstr "Показване на визуалните _ефекти при изпълнението на звуков файл"
+
+#: ../data/preferences.ui.h:32
+msgid "_Type of visualization:"
+msgstr "_Избор на визуализация:"
+
+#: ../data/preferences.ui.h:33
+msgid "Visualization _size:"
+msgstr "_Размер на визуализацията:"
+
+#: ../data/preferences.ui.h:34
+msgid "Color Balance"
+msgstr "Цветови баланс"
+
+#: ../data/preferences.ui.h:35
+msgid "_Brightness:"
+msgstr "_Яркост"
+
+#: ../data/preferences.ui.h:36
+msgid "Co_ntrast:"
+msgstr "_Контраст:"
+
+#: ../data/preferences.ui.h:37
+msgid "Sat_uration:"
+msgstr "На_ситеност:"
+
+#: ../data/preferences.ui.h:38
+msgid "_Hue:"
+msgstr "_Нюанс:"
+
+#: ../data/preferences.ui.h:39
+msgid "Reset to _Defaults"
+msgstr "В_ъзстановяване на стандартните настройки"
+
+#: ../data/preferences.ui.h:40
+msgid "Audio Output"
+msgstr "Изход на звука"
+
+#: ../data/preferences.ui.h:41
+msgid "_Audio output type:"
+msgstr "Вид на изхода на _звука:"
+
+#: ../data/preferences.ui.h:42 ../data/properties.ui.h:14
+#: ../src/totem-properties-view.c:273
+msgid "Audio"
+msgstr "Звук"
+
 #: ../data/properties.ui.h:2
 msgid "Title:"
 msgstr "Заглавие:"
@@ -107,11 +478,6 @@
 msgid "Container:"
 msgstr "Контейнер:"
 
-#: ../data/properties.ui.h:9 ../data/totem.ui.h:128
-#: ../src/totem-properties-view.c:270
-msgid "Video"
-msgstr "Видео"
-
 #: ../data/properties.ui.h:10
 msgid "Dimensions:"
 msgstr "Размери:"
@@ -128,11 +494,6 @@
 msgid "Bitrate:"
 msgstr "Бит./сек:"
 
-#: ../data/properties.ui.h:14 ../data/totem.ui.h:142
-#: ../src/totem-properties-view.c:268
-msgid "Audio"
-msgstr "Звук"
-
 #: ../data/properties.ui.h:15
 msgid "Sample rate:"
 msgstr "Кадри/сек:"
@@ -141,742 +502,447 @@
 msgid "Channels:"
 msgstr "Канали:"
 
-#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
-msgid "_Add to Playlist"
-msgstr "_Добавяне към списъка за изпълнение"
-
-#: ../data/video-list.ui.h:2
-msgid "Add the video to the playlist"
-msgstr "Добавяне на видеото към списъка за изпълнение"
-
 #. Title
-#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:143
-#: ../src/totem-object.c:1667
-msgid "Movie Player"
-msgstr "Изпълнение на филми"
+#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:80 ../src/totem.c:239
+#: ../src/totem.c:248 ../src/totem-menu.c:789 ../src/totem-object.c:1658
+msgid "Videos"
+msgstr "Видео клипове"
 
 #: ../data/totem.desktop.in.in.in.h:2
-msgid "Play movies and songs"
-msgstr "Гледане на филми и слушане на песни"
+msgid "Play movies"
+msgstr "Изпълнение на филми"
+
+#: ../data/totem.desktop.in.in.in.h:3
+msgid "Video;Movie;Film;Clip;Series;Player;DVD;TV;Disc;"
+msgstr "Видео;Филм;Клип;Сериал;Изпълнение;DVD;Телевизия;TV;Диск;"
 
 #: ../data/totem.ui.h:1
-msgid "_Movie"
-msgstr "_Филм"
+msgid "_Open"
+msgstr "_Отваряне"
 
 #: ../data/totem.ui.h:2
-msgid "_Open..."
-msgstr "_Отваряне…"
+msgid "Open _Location"
+msgstr "Отваряне на _местоположение"
 
 #: ../data/totem.ui.h:3
-msgid "Open a file"
-msgstr "Отваряне на файл"
+msgid "_Fullscreen"
+msgstr "На _цял екран"
 
 #: ../data/totem.ui.h:4
-msgid "Open _Location..."
-msgstr "Отваряне на _местоположение…"
+msgid "Prefere_nces"
+msgstr "_Настройки"
 
 #: ../data/totem.ui.h:5
-msgid "Open a non-local file"
-msgstr "Отваряне на отдалечен файл"
+msgid "Shuff_le"
+msgstr "_Разбъркано"
 
 #: ../data/totem.ui.h:6
+msgid "_Repeat"
+msgstr "_Повторение"
+
+#: ../data/totem.ui.h:7
+msgid "_Quit"
+msgstr "_Спиране на програмата"
+
+#: ../data/totem.ui.h:8
+msgid "_Movie"
+msgstr "_Филм"
+
+#: ../data/totem.ui.h:9
 msgid "_Eject"
 msgstr "_Изваждане"
 
-#: ../data/totem.ui.h:7
+#: ../data/totem.ui.h:10
 msgid "Eject the current disc"
 msgstr "Изваждане на текущия диск"
 
-#: ../data/totem.ui.h:8
+#: ../data/totem.ui.h:11
 msgid "_Properties"
 msgstr "_Подробности"
 
-#: ../data/totem.ui.h:9
+#: ../data/totem.ui.h:12
 msgid "View the properties of the current stream"
 msgstr "Преглед на настройките на текущия поток"
 
-#: ../data/totem.ui.h:10
+#: ../data/totem.ui.h:13
 msgid "Play / P_ause"
 msgstr "Изп_ълнение/пауза"
 
-#: ../data/totem.ui.h:11
+#: ../data/totem.ui.h:14
 msgid "Play or pause the movie"
 msgstr "Изпълнение или пауза на филма"
 
-#: ../data/totem.ui.h:12
-msgid "_Quit"
-msgstr "_Спиране на програмата"
-
-#: ../data/totem.ui.h:13
-msgid "Quit the program"
-msgstr "Спиране на програмата"
-
-#: ../data/totem.ui.h:14
+#: ../data/totem.ui.h:15
 msgid "_Edit"
 msgstr "_Редактиране"
 
-#: ../data/totem.ui.h:15
+#: ../data/totem.ui.h:16
 msgid "_Clear Playlist"
 msgstr "_Изчистване на списъка за изпълнение"
 
-#: ../data/totem.ui.h:16
+#: ../data/totem.ui.h:17
 msgid "Clear the playlist"
 msgstr "Изчистване на списъка за изпълнение"
 
-#: ../data/totem.ui.h:17
-msgid "Prefere_nces"
-msgstr "_Настройки"
-
 #: ../data/totem.ui.h:18
-msgid "Configure the application"
-msgstr "Настройки на програмата"
-
-#: ../data/totem.ui.h:19
 msgid "Plugins..."
 msgstr "Приставки…"
 
-#: ../data/totem.ui.h:20
+#: ../data/totem.ui.h:19
 msgid "Configure plugins to extend the application"
 msgstr ""
 "Настройване на приставките, които дават допълнителни възможности на "
 "приложението"
 
-#: ../data/totem.ui.h:21
+#: ../data/totem.ui.h:20
 msgid "_View"
 msgstr "_Изглед"
 
-#: ../data/totem.ui.h:22
-msgid "_Fullscreen"
-msgstr "На _цял екран"
-
-#: ../data/totem.ui.h:23
-msgid "Switch to fullscreen"
-msgstr "Превключване на цял екран"
-
-#: ../data/totem.ui.h:24
+#: ../data/totem.ui.h:21
 msgid "Fit Window to Movie"
 msgstr "Оразмеряване на прозореца към филма"
 
-#: ../data/totem.ui.h:25
+#: ../data/totem.ui.h:22
 msgid "_Resize 1:2"
 msgstr "_Оразмеряване 1:2"
 
-#: ../data/totem.ui.h:26
+#: ../data/totem.ui.h:23
 msgid "Resize to half the original video size"
 msgstr "Оразмеряване към половин размер"
 
-#: ../data/totem.ui.h:27
+#: ../data/totem.ui.h:24
 msgid "Resize _1:1"
 msgstr "Оразмеряване _1:1"
 
-#: ../data/totem.ui.h:28
+#: ../data/totem.ui.h:25
 msgid "Resize to the original video size"
 msgstr "Оразмеряване към оригиналния размер"
 
-#: ../data/totem.ui.h:29
+#: ../data/totem.ui.h:26
 msgid "Resize _2:1"
 msgstr "Оразмеряване _2:1"
 
-#: ../data/totem.ui.h:30
+#: ../data/totem.ui.h:27
 msgid "Resize to double the original video size"
 msgstr "Оразмеряване към двоен размер"
 
-#: ../data/totem.ui.h:31
+#: ../data/totem.ui.h:28
 msgid "_Aspect Ratio"
 msgstr "_Съотношението на екрана"
 
-#: ../data/totem.ui.h:32
+#: ../data/totem.ui.h:29
 msgid "Switch An_gles"
 msgstr "Избор на друг _ъгъл"
 
-#: ../data/totem.ui.h:33
+#: ../data/totem.ui.h:30
 msgid "Switch camera angles"
 msgstr "Избор на друг ракурс"
 
-#: ../data/totem.ui.h:34
+#: ../data/totem.ui.h:31
 msgid "_Go"
 msgstr "_Управление"
 
-#: ../data/totem.ui.h:35
+#: ../data/totem.ui.h:32
 msgid "_DVD Menu"
 msgstr "_Меню за DVD"
 
-#: ../data/totem.ui.h:36
+#: ../data/totem.ui.h:33
 msgid "Go to the DVD menu"
 msgstr "Отиване в менюто на DVD"
 
-#: ../data/totem.ui.h:37
+#: ../data/totem.ui.h:34
 msgid "_Title Menu"
 msgstr "На_чално меню"
 
-#: ../data/totem.ui.h:38
+#: ../data/totem.ui.h:35
 msgid "Go to the title menu"
 msgstr "Отиване в заглавното меню"
 
-#: ../data/totem.ui.h:39
+#: ../data/totem.ui.h:36
 msgid "A_udio Menu"
 msgstr "Меню за _звука"
 
-#: ../data/totem.ui.h:40
+#: ../data/totem.ui.h:37
 msgid "Go to the audio menu"
 msgstr "Отиване в менюто за звука"
 
-#: ../data/totem.ui.h:41
+#: ../data/totem.ui.h:38
 msgid "_Angle Menu"
 msgstr "Меню за избор на _ъгъл"
 
-#: ../data/totem.ui.h:42
+#: ../data/totem.ui.h:39
 msgid "Go to the angle menu"
 msgstr "Отиване в менюто за избор на ъгъл"
 
-#: ../data/totem.ui.h:43
+#: ../data/totem.ui.h:40
 msgid "_Chapter Menu"
 msgstr "Меню за избор на _глава"
 
-#: ../data/totem.ui.h:44
+#: ../data/totem.ui.h:41
 msgid "Go to the chapter menu"
 msgstr "Отиване в менюто за избор на глава"
 
-#: ../data/totem.ui.h:45
+#: ../data/totem.ui.h:42
 msgid "_Next Chapter/Movie"
 msgstr "_Следваща глава/филм"
 
-#: ../data/totem.ui.h:46
+#: ../data/totem.ui.h:43
 msgid "Next chapter or movie"
 msgstr "Следваща глава или филм"
 
-#: ../data/totem.ui.h:47
+#: ../data/totem.ui.h:44
 msgid "_Previous Chapter/Movie"
 msgstr "_Предишна глава/филм"
 
-#: ../data/totem.ui.h:48
+#: ../data/totem.ui.h:45
 msgid "Previous chapter or movie"
 msgstr "Предишна глава или филм"
 
-#: ../data/totem.ui.h:49
+#: ../data/totem.ui.h:46
 msgid "_Sound"
 msgstr "_Звук"
 
-#: ../data/totem.ui.h:50
+#: ../data/totem.ui.h:47
 msgid "Volume _Up"
 msgstr "_Увеличаване на звука"
 
-#: ../data/totem.ui.h:51
+#: ../data/totem.ui.h:48
 msgid "Increase volume"
 msgstr "Увеличаване на звука"
 
-#: ../data/totem.ui.h:52
+#: ../data/totem.ui.h:49
 msgid "Volume _Down"
 msgstr "_Намаляване на звука"
 
-#: ../data/totem.ui.h:53
+#: ../data/totem.ui.h:50
 msgid "Decrease volume"
 msgstr "Намаляване на звука"
 
-#: ../data/totem.ui.h:54
+#: ../data/totem.ui.h:51
 msgid "_Help"
 msgstr "Помо_щ"
 
-#: ../data/totem.ui.h:55
+#: ../data/totem.ui.h:52
 msgid "_Contents"
 msgstr "_Ръководство"
 
-#: ../data/totem.ui.h:56
+#: ../data/totem.ui.h:53
 msgid "Help contents"
 msgstr "Ръководство"
 
-#: ../data/totem.ui.h:57
+#: ../data/totem.ui.h:54
 msgid "_About"
 msgstr "_Относно"
 
-#: ../data/totem.ui.h:58
-msgid "About this application"
-msgstr "Относно това приложение"
-
-#: ../data/totem.ui.h:59
-msgid "_Repeat Mode"
-msgstr "Режим „_Повторение“"
-
-#: ../data/totem.ui.h:60
-msgid "Set the repeat mode"
-msgstr "Включване на режим на повторение"
-
-#: ../data/totem.ui.h:61
-msgid "Shuff_le Mode"
-msgstr "Режим „_Разбъркано“"
-
-#: ../data/totem.ui.h:62
-msgid "Set the shuffle mode"
-msgstr "Включване на режим „Разбъркано“"
-
-#: ../data/totem.ui.h:63
-msgid "Show _Controls"
-msgstr "Показване на контролните _бутони"
-
-#: ../data/totem.ui.h:64
-msgid "Show controls"
-msgstr "Показване на контролните бутони"
-
-#: ../data/totem.ui.h:65
-msgid "S_idebar"
-msgstr "Страни_чен панел"
-
-#: ../data/totem.ui.h:66
-msgid "Show or hide the sidebar"
-msgstr "Показване или скриване на страничния панел"
-
-#: ../data/totem.ui.h:67
-msgctxt "Aspect ratio"
-msgid "Auto"
-msgstr "Автоматично"
-
-#: ../data/totem.ui.h:68
-msgid "Sets automatic aspect ratio"
-msgstr "Автоматично задаване на съотношението ширина/височина"
-
-#: ../data/totem.ui.h:69
-msgid "Square"
-msgstr "Квадратно"
-
-#: ../data/totem.ui.h:70
-msgid "Sets square aspect ratio"
-msgstr "Задаване на квадратно съотношение ширина/височина"
-
-#: ../data/totem.ui.h:71
-msgid "4:3 (TV)"
-msgstr "4:3 (телевизия)"
-
-#: ../data/totem.ui.h:72
-msgid "Sets 4:3 (TV) aspect ratio"
-msgstr "Задаване на съотношение 4:3 (телевизия)"
-
-#: ../data/totem.ui.h:73
-msgid "16:9 (Widescreen)"
-msgstr "16:9 (широк екран)"
-
-#: ../data/totem.ui.h:74
-msgid "Sets 16:9 (widescreen) aspect ratio"
-msgstr "Задаване на съотношение 16:9 (широк екран)"
-
-#: ../data/totem.ui.h:75
-msgid "2.11:1 (DVB)"
-msgstr "2.11:1 (цифрово видеоразпръскване)"
-
-#: ../data/totem.ui.h:76
-msgid "Sets 2.11:1 (DVB) aspect ratio"
-msgstr "Задаване на съотношение 2.11:1 (цифрово видеоразпръскване)"
-
-#: ../data/totem.ui.h:77
-msgid "S_ubtitles"
-msgstr "_Субтитри"
-
-#: ../data/totem.ui.h:80
-msgid "_Languages"
-msgstr "_Езици"
-
-#: ../data/totem.ui.h:81
-msgid "Zoom In"
-msgstr "Увеличаване"
-
-#: ../data/totem.ui.h:82
-msgid "Zoom in"
-msgstr "Увеличаване"
-
-#: ../data/totem.ui.h:83
-msgid "Skip _Forward"
-msgstr "Прескачане _напред"
-
-#: ../data/totem.ui.h:84
-msgid "Skip forward"
-msgstr "Прескачане напред"
-
-#: ../data/totem.ui.h:85
-msgid "Skip _Backwards"
-msgstr "Прескачане наза_д"
-
-#: ../data/totem.ui.h:86
-msgid "Skip backwards"
-msgstr "Прескачане назад"
-
-#: ../data/totem.ui.h:87
-msgid "14.4 Kbps Modem"
-msgstr "14.4 Kbps модем"
-
-#: ../data/totem.ui.h:88
-msgid "19.2 Kbps Modem"
-msgstr "19.2 Kbps модем"
-
-#: ../data/totem.ui.h:89
-msgid "28.8 Kbps Modem"
-msgstr "28.8 Kbps модем"
-
-#: ../data/totem.ui.h:90
-msgid "33.6 Kbps Modem"
-msgstr "33.6 Kbps модем"
-
-#: ../data/totem.ui.h:91
-msgid "34.4 Kbps Modem"
-msgstr "34.4 Kbps модем"
-
-#: ../data/totem.ui.h:92
-msgid "56 Kbps Modem/ISDN"
-msgstr "56 Kbps модем/ISDN"
-
-#: ../data/totem.ui.h:93
-msgid "112 Kbps Dual ISDN/DSL"
-msgstr "112 Kbps двоен ISDN/DSL"
-
-#: ../data/totem.ui.h:94
-msgid "256 Kbps DSL/Cable"
-msgstr "256 Kbps DSL/кабел"
-
-#: ../data/totem.ui.h:95
-msgid "384 Kbps DSL/Cable"
-msgstr "384 Kbps DSL/кабел"
-
-#: ../data/totem.ui.h:96
-msgid "512 Kbps DSL/Cable"
-msgstr "512 Kbps DSL/кабел"
-
-#: ../data/totem.ui.h:97
-msgid "1.5 Mbps T1/Intranet/LAN"
-msgstr "1.5 Mbps T1/Интранет/LAN"
-
-#: ../data/totem.ui.h:98
-msgid "Intranet/LAN"
-msgstr "Интранет/LAN"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:100
-msgid "Normal"
-msgstr "нормален"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:102
-msgid "Large"
-msgstr "голям"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:104
-msgid "Extra Large"
-msgstr "извънредно голям"
-
-#: ../data/totem.ui.h:105 ../src/totem-properties-view.c:228
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5593
-msgid "Stereo"
-msgstr "стерео"
-
-#: ../data/totem.ui.h:106
-msgid "4-channel"
-msgstr "4 канален"
-
-#: ../data/totem.ui.h:107
-msgid "4.1-channel"
-msgstr "4.1 канален"
-
-#: ../data/totem.ui.h:108
-msgid "5.0-channel"
-msgstr "5.0 канален"
-
-#: ../data/totem.ui.h:109
-msgid "5.1-channel"
-msgstr "5.1 канален"
-
-#: ../data/totem.ui.h:110
-msgid "AC3 Passthrough"
-msgstr "директен AC3"
-
-#: ../data/totem.ui.h:111
-msgid "Totem Preferences"
-msgstr "Настройки на Totem"
-
-#: ../data/totem.ui.h:112
-msgid "Playback"
-msgstr "Изпълнение"
-
-#: ../data/totem.ui.h:113
-msgid "Start playing files from last position"
-msgstr "При пускане да се продължава от мястото, докъдето се е стигнало"
-
-#: ../data/totem.ui.h:114
-msgid "Networking"
-msgstr "Мрежа"
-
-#: ../data/totem.ui.h:115
-msgid "Connection _speed:"
-msgstr "_Скорост на връзката:"
-
-#: ../data/totem.ui.h:116
-msgid "Text Subtitles"
-msgstr "Текстови субтитри"
-
-#: ../data/totem.ui.h:117
-msgid "_Load subtitle files when movie is loaded"
-msgstr "_Зареждане на субтитри заедно с филма"
-
-#: ../data/totem.ui.h:118
-msgid "_Font:"
-msgstr "_Шрифт:"
-
-#: ../data/totem.ui.h:119
-msgid "_Encoding:"
-msgstr "_Кодова таблица:"
-
-#: ../data/totem.ui.h:120
-msgid "External Chapters"
-msgstr "Външни глави"
-
-#: ../data/totem.ui.h:121
-msgid "Load _chapter files when movie is loaded"
-msgstr "Зареждане на файловете на _главите заедно с филма"
-
-#. Tab label in the Preferences dialogue
-#: ../data/totem.ui.h:124
-msgid "Display"
-msgstr "Визуални"
-
-#: ../data/totem.ui.h:125
-msgid "_Resize the window when a new video is loaded"
-msgstr "_Оразмеряване на прозореца при зареждане на видео"
-
-#: ../data/totem.ui.h:126
-msgid "Disable _deinterlacing of interlaced videos"
-msgstr "Без _корекция на презредови видео потоци"
-
-#: ../data/totem.ui.h:127
-msgid "Disable screensaver when playing "
-msgstr "Изключване на предпазителя на екрана при изпълнение"
-
-#: ../data/totem.ui.h:129
-msgid "Video or Audio"
-msgstr "Видео или звук"
-
-#: ../data/totem.ui.h:130
-msgid "Visual Effects"
-msgstr "Визуални ефекти"
-
-#: ../data/totem.ui.h:131
-msgid "Show _visual effects when an audio file is played"
-msgstr "Показване на визуалните _ефекти при изпълнението на звуков файл"
-
-#: ../data/totem.ui.h:132
-msgid "_Type of visualization:"
-msgstr "_Избор на визуализация:"
-
-#: ../data/totem.ui.h:133
-msgid "Visualization _size:"
-msgstr "_Размер на визуализацията:"
-
-#: ../data/totem.ui.h:134
-msgid "Color Balance"
-msgstr "Цветови баланс"
-
-#: ../data/totem.ui.h:135
-msgid "_Brightness:"
-msgstr "_Яркост"
-
-#: ../data/totem.ui.h:136
-msgid "Co_ntrast:"
-msgstr "_Контраст:"
-
-#: ../data/totem.ui.h:137
-msgid "Sat_uration:"
-msgstr "На_ситеност:"
-
-#: ../data/totem.ui.h:138
-msgid "_Hue:"
-msgstr "_Нюанс:"
+#: ../data/totem.ui.h:55
+msgid "About this application"
+msgstr "Относно това приложение"
 
-#: ../data/totem.ui.h:139
-msgid "Reset to _Defaults"
-msgstr "В_ъзстановяване на стандартните настройки"
+#: ../data/totem.ui.h:56
+msgid "Show _Controls"
+msgstr "Показване на контролните _бутони"
 
-#: ../data/totem.ui.h:140
-msgid "Audio Output"
-msgstr "Изход на звука"
+#: ../data/totem.ui.h:57
+msgid "Show controls"
+msgstr "Показване на контролните бутони"
 
-#: ../data/totem.ui.h:141
-msgid "_Audio output type:"
-msgstr "Вид на изхода на _звука:"
+#: ../data/totem.ui.h:58
+msgid "S_idebar"
+msgstr "Страни_чен панел"
 
-#: ../data/totem.ui.h:145
-msgid "Time seek bar"
-msgstr "Лента за време"
+#: ../data/totem.ui.h:59
+msgid "Show or hide the sidebar"
+msgstr "Показване или скриване на страничния панел"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
-msgid "Allow the screensaver to activate when playing audio"
-msgstr "Предпазителят на екрани да може да се включва, когато е пуснато аудио"
+#: ../data/totem.ui.h:60
+msgctxt "Aspect ratio"
+msgid "Auto"
+msgstr "Автоматично"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
-msgid ""
-"Allow the screensaver to activate when playing audio. Disable if you have "
-"monitor-powered speakers."
-msgstr ""
-"Предпазителят на екрани да може да се включва, когато е пуснато аудио. "
-"Изключете го, ако тонколоните се захранват от монитора."
+#: ../data/totem.ui.h:61
+msgid "Sets automatic aspect ratio"
+msgstr "Автоматично задаване на съотношението ширина/височина"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
-msgid "Show visual effects when no video is displayed"
-msgstr "Показване на визуални ефекти при липса на видео изображение"
+#: ../data/totem.ui.h:62
+msgid "Square"
+msgstr "Квадратно"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
-msgid "Show visual effects when playing an audio only file."
-msgstr "Показване на визуални ефекти при изпълнение на файлове само с аудио."
+#: ../data/totem.ui.h:63
+msgid "Sets square aspect ratio"
+msgstr "Задаване на квадратно съотношение ширина/височина"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
-msgid "Name of the visual effects plugin"
-msgstr "Име на приставките за визуални ефекти"
+#: ../data/totem.ui.h:64
+msgid "4:3 (TV)"
+msgstr "4:3 (телевизия)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
-msgid "The brightness of the video"
-msgstr "Яркостта на видеосигнала"
+#: ../data/totem.ui.h:65
+msgid "Sets 4:3 (TV) aspect ratio"
+msgstr "Задаване на съотношение 4:3 (телевизия)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
-msgid "The contrast of the video"
-msgstr "Контрастът на видеосигнала"
+#: ../data/totem.ui.h:66
+msgid "16:9 (Widescreen)"
+msgstr "16:9 (широк екран)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
-msgid "The hue of the video"
-msgstr "Нюанс на видеосигнала"
+#: ../data/totem.ui.h:67
+msgid "Sets 16:9 (widescreen) aspect ratio"
+msgstr "Задаване на съотношение 16:9 (широк екран)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
-msgid "The saturation of the video"
-msgstr "Наситеност на видеосигнала"
+#: ../data/totem.ui.h:68
+msgid "2.11:1 (DVB)"
+msgstr "2.11:1 (цифрово видеоразпръскване)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
-msgid "Resize the canvas automatically on file load"
-msgstr "Автоматично оразмеряване на прозореца на клипа при зареждане на файл"
+#: ../data/totem.ui.h:69
+msgid "Sets 2.11:1 (DVB) aspect ratio"
+msgstr "Задаване на съотношение 2.11:1 (цифрово видеоразпръскване)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
-msgid "Network connection speed"
-msgstr "Скорост на връзката"
+#: ../data/totem.ui.h:70
+msgid "S_ubtitles"
+msgstr "_Субтитри"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
-msgid ""
-"Approximate network connection speed, used to select quality on media over "
-"the network."
-msgstr ""
-"Приблизителна скорост на мрежата. Използва се за избор на качеството на "
-"медията по мрежата."
+#: ../data/totem.ui.h:73
+msgid "_Languages"
+msgstr "_Езици"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
-msgid "Repeat mode"
-msgstr "Режим „Повторение“"
+#: ../data/totem.ui.h:74
+msgid "Zoom In"
+msgstr "Увеличаване"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
-msgid "Shuffle mode"
-msgstr "Режим „Разбъркано“"
+#: ../data/totem.ui.h:75
+msgid "Zoom in"
+msgstr "Увеличаване"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
-msgid "Whether to disable deinterlacing for interlaced movies"
-msgstr "Забраняване на корекцията на презредови филми"
+#: ../data/totem.ui.h:76
+msgid "Skip _Forward"
+msgstr "Прескачане _напред"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
-msgid "Whether to enable debug for the playback engine"
-msgstr "Позволяване на откриване на грешки в ядрото за изпълнение"
+#: ../data/totem.ui.h:77
+msgid "Skip forward"
+msgstr "Прескачане напред"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
-msgid "Type of audio output to use"
-msgstr "Използван вид на изхода на звука"
+#: ../data/totem.ui.h:78
+msgid "Skip _Backwards"
+msgstr "Прескачане наза_д"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
-msgid "Visualization quality setting"
-msgstr "Качество на визуализацията"
+#: ../data/totem.ui.h:79
+msgid "Skip backwards"
+msgstr "Прескачане назад"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
-msgid "Quality setting for the audio visualization."
-msgstr "Настройка на качеството за визуализациите към аудиото."
+#: ../data/totem.ui.h:82
+msgid "Time seek bar"
+msgstr "Лента за време"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
-msgid "Network buffering threshold"
-msgstr "Праг на буфериране на мрежови данни"
+#: ../data/uri.ui.h:1
+msgid "Enter the _address of the file you would like to open:"
+msgstr "Въвеждане на _местоположението на файла за изпълнение"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
-msgid ""
-"Amount of data to buffer for network streams before starting to display the "
-"stream (in seconds)."
-msgstr ""
-"Обем данни, идващи по мрежата, които да се сложат в междинен буфер, преди да "
-"започне визуализацията на потока (в секунди)"
+#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
+msgid "_Add to Playlist"
+msgstr "_Добавяне към списъка за изпълнение"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
-msgid "Subtitle font"
-msgstr "Шрифт за субтитрите"
+#: ../data/video-list.ui.h:2
+msgid "Add the video to the playlist"
+msgstr "Добавяне на видеото към списъка за изпълнение"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
-msgid "Pango font description for subtitle rendering."
-msgstr "Описание на Pango на шрифта за субтитри."
+#: ../src/backend/bacon-video-widget.c:1643
+msgid "Password requested for RTSP server"
+msgstr "Сървърът за RTSP изисква парола"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
-msgid "Subtitle encoding"
-msgstr "Кодиране на субтитрите"
+#: ../src/backend/bacon-video-widget.c:2940
+#, c-format
+msgid "Audio Track #%d"
+msgstr "Аудио № %d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
-msgid "Encoding character set for subtitle."
-msgstr "Кодова таблица на субтитрите"
+#: ../src/backend/bacon-video-widget.c:2944
+#, c-format
+msgid "Subtitle #%d"
+msgstr "Субтитри № %d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
-msgid "Default location for the \"Open...\" dialogs"
-msgstr "Стандартно местоположение за диалоговите прозорци „Отваряне…“"
+#: ../src/backend/bacon-video-widget.c:3341
+msgid "The server you are trying to connect to is not known."
+msgstr "Опитвате се да се свържете към неизвестен сървър."
+
+#: ../src/backend/bacon-video-widget.c:3344
+msgid "The connection to this server was refused."
+msgstr "Свързването към този сървър беше отказано."
+
+#: ../src/backend/bacon-video-widget.c:3347
+msgid "The specified movie could not be found."
+msgstr "Зададеният филм не може да бъде намерен."
+
+#: ../src/backend/bacon-video-widget.c:3354
+msgid "The server refused access to this file or stream."
+msgstr "Сървърът не разрешава достъп до този файл или поток."
+
+#: ../src/backend/bacon-video-widget.c:3360
+msgid "Authentication is required to access this file or stream."
+msgstr "Изисква се удостоверяване за достъп до този файл или поток."
+
+#: ../src/backend/bacon-video-widget.c:3367
+msgid "You are not allowed to open this file."
+msgstr "Нямате права за достъп, за да отворите този файл."
+
+#: ../src/backend/bacon-video-widget.c:3372
+msgid "This location is not a valid one."
+msgstr "Местоположението е грешно."
+
+#: ../src/backend/bacon-video-widget.c:3380
+msgid "The movie could not be read."
+msgstr "Филмът не може да бъде прочетен."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
+#. should be exactly one missing thing (source or converter)
+#: ../src/backend/bacon-video-widget.c:3403
+#: ../src/backend/bacon-video-widget.c:3411
+#, c-format
+msgid "The playback of this movie requires a %s plugin which is not installed."
+msgid_plural ""
+"The playback of this movie requires the following decoders which are not "
+"installed:\n"
+"\n"
+"%s"
+msgstr[0] ""
+"Изпълнението на този филм изисква приставката „%s“, която не е инсталирана."
+msgstr[1] ""
+"Изпълнението на този филм изисква следните декодери, които не са "
+"инсталирани:\n"
+"\n"
+"%s"
+
+#: ../src/backend/bacon-video-widget.c:3422
 msgid ""
-"Default location for the \"Open...\" dialogs. Default is the current "
-"directory."
+"An audio or video stream is not handled due to missing codecs. You might "
+"need to install additional plugins to be able to play some types of movies"
 msgstr ""
-"Стандартно местоположение използвано от диалоговите прозорци „Отваряне…“, "
-"стандартно е текущата папка."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
-msgid "Default location for the \"Take Screenshot\" dialogs"
-msgstr "Стандартно местоположение за диалоговите прозорци „Снимане на кадър“"
+"Поради липсващи кодери, някои видео или звукови потоци не могат да бъдат "
+"възпроизведени. Може да е необходимо да инсталирате допълнителни приставки, "
+"за да гледате някои видове филми"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
+#: ../src/backend/bacon-video-widget.c:3432
 msgid ""
-"Default location for the \"Take Screenshot\" dialogs. Default is the "
-"Pictures directory."
+"This file cannot be played over the network. Try downloading it locally "
+"first."
 msgstr ""
-"Стандартно местоположение използвано от диалоговите прозорци „Снимане на "
-"кадър“, стандартно е папката „Изображения“."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
-msgid "Whether to disable the plugins in the user's home directory"
-msgstr "Дали да се изключат приставките в домашната директория на потребителя"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
-msgid "Whether to disable the keyboard shortcuts"
-msgstr "Дали да се изключат клавишните комбинации"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
-msgid "Whether to autoload text subtitle files when a movie is loaded"
-msgstr "Дали субтитрите да се зареждат автоматично с филмите"
+"Файлът не може да бъде изпълнен през мрежата. Опитайте да го изтеглите "
+"локално."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
-msgid "Whether to autoload external chapter files when a movie is loaded"
-msgstr "Дали външните глави да се зареждат автоматично с филма"
+#: ../src/backend/bacon-video-widget.c:5514 ../src/totem-properties-view.c:228
+msgid "Surround"
+msgstr "обемен звук"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
-msgid ""
-"Whether to remember the position of played audio/video files when pausing or "
-"closing them"
-msgstr ""
-"Дали да се запомня положението, до което се е стигнало в пуснатото аудио/"
-"видео, при пауза или затварянето им"
+#: ../src/backend/bacon-video-widget.c:5516 ../src/totem-properties-view.c:230
+msgid "Mono"
+msgstr "моно"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:35
-msgid "Active plugins list"
-msgstr "Списък на активните приставки"
+#: ../src/backend/bacon-video-widget.c:5801
+msgid "Media contains no supported video streams."
+msgstr "Медията съдържа неподдържани видео потоци."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:36
+#: ../src/backend/bacon-video-widget.c:5983
 msgid ""
-"A list of the names of the plugins which are currently active (loaded and "
-"running)."
+"Some necessary plug-ins are missing. Make sure that the program is correctly "
+"installed."
 msgstr ""
-"Списък с имената на действащите в момента приставки (заредени и включени)."
-
-#: ../data/uri.ui.h:1
-msgid "Enter the _address of the file you would like to open:"
-msgstr "Въвеждане на _местоположението на файла за изпълнение"
+"Някои необходими приставки липсват. Проверете дали програмата е инсталирана "
+"правилно."
 
 #: ../src/eggdesktopfile.c:165
 #, c-format
@@ -978,9 +1044,34 @@
 msgid "Session management options:"
 msgstr "Настройки на управлението на сесии:"
 
-#: ../src/eggsmclient.c:254
-msgid "Show session management options"
-msgstr "Показване на настройките за управлението на сесиите"
+#: ../src/eggsmclient.c:254
+msgid "Show session management options"
+msgstr "Показване на настройките за управлението на сесиите"
+
+#. hour:minutes:seconds
+#. Translators: This is a time format, like "9:05:02" for 9
+#. * hours, 5 minutes, and 2 seconds. You may change ":" to
+#. * the separator that your locale uses or use "%Id" instead
+#. * of "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:56
+#: ../src/plugins/skipto/totem-time-entry.c:57
+#, c-format
+msgctxt "long time format"
+msgid "%d:%02d:%02d"
+msgstr "%d:%02d:%02d"
+
+#. minutes:seconds
+#. Translators: This is a time format, like "5:02" for 5
+#. * minutes and 2 seconds. You may change ":" to the
+#. * separator that your locale uses or use "%Id" instead of
+#. * "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:65
+#, c-format
+msgctxt "short time format"
+msgid "%d:%02d"
+msgstr "%d:%02d"
 
 #. Title
 #. Artist
@@ -1086,10 +1177,14 @@
 msgstr[0] "%d кадър в секунда"
 msgstr[1] "%d кадъра в секунда"
 
-#: ../src/totem-audio-preview.c:168
+#: ../src/totem-audio-preview.c:137
 msgid "Audio Preview"
 msgstr "Преглед на аудио"
 
+#: ../src/totem.c:240
+msgid "Verify your system installation. Totem will now exit."
+msgstr "Проверете системата си. Totem ще бъде спрян."
+
 #: ../src/totem-cell-renderer-video.c:126
 msgid "Unknown video"
 msgstr "Непознато видео"
@@ -1102,7 +1197,7 @@
 msgid "Cancel"
 msgstr "Отказ"
 
-#: ../src/totem-fullscreen.c:616
+#: ../src/totem-fullscreen.c:573
 msgid "No File"
 msgstr "Липсва файл"
 
@@ -1120,7 +1215,7 @@
 msgid "Make sure that Totem is properly installed."
 msgstr "Проверете дали Totem е инсталиран правилно."
 
-#: ../src/totem-interface.c:347
+#: ../src/totem-interface.c:357
 msgid ""
 "Totem 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 "
@@ -1132,7 +1227,7 @@
 "публикуван от Фондацията за свободен софтуер — версия 2 на лиценза или (по "
 "ваше решение) по-късна версия."
 
-#: ../src/totem-interface.c:351
+#: ../src/totem-interface.c:361
 msgid ""
 "Totem is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -1143,7 +1238,7 @@
 "НИКАКВИ ГАРАНЦИИ, дори и косвените за ПРОДАЖБА или СЪОТВЕТСТВИЕ С КАКВАТО И "
 "ДА Е УПОТРЕБА. За подробности погледнете Общия публичен лиценз на GNU."
 
-#: ../src/totem-interface.c:355
+#: ../src/totem-interface.c:365
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Totem; if not, write to the Free Software Foundation, Inc., 59 Temple Place, "
@@ -1153,7 +1248,7 @@
 "заедно с тази програма. Ако не сте, пишете до Free Software Foundation, "
 "Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: ../src/totem-interface.c:358
+#: ../src/totem-interface.c:368
 msgid ""
 "Totem contains an exception to allow the use of proprietary GStreamer "
 "plugins."
@@ -1162,46 +1257,21 @@
 "приставки за GStreamer."
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:190
+#: ../src/totem-menu.c:291
 msgid "None"
 msgstr "Без"
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:195
+#: ../src/totem-menu.c:296
 msgctxt "Language"
 msgid "Auto"
 msgstr "Автоматично"
 
-#. Translators:
-#. * This is not a JPEG image, but a disc image, for example,
-#. * an ISO file
-#: ../src/totem-menu.c:765
-#, c-format
-msgid "Play Image '%s'"
-msgstr "Изпълнение на изображение на диск: „%s“"
-
-#: ../src/totem-menu.c:768 ../src/totem-menu.c:851
-#, c-format
-msgid "device%d"
-msgstr "устройство%d"
-
-#: ../src/totem-menu.c:848
-#, c-format
-msgid "Play Disc '%s'"
-msgstr "Изпълнение на диск: „%s“"
-
-#. This lists the back-end type and version, such as
-#. * Movie Player using GStreamer 0.10.1
-#: ../src/totem-menu.c:1189
-#, c-format
-msgid "Movie Player using %s"
-msgstr "Програма за гледане на филми, която използва %s"
-
-#: ../src/totem-menu.c:1193
+#: ../src/totem-menu.c:788
 msgid "Copyright © 2002-2009 Bastien Nocera"
 msgstr "Авторски права © 2002-2009 Bastien Nocera"
 
-#: ../src/totem-menu.c:1198
+#: ../src/totem-menu.c:792
 msgid "translator-credits"
 msgstr ""
 "Владимир „Kaladan“ Петков \n"
@@ -1209,162 +1279,86 @@
 "Александър Шопов \n"
 "Евгени Боевски \n"
 "Красимир „bfaf“ Чонов \n"
+"Ивайло Вълков \n"
 "\n"
 "Проектът за превод на GNOME има нужда от подкрепа.\n"
-"Научете повече за нас на http://gnome.cult.bg"
+"Научете повече за нас на http://gnome.cult."
+"bg\n"
+"Докладвайте за грешки на http://gnome."
+"cult.bg/bugs"
 
-#: ../src/totem-menu.c:1202
+#: ../src/totem-menu.c:796
 msgid "Totem Website"
 msgstr "Уеб сайт на Totem"
 
-#: ../src/totem-menu.c:1236
+#: ../src/totem-menu.c:827
 msgid "Configure Plugins"
 msgstr "Настройки на приставките"
 
+#: ../src/totem-object.c:162
+#, c-format
+msgid ""
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"%s\n"
+"Стартирайте „%s --help“, за да видите пълния списък с опции за командния "
+"ред.\n"
+
 #. Translators: %s is the totem version number
-#: ../src/totem-object.c:471
+#: ../src/totem-object.c:591
 #, c-format
 msgid "Totem %s"
 msgstr "Totem %s"
 
-#: ../src/totem-object.c:1047 ../browser-plugin/totem-plugin-viewer.c:367
-msgid "Playing"
-msgstr "Изпълнява се"
-
-#: ../src/totem-object.c:1049 ../src/totem-options.c:52
+#: ../src/totem-object.c:1168 ../src/totem-options.c:52
 msgid "Pause"
 msgstr "Пауза"
 
-#: ../src/totem-object.c:1054 ../browser-plugin/totem-plugin-viewer.c:363
-msgid "Paused"
-msgstr "На пауза"
-
-#: ../src/totem-object.c:1056 ../src/totem-object.c:1066
+#: ../src/totem-object.c:1175 ../src/totem-object.c:1185
 #: ../src/totem-options.c:51
 msgid "Play"
 msgstr "Изпълнение"
 
-#: ../src/totem-object.c:1061 ../src/totem-object.c:1659
-#: ../src/totem-statusbar.c:115 ../browser-plugin/totem-plugin-viewer.c:351
-msgid "Stopped"
-msgstr "Спрян"
-
-#: ../src/totem-object.c:1142 ../src/totem-object.c:1169
-#: ../src/totem-object.c:1799 ../src/totem-object.c:1963
+#: ../src/totem-object.c:1267 ../src/totem-object.c:1294
+#: ../src/totem-object.c:1787 ../src/totem-object.c:1942
 #, c-format
 msgid "Totem could not play '%s'."
 msgstr "Totem не може да изпълни „%s“."
 
-#: ../src/totem-object.c:1246
-#, c-format
-msgid ""
-"Totem could not play this media (%s) although a plugin is present to handle "
-"it."
-msgstr ""
-"Totem не може да изпълни този вид медия (%s), въпреки наличието на подходяща "
-"приставка."
-
-#: ../src/totem-object.c:1247
-msgid ""
-"You might want to check that a disc is present in the drive and that it is "
-"correctly configured."
-msgstr ""
-"Проверете има ли носител в устройството и дали то е настроено правилно."
-
-#: ../src/totem-object.c:1255
-msgid "More information about media plugins"
-msgstr "Повече информация за медийните приставки"
-
-#: ../src/totem-object.c:1256
-msgid ""
-"Please install the necessary plugins and restart Totem to be able to play "
-"this media."
-msgstr ""
-"Инсталирайте необходимите приставки и рестартирайте Totem, за да изпълните "
-"този файл."
-
-# c-format
-#: ../src/totem-object.c:1258
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because it does not have the "
-"appropriate plugins to be able to read from the disc."
-msgstr ""
-"Totem не може да изпълни този вид медия (%s) поради липса на подходящи "
-"приставки за четене от диска."
-
-#: ../src/totem-object.c:1260
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because you do not have the "
-"appropriate plugins to handle it."
-msgstr ""
-"Totem не може да изпълни този вид медия (%s) поради липса на подходящи "
-"приставки."
-
-#: ../src/totem-object.c:1263
-#, c-format
-msgid "Totem cannot play this type of media (%s) because it is not supported."
-msgstr ""
-"Totem не може да изпълни този вид медия (%s) поради липса на поддръжка."
-
-#: ../src/totem-object.c:1264
-msgid "Please insert another disc to play back."
-msgstr "Поставете следващ диск, който да бъде изпълнен."
-
-#: ../src/totem-object.c:1300
-msgid "Totem was not able to play this disc."
-msgstr "Totem не успя да пусне диска за изпълнение."
-
-#: ../src/totem-object.c:1301 ../src/totem-object.c:4229
-msgid "No reason."
-msgstr "Няма причина."
-
-#: ../src/totem-object.c:1315
-msgid "Totem does not support playback of Audio CDs"
-msgstr "Totem не поддържа изпълнение на аудио CD-та."
-
-#: ../src/totem-object.c:1316
-msgid "Please consider using a music player or a CD extractor to play this CD"
-msgstr ""
-"Пробвайте със съответна аудио програма или такава за извличане, за да "
-"пуснете CD-то."
-
-#: ../src/totem-object.c:1805
+#: ../src/totem-object.c:1793
 msgid "No error message"
 msgstr "Липсва съобщение за грешка"
 
-#: ../src/totem-object.c:2154
+#: ../src/totem-object.c:2133
 msgid "Totem could not display the help contents."
 msgstr "Ръководството не може да бъде показано."
 
-#: ../src/totem-object.c:2493 ../src/totem-object.c:2495
-#: ../browser-plugin/totem-plugin-viewer.c:1417
-msgid "An error occurred"
-msgstr "Получи се грешка"
-
-#: ../src/totem-object.c:4064 ../src/totem-object.c:4066
+#: ../src/totem-object.c:4019 ../src/totem-object.c:4021
 msgid "Previous Chapter/Movie"
 msgstr "Предишна глава/филм"
 
-#: ../src/totem-object.c:4073 ../src/totem-object.c:4075
+#: ../src/totem-object.c:4028 ../src/totem-object.c:4030
 msgid "Play / Pause"
 msgstr "Изпълнение/пауза"
 
-#: ../src/totem-object.c:4083 ../src/totem-object.c:4085
+#: ../src/totem-object.c:4038 ../src/totem-object.c:4040
 msgid "Next Chapter/Movie"
 msgstr "Следваща глава/филм"
 
-#. Translators: this is the tooltip text for the fullscreen button in the controls box in Totem's main window.
 #. Translators: this is the accessibility text for the fullscreen button in the controls box in Totem's main window.
-#: ../src/totem-object.c:4097 ../src/totem-object.c:4099
+#: ../src/totem-object.c:4051 ../src/totem-object.c:4053
 msgid "Fullscreen"
 msgstr "На цял екран"
 
-#: ../src/totem-object.c:4229
+#: ../src/totem-object.c:4184
 msgid "Totem could not startup."
 msgstr "Totem не може да се стартира."
 
+#: ../src/totem-object.c:4184
+msgid "No reason."
+msgstr "Няма причина."
+
 #: ../src/totem-open-location.c:182
 msgid "Open Location..."
 msgstr "Отваряне на местоположение…"
@@ -1438,117 +1432,111 @@
 msgid "Movies to play"
 msgstr "Филми за изпълнение"
 
-#: ../src/totem-options.c:117
+#: ../src/totem-options.c:79
+msgid "- Play movies and songs"
+msgstr "— Гледане на филми и слушане на песни"
+
+#: ../src/totem-options.c:142
 msgid "Can't enqueue and replace at the same time"
 msgstr "Не може едновременно да се добавя и заменя"
 
 #. By extension entry
-#: ../src/totem-playlist.c:161
+#: ../src/totem-playlist.c:162
 msgid "MP3 ShoutCast playlist"
 msgstr "Списък за изпълнение, MP3 ShoutCast"
 
-#: ../src/totem-playlist.c:162
+#: ../src/totem-playlist.c:163
 msgid "MP3 audio (streamed)"
 msgstr "Аудио по MP3 (поточно)"
 
-#: ../src/totem-playlist.c:163
+#: ../src/totem-playlist.c:164
 msgid "MP3 audio (streamed, DOS format)"
 msgstr "Аудио по MP3 (поточно, формат DOS)"
 
-#: ../src/totem-playlist.c:164
+#: ../src/totem-playlist.c:165
 msgid "XML Shareable Playlist"
 msgstr "Списък за изпълнение, споделим чрез XML"
 
 #. This is "Title 3", where title is a DVD title
 #. * Note: NOT a DVD chapter
-#: ../src/totem-playlist.c:347
+#: ../src/totem-playlist.c:348
 #, c-format
 msgid "Title %d"
 msgstr "Заглавие %d"
 
-#: ../src/totem-playlist.c:446
+#: ../src/totem-playlist.c:447
 msgid "Could not save the playlist"
 msgstr "Списъкът за изпълнение не може да бъде запазен"
 
-#: ../src/totem-playlist.c:1021
+#: ../src/totem-playlist.c:1022
 msgid "Save Playlist"
 msgstr "Запазване на списъка за изпълнение"
 
 #. translators: Playlist is the default saved playlist filename,
 #. * without the suffix
-#: ../src/totem-playlist.c:1033 ../src/totem-playlist.c:1264
-#: ../src/totem-sidebar.c:142
+#: ../src/totem-playlist.c:1034 ../src/totem-playlist.c:1263
+#: ../src/totem-sidebar.c:145
 msgid "Playlist"
 msgstr "Списък"
 
-#: ../src/totem-playlist.c:1857
+#: ../src/totem-playlist.c:1862
 #, c-format
 msgid "The playlist '%s' could not be parsed. It might be damaged."
 msgstr "Списъкът „%s“ не може да бъде прочетен, възможно е да е повреден."
 
-#: ../src/totem-playlist.c:1858
+#: ../src/totem-playlist.c:1863
 msgid "Playlist error"
 msgstr "Грешка в списъка за изпълнение"
 
-#: ../src/totem-preferences.c:295
+#: ../src/totem-preferences.c:297
 msgid "Preferences"
 msgstr "Настройки"
 
-#: ../src/totem-preferences.c:451
+#: ../src/totem-preferences.c:445
 msgid "Select Subtitle Font"
 msgstr "Шрифт за субтитрите"
 
-#: ../src/totem-properties-main.c:115 ../src/totem-properties-view.c:266
+#: ../src/totem-properties-main.c:116 ../src/totem-properties-view.c:271
 msgid "Audio/Video"
 msgstr "Звук/видео"
 
-#: ../src/totem-properties-view.c:128
+#: ../src/totem-properties-view.c:131
 msgid "N/A"
 msgstr "Липсва"
 
-#: ../src/totem-properties-view.c:157
+#: ../src/totem-properties-view.c:160
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 msgctxt "Stream bit rate"
 msgid "N/A"
 msgstr "Липсва"
 
-#: ../src/totem-properties-view.c:160
+#: ../src/totem-properties-view.c:163
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: ../src/totem-properties-view.c:177
+#: ../src/totem-properties-view.c:180
 #: ../src/plugins/properties/totem-movie-properties.c:149
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../src/totem-properties-view.c:209
+#: ../src/totem-properties-view.c:212
 #: ../src/plugins/properties/totem-movie-properties.c:166
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: ../src/totem-properties-view.c:216
+#: ../src/totem-properties-view.c:220
 #: ../src/plugins/properties/totem-movie-properties.c:166
 msgctxt "Sample rate"
 msgid "N/A"
 msgstr "Липсва"
 
-#: ../src/totem-properties-view.c:224
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5589
-msgid "Surround"
-msgstr "обемен звук"
-
-#: ../src/totem-properties-view.c:226
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5591
-msgid "Mono"
-msgstr "моно"
-
-#: ../src/totem-properties-view.c:236
+#: ../src/totem-properties-view.c:241
 msgctxt "Number of audio channels"
 msgid "N/A"
 msgstr "Липсва"
@@ -1581,8 +1569,8 @@
 #. eg: 75 %
 #: ../src/totem-statusbar.c:250
 #, c-format
-msgid "%d %%"
-msgstr "%d %%"
+msgid "%lf %%"
+msgstr "%lf %%"
 
 #. eg: Paused, 0:32 / 1:05
 #: ../src/totem-statusbar.c:325
@@ -1593,12 +1581,12 @@
 #. eg: Buffering, 75 %
 #: ../src/totem-statusbar.c:330
 #, c-format
-msgid "%s, %d %%"
-msgstr "%s, %d %%"
+msgid "%s, %f %%"
+msgstr "%s, %f %%"
 
 #: ../src/totem-subtitle-encoding.c:156
 msgid "Current Locale"
-msgstr "на текущия локал"
+msgstr "Текущ локал"
 
 #: ../src/totem-subtitle-encoding.c:159 ../src/totem-subtitle-encoding.c:161
 #: ../src/totem-subtitle-encoding.c:163 ../src/totem-subtitle-encoding.c:165
@@ -1737,228 +1725,93 @@
 msgid "Vietnamese"
 msgstr "виетнамско"
 
-#: ../src/totem-video-list.c:330
-msgid "No video URI"
-msgstr "Липсва адрес на видео"
-
-#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
-#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
-#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
-#: ../src/totem-video-thumbnailer.c:872
-#, c-format
-msgid ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-msgstr ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-
-#: ../src/totem-video-thumbnailer.c:873
-msgid "Filename"
-msgstr "Име на файл"
-
-#: ../src/totem-video-thumbnailer.c:875
-msgid "Resolution"
-msgstr "Разделителна способност"
-
-#: ../src/totem-video-thumbnailer.c:878
-msgid "Duration"
-msgstr "Продължителност"
-
-#: ../src/totem-uri.c:506 ../src/plugins/chapters/totem-chapters.c:998
+#: ../src/totem-uri.c:343 ../src/plugins/chapters/totem-chapters.c:998
 msgid "All files"
 msgstr "Всички файлове"
 
-#: ../src/totem-uri.c:511 ../src/plugins/chapters/totem-chapters.c:995
+#: ../src/totem-uri.c:348 ../src/plugins/chapters/totem-chapters.c:995
 msgid "Supported files"
 msgstr "Поддържани файлове"
 
-#: ../src/totem-uri.c:523
+#: ../src/totem-uri.c:360
 msgid "Audio files"
 msgstr "Аудио файлове"
 
-#: ../src/totem-uri.c:531
+#: ../src/totem-uri.c:368
 msgid "Video files"
 msgstr "Видео файлове"
 
-#: ../src/totem-uri.c:541
+#: ../src/totem-uri.c:378
 msgid "Subtitle files"
 msgstr "Файлове със субтитри"
 
-#: ../src/totem-uri.c:593
+#: ../src/totem-uri.c:430
 msgid "Select Text Subtitles"
 msgstr "Шрифт за субтитрите"
 
-#: ../src/totem-uri.c:656
+#: ../src/totem-uri.c:495
 msgid "Select Movies or Playlists"
 msgstr "Избор на филми или списъци за изпълнение"
 
-#. Options parsing
-#: ../src/totem.c:201
-msgid "- Play movies and songs"
-msgstr "— Гледане на филми и слушане на песни"
-
-#: ../src/totem.c:212
-#, c-format
-msgid ""
-"%s\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"%s\n"
-"Стартирайте „%s --help“, за да видите пълния списък с опции за командния "
-"ред.\n"
-
-#: ../src/totem.c:254 ../src/totem.c:265
-#: ../browser-plugin/totem-plugin-viewer.c:663
-#: ../browser-plugin/totem-plugin-viewer.c:1793
-msgid "Totem Movie Player"
-msgstr "Изпълнение на филми (Totem)"
-
-#: ../src/totem.c:255 ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Could not initialize the thread-safe libraries."
-msgstr ""
-"Библиотеките за безопасна работа с нишки не могат да бъдат инициализирани."
-
-#: ../src/totem.c:255
-msgid "Verify your system installation. Totem will now exit."
-msgstr "Проверете системата си. Totem ще бъде спрян."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:1589
-msgid "Password requested for RTSP server"
-msgstr "Сървърът за RTSP изисква парола"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2858
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2862
-#, c-format
-msgid "Audio Track #%d"
-msgstr "Аудио № %d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2890
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2894
-#, c-format
-msgid "Subtitle #%d"
-msgstr "Субтитри № %d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3298
-msgid ""
-"The requested audio output was not found. Please select another audio output "
-"in the Multimedia Systems Selector."
-msgstr ""
-"Необходимият изход на звука не е намерен. Изберете друг изход на звука в "
-"„Избор на мултимедийни системи“"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3303
-msgid "Location not found."
-msgstr "Местоположението не е намерено."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3307
-msgid ""
-"Could not open location; you might not have permission to open the file."
-msgstr ""
-"Местоположението не може да бъде отворено. Може да нямате права да отворите "
-"файла."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3318
-msgid ""
-"The video output is in use by another application. Please close other video "
-"applications, or select another video output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"Видео изходът се използва от друга програма. Затворете другите видео "
-"програми или изберете друг видео изход в „Избор на мултимедийни системи“."
+#: ../src/totem-uri.c:499
+msgid "Add Directory"
+msgstr "Добавяне на папка"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3324
-msgid ""
-"The audio output is in use by another application. Please select another "
-"audio output in the Multimedia Systems Selector. You may want to consider "
-"using a sound server."
-msgstr ""
-"Изходът на звука се използва от друга програма. Изберете друг изход на звука "
-"в „Избор на мултимедийни системи“. Замислете се за ползването на звуков "
-"сървър."
+#: ../src/totem-video-list.c:330
+msgid "No video URI"
+msgstr "Липсва адрес на видео"
 
-#. should be exactly one missing thing (source or converter)
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3342
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3348
+#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
+#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
+#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
+#: ../src/totem-video-thumbnailer.c:848
 #, c-format
-msgid "The playback of this movie requires a %s plugin which is not installed."
-msgid_plural ""
-"The playback of this movie requires the following decoders which are not "
-"installed:\n"
-"\n"
-"%s"
-msgstr[0] ""
-"Изпълнението на този филм изисква приставката „%s“, която не е инсталирана."
-msgstr[1] ""
-"Изпълнението на този филм изисква следните декодери, които не са "
-"инсталирани:\n"
-"\n"
-"%s"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3374
 msgid ""
-"Cannot play this file over the network. Try downloading it to disk first."
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 msgstr ""
-"Файлът не може да бъде изпълнен през мрежата. Опитайте да го изтеглите на "
-"локалния диск."
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5878
-msgid "Media contains no supported video streams."
-msgstr "Медията съдържа неподдържани видео потоци."
+#: ../src/totem-video-thumbnailer.c:849
+msgid "Filename"
+msgstr "Име на файл"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6052
-msgid ""
-"Failed to create a GStreamer play object. Please check your GStreamer "
-"installation."
-msgstr ""
-"Неуспех при създаването на обект за изпълнение на GStreamer. Проверете "
-"инсталацията на GStreamer."
+#: ../src/totem-video-thumbnailer.c:851
+msgid "Resolution"
+msgstr "Разделителна способност"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6172
-msgid ""
-"Failed to open audio output. You may not have permission to open the sound "
-"device, or the sound server may not be running. Please select another audio "
-"output in the Multimedia Systems Selector."
-msgstr ""
-"Неуспех при отварянето на изхода за звука. Възможно е да нямате права да "
-"отворите звуковата карта или е възможно звуковият сървър да не работи. "
-"Изберете друг звуков изход от „Избор на мултимедийни системи“."
+#: ../src/totem-video-thumbnailer.c:854
+msgid "Duration"
+msgstr "Продължителност"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6192
-msgid ""
-"Could not find the audio output. You may need to install additional "
-"GStreamer plugins, or select another audio output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"Неуспех при откриването на изхода на звука. Може да се наложи да инсталирате "
-"допълнителни приставки на GStreamer или да изберете друг изход на звука от "
-"„Избор на мултимедийни системи“."
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:1
+msgid "Apple Trailers"
+msgstr "Реклами на предстоящи филми предоставени от Епъл"
+
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:2
+msgid "Sets the user agent for the Apple Trailers site"
+msgstr ""
+"Задаване на името на потребителския агент за уеб страницата за преглед на "
+"реклами на предстоящи филми на Епъл"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:1
+msgid "Autoload Subtitles"
+msgstr "Автоматично зареждане на субтитри"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:2
+msgid "Autoloads text subtitles"
+msgstr "Субтитрите в текстов формат се зареждат автоматично"
 
-#. hour:minutes:seconds
-#. Translators: This is a time format, like "9:05:02" for 9
-#. * hours, 5 minutes, and 2 seconds. You may change ":" to
-#. * the separator that your locale uses or use "%Id" instead
-#. * of "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:83 ../src/plugins/skipto/totem-time-entry.c:57
-#, c-format
-msgctxt "long time format"
-msgid "%d:%02d:%02d"
-msgstr "%d:%02d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
+msgid "Video Disc Recorder"
+msgstr "Записване на видео дискове"
 
-#. minutes:seconds
-#. Translators: This is a time format, like "5:02" for 5
-#. * minutes and 2 seconds. You may change ":" to the
-#. * separator that your locale uses or use "%Id" instead of
-#. * "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:92
-#, c-format
-msgctxt "short time format"
-msgid "%d:%02d"
-msgstr "%d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
+msgid "Records (S)VCDs or video DVDs"
+msgstr "Запис на (S)VCDs или видео DVDs"
 
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:65
 msgid "_Create Video Disc..."
@@ -1984,37 +1837,20 @@
 msgid "Copy the currently playing (S)VCD"
 msgstr "Копиране на текущо изпълнявания (S)VCD"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:129
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:136
 msgid "The video disc could not be duplicated."
 msgstr "Видео дискът не може да бъде копиран."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:131
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:276
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:138
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:283
 msgid "The movie could not be recorded."
 msgstr "Филмът не може да бъде записан."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:157
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:167
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:263
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:164
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:174
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:270
 msgid "Unable to write a project."
-msgstr "Проектът не може да бъде запазен."
-
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
-msgid "Video Disc Recorder"
-msgstr "Записване на видео дискове"
-
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
-msgid "Records (S)VCDs or video DVDs"
-msgstr "Запис на (S)VCDs или видео DVDs"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:1
-#: ../src/plugins/chapters/totem-chapters.c:1139
-msgid "Chapters"
-msgstr "Глави"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:2
-msgid "Support chapter markers in movies."
-msgstr "Включване на маркиране на глави във филми."
+msgstr "Проектът не може да бъде запазен."
 
 #: ../src/plugins/chapters/chapters-edit.ui.h:1
 msgid "Name for new chapter:"
@@ -2072,6 +1908,15 @@
 msgid "Create a new chapter list for the movie"
 msgstr "Създаване на нов списък с глави за филма"
 
+#: ../src/plugins/chapters/chapters.plugin.in.h:1
+#: ../src/plugins/chapters/totem-chapters.c:1139
+msgid "Chapters"
+msgstr "Глави"
+
+#: ../src/plugins/chapters/chapters.plugin.in.h:2
+msgid "Support chapter markers in movies"
+msgstr "Включване на маркиране на глави във филми"
+
 #: ../src/plugins/chapters/totem-chapters.c:56
 #, c-format
 msgid ""
@@ -2160,7 +2005,7 @@
 #: ../src/plugins/dbusservice/dbusservice.py:243
 #, python-format
 msgid "The MediaPlayer2 object does not implement the ‘%s’ interface"
-msgstr "Обектът MediaPlayer2 не поддържа интерфейса „%s“"
+msgstr "В обекта MediaPlayer2 липсва реализация на интерфейса „%s“"
 
 #: ../src/plugins/dbusservice/dbusservice.py:222
 #, python-format
@@ -2177,15 +2022,37 @@
 msgid "The URI ‘%s’ is not supported."
 msgstr "Адресът „%s“ не се поддържа."
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
-msgid "Instant Messenger status"
-msgstr "Състояние за моментни съобщения"
+#: ../src/plugins/grilo/grilo.plugin.in.h:1
+msgid "Grilo Browser"
+msgstr "Браузър Grilo"
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
-msgid "Set your Instant Messenger status to away when a movie is playing"
-msgstr ""
-"Програмата за бързи съобщения да преминава в състояние „Отсъствам“ при "
-"изпълнението на филм"
+#: ../src/plugins/grilo/grilo.plugin.in.h:2
+msgid "A plugin to let you browse media content from various sources"
+msgstr "Приставка за разглеждане на медия от различни сайтове"
+
+#: ../src/plugins/grilo/grilo.ui.h:1
+msgid "Add to Playlist"
+msgstr "Добавяне към списъка за изпълнение"
+
+#: ../src/plugins/grilo/grilo.ui.h:2
+msgid "Copy Location"
+msgstr "Копиране на местоположението"
+
+#: ../src/plugins/grilo/grilo.ui.h:3 ../src/plugins/grilo/totem-grilo.c:1186
+msgid "Browse"
+msgstr "Разглеждане"
+
+#: ../src/plugins/grilo/grilo.ui.h:4 ../src/plugins/grilo/totem-grilo.c:1229
+msgid "Search"
+msgstr "Търсене"
+
+#: ../src/plugins/grilo/totem-grilo.c:454
+msgid "Browse Error"
+msgstr "Грешка при разглеждане"
+
+#: ../src/plugins/grilo/totem-grilo.c:609
+msgid "Search Error"
+msgstr "Грешка при търсене"
 
 #: ../src/plugins/gromit/gromit.plugin.in.h:1
 msgid "Gromit Annotations"
@@ -2199,58 +2066,15 @@
 msgid "The gromit binary was not found."
 msgstr "Изпълнимият файл на gromit не е открит."
 
-#. Add the interface to Totem's sidebar
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:1
-#: ../src/plugins/iplayer/iplayer.py:46
-msgid "BBC iPlayer"
-msgstr "Материали от BBC"
-
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:2
-msgid "Stream BBC programs from the last 7 days from the BBC iPlayer service."
-msgstr ""
-"Пускане на потоци с програмата на BBC от последните 7 дни от тяхната услуга "
-"iPlayer."
-
-#: ../src/plugins/iplayer/iplayer.py:72
-msgid "Error listing channel categories"
-msgstr "Грешка при изтеглянето на категориите канали"
-
-#: ../src/plugins/iplayer/iplayer.py:73
-msgid ""
-"There was an unknown error getting the list of television channels available "
-"on BBC iPlayer."
-msgstr ""
-"Непозната грешка при изтеглянето на списъка с телевизионни канали достъпни "
-"през услугата iPlayer на BBC."
-
-#. Append a dummy child row so that the expander's visible; we can
-#. then queue off the expander to load the programme listing for this
-#. category
-#: ../src/plugins/iplayer/iplayer.py:84
-msgid "Loading…"
-msgstr "Зареждане…"
-
-#. Translators: the "programme feed" is the list of TV shows
-#. available to watch online
-#: ../src/plugins/iplayer/iplayer.py:136
-msgid "Error getting programme feed"
-msgstr "Грешка при изтеглянето на предаванията"
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
+msgid "Instant Messenger Status"
+msgstr "Състояние за моментни съобщения"
 
-#: ../src/plugins/iplayer/iplayer.py:137
-msgid ""
-"There was an error getting the list of programmes for this channel and "
-"category combination."
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
+msgid "Set your Instant Messenger status to away when a movie is playing"
 msgstr ""
-"Грешка при изтеглянето на списъка с предавания от категорията в този канал."
-
-#: ../src/plugins/iplayer/iplayer2.py:298
-msgid ""
-msgstr "<няма подадена причина>"
-
-#: ../src/plugins/iplayer/iplayer2.py:299
-#, python-format
-msgid "Programme unavailable (\"%s\")"
-msgstr "Предаването е недостъпно („%s“)"
+"Програмата за бързи съобщения да преминава в състояние „Отсъствам“ при "
+"изпълнението на филм"
 
 #: ../src/plugins/lirc/lirc.plugin.in.h:1
 msgid "Infrared Remote Control"
@@ -2268,25 +2092,29 @@
 msgid "Couldn't read lirc configuration."
 msgstr "Настройките на lirc не могат да бъдат прочетени."
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
-msgid "Download Movie Subtitles"
-msgstr "Изтегляне на субтитрите на филма"
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:1
+msgid "Media Player Keys"
+msgstr "Клавиши за мултимедия"
+
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:2
+msgid "Support additional media player keys"
+msgstr "Поддръжка на допълнителни клавиши за мултимедия"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
-msgid "Subtitle _language:"
-msgstr "_Език на субтитрите:"
+#: ../src/plugins/ontop/ontop.plugin.in.h:1
+msgid "Always On Top"
+msgstr "Винаги най-отгоре"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
-msgid "_Play with Subtitle"
-msgstr "_Изпълнение със субтитри"
+#: ../src/plugins/ontop/ontop.plugin.in.h:2
+msgid "Keep the main window on top when playing a movie"
+msgstr "Главният прозорец да стои най-отгоре при изпълнение на филм."
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:1
 msgid "Subtitle Downloader"
 msgstr "Изтегляне на субтитри"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:2
-msgid "Look for subtitles for the currently playing movie."
-msgstr "Търсене на субтитри за текущо изпълнявания филм."
+msgid "Look for subtitles for the currently playing movie"
+msgstr "Търсене на субтитри за текущо изпълнявания филм"
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:42
 msgid "Brazilian Portuguese"
@@ -2342,6 +2170,18 @@
 msgid "Searching subtitles…"
 msgstr "Търсене на субтитри…"
 
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
+msgid "Download Movie Subtitles"
+msgstr "Изтегляне на субтитрите на филма"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
+msgid "Subtitle _language:"
+msgstr "_Език на субтитрите:"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
+msgid "_Play with Subtitle"
+msgstr "_Изпълнение със субтитри"
+
 #: ../src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in.h:1
 msgid "Subtitle language"
 msgstr "Език на субтитрите"
@@ -2350,81 +2190,18 @@
 msgid "The language to search for subtitles for movies in."
 msgstr "Езикът, за който да се търсят субтитри на филмите."
 
-#: ../src/plugins/ontop/ontop.plugin.in.h:1
-msgid "Always On Top"
-msgstr "Винаги най-отгоре"
-
-#: ../src/plugins/ontop/ontop.plugin.in.h:2
-msgid "Keep the main window on top when playing a movie"
-msgstr "Главният прозорец да стои най-отгоре при изпълнение на филм."
+#: ../src/plugins/properties/movie-properties.plugin.in.h:1
+msgid "Movie Properties"
+msgstr "Информация за филма"
+
+#: ../src/plugins/properties/movie-properties.plugin.in.h:2
+msgid "Adds movie properties to the sidebar"
+msgstr "Показване на информация за филма в страничния панел"
 
 #: ../src/plugins/properties/totem-movie-properties.c:246
 msgid "Properties"
 msgstr "Подробности"
 
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:1
-msgid "Publisher protocol to use"
-msgstr "Протоколът, който да се използва за публикуване"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:2
-msgid ""
-"The transport protocol to use when publishing playlists over the network."
-msgstr ""
-"Транспортният протокол, който да се използва при публикуване на списъците за "
-"изпълнение по мрежата."
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:3
-msgid "Format for network service name"
-msgstr "Формат на името на мрежовата услуга"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:5
-#, no-c-format
-msgid ""
-"A format string used to build the network service name used when publishing "
-"playlists over the network. The following format placeholders can be used: • "
-"%a: the program name as returned by g_get_application_name() • %h: the "
-"machine's host name in title case • %u: the user's login name in title case "
-"• %U: the user's real name • %%: the percent sign"
-msgstr ""
-"Форматиращ низ за съставянето на име за мрежовата услуга при публикуване на "
-"списък за изпълнение по мрежата. Можете да използвате следните шаблонни "
-"изрази: • %a: името на програмата връщано от функцията g_get_application_name"
-"() • %h: името на машината с първи главни букви • %u: името на потребителя с "
-"първи главни букви • %U: истинското име на потребителя • %%: знакът за "
-"процент."
-
-#. Translators: computers on the local network which are publishing their playlists over the network
-#: ../src/plugins/publish/totem-publish.c:552
-msgid "Neighbors"
-msgstr "Съседи"
-
-#: ../src/plugins/publish/publish.plugin.in.h:1
-msgid "Publish Playlist"
-msgstr "Публикуване на списък за изпълнение"
-
-#: ../src/plugins/publish/publish.plugin.in.h:2
-msgid "Share the current playlist via HTTP"
-msgstr "Споделяне на текущия списък за изпълнение по HTTP"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:1
-msgid "Service _Name:"
-msgstr "_Име на услугата:"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:3
-#, no-c-format
-msgid ""
-"The name used for announcing the playlist service on the network.\n"
-"All occurrences of the string %u will be replaced by your name,\n"
-"and %h will be replaced by your computer's host name."
-msgstr ""
-"Името на услугата със списъка за изпълнение, което да се обяви по мрежата. "
-"Всички появи на низа %u ще бъдат заменени от потребителското ви име, "
-"а на низа %h с името на компютъра ви."
-
-#: ../src/plugins/publish/publish-plugin.ui.h:6
-msgid "Use _encrypted transport protocol (HTTPS)"
-msgstr "Използване на _шифриран транспортен протокол (HTTPS)"
-
 #: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:1
 msgid "rpdb2 password"
 msgstr "Парола за rpdb2"
@@ -2437,22 +2214,86 @@
 "Парола за защита на сървъра за изчистване на грешки rpdb2 от неупълномощен "
 "достъп. Ако е празно, се използва стандартната парола „totem“.."
 
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
+msgid "Python Console"
+msgstr "Конзола на Питон"
+
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
+msgid "Interactive Python console"
+msgstr "Интерактивна конзола на Питон."
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:88
+msgid "Python Console Menu"
+msgstr "Меню за конзолата на Питон"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:93
+msgid "_Python Console"
+msgstr "_Конзола на Питон"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:94
+msgid "Show Totem's Python console"
+msgstr "Показване на конзолата на Питон"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:100
+msgid "Python Debugger"
+msgstr "Изчистване на грешки на Питон"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:101
+msgid "Enable remote Python debugging with rpdb2"
+msgstr "Включване на отдалеченото изчистване на грешки на Питон с rpdb2"
+
+#. pylint: disable-msg=E1101
+#: ../src/plugins/pythonconsole/pythonconsole.py:125
+#, python-format
+msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
+msgstr "Обектът на Totem е достъпен като „totem_object“: \\n%s"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:129
+msgid "Totem Python Console"
+msgstr "Конзола на Питон за Totem"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:139
+msgid ""
+"After you press OK, Totem will wait until you connect to it with winpdb or "
+"rpdb2. If you have not set a debugger password in DConf, it will use the "
+"default password ('totem')."
+msgstr ""
+"След като натиснете „Добре“, Totem ще изчака да се свържете с него чрез "
+"winpdb или rpdb2. Ако не сте задали парола за изчистване на грешки в GConf, "
+"ще се ползва стандартната („totem“)."
+
+#: ../src/plugins/recent/recent.plugin.in.h:1
+msgid "Recent files"
+msgstr "Скоро отваряне файлове"
+
+#: ../src/plugins/recent/recent.plugin.in.h:2
+msgid "Adds files that have been played to recent files"
+msgstr "Изпълнените файлове да се добавят в скоро отваряните файлове"
+
 #: ../src/plugins/rotation/rotation.plugin.in.h:1
 msgid "Rotation Plugin"
 msgstr "Приставка за завъртане"
 
 #: ../src/plugins/rotation/rotation.plugin.in.h:2
-msgid "Allows videos to be rotated if they're in the wrong orientation."
-msgstr "Завъртане на видеото, ако ориентацията му е грешна."
+msgid "Allows videos to be rotated if they are in the wrong orientation"
+msgstr "Завъртане на видеото, ако ориентацията му е грешна"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:60
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:50
 msgid "_Rotate Clockwise"
 msgstr "По _часовниковата стрелка"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:62
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:52
 msgid "Rotate Counterc_lockwise"
 msgstr "_Обратно на часовниковата стрелка"
 
+#: ../src/plugins/save-file/save-file.plugin.in.h:1
+msgid "Save Copy"
+msgstr "Запазване на копие"
+
+#: ../src/plugins/save-file/save-file.plugin.in.h:2
+msgid "Save a copy of the currently playing movie"
+msgstr "Копиране на текущия изпълняван филм"
+
 #: ../src/plugins/save-file/totem-save-file.c:63
 msgid "Save a Copy..."
 msgstr "Запазване на копие…"
@@ -2475,10 +2316,13 @@
 msgid "Movie stream"
 msgstr "Филмов поток"
 
-#: ../src/plugins/screensaver/totem-screensaver.c:116
-#: ../browser-plugin/totem-plugin-viewer.c:1891
-msgid "Playing a movie"
-msgstr "Изпълнение на филм"
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:1
+msgid "Screen Saver"
+msgstr "Предпазител на екрана"
+
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:2
+msgid "Deactivates the screen saver when a movie is playing"
+msgstr "Изключване на предпазителя на екрана при изпълнение"
 
 #: ../src/plugins/screenshot/gallery.ui.h:1
 msgid "Screenshot width (in pixels):"
@@ -2492,23 +2336,28 @@
 msgid "Number of screenshots:"
 msgstr "Брой кадри:"
 
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:1
-msgid "_Name:"
-msgstr "_Име:"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:2
-msgid "Save in _folder:"
-msgstr "_Папка за запис:"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:3
-msgid "Select a folder"
-msgstr "Изберете папка"
-
-#. Write the screenshot to the temporary file
-#: ../src/plugins/screenshot/gnome-screenshot-widget.c:385
-#: ../src/plugins/screenshot/totem-screenshot.c:64
-msgid "Screenshot.png"
-msgstr "Филмов_кадър.png"
+#. translators: this is the name of the file that gets made up
+#. * with the screenshot if the entire screen is taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:147
+#, c-format
+msgid "Screenshot from %s.png"
+msgstr "Филмов_кадър от %s.png"
+
+#. translators: this is the name of the file that gets
+#. * made up with the screenshot if the entire screen is
+#. * taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:154
+#, c-format
+msgid "Screenshot from %s - %d.png"
+msgstr "Филмов_кадър от %s — %d.png"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:1
+msgid "Screenshot"
+msgstr "Филмов_кадър"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:2
+msgid "Allows screenshots and galleries to be taken of videos"
+msgstr "Разрешаване на заснемането на кадри и галерии от филми"
 
 #: ../src/plugins/screenshot/totem-gallery.c:91
 msgid "Save Gallery"
@@ -2534,49 +2383,47 @@
 msgid "Saving gallery as \"%s\""
 msgstr "Запазване на галерията като „%s“"
 
-#: ../src/plugins/screenshot/totem-screenshot.c:113
-msgid "There was an error saving the screenshot."
-msgstr "Имаше грешка при запазването на кадъра."
-
-#: ../src/plugins/screenshot/totem-screenshot.c:139
-msgid "Save Screenshot"
-msgstr "Запазване на кадър"
-
-#. Create the screenshot widget
-#. Translators: %s is the movie title and %d is an auto-incrementing number to make filename unique
-#: ../src/plugins/screenshot/totem-screenshot.c:160
-#, c-format
-msgid "Screenshot-%s-%d.png"
-msgstr "Филмов_кадър-%s-%d.png"
-
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:88
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:220
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "Totem could not get a screenshot of the video."
 msgstr "Totem не можа да заснеме кадър от този филм."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "This is not supposed to happen; please file a bug report."
 msgstr "Това не трябва да се случва! Моля, подайте доклад за грешка."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
-msgid "Take _Screenshot..."
-msgstr "_Снимане на кадър…"
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
+msgid "Take _Screenshot"
+msgstr "_Снимане на кадър"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
 msgid "Take a screenshot"
 msgstr "Заснемане на текущия кадър"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create Screenshot _Gallery..."
 msgstr "Заснемане на _галерия от кадри…"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create a gallery of screenshots"
 msgstr "Заснемане на галерия от кадри"
 
+#: ../src/plugins/skipto/skipto.plugin.in.h:1
+#: ../src/plugins/skipto/totem-skipto.c:196
+msgid "Skip To"
+msgstr "Прескачане до"
+
+#: ../src/plugins/skipto/skipto.plugin.in.h:2
+msgid "Provides the \"Skip to\" dialog"
+msgstr "Предоставя прозореца „Прескачане до“"
+
+#: ../src/plugins/skipto/skipto.ui.h:1
+msgid "_Skip to:"
+msgstr "Пре_скачане до:"
+
 #. Update the "seconds" label so that it always has the correct singular/plural form
 #. Translators: label for the seconds selector in the "Skip to" dialogue
-#: ../src/plugins/skipto/totem-skipto.c:160
+#: ../src/plugins/skipto/totem-skipto.c:159
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "секунда"
@@ -2586,15 +2433,11 @@
 #. Translators: you should translate this string to a number (written in digits) which corresponds to the longer character length of the
 #. * translations for "second" and "seconds", as translated elsewhere in this file. For example, in English, "second" is 6 characters long and
 #. * "seconds" is 7 characters long, so this string should be translated to "7". See: bgo#639398
-#: ../src/plugins/skipto/totem-skipto.c:190
+#: ../src/plugins/skipto/totem-skipto.c:189
 msgctxt "Skip To label length"
 msgid "7"
 msgstr "7"
 
-#: ../src/plugins/skipto/totem-skipto.c:197
-msgid "Skip To"
-msgstr "Прескачане до"
-
 #: ../src/plugins/skipto/totem-skipto-plugin.c:182
 msgid "_Skip To..."
 msgstr "Прескачане _до…"
@@ -2602,111 +2445,3 @@
 #: ../src/plugins/skipto/totem-skipto-plugin.c:182
 msgid "Skip to a specific time"
 msgstr "Прескачане до зададено време"
-
-#: ../src/plugins/skipto/skipto.ui.h:1
-msgid "_Skip to:"
-msgstr "Пре_скачане до:"
-
-#: ../browser-plugin/totem-plugin-viewer.c:431
-msgid "No URI to play"
-msgstr "Няма адрес за изпълнение"
-
-#. translators: this is:
-#. * Open With ApplicationName
-#. * as in nautilus' right-click menu
-#: ../browser-plugin/totem-plugin-viewer.c:1107
-#, c-format
-msgid "_Open with \"%s\""
-msgstr "_Отваряне с „%s“"
-
-#: ../browser-plugin/totem-plugin-viewer.c:2136
-msgid "No playlist or playlist empty"
-msgstr "Или няма списък за изпълнение, или той е празен"
-
-#: ../browser-plugin/totem-plugin-viewer.c:2235
-msgid "Movie browser plugin"
-msgstr "Приставка за филми за браузъри"
-
-#: ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Verify your system installation. The Totem plugin will now exit."
-msgstr "Проверете системата си. Приставката на Totem ще бъде спряна."
-
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
-msgid "Python Console"
-msgstr "Конзола на Питон"
-
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
-msgid "Interactive Python console."
-msgstr "Интерактивна конзола на Питон."
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:88
-msgid "Python Console Menu"
-msgstr "Меню за конзолата на Питон"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:93
-msgid "_Python Console"
-msgstr "_Конзола на Питон"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:94
-msgid "Show Totem's Python console"
-msgstr "Показване на конзолата на Питон"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:100
-msgid "Python Debugger"
-msgstr "Изчистване на грешки на Питон"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:101
-msgid "Enable remote Python debugging with rpdb2"
-msgstr "Включване на отдалеченото изчистване на грешки на Питон с rpdb2"
-
-#. pylint: disable-msg=E1101
-#: ../src/plugins/pythonconsole/pythonconsole.py:125
-#, python-format
-msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
-msgstr "Обектът на Totem е достъпен като „totem_object“: \\n%s"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:129
-msgid "Totem Python Console"
-msgstr "Конзола на Питон за Totem"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:139
-msgid ""
-"After you press OK, Totem will wait until you connect to it with winpdb or "
-"rpdb2. If you have not set a debugger password in DConf, it will use the "
-"default password ('totem')."
-msgstr ""
-"След като натиснете „Добре“, Totem ще изчака да се свържете с него чрез "
-"winpdb или rpdb2. Ако не сте задали парола за изчистване на грешки в GConf, "
-"ще се ползва стандартната („totem“)."
-
-#: ../src/plugins/grilo/grilo.plugin.in.h:1
-msgid "Grilo Browser"
-msgstr "Браузър Grilo"
-
-#: ../src/plugins/grilo/grilo.plugin.in.h:2
-msgid "A plugin to let you browse media content from various sources."
-msgstr "Приставка за разглеждане на медия от различни сайтове."
-
-#: ../src/plugins/grilo/totem-grilo.c:452
-msgid "Browse Error"
-msgstr "Грешка при разглеждане"
-
-#: ../src/plugins/grilo/totem-grilo.c:599
-msgid "Search Error"
-msgstr "Грешка при търсене"
-
-#: ../src/plugins/grilo/totem-grilo.c:1219 ../src/plugins/grilo/grilo.ui.h:3
-msgid "Browse"
-msgstr "Разглеждане"
-
-#: ../src/plugins/grilo/totem-grilo.c:1285 ../src/plugins/grilo/grilo.ui.h:4
-msgid "Search"
-msgstr "Търсене"
-
-#: ../src/plugins/grilo/grilo.ui.h:1
-msgid "Add to Playlist"
-msgstr "Добавяне към списъка за изпълнение"
-
-#: ../src/plugins/grilo/grilo.ui.h:2
-msgid "Copy Location"
-msgstr "Копиране на местоположението"
diff -Nru totem-3.4.3/po/bn_IN.po totem-3.6.2/po/bn_IN.po
--- totem-3.4.3/po/bn_IN.po	2011-08-25 18:35:01.000000000 +0000
+++ totem-3.6.2/po/bn_IN.po	2012-10-25 13:15:32.000000000 +0000
@@ -4,1038 +4,1037 @@
 # Runa Bhattacharjee, 2003.
 # Runa Bhattacharjee , 2007.
 # Runa Bhattacharjee , 2008.
-# Runa Bhattacharjee , 2008, 2009, 2010.
+# Runa Bhattacharjee , 2008, 2009, 2010, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: bn_IN\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=totem&component=general\n"
-"POT-Creation-Date: 2010-04-08 12:54+0000\n"
-"PO-Revision-Date: 2010-04-17 15:03+0530\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=totem&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2012-09-10 15:48+0000\n"
+"PO-Revision-Date: 2012-10-17 00:17+0530\n"
 "Last-Translator: Runa Bhattacharjee \n"
-"Language-Team: Bengali INDIA \n"
+"Language-Team: Bengali (India) \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 1.2\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "\n"
 "\n"
 
+# msgstr "স্ট্যাটাসবারে লিখিত টেক্সটের চারপাশে প্রদর্শিত বেভেলের ধরন"
+#: ../browser-plugin/totem-plugin-viewer.c:352 ../src/totem-object.c:1180
+#: ../src/totem-object.c:1650 ../src/totem-statusbar.c:115
+msgid "Stopped"
+msgstr "স্থগিত"
+
+#: ../browser-plugin/totem-plugin-viewer.c:364 ../src/totem-object.c:1173
+msgid "Paused"
+msgstr "থামানো হয়েছে"
+
+#: ../browser-plugin/totem-plugin-viewer.c:368 ../src/totem-object.c:1166
+msgid "Playing"
+msgstr "চালানো হচ্ছে"
+
+#: ../browser-plugin/totem-plugin-viewer.c:386
+#: ../src/plugins/screensaver/totem-screensaver.c:97
+msgid "Playing a movie"
+msgstr "চলচ্চিত্র চালানো হচ্ছে"
+
+#: ../browser-plugin/totem-plugin-viewer.c:443
+msgid "No URI to play"
+msgstr "চালানোর জন্য কোনো URI চিহ্নিত করা হয়নি"
+
+# বাজানো হোক, দেখানো হোক
+# msgstr "চলচ্চিত্র ও গান চালানো হোক" <-- Short cut ;-)
+#: ../browser-plugin/totem-plugin-viewer.c:676
+#: ../browser-plugin/totem-plugin-viewer.c:1700
+msgid "Totem Movie Player"
+msgstr "Totem মুভি প্লেয়ার"
+
+#. translators: this is:
+#. * Open With ApplicationName
+#. * as in nautilus' right-click menu
+#: ../browser-plugin/totem-plugin-viewer.c:1120
+#, c-format
+msgid "_Open with \"%s\""
+msgstr "\"%s\" সহযোগে খুলুন (_O)"
+
+#: ../browser-plugin/totem-plugin-viewer.c:1341 ../src/totem-object.c:2475
+msgid "An error occurred"
+msgstr "সমস্যা উৎপন্ন হয়েছে"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2033
+msgid "No playlist or playlist empty"
+msgstr "প্লে-লিস্ট ফাঁকা অথবা অনুপস্থিত"
+
+# বাজানো হোক, দেখানো হোক
+# msgstr "চলচ্চিত্র ও গান চালানো হোক" <-- Short cut ;-)
+#: ../browser-plugin/totem-plugin-viewer.c:2128
+msgid "Movie browser plugin"
+msgstr "চলচ্চিত্র ব্রাউজার প্লাগ-ইন"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144 ../src/totem.c:240
+msgid "Could not initialize the thread-safe libraries."
+msgstr "থ্রেড-সেফ লাইব্রেরি চালু করা যায়নি।"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144
+msgid "Verify your system installation. The Totem plugin will now exit."
+msgstr ""
+"আপনার সিস্টেমের ইনস্টলেশন পরীক্ষা করুন। Totem প্লাগ-ইন এখন বন্ধ করা হবে।"
+
 # msgstr "বের করে দেওয়া হোক (_ব)"
 # Eject অর্থে 'বার' শব্দটা সম্ভবত কথ্য ভাষার। Dict দেখেন।
 #: ../data/fullscreen.ui.h:1
 msgid "Leave Fullscreen"
 msgstr "সম্পূর্ণ পর্দায় প্রদর্শন বন্ধ করুন"
 
-#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:98
+#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:81
 msgid "Time:"
 msgstr "সময়:"
 
-#: ../data/playlist.ui.h:1
-msgid "Add..."
-msgstr "যোগ করুন..."
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
+msgid "Allow the screensaver to activate when playing audio"
+msgstr "অডিও চালনার সময় স্ক্রিন-সেভার সক্রিয় করার সুবিধা উপলব্ধ করা হবে"
 
-#: ../data/playlist.ui.h:2 ../data/video-list.ui.h:2
-msgid "Copy the location to the clipboard"
-msgstr "নির্বাচিত অবস্থান ক্লিপ-বোর্ডে কপি করুন"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
+msgid ""
+"Allow the screensaver to activate when playing audio. Disable if you have "
+"monitor-powered speakers."
+msgstr ""
+"অডিও চালনার সময় স্ক্রিন-সেভার সক্রিয় করার সুবিধা উপলব্ধ করা হবে। মনিটর থেকে "
+"বিদ্যুৎ "
+"প্রয়োগ করে চালিত স্পিকারের ক্ষেত্রে এটি নিষ্ক্রিয় করুন।"
 
-#: ../data/playlist.ui.h:3
-msgid "Move Down"
-msgstr "নীচে স্থানান্তর"
+# msgstr "ফাইল লোড করা হলে স্বয়ংক্রিয়ভাবে ক্যানভাসের আকার পরিবর্তন করা হোক" <-- এটাও সোজা করে দিলাম ;-)
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
+msgid "Show visual effects when no video is displayed"
+msgstr "কোনো ভিডিও প্রদর্শন না করা হলে ভিজুয়াল ইফেক্ট প্রদর্শন করা হবে"
 
-#: ../data/playlist.ui.h:4
-msgid "Move Up"
-msgstr "উপরে স্থানান্তর"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
+msgid "Show visual effects when playing an audio only file."
+msgstr "শুধুমাত্র অডিও সহ ফাইল চালানো হলে ভিজুয়াল ইফেক্ট প্রদর্শন করা হবে।"
 
-#: ../data/playlist.ui.h:5
-msgid "Remove"
-msgstr "অপসারণ"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
+#| msgid "Name of the visual effects plugins"
+msgid "Name of the visual effects plugin"
+msgstr "ভিজুয়াল ইফেক্ট প্লাগ-ইনের নাম"
 
-#: ../data/playlist.ui.h:6
-msgid "Remove file from playlist"
-msgstr "প্লে-লিস্ট থেকে ফাইল মুছে ফেলুন"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
+msgid "The brightness of the video"
+msgstr "ভিডিও-র উজ্জ্বলতার মাত্রা"
 
-#: ../data/playlist.ui.h:7
-msgid "Save Playlist..."
-msgstr "প্লে-লিস্ট সংরক্ষণ করুন..."
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
+msgid "The contrast of the video"
+msgstr "ভিডিও-র বৈপরিত্যের মাত্রা"
 
-#: ../data/playlist.ui.h:8 ../data/totem.ui.h:73
-msgid "Select a file to use for text subtitles"
-msgstr "অনুবাদলিপির জন্য ব্যবহারযোগ্য ফাইল নির্বাচন করুন"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
+msgid "The hue of the video"
+msgstr "ভিডিও-র হিউ-র মাত্রা"
 
-#: ../data/playlist.ui.h:9 ../data/video-list.ui.h:4
-msgid "_Copy Location"
-msgstr "অবস্থান কপি করুন(_C)"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
+msgid "The saturation of the video"
+msgstr "ভিডিও-র স্যাচুরেশন মাত্রা"
 
-#: ../data/playlist.ui.h:10
-msgid "_Remove"
-msgstr "অপসারণ (_R)"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
+msgid "Resize the canvas automatically on file load"
+msgstr "ফাইল লোড হলে স্বয়ংক্রিয়ভাবে ক্যানভাসের মাপ পুনরায় নির্ধারণ করা হবে"
 
-# msgstr "এই পাসওয়ার্ডটি মনে রাখা হবে"
-#: ../data/playlist.ui.h:11 ../data/totem.ui.h:138
-msgid "_Select Text Subtitles..."
-msgstr "অনুবাদলিপির লেখনি নির্বাচন করুন...(_S)"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
+msgid "Repeat mode"
+msgstr "পুনরাবৃত্তি মোড"
 
-# msgstr "কোনটিই নয়"
-# msgstr "একটিও নয়"
-#: ../data/plugins.ui.h:1
-msgid "Author:"
-msgstr "নির্মাতা:"
-
-#: ../data/plugins.ui.h:2
-msgid "C_onfigure..."
-msgstr "কনফিগার করুন...(_o)"
-
-#: ../data/plugins.ui.h:3
-msgid "Copyright:"
-msgstr "স্বত্বাধিকার:"
-
-#: ../data/plugins.ui.h:4
-msgid "Description:"
-msgstr "বিবরণ:"
-
-#: ../data/plugins.ui.h:5
-msgid "Site:"
-msgstr "সাইট:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
+msgid "Shuffle mode"
+msgstr "পাঁচমিশালি মোড"
 
-#. Channels
-#: ../data/properties.ui.h:1
-#: ../src/plugins/properties/bacon-video-widget-properties.c:173
-msgid "0 Channels"
-msgstr "০ চ্যানেল"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
+#| msgid "Whether to enable debug for the playback engine"
+msgid "Whether to disable deinterlacing for interlaced movies"
+msgstr ""
+"ইন্টারলেস করা চলচ্চিত্রের ক্ষেত্রে ডি-ইন্টারলেসিং নিষ্ক্রিয় করা হবে কি না"
 
-#. Sample rate
-#: ../data/properties.ui.h:2
-#: ../src/plugins/properties/bacon-video-widget-properties.c:171
-msgid "0 Hz"
-msgstr "০ হার্টজ"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
+msgid "Whether to enable debug for the playback engine"
+msgstr "প্লেব্যাক ইঞ্জিনের জন্য ডিবাগ সক্রিয় করা হবে কিনা"
 
-#: ../data/properties.ui.h:3
-msgid "0 frames per second"
-msgstr "প্রতি সেকেন্ডে ০-টি ফ্রেম"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
+msgid "Type of audio output to use"
+msgstr "ব্যবহারের জন্য অডিও আউটপুটের ধরন"
 
-#: ../data/properties.ui.h:4
-msgid "0 kbps"
-msgstr "০ কিলোবাইট/সেকেন্ড"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
+msgid "Visualization quality setting"
+msgstr "ভিশুয়ালাইজেশন প্রদর্শন সংক্রান্ত বৈশিষ্ট্য"
 
-#. 0 seconds
-#: ../data/properties.ui.h:5 ../src/backend/video-utils.c:158
-msgid "0 seconds"
-msgstr "০ সেকেন্ড"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
+msgid "Quality setting for the audio visualization."
+msgstr "অডিও ভিশুয়েলাইজেশনের জন্য ব্যবহারযোগ্য গুণমানের বৈশিষ্ট্য"
 
-#: ../data/properties.ui.h:6
-msgid "0 x 0"
-msgstr "০ x ০"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
+msgid "Network buffering threshold"
+msgstr "নেটওয়ার্ক বাফারের প্রান্তিক মাপ"
 
-#: ../data/properties.ui.h:7
-msgid "Album:"
-msgstr "সংকলন:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
+#| msgid ""
+#| "Amount of data to buffer for network streams before starting to display "
+#| "the stream (in seconds)"
+msgid ""
+"Amount of data to buffer for network streams before starting to display the "
+"stream (in seconds)."
+msgstr ""
+"নেটওয়ার্ক স্ট্রিমের ক্ষেত্রে স্ট্রিম প্রদর্শনের পূর্বে যে পরিমান তথ্য বাফার "
+"করা হবে "
+"(সেকেন্ডে ব্যক্ত)"
 
-#: ../data/properties.ui.h:8
-msgid "Artist:"
-msgstr "শিল্পী:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
+msgid "Subtitle font"
+msgstr "অনুবাদলিপির ফন্ট"
 
-# msgstr "কোনটিই নয়"
-# msgstr "একটিও নয়"
-#: ../data/properties.ui.h:9 ../data/totem.ui.h:23
-#: ../src/totem-properties-view.c:89
-msgid "Audio"
-msgstr "অডিও"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
+#| msgid "Pango font description for subtitle rendering"
+msgid "Pango font description for subtitle rendering."
+msgstr "অনুবাদলিপিতে রেন্ডারিং-র জন্য Pango-র ফন্টের বিবরণ"
 
-#: ../data/properties.ui.h:10
-msgid "Bitrate:"
-msgstr "বিটের মাত্রা:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
+msgid "Subtitle encoding"
+msgstr "অনুবাদলিপির এনকোডিং"
 
-#: ../data/properties.ui.h:11
-msgid "Channels:"
-msgstr "চ্যানেল:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
+#| msgid "Encoding charset for subtitle"
+msgid "Encoding character set for subtitle."
+msgstr "অনুবাদলিপিতে ব্যবহৃত এনকোডিং।"
 
-#: ../data/properties.ui.h:12
-msgid "Codec:"
-msgstr "কোডেক:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
+msgid "Default location for the \"Open...\" dialogs"
+msgstr "\"খুলুন...\" ডায়লগ বক্সগুলির ক্ষেত্রে নির্ধারিত ডিফল্ট অবস্থান"
 
-#: ../data/properties.ui.h:13
-msgid "Comment:"
-msgstr "বক্তব্য:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
+#| msgid ""
+#| "Default location for the \"Open...\" dialogs, default is the current "
+#| "directory"
+msgid ""
+"Default location for the \"Open...\" dialogs. Default is the current "
+"directory."
+msgstr ""
+"\"খুলুন...\" ডায়লগ বক্সগুলির ক্ষেত্রে নির্ধারিত ডিফল্ট অবস্থান। বর্তমান "
+"ডিরেক্টরি ডিফল্ট "
+"রূপে চিহ্নিত হয়।"
 
-#: ../data/properties.ui.h:14
-msgid "Dimensions:"
-msgstr "দিকমাত্রা:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
+msgid "Default location for the \"Take Screenshot\" dialogs"
+msgstr "\"পর্দার ছবি নিন\" শীর্ষক ডায়লগ বক্সের ডিফল্ট অবস্থান"
 
-#: ../data/properties.ui.h:15
-msgid "Duration:"
-msgstr "অবকাল:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
+#| msgid ""
+#| "Default location for the \"Take Screenshot\" dialogs, default is the "
+#| "Pictures directory"
+msgid ""
+"Default location for the \"Take Screenshot\" dialogs. Default is the "
+"Pictures directory."
+msgstr ""
+"\"পর্দার ছবি নিন\" শীর্ষক ডায়লগ বক্সের ডিফল্ট অবস্থান। ডিফল্টরূপে Pictures "
+"ডিরেক্টরি "
+"চিহ্নিত করা হয়।"
 
-#: ../data/properties.ui.h:16
-msgid "Framerate:"
-msgstr "ফ্রেমের মাত্রা:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
+msgid "Whether to disable the plugins in the user's home directory"
+msgstr ""
+"ব্যবহারকারীর ব্যক্তিগত ডিরেক্টরির মধ্যে প্লাগ-ইন নিষ্ক্রিয় করা হবে কি না"
 
-#: ../data/properties.ui.h:17 ../data/totem.ui.h:40
-msgid "General"
-msgstr "সাধারণ"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
+msgid "Whether to disable the keyboard shortcuts"
+msgstr "কি-বোর্ড শর্ট-কাট নিষ্ক্রিয় করা হবে কি না"
 
-#. Dimensions
-#. Video Codec
-#. Audio Codec
-#: ../data/properties.ui.h:18
-#: ../src/plugins/properties/bacon-video-widget-properties.c:156
-#: ../src/plugins/properties/bacon-video-widget-properties.c:158
-#: ../src/plugins/properties/bacon-video-widget-properties.c:161
-#: ../src/plugins/properties/bacon-video-widget-properties.c:164
-#: ../src/plugins/properties/bacon-video-widget-properties.c:167
-#: ../src/plugins/properties/bacon-video-widget-properties.c:169
-#: ../src/plugins/properties/bacon-video-widget-properties.c:238
-#: ../src/plugins/properties/bacon-video-widget-properties.c:240
-#: ../src/plugins/properties/bacon-video-widget-properties.c:257
-#: ../src/plugins/properties/bacon-video-widget-properties.c:260
-msgid "N/A"
-msgstr "প্রযোজ্য নয়"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
+msgid "Whether to autoload text subtitle files when a movie is loaded"
+msgstr "চলচ্চিত্র লোত করামাত্র স্বয়ংক্রিয়রূপে অনুবাদলিপি লোড করা হবে কি না"
 
-#: ../data/properties.ui.h:19
-msgid "Sample rate:"
-msgstr "নমূণার মাত্রা:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
+#| msgid "Whether to autoload text subtitle files when a movie is loaded"
+msgid "Whether to autoload external chapter files when a movie is loaded"
+msgstr "চলচ্চিত্র লোড করামাত্র স্বয়ংক্রিয়রূপে অনুবাদলিপি লোড করা হবে কি না"
 
-#: ../data/properties.ui.h:20
-msgid "Title:"
-msgstr "শিরোনাম:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
+#| msgid ""
+#| "Whether to remember the position of played audio/video files when pausing "
+#| "or closing them."
+msgid ""
+"Whether to remember the position of played audio/video files when pausing or "
+"closing them"
+msgstr ""
+"চলমান অডিও/ভিডিও স্থগিত অথবা বন্ধ করা হলে, ব্যাঘাতের স্থানটি মনে রাখা হবে কি "
+"না।"
 
-#. Title
-#. Artist
-#. Album
-#. Year
-#: ../data/properties.ui.h:21
-#: ../src/plugins/properties/bacon-video-widget-properties.c:143
-#: ../src/plugins/properties/bacon-video-widget-properties.c:145
-#: ../src/plugins/properties/bacon-video-widget-properties.c:147
-#: ../src/plugins/properties/bacon-video-widget-properties.c:149
-msgid "Unknown"
-msgstr "অজানা"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
+msgid "Active plugins list"
+msgstr "সক্রিয় প্লাগ-ইনের তালিকা"
 
-# ঠিক করেন
-#: ../data/properties.ui.h:22 ../src/totem-properties-view.c:85
-msgid "Video"
-msgstr "ভিডিও"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+msgid ""
+"A list of the names of the plugins which are currently active (loaded and "
+"running)."
+msgstr ""
+"বর্তমানে সক্রিয় (লোড করা ও চলমান) প্লাগ-ইনগুলির নাম বিশিষ্ট একটি তালিকা।"
 
-#: ../data/properties.ui.h:23
-msgid "Year:"
-msgstr "বৎসর:"
+#: ../data/playlist.ui.h:1
+msgid "_Remove"
+msgstr "অপসারণ (_R)"
 
-#: ../data/video-list.ui.h:1
-msgid "Add the video to the playlist"
-msgstr "প্লে-লিস্টের মধ্যে ভিডিও যোগ করুন"
+#: ../data/playlist.ui.h:2
+msgid "Remove file from playlist"
+msgstr "প্লে-লিস্ট থেকে ফাইল মুছে ফেলুন"
 
-# Header পরিবর্তন করা হইছে
-# Chapter=অধ্যায়
-# অশুদ্ধ - পরিক্ষা
-# শুদ্ধ - পরীক্ষা
-#: ../data/video-list.ui.h:3 ../src/totem-dnd-menu.c:97
-#: ../src/plugins/jamendo/jamendo.ui.h:10
-msgid "_Add to Playlist"
-msgstr "প্লে-লিস্টের মধ্যে যোগ করুন (_A)"
+#: ../data/playlist.ui.h:3 ../data/video-list.ui.h:3
+msgid "_Copy Location"
+msgstr "অবস্থান কপি করুন(_C)"
 
-# বাজানো হোক, দেখানো হোক
-# msgstr "চলচ্চিত্র ও গান চালানো হোক" <-- Short cut ;-)
-#. Title
-#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:50
-#: ../src/totem-object.c:1631
-msgid "Movie Player"
-msgstr "মুভি প্লেয়ার"
+#: ../data/playlist.ui.h:4 ../data/video-list.ui.h:4
+msgid "Copy the location to the clipboard"
+msgstr "নির্বাচিত অবস্থান ক্লিপ-বোর্ডে কপি করুন"
 
-# msgstr "বৎসর:" <-- বানান
-# msgstr "বছর:"
-#: ../data/totem.desktop.in.in.in.h:2
-msgid "Play movies and songs"
-msgstr "চলচ্চিত্র ও সংগীত পরিবেশন"
+# msgstr "এই পাসওয়ার্ডটি মনে রাখা হবে"
+#: ../data/playlist.ui.h:5 ../data/totem.ui.h:71
+msgid "_Select Text Subtitles..."
+msgstr "অনুবাদলিপির লেখনি নির্বাচন করুন...(_S)"
 
-#: ../data/totem.ui.h:1
-msgid "1.5 Mbps T1/Intranet/LAN"
-msgstr "১.৫ মেগাবাইট/সেকেন্ড T1/ইন্ট্রানেট/LAN"
+#: ../data/playlist.ui.h:6 ../data/totem.ui.h:72
+msgid "Select a file to use for text subtitles"
+msgstr "অনুবাদলিপির জন্য ব্যবহারযোগ্য ফাইল নির্বাচন করুন"
 
-#: ../data/totem.ui.h:2
-msgid "112 Kbps Dual ISDN/DSL"
-msgstr "১১২ কিলোবাইট/সেকেন্ড ISDN/DSL"
+#: ../data/playlist.ui.h:7
+msgid "Add..."
+msgstr "যোগ করুন..."
 
-#: ../data/totem.ui.h:3
-msgid "14.4 Kbps Modem"
-msgstr "১৪.৪ কিলোবাইট/সেকেন্ড মোডেম"
+#: ../data/playlist.ui.h:8
+msgid "Remove"
+msgstr "অপসারণ"
 
-#: ../data/totem.ui.h:4
-msgid "16:9 (Widescreen)"
-msgstr "১৬:৯ (প্রসারিত পর্দা)"
+#: ../data/playlist.ui.h:9
+msgid "Save Playlist..."
+msgstr "প্লে-লিস্ট সংরক্ষণ করুন..."
 
-#: ../data/totem.ui.h:5
-msgid "19.2 Kbps Modem"
-msgstr "১৯.২ কিলোবাইট/সেকেন্ড মোডেম"
+#: ../data/playlist.ui.h:10
+msgid "Move Up"
+msgstr "উপরে স্থানান্তর"
 
-#: ../data/totem.ui.h:6
-msgid "2.11:1 (DVB)"
-msgstr "২.১১:১ (DVB)"
+#: ../data/playlist.ui.h:11
+msgid "Move Down"
+msgstr "নীচে স্থানান্তর"
 
-#: ../data/totem.ui.h:7
-msgid "256 Kbps DSL/Cable"
-msgstr "২৫৬ কিলোবাইট/সেকেন্ড DSL/কেবল"
-
-#: ../data/totem.ui.h:8
-msgid "28.8 Kbps Modem"
-msgstr "২৮.৬ কিলোবাইট/সেকেন্ড মোডেম"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:2
+msgid "Normal"
+msgstr "স্বাভাবিক"
 
-#: ../data/totem.ui.h:9
-msgid "33.6 Kbps Modem"
-msgstr "৩৩.৬ কিলোবাইট/সেকেন্ড মোডেম"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:4
+msgid "Large"
+msgstr "বৃহৎ"
 
-#: ../data/totem.ui.h:10
-msgid "34.4 Kbps Modem"
-msgstr "৪৪.৪ কিলোবাইট/সেকেন্ড মোডেম"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:6
+msgid "Extra Large"
+msgstr "অধিক বৃহৎ"
 
-#: ../data/totem.ui.h:11
-msgid "384 Kbps DSL/Cable"
-msgstr "৩৮৪ কিলোবাইট/সেকেন্ড DSL/কেবল"
+#: ../data/preferences.ui.h:7 ../src/backend/bacon-video-widget.c:5498
+#: ../src/totem-properties-view.c:231
+msgid "Stereo"
+msgstr "স্টিরিও"
 
-#: ../data/totem.ui.h:12
+#: ../data/preferences.ui.h:8
 msgid "4-channel"
 msgstr "৪-চ্যানেল"
 
-#: ../data/totem.ui.h:13
+#: ../data/preferences.ui.h:9
 msgid "4.1-channel"
 msgstr "৪.১-চ্যানেল"
 
-#: ../data/totem.ui.h:14
-msgid "4:3 (TV)"
-msgstr "৪:৩ (টেলিভিশান)"
-
-#: ../data/totem.ui.h:15
+#: ../data/preferences.ui.h:10
 msgid "5.0-channel"
 msgstr "৫.০-চ্যানেল"
 
-#: ../data/totem.ui.h:16
+#: ../data/preferences.ui.h:11
 msgid "5.1-channel"
 msgstr "৫.১-চ্যানেল"
 
-#: ../data/totem.ui.h:17
-msgid "512 Kbps DSL/Cable"
-msgstr "৫১২ কিলোবাইট/সেকেন্ড DSL/কেবল"
-
-#: ../data/totem.ui.h:18
-msgid "56 Kbps Modem/ISDN"
-msgstr "৫৬ কিলোবাইট/সেকেন্ড মোডেম/ISDN"
-
-#: ../data/totem.ui.h:19
+#: ../data/preferences.ui.h:12
 msgid "AC3 Passthrough"
 msgstr "AC3 পাসথ্রু"
 
-# msgstr "অ্যাঙ্গেল (কোণ) মেনু"
-#: ../data/totem.ui.h:20
-msgid "A_udio Menu"
-msgstr "অডিও মেনু (_u)"
+#: ../data/preferences.ui.h:13
+msgid "Totem Preferences"
+msgstr "Totem সংক্রান্ত পছন্দ"
 
-#: ../data/totem.ui.h:21
-msgid "About this application"
-msgstr "অ্যাপ্লিকেশন পরিচিতি"
+#: ../data/preferences.ui.h:14
+msgid "Playback"
+msgstr "চালানো হবে"
 
-#: ../data/totem.ui.h:22
-msgid "Also disable the screensaver when playing _audio"
-msgstr "অডিও বাজানোর সময় স্ক্রিন-সেভার নিষ্ক্রিয় করা হবে (_a)"
+#: ../data/preferences.ui.h:15
+msgid "Start playing files from last position"
+msgstr "সর্বশেষ স্থান থেকে আরম্ভ করে ফাইল চালানো হবে"
 
-# msgstr "অ্যাঙ্গেল (কোণ) মেনু"
-#: ../data/totem.ui.h:24
-msgid "Audio Output"
-msgstr "অডিও আউটপুট"
+#: ../data/preferences.ui.h:16
+msgid "Text Subtitles"
+msgstr "অনুবাদলিপি"
 
-# msgstr "কোনটিই নয়"
-# msgstr "একটিও নয়"
-#: ../data/totem.ui.h:25 ../src/totem-menu.c:196
-msgid "Auto"
-msgstr "স্বয়ংক্রিয়"
+#: ../data/preferences.ui.h:17
+#| msgid "Automatically _load subtitle files when movie is loaded"
+msgid "_Load subtitle files when movie is loaded"
+msgstr "চলচ্চিত্র লোড করা হলে স্বয়ংক্রিয়রূপে অনুবাদলিপি লোড করা হবে (_L)"
 
-#: ../data/totem.ui.h:26
-msgid "Automatically _load subtitle files when movie is loaded"
-msgstr "চলচ্চিত্র লোড করা হলে স্বয়ংক্রিয়রূপে অনুবাদলিপি লোড করা হবে (_l)"
+#: ../data/preferences.ui.h:18
+msgid "_Font:"
+msgstr "ফন্ট: (_F)"
 
-#: ../data/totem.ui.h:27
-msgid "Automatically _resize the window when a new video is loaded"
-msgstr "নতুন ভিডিও লোড করা হলে স্বয়ংক্রিয়রূপে উইন্ডোর মাপ পরিবর্তন করা হবে (_r)"
+#: ../data/preferences.ui.h:19
+msgid "_Encoding:"
+msgstr "এনকোডিং: (_E)"
 
-# Header পরিবর্তন করা হইছে
-# Chapter=অধ্যায়
-# অশুদ্ধ - পরিক্ষা
-# শুদ্ধ - পরীক্ষা
-#: ../data/totem.ui.h:28
-msgid "Clear the playlist"
-msgstr "প্লে-লিস্ট পরিষ্কার করুন"
+#: ../data/preferences.ui.h:20
+msgid "External Chapters"
+msgstr "বহিস্থিত অধ্যায়"
+
+#: ../data/preferences.ui.h:21
+#| msgid "Automatically _load subtitle files when movie is loaded"
+msgid "Load _chapter files when movie is loaded"
+msgstr "চলচ্চিত্র লোড করা হলে স্বয়ংক্রিয়রূপে অধ্যায়ের ফাইল লোড করা হবে (_c)"
 
-#: ../data/totem.ui.h:29
-msgid "Co_ntrast:"
-msgstr "বৈপরীত্য: (_n)"
+#: ../data/preferences.ui.h:22 ../data/properties.ui.h:1
+msgid "General"
+msgstr "সাধারণ"
 
-#: ../data/totem.ui.h:30
-msgid "Color Balance"
-msgstr "রঙের ভারসাম্য"
+#. Tab label in the Preferences dialogue
+#: ../data/preferences.ui.h:24
+msgid "Display"
+msgstr "প্রদর্শন"
 
-#: ../data/totem.ui.h:31
-msgid "Configure plugins to extend the application"
-msgstr "অ্যাপ্লিকেশনের বৈশিষ্ট্য বৃদ্ধি করার জন্য প্লাগ-ইন কনফিগার করুন"
+#: ../data/preferences.ui.h:25
+#| msgid "Automatically _resize the window when a new video is loaded"
+msgid "_Resize the window when a new video is loaded"
+msgstr ""
+"নতুন ভিডিও লোড করা হলে স্বয়ংক্রিয়রূপে উইন্ডোর মাপ পরিবর্তন করা হবে (_R)"
 
-#: ../data/totem.ui.h:32
-msgid "Configure the application"
-msgstr "অ্যাপ্লিকেশন কনফিগার করুন"
+#: ../data/preferences.ui.h:26
+msgid "Disable _deinterlacing of interlaced videos"
+msgstr ""
+"ইন্টারলেস করার ভিডিওর ক্ষেত্রে ডি-ইন্টারলেসিং ব্যবস্থা নিষ্ক্রিয় করা হবে (_d)"
 
-#: ../data/totem.ui.h:33
-msgid "Connection _speed:"
-msgstr "সংযোগের গতি: (_s)"
+#: ../data/preferences.ui.h:27
+#| msgid "Also disable the screensaver when playing _audio"
+msgid "Disable screensaver when playing "
+msgstr "সঞ্চালনার সময় স্ক্রিন-সেভার নিষ্ক্রিয় করা হবে "
 
-#: ../data/totem.ui.h:34
-msgid "Decrease volume"
-msgstr "আওয়াজ হ্রাস করুন"
+# ঠিক করেন
+#: ../data/preferences.ui.h:28 ../data/properties.ui.h:9
+#: ../src/totem-properties-view.c:273
+msgid "Video"
+msgstr "ভিডিও"
 
-# msgstr "ডিভিডি মেনু"
-#: ../data/totem.ui.h:35
-msgid "Deinterlace"
-msgstr "ডি-ইন্টারলেস"
+#: ../data/preferences.ui.h:29
+msgid "Video or Audio"
+msgstr "ভিডিও অথবা অডিও"
 
-#: ../data/totem.ui.h:36
-msgid "Display"
-msgstr "প্রদর্শন"
+#: ../data/preferences.ui.h:30
+msgid "Visual Effects"
+msgstr "ভিজুয়াল ইফেক্ট"
 
-#: ../data/totem.ui.h:37
-msgid "Eject the current disc"
-msgstr "বর্তমান ডিস্ক বের করে নিন"
+# msgstr "ফাইল লোড করা হলে স্বয়ংক্রিয়ভাবে ক্যানভাসের আকার পরিবর্তন করা হোক" <-- এটাও সোজা করে দিলাম ;-)
+#: ../data/preferences.ui.h:31
+msgid "Show _visual effects when an audio file is played"
+msgstr "অডিও ফাইল চালানো হলে ভিজুয়াল ইফেক্ট প্রদর্শন করা হবে (_v)"
 
-#: ../data/totem.ui.h:38
-msgid "Extra Large"
-msgstr "অধিক বৃহৎ"
+#: ../data/preferences.ui.h:32
+msgid "_Type of visualization:"
+msgstr "ভিশুয়ালাইজেশনের ধরন: (_T)"
 
-#: ../data/totem.ui.h:39
-msgid "Fit Window to Movie"
-msgstr "চলচ্চিত্র অনুযায়ী উইন্ডোর মাপ পরিবর্তন করা হবে"
+#: ../data/preferences.ui.h:33
+msgid "Visualization _size:"
+msgstr "ভিশুয়ালাইজেশন প্রদর্শনের মাপ: (_s)"
 
-#: ../data/totem.ui.h:41
-msgid "Go to the DVD menu"
-msgstr "DVD মেনু প্রদর্শন"
+#: ../data/preferences.ui.h:34
+msgid "Color Balance"
+msgstr "রঙের ভারসাম্য"
 
-# msgstr "ডিভিডি মেনু দেখানো হোক"
-#: ../data/totem.ui.h:42
-msgid "Go to the angle menu"
-msgstr "অ্যাঙ্গেল মেনু প্রদর্শন"
+#: ../data/preferences.ui.h:35
+msgid "_Brightness:"
+msgstr "উজ্জ্বলতা: (_B)"
 
-# msgstr "অ্যাঙ্গেল (কোণ) মেনু দেখানো হোক"
-#: ../data/totem.ui.h:43
-msgid "Go to the audio menu"
-msgstr "অডিও মেনু প্রদর্শন"
+#: ../data/preferences.ui.h:36
+msgid "Co_ntrast:"
+msgstr "বৈপরীত্য: (_n)"
 
-# msgstr "অডিও মেনু দেখানো হোক"
-#: ../data/totem.ui.h:44
-msgid "Go to the chapter menu"
-msgstr "চ্যাপ্টার মেনু প্রদর্শন"
+#: ../data/preferences.ui.h:37
+msgid "Sat_uration:"
+msgstr "স্যাচুরেশন: (_u)"
 
-# msgstr "অধ্যায় মেনুতে দেখানো হোক"
-#: ../data/totem.ui.h:45
-msgid "Go to the title menu"
-msgstr "শিরোনাম মেনু প্রদর্শন"
+#: ../data/preferences.ui.h:38
+msgid "_Hue:"
+msgstr "হিউ: (_H)"
 
-#: ../data/totem.ui.h:46
-msgid "Help contents"
-msgstr "সহায়িকার বিষয়বস্তু"
+#: ../data/preferences.ui.h:39
+msgid "Reset to _Defaults"
+msgstr "ডিফল্ট মান পুনরায় স্থাপন করুন"
 
-#: ../data/totem.ui.h:47
-msgid "Increase volume"
-msgstr "আওয়াজ বৃদ্ধি করুন"
+# msgstr "অ্যাঙ্গেল (কোণ) মেনু"
+#: ../data/preferences.ui.h:40
+msgid "Audio Output"
+msgstr "অডিও আউটপুট"
 
-#: ../data/totem.ui.h:48
-msgid "Intranet/LAN"
-msgstr "ইন্ট্রানেট/LAN"
+#: ../data/preferences.ui.h:41
+msgid "_Audio output type:"
+msgstr "অডিও আউটপুটের ধরন: (_A)"
 
-#: ../data/totem.ui.h:49
-msgid "Large"
-msgstr "বৃহৎ"
+# msgstr "কোনটিই নয়"
+# msgstr "একটিও নয়"
+#: ../data/preferences.ui.h:42 ../data/properties.ui.h:14
+#: ../src/totem-properties-view.c:271
+msgid "Audio"
+msgstr "অডিও"
 
-#: ../data/totem.ui.h:51
-msgid "Networking"
-msgstr "নেটওয়ার্ক ব্যবস্থা"
+#: ../data/properties.ui.h:2
+msgid "Title:"
+msgstr "শিরোনাম:"
 
-#: ../data/totem.ui.h:52
-msgid "Next chapter or movie"
-msgstr "পরবর্তি অধ্যায় অথবা চলচ্চিত্র"
+#: ../data/properties.ui.h:3
+msgid "Artist:"
+msgstr "শিল্পী:"
 
-#: ../data/totem.ui.h:53
-msgid "Normal"
-msgstr "স্বাভাবিক"
+#: ../data/properties.ui.h:4
+msgid "Duration:"
+msgstr "অবকাল:"
 
-#: ../data/totem.ui.h:54
-msgid "Open _Location..."
-msgstr "চিহ্নিত অবস্থান খুলুন...(_L)"
+#: ../data/properties.ui.h:5
+msgid "Year:"
+msgstr "বৎসর:"
 
-#: ../data/totem.ui.h:55
-msgid "Open a file"
-msgstr "ফাইল খুলুন"
+#: ../data/properties.ui.h:6
+msgid "Album:"
+msgstr "সংকলন:"
 
-#: ../data/totem.ui.h:56
-msgid "Open a non-local file"
-msgstr "স্থানীয় অবস্থান বহির্ভূত ফাইল খুলুন"
+#: ../data/properties.ui.h:7
+msgid "Comment:"
+msgstr "বক্তব্য:"
 
-#: ../data/totem.ui.h:57
-msgid "Play / P_ause"
-msgstr "চালানো / থামানো হবে (_a)"
+#: ../data/properties.ui.h:8
+msgid "Container:"
+msgstr "ধারণকারী:"
 
-# ঠিক করেন
-#: ../data/totem.ui.h:58
-msgid "Play or pause the movie"
-msgstr "চলচ্চিত্র চালানো অথবা থামানো হবে"
+#: ../data/properties.ui.h:10
+msgid "Dimensions:"
+msgstr "দিকমাত্রা:"
 
-#: ../data/totem.ui.h:59
-msgid "Playback"
-msgstr "চালানো হবে"
+#: ../data/properties.ui.h:11
+msgid "Codec:"
+msgstr "কোডেক:"
 
-#: ../data/totem.ui.h:60
-msgid "Plugins..."
-msgstr "প্লাগ-ইন..."
+#: ../data/properties.ui.h:12
+msgid "Framerate:"
+msgstr "ফ্রেমের মাত্রা:"
 
-#: ../data/totem.ui.h:61
-msgid "Prefere_nces"
-msgstr "বৈশিষ্ট্যাবলী (_n)"
+#: ../data/properties.ui.h:13
+msgid "Bitrate:"
+msgstr "বিটের মাত্রা:"
 
-#: ../data/totem.ui.h:62
-msgid "Previous chapter or movie"
-msgstr "পূর্ববর্তী অধ্যায় অথবা চলচ্চিত্র"
+#: ../data/properties.ui.h:15
+msgid "Sample rate:"
+msgstr "নমূণার মাত্রা:"
 
-#: ../data/totem.ui.h:63
-msgid "Quit the program"
-msgstr "প্রোগ্রাম থেকে প্রস্থান"
+#: ../data/properties.ui.h:16
+msgid "Channels:"
+msgstr "চ্যানেল:"
 
-#: ../data/totem.ui.h:64
-msgid "Reset to _Defaults"
-msgstr "ডিফল্ট মান পুনরায় স্থাপন করুন"
+# ঠিক করেন
+#. Title
+#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:80 ../src/totem.c:239
+#: ../src/totem.c:248 ../src/totem-menu.c:790 ../src/totem-object.c:1658
+msgid "Videos"
+msgstr "ভিডিও"
 
-#: ../data/totem.ui.h:65
-msgid "Resize _1:1"
-msgstr "মাপ পরিবর্তন ১:১ (_1)"
+#: ../data/totem.desktop.in.in.in.h:2
+#| msgid "Playing a movie"
+msgid "Play movies"
+msgstr "চলচ্চিত্র চালানো হবে"
+
+#: ../data/totem.desktop.in.in.in.h:3
+msgid "Video;Movie;Film;Clip;Series;Player;DVD;TV;Disc;"
+msgstr "ভিডিও;চলচ্চিত্র;ছায়াছবি;অংশ;ধারাবাহিক;প্লেয়ার;DVD;TV;ডিস্ক;"
 
-#: ../data/totem.ui.h:66
-msgid "Resize _2:1"
-msgstr "মাপ পরিবর্তন ১:১ (_2)"
+#: ../data/totem.ui.h:1
+#| msgid "_Open..."
+msgid "_Open"
+msgstr "খুলুন (_O)"
 
-#: ../data/totem.ui.h:67
-msgid "Resize to double the original video size"
-msgstr "ভিডিও-র মাপ অনুযায়ী দ্বিগুণ মাপ নির্ধারণ করা হবে"
+#: ../data/totem.ui.h:2
+#| msgid "Open _Location..."
+msgid "Open _Location"
+msgstr "চিহ্নিত অবস্থান খুলুন (_L)"
 
-#: ../data/totem.ui.h:68
-msgid "Resize to half the original video size"
-msgstr "ভিডিও-র মাপ অনুযায়ী অর্ধেক মাপ নির্ধারণ করা হবে"
+# msgstr "বের করে দেওয়া হোক (_ব)"
+# Eject অর্থে 'বার' শব্দটা সম্ভবত কথ্য ভাষার। Dict দেখেন।
+#: ../data/totem.ui.h:3
+msgid "_Fullscreen"
+msgstr "সম্পূর্ণ পর্দা জুড়ে প্রদর্শন (_F)"
 
-#: ../data/totem.ui.h:69
-msgid "Resize to the original video size"
-msgstr "ভিডিও-র মাপ অনুযায়ী প্রকৃত মাপ নির্ধারণ করা হবে"
+#: ../data/totem.ui.h:4
+msgid "Prefere_nces"
+msgstr "বৈশিষ্ট্যাবলী (_n)"
 
-#: ../data/totem.ui.h:70
-msgid "S_idebar"
-msgstr "সাইড-বার (_i)"
+#: ../data/totem.ui.h:5
+#| msgid "Shuff_le Mode"
+msgid "Shuff_le"
+msgstr "পাঁচমিশেলি মোড (_l)"
 
-#: ../data/totem.ui.h:71
-msgid "S_ubtitles"
-msgstr "অনুবাদলিপি (_u)"
+#: ../data/totem.ui.h:6
+#| msgid "_Repeat Mode"
+msgid "_Repeat"
+msgstr "পুনরাবৃত্তি মোড (_R)"
 
-#: ../data/totem.ui.h:72
-msgid "Sat_uration:"
-msgstr "স্যাচুরেশন: (_u)"
+#: ../data/totem.ui.h:7
+msgid "_Quit"
+msgstr "প্রস্থান (_Q)"
 
-# সংরক্ষণ, করা হোক
-#: ../data/totem.ui.h:74
-msgid "Set the repeat mode"
-msgstr "পুনরাবৃত্তি মোড নির্ধারণ করুন"
+# msgstr "চালানো হোক (_চ)"
+# msgstr "প্রদর্শন করা হোক (_প)"
+# msgstr "প্রদর্শন (_প)"
+# আমি এটার Context সম্পর্কে জানিনা। তাই ভালভাবে বুঝতে পারতেছি না।
+#: ../data/totem.ui.h:8
+msgid "_Movie"
+msgstr "চলচ্চিত্র (_M)"
 
-# সংরক্ষণ, করা হোক
-#: ../data/totem.ui.h:75
-msgid "Set the shuffle mode"
-msgstr "পাচঁমিশেলি মোড নির্ধারণ করুন"
+# বাংলায় লিখতে পারেন
+#: ../data/totem.ui.h:9
+msgid "_Eject"
+msgstr "বহিষ্কার (_E)"
 
-#: ../data/totem.ui.h:76
-msgid "Sets 16:9 (widescreen) aspect ratio"
-msgstr "১৬:৯ (ওয়াইড-স্ক্রিন) অ্যাস্পেক্ট অনুপাত নির্ধারণ করে"
+#: ../data/totem.ui.h:10
+msgid "Eject the current disc"
+msgstr "বর্তমান ডিস্ক বের করে নিন"
 
-#: ../data/totem.ui.h:77
-msgid "Sets 2.11:1 (DVB) aspect ratio"
-msgstr "২.১১:১ (DVB) অ্যাস্পেক্ট অনুপাত নির্ধারণ করে"
+# এটা কি ঠিক আছে ?
+#: ../data/totem.ui.h:11
+msgid "_Properties"
+msgstr "বিবিধ বৈশিষ্ট্য (_P)"
 
-# msgstr "_অ্যাস্পেক্টের (আবয়ব) অনুপাত পরিবর্তন করা হোক"
-#: ../data/totem.ui.h:78
-msgid "Sets 4:3 (TV) aspect ratio"
-msgstr "৪:৩ (টেলিভিশন) অ্যাস্পেক্ট অনুপাত নির্ধারণ করে"
+#: ../data/totem.ui.h:12
+msgid "View the properties of the current stream"
+msgstr "বর্তমানে স্ট্রিমের বৈশিষ্ট্য প্রদর্শন করা হবে"
 
-# msgstr "_অ্যাস্পেক্টের (আবয়ব) অনুপাত পরিবর্তন করা হোক"
-#: ../data/totem.ui.h:79
-msgid "Sets automatic aspect ratio"
-msgstr "স্বয়ংক্রিয়রূপে অ্যাস্পেক্টের অনুপাত নির্ধারণ করে"
+#: ../data/totem.ui.h:13
+msgid "Play / P_ause"
+msgstr "চালানো / থামানো হবে (_a)"
 
-# msgstr "_অ্যাস্পেক্টের (আবয়ব) অনুপাত পরিবর্তন করা হোক"
-# ../data/totem.glade.ue:h:71
-#: ../data/totem.ui.h:80
-msgid "Sets square aspect ratio"
-msgstr "চতুষ্কোন অ্যাস্পেক্ট অনুপাত নির্ধারণ করে"
+# ঠিক করেন
+#: ../data/totem.ui.h:14
+msgid "Play or pause the movie"
+msgstr "চলচ্চিত্র চালানো অথবা থামানো হবে"
 
-#: ../data/totem.ui.h:81
-msgid "Show _Controls"
-msgstr "নিয়ন্ত্রক বাটন প্রদর্শন করা হবে (_C)"
+#: ../data/totem.ui.h:15
+msgid "_Edit"
+msgstr "সম্পাদনা (_E)"
 
-# msgstr "ফাইল লোড করা হলে স্বয়ংক্রিয়ভাবে ক্যানভাসের আকার পরিবর্তন করা হোক" <-- এটাও সোজা করে দিলাম ;-)
-#: ../data/totem.ui.h:82
-msgid "Show _visual effects when an audio file is played"
-msgstr "অডিও ফাইল চালানো হলে ভিজুয়াল ইফেক্ট প্রদর্শন করা হবে (_v)"
+#: ../data/totem.ui.h:16
+msgid "_Clear Playlist"
+msgstr "প্লে-লিস্ট ফাঁকা করুন (_C)"
 
-#: ../data/totem.ui.h:83
-msgid "Show controls"
-msgstr "নিয়ন্ত্রক বাটন প্রদর্শন করা হবে"
+# Header পরিবর্তন করা হইছে
+# Chapter=অধ্যায়
+# অশুদ্ধ - পরিক্ষা
+# শুদ্ধ - পরীক্ষা
+#: ../data/totem.ui.h:17
+msgid "Clear the playlist"
+msgstr "প্লে-লিস্ট পরিষ্কার করুন"
 
-#: ../data/totem.ui.h:84
-msgid "Show or hide the sidebar"
-msgstr "সাইড-বার প্রদর্শন অথবা আড়াল করুন"
+#: ../data/totem.ui.h:18
+msgid "Plugins..."
+msgstr "প্লাগ-ইন..."
 
-#: ../data/totem.ui.h:85
-msgid "Shuff_le Mode"
-msgstr "পাঁচমিশেলি মোড (_l)"
+#: ../data/totem.ui.h:19
+msgid "Configure plugins to extend the application"
+msgstr "অ্যাপ্লিকেশনের বৈশিষ্ট্য বৃদ্ধি করার জন্য প্লাগ-ইন কনফিগার করুন"
 
-# আগেরটার মত
-#: ../data/totem.ui.h:86
-msgid "Skip _Backwards"
-msgstr "পিছিয়ে যান (_B)"
+# ঠিক করেন
+#: ../data/totem.ui.h:20
+msgid "_View"
+msgstr "প্রদর্শন (_V)"
 
-# msgstr "পেছনে"
-#: ../data/totem.ui.h:87
-msgid "Skip _Forward"
-msgstr "এগিয়ে চলুন (_F)"
+#: ../data/totem.ui.h:21
+msgid "Fit Window to Movie"
+msgstr "চলচ্চিত্র অনুযায়ী উইন্ডোর মাপ পরিবর্তন করা হবে"
 
-# আগেরটার মত
-#: ../data/totem.ui.h:88
-msgid "Skip backwards"
-msgstr "পিছিয়ে যান"
+#: ../data/totem.ui.h:22
+msgid "_Resize 1:2"
+msgstr "মাপ পরিবর্তন ১:২ (_R)"
 
-# msgstr "পেছনে"
-#: ../data/totem.ui.h:89
-msgid "Skip forward"
-msgstr "এগিয়ে চলুন"
+#: ../data/totem.ui.h:23
+msgid "Resize to half the original video size"
+msgstr "ভিডিও-র মাপ অনুযায়ী অর্ধেক মাপ নির্ধারণ করা হবে"
 
-#: ../data/totem.ui.h:90
-msgid "Square"
-msgstr "চৌকো"
+#: ../data/totem.ui.h:24
+msgid "Resize _1:1"
+msgstr "মাপ পরিবর্তন ১:১ (_1)"
 
-#: ../data/totem.ui.h:91
-msgid "Start playing files from last position"
-msgstr "সর্বশেষ স্থান থেকে আরম্ভ করে ফাইল চালানো হবে"
+#: ../data/totem.ui.h:25
+msgid "Resize to the original video size"
+msgstr "ভিডিও-র মাপ অনুযায়ী প্রকৃত মাপ নির্ধারণ করা হবে"
 
-#: ../data/totem.ui.h:92 ../src/backend/bacon-video-widget-gst-0.10.c:5774
-msgid "Stereo"
-msgstr "স্টিরিও"
+#: ../data/totem.ui.h:26
+msgid "Resize _2:1"
+msgstr "মাপ পরিবর্তন ১:১ (_2)"
+
+#: ../data/totem.ui.h:27
+msgid "Resize to double the original video size"
+msgstr "ভিডিও-র মাপ অনুযায়ী দ্বিগুণ মাপ নির্ধারণ করা হবে"
+
+#: ../data/totem.ui.h:28
+msgid "_Aspect Ratio"
+msgstr "অ্যাসপেক্টের অনুপাত (_A)"
 
-#: ../data/totem.ui.h:93
+#: ../data/totem.ui.h:29
 msgid "Switch An_gles"
 msgstr "অ্যাঙ্গেল পরিবর্তন করুন (_g)"
 
-#: ../data/totem.ui.h:94
+#: ../data/totem.ui.h:30
 msgid "Switch camera angles"
 msgstr "ক্যামেরার কোণ পরিবর্তন করুন"
 
-#: ../data/totem.ui.h:95
-msgid "Switch to fullscreen"
-msgstr "সম্পূর্ণ পর্দা জুড়ে প্রদর্শন করা হবে"
-
-#: ../data/totem.ui.h:96
-msgid "Text Subtitles"
-msgstr "অনুবাদলিপি"
-
-#: ../data/totem.ui.h:97
-msgid "Time seek bar"
-msgstr "সময় প্রাপ্ত করতে ব্যবহৃত বার"
-
-#: ../data/totem.ui.h:99
-msgid "Totem Preferences"
-msgstr "Totem সংক্রান্ত পছন্দ"
-
-#: ../data/totem.ui.h:100
-msgid "View the properties of the current stream"
-msgstr "বর্তমানে স্ট্রিমের বৈশিষ্ট্য প্রদর্শন করা হবে"
-
-#: ../data/totem.ui.h:101
-msgid "Visual Effects"
-msgstr "ভিজুয়াল ইফেক্ট"
-
-#: ../data/totem.ui.h:102
-msgid "Visualization _size:"
-msgstr "ভিশুয়ালাইজেশন প্রদর্শনের মাপ: (_s)"
-
-#: ../data/totem.ui.h:103
-msgid "Volume _Down"
-msgstr "শব্দের মাত্রা হ্রাস করুন (_D)"
+#: ../data/totem.ui.h:31
+msgid "_Go"
+msgstr "চালনা (_G)"
 
-#: ../data/totem.ui.h:104
-msgid "Volume _Up"
-msgstr "শব্দের মাত্রা বৃদ্ধি করুন (_U)"
+#: ../data/totem.ui.h:32
+msgid "_DVD Menu"
+msgstr "DVD মেনু (_D)"
 
-# msgstr "১:২ অনুপাতে প্রদর্শন করা হোক"
-#: ../data/totem.ui.h:105
-msgid "Zoom In"
-msgstr "বড় মাপে প্রদর্শন"
+#: ../data/totem.ui.h:33
+msgid "Go to the DVD menu"
+msgstr "DVD মেনু প্রদর্শন"
 
-# msgstr "ভ্যানিটি সংক্রান্ত পছন্দ"
-#: ../data/totem.ui.h:106
-msgid "Zoom Out"
-msgstr "ছোট মাপে প্রদর্শন"
-
-#: ../data/totem.ui.h:107
-msgid "Zoom Reset"
-msgstr "প্রদর্শনের মান পুনরায় নির্ধারণ"
+#: ../data/totem.ui.h:34
+msgid "_Title Menu"
+msgstr "শিরোনাম মেনু (_T)"
 
-# msgstr "১:২ অনুপাতে প্রদর্শন করা হোক"
-#: ../data/totem.ui.h:108
-msgid "Zoom in"
-msgstr "বড় মাপে প্রদর্শন"
+# msgstr "অধ্যায় মেনুতে দেখানো হোক"
+#: ../data/totem.ui.h:35
+msgid "Go to the title menu"
+msgstr "শিরোনাম মেনু প্রদর্শন"
 
-# msgstr "ভ্যানিটি সংক্রান্ত পছন্দ"
-#: ../data/totem.ui.h:109
-msgid "Zoom out"
-msgstr "ছোট মাপে প্রদর্শন"
-
-#: ../data/totem.ui.h:110
-msgid "Zoom reset"
-msgstr "প্রদর্শনের মান পুনরায় নির্ধারণ"
+# msgstr "অ্যাঙ্গেল (কোণ) মেনু"
+#: ../data/totem.ui.h:36
+msgid "A_udio Menu"
+msgstr "অডিও মেনু (_u)"
 
-# msgstr "কোনটিই নয়"
-# msgstr "একটিও নয়"
-#: ../data/totem.ui.h:111
-msgid "_About"
-msgstr "পরিচিতি (_A)"
+# msgstr "অ্যাঙ্গেল (কোণ) মেনু দেখানো হোক"
+#: ../data/totem.ui.h:37
+msgid "Go to the audio menu"
+msgstr "অডিও মেনু প্রদর্শন"
 
-#: ../data/totem.ui.h:112
+#: ../data/totem.ui.h:38
 msgid "_Angle Menu"
 msgstr "অ্যাঙ্গেল মেনু (_A)"
 
-#: ../data/totem.ui.h:113
-msgid "_Aspect Ratio"
-msgstr "অ্যাসপেক্টের অনুপাত (_A)"
-
-#: ../data/totem.ui.h:114
-msgid "_Audio output type:"
-msgstr "অডিও আউটপুটের ধরন: (_A)"
-
-#: ../data/totem.ui.h:115
-msgid "_Brightness:"
-msgstr "উজ্জ্বলতা: (_B)"
+# msgstr "ডিভিডি মেনু দেখানো হোক"
+#: ../data/totem.ui.h:39
+msgid "Go to the angle menu"
+msgstr "অ্যাঙ্গেল মেনু প্রদর্শন"
 
 # msgstr "নতুন ভিডিও লোড করা হলে স্বয়ংক্রিয়ভাবে উইন্ডোর আকার পরিবর্তন করা হোক" <-- একটু সোজা করে দিলাম ;-)
-#: ../data/totem.ui.h:116
+#: ../data/totem.ui.h:40
 msgid "_Chapter Menu"
 msgstr "অধ্যায় মেনু (_C)"
 
-#: ../data/totem.ui.h:117
-msgid "_Clear Playlist"
-msgstr "প্লে-লিস্ট ফাঁকা করুন (_C)"
+# msgstr "অডিও মেনু দেখানো হোক"
+#: ../data/totem.ui.h:41
+msgid "Go to the chapter menu"
+msgstr "চ্যাপ্টার মেনু প্রদর্শন"
 
-#: ../data/totem.ui.h:118
-msgid "_Contents"
-msgstr "সূচিপত্র (_C)"
+#: ../data/totem.ui.h:42
+msgid "_Next Chapter/Movie"
+msgstr "পরবর্তী অধ্যায়/চলচ্চিত্র (_N)"
 
-#: ../data/totem.ui.h:119
-msgid "_DVD Menu"
-msgstr "DVD মেনু (_D)"
+#: ../data/totem.ui.h:43
+msgid "Next chapter or movie"
+msgstr "পরবর্তি অধ্যায় অথবা চলচ্চিত্র"
 
-#: ../data/totem.ui.h:120
-msgid "_Deinterlace"
-msgstr "ডি-ইন্টারলেস (_D)"
+#: ../data/totem.ui.h:44
+msgid "_Previous Chapter/Movie"
+msgstr "পূর্ববর্তী অধ্যায়/চলচ্চিত্র (_P)"
 
-#: ../data/totem.ui.h:121
-msgid "_Edit"
-msgstr "সম্পাদনা (_E)"
+#: ../data/totem.ui.h:45
+msgid "Previous chapter or movie"
+msgstr "পূর্ববর্তী অধ্যায় অথবা চলচ্চিত্র"
 
-# বাংলায় লিখতে পারেন
-#: ../data/totem.ui.h:122
-msgid "_Eject"
-msgstr "বহিষ্কার (_E)"
+#: ../data/totem.ui.h:46
+msgid "_Sound"
+msgstr "শব্দ (_S)"
 
-#: ../data/totem.ui.h:123
-msgid "_Encoding:"
-msgstr "এনকোডিং: (_E)"
+#: ../data/totem.ui.h:47
+msgid "Volume _Up"
+msgstr "শব্দের মাত্রা বৃদ্ধি করুন (_U)"
 
-#: ../data/totem.ui.h:124
-msgid "_Font:"
-msgstr "ফন্ট: (_F)"
+#: ../data/totem.ui.h:48
+msgid "Increase volume"
+msgstr "আওয়াজ বৃদ্ধি করুন"
 
-# msgstr "বের করে দেওয়া হোক (_ব)"
-# Eject অর্থে 'বার' শব্দটা সম্ভবত কথ্য ভাষার। Dict দেখেন।
-#: ../data/totem.ui.h:125
-msgid "_Fullscreen"
-msgstr "সম্পূর্ণ পর্দা জুড়ে প্রদর্শন (_F)"
+#: ../data/totem.ui.h:49
+msgid "Volume _Down"
+msgstr "শব্দের মাত্রা হ্রাস করুন (_D)"
 
-#: ../data/totem.ui.h:126
-msgid "_Go"
-msgstr "চালনা (_G)"
+#: ../data/totem.ui.h:50
+msgid "Decrease volume"
+msgstr "আওয়াজ হ্রাস করুন"
 
-#: ../data/totem.ui.h:127
+#: ../data/totem.ui.h:51
 msgid "_Help"
 msgstr "সাহায্য (_H)"
 
-#: ../data/totem.ui.h:128
-msgid "_Hue:"
-msgstr "হিউ: (_H)"
-
-#: ../data/totem.ui.h:129
-msgid "_Languages"
-msgstr "ভাষা (_L)"
-
-# msgstr "চালানো হোক (_চ)"
-# msgstr "প্রদর্শন করা হোক (_প)"
-# msgstr "প্রদর্শন (_প)"
-# আমি এটার Context সম্পর্কে জানিনা। তাই ভালভাবে বুঝতে পারতেছি না।
-#: ../data/totem.ui.h:130
-msgid "_Movie"
-msgstr "চলচ্চিত্র (_M)"
-
-#: ../data/totem.ui.h:131
-msgid "_Next Chapter/Movie"
-msgstr "পরবর্তী অধ্যায়/চলচ্চিত্র (_N)"
-
-#: ../data/totem.ui.h:132
-msgid "_Open..."
-msgstr "খুলুন...(_O)"
-
-#: ../data/totem.ui.h:133
-msgid "_Previous Chapter/Movie"
-msgstr "পূর্ববর্তী অধ্যায়/চলচ্চিত্র (_P)"
-
-# এটা কি ঠিক আছে ?
-#: ../data/totem.ui.h:134
-msgid "_Properties"
-msgstr "বিবিধ বৈশিষ্ট্য (_P)"
-
-#: ../data/totem.ui.h:135
-msgid "_Quit"
-msgstr "প্রস্থান (_Q)"
-
-#: ../data/totem.ui.h:136
-msgid "_Repeat Mode"
-msgstr "পুনরাবৃত্তি মোড (_R)"
-
-#: ../data/totem.ui.h:137
-msgid "_Resize 1:2"
-msgstr "মাপ পরিবর্তন ১:২ (_R)"
+#: ../data/totem.ui.h:52
+msgid "_Contents"
+msgstr "সূচিপত্র (_C)"
 
-#: ../data/totem.ui.h:139
-msgid "_Sound"
-msgstr "শব্দ (_S)"
+#: ../data/totem.ui.h:53
+msgid "Help contents"
+msgstr "সহায়িকার বিষয়বস্তু"
 
-#: ../data/totem.ui.h:140
-msgid "_Title Menu"
-msgstr "শিরোনাম মেনু (_T)"
+# msgstr "কোনটিই নয়"
+# msgstr "একটিও নয়"
+#: ../data/totem.ui.h:54
+msgid "_About"
+msgstr "পরিচিতি (_A)"
 
-#: ../data/totem.ui.h:141
-msgid "_Type of visualization:"
-msgstr "ভিশুয়ালাইজেশনের ধরন: (_T)"
+#: ../data/totem.ui.h:55
+msgid "About this application"
+msgstr "অ্যাপ্লিকেশন পরিচিতি"
 
-# ঠিক করেন
-#: ../data/totem.ui.h:142
-msgid "_View"
-msgstr "প্রদর্শন (_V)"
+#: ../data/totem.ui.h:56
+msgid "Show _Controls"
+msgstr "নিয়ন্ত্রক বাটন প্রদর্শন করা হবে (_C)"
 
-#: ../data/totem.schemas.in.h:1
-msgid "Allow the screensaver to activate when playing audio"
-msgstr "অডিও চালনার সময় স্ক্রিন-সেভার সক্রিয় করার সুবিধা উপলব্ধ করা হবে"
+#: ../data/totem.ui.h:57
+msgid "Show controls"
+msgstr "নিয়ন্ত্রক বাটন প্রদর্শন করা হবে"
 
-#: ../data/totem.schemas.in.h:2
-msgid ""
-"Allow the screensaver to activate when playing audio. Disable if you have "
-"monitor-powered speakers."
-msgstr ""
-"অডিও চালনার সময় স্ক্রিন-সেভার সক্রিয় করার সুবিধা উপলব্ধ করা হবে। মনিটর থেকে বিদ্যুৎ "
-"প্রয়োগ করে চালিত স্পিকারের ক্ষেত্রে এটি নিষ্ক্রিয় করুন।"
+#: ../data/totem.ui.h:58
+msgid "S_idebar"
+msgstr "সাইড-বার (_i)"
 
-#: ../data/totem.schemas.in.h:3
-msgid ""
-"Amount of data to buffer for network streams before starting to display the "
-"stream (in seconds)"
-msgstr ""
-"নেটওয়ার্ক স্ট্রিমের ক্ষেত্রে স্ট্রিম প্রদর্শনের পূর্বে যে পরিমান তথ্য বাফার করা হবে "
-"(সেকেন্ডে ব্যক্ত)"
+#: ../data/totem.ui.h:59
+msgid "Show or hide the sidebar"
+msgstr "সাইড-বার প্রদর্শন অথবা আড়াল করুন"
 
-#: ../data/totem.schemas.in.h:4
-msgid ""
-"Approximate network connection speed, used to select quality on media over "
-"the network: \"0\" for 14.4 Kbps Modem, \"1\" for 19.2 Kbps Modem, \"2\" for "
-"28.8 Kbps Modem, \"3\" for 33.6 Kbps Modem, \"4\" for 34.4 Kbps Modem, \"5\" "
-"for 56 Kbps Modem/ISDN, \"6\" for 112 Kbps Dual ISDN/DSL, \"7\" for 256 Kbps "
-"DSL/Cable, \"8\" for 384 Kbps DSL/Cable, \"9\" for 512 Kbps DSL/Cable, \"10"
-"\" for 1.5 Mbps T1/Intranet/LAN, \"11\" for Intranet/LAN."
-msgstr ""
-"নেটওয়ার্ক সংযোগের আনুমানিক গতি। নেটওয়ার্কের মাধ্যমে সঞ্চারের সময় মিডিয়ার গুণমান "
-"নির্বাচন করতে ব্যবহৃত হয়: ১৪.৪ কিলোবাইট/সেকেন্ডের মোডেমের জন্য \"0\", ১৯.২ "
-"কিলোবাইট/সেকেন্ডের মোডেমের জন্য \"1\", ২৮.৮ কিলোবাইট/সেকেন্ডের মোডেমের জন্য \"2"
-"\", ৩৩.৬ কিলোবাইট/সেকেন্ডের মোডেমের জন্য \"3\", ৩৪.৪ কিলোবাইট/সেকেন্ডের মোডেমের "
-"জন্য \"4\", ৫৬ কিলোবাইট/সেকেন্ডের মোডেম/ISDN-র জন্য \"5\", ১১২ কিলোবাইট/"
-"সেকেন্ডের ডুয়াল ISDN/DSL-র জন্য \"6\", ১১২ কিলোবাইট/সেকেন্ডের DSL/কেবলের জন্য \"7"
-"\", ৩৮৪ কিলোবাইট/সেকেন্ডের DSL/কেবলের জন্য \"8\", ৫১২ কিলোবাইট/সেকেন্ডের DSL/"
-"কেবলের জন্য \"9\", ১.৫ মেগাবাইট/সেকেন্ডের T1/ইনট্রানেট/LAN-র জন্য \"10\", "
-"ইনট্রানেট/LAN-র জন্য \"11\"।"
+# msgstr "কোনটিই নয়"
+# msgstr "একটিও নয়"
+#: ../data/totem.ui.h:60
+#| msgid "Auto"
+msgctxt "Aspect ratio"
+msgid "Auto"
+msgstr "স্বয়ংক্রিয়"
 
-#: ../data/totem.schemas.in.h:5
-msgid "Default location for the \"Open...\" dialogs"
-msgstr "\"খুলুন...\" ডায়লগ বক্সগুলির ক্ষেত্রে নির্ধারিত ডিফল্ট অবস্থান"
+# msgstr "_অ্যাস্পেক্টের (আবয়ব) অনুপাত পরিবর্তন করা হোক"
+#: ../data/totem.ui.h:61
+msgid "Sets automatic aspect ratio"
+msgstr "স্বয়ংক্রিয়রূপে অ্যাস্পেক্টের অনুপাত নির্ধারণ করে"
 
-#: ../data/totem.schemas.in.h:6
-msgid ""
-"Default location for the \"Open...\" dialogs, default is the current "
-"directory"
-msgstr ""
-"\"খুলুন...\" ডায়লগ বক্সগুলির ক্ষেত্রে নির্ধারিত ডিফল্ট অবস্থান, বর্তমান ডিরেক্টরি ডিফল্ট "
-"রূপে চিহ্নিত হয়"
+#: ../data/totem.ui.h:62
+msgid "Square"
+msgstr "চৌকো"
 
-#: ../data/totem.schemas.in.h:7
-msgid "Default location for the \"Take Screenshot\" dialogs"
-msgstr "\"পর্দার ছবি নিন\" শীর্ষক ডায়লগ বক্সের ডিফল্ট অবস্থান"
+# msgstr "_অ্যাস্পেক্টের (আবয়ব) অনুপাত পরিবর্তন করা হোক"
+# ../data/totem.glade.ue:h:71
+#: ../data/totem.ui.h:63
+msgid "Sets square aspect ratio"
+msgstr "চতুষ্কোন অ্যাস্পেক্ট অনুপাত নির্ধারণ করে"
 
-#: ../data/totem.schemas.in.h:8
-msgid ""
-"Default location for the \"Take Screenshot\" dialogs, default is the "
-"Pictures directory"
-msgstr ""
-"\"পর্দার ছবি নিন\" শীর্ষক ডায়লগ বক্সের ডিফল্ট অবস্থান, ডিফল্টরূপে Pictures ডিরেক্টরি "
-"চিহ্নিত করা হয়"
+#: ../data/totem.ui.h:64
+msgid "4:3 (TV)"
+msgstr "৪:৩ (টেলিভিশান)"
 
-#: ../data/totem.schemas.in.h:9
-msgid "Enable deinterlacing"
-msgstr "ডি-ইন্টারলেসিং সক্রিয় করা হবে"
+# msgstr "_অ্যাস্পেক্টের (আবয়ব) অনুপাত পরিবর্তন করা হোক"
+#: ../data/totem.ui.h:65
+msgid "Sets 4:3 (TV) aspect ratio"
+msgstr "৪:৩ (টেলিভিশন) অ্যাস্পেক্ট অনুপাত নির্ধারণ করে"
 
-#: ../data/totem.schemas.in.h:10
-msgid "Encoding charset for subtitle"
-msgstr "অনুবাদলিপিতে ব্যবহৃত এনকোডিং"
+#: ../data/totem.ui.h:66
+msgid "16:9 (Widescreen)"
+msgstr "১৬:৯ (প্রসারিত পর্দা)"
 
-#: ../data/totem.schemas.in.h:11
-msgid "Name of the visual effects plugins"
-msgstr "ভিজুয়াল ইফেক্ট প্লাগ-ইনের নাম"
+#: ../data/totem.ui.h:67
+msgid "Sets 16:9 (widescreen) aspect ratio"
+msgstr "১৬:৯ (ওয়াইড-স্ক্রিন) অ্যাস্পেক্ট অনুপাত নির্ধারণ করে"
 
-#: ../data/totem.schemas.in.h:12
-msgid "Network buffering threshold"
-msgstr "নেটওয়ার্ক বাফারের প্রান্তিক মাপ"
+#: ../data/totem.ui.h:68
+msgid "2.11:1 (DVB)"
+msgstr "২.১১:১ (DVB)"
 
-#: ../data/totem.schemas.in.h:13
-msgid "Network connection speed"
-msgstr "নেটওয়ার্ক সংযোগ গতি"
+#: ../data/totem.ui.h:69
+msgid "Sets 2.11:1 (DVB) aspect ratio"
+msgstr "২.১১:১ (DVB) অ্যাস্পেক্ট অনুপাত নির্ধারণ করে"
 
-#: ../data/totem.schemas.in.h:14
-msgid "Pango font description for subtitle rendering"
-msgstr "অনুবাদলিপিতে রেন্ডারিং-র জন্য Pango-র ফন্টের বিবরণ"
+#: ../data/totem.ui.h:70
+msgid "S_ubtitles"
+msgstr "অনুবাদলিপি (_u)"
 
-#: ../data/totem.schemas.in.h:15
-msgid ""
-"Quality settings for the audio visualization: \"0\" for small, \"1\" for "
-"normal, \"2\" for large, \"3\" for extra large."
-msgstr ""
-"অডিও-র সাথে প্রদর্শিত ভিসুয়ালাইজেশনের গুণমান: ক্ষুদ্র মাপের জন্য \"0\", স্বাভাবিক "
-"মাপের জন্য \"1\", বড় মাপের জন্য \"2\", অত্যাধিক বড় মাপের জন্য \"3\"।"
+#: ../data/totem.ui.h:73
+msgid "_Languages"
+msgstr "ভাষা (_L)"
 
-#: ../data/totem.schemas.in.h:16
-msgid "Repeat mode"
-msgstr "পুনরাবৃত্তি মোড"
+# msgstr "১:২ অনুপাতে প্রদর্শন করা হোক"
+#: ../data/totem.ui.h:74
+msgid "Zoom In"
+msgstr "বড় মাপে প্রদর্শন"
 
-#: ../data/totem.schemas.in.h:17
-msgid "Resize the canvas automatically on file load"
-msgstr "ফাইল লোড হলে স্বয়ংক্রিয়ভাবে ক্যানভাসের মাপ পুনরায় নির্ধারণ করা হবে"
+# msgstr "১:২ অনুপাতে প্রদর্শন করা হোক"
+#: ../data/totem.ui.h:75
+msgid "Zoom in"
+msgstr "বড় মাপে প্রদর্শন"
 
-# msgstr "ফাইল লোড করা হলে স্বয়ংক্রিয়ভাবে ক্যানভাসের আকার পরিবর্তন করা হোক" <-- এটাও সোজা করে দিলাম ;-)
-#: ../data/totem.schemas.in.h:18
-msgid "Show visual effects when no video is displayed"
-msgstr "কোনো ভিডিও প্রদর্শন না করা হলে ভিজুয়াল ইফেক্ট প্রদর্শন করা হবে"
+# msgstr "পেছনে"
+#: ../data/totem.ui.h:76
+msgid "Skip _Forward"
+msgstr "এগিয়ে চলুন (_F)"
 
-#: ../data/totem.schemas.in.h:19
-msgid "Show visual effects when playing an audio only file."
-msgstr "শুধুমাত্র অডিও সহ ফাইল চালানো হলে ভিজুয়াল ইফেক্ট প্রদর্শন করা হবে।"
+# msgstr "পেছনে"
+#: ../data/totem.ui.h:77
+msgid "Skip forward"
+msgstr "এগিয়ে চলুন"
 
-#: ../data/totem.schemas.in.h:20
-msgid "Shuffle mode"
-msgstr "পাঁচমিশালি মোড"
+# আগেরটার মত
+#: ../data/totem.ui.h:78
+msgid "Skip _Backwards"
+msgstr "পিছিয়ে যান (_B)"
 
-#: ../data/totem.schemas.in.h:21
-msgid "Subtitle encoding"
-msgstr "অনুবাদলিপির এনকোডিং"
+# আগেরটার মত
+#: ../data/totem.ui.h:79
+msgid "Skip backwards"
+msgstr "পিছিয়ে যান"
 
-#: ../data/totem.schemas.in.h:22
-msgid "Subtitle font"
-msgstr "অনুবাদলিপির ফন্ট"
+#: ../data/totem.ui.h:82
+msgid "Time seek bar"
+msgstr "সময় প্রাপ্ত করতে ব্যবহৃত বার"
 
-#: ../data/totem.schemas.in.h:23
-msgid "The brightness of the video"
-msgstr "ভিডিও-র উজ্জ্বলতার মাত্রা"
+#: ../data/uri.ui.h:1
+msgid "Enter the _address of the file you would like to open:"
+msgstr "খোলার উদ্দেশ্যে ফাইলের ঠিকানা উল্লেখ করুন: (_a)"
 
-#: ../data/totem.schemas.in.h:24
-msgid "The contrast of the video"
-msgstr "ভিডিও-র বৈপরিত্যের মাত্রা"
+# Header পরিবর্তন করা হইছে
+# Chapter=অধ্যায়
+# অশুদ্ধ - পরিক্ষা
+# শুদ্ধ - পরীক্ষা
+#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
+msgid "_Add to Playlist"
+msgstr "প্লে-লিস্টের মধ্যে যোগ করুন (_A)"
 
-#: ../data/totem.schemas.in.h:25
-msgid "The hue of the video"
-msgstr "ভিডিও-র হিউ-র মাত্রা"
+#: ../data/video-list.ui.h:2
+msgid "Add the video to the playlist"
+msgstr "প্লে-লিস্টের মধ্যে ভিডিও যোগ করুন"
 
-#: ../data/totem.schemas.in.h:26
-msgid "The saturation of the video"
-msgstr "ভিডিও-র স্যাচুরেশন মাত্রা"
+#: ../src/backend/bacon-video-widget.c:1643
+msgid "Password requested for RTSP server"
+msgstr "RTSP সার্ভারের জন্য অনুরোধ করা পাসওয়ার্ড"
 
-#: ../data/totem.schemas.in.h:27
-msgid "Type of audio output to use"
-msgstr "ব্যবহারের জন্য অডিও আউটপুটের ধরন"
+#: ../src/backend/bacon-video-widget.c:2944
+#, c-format
+msgid "Audio Track #%d"
+msgstr "অডিও ট্র্যাক সংখ্যা #%d"
 
-#: ../data/totem.schemas.in.h:28
-msgid ""
-"Type of audio output to use: \"0\" for stereo, \"1\" for 4-channel output, "
-"\"2\" for 5.0 channel output, \"3\" for 5.1 channel output, \"4\" for AC3 "
-"Passthrough."
-msgstr ""
-"ব্যবহারের জন্য অডিও আউটপুটের ধরন: স্টিরিও-র ক্ষেত্রে \"0\" , ৪-চ্যানেল বিশিষ্ট "
-"আউটপুটের ক্ষেত্রে \"1\", ৫.০ চ্যানেল বিশিষ্ট আউটপুটের ক্ষেত্রে \"2\", ৫.০ চ্যানেল "
-"বিশিষ্ট আউটপুটের ক্ষেত্রে \"3\", AC3 পাসথ্রু-র ক্ষেত্রে \"4\"।"
-
-#. Translators: This is default subtitle encoding
-#. character set. You can change this to be the most common
-#. encoding for fansub subtitles in your language. File a bug
-#. against Totem, and leave UTF-8 as the default if in doubt.
-#: ../data/totem.schemas.in.h:33
-msgid "UTF-8"
-msgstr "UTF-8"
+#: ../src/backend/bacon-video-widget.c:2948
+#, c-format
+msgid "Subtitle #%d"
+msgstr "অনুবাদলিপি #%d"
 
-#: ../data/totem.schemas.in.h:34
-msgid "Visualization quality setting"
-msgstr "ভিশুয়ালাইজেশন প্রদর্শন সংক্রান্ত বৈশিষ্ট্য"
+#: ../src/backend/bacon-video-widget.c:3345
+msgid "The server you are trying to connect to is not known."
+msgstr "যে সার্ভারের সাথে সংযোগ স্থাপনের প্রচেষ্টা চলছে সেটি অজানা।"
+
+#: ../src/backend/bacon-video-widget.c:3348
+msgid "The connection to this server was refused."
+msgstr "এই সার্ভারের সাথে সংযোগ প্রত্যাখ্যান করা হয়েছে।"
+
+#: ../src/backend/bacon-video-widget.c:3351
+#| msgid "The movie could not be recorded."
+msgid "The specified movie could not be found."
+msgstr "নির্দিষ্ট চলচ্চিত্রটি পাওয়া যায়নি।"
+
+#: ../src/backend/bacon-video-widget.c:3358
+msgid "The server refused access to this file or stream."
+msgstr "সার্ভার দ্বারা এই ফাইল অথবা স্ট্রিমের ব্যবহার প্রত্যাখ্যান করা হয়েছে।"
+
+#: ../src/backend/bacon-video-widget.c:3364
+msgid "Authentication is required to access this file or stream."
+msgstr "এই ফাইল অথবা স্ট্রিম ব্যবহার করার জন্য অনুমোদন প্রয়োজন।"
+
+#: ../src/backend/bacon-video-widget.c:3371
+#| msgid "Totem was not able to play this disc."
+msgid "You are not allowed to open this file."
+msgstr "আপনি এই ফাইলটি খুলতে পারবেন না।"
 
-#: ../data/totem.schemas.in.h:35
-msgid "Whether the main window should stay on top"
-msgstr "প্রধান উইন্ডো উপরে স্থাপিত হবে কিনা"
-
-#: ../data/totem.schemas.in.h:36
-msgid "Whether the main window should stay on top of the other ones"
-msgstr "প্রধান উইন্ডো অন্যান্য সকল উইন্ডোর উপরে স্থাপিত হবে কিনা"
+# msgstr "এই চলচ্চিত্রটি ভাঙা এবং এর পরবর্তি অংশ চালানো সম্ভব নয়" <-- বানান
+# msgstr "এই চলচ্চিত্রটি ত্রুটিযুক্ত এবং এর পরবর্তী অংশ চালানো সম্ভব নয়"
+#: ../src/backend/bacon-video-widget.c:3376
+#| msgid "File is not a valid .desktop file"
+msgid "This location is not a valid one."
+msgstr "এই অবস্থানটি বৈধ নয়।"
+
+#: ../src/backend/bacon-video-widget.c:3384
+#| msgid "The movie could not be recorded."
+msgid "The movie could not be read."
+msgstr "চলচ্চিত্র পড়া যায়নি।"
 
-#: ../data/totem.schemas.in.h:37
-msgid "Whether to autoload text subtitle files when a movie is loaded"
-msgstr "চলচ্চিত্র লোত করামাত্র স্বয়ংক্রিয়রূপে অনুবাদলিপি লোড করা হবে কি না"
+#. should be exactly one missing thing (source or converter)
+#: ../src/backend/bacon-video-widget.c:3407
+#: ../src/backend/bacon-video-widget.c:3415
+#, c-format
+#| msgid ""
+#| "The playback of this movie requires a %s plugin which is not installed."
+msgid "The playback of this movie requires a %s plugin which is not installed."
+msgid_plural ""
+"The playback of this movie requires the following decoders which are not "
+"installed:\n"
+"\n"
+"%s"
+msgstr[0] "এই চলচ্চিত্র প্রদর্শনের জন্য আবশ্যক %s প্লাগ-ইন, ইনস্টল করা হয়নি।"
+msgstr[1] ""
+"এই চলচ্চিত্র প্রদর্শনের জন্য আবশ্যক নিম্নলিখিত ডিকোডারগুলি ইনস্টল করা হয়নি।:\n"
+"\n"
+"%s"
 
-#: ../data/totem.schemas.in.h:38
-#| msgid "Whether to disable the plugins in the user's home directory"
-msgid "Whether to disable the keyboard shortcuts"
-msgstr "কি-বোর্ড শর্ট-কাট নিষ্ক্রিয় করা হবে কি না"
+#: ../src/backend/bacon-video-widget.c:3426
+msgid ""
+"An audio or video stream is not handled due to missing codecs. You might "
+"need to install additional plugins to be able to play some types of movies"
+msgstr ""
+"অনুপস্থিত কোডেকের ফলে একটি অডিও অথবা ভিডিও স্ট্রিম সঞ্চালন করা যায়নি। কিছু "
+"ধরনের চলচ্চিত্র সঞ্চালনার জন্য কয়েকটি অতিরিক্ত প্লাগ-ইন ইনস্টল করা আবশ্যক।"
 
-#: ../data/totem.schemas.in.h:39
-msgid "Whether to disable the plugins in the user's home directory"
-msgstr "ব্যবহারকারীর ব্যক্তিগত ডিরেক্টরির মধ্যে প্লাগ-ইন নিষ্ক্রিয় করা হবে কি না"
+#: ../src/backend/bacon-video-widget.c:3436
+#| msgid ""
+#| "Cannot play this file over the network. Try downloading it to disk first."
+msgid ""
+"This file cannot be played over the network. Try downloading it locally "
+"first."
+msgstr ""
+"নেটওয়ার্কের মাধ্যমে এই ফাইল চালানো যাবে না। প্রথমে এটি ডিস্কে ডাউনলোড করার "
+"প্রচেষ্টা করুন।"
 
-#: ../data/totem.schemas.in.h:40
-msgid "Whether to enable debug for the playback engine"
-msgstr "প্লেব্যাক ইঞ্জিনের জন্য ডিবাগ সক্রিয় করা হবে কিনা"
+#: ../src/backend/bacon-video-widget.c:5494 ../src/totem-properties-view.c:227
+msgid "Surround"
+msgstr "সারাউন্ড"
 
-#: ../data/totem.schemas.in.h:41
-msgid ""
-"Whether to remember the position of played audio/video files when pausing or "
-"closing them."
-msgstr "চলমান অডিও/ভিডিও স্থগিত অথবা বন্ধ করা হলে, ব্যাঘাতের স্থানটি মনে রাখা হবে কি না।"
+#: ../src/backend/bacon-video-widget.c:5496 ../src/totem-properties-view.c:229
+msgid "Mono"
+msgstr "মোনো"
 
-#: ../data/uri.ui.h:1
-msgid "Enter the _address of the file you would like to open:"
-msgstr "খোলার উদ্দেশ্যে ফাইলের ঠিকানা উল্লেখ করুন: (_a)"
+#: ../src/backend/bacon-video-widget.c:5781
+msgid "Media contains no supported video streams."
+msgstr "কোনো সমর্থিত ভিডিও স্ট্রিম মিডিয়ার মধ্যে উপস্থিত নেই।"
 
-#: ../lib/totem-scrsaver.c:115
-msgid "Playing a movie"
-msgstr "চলচ্চিত্র চালানো হচ্ছে"
+#: ../src/backend/bacon-video-widget.c:5963
+msgid ""
+"Some necessary plug-ins are missing. Make sure that the program is correctly "
+"installed."
+msgstr ""
+"কয়েকটি আবশ্যক প্লাগ-ইন বর্তমানে উপস্থিত নেই। অনুগ্রহ করে পরীক্ষা করুন "
+"প্রোগ্রামটি সঠিকভাবে ইনস্টল করা হয়েছে কি না।"
 
 # msgstr "এই চলচ্চিত্রটি ভাঙা এবং এর পরবর্তি অংশ চালানো সম্ভব নয়" <-- বানান
 # msgstr "এই চলচ্চিত্রটি ত্রুটিযুক্ত এবং এর পরবর্তী অংশ চালানো সম্ভব নয়"
@@ -1049,105 +1048,251 @@
 msgid "Unrecognized desktop file Version '%s'"
 msgstr "ডেস্কটপ ফাইলের অজ্ঞাত সংস্করণ '%s'"
 
-#: ../src/eggdesktopfile.c:958
+#: ../src/eggdesktopfile.c:968
 #, c-format
 msgid "Starting %s"
 msgstr "%s আরম্ভ করা হচ্ছে"
 
-#: ../src/eggdesktopfile.c:1100
+#: ../src/eggdesktopfile.c:1110
 #, c-format
 msgid "Application does not accept documents on command line"
 msgstr "অ্যাপ্লিকেশন দ্বারা কমান্ড-লাইনের মাধ্যমে নথিপত্র গ্রহণ করা হয় না"
 
-#: ../src/eggdesktopfile.c:1168
+#: ../src/eggdesktopfile.c:1178
 #, c-format
 msgid "Unrecognized launch option: %d"
 msgstr "প্রারম্ভিক বিকল্প অজানা: %d"
 
-#: ../src/eggdesktopfile.c:1373
+#: ../src/eggdesktopfile.c:1383
 #, c-format
 msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
 msgstr "'Type=Link' ডেস্কটপ এনট্রির ক্ষেত্রে নথিপত্রের URI উল্লেখ করা সম্ভব নয়"
 
-#: ../src/eggdesktopfile.c:1394
+#: ../src/eggdesktopfile.c:1404
 #, c-format
 msgid "Not a launchable item"
 msgstr "প্রারম্ভ করার যোগ্য বস্তু নয়"
 
-#: ../src/eggfileformatchooser.c:235
+#: ../src/eggfileformatchooser.c:240
 #, c-format
 msgid "File _Format: %s"
 msgstr "ফাইলের বিন্যাস: %s (_F)"
 
 # msgstr "এই পাসওয়ার্ডটি মনে রাখা হবে"
-#: ../src/eggfileformatchooser.c:374
+#: ../src/eggfileformatchooser.c:379
 msgid "All Files"
 msgstr "সকল ফাইল"
 
-#: ../src/eggfileformatchooser.c:375
+#: ../src/eggfileformatchooser.c:380
 msgid "All Supported Files"
 msgstr "সমর্থিত সকল ফাইল"
 
-#: ../src/eggfileformatchooser.c:384
+#: ../src/eggfileformatchooser.c:389
 msgid "By Extension"
 msgstr "এক্সটেনশন অনুযায়ী"
 
-#: ../src/eggfileformatchooser.c:399
+#: ../src/eggfileformatchooser.c:404
 msgid "File Format"
 msgstr "ফাইলের বিন্যাস"
 
-#: ../src/eggfileformatchooser.c:417
+#: ../src/eggfileformatchooser.c:422
 msgid "Extension(s)"
 msgstr "এক্সটেনশন"
 
-#: ../src/eggfileformatchooser.c:651
+#. Translators: the parameter is a filename
+#: ../src/eggfileformatchooser.c:657
 #, c-format
 msgid ""
-"The program was not able to find out the file format you want to use for `%"
-"s'. Please make sure to use a known extension for that file or manually "
+"The program was not able to find out the file format you want to use for `"
+"%s'. Please make sure to use a known extension for that file or manually "
 "choose a file format from the list below."
 msgstr ""
-"`%s'-র জন্য ব্যবহারের উদ্দেশ্যে ফাইলের বিন্যাসটি এই প্রোগ্রাম দ্বারা সনাক্ত করা সম্ভব "
-"হয়নি। অনুগ্রহ করে এই ফাইলের জন্য একটি পরিচিত এনক্সটেশন  প্রয়োগ করুন অথবা নিম্নলিখিত "
+"`%s'-র জন্য ব্যবহারের উদ্দেশ্যে ফাইলের বিন্যাসটি এই প্রোগ্রাম দ্বারা সনাক্ত "
+"করা সম্ভব "
+"হয়নি। অনুগ্রহ করে এই ফাইলের জন্য একটি পরিচিত এনক্সটেশন  প্রয়োগ করুন অথবা "
+"নিম্নলিখিত "
 "তালিকা থেকে একটি ফাইলের বিন্যাস নির্বাচন করুন।"
 
-#: ../src/eggfileformatchooser.c:658
+#: ../src/eggfileformatchooser.c:664
 msgid "File format not recognized"
 msgstr "ফাইলের বিন্যাস সনাক্ত করা যায়নি"
 
-#: ../src/eggsmclient.c:225
+#: ../src/eggsmclient.c:226
 msgid "Disable connection to session manager"
 msgstr "সেশান পরিচালনব্যবস্থার সাথে সংযোগ বিচ্ছিন্ন করা হবে"
 
-#: ../src/eggsmclient.c:228
+#: ../src/eggsmclient.c:229
 msgid "Specify file containing saved configuration"
 msgstr "সংরক্ষিত কনফিগারেশন ধারণকারী ফাইল উল্লেখ করুন"
 
-#: ../src/eggsmclient.c:228
+#: ../src/eggsmclient.c:229
 msgid "FILE"
 msgstr "FILE"
 
-#: ../src/eggsmclient.c:231
+#: ../src/eggsmclient.c:232
 msgid "Specify session management ID"
 msgstr "সেশান পরিচালনার ID উল্লেখ করুন"
 
-#: ../src/eggsmclient.c:231
+#: ../src/eggsmclient.c:232
 msgid "ID"
 msgstr "ID"
 
-#: ../src/eggsmclient.c:252
+#: ../src/eggsmclient.c:253
 msgid "Session management options:"
 msgstr "সেশান পরিচালনা সংক্রান্ত বিকল্প:"
 
-#: ../src/eggsmclient.c:253
+#: ../src/eggsmclient.c:254
 msgid "Show session management options"
 msgstr "সেশান পরিচালনা সংক্রান্ত বিকল্প প্রদর্শন করা হবে"
 
+#. hour:minutes:seconds
+#. Translators: This is a time format, like "9:05:02" for 9
+#. * hours, 5 minutes, and 2 seconds. You may change ":" to
+#. * the separator that your locale uses or use "%Id" instead
+#. * of "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:56
+#: ../src/plugins/skipto/totem-time-entry.c:57
+#, c-format
+msgctxt "long time format"
+msgid "%d:%02d:%02d"
+msgstr "%d:%02d:%02d"
+
+#. minutes:seconds
+#. Translators: This is a time format, like "5:02" for 5
+#. * minutes and 2 seconds. You may change ":" to the
+#. * separator that your locale uses or use "%Id" instead of
+#. * "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:65
+#, c-format
+msgctxt "short time format"
+msgid "%d:%02d"
+msgstr "%d:%02d"
+
+#. Title
+#. Artist
+#. Album
+#. Year
+#. Container
+#: ../src/properties/bacon-video-widget-properties.c:107
+#: ../src/properties/bacon-video-widget-properties.c:109
+#: ../src/properties/bacon-video-widget-properties.c:111
+#: ../src/properties/bacon-video-widget-properties.c:113
+#: ../src/properties/bacon-video-widget-properties.c:119
+msgid "Unknown"
+msgstr "অজানা"
+
+#. Dimensions
+#: ../src/properties/bacon-video-widget-properties.c:122
+#| msgid "N/A"
+msgctxt "Dimensions"
+msgid "N/A"
+msgstr "প্রযোজ্য নয়"
+
+#. Video Codec
+#: ../src/properties/bacon-video-widget-properties.c:124
+#| msgid "N/A"
+msgctxt "Video codec"
+msgid "N/A"
+msgstr "প্রযোজ্য নয়"
+
+#: ../src/properties/bacon-video-widget-properties.c:127
+#| msgid "N/A"
+msgctxt "Video bit rate"
+msgid "N/A"
+msgstr "প্রযোজ্য নয়"
+
+#: ../src/properties/bacon-video-widget-properties.c:130
+#: ../src/properties/bacon-video-widget-properties.c:240
+#| msgid "N/A"
+msgctxt "Frame rate"
+msgid "N/A"
+msgstr "প্রযোজ্য নয়"
+
+#: ../src/properties/bacon-video-widget-properties.c:134
+#| msgid "N/A"
+msgctxt "Audio bit rate"
+msgid "N/A"
+msgstr "প্রযোজ্য নয়"
+
+#. Audio Codec
+#: ../src/properties/bacon-video-widget-properties.c:136
+#| msgid "N/A"
+msgctxt "Audio codec"
+msgid "N/A"
+msgstr "প্রযোজ্য নয়"
+
+#. Sample rate
+#: ../src/properties/bacon-video-widget-properties.c:138
+msgid "0 Hz"
+msgstr "০ হার্টজ"
+
+#. Channels
+#: ../src/properties/bacon-video-widget-properties.c:140
+msgid "0 Channels"
+msgstr "০ চ্যানেল"
+
+# msgstr "টোটেম ভিডিও উইন্ডো" <-- ঠিক আছেনা ?
+#: ../src/properties/bacon-video-widget-properties.c:156
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d ঘন্টা"
+msgstr[1] "%d ঘন্টা"
+
+#: ../src/properties/bacon-video-widget-properties.c:158
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d মিনিট"
+msgstr[1] "%d মিনিট"
+
+#: ../src/properties/bacon-video-widget-properties.c:161
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d সেকেন্ড"
+msgstr[1] "%d সেকেন্ড"
+
+#. 5 hours 2 minutes 12 seconds
+#: ../src/properties/bacon-video-widget-properties.c:167
+#, c-format
+#| msgid "%s %s %s"
+msgctxt "time"
+msgid "%s %s %s"
+msgstr "%s %s %s"
+
+#. 2 minutes 12 seconds
+#: ../src/properties/bacon-video-widget-properties.c:170
+#, c-format
+#| msgid "%s %s"
+msgctxt "time"
+msgid "%s %s"
+msgstr "%s %s"
+
+#. 0 seconds
+#: ../src/properties/bacon-video-widget-properties.c:176
+msgid "0 seconds"
+msgstr "০ সেকেন্ড"
+
+#: ../src/properties/bacon-video-widget-properties.c:237
+#, c-format
+#| msgid "%d frames per second"
+msgid "%d frame per second"
+msgid_plural "%d frames per second"
+msgstr[0] "প্রতি সেকেন্ডে %d-টি ফ্রেম"
+msgstr[1] "প্রতি সেকেন্ডে %d-টি ফ্রেম"
+
 # msgstr "এই পাসওয়ার্ডটি মনে রাখা হবে"
-#: ../src/totem-audio-preview.c:82
+#: ../src/totem-audio-preview.c:137
 msgid "Audio Preview"
 msgstr "অডিও প্রি-ভিউ"
 
+#: ../src/totem.c:240
+msgid "Verify your system installation. Totem will now exit."
+msgstr "আপনার সিস্টেমের ইনস্টলেশন পরীক্ষা করুন। Totem এখন বন্ধ করা হবে।"
+
 #: ../src/totem-cell-renderer-video.c:126
 msgid "Unknown video"
 msgstr "অজানা ভিডিও"
@@ -1160,331 +1305,232 @@
 msgid "Cancel"
 msgstr "বাতিল"
 
-#: ../src/totem-fullscreen.c:595
+#: ../src/totem-fullscreen.c:573
 msgid "No File"
 msgstr "ফাইল নেই।"
 
-#: ../src/totem-interface.c:172 ../src/totem-interface.c:204
+#: ../src/totem-interface.c:181 ../src/totem-interface.c:224
 #, c-format
 msgid "Couldn't load the '%s' interface. %s"
 msgstr "'%s' ইন্টারফেস লোড করা যায়নি। %s"
 
-#: ../src/totem-interface.c:172
+#: ../src/totem-interface.c:181
 msgid "The file does not exist."
 msgstr "ফাইল বর্তমানে উপস্থিত নেই।"
 
-#: ../src/totem-interface.c:174 ../src/totem-interface.c:176
-#: ../src/totem-interface.c:206 ../src/totem-interface.c:208
+#: ../src/totem-interface.c:183 ../src/totem-interface.c:185
+#: ../src/totem-interface.c:226 ../src/totem-interface.c:228
 msgid "Make sure that Totem is properly installed."
 msgstr "Totem সঠিকভাবে ইনস্টল করা হয়েছে কিনা পরীক্ষা করুন।"
 
-#: ../src/totem-interface.c:319
+#: ../src/totem-interface.c:357
 msgid ""
 "Totem 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."
 msgstr ""
-"Totem একটি মুক্ত সফ্টওয়্যার; Free Software Foundation দ্বারা প্রকাশিত GNU General "
-"Public License-র শর্তানুযায়ী এটি বিতরণ ও পরিবর্তন করা যাবে; লাইসেন্সের সংস্করণ ২ "
+"Totem একটি মুক্ত সফ্টওয়্যার; Free Software Foundation দ্বারা প্রকাশিত GNU "
+"General "
+"Public License-র শর্তানুযায়ী এটি বিতরণ ও পরিবর্তন করা যাবে; লাইসেন্সের "
+"সংস্করণ ২ "
 "অথবা (আপনার সুবিধানুযায়ী) ঊর্ধ্বতন কোনো সংস্করণের অধীন।"
 
-#: ../src/totem-interface.c:323
+#: ../src/totem-interface.c:361
 msgid ""
 "Totem 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 General Public License for more "
 "details."
 msgstr ""
-"Totem বিতরণ করার মূল উদ্দেশ্য যে ব্যবহারকারীরা এর দ্বারা উপকৃত হবেন, কিন্তু এটির জন্য "
-"কোনো সুস্পষ্ট ওয়ারেন্টি উপস্থিত নেই; বাণিজ্যিক ও কোনো সুনির্দিষ্ট কর্ম সাধনের জন্য "
+"Totem বিতরণ করার মূল উদ্দেশ্য যে ব্যবহারকারীরা এর দ্বারা উপকৃত হবেন, কিন্তু "
+"এটির জন্য "
+"কোনো সুস্পষ্ট ওয়ারেন্টি উপস্থিত নেই; বাণিজ্যিক ও কোনো সুনির্দিষ্ট কর্ম সাধনের "
+"জন্য "
 "অন্তর্নিহীত ওয়ারেন্টিও অনুপস্থিত। অধিক জানতে GNU General Public License পড়ুন।"
 
-#: ../src/totem-interface.c:327
+#: ../src/totem-interface.c:365
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Totem; if not, write to the Free Software Foundation, Inc., 59 Temple Place, "
 "Suite 330, Boston, MA  02111-1307  USA"
 msgstr ""
 "Totem-র সাথে GNU General Public License-র একটি প্রতিলিপি উপলব্ধ হওয়া উচিত; না "
-"থাকলে নিম্নলিখিত ঠিকানায় লিখে তা সংগ্রহ করুন Free Software Foundation, Inc., 51 "
+"থাকলে নিম্নলিখিত ঠিকানায় লিখে তা সংগ্রহ করুন Free Software Foundation, Inc., "
+"51 "
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA"
 
-#: ../src/totem-interface.c:330
+#: ../src/totem-interface.c:368
 msgid ""
 "Totem contains an exception to allow the use of proprietary GStreamer "
 "plugins."
 msgstr ""
-"Totem দ্বারা প্রোপ্রাইটারি GStreamer প্লাগ-ইন ব্যবহারের জন্য প্রযোজ্য অনুমোদন উপস্থিত "
+"Totem দ্বারা প্রোপ্রাইটারি GStreamer প্লাগ-ইন ব্যবহারের জন্য প্রযোজ্য অনুমোদন "
+"উপস্থিত "
 "রয়েছে।"
 
-#: ../src/totem-menu.c:192
+#. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
+#: ../src/totem-menu.c:291
 msgid "None"
 msgstr "ফাঁকা"
 
-#. Translators:
-#. * This is not a JPEG image, but a disc image, for example,
-#. * an ISO file
-#: ../src/totem-menu.c:744
-#, c-format
-#| msgid "Play Disc '%s'"
-msgid "Play Image '%s'"
-msgstr "'%s' নামক ইমেজ সঞ্চালিত হবে"
-
-#: ../src/totem-menu.c:747 ../src/totem-menu.c:829
-#, c-format
-msgid "device%d"
-msgstr "ডিভাইস%d"
-
-#: ../src/totem-menu.c:826
-#, c-format
-msgid "Play Disc '%s'"
-msgstr "'%s' নামক ডিস্ক চালান"
-
-# নিজের নামে আন্ডারস্কোর দিছেন কেন ???@@#!!!
-# msgstr "রুনা ভট্টাচার্য্য " <-- ঠিক আছেনা ?
-#. This lists the back-end type and version, such as
-#. * Movie Player using GStreamer 0.10.1
-#: ../src/totem-menu.c:1177
-#, c-format
-msgid "Movie Player using %s"
-msgstr "%s প্রয়োগকারী মুভি প্লেয়ার"
+# msgstr "কোনটিই নয়"
+# msgstr "একটিও নয়"
+#. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
+#: ../src/totem-menu.c:296
+#| msgid "Auto"
+msgctxt "Language"
+msgid "Auto"
+msgstr "স্বয়ংক্রিয়"
 
-#: ../src/totem-menu.c:1181
+#: ../src/totem-menu.c:789
 msgid "Copyright © 2002-2009 Bastien Nocera"
 msgstr "স্বত্বাধিকার ২০০২-২০০৯ বেস্টিয়ান নোসেরা"
 
-#: ../src/totem-menu.c:1186 ../browser-plugin/totem-plugin-viewer.c:1127
+#: ../src/totem-menu.c:794
 msgid "translator-credits"
 msgstr "রুণা ভট্টাচার্য্য"
 
-#: ../src/totem-menu.c:1190
+#: ../src/totem-menu.c:798
 msgid "Totem Website"
 msgstr "Totem ওয়েব-সাইট"
 
-#: ../src/totem-menu.c:1225
+#: ../src/totem-menu.c:829
 msgid "Configure Plugins"
-msgstr "প্লাগ-ইন কনফিগার করুন"
-
-#. Translators: %s is the totem version number
-#: ../src/totem-object.c:431
-#, c-format
-#| msgid "Totem Website"
-msgid "Totem %s"
-msgstr "Totem %s"
-
-#: ../src/totem-object.c:1000 ../browser-plugin/totem-plugin-viewer.c:361
-msgid "Playing"
-msgstr "চালানো হচ্ছে"
-
-#: ../src/totem-object.c:1002 ../src/totem-options.c:51
-msgid "Pause"
-msgstr "থামানো হবে"
-
-#: ../src/totem-object.c:1007 ../browser-plugin/totem-plugin-viewer.c:357
-msgid "Paused"
-msgstr "থামানো হয়েছে"
-
-#. Translators: this refers to a media file
-#: ../src/totem-object.c:1009 ../src/totem-object.c:1019
-#: ../src/totem-options.c:50
-#: ../src/plugins/coherence_upnp/coherence_upnp.py:76
-#: ../src/plugins/coherence_upnp/coherence_upnp.py:88
-msgid "Play"
-msgstr "চালানো হবে"
-
-# msgstr "স্ট্যাটাসবারে লিখিত টেক্সটের চারপাশে প্রদর্শিত বেভেলের ধরন"
-#: ../src/totem-object.c:1014 ../src/totem-object.c:1623
-#: ../src/totem-statusbar.c:96 ../browser-plugin/totem-plugin-viewer.c:345
-msgid "Stopped"
-msgstr "স্থগিত"
-
-#: ../src/totem-object.c:1095 ../src/totem-object.c:1122
-#: ../src/totem-object.c:1753 ../src/totem-object.c:1916
-#, c-format
-msgid "Totem could not play '%s'."
-msgstr "Totem সহযোগে '%s' চালানো যায়নি।"
-
-# msgstr ""
-# "সঠিক প্লাগিন না থাকায় টোটেম এধরনের মিডিয়া চালাতে অক্ষম।\n"
-# "এই মিডিয়া ব্যবহারের জন্য সঠিক প্লাগিন ইনস্টল করে পুনরায় টোটেম চালু করুন।"
-#: ../src/totem-object.c:1199
-#, c-format
-msgid ""
-"Totem could not play this media (%s) although a plugin is present to handle "
-"it."
-msgstr "সঠিক প্লাগ-ইন উপস্থিত থাকা সত্বেও Totem দ্বারা এই মিডিয়া (%s) চালানো সম্ভব হয়নি।"
-
-# msgstr ""
-# "সঠিক প্লাগিন না থাকায় টোটেম এধরনের মিডিয়া চালাতে অক্ষম।\n"
-# "এই মিডিয়া ব্যবহারের জন্য সঠিক প্লাগিন ইনস্টল করে পুনরায় টোটেম চালু করুন।"
-#: ../src/totem-object.c:1200
-msgid ""
-"You might want to check that a disc is present in the drive and that it is "
-"correctly configured."
-msgstr "ড্রাইভে ডিস্ক আছে কিনা এবং তা সঠিকভাবে কনফিগার করা হয়েছে কিনা পরীক্ষা করুন।"
-
-#: ../src/totem-object.c:1208
-msgid "More information about media plugins"
-msgstr "মিডিয়া প্লাগ-ইন সম্বন্ধে অধিক তথ্য"
-
-#: ../src/totem-object.c:1209
-msgid ""
-"Please install the necessary plugins and restart Totem to be able to play "
-"this media."
-msgstr "এই মিডিয়া চালানোর জন্য সঠিক প্লাগ-ইন ইনস্টল করে Totem পুনরায় চালু করুন।"
-
-#: ../src/totem-object.c:1211
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because it does not have the "
-"appropriate plugins to be able to read from the disc."
-msgstr ""
-"ডিস্ক থেকে তথ্য পাঠের উদ্দেশ্যে সঠিক প্লাগ-ইন উপস্থিত না থাকার ফলে Totem-র পক্ষে এই "
-"ধরনের মিডিয়া (%s) চালানো সম্ভব নয়।"
+msgstr "প্লাগ-ইন কনফিগার করুন"
 
-#: ../src/totem-object.c:1213
+#: ../src/totem-object.c:162
 #, c-format
 msgid ""
-"Totem cannot play this type of media (%s) because you do not have the "
-"appropriate plugins to handle it."
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
-"সঠিক প্লাগ-ইন উপস্থিত না থাকার ফলে Totem-র পক্ষে এই ধরনের মিডিয়া (%s) চালানো "
-"সম্ভব নয়।"
+"%s\n"
+"কমান্ড-লাইন থেকে ব্যবহারযোগ্য বিকল্পের সম্পূর্ণ তালিকা দেখার জন্য '%s --help' "
+"ব্যবহার "
+"করুন।\n"
 
-#: ../src/totem-object.c:1216
+#. Translators: %s is the totem version number
+#: ../src/totem-object.c:591
 #, c-format
-msgid "Totem cannot play this type of media (%s) because it is not supported."
-msgstr "এই ধরনের মিডিয়া (%s) Totem দ্বারা সমর্থিত না হওয়ার ফলে এটি চালানো যাবে না।"
-
-#: ../src/totem-object.c:1217
-msgid "Please insert another disc to play back."
-msgstr "চালনার জন্য অনুগ্রহ করে একটি ডিস্ক ঢুকিয়ে দিন।"
+msgid "Totem %s"
+msgstr "Totem %s"
 
-#: ../src/totem-object.c:1252
-msgid "Totem was not able to play this disc."
-msgstr "Totem দ্বারা এই ডিস্ক চালানো সম্ভব হয়নি।"
+#: ../src/totem-object.c:1168 ../src/totem-options.c:52
+msgid "Pause"
+msgstr "থামানো হবে"
 
-#: ../src/totem-object.c:1253 ../src/totem-object.c:4189
-msgid "No reason."
-msgstr "কারণ নেই।"
+#: ../src/totem-object.c:1175 ../src/totem-object.c:1185
+#: ../src/totem-options.c:51
+msgid "Play"
+msgstr "চালানো হবে"
 
-#: ../src/totem-object.c:1267
-msgid "Totem does not support playback of Audio CDs"
-msgstr "Totem দ্বারা অডিও CD চালানো সম্ভব নয়"
-
-#: ../src/totem-object.c:1268
-msgid "Please consider using a music player or a CD extractor to play this CD"
-msgstr "এই CD চালানোর জন্য অনুগ্রহ করে কোনো মিউজিক প্লেয়ার অথবা CD এক্সট্র্যাক্টার ব্যবহার করুন"
+#: ../src/totem-object.c:1267 ../src/totem-object.c:1294
+#: ../src/totem-object.c:1787 ../src/totem-object.c:1942
+#, c-format
+msgid "Totem could not play '%s'."
+msgstr "Totem সহযোগে '%s' চালানো যায়নি।"
 
-#: ../src/totem-object.c:1759
+#: ../src/totem-object.c:1793
 msgid "No error message"
 msgstr "সমস্যাজড়িত বার্তা নেই"
 
-#: ../src/totem-object.c:2143
+#: ../src/totem-object.c:2133
 msgid "Totem could not display the help contents."
 msgstr "Totem দ্বারা সহায়িকার বিষয় বস্তু প্রদর্শন করা যায়নি।"
 
-#: ../src/totem-object.c:2473 ../src/totem-object.c:2475
-#: ../browser-plugin/totem-plugin-viewer.c:1428
-msgid "An error occurred"
-msgstr "সমস্যা উৎপন্ন হয়েছে"
-
-#: ../src/totem-object.c:4031 ../src/totem-object.c:4033
+#: ../src/totem-object.c:4019 ../src/totem-object.c:4021
 msgid "Previous Chapter/Movie"
 msgstr "পূর্ববর্তী অধ্যায়/চলচ্চিত্র"
 
-#: ../src/totem-object.c:4040 ../src/totem-object.c:4042
+#: ../src/totem-object.c:4028 ../src/totem-object.c:4030
 msgid "Play / Pause"
 msgstr "চালানো / থামানো হবে"
 
-#: ../src/totem-object.c:4050 ../src/totem-object.c:4052
+#: ../src/totem-object.c:4038 ../src/totem-object.c:4040
 msgid "Next Chapter/Movie"
 msgstr "পরবর্তী অধ্যায়/চলচ্চিত্র"
 
 # msgstr "বের করে দেওয়া হোক (_ব)"
 # Eject অর্থে 'বার' শব্দটা সম্ভবত কথ্য ভাষার। Dict দেখেন।
-#: ../src/totem-object.c:4064 ../src/totem-object.c:4066
-#| msgid "_Fullscreen"
+#. Translators: this is the accessibility text for the fullscreen button in the controls box in Totem's main window.
+#: ../src/totem-object.c:4051 ../src/totem-object.c:4053
 msgid "Fullscreen"
 msgstr "সম্পূর্ণ পর্দা জুড়ে প্রদর্শন"
 
-#: ../src/totem-object.c:4189
+#: ../src/totem-object.c:4184
 msgid "Totem could not startup."
 msgstr "Totem আরম্ভ করা যায়নি।"
 
-#: ../src/totem-open-location.c:171
+#: ../src/totem-object.c:4184
+msgid "No reason."
+msgstr "কারণ নেই।"
+
+#: ../src/totem-open-location.c:182
 msgid "Open Location..."
 msgstr "অবস্থান খুলুন..."
 
-#: ../src/totem-options.c:48
+#: ../src/totem-options.c:49
 msgid "Enable debug"
 msgstr "ডি-বাগ ব্যবস্থা সক্রিয় করা হবে"
 
 # msgstr "চলচ্চিত্রটি চালানো অথবা স্থগিত রাখা হোক"
-#: ../src/totem-options.c:49
+#: ../src/totem-options.c:50
 msgid "Play/Pause"
 msgstr "চালানো/থামানো হবে"
 
-#: ../src/totem-options.c:52
+#: ../src/totem-options.c:53
 msgid "Next"
 msgstr "পরবর্তী"
 
 # msgstr "চালানো/স্থগিত রাখা হোক"
-#: ../src/totem-options.c:53
+#: ../src/totem-options.c:54
 msgid "Previous"
 msgstr "পূর্ববর্তী"
 
-#: ../src/totem-options.c:54
+#: ../src/totem-options.c:55
 msgid "Seek Forwards"
 msgstr "পরবর্তী অংশে অনুসন্ধান"
 
-#: ../src/totem-options.c:55
+#: ../src/totem-options.c:56
 msgid "Seek Backwards"
 msgstr "পূর্ববর্তী অংশে অনুসন্ধান"
 
-#: ../src/totem-options.c:56
+#: ../src/totem-options.c:57
 msgid "Volume Up"
 msgstr "শব্দের মাত্রা বৃদ্ধি করুন"
 
-#: ../src/totem-options.c:57
+#: ../src/totem-options.c:58
 msgid "Volume Down"
 msgstr "শব্দের মাত্রা হ্রাস করুন"
 
-#: ../src/totem-options.c:58
+#: ../src/totem-options.c:59
 msgid "Mute sound"
 msgstr "নিঃশব্দ করুন"
 
-#: ../src/totem-options.c:59
+#: ../src/totem-options.c:60
 msgid "Toggle Fullscreen"
 msgstr "সম্পূর্ণ পর্দা জুড়ে প্রদর্শন করা হবে/হবে না"
 
 # Playlist=চলচ্চিত্রের তালিকা
-#: ../src/totem-options.c:60
+#: ../src/totem-options.c:61
 msgid "Show/Hide Controls"
 msgstr "নিয়ন্ত্রক বাটন প্রদর্শন/আড়াল করা হবে"
 
-#: ../src/totem-options.c:61
+#: ../src/totem-options.c:62
 msgid "Quit"
 msgstr "প্রস্থান"
 
 # msgstr "প্রস্থান"
 # "বেরিয়ে" যাওয়া কথ্য ভাষায় Use হয়। তাই "বাহির হয়ে আসা" লেখা উচিৎ।
-#. Translators: this refers to a media file
-#: ../src/totem-options.c:62
-#: ../src/plugins/coherence_upnp/coherence_upnp.py:79
-#: ../src/plugins/coherence_upnp/coherence_upnp.py:91
+#: ../src/totem-options.c:63
 msgid "Enqueue"
 msgstr "সারিবদ্ধ করা হবে"
 
-#: ../src/totem-options.c:63
+#: ../src/totem-options.c:64
 msgid "Replace"
 msgstr "পরিবর্তন করা হবে"
 
-#: ../src/totem-options.c:64
-msgid "Don't connect to an already-running instance"
-msgstr "চলমান কোনো ইনস্ট্যান্সের সাথে সংযোগ স্থাপন করা হবে না"
-
 #: ../src/totem-options.c:65
 msgid "Seek"
 msgstr "সিক"
@@ -1493,47 +1539,58 @@
 # Chapter=অধ্যায়
 # অশুদ্ধ - পরিক্ষা
 # শুদ্ধ - পরীক্ষা
-#: ../src/totem-options.c:66
+#. Translators: help for a (hidden) command line option to specify (the zero-based index of) a playlist entry to start playing once Totem's finished loading
+#: ../src/totem-options.c:67
 msgid "Playlist index"
 msgstr "প্লে-লিস্টের ইনডেক্স"
 
-#: ../src/totem-options.c:68
+#: ../src/totem-options.c:69
 msgid "Movies to play"
 msgstr "চালানোর জন্য চিহ্নিত চলচ্চিত্র।"
 
+# msgstr "বৎসর:" <-- বানান
+# msgstr "বছর:"
+#: ../src/totem-options.c:79
+msgid "- Play movies and songs"
+msgstr "- চলচ্চিত্র ও সংগীত পরিবেশন"
+
+#: ../src/totem-options.c:142
+msgid "Can't enqueue and replace at the same time"
+msgstr "একই সময়ে সারিবদ্ধ ও প্রতিস্থাপন করা যাবে না "
+
 # Header পরিবর্তন করা হইছে
 # Chapter=অধ্যায়
 # অশুদ্ধ - পরিক্ষা
 # শুদ্ধ - পরীক্ষা
 #. By extension entry
-#: ../src/totem-playlist.c:150
+#: ../src/totem-playlist.c:162
 msgid "MP3 ShoutCast playlist"
 msgstr "MP3 ShoutCast প্লে-লিস্ট"
 
-#: ../src/totem-playlist.c:151
+#: ../src/totem-playlist.c:163
 msgid "MP3 audio (streamed)"
 msgstr "MP3 অডিও (স্ট্রিম করা)"
 
-#: ../src/totem-playlist.c:152
+#: ../src/totem-playlist.c:164
 msgid "MP3 audio (streamed, DOS format)"
 msgstr "MP3 অডিও (স্ট্রিম করা, DOS বিন্যাস)"
 
-#: ../src/totem-playlist.c:153
+#: ../src/totem-playlist.c:165
 msgid "XML Shareable Playlist"
 msgstr "XML সহযোগে যৌথভাবে ব্যবহারযোগ্য প্লে-লিস্ট"
 
 #. This is "Title 3", where title is a DVD title
 #. * Note: NOT a DVD chapter
-#: ../src/totem-playlist.c:356
+#: ../src/totem-playlist.c:348
 #, c-format
 msgid "Title %d"
 msgstr "শিরোনাম %d"
 
-#: ../src/totem-playlist.c:457
+#: ../src/totem-playlist.c:447
 msgid "Could not save the playlist"
 msgstr "প্লে-লিস্ট সংরক্ষণ করা যায়নি"
 
-#: ../src/totem-playlist.c:1030
+#: ../src/totem-playlist.c:1022
 msgid "Save Playlist"
 msgstr "প্লে-লিস্ট সংরক্ষণ করুন"
 
@@ -1543,107 +1600,128 @@
 # শুদ্ধ - পরীক্ষা
 #. translators: Playlist is the default saved playlist filename,
 #. * without the suffix
-#: ../src/totem-playlist.c:1042 ../src/totem-sidebar.c:145
+#: ../src/totem-playlist.c:1034 ../src/totem-playlist.c:1263
+#: ../src/totem-sidebar.c:145
 msgid "Playlist"
 msgstr "প্লে-লিস্ট"
 
-#: ../src/totem-playlist.c:1854
+#: ../src/totem-playlist.c:1862
 #, c-format
-msgid "The playlist '%s' could not be parsed, it might be damaged."
+#| msgid "The playlist '%s' could not be parsed, it might be damaged."
+msgid "The playlist '%s' could not be parsed. It might be damaged."
 msgstr "সম্ভবত ক্ষতিগ্রস্ত হওয়ার ফলে '%s' প্লে-লিস্টটি পড়া যায়নি।"
 
 # Header পরিবর্তন করা হইছে
 # Chapter=অধ্যায়
 # অশুদ্ধ - পরিক্ষা
 # শুদ্ধ - পরীক্ষা
-#: ../src/totem-playlist.c:1855
+#: ../src/totem-playlist.c:1863
 msgid "Playlist error"
 msgstr "প্লে-লিস্ট সংক্রান্ত সমস্যা"
 
-#: ../src/totem-preferences.c:106
-msgid "Enable visual effects?"
-msgstr "ভিজুয়াল ইফেক্ট সক্রিয় করা হবে কি?"
-
-#: ../src/totem-preferences.c:108
-msgid ""
-"It seems you are running Totem remotely.\n"
-"Are you sure you want to enable the visual effects?"
-msgstr ""
-"সম্ভবত আপনি দূরবর্তী অবস্থান থেকে Totem চালাচ্ছেন।\n"
-"আপনি কি নিশ্চিতরূপে ভিজুয়াল ইফেক্ট সক্রিয় করতে ইচ্ছুক?"
-
-#: ../src/totem-preferences.c:363
-msgid "Changing the visuals effect type will require a restart to take effect."
-msgstr "ভিজুয়াল ইফেক্ট সংক্রান্ত পরিবর্তন প্রয়োগ করার জন্য রি-স্টার্ট করা আবশ্যক।"
-
-#: ../src/totem-preferences.c:447
-msgid ""
-"The change of audio output type will only take effect when Totem is "
-"restarted."
-msgstr ""
-"অডিও আউটপুটের প্রকৃতি সংক্রান্ত পরিবর্তনগুলি প্রয়োগ করার জন্য Totem পুনরায় আরম্ভ করা "
-"আবশ্যক।"
-
-#: ../src/totem-preferences.c:542
+#: ../src/totem-preferences.c:297
 msgid "Preferences"
 msgstr "পছন্দ"
 
 # msgstr "এই পাসওয়ার্ডটি মনে রাখা হবে"
-#: ../src/totem-preferences.c:703
+#: ../src/totem-preferences.c:445
 msgid "Select Subtitle Font"
 msgstr "অনুবাদলিপির ফন্ট নির্বাচন"
 
 # msgstr "কোনটিই নয়"
 # msgstr "একটিও নয়"
-#. FIXME this should be setting an error?
-#: ../src/totem-properties-main.c:114 ../src/totem-properties-view.c:83
-#: ../src/totem-properties-view.c:91
+#: ../src/totem-properties-main.c:116 ../src/totem-properties-view.c:269
 msgid "Audio/Video"
 msgstr "অডিও/ভিডিও"
 
+#: ../src/totem-properties-view.c:131
+msgid "N/A"
+msgstr "প্রযোজ্য নয়"
+
+#: ../src/totem-properties-view.c:160
+#: ../src/plugins/properties/totem-movie-properties.c:152
+#: ../src/plugins/properties/totem-movie-properties.c:163
+#| msgid "N/A"
+msgctxt "Stream bit rate"
+msgid "N/A"
+msgstr "প্রযোজ্য নয়"
+
+#: ../src/totem-properties-view.c:163
+#: ../src/plugins/properties/totem-movie-properties.c:152
+#: ../src/plugins/properties/totem-movie-properties.c:163
+#, c-format
+msgid "%d kbps"
+msgstr "%d কিলোবাইট/সেকেন্ড"
+
+#: ../src/totem-properties-view.c:180
+#: ../src/plugins/properties/totem-movie-properties.c:149
+#, c-format
+msgid "%d x %d"
+msgstr "%d x %d"
+
+#: ../src/totem-properties-view.c:212
+#: ../src/plugins/properties/totem-movie-properties.c:166
+#, c-format
+msgid "%d Hz"
+msgstr "%d হার্টজ"
+
+#: ../src/totem-properties-view.c:219
+#: ../src/plugins/properties/totem-movie-properties.c:166
+#| msgid "N/A"
+msgctxt "Sample rate"
+msgid "N/A"
+msgstr "প্রযোজ্য নয়"
+
+#: ../src/totem-properties-view.c:239
+#| msgid "N/A"
+msgctxt "Number of audio channels"
+msgid "N/A"
+msgstr "প্রযোজ্য নয়"
+
 # msgstr "স্থগিত"
-#: ../src/totem-statusbar.c:91
+#: ../src/totem-statusbar.c:110
 msgid "0:00 / 0:00"
 msgstr "০:০০ / ০:০০"
 
-#: ../src/totem-statusbar.c:113
+#: ../src/totem-statusbar.c:133
 #, c-format
 msgid "%s (Streaming)"
 msgstr "%s (স্ট্রিম করা হচ্ছে)"
 
 #. Elapsed / Total Length
-#: ../src/totem-statusbar.c:120 ../src/totem-time-label.c:64
+#: ../src/totem-statusbar.c:140 ../src/totem-time-label.c:64
 #, c-format
 msgid "%s / %s"
 msgstr "%s / %s"
 
 #. Seeking to Time / Total Length
-#: ../src/totem-statusbar.c:123 ../src/totem-time-label.c:67
+#: ../src/totem-statusbar.c:143 ../src/totem-time-label.c:67
 #, c-format
 msgid "Seek to %s / %s"
 msgstr "%s / %s অনুসন্ধান করা হবে"
 
-#: ../src/totem-statusbar.c:217
+#: ../src/totem-statusbar.c:239
 msgid "Buffering"
 msgstr "বাফার করা হচ্ছে"
 
 #. eg: 75 %
-#: ../src/totem-statusbar.c:228
+#: ../src/totem-statusbar.c:250
 #, c-format
-msgid "%d %%"
-msgstr "%d %%"
+msgid "%lf %%"
+msgstr "%lf %%"
 
 #. eg: Paused, 0:32 / 1:05
-#: ../src/totem-statusbar.c:303
+#: ../src/totem-statusbar.c:325
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
 #. eg: Buffering, 75 %
-#: ../src/totem-statusbar.c:308
+#: ../src/totem-statusbar.c:330
 #, c-format
-msgid "%s, %d %%"
-msgstr "%s, %d %%"
+#| msgid "%s, %d %%"
+msgid "%s, %f %%"
+msgstr "%s, %f %%"
 
 #: ../src/totem-subtitle-encoding.c:156
 msgid "Current Locale"
@@ -1781,1182 +1859,1503 @@
 msgid "Western"
 msgstr "পশ্চিমি"
 
-#: ../src/totem-subtitle-encoding.c:328 ../src/totem-subtitle-encoding.c:330
-#: ../src/totem-subtitle-encoding.c:332
-msgid "Vietnamese"
-msgstr "ভিয়েতনামিস"
+#: ../src/totem-subtitle-encoding.c:328 ../src/totem-subtitle-encoding.c:330
+#: ../src/totem-subtitle-encoding.c:332
+msgid "Vietnamese"
+msgstr "ভিয়েতনামিস"
+
+# msgstr "এই পাসওয়ার্ডটি মনে রাখা হবে"
+#: ../src/totem-uri.c:343 ../src/plugins/chapters/totem-chapters.c:998
+msgid "All files"
+msgstr "সমস্ত ফাইল"
+
+#: ../src/totem-uri.c:348 ../src/plugins/chapters/totem-chapters.c:995
+msgid "Supported files"
+msgstr "সমর্থিত ফাইল"
+
+# msgstr "এই পাসওয়ার্ডটি মনে রাখা হবে"
+#: ../src/totem-uri.c:360
+msgid "Audio files"
+msgstr "অডিও ফাইল"
+
+# ঠিক করেন
+#: ../src/totem-uri.c:368
+msgid "Video files"
+msgstr "ভিডিও ফাইল"
+
+#: ../src/totem-uri.c:378
+msgid "Subtitle files"
+msgstr "অনুবাদলিপির ফাইল"
+
+# msgstr "এই পাসওয়ার্ডটি মনে রাখা হবে"
+#: ../src/totem-uri.c:430
+msgid "Select Text Subtitles"
+msgstr "অনুবাদলিপি নির্বাচন করুন"
+
+#: ../src/totem-uri.c:495
+msgid "Select Movies or Playlists"
+msgstr "চলচ্চিত্র অথবা প্লে-লিস্ট নির্বাচন করুন"
+
+#: ../src/totem-uri.c:499
+msgid "Add Directory"
+msgstr "ডিরেক্টরি যোগ করুন"
+
+#: ../src/totem-video-list.c:330
+msgid "No video URI"
+msgstr "কোনো URI উপস্থিত নেই"
+
+#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
+#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
+#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
+#: ../src/totem-video-thumbnailer.c:841
+#, c-format
+msgid ""
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
+msgstr ""
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
+
+#: ../src/totem-video-thumbnailer.c:842
+msgid "Filename"
+msgstr "ফাইলের নাম"
+
+#: ../src/totem-video-thumbnailer.c:844
+msgid "Resolution"
+msgstr "রেসোলিউশন"
+
+#: ../src/totem-video-thumbnailer.c:847
+msgid "Duration"
+msgstr "অবকাল"
+
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:1
+msgid "Apple Trailers"
+msgstr "Apple Trailers"
+
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:2
+msgid "Sets the user agent for the Apple Trailers site"
+msgstr "Apple Trailers সাইটের জন্য ইউজার এজেন্ট নির্ধারণ করা হয়"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:1
+#| msgid "Download Movie Subtitles"
+msgid "Autoload Subtitles"
+msgstr "চলচ্চিত্রের অনুবাদলিপি লোড করুন"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:2
+#| msgid "Downloading the subtitles..."
+msgid "Autoloads text subtitles"
+msgstr "টেক্সট অনুবাদলিপী স্বয়ংক্রিয়ভাবে লোড করা হয়"
+
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
+msgid "Video Disc Recorder"
+msgstr "ভিডিও ডিস্ক রেকর্ডার"
+
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
+msgid "Records (S)VCDs or video DVDs"
+msgstr "(S)VCD অথবা DVD রেকর্ড করতে ব্যবহৃত হয়"
+
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:65
+msgid "_Create Video Disc..."
+msgstr "ভিডিও ডিস্ক নির্মাণ করুন...(_C)"
+
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:66
+msgid "Create a video DVD or a (S)VCD from the currently opened movie"
+msgstr "বর্তমানে চলমান চলচ্চিত্র থেকে ভিডিও DVD অথবা (S)VCD নির্মাণ করুন"
+
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:68
+msgid "Copy Vide_o DVD..."
+msgstr "ভিডিও DVD কপি করুন...(_o)"
+
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:69
+msgid "Copy the currently playing video DVD"
+msgstr "বর্তমানে চলমান ভিডিও DVD কপি করুন"
+
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:71
+msgid "Copy (S)VCD..."
+msgstr "(S)VCD কপি করুন..."
+
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:72
+msgid "Copy the currently playing (S)VCD"
+msgstr "বর্তমানে চলমান (S)VCD কপি করুন"
+
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:136
+msgid "The video disc could not be duplicated."
+msgstr "ভিডিও ডিস্কের প্রতিলিপি তৈরি করতে ব্যর্থ।"
+
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:138
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:283
+msgid "The movie could not be recorded."
+msgstr "চলচ্চিত্র রেকর্ড করতে ব্যর্থ।"
+
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:164
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:174
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:270
+msgid "Unable to write a project."
+msgstr "প্রজেক্ট লিখতে ব্যর্থ।"
+
+#: ../src/plugins/chapters/chapters-edit.ui.h:1
+msgid "Name for new chapter:"
+msgstr "নতুন অধ্যায়ের নাম:"
+
+#: ../src/plugins/chapters/chapters-list.ui.h:1
+#| msgid "_Remove"
+msgid "_Remove Chapter"
+msgstr "অধ্যায় মুছে ফেলুন (_R)"
+
+#: ../src/plugins/chapters/chapters-list.ui.h:2
+#| msgid "Remove file from playlist"
+msgid "Remove the chapter from the list"
+msgstr "তালিকা থেকে অধ্যায় মুছে ফেলুন"
+
+# msgstr "অডিও মেনু দেখানো হোক"
+#: ../src/plugins/chapters/chapters-list.ui.h:3
+#| msgid "Go to the chapter menu"
+msgid "_Go to Chapter"
+msgstr "চিহ্নিত অধ্যায়ে চলুন (_G)"
+
+# msgstr "অডিও মেনু দেখানো হোক"
+#: ../src/plugins/chapters/chapters-list.ui.h:4
+#| msgid "Go to the chapter menu"
+msgid "Go to the chapter in the movie"
+msgstr "চলচ্চিত্রের মধ্যে চিহ্নিত অধ্যায়ে চলুন"
+
+#: ../src/plugins/chapters/chapters-list.ui.h:5
+msgid "Add Chapter..."
+msgstr "অধ্যায় যোগ করুন..."
+
+#: ../src/plugins/chapters/chapters-list.ui.h:6
+#| msgid "Remove"
+msgid "Remove Chapter"
+msgstr "অধ্যায় মুছে ফেলুন"
+
+# msgstr "অডিও মেনু দেখানো হোক"
+#: ../src/plugins/chapters/chapters-list.ui.h:7
+#| msgid "Go to the chapter menu"
+msgid "Go to Chapter"
+msgstr "চিহ্নিত অধ্যায়ে চলুন"
+
+#: ../src/plugins/chapters/chapters-list.ui.h:8
+#| msgid "0 Channels"
+msgid "Save Changes"
+msgstr "পরিবর্তন সংরক্ষণ করুন"
+
+#: ../src/plugins/chapters/chapters-list.ui.h:9
+msgid "No chapter data"
+msgstr "অধ্যায়ের কোনো তথ্য নেই"
+
+#: ../src/plugins/chapters/chapters-list.ui.h:10
+msgid "Load Chapters..."
+msgstr "অধ্যায় লোড করুন..."
+
+#: ../src/plugins/chapters/chapters-list.ui.h:11
+msgid "Load chapters from an external CMML file"
+msgstr "বহিস্থিত CMML ফাইল থেকে অধ্যায় লোড করুন"
+
+#: ../src/plugins/chapters/chapters-list.ui.h:12
+msgid "Add New Chapters"
+msgstr "নতুন অধ্যায় যোগ করুন"
+
+#: ../src/plugins/chapters/chapters-list.ui.h:13
+#| msgid "Next chapter or movie"
+msgid "Create a new chapter list for the movie"
+msgstr "চলচ্চিত্রের জন্য একটি নতুন অধ্যায়ের তালিকা তৈরি করুন"
+
+# msgstr "নতুন ভিডিও লোড করা হলে স্বয়ংক্রিয়ভাবে উইন্ডোর আকার পরিবর্তন করা হোক" <-- একটু সোজা করে দিলাম ;-)
+#: ../src/plugins/chapters/chapters.plugin.in.h:1
+#: ../src/plugins/chapters/totem-chapters.c:1139
+#| msgid "_Chapter Menu"
+msgid "Chapters"
+msgstr "অধ্যায়"
+
+#: ../src/plugins/chapters/chapters.plugin.in.h:2
+#| msgid "Next chapter or movie"
+msgid "Support chapter markers in movies"
+msgstr "চলচ্চিত্রে অধ্যায় নির্দেশক চিহ্ন সমর্থন করা হবে"
+
+#: ../src/plugins/chapters/totem-chapters.c:56
+#, c-format
+msgid ""
+"Title: %s\n"
+"Start time: %s"
+msgstr ""
+"শিরোনাম: %s\n"
+"আরম্ভের সময়: %s"
+
+#: ../src/plugins/chapters/totem-chapters.c:328
+msgid "Error while reading file with chapters"
+msgstr "অধ্যায় সহ ফাইল পড়তে ত্রুটি"
+
+#: ../src/plugins/chapters/totem-chapters.c:543
+msgid "Chapter with the same time already exists"
+msgstr "একই সময় বিশিষ্ট অধ্যায় বর্তমানে উপস্থিত রয়েছে"
+
+#: ../src/plugins/chapters/totem-chapters.c:544
+msgid "Try another name or remove an existing chapter."
+msgstr ""
+"অন্য কোনো নাম প্রয়োগ করুন অথবা একটি উপস্থিত অধ্যায় মুছে প্রচেষ্টা করুন।"
+
+#: ../src/plugins/chapters/totem-chapters.c:717
+msgid "Error while writing file with chapters"
+msgstr "অধ্যায় সহ ফাইল লিখতে ত্রুটি"
+
+#: ../src/plugins/chapters/totem-chapters.c:842
+#| msgid "An error occurred while fetching albums."
+msgid "Error occurred while saving chapters"
+msgstr "অধ্যায় সংরক্ষণ কালে ত্রুটি হয়েছে"
+
+#: ../src/plugins/chapters/totem-chapters.c:843
+msgid ""
+"Please check you have permission to write to the folder containing the movie."
+msgstr ""
+"চলচ্চিত্র ধারণকারী ফোল্ডারের মধ্যে লেখার জন্য প্রযোজ্য অনুমতি আপনার রয়েছে কি "
+"না তা অনুগ্রহ করে পরীক্ষা করুন।"
+
+#: ../src/plugins/chapters/totem-chapters.c:976
+#| msgid "Open a file"
+msgid "Open Chapter File"
+msgstr "অধ্যায়ের ফাইল খুলুন"
+
+#: ../src/plugins/chapters/totem-chapters.c:1093
+#| msgid "Save Screenshot"
+msgid "Chapter Screenshot"
+msgstr "অধ্যায়ের পর্দার ছবি"
+
+# msgstr "নতুন ভিডিও লোড করা হলে স্বয়ংক্রিয়ভাবে উইন্ডোর আকার পরিবর্তন করা হোক" <-- একটু সোজা করে দিলাম ;-)
+#: ../src/plugins/chapters/totem-chapters.c:1104
+#| msgid "_Chapter Menu"
+msgid "Chapter Title"
+msgstr "অধ্যায় শিরোনাম"
+
+#: ../src/plugins/chapters/totem-chapters.c:1184
+msgid "Save changes to chapter list before closing?"
+msgstr "বন্ধ করার পূর্বে অধ্যায়ের তালিকায় পরিবর্তন সংরক্ষণ করুন?"
+
+#. Translators: close Totem without saving changes to the chapter list of the current movie.
+#: ../src/plugins/chapters/totem-chapters.c:1189
+msgid "Close without Saving"
+msgstr "সংরক্ষণ না করে বন্ধ করুন"
+
+#. Translators: save changes to the chapter list of the current movie before closing Totem.
+#: ../src/plugins/chapters/totem-chapters.c:1191
+msgid "Save"
+msgstr "সংরক্ষণ করুন"
+
+#: ../src/plugins/chapters/totem-chapters.c:1194
+msgid "If you don't save, changes to the chapter list will be lost."
+msgstr "সংরক্ষণ না করা হলে, অধ্যায়ের তালিকায় করা পরিবর্তনগুলি মুছে যাবে।"
+
+#: ../src/plugins/chapters/totem-cmml-parser.c:651
+msgid "Failed to parse CMML file"
+msgstr "CMML ফাইল পার্স করতে ব্যর্থ"
+
+#: ../src/plugins/chapters/totem-edit-chapter.c:95
+msgid "Add Chapter"
+msgstr "অধ্যায় যোগ করুন"
+
+#: ../src/plugins/dbusservice/dbusservice.plugin.in.h:1
+msgid "D-Bus Service"
+msgstr "D-Bus পরিসেবা"
+
+#: ../src/plugins/dbusservice/dbusservice.plugin.in.h:2
+msgid ""
+"Plugin for sending notifications of currently playing movies to the D-Bus "
+"subsystem."
+msgstr ""
+"বর্তমানে চলমান চলচ্চিত্র থেকে D-Bus সাব-সিস্টেমে সূচনাপ্রদানের জন্য এই "
+"প্লাগ-ইন "
+"ব্যবহৃত হয়।"
+
+#: ../src/plugins/dbusservice/dbusservice.py:213
+#: ../src/plugins/dbusservice/dbusservice.py:243
+#, python-format
+msgid "The MediaPlayer2 object does not implement the ‘%s’ interface"
+msgstr "MediaPlayer2 অবজেক্ট দ্বারা ‘%s’ ইন্টারফেস কার্যকরী করা হয় না"
+
+#: ../src/plugins/dbusservice/dbusservice.py:222
+#, python-format
+msgid "The property ‘%s’ is not writeable."
+msgstr "‘%s’ বৈশিষ্ট্যটি লিখনযোগ্য নয়।"
+
+#: ../src/plugins/dbusservice/dbusservice.py:238
+#, python-format
+msgid "Unknown property ‘%s’ requested of a MediaPlayer 2 object"
+msgstr "MediaPlayer 2 অবজেক্টের জন্য অজানা বৈশিষ্ট্য ‘%s’-র অনুরোধ করা হয়েছে"
+
+#: ../src/plugins/dbusservice/dbusservice.py:341
+#, python-format
+msgid "The URI ‘%s’ is not supported."
+msgstr "URI ‘%s’ সমর্থিত নয়।"
+
+#: ../src/plugins/grilo/grilo.plugin.in.h:1
+#| msgid "YouTube Browser"
+msgid "Grilo Browser"
+msgstr "Grilo ব্রাউজার"
+
+#: ../src/plugins/grilo/grilo.plugin.in.h:2
+#| msgid "A plugin to let you browse YouTube videos."
+msgid "A plugin to let you browse media content from various sources"
+msgstr ""
+"বিভিন্ন স্থান থেকে প্রাপ্ত মিডিয়ার তথ্য ব্রাউজ করার উদ্দেশ্যে ব্যবহৃত "
+"প্লাগ-ইন।"
+
+# Header পরিবর্তন করা হইছে
+# Chapter=অধ্যায়
+# অশুদ্ধ - পরিক্ষা
+# শুদ্ধ - পরীক্ষা
+#: ../src/plugins/grilo/grilo.ui.h:1
+#| msgid "_Add to Playlist"
+msgid "Add to Playlist"
+msgstr "প্লে-লিস্টের মধ্যে যোগ করুন"
+
+#: ../src/plugins/grilo/grilo.ui.h:2
+#| msgid "_Copy Location"
+msgid "Copy Location"
+msgstr "অবস্থান কপি করুন"
+
+#: ../src/plugins/grilo/grilo.ui.h:3 ../src/plugins/grilo/totem-grilo.c:1184
+msgid "Browse"
+msgstr "ব্রাউজ করুন"
+
+#: ../src/plugins/grilo/grilo.ui.h:4 ../src/plugins/grilo/totem-grilo.c:1227
+#| msgid "Local Search"
+msgid "Search"
+msgstr "অনুসন্ধান"
+
+#: ../src/plugins/grilo/totem-grilo.c:454
+#| msgid "File Error"
+msgid "Browse Error"
+msgstr "ব্রাউজ সংক্রান্ত ত্রুটি"
+
+#: ../src/plugins/grilo/totem-grilo.c:609
+#| msgid "File Error"
+msgid "Search Error"
+msgstr "অনুসন্ধান সংক্রান্ত ত্রুটি"
+
+#: ../src/plugins/gromit/gromit.plugin.in.h:1
+msgid "Gromit Annotations"
+msgstr "Gromit অ্যানোটেশন"
+
+#: ../src/plugins/gromit/gromit.plugin.in.h:2
+msgid "Presentation helper to make annotations on screen"
+msgstr "পর্দায় অ্যানোটেশন নির্মাণের জন্য প্রেসেন্টেশন সহায়তা ব্যবস্থা"
+
+#: ../src/plugins/gromit/totem-gromit.c:231
+msgid "The gromit binary was not found."
+msgstr "gromit বাইনারি পাওয়া যায়নি।"
+
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
+#| msgid "Instant Messenger status"
+msgid "Instant Messenger Status"
+msgstr "ইনস্ট্যান্ট মেসেঞ্জারের অবস্থা"
+
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
+msgid "Set your Instant Messenger status to away when a movie is playing"
+msgstr ""
+"চলচ্চিত্র চলাকালীন ইনস্ট্যান্ট মেসেঞ্জার-এ নিজেকে অনুপস্থিত রূপে চিহ্নিত করুন"
+
+#: ../src/plugins/lirc/lirc.plugin.in.h:1
+msgid "Infrared Remote Control"
+msgstr "ইনফ্রা-রেড রিমোট কন্ট্রোল"
+
+#: ../src/plugins/lirc/lirc.plugin.in.h:2
+msgid "Support infrared remote control"
+msgstr "ইনফ্রা-রেড রিমোট কন্ট্রোলের সহায়তা"
+
+#: ../src/plugins/lirc/totem-lirc.c:242
+msgid "Couldn't initialize lirc."
+msgstr "lirc আরম্ভ করতে ব্যর্থ।"
+
+#: ../src/plugins/lirc/totem-lirc.c:254
+msgid "Couldn't read lirc configuration."
+msgstr "lirc কনফিগারেশন পড়তে ব্যর্থ।"
+
+# বাজানো হোক, দেখানো হোক
+# msgstr "চলচ্চিত্র ও গান চালানো হোক" <-- Short cut ;-)
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:1
+#| msgid "Movie Player"
+msgid "Media Player Keys"
+msgstr "মিডিয়া প্লেয়ার নিয়ন্ত্রণের কি"
+
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:2
+msgid "Support additional media player keys"
+msgstr "অতিরিক্ত মিডিয়া প্লেয়ার-কি সমর্থন করা হবে"
 
-#: ../src/totem-video-list.c:305
-msgid "No video URI"
-msgstr "কোনো URI উপস্থিত নেই"
+#: ../src/plugins/ontop/ontop.plugin.in.h:1
+msgid "Always On Top"
+msgstr "সর্বদা উপরে রাখা হবে"
 
-#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
-#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
-#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
-#: ../src/totem-video-thumbnailer.c:668
-#, c-format
-msgid ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-msgstr ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
+#: ../src/plugins/ontop/ontop.plugin.in.h:2
+msgid "Keep the main window on top when playing a movie"
+msgstr "চলচ্চিত্র চালানোর সময়, প্রধান উইন্ডোর সর্বদা উপরে প্রদর্শন করা হবে"
 
-#: ../src/totem-video-thumbnailer.c:669
-msgid "Filename"
-msgstr "ফাইলের নাম"
+#: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:1
+msgid "Subtitle Downloader"
+msgstr "অনুবাদলিপি ডাউনলোড ব্যবস্থা"
 
-#: ../src/totem-video-thumbnailer.c:671
-msgid "Resolution"
-msgstr "রেসোলিউশন"
+#: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:2
+#| msgid "Look for subtitles for the currently playing movie."
+msgid "Look for subtitles for the currently playing movie"
+msgstr "বর্তমানে চলমান চলচ্চিত্রের অনুবাদলিপি অনুসন্ধান করুন"
 
-#: ../src/totem-video-thumbnailer.c:674
-msgid "Duration"
-msgstr "অবকাল"
+#: ../src/plugins/opensubtitles/opensubtitles.py:42
+#| msgid "Brasilian Portuguese"
+msgid "Brazilian Portuguese"
+msgstr "ব্রাজিলিয়ান পোর্তুগিজ"
 
 # msgstr "এই পাসওয়ার্ডটি মনে রাখা হবে"
-#: ../src/totem-uri.c:500
-msgid "All files"
-msgstr "সমস্ত ফাইল"
+#: ../src/plugins/opensubtitles/opensubtitles.py:177
+#| msgid "Searching subtitles..."
+msgid "Searching for subtitles…"
+msgstr "অনুবাদলিপি অনুসন্ধান করা হচ্ছে..."
 
-#: ../src/totem-uri.c:505
-msgid "Supported files"
-msgstr "সমর্থিত ফাইল"
+#: ../src/plugins/opensubtitles/opensubtitles.py:225
+#: ../src/plugins/opensubtitles/opensubtitles.py:645
+#| msgid "Downloading the subtitles..."
+msgid "Downloading the subtitles…"
+msgstr "অনুবাদলিপি ডাউনলোড করা হচ্ছে..."
 
-# msgstr "এই পাসওয়ার্ডটি মনে রাখা হবে"
-#: ../src/totem-uri.c:517
-msgid "Audio files"
-msgstr "অডিও ফাইল"
+#: ../src/plugins/opensubtitles/opensubtitles.py:290
+msgid "Could not contact the OpenSubtitles website"
+msgstr "OpenSubtitles ওয়েব-সাইটের সাথে সংযোগ স্থাপন করতে ব্যর্থ"
 
-# ঠিক করেন
-#: ../src/totem-uri.c:525
-msgid "Video files"
-msgstr "ভিডিও ফাইল"
+#: ../src/plugins/opensubtitles/opensubtitles.py:323
+#: ../src/plugins/opensubtitles/opensubtitles.py:341
+#| msgid "Could not contact the OpenSubtitles website"
+msgid "Could not contact the OpenSubtitles website."
+msgstr "OpenSubtitles ওয়েব-সাইটের সাথে সংযোগ স্থাপন করতে ব্যর্থ।"
+
+#: ../src/plugins/opensubtitles/opensubtitles.py:329
+#| msgid "No results found"
+msgid "No results found."
+msgstr "কোনো ফলাফল পাওয়া যায়নি।"
 
-#: ../src/totem-uri.c:535
-msgid "Subtitle files"
-msgstr "অনুবাদলিপির ফাইল"
+#: ../src/plugins/opensubtitles/opensubtitles.py:478
+msgid "Subtitles"
+msgstr "অনুবাদলিপি"
 
-# msgstr "এই পাসওয়ার্ডটি মনে রাখা হবে"
-#: ../src/totem-uri.c:587
-msgid "Select Text Subtitles"
-msgstr "অনুবাদলিপি নির্বাচন করুন"
+#. translators comment:
+#. This is the file-type of the subtitle file detected
+#: ../src/plugins/opensubtitles/opensubtitles.py:484
+msgid "Format"
+msgstr "বিন্যাস"
 
-#: ../src/totem-uri.c:649
-msgid "Select Movies or Playlists"
-msgstr "চলচ্চিত্র অথবা প্লে-লিস্ট নির্বাচন করুন"
+#. translators comment:
+#. This is a rating of the quality of the subtitle
+#: ../src/plugins/opensubtitles/opensubtitles.py:489
+msgid "Rating"
+msgstr "মাত্রা"
 
-#: ../src/totem.c:93
-msgid "Could not open link"
-msgstr "লিংক খুলতে ব্যর্থ"
+#: ../src/plugins/opensubtitles/opensubtitles.py:525
+msgid "Download movie subtitles from OpenSubtitles"
+msgstr "OpenSubtitles থেকে চলচ্চিত্রের অনুবাদলিপি ডাউনলোড করুন"
 
-# বাজানো হোক, দেখানো হোক
-# msgstr "চলচ্চিত্র ও গান চালানো হোক" <-- Short cut ;-)
-#: ../src/totem.c:151 ../src/totem.c:177
-#: ../browser-plugin/totem-plugin-viewer.c:652
-#: ../browser-plugin/totem-plugin-viewer.c:1814
-msgid "Totem Movie Player"
-msgstr "Totem মুভি প্লেয়ার"
+#: ../src/plugins/opensubtitles/opensubtitles.py:527
+#| msgid "Download Movie Subtitles"
+msgid "_Download Movie Subtitles…"
+msgstr "চলচ্চিত্রের অনুবাদলিপি ডাউনলোড করুন...(_D)"
 
-#: ../src/totem.c:152 ../browser-plugin/totem-plugin-viewer.c:2241
-msgid "Could not initialize the thread-safe libraries."
-msgstr "থ্রেড-সেফ লাইব্রেরি চালু করা যায়নি।"
+# msgstr "এই পাসওয়ার্ডটি মনে রাখা হবে"
+#: ../src/plugins/opensubtitles/opensubtitles.py:589
+#| msgid "Searching subtitles..."
+msgid "Searching subtitles…"
+msgstr "অনুবাদলিপি অনুসন্ধান করা হচ্ছে..."
 
-#: ../src/totem.c:152
-msgid "Verify your system installation. Totem will now exit."
-msgstr "আপনার সিস্টেমের ইনস্টলেশন পরীক্ষা করুন। Totem এখন বন্ধ করা হবে।"
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
+msgid "Download Movie Subtitles"
+msgstr "চলচ্চিত্রের অনুবাদলিপি ডাউনলোড করুন"
 
-# msgstr "বৎসর:" <-- বানান
-# msgstr "বছর:"
-#. Handle command line arguments
-#: ../src/totem.c:160
-msgid "- Play movies and songs"
-msgstr "- চলচ্চিত্র ও সংগীত পরিবেশন"
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
+msgid "Subtitle _language:"
+msgstr "অনুবাদলিপির ভাষা: (_l)"
 
-#: ../src/totem.c:169
-#, c-format
-msgid ""
-"%s\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"%s\n"
-"কমান্ড-লাইন থেকে ব্যবহারযোগ্য বিকল্পের সম্পূর্ণ তালিকা দেখার জন্য '%s --help' ব্যবহার "
-"করুন।\n"
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
+msgid "_Play with Subtitle"
+msgstr "অনুবাদলিপি সহ চালানো হবে (_P)"
 
-# পরীক্ষা
-#: ../src/totem.c:186
-msgid "Totem could not initialize the configuration engine."
-msgstr "Totem দ্বারা এই কনফিগারেশন ইঞ্জিনটি আরম্ভ করা যায়নি।"
-
-#: ../src/totem.c:186
-msgid "Make sure that GNOME is properly installed."
-msgstr "GNOME সঠিকরূপে ইনস্টল করা হয়েছে কিনা পরীক্ষা করুন।"
+#: ../src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in.h:1
+#| msgid "Subtitle _language:"
+msgid "Subtitle language"
+msgstr "অনুবাদলিপির ভাষা"
+
+#: ../src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in.h:2
+msgid "The language to search for subtitles for movies in."
+msgstr "চলচ্চিত্রের জন্য যে ভাষার অনুবাদলিপী সন্ধান করা হবে।"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:1740
-msgid "Password requested for RTSP server"
-msgstr "RTSP সার্ভারের জন্য অনুরোধ করা পাসওয়ার্ড"
+# এটা কি ঠিক আছে ?
+#: ../src/plugins/properties/movie-properties.plugin.in.h:1
+#| msgid "Properties"
+msgid "Movie Properties"
+msgstr "চলচ্চিত্রের বৈশিষ্ট্য"
+
+#: ../src/plugins/properties/movie-properties.plugin.in.h:2
+#| msgid "Show or hide the sidebar"
+msgid "Adds movie properties to the sidebar"
+msgstr "সাইড-বারের চলচ্চিত্রের বৈশিষ্ট্য যোগ করা হয়"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2936
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2940
-#, c-format
-msgid "Audio Track #%d"
-msgstr "অডিও ট্র্যাক সংখ্যা #%d"
+# এটা কি ঠিক আছে ?
+#: ../src/plugins/properties/totem-movie-properties.c:246
+msgid "Properties"
+msgstr "বৈশিষ্ট্যাবলী"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2968
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2972
-#, c-format
-msgid "Subtitle #%d"
-msgstr "অনুবাদলিপি #%d"
+#: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:1
+msgid "rpdb2 password"
+msgstr "rpdb2 পাসওয়ার্ড"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3376
+#: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:2
 msgid ""
-"The requested audio output was not found. Please select another audio output "
-"in the Multimedia Systems Selector."
+"A password to protect the rpdb2 server for debugging Totem from unauthorized "
+"remote access. If this is empty, a default of 'totem' will be used."
 msgstr ""
-"অনুরোধ করা অডিও আউটপুট পাওয়া যায়নি। মাল্টি-মিডিয়া সিস্টেম নির্বাচন ব্যবস্থায় অনুগ্রহ "
-"করে অন্য একটি অডিও আউটপুট নির্বাচন করুন।"
+"Totem ডিবাগ করার জন্য ব্যবহারযোগ্য rpdb2 সার্ভারে দূরবর্তী অবস্থান থেকে অবৈধ "
+"অনুপ্রবেশের হাত থেকে রক্ষা করার জন্য পাসওয়ার্ড নির্ধারণ করুন। এটি ফাঁকা রাখা "
+"হলে, ডিফল্ট মান  'totem' ব্যবহার করা হবে।"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3381
-msgid "Location not found."
-msgstr "অবস্থান পাওয়া যায়নি।"
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
+msgid "Python Console"
+msgstr "Python কনসোল"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3385
-msgid "Could not open location; you might not have permission to open the file."
-msgstr "অবস্থান খোলা যায়নি; সম্ভবত এই ফাইল খুলতে আপনি অনুমতিপ্রাপ্ত নন।"
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
+#| msgid "Interactive Python console."
+msgid "Interactive Python console"
+msgstr "ইন্টারেক্টিভ python কনসোল"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3396
-msgid ""
-"The video output is in use by another application. Please close other video "
-"applications, or select another video output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"ভিডিও আউটপুট অন্য একটি অ্যাপ্লিকেশনের দ্বারা ব্যবহৃত হচ্ছে। অনুগ্রহ করে অন্য ভিডিও "
-"অ্যাপ্লিকেশন বন্ধ করুন অথবা মাল্টি-মিডিয়া সিস্টেম নির্বাচন ব্যবস্থায় অন্য একটি ভিডিও "
-"আউটপুট ব্যবস্থা নির্বাচন করুন।"
+#: ../src/plugins/pythonconsole/pythonconsole.py:88
+msgid "Python Console Menu"
+msgstr "Python কনসোল মেনু"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3402
-msgid ""
-"The audio output is in use by another application. Please select another "
-"audio output in the Multimedia Systems Selector. You may want to consider "
-"using a sound server."
+#: ../src/plugins/pythonconsole/pythonconsole.py:93
+msgid "_Python Console"
+msgstr "Python কনসোল (_P)"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:94
+msgid "Show Totem's Python console"
+msgstr "Totem-র python কনসোল প্রদর্শন করা হবে"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:100
+msgid "Python Debugger"
+msgstr "Python ডিবাগার"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:101
+msgid "Enable remote Python debugging with rpdb2"
 msgstr ""
-"অডিও আউটপুট অন্য একটি অ্যাপ্লিকেশনের দ্বারা ব্যবহৃত হচ্ছে। অনুগ্রহ করে মাল্টি-মিডিয়া "
-"সিস্টেম নির্বাচন ব্যবস্থায় অন্য একটি অডিও আউটপুট ব্যবস্থা নির্বাচন করুন। সাউন্ড সার্ভার "
-"ব্যবহার সম্পর্কে বিবেচনা করা যাবে।"
+"rpdb2-র সাহায্যে দূরবর্তী অবস্থান থেকে python ডিবাগ প্রক্রিয়া সক্রিয় করুন"
 
-#. should be exactly one missing thing (source or converter)
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3420
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3426
-#, c-format
-msgid "The playback of this movie requires a %s plugin which is not installed."
-msgstr "এই চলচ্চিত্র প্রদর্শনের জন্য আবশ্যক %s প্লাগ-ইন, ইনস্টল করা হয়নি।"
+#. pylint: disable-msg=E1101
+#: ../src/plugins/pythonconsole/pythonconsole.py:125
+#, python-format
+#| msgid "You can access the totem object through 'totem_object' :\\n%s"
+msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
+msgstr "'totem_object'-র সাহায্যে Totem.Object ব্যবহার করা যাবে :\\n%s"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3427
-#, c-format
+#: ../src/plugins/pythonconsole/pythonconsole.py:129
+msgid "Totem Python Console"
+msgstr "Totem Python কনসোল"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:139
+#| msgid ""
+#| "After you press OK, Totem will wait until you connect to it with winpdb "
+#| "or rpdb2. If you have not set a debugger password in GConf, it will use "
+#| "the default password ('totem')."
 msgid ""
-"The playback of this movie requires the following decoders which are not "
-"installed:\n"
-"\n"
-"%s"
+"After you press OK, Totem will wait until you connect to it with winpdb or "
+"rpdb2. If you have not set a debugger password in DConf, it will use the "
+"default password ('totem')."
 msgstr ""
-"এই চলচ্চিত্রের জন্য আবশ্যক নিম্নলিখিত ডিকোডারগুলি ইনস্টল করা হয়নি:\n"
-"\n"
-"%s"
+"'ঠিক আছে' টেপা হলে, winpdb অথবা rpdb2-র সাথে সংযোগ স্থাপন না করা অবধি Totem "
+"দ্বারা অপেক্ষা করা হবে। DConf-র মধ্যে ডিবাগার পাসওয়ার্ড নির্ধারণ না করা হলে "
+"ডিফল্ট পাসওয়ার্ড প্রয়োগ করা হবে ('totem')।"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3452
-msgid "Cannot play this file over the network. Try downloading it to disk first."
-msgstr ""
-"নেটওয়ার্কের মাধ্যমে এই ফাইল চালানো যাবে না। প্রতমে এটি ডিস্কে ডাউনলোড করার "
-"প্রচেষ্টা করুন।"
+# ঠিক করেন
+#: ../src/plugins/recent/recent.plugin.in.h:1
+#| msgid "Video files"
+msgid "Recent files"
+msgstr "সাম্প্রতিক ফাইল"
+
+#: ../src/plugins/recent/recent.plugin.in.h:2
+msgid "Adds files that have been played to recent files"
+msgstr "সঞ্চালিত ফাইলগুলি সম্প্রতি ব্যবহৃত ফাইলের তালিকায় যোগ করা হয়"
+
+#: ../src/plugins/rotation/rotation.plugin.in.h:1
+msgid "Rotation Plugin"
+msgstr "আবর্তন সংক্রান্ত প্লাগ-ইন"
+
+#: ../src/plugins/rotation/rotation.plugin.in.h:2
+msgid "Allows videos to be rotated if they are in the wrong orientation"
+msgstr "ভুল দিশার ভিডিওগুলিকে অাবর্তনের সুবিধা উপলব্ধ করা হয়"
+
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:50
+msgid "_Rotate Clockwise"
+msgstr "ডান দিকে ঘুরিয়ে দিন (_R)"
+
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:52
+msgid "Rotate Counterc_lockwise"
+msgstr "বাঁদিকে ঘুরিয়ে দিন (_l)"
+
+#: ../src/plugins/save-file/save-file.plugin.in.h:1
+msgid "Save Copy"
+msgstr "প্রতিলিপি সংরক্ষণ করুন"
+
+#: ../src/plugins/save-file/save-file.plugin.in.h:2
+#| msgid "Copy the currently playing video DVD"
+msgid "Save a copy of the currently playing movie"
+msgstr "বর্তমানে চলমান চলচ্চিত্রের প্রতিলিপি সংরক্ষ করুন"
+
+#: ../src/plugins/save-file/totem-save-file.c:63
+#| msgid "Save Playlist..."
+msgid "Save a Copy..."
+msgstr "প্রতিলিপি সংরক্ষণ করুন..."
+
+#: ../src/plugins/save-file/totem-save-file.c:64
+#| msgid "The contrast of the video"
+msgid "Save a copy of the movie"
+msgstr "চলচ্চিত্রের প্রতিলিপি সংরক্ষণ করুন"
+
+#: ../src/plugins/save-file/totem-save-file.c:129
+#| msgid "Save Gallery"
+msgid "Save a Copy"
+msgstr "প্রতিলিপি সংরক্ষণ করুন"
 
-# msgstr "এই অবস্থানটি অবৈধ"
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3524
-msgid "Media file could not be played."
-msgstr "মিডিয়া ফাইল চালানো যায়নি।"
+# msgstr "চালানো হোক (_চ)"
+# msgstr "প্রদর্শন করা হোক (_প)"
+# msgstr "প্রদর্শন (_প)"
+# আমি এটার Context সম্পর্কে জানিনা। তাই ভালভাবে বুঝতে পারতেছি না।
+#. translators: Movie is the default saved movie filename,
+#. * without the suffix
+#: ../src/plugins/save-file/totem-save-file.c:161
+#| msgid "_Movie"
+msgid "Movie"
+msgstr "চলচ্চিত্র"
+
+#: ../src/plugins/save-file/totem-save-file.c:183
+#| msgid "Movies to play"
+msgid "Movie stream"
+msgstr "চলচ্চিত্রের স্ট্রিম"
+
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:1
+msgid "Screen Saver"
+msgstr "স্ক্রিন-সেভার"
+
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:2
+#| msgid "Also disable the screensaver when playing _audio"
+msgid "Deactivates the screen saver when a movie is playing"
+msgstr "চলচ্চিত্র চলার সময় স্ক্রিন-সেভার নিষ্ক্রিয় করা হবে"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5770
-msgid "Surround"
-msgstr "সারাউন্ড"
+#: ../src/plugins/screenshot/gallery.ui.h:1
+msgid "Screenshot width (in pixels):"
+msgstr "স্ক্রিন-শটের প্রস্থের মাপ (পিক্সেল অনুযায়ী):"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5772
-msgid "Mono"
-msgstr "মোনো"
+#: ../src/plugins/screenshot/gallery.ui.h:2
+msgid "Calculate the number of screenshots"
+msgstr "স্ক্রিন-শটের সংখ্যা গণনা করুন"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6119
-msgid "Too old version of GStreamer installed."
-msgstr "GStreamer-র অত্যন্ত পুরোনো সংস্করণ ইনস্টল করা হয়েছে।"
+#: ../src/plugins/screenshot/gallery.ui.h:3
+msgid "Number of screenshots:"
+msgstr "স্ক্রিন-শটের সংখ্যা:"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6126
-msgid "Media contains no supported video streams."
-msgstr "কোনো সমর্থিত ভিডিও স্ট্রিম মিডিয়ার মধ্যে উপস্থিত নেই।"
+# msgstr "মুভি প্লেয়ার %s ব্যবহার করছে"
+#. translators: this is the name of the file that gets made up
+#. * with the screenshot if the entire screen is taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:147
+#, c-format
+#| msgid "Screenshot.png"
+msgid "Screenshot from %s.png"
+msgstr "%s.png থেকে প্রাপ্ত পর্দার ছবি"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6653
-msgid ""
-"Failed to create a GStreamer play object. Please check your GStreamer "
-"installation."
-msgstr ""
-"GStreamer প্লে অবজেক্ট নির্মাণ করা যায়নি। অনুগ্রহ করে আপনার সিস্টেমে ইনস্টল করা "
-"GStreamer পরীক্ষা করুন।"
+# msgstr "মুভি প্লেয়ার %s ব্যবহার করছে"
+#. translators: this is the name of the file that gets
+#. * made up with the screenshot if the entire screen is
+#. * taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:154
+#, c-format
+#| msgid "Screenshot-%s-%d.png"
+msgid "Screenshot from %s - %d.png"
+msgstr "%s - %d.png থেকে প্রাপ্ত পর্দার ছবি"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6802
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6937
-msgid ""
-"Failed to open video output. It may not be available. Please select another "
-"video output in the Multimedia Systems Selector."
-msgstr ""
-"ভিডিও আউটপুট খোলা যায়নি। সম্ভবত এটি উপস্থিত নেই। অনুগ্রহ করে মাল্টি-মিডিয়া সিস্টেম "
-"নির্বাচন ব্যবস্থায় অন্য একটি ভিডিও আউটপুট নির্বাচন করুন।"
+# msgstr "মুভি প্লেয়ার %s ব্যবহার করছে"
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:1
+#| msgid "Screenshot.png"
+msgid "Screenshot"
+msgstr "স্ক্রিন-শট"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:2
+msgid "Allows screenshots and galleries to be taken of videos"
+msgstr "ভিডিও থেকে পর্দার ছবি ও ছবির সংকলন প্রস্তুত করা যাবে"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6814
-msgid ""
-"Could not find the video output. You may need to install additional "
-"GStreamer plugins, or select another video output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"ভিডিও আউটপুট পাওয়া যায়নি। সম্ভবত অতিরিক্ত GStreamer প্লাগ-ইন ইনস্টল করা আবশ্যক "
-"অথবা মাল্টি-মিডিয়া সিস্টেম নির্বাচন ব্যবস্থায় অন্য একটি ভিডিও আউটপুট নির্বাচন করুন।"
+#: ../src/plugins/screenshot/totem-gallery.c:91
+msgid "Save Gallery"
+msgstr "গ্যালারি সংরক্ষণ করুন"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6849
-msgid ""
-"Failed to open audio output. You may not have permission to open the sound "
-"device, or the sound server may not be running. Please select another audio "
-"output in the Multimedia Systems Selector."
-msgstr ""
-"অডিও আউটপুট খুলতে সমস্যা।. সম্ভবত আপনি সাউন্ড ডিভাইস খুলতে অনুমতিপ্রাপ্ত নন অথবা "
-"সাউন্ড সার্ভার বর্তমানে সক্রিয় নয়। অনুগ্রহ করে মাল্টি-মিডিয়া সিস্টেম নির্বাচন ব্যবস্থায় "
-"অন্য একটি অডিও আউটপুট নির্বাচন করুন।"
+#. Translators: The first argument is the movie title. The second
+#. * argument is a number which is used to prevent overwriting files.
+#. * Just translate "Gallery", and not the ".jpg". Example:
+#. * "Galerie-%s-%d.jpg".
+#: ../src/plugins/screenshot/totem-gallery.c:115
+#, c-format
+msgid "Gallery-%s-%d.jpg"
+msgstr "Gallery-%s-%d.jpg"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6869
-msgid ""
-"Could not find the audio output. You may need to install additional "
-"GStreamer plugins, or select another audio output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"অডিও আউটপুট পাওয়া যায়নি। সম্ভবত অতিরিক্ত GStreamer প্লাগ-ইন ইনস্টল করা আবশ্যক অথবা "
-"মাল্টি-মিডিয়া সিস্টেম নির্বাচন ব্যবস্থায় অন্য একটি অডিও আউটপুট নির্বাচন করুন।"
+#. Set up the window
+#: ../src/plugins/screenshot/totem-gallery-progress.c:101
+msgid "Creating Gallery..."
+msgstr "গ্যালারি নির্মাণ করা হচ্ছে..."
 
-#. hour:minutes:seconds
-#. Translators: This is a time format, like "9:05:02" for 9
-#. * hours, 5 minutes, and 2 seconds. You may change ":" to
-#. * the separator that your locale uses or use "%Id" instead
-#. * of "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:91 ../src/backend/video-utils.c:108
+#. Set the progress label
+#: ../src/plugins/screenshot/totem-gallery-progress.c:107
 #, c-format
-msgctxt "long time format"
-msgid "%d:%02d:%02d"
-msgstr "%d:%02d:%02d"
+msgid "Saving gallery as \"%s\""
+msgstr "\"%s\" নামে গ্যালারি সংরক্ষণ করা হচ্ছে"
 
-#. minutes:seconds
-#. Translators: This is a time format, like "5:02" for 5
-#. * minutes and 2 seconds. You may change ":" to the
-#. * separator that your locale uses or use "%Id" instead of
-#. * "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:100
-#, c-format
-msgctxt "short time format"
-msgid "%d:%02d"
-msgstr "%d:%02d"
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:220
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
+msgid "Totem could not get a screenshot of the video."
+msgstr "Totem দ্বারা ভিডিওর ছবি গ্রহণ করা সম্ভব হয়নি।"
 
-# msgstr "টোটেম ভিডিও উইন্ডো" <-- ঠিক আছেনা ?
-#: ../src/backend/video-utils.c:138
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d ঘন্টা"
-msgstr[1] "%d ঘন্টা"
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
+msgid "This is not supposed to happen; please file a bug report."
+msgstr "এই আচরণ প্রত্যাশিত নয়; অনুগ্রহ করে বাগ-রিপোর্ট নথিভুক্ত করুন"
 
-#: ../src/backend/video-utils.c:140
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d মিনিট"
-msgstr[1] "%d মিনিট"
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
+#| msgid "Take _Screenshot..."
+msgid "Take _Screenshot"
+msgstr "পর্দার ছবি নিন (_S)"
 
-#: ../src/backend/video-utils.c:143
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d সেকেন্ড"
-msgstr[1] "%d সেকেন্ড"
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
+msgid "Take a screenshot"
+msgstr "পর্দার ছবি নিন"
 
-#. hour:minutes:seconds
-#: ../src/backend/video-utils.c:149
-#, c-format
-msgid "%s %s %s"
-msgstr "%s %s %s"
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
+msgid "Create Screenshot _Gallery..."
+msgstr "স্ক্রিন-শটের গ্যালারি নির্মাণ করুন...(_G)"
 
-#. minutes:seconds
-#: ../src/backend/video-utils.c:152
-#, c-format
-msgid "%s %s"
-msgstr "%s %s"
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
+msgid "Create a gallery of screenshots"
+msgstr "স্ক্রিন-শটের গ্যালারি নির্মাণ করুন"
+
+# msgstr "সামনে"
+#: ../src/plugins/skipto/skipto.plugin.in.h:1
+#: ../src/plugins/skipto/totem-skipto.c:196
+#| msgid "Skip to"
+msgid "Skip To"
+msgstr "চিহ্নিত স্থানে এগিয়ে চলুন"
+
+#: ../src/plugins/skipto/skipto.plugin.in.h:2
+#| msgid "Could not load the \"Skip to\" dialog interface."
+msgid "Provides the \"Skip to\" dialog"
+msgstr "\"চিহ্নিত স্থানে এগিয়ে চলুন\" ডায়লগ উপলব্ধ করে"
 
-#. seconds
-#: ../src/backend/video-utils.c:155
-#, c-format
-msgid "%s"
-msgstr "%s"
+# msgstr "সামনে"
+#: ../src/plugins/skipto/skipto.ui.h:1
+msgid "_Skip to:"
+msgstr "চিহ্নিত স্থানে চলুন: (_S)"
 
-#: ../src/plugins/totem-plugin-manager.c:51
-msgid "Plugin"
-msgstr "প্লাগ-ইন"
+#. Update the "seconds" label so that it always has the correct singular/plural form
+#. Translators: label for the seconds selector in the "Skip to" dialogue
+#: ../src/plugins/skipto/totem-skipto.c:159
+#| msgid "seconds"
+msgid "second"
+msgid_plural "seconds"
+msgstr[0] "সেকেন্ড"
+msgstr[1] "সেকেন্ড"
+
+#. Fix the label width at the maximum necessary for the plural labels, to prevent it changing size when we change the spinner value
+#. Translators: you should translate this string to a number (written in digits) which corresponds to the longer character length of the
+#. * translations for "second" and "seconds", as translated elsewhere in this file. For example, in English, "second" is 6 characters long and
+#. * "seconds" is 7 characters long, so this string should be translated to "7". See: bgo#639398
+#: ../src/plugins/skipto/totem-skipto.c:189
+msgctxt "Skip To label length"
+msgid "7"
+msgstr "৭"
 
-#: ../src/plugins/totem-plugin-manager.c:52
-msgid "Enabled"
-msgstr "সক্রিয়"
+# চলচ্চিত্রের তালিকা
+#: ../src/plugins/skipto/totem-skipto-plugin.c:182
+#| msgid "_Skip to..."
+msgid "_Skip To..."
+msgstr "চিহ্নিত স্থানে এগিয়ে চলুন...(_S)"
 
-#: ../src/plugins/totem-plugins-engine.c:603
-#, c-format
-msgid ""
-"Unable to activate plugin %s.\n"
-"%s"
-msgstr ""
-"%s প্লাগ-ইন সক্রিয় করতে ব্যর্থ।\n"
-"%s"
+# যাওয়া হোক। আগের কয়েকটাতেও এই সমস্যা আছে
+#: ../src/plugins/skipto/totem-skipto-plugin.c:182
+msgid "Skip to a specific time"
+msgstr "চিহ্নিত সময়ে এগিয়ে চলুন"
 
-#: ../src/plugins/totem-plugins-engine.c:606
-#, c-format
-msgid "Unable to activate plugin %s"
-msgstr "%s প্লাগ-ইন সক্রিয় করতে ব্যর্থ"
+# msgstr "কোনটিই নয়"
+# msgstr "একটিও নয়"
+#~ msgid "Author:"
+#~ msgstr "নির্মাতা:"
 
-#: ../src/plugins/totem-plugins-engine.c:608
-msgid "Plugin Error"
-msgstr "প্লাগ-ইন সংক্রান্ত ত্রুটি"
+#~ msgid "C_onfigure..."
+#~ msgstr "কনফিগার করুন...(_o)"
 
-#: ../src/plugins/bemused/bemused.totem-plugin.in.h:1
-msgid "Bemused"
-msgstr "Bemused"
+#~ msgid "Copyright:"
+#~ msgstr "স্বত্বাধিকার:"
 
-#: ../src/plugins/bemused/bemused.totem-plugin.in.h:2
-msgid "Control Totem through a mobile phone with a Bemused client"
-msgstr "Bemused ক্লায়েন্ট সহযোগে মোবাইল ফোন থেকে Totem নিয়ন্ত্রণ করুন"
+#~ msgid "Description:"
+#~ msgstr "বিবরণ:"
 
-#: ../src/plugins/bemused/totem-bemused.c:185
-#, c-format
-msgid "Untitled %d"
-msgstr "নামবিহীন %d"
+#~ msgid "Site:"
+#~ msgstr "সাইট:"
 
-#: ../src/plugins/bemused/totem-bemused.c:607
-msgid "Totem Bemused Server"
-msgstr "Totem Bemused সার্ভার"
+#~ msgid "0 frames per second"
+#~ msgstr "প্রতি সেকেন্ডে ০-টি ফ্রেম"
 
-#. FIXME version
-#: ../src/plugins/bemused/totem-bemused.c:609
-msgid "Totem Bemused Server version 1.0"
-msgstr "Totem Bemused সার্ভার সংস্করণ ১.০"
+#~ msgid "0 kbps"
+#~ msgstr "০ কিলোবাইট/সেকেন্ড"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:77
-msgid "_Create Video Disc..."
-msgstr "ভিডিও ডিস্ক নির্মাণ করুন...(_C)"
+#~ msgid "0 x 0"
+#~ msgstr "০ x ০"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:78
-msgid "Create a video DVD or a (S)VCD from the currently opened movie"
-msgstr "বর্তমানে চলমান চলচ্চিত্র থেকে ভিডিও DVD অথবা (S)VCD নির্মাণ করুন"
+# msgstr "বৎসর:" <-- বানান
+# msgstr "বছর:"
+#~ msgid "Play movies and songs"
+#~ msgstr "চলচ্চিত্র ও সংগীত পরিবেশন"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:80
-msgid "Copy Vide_o DVD..."
-msgstr "ভিডিও DVD কপি করুন...(_o)"
+#~ msgid "1.5 Mbps T1/Intranet/LAN"
+#~ msgstr "১.৫ মেগাবাইট/সেকেন্ড T1/ইন্ট্রানেট/LAN"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:81
-msgid "Copy the currently playing video DVD"
-msgstr "বর্তমানে চলমান ভিডিও DVD কপি করুন"
+#~ msgid "112 Kbps Dual ISDN/DSL"
+#~ msgstr "১১২ কিলোবাইট/সেকেন্ড ISDN/DSL"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:83
-msgid "Copy (S)VCD..."
-msgstr "(S)VCD কপি করুন..."
+#~ msgid "14.4 Kbps Modem"
+#~ msgstr "১৪.৪ কিলোবাইট/সেকেন্ড মোডেম"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:84
-msgid "Copy the currently playing (S)VCD"
-msgstr "বর্তমানে চলমান (S)VCD কপি করুন"
+#~ msgid "19.2 Kbps Modem"
+#~ msgstr "১৯.২ কিলোবাইট/সেকেন্ড মোডেম"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:124
-msgid "The video disc could not be duplicated."
-msgstr "ভিডিও ডিস্কের প্রতিলিপি তৈরি করতে ব্যর্থ।"
+#~ msgid "256 Kbps DSL/Cable"
+#~ msgstr "২৫৬ কিলোবাইট/সেকেন্ড DSL/কেবল"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:128
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:279
-msgid "The movie could not be recorded."
-msgstr "চলচ্চিত্র রেকর্ড করতে ব্যর্থ।"
+#~ msgid "28.8 Kbps Modem"
+#~ msgstr "২৮.৬ কিলোবাইট/সেকেন্ড মোডেম"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:160
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:170
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:266
-msgid "Unable to write a project."
-msgstr "প্রজেক্ট লিখতে ব্যর্থ।"
+#~ msgid "33.6 Kbps Modem"
+#~ msgstr "৩৩.৬ কিলোবাইট/সেকেন্ড মোডেম"
 
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.totem-plugin.in.h:1
-msgid "Records (S)VCDs or video DVDs"
-msgstr "(S)VCD অথবা DVD রেকর্ড করতে ব্যবহৃত হয়"
+#~ msgid "34.4 Kbps Modem"
+#~ msgstr "৪৪.৪ কিলোবাইট/সেকেন্ড মোডেম"
 
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.totem-plugin.in.h:2
-msgid "Video Disc Recorder"
-msgstr "ভিডিও ডিস্ক রেকর্ডার"
+#~ msgid "384 Kbps DSL/Cable"
+#~ msgstr "৩৮৪ কিলোবাইট/সেকেন্ড DSL/কেবল"
 
-#. Translators: this refers to a media file
-#: ../src/plugins/coherence_upnp/coherence_upnp.py:97
-msgid "Delete"
-msgstr "মুছে ফেলুন"
-
-#: ../src/plugins/coherence_upnp/coherence_upnp.py:108
-#: ../src/plugins/coherence_upnp/coherence_upnp.totem-plugin.in.h:2
-msgid "Coherence DLNA/UPnP Client"
-msgstr "Coherence DLNA/UPnP ক্লায়েন্ট"
-
-#: ../src/plugins/coherence_upnp/coherence_upnp.totem-plugin.in.h:1
-msgid "A DLNA/UPnP client for Totem powered by Coherence"
-msgstr "Totem-র জন্য Coherence দ্বারা চালিত একটি DLNA/UPnP ক্লায়েন্ট"
+#~ msgid "512 Kbps DSL/Cable"
+#~ msgstr "৫১২ কিলোবাইট/সেকেন্ড DSL/কেবল"
 
-#: ../src/plugins/dbus-service/dbus-service.totem-plugin.in.h:1
-msgid "D-Bus Service"
-msgstr "D-Bus পরিসেবা"
+#~ msgid "56 Kbps Modem/ISDN"
+#~ msgstr "৫৬ কিলোবাইট/সেকেন্ড মোডেম/ISDN"
 
-#: ../src/plugins/dbus-service/dbus-service.totem-plugin.in.h:2
-#| msgid ""
-#| "Plugin for sending notifications of currently-playing movies to the D-Bus "
-#| "subsystem."
-msgid ""
-"Plugin for sending notifications of currently playing movies to the D-Bus "
-"subsystem."
-msgstr "বর্তমানে চলমান চলচ্চিত্র থেকে D-Bus সাব-সিস্টেমে সূচনাপ্রদানের জন্য এই প্লাগ-ইন ব্যবহৃত হয়।"
+#~ msgid "Configure the application"
+#~ msgstr "অ্যাপ্লিকেশন কনফিগার করুন"
 
-#: ../src/plugins/galago/galago.totem-plugin.in.h:1
-msgid "Instant Messenger status"
-msgstr "ইনস্ট্যান্ট মেসেঞ্জারের অবস্থা"
+#~ msgid "Connection _speed:"
+#~ msgstr "সংযোগের গতি: (_s)"
 
-#: ../src/plugins/galago/galago.totem-plugin.in.h:2
-msgid "Set your Instant Messenger status to away when a movie is playing"
-msgstr "চলচ্চিত্র চলাকালীন ইনস্ট্যান্ট মেসেঞ্জার-এ নিজেকে অনুপস্থিত রূপে চিহ্নিত করুন"
+# msgstr "ডিভিডি মেনু"
+#~ msgid "Deinterlace"
+#~ msgstr "ডি-ইন্টারলেস"
 
-#: ../src/plugins/galago/totem-galago.c:171
-msgid "Could not connect to the Galago daemon."
-msgstr "Galago ডেমনের সাথে সংযোগ করতে ব্যর্থ।"
+#~ msgid "Intranet/LAN"
+#~ msgstr "ইন্ট্রানেট/LAN"
 
-#: ../src/plugins/gromit/gromit.totem-plugin.in.h:1
-msgid "Gromit Annotations"
-msgstr "Gromit অ্যানোটেশন"
+#~ msgid "Networking"
+#~ msgstr "নেটওয়ার্ক ব্যবস্থা"
 
-#: ../src/plugins/gromit/gromit.totem-plugin.in.h:2
-msgid "Presentation helper to make annotations on screen"
-msgstr "পর্দায় অ্যানোটেশন নির্মাণের জন্য প্রেসেন্টেশন সহায়তা ব্যবস্থা"
+#~ msgid "Open a non-local file"
+#~ msgstr "স্থানীয় অবস্থান বহির্ভূত ফাইল খুলুন"
 
-#: ../src/plugins/gromit/totem-gromit.c:272
-msgid "The gromit binary was not found."
-msgstr "gromit বাইনারি পাওয়া যায়নি।"
+#~ msgid "Quit the program"
+#~ msgstr "প্রোগ্রাম থেকে প্রস্থান"
 
-# বাজানো হোক, দেখানো হোক
-# msgstr "চলচ্চিত্র ও গান চালানো হোক" <-- Short cut ;-)
-#. Add the interface to Totem's sidebar
-#: ../src/plugins/iplayer/iplayer.totem-plugin.in.h:1
-#: ../src/plugins/iplayer/iplayer.py:32
-msgid "BBC iPlayer"
-msgstr "BBC iPlayer"
+# সংরক্ষণ, করা হোক
+#~ msgid "Set the repeat mode"
+#~ msgstr "পুনরাবৃত্তি মোড নির্ধারণ করুন"
 
-#: ../src/plugins/iplayer/iplayer.totem-plugin.in.h:2
-msgid "Stream BBC programs from the last 7 days from the BBC iPlayer service."
-msgstr "গত ৭ দিনে BBC দ্বারা প্রচারিত কার্যক্রম BBC iPlayer পরিসেবা থেকে স্ট্রিম করুন।"
+# সংরক্ষণ, করা হোক
+#~ msgid "Set the shuffle mode"
+#~ msgstr "পাচঁমিশেলি মোড নির্ধারণ করুন"
 
-#: ../src/plugins/iplayer/iplayer.py:57
-msgid "Error Listing Channel Categories"
-msgstr "চ্যানেলের বিভাগের তালিকা প্রদর্শনে ত্রুটি"
+#~ msgid "Switch to fullscreen"
+#~ msgstr "সম্পূর্ণ পর্দা জুড়ে প্রদর্শন করা হবে"
 
-#: ../src/plugins/iplayer/iplayer.py:57
-msgid ""
-"There was an unknown error getting the list of television channels available "
-"on BBC iPlayer."
-msgstr ""
-"BBC iPlayer-এ উপলব্ধ টেলিভিশন চ্যানেলের তালিকা প্রাপ্ত করতে অজানা সমস্যা দেখা "
-"দিয়েছে।"
+# msgstr "ভ্যানিটি সংক্রান্ত পছন্দ"
+#~ msgid "Zoom Out"
+#~ msgstr "ছোট মাপে প্রদর্শন"
 
-#. Append a dummy child row so that the expander's visible; we can
-#. then queue off the expander to load the programme listing for this category
-#: ../src/plugins/iplayer/iplayer.py:65
-msgid "Loading…"
-msgstr "লোড করা হচ্ছে…"
+#~ msgid "Zoom Reset"
+#~ msgstr "প্রদর্শনের মান পুনরায় নির্ধারণ"
 
-#: ../src/plugins/iplayer/iplayer.py:106
-msgid "Error getting programme feed"
-msgstr "প্রোগ্রামের ফিড প্রাপ্ত করতে ত্রুটি"
+# msgstr "ভ্যানিটি সংক্রান্ত পছন্দ"
+#~ msgid "Zoom out"
+#~ msgstr "ছোট মাপে প্রদর্শন"
 
-#: ../src/plugins/iplayer/iplayer.py:106
-msgid ""
-"There was an unknown error getting the list of programmes for this channel "
-"and category combination."
-msgstr ""
-"উল্লিখিত বিভাগ অনুযায়ী এই চ্যানেলের জন্য উপলব্ধ সুসংগত প্রোগ্রামের তালিকা প্রাপ্ত করতে "
-"অজানা ত্রুটি দেখা দিয়েছে।"
+#~ msgid "Zoom reset"
+#~ msgstr "প্রদর্শনের মান পুনরায় নির্ধারণ"
 
-#: ../src/plugins/iplayer/iplayer2.py:295
-#, python-format
-msgid "Programme unavailable (\"%s\")"
-msgstr "প্রোগ্রাম উপলব্ধ নয় (\"%s\")"
+#~ msgid "_Deinterlace"
+#~ msgstr "ডি-ইন্টারলেস (_D)"
 
-#: ../src/plugins/jamendo/jamendo.ui.h:1
-msgid "By artist"
-msgstr "শিল্পী অনুযায়ী"
-
-#: ../src/plugins/jamendo/jamendo.ui.h:2
-msgid "By tag"
-msgstr "ট্যাগ অনুযায়ী"
-
-#: ../src/plugins/jamendo/jamendo.ui.h:3
-msgid "Jamendo Album Page"
-msgstr "Jamendo সংকলনের পৃষ্ঠা"
-
-#: ../src/plugins/jamendo/jamendo.ui.h:4
-msgid "Jamendo Plugin Configuration"
-msgstr "Jamendo প্লাগ-ইন কনফিগারেশন"
-
-#: ../src/plugins/jamendo/jamendo.ui.h:5
-msgid "Latest Releases"
-msgstr "সর্বশেষ রিলিজ"
-
-#: ../src/plugins/jamendo/jamendo.ui.h:6
-#| msgid "Number of albums to _retrieve"
-msgid "Number of albums to _retrieve:"
-msgstr "আহরণের জন্য চিহ্নিত অ্যালবামের সংখ্যা (_r)"
-
-#: ../src/plugins/jamendo/jamendo.ui.h:7
-msgid "Popular"
-msgstr "জনপ্রীয়"
-
-#: ../src/plugins/jamendo/jamendo.ui.h:8
-#| msgid "Preferred audio _format"
-msgid "Preferred audio _format:"
-msgstr "পছন্দসই অডিও বিন্যাস: (_f)"
-
-#: ../src/plugins/jamendo/jamendo.ui.h:9
-#: ../src/plugins/tracker/totem-tracker-widget.c:511
-#: ../src/plugins/youtube/youtube.ui.h:2
-msgid "Search Results"
-msgstr "অনুসন্ধানের ফলাফল"
-
-#: ../src/plugins/jamendo/jamendo.ui.h:11
-msgid "_Open Jamendo Album Page in Browser"
-msgstr "ব্রাউজারের মধ্যে Jamendo সংকলনের পৃষ্ঠা খুলুন (_O)"
-
-#: ../src/plugins/jamendo/jamendo.totem-plugin.in.h:1
-#: ../src/plugins/jamendo/jamendo.py:127
-msgid "Jamendo"
-msgstr "Jamendo"
-
-#: ../src/plugins/jamendo/jamendo.totem-plugin.in.h:2
-msgid "Listen to the large collection of Creative Commons licensed music on Jamendo."
-msgstr ""
-"Creative Commons-র শর্তাধীন উপলব্ধ বৃহৎ পরিমাণ সংগীতের সংকলন Jamendo-র মাধ্যমে "
-"উপভোগ করুন।"
-
-#: ../src/plugins/jamendo/jamendo.py:55
-msgid "You need to install the Python simplejson module."
-msgstr "Python simplejson মডিউল ইনস্টল করা আবশ্যক।"
+#~ msgid ""
+#~ "Approximate network connection speed, used to select quality on media "
+#~ "over the network: \"0\" for 14.4 Kbps Modem, \"1\" for 19.2 Kbps Modem, "
+#~ "\"2\" for 28.8 Kbps Modem, \"3\" for 33.6 Kbps Modem, \"4\" for 34.4 Kbps "
+#~ "Modem, \"5\" for 56 Kbps Modem/ISDN, \"6\" for 112 Kbps Dual ISDN/DSL, "
+#~ "\"7\" for 256 Kbps DSL/Cable, \"8\" for 384 Kbps DSL/Cable, \"9\" for 512 "
+#~ "Kbps DSL/Cable, \"10\" for 1.5 Mbps T1/Intranet/LAN, \"11\" for Intranet/"
+#~ "LAN."
+#~ msgstr ""
+#~ "নেটওয়ার্ক সংযোগের আনুমানিক গতি। নেটওয়ার্কের মাধ্যমে সঞ্চারের সময় মিডিয়ার গুণমান "
+#~ "নির্বাচন করতে ব্যবহৃত হয়: ১৪.৪ কিলোবাইট/সেকেন্ডের মোডেমের জন্য \"0\", ১৯.২ "
+#~ "কিলোবাইট/সেকেন্ডের মোডেমের জন্য \"1\", ২৮.৮ কিলোবাইট/সেকেন্ডের মোডেমের জন্য "
+#~ "\"2\", ৩৩.৬ কিলোবাইট/সেকেন্ডের মোডেমের জন্য \"3\", ৩৪.৪ কিলোবাইট/সেকেন্ডের "
+#~ "মোডেমের জন্য \"4\", ৫৬ কিলোবাইট/সেকেন্ডের মোডেম/ISDN-র জন্য \"5\", ১১২ "
+#~ "কিলোবাইট/সেকেন্ডের ডুয়াল ISDN/DSL-র জন্য \"6\", ১১২ কিলোবাইট/সেকেন্ডের DSL/"
+#~ "কেবলের জন্য \"7\", ৩৮৪ কিলোবাইট/সেকেন্ডের DSL/কেবলের জন্য \"8\", ৫১২ "
+#~ "কিলোবাইট/সেকেন্ডের DSL/কেবলের জন্য \"9\", ১.৫ মেগাবাইট/সেকেন্ডের T1/ইনট্রানেট/"
+#~ "LAN-র জন্য \"10\", ইনট্রানেট/LAN-র জন্য \"11\"।"
+
+#~ msgid "Enable deinterlacing"
+#~ msgstr "ডি-ইন্টারলেসিং সক্রিয় করা হবে"
+
+#~ msgid "Network connection speed"
+#~ msgstr "নেটওয়ার্ক সংযোগ গতি"
+
+#~ msgid ""
+#~ "Quality settings for the audio visualization: \"0\" for small, \"1\" for "
+#~ "normal, \"2\" for large, \"3\" for extra large."
+#~ msgstr ""
+#~ "অডিও-র সাথে প্রদর্শিত ভিসুয়ালাইজেশনের গুণমান: ক্ষুদ্র মাপের জন্য \"0\", স্বাভাবিক "
+#~ "মাপের জন্য \"1\", বড় মাপের জন্য \"2\", অত্যাধিক বড় মাপের জন্য \"3\"।"
+
+#~ msgid ""
+#~ "Type of audio output to use: \"0\" for stereo, \"1\" for 4-channel "
+#~ "output, \"2\" for 5.0 channel output, \"3\" for 5.1 channel output, \"4\" "
+#~ "for AC3 Passthrough."
+#~ msgstr ""
+#~ "ব্যবহারের জন্য অডিও আউটপুটের ধরন: স্টিরিও-র ক্ষেত্রে \"0\" , ৪-চ্যানেল বিশিষ্ট "
+#~ "আউটপুটের ক্ষেত্রে \"1\", ৫.০ চ্যানেল বিশিষ্ট আউটপুটের ক্ষেত্রে \"2\", ৫.০ চ্যানেল "
+#~ "বিশিষ্ট আউটপুটের ক্ষেত্রে \"3\", AC3 পাসথ্রু-র ক্ষেত্রে \"4\"।"
+
+#~ msgid "UTF-8"
+#~ msgstr "UTF-8"
+
+#~ msgid "Whether the main window should stay on top"
+#~ msgstr "প্রধান উইন্ডো উপরে স্থাপিত হবে কিনা"
+
+#~ msgid "Whether the main window should stay on top of the other ones"
+#~ msgstr "প্রধান উইন্ডো অন্যান্য সকল উইন্ডোর উপরে স্থাপিত হবে কিনা"
+
+#~| msgid "Play Disc '%s'"
+#~ msgid "Play Image '%s'"
+#~ msgstr "'%s' নামক ইমেজ সঞ্চালিত হবে"
 
-#: ../src/plugins/jamendo/jamendo.py:245 ../src/plugins/jamendo/jamendo.py:258
-#: ../src/plugins/jamendo/jamendo.py:281
-#, python-format
-msgid "Artist: %s"
-msgstr "শিল্পী: %s"
+#~ msgid "device%d"
+#~ msgstr "ডিভাইস%d"
 
-#. Translators: this is the release date of an album in Python strptime format
-#: ../src/plugins/jamendo/jamendo.py:251
-msgid "%Y-%m-%d"
-msgstr "%Y-%m-%d"
+#~ msgid "Play Disc '%s'"
+#~ msgstr "'%s' নামক ডিস্ক চালান"
 
-#. Translators: this is the release time of an album in Python strftime format
-#: ../src/plugins/jamendo/jamendo.py:253
-#, python-format
-msgid "%x"
-msgstr "%x"
+# নিজের নামে আন্ডারস্কোর দিছেন কেন ???@@#!!!
+# msgstr "রুনা ভট্টাচার্য্য " <-- ঠিক আছেনা ?
+#~ msgid "Movie Player using %s"
+#~ msgstr "%s প্রয়োগকারী মুভি প্লেয়ার"
 
-#: ../src/plugins/jamendo/jamendo.py:259
-#, python-format
-msgid "Genre: %s"
-msgstr "ধরন: %s"
+# msgstr ""
+# "সঠিক প্লাগিন না থাকায় টোটেম এধরনের মিডিয়া চালাতে অক্ষম।\n"
+# "এই মিডিয়া ব্যবহারের জন্য সঠিক প্লাগিন ইনস্টল করে পুনরায় টোটেম চালু করুন।"
+#~ msgid ""
+#~ "Totem could not play this media (%s) although a plugin is present to "
+#~ "handle it."
+#~ msgstr ""
+#~ "সঠিক প্লাগ-ইন উপস্থিত থাকা সত্বেও Totem দ্বারা এই মিডিয়া (%s) চালানো সম্ভব "
+#~ "হয়নি।"
 
-#: ../src/plugins/jamendo/jamendo.py:260
-#, python-format
-msgid "Released on: %s"
-msgstr "মুক্তি: %s"
+# msgstr ""
+# "সঠিক প্লাগিন না থাকায় টোটেম এধরনের মিডিয়া চালাতে অক্ষম।\n"
+# "এই মিডিয়া ব্যবহারের জন্য সঠিক প্লাগিন ইনস্টল করে পুনরায় টোটেম চালু করুন।"
+#~ msgid ""
+#~ "You might want to check that a disc is present in the drive and that it "
+#~ "is correctly configured."
+#~ msgstr ""
+#~ "ড্রাইভে ডিস্ক আছে কিনা এবং তা সঠিকভাবে কনফিগার করা হয়েছে কিনা পরীক্ষা করুন।"
+
+#~ msgid "More information about media plugins"
+#~ msgstr "মিডিয়া প্লাগ-ইন সম্বন্ধে অধিক তথ্য"
+
+#~ msgid ""
+#~ "Please install the necessary plugins and restart Totem to be able to play "
+#~ "this media."
+#~ msgstr "এই মিডিয়া চালানোর জন্য সঠিক প্লাগ-ইন ইনস্টল করে Totem পুনরায় চালু করুন।"
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it does not have the "
+#~ "appropriate plugins to be able to read from the disc."
+#~ msgstr ""
+#~ "ডিস্ক থেকে তথ্য পাঠের উদ্দেশ্যে সঠিক প্লাগ-ইন উপস্থিত না থাকার ফলে Totem-র পক্ষে "
+#~ "এই ধরনের মিডিয়া (%s) চালানো সম্ভব নয়।"
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because you do not have the "
+#~ "appropriate plugins to handle it."
+#~ msgstr ""
+#~ "সঠিক প্লাগ-ইন উপস্থিত না থাকার ফলে Totem-র পক্ষে এই ধরনের মিডিয়া (%s) চালানো "
+#~ "সম্ভব নয়।"
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it is not supported."
+#~ msgstr ""
+#~ "এই ধরনের মিডিয়া (%s) Totem দ্বারা সমর্থিত না হওয়ার ফলে এটি চালানো যাবে না।"
+
+#~ msgid "Please insert another disc to play back."
+#~ msgstr "চালনার জন্য অনুগ্রহ করে একটি ডিস্ক ঢুকিয়ে দিন।"
+
+#~ msgid "Totem does not support playback of Audio CDs"
+#~ msgstr "Totem দ্বারা অডিও CD চালানো সম্ভব নয়"
+
+#~ msgid ""
+#~ "Please consider using a music player or a CD extractor to play this CD"
+#~ msgstr ""
+#~ "এই CD চালানোর জন্য অনুগ্রহ করে কোনো মিউজিক প্লেয়ার অথবা CD এক্সট্র্যাক্টার ব্যবহার "
+#~ "করুন"
+
+#~ msgid "Don't connect to an already-running instance"
+#~ msgstr "চলমান কোনো ইনস্ট্যান্সের সাথে সংযোগ স্থাপন করা হবে না"
+
+#~ msgid "Enable visual effects?"
+#~ msgstr "ভিজুয়াল ইফেক্ট সক্রিয় করা হবে কি?"
+
+#~ msgid ""
+#~ "It seems you are running Totem remotely.\n"
+#~ "Are you sure you want to enable the visual effects?"
+#~ msgstr ""
+#~ "সম্ভবত আপনি দূরবর্তী অবস্থান থেকে Totem চালাচ্ছেন।\n"
+#~ "আপনি কি নিশ্চিতরূপে ভিজুয়াল ইফেক্ট সক্রিয় করতে ইচ্ছুক?"
+
+#~ msgid ""
+#~ "Changing the visuals effect type will require a restart to take effect."
+#~ msgstr "ভিজুয়াল ইফেক্ট সংক্রান্ত পরিবর্তন প্রয়োগ করার জন্য রি-স্টার্ট করা আবশ্যক।"
+
+#~ msgid ""
+#~ "The change of audio output type will only take effect when Totem is "
+#~ "restarted."
+#~ msgstr ""
+#~ "অডিও আউটপুটের প্রকৃতি সংক্রান্ত পরিবর্তনগুলি প্রয়োগ করার জন্য Totem পুনরায় আরম্ভ করা "
+#~ "আবশ্যক।"
 
-#: ../src/plugins/jamendo/jamendo.py:261
-#, python-format
-msgid "License: %s"
-msgstr "লাইসেন্স: %s"
+#~ msgid "%d %%"
+#~ msgstr "%d %%"
 
-#. track title
-#. Translators: this is the title of a track in Python format
-#. (first argument is the track number, second is the track title)
-#: ../src/plugins/jamendo/jamendo.py:273
-#, python-format
-msgid "%02d. %s"
-msgstr "%02d. %s"
+#~ msgid "Could not open link"
+#~ msgstr "লিংক খুলতে ব্যর্থ"
 
-#: ../src/plugins/jamendo/jamendo.py:280
-#, python-format
-msgid "Album: %s"
-msgstr "সংকলন: %s"
+# পরীক্ষা
+#~ msgid "Totem could not initialize the configuration engine."
+#~ msgstr "Totem দ্বারা এই কনফিগারেশন ইঞ্জিনটি আরম্ভ করা যায়নি।"
 
-#: ../src/plugins/jamendo/jamendo.py:282
-#, python-format
-msgid "Duration: %s"
-msgstr "অবকাল: %s"
+#~ msgid "Make sure that GNOME is properly installed."
+#~ msgstr "GNOME সঠিকরূপে ইনস্টল করা হয়েছে কিনা পরীক্ষা করুন।"
 
-#: ../src/plugins/jamendo/jamendo.py:339
-msgid "Fetching albums, please wait..."
-msgstr "সংকলন প্রাপ্ত করা হচ্ছে, অনুগ্রহ করে অপেক্ষা করুন..."
-
-#: ../src/plugins/jamendo/jamendo.py:388
-msgid "An error occurred while fetching albums."
-msgstr "সংকলন প্রাপ্তিকালে সমস্যা দেখা দিয়েছে।"
+#~ msgid ""
+#~ "The requested audio output was not found. Please select another audio "
+#~ "output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "অনুরোধ করা অডিও আউটপুট পাওয়া যায়নি। মাল্টি-মিডিয়া সিস্টেম নির্বাচন ব্যবস্থায় "
+#~ "অনুগ্রহ করে অন্য একটি অডিও আউটপুট নির্বাচন করুন।"
+
+#~ msgid "Location not found."
+#~ msgstr "অবস্থান পাওয়া যায়নি।"
+
+#~ msgid ""
+#~ "Could not open location; you might not have permission to open the file."
+#~ msgstr "অবস্থান খোলা যায়নি; সম্ভবত এই ফাইল খুলতে আপনি অনুমতিপ্রাপ্ত নন।"
+
+#~ msgid ""
+#~ "The video output is in use by another application. Please close other "
+#~ "video applications, or select another video output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "ভিডিও আউটপুট অন্য একটি অ্যাপ্লিকেশনের দ্বারা ব্যবহৃত হচ্ছে। অনুগ্রহ করে অন্য ভিডিও "
+#~ "অ্যাপ্লিকেশন বন্ধ করুন অথবা মাল্টি-মিডিয়া সিস্টেম নির্বাচন ব্যবস্থায় অন্য একটি "
+#~ "ভিডিও আউটপুট ব্যবস্থা নির্বাচন করুন।"
+
+#~ msgid ""
+#~ "The audio output is in use by another application. Please select another "
+#~ "audio output in the Multimedia Systems Selector. You may want to consider "
+#~ "using a sound server."
+#~ msgstr ""
+#~ "অডিও আউটপুট অন্য একটি অ্যাপ্লিকেশনের দ্বারা ব্যবহৃত হচ্ছে। অনুগ্রহ করে মাল্টি-মিডিয়া "
+#~ "সিস্টেম নির্বাচন ব্যবস্থায় অন্য একটি অডিও আউটপুট ব্যবস্থা নির্বাচন করুন। সাউন্ড "
+#~ "সার্ভার ব্যবহার সম্পর্কে বিবেচনা করা যাবে।"
+
+#~ msgid ""
+#~ "The playback of this movie requires the following decoders which are not "
+#~ "installed:\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "এই চলচ্চিত্রের জন্য আবশ্যক নিম্নলিখিত ডিকোডারগুলি ইনস্টল করা হয়নি:\n"
+#~ "\n"
+#~ "%s"
 
-#: ../src/plugins/jamendo/jamendo.py:400
-#, python-format
-msgid ""
-"Failed to connect to Jamendo server.\n"
-"%s."
-msgstr ""
-"Jamendo সার্ভারের সাথে সংযোগ স্থাপন করতে ব্যর্থ।\n"
-"%s."
+# msgstr "এই অবস্থানটি অবৈধ"
+#~ msgid "Media file could not be played."
+#~ msgstr "মিডিয়া ফাইল চালানো যায়নি।"
 
-#: ../src/plugins/jamendo/jamendo.py:402
-#, python-format
-msgid "The Jamendo server returned code %s."
-msgstr "Jamendo সার্ভার থেকে %s কোড প্রাপ্ত হয়েছে।"
+#~ msgid "Too old version of GStreamer installed."
+#~ msgstr "GStreamer-র অত্যন্ত পুরোনো সংস্করণ ইনস্টল করা হয়েছে।"
 
-#. Translators: time formatting (in Python strftime format) for the Jamendo plugin
-#. for times longer than an hour
-#: ../src/plugins/jamendo/jamendo.py:634
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
-
-#. Translators: time formatting (in Python strftime format) for the Jamendo plugin
-#. for times shorter than an hour
-#: ../src/plugins/jamendo/jamendo.py:637
-msgid "%M:%S"
-msgstr "%M:%S"
-
-#. Translators: If Jamendo supports your language, replace "en" with the language code, enclosed
-#. in slashes, used to view pages in your language on the Jamendo website. e.g. For French, "en"
-#. would be translated to "fr", as Jamendo uses that in its URLs:
-#. http://www.jamendo.com/fr/album/4818
-#. Compared to:
-#. http://www.jamendo.com/en/album/4818
-#. If Jamendo doesn't support your language, *do not translate this string*!
-#: ../src/plugins/jamendo/jamendo.py:687
-msgid "en"
-msgstr "en"
+#~ msgid ""
+#~ "Failed to create a GStreamer play object. Please check your GStreamer "
+#~ "installation."
+#~ msgstr ""
+#~ "GStreamer প্লে অবজেক্ট নির্মাণ করা যায়নি। অনুগ্রহ করে আপনার সিস্টেমে ইনস্টল করা "
+#~ "GStreamer পরীক্ষা করুন।"
+
+#~ msgid ""
+#~ "Failed to open video output. It may not be available. Please select "
+#~ "another video output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "ভিডিও আউটপুট খোলা যায়নি। সম্ভবত এটি উপস্থিত নেই। অনুগ্রহ করে মাল্টি-মিডিয়া "
+#~ "সিস্টেম নির্বাচন ব্যবস্থায় অন্য একটি ভিডিও আউটপুট নির্বাচন করুন।"
+
+#~ msgid ""
+#~ "Could not find the video output. You may need to install additional "
+#~ "GStreamer plugins, or select another video output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "ভিডিও আউটপুট পাওয়া যায়নি। সম্ভবত অতিরিক্ত GStreamer প্লাগ-ইন ইনস্টল করা আবশ্যক "
+#~ "অথবা মাল্টি-মিডিয়া সিস্টেম নির্বাচন ব্যবস্থায় অন্য একটি ভিডিও আউটপুট নির্বাচন করুন।"
+
+#~ msgid ""
+#~ "Failed to open audio output. You may not have permission to open the "
+#~ "sound device, or the sound server may not be running. Please select "
+#~ "another audio output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "অডিও আউটপুট খুলতে সমস্যা।. সম্ভবত আপনি সাউন্ড ডিভাইস খুলতে অনুমতিপ্রাপ্ত নন অথবা "
+#~ "সাউন্ড সার্ভার বর্তমানে সক্রিয় নয়। অনুগ্রহ করে মাল্টি-মিডিয়া সিস্টেম নির্বাচন "
+#~ "ব্যবস্থায় অন্য একটি অডিও আউটপুট নির্বাচন করুন।"
+
+#~ msgid ""
+#~ "Could not find the audio output. You may need to install additional "
+#~ "GStreamer plugins, or select another audio output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "অডিও আউটপুট পাওয়া যায়নি। সম্ভবত অতিরিক্ত GStreamer প্লাগ-ইন ইনস্টল করা আবশ্যক "
+#~ "অথবা মাল্টি-মিডিয়া সিস্টেম নির্বাচন ব্যবস্থায় অন্য একটি অডিও আউটপুট নির্বাচন করুন।"
+
+#~ msgid "%s"
+#~ msgstr "%s"
+
+#~ msgid "Plugin"
+#~ msgstr "প্লাগ-ইন"
+
+#~ msgid "Enabled"
+#~ msgstr "সক্রিয়"
+
+#~ msgid ""
+#~ "Unable to activate plugin %s.\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s প্লাগ-ইন সক্রিয় করতে ব্যর্থ।\n"
+#~ "%s"
+
+#~ msgid "Unable to activate plugin %s"
+#~ msgstr "%s প্লাগ-ইন সক্রিয় করতে ব্যর্থ"
+
+#~ msgid "Plugin Error"
+#~ msgstr "প্লাগ-ইন সংক্রান্ত ত্রুটি"
+
+#~ msgid "Bemused"
+#~ msgstr "Bemused"
+
+#~ msgid "Control Totem through a mobile phone with a Bemused client"
+#~ msgstr "Bemused ক্লায়েন্ট সহযোগে মোবাইল ফোন থেকে Totem নিয়ন্ত্রণ করুন"
+
+#~ msgid "Untitled %d"
+#~ msgstr "নামবিহীন %d"
+
+#~ msgid "Totem Bemused Server"
+#~ msgstr "Totem Bemused সার্ভার"
+
+#~ msgid "Totem Bemused Server version 1.0"
+#~ msgstr "Totem Bemused সার্ভার সংস্করণ ১.০"
+
+#~ msgid "Delete"
+#~ msgstr "মুছে ফেলুন"
 
-#: ../src/plugins/lirc/lirc.totem-plugin.in.h:1
-msgid "Infrared Remote Control"
-msgstr "ইনফ্রা-রেড রিমোট কন্ট্রোল"
+#~ msgid "Coherence DLNA/UPnP Client"
+#~ msgstr "Coherence DLNA/UPnP ক্লায়েন্ট"
 
-#: ../src/plugins/lirc/lirc.totem-plugin.in.h:2
-msgid "Support infrared remote control"
-msgstr "ইনফ্রা-রেড রিমোট কন্ট্রোলের সহায়তা"
+#~ msgid "A DLNA/UPnP client for Totem powered by Coherence"
+#~ msgstr "Totem-র জন্য Coherence দ্বারা চালিত একটি DLNA/UPnP ক্লায়েন্ট"
 
-#: ../src/plugins/lirc/totem-lirc.c:281
-msgid "Couldn't initialize lirc."
-msgstr "lirc আরম্ভ করতে ব্যর্থ।"
+#~ msgid "Could not connect to the Galago daemon."
+#~ msgstr "Galago ডেমনের সাথে সংযোগ করতে ব্যর্থ।"
 
-#: ../src/plugins/lirc/totem-lirc.c:290
-msgid "Couldn't read lirc configuration."
-msgstr "lirc কনফিগারেশন পড়তে ব্যর্থ।"
+# বাজানো হোক, দেখানো হোক
+# msgstr "চলচ্চিত্র ও গান চালানো হোক" <-- Short cut ;-)
+#~ msgid "BBC iPlayer"
+#~ msgstr "BBC iPlayer"
 
-#: ../src/plugins/mythtv/totem-mythtv.c:200
-msgid "Recordings"
-msgstr "রেকর্ডিং"
-
-#: ../src/plugins/mythtv/totem-mythtv.c:523
-msgid "MythTV Recordings"
-msgstr "MythTV রেকর্ডিং"
-
-#: ../src/plugins/mythtv/totem-mythtv.c:524
-msgid "MythTV LiveTV"
-msgstr "MythTV LiveTV"
+#~ msgid ""
+#~ "Stream BBC programs from the last 7 days from the BBC iPlayer service."
+#~ msgstr ""
+#~ "গত ৭ দিনে BBC দ্বারা প্রচারিত কার্যক্রম BBC iPlayer পরিসেবা থেকে স্ট্রিম করুন।"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
-msgid "Download Movie Subtitles"
-msgstr "চলচ্চিত্রের অনুবাদলিপি ডাউনলোড করুন"
+#~ msgid "Error Listing Channel Categories"
+#~ msgstr "চ্যানেলের বিভাগের তালিকা প্রদর্শনে ত্রুটি"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
-#| msgid "_Languages"
-msgid "Language"
-msgstr "ভাষা"
+#~ msgid ""
+#~ "There was an unknown error getting the list of television channels "
+#~ "available on BBC iPlayer."
+#~ msgstr ""
+#~ "BBC iPlayer-এ উপলব্ধ টেলিভিশন চ্যানেলের তালিকা প্রাপ্ত করতে অজানা সমস্যা দেখা "
+#~ "দিয়েছে।"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
-msgid "Subtitle _language:"
-msgstr "অনুবাদলিপির ভাষা: (_l)"
+#~ msgid "Loading…"
+#~ msgstr "লোড করা হচ্ছে…"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:4
-msgid "_Play with Subtitle"
-msgstr "অনুবাদলিপি সহ চালানো হবে (_P)"
+#~ msgid "Error getting programme feed"
+#~ msgstr "প্রোগ্রামের ফিড প্রাপ্ত করতে ত্রুটি"
 
-#: ../src/plugins/opensubtitles/opensubtitles.totem-plugin.in.h:1
-msgid "Look for subtitles for the currently playing movie."
-msgstr "বর্তমানে চলমান চলচ্চিত্রের অনুবাদলিপি অনুসন্ধান করুন"
+#~ msgid ""
+#~ "There was an unknown error getting the list of programmes for this "
+#~ "channel and category combination."
+#~ msgstr ""
+#~ "উল্লিখিত বিভাগ অনুযায়ী এই চ্যানেলের জন্য উপলব্ধ সুসংগত প্রোগ্রামের তালিকা প্রাপ্ত "
+#~ "করতে অজানা ত্রুটি দেখা দিয়েছে।"
 
-#: ../src/plugins/opensubtitles/opensubtitles.totem-plugin.in.h:2
-msgid "Subtitle Downloader"
-msgstr "অনুবাদলিপি ডাউনলোড ব্যবস্থা"
+#~ msgid "Programme unavailable (\"%s\")"
+#~ msgstr "প্রোগ্রাম উপলব্ধ নয় (\"%s\")"
 
-#: ../src/plugins/opensubtitles/opensubtitles.py:35
-msgid "Brasilian Portuguese"
-msgstr "ব্রাজিলিয়ান পোর্তুগিজ"
+#~ msgid "By artist"
+#~ msgstr "শিল্পী অনুযায়ী"
 
-#: ../src/plugins/opensubtitles/opensubtitles.py:238
-#: ../src/plugins/opensubtitles/opensubtitles.py:254
-#: ../src/plugins/opensubtitles/opensubtitles.py:271
-#: ../src/plugins/opensubtitles/opensubtitles.py:277
-msgid "Could not contact the OpenSubtitles website"
-msgstr "OpenSubtitles ওয়েব-সাইটের সাথে সংযোগ স্থাপন করতে ব্যর্থ"
+#~ msgid "By tag"
+#~ msgstr "ট্যাগ অনুযায়ী"
 
-#: ../src/plugins/opensubtitles/opensubtitles.py:259
-msgid "No results found"
-msgstr "কোনো ফলাফল পাওয়া যায়নি"
+#~ msgid "Jamendo Album Page"
+#~ msgstr "Jamendo সংকলনের পৃষ্ঠা"
 
-#: ../src/plugins/opensubtitles/opensubtitles.py:368
-msgid "Subtitles"
-msgstr "অনুবাদলিপি"
+#~ msgid "Jamendo Plugin Configuration"
+#~ msgstr "Jamendo প্লাগ-ইন কনফিগারেশন"
 
-#. translators comment:
-#. This is the file-type of the subtitle file detected
-#: ../src/plugins/opensubtitles/opensubtitles.py:374
-msgid "Format"
-msgstr "বিন্যাস"
+#~ msgid "Latest Releases"
+#~ msgstr "সর্বশেষ রিলিজ"
 
-#. translators comment:
-#. This is a rating of the quality of the subtitle
-#: ../src/plugins/opensubtitles/opensubtitles.py:379
-msgid "Rating"
-msgstr "মাত্রা"
+#~| msgid "Number of albums to _retrieve"
+#~ msgid "Number of albums to _retrieve:"
+#~ msgstr "আহরণের জন্য চিহ্নিত অ্যালবামের সংখ্যা (_r)"
 
-#: ../src/plugins/opensubtitles/opensubtitles.py:420
-msgid "_Download Movie Subtitles..."
-msgstr "চলচ্চিত্রের অনুবাদলিপি ডাউনলোড করুন...(_D)"
+#~ msgid "Popular"
+#~ msgstr "জনপ্রীয়"
 
-#: ../src/plugins/opensubtitles/opensubtitles.py:421
-msgid "Download movie subtitles from OpenSubtitles"
-msgstr "OpenSubtitles থেকে চলচ্চিত্রের অনুবাদলিপি ডাউনলোড করুন"
+#~| msgid "Preferred audio _format"
+#~ msgid "Preferred audio _format:"
+#~ msgstr "পছন্দসই অডিও বিন্যাস: (_f)"
 
-# msgstr "এই পাসওয়ার্ডটি মনে রাখা হবে"
-#: ../src/plugins/opensubtitles/opensubtitles.py:480
-msgid "Searching subtitles..."
-msgstr "অনুবাদলিপি অনুসন্ধান করা হচ্ছে..."
+#~ msgid "Search Results"
+#~ msgstr "অনুসন্ধানের ফলাফল"
 
-#: ../src/plugins/opensubtitles/opensubtitles.py:538
-msgid "Downloading the subtitles..."
-msgstr "অনুবাদলিপি ডাউনলোড করা হচ্ছে..."
+#~ msgid "_Open Jamendo Album Page in Browser"
+#~ msgstr "ব্রাউজারের মধ্যে Jamendo সংকলনের পৃষ্ঠা খুলুন (_O)"
 
-#: ../src/plugins/ontop/ontop.totem-plugin.in.h:1
-msgid "Always On Top"
-msgstr "সর্বদা উপরে রাখা হবে"
+#~ msgid "Jamendo"
+#~ msgstr "Jamendo"
 
-#: ../src/plugins/ontop/ontop.totem-plugin.in.h:2
-msgid "Keep the main window on top when playing a movie"
-msgstr "চলচ্চিত্র চালানোর সময়, প্রধান উইন্ডোর সর্বদা উপরে প্রদর্শন করা হবে"
+#~ msgid ""
+#~ "Listen to the large collection of Creative Commons licensed music on "
+#~ "Jamendo."
+#~ msgstr ""
+#~ "Creative Commons-র শর্তাধীন উপলব্ধ বৃহৎ পরিমাণ সংগীতের সংকলন Jamendo-র "
+#~ "মাধ্যমে উপভোগ করুন।"
 
-# এটা কি ঠিক আছে ?
-#: ../src/plugins/properties/totem-movie-properties.c:152
-msgid "Properties"
-msgstr "বৈশিষ্ট্যাবলী"
+#~ msgid "You need to install the Python simplejson module."
+#~ msgstr "Python simplejson মডিউল ইনস্টল করা আবশ্যক।"
 
-#: ../src/plugins/properties/bacon-video-widget-properties.c:235
-#, c-format
-msgid "%d x %d"
-msgstr "%d x %d"
+#~ msgid "Artist: %s"
+#~ msgstr "শিল্পী: %s"
 
-#: ../src/plugins/properties/bacon-video-widget-properties.c:238
-#, c-format
-msgid "%d frames per second"
-msgstr "প্রতি সেকেন্ডে %d-টি ফ্রেম"
+#~ msgid "%Y-%m-%d"
+#~ msgstr "%Y-%m-%d"
 
-#: ../src/plugins/properties/bacon-video-widget-properties.c:240
-#: ../src/plugins/properties/bacon-video-widget-properties.c:257
-#, c-format
-msgid "%d kbps"
-msgstr "%d কিলোবাইট/সেকেন্ড"
+#~ msgid "%x"
+#~ msgstr "%x"
 
-#: ../src/plugins/properties/bacon-video-widget-properties.c:260
-#, c-format
-msgid "%d Hz"
-msgstr "%d হার্টজ"
+#~ msgid "Genre: %s"
+#~ msgstr "ধরন: %s"
 
-#: ../src/plugins/publish/totem-publish.c:588
-msgid "Neighbors"
-msgstr "প্রতিবেশি"
+#~ msgid "Released on: %s"
+#~ msgstr "মুক্তি: %s"
 
-# Header পরিবর্তন করা হইছে
-# Chapter=অধ্যায়
-# অশুদ্ধ - পরিক্ষা
-# শুদ্ধ - পরীক্ষা
-#: ../src/plugins/publish/publish.totem-plugin.in.h:1
-msgid "Publish Playlist"
-msgstr "প্লে-লিস্ট প্রকাশ করুন"
-
-#: ../src/plugins/publish/publish.totem-plugin.in.h:2
-msgid "Share the current playlist via HTTP"
-msgstr "HTTP-র সাহায্যে বর্তমান প্লে-লিস্ট বিতরণ করুন"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:1
-msgid "Service _Name:"
-msgstr "পরিসেবার নাম: (_N)"
+#~ msgid "License: %s"
+#~ msgstr "লাইসেন্স: %s"
 
-#: ../src/plugins/publish/publish-plugin.ui.h:3
-#, no-c-format
-#| msgid ""
-#| "The name used for announcing the playlist service on the network.\n"
-#| "All occurrences of the string %u will be replaced by your name,\n"
-#| "and %h will be replaced by your computer's host name."
-msgid ""
-"The name used for announcing the playlist service on the network.\n"
-"All occurrences of the string %u will be replaced by your name,\n"
-"and %h will be replaced by your computer's host name."
-msgstr ""
-"নেটওয়ার্কের মধ্যে প্লে-লিস্ট পরিসেবার ঘোষনার জন্য ব্যবহৃত নাম।\n"
-"%u-র পরিবর্তে সকল স্থানে আপনার নাম প্রতিস্থাপন করা হবে,\n"
-"ও %h-র পরিবর্তে কম্পিউটারের হোস্ট-নেম স্থাপন করা হবে।"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:6
-msgid "Use _encrypted transport protocol (HTTPS)"
-msgstr "এনক্রিপশনসহ সম্প্রচার প্রোটোকল প্রয়োগ করুন (HTTPS) (_e)"
+#~ msgid "%02d. %s"
+#~ msgstr "%02d. %s"
 
-#: ../src/plugins/screenshot/gallery.ui.h:1
-msgid "Calculate the number of screenshots"
-msgstr "স্ক্রিন-শটের সংখ্যা গণনা করুন"
+#~ msgid "Album: %s"
+#~ msgstr "সংকলন: %s"
 
-#: ../src/plugins/screenshot/gallery.ui.h:2
-msgid "Number of screenshots:"
-msgstr "স্ক্রিন-শটের সংখ্যা:"
+#~ msgid "Duration: %s"
+#~ msgstr "অবকাল: %s"
 
-#: ../src/plugins/screenshot/gallery.ui.h:3
-msgid "Screenshot width (in pixels):"
-msgstr "স্ক্রিন-শটের প্রস্থের মাপ (পিক্সেল অনুযায়ী):"
+#~ msgid "Fetching albums, please wait..."
+#~ msgstr "সংকলন প্রাপ্ত করা হচ্ছে, অনুগ্রহ করে অপেক্ষা করুন..."
 
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:1
-msgid "Save in _folder:"
-msgstr "চিহ্নিত ফোল্ডারে সংরক্ষণ করা হবে: (_f)"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:2
-msgid "Select a folder"
-msgstr "একটি ফোল্ডার নির্বাচন করুন"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:3
-msgid "_Name:"
-msgstr "নাম: (_N)"
+#~ msgid ""
+#~ "Failed to connect to Jamendo server.\n"
+#~ "%s."
+#~ msgstr ""
+#~ "Jamendo সার্ভারের সাথে সংযোগ স্থাপন করতে ব্যর্থ।\n"
+#~ "%s."
 
-# msgstr "মুভি প্লেয়ার %s ব্যবহার করছে"
-#. Write the screenshot to the temporary file
-#: ../src/plugins/screenshot/gnome-screenshot-widget.c:383
-#: ../src/plugins/screenshot/totem-screenshot.c:63
-msgid "Screenshot.png"
-msgstr "Screenshot.png"
+#~ msgid "The Jamendo server returned code %s."
+#~ msgstr "Jamendo সার্ভার থেকে %s কোড প্রাপ্ত হয়েছে।"
 
-#: ../src/plugins/screenshot/totem-gallery.c:90
-msgid "Save Gallery"
-msgstr "গ্যালারি সংরক্ষণ করুন"
+#~ msgid "%H:%M:%S"
+#~ msgstr "%H:%M:%S"
 
-#. Translators: The first argument is the movie title. The second
-#. * argument is a number which is used to prevent overwriting files.
-#. * Just translate "Gallery", and not the ".jpg". Example:
-#. * "Galerie-%s-%d.jpg".
-#: ../src/plugins/screenshot/totem-gallery.c:114
-#, c-format
-msgid "Gallery-%s-%d.jpg"
-msgstr "Gallery-%s-%d.jpg"
+#~ msgid "%M:%S"
+#~ msgstr "%M:%S"
 
-#. Set up the window
-#: ../src/plugins/screenshot/totem-gallery-progress.c:101
-msgid "Creating Gallery..."
-msgstr "গ্যালারি নির্মাণ করা হচ্ছে..."
+#~ msgid "en"
+#~ msgstr "en"
 
-#. Set the progress label
-#: ../src/plugins/screenshot/totem-gallery-progress.c:108
-#, c-format
-msgid "Saving gallery as \"%s\""
-msgstr "\"%s\" নামে গ্যালারি সংরক্ষণ করা হচ্ছে"
+#~ msgid "Recordings"
+#~ msgstr "রেকর্ডিং"
 
-# "'%s' ফাইলটি ইতিমধ্যেই আছে।\n"
-#: ../src/plugins/screenshot/totem-screenshot.c:112
-msgid "There was an error saving the screenshot."
-msgstr "পর্দার ছবি সংরক্ষণ করতে সমস্যা।"
-
-#: ../src/plugins/screenshot/totem-screenshot.c:139
-msgid "Save Screenshot"
-msgstr "পর্দার ছবি সংরক্ষণ করুন"
+#~ msgid "MythTV Recordings"
+#~ msgstr "MythTV রেকর্ডিং"
 
-# msgstr "মুভি প্লেয়ার %s ব্যবহার করছে"
-#. Create the screenshot widget
-#. Translators: %s is the movie title and %d is an auto-incrementing number to make filename unique
-#: ../src/plugins/screenshot/totem-screenshot.c:160
-#, c-format
-#| msgid "Screenshot%d.png"
-msgid "Screenshot-%s-%d.png"
-msgstr "Screenshot-%s-%d.png"
+#~ msgid "MythTV LiveTV"
+#~ msgstr "MythTV LiveTV"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:98
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:105
-msgid "Totem could not get a screenshot of the video."
-msgstr "Totem দ্বারা ভিডিওর ছবি গ্রহণ করা সম্ভব হয়নি।"
+#~| msgid "_Languages"
+#~ msgid "Language"
+#~ msgstr "ভাষা"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:105
-msgid "This is not supposed to happen; please file a bug report."
-msgstr "এই আচরণ প্রত্যাশিত নয়; অনুগ্রহ করে বাগ-রিপোর্ট নথিভুক্ত করুন"
+#~ msgid "_Download Movie Subtitles..."
+#~ msgstr "চলচ্চিত্রের অনুবাদলিপি ডাউনলোড করুন...(_D)"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:208
-msgid "Take _Screenshot..."
-msgstr "পর্দার ছবি নিন...(_S)"
+#~ msgid "Neighbors"
+#~ msgstr "প্রতিবেশি"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:208
-msgid "Take a screenshot"
-msgstr "পর্দার ছবি নিন"
+# Header পরিবর্তন করা হইছে
+# Chapter=অধ্যায়
+# অশুদ্ধ - পরিক্ষা
+# শুদ্ধ - পরীক্ষা
+#~ msgid "Publish Playlist"
+#~ msgstr "প্লে-লিস্ট প্রকাশ করুন"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:209
-msgid "Create Screenshot _Gallery..."
-msgstr "স্ক্রিন-শটের গ্যালারি নির্মাণ করুন...(_G)"
+#~ msgid "Share the current playlist via HTTP"
+#~ msgstr "HTTP-র সাহায্যে বর্তমান প্লে-লিস্ট বিতরণ করুন"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:209
-msgid "Create a gallery of screenshots"
-msgstr "স্ক্রিন-শটের গ্যালারি নির্মাণ করুন"
+#~ msgid "Service _Name:"
+#~ msgstr "পরিসেবার নাম: (_N)"
 
-# msgstr "সামনে"
-#: ../src/plugins/skipto/totem-skipto.c:171
-msgid "Skip to"
-msgstr "চিহ্নিত স্থানে চলুন"
+#~| msgid ""
+#~| "The name used for announcing the playlist service on the "
+#~| "network.\n"
+#~| "All occurrences of the string %u will be replaced by your name,\n"
+#~| "and %h will be replaced by your computer's host name."
+#~ msgid ""
+#~ "The name used for announcing the playlist service on the network.\n"
+#~ "All occurrences of the string %u will be replaced by your name,\n"
+#~ "and %h will be replaced by your computer's host name."
+#~ msgstr ""
+#~ "নেটওয়ার্কের মধ্যে প্লে-লিস্ট পরিসেবার ঘোষনার জন্য ব্যবহৃত নাম।\n"
+#~ "%u-র পরিবর্তে সকল স্থানে আপনার নাম প্রতিস্থাপন করা হবে,\n"
+#~ "ও %h-র পরিবর্তে কম্পিউটারের হোস্ট-নেম স্থাপন করা হবে।"
+
+#~ msgid "Use _encrypted transport protocol (HTTPS)"
+#~ msgstr "এনক্রিপশনসহ সম্প্রচার প্রোটোকল প্রয়োগ করুন (HTTPS) (_e)"
 
-# চলচ্চিত্রের তালিকা
-#: ../src/plugins/skipto/totem-skipto-plugin.c:215
-msgid "_Skip to..."
-msgstr "চিহ্নিত স্থানে এগিয়ে চলুন...(_S)"
+#~ msgid "Save in _folder:"
+#~ msgstr "চিহ্নিত ফোল্ডারে সংরক্ষণ করা হবে: (_f)"
 
-# যাওয়া হোক। আগের কয়েকটাতেও এই সমস্যা আছে
-#: ../src/plugins/skipto/totem-skipto-plugin.c:215
-msgid "Skip to a specific time"
-msgstr "চিহ্নিত সময়ে এগিয়ে চলুন"
+#~ msgid "Select a folder"
+#~ msgstr "একটি ফোল্ডার নির্বাচন করুন"
 
-#: ../src/plugins/skipto/totem-skipto-plugin.c:221
-msgid "Could not load the \"Skip to\" dialog interface."
-msgstr "\"চিহ্নিত স্থানে চলুন\" ডায়লগ ইন্টারফেস লোড করা যায়নি।"
+#~ msgid "_Name:"
+#~ msgstr "নাম: (_N)"
 
-# msgstr "সামনে"
-#: ../src/plugins/skipto/skipto.ui.h:1
-msgid "_Skip to:"
-msgstr "চিহ্নিত স্থানে চলুন: (_S)"
+# "'%s' ফাইলটি ইতিমধ্যেই আছে।\n"
+#~ msgid "There was an error saving the screenshot."
+#~ msgstr "পর্দার ছবি সংরক্ষণ করতে সমস্যা।"
 
-#: ../src/plugins/skipto/skipto.ui.h:2
-msgid "seconds"
-msgstr "সেকেন্ড"
-
-#. Display an error
-#: ../src/plugins/tracker/totem-tracker-widget.c:170
-#, c-format
-#| msgid "Could not get metadata for file %s: %s"
-msgid "Could not get name and thumbnail for %s: %s"
-msgstr "%s-র নাম ও থাম্‌ব-নেই প্রাপ্ত করা যায়নি: %s"
-
-#: ../src/plugins/tracker/totem-tracker-widget.c:171
-msgid "File Error"
-msgstr "ফাইল সংক্রান্ত ত্রুটি"
-
-#: ../src/plugins/tracker/totem-tracker-widget.c:244
-#: ../src/plugins/tracker/totem-tracker-widget.c:358
-#| msgid "Could not connect to the Galago daemon."
-msgid "Could not connect to Tracker"
-msgstr "Tracker-র সাথে সংযোগ করতে ব্যর্থ।"
-
-#: ../src/plugins/tracker/totem-tracker-widget.c:251
-msgid "No results"
-msgstr "কোনো ফলাফল পাওয়া যায়নি"
-
-#. Translators:
-#. * This is used to show which items are listed in the list view, for example:
-#. * Showing 10-20 of 128 matches
-#. * This is similar to what web searches use, eg. Google on the top-right of their search results page show:
-#. * Personalized Results 1 - 10 of about 4,130,000 for foobar
-#: ../src/plugins/tracker/totem-tracker-widget.c:276
-#, c-format
-msgid "Showing %i - %i of %i match"
-msgid_plural "Showing %i - %i of %i matches"
-msgstr[0] "%i প্রদর্শিত - %i ফলাফল, সর্বমোট %i"
-msgstr[1] "%i প্রদর্শিত - %i ফলাফল, সর্বমোট %i"
-
-#: ../src/plugins/tracker/totem-tracker-widget.c:571
-msgid "Page"
-msgstr "পৃষ্ঠা"
-
-#: ../src/plugins/tracker/totem-tracker.c:91
-#: ../src/plugins/tracker/tracker.totem-plugin.in.h:1
-msgid "Local Search"
-msgstr "স্থানীয়রূপে অনুসন্ধান"
-
-#: ../src/plugins/thumbnail/thumbnail.totem-plugin.in.h:1
-msgid "Set the window icon to the thumbnail of the playing movie"
-msgstr "সঞ্চালিত চলচ্চিত্রের উইন্ডো আইকনটি থাম্‌ব-নেইল রূপে স্থাপিত হবে"
-
-#: ../src/plugins/thumbnail/thumbnail.totem-plugin.in.h:2
-msgid "Thumbnail"
-msgstr "থাম্‌ব-নেইল"
-
-#: ../src/plugins/tracker/tracker.totem-plugin.in.h:2
-msgid "Search for local videos using Tracker"
-msgstr "Tracker সহযোগে স্থানীয় ভিডিও অনুসন্ধান করুন"
-
-#: ../src/plugins/youtube/youtube.totem-plugin.in.h:1
-msgid "A plugin to let you browse YouTube videos."
-msgstr "YouTube ভিডিও ব্রাউজ করার উদ্দেশ্যে ব্যবহৃত প্লাগ-ইন।"
-
-#: ../src/plugins/youtube/youtube.totem-plugin.in.h:2
-msgid "YouTube Browser"
-msgstr "YouTube ব্রাউজার"
-
-#: ../src/plugins/youtube/youtube.ui.h:1
-msgid "Related Videos"
-msgstr "সম্বন্ধীয় ভিডিও"
+#~| msgid "Could not get metadata for file %s: %s"
+#~ msgid "Could not get name and thumbnail for %s: %s"
+#~ msgstr "%s-র নাম ও থাম্‌ব-নেই প্রাপ্ত করা যায়নি: %s"
 
-# ঠিক করেন
-#: ../src/plugins/youtube/youtube.ui.h:3
-msgid "Videos"
-msgstr "ভিডিও"
+#~| msgid "Could not connect to the Galago daemon."
+#~ msgid "Could not connect to Tracker"
+#~ msgstr "Tracker-র সাথে সংযোগ করতে ব্যর্থ।"
 
-#: ../src/plugins/youtube/totem-youtube.c:314
-msgid "_Open in Web Browser"
-msgstr "ওয়েব-ব্রাউজার খুলুন (_O)"
-
-#: ../src/plugins/youtube/totem-youtube.c:314
-msgid "Open the video in your web browser"
-msgstr "ওয়েব-ব্রাউজারের মধ্যে ভিডিও খুলুন"
-
-#. Add the sidebar page
-#: ../src/plugins/youtube/totem-youtube.c:364
-msgid "YouTube"
-msgstr "YouTube"
-
-#: ../src/plugins/youtube/totem-youtube.c:456
-msgid "Cancelling query…"
-msgstr "অনুসন্ধান বাতিল করা হচ্ছে…"
-
-#: ../src/plugins/youtube/totem-youtube.c:505
-msgid "Error Looking Up Video URI"
-msgstr "ভিডিও URI অনুসন্ধান করতে ত্রুটি"
-
-#. Hide the ugly technical message libgdata gives behind a nice one telling them it's out of date (which it likely is
-#. * if we're receiving a protocol error).
-#. Spew out the error message as provided
-#: ../src/plugins/youtube/totem-youtube.c:695
-#: ../src/plugins/youtube/totem-youtube.c:700
-msgid "Error Searching for Videos"
-msgstr "ভিডিও অনুসন্ধান করতে ত্রুটি"
-
-#: ../src/plugins/youtube/totem-youtube.c:696
-msgid ""
-"The response from the server could not be understood. Please check you are "
-"running the latest version of libgdata."
-msgstr ""
-"সার্ভার থেকে প্রাপ্ত উত্তর বোধগম্য হয়নি। libgdata-র সাম্প্রতিকতম সংস্করণ সঞ্চালিত "
-"হচ্ছে কি না পরীক্ষা করুন।"
-
-#. Update the UI
-#: ../src/plugins/youtube/totem-youtube.c:842
-msgid "Fetching search results…"
-msgstr "অনুসন্ধানের ফলাফল প্রাপ্ত করা হচ্ছে..."
-
-#. Update the UI
-#: ../src/plugins/youtube/totem-youtube.c:895
-msgid "Fetching related videos…"
-msgstr "সম্বন্ধীয় ভিডিও আহরণ করা হচ্ছে..."
-
-#: ../src/plugins/youtube/totem-youtube.c:946
-msgid "Error Opening Video in Web Browser"
-msgstr "ওয়েব-ব্রাউজারের মধ্যে ভিডিও খুলতে ত্রুটি"
-
-#: ../src/plugins/youtube/totem-youtube.c:966
-msgid "Fetching more videos…"
-msgstr "অতিরিক্ত ভিডিও আহরণ করা হচ্ছে..."
+#~ msgid "No results"
+#~ msgstr "কোনো ফলাফল পাওয়া যায়নি"
 
-#: ../browser-plugin/totem-plugin-viewer.c:419
-msgid "No URI to play"
-msgstr "চালানোর জন্য কোনো URI চিহ্নিত করা হয়নি"
+#~ msgid "Showing %i - %i of %i match"
+#~ msgid_plural "Showing %i - %i of %i matches"
+#~ msgstr[0] "%i প্রদর্শিত - %i ফলাফল, সর্বমোট %i"
+#~ msgstr[1] "%i প্রদর্শিত - %i ফলাফল, সর্বমোট %i"
 
-#. translators: this is:
-#. * Open With ApplicationName
-#. * as in nautilus' right-click menu
-#: ../browser-plugin/totem-plugin-viewer.c:1065
-#, c-format
-msgid "_Open with \"%s\""
-msgstr "\"%s\" সহযোগে খুলুন (_O)"
+#~ msgid "Page"
+#~ msgstr "পৃষ্ঠা"
 
-# নিজের নামে আন্ডারস্কোর দিছেন কেন ???@@#!!!
-# msgstr "রুনা ভট্টাচার্য্য " <-- ঠিক আছেনা ?
-#: ../browser-plugin/totem-plugin-viewer.c:1116
-#, c-format
-msgid "Browser Plugin using %s"
-msgstr "%s প্রয়োগকারী ব্রাউজার প্লাগ-ইন"
+#~ msgid "Set the window icon to the thumbnail of the playing movie"
+#~ msgstr "সঞ্চালিত চলচ্চিত্রের উইন্ডো আইকনটি থাম্‌ব-নেইল রূপে স্থাপিত হবে"
 
-# বাজানো হোক, দেখানো হোক
-# msgstr "চলচ্চিত্র ও গান চালানো হোক" <-- Short cut ;-)
-#: ../browser-plugin/totem-plugin-viewer.c:1121
-msgid "Totem Browser Plugin"
-msgstr "Totem Browser প্লাগ-ইন"
+#~ msgid "Thumbnail"
+#~ msgstr "থাম্‌ব-নেইল"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2134
-msgid "No playlist or playlist empty"
-msgstr "প্লে-লিস্ট ফাঁকা অথবা অনুপস্থিত"
+#~ msgid "Search for local videos using Tracker"
+#~ msgstr "Tracker সহযোগে স্থানীয় ভিডিও অনুসন্ধান করুন"
 
-# বাজানো হোক, দেখানো হোক
-# msgstr "চলচ্চিত্র ও গান চালানো হোক" <-- Short cut ;-)
-#: ../browser-plugin/totem-plugin-viewer.c:2225
-msgid "Movie browser plugin"
-msgstr "চলচ্চিত্র ব্রাউজার প্লাগ-ইন"
+#~ msgid "Related Videos"
+#~ msgstr "সম্বন্ধীয় ভিডিও"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2241
-msgid "Verify your system installation. The Totem plugin will now exit."
-msgstr "আপনার সিস্টেমের ইনস্টলেশন পরীক্ষা করুন। Totem প্লাগ-ইন এখন বন্ধ করা হবে।"
+#~ msgid "_Open in Web Browser"
+#~ msgstr "ওয়েব-ব্রাউজার খুলুন (_O)"
 
-#: ../src/plugins/pythonconsole/pythonconsole.totem-plugin.in.h:1
-msgid "Interactive Python console."
-msgstr "ইন্টারেক্টিভ python কনসোল।"
+#~ msgid "Open the video in your web browser"
+#~ msgstr "ওয়েব-ব্রাউজারের মধ্যে ভিডিও খুলুন"
 
-#: ../src/plugins/pythonconsole/pythonconsole.totem-plugin.in.h:2
-msgid "Python Console"
-msgstr "Python কনসোল"
+#~ msgid "YouTube"
+#~ msgstr "YouTube"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:74
-msgid "Python Console Menu"
-msgstr "Python কনসোল মেনু"
+#~ msgid "Cancelling query…"
+#~ msgstr "অনুসন্ধান বাতিল করা হচ্ছে…"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:77
-msgid "_Python Console"
-msgstr "Python কনসোল (_P)"
+#~ msgid "Error Looking Up Video URI"
+#~ msgstr "ভিডিও URI অনুসন্ধান করতে ত্রুটি"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:78
-msgid "Show Totem's Python console"
-msgstr "Totem-র python কনসোল প্রদর্শন করা হবে"
+#~ msgid "Error Searching for Videos"
+#~ msgstr "ভিডিও অনুসন্ধান করতে ত্রুটি"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:83
-msgid "Python Debugger"
-msgstr "Python ডিবাগার"
+#~ msgid ""
+#~ "The response from the server could not be understood. Please check you "
+#~ "are running the latest version of libgdata."
+#~ msgstr ""
+#~ "সার্ভার থেকে প্রাপ্ত উত্তর বোধগম্য হয়নি। libgdata-র সাম্প্রতিকতম সংস্করণ সঞ্চালিত "
+#~ "হচ্ছে কি না পরীক্ষা করুন।"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:84
-msgid "Enable remote Python debugging with rpdb2"
-msgstr "rpdb2-র সাহায্যে দূরবর্তী অবস্থান থেকে python ডিবাগ প্রক্রিয়া সক্রিয় করুন"
+#~ msgid "Fetching search results…"
+#~ msgstr "অনুসন্ধানের ফলাফল প্রাপ্ত করা হচ্ছে..."
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:106
-#, python-format
-msgid "You can access the totem object through 'totem_object' :\\n%s"
-msgstr "'totem_object'-র সাহায্যে totem অবজেক্ট ব্যবহার করা যাবে :\\n%s"
+#~ msgid "Fetching related videos…"
+#~ msgstr "সম্বন্ধীয় ভিডিও আহরণ করা হচ্ছে..."
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:111
-msgid "Totem Python Console"
-msgstr "Totem Python কনসোল"
+#~ msgid "Error Opening Video in Web Browser"
+#~ msgstr "ওয়েব-ব্রাউজারের মধ্যে ভিডিও খুলতে ত্রুটি"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:120
-msgid ""
-"After you press OK, Totem will wait until you connect to it with winpdb or "
-"rpdb2. If you have not set a debugger password in GConf, it will use the "
-"default password ('totem')."
-msgstr ""
-"'ঠিক আছে' টেপা হলে, winpdb অথবা rpdb2-র সাথে সংযোগ স্থাপন না করা অবধি Totem "
-"দ্বারা অপেক্ষা করা হবে। GConf-র মধ্যে ডিবাগার পাসওয়ার্ড নির্ধারণ না করা হলে ডিফল্ট "
-"পাসওয়ার্ড প্রয়োগ করা হবে ('totem')।"
+#~ msgid "Fetching more videos…"
+#~ msgstr "অতিরিক্ত ভিডিও আহরণ করা হচ্ছে..."
+
+# নিজের নামে আন্ডারস্কোর দিছেন কেন ???@@#!!!
+# msgstr "রুনা ভট্টাচার্য্য " <-- ঠিক আছেনা ?
+#~ msgid "Browser Plugin using %s"
+#~ msgstr "%s প্রয়োগকারী ব্রাউজার প্লাগ-ইন"
 
+# বাজানো হোক, দেখানো হোক
+# msgstr "চলচ্চিত্র ও গান চালানো হোক" <-- Short cut ;-)
+#~ msgid "Totem Browser Plugin"
+#~ msgstr "Totem Browser প্লাগ-ইন"
diff -Nru totem-3.4.3/po/ca.po totem-3.6.2/po/ca.po
--- totem-3.4.3/po/ca.po	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/po/ca.po	2012-10-09 15:42:00.000000000 +0000
@@ -3,31 +3,255 @@
 # This file is distributed under the same license as the totem package.
 # Jordi Mallach , 2002, 2003, 2004, 2005, 2006, 2007.
 # Gil Forcada , 2006, 2007, 2008, 2009, 2010, 2011, 2012.
-# Jordi Serratosa , 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: totem 2.14\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=totem&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-03-28 18:27+0000\n"
-"PO-Revision-Date: 2012-03-24 01:36+0100\n"
+"POT-Creation-Date: 2012-09-22 18:18+0000\n"
+"PO-Revision-Date: 2012-09-15 19:13+0200\n"
 "Last-Translator: Gil Forcada \n"
 "Language-Team: Catalan \n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bits\n"
-"Language: ca\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
+#: ../browser-plugin/totem-plugin-viewer.c:352 ../src/totem-object.c:1180
+#: ../src/totem-object.c:1650 ../src/totem-statusbar.c:115
+msgid "Stopped"
+msgstr "Aturat"
+
+#: ../browser-plugin/totem-plugin-viewer.c:364 ../src/totem-object.c:1173
+msgid "Paused"
+msgstr "En pausa"
+
+#: ../browser-plugin/totem-plugin-viewer.c:368 ../src/totem-object.c:1166
+msgid "Playing"
+msgstr "S'està reproduint"
+
+#: ../browser-plugin/totem-plugin-viewer.c:386
+#: ../src/plugins/screensaver/totem-screensaver.c:97
+msgid "Playing a movie"
+msgstr "S'està reproduint una pel·lícula"
+
+#: ../browser-plugin/totem-plugin-viewer.c:443
+msgid "No URI to play"
+msgstr "No hi ha cap URI per reproduir"
+
+#: ../browser-plugin/totem-plugin-viewer.c:676
+#: ../browser-plugin/totem-plugin-viewer.c:1700
+msgid "Totem Movie Player"
+msgstr "Reproductor de vídeo Totem"
+
+#. translators: this is:
+#. * Open With ApplicationName
+#. * as in nautilus' right-click menu
+#: ../browser-plugin/totem-plugin-viewer.c:1120
+#, c-format
+msgid "_Open with \"%s\""
+msgstr "_Obre amb el «%s»"
+
+#: ../browser-plugin/totem-plugin-viewer.c:1341 ../src/totem-object.c:2475
+msgid "An error occurred"
+msgstr "S'ha produït un error"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2033
+msgid "No playlist or playlist empty"
+msgstr "No hi ha cap llista de reproducció o bé és buida"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2128
+msgid "Movie browser plugin"
+msgstr "Connector per veure pel·lícules al navegador"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144 ../src/totem.c:240
+msgid "Could not initialize the thread-safe libraries."
+msgstr "No s'han pogut inicialitzar les biblioteques que permeten fils segurs."
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144
+msgid "Verify your system installation. The Totem plugin will now exit."
+msgstr ""
+"Verifiqueu la instal·lació del sistema. El connector del Totem sortirà ara."
+
 #: ../data/fullscreen.ui.h:1
 msgid "Leave Fullscreen"
 msgstr "Surt de la pantalla completa"
 
-#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:144
+#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:81
 msgid "Time:"
 msgstr "Temps:"
 
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
+msgid "Allow the screensaver to activate when playing audio"
+msgstr ""
+"Permet que s'activi l'estalvi de pantalla quan s'estigui reproduint àudio"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
+msgid ""
+"Allow the screensaver to activate when playing audio. Disable if you have "
+"monitor-powered speakers."
+msgstr ""
+"Permet que s'activi l'estalvi de pantalla quan s'estigui reproduint àudio. "
+"No ho habiliteu si teniu un monitor amb altaveus."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
+msgid "Show visual effects when no video is displayed"
+msgstr "Mostra efectes visuals quan no es mostri cap vídeo"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
+msgid "Show visual effects when playing an audio only file."
+msgstr "Mostra efectes visuals quan es reprodueixi un fitxer d'àudio."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
+msgid "Name of the visual effects plugin"
+msgstr "Nom del connector d'efectes visuals"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
+msgid "The brightness of the video"
+msgstr "La brillantor del vídeo"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
+msgid "The contrast of the video"
+msgstr "El contrast del vídeo"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
+msgid "The hue of the video"
+msgstr "El to del vídeo"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
+msgid "The saturation of the video"
+msgstr "La saturació del vídeo"
+
+# FIXME: "canvas" (josep)
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
+msgid "Resize the canvas automatically on file load"
+msgstr "Redimensiona el llenç automàticament en carregar un fitxer"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
+msgid "Repeat mode"
+msgstr "Mode de repetició"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
+msgid "Shuffle mode"
+msgstr "Mode aleatori"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
+msgid "Whether to disable deinterlacing for interlaced movies"
+msgstr ""
+"Si s'ha d'inhabilitar el desentrallaçat de les pel·lícules entrellaçades"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
+msgid "Whether to enable debug for the playback engine"
+msgstr "Si s'ha d'habilitar la depuració per al motor de reproducció"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
+msgid "Type of audio output to use"
+msgstr "Tipus de sortida d'àudio a utilitzar"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
+msgid "Visualization quality setting"
+msgstr "Paràmetre de la qualitat de la visualització"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
+msgid "Quality setting for the audio visualization."
+msgstr "Paràmetre de qualitat per a la visualització d'àudio."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
+msgid "Network buffering threshold"
+msgstr "Llindar d'utilització de la memòria intermèdia de xarxa"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
+msgid ""
+"Amount of data to buffer for network streams before starting to display the "
+"stream (in seconds)."
+msgstr ""
+"Quantitat de dades (en segons) a emmagatzemar a la memòria intermèdia per "
+"als fluxos de la xarxa abans de començar-los a mostrar."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
+msgid "Subtitle font"
+msgstr "Tipus de lletra dels subtítols"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
+msgid "Pango font description for subtitle rendering."
+msgstr ""
+"Descripció del tipus de lletra Pango per a la representació dels subtítols."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
+msgid "Subtitle encoding"
+msgstr "Codificació dels subtítols"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
+msgid "Encoding character set for subtitle."
+msgstr "Codificació del joc de caràcters dels subtítols."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
+msgid "Default location for the \"Open...\" dialogs"
+msgstr "Ubicació predeterminada per als diàlegs «Obre...»"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
+msgid ""
+"Default location for the \"Open...\" dialogs. Default is the current "
+"directory."
+msgstr ""
+"Ubicació predeterminada per als diàlegs «Obre...». La predeterminada és el "
+"directori actual."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
+msgid "Default location for the \"Take Screenshot\" dialogs"
+msgstr "Ubicació predeterminada per als diàlegs «Feu una captura de pantalla»"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
+msgid ""
+"Default location for the \"Take Screenshot\" dialogs. Default is the "
+"Pictures directory."
+msgstr ""
+"Ubicació predeterminada per als diàlegs «Feu una captura de pantalla». La "
+"predeterminada és el directori d'imatges."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
+msgid "Whether to disable the plugins in the user's home directory"
+msgstr ""
+"Si s'han d'inhabilitar els connectors del directori d'inici de l'usuari"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
+msgid "Whether to disable the keyboard shortcuts"
+msgstr "Si s'han d'inhabilitar les dreceres de teclat"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
+msgid "Whether to autoload text subtitle files when a movie is loaded"
+msgstr ""
+"Si s'han de carregar automàticament els fitxers de subtítols quan es "
+"reprodueixi una pel·lícula"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
+msgid "Whether to autoload external chapter files when a movie is loaded"
+msgstr ""
+"Si s'han de carregar automàticament els fitxers de capítols externs quan es "
+"carrega una pel·lícula"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
+msgid ""
+"Whether to remember the position of played audio/video files when pausing or "
+"closing them"
+msgstr ""
+"Si s'ha de recordar la posició dels fitxers d'àudio/vídeo quan s'hi faci una "
+"pausa o es tanquin"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
+msgid "Active plugins list"
+msgstr "Llista dels connectors actius"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+msgid ""
+"A list of the names of the plugins which are currently active (loaded and "
+"running)."
+msgstr ""
+"Una llista dels noms dels connectors que estan actius actualment (carregats "
+"i en funcionament)."
+
 #: ../data/playlist.ui.h:1
 msgid "_Remove"
 msgstr "_Suprimeix"
@@ -44,11 +268,11 @@
 msgid "Copy the location to the clipboard"
 msgstr "Copia la ubicació al porta-retalls"
 
-#: ../data/playlist.ui.h:5 ../data/totem.ui.h:78
+#: ../data/playlist.ui.h:5 ../data/totem.ui.h:71
 msgid "_Select Text Subtitles..."
 msgstr "_Seleccioneu els subtítols de text..."
 
-#: ../data/playlist.ui.h:6 ../data/totem.ui.h:79
+#: ../data/playlist.ui.h:6 ../data/totem.ui.h:72
 msgid "Select a file to use for text subtitles"
 msgstr "Seleccioneu el fitxer que conté els subtítols"
 
@@ -72,42 +296,192 @@
 msgid "Move Down"
 msgstr "Mou avall"
 
-#: ../data/properties.ui.h:1 ../data/totem.ui.h:122
-msgid "General"
-msgstr "General"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:2
+msgid "Normal"
+msgstr "Normal"
 
-#: ../data/properties.ui.h:2
-msgid "Title:"
-msgstr "Títol:"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:4
+msgid "Large"
+msgstr "Gran"
 
-#: ../data/properties.ui.h:3
-msgid "Artist:"
-msgstr "Artista:"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:6
+msgid "Extra Large"
+msgstr "Extra gran"
 
-#: ../data/properties.ui.h:4
-msgid "Duration:"
-msgstr "Durada:"
+#: ../data/preferences.ui.h:7 ../src/backend/bacon-video-widget.c:5518
+#: ../src/totem-properties-view.c:232
+msgid "Stereo"
+msgstr "Estèreo"
 
-#: ../data/properties.ui.h:5
-msgid "Year:"
-msgstr "Any:"
+#: ../data/preferences.ui.h:8
+msgid "4-channel"
+msgstr "4 canals"
 
-#: ../data/properties.ui.h:6
-msgid "Album:"
-msgstr "Àlbum:"
+#: ../data/preferences.ui.h:9
+msgid "4.1-channel"
+msgstr "Canal 4.1"
 
-#: ../data/properties.ui.h:7
-msgid "Comment:"
-msgstr "Comentari:"
+#: ../data/preferences.ui.h:10
+msgid "5.0-channel"
+msgstr "Canal 5.0"
 
-#: ../data/properties.ui.h:8
-msgid "Container:"
-msgstr "Contenidor:"
+#: ../data/preferences.ui.h:11
+msgid "5.1-channel"
+msgstr "canal 5.1"
 
-#: ../data/properties.ui.h:9 ../data/totem.ui.h:128
-#: ../src/totem-properties-view.c:270
-msgid "Video"
-msgstr "Vídeo"
+#: ../data/preferences.ui.h:12
+msgid "AC3 Passthrough"
+msgstr "AC3 directe a la targeta de so"
+
+#: ../data/preferences.ui.h:13
+msgid "Totem Preferences"
+msgstr "Preferències del Totem"
+
+#: ../data/preferences.ui.h:14
+msgid "Playback"
+msgstr "Reprodueix"
+
+#: ../data/preferences.ui.h:15
+msgid "Start playing files from last position"
+msgstr "Inicia la reproducció dels fitxers des de l'última posició"
+
+#: ../data/preferences.ui.h:16
+msgid "Text Subtitles"
+msgstr "Subtítols"
+
+#: ../data/preferences.ui.h:17
+msgid "_Load subtitle files when movie is loaded"
+msgstr "_Carrega els fitxers de subtítols quan es carrega una pel·lícula"
+
+#: ../data/preferences.ui.h:18
+msgid "_Font:"
+msgstr "_Tipus de lletra:"
+
+#: ../data/preferences.ui.h:19
+msgid "_Encoding:"
+msgstr "_Codificació:"
+
+#: ../data/preferences.ui.h:20
+msgid "External Chapters"
+msgstr "Capítols externs"
+
+#: ../data/preferences.ui.h:21
+msgid "Load _chapter files when movie is loaded"
+msgstr "_Carrega els fitxers de capítols quan es carrega una pel·lícula"
+
+#: ../data/preferences.ui.h:22 ../data/properties.ui.h:1
+msgid "General"
+msgstr "General"
+
+#. Tab label in the Preferences dialogue
+#: ../data/preferences.ui.h:24
+msgid "Display"
+msgstr "Pantalla"
+
+#: ../data/preferences.ui.h:25
+msgid "_Resize the window when a new video is loaded"
+msgstr "_Redimensiona la finestra quan es carrega un vídeo nou"
+
+#: ../data/preferences.ui.h:26
+msgid "Disable _deinterlacing of interlaced videos"
+msgstr "Inhabilita el _desentrallaçat dels vídeos entrellaçats"
+
+#: ../data/preferences.ui.h:27
+msgid "Disable screensaver when playing "
+msgstr "Inhabilita l'estalvi de pantalla quan es reprodueixi "
+
+#: ../data/preferences.ui.h:28 ../data/properties.ui.h:9
+#: ../src/totem-properties-view.c:275
+msgid "Video"
+msgstr "Vídeo"
+
+#: ../data/preferences.ui.h:29
+msgid "Video or Audio"
+msgstr "Vídeo o àudio"
+
+#: ../data/preferences.ui.h:30
+msgid "Visual Effects"
+msgstr "Efectes visuals"
+
+#: ../data/preferences.ui.h:31
+msgid "Show _visual effects when an audio file is played"
+msgstr "Mostra efectes _visuals quan es reprodueix un fitxer d'àudio"
+
+#: ../data/preferences.ui.h:32
+msgid "_Type of visualization:"
+msgstr "_Tipus de visualització:"
+
+#: ../data/preferences.ui.h:33
+msgid "Visualization _size:"
+msgstr "Mida de la vi_sualització:"
+
+#: ../data/preferences.ui.h:34
+msgid "Color Balance"
+msgstr "Balanç del color"
+
+#: ../data/preferences.ui.h:35
+msgid "_Brightness:"
+msgstr "_Brillantor:"
+
+#: ../data/preferences.ui.h:36
+msgid "Co_ntrast:"
+msgstr "Co_ntrast:"
+
+#: ../data/preferences.ui.h:37
+msgid "Sat_uration:"
+msgstr "Sat_uració:"
+
+#: ../data/preferences.ui.h:38
+msgid "_Hue:"
+msgstr "_To:"
+
+#: ../data/preferences.ui.h:39
+msgid "Reset to _Defaults"
+msgstr "Torna als valors per _defecte"
+
+#: ../data/preferences.ui.h:40
+msgid "Audio Output"
+msgstr "Sortida d'àudio"
+
+#: ../data/preferences.ui.h:41
+msgid "_Audio output type:"
+msgstr "Tipus de sortid_a d'àudio:"
+
+#: ../data/preferences.ui.h:42 ../data/properties.ui.h:14
+#: ../src/totem-properties-view.c:273
+msgid "Audio"
+msgstr "Àudio"
+
+#: ../data/properties.ui.h:2
+msgid "Title:"
+msgstr "Títol:"
+
+#: ../data/properties.ui.h:3
+msgid "Artist:"
+msgstr "Artista:"
+
+#: ../data/properties.ui.h:4
+msgid "Duration:"
+msgstr "Durada:"
+
+#: ../data/properties.ui.h:5
+msgid "Year:"
+msgstr "Any:"
+
+#: ../data/properties.ui.h:6
+msgid "Album:"
+msgstr "Àlbum:"
+
+#: ../data/properties.ui.h:7
+msgid "Comment:"
+msgstr "Comentari:"
+
+#: ../data/properties.ui.h:8
+msgid "Container:"
+msgstr "Contenidor:"
 
 #: ../data/properties.ui.h:10
 msgid "Dimensions:"
@@ -125,11 +499,6 @@
 msgid "Bitrate:"
 msgstr "Velocitat de transmissió:"
 
-#: ../data/properties.ui.h:14 ../data/totem.ui.h:142
-#: ../src/totem-properties-view.c:268
-msgid "Audio"
-msgstr "Àudio"
-
 #: ../data/properties.ui.h:15
 msgid "Sample rate:"
 msgstr "Freqüència de mostratge:"
@@ -138,750 +507,445 @@
 msgid "Channels:"
 msgstr "Canals:"
 
-#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
-msgid "_Add to Playlist"
-msgstr "_Afegeix a la llista de reproducció"
-
-#: ../data/video-list.ui.h:2
-msgid "Add the video to the playlist"
-msgstr "Afegeix el vídeo a la llista de reproducció"
-
 #. Title
-#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:143
-#: ../src/totem-object.c:1667
-msgid "Movie Player"
-msgstr "Reproductor de pel·lícules"
+#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:80 ../src/totem.c:239
+#: ../src/totem.c:248 ../src/totem-menu.c:789 ../src/totem-object.c:1658
+msgid "Videos"
+msgstr "Vídeos"
 
 #: ../data/totem.desktop.in.in.in.h:2
-msgid "Play movies and songs"
-msgstr "Reproduïu vídeos i cançons"
+msgid "Play movies"
+msgstr "Reprodueix pel·lícules"
+
+#: ../data/totem.desktop.in.in.in.h:3
+msgid "Video;Movie;Film;Clip;Series;Player;DVD;TV;Disc;"
+msgstr "Vídeo;Pel·lícula;Film;Clip;Sèries;Reproductor;DVD;TV;Disc;"
 
 #: ../data/totem.ui.h:1
-msgid "_Movie"
-msgstr "_Pel·lícula"
+msgid "_Open"
+msgstr "_Obre"
 
 #: ../data/totem.ui.h:2
-msgid "_Open..."
-msgstr "_Obre..."
+msgid "Open _Location"
+msgstr "Obre una _ubicació"
 
 #: ../data/totem.ui.h:3
-msgid "Open a file"
-msgstr "Obre un fitxer"
+msgid "_Fullscreen"
+msgstr "Pantalla _completa"
 
 #: ../data/totem.ui.h:4
-msgid "Open _Location..."
-msgstr "Obre una _ubicació..."
+msgid "Prefere_nces"
+msgstr "_Preferències"
 
 #: ../data/totem.ui.h:5
-msgid "Open a non-local file"
-msgstr "Obre un fitxer de la xarxa"
+msgid "Shuff_le"
+msgstr "_Mescla"
 
 #: ../data/totem.ui.h:6
+msgid "_Repeat"
+msgstr "_Repeteix"
+
+#: ../data/totem.ui.h:7
+msgid "_Quit"
+msgstr "_Surt"
+
+#: ../data/totem.ui.h:8
+msgid "_Movie"
+msgstr "_Pel·lícula"
+
+#: ../data/totem.ui.h:9
 msgid "_Eject"
 msgstr "_Expulsa"
 
-#: ../data/totem.ui.h:7
+#: ../data/totem.ui.h:10
 msgid "Eject the current disc"
 msgstr "Expulsa el disc actual"
 
-#: ../data/totem.ui.h:8
+#: ../data/totem.ui.h:11
 msgid "_Properties"
 msgstr "_Propietats"
 
-#: ../data/totem.ui.h:9
+#: ../data/totem.ui.h:12
 msgid "View the properties of the current stream"
 msgstr "Visualitza les propietats del flux actual"
 
-#: ../data/totem.ui.h:10
+#: ../data/totem.ui.h:13
 msgid "Play / P_ause"
 msgstr "Reprodueix / Fes una p_ausa"
 
-#: ../data/totem.ui.h:11
+#: ../data/totem.ui.h:14
 msgid "Play or pause the movie"
 msgstr "Reprodueix o fes una pausa a la pel·lícula"
 
-#: ../data/totem.ui.h:12
-msgid "_Quit"
-msgstr "_Surt"
-
-#: ../data/totem.ui.h:13
-msgid "Quit the program"
-msgstr "Surt del programa"
-
-#: ../data/totem.ui.h:14
+#: ../data/totem.ui.h:15
 msgid "_Edit"
 msgstr "_Edita"
 
-#: ../data/totem.ui.h:15
+#: ../data/totem.ui.h:16
 msgid "_Clear Playlist"
 msgstr "_Neteja la llista de reproducció"
 
-#: ../data/totem.ui.h:16
+#: ../data/totem.ui.h:17
 msgid "Clear the playlist"
 msgstr "Neteja la llista de reproducció"
 
-#: ../data/totem.ui.h:17
-msgid "Prefere_nces"
-msgstr "_Preferències"
-
 #: ../data/totem.ui.h:18
-msgid "Configure the application"
-msgstr "Configureu l'aplicació"
-
-#: ../data/totem.ui.h:19
 msgid "Plugins..."
 msgstr "Connectors..."
 
-#: ../data/totem.ui.h:20
+#: ../data/totem.ui.h:19
 msgid "Configure plugins to extend the application"
 msgstr "Configureu els connectors per ampliar l'aplicació"
 
-#: ../data/totem.ui.h:21
+#: ../data/totem.ui.h:20
 msgid "_View"
 msgstr "_Visualitza"
 
-#: ../data/totem.ui.h:22
-msgid "_Fullscreen"
-msgstr "Pantalla _completa"
-
-#: ../data/totem.ui.h:23
-msgid "Switch to fullscreen"
-msgstr "Canvia a pantalla completa"
-
-#: ../data/totem.ui.h:24
+#: ../data/totem.ui.h:21
 msgid "Fit Window to Movie"
 msgstr "Ajusta la finestra a la pel·lícula"
 
-#: ../data/totem.ui.h:25
+#: ../data/totem.ui.h:22
 msgid "_Resize 1:2"
 msgstr "_Redimensiona a 1:2"
 
-#: ../data/totem.ui.h:26
+#: ../data/totem.ui.h:23
 msgid "Resize to half the original video size"
 msgstr "Redimensiona el vídeo a la meitat de la mida original"
 
-#: ../data/totem.ui.h:27
+#: ../data/totem.ui.h:24
 msgid "Resize _1:1"
 msgstr "Redimensiona a _1:1"
 
-#: ../data/totem.ui.h:28
+#: ../data/totem.ui.h:25
 msgid "Resize to the original video size"
 msgstr "Redimensiona el vídeo a la mida original"
 
-#: ../data/totem.ui.h:29
+#: ../data/totem.ui.h:26
 msgid "Resize _2:1"
 msgstr "Redimensiona a _2:1"
 
-#: ../data/totem.ui.h:30
+#: ../data/totem.ui.h:27
 msgid "Resize to double the original video size"
 msgstr "Redimensiona el vídeo al doble de la mida original"
 
-#: ../data/totem.ui.h:31
+#: ../data/totem.ui.h:28
 msgid "_Aspect Ratio"
 msgstr "Relació d'_aspecte"
 
-#: ../data/totem.ui.h:32
+#: ../data/totem.ui.h:29
 msgid "Switch An_gles"
 msgstr "Commuta els an_gles"
 
-#: ../data/totem.ui.h:33
+#: ../data/totem.ui.h:30
 msgid "Switch camera angles"
 msgstr "Commuta els angles de la càmera"
 
-#: ../data/totem.ui.h:34
+#: ../data/totem.ui.h:31
 msgid "_Go"
 msgstr "Vé_s"
 
-#: ../data/totem.ui.h:35
+#: ../data/totem.ui.h:32
 msgid "_DVD Menu"
 msgstr "Menú del _DVD"
 
-#: ../data/totem.ui.h:36
+#: ../data/totem.ui.h:33
 msgid "Go to the DVD menu"
 msgstr "Vés al menú del DVD"
 
-#: ../data/totem.ui.h:37
+#: ../data/totem.ui.h:34
 msgid "_Title Menu"
 msgstr "Menú del _títol"
 
-#: ../data/totem.ui.h:38
+#: ../data/totem.ui.h:35
 msgid "Go to the title menu"
 msgstr "Vés al menú del títol"
 
-#: ../data/totem.ui.h:39
+#: ../data/totem.ui.h:36
 msgid "A_udio Menu"
 msgstr "Menú d'à_udio"
 
-#: ../data/totem.ui.h:40
+#: ../data/totem.ui.h:37
 msgid "Go to the audio menu"
 msgstr "Vés al menú d'àudio"
 
-#: ../data/totem.ui.h:41
+#: ../data/totem.ui.h:38
 msgid "_Angle Menu"
 msgstr "Menú d'an_gle"
 
-#: ../data/totem.ui.h:42
+#: ../data/totem.ui.h:39
 msgid "Go to the angle menu"
 msgstr "Vés al menú d'angle"
 
-#: ../data/totem.ui.h:43
+#: ../data/totem.ui.h:40
 msgid "_Chapter Menu"
 msgstr "Menú dels _capítols"
 
-#: ../data/totem.ui.h:44
+#: ../data/totem.ui.h:41
 msgid "Go to the chapter menu"
 msgstr "Vés al menú dels capítols"
 
-#: ../data/totem.ui.h:45
+#: ../data/totem.ui.h:42
 msgid "_Next Chapter/Movie"
 msgstr "Capítol/pel·lícula _següent"
 
-#: ../data/totem.ui.h:46
+#: ../data/totem.ui.h:43
 msgid "Next chapter or movie"
 msgstr "Capítol o pel·lícula següent"
 
-#: ../data/totem.ui.h:47
+#: ../data/totem.ui.h:44
 msgid "_Previous Chapter/Movie"
 msgstr "Capítol/pel·lícula _anterior"
 
-#: ../data/totem.ui.h:48
+#: ../data/totem.ui.h:45
 msgid "Previous chapter or movie"
 msgstr "Capítol o pel·lícula anterior"
 
-#: ../data/totem.ui.h:49
+#: ../data/totem.ui.h:46
 msgid "_Sound"
 msgstr "S_o"
 
-#: ../data/totem.ui.h:50
+#: ../data/totem.ui.h:47
 msgid "Volume _Up"
 msgstr "_Apuja el volum"
 
-#: ../data/totem.ui.h:51
+#: ../data/totem.ui.h:48
 msgid "Increase volume"
 msgstr "Apuja el volum"
 
-#: ../data/totem.ui.h:52
+#: ../data/totem.ui.h:49
 msgid "Volume _Down"
 msgstr "A_baixa el volum"
 
-#: ../data/totem.ui.h:53
+#: ../data/totem.ui.h:50
 msgid "Decrease volume"
 msgstr "Abaixa el volum"
 
-#: ../data/totem.ui.h:54
+#: ../data/totem.ui.h:51
 msgid "_Help"
 msgstr "A_juda"
 
-#: ../data/totem.ui.h:55
+#: ../data/totem.ui.h:52
 msgid "_Contents"
 msgstr "_Continguts"
 
-#: ../data/totem.ui.h:56
+#: ../data/totem.ui.h:53
 msgid "Help contents"
 msgstr "Continguts de l'ajuda"
 
-#: ../data/totem.ui.h:57
+#: ../data/totem.ui.h:54
 msgid "_About"
 msgstr "_Quant a"
 
-#: ../data/totem.ui.h:58
+#: ../data/totem.ui.h:55
 msgid "About this application"
 msgstr "Quant a aquesta aplicació"
 
-#: ../data/totem.ui.h:59
-msgid "_Repeat Mode"
-msgstr "Mode de _repetició"
-
-#: ../data/totem.ui.h:60
-msgid "Set the repeat mode"
-msgstr "Activa el mode de repetició"
-
-#: ../data/totem.ui.h:61
-msgid "Shuff_le Mode"
-msgstr "Mode _aleatori"
-
-#: ../data/totem.ui.h:62
-msgid "Set the shuffle mode"
-msgstr "Activa el mode aleatori"
-
-#: ../data/totem.ui.h:63
+#: ../data/totem.ui.h:56
 msgid "Show _Controls"
 msgstr "Mostra els _controls"
 
-#: ../data/totem.ui.h:64
+#: ../data/totem.ui.h:57
 msgid "Show controls"
 msgstr "Mostra els controls"
 
-#: ../data/totem.ui.h:65
+#: ../data/totem.ui.h:58
 msgid "S_idebar"
 msgstr "_Barra lateral"
 
-#: ../data/totem.ui.h:66
+#: ../data/totem.ui.h:59
 msgid "Show or hide the sidebar"
 msgstr "Mostra o amaga la barra lateral"
 
-#: ../data/totem.ui.h:67
+#: ../data/totem.ui.h:60
 msgctxt "Aspect ratio"
 msgid "Auto"
 msgstr "Auto"
 
-#: ../data/totem.ui.h:68
+#: ../data/totem.ui.h:61
 msgid "Sets automatic aspect ratio"
 msgstr "Estableix la relació d'aspecte automàtica"
 
-#: ../data/totem.ui.h:69
+#: ../data/totem.ui.h:62
 msgid "Square"
 msgstr "Quadrat"
 
-#: ../data/totem.ui.h:70
+#: ../data/totem.ui.h:63
 msgid "Sets square aspect ratio"
 msgstr "Estableix la relació d'aspecte quadrada"
 
-#: ../data/totem.ui.h:71
+#: ../data/totem.ui.h:64
 msgid "4:3 (TV)"
 msgstr "4.3 (TV)"
 
-#: ../data/totem.ui.h:72
+#: ../data/totem.ui.h:65
 msgid "Sets 4:3 (TV) aspect ratio"
 msgstr "Estableix la relació d'aspecte a 4:3 (TV)"
 
-#: ../data/totem.ui.h:73
+#: ../data/totem.ui.h:66
 msgid "16:9 (Widescreen)"
 msgstr "16:9 (Pantalla ampla)"
 
-#: ../data/totem.ui.h:74
+#: ../data/totem.ui.h:67
 msgid "Sets 16:9 (widescreen) aspect ratio"
 msgstr "Estableix la relació d'aspecte a 16:9 (pantalla ampla)"
 
-#: ../data/totem.ui.h:75
+#: ../data/totem.ui.h:68
 msgid "2.11:1 (DVB)"
 msgstr "2.11:1 (DVB)"
 
-#: ../data/totem.ui.h:76
+#: ../data/totem.ui.h:69
 msgid "Sets 2.11:1 (DVB) aspect ratio"
 msgstr "Estableix la relació d'aspecte a 2.11:1 (DVB)"
 
-#: ../data/totem.ui.h:77
+#: ../data/totem.ui.h:70
 msgid "S_ubtitles"
 msgstr "S_ubtítols"
 
-#: ../data/totem.ui.h:80
+#: ../data/totem.ui.h:73
 msgid "_Languages"
 msgstr "_Idiomes"
 
-#: ../data/totem.ui.h:81
+#: ../data/totem.ui.h:74
 msgid "Zoom In"
 msgstr "Apropa"
 
-#: ../data/totem.ui.h:82
+#: ../data/totem.ui.h:75
 msgid "Zoom in"
 msgstr "Apropa"
 
-#: ../data/totem.ui.h:83
-msgid "Skip _Forward"
-msgstr "Salta en_davant"
-
-#: ../data/totem.ui.h:84
-msgid "Skip forward"
-msgstr "Salta endavant"
-
-#: ../data/totem.ui.h:85
-msgid "Skip _Backwards"
-msgstr "Salta _enrere"
-
-#: ../data/totem.ui.h:86
-msgid "Skip backwards"
-msgstr "Salta enrere"
-
-#: ../data/totem.ui.h:87
-msgid "14.4 Kbps Modem"
-msgstr "Mòdem a 14.4 Kbps"
-
-#: ../data/totem.ui.h:88
-msgid "19.2 Kbps Modem"
-msgstr "Mòdem a 19.2 Kbps"
-
-#: ../data/totem.ui.h:89
-msgid "28.8 Kbps Modem"
-msgstr "Mòdem a 28.8 Kbps"
-
-#: ../data/totem.ui.h:90
-msgid "33.6 Kbps Modem"
-msgstr "Mòdem a 33.6 Kbps"
-
-#: ../data/totem.ui.h:91
-msgid "34.4 Kbps Modem"
-msgstr "Mòdem a 34.4 Kbps"
-
-#: ../data/totem.ui.h:92
-msgid "56 Kbps Modem/ISDN"
-msgstr "Mòdem/XDSI a 56 Kbps"
-
-#: ../data/totem.ui.h:93
-msgid "112 Kbps Dual ISDN/DSL"
-msgstr "XDSI dual/DSL a 112 Kbps"
-
-#: ../data/totem.ui.h:94
-msgid "256 Kbps DSL/Cable"
-msgstr "DSL/Cable a 256 Kbps"
-
-#: ../data/totem.ui.h:95
-msgid "384 Kbps DSL/Cable"
-msgstr "DSL/Cable a 384 Kbps"
-
-#: ../data/totem.ui.h:96
-msgid "512 Kbps DSL/Cable"
-msgstr "DSL/Cable a 512 Kbps"
-
-#: ../data/totem.ui.h:97
-msgid "1.5 Mbps T1/Intranet/LAN"
-msgstr "T1/Intranet/LAN a 1.5 Mbps"
-
-#: ../data/totem.ui.h:98
-msgid "Intranet/LAN"
-msgstr "Intranet/LAN"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:100
-msgid "Normal"
-msgstr "Normal"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:102
-msgid "Large"
-msgstr "Gran"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:104
-msgid "Extra Large"
-msgstr "Extra gran"
-
-#: ../data/totem.ui.h:105 ../src/totem-properties-view.c:228
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5593
-msgid "Stereo"
-msgstr "Estèreo"
-
-#: ../data/totem.ui.h:106
-msgid "4-channel"
-msgstr "4 canals"
-
-#: ../data/totem.ui.h:107
-msgid "4.1-channel"
-msgstr "Canal 4.1"
-
-#: ../data/totem.ui.h:108
-msgid "5.0-channel"
-msgstr "Canal 5.0"
-
-#: ../data/totem.ui.h:109
-msgid "5.1-channel"
-msgstr "canal 5.1"
-
-#: ../data/totem.ui.h:110
-msgid "AC3 Passthrough"
-msgstr "AC3 directe a la targeta de so"
-
-#: ../data/totem.ui.h:111
-msgid "Totem Preferences"
-msgstr "Preferències del Totem"
-
-#: ../data/totem.ui.h:112
-msgid "Playback"
-msgstr "Reprodueix"
-
-#: ../data/totem.ui.h:113
-msgid "Start playing files from last position"
-msgstr "Inicia la reproducció dels fitxers des de l'última posició"
-
-#: ../data/totem.ui.h:114
-msgid "Networking"
-msgstr "Xarxa"
-
-#: ../data/totem.ui.h:115
-msgid "Connection _speed:"
-msgstr "_Velocitat de connexió:"
-
-#: ../data/totem.ui.h:116
-msgid "Text Subtitles"
-msgstr "Subtítols"
-
-#: ../data/totem.ui.h:117
-msgid "_Load subtitle files when movie is loaded"
-msgstr "_Carrega els fitxers de subtítols quan es carrega una pel·lícula"
-
-#: ../data/totem.ui.h:118
-msgid "_Font:"
-msgstr "_Tipus de lletra:"
-
-#: ../data/totem.ui.h:119
-msgid "_Encoding:"
-msgstr "_Codificació:"
-
-#: ../data/totem.ui.h:120
-msgid "External Chapters"
-msgstr "Capítols externs"
-
-#: ../data/totem.ui.h:121
-msgid "Load _chapter files when movie is loaded"
-msgstr "_Carrega els fitxers de capítols quan es carrega una pel·lícula"
-
-#. Tab label in the Preferences dialogue
-#: ../data/totem.ui.h:124
-msgid "Display"
-msgstr "Pantalla"
-
-#: ../data/totem.ui.h:125
-msgid "_Resize the window when a new video is loaded"
-msgstr "_Redimensiona la finestra quan es carrega un vídeo nou"
-
-#: ../data/totem.ui.h:126
-msgid "Disable _deinterlacing of interlaced videos"
-msgstr "Inhabilita el _desentrallaçat dels vídeos entrellaçats"
-
-#: ../data/totem.ui.h:127
-msgid "Disable screensaver when playing "
-msgstr "Inhabilita l'estalvi de pantalla quan es reprodueixi "
-
-#: ../data/totem.ui.h:129
-msgid "Video or Audio"
-msgstr "Vídeo o àudio"
-
-#: ../data/totem.ui.h:130
-msgid "Visual Effects"
-msgstr "Efectes visuals"
-
-#: ../data/totem.ui.h:131
-msgid "Show _visual effects when an audio file is played"
-msgstr "Mostra efectes _visuals quan es reprodueix un fitxer d'àudio"
-
-#: ../data/totem.ui.h:132
-msgid "_Type of visualization:"
-msgstr "_Tipus de visualització:"
-
-#: ../data/totem.ui.h:133
-msgid "Visualization _size:"
-msgstr "Mida de la vi_sualització:"
-
-#: ../data/totem.ui.h:134
-msgid "Color Balance"
-msgstr "Balanç del color"
-
-#: ../data/totem.ui.h:135
-msgid "_Brightness:"
-msgstr "_Brillantor:"
-
-#: ../data/totem.ui.h:136
-msgid "Co_ntrast:"
-msgstr "Co_ntrast:"
-
-#: ../data/totem.ui.h:137
-msgid "Sat_uration:"
-msgstr "Sat_uració:"
-
-#: ../data/totem.ui.h:138
-msgid "_Hue:"
-msgstr "_To:"
-
-#: ../data/totem.ui.h:139
-msgid "Reset to _Defaults"
-msgstr "Torna als valors per _defecte"
-
-#: ../data/totem.ui.h:140
-msgid "Audio Output"
-msgstr "Sortida d'àudio"
-
-#: ../data/totem.ui.h:141
-msgid "_Audio output type:"
-msgstr "Tipus de sortid_a d'àudio:"
-
-#: ../data/totem.ui.h:145
-msgid "Time seek bar"
-msgstr "Barra de cerca de temps"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
-msgid "Allow the screensaver to activate when playing audio"
-msgstr ""
-"Permet que s'activi l'estalvi de pantalla quan s'estigui reproduint àudio"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
-msgid ""
-"Allow the screensaver to activate when playing audio. Disable if you have "
-"monitor-powered speakers."
-msgstr ""
-"Permet que s'activi l'estalvi de pantalla quan s'estigui reproduint àudio. "
-"No ho habiliteu si teniu un monitor amb altaveus."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
-msgid "Show visual effects when no video is displayed"
-msgstr "Mostra efectes visuals quan no es mostri cap vídeo"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
-msgid "Show visual effects when playing an audio only file."
-msgstr "Mostra efectes visuals quan es reprodueixi un fitxer d'àudio."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
-msgid "Name of the visual effects plugin"
-msgstr "Nom del connector d'efectes visuals"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
-msgid "The brightness of the video"
-msgstr "La brillantor del vídeo"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
-msgid "The contrast of the video"
-msgstr "El contrast del vídeo"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
-msgid "The hue of the video"
-msgstr "El to del vídeo"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
-msgid "The saturation of the video"
-msgstr "La saturació del vídeo"
-
-# FIXME: "canvas" (josep)
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
-msgid "Resize the canvas automatically on file load"
-msgstr "Redimensiona el llenç automàticament en carregar un fitxer"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
-msgid "Network connection speed"
-msgstr "Velocitat de connexió a la xarxa"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
-msgid ""
-"Approximate network connection speed, used to select quality on media over "
-"the network."
-msgstr ""
-"Velocitat estimada de la connexió a la xarxa. S'utilitza per seleccionar la "
-"qualitat dels fitxers multimèdia a través de la xarxa."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
-msgid "Repeat mode"
-msgstr "Mode de repetició"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
-msgid "Shuffle mode"
-msgstr "Mode aleatori"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
-msgid "Whether to disable deinterlacing for interlaced movies"
-msgstr ""
-"Si s'ha d'inhabilitar el desentrallaçat de les pel·lícules entrellaçades"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
-msgid "Whether to enable debug for the playback engine"
-msgstr "Si s'ha d'habilitar la depuració per al motor de reproducció"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
-msgid "Type of audio output to use"
-msgstr "Tipus de sortida d'àudio a utilitzar"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
-msgid "Visualization quality setting"
-msgstr "Paràmetre de la qualitat de la visualització"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
-msgid "Quality setting for the audio visualization."
-msgstr "Paràmetre de qualitat per a la visualització d'àudio."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
-msgid "Network buffering threshold"
-msgstr "Llindar d'utilització de la memòria intermèdia de xarxa"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
-msgid ""
-"Amount of data to buffer for network streams before starting to display the "
-"stream (in seconds)."
-msgstr ""
-"Quantitat de dades (en segons) a emmagatzemar a la memòria intermèdia per "
-"als fluxos de la xarxa abans de començar-los a mostrar."
+#: ../data/totem.ui.h:76
+msgid "Skip _Forward"
+msgstr "Salta en_davant"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
-msgid "Subtitle font"
-msgstr "Tipus de lletra dels subtítols"
+#: ../data/totem.ui.h:77
+msgid "Skip forward"
+msgstr "Salta endavant"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
-msgid "Pango font description for subtitle rendering."
-msgstr ""
-"Descripció del tipus de lletra Pango per a la representació dels subtítols."
+#: ../data/totem.ui.h:78
+msgid "Skip _Backwards"
+msgstr "Salta _enrere"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
-msgid "Subtitle encoding"
-msgstr "Codificació dels subtítols"
+#: ../data/totem.ui.h:79
+msgid "Skip backwards"
+msgstr "Salta enrere"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
-msgid "Encoding character set for subtitle."
-msgstr "Codificació del joc de caràcters dels subtítols."
+#: ../data/totem.ui.h:82
+msgid "Time seek bar"
+msgstr "Barra de cerca de temps"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
-msgid "Default location for the \"Open...\" dialogs"
-msgstr "Ubicació predeterminada per als diàlegs «Obre...»"
+#: ../data/uri.ui.h:1
+msgid "Enter the _address of the file you would like to open:"
+msgstr "Introduïu l'_adreça del fitxer que vulgueu obrir:"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
-msgid ""
-"Default location for the \"Open...\" dialogs. Default is the current "
-"directory."
-msgstr ""
-"Ubicació predeterminada per als diàlegs «Obre...». La predeterminada és el "
-"directori actual."
+#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
+msgid "_Add to Playlist"
+msgstr "_Afegeix a la llista de reproducció"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
-msgid "Default location for the \"Take Screenshot\" dialogs"
-msgstr "Ubicació predeterminada per als diàlegs «Feu una captura de pantalla»"
+#: ../data/video-list.ui.h:2
+msgid "Add the video to the playlist"
+msgstr "Afegeix el vídeo a la llista de reproducció"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
-msgid ""
-"Default location for the \"Take Screenshot\" dialogs. Default is the "
-"Pictures directory."
-msgstr ""
-"Ubicació predeterminada per als diàlegs «Feu una captura de pantalla». La "
-"predeterminada és el directori d'imatges."
+#: ../src/backend/bacon-video-widget.c:1643
+msgid "Password requested for RTSP server"
+msgstr "El servidor de RTSP sol·licita la contrasenya"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
-msgid "Whether to disable the plugins in the user's home directory"
-msgstr ""
-"Si s'han d'inhabilitar els connectors del directori d'inici de l'usuari"
+#: ../src/backend/bacon-video-widget.c:2940
+#, c-format
+msgid "Audio Track #%d"
+msgstr "Pista d'àudio #%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
-msgid "Whether to disable the keyboard shortcuts"
-msgstr "Si s'han d'inhabilitar les dreceres de teclat"
+#: ../src/backend/bacon-video-widget.c:2944
+#, c-format
+msgid "Subtitle #%d"
+msgstr "Subtítol #%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
-msgid "Whether to autoload text subtitle files when a movie is loaded"
-msgstr ""
-"Si s'han de carregar automàticament els fitxers de subtítols quan es "
-"reprodueixi una pel·lícula"
+#: ../src/backend/bacon-video-widget.c:3341
+msgid "The server you are trying to connect to is not known."
+msgstr "Es desconeix el servidor al qual esteu intentant connectar."
+
+#: ../src/backend/bacon-video-widget.c:3344
+msgid "The connection to this server was refused."
+msgstr "S'ha refusat la connexió a aquest servidor."
+
+#: ../src/backend/bacon-video-widget.c:3347
+msgid "The specified movie could not be found."
+msgstr "No s'ha trobat la pel·lícula especificada."
+
+#: ../src/backend/bacon-video-widget.c:3354
+msgid "The server refused access to this file or stream."
+msgstr "El servidor ha rebutjat l'accés a aquest fitxer o flux."
+
+#: ../src/backend/bacon-video-widget.c:3360
+msgid "Authentication is required to access this file or stream."
+msgstr "Es requereix autenticació per a accedir a aquest fitxer o flux."
+
+#: ../src/backend/bacon-video-widget.c:3367
+msgid "You are not allowed to open this file."
+msgstr "No teniu permís per a obrir aquest fitxer."
+
+#: ../src/backend/bacon-video-widget.c:3372
+msgid "This location is not a valid one."
+msgstr "La ubicació no és vàlida."
+
+#: ../src/backend/bacon-video-widget.c:3380
+msgid "The movie could not be read."
+msgstr "No s'ha pogut llegir la pel·lícula."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
-msgid "Whether to autoload external chapter files when a movie is loaded"
+#. should be exactly one missing thing (source or converter)
+#: ../src/backend/bacon-video-widget.c:3403
+#: ../src/backend/bacon-video-widget.c:3411
+#, c-format
+msgid "The playback of this movie requires a %s plugin which is not installed."
+msgid_plural ""
+"The playback of this movie requires the following decoders which are not "
+"installed:\n"
+"\n"
+"%s"
+msgstr[0] ""
+"Hauríeu d'instal·lar el connector %s per reproduir aquesta pel·lícula."
+msgstr[1] ""
+"Hauríeu d'instal·lar els connectors següents per reproduir aquesta "
+"pel·lícula:\n"
+"\n"
+"%s"
+
+#: ../src/backend/bacon-video-widget.c:3422
+msgid ""
+"An audio or video stream is not handled due to missing codecs. You might "
+"need to install additional plugins to be able to play some types of movies"
 msgstr ""
-"Si s'han de carregar automàticament els fitxers de capítols externs quan es "
-"carrega una pel·lícula"
+"No es pot gestionar el flux d'àudio o de vídeo perquè manca algun còdec. "
+"Potser cal que instal·leu connectors addicionals per poder veure alguns "
+"tipus de pel·lícules"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+#: ../src/backend/bacon-video-widget.c:3432
 msgid ""
-"Whether to remember the position of played audio/video files when pausing or "
-"closing them"
+"This file cannot be played over the network. Try downloading it locally "
+"first."
 msgstr ""
-"Si s'ha de recordar la posició dels fitxers d'àudio/vídeo quan s'hi faci una "
-"pausa o es tanquin"
+"No es pot reproduir aquest fitxer a través de la xarxa. Proveu de baixar-lo "
+"al disc primer."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:35
-msgid "Active plugins list"
-msgstr "Llista dels connectors actius"
+#: ../src/backend/bacon-video-widget.c:5514 ../src/totem-properties-view.c:228
+msgid "Surround"
+msgstr "Envoltant"
+
+#: ../src/backend/bacon-video-widget.c:5516 ../src/totem-properties-view.c:230
+msgid "Mono"
+msgstr "Mono"
+
+#: ../src/backend/bacon-video-widget.c:5801
+msgid "Media contains no supported video streams."
+msgstr "El medi no conté cap flux de vídeo conegut."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:36
+#: ../src/backend/bacon-video-widget.c:5983
 msgid ""
-"A list of the names of the plugins which are currently active (loaded and "
-"running)."
+"Some necessary plug-ins are missing. Make sure that the program is correctly "
+"installed."
 msgstr ""
-"Una llista dels noms dels connectors que estan actius actualment (carregats "
-"i en funcionament)."
-
-#: ../data/uri.ui.h:1
-msgid "Enter the _address of the file you would like to open:"
-msgstr "Introduïu l'_adreça del fitxer que vulgueu obrir:"
+"Falten alguns connectors necessaris. Assegureu-vos que el programa està "
+"instal·lat correctament."
 
 #: ../src/eggdesktopfile.c:165
 #, c-format
@@ -949,8 +1013,8 @@
 #: ../src/eggfileformatchooser.c:657
 #, c-format
 msgid ""
-"The program was not able to find out the file format you want to use for `%"
-"s'. Please make sure to use a known extension for that file or manually "
+"The program was not able to find out the file format you want to use for `"
+"%s'. Please make sure to use a known extension for that file or manually "
 "choose a file format from the list below."
 msgstr ""
 "No s'ha pogut descobrir el format de fitxer que voleu utilitzar per a «%s». "
@@ -989,6 +1053,31 @@
 msgid "Show session management options"
 msgstr "Mostra les opcions de la gestió de la sessió"
 
+#. hour:minutes:seconds
+#. Translators: This is a time format, like "9:05:02" for 9
+#. * hours, 5 minutes, and 2 seconds. You may change ":" to
+#. * the separator that your locale uses or use "%Id" instead
+#. * of "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:56
+#: ../src/plugins/skipto/totem-time-entry.c:57
+#, c-format
+msgctxt "long time format"
+msgid "%d:%02d:%02d"
+msgstr "%d:%02d:%02d"
+
+#. minutes:seconds
+#. Translators: This is a time format, like "5:02" for 5
+#. * minutes and 2 seconds. You may change ":" to the
+#. * separator that your locale uses or use "%Id" instead of
+#. * "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:65
+#, c-format
+msgctxt "short time format"
+msgid "%d:%02d"
+msgstr "%d:%02d"
+
 #. Title
 #. Artist
 #. Album
@@ -1093,10 +1182,14 @@
 msgstr[0] "%d quadre per segon"
 msgstr[1] "%d quadres per segon"
 
-#: ../src/totem-audio-preview.c:168
+#: ../src/totem-audio-preview.c:137
 msgid "Audio Preview"
 msgstr "Previsualització d'àudio"
 
+#: ../src/totem.c:240
+msgid "Verify your system installation. Totem will now exit."
+msgstr "Verifiqueu la instal·lació del sistema. El Totem sortirà ara."
+
 #: ../src/totem-cell-renderer-video.c:126
 msgid "Unknown video"
 msgstr "Vídeo desconegut"
@@ -1109,7 +1202,7 @@
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: ../src/totem-fullscreen.c:616
+#: ../src/totem-fullscreen.c:573
 msgid "No File"
 msgstr "Cap fitxer"
 
@@ -1127,7 +1220,7 @@
 msgid "Make sure that Totem is properly installed."
 msgstr "Assegureu-vos que el Totem està instal·lat correctament."
 
-#: ../src/totem-interface.c:347
+#: ../src/totem-interface.c:357
 msgid ""
 "Totem 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 "
@@ -1139,7 +1232,7 @@
 "per la Free Software Foundation; ja sigui la versió 2 de la llicència o bé "
 "(si ho preferiu) qualsevol altra versió posterior."
 
-#: ../src/totem-interface.c:351
+#: ../src/totem-interface.c:361
 msgid ""
 "Totem is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -1151,7 +1244,7 @@
 "PER UN PROPÒSIT PARTICULAR. Vegeu la Llicència Pública General de GNU per "
 "obtenir-ne més detalls."
 
-#: ../src/totem-interface.c:355
+#: ../src/totem-interface.c:365
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Totem; if not, write to the Free Software Foundation, Inc., 59 Temple Place, "
@@ -1161,7 +1254,7 @@
 "juntament amb el Totem; en cas contrari, escriviu a la Free Software "
 "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA"
 
-#: ../src/totem-interface.c:358
+#: ../src/totem-interface.c:368
 msgid ""
 "Totem contains an exception to allow the use of proprietary GStreamer "
 "plugins."
@@ -1170,204 +1263,98 @@
 "propietat."
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:190
+#: ../src/totem-menu.c:291
 msgid "None"
 msgstr "Cap"
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:195
+#: ../src/totem-menu.c:296
 msgctxt "Language"
 msgid "Auto"
 msgstr "Auto"
 
-#. Translators:
-#. * This is not a JPEG image, but a disc image, for example,
-#. * an ISO file
-#: ../src/totem-menu.c:765
-#, c-format
-msgid "Play Image '%s'"
-msgstr "Reprodueix la imatge «%s»"
-
-#: ../src/totem-menu.c:768 ../src/totem-menu.c:851
-#, c-format
-msgid "device%d"
-msgstr "dispositiu%d"
-
-#: ../src/totem-menu.c:848
-#, c-format
-msgid "Play Disc '%s'"
-msgstr "Reprodueix el disc «%s»"
-
-#. This lists the back-end type and version, such as
-#. * Movie Player using GStreamer 0.10.1
-#: ../src/totem-menu.c:1189
-#, c-format
-msgid "Movie Player using %s"
-msgstr "Reproductor de vídeo que utilitza el %s"
-
-#: ../src/totem-menu.c:1193
+#: ../src/totem-menu.c:788
 msgid "Copyright © 2002-2009 Bastien Nocera"
 msgstr "Copyright © 2002-2009 Bastien Nocera"
 
-#: ../src/totem-menu.c:1198
+#: ../src/totem-menu.c:792
 msgid "translator-credits"
 msgstr ""
 "Jordi Mallach \n"
 "Gil Forcada "
 
-#: ../src/totem-menu.c:1202
+#: ../src/totem-menu.c:796
 msgid "Totem Website"
 msgstr "Pàgina web del Totem"
 
-#: ../src/totem-menu.c:1236
+#: ../src/totem-menu.c:827
 msgid "Configure Plugins"
 msgstr "Configura els connectors"
 
+#: ../src/totem-object.c:162
+#, c-format
+msgid ""
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"%s\n"
+"Executeu «%s --help» per veure una llista completa de les opcions de la "
+"línia d'ordres.\n"
+
 #. Translators: %s is the totem version number
-#: ../src/totem-object.c:471
+#: ../src/totem-object.c:591
 #, c-format
 msgid "Totem %s"
 msgstr "Totem %s"
 
-#: ../src/totem-object.c:1047 ../browser-plugin/totem-plugin-viewer.c:367
-msgid "Playing"
-msgstr "S'està reproduint"
-
-#: ../src/totem-object.c:1049 ../src/totem-options.c:52
+#: ../src/totem-object.c:1168 ../src/totem-options.c:52
 msgid "Pause"
 msgstr "Fes una pausa"
 
-#: ../src/totem-object.c:1054 ../browser-plugin/totem-plugin-viewer.c:363
-msgid "Paused"
-msgstr "En pausa"
-
-#: ../src/totem-object.c:1056 ../src/totem-object.c:1066
+#: ../src/totem-object.c:1175 ../src/totem-object.c:1185
 #: ../src/totem-options.c:51
 msgid "Play"
 msgstr "Reprodueix"
 
-#: ../src/totem-object.c:1061 ../src/totem-object.c:1659
-#: ../src/totem-statusbar.c:115 ../browser-plugin/totem-plugin-viewer.c:351
-msgid "Stopped"
-msgstr "Aturat"
-
-#: ../src/totem-object.c:1142 ../src/totem-object.c:1169
-#: ../src/totem-object.c:1799 ../src/totem-object.c:1963
+#: ../src/totem-object.c:1267 ../src/totem-object.c:1294
+#: ../src/totem-object.c:1787 ../src/totem-object.c:1942
 #, c-format
 msgid "Totem could not play '%s'."
 msgstr "El Totem no ha pogut reproduir «%s»."
 
-#: ../src/totem-object.c:1246
-#, c-format
-msgid ""
-"Totem could not play this media (%s) although a plugin is present to handle "
-"it."
-msgstr ""
-"El Totem no ha pogut reproduir aquest medi (%s) encara que hi ha un "
-"connector per gestionar-lo."
-
-#: ../src/totem-object.c:1247
-msgid ""
-"You might want to check that a disc is present in the drive and that it is "
-"correctly configured."
-msgstr ""
-"Hauríeu de comprovar que hi ha un disc en la unitat i que està correctament "
-"configurada."
-
-#: ../src/totem-object.c:1255
-msgid "More information about media plugins"
-msgstr "Més informació sobre els connectors de medi"
-
-#: ../src/totem-object.c:1256
-msgid ""
-"Please install the necessary plugins and restart Totem to be able to play "
-"this media."
-msgstr ""
-"Instal·leu els connectors necessaris i reinicieu el Totem per poder "
-"reproduir aquest medi."
-
-#: ../src/totem-object.c:1258
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because it does not have the "
-"appropriate plugins to be able to read from the disc."
-msgstr ""
-"El Totem no pot reproduir aquest tipus de medi (%s) perquè no té els "
-"connectors adequats per poder llegir-lo del disc."
-
-#: ../src/totem-object.c:1260
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because you do not have the "
-"appropriate plugins to handle it."
-msgstr ""
-"El Totem no pot reproduir aquest tipus de medi (%s) perquè no teniu el "
-"connector adequat per gestionar-lo."
-
-#: ../src/totem-object.c:1263
-#, c-format
-msgid "Totem cannot play this type of media (%s) because it is not supported."
-msgstr ""
-"El Totem no pot reproduir aquest tipus de medi (%s) perquè no el sap "
-"utilitzar."
-
-#: ../src/totem-object.c:1264
-msgid "Please insert another disc to play back."
-msgstr "Inseriu un altre disc a reproduir."
-
-#: ../src/totem-object.c:1300
-msgid "Totem was not able to play this disc."
-msgstr "El Totem no pot reproduir aquest disc."
-
-#: ../src/totem-object.c:1301 ../src/totem-object.c:4229
-msgid "No reason."
-msgstr "Sense motiu."
-
-#: ../src/totem-object.c:1315
-msgid "Totem does not support playback of Audio CDs"
-msgstr "El Totem no sap reproduir els CD d'àudio"
-
-#: ../src/totem-object.c:1316
-msgid "Please consider using a music player or a CD extractor to play this CD"
-msgstr ""
-"Podeu utilitzar un reproductor de música o un extractor de CD per reproduir-"
-"lo"
-
-#: ../src/totem-object.c:1805
+#: ../src/totem-object.c:1793
 msgid "No error message"
 msgstr "No hi ha cap missatge d'error"
 
-#: ../src/totem-object.c:2154
+#: ../src/totem-object.c:2133
 msgid "Totem could not display the help contents."
 msgstr "El Totem no ha pogut mostrar els continguts de l'ajuda."
 
-#: ../src/totem-object.c:2493 ../src/totem-object.c:2495
-#: ../browser-plugin/totem-plugin-viewer.c:1417
-msgid "An error occurred"
-msgstr "S'ha produït un error"
-
-#: ../src/totem-object.c:4064 ../src/totem-object.c:4066
+#: ../src/totem-object.c:4019 ../src/totem-object.c:4021
 msgid "Previous Chapter/Movie"
 msgstr "Capítol/pel·lícula anterior"
 
-#: ../src/totem-object.c:4073 ../src/totem-object.c:4075
+#: ../src/totem-object.c:4028 ../src/totem-object.c:4030
 msgid "Play / Pause"
 msgstr "Reprodueix / Fes una pausa"
 
-#: ../src/totem-object.c:4083 ../src/totem-object.c:4085
+#: ../src/totem-object.c:4038 ../src/totem-object.c:4040
 msgid "Next Chapter/Movie"
 msgstr "Capítol/pel·lícula següent"
 
-#. Translators: this is the tooltip text for the fullscreen button in the controls box in Totem's main window.
 #. Translators: this is the accessibility text for the fullscreen button in the controls box in Totem's main window.
-#: ../src/totem-object.c:4097 ../src/totem-object.c:4099
+#: ../src/totem-object.c:4051 ../src/totem-object.c:4053
 msgid "Fullscreen"
 msgstr "Pantalla completa"
 
-#: ../src/totem-object.c:4229
+#: ../src/totem-object.c:4184
 msgid "Totem could not startup."
 msgstr "No s'ha pogut executar el Totem."
 
+#: ../src/totem-object.c:4184
+msgid "No reason."
+msgstr "Sense motiu."
+
 #: ../src/totem-open-location.c:182
 msgid "Open Location..."
 msgstr "Obre una ubicació..."
@@ -1441,118 +1428,112 @@
 msgid "Movies to play"
 msgstr "Pel·lícules a reproduir"
 
-#: ../src/totem-options.c:117
+#: ../src/totem-options.c:79
+msgid "- Play movies and songs"
+msgstr "- Reproduïu vídeos i cançons"
+
+#: ../src/totem-options.c:142
 msgid "Can't enqueue and replace at the same time"
 msgstr "No es pot enviar a la cua i reemplaçar alhora"
 
 #. By extension entry
-#: ../src/totem-playlist.c:161
+#: ../src/totem-playlist.c:162
 msgid "MP3 ShoutCast playlist"
 msgstr "Llista de reproducció MP3 ShoutCast"
 
-#: ../src/totem-playlist.c:162
+#: ../src/totem-playlist.c:163
 msgid "MP3 audio (streamed)"
 msgstr "Àudio MP3 (en flux)"
 
-#: ../src/totem-playlist.c:163
+#: ../src/totem-playlist.c:164
 msgid "MP3 audio (streamed, DOS format)"
 msgstr "Àudio MP3 (en flux, format DOS)"
 
-#: ../src/totem-playlist.c:164
+#: ../src/totem-playlist.c:165
 msgid "XML Shareable Playlist"
 msgstr "Llista de reproducció XML per compartir"
 
 #. This is "Title 3", where title is a DVD title
 #. * Note: NOT a DVD chapter
-#: ../src/totem-playlist.c:347
+#: ../src/totem-playlist.c:348
 #, c-format
 msgid "Title %d"
 msgstr "Títol %d"
 
-#: ../src/totem-playlist.c:446
+#: ../src/totem-playlist.c:447
 msgid "Could not save the playlist"
 msgstr "No s'ha pogut desar la llista de reproducció"
 
-#: ../src/totem-playlist.c:1021
+#: ../src/totem-playlist.c:1022
 msgid "Save Playlist"
 msgstr "Desa la llista de reproducció"
 
 #. translators: Playlist is the default saved playlist filename,
 #. * without the suffix
-#: ../src/totem-playlist.c:1033 ../src/totem-playlist.c:1264
-#: ../src/totem-sidebar.c:142
+#: ../src/totem-playlist.c:1034 ../src/totem-playlist.c:1263
+#: ../src/totem-sidebar.c:145
 msgid "Playlist"
 msgstr "Llista de reproducció"
 
-#: ../src/totem-playlist.c:1857
+#: ../src/totem-playlist.c:1862
 #, c-format
 msgid "The playlist '%s' could not be parsed. It might be damaged."
 msgstr ""
 "No s'ha pogut analitzar la llista de reproducció «%s», pot estar malmesa."
 
-#: ../src/totem-playlist.c:1858
+#: ../src/totem-playlist.c:1863
 msgid "Playlist error"
 msgstr "S'ha produït un error de la llista de reproducció"
 
-#: ../src/totem-preferences.c:295
+#: ../src/totem-preferences.c:297
 msgid "Preferences"
 msgstr "Preferències"
 
-#: ../src/totem-preferences.c:451
+#: ../src/totem-preferences.c:445
 msgid "Select Subtitle Font"
 msgstr "Seleccioneu el tipus de lletra per als subtítols"
 
-#: ../src/totem-properties-main.c:115 ../src/totem-properties-view.c:266
+#: ../src/totem-properties-main.c:116 ../src/totem-properties-view.c:271
 msgid "Audio/Video"
 msgstr "Àudio/Vídeo"
 
-#: ../src/totem-properties-view.c:128
+#: ../src/totem-properties-view.c:131
 msgid "N/A"
 msgstr "N/D"
 
-#: ../src/totem-properties-view.c:157
+#: ../src/totem-properties-view.c:160
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 msgctxt "Stream bit rate"
 msgid "N/A"
 msgstr "N/D"
 
-#: ../src/totem-properties-view.c:160
+#: ../src/totem-properties-view.c:163
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 #, c-format
 msgid "%d kbps"
 msgstr "%d Kbps"
 
-#: ../src/totem-properties-view.c:177
+#: ../src/totem-properties-view.c:180
 #: ../src/plugins/properties/totem-movie-properties.c:149
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../src/totem-properties-view.c:209
+#: ../src/totem-properties-view.c:212
 #: ../src/plugins/properties/totem-movie-properties.c:166
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: ../src/totem-properties-view.c:216
+#: ../src/totem-properties-view.c:220
 #: ../src/plugins/properties/totem-movie-properties.c:166
 msgctxt "Sample rate"
 msgid "N/A"
 msgstr "N/D"
 
-#: ../src/totem-properties-view.c:224
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5589
-msgid "Surround"
-msgstr "Envoltant"
-
-#: ../src/totem-properties-view.c:226
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5591
-msgid "Mono"
-msgstr "Mono"
-
-#: ../src/totem-properties-view.c:236
+#: ../src/totem-properties-view.c:241
 msgctxt "Number of audio channels"
 msgid "N/A"
 msgstr "N/D"
@@ -1585,8 +1566,8 @@
 #. eg: 75 %
 #: ../src/totem-statusbar.c:250
 #, c-format
-msgid "%d %%"
-msgstr "%d%%"
+msgid "%lf %%"
+msgstr "%lf %%"
 
 #. eg: Paused, 0:32 / 1:05
 #: ../src/totem-statusbar.c:325
@@ -1597,8 +1578,8 @@
 #. eg: Buffering, 75 %
 #: ../src/totem-statusbar.c:330
 #, c-format
-msgid "%s, %d %%"
-msgstr "%s, %d %%"
+msgid "%s, %f %%"
+msgstr "%s, %f %%"
 
 #: ../src/totem-subtitle-encoding.c:156
 msgid "Current Locale"
@@ -1726,243 +1707,107 @@
 msgstr "Turc"
 
 #: ../src/totem-subtitle-encoding.c:306 ../src/totem-subtitle-encoding.c:308
-#: ../src/totem-subtitle-encoding.c:310 ../src/totem-subtitle-encoding.c:312
-#: ../src/totem-subtitle-encoding.c:314
-msgid "Unicode"
-msgstr "Unicode"
-
-#: ../src/totem-subtitle-encoding.c:317 ../src/totem-subtitle-encoding.c:319
-#: ../src/totem-subtitle-encoding.c:321 ../src/totem-subtitle-encoding.c:323
-#: ../src/totem-subtitle-encoding.c:325
-msgid "Western"
-msgstr "Occidental"
-
-#: ../src/totem-subtitle-encoding.c:328 ../src/totem-subtitle-encoding.c:330
-#: ../src/totem-subtitle-encoding.c:332
-msgid "Vietnamese"
-msgstr "Vietnamita"
-
-#: ../src/totem-video-list.c:330
-msgid "No video URI"
-msgstr "No hi ha cap URI de vídeo"
-
-#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
-#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
-#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
-#: ../src/totem-video-thumbnailer.c:872
-#, c-format
-msgid ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-msgstr ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-
-#: ../src/totem-video-thumbnailer.c:873
-msgid "Filename"
-msgstr "Nom del fitxer"
+#: ../src/totem-subtitle-encoding.c:310 ../src/totem-subtitle-encoding.c:312
+#: ../src/totem-subtitle-encoding.c:314
+msgid "Unicode"
+msgstr "Unicode"
 
-#: ../src/totem-video-thumbnailer.c:875
-msgid "Resolution"
-msgstr "Resolució"
+#: ../src/totem-subtitle-encoding.c:317 ../src/totem-subtitle-encoding.c:319
+#: ../src/totem-subtitle-encoding.c:321 ../src/totem-subtitle-encoding.c:323
+#: ../src/totem-subtitle-encoding.c:325
+msgid "Western"
+msgstr "Occidental"
 
-#: ../src/totem-video-thumbnailer.c:878
-msgid "Duration"
-msgstr "Durada"
+#: ../src/totem-subtitle-encoding.c:328 ../src/totem-subtitle-encoding.c:330
+#: ../src/totem-subtitle-encoding.c:332
+msgid "Vietnamese"
+msgstr "Vietnamita"
 
-#: ../src/totem-uri.c:506 ../src/plugins/chapters/totem-chapters.c:998
+#: ../src/totem-uri.c:343 ../src/plugins/chapters/totem-chapters.c:998
 msgid "All files"
 msgstr "Tots els fitxers"
 
-#: ../src/totem-uri.c:511 ../src/plugins/chapters/totem-chapters.c:995
+#: ../src/totem-uri.c:348 ../src/plugins/chapters/totem-chapters.c:995
 msgid "Supported files"
 msgstr "Fitxers permesos"
 
-#: ../src/totem-uri.c:523
+#: ../src/totem-uri.c:360
 msgid "Audio files"
 msgstr "Fitxers d'àudio"
 
-#: ../src/totem-uri.c:531
+#: ../src/totem-uri.c:368
 msgid "Video files"
 msgstr "Fitxers de vídeo"
 
-#: ../src/totem-uri.c:541
+#: ../src/totem-uri.c:378
 msgid "Subtitle files"
 msgstr "Fitxers de subtítols"
 
-#: ../src/totem-uri.c:593
+#: ../src/totem-uri.c:430
 msgid "Select Text Subtitles"
 msgstr "Seleccioneu els subtítols"
 
-#: ../src/totem-uri.c:656
+#: ../src/totem-uri.c:495
 msgid "Select Movies or Playlists"
 msgstr "Seleccioneu pel·lícules o llistes de reproducció"
 
-#. Options parsing
-#: ../src/totem.c:204
-msgid "- Play movies and songs"
-msgstr "- Reproduïu vídeos i cançons"
-
-#: ../src/totem.c:220
-#, c-format
-msgid ""
-"%s\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"%s\n"
-"Executeu «%s --help» per veure una llista completa de les opcions de la línia "
-"d'ordres.\n"
-
-#: ../src/totem.c:262 ../src/totem.c:273
-#: ../browser-plugin/totem-plugin-viewer.c:663
-#: ../browser-plugin/totem-plugin-viewer.c:1793
-msgid "Totem Movie Player"
-msgstr "Reproductor de vídeo Totem"
-
-#: ../src/totem.c:263 ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Could not initialize the thread-safe libraries."
-msgstr "No s'han pogut inicialitzar les biblioteques que permeten fils segurs."
-
-#: ../src/totem.c:263
-msgid "Verify your system installation. Totem will now exit."
-msgstr "Verifiqueu la instal·lació del sistema. El Totem sortirà ara."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:1589
-msgid "Password requested for RTSP server"
-msgstr "El servidor de RTSP sol·licita la contrasenya"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2858
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2862
-#, c-format
-msgid "Audio Track #%d"
-msgstr "Pista d'àudio #%d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2890
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2894
-#, c-format
-msgid "Subtitle #%d"
-msgstr "Subtítol #%d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3298
-msgid ""
-"The requested audio output was not found. Please select another audio output "
-"in the Multimedia Systems Selector."
-msgstr ""
-"No s'ha trobat la sortida d'àudio demanada. Seleccioneu una altra sortida "
-"d'àudio en el selector de sistemes multimèdia."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3303
-msgid "Location not found."
-msgstr "No s'ha trobat la ubicació."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3307
-msgid ""
-"Could not open location; you might not have permission to open the file."
-msgstr ""
-"No s'ha pogut obrir la ubicació. Potser no teniu permís per obrir el fitxer."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3318
-msgid ""
-"The video output is in use by another application. Please close other video "
-"applications, or select another video output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"Una altra aplicació ja utilitza la sortida de vídeo. Tanqueu les altres "
-"aplicacions de vídeo, o seleccioneu una altra sortida de vídeo al selector "
-"de sistemes multimèdia."
+#: ../src/totem-uri.c:499
+msgid "Add Directory"
+msgstr "Afegiu un directori"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3324
-msgid ""
-"The audio output is in use by another application. Please select another "
-"audio output in the Multimedia Systems Selector. You may want to consider "
-"using a sound server."
-msgstr ""
-"Una altra aplicació ja utilitza la sortida d'àudio. Seleccioneu una altra "
-"sortida d'àudio al selector de sistemes multimèdia. Potser hauríeu de "
-"considerar utilitzar un servidor de so."
+#: ../src/totem-video-list.c:330
+msgid "No video URI"
+msgstr "No hi ha cap URI de vídeo"
 
-#. should be exactly one missing thing (source or converter)
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3342
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3348
+#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
+#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
+#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
+#: ../src/totem-video-thumbnailer.c:841
 #, c-format
-msgid "The playback of this movie requires a %s plugin which is not installed."
-msgid_plural ""
-"The playback of this movie requires the following decoders which are not "
-"installed:\n"
-"\n"
-"%s"
-msgstr[0] ""
-"Hauríeu d'instal·lar el connector %s per reproduir aquesta pel·lícula."
-msgstr[1] ""
-"Hauríeu d'instal·lar els connectors següents per reproduir aquesta "
-"pel·lícula:\n"
-"\n"
-"%s"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3374
 msgid ""
-"Cannot play this file over the network. Try downloading it to disk first."
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 msgstr ""
-"No es pot reproduir aquest fitxer a través de la xarxa. Proveu de baixar-lo "
-"al disc primer."
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5878
-msgid "Media contains no supported video streams."
-msgstr "El medi no conté cap flux de vídeo conegut."
+#: ../src/totem-video-thumbnailer.c:842
+msgid "Filename"
+msgstr "Nom del fitxer"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6053
-msgid ""
-"Failed to create a GStreamer play object. Please check your GStreamer "
-"installation."
-msgstr ""
-"No s'ha pogut crear un objecte de reproducció del GStreamer. Comproveu la "
-"instal·lació del GStreamer."
+#: ../src/totem-video-thumbnailer.c:844
+msgid "Resolution"
+msgstr "Resolució"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6173
-msgid ""
-"Failed to open audio output. You may not have permission to open the sound "
-"device, or the sound server may not be running. Please select another audio "
-"output in the Multimedia Systems Selector."
-msgstr ""
-"No s'ha pogut obrir la sortida d'àudio. Pot ser que no tingueu permís per "
-"obrir el dispositiu d'àudio, o que el servidor de so no s'estigui executant. "
-"Seleccioneu una altra sortida de so al selector de sistemes multimèdia."
+#: ../src/totem-video-thumbnailer.c:847
+msgid "Duration"
+msgstr "Durada"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6193
-msgid ""
-"Could not find the audio output. You may need to install additional "
-"GStreamer plugins, or select another audio output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"No s'ha trobat la sortida d'àudio. Pot ser que hàgiu d'instal·lar connectors "
-"del GStreamer addicionals, o bé seleccionar una altra sortida d'àudio al "
-"selector de sistemes multimèdia."
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:1
+msgid "Apple Trailers"
+msgstr "Apple Trailers"
+
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:2
+msgid "Sets the user agent for the Apple Trailers site"
+msgstr "Estableix l'agent d'usuari pel lloc web de l'Apple Trailers"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:1
+msgid "Autoload Subtitles"
+msgstr "Carrega automàticament els subtítols"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:2
+msgid "Autoloads text subtitles"
+msgstr "Carrega automàticament els subtítols de text"
 
-#. hour:minutes:seconds
-#. Translators: This is a time format, like "9:05:02" for 9
-#. * hours, 5 minutes, and 2 seconds. You may change ":" to
-#. * the separator that your locale uses or use "%Id" instead
-#. * of "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:83 ../src/plugins/skipto/totem-time-entry.c:57
-#, c-format
-msgctxt "long time format"
-msgid "%d:%02d:%02d"
-msgstr "%d:%02d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
+msgid "Video Disc Recorder"
+msgstr "Enregistrador de discs de vídeo"
 
-#. minutes:seconds
-#. Translators: This is a time format, like "5:02" for 5
-#. * minutes and 2 seconds. You may change ":" to the
-#. * separator that your locale uses or use "%Id" instead of
-#. * "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:92
-#, c-format
-msgctxt "short time format"
-msgid "%d:%02d"
-msgstr "%d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
+msgid "Records (S)VCDs or video DVDs"
+msgstr "Enregistra (S)VCD o DVD de vídeo"
 
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:65
 msgid "_Create Video Disc..."
@@ -1988,38 +1833,21 @@
 msgid "Copy the currently playing (S)VCD"
 msgstr "Copia el (S)VCD que s'està reproduint"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:129
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:136
 msgid "The video disc could not be duplicated."
 msgstr "No s'ha pogut duplicar el disc de vídeo."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:131
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:276
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:138
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:283
 msgid "The movie could not be recorded."
 msgstr "No s'ha pogut enregistrar la pel·lícula."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:157
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:167
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:263
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:164
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:174
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:270
 msgid "Unable to write a project."
 msgstr "No s'ha pogut escriure un projecte."
 
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
-msgid "Video Disc Recorder"
-msgstr "Enregistrador de discs de vídeo"
-
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
-msgid "Records (S)VCDs or video DVDs"
-msgstr "Enregistra (S)VCD o DVD de vídeo"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:1
-#: ../src/plugins/chapters/totem-chapters.c:1139
-msgid "Chapters"
-msgstr "Capítols"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:2
-msgid "Support chapter markers in movies."
-msgstr "Permet posar marcadors de capítols a les pel·lícules."
-
 #: ../src/plugins/chapters/chapters-edit.ui.h:1
 msgid "Name for new chapter:"
 msgstr "El nom del capítol nou:"
@@ -2076,6 +1904,15 @@
 msgid "Create a new chapter list for the movie"
 msgstr "Crea una llista de capítols nova per a la pel·lícula"
 
+#: ../src/plugins/chapters/chapters.plugin.in.h:1
+#: ../src/plugins/chapters/totem-chapters.c:1139
+msgid "Chapters"
+msgstr "Capítols"
+
+#: ../src/plugins/chapters/chapters.plugin.in.h:2
+msgid "Support chapter markers in movies"
+msgstr "Permet posar marcadors de capítols a les pel·lícules"
+
 #: ../src/plugins/chapters/totem-chapters.c:56
 #, c-format
 msgid ""
@@ -2183,15 +2020,37 @@
 msgid "The URI ‘%s’ is not supported."
 msgstr "L'URI «%s» no és compatible."
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
-msgid "Instant Messenger status"
-msgstr "Estat en la missatgeria instantània"
+#: ../src/plugins/grilo/grilo.plugin.in.h:1
+msgid "Grilo Browser"
+msgstr "Navegador Grilo"
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
-msgid "Set your Instant Messenger status to away when a movie is playing"
-msgstr ""
-"Estableix l'estat d'absència en la missatgeria instantània quan s'estigui "
-"reproduint una pel·lícula"
+#: ../src/plugins/grilo/grilo.plugin.in.h:2
+msgid "A plugin to let you browse media content from various sources"
+msgstr "Un connector que us permet navegar per continguts de diverses fonts"
+
+#: ../src/plugins/grilo/grilo.ui.h:1
+msgid "Add to Playlist"
+msgstr "Afegeix a la llista de reproducció"
+
+#: ../src/plugins/grilo/grilo.ui.h:2
+msgid "Copy Location"
+msgstr "Copia la ubicació"
+
+#: ../src/plugins/grilo/grilo.ui.h:3 ../src/plugins/grilo/totem-grilo.c:1186
+msgid "Browse"
+msgstr "Navega"
+
+#: ../src/plugins/grilo/grilo.ui.h:4 ../src/plugins/grilo/totem-grilo.c:1229
+msgid "Search"
+msgstr "Cerca"
+
+#: ../src/plugins/grilo/totem-grilo.c:454
+msgid "Browse Error"
+msgstr "Error de navegació"
+
+#: ../src/plugins/grilo/totem-grilo.c:609
+msgid "Search Error"
+msgstr "Error de cerca"
 
 #: ../src/plugins/gromit/gromit.plugin.in.h:1
 msgid "Gromit Annotations"
@@ -2205,59 +2064,15 @@
 msgid "The gromit binary was not found."
 msgstr "No s'ha trobat el fitxer binari del Gromit."
 
-#. Add the interface to Totem's sidebar
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:1
-#: ../src/plugins/iplayer/iplayer.py:46
-msgid "BBC iPlayer"
-msgstr "iPlayer de la BBC"
-
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:2
-msgid "Stream BBC programs from the last 7 days from the BBC iPlayer service."
-msgstr ""
-"Reprodueix els programes de la BBC dels últims 7 dies des del servei iPlayer "
-"de la BBC."
-
-#: ../src/plugins/iplayer/iplayer.py:72
-msgid "Error listing channel categories"
-msgstr "S'ha produït un error en llistar les categories dels canals"
-
-#: ../src/plugins/iplayer/iplayer.py:73
-msgid ""
-"There was an unknown error getting the list of television channels available "
-"on BBC iPlayer."
-msgstr ""
-"S'ha produït un error desconegut en obtenir la llista de canals de televisió "
-"disponibles en l'iPlayer de la BBC."
-
-#. Append a dummy child row so that the expander's visible; we can
-#. then queue off the expander to load the programme listing for this
-#. category
-#: ../src/plugins/iplayer/iplayer.py:84
-msgid "Loading…"
-msgstr "S'està carregant…"
-
-#. Translators: the "programme feed" is the list of TV shows
-#. available to watch online
-#: ../src/plugins/iplayer/iplayer.py:136
-msgid "Error getting programme feed"
-msgstr "S'ha produït un error en obtenir la programació del canal"
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
+msgid "Instant Messenger Status"
+msgstr "Estat de la missatgeria instantània"
 
-#: ../src/plugins/iplayer/iplayer.py:137
-msgid ""
-"There was an error getting the list of programmes for this channel and "
-"category combination."
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
+msgid "Set your Instant Messenger status to away when a movie is playing"
 msgstr ""
-"S'ha produït un error en obtenir la llista de programes per aquesta "
-"combinació de canal i categoria."
-
-#: ../src/plugins/iplayer/iplayer2.py:298
-msgid ""
-msgstr ""
-
-#: ../src/plugins/iplayer/iplayer2.py:299
-#, python-format
-msgid "Programme unavailable (\"%s\")"
-msgstr "El programa no és disponible («%s»)"
+"Estableix l'estat d'absència en la missatgeria instantània quan s'estigui "
+"reproduint una pel·lícula"
 
 #: ../src/plugins/lirc/lirc.plugin.in.h:1
 msgid "Infrared Remote Control"
@@ -2275,29 +2090,35 @@
 msgid "Couldn't read lirc configuration."
 msgstr "No s'ha pogut llegir la configuració del lirc."
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
-msgid "Download Movie Subtitles"
-msgstr "Baixa els subtítols de la pel·lícula"
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:1
+msgid "Media Player Keys"
+msgstr "Tecles del reproductor multimèdia"
+
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:2
+msgid "Support additional media player keys"
+msgstr "Permet més tecles del reproductor multimèdia"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
-msgid "Subtitle _language:"
-msgstr "_Llengua dels subtítols:"
+#: ../src/plugins/ontop/ontop.plugin.in.h:1
+msgid "Always On Top"
+msgstr "Sempre per damunt"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
-msgid "_Play with Subtitle"
-msgstr "_Reprodueix amb subtítols"
+#: ../src/plugins/ontop/ontop.plugin.in.h:2
+msgid "Keep the main window on top when playing a movie"
+msgstr ""
+"Mantingues la finestra principal per sobre de les altres quan s'estigui "
+"reproduint una pel·lícula"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:1
 msgid "Subtitle Downloader"
 msgstr "Baixador de subtítols"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:2
-msgid "Look for subtitles for the currently playing movie."
-msgstr "Cerca subtítols per a la pel·lícula que s'està reproduint."
+msgid "Look for subtitles for the currently playing movie"
+msgstr "Cerca subtítols per a la pel·lícula que s'està reproduint"
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:42
 msgid "Brazilian Portuguese"
-msgstr "Brasiler portuguès"
+msgstr "Brasiler portuguès"
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:177
 msgid "Searching for subtitles…"
@@ -2349,6 +2170,18 @@
 msgid "Searching subtitles…"
 msgstr "S'estan cercant subtítols…"
 
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
+msgid "Download Movie Subtitles"
+msgstr "Baixa els subtítols de la pel·lícula"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
+msgid "Subtitle _language:"
+msgstr "_Llengua dels subtítols:"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
+msgid "_Play with Subtitle"
+msgstr "_Reprodueix amb subtítols"
+
 #: ../src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in.h:1
 msgid "Subtitle language"
 msgstr "Llengua dels subtítols"
@@ -2357,113 +2190,111 @@
 msgid "The language to search for subtitles for movies in."
 msgstr "La llengua a la qual cercar subtítols de la pel·lícula."
 
-#: ../src/plugins/ontop/ontop.plugin.in.h:1
-msgid "Always On Top"
-msgstr "Sempre per damunt"
-
-#: ../src/plugins/ontop/ontop.plugin.in.h:2
-msgid "Keep the main window on top when playing a movie"
-msgstr ""
-"Mantingues la finestra principal per sobre de les altres quan s'estigui "
-"reproduint una pel·lícula"
+#: ../src/plugins/properties/movie-properties.plugin.in.h:1
+msgid "Movie Properties"
+msgstr "Propietats de la pel·lícula"
+
+#: ../src/plugins/properties/movie-properties.plugin.in.h:2
+msgid "Adds movie properties to the sidebar"
+msgstr "Afegeix les propietats de les pel·lícules a la barra lateral"
 
 #: ../src/plugins/properties/totem-movie-properties.c:246
 msgid "Properties"
 msgstr "Propietats"
 
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:1
-msgid "Publisher protocol to use"
-msgstr "Protocol de publicació que s'utilitza"
+#: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:1
+msgid "rpdb2 password"
+msgstr "contrasenya rpdb2"
+
+#: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:2
+msgid ""
+"A password to protect the rpdb2 server for debugging Totem from unauthorized "
+"remote access. If this is empty, a default of 'totem' will be used."
+msgstr ""
+"Una contrasenya per protegir el servidor rpdb2 d'accessos remots no "
+"autoritzats a la depuració del Totem. Si es deixa buida la contrasenya serà "
+"«totem»."
+
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
+msgid "Python Console"
+msgstr "Consola del Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
+msgid "Interactive Python console"
+msgstr "Consola interactiva del Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:88
+msgid "Python Console Menu"
+msgstr "Menú de la consola del Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:93
+msgid "_Python Console"
+msgstr "Consola del _Python"
 
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:2
-msgid ""
-"The transport protocol to use when publishing playlists over the network."
-msgstr ""
-"El protocol de transport per la publicació de llistes de reproducció a "
-"través de la xarxa."
+#: ../src/plugins/pythonconsole/pythonconsole.py:94
+msgid "Show Totem's Python console"
+msgstr "Mostra la consola del Python del Totem"
 
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:3
-msgid "Format for network service name"
-msgstr "Format pel nom del servei de xarxa"
+#: ../src/plugins/pythonconsole/pythonconsole.py:100
+msgid "Python Debugger"
+msgstr "Depurador del Python"
 
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:5
-#, no-c-format
-msgid ""
-"A format string used to build the network service name used when publishing "
-"playlists over the network. The following format placeholders can be used: • "
-"%a: the program name as returned by g_get_application_name() • %h: the "
-"machine's host name in title case • %u: the user's login name in title case "
-"• %U: the user's real name • %%: the percent sign"
-msgstr ""
-"Una cadena de format per construir el nom del servei de xarxa per la "
-"publicació de llistes de reproducció a través de la xarxa. Es poden "
-"utilitzar les variables següents: %a - el nom del programa que retorna "
-"g_get_application_name(); %h - el nom de l'ordinador; %u - el nom "
-"d'identificació de l'usuari; %U el nom real de l'usuari; %% - el símbol de "
-"percentatge"
-
-#. Translators: computers on the local network which are publishing their playlists over the network
-#: ../src/plugins/publish/totem-publish.c:552
-msgid "Neighbors"
-msgstr "Veïns"
-
-#: ../src/plugins/publish/publish.plugin.in.h:1
-msgid "Publish Playlist"
-msgstr "Publica la llista de reproducció"
-
-#: ../src/plugins/publish/publish.plugin.in.h:2
-msgid "Share the current playlist via HTTP"
-msgstr "Comparteix la llista de reproducció actual a través d'HTTP"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:1
-msgid "Service _Name:"
-msgstr "_Nom del servei:"
+#: ../src/plugins/pythonconsole/pythonconsole.py:101
+msgid "Enable remote Python debugging with rpdb2"
+msgstr "Habilita la depuració remota del Python amb el rpdb2"
 
-#: ../src/plugins/publish/publish-plugin.ui.h:3
-#, no-c-format
-msgid ""
-"The name used for announcing the playlist service on the network.\n"
-"All occurrences of the string %u will be replaced by your name,\n"
-"and %h will be replaced by your computer's host name."
-msgstr ""
-"El nom que s'utilitzarà per anunciar el servei de llista de reproducció a la "
-"xarxa.\n"
-"Totes les ocurrències de la cadena %u es reemplaçaran pel vostre nom\n"
-"i %h es reemplaçarà pel nom del vostre ordinador."
-
-#: ../src/plugins/publish/publish-plugin.ui.h:6
-msgid "Use _encrypted transport protocol (HTTPS)"
-msgstr "Utilitza un protocol de transport _xifrat (HTTPS)"
+#. pylint: disable-msg=E1101
+#: ../src/plugins/pythonconsole/pythonconsole.py:125
+#, python-format
+msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
+msgstr "Podeu accedir a Totem.Object a través de «totem_object»: \\n%s"
 
-#: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:1
-msgid "rpdb2 password"
-msgstr "contrasenya rpdb2"
+#: ../src/plugins/pythonconsole/pythonconsole.py:129
+msgid "Totem Python Console"
+msgstr "Consola del Python del Totem"
 
-#: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:2
+#: ../src/plugins/pythonconsole/pythonconsole.py:139
 msgid ""
-"A password to protect the rpdb2 server for debugging Totem from unauthorized "
-"remote access. If this is empty, a default of 'totem' will be used."
+"After you press OK, Totem will wait until you connect to it with winpdb or "
+"rpdb2. If you have not set a debugger password in DConf, it will use the "
+"default password ('totem')."
 msgstr ""
-"Una contrasenya per protegir el servidor rpdb2 d'accessos remots no "
-"autoritzats a la depuració del Totem. Si es deixa buida la contrasenya serà "
-"«totem»."
+"Després de prémer D'acord, el Totem s'esperarà fins que us hi connecteu amb "
+"el winpdb o el rpdb2. Si no heu establert una contrasenya de depuració en el "
+"DConf, s'utilitzarà la contrasenya predeterminada («totem»)."
+
+#: ../src/plugins/recent/recent.plugin.in.h:1
+msgid "Recent files"
+msgstr "Fitxers recents"
+
+#: ../src/plugins/recent/recent.plugin.in.h:2
+msgid "Adds files that have been played to recent files"
+msgstr "Afegeix els fitxers que s'han reproduït als fitxers recents"
 
 #: ../src/plugins/rotation/rotation.plugin.in.h:1
 msgid "Rotation Plugin"
 msgstr "Connector de rotació"
 
 #: ../src/plugins/rotation/rotation.plugin.in.h:2
-msgid "Allows videos to be rotated if they're in the wrong orientation."
-msgstr "Permet girar vídeos que no estiguin en l'orientació correcta."
+msgid "Allows videos to be rotated if they are in the wrong orientation"
+msgstr "Permet girar vídeos que no estiguin en l'orientació correcta"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:60
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:50
 msgid "_Rotate Clockwise"
 msgstr "_Gira en sentit horari"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:62
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:52
 msgid "Rotate Counterc_lockwise"
 msgstr "Gira en sentit _antihorari"
 
+#: ../src/plugins/save-file/save-file.plugin.in.h:1
+msgid "Save Copy"
+msgstr "Desa'n una còpia"
+
+#: ../src/plugins/save-file/save-file.plugin.in.h:2
+msgid "Save a copy of the currently playing movie"
+msgstr "Desa una còpia de la pel·lícula que s'està reproduint"
+
 #: ../src/plugins/save-file/totem-save-file.c:63
 msgid "Save a Copy..."
 msgstr "Desa'n una còpia..."
@@ -2486,10 +2317,14 @@
 msgid "Movie stream"
 msgstr "Flux de la pel·lícula"
 
-#: ../src/plugins/screensaver/totem-screensaver.c:116
-#: ../browser-plugin/totem-plugin-viewer.c:1891
-msgid "Playing a movie"
-msgstr "S'està reproduint una pel·lícula"
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:1
+msgid "Screen Saver"
+msgstr "Estalvi de pantalla"
+
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:2
+msgid "Deactivates the screen saver when a movie is playing"
+msgstr ""
+"Desactiva l'estalvi de pantalla quan s'estigui reproduint una pel·lícula"
 
 #: ../src/plugins/screenshot/gallery.ui.h:1
 msgid "Screenshot width (in pixels):"
@@ -2503,23 +2338,28 @@
 msgid "Number of screenshots:"
 msgstr "Nombre de captures de pantalla:"
 
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:1
-msgid "_Name:"
-msgstr "_Nom:"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:2
-msgid "Save in _folder:"
-msgstr "Desa en la _carpeta:"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:3
-msgid "Select a folder"
-msgstr "Seleccioneu una carpeta"
-
-#. Write the screenshot to the temporary file
-#: ../src/plugins/screenshot/gnome-screenshot-widget.c:385
-#: ../src/plugins/screenshot/totem-screenshot.c:64
-msgid "Screenshot.png"
-msgstr "Captura.png"
+#. translators: this is the name of the file that gets made up
+#. * with the screenshot if the entire screen is taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:147
+#, c-format
+msgid "Screenshot from %s.png"
+msgstr "Captura de pantalla de %s.png"
+
+#. translators: this is the name of the file that gets
+#. * made up with the screenshot if the entire screen is
+#. * taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:154
+#, c-format
+msgid "Screenshot from %s - %d.png"
+msgstr "Captura de pantalla de %s - %d.png"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:1
+msgid "Screenshot"
+msgstr "Captura de pantalla"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:2
+msgid "Allows screenshots and galleries to be taken of videos"
+msgstr "Permet fer captures de pantalles i galeries dels vídeos"
 
 #: ../src/plugins/screenshot/totem-gallery.c:91
 msgid "Save Gallery"
@@ -2545,50 +2385,48 @@
 msgid "Saving gallery as \"%s\""
 msgstr "S'està desant la galeria com a «%s»"
 
-#: ../src/plugins/screenshot/totem-screenshot.c:113
-msgid "There was an error saving the screenshot."
-msgstr "S'ha produït un error en desar la captura de pantalla."
-
-#: ../src/plugins/screenshot/totem-screenshot.c:139
-msgid "Save Screenshot"
-msgstr "Desa la captura de pantalla"
-
-#. Create the screenshot widget
-#. Translators: %s is the movie title and %d is an auto-incrementing number to make filename unique
-#: ../src/plugins/screenshot/totem-screenshot.c:160
-#, c-format
-msgid "Screenshot-%s-%d.png"
-msgstr "Captura-%s-%d.png"
-
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:88
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:220
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "Totem could not get a screenshot of the video."
 msgstr ""
 "El Totem no ha pogut obtenir una captura de pantalla d'aquesta pel·lícula."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "This is not supposed to happen; please file a bug report."
 msgstr "Això no hauria de passar. Envieu un informe d'error."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
-msgid "Take _Screenshot..."
-msgstr "Fes una _captura de pantalla..."
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
+msgid "Take _Screenshot"
+msgstr "Fes una _captura de pantalla"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
 msgid "Take a screenshot"
 msgstr "Fes una captura de pantalla"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create Screenshot _Gallery..."
 msgstr "Crea una _galeria de captures de pantalla..."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create a gallery of screenshots"
 msgstr "Crea una galeria de captures de pantalla"
 
+#: ../src/plugins/skipto/skipto.plugin.in.h:1
+#: ../src/plugins/skipto/totem-skipto.c:196
+msgid "Skip To"
+msgstr "Salta a"
+
+#: ../src/plugins/skipto/skipto.plugin.in.h:2
+msgid "Provides the \"Skip to\" dialog"
+msgstr "Proporciona el diàleg de «Salta a»"
+
+#: ../src/plugins/skipto/skipto.ui.h:1
+msgid "_Skip to:"
+msgstr "_Salta a:"
+
 #. Update the "seconds" label so that it always has the correct singular/plural form
 #. Translators: label for the seconds selector in the "Skip to" dialogue
-#: ../src/plugins/skipto/totem-skipto.c:160
+#: ../src/plugins/skipto/totem-skipto.c:159
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "segon"
@@ -2598,15 +2436,11 @@
 #. Translators: you should translate this string to a number (written in digits) which corresponds to the longer character length of the
 #. * translations for "second" and "seconds", as translated elsewhere in this file. For example, in English, "second" is 6 characters long and
 #. * "seconds" is 7 characters long, so this string should be translated to "7". See: bgo#639398
-#: ../src/plugins/skipto/totem-skipto.c:190
+#: ../src/plugins/skipto/totem-skipto.c:189
 msgctxt "Skip To label length"
 msgid "7"
 msgstr "6"
 
-#: ../src/plugins/skipto/totem-skipto.c:197
-msgid "Skip To"
-msgstr "Salta a"
-
 #: ../src/plugins/skipto/totem-skipto-plugin.c:182
 msgid "_Skip To..."
 msgstr "Sa_lta a..."
@@ -2615,114 +2449,326 @@
 msgid "Skip to a specific time"
 msgstr "Salta a un moment en concret"
 
-#: ../src/plugins/skipto/skipto.ui.h:1
-msgid "_Skip to:"
-msgstr "_Salta a:"
+#~ msgid "Movie Player"
+#~ msgstr "Reproductor de pel·lícules"
 
-#: ../browser-plugin/totem-plugin-viewer.c:431
-msgid "No URI to play"
-msgstr "No hi ha cap URI per reproduir"
+#~ msgid "Play movies and songs"
+#~ msgstr "Reproduïu vídeos i cançons"
 
-#. translators: this is:
-#. * Open With ApplicationName
-#. * as in nautilus' right-click menu
-#: ../browser-plugin/totem-plugin-viewer.c:1107
-#, c-format
-msgid "_Open with \"%s\""
-msgstr "_Obre amb el «%s»"
+#~ msgid "Open a file"
+#~ msgstr "Obre un fitxer"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2136
-msgid "No playlist or playlist empty"
-msgstr "No hi ha cap llista de reproducció o bé és buida"
+#~ msgid "Open _Location..."
+#~ msgstr "Obre una _ubicació..."
 
-#: ../browser-plugin/totem-plugin-viewer.c:2235
-msgid "Movie browser plugin"
-msgstr "Connector per veure pel·lícules al navegador"
+#~ msgid "Open a non-local file"
+#~ msgstr "Obre un fitxer de la xarxa"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Verify your system installation. The Totem plugin will now exit."
-msgstr ""
-"Verifiqueu la instal·lació del sistema. El connector del Totem sortirà ara."
+#~ msgid "Quit the program"
+#~ msgstr "Surt del programa"
 
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
-msgid "Python Console"
-msgstr "Consola del Python"
+#~ msgid "Configure the application"
+#~ msgstr "Configureu l'aplicació"
 
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
-msgid "Interactive Python console."
-msgstr "Consola interactiva del Python."
+#~ msgid "Switch to fullscreen"
+#~ msgstr "Canvia a pantalla completa"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:88
-msgid "Python Console Menu"
-msgstr "Menú de la consola del Python"
+#~ msgid "Set the repeat mode"
+#~ msgstr "Activa el mode de repetició"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:93
-msgid "_Python Console"
-msgstr "Consola del _Python"
+#~ msgid "Set the shuffle mode"
+#~ msgstr "Activa el mode aleatori"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:94
-msgid "Show Totem's Python console"
-msgstr "Mostra la consola del Python del Totem"
+#~ msgid "14.4 Kbps Modem"
+#~ msgstr "Mòdem a 14.4 Kbps"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:100
-msgid "Python Debugger"
-msgstr "Depurador del Python"
+#~ msgid "19.2 Kbps Modem"
+#~ msgstr "Mòdem a 19.2 Kbps"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:101
-msgid "Enable remote Python debugging with rpdb2"
-msgstr "Habilita la depuració remota del Python amb el rpdb2"
+#~ msgid "28.8 Kbps Modem"
+#~ msgstr "Mòdem a 28.8 Kbps"
 
-#. pylint: disable-msg=E1101
-#: ../src/plugins/pythonconsole/pythonconsole.py:125
-#, python-format
-msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
-msgstr "Podeu accedir a Totem.Object a través de «totem_object»: \\n%s"
+#~ msgid "33.6 Kbps Modem"
+#~ msgstr "Mòdem a 33.6 Kbps"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:129
-msgid "Totem Python Console"
-msgstr "Consola del Python del Totem"
+#~ msgid "34.4 Kbps Modem"
+#~ msgstr "Mòdem a 34.4 Kbps"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:139
-msgid ""
-"After you press OK, Totem will wait until you connect to it with winpdb or "
-"rpdb2. If you have not set a debugger password in DConf, it will use the "
-"default password ('totem')."
-msgstr ""
-"Després de prémer D'acord, el Totem s'esperarà fins que us hi connecteu amb "
-"el winpdb o el rpdb2. Si no heu establert una contrasenya de depuració en el "
-"DConf, s'utilitzarà la contrasenya predeterminada («totem»)."
+#~ msgid "56 Kbps Modem/ISDN"
+#~ msgstr "Mòdem/XDSI a 56 Kbps"
 
-#: ../src/plugins/grilo/grilo.plugin.in.h:1
-msgid "Grilo Browser"
-msgstr "Navegador Grilo"
+#~ msgid "112 Kbps Dual ISDN/DSL"
+#~ msgstr "XDSI dual/DSL a 112 Kbps"
 
-#: ../src/plugins/grilo/grilo.plugin.in.h:2
-msgid "A plugin to let you browse media content from various sources."
-msgstr "Un connector que us permet navegar per continguts de diverses fonts."
+#~ msgid "256 Kbps DSL/Cable"
+#~ msgstr "DSL/Cable a 256 Kbps"
 
-#: ../src/plugins/grilo/totem-grilo.c:452
-msgid "Browse Error"
-msgstr "Error de navegació"
+#~ msgid "384 Kbps DSL/Cable"
+#~ msgstr "DSL/Cable a 384 Kbps"
 
-#: ../src/plugins/grilo/totem-grilo.c:599
-msgid "Search Error"
-msgstr "Error de cerca"
+#~ msgid "512 Kbps DSL/Cable"
+#~ msgstr "DSL/Cable a 512 Kbps"
 
-#: ../src/plugins/grilo/totem-grilo.c:1219 ../src/plugins/grilo/grilo.ui.h:3
-msgid "Browse"
-msgstr "Navega"
+#~ msgid "1.5 Mbps T1/Intranet/LAN"
+#~ msgstr "T1/Intranet/LAN a 1.5 Mbps"
 
-#: ../src/plugins/grilo/totem-grilo.c:1285 ../src/plugins/grilo/grilo.ui.h:4
-msgid "Search"
-msgstr "Cerca"
+#~ msgid "Intranet/LAN"
+#~ msgstr "Intranet/LAN"
 
-#: ../src/plugins/grilo/grilo.ui.h:1
-msgid "Add to Playlist"
-msgstr "Afegeix a la llista de reproducció"
+#~ msgid "Networking"
+#~ msgstr "Xarxa"
 
-#: ../src/plugins/grilo/grilo.ui.h:2
-msgid "Copy Location"
-msgstr "Copia la ubicació"
+#~ msgid "Connection _speed:"
+#~ msgstr "_Velocitat de connexió:"
+
+#~ msgid "Network connection speed"
+#~ msgstr "Velocitat de connexió a la xarxa"
+
+#~ msgid ""
+#~ "Approximate network connection speed, used to select quality on media "
+#~ "over the network."
+#~ msgstr ""
+#~ "Velocitat estimada de la connexió a la xarxa. S'utilitza per seleccionar "
+#~ "la qualitat dels fitxers multimèdia a través de la xarxa."
+
+#~ msgid "Play Image '%s'"
+#~ msgstr "Reprodueix la imatge «%s»"
+
+#~ msgid "device%d"
+#~ msgstr "dispositiu%d"
+
+#~ msgid "Play Disc '%s'"
+#~ msgstr "Reprodueix el disc «%s»"
+
+#~ msgid "Movie Player using %s"
+#~ msgstr "Reproductor de vídeo que utilitza el %s"
+
+#~ msgid ""
+#~ "Totem could not play this media (%s) although a plugin is present to "
+#~ "handle it."
+#~ msgstr ""
+#~ "El Totem no ha pogut reproduir aquest medi (%s) encara que hi ha un "
+#~ "connector per gestionar-lo."
+
+#~ msgid ""
+#~ "You might want to check that a disc is present in the drive and that it "
+#~ "is correctly configured."
+#~ msgstr ""
+#~ "Hauríeu de comprovar que hi ha un disc en la unitat i que està "
+#~ "correctament configurada."
+
+#~ msgid "More information about media plugins"
+#~ msgstr "Més informació sobre els connectors de medi"
+
+#~ msgid ""
+#~ "Please install the necessary plugins and restart Totem to be able to play "
+#~ "this media."
+#~ msgstr ""
+#~ "Instal·leu els connectors necessaris i reinicieu el Totem per poder "
+#~ "reproduir aquest medi."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it does not have the "
+#~ "appropriate plugins to be able to read from the disc."
+#~ msgstr ""
+#~ "El Totem no pot reproduir aquest tipus de medi (%s) perquè no té els "
+#~ "connectors adequats per poder llegir-lo del disc."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because you do not have the "
+#~ "appropriate plugins to handle it."
+#~ msgstr ""
+#~ "El Totem no pot reproduir aquest tipus de medi (%s) perquè no teniu el "
+#~ "connector adequat per gestionar-lo."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it is not supported."
+#~ msgstr ""
+#~ "El Totem no pot reproduir aquest tipus de medi (%s) perquè no el sap "
+#~ "utilitzar."
+
+#~ msgid "Please insert another disc to play back."
+#~ msgstr "Inseriu un altre disc a reproduir."
+
+#~ msgid "Totem was not able to play this disc."
+#~ msgstr "El Totem no pot reproduir aquest disc."
+
+#~ msgid "Totem does not support playback of Audio CDs"
+#~ msgstr "El Totem no sap reproduir els CD d'àudio"
+
+#~ msgid ""
+#~ "Please consider using a music player or a CD extractor to play this CD"
+#~ msgstr ""
+#~ "Podeu utilitzar un reproductor de música o un extractor de CD per "
+#~ "reproduir-lo"
+
+#~ msgid "%d %%"
+#~ msgstr "%d%%"
+
+#~ msgid ""
+#~ "The requested audio output was not found. Please select another audio "
+#~ "output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "No s'ha trobat la sortida d'àudio demanada. Seleccioneu una altra sortida "
+#~ "d'àudio en el selector de sistemes multimèdia."
+
+#~ msgid "Location not found."
+#~ msgstr "No s'ha trobat la ubicació."
+
+#~ msgid ""
+#~ "Could not open location; you might not have permission to open the file."
+#~ msgstr ""
+#~ "No s'ha pogut obrir la ubicació. Potser no teniu permís per obrir el "
+#~ "fitxer."
+
+#~ msgid ""
+#~ "The video output is in use by another application. Please close other "
+#~ "video applications, or select another video output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "Una altra aplicació ja utilitza la sortida de vídeo. Tanqueu les altres "
+#~ "aplicacions de vídeo, o seleccioneu una altra sortida de vídeo al "
+#~ "selector de sistemes multimèdia."
+
+#~ msgid ""
+#~ "The audio output is in use by another application. Please select another "
+#~ "audio output in the Multimedia Systems Selector. You may want to consider "
+#~ "using a sound server."
+#~ msgstr ""
+#~ "Una altra aplicació ja utilitza la sortida d'àudio. Seleccioneu una altra "
+#~ "sortida d'àudio al selector de sistemes multimèdia. Potser hauríeu de "
+#~ "considerar utilitzar un servidor de so."
+
+#~ msgid ""
+#~ "Failed to create a GStreamer play object. Please check your GStreamer "
+#~ "installation."
+#~ msgstr ""
+#~ "No s'ha pogut crear un objecte de reproducció del GStreamer. Comproveu la "
+#~ "instal·lació del GStreamer."
+
+#~ msgid ""
+#~ "Failed to open audio output. You may not have permission to open the "
+#~ "sound device, or the sound server may not be running. Please select "
+#~ "another audio output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "No s'ha pogut obrir la sortida d'àudio. Pot ser que no tingueu permís per "
+#~ "obrir el dispositiu d'àudio, o que el servidor de so no s'estigui "
+#~ "executant. Seleccioneu una altra sortida de so al selector de sistemes "
+#~ "multimèdia."
+
+#~ msgid ""
+#~ "Could not find the audio output. You may need to install additional "
+#~ "GStreamer plugins, or select another audio output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "No s'ha trobat la sortida d'àudio. Pot ser que hàgiu d'instal·lar "
+#~ "connectors del GStreamer addicionals, o bé seleccionar una altra sortida "
+#~ "d'àudio al selector de sistemes multimèdia."
+
+#~ msgid "BBC iPlayer"
+#~ msgstr "iPlayer de la BBC"
+
+#~ msgid ""
+#~ "Stream BBC programs from the last 7 days from the BBC iPlayer service."
+#~ msgstr ""
+#~ "Reprodueix els programes de la BBC dels últims 7 dies des del servei "
+#~ "iPlayer de la BBC."
+
+#~ msgid "Error listing channel categories"
+#~ msgstr "S'ha produït un error en llistar les categories dels canals"
+
+#~ msgid ""
+#~ "There was an unknown error getting the list of television channels "
+#~ "available on BBC iPlayer."
+#~ msgstr ""
+#~ "S'ha produït un error desconegut en obtenir la llista de canals de "
+#~ "televisió disponibles en l'iPlayer de la BBC."
+
+#~ msgid "Loading…"
+#~ msgstr "S'està carregant…"
+
+#~ msgid "Error getting programme feed"
+#~ msgstr "S'ha produït un error en obtenir la programació del canal"
+
+#~ msgid ""
+#~ "There was an error getting the list of programmes for this channel and "
+#~ "category combination."
+#~ msgstr ""
+#~ "S'ha produït un error en obtenir la llista de programes per aquesta "
+#~ "combinació de canal i categoria."
+
+#~ msgid ""
+#~ msgstr ""
+
+#~ msgid "Programme unavailable (\"%s\")"
+#~ msgstr "El programa no és disponible («%s»)"
+
+#~ msgid "Publisher protocol to use"
+#~ msgstr "Protocol de publicació que s'utilitza"
+
+#~ msgid ""
+#~ "The transport protocol to use when publishing playlists over the network."
+#~ msgstr ""
+#~ "El protocol de transport per la publicació de llistes de reproducció a "
+#~ "través de la xarxa."
+
+#~ msgid "Format for network service name"
+#~ msgstr "Format pel nom del servei de xarxa"
+
+#~ msgid ""
+#~ "A format string used to build the network service name used when "
+#~ "publishing playlists over the network. The following format placeholders "
+#~ "can be used: • %a: the program name as returned by g_get_application_name"
+#~ "() • %h: the machine's host name in title case • %u: the user's login "
+#~ "name in title case • %U: the user's real name • %%: the percent sign"
+#~ msgstr ""
+#~ "Una cadena de format per construir el nom del servei de xarxa per la "
+#~ "publicació de llistes de reproducció a través de la xarxa. Es poden "
+#~ "utilitzar les variables següents: %a - el nom del programa que retorna "
+#~ "g_get_application_name(); %h - el nom de l'ordinador; %u - el nom "
+#~ "d'identificació de l'usuari; %U el nom real de l'usuari; %% - el símbol "
+#~ "de percentatge"
+
+#~ msgid "Neighbors"
+#~ msgstr "Veïns"
+
+#~ msgid "Publish Playlist"
+#~ msgstr "Publica la llista de reproducció"
+
+#~ msgid "Share the current playlist via HTTP"
+#~ msgstr "Comparteix la llista de reproducció actual a través d'HTTP"
+
+#~ msgid "Service _Name:"
+#~ msgstr "_Nom del servei:"
+
+#~ msgid ""
+#~ "The name used for announcing the playlist service on the network.\n"
+#~ "All occurrences of the string %u will be replaced by your name,\n"
+#~ "and %h will be replaced by your computer's host name."
+#~ msgstr ""
+#~ "El nom que s'utilitzarà per anunciar el servei de llista de reproducció a "
+#~ "la xarxa.\n"
+#~ "Totes les ocurrències de la cadena %u es reemplaçaran pel vostre "
+#~ "nom\n"
+#~ "i %h es reemplaçarà pel nom del vostre ordinador."
+
+#~ msgid "Use _encrypted transport protocol (HTTPS)"
+#~ msgstr "Utilitza un protocol de transport _xifrat (HTTPS)"
+
+#~ msgid "_Name:"
+#~ msgstr "_Nom:"
+
+#~ msgid "Save in _folder:"
+#~ msgstr "Desa en la _carpeta:"
+
+#~ msgid "Select a folder"
+#~ msgstr "Seleccioneu una carpeta"
+
+#~ msgid "There was an error saving the screenshot."
+#~ msgstr "S'ha produït un error en desar la captura de pantalla."
+
+#~ msgid "Save Screenshot"
+#~ msgstr "Desa la captura de pantalla"
 
 #~ msgid "0 frames per second"
 #~ msgstr "0 quadres per segon"
@@ -2761,9 +2807,6 @@
 #~ msgid "Search Results"
 #~ msgstr "Resultats de la cerca"
 
-#~ msgid "Videos"
-#~ msgstr "Vídeos"
-
 #~ msgid "_Open in Web Browser"
 #~ msgstr "_Obre en el navegador web"
 
@@ -3027,17 +3070,18 @@
 #~ "Approximate network connection speed, used to select quality on media "
 #~ "over the network: \"0\" for 14.4 Kbps Modem, \"1\" for 19.2 Kbps Modem, "
 #~ "\"2\" for 28.8 Kbps Modem, \"3\" for 33.6 Kbps Modem, \"4\" for 34.4 Kbps "
-#~ "Modem, \"5\" for 56 Kbps Modem/ISDN, \"6\" for 112 Kbps Dual ISDN/DSL, \"7"
-#~ "\" for 256 Kbps DSL/Cable, \"8\" for 384 Kbps DSL/Cable, \"9\" for 512 "
+#~ "Modem, \"5\" for 56 Kbps Modem/ISDN, \"6\" for 112 Kbps Dual ISDN/DSL, "
+#~ "\"7\" for 256 Kbps DSL/Cable, \"8\" for 384 Kbps DSL/Cable, \"9\" for 512 "
 #~ "Kbps DSL/Cable, \"10\" for 1.5 Mbps T1/Intranet/LAN, \"11\" for Intranet/"
 #~ "LAN."
 #~ msgstr ""
 #~ "Velocitat de connexió a la xarxa aproximada, s'utilitza per seleccionar "
 #~ "la qualitat dels recursos obtinguts a través de la xarxa: «0» mòdem de "
-#~ "14.4 Kbps, «1» mòdem de 19.2 Kbps, «2» mòdem de 28.8 Kbps, «3» mòdem de 33.6 "
-#~ "Kbps, «4» mòdem de 34.4 Kbps, «5» mòdem/XDSI de 56 Kbps, «6» XDSI dual/ADSL "
-#~ "de 112 Kbps, «7» ADSL/Cable de 256 Kbps, «8» ADSL/cable de 384 Kbps, «9» "
-#~ "ADSL/cable de 512 Kbps, «10»T1/intranet/LAN de 1.5 Mbps i «11» intranet/LAN."
+#~ "14.4 Kbps, «1» mòdem de 19.2 Kbps, «2» mòdem de 28.8 Kbps, «3» mòdem de "
+#~ "33.6 Kbps, «4» mòdem de 34.4 Kbps, «5» mòdem/XDSI de 56 Kbps, «6» XDSI "
+#~ "dual/ADSL de 112 Kbps, «7» ADSL/Cable de 256 Kbps, «8» ADSL/cable de 384 "
+#~ "Kbps, «9» ADSL/cable de 512 Kbps, «10»T1/intranet/LAN de 1.5 Mbps i «11» "
+#~ "intranet/LAN."
 
 #~ msgid ""
 #~ "Quality settings for the audio visualization: \"0\" for small, \"1\" for "
@@ -3051,9 +3095,9 @@
 #~ "output, \"2\" for 5.0 channel output, \"3\" for 5.1 channel output, \"4\" "
 #~ "for AC3 Passthrough."
 #~ msgstr ""
-#~ "Tipus de sortida d'àudio a utilitzar: «0» per a estèreo, «1» per a sortida "
-#~ "a 4 canals, «2» per a sortida amb canals 5.0, «3» per a sortida amb canals "
-#~ "5.1, «4» per a AC3 directe a la targeta de so."
+#~ "Tipus de sortida d'àudio a utilitzar: «0» per a estèreo, «1» per a "
+#~ "sortida a 4 canals, «2» per a sortida amb canals 5.0, «3» per a sortida "
+#~ "amb canals 5.1, «4» per a AC3 directe a la targeta de so."
 
 #~ msgid "UTF-8"
 #~ msgstr "UTF-8"
@@ -3280,35 +3324,19 @@
 #~ "Comproveu que el dispositiu no estigui ocupat."
 
 #~ msgid ""
-#~ "No video output is available. Make sure that the program is correctly "
-#~ "installed."
-#~ msgstr ""
-#~ "No hi ha cap sortida de vídeo disponible. Assegureu-vos que el programa "
-#~ "està instal·lat correctament."
-
-#~ msgid ""
 #~ "The TV adapter could not tune into the channel. Please check your "
 #~ "hardware setup and channel configuration."
 #~ msgstr ""
 #~ "L'adaptador de televisió no ha pogut sintonitzar el canal. Comproveu la "
 #~ "configuració del maquinari i la configuració del canal."
 
-#~ msgid "The server you are trying to connect to is not known."
-#~ msgstr "Es desconeix el servidor al qual esteu intentant connectar."
-
 #~ msgid "The device name you specified (%s) seems to be invalid."
 #~ msgstr "El nom del dispositiu que heu especificat (%s) és invàlid."
 
 #~ msgid "The server you are trying to connect to (%s) is unreachable."
 #~ msgstr ""
-#~ "No es pot contactar amb el servidor al qual esteu intentant connectar (%"
-#~ "s)."
-
-#~ msgid "The connection to this server was refused."
-#~ msgstr "S'ha refusat la connexió a aquest servidor."
-
-#~ msgid "The specified movie could not be found."
-#~ msgstr "No s'ha trobat la pel·lícula especificada."
+#~ "No es pot contactar amb el servidor al qual esteu intentant connectar "
+#~ "(%s)."
 
 #~ msgid ""
 #~ "The source seems encrypted and can't be read. Are you trying to play an "
@@ -3317,9 +3345,6 @@
 #~ "Sembla ser que la font estigui xifrada i no es pot llegir. Esteu "
 #~ "intentant reproduir un DVD xifrat sense la libdvdcss?."
 
-#~ msgid "The movie could not be read."
-#~ msgstr "No s'ha pogut llegir la pel·lícula."
-
 #~ msgid "A problem occurred while loading a library or a decoder (%s)."
 #~ msgstr ""
 #~ "S'ha produït un problema en carregar una biblioteca o descodificador (%s)."
@@ -3338,15 +3363,6 @@
 #~ msgid "Authentication is required to access this file."
 #~ msgstr "Es requereix autenticació per a accedir a aquest fitxer."
 
-#~ msgid "Authentication is required to access this file or stream."
-#~ msgstr "Es requereix autenticació per a accedir a aquest fitxer o flux."
-
-#~ msgid "You are not allowed to open this file."
-#~ msgstr "No teniu permís per a obrir aquest fitxer."
-
-#~ msgid "The server refused access to this file or stream."
-#~ msgstr "El servidor ha rebutjat l'accés a aquest fitxer o flux."
-
 #~ msgid "The file you tried to play is an empty file."
 #~ msgstr "Heu intentat reproduir un fitxer buit."
 
@@ -3361,9 +3377,6 @@
 #~ msgid "This movie is broken and can not be played further."
 #~ msgstr "La pel·lícula està malmesa i no es pot continuar reproduint."
 
-#~ msgid "This location is not a valid one."
-#~ msgstr "La ubicació no és vàlida."
-
 #~ msgid "This movie could not be opened."
 #~ msgstr "No s'ha pogut obrir la pel·lícula."
 
@@ -3374,13 +3387,6 @@
 #~ "No es pot gestionar el còdec de vídeo «%s». Potser cal que instal·leu "
 #~ "connectors addicionals per a poder veure alguns tipus de pel·lícules"
 
-#~ msgid ""
-#~ "Audio codec '%s' is not handled. You might need to install additional "
-#~ "plugins to be able to play some types of movies"
-#~ msgstr ""
-#~ "No es pot gestionar el còdec d'àudio «%s». Potser cal que instal·leu "
-#~ "connectors addicionals per a poder veure alguns tipus de pel·lícules"
-
 #~ msgid "This is an audio-only file and there is no audio output available."
 #~ msgstr ""
 #~ "Aquest és un fitxer només d'àudio i no hi ha cap sortida d'àudio "
@@ -3525,24 +3531,6 @@
 #~ msgid "Totem could not eject the optical media."
 #~ msgstr "El Totem no ha pogut expulsar el medi òptic."
 
-#~ msgid "Media Player Keys"
-#~ msgstr "Tecles del reproductor multimèdia"
-
-#~ msgid "Support additional media player keys"
-#~ msgstr "Permet més tecles del reproductor multimèdia"
-
-#~ msgid "Adds movie properties to the sidebar"
-#~ msgstr "Afegeix les propietats de les pel·lícules a la barra lateral"
-
-#~ msgid "Movie Properties"
-#~ msgstr "Propietats de la pel·lícula"
-
-#~ msgid "Screensaver"
-#~ msgstr "Estalvi de pantalla"
-
-#~ msgid "Provides the \"Skip to\" dialog."
-#~ msgstr "Proporciona el diàleg de «Salta a»."
-
 #~ msgid "Skipto"
 #~ msgstr "Salta a"
 
@@ -3572,9 +3560,6 @@
 #~ "Canal 5.1\n"
 #~ "Passarel·la AC3"
 
-#~ msgid "Open Location"
-#~ msgstr "Obre una ubicació"
-
 #~ msgid "Properties dialog"
 #~ msgstr "Diàleg de propietats"
 
diff -Nru totem-3.4.3/po/ca@valencia.po totem-3.6.2/po/ca@valencia.po
--- totem-3.4.3/po/ca@valencia.po	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/po/ca@valencia.po	2012-10-25 13:15:32.000000000 +0000
@@ -3,14 +3,13 @@
 # This file is distributed under the same license as the totem package.
 # Jordi Mallach , 2002, 2003, 2004, 2005, 2006, 2007.
 # Gil Forcada , 2006, 2007, 2008, 2009, 2010, 2011, 2012.
-# Jordi Serratosa , 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: totem 2.14\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-10 23:36+0200\n"
-"PO-Revision-Date: 2012-03-24 01:36+0100\n"
+"POT-Creation-Date: 2012-09-23 01:13+0200\n"
+"PO-Revision-Date: 2012-09-15 19:13+0200\n"
 "Last-Translator: Gil Forcada \n"
 "Language-Team: Catalan \n"
 "Language: ca-XV\n"
@@ -19,14 +18,239 @@
 "Content-Transfer-Encoding: 8bits\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
+#: ../browser-plugin/totem-plugin-viewer.c:352 ../src/totem-object.c:1180
+#: ../src/totem-object.c:1650 ../src/totem-statusbar.c:115
+msgid "Stopped"
+msgstr "Parat"
+
+#: ../browser-plugin/totem-plugin-viewer.c:364 ../src/totem-object.c:1173
+msgid "Paused"
+msgstr "En pausa"
+
+#: ../browser-plugin/totem-plugin-viewer.c:368 ../src/totem-object.c:1166
+msgid "Playing"
+msgstr "S'està reproduint"
+
+#: ../browser-plugin/totem-plugin-viewer.c:386
+#: ../src/plugins/screensaver/totem-screensaver.c:97
+msgid "Playing a movie"
+msgstr "S'està reproduint una pel·lícula"
+
+#: ../browser-plugin/totem-plugin-viewer.c:443
+msgid "No URI to play"
+msgstr "No hi ha cap URI per reproduir"
+
+#: ../browser-plugin/totem-plugin-viewer.c:676
+#: ../browser-plugin/totem-plugin-viewer.c:1700
+msgid "Totem Movie Player"
+msgstr "Reproductor de vídeo Totem"
+
+#. translators: this is:
+#. * Open With ApplicationName
+#. * as in nautilus' right-click menu
+#: ../browser-plugin/totem-plugin-viewer.c:1120
+#, c-format
+msgid "_Open with \"%s\""
+msgstr "_Obri amb el «%s»"
+
+#: ../browser-plugin/totem-plugin-viewer.c:1341 ../src/totem-object.c:2475
+msgid "An error occurred"
+msgstr "S'ha produït un error"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2033
+msgid "No playlist or playlist empty"
+msgstr "No hi ha cap llista de reproducció o bé és buida"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2128
+msgid "Movie browser plugin"
+msgstr "Connector per veure pel·lícules al navegador"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144 ../src/totem.c:240
+msgid "Could not initialize the thread-safe libraries."
+msgstr "No s'han pogut inicialitzar les biblioteques que permeten fils segurs."
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144
+msgid "Verify your system installation. The Totem plugin will now exit."
+msgstr ""
+"Verifiqueu la instal·lació del sistema. El connector del Totem eixirà ara."
+
 #: ../data/fullscreen.ui.h:1
 msgid "Leave Fullscreen"
 msgstr "Ix de la pantalla completa"
 
-#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:144
+#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:81
 msgid "Time:"
 msgstr "Temps:"
 
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
+msgid "Allow the screensaver to activate when playing audio"
+msgstr ""
+"Permet que s'active l'estalvi de pantalla quan s'estiga reproduint àudio"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
+msgid ""
+"Allow the screensaver to activate when playing audio. Disable if you have "
+"monitor-powered speakers."
+msgstr ""
+"Permet que s'active l'estalvi de pantalla quan s'estiga reproduint àudio. No "
+"ho habiliteu si teniu un monitor amb altaveus."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
+msgid "Show visual effects when no video is displayed"
+msgstr "Mostra efectes visuals quan no es mostre cap vídeo"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
+msgid "Show visual effects when playing an audio only file."
+msgstr "Mostra efectes visuals quan es reproduïsca un fitxer d'àudio."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
+msgid "Name of the visual effects plugin"
+msgstr "Nom del connector d'efectes visuals"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
+msgid "The brightness of the video"
+msgstr "La brillantor del vídeo"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
+msgid "The contrast of the video"
+msgstr "El contrast del vídeo"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
+msgid "The hue of the video"
+msgstr "El to del vídeo"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
+msgid "The saturation of the video"
+msgstr "La saturació del vídeo"
+
+# FIXME: "canvas" (josep)
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
+msgid "Resize the canvas automatically on file load"
+msgstr "Redimensiona el llenç automàticament en carregar un fitxer"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
+msgid "Repeat mode"
+msgstr "Mode de repetició"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
+msgid "Shuffle mode"
+msgstr "Mode aleatori"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
+msgid "Whether to disable deinterlacing for interlaced movies"
+msgstr ""
+"Si s'ha d'inhabilitar el desentrallaçat de les pel·lícules entrellaçades"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
+msgid "Whether to enable debug for the playback engine"
+msgstr "Si s'ha d'habilitar la depuració per al motor de reproducció"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
+msgid "Type of audio output to use"
+msgstr "Tipus d'eixida d'àudio a utilitzar"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
+msgid "Visualization quality setting"
+msgstr "Paràmetre de la qualitat de la visualització"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
+msgid "Quality setting for the audio visualization."
+msgstr "Paràmetre de qualitat per a la visualització d'àudio."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
+msgid "Network buffering threshold"
+msgstr "Llindar d'utilització de la memòria intermèdia de xarxa"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
+msgid ""
+"Amount of data to buffer for network streams before starting to display the "
+"stream (in seconds)."
+msgstr ""
+"Quantitat de dades (en segons) a emmagatzemar a la memòria intermèdia per "
+"als fluxos de la xarxa abans de començar-los a mostrar."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
+msgid "Subtitle font"
+msgstr "Tipus de lletra dels subtítols"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
+msgid "Pango font description for subtitle rendering."
+msgstr ""
+"Descripció del tipus de lletra Pango per a la representació dels subtítols."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
+msgid "Subtitle encoding"
+msgstr "Codificació dels subtítols"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
+msgid "Encoding character set for subtitle."
+msgstr "Codificació del joc de caràcters dels subtítols."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
+msgid "Default location for the \"Open...\" dialogs"
+msgstr "Ubicació predeterminada per als diàlegs «Obri...»"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
+msgid ""
+"Default location for the \"Open...\" dialogs. Default is the current "
+"directory."
+msgstr ""
+"Ubicació predeterminada per als diàlegs «Obri...». La predeterminada és el "
+"directori actual."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
+msgid "Default location for the \"Take Screenshot\" dialogs"
+msgstr "Ubicació predeterminada per als diàlegs «Feu una captura de pantalla»"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
+msgid ""
+"Default location for the \"Take Screenshot\" dialogs. Default is the "
+"Pictures directory."
+msgstr ""
+"Ubicació predeterminada per als diàlegs «Feu una captura de pantalla». La "
+"predeterminada és el directori d'imatges."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
+msgid "Whether to disable the plugins in the user's home directory"
+msgstr ""
+"Si s'han d'inhabilitar els connectors del directori d'inici de l'usuari"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
+msgid "Whether to disable the keyboard shortcuts"
+msgstr "Si s'han d'inhabilitar les dreceres de teclat"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
+msgid "Whether to autoload text subtitle files when a movie is loaded"
+msgstr ""
+"Si s'han de carregar automàticament els fitxers de subtítols quan es "
+"reproduïsca una pel·lícula"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
+msgid "Whether to autoload external chapter files when a movie is loaded"
+msgstr ""
+"Si s'han de carregar automàticament els fitxers de capítols externs quan es "
+"carrega una pel·lícula"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
+msgid ""
+"Whether to remember the position of played audio/video files when pausing or "
+"closing them"
+msgstr ""
+"Si s'ha de recordar la posició dels fitxers d'àudio/vídeo quan s'hi faça una "
+"pausa o es tanquen"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
+msgid "Active plugins list"
+msgstr "Llista dels connectors actius"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+msgid ""
+"A list of the names of the plugins which are currently active (loaded and "
+"running)."
+msgstr ""
+"Una llista dels noms dels connectors que estan actius actualment (carregats "
+"i en funcionament)."
+
 #: ../data/playlist.ui.h:1
 msgid "_Remove"
 msgstr "_Suprimeix"
@@ -43,11 +267,11 @@
 msgid "Copy the location to the clipboard"
 msgstr "Copia la ubicació al porta-retalls"
 
-#: ../data/playlist.ui.h:5 ../data/totem.ui.h:78
+#: ../data/playlist.ui.h:5 ../data/totem.ui.h:71
 msgid "_Select Text Subtitles..."
 msgstr "_Seleccioneu els subtítols de text..."
 
-#: ../data/playlist.ui.h:6 ../data/totem.ui.h:79
+#: ../data/playlist.ui.h:6 ../data/totem.ui.h:72
 msgid "Select a file to use for text subtitles"
 msgstr "Seleccioneu el fitxer que conté els subtítols"
 
@@ -71,10 +295,165 @@
 msgid "Move Down"
 msgstr "Mou avall"
 
-#: ../data/properties.ui.h:1 ../data/totem.ui.h:122
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:2
+msgid "Normal"
+msgstr "Normal"
+
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:4
+msgid "Large"
+msgstr "Gran"
+
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:6
+msgid "Extra Large"
+msgstr "Extra gran"
+
+#: ../data/preferences.ui.h:7 ../src/backend/bacon-video-widget.c:5518
+#: ../src/totem-properties-view.c:232
+msgid "Stereo"
+msgstr "Estèreo"
+
+#: ../data/preferences.ui.h:8
+msgid "4-channel"
+msgstr "4 canals"
+
+#: ../data/preferences.ui.h:9
+msgid "4.1-channel"
+msgstr "Canal 4.1"
+
+#: ../data/preferences.ui.h:10
+msgid "5.0-channel"
+msgstr "Canal 5.0"
+
+#: ../data/preferences.ui.h:11
+msgid "5.1-channel"
+msgstr "canal 5.1"
+
+#: ../data/preferences.ui.h:12
+msgid "AC3 Passthrough"
+msgstr "AC3 directe a la targeta de so"
+
+#: ../data/preferences.ui.h:13
+msgid "Totem Preferences"
+msgstr "Preferències del Totem"
+
+#: ../data/preferences.ui.h:14
+msgid "Playback"
+msgstr "Reprodueix"
+
+#: ../data/preferences.ui.h:15
+msgid "Start playing files from last position"
+msgstr "Inicia la reproducció dels fitxers des de l'última posició"
+
+#: ../data/preferences.ui.h:16
+msgid "Text Subtitles"
+msgstr "Subtítols"
+
+#: ../data/preferences.ui.h:17
+msgid "_Load subtitle files when movie is loaded"
+msgstr "_Carrega els fitxers de subtítols quan es carrega una pel·lícula"
+
+#: ../data/preferences.ui.h:18
+msgid "_Font:"
+msgstr "_Tipus de lletra:"
+
+#: ../data/preferences.ui.h:19
+msgid "_Encoding:"
+msgstr "_Codificació:"
+
+#: ../data/preferences.ui.h:20
+msgid "External Chapters"
+msgstr "Capítols externs"
+
+#: ../data/preferences.ui.h:21
+msgid "Load _chapter files when movie is loaded"
+msgstr "_Carrega els fitxers de capítols quan es carrega una pel·lícula"
+
+#: ../data/preferences.ui.h:22 ../data/properties.ui.h:1
 msgid "General"
 msgstr "General"
 
+#. Tab label in the Preferences dialogue
+#: ../data/preferences.ui.h:24
+msgid "Display"
+msgstr "Pantalla"
+
+#: ../data/preferences.ui.h:25
+msgid "_Resize the window when a new video is loaded"
+msgstr "_Redimensiona la finestra quan es carrega un vídeo nou"
+
+#: ../data/preferences.ui.h:26
+msgid "Disable _deinterlacing of interlaced videos"
+msgstr "Inhabilita el _desentrallaçat dels vídeos entrellaçats"
+
+#: ../data/preferences.ui.h:27
+msgid "Disable screensaver when playing "
+msgstr "Inhabilita l'estalvi de pantalla quan es reproduïsca "
+
+#: ../data/preferences.ui.h:28 ../data/properties.ui.h:9
+#: ../src/totem-properties-view.c:275
+msgid "Video"
+msgstr "Vídeo"
+
+#: ../data/preferences.ui.h:29
+msgid "Video or Audio"
+msgstr "Vídeo o àudio"
+
+#: ../data/preferences.ui.h:30
+msgid "Visual Effects"
+msgstr "Efectes visuals"
+
+#: ../data/preferences.ui.h:31
+msgid "Show _visual effects when an audio file is played"
+msgstr "Mostra efectes _visuals quan es reprodueix un fitxer d'àudio"
+
+#: ../data/preferences.ui.h:32
+msgid "_Type of visualization:"
+msgstr "_Tipus de visualització:"
+
+#: ../data/preferences.ui.h:33
+msgid "Visualization _size:"
+msgstr "Mida de la vi_sualització:"
+
+#: ../data/preferences.ui.h:34
+msgid "Color Balance"
+msgstr "Balanç del color"
+
+#: ../data/preferences.ui.h:35
+msgid "_Brightness:"
+msgstr "_Brillantor:"
+
+#: ../data/preferences.ui.h:36
+msgid "Co_ntrast:"
+msgstr "Co_ntrast:"
+
+#: ../data/preferences.ui.h:37
+msgid "Sat_uration:"
+msgstr "Sat_uració:"
+
+#: ../data/preferences.ui.h:38
+msgid "_Hue:"
+msgstr "_To:"
+
+#: ../data/preferences.ui.h:39
+msgid "Reset to _Defaults"
+msgstr "Torna als valors per _defecte"
+
+#: ../data/preferences.ui.h:40
+msgid "Audio Output"
+msgstr "Eixida d'àudio"
+
+#: ../data/preferences.ui.h:41
+msgid "_Audio output type:"
+msgstr "Tipus d'eixid_a d'àudio:"
+
+#: ../data/preferences.ui.h:42 ../data/properties.ui.h:14
+#: ../src/totem-properties-view.c:273
+msgid "Audio"
+msgstr "Àudio"
+
 #: ../data/properties.ui.h:2
 msgid "Title:"
 msgstr "Títol:"
@@ -103,11 +482,6 @@
 msgid "Container:"
 msgstr "Contenidor:"
 
-#: ../data/properties.ui.h:9 ../data/totem.ui.h:128
-#: ../src/totem-properties-view.c:270
-msgid "Video"
-msgstr "Vídeo"
-
 #: ../data/properties.ui.h:10
 msgid "Dimensions:"
 msgstr "Dimensions:"
@@ -124,11 +498,6 @@
 msgid "Bitrate:"
 msgstr "Velocitat de transmissió:"
 
-#: ../data/properties.ui.h:14 ../data/totem.ui.h:142
-#: ../src/totem-properties-view.c:268
-msgid "Audio"
-msgstr "Àudio"
-
 #: ../data/properties.ui.h:15
 msgid "Sample rate:"
 msgstr "Freqüència de mostratge:"
@@ -137,750 +506,443 @@
 msgid "Channels:"
 msgstr "Canals:"
 
-#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
-msgid "_Add to Playlist"
-msgstr "_Afig a la llista de reproducció"
-
-#: ../data/video-list.ui.h:2
-msgid "Add the video to the playlist"
-msgstr "Afig el vídeo a la llista de reproducció"
-
 #. Title
-#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:143
-#: ../src/totem-object.c:1667
-msgid "Movie Player"
-msgstr "Reproductor de pel·lícules"
+#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:80 ../src/totem.c:239
+#: ../src/totem.c:248 ../src/totem-menu.c:789 ../src/totem-object.c:1658
+msgid "Videos"
+msgstr "Vídeos"
 
 #: ../data/totem.desktop.in.in.in.h:2
-msgid "Play movies and songs"
-msgstr "Reproduïu vídeos i cançons"
+msgid "Play movies"
+msgstr "Reprodueix pel·lícules"
+
+#: ../data/totem.desktop.in.in.in.h:3
+msgid "Video;Movie;Film;Clip;Series;Player;DVD;TV;Disc;"
+msgstr "Vídeo;Pel·lícula;Film;Clip;Sèries;Reproductor;DVD;TV;Disc;"
 
 #: ../data/totem.ui.h:1
-msgid "_Movie"
-msgstr "_Pel·lícula"
+msgid "_Open"
+msgstr "_Obri"
 
 #: ../data/totem.ui.h:2
-msgid "_Open..."
-msgstr "_Obri..."
+msgid "Open _Location"
+msgstr "Obri una _ubicació"
 
 #: ../data/totem.ui.h:3
-msgid "Open a file"
-msgstr "Obri un fitxer"
+msgid "_Fullscreen"
+msgstr "Pantalla _completa"
 
 #: ../data/totem.ui.h:4
-msgid "Open _Location..."
-msgstr "Obri una _ubicació..."
+msgid "Prefere_nces"
+msgstr "_Preferències"
 
 #: ../data/totem.ui.h:5
-msgid "Open a non-local file"
-msgstr "Obri un fitxer de la xarxa"
+msgid "Shuff_le"
+msgstr "_Mescla"
 
 #: ../data/totem.ui.h:6
+msgid "_Repeat"
+msgstr "_Repeteix"
+
+#: ../data/totem.ui.h:7
+msgid "_Quit"
+msgstr "I_x"
+
+#: ../data/totem.ui.h:8
+msgid "_Movie"
+msgstr "_Pel·lícula"
+
+#: ../data/totem.ui.h:9
 msgid "_Eject"
 msgstr "_Expulsa"
 
-#: ../data/totem.ui.h:7
+#: ../data/totem.ui.h:10
 msgid "Eject the current disc"
 msgstr "Expulsa el disc actual"
 
-#: ../data/totem.ui.h:8
+#: ../data/totem.ui.h:11
 msgid "_Properties"
 msgstr "_Propietats"
 
-#: ../data/totem.ui.h:9
+#: ../data/totem.ui.h:12
 msgid "View the properties of the current stream"
 msgstr "Visualitza les propietats del flux actual"
 
-#: ../data/totem.ui.h:10
+#: ../data/totem.ui.h:13
 msgid "Play / P_ause"
 msgstr "Reprodueix / Fes una p_ausa"
 
-#: ../data/totem.ui.h:11
+#: ../data/totem.ui.h:14
 msgid "Play or pause the movie"
 msgstr "Reprodueix o fes una pausa a la pel·lícula"
 
-#: ../data/totem.ui.h:12
-msgid "_Quit"
-msgstr "I_x"
-
-#: ../data/totem.ui.h:13
-msgid "Quit the program"
-msgstr "Ix del programa"
-
-#: ../data/totem.ui.h:14
+#: ../data/totem.ui.h:15
 msgid "_Edit"
 msgstr "_Edita"
 
-#: ../data/totem.ui.h:15
+#: ../data/totem.ui.h:16
 msgid "_Clear Playlist"
 msgstr "_Neteja la llista de reproducció"
 
-#: ../data/totem.ui.h:16
+#: ../data/totem.ui.h:17
 msgid "Clear the playlist"
 msgstr "Neteja la llista de reproducció"
 
-#: ../data/totem.ui.h:17
-msgid "Prefere_nces"
-msgstr "_Preferències"
-
 #: ../data/totem.ui.h:18
-msgid "Configure the application"
-msgstr "Configureu l'aplicació"
-
-#: ../data/totem.ui.h:19
 msgid "Plugins..."
 msgstr "Connectors..."
 
-#: ../data/totem.ui.h:20
+#: ../data/totem.ui.h:19
 msgid "Configure plugins to extend the application"
 msgstr "Configureu els connectors per ampliar l'aplicació"
 
-#: ../data/totem.ui.h:21
+#: ../data/totem.ui.h:20
 msgid "_View"
 msgstr "_Visualitza"
 
-#: ../data/totem.ui.h:22
-msgid "_Fullscreen"
-msgstr "Pantalla _completa"
-
-#: ../data/totem.ui.h:23
-msgid "Switch to fullscreen"
-msgstr "Canvia a pantalla completa"
-
-#: ../data/totem.ui.h:24
+#: ../data/totem.ui.h:21
 msgid "Fit Window to Movie"
 msgstr "Ajusta la finestra a la pel·lícula"
 
-#: ../data/totem.ui.h:25
+#: ../data/totem.ui.h:22
 msgid "_Resize 1:2"
 msgstr "_Redimensiona a 1:2"
 
-#: ../data/totem.ui.h:26
+#: ../data/totem.ui.h:23
 msgid "Resize to half the original video size"
 msgstr "Redimensiona el vídeo a la meitat de la mida original"
 
-#: ../data/totem.ui.h:27
+#: ../data/totem.ui.h:24
 msgid "Resize _1:1"
 msgstr "Redimensiona a _1:1"
 
-#: ../data/totem.ui.h:28
+#: ../data/totem.ui.h:25
 msgid "Resize to the original video size"
 msgstr "Redimensiona el vídeo a la mida original"
 
-#: ../data/totem.ui.h:29
+#: ../data/totem.ui.h:26
 msgid "Resize _2:1"
 msgstr "Redimensiona a _2:1"
 
-#: ../data/totem.ui.h:30
+#: ../data/totem.ui.h:27
 msgid "Resize to double the original video size"
 msgstr "Redimensiona el vídeo al doble de la mida original"
 
-#: ../data/totem.ui.h:31
+#: ../data/totem.ui.h:28
 msgid "_Aspect Ratio"
 msgstr "Relació d'_aspecte"
 
-#: ../data/totem.ui.h:32
+#: ../data/totem.ui.h:29
 msgid "Switch An_gles"
 msgstr "Commuta els an_gles"
 
-#: ../data/totem.ui.h:33
+#: ../data/totem.ui.h:30
 msgid "Switch camera angles"
 msgstr "Commuta els angles de la càmera"
 
-#: ../data/totem.ui.h:34
+#: ../data/totem.ui.h:31
 msgid "_Go"
 msgstr "Vé_s"
 
-#: ../data/totem.ui.h:35
+#: ../data/totem.ui.h:32
 msgid "_DVD Menu"
 msgstr "Menú del _DVD"
 
-#: ../data/totem.ui.h:36
+#: ../data/totem.ui.h:33
 msgid "Go to the DVD menu"
 msgstr "Vés al menú del DVD"
 
-#: ../data/totem.ui.h:37
+#: ../data/totem.ui.h:34
 msgid "_Title Menu"
 msgstr "Menú del _títol"
 
-#: ../data/totem.ui.h:38
+#: ../data/totem.ui.h:35
 msgid "Go to the title menu"
 msgstr "Vés al menú del títol"
 
-#: ../data/totem.ui.h:39
+#: ../data/totem.ui.h:36
 msgid "A_udio Menu"
 msgstr "Menú d'à_udio"
 
-#: ../data/totem.ui.h:40
+#: ../data/totem.ui.h:37
 msgid "Go to the audio menu"
 msgstr "Vés al menú d'àudio"
 
-#: ../data/totem.ui.h:41
+#: ../data/totem.ui.h:38
 msgid "_Angle Menu"
 msgstr "Menú d'an_gle"
 
-#: ../data/totem.ui.h:42
+#: ../data/totem.ui.h:39
 msgid "Go to the angle menu"
 msgstr "Vés al menú d'angle"
 
-#: ../data/totem.ui.h:43
+#: ../data/totem.ui.h:40
 msgid "_Chapter Menu"
 msgstr "Menú dels _capítols"
 
-#: ../data/totem.ui.h:44
+#: ../data/totem.ui.h:41
 msgid "Go to the chapter menu"
 msgstr "Vés al menú dels capítols"
 
-#: ../data/totem.ui.h:45
+#: ../data/totem.ui.h:42
 msgid "_Next Chapter/Movie"
 msgstr "Capítol/pel·lícula _següent"
 
-#: ../data/totem.ui.h:46
+#: ../data/totem.ui.h:43
 msgid "Next chapter or movie"
 msgstr "Capítol o pel·lícula següent"
 
-#: ../data/totem.ui.h:47
+#: ../data/totem.ui.h:44
 msgid "_Previous Chapter/Movie"
 msgstr "Capítol/pel·lícula _anterior"
 
-#: ../data/totem.ui.h:48
+#: ../data/totem.ui.h:45
 msgid "Previous chapter or movie"
 msgstr "Capítol o pel·lícula anterior"
 
-#: ../data/totem.ui.h:49
+#: ../data/totem.ui.h:46
 msgid "_Sound"
 msgstr "S_o"
 
-#: ../data/totem.ui.h:50
+#: ../data/totem.ui.h:47
 msgid "Volume _Up"
 msgstr "_Apuja el volum"
 
-#: ../data/totem.ui.h:51
+#: ../data/totem.ui.h:48
 msgid "Increase volume"
 msgstr "Apuja el volum"
 
-#: ../data/totem.ui.h:52
+#: ../data/totem.ui.h:49
 msgid "Volume _Down"
 msgstr "A_baixa el volum"
 
-#: ../data/totem.ui.h:53
+#: ../data/totem.ui.h:50
 msgid "Decrease volume"
 msgstr "Abaixa el volum"
 
-#: ../data/totem.ui.h:54
+#: ../data/totem.ui.h:51
 msgid "_Help"
 msgstr "A_juda"
 
-#: ../data/totem.ui.h:55
+#: ../data/totem.ui.h:52
 msgid "_Contents"
 msgstr "_Continguts"
 
-#: ../data/totem.ui.h:56
+#: ../data/totem.ui.h:53
 msgid "Help contents"
 msgstr "Continguts de l'ajuda"
 
-#: ../data/totem.ui.h:57
-msgid "_About"
-msgstr "_Quant a"
-
-#: ../data/totem.ui.h:58
-msgid "About this application"
-msgstr "Quant a esta aplicació"
-
-#: ../data/totem.ui.h:59
-msgid "_Repeat Mode"
-msgstr "Mode de _repetició"
-
-#: ../data/totem.ui.h:60
-msgid "Set the repeat mode"
-msgstr "Activa el mode de repetició"
-
-#: ../data/totem.ui.h:61
-msgid "Shuff_le Mode"
-msgstr "Mode _aleatori"
+#: ../data/totem.ui.h:54
+msgid "_About"
+msgstr "_Quant a"
 
-#: ../data/totem.ui.h:62
-msgid "Set the shuffle mode"
-msgstr "Activa el mode aleatori"
+#: ../data/totem.ui.h:55
+msgid "About this application"
+msgstr "Quant a esta aplicació"
 
-#: ../data/totem.ui.h:63
+#: ../data/totem.ui.h:56
 msgid "Show _Controls"
 msgstr "Mostra els _controls"
 
-#: ../data/totem.ui.h:64
+#: ../data/totem.ui.h:57
 msgid "Show controls"
 msgstr "Mostra els controls"
 
-#: ../data/totem.ui.h:65
+#: ../data/totem.ui.h:58
 msgid "S_idebar"
 msgstr "_Barra lateral"
 
-#: ../data/totem.ui.h:66
+#: ../data/totem.ui.h:59
 msgid "Show or hide the sidebar"
 msgstr "Mostra o amaga la barra lateral"
 
-#: ../data/totem.ui.h:67
+#: ../data/totem.ui.h:60
 msgctxt "Aspect ratio"
 msgid "Auto"
 msgstr "Auto"
 
-#: ../data/totem.ui.h:68
+#: ../data/totem.ui.h:61
 msgid "Sets automatic aspect ratio"
 msgstr "Estableix la relació d'aspecte automàtica"
 
-#: ../data/totem.ui.h:69
+#: ../data/totem.ui.h:62
 msgid "Square"
 msgstr "Quadrat"
 
-#: ../data/totem.ui.h:70
+#: ../data/totem.ui.h:63
 msgid "Sets square aspect ratio"
 msgstr "Estableix la relació d'aspecte quadrada"
 
-#: ../data/totem.ui.h:71
+#: ../data/totem.ui.h:64
 msgid "4:3 (TV)"
 msgstr "4.3 (TV)"
 
-#: ../data/totem.ui.h:72
+#: ../data/totem.ui.h:65
 msgid "Sets 4:3 (TV) aspect ratio"
 msgstr "Estableix la relació d'aspecte a 4:3 (TV)"
 
-#: ../data/totem.ui.h:73
+#: ../data/totem.ui.h:66
 msgid "16:9 (Widescreen)"
 msgstr "16:9 (Pantalla ampla)"
 
-#: ../data/totem.ui.h:74
+#: ../data/totem.ui.h:67
 msgid "Sets 16:9 (widescreen) aspect ratio"
 msgstr "Estableix la relació d'aspecte a 16:9 (pantalla ampla)"
 
-#: ../data/totem.ui.h:75
+#: ../data/totem.ui.h:68
 msgid "2.11:1 (DVB)"
 msgstr "2.11:1 (DVB)"
 
-#: ../data/totem.ui.h:76
+#: ../data/totem.ui.h:69
 msgid "Sets 2.11:1 (DVB) aspect ratio"
 msgstr "Estableix la relació d'aspecte a 2.11:1 (DVB)"
 
-#: ../data/totem.ui.h:77
+#: ../data/totem.ui.h:70
 msgid "S_ubtitles"
 msgstr "S_ubtítols"
 
-#: ../data/totem.ui.h:80
+#: ../data/totem.ui.h:73
 msgid "_Languages"
 msgstr "_Idiomes"
 
-#: ../data/totem.ui.h:81
+#: ../data/totem.ui.h:74
 msgid "Zoom In"
 msgstr "Apropa"
 
-#: ../data/totem.ui.h:82
+#: ../data/totem.ui.h:75
 msgid "Zoom in"
 msgstr "Apropa"
 
-#: ../data/totem.ui.h:83
+#: ../data/totem.ui.h:76
 msgid "Skip _Forward"
-msgstr "Salta en_davant"
-
-#: ../data/totem.ui.h:84
-msgid "Skip forward"
-msgstr "Salta avant"
-
-#: ../data/totem.ui.h:85
-msgid "Skip _Backwards"
-msgstr "Salta _enrere"
-
-#: ../data/totem.ui.h:86
-msgid "Skip backwards"
-msgstr "Salta arrere"
-
-#: ../data/totem.ui.h:87
-msgid "14.4 Kbps Modem"
-msgstr "Mòdem a 14.4 Kbps"
-
-#: ../data/totem.ui.h:88
-msgid "19.2 Kbps Modem"
-msgstr "Mòdem a 19.2 Kbps"
-
-#: ../data/totem.ui.h:89
-msgid "28.8 Kbps Modem"
-msgstr "Mòdem a 28.8 Kbps"
-
-#: ../data/totem.ui.h:90
-msgid "33.6 Kbps Modem"
-msgstr "Mòdem a 33.6 Kbps"
-
-#: ../data/totem.ui.h:91
-msgid "34.4 Kbps Modem"
-msgstr "Mòdem a 34.4 Kbps"
-
-#: ../data/totem.ui.h:92
-msgid "56 Kbps Modem/ISDN"
-msgstr "Mòdem/XDSI a 56 Kbps"
-
-#: ../data/totem.ui.h:93
-msgid "112 Kbps Dual ISDN/DSL"
-msgstr "XDSI dual/DSL a 112 Kbps"
-
-#: ../data/totem.ui.h:94
-msgid "256 Kbps DSL/Cable"
-msgstr "DSL/Cable a 256 Kbps"
-
-#: ../data/totem.ui.h:95
-msgid "384 Kbps DSL/Cable"
-msgstr "DSL/Cable a 384 Kbps"
-
-#: ../data/totem.ui.h:96
-msgid "512 Kbps DSL/Cable"
-msgstr "DSL/Cable a 512 Kbps"
-
-#: ../data/totem.ui.h:97
-msgid "1.5 Mbps T1/Intranet/LAN"
-msgstr "T1/Intranet/LAN a 1.5 Mbps"
-
-#: ../data/totem.ui.h:98
-msgid "Intranet/LAN"
-msgstr "Intranet/LAN"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:100
-msgid "Normal"
-msgstr "Normal"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:102
-msgid "Large"
-msgstr "Gran"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:104
-msgid "Extra Large"
-msgstr "Extra gran"
-
-#: ../data/totem.ui.h:105 ../src/totem-properties-view.c:228
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5593
-msgid "Stereo"
-msgstr "Estèreo"
-
-#: ../data/totem.ui.h:106
-msgid "4-channel"
-msgstr "4 canals"
-
-#: ../data/totem.ui.h:107
-msgid "4.1-channel"
-msgstr "Canal 4.1"
-
-#: ../data/totem.ui.h:108
-msgid "5.0-channel"
-msgstr "Canal 5.0"
-
-#: ../data/totem.ui.h:109
-msgid "5.1-channel"
-msgstr "canal 5.1"
-
-#: ../data/totem.ui.h:110
-msgid "AC3 Passthrough"
-msgstr "AC3 directe a la targeta de so"
-
-#: ../data/totem.ui.h:111
-msgid "Totem Preferences"
-msgstr "Preferències del Totem"
-
-#: ../data/totem.ui.h:112
-msgid "Playback"
-msgstr "Reprodueix"
-
-#: ../data/totem.ui.h:113
-msgid "Start playing files from last position"
-msgstr "Inicia la reproducció dels fitxers des de l'última posició"
-
-#: ../data/totem.ui.h:114
-msgid "Networking"
-msgstr "Xarxa"
-
-#: ../data/totem.ui.h:115
-msgid "Connection _speed:"
-msgstr "_Velocitat de connexió:"
-
-#: ../data/totem.ui.h:116
-msgid "Text Subtitles"
-msgstr "Subtítols"
-
-#: ../data/totem.ui.h:117
-msgid "_Load subtitle files when movie is loaded"
-msgstr "_Carrega els fitxers de subtítols quan es carrega una pel·lícula"
-
-#: ../data/totem.ui.h:118
-msgid "_Font:"
-msgstr "_Tipus de lletra:"
-
-#: ../data/totem.ui.h:119
-msgid "_Encoding:"
-msgstr "_Codificació:"
-
-#: ../data/totem.ui.h:120
-msgid "External Chapters"
-msgstr "Capítols externs"
-
-#: ../data/totem.ui.h:121
-msgid "Load _chapter files when movie is loaded"
-msgstr "_Carrega els fitxers de capítols quan es carrega una pel·lícula"
-
-#. Tab label in the Preferences dialogue
-#: ../data/totem.ui.h:124
-msgid "Display"
-msgstr "Pantalla"
-
-#: ../data/totem.ui.h:125
-msgid "_Resize the window when a new video is loaded"
-msgstr "_Redimensiona la finestra quan es carrega un vídeo nou"
-
-#: ../data/totem.ui.h:126
-msgid "Disable _deinterlacing of interlaced videos"
-msgstr "Inhabilita el _desentrallaçat dels vídeos entrellaçats"
-
-#: ../data/totem.ui.h:127
-msgid "Disable screensaver when playing "
-msgstr "Inhabilita l'estalvi de pantalla quan es reproduïsca "
-
-#: ../data/totem.ui.h:129
-msgid "Video or Audio"
-msgstr "Vídeo o àudio"
-
-#: ../data/totem.ui.h:130
-msgid "Visual Effects"
-msgstr "Efectes visuals"
-
-#: ../data/totem.ui.h:131
-msgid "Show _visual effects when an audio file is played"
-msgstr "Mostra efectes _visuals quan es reprodueix un fitxer d'àudio"
-
-#: ../data/totem.ui.h:132
-msgid "_Type of visualization:"
-msgstr "_Tipus de visualització:"
-
-#: ../data/totem.ui.h:133
-msgid "Visualization _size:"
-msgstr "Mida de la vi_sualització:"
-
-#: ../data/totem.ui.h:134
-msgid "Color Balance"
-msgstr "Balanç del color"
-
-#: ../data/totem.ui.h:135
-msgid "_Brightness:"
-msgstr "_Brillantor:"
-
-#: ../data/totem.ui.h:136
-msgid "Co_ntrast:"
-msgstr "Co_ntrast:"
-
-#: ../data/totem.ui.h:137
-msgid "Sat_uration:"
-msgstr "Sat_uració:"
-
-#: ../data/totem.ui.h:138
-msgid "_Hue:"
-msgstr "_To:"
-
-#: ../data/totem.ui.h:139
-msgid "Reset to _Defaults"
-msgstr "Torna als valors per _defecte"
-
-#: ../data/totem.ui.h:140
-msgid "Audio Output"
-msgstr "Eixida d'àudio"
-
-#: ../data/totem.ui.h:141
-msgid "_Audio output type:"
-msgstr "Tipus d'eixid_a d'àudio:"
-
-#: ../data/totem.ui.h:145
-msgid "Time seek bar"
-msgstr "Barra de cerca de temps"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
-msgid "Allow the screensaver to activate when playing audio"
-msgstr ""
-"Permet que s'active l'estalvi de pantalla quan s'estiga reproduint àudio"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
-msgid ""
-"Allow the screensaver to activate when playing audio. Disable if you have "
-"monitor-powered speakers."
-msgstr ""
-"Permet que s'active l'estalvi de pantalla quan s'estiga reproduint àudio. No "
-"ho habiliteu si teniu un monitor amb altaveus."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
-msgid "Show visual effects when no video is displayed"
-msgstr "Mostra efectes visuals quan no es mostre cap vídeo"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
-msgid "Show visual effects when playing an audio only file."
-msgstr "Mostra efectes visuals quan es reproduïsca un fitxer d'àudio."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
-msgid "Name of the visual effects plugin"
-msgstr "Nom del connector d'efectes visuals"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
-msgid "The brightness of the video"
-msgstr "La brillantor del vídeo"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
-msgid "The contrast of the video"
-msgstr "El contrast del vídeo"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
-msgid "The hue of the video"
-msgstr "El to del vídeo"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
-msgid "The saturation of the video"
-msgstr "La saturació del vídeo"
-
-# FIXME: "canvas" (josep)
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
-msgid "Resize the canvas automatically on file load"
-msgstr "Redimensiona el llenç automàticament en carregar un fitxer"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
-msgid "Network connection speed"
-msgstr "Velocitat de connexió a la xarxa"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
-msgid ""
-"Approximate network connection speed, used to select quality on media over "
-"the network."
-msgstr ""
-"Velocitat estimada de la connexió a la xarxa. S'utilitza per seleccionar la "
-"qualitat dels fitxers multimèdia a través de la xarxa."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
-msgid "Repeat mode"
-msgstr "Mode de repetició"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
-msgid "Shuffle mode"
-msgstr "Mode aleatori"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
-msgid "Whether to disable deinterlacing for interlaced movies"
-msgstr ""
-"Si s'ha d'inhabilitar el desentrallaçat de les pel·lícules entrellaçades"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
-msgid "Whether to enable debug for the playback engine"
-msgstr "Si s'ha d'habilitar la depuració per al motor de reproducció"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
-msgid "Type of audio output to use"
-msgstr "Tipus d'eixida d'àudio a utilitzar"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
-msgid "Visualization quality setting"
-msgstr "Paràmetre de la qualitat de la visualització"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
-msgid "Quality setting for the audio visualization."
-msgstr "Paràmetre de qualitat per a la visualització d'àudio."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
-msgid "Network buffering threshold"
-msgstr "Llindar d'utilització de la memòria intermèdia de xarxa"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
-msgid ""
-"Amount of data to buffer for network streams before starting to display the "
-"stream (in seconds)."
-msgstr ""
-"Quantitat de dades (en segons) a emmagatzemar a la memòria intermèdia per "
-"als fluxos de la xarxa abans de començar-los a mostrar."
+msgstr "Salta en_davant"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
-msgid "Subtitle font"
-msgstr "Tipus de lletra dels subtítols"
+#: ../data/totem.ui.h:77
+msgid "Skip forward"
+msgstr "Salta avant"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
-msgid "Pango font description for subtitle rendering."
-msgstr ""
-"Descripció del tipus de lletra Pango per a la representació dels subtítols."
+#: ../data/totem.ui.h:78
+msgid "Skip _Backwards"
+msgstr "Salta _enrere"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
-msgid "Subtitle encoding"
-msgstr "Codificació dels subtítols"
+#: ../data/totem.ui.h:79
+msgid "Skip backwards"
+msgstr "Salta arrere"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
-msgid "Encoding character set for subtitle."
-msgstr "Codificació del joc de caràcters dels subtítols."
+#: ../data/totem.ui.h:82
+msgid "Time seek bar"
+msgstr "Barra de cerca de temps"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
-msgid "Default location for the \"Open...\" dialogs"
-msgstr "Ubicació predeterminada per als diàlegs «Obri...»"
+#: ../data/uri.ui.h:1
+msgid "Enter the _address of the file you would like to open:"
+msgstr "Introduïu l'_adreça del fitxer que vulgueu obrir:"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
-msgid ""
-"Default location for the \"Open...\" dialogs. Default is the current "
-"directory."
-msgstr ""
-"Ubicació predeterminada per als diàlegs «Obri...». La predeterminada és el "
-"directori actual."
+#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
+msgid "_Add to Playlist"
+msgstr "_Afig a la llista de reproducció"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
-msgid "Default location for the \"Take Screenshot\" dialogs"
-msgstr "Ubicació predeterminada per als diàlegs «Feu una captura de pantalla»"
+#: ../data/video-list.ui.h:2
+msgid "Add the video to the playlist"
+msgstr "Afig el vídeo a la llista de reproducció"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
-msgid ""
-"Default location for the \"Take Screenshot\" dialogs. Default is the "
-"Pictures directory."
-msgstr ""
-"Ubicació predeterminada per als diàlegs «Feu una captura de pantalla». La "
-"predeterminada és el directori d'imatges."
+#: ../src/backend/bacon-video-widget.c:1643
+msgid "Password requested for RTSP server"
+msgstr "El servidor de RTSP sol·licita la contrasenya"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
-msgid "Whether to disable the plugins in the user's home directory"
-msgstr ""
-"Si s'han d'inhabilitar els connectors del directori d'inici de l'usuari"
+#: ../src/backend/bacon-video-widget.c:2940
+#, c-format
+msgid "Audio Track #%d"
+msgstr "Pista d'àudio #%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
-msgid "Whether to disable the keyboard shortcuts"
-msgstr "Si s'han d'inhabilitar les dreceres de teclat"
+#: ../src/backend/bacon-video-widget.c:2944
+#, c-format
+msgid "Subtitle #%d"
+msgstr "Subtítol #%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
-msgid "Whether to autoload text subtitle files when a movie is loaded"
-msgstr ""
-"Si s'han de carregar automàticament els fitxers de subtítols quan es "
-"reproduïsca una pel·lícula"
+#: ../src/backend/bacon-video-widget.c:3341
+msgid "The server you are trying to connect to is not known."
+msgstr "Es desconeix el servidor al qual esteu intentant connectar."
+
+#: ../src/backend/bacon-video-widget.c:3344
+msgid "The connection to this server was refused."
+msgstr "S'ha refusat la connexió a este servidor."
+
+#: ../src/backend/bacon-video-widget.c:3347
+msgid "The specified movie could not be found."
+msgstr "No s'ha trobat la pel·lícula especificada."
+
+#: ../src/backend/bacon-video-widget.c:3354
+msgid "The server refused access to this file or stream."
+msgstr "El servidor ha rebutjat l'accés a este fitxer o flux."
+
+#: ../src/backend/bacon-video-widget.c:3360
+msgid "Authentication is required to access this file or stream."
+msgstr "Es requereix autenticació per a accedir a este fitxer o flux."
+
+#: ../src/backend/bacon-video-widget.c:3367
+msgid "You are not allowed to open this file."
+msgstr "No teniu permís per a obrir este fitxer."
+
+#: ../src/backend/bacon-video-widget.c:3372
+msgid "This location is not a valid one."
+msgstr "La ubicació no és vàlida."
+
+#: ../src/backend/bacon-video-widget.c:3380
+msgid "The movie could not be read."
+msgstr "No s'ha pogut llegir la pel·lícula."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
-msgid "Whether to autoload external chapter files when a movie is loaded"
+#. should be exactly one missing thing (source or converter)
+#: ../src/backend/bacon-video-widget.c:3403
+#: ../src/backend/bacon-video-widget.c:3411
+#, c-format
+msgid "The playback of this movie requires a %s plugin which is not installed."
+msgid_plural ""
+"The playback of this movie requires the following decoders which are not "
+"installed:\n"
+"\n"
+"%s"
+msgstr[0] "Hauríeu d'instal·lar el connector %s per reproduir esta pel·lícula."
+msgstr[1] ""
+"Hauríeu d'instal·lar els connectors següents per reproduir esta pel·lícula:\n"
+"\n"
+"%s"
+
+#: ../src/backend/bacon-video-widget.c:3422
+msgid ""
+"An audio or video stream is not handled due to missing codecs. You might "
+"need to install additional plugins to be able to play some types of movies"
 msgstr ""
-"Si s'han de carregar automàticament els fitxers de capítols externs quan es "
-"carrega una pel·lícula"
+"No es pot gestionar el flux d'àudio o de vídeo perquè manca algun còdec. "
+"Potser cal que instal·leu connectors addicionals per poder veure alguns "
+"tipus de pel·lícules"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+#: ../src/backend/bacon-video-widget.c:3432
 msgid ""
-"Whether to remember the position of played audio/video files when pausing or "
-"closing them"
+"This file cannot be played over the network. Try downloading it locally "
+"first."
 msgstr ""
-"Si s'ha de recordar la posició dels fitxers d'àudio/vídeo quan s'hi faça una "
-"pausa o es tanquen"
+"No es pot reproduir este fitxer a través de la xarxa. Proveu de baixar-lo al "
+"disc primer."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:35
-msgid "Active plugins list"
-msgstr "Llista dels connectors actius"
+#: ../src/backend/bacon-video-widget.c:5514 ../src/totem-properties-view.c:228
+msgid "Surround"
+msgstr "Envoltant"
+
+#: ../src/backend/bacon-video-widget.c:5516 ../src/totem-properties-view.c:230
+msgid "Mono"
+msgstr "Mono"
+
+#: ../src/backend/bacon-video-widget.c:5801
+msgid "Media contains no supported video streams."
+msgstr "El medi no conté cap flux de vídeo conegut."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:36
+#: ../src/backend/bacon-video-widget.c:5983
 msgid ""
-"A list of the names of the plugins which are currently active (loaded and "
-"running)."
+"Some necessary plug-ins are missing. Make sure that the program is correctly "
+"installed."
 msgstr ""
-"Una llista dels noms dels connectors que estan actius actualment (carregats "
-"i en funcionament)."
-
-#: ../data/uri.ui.h:1
-msgid "Enter the _address of the file you would like to open:"
-msgstr "Introduïu l'_adreça del fitxer que vulgueu obrir:"
+"Falten alguns connectors necessaris. Assegureu-vos que el programa està "
+"instal·lat correctament."
 
 #: ../src/eggdesktopfile.c:165
 #, c-format
@@ -988,6 +1050,31 @@
 msgid "Show session management options"
 msgstr "Mostra les opcions de la gestió de la sessió"
 
+#. hour:minutes:seconds
+#. Translators: This is a time format, like "9:05:02" for 9
+#. * hours, 5 minutes, and 2 seconds. You may change ":" to
+#. * the separator that your locale uses or use "%Id" instead
+#. * of "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:56
+#: ../src/plugins/skipto/totem-time-entry.c:57
+#, c-format
+msgctxt "long time format"
+msgid "%d:%02d:%02d"
+msgstr "%d:%02d:%02d"
+
+#. minutes:seconds
+#. Translators: This is a time format, like "5:02" for 5
+#. * minutes and 2 seconds. You may change ":" to the
+#. * separator that your locale uses or use "%Id" instead of
+#. * "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:65
+#, c-format
+msgctxt "short time format"
+msgid "%d:%02d"
+msgstr "%d:%02d"
+
 #. Title
 #. Artist
 #. Album
@@ -1092,10 +1179,14 @@
 msgstr[0] "%d quadre per segon"
 msgstr[1] "%d quadres per segon"
 
-#: ../src/totem-audio-preview.c:168
+#: ../src/totem-audio-preview.c:137
 msgid "Audio Preview"
 msgstr "Previsualització d'àudio"
 
+#: ../src/totem.c:240
+msgid "Verify your system installation. Totem will now exit."
+msgstr "Verifiqueu la instal·lació del sistema. El Totem eixirà ara."
+
 #: ../src/totem-cell-renderer-video.c:126
 msgid "Unknown video"
 msgstr "Vídeo desconegut"
@@ -1108,7 +1199,7 @@
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: ../src/totem-fullscreen.c:616
+#: ../src/totem-fullscreen.c:573
 msgid "No File"
 msgstr "Cap fitxer"
 
@@ -1126,7 +1217,7 @@
 msgid "Make sure that Totem is properly installed."
 msgstr "Assegureu-vos que el Totem està instal·lat correctament."
 
-#: ../src/totem-interface.c:347
+#: ../src/totem-interface.c:357
 msgid ""
 "Totem 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 "
@@ -1138,7 +1229,7 @@
 "per la Free Software Foundation; ja siga la versió 2 de la llicència o bé "
 "(si ho preferiu) qualsevol altra versió posterior."
 
-#: ../src/totem-interface.c:351
+#: ../src/totem-interface.c:361
 msgid ""
 "Totem is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -1150,7 +1241,7 @@
 "PER UN PROPÒSIT PARTICULAR. Vegeu la Llicència Pública General de GNU per "
 "obtindre'n més detalls."
 
-#: ../src/totem-interface.c:355
+#: ../src/totem-interface.c:365
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Totem; if not, write to the Free Software Foundation, Inc., 59 Temple Place, "
@@ -1160,7 +1251,7 @@
 "juntament amb el Totem; en cas contrari, escriviu a la Free Software "
 "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA"
 
-#: ../src/totem-interface.c:358
+#: ../src/totem-interface.c:368
 msgid ""
 "Totem contains an exception to allow the use of proprietary GStreamer "
 "plugins."
@@ -1169,203 +1260,98 @@
 "propietat."
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:190
+#: ../src/totem-menu.c:291
 msgid "None"
 msgstr "Cap"
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:195
+#: ../src/totem-menu.c:296
 msgctxt "Language"
 msgid "Auto"
 msgstr "Auto"
 
-#. Translators:
-#. * This is not a JPEG image, but a disc image, for example,
-#. * an ISO file
-#: ../src/totem-menu.c:765
-#, c-format
-msgid "Play Image '%s'"
-msgstr "Reprodueix la imatge «%s»"
-
-#: ../src/totem-menu.c:768 ../src/totem-menu.c:851
-#, c-format
-msgid "device%d"
-msgstr "dispositiu%d"
-
-#: ../src/totem-menu.c:848
-#, c-format
-msgid "Play Disc '%s'"
-msgstr "Reprodueix el disc «%s»"
-
-#. This lists the back-end type and version, such as
-#. * Movie Player using GStreamer 0.10.1
-#: ../src/totem-menu.c:1189
-#, c-format
-msgid "Movie Player using %s"
-msgstr "Reproductor de vídeo que utilitza el %s"
-
-#: ../src/totem-menu.c:1193
+#: ../src/totem-menu.c:788
 msgid "Copyright © 2002-2009 Bastien Nocera"
 msgstr "Copyright © 2002-2009 Bastien Nocera"
 
-#: ../src/totem-menu.c:1198
+#: ../src/totem-menu.c:792
 msgid "translator-credits"
 msgstr ""
 "Jordi Mallach \n"
 "Gil Forcada "
 
-#: ../src/totem-menu.c:1202
+#: ../src/totem-menu.c:796
 msgid "Totem Website"
 msgstr "Pàgina web del Totem"
 
-#: ../src/totem-menu.c:1236
+#: ../src/totem-menu.c:827
 msgid "Configure Plugins"
 msgstr "Configura els connectors"
 
+#: ../src/totem-object.c:162
+#, c-format
+msgid ""
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"%s\n"
+"Executeu «%s --help» per veure una llista completa de les opcions de la "
+"línia d'ordes.\n"
+
 #. Translators: %s is the totem version number
-#: ../src/totem-object.c:471
+#: ../src/totem-object.c:591
 #, c-format
 msgid "Totem %s"
 msgstr "Totem %s"
 
-#: ../src/totem-object.c:1047 ../browser-plugin/totem-plugin-viewer.c:367
-msgid "Playing"
-msgstr "S'està reproduint"
-
-#: ../src/totem-object.c:1049 ../src/totem-options.c:52
+#: ../src/totem-object.c:1168 ../src/totem-options.c:52
 msgid "Pause"
 msgstr "Fes una pausa"
 
-#: ../src/totem-object.c:1054 ../browser-plugin/totem-plugin-viewer.c:363
-msgid "Paused"
-msgstr "En pausa"
-
-#: ../src/totem-object.c:1056 ../src/totem-object.c:1066
+#: ../src/totem-object.c:1175 ../src/totem-object.c:1185
 #: ../src/totem-options.c:51
 msgid "Play"
 msgstr "Reprodueix"
 
-#: ../src/totem-object.c:1061 ../src/totem-object.c:1659
-#: ../src/totem-statusbar.c:115 ../browser-plugin/totem-plugin-viewer.c:351
-msgid "Stopped"
-msgstr "Parat"
-
-#: ../src/totem-object.c:1142 ../src/totem-object.c:1169
-#: ../src/totem-object.c:1799 ../src/totem-object.c:1963
+#: ../src/totem-object.c:1267 ../src/totem-object.c:1294
+#: ../src/totem-object.c:1787 ../src/totem-object.c:1942
 #, c-format
 msgid "Totem could not play '%s'."
 msgstr "El Totem no ha pogut reproduir «%s»."
 
-#: ../src/totem-object.c:1246
-#, c-format
-msgid ""
-"Totem could not play this media (%s) although a plugin is present to handle "
-"it."
-msgstr ""
-"El Totem no ha pogut reproduir este medi (%s) encara que hi ha un connector "
-"per gestionar-lo."
-
-#: ../src/totem-object.c:1247
-msgid ""
-"You might want to check that a disc is present in the drive and that it is "
-"correctly configured."
-msgstr ""
-"Hauríeu de comprovar que hi ha un disc en la unitat i que està correctament "
-"configurada."
-
-#: ../src/totem-object.c:1255
-msgid "More information about media plugins"
-msgstr "Més informació sobre els connectors de medi"
-
-#: ../src/totem-object.c:1256
-msgid ""
-"Please install the necessary plugins and restart Totem to be able to play "
-"this media."
-msgstr ""
-"Instal·leu els connectors necessaris i reinicieu el Totem per poder "
-"reproduir este medi."
-
-#: ../src/totem-object.c:1258
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because it does not have the "
-"appropriate plugins to be able to read from the disc."
-msgstr ""
-"El Totem no pot reproduir este tipus de medi (%s) perquè no té els "
-"connectors adequats per poder llegir-lo del disc."
-
-#: ../src/totem-object.c:1260
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because you do not have the "
-"appropriate plugins to handle it."
-msgstr ""
-"El Totem no pot reproduir este tipus de medi (%s) perquè no teniu el "
-"connector adequat per gestionar-lo."
-
-#: ../src/totem-object.c:1263
-#, c-format
-msgid "Totem cannot play this type of media (%s) because it is not supported."
-msgstr ""
-"El Totem no pot reproduir este tipus de medi (%s) perquè no el sap utilitzar."
-
-#: ../src/totem-object.c:1264
-msgid "Please insert another disc to play back."
-msgstr "Inseriu un altre disc a reproduir."
-
-#: ../src/totem-object.c:1300
-msgid "Totem was not able to play this disc."
-msgstr "El Totem no pot reproduir este disc."
-
-#: ../src/totem-object.c:1301 ../src/totem-object.c:4228
-msgid "No reason."
-msgstr "Sense motiu."
-
-#: ../src/totem-object.c:1315
-msgid "Totem does not support playback of Audio CDs"
-msgstr "El Totem no sap reproduir els CD d'àudio"
-
-#: ../src/totem-object.c:1316
-msgid "Please consider using a music player or a CD extractor to play this CD"
-msgstr ""
-"Podeu utilitzar un reproductor de música o un extractor de CD per reproduir-"
-"lo"
-
-#: ../src/totem-object.c:1805
+#: ../src/totem-object.c:1793
 msgid "No error message"
 msgstr "No hi ha cap missatge d'error"
 
-#: ../src/totem-object.c:2154
+#: ../src/totem-object.c:2133
 msgid "Totem could not display the help contents."
 msgstr "El Totem no ha pogut mostrar els continguts de l'ajuda."
 
-#: ../src/totem-object.c:2493 ../src/totem-object.c:2495
-#: ../browser-plugin/totem-plugin-viewer.c:1417
-msgid "An error occurred"
-msgstr "S'ha produït un error"
-
-#: ../src/totem-object.c:4063 ../src/totem-object.c:4065
+#: ../src/totem-object.c:4019 ../src/totem-object.c:4021
 msgid "Previous Chapter/Movie"
 msgstr "Capítol/pel·lícula anterior"
 
-#: ../src/totem-object.c:4072 ../src/totem-object.c:4074
+#: ../src/totem-object.c:4028 ../src/totem-object.c:4030
 msgid "Play / Pause"
 msgstr "Reprodueix / Fes una pausa"
 
-#: ../src/totem-object.c:4082 ../src/totem-object.c:4084
+#: ../src/totem-object.c:4038 ../src/totem-object.c:4040
 msgid "Next Chapter/Movie"
 msgstr "Capítol/pel·lícula següent"
 
-#. Translators: this is the tooltip text for the fullscreen button in the controls box in Totem's main window.
 #. Translators: this is the accessibility text for the fullscreen button in the controls box in Totem's main window.
-#: ../src/totem-object.c:4096 ../src/totem-object.c:4098
+#: ../src/totem-object.c:4051 ../src/totem-object.c:4053
 msgid "Fullscreen"
 msgstr "Pantalla completa"
 
-#: ../src/totem-object.c:4228
+#: ../src/totem-object.c:4184
 msgid "Totem could not startup."
 msgstr "No s'ha pogut executar el Totem."
 
+#: ../src/totem-object.c:4184
+msgid "No reason."
+msgstr "Sense motiu."
+
 #: ../src/totem-open-location.c:182
 msgid "Open Location..."
 msgstr "Obri una ubicació..."
@@ -1439,118 +1425,112 @@
 msgid "Movies to play"
 msgstr "Pel·lícules a reproduir"
 
-#: ../src/totem-options.c:117
+#: ../src/totem-options.c:79
+msgid "- Play movies and songs"
+msgstr "- Reproduïu vídeos i cançons"
+
+#: ../src/totem-options.c:142
 msgid "Can't enqueue and replace at the same time"
 msgstr "No es pot enviar a la cua i reemplaçar alhora"
 
 #. By extension entry
-#: ../src/totem-playlist.c:161
+#: ../src/totem-playlist.c:162
 msgid "MP3 ShoutCast playlist"
 msgstr "Llista de reproducció MP3 ShoutCast"
 
-#: ../src/totem-playlist.c:162
+#: ../src/totem-playlist.c:163
 msgid "MP3 audio (streamed)"
 msgstr "Àudio MP3 (en flux)"
 
-#: ../src/totem-playlist.c:163
+#: ../src/totem-playlist.c:164
 msgid "MP3 audio (streamed, DOS format)"
 msgstr "Àudio MP3 (en flux, format DOS)"
 
-#: ../src/totem-playlist.c:164
+#: ../src/totem-playlist.c:165
 msgid "XML Shareable Playlist"
 msgstr "Llista de reproducció XML per compartir"
 
 #. This is "Title 3", where title is a DVD title
 #. * Note: NOT a DVD chapter
-#: ../src/totem-playlist.c:347
+#: ../src/totem-playlist.c:348
 #, c-format
 msgid "Title %d"
 msgstr "Títol %d"
 
-#: ../src/totem-playlist.c:446
+#: ../src/totem-playlist.c:447
 msgid "Could not save the playlist"
 msgstr "No s'ha pogut alçar la llista de reproducció"
 
-#: ../src/totem-playlist.c:1021
+#: ../src/totem-playlist.c:1022
 msgid "Save Playlist"
 msgstr "Alça la llista de reproducció"
 
 #. translators: Playlist is the default saved playlist filename,
 #. * without the suffix
-#: ../src/totem-playlist.c:1033 ../src/totem-playlist.c:1264
-#: ../src/totem-sidebar.c:142
+#: ../src/totem-playlist.c:1034 ../src/totem-playlist.c:1263
+#: ../src/totem-sidebar.c:145
 msgid "Playlist"
 msgstr "Llista de reproducció"
 
-#: ../src/totem-playlist.c:1857
+#: ../src/totem-playlist.c:1862
 #, c-format
 msgid "The playlist '%s' could not be parsed. It might be damaged."
 msgstr ""
 "No s'ha pogut analitzar la llista de reproducció «%s», pot estar malmesa."
 
-#: ../src/totem-playlist.c:1858
+#: ../src/totem-playlist.c:1863
 msgid "Playlist error"
 msgstr "S'ha produït un error de la llista de reproducció"
 
-#: ../src/totem-preferences.c:295
+#: ../src/totem-preferences.c:297
 msgid "Preferences"
 msgstr "Preferències"
 
-#: ../src/totem-preferences.c:451
+#: ../src/totem-preferences.c:445
 msgid "Select Subtitle Font"
 msgstr "Seleccioneu el tipus de lletra per als subtítols"
 
-#: ../src/totem-properties-main.c:115 ../src/totem-properties-view.c:266
+#: ../src/totem-properties-main.c:116 ../src/totem-properties-view.c:271
 msgid "Audio/Video"
 msgstr "Àudio/Vídeo"
 
-#: ../src/totem-properties-view.c:128
+#: ../src/totem-properties-view.c:131
 msgid "N/A"
 msgstr "N/D"
 
-#: ../src/totem-properties-view.c:157
+#: ../src/totem-properties-view.c:160
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 msgctxt "Stream bit rate"
 msgid "N/A"
 msgstr "N/D"
 
-#: ../src/totem-properties-view.c:160
+#: ../src/totem-properties-view.c:163
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 #, c-format
 msgid "%d kbps"
 msgstr "%d Kbps"
 
-#: ../src/totem-properties-view.c:177
+#: ../src/totem-properties-view.c:180
 #: ../src/plugins/properties/totem-movie-properties.c:149
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../src/totem-properties-view.c:209
+#: ../src/totem-properties-view.c:212
 #: ../src/plugins/properties/totem-movie-properties.c:166
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: ../src/totem-properties-view.c:216
+#: ../src/totem-properties-view.c:220
 #: ../src/plugins/properties/totem-movie-properties.c:166
 msgctxt "Sample rate"
 msgid "N/A"
 msgstr "N/D"
 
-#: ../src/totem-properties-view.c:224
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5589
-msgid "Surround"
-msgstr "Envoltant"
-
-#: ../src/totem-properties-view.c:226
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5591
-msgid "Mono"
-msgstr "Mono"
-
-#: ../src/totem-properties-view.c:236
+#: ../src/totem-properties-view.c:241
 msgctxt "Number of audio channels"
 msgid "N/A"
 msgstr "N/D"
@@ -1583,8 +1563,8 @@
 #. eg: 75 %
 #: ../src/totem-statusbar.c:250
 #, c-format
-msgid "%d %%"
-msgstr "%d%%"
+msgid "%lf %%"
+msgstr "%lf %%"
 
 #. eg: Paused, 0:32 / 1:05
 #: ../src/totem-statusbar.c:325
@@ -1595,8 +1575,8 @@
 #. eg: Buffering, 75 %
 #: ../src/totem-statusbar.c:330
 #, c-format
-msgid "%s, %d %%"
-msgstr "%s, %d %%"
+msgid "%s, %f %%"
+msgstr "%s, %f %%"
 
 #: ../src/totem-subtitle-encoding.c:156
 msgid "Current Locale"
@@ -1724,241 +1704,107 @@
 msgstr "Turc"
 
 #: ../src/totem-subtitle-encoding.c:306 ../src/totem-subtitle-encoding.c:308
-#: ../src/totem-subtitle-encoding.c:310 ../src/totem-subtitle-encoding.c:312
-#: ../src/totem-subtitle-encoding.c:314
-msgid "Unicode"
-msgstr "Unicode"
-
-#: ../src/totem-subtitle-encoding.c:317 ../src/totem-subtitle-encoding.c:319
-#: ../src/totem-subtitle-encoding.c:321 ../src/totem-subtitle-encoding.c:323
-#: ../src/totem-subtitle-encoding.c:325
-msgid "Western"
-msgstr "Occidental"
-
-#: ../src/totem-subtitle-encoding.c:328 ../src/totem-subtitle-encoding.c:330
-#: ../src/totem-subtitle-encoding.c:332
-msgid "Vietnamese"
-msgstr "Vietnamita"
-
-#: ../src/totem-video-list.c:330
-msgid "No video URI"
-msgstr "No hi ha cap URI de vídeo"
-
-#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
-#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
-#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
-#: ../src/totem-video-thumbnailer.c:872
-#, c-format
-msgid ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-msgstr ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-
-#: ../src/totem-video-thumbnailer.c:873
-msgid "Filename"
-msgstr "Nom del fitxer"
+#: ../src/totem-subtitle-encoding.c:310 ../src/totem-subtitle-encoding.c:312
+#: ../src/totem-subtitle-encoding.c:314
+msgid "Unicode"
+msgstr "Unicode"
 
-#: ../src/totem-video-thumbnailer.c:875
-msgid "Resolution"
-msgstr "Resolució"
+#: ../src/totem-subtitle-encoding.c:317 ../src/totem-subtitle-encoding.c:319
+#: ../src/totem-subtitle-encoding.c:321 ../src/totem-subtitle-encoding.c:323
+#: ../src/totem-subtitle-encoding.c:325
+msgid "Western"
+msgstr "Occidental"
 
-#: ../src/totem-video-thumbnailer.c:878
-msgid "Duration"
-msgstr "Durada"
+#: ../src/totem-subtitle-encoding.c:328 ../src/totem-subtitle-encoding.c:330
+#: ../src/totem-subtitle-encoding.c:332
+msgid "Vietnamese"
+msgstr "Vietnamita"
 
-#: ../src/totem-uri.c:506 ../src/plugins/chapters/totem-chapters.c:998
+#: ../src/totem-uri.c:343 ../src/plugins/chapters/totem-chapters.c:998
 msgid "All files"
 msgstr "Tots els fitxers"
 
-#: ../src/totem-uri.c:511 ../src/plugins/chapters/totem-chapters.c:995
+#: ../src/totem-uri.c:348 ../src/plugins/chapters/totem-chapters.c:995
 msgid "Supported files"
 msgstr "Fitxers permesos"
 
-#: ../src/totem-uri.c:523
+#: ../src/totem-uri.c:360
 msgid "Audio files"
 msgstr "Fitxers d'àudio"
 
-#: ../src/totem-uri.c:531
+#: ../src/totem-uri.c:368
 msgid "Video files"
 msgstr "Fitxers de vídeo"
 
-#: ../src/totem-uri.c:541
+#: ../src/totem-uri.c:378
 msgid "Subtitle files"
 msgstr "Fitxers de subtítols"
 
-#: ../src/totem-uri.c:593
+#: ../src/totem-uri.c:430
 msgid "Select Text Subtitles"
 msgstr "Seleccioneu els subtítols"
 
-#: ../src/totem-uri.c:656
+#: ../src/totem-uri.c:495
 msgid "Select Movies or Playlists"
 msgstr "Seleccioneu pel·lícules o llistes de reproducció"
 
-#. Options parsing
-#: ../src/totem.c:204
-msgid "- Play movies and songs"
-msgstr "- Reproduïu vídeos i cançons"
-
-#: ../src/totem.c:220
-#, c-format
-msgid ""
-"%s\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"%s\n"
-"Executeu «%s --help» per veure una llista completa de les opcions de la "
-"línia d'ordes.\n"
-
-#: ../src/totem.c:262 ../src/totem.c:273
-#: ../browser-plugin/totem-plugin-viewer.c:663
-#: ../browser-plugin/totem-plugin-viewer.c:1793
-msgid "Totem Movie Player"
-msgstr "Reproductor de vídeo Totem"
-
-#: ../src/totem.c:263 ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Could not initialize the thread-safe libraries."
-msgstr "No s'han pogut inicialitzar les biblioteques que permeten fils segurs."
-
-#: ../src/totem.c:263
-msgid "Verify your system installation. Totem will now exit."
-msgstr "Verifiqueu la instal·lació del sistema. El Totem eixirà ara."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:1589
-msgid "Password requested for RTSP server"
-msgstr "El servidor de RTSP sol·licita la contrasenya"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2858
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2862
-#, c-format
-msgid "Audio Track #%d"
-msgstr "Pista d'àudio #%d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2890
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2894
-#, c-format
-msgid "Subtitle #%d"
-msgstr "Subtítol #%d"
+#: ../src/totem-uri.c:499
+msgid "Add Directory"
+msgstr "Afegiu un directori"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3298
-msgid ""
-"The requested audio output was not found. Please select another audio output "
-"in the Multimedia Systems Selector."
-msgstr ""
-"No s'ha trobat l'eixida d'àudio demanada. Seleccioneu una altra eixida "
-"d'àudio en el selector de sistemes multimèdia."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3303
-msgid "Location not found."
-msgstr "No s'ha trobat la ubicació."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3307
-msgid ""
-"Could not open location; you might not have permission to open the file."
-msgstr ""
-"No s'ha pogut obrir la ubicació. Potser no teniu permís per obrir el fitxer."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3318
-msgid ""
-"The video output is in use by another application. Please close other video "
-"applications, or select another video output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"Una altra aplicació ja utilitza l'eixida de vídeo. Tanqueu les altres "
-"aplicacions de vídeo, o seleccioneu una altra eixida de vídeo al selector de "
-"sistemes multimèdia."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3324
-msgid ""
-"The audio output is in use by another application. Please select another "
-"audio output in the Multimedia Systems Selector. You may want to consider "
-"using a sound server."
-msgstr ""
-"Una altra aplicació ja utilitza l'eixida d'àudio. Seleccioneu una altra "
-"eixida d'àudio al selector de sistemes multimèdia. Potser hauríeu de "
-"considerar utilitzar un servidor de so."
+#: ../src/totem-video-list.c:330
+msgid "No video URI"
+msgstr "No hi ha cap URI de vídeo"
 
-#. should be exactly one missing thing (source or converter)
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3342
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3348
+#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
+#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
+#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
+#: ../src/totem-video-thumbnailer.c:841
 #, c-format
-msgid "The playback of this movie requires a %s plugin which is not installed."
-msgid_plural ""
-"The playback of this movie requires the following decoders which are not "
-"installed:\n"
-"\n"
-"%s"
-msgstr[0] "Hauríeu d'instal·lar el connector %s per reproduir esta pel·lícula."
-msgstr[1] ""
-"Hauríeu d'instal·lar els connectors següents per reproduir esta pel·lícula:\n"
-"\n"
-"%s"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3374
 msgid ""
-"Cannot play this file over the network. Try downloading it to disk first."
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 msgstr ""
-"No es pot reproduir este fitxer a través de la xarxa. Proveu de baixar-lo al "
-"disc primer."
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5878
-msgid "Media contains no supported video streams."
-msgstr "El medi no conté cap flux de vídeo conegut."
+#: ../src/totem-video-thumbnailer.c:842
+msgid "Filename"
+msgstr "Nom del fitxer"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6053
-msgid ""
-"Failed to create a GStreamer play object. Please check your GStreamer "
-"installation."
-msgstr ""
-"No s'ha pogut crear un objecte de reproducció del GStreamer. Comproveu la "
-"instal·lació del GStreamer."
+#: ../src/totem-video-thumbnailer.c:844
+msgid "Resolution"
+msgstr "Resolució"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6173
-msgid ""
-"Failed to open audio output. You may not have permission to open the sound "
-"device, or the sound server may not be running. Please select another audio "
-"output in the Multimedia Systems Selector."
-msgstr ""
-"No s'ha pogut obrir l'eixida d'àudio. Pot ser que no tingueu permís per "
-"obrir el dispositiu d'àudio, o que el servidor de so no s'estiga executant. "
-"Seleccioneu una altra eixida de so al selector de sistemes multimèdia."
+#: ../src/totem-video-thumbnailer.c:847
+msgid "Duration"
+msgstr "Durada"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6193
-msgid ""
-"Could not find the audio output. You may need to install additional "
-"GStreamer plugins, or select another audio output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"No s'ha trobat l'eixida d'àudio. Pot ser que hàgeu d'instal·lar connectors "
-"del GStreamer addicionals, o bé seleccionar una altra eixida d'àudio al "
-"selector de sistemes multimèdia."
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:1
+msgid "Apple Trailers"
+msgstr "Apple Trailers"
+
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:2
+msgid "Sets the user agent for the Apple Trailers site"
+msgstr "Estableix l'agent d'usuari pel lloc web de l'Apple Trailers"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:1
+msgid "Autoload Subtitles"
+msgstr "Carrega automàticament els subtítols"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:2
+msgid "Autoloads text subtitles"
+msgstr "Carrega automàticament els subtítols de text"
 
-#. hour:minutes:seconds
-#. Translators: This is a time format, like "9:05:02" for 9
-#. * hours, 5 minutes, and 2 seconds. You may change ":" to
-#. * the separator that your locale uses or use "%Id" instead
-#. * of "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:83 ../src/plugins/skipto/totem-time-entry.c:57
-#, c-format
-msgctxt "long time format"
-msgid "%d:%02d:%02d"
-msgstr "%d:%02d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
+msgid "Video Disc Recorder"
+msgstr "Enregistrador de discs de vídeo"
 
-#. minutes:seconds
-#. Translators: This is a time format, like "5:02" for 5
-#. * minutes and 2 seconds. You may change ":" to the
-#. * separator that your locale uses or use "%Id" instead of
-#. * "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:92
-#, c-format
-msgctxt "short time format"
-msgid "%d:%02d"
-msgstr "%d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
+msgid "Records (S)VCDs or video DVDs"
+msgstr "Enregistra (S)VCD o DVD de vídeo"
 
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:65
 msgid "_Create Video Disc..."
@@ -1984,38 +1830,21 @@
 msgid "Copy the currently playing (S)VCD"
 msgstr "Copia el (S)VCD que s'està reproduint"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:129
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:136
 msgid "The video disc could not be duplicated."
 msgstr "No s'ha pogut duplicar el disc de vídeo."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:131
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:276
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:138
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:283
 msgid "The movie could not be recorded."
 msgstr "No s'ha pogut enregistrar la pel·lícula."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:157
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:167
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:263
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:164
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:174
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:270
 msgid "Unable to write a project."
 msgstr "No s'ha pogut escriure un projecte."
 
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
-msgid "Video Disc Recorder"
-msgstr "Enregistrador de discs de vídeo"
-
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
-msgid "Records (S)VCDs or video DVDs"
-msgstr "Enregistra (S)VCD o DVD de vídeo"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:1
-#: ../src/plugins/chapters/totem-chapters.c:1139
-msgid "Chapters"
-msgstr "Capítols"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:2
-msgid "Support chapter markers in movies."
-msgstr "Permet posar marcadors de capítols a les pel·lícules."
-
 #: ../src/plugins/chapters/chapters-edit.ui.h:1
 msgid "Name for new chapter:"
 msgstr "El nom del capítol nou:"
@@ -2072,6 +1901,15 @@
 msgid "Create a new chapter list for the movie"
 msgstr "Crea una llista de capítols nova per a la pel·lícula"
 
+#: ../src/plugins/chapters/chapters.plugin.in.h:1
+#: ../src/plugins/chapters/totem-chapters.c:1139
+msgid "Chapters"
+msgstr "Capítols"
+
+#: ../src/plugins/chapters/chapters.plugin.in.h:2
+msgid "Support chapter markers in movies"
+msgstr "Permet posar marcadors de capítols a les pel·lícules"
+
 #: ../src/plugins/chapters/totem-chapters.c:56
 #, c-format
 msgid ""
@@ -2179,15 +2017,37 @@
 msgid "The URI ‘%s’ is not supported."
 msgstr "L'URI «%s» no és compatible."
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
-msgid "Instant Messenger status"
-msgstr "Estat en la missatgeria instantània"
+#: ../src/plugins/grilo/grilo.plugin.in.h:1
+msgid "Grilo Browser"
+msgstr "Navegador Grilo"
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
-msgid "Set your Instant Messenger status to away when a movie is playing"
-msgstr ""
-"Estableix l'estat d'absència en la missatgeria instantània quan s'estiga "
-"reproduint una pel·lícula"
+#: ../src/plugins/grilo/grilo.plugin.in.h:2
+msgid "A plugin to let you browse media content from various sources"
+msgstr "Un connector que vos permet navegar per continguts de diverses fonts"
+
+#: ../src/plugins/grilo/grilo.ui.h:1
+msgid "Add to Playlist"
+msgstr "Afig a la llista de reproducció"
+
+#: ../src/plugins/grilo/grilo.ui.h:2
+msgid "Copy Location"
+msgstr "Copia la ubicació"
+
+#: ../src/plugins/grilo/grilo.ui.h:3 ../src/plugins/grilo/totem-grilo.c:1186
+msgid "Browse"
+msgstr "Navega"
+
+#: ../src/plugins/grilo/grilo.ui.h:4 ../src/plugins/grilo/totem-grilo.c:1229
+msgid "Search"
+msgstr "Cerca"
+
+#: ../src/plugins/grilo/totem-grilo.c:454
+msgid "Browse Error"
+msgstr "Error de navegació"
+
+#: ../src/plugins/grilo/totem-grilo.c:609
+msgid "Search Error"
+msgstr "Error de cerca"
 
 #: ../src/plugins/gromit/gromit.plugin.in.h:1
 msgid "Gromit Annotations"
@@ -2201,59 +2061,15 @@
 msgid "The gromit binary was not found."
 msgstr "No s'ha trobat el fitxer binari del Gromit."
 
-#. Add the interface to Totem's sidebar
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:1
-#: ../src/plugins/iplayer/iplayer.py:46
-msgid "BBC iPlayer"
-msgstr "iPlayer de la BBC"
-
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:2
-msgid "Stream BBC programs from the last 7 days from the BBC iPlayer service."
-msgstr ""
-"Reprodueix els programes de la BBC dels últims 7 dies des del servei iPlayer "
-"de la BBC."
-
-#: ../src/plugins/iplayer/iplayer.py:72
-msgid "Error listing channel categories"
-msgstr "S'ha produït un error en llistar les categories dels canals"
-
-#: ../src/plugins/iplayer/iplayer.py:73
-msgid ""
-"There was an unknown error getting the list of television channels available "
-"on BBC iPlayer."
-msgstr ""
-"S'ha produït un error desconegut en obtindre la llista de canals de "
-"televisió disponibles en l'iPlayer de la BBC."
-
-#. Append a dummy child row so that the expander's visible; we can
-#. then queue off the expander to load the programme listing for this
-#. category
-#: ../src/plugins/iplayer/iplayer.py:84
-msgid "Loading…"
-msgstr "S'està carregant…"
-
-#. Translators: the "programme feed" is the list of TV shows
-#. available to watch online
-#: ../src/plugins/iplayer/iplayer.py:136
-msgid "Error getting programme feed"
-msgstr "S'ha produït un error en obtindre la programació del canal"
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
+msgid "Instant Messenger Status"
+msgstr "Estat de la missatgeria instantània"
 
-#: ../src/plugins/iplayer/iplayer.py:137
-msgid ""
-"There was an error getting the list of programmes for this channel and "
-"category combination."
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
+msgid "Set your Instant Messenger status to away when a movie is playing"
 msgstr ""
-"S'ha produït un error en obtindre la llista de programes per esta combinació "
-"de canal i categoria."
-
-#: ../src/plugins/iplayer/iplayer2.py:298
-msgid ""
-msgstr ""
-
-#: ../src/plugins/iplayer/iplayer2.py:299
-#, python-format
-msgid "Programme unavailable (\"%s\")"
-msgstr "El programa no és disponible («%s»)"
+"Estableix l'estat d'absència en la missatgeria instantània quan s'estiga "
+"reproduint una pel·lícula"
 
 #: ../src/plugins/lirc/lirc.plugin.in.h:1
 msgid "Infrared Remote Control"
@@ -2271,29 +2087,35 @@
 msgid "Couldn't read lirc configuration."
 msgstr "No s'ha pogut llegir la configuració del lirc."
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
-msgid "Download Movie Subtitles"
-msgstr "Baixa els subtítols de la pel·lícula"
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:1
+msgid "Media Player Keys"
+msgstr "Tecles del reproductor multimèdia"
+
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:2
+msgid "Support additional media player keys"
+msgstr "Permet més tecles del reproductor multimèdia"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
-msgid "Subtitle _language:"
-msgstr "_Llengua dels subtítols:"
+#: ../src/plugins/ontop/ontop.plugin.in.h:1
+msgid "Always On Top"
+msgstr "Sempre per damunt"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
-msgid "_Play with Subtitle"
-msgstr "_Reprodueix amb subtítols"
+#: ../src/plugins/ontop/ontop.plugin.in.h:2
+msgid "Keep the main window on top when playing a movie"
+msgstr ""
+"Mantingues la finestra principal per sobre de les altres quan s'estiga "
+"reproduint una pel·lícula"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:1
 msgid "Subtitle Downloader"
 msgstr "Baixador de subtítols"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:2
-msgid "Look for subtitles for the currently playing movie."
-msgstr "Cerca subtítols per a la pel·lícula que s'està reproduint."
+msgid "Look for subtitles for the currently playing movie"
+msgstr "Cerca subtítols per a la pel·lícula que s'està reproduint"
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:42
 msgid "Brazilian Portuguese"
-msgstr "Brasiler portugués"
+msgstr "Brasiler portuguès"
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:177
 msgid "Searching for subtitles…"
@@ -2345,6 +2167,18 @@
 msgid "Searching subtitles…"
 msgstr "S'estan cercant subtítols…"
 
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
+msgid "Download Movie Subtitles"
+msgstr "Baixa els subtítols de la pel·lícula"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
+msgid "Subtitle _language:"
+msgstr "_Llengua dels subtítols:"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
+msgid "_Play with Subtitle"
+msgstr "_Reprodueix amb subtítols"
+
 #: ../src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in.h:1
 msgid "Subtitle language"
 msgstr "Llengua dels subtítols"
@@ -2353,113 +2187,111 @@
 msgid "The language to search for subtitles for movies in."
 msgstr "La llengua a la qual cercar subtítols de la pel·lícula."
 
-#: ../src/plugins/ontop/ontop.plugin.in.h:1
-msgid "Always On Top"
-msgstr "Sempre per damunt"
-
-#: ../src/plugins/ontop/ontop.plugin.in.h:2
-msgid "Keep the main window on top when playing a movie"
-msgstr ""
-"Mantingues la finestra principal per sobre de les altres quan s'estiga "
-"reproduint una pel·lícula"
+#: ../src/plugins/properties/movie-properties.plugin.in.h:1
+msgid "Movie Properties"
+msgstr "Propietats de la pel·lícula"
+
+#: ../src/plugins/properties/movie-properties.plugin.in.h:2
+msgid "Adds movie properties to the sidebar"
+msgstr "Afig les propietats de les pel·lícules a la barra lateral"
 
 #: ../src/plugins/properties/totem-movie-properties.c:246
 msgid "Properties"
 msgstr "Propietats"
 
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:1
-msgid "Publisher protocol to use"
-msgstr "Protocol de publicació que s'utilitza"
+#: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:1
+msgid "rpdb2 password"
+msgstr "contrasenya rpdb2"
+
+#: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:2
+msgid ""
+"A password to protect the rpdb2 server for debugging Totem from unauthorized "
+"remote access. If this is empty, a default of 'totem' will be used."
+msgstr ""
+"Una contrasenya per protegir el servidor rpdb2 d'accessos remots no "
+"autoritzats a la depuració del Totem. Si es deixa buida la contrasenya serà "
+"«totem»."
+
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
+msgid "Python Console"
+msgstr "Consola del Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
+msgid "Interactive Python console"
+msgstr "Consola interactiva del Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:88
+msgid "Python Console Menu"
+msgstr "Menú de la consola del Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:93
+msgid "_Python Console"
+msgstr "Consola del _Python"
 
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:2
-msgid ""
-"The transport protocol to use when publishing playlists over the network."
-msgstr ""
-"El protocol de transport per la publicació de llistes de reproducció a "
-"través de la xarxa."
+#: ../src/plugins/pythonconsole/pythonconsole.py:94
+msgid "Show Totem's Python console"
+msgstr "Mostra la consola del Python del Totem"
 
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:3
-msgid "Format for network service name"
-msgstr "Format pel nom del servei de xarxa"
+#: ../src/plugins/pythonconsole/pythonconsole.py:100
+msgid "Python Debugger"
+msgstr "Depurador del Python"
 
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:5
-#, no-c-format
-msgid ""
-"A format string used to build the network service name used when publishing "
-"playlists over the network. The following format placeholders can be used: • "
-"%a: the program name as returned by g_get_application_name() • %h: the "
-"machine's host name in title case • %u: the user's login name in title case "
-"• %U: the user's real name • %%: the percent sign"
-msgstr ""
-"Una cadena de format per construir el nom del servei de xarxa per la "
-"publicació de llistes de reproducció a través de la xarxa. Es poden "
-"utilitzar les variables següents: %a - el nom del programa que retorna "
-"g_get_application_name(); %h - el nom de l'ordinador; %u - el nom "
-"d'identificació de l'usuari; %U el nom real de l'usuari; %% - el símbol de "
-"percentatge"
-
-#. Translators: computers on the local network which are publishing their playlists over the network
-#: ../src/plugins/publish/totem-publish.c:552
-msgid "Neighbors"
-msgstr "Veïns"
-
-#: ../src/plugins/publish/publish.plugin.in.h:1
-msgid "Publish Playlist"
-msgstr "Publica la llista de reproducció"
-
-#: ../src/plugins/publish/publish.plugin.in.h:2
-msgid "Share the current playlist via HTTP"
-msgstr "Comparteix la llista de reproducció actual a través d'HTTP"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:1
-msgid "Service _Name:"
-msgstr "_Nom del servei:"
+#: ../src/plugins/pythonconsole/pythonconsole.py:101
+msgid "Enable remote Python debugging with rpdb2"
+msgstr "Habilita la depuració remota del Python amb el rpdb2"
 
-#: ../src/plugins/publish/publish-plugin.ui.h:3
-#, no-c-format
-msgid ""
-"The name used for announcing the playlist service on the network.\n"
-"All occurrences of the string %u will be replaced by your name,\n"
-"and %h will be replaced by your computer's host name."
-msgstr ""
-"El nom que s'utilitzarà per anunciar el servei de llista de reproducció a la "
-"xarxa.\n"
-"Totes les ocurrències de la cadena %u es reemplaçaran pel vostre nom\n"
-"i %h es reemplaçarà pel nom del vostre ordinador."
-
-#: ../src/plugins/publish/publish-plugin.ui.h:6
-msgid "Use _encrypted transport protocol (HTTPS)"
-msgstr "Utilitza un protocol de transport _xifrat (HTTPS)"
+#. pylint: disable-msg=E1101
+#: ../src/plugins/pythonconsole/pythonconsole.py:125
+#, python-format
+msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
+msgstr "Podeu accedir a Totem.Object a través de «totem_object»: \\n%s"
 
-#: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:1
-msgid "rpdb2 password"
-msgstr "contrasenya rpdb2"
+#: ../src/plugins/pythonconsole/pythonconsole.py:129
+msgid "Totem Python Console"
+msgstr "Consola del Python del Totem"
 
-#: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:2
+#: ../src/plugins/pythonconsole/pythonconsole.py:139
 msgid ""
-"A password to protect the rpdb2 server for debugging Totem from unauthorized "
-"remote access. If this is empty, a default of 'totem' will be used."
+"After you press OK, Totem will wait until you connect to it with winpdb or "
+"rpdb2. If you have not set a debugger password in DConf, it will use the "
+"default password ('totem')."
 msgstr ""
-"Una contrasenya per protegir el servidor rpdb2 d'accessos remots no "
-"autoritzats a la depuració del Totem. Si es deixa buida la contrasenya serà "
-"«totem»."
+"Després de prémer D'acord, el Totem s'esperarà fins que vos hi connecteu amb "
+"el winpdb o el rpdb2. Si no heu establit una contrasenya de depuració en el "
+"DConf, s'utilitzarà la contrasenya predeterminada («totem»)."
+
+#: ../src/plugins/recent/recent.plugin.in.h:1
+msgid "Recent files"
+msgstr "Fitxers recents"
+
+#: ../src/plugins/recent/recent.plugin.in.h:2
+msgid "Adds files that have been played to recent files"
+msgstr "Afig els fitxers que s'han reproduït als fitxers recents"
 
 #: ../src/plugins/rotation/rotation.plugin.in.h:1
 msgid "Rotation Plugin"
 msgstr "Connector de rotació"
 
 #: ../src/plugins/rotation/rotation.plugin.in.h:2
-msgid "Allows videos to be rotated if they're in the wrong orientation."
-msgstr "Permet girar vídeos que no estiguen en l'orientació correcta."
+msgid "Allows videos to be rotated if they are in the wrong orientation"
+msgstr "Permet girar vídeos que no estiguen en l'orientació correcta"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:60
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:50
 msgid "_Rotate Clockwise"
 msgstr "_Gira en sentit horari"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:62
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:52
 msgid "Rotate Counterc_lockwise"
 msgstr "Gira en sentit _antihorari"
 
+#: ../src/plugins/save-file/save-file.plugin.in.h:1
+msgid "Save Copy"
+msgstr "Alça'n una còpia"
+
+#: ../src/plugins/save-file/save-file.plugin.in.h:2
+msgid "Save a copy of the currently playing movie"
+msgstr "Alça una còpia de la pel·lícula que s'està reproduint"
+
 #: ../src/plugins/save-file/totem-save-file.c:63
 msgid "Save a Copy..."
 msgstr "Alça'n una còpia..."
@@ -2482,10 +2314,14 @@
 msgid "Movie stream"
 msgstr "Flux de la pel·lícula"
 
-#: ../src/plugins/screensaver/totem-screensaver.c:116
-#: ../browser-plugin/totem-plugin-viewer.c:1891
-msgid "Playing a movie"
-msgstr "S'està reproduint una pel·lícula"
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:1
+msgid "Screen Saver"
+msgstr "Estalvi de pantalla"
+
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:2
+msgid "Deactivates the screen saver when a movie is playing"
+msgstr ""
+"Desactiva l'estalvi de pantalla quan s'estiga reproduint una pel·lícula"
 
 #: ../src/plugins/screenshot/gallery.ui.h:1
 msgid "Screenshot width (in pixels):"
@@ -2499,23 +2335,28 @@
 msgid "Number of screenshots:"
 msgstr "Nombre de captures de pantalla:"
 
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:1
-msgid "_Name:"
-msgstr "_Nom:"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:2
-msgid "Save in _folder:"
-msgstr "Alça en la _carpeta:"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:3
-msgid "Select a folder"
-msgstr "Seleccioneu una carpeta"
-
-#. Write the screenshot to the temporary file
-#: ../src/plugins/screenshot/gnome-screenshot-widget.c:385
-#: ../src/plugins/screenshot/totem-screenshot.c:64
-msgid "Screenshot.png"
-msgstr "Captura.png"
+#. translators: this is the name of the file that gets made up
+#. * with the screenshot if the entire screen is taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:147
+#, c-format
+msgid "Screenshot from %s.png"
+msgstr "Captura de pantalla de %s.png"
+
+#. translators: this is the name of the file that gets
+#. * made up with the screenshot if the entire screen is
+#. * taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:154
+#, c-format
+msgid "Screenshot from %s - %d.png"
+msgstr "Captura de pantalla de %s - %d.png"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:1
+msgid "Screenshot"
+msgstr "Captura de pantalla"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:2
+msgid "Allows screenshots and galleries to be taken of videos"
+msgstr "Permet fer captures de pantalles i galeries dels vídeos"
 
 #: ../src/plugins/screenshot/totem-gallery.c:91
 msgid "Save Gallery"
@@ -2541,50 +2382,48 @@
 msgid "Saving gallery as \"%s\""
 msgstr "S'està alçant la galeria com a «%s»"
 
-#: ../src/plugins/screenshot/totem-screenshot.c:113
-msgid "There was an error saving the screenshot."
-msgstr "S'ha produït un error en alçar la captura de pantalla."
-
-#: ../src/plugins/screenshot/totem-screenshot.c:139
-msgid "Save Screenshot"
-msgstr "Alça la captura de pantalla"
-
-#. Create the screenshot widget
-#. Translators: %s is the movie title and %d is an auto-incrementing number to make filename unique
-#: ../src/plugins/screenshot/totem-screenshot.c:160
-#, c-format
-msgid "Screenshot-%s-%d.png"
-msgstr "Captura-%s-%d.png"
-
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:88
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:220
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "Totem could not get a screenshot of the video."
 msgstr ""
 "El Totem no ha pogut obtindre una captura de pantalla d'esta pel·lícula."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "This is not supposed to happen; please file a bug report."
 msgstr "Això no hauria de passar. Envieu un informe d'error."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
-msgid "Take _Screenshot..."
-msgstr "Fes una _captura de pantalla..."
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
+msgid "Take _Screenshot"
+msgstr "Fes una _captura de pantalla"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
 msgid "Take a screenshot"
 msgstr "Fes una captura de pantalla"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create Screenshot _Gallery..."
 msgstr "Crea una _galeria de captures de pantalla..."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create a gallery of screenshots"
 msgstr "Crea una galeria de captures de pantalla"
 
+#: ../src/plugins/skipto/skipto.plugin.in.h:1
+#: ../src/plugins/skipto/totem-skipto.c:196
+msgid "Skip To"
+msgstr "Salta a"
+
+#: ../src/plugins/skipto/skipto.plugin.in.h:2
+msgid "Provides the \"Skip to\" dialog"
+msgstr "Proporciona el diàleg de «Salta a»"
+
+#: ../src/plugins/skipto/skipto.ui.h:1
+msgid "_Skip to:"
+msgstr "_Salta a:"
+
 #. Update the "seconds" label so that it always has the correct singular/plural form
 #. Translators: label for the seconds selector in the "Skip to" dialogue
-#: ../src/plugins/skipto/totem-skipto.c:160
+#: ../src/plugins/skipto/totem-skipto.c:159
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "segon"
@@ -2594,15 +2433,11 @@
 #. Translators: you should translate this string to a number (written in digits) which corresponds to the longer character length of the
 #. * translations for "second" and "seconds", as translated elsewhere in this file. For example, in English, "second" is 6 characters long and
 #. * "seconds" is 7 characters long, so this string should be translated to "7". See: bgo#639398
-#: ../src/plugins/skipto/totem-skipto.c:190
+#: ../src/plugins/skipto/totem-skipto.c:189
 msgctxt "Skip To label length"
 msgid "7"
 msgstr "6"
 
-#: ../src/plugins/skipto/totem-skipto.c:197
-msgid "Skip To"
-msgstr "Salta a"
-
 #: ../src/plugins/skipto/totem-skipto-plugin.c:182
 msgid "_Skip To..."
 msgstr "Sa_lta a..."
@@ -2611,114 +2446,326 @@
 msgid "Skip to a specific time"
 msgstr "Salta a un moment en concret"
 
-#: ../src/plugins/skipto/skipto.ui.h:1
-msgid "_Skip to:"
-msgstr "_Salta a:"
+#~ msgid "Movie Player"
+#~ msgstr "Reproductor de pel·lícules"
 
-#: ../browser-plugin/totem-plugin-viewer.c:431
-msgid "No URI to play"
-msgstr "No hi ha cap URI per reproduir"
+#~ msgid "Play movies and songs"
+#~ msgstr "Reproduïu vídeos i cançons"
 
-#. translators: this is:
-#. * Open With ApplicationName
-#. * as in nautilus' right-click menu
-#: ../browser-plugin/totem-plugin-viewer.c:1107
-#, c-format
-msgid "_Open with \"%s\""
-msgstr "_Obri amb el «%s»"
+#~ msgid "Open a file"
+#~ msgstr "Obre un fitxer"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2136
-msgid "No playlist or playlist empty"
-msgstr "No hi ha cap llista de reproducció o bé és buida"
+#~ msgid "Open _Location..."
+#~ msgstr "Obre una _ubicació..."
 
-#: ../browser-plugin/totem-plugin-viewer.c:2235
-msgid "Movie browser plugin"
-msgstr "Connector per veure pel·lícules al navegador"
+#~ msgid "Open a non-local file"
+#~ msgstr "Obre un fitxer de la xarxa"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Verify your system installation. The Totem plugin will now exit."
-msgstr ""
-"Verifiqueu la instal·lació del sistema. El connector del Totem eixirà ara."
+#~ msgid "Quit the program"
+#~ msgstr "Surt del programa"
 
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
-msgid "Python Console"
-msgstr "Consola del Python"
+#~ msgid "Configure the application"
+#~ msgstr "Configureu l'aplicació"
 
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
-msgid "Interactive Python console."
-msgstr "Consola interactiva del Python."
+#~ msgid "Switch to fullscreen"
+#~ msgstr "Canvia a pantalla completa"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:88
-msgid "Python Console Menu"
-msgstr "Menú de la consola del Python"
+#~ msgid "Set the repeat mode"
+#~ msgstr "Activa el mode de repetició"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:93
-msgid "_Python Console"
-msgstr "Consola del _Python"
+#~ msgid "Set the shuffle mode"
+#~ msgstr "Activa el mode aleatori"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:94
-msgid "Show Totem's Python console"
-msgstr "Mostra la consola del Python del Totem"
+#~ msgid "14.4 Kbps Modem"
+#~ msgstr "Mòdem a 14.4 Kbps"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:100
-msgid "Python Debugger"
-msgstr "Depurador del Python"
+#~ msgid "19.2 Kbps Modem"
+#~ msgstr "Mòdem a 19.2 Kbps"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:101
-msgid "Enable remote Python debugging with rpdb2"
-msgstr "Habilita la depuració remota del Python amb el rpdb2"
+#~ msgid "28.8 Kbps Modem"
+#~ msgstr "Mòdem a 28.8 Kbps"
 
-#. pylint: disable-msg=E1101
-#: ../src/plugins/pythonconsole/pythonconsole.py:125
-#, python-format
-msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
-msgstr "Podeu accedir a Totem.Object a través de «totem_object»: \\n%s"
+#~ msgid "33.6 Kbps Modem"
+#~ msgstr "Mòdem a 33.6 Kbps"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:129
-msgid "Totem Python Console"
-msgstr "Consola del Python del Totem"
+#~ msgid "34.4 Kbps Modem"
+#~ msgstr "Mòdem a 34.4 Kbps"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:139
-msgid ""
-"After you press OK, Totem will wait until you connect to it with winpdb or "
-"rpdb2. If you have not set a debugger password in DConf, it will use the "
-"default password ('totem')."
-msgstr ""
-"Després de prémer D'acord, el Totem s'esperarà fins que vos hi connecteu amb "
-"el winpdb o el rpdb2. Si no heu establit una contrasenya de depuració en el "
-"DConf, s'utilitzarà la contrasenya predeterminada («totem»)."
+#~ msgid "56 Kbps Modem/ISDN"
+#~ msgstr "Mòdem/XDSI a 56 Kbps"
 
-#: ../src/plugins/grilo/grilo.plugin.in.h:1
-msgid "Grilo Browser"
-msgstr "Navegador Grilo"
+#~ msgid "112 Kbps Dual ISDN/DSL"
+#~ msgstr "XDSI dual/DSL a 112 Kbps"
 
-#: ../src/plugins/grilo/grilo.plugin.in.h:2
-msgid "A plugin to let you browse media content from various sources."
-msgstr "Un connector que vos permet navegar per continguts de diverses fonts."
+#~ msgid "256 Kbps DSL/Cable"
+#~ msgstr "DSL/Cable a 256 Kbps"
 
-#: ../src/plugins/grilo/totem-grilo.c:452
-msgid "Browse Error"
-msgstr "Error de navegació"
+#~ msgid "384 Kbps DSL/Cable"
+#~ msgstr "DSL/Cable a 384 Kbps"
 
-#: ../src/plugins/grilo/totem-grilo.c:599
-msgid "Search Error"
-msgstr "Error de cerca"
+#~ msgid "512 Kbps DSL/Cable"
+#~ msgstr "DSL/Cable a 512 Kbps"
 
-#: ../src/plugins/grilo/totem-grilo.c:1219 ../src/plugins/grilo/grilo.ui.h:3
-msgid "Browse"
-msgstr "Navega"
+#~ msgid "1.5 Mbps T1/Intranet/LAN"
+#~ msgstr "T1/Intranet/LAN a 1.5 Mbps"
 
-#: ../src/plugins/grilo/totem-grilo.c:1285 ../src/plugins/grilo/grilo.ui.h:4
-msgid "Search"
-msgstr "Cerca"
+#~ msgid "Intranet/LAN"
+#~ msgstr "Intranet/LAN"
 
-#: ../src/plugins/grilo/grilo.ui.h:1
-msgid "Add to Playlist"
-msgstr "Afig a la llista de reproducció"
+#~ msgid "Networking"
+#~ msgstr "Xarxa"
 
-#: ../src/plugins/grilo/grilo.ui.h:2
-msgid "Copy Location"
-msgstr "Copia la ubicació"
+#~ msgid "Connection _speed:"
+#~ msgstr "_Velocitat de connexió:"
+
+#~ msgid "Network connection speed"
+#~ msgstr "Velocitat de connexió a la xarxa"
+
+#~ msgid ""
+#~ "Approximate network connection speed, used to select quality on media "
+#~ "over the network."
+#~ msgstr ""
+#~ "Velocitat estimada de la connexió a la xarxa. S'utilitza per seleccionar "
+#~ "la qualitat dels fitxers multimèdia a través de la xarxa."
+
+#~ msgid "Play Image '%s'"
+#~ msgstr "Reprodueix la imatge «%s»"
+
+#~ msgid "device%d"
+#~ msgstr "dispositiu%d"
+
+#~ msgid "Play Disc '%s'"
+#~ msgstr "Reprodueix el disc «%s»"
+
+#~ msgid "Movie Player using %s"
+#~ msgstr "Reproductor de vídeo que utilitza el %s"
+
+#~ msgid ""
+#~ "Totem could not play this media (%s) although a plugin is present to "
+#~ "handle it."
+#~ msgstr ""
+#~ "El Totem no ha pogut reproduir aquest medi (%s) encara que hi ha un "
+#~ "connector per gestionar-lo."
+
+#~ msgid ""
+#~ "You might want to check that a disc is present in the drive and that it "
+#~ "is correctly configured."
+#~ msgstr ""
+#~ "Hauríeu de comprovar que hi ha un disc en la unitat i que està "
+#~ "correctament configurada."
+
+#~ msgid "More information about media plugins"
+#~ msgstr "Més informació sobre els connectors de medi"
+
+#~ msgid ""
+#~ "Please install the necessary plugins and restart Totem to be able to play "
+#~ "this media."
+#~ msgstr ""
+#~ "Instal·leu els connectors necessaris i reinicieu el Totem per poder "
+#~ "reproduir aquest medi."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it does not have the "
+#~ "appropriate plugins to be able to read from the disc."
+#~ msgstr ""
+#~ "El Totem no pot reproduir aquest tipus de medi (%s) perquè no té els "
+#~ "connectors adequats per poder llegir-lo del disc."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because you do not have the "
+#~ "appropriate plugins to handle it."
+#~ msgstr ""
+#~ "El Totem no pot reproduir aquest tipus de medi (%s) perquè no teniu el "
+#~ "connector adequat per gestionar-lo."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it is not supported."
+#~ msgstr ""
+#~ "El Totem no pot reproduir aquest tipus de medi (%s) perquè no el sap "
+#~ "utilitzar."
+
+#~ msgid "Please insert another disc to play back."
+#~ msgstr "Inseriu un altre disc a reproduir."
+
+#~ msgid "Totem was not able to play this disc."
+#~ msgstr "El Totem no pot reproduir aquest disc."
+
+#~ msgid "Totem does not support playback of Audio CDs"
+#~ msgstr "El Totem no sap reproduir els CD d'àudio"
+
+#~ msgid ""
+#~ "Please consider using a music player or a CD extractor to play this CD"
+#~ msgstr ""
+#~ "Podeu utilitzar un reproductor de música o un extractor de CD per "
+#~ "reproduir-lo"
+
+#~ msgid "%d %%"
+#~ msgstr "%d%%"
+
+#~ msgid ""
+#~ "The requested audio output was not found. Please select another audio "
+#~ "output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "No s'ha trobat la sortida d'àudio demanada. Seleccioneu una altra sortida "
+#~ "d'àudio en el selector de sistemes multimèdia."
+
+#~ msgid "Location not found."
+#~ msgstr "No s'ha trobat la ubicació."
+
+#~ msgid ""
+#~ "Could not open location; you might not have permission to open the file."
+#~ msgstr ""
+#~ "No s'ha pogut obrir la ubicació. Potser no teniu permís per obrir el "
+#~ "fitxer."
+
+#~ msgid ""
+#~ "The video output is in use by another application. Please close other "
+#~ "video applications, or select another video output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "Una altra aplicació ja utilitza la sortida de vídeo. Tanqueu les altres "
+#~ "aplicacions de vídeo, o seleccioneu una altra sortida de vídeo al "
+#~ "selector de sistemes multimèdia."
+
+#~ msgid ""
+#~ "The audio output is in use by another application. Please select another "
+#~ "audio output in the Multimedia Systems Selector. You may want to consider "
+#~ "using a sound server."
+#~ msgstr ""
+#~ "Una altra aplicació ja utilitza la sortida d'àudio. Seleccioneu una altra "
+#~ "sortida d'àudio al selector de sistemes multimèdia. Potser hauríeu de "
+#~ "considerar utilitzar un servidor de so."
+
+#~ msgid ""
+#~ "Failed to create a GStreamer play object. Please check your GStreamer "
+#~ "installation."
+#~ msgstr ""
+#~ "No s'ha pogut crear un objecte de reproducció del GStreamer. Comproveu la "
+#~ "instal·lació del GStreamer."
+
+#~ msgid ""
+#~ "Failed to open audio output. You may not have permission to open the "
+#~ "sound device, or the sound server may not be running. Please select "
+#~ "another audio output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "No s'ha pogut obrir la sortida d'àudio. Pot ser que no tingueu permís per "
+#~ "obrir el dispositiu d'àudio, o que el servidor de so no s'estigui "
+#~ "executant. Seleccioneu una altra sortida de so al selector de sistemes "
+#~ "multimèdia."
+
+#~ msgid ""
+#~ "Could not find the audio output. You may need to install additional "
+#~ "GStreamer plugins, or select another audio output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "No s'ha trobat la sortida d'àudio. Pot ser que hàgiu d'instal·lar "
+#~ "connectors del GStreamer addicionals, o bé seleccionar una altra sortida "
+#~ "d'àudio al selector de sistemes multimèdia."
+
+#~ msgid "BBC iPlayer"
+#~ msgstr "iPlayer de la BBC"
+
+#~ msgid ""
+#~ "Stream BBC programs from the last 7 days from the BBC iPlayer service."
+#~ msgstr ""
+#~ "Reprodueix els programes de la BBC dels últims 7 dies des del servei "
+#~ "iPlayer de la BBC."
+
+#~ msgid "Error listing channel categories"
+#~ msgstr "S'ha produït un error en llistar les categories dels canals"
+
+#~ msgid ""
+#~ "There was an unknown error getting the list of television channels "
+#~ "available on BBC iPlayer."
+#~ msgstr ""
+#~ "S'ha produït un error desconegut en obtenir la llista de canals de "
+#~ "televisió disponibles en l'iPlayer de la BBC."
+
+#~ msgid "Loading…"
+#~ msgstr "S'està carregant…"
+
+#~ msgid "Error getting programme feed"
+#~ msgstr "S'ha produït un error en obtenir la programació del canal"
+
+#~ msgid ""
+#~ "There was an error getting the list of programmes for this channel and "
+#~ "category combination."
+#~ msgstr ""
+#~ "S'ha produït un error en obtenir la llista de programes per aquesta "
+#~ "combinació de canal i categoria."
+
+#~ msgid ""
+#~ msgstr ""
+
+#~ msgid "Programme unavailable (\"%s\")"
+#~ msgstr "El programa no és disponible («%s»)"
+
+#~ msgid "Publisher protocol to use"
+#~ msgstr "Protocol de publicació que s'utilitza"
+
+#~ msgid ""
+#~ "The transport protocol to use when publishing playlists over the network."
+#~ msgstr ""
+#~ "El protocol de transport per la publicació de llistes de reproducció a "
+#~ "través de la xarxa."
+
+#~ msgid "Format for network service name"
+#~ msgstr "Format pel nom del servei de xarxa"
+
+#~ msgid ""
+#~ "A format string used to build the network service name used when "
+#~ "publishing playlists over the network. The following format placeholders "
+#~ "can be used: • %a: the program name as returned by g_get_application_name"
+#~ "() • %h: the machine's host name in title case • %u: the user's login "
+#~ "name in title case • %U: the user's real name • %%: the percent sign"
+#~ msgstr ""
+#~ "Una cadena de format per construir el nom del servei de xarxa per la "
+#~ "publicació de llistes de reproducció a través de la xarxa. Es poden "
+#~ "utilitzar les variables següents: %a - el nom del programa que retorna "
+#~ "g_get_application_name(); %h - el nom de l'ordinador; %u - el nom "
+#~ "d'identificació de l'usuari; %U el nom real de l'usuari; %% - el símbol "
+#~ "de percentatge"
+
+#~ msgid "Neighbors"
+#~ msgstr "Veïns"
+
+#~ msgid "Publish Playlist"
+#~ msgstr "Publica la llista de reproducció"
+
+#~ msgid "Share the current playlist via HTTP"
+#~ msgstr "Comparteix la llista de reproducció actual a través d'HTTP"
+
+#~ msgid "Service _Name:"
+#~ msgstr "_Nom del servei:"
+
+#~ msgid ""
+#~ "The name used for announcing the playlist service on the network.\n"
+#~ "All occurrences of the string %u will be replaced by your name,\n"
+#~ "and %h will be replaced by your computer's host name."
+#~ msgstr ""
+#~ "El nom que s'utilitzarà per anunciar el servei de llista de reproducció a "
+#~ "la xarxa.\n"
+#~ "Totes les ocurrències de la cadena %u es reemplaçaran pel vostre "
+#~ "nom\n"
+#~ "i %h es reemplaçarà pel nom del vostre ordinador."
+
+#~ msgid "Use _encrypted transport protocol (HTTPS)"
+#~ msgstr "Utilitza un protocol de transport _xifrat (HTTPS)"
+
+#~ msgid "_Name:"
+#~ msgstr "_Nom:"
+
+#~ msgid "Save in _folder:"
+#~ msgstr "Desa en la _carpeta:"
+
+#~ msgid "Select a folder"
+#~ msgstr "Seleccioneu una carpeta"
+
+#~ msgid "There was an error saving the screenshot."
+#~ msgstr "S'ha produït un error en desar la captura de pantalla."
+
+#~ msgid "Save Screenshot"
+#~ msgstr "Desa la captura de pantalla"
 
 #~ msgid "0 frames per second"
 #~ msgstr "0 quadres per segon"
@@ -2757,9 +2804,6 @@
 #~ msgid "Search Results"
 #~ msgstr "Resultats de la cerca"
 
-#~ msgid "Videos"
-#~ msgstr "Vídeos"
-
 #~ msgid "_Open in Web Browser"
 #~ msgstr "_Obre en el navegador web"
 
@@ -3277,22 +3321,12 @@
 #~ "Comproveu que el dispositiu no estigui ocupat."
 
 #~ msgid ""
-#~ "No video output is available. Make sure that the program is correctly "
-#~ "installed."
-#~ msgstr ""
-#~ "No hi ha cap sortida de vídeo disponible. Assegureu-vos que el programa "
-#~ "està instal·lat correctament."
-
-#~ msgid ""
 #~ "The TV adapter could not tune into the channel. Please check your "
 #~ "hardware setup and channel configuration."
 #~ msgstr ""
 #~ "L'adaptador de televisió no ha pogut sintonitzar el canal. Comproveu la "
 #~ "configuració del maquinari i la configuració del canal."
 
-#~ msgid "The server you are trying to connect to is not known."
-#~ msgstr "Es desconeix el servidor al qual esteu intentant connectar."
-
 #~ msgid "The device name you specified (%s) seems to be invalid."
 #~ msgstr "El nom del dispositiu que heu especificat (%s) és invàlid."
 
@@ -3301,12 +3335,6 @@
 #~ "No es pot contactar amb el servidor al qual esteu intentant connectar "
 #~ "(%s)."
 
-#~ msgid "The connection to this server was refused."
-#~ msgstr "S'ha refusat la connexió a aquest servidor."
-
-#~ msgid "The specified movie could not be found."
-#~ msgstr "No s'ha trobat la pel·lícula especificada."
-
 #~ msgid ""
 #~ "The source seems encrypted and can't be read. Are you trying to play an "
 #~ "encrypted DVD without libdvdcss?"
@@ -3314,9 +3342,6 @@
 #~ "Sembla ser que la font estigui xifrada i no es pot llegir. Esteu "
 #~ "intentant reproduir un DVD xifrat sense la libdvdcss?."
 
-#~ msgid "The movie could not be read."
-#~ msgstr "No s'ha pogut llegir la pel·lícula."
-
 #~ msgid "A problem occurred while loading a library or a decoder (%s)."
 #~ msgstr ""
 #~ "S'ha produït un problema en carregar una biblioteca o descodificador (%s)."
@@ -3335,15 +3360,6 @@
 #~ msgid "Authentication is required to access this file."
 #~ msgstr "Es requereix autenticació per a accedir a aquest fitxer."
 
-#~ msgid "Authentication is required to access this file or stream."
-#~ msgstr "Es requereix autenticació per a accedir a aquest fitxer o flux."
-
-#~ msgid "You are not allowed to open this file."
-#~ msgstr "No teniu permís per a obrir aquest fitxer."
-
-#~ msgid "The server refused access to this file or stream."
-#~ msgstr "El servidor ha rebutjat l'accés a aquest fitxer o flux."
-
 #~ msgid "The file you tried to play is an empty file."
 #~ msgstr "Heu intentat reproduir un fitxer buit."
 
@@ -3358,9 +3374,6 @@
 #~ msgid "This movie is broken and can not be played further."
 #~ msgstr "La pel·lícula està malmesa i no es pot continuar reproduint."
 
-#~ msgid "This location is not a valid one."
-#~ msgstr "La ubicació no és vàlida."
-
 #~ msgid "This movie could not be opened."
 #~ msgstr "No s'ha pogut obrir la pel·lícula."
 
@@ -3371,13 +3384,6 @@
 #~ "No es pot gestionar el còdec de vídeo «%s». Potser cal que instal·leu "
 #~ "connectors addicionals per a poder veure alguns tipus de pel·lícules"
 
-#~ msgid ""
-#~ "Audio codec '%s' is not handled. You might need to install additional "
-#~ "plugins to be able to play some types of movies"
-#~ msgstr ""
-#~ "No es pot gestionar el còdec d'àudio «%s». Potser cal que instal·leu "
-#~ "connectors addicionals per a poder veure alguns tipus de pel·lícules"
-
 #~ msgid "This is an audio-only file and there is no audio output available."
 #~ msgstr ""
 #~ "Aquest és un fitxer només d'àudio i no hi ha cap sortida d'àudio "
@@ -3522,24 +3528,6 @@
 #~ msgid "Totem could not eject the optical media."
 #~ msgstr "El Totem no ha pogut expulsar el medi òptic."
 
-#~ msgid "Media Player Keys"
-#~ msgstr "Tecles del reproductor multimèdia"
-
-#~ msgid "Support additional media player keys"
-#~ msgstr "Permet més tecles del reproductor multimèdia"
-
-#~ msgid "Adds movie properties to the sidebar"
-#~ msgstr "Afegeix les propietats de les pel·lícules a la barra lateral"
-
-#~ msgid "Movie Properties"
-#~ msgstr "Propietats de la pel·lícula"
-
-#~ msgid "Screensaver"
-#~ msgstr "Estalvi de pantalla"
-
-#~ msgid "Provides the \"Skip to\" dialog."
-#~ msgstr "Proporciona el diàleg de «Salta a»."
-
 #~ msgid "Skipto"
 #~ msgstr "Salta a"
 
@@ -3569,9 +3557,6 @@
 #~ "Canal 5.1\n"
 #~ "Passarel·la AC3"
 
-#~ msgid "Open Location"
-#~ msgstr "Obre una ubicació"
-
 #~ msgid "Properties dialog"
 #~ msgstr "Diàleg de propietats"
 
diff -Nru totem-3.4.3/po/cs.po totem-3.6.2/po/cs.po
--- totem-3.4.3/po/cs.po	2012-04-02 14:15:40.000000000 +0000
+++ totem-3.6.2/po/cs.po	2012-10-09 15:42:00.000000000 +0000
@@ -22,25 +22,242 @@
 "Project-Id-Version: totem master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=totem&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-03-22 23:18+0000\n"
-"PO-Revision-Date: 2012-03-23 07:04+0100\n"
-"Last-Translator: Marek Černocký \n"
+"POT-Creation-Date: 2012-09-18 10:30+0000\n"
+"PO-Revision-Date: 2012-09-16 18:35+0100\n"
+"Last-Translator: Adam Matoušek \n"
 "Language-Team: Czech \n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: cs\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Generator: KBabel 1.11.4\n"
 
+#: ../browser-plugin/totem-plugin-viewer.c:352 ../src/totem-object.c:1180
+#: ../src/totem-object.c:1650 ../src/totem-statusbar.c:115
+msgid "Stopped"
+msgstr "Zastaveno"
+
+#: ../browser-plugin/totem-plugin-viewer.c:364 ../src/totem-object.c:1173
+msgid "Paused"
+msgstr "Pozastaveno"
+
+#: ../browser-plugin/totem-plugin-viewer.c:368 ../src/totem-object.c:1166
+msgid "Playing"
+msgstr "Přehrává se"
+
+#: ../browser-plugin/totem-plugin-viewer.c:386
+#: ../src/plugins/screensaver/totem-screensaver.c:97
+msgid "Playing a movie"
+msgstr "Přehrávání videa"
+
+#: ../browser-plugin/totem-plugin-viewer.c:443
+msgid "No URI to play"
+msgstr "Žádné URI k přehrání"
+
+#: ../browser-plugin/totem-plugin-viewer.c:676
+#: ../browser-plugin/totem-plugin-viewer.c:1700
+msgid "Totem Movie Player"
+msgstr "Přehrávač filmů Totem"
+
+#. translators: this is:
+#. * Open With ApplicationName
+#. * as in nautilus' right-click menu
+#: ../browser-plugin/totem-plugin-viewer.c:1120
+#, c-format
+msgid "_Open with \"%s\""
+msgstr "_Otevřít s „%s“"
+
+#: ../browser-plugin/totem-plugin-viewer.c:1341 ../src/totem-object.c:2475
+msgid "An error occurred"
+msgstr "Došlo k chybě"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2033
+msgid "No playlist or playlist empty"
+msgstr "Žádný nebo prázdný seznam k přehrání"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2128
+msgid "Movie browser plugin"
+msgstr "Zásuvný modul prohlížeče na přehrávání filmů"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144 ../src/totem.c:240
+msgid "Could not initialize the thread-safe libraries."
+msgstr "Nelze inicializovat knihovny podporující vlákna."
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144
+msgid "Verify your system installation. The Totem plugin will now exit."
+msgstr ""
+"Zkontrolujte svou instalaci systému. Zásuvný modul programu Totem bude nyní "
+"ukončen."
+
 #: ../data/fullscreen.ui.h:1
 msgid "Leave Fullscreen"
 msgstr "Opustit celou obrazovku"
 
-#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:144
+#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:81
 msgid "Time:"
 msgstr "Čas:"
 
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
+msgid "Allow the screensaver to activate when playing audio"
+msgstr "Povolit spuštění šetřiče obrazovky i pokud se přehrává pouze zvuk"
+
+# TEST
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
+msgid ""
+"Allow the screensaver to activate when playing audio. Disable if you have "
+"monitor-powered speakers."
+msgstr ""
+"Povolit spuštění šetřiče obrazovky i pokud se přehrává pouze zvuk. Toto "
+"zakažte, pokud máte reproduktory napájené přes monitor."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
+msgid "Show visual effects when no video is displayed"
+msgstr "Zobrazit vizuální efekty, pokud není zobrazeno video"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
+msgid "Show visual effects when playing an audio only file."
+msgstr "Zobrazovat vizuální efekty, pokud se přehrává pouze zvukový soubor."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
+msgid "Name of the visual effects plugin"
+msgstr "Název zásuvného modulu vizuálních efektů"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
+msgid "The brightness of the video"
+msgstr "Jas videa"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
+msgid "The contrast of the video"
+msgstr "Kontrast videa"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
+msgid "The hue of the video"
+msgstr "Odstín videa"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
+msgid "The saturation of the video"
+msgstr "Sytost videa"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
+msgid "Resize the canvas automatically on file load"
+msgstr "Změnit velikost plátna automaticky po načtení souboru"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
+msgid "Repeat mode"
+msgstr "Režim opakování"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
+msgid "Shuffle mode"
+msgstr "Náhodný režim"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
+msgid "Whether to disable deinterlacing for interlaced movies"
+msgstr "Zda zakázat o_dstranění prokládání u prokládaného videa"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
+msgid "Whether to enable debug for the playback engine"
+msgstr "Jestli povolit ladění přehrávacího systému"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
+msgid "Type of audio output to use"
+msgstr "Typ zvukového výstupu, který se má používat"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
+msgid "Visualization quality setting"
+msgstr "Kvalita vizualizace"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
+msgid "Quality setting for the audio visualization."
+msgstr "Nastavení kvality pro vizualizaci zvuku."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
+msgid "Network buffering threshold"
+msgstr "Práh ukládání do vyrovnávací paměti ze sítě"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
+msgid ""
+"Amount of data to buffer for network streams before starting to display the "
+"stream (in seconds)."
+msgstr ""
+"Objem dat, který se má ukládat do vyrovnávací paměti pro síťové proudy před "
+"započetím zobrazování proudu (v sekundách)"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
+msgid "Subtitle font"
+msgstr "Písmo titulků"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
+msgid "Pango font description for subtitle rendering."
+msgstr "Popis písma Pango pro vykreslování titulků."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
+msgid "Subtitle encoding"
+msgstr "Kódování titulků"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
+msgid "Encoding character set for subtitle."
+msgstr "Kódování znakové sady pro titulky."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
+msgid "Default location for the \"Open...\" dialogs"
+msgstr "Výchozí umístění pro dialogy „Otevřít…“"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
+msgid ""
+"Default location for the \"Open...\" dialogs. Default is the current "
+"directory."
+msgstr "Výchozí umístění pro dialogy „Otevřít…“. Výchozí je aktuální složka."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
+msgid "Default location for the \"Take Screenshot\" dialogs"
+msgstr "Výchozí umístění pro dialogy „Sejmout obrazovku“"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
+msgid ""
+"Default location for the \"Take Screenshot\" dialogs. Default is the "
+"Pictures directory."
+msgstr ""
+"Výchozí umístění pro dialogovy „Sejmout obrazovku“. Výchozí je složka "
+"„Obrázky“"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
+msgid "Whether to disable the plugins in the user's home directory"
+msgstr "Zda zakázat zásuvné moduly v uživatelově domovské složce"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
+msgid "Whether to disable the keyboard shortcuts"
+msgstr "Zda zakázat klávesové zkratky"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
+msgid "Whether to autoload text subtitle files when a movie is loaded"
+msgstr "Zda automaticky nahrávat soubory s titulky, když je nahrán film"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
+msgid "Whether to autoload external chapter files when a movie is loaded"
+msgstr ""
+"Zda automaticky načíst externí soubor s kapitolami, když je načten film"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
+msgid ""
+"Whether to remember the position of played audio/video files when pausing or "
+"closing them"
+msgstr ""
+"Zda si zapamatovat pozici v přehrávaných zvukových/video souborech při "
+"jejich pozastavení nebo zavření"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
+msgid "Active plugins list"
+msgstr "Seznam aktivních zásuvných modulů"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+msgid ""
+"A list of the names of the plugins which are currently active (loaded and "
+"running)."
+msgstr ""
+"Seznam názvů zásuvných modulů, které jsou v současnosti aktivované (načtené "
+"a běží)."
+
 #: ../data/playlist.ui.h:1
 msgid "_Remove"
 msgstr "Odst_ranit"
@@ -58,11 +275,11 @@
 msgstr "Kopírovat umístění do schránky"
 
 # TEST
-#: ../data/playlist.ui.h:5 ../data/totem.ui.h:78
+#: ../data/playlist.ui.h:5 ../data/totem.ui.h:71
 msgid "_Select Text Subtitles..."
 msgstr "Zvolit _titulky…"
 
-#: ../data/playlist.ui.h:6 ../data/totem.ui.h:79
+#: ../data/playlist.ui.h:6 ../data/totem.ui.h:72
 msgid "Select a file to use for text subtitles"
 msgstr "Vyberte soubor, který bude použit jako textové titulky"
 
@@ -86,10 +303,166 @@
 msgid "Move Down"
 msgstr "Posunout dolů"
 
-#: ../data/properties.ui.h:1 ../data/totem.ui.h:122
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:2
+msgid "Normal"
+msgstr "Normální"
+
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:4
+msgid "Large"
+msgstr "Velká"
+
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:6
+msgid "Extra Large"
+msgstr "Extra velká"
+
+#: ../data/preferences.ui.h:7 ../src/backend/bacon-video-widget.c:5518
+#: ../src/totem-properties-view.c:232
+msgid "Stereo"
+msgstr "Stereo"
+
+#: ../data/preferences.ui.h:8
+msgid "4-channel"
+msgstr "4kanálový"
+
+#: ../data/preferences.ui.h:9
+msgid "4.1-channel"
+msgstr "4.1kanálový"
+
+#: ../data/preferences.ui.h:10
+msgid "5.0-channel"
+msgstr "5kanálový"
+
+#: ../data/preferences.ui.h:11
+msgid "5.1-channel"
+msgstr "5.1kanálový"
+
+#: ../data/preferences.ui.h:12
+msgid "AC3 Passthrough"
+msgstr "Průchod AC3"
+
+#: ../data/preferences.ui.h:13
+msgid "Totem Preferences"
+msgstr "Nastavení Totemu"
+
+#: ../data/preferences.ui.h:14
+msgid "Playback"
+msgstr "Přehrávání"
+
+#: ../data/preferences.ui.h:15
+msgid "Start playing files from last position"
+msgstr "Spustit přehrávání souborů od poslední pozice"
+
+#: ../data/preferences.ui.h:16
+msgid "Text Subtitles"
+msgstr "Textové titulky"
+
+#: ../data/preferences.ui.h:17
+msgid "_Load subtitle files when movie is loaded"
+msgstr "Po načtení videa načíst soubory s titu_lky"
+
+#: ../data/preferences.ui.h:18
+msgid "_Font:"
+msgstr "_Písmo:"
+
+#: ../data/preferences.ui.h:19
+msgid "_Encoding:"
+msgstr "_Kódování:"
+
+#: ../data/preferences.ui.h:20
+msgid "External Chapters"
+msgstr "Externí kapitoly"
+
+#: ../data/preferences.ui.h:21
+msgid "Load _chapter files when movie is loaded"
+msgstr "Po načtení filmu načíst soubory s _kapitolami"
+
+#: ../data/preferences.ui.h:22 ../data/properties.ui.h:1
 msgid "General"
 msgstr "Obecné"
 
+#. Tab label in the Preferences dialogue
+#: ../data/preferences.ui.h:24
+msgid "Display"
+msgstr "Zobrazení"
+
+#: ../data/preferences.ui.h:25
+msgid "_Resize the window when a new video is loaded"
+msgstr "_Změnit velikost okna po načtení nového videa"
+
+#: ../data/preferences.ui.h:26
+msgid "Disable _deinterlacing of interlaced videos"
+msgstr "Zakázat o_dstranění prokládání u prokládaného videa"
+
+#: ../data/preferences.ui.h:27
+msgid "Disable screensaver when playing "
+msgstr "Zakázat šetřič obrazovky během přehrávání"
+
+#: ../data/preferences.ui.h:28 ../data/properties.ui.h:9
+#: ../src/totem-properties-view.c:275
+msgid "Video"
+msgstr "Video"
+
+#: ../data/preferences.ui.h:29
+msgid "Video or Audio"
+msgstr "Video nebo zvuk"
+
+#: ../data/preferences.ui.h:30
+msgid "Visual Effects"
+msgstr "Vizuální efekty"
+
+#: ../data/preferences.ui.h:31
+msgid "Show _visual effects when an audio file is played"
+msgstr "Zobrazovat _vizuální efekty při přehrávání zvukového souboru"
+
+#: ../data/preferences.ui.h:32
+msgid "_Type of visualization:"
+msgstr "_Typ vizualizace:"
+
+#: ../data/preferences.ui.h:33
+msgid "Visualization _size:"
+msgstr "_Velikost vizualizace:"
+
+#: ../data/preferences.ui.h:34
+msgid "Color Balance"
+msgstr "Vyvážení barev"
+
+#: ../data/preferences.ui.h:35
+msgid "_Brightness:"
+msgstr "_Jas:"
+
+#: ../data/preferences.ui.h:36
+msgid "Co_ntrast:"
+msgstr "_Kontrast:"
+
+#: ../data/preferences.ui.h:37
+msgid "Sat_uration:"
+msgstr "_Sytost:"
+
+#: ../data/preferences.ui.h:38
+msgid "_Hue:"
+msgstr "_Odstín:"
+
+# TEST
+#: ../data/preferences.ui.h:39
+msgid "Reset to _Defaults"
+msgstr "Vrátit na _výchozí"
+
+#: ../data/preferences.ui.h:40
+msgid "Audio Output"
+msgstr "Zvukový výstup"
+
+#: ../data/preferences.ui.h:41
+msgid "_Audio output type:"
+msgstr "_Typ zvukového výstupu:"
+
+#: ../data/preferences.ui.h:42 ../data/properties.ui.h:14
+#: ../src/totem-properties-view.c:273
+msgid "Audio"
+msgstr "Zvuk"
+
 #: ../data/properties.ui.h:2
 msgid "Title:"
 msgstr "Titul:"
@@ -118,11 +491,6 @@
 msgid "Container:"
 msgstr "Kontejner:"
 
-#: ../data/properties.ui.h:9 ../data/totem.ui.h:128
-#: ../src/totem-properties-view.c:270
-msgid "Video"
-msgstr "Video"
-
 #: ../data/properties.ui.h:10
 msgid "Dimensions:"
 msgstr "Rozměry:"
@@ -139,11 +507,6 @@
 msgid "Bitrate:"
 msgstr "Datový tok:"
 
-#: ../data/properties.ui.h:14 ../data/totem.ui.h:142
-#: ../src/totem-properties-view.c:268
-msgid "Audio"
-msgstr "Zvuk"
-
 #: ../data/properties.ui.h:15
 msgid "Sample rate:"
 msgstr "Vzorkovací frekvence:"
@@ -152,742 +515,454 @@
 msgid "Channels:"
 msgstr "Kanály:"
 
-#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
-msgid "_Add to Playlist"
-msgstr "Přid_at do seznamu k přehrání"
-
-#: ../data/video-list.ui.h:2
-msgid "Add the video to the playlist"
-msgstr "Přidat video do seznamu k přehrání"
-
 #. Title
-#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:143
-#: ../src/totem-object.c:1667
-msgid "Movie Player"
-msgstr "Přehrávač filmů"
+#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:80 ../src/totem.c:239
+#: ../src/totem.c:248 ../src/totem-menu.c:789 ../src/totem-object.c:1658
+msgid "Videos"
+msgstr "Videa"
 
 #: ../data/totem.desktop.in.in.in.h:2
-msgid "Play movies and songs"
-msgstr "Přehrávání filmů a písniček"
+msgid "Play movies"
+msgstr "Přehrávání filmů"
+
+#: ../data/totem.desktop.in.in.in.h:3
+msgid "Video;Movie;Film;Clip;Series;Player;DVD;TV;Disc;"
+msgstr "Video;Film;Klip;Seriál;Přehrávač;DVD;TV;Disk;"
 
 #: ../data/totem.ui.h:1
-msgid "_Movie"
-msgstr "_Film"
+msgid "_Open"
+msgstr "_Otevřít"
 
 #: ../data/totem.ui.h:2
-msgid "_Open..."
-msgstr "_Otevřít…"
+msgid "Open _Location"
+msgstr "Otevřít _umístění"
 
 #: ../data/totem.ui.h:3
-msgid "Open a file"
-msgstr "Otevřít soubor"
+msgid "_Fullscreen"
+msgstr "_Celá obrazovka"
 
 #: ../data/totem.ui.h:4
-msgid "Open _Location..."
-msgstr "Otevřít _umístění…"
+msgid "Prefere_nces"
+msgstr "Nastave_ní"
 
 #: ../data/totem.ui.h:5
-msgid "Open a non-local file"
-msgstr "Otevřít vzdálený soubor"
+msgid "Shuff_le"
+msgstr "_Náhodně"
 
 #: ../data/totem.ui.h:6
+msgid "_Repeat"
+msgstr "O_pakovat"
+
+#: ../data/totem.ui.h:7
+msgid "_Quit"
+msgstr "U_končit"
+
+#: ../data/totem.ui.h:8
+msgid "_Movie"
+msgstr "_Film"
+
+#: ../data/totem.ui.h:9
 msgid "_Eject"
 msgstr "_Vysunout"
 
-#: ../data/totem.ui.h:7
+#: ../data/totem.ui.h:10
 msgid "Eject the current disc"
 msgstr "Vysunout právě požívaný disk"
 
-#: ../data/totem.ui.h:8
+#: ../data/totem.ui.h:11
 msgid "_Properties"
 msgstr "_Vlastnosti"
 
-#: ../data/totem.ui.h:9
+#: ../data/totem.ui.h:12
 msgid "View the properties of the current stream"
 msgstr "Zobrazit vlastnosti současného proudu"
 
-#: ../data/totem.ui.h:10
+#: ../data/totem.ui.h:13
 msgid "Play / P_ause"
 msgstr "Přehrát / poz_astavit"
 
-#: ../data/totem.ui.h:11
+#: ../data/totem.ui.h:14
 msgid "Play or pause the movie"
 msgstr "Přehrát nebo pozastavit film"
 
-#: ../data/totem.ui.h:12
-msgid "_Quit"
-msgstr "U_končit"
-
-#: ../data/totem.ui.h:13
-msgid "Quit the program"
-msgstr "Ukončit aplikaci"
-
-#: ../data/totem.ui.h:14
+#: ../data/totem.ui.h:15
 msgid "_Edit"
 msgstr "_Upravit"
 
-#: ../data/totem.ui.h:15
+#: ../data/totem.ui.h:16
 msgid "_Clear Playlist"
 msgstr "_Vyprázdnit seznam k přehrání"
 
-#: ../data/totem.ui.h:16
+#: ../data/totem.ui.h:17
 msgid "Clear the playlist"
 msgstr "Vyprázdnit seznam k přehrání"
 
-#: ../data/totem.ui.h:17
-msgid "Prefere_nces"
-msgstr "Nastave_ní"
-
 #: ../data/totem.ui.h:18
-msgid "Configure the application"
-msgstr "Nastavit aplikaci"
-
-#: ../data/totem.ui.h:19
 msgid "Plugins..."
 msgstr "Zásuvné moduly…"
 
-#: ../data/totem.ui.h:20
+#: ../data/totem.ui.h:19
 msgid "Configure plugins to extend the application"
 msgstr "Nastavit zásuvné moduly pro rozšíření schopností aplikace"
 
-#: ../data/totem.ui.h:21
+#: ../data/totem.ui.h:20
 msgid "_View"
 msgstr "_Zobrazit"
 
-#: ../data/totem.ui.h:22
-msgid "_Fullscreen"
-msgstr "_Celá obrazovka"
-
-#: ../data/totem.ui.h:23
-msgid "Switch to fullscreen"
-msgstr "Přepnout do celoobrazovkového režimu"
-
-#: ../data/totem.ui.h:24
+#: ../data/totem.ui.h:21
 msgid "Fit Window to Movie"
 msgstr "Přizpůsobit okno filmu"
 
-#: ../data/totem.ui.h:25
+#: ../data/totem.ui.h:22
 msgid "_Resize 1:2"
 msgstr "_Změnit velikost na 1:2"
 
-#: ../data/totem.ui.h:26
+#: ../data/totem.ui.h:23
 msgid "Resize to half the original video size"
 msgstr "Změnit velikost na polovinu původní velikosti videa"
 
-#: ../data/totem.ui.h:27
+#: ../data/totem.ui.h:24
 msgid "Resize _1:1"
 msgstr "Změnit velikost na _1:1"
 
-#: ../data/totem.ui.h:28
+#: ../data/totem.ui.h:25
 msgid "Resize to the original video size"
 msgstr "Změnit velikost na původní velikost videa"
 
-#: ../data/totem.ui.h:29
+#: ../data/totem.ui.h:26
 msgid "Resize _2:1"
 msgstr "Změnit velikost na _2:1"
 
-#: ../data/totem.ui.h:30
+#: ../data/totem.ui.h:27
 msgid "Resize to double the original video size"
 msgstr "Změnit velikost na dvojnásobek původní velikosti videa"
 
-#: ../data/totem.ui.h:31
+#: ../data/totem.ui.h:28
 msgid "_Aspect Ratio"
 msgstr "_Poměr stran"
 
-#: ../data/totem.ui.h:32
+#: ../data/totem.ui.h:29
 msgid "Switch An_gles"
 msgstr "Přepnout ú_hly"
 
-#: ../data/totem.ui.h:33
+#: ../data/totem.ui.h:30
 msgid "Switch camera angles"
 msgstr "Přepnout úhly kamery"
 
-#: ../data/totem.ui.h:34
+#: ../data/totem.ui.h:31
 msgid "_Go"
 msgstr "Pře_jít"
 
-#: ../data/totem.ui.h:35
+#: ../data/totem.ui.h:32
 msgid "_DVD Menu"
 msgstr "Nabídka _DVD"
 
-#: ../data/totem.ui.h:36
+#: ../data/totem.ui.h:33
 msgid "Go to the DVD menu"
 msgstr "Přejít na nabídku DVD"
 
-#: ../data/totem.ui.h:37
+#: ../data/totem.ui.h:34
 msgid "_Title Menu"
 msgstr "Nabídka _titulků"
 
-#: ../data/totem.ui.h:38
+#: ../data/totem.ui.h:35
 msgid "Go to the title menu"
 msgstr "Přejít na nabídku titulků"
 
-#: ../data/totem.ui.h:39
+#: ../data/totem.ui.h:36
 msgid "A_udio Menu"
 msgstr "Nabídka z_vuku"
 
-#: ../data/totem.ui.h:40
+#: ../data/totem.ui.h:37
 msgid "Go to the audio menu"
 msgstr "Přejít na nabídku zvuku"
 
-#: ../data/totem.ui.h:41
+#: ../data/totem.ui.h:38
 msgid "_Angle Menu"
 msgstr "Nabídka ú_hlů"
 
-#: ../data/totem.ui.h:42
+#: ../data/totem.ui.h:39
 msgid "Go to the angle menu"
 msgstr "Přejít na nabídku úhlů"
 
-#: ../data/totem.ui.h:43
+#: ../data/totem.ui.h:40
 msgid "_Chapter Menu"
 msgstr "Nabídka _kapitol"
 
-#: ../data/totem.ui.h:44
+#: ../data/totem.ui.h:41
 msgid "Go to the chapter menu"
 msgstr "Přejít na nabídku kapitol"
 
-#: ../data/totem.ui.h:45
+#: ../data/totem.ui.h:42
 msgid "_Next Chapter/Movie"
 msgstr "_Následující kapitola/film"
 
-#: ../data/totem.ui.h:46
+#: ../data/totem.ui.h:43
 msgid "Next chapter or movie"
 msgstr "Následující kapitola nebo film"
 
-#: ../data/totem.ui.h:47
+#: ../data/totem.ui.h:44
 msgid "_Previous Chapter/Movie"
 msgstr "_Předchozí kapitola/film"
 
-#: ../data/totem.ui.h:48
+#: ../data/totem.ui.h:45
 msgid "Previous chapter or movie"
 msgstr "Předchozí kapitola nebo film"
 
-#: ../data/totem.ui.h:49
+#: ../data/totem.ui.h:46
 msgid "_Sound"
 msgstr "Z_vuk"
 
-#: ../data/totem.ui.h:50
+#: ../data/totem.ui.h:47
 msgid "Volume _Up"
 msgstr "Z_výšit hlasitost"
 
-#: ../data/totem.ui.h:51
+#: ../data/totem.ui.h:48
 msgid "Increase volume"
 msgstr "Zvýšit hlasitost"
 
-#: ../data/totem.ui.h:52
+#: ../data/totem.ui.h:49
 msgid "Volume _Down"
 msgstr "S_nížit hlasitost"
 
-#: ../data/totem.ui.h:53
+#: ../data/totem.ui.h:50
 msgid "Decrease volume"
 msgstr "Snížit hlasitost"
 
-#: ../data/totem.ui.h:54
+#: ../data/totem.ui.h:51
 msgid "_Help"
 msgstr "_Nápověda"
 
-#: ../data/totem.ui.h:55
+#: ../data/totem.ui.h:52
 msgid "_Contents"
 msgstr "_Obsah"
 
-#: ../data/totem.ui.h:56
+#: ../data/totem.ui.h:53
 msgid "Help contents"
 msgstr "Obsah nápovědy"
 
-#: ../data/totem.ui.h:57
+#: ../data/totem.ui.h:54
 msgid "_About"
 msgstr "O _aplikaci"
 
-#: ../data/totem.ui.h:58
+#: ../data/totem.ui.h:55
 msgid "About this application"
 msgstr "O této aplikaci"
 
-#: ../data/totem.ui.h:59
-msgid "_Repeat Mode"
-msgstr "Režim _opakování"
-
-#: ../data/totem.ui.h:60
-msgid "Set the repeat mode"
-msgstr "Nastavit režim opakování"
-
-#: ../data/totem.ui.h:61
-msgid "Shuff_le Mode"
-msgstr "_Náhodný režim"
-
-#: ../data/totem.ui.h:62
-msgid "Set the shuffle mode"
-msgstr "Nastavit náhodný režim"
-
-#: ../data/totem.ui.h:63
+#: ../data/totem.ui.h:56
 msgid "Show _Controls"
 msgstr "Zobrazovat _ovládací prvky"
 
-#: ../data/totem.ui.h:64
+#: ../data/totem.ui.h:57
 msgid "Show controls"
 msgstr "Zobrazit ovládací prvky"
 
-#: ../data/totem.ui.h:65
+#: ../data/totem.ui.h:58
 msgid "S_idebar"
 msgstr "_Boční panel"
 
-#: ../data/totem.ui.h:66
+#: ../data/totem.ui.h:59
 msgid "Show or hide the sidebar"
 msgstr "Zobrazit nebo skrýt boční panel"
 
-#: ../data/totem.ui.h:67
+#: ../data/totem.ui.h:60
 msgctxt "Aspect ratio"
-msgid "Auto"
-msgstr "Automaticky"
-
-#: ../data/totem.ui.h:68
-msgid "Sets automatic aspect ratio"
-msgstr "Nastaví automatický poměr stran"
-
-#: ../data/totem.ui.h:69
-msgid "Square"
-msgstr "Čtvercový"
-
-#: ../data/totem.ui.h:70
-msgid "Sets square aspect ratio"
-msgstr "Nastaví čtvercový poměr stran"
-
-#: ../data/totem.ui.h:71
-msgid "4:3 (TV)"
-msgstr "4:3 (TV)"
-
-#: ../data/totem.ui.h:72
-msgid "Sets 4:3 (TV) aspect ratio"
-msgstr "Nastaví poměr stran 4:3 (TV)"
-
-#: ../data/totem.ui.h:73
-msgid "16:9 (Widescreen)"
-msgstr "16:9 (širokoúhlá obrazovka)"
-
-#: ../data/totem.ui.h:74
-msgid "Sets 16:9 (widescreen) aspect ratio"
-msgstr "Nastaví poměr stran 16:9 (širokoúhlé)"
-
-#: ../data/totem.ui.h:75
-msgid "2.11:1 (DVB)"
-msgstr "2,11:1 (DVB)"
-
-#: ../data/totem.ui.h:76
-msgid "Sets 2.11:1 (DVB) aspect ratio"
-msgstr "Nastaví poměr stran 2,11:1 (DVB)"
-
-#: ../data/totem.ui.h:77
-msgid "S_ubtitles"
-msgstr "_Titulky"
-
-#: ../data/totem.ui.h:80
-msgid "_Languages"
-msgstr "_Jazyky"
-
-#: ../data/totem.ui.h:81
-msgid "Zoom In"
-msgstr "Zvětšit"
-
-#: ../data/totem.ui.h:82
-msgid "Zoom in"
-msgstr "Zvětšit"
-
-#: ../data/totem.ui.h:83
-msgid "Skip _Forward"
-msgstr "Přeskočit _vpřed"
-
-#: ../data/totem.ui.h:84
-msgid "Skip forward"
-msgstr "Přeskočit vpřed"
-
-#: ../data/totem.ui.h:85
-msgid "Skip _Backwards"
-msgstr "Přeskočit _zpět"
-
-#: ../data/totem.ui.h:86
-msgid "Skip backwards"
-msgstr "Přeskočit zpět"
-
-#: ../data/totem.ui.h:87
-msgid "14.4 Kbps Modem"
-msgstr "Modem 14,4 kb/s"
-
-#: ../data/totem.ui.h:88
-msgid "19.2 Kbps Modem"
-msgstr "Modem 19,2 kb/s"
-
-#: ../data/totem.ui.h:89
-msgid "28.8 Kbps Modem"
-msgstr "Modem 28,8 kb/s"
-
-#: ../data/totem.ui.h:90
-msgid "33.6 Kbps Modem"
-msgstr "Modem 33,6 kb/s"
-
-#: ../data/totem.ui.h:91
-msgid "34.4 Kbps Modem"
-msgstr "Modem 34,4 kb/s"
-
-#: ../data/totem.ui.h:92
-msgid "56 Kbps Modem/ISDN"
-msgstr "Modem/ISDN 56 kb/s"
-
-#: ../data/totem.ui.h:93
-msgid "112 Kbps Dual ISDN/DSL"
-msgstr "Dvojité ISDN/DSL 112 kb/s"
-
-#: ../data/totem.ui.h:94
-msgid "256 Kbps DSL/Cable"
-msgstr "DSL/kabel 256 kb/s"
-
-#: ../data/totem.ui.h:95
-msgid "384 Kbps DSL/Cable"
-msgstr "DSL/kabel 384 kb/s"
-
-#: ../data/totem.ui.h:96
-msgid "512 Kbps DSL/Cable"
-msgstr "DSL/kabel 512 kb/s"
-
-#: ../data/totem.ui.h:97
-msgid "1.5 Mbps T1/Intranet/LAN"
-msgstr "T1/Intranet/LAN 1,5 Mb/s"
-
-#: ../data/totem.ui.h:98
-msgid "Intranet/LAN"
-msgstr "Intranet/LAN"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:100
-msgid "Normal"
-msgstr "Normální"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:102
-msgid "Large"
-msgstr "Velká"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:104
-msgid "Extra Large"
-msgstr "Extra velká"
-
-#: ../data/totem.ui.h:105 ../src/totem-properties-view.c:228
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5593
-msgid "Stereo"
-msgstr "Stereo"
-
-#: ../data/totem.ui.h:106
-msgid "4-channel"
-msgstr "4kanálový"
-
-#: ../data/totem.ui.h:107
-msgid "4.1-channel"
-msgstr "4.1kanálový"
-
-#: ../data/totem.ui.h:108
-msgid "5.0-channel"
-msgstr "5kanálový"
-
-#: ../data/totem.ui.h:109
-msgid "5.1-channel"
-msgstr "5.1kanálový"
-
-#: ../data/totem.ui.h:110
-msgid "AC3 Passthrough"
-msgstr "Průchod AC3"
-
-#: ../data/totem.ui.h:111
-msgid "Totem Preferences"
-msgstr "Nastavení Totemu"
-
-#: ../data/totem.ui.h:112
-msgid "Playback"
-msgstr "Přehrávání"
-
-#: ../data/totem.ui.h:113
-msgid "Start playing files from last position"
-msgstr "Spustit přehrávání souborů od poslední pozice"
-
-#: ../data/totem.ui.h:114
-msgid "Networking"
-msgstr "Síť"
-
-#: ../data/totem.ui.h:115
-msgid "Connection _speed:"
-msgstr "_Rychlost připojení:"
-
-#: ../data/totem.ui.h:116
-msgid "Text Subtitles"
-msgstr "Textové titulky"
-
-#: ../data/totem.ui.h:117
-msgid "_Load subtitle files when movie is loaded"
-msgstr "Po načtení videa načíst soubory s titu_lky"
-
-#: ../data/totem.ui.h:118
-msgid "_Font:"
-msgstr "_Písmo:"
-
-#: ../data/totem.ui.h:119
-msgid "_Encoding:"
-msgstr "_Kódování:"
-
-#: ../data/totem.ui.h:120
-msgid "External Chapters"
-msgstr "Externí kapitoly"
-
-#: ../data/totem.ui.h:121
-msgid "Load _chapter files when movie is loaded"
-msgstr "Po načtení filmu načíst soubory s _kapitolami"
-
-#. Tab label in the Preferences dialogue
-#: ../data/totem.ui.h:124
-msgid "Display"
-msgstr "Zobrazení"
-
-#: ../data/totem.ui.h:125
-msgid "_Resize the window when a new video is loaded"
-msgstr "_Změnit velikost okna po načtení nového videa"
-
-#: ../data/totem.ui.h:126
-msgid "Disable _deinterlacing of interlaced videos"
-msgstr "Zakázat o_dstranění prokládání u prokládaného videa"
-
-#: ../data/totem.ui.h:127
-msgid "Disable screensaver when playing "
-msgstr "Zakázat šetřič obrazovky během přehrávání"
-
-#: ../data/totem.ui.h:129
-msgid "Video or Audio"
-msgstr "Video nebo zvuk"
-
-#: ../data/totem.ui.h:130
-msgid "Visual Effects"
-msgstr "Vizuální efekty"
-
-#: ../data/totem.ui.h:131
-msgid "Show _visual effects when an audio file is played"
-msgstr "Zobrazovat _vizuální efekty při přehrávání zvukového souboru"
-
-#: ../data/totem.ui.h:132
-msgid "_Type of visualization:"
-msgstr "_Typ vizualizace:"
-
-#: ../data/totem.ui.h:133
-msgid "Visualization _size:"
-msgstr "_Velikost vizualizace:"
-
-#: ../data/totem.ui.h:134
-msgid "Color Balance"
-msgstr "Vyvážení barev"
-
-#: ../data/totem.ui.h:135
-msgid "_Brightness:"
-msgstr "_Jas:"
-
-#: ../data/totem.ui.h:136
-msgid "Co_ntrast:"
-msgstr "_Kontrast:"
-
-#: ../data/totem.ui.h:137
-msgid "Sat_uration:"
-msgstr "_Sytost:"
-
-#: ../data/totem.ui.h:138
-msgid "_Hue:"
-msgstr "_Odstín:"
-
-# TEST
-#: ../data/totem.ui.h:139
-msgid "Reset to _Defaults"
-msgstr "Vrátit na _výchozí"
-
-#: ../data/totem.ui.h:140
-msgid "Audio Output"
-msgstr "Zvukový výstup"
-
-#: ../data/totem.ui.h:141
-msgid "_Audio output type:"
-msgstr "_Typ zvukového výstupu:"
+msgid "Auto"
+msgstr "Automaticky"
 
-#: ../data/totem.ui.h:145
-msgid "Time seek bar"
-msgstr "Časová lišta průběhu"
+#: ../data/totem.ui.h:61
+msgid "Sets automatic aspect ratio"
+msgstr "Nastaví automatický poměr stran"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
-msgid "Allow the screensaver to activate when playing audio"
-msgstr "Povolit spuštění šetřiče obrazovky i pokud se přehrává pouze zvuk"
+#: ../data/totem.ui.h:62
+msgid "Square"
+msgstr "Čtvercový"
 
-# TEST
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
-msgid ""
-"Allow the screensaver to activate when playing audio. Disable if you have "
-"monitor-powered speakers."
-msgstr ""
-"Povolit spuštění šetřiče obrazovky i pokud se přehrává pouze zvuk. Toto "
-"zakažte, pokud máte reproduktory napájené přes monitor."
+#: ../data/totem.ui.h:63
+msgid "Sets square aspect ratio"
+msgstr "Nastaví čtvercový poměr stran"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
-msgid "Show visual effects when no video is displayed"
-msgstr "Zobrazit vizuální efekty, pokud není zobrazeno video"
+#: ../data/totem.ui.h:64
+msgid "4:3 (TV)"
+msgstr "4:3 (TV)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
-msgid "Show visual effects when playing an audio only file."
-msgstr "Zobrazovat vizuální efekty, pokud se přehrává pouze zvukový soubor."
+#: ../data/totem.ui.h:65
+msgid "Sets 4:3 (TV) aspect ratio"
+msgstr "Nastaví poměr stran 4:3 (TV)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
-msgid "Name of the visual effects plugin"
-msgstr "Název zásuvného modulu vizuálních efektů"
+#: ../data/totem.ui.h:66
+msgid "16:9 (Widescreen)"
+msgstr "16:9 (širokoúhlá obrazovka)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
-msgid "The brightness of the video"
-msgstr "Jas videa"
+#: ../data/totem.ui.h:67
+msgid "Sets 16:9 (widescreen) aspect ratio"
+msgstr "Nastaví poměr stran 16:9 (širokoúhlé)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
-msgid "The contrast of the video"
-msgstr "Kontrast videa"
+#: ../data/totem.ui.h:68
+msgid "2.11:1 (DVB)"
+msgstr "2,11:1 (DVB)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
-msgid "The hue of the video"
-msgstr "Odstín videa"
+#: ../data/totem.ui.h:69
+msgid "Sets 2.11:1 (DVB) aspect ratio"
+msgstr "Nastaví poměr stran 2,11:1 (DVB)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
-msgid "The saturation of the video"
-msgstr "Sytost videa"
+#: ../data/totem.ui.h:70
+msgid "S_ubtitles"
+msgstr "_Titulky"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
-msgid "Resize the canvas automatically on file load"
-msgstr "Změnit velikost plátna automaticky po načtení souboru"
+#: ../data/totem.ui.h:73
+msgid "_Languages"
+msgstr "_Jazyky"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
-msgid "Network connection speed"
-msgstr "Rychlost připojení"
+#: ../data/totem.ui.h:74
+msgid "Zoom In"
+msgstr "Zvětšit"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
-msgid ""
-"Approximate network connection speed, used to select quality on media over "
-"the network."
-msgstr ""
-"Přibližná rychlost síťového připojení použitá k výběru kvality pro média "
-"přenášená přes síť."
+#: ../data/totem.ui.h:75
+msgid "Zoom in"
+msgstr "Zvětšit"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
-msgid "Repeat mode"
-msgstr "Režim opakování"
+#: ../data/totem.ui.h:76
+msgid "Skip _Forward"
+msgstr "Přeskočit _vpřed"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
-msgid "Shuffle mode"
-msgstr "Náhodný režim"
+#: ../data/totem.ui.h:77
+msgid "Skip forward"
+msgstr "Přeskočit vpřed"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
-msgid "Whether to disable deinterlacing for interlaced movies"
-msgstr "Zda zakázat o_dstranění prokládání u prokládaného videa"
+#: ../data/totem.ui.h:78
+msgid "Skip _Backwards"
+msgstr "Přeskočit _zpět"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
-msgid "Whether to enable debug for the playback engine"
-msgstr "Jestli povolit ladění přehrávacího systému"
+#: ../data/totem.ui.h:79
+msgid "Skip backwards"
+msgstr "Přeskočit zpět"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
-msgid "Type of audio output to use"
-msgstr "Typ zvukového výstupu, který se má používat"
+#: ../data/totem.ui.h:82
+msgid "Time seek bar"
+msgstr "Časová lišta průběhu"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
-msgid "Visualization quality setting"
-msgstr "Kvalita vizualizace"
+#: ../data/uri.ui.h:1
+msgid "Enter the _address of the file you would like to open:"
+msgstr "Vložte _adresu souboru, který chcete otevřít:"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
-msgid "Quality setting for the audio visualization."
-msgstr "Nastavení kvality pro vizualizaci zvuku."
+#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
+msgid "_Add to Playlist"
+msgstr "Přid_at do seznamu k přehrání"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
-msgid "Network buffering threshold"
-msgstr "Práh ukládání do vyrovnávací paměti ze sítě"
+#: ../data/video-list.ui.h:2
+msgid "Add the video to the playlist"
+msgstr "Přidat video do seznamu k přehrání"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
-msgid ""
-"Amount of data to buffer for network streams before starting to display the "
-"stream (in seconds)."
-msgstr ""
-"Objem dat, který se má ukládat do vyrovnávací paměti pro síťové proudy před "
-"započetím zobrazování proudu (v sekundách)"
+#: ../src/backend/bacon-video-widget.c:1643
+msgid "Password requested for RTSP server"
+msgstr "Heslo vyžadované pro server RTSP"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
-msgid "Subtitle font"
-msgstr "Písmo titulků"
+#: ../src/backend/bacon-video-widget.c:2940
+#, c-format
+msgid "Audio Track #%d"
+msgstr "Zvuková stopa #%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
-msgid "Pango font description for subtitle rendering."
-msgstr "Popis písma Pango pro vykreslování titulků."
+# TEST
+#: ../src/backend/bacon-video-widget.c:2944
+#, c-format
+msgid "Subtitle #%d"
+msgstr "Titulek #%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
-msgid "Subtitle encoding"
-msgstr "Kódování titulků"
+#: ../src/backend/bacon-video-widget.c:3341
+msgid "The server you are trying to connect to is not known."
+msgstr "Server, ke kterému se snažíte připojit, není známý."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
-msgid "Encoding character set for subtitle."
-msgstr "Kódování znakové sady pro titulky."
+#: ../src/backend/bacon-video-widget.c:3344
+msgid "The connection to this server was refused."
+msgstr "Připojení k tomuto serveru bylo zamítnuto."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
-msgid "Default location for the \"Open...\" dialogs"
-msgstr "Výchozí umístění pro dialogy „Otevřít…“"
+# TEST
+#: ../src/backend/bacon-video-widget.c:3347
+msgid "The specified movie could not be found."
+msgstr "Zadaný film nebyl nalezen."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
-msgid ""
-"Default location for the \"Open...\" dialogs. Default is the current "
-"directory."
-msgstr "Výchozí umístění pro dialogy „Otevřít…“. Výchozí je aktuální složka."
+#: ../src/backend/bacon-video-widget.c:3354
+msgid "The server refused access to this file or stream."
+msgstr "Přístup k tomuto souboru či proudu byl serverem zamítnut."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
-msgid "Default location for the \"Take Screenshot\" dialogs"
-msgstr "Výchozí umístění pro dialogy „Sejmout obrazovku“"
+#: ../src/backend/bacon-video-widget.c:3360
+msgid "Authentication is required to access this file or stream."
+msgstr "K přístupu k tomuto souboru či proudu je zapotřebí ověření."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
-msgid ""
-"Default location for the \"Take Screenshot\" dialogs. Default is the "
-"Pictures directory."
-msgstr ""
-"Výchozí umístění pro dialogovy „Sejmout obrazovku“. Výchozí je složka "
-"„Obrázky“"
+#: ../src/backend/bacon-video-widget.c:3367
+msgid "You are not allowed to open this file."
+msgstr "Nemáte oprávnění otevřít tento soubor."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
-msgid "Whether to disable the plugins in the user's home directory"
-msgstr "Zda zakázat zásuvné moduly v uživatelově domovské složce"
+# TEST
+#: ../src/backend/bacon-video-widget.c:3372
+msgid "This location is not a valid one."
+msgstr "Toto není platné upístění."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
-msgid "Whether to disable the keyboard shortcuts"
-msgstr "Zda zakázat klávesové zkratky"
+# TEST
+#: ../src/backend/bacon-video-widget.c:3380
+msgid "The movie could not be read."
+msgstr "Film nebylo možno přečíst."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
-msgid "Whether to autoload text subtitle files when a movie is loaded"
-msgstr "Zda automaticky nahrávat soubory s titulky, když je nahrán film"
+#. should be exactly one missing thing (source or converter)
+#: ../src/backend/bacon-video-widget.c:3403
+#: ../src/backend/bacon-video-widget.c:3411
+#, c-format
+msgid "The playback of this movie requires a %s plugin which is not installed."
+msgid_plural ""
+"The playback of this movie requires the following decoders which are not "
+"installed:\n"
+"\n"
+"%s"
+msgstr[0] ""
+"Pro přehrání tohoto filmu je vyžadován zásuvný modul %s, který není "
+"nainstalován."
+msgstr[1] ""
+"Pro přehrání tohoto filmu jsou vyžadovány následující dekodéry, které nejsou "
+"nainstalovány:\n"
+"\n"
+"%s"
+msgstr[2] ""
+"Pro přehrání tohoto filmu jsou vyžadovány následující dekodéry, které nejsou "
+"nainstalovány:\n"
+"\n"
+"%s"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
-msgid "Whether to autoload external chapter files when a movie is loaded"
+#: ../src/backend/bacon-video-widget.c:3422
+msgid ""
+"An audio or video stream is not handled due to missing codecs. You might "
+"need to install additional plugins to be able to play some types of movies"
 msgstr ""
-"Zda automaticky načíst externí soubor s kapitolami, když je načten film"
+"Obrazový či zvukový proud nelze kvůli chybějícím kodekům přehrát. K "
+"přehrávání některých typů médií budete potřebovat nainstalovat zásuvné "
+"moduly."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+#: ../src/backend/bacon-video-widget.c:3432
 msgid ""
-"Whether to remember the position of played audio/video files when pausing or "
-"closing them"
+"This file cannot be played over the network. Try downloading it locally "
+"first."
 msgstr ""
-"Zda si zapamatovat pozici v přehrávaných zvukových/video souborech při "
-"jejich pozastavení nebo zavření"
+"Tento soubor nelze přehrávat po síti. Zkuste jej nejdřív stáhnout na disk."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:35
-msgid "Active plugins list"
-msgstr "Seznam aktivních zásuvných modulů"
+#: ../src/backend/bacon-video-widget.c:5514 ../src/totem-properties-view.c:228
+msgid "Surround"
+msgstr "Surround"
+
+#: ../src/backend/bacon-video-widget.c:5516 ../src/totem-properties-view.c:230
+msgid "Mono"
+msgstr "Mono"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:36
+#: ../src/backend/bacon-video-widget.c:5801
+msgid "Media contains no supported video streams."
+msgstr "Médium neobsahuje žádný podporovaný proud videa."
+
+#: ../src/backend/bacon-video-widget.c:5983
 msgid ""
-"A list of the names of the plugins which are currently active (loaded and "
-"running)."
+"Some necessary plug-ins are missing. Make sure that the program is correctly "
+"installed."
 msgstr ""
-"Seznam názvů zásuvných modulů, které jsou v současnosti aktivované (načtené "
-"a běží)."
-
-#: ../data/uri.ui.h:1
-msgid "Enter the _address of the file you would like to open:"
-msgstr "Vložte _adresu souboru, který chcete otevřít:"
+"Některé nutné zásuvné moduly chybí. Ujistěte se, že je program nainstalován "
+"správně."
 
 # TEST
 #: ../src/eggdesktopfile.c:165
@@ -1011,6 +1086,33 @@
 msgid "Show session management options"
 msgstr "Zobrazit volby správy sezení"
 
+# TEST
+#. hour:minutes:seconds
+#. Translators: This is a time format, like "9:05:02" for 9
+#. * hours, 5 minutes, and 2 seconds. You may change ":" to
+#. * the separator that your locale uses or use "%Id" instead
+#. * of "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:56
+#: ../src/plugins/skipto/totem-time-entry.c:57
+#, c-format
+msgctxt "long time format"
+msgid "%d:%02d:%02d"
+msgstr "%d:%02d:%02d"
+
+# TEST
+#. minutes:seconds
+#. Translators: This is a time format, like "5:02" for 5
+#. * minutes and 2 seconds. You may change ":" to the
+#. * separator that your locale uses or use "%Id" instead of
+#. * "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:65
+#, c-format
+msgctxt "short time format"
+msgid "%d:%02d"
+msgstr "%d:%02d"
+
 #. Title
 #. Artist
 #. Album
@@ -1119,10 +1221,14 @@
 msgstr[1] "%d snímky za sekundu"
 msgstr[2] "%d snímků za sekundu"
 
-#: ../src/totem-audio-preview.c:168
+#: ../src/totem-audio-preview.c:137
 msgid "Audio Preview"
 msgstr "Ukázka zvuku"
 
+#: ../src/totem.c:240
+msgid "Verify your system installation. Totem will now exit."
+msgstr "Zkontrolujte svou instalaci systému. Totem nyní skončí."
+
 #: ../src/totem-cell-renderer-video.c:126
 msgid "Unknown video"
 msgstr "Neznámé video"
@@ -1137,7 +1243,7 @@
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: ../src/totem-fullscreen.c:616
+#: ../src/totem-fullscreen.c:573
 msgid "No File"
 msgstr "Žádný soubor"
 
@@ -1155,7 +1261,7 @@
 msgid "Make sure that Totem is properly installed."
 msgstr "Ujistěte se, že je Totem správně nainstalován."
 
-#: ../src/totem-interface.c:347
+#: ../src/totem-interface.c:357
 msgid ""
 "Totem 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 "
@@ -1167,7 +1273,7 @@
 "verze 2 této licence anebo (podle vlastního uvážení) kterékoliv pozdější "
 "verze."
 
-#: ../src/totem-interface.c:351
+#: ../src/totem-interface.c:361
 msgid ""
 "Totem is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -1178,7 +1284,7 @@
 "ZÁRUKY; neposkytují se ani odvozené záruky PRODEJNOSTI anebo VHODNOSTI PRO "
 "URČITÝ ÚČEL. Další podrobnosti hledejte v GNU General Public License."
 
-#: ../src/totem-interface.c:355
+#: ../src/totem-interface.c:365
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Totem; if not, write to the Free Software Foundation, Inc., 59 Temple Place, "
@@ -1188,7 +1294,7 @@
 "programem; pokud se tak nestalo, napište o ni Free Software Foundation, "
 "Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA"
 
-#: ../src/totem-interface.c:358
+#: ../src/totem-interface.c:368
 msgid ""
 "Totem contains an exception to allow the use of proprietary GStreamer "
 "plugins."
@@ -1196,47 +1302,22 @@
 "Totem obsahuje výjimku umožňující použít proprietární moduly GStreamer."
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:190
+#: ../src/totem-menu.c:291
 msgid "None"
 msgstr "Žádný"
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:195
+#: ../src/totem-menu.c:296
 msgctxt "Language"
 msgid "Auto"
 msgstr "Automaticky"
 
-#. Translators:
-#. * This is not a JPEG image, but a disc image, for example,
-#. * an ISO file
-#: ../src/totem-menu.c:765
-#, c-format
-msgid "Play Image '%s'"
-msgstr "Přehrát obraz „%s“"
-
-#: ../src/totem-menu.c:768 ../src/totem-menu.c:851
-#, c-format
-msgid "device%d"
-msgstr "zařízení%d"
-
-#: ../src/totem-menu.c:848
-#, c-format
-msgid "Play Disc '%s'"
-msgstr "Přehrát disk „%s“"
-
-#. This lists the back-end type and version, such as
-#. * Movie Player using GStreamer 0.10.1
-#: ../src/totem-menu.c:1189
-#, c-format
-msgid "Movie Player using %s"
-msgstr "Přehrávač filmů používající %s"
-
 # TEST
-#: ../src/totem-menu.c:1193
+#: ../src/totem-menu.c:788
 msgid "Copyright © 2002-2009 Bastien Nocera"
 msgstr "Copyright © 2002–2009 Bastien Nocera"
 
-#: ../src/totem-menu.c:1198
+#: ../src/totem-menu.c:792
 msgid "translator-credits"
 msgstr ""
 "Martin Picek \n"
@@ -1248,160 +1329,81 @@
 "Kamil Páral \n"
 "Petr Kovář \n"
 "Pavel Šefránek \n"
-"Marek Černocký "
+"Marek Černocký \n"
+"Adam Matoušek "
 
-#: ../src/totem-menu.c:1202
+#: ../src/totem-menu.c:796
 msgid "Totem Website"
 msgstr "Stránka Totemu"
 
-#: ../src/totem-menu.c:1236
+#: ../src/totem-menu.c:827
 msgid "Configure Plugins"
 msgstr "Nastavit zásuvné moduly"
 
+#: ../src/totem-object.c:162
+#, c-format
+msgid ""
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"%s\n"
+"Seznam všech dostupných možností získáte příkazem „%s --help“.\n"
+
 #. Translators: %s is the totem version number
-#: ../src/totem-object.c:471
+#: ../src/totem-object.c:591
 #, c-format
 msgid "Totem %s"
 msgstr "Totem %s"
 
-#: ../src/totem-object.c:1047 ../browser-plugin/totem-plugin-viewer.c:367
-msgid "Playing"
-msgstr "Přehrává se"
-
-#: ../src/totem-object.c:1049 ../src/totem-options.c:52
+#: ../src/totem-object.c:1168 ../src/totem-options.c:52
 msgid "Pause"
 msgstr "Pozastavit"
 
-#: ../src/totem-object.c:1054 ../browser-plugin/totem-plugin-viewer.c:363
-msgid "Paused"
-msgstr "Pozastaveno"
-
-#: ../src/totem-object.c:1056 ../src/totem-object.c:1066
+#: ../src/totem-object.c:1175 ../src/totem-object.c:1185
 #: ../src/totem-options.c:51
 msgid "Play"
 msgstr "Přehrát"
 
-#: ../src/totem-object.c:1061 ../src/totem-object.c:1659
-#: ../src/totem-statusbar.c:115 ../browser-plugin/totem-plugin-viewer.c:351
-msgid "Stopped"
-msgstr "Zastaveno"
-
-#: ../src/totem-object.c:1142 ../src/totem-object.c:1169
-#: ../src/totem-object.c:1799 ../src/totem-object.c:1963
+#: ../src/totem-object.c:1267 ../src/totem-object.c:1294
+#: ../src/totem-object.c:1787 ../src/totem-object.c:1942
 #, c-format
 msgid "Totem could not play '%s'."
 msgstr "Totem nemohl přehrát „%s“."
 
-#: ../src/totem-object.c:1246
-#, c-format
-msgid ""
-"Totem could not play this media (%s) although a plugin is present to handle "
-"it."
-msgstr ""
-"Totem nemohl přehrát tento typ médií (%s), přestože je nainstalován zásuvný "
-"modul, který umí tento typ médií zpracovat."
-
-#: ../src/totem-object.c:1247
-msgid ""
-"You might want to check that a disc is present in the drive and that it is "
-"correctly configured."
-msgstr ""
-"Zkuste zkontrolovat, zda je v zařízení přítomen disk a zda je zařízení "
-"správně nastaveno."
-
-#: ../src/totem-object.c:1255
-msgid "More information about media plugins"
-msgstr "Více informací o multimediálních zásuvných modulech"
-
-#: ../src/totem-object.c:1256
-msgid ""
-"Please install the necessary plugins and restart Totem to be able to play "
-"this media."
-msgstr ""
-"Aby Totem mohl tento typ médií přehrávat, nainstalujte odpovídající zásuvné "
-"moduly a poté spusťte Totem znovu."
-
-#: ../src/totem-object.c:1258
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because it does not have the "
-"appropriate plugins to be able to read from the disc."
-msgstr ""
-"Totem nemůže přehrát tento typ média (%s), protože nemá vhodný zásuvný "
-"modul, který by umožnil čtení z disku."
-
-#: ../src/totem-object.c:1260
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because you do not have the "
-"appropriate plugins to handle it."
-msgstr ""
-"Totem nemůže přehrávat tento typ médií (%s), protože nemáte zásuvné moduly "
-"potřebné k jeho zpracování."
-
-#: ../src/totem-object.c:1263
-#, c-format
-msgid "Totem cannot play this type of media (%s) because it is not supported."
-msgstr "Totem nemůže přehrávat tento typ médií (%s), protože není podporován."
-
-#: ../src/totem-object.c:1264
-msgid "Please insert another disc to play back."
-msgstr "Vložte další disk, který chcete přehrát."
-
-#: ../src/totem-object.c:1300
-msgid "Totem was not able to play this disc."
-msgstr "Totem nemohl přehrát tento disk."
-
-# :-)
-#: ../src/totem-object.c:1301 ../src/totem-object.c:4229
-msgid "No reason."
-msgstr "Žádný důvod."
-
-#: ../src/totem-object.c:1315
-msgid "Totem does not support playback of Audio CDs"
-msgstr "Totem nepodporuje přehrávání hudebních CD"
-
-#: ../src/totem-object.c:1316
-msgid "Please consider using a music player or a CD extractor to play this CD"
-msgstr ""
-"Zvažte použití hudebního přehrávače nebo extraktoru CD pro přehrání tohoto "
-"hudebního disku"
-
-#: ../src/totem-object.c:1805
+#: ../src/totem-object.c:1793
 msgid "No error message"
 msgstr "Žádná zpráva o chybě"
 
-#: ../src/totem-object.c:2154
+#: ../src/totem-object.c:2133
 msgid "Totem could not display the help contents."
 msgstr "Totem nemohl zobrazit obsah nápovědy."
 
-#: ../src/totem-object.c:2493 ../src/totem-object.c:2495
-#: ../browser-plugin/totem-plugin-viewer.c:1417
-msgid "An error occurred"
-msgstr "Došlo k chybě"
-
-#: ../src/totem-object.c:4064 ../src/totem-object.c:4066
+#: ../src/totem-object.c:4019 ../src/totem-object.c:4021
 msgid "Previous Chapter/Movie"
 msgstr "Předchozí kapitola/film"
 
-#: ../src/totem-object.c:4073 ../src/totem-object.c:4075
+#: ../src/totem-object.c:4028 ../src/totem-object.c:4030
 msgid "Play / Pause"
 msgstr "Přehrát / pozastavit"
 
-#: ../src/totem-object.c:4083 ../src/totem-object.c:4085
+#: ../src/totem-object.c:4038 ../src/totem-object.c:4040
 msgid "Next Chapter/Movie"
 msgstr "Následující kapitola/film"
 
-#. Translators: this is the tooltip text for the fullscreen button in the controls box in Totem's main window.
 #. Translators: this is the accessibility text for the fullscreen button in the controls box in Totem's main window.
-#: ../src/totem-object.c:4097 ../src/totem-object.c:4099
+#: ../src/totem-object.c:4051 ../src/totem-object.c:4053
 msgid "Fullscreen"
 msgstr "Celá obrazovka"
 
-#: ../src/totem-object.c:4229
+#: ../src/totem-object.c:4184
 msgid "Totem could not startup."
 msgstr "Totem se nemohl spustit."
 
+# :-)
+#: ../src/totem-object.c:4184
+msgid "No reason."
+msgstr "Žádný důvod."
+
 #: ../src/totem-open-location.c:182
 msgid "Open Location..."
 msgstr "Otevřít umístění…"
@@ -1476,121 +1478,115 @@
 msgid "Movies to play"
 msgstr "Filmy k přehrání"
 
-#: ../src/totem-options.c:117
+#: ../src/totem-options.c:79
+msgid "- Play movies and songs"
+msgstr "- přehrává filmy a písničky"
+
+#: ../src/totem-options.c:142
 msgid "Can't enqueue and replace at the same time"
 msgstr "Nelze v tu samou chvíli zařazovat do fronty a přejmenovávat"
 
 # TEST
 #. By extension entry
-#: ../src/totem-playlist.c:161
+#: ../src/totem-playlist.c:162
 msgid "MP3 ShoutCast playlist"
 msgstr "Seznam k přehrání MP3 ShoutCast"
 
 # TEST
-#: ../src/totem-playlist.c:162
+#: ../src/totem-playlist.c:163
 msgid "MP3 audio (streamed)"
 msgstr "Zvuk MP3 (proud)"
 
 # TEST
-#: ../src/totem-playlist.c:163
+#: ../src/totem-playlist.c:164
 msgid "MP3 audio (streamed, DOS format)"
 msgstr "Zvuk MP3 (proud, formát DOS)"
 
 # TEST
-#: ../src/totem-playlist.c:164
+#: ../src/totem-playlist.c:165
 msgid "XML Shareable Playlist"
 msgstr "Seznam k přehrání XML Shareable"
 
 #. This is "Title 3", where title is a DVD title
 #. * Note: NOT a DVD chapter
-#: ../src/totem-playlist.c:347
+#: ../src/totem-playlist.c:348
 #, c-format
 msgid "Title %d"
 msgstr "Titul %d"
 
-#: ../src/totem-playlist.c:446
+#: ../src/totem-playlist.c:447
 msgid "Could not save the playlist"
 msgstr "Nelze uložit seznam k přehrání"
 
-#: ../src/totem-playlist.c:1021
+#: ../src/totem-playlist.c:1022
 msgid "Save Playlist"
 msgstr "Uložit seznam k přehrání"
 
 #. translators: Playlist is the default saved playlist filename,
 #. * without the suffix
-#: ../src/totem-playlist.c:1033 ../src/totem-playlist.c:1264
-#: ../src/totem-sidebar.c:142
+#: ../src/totem-playlist.c:1034 ../src/totem-playlist.c:1263
+#: ../src/totem-sidebar.c:145
 msgid "Playlist"
 msgstr "Seznam k přehrání"
 
-#: ../src/totem-playlist.c:1857
+#: ../src/totem-playlist.c:1862
 #, c-format
 msgid "The playlist '%s' could not be parsed. It might be damaged."
 msgstr "Seznam k přehrání „%s“ nelze zpracovat. Možná je poškozen."
 
-#: ../src/totem-playlist.c:1858
+#: ../src/totem-playlist.c:1863
 msgid "Playlist error"
 msgstr "Chyba seznamu k přehrání"
 
-#: ../src/totem-preferences.c:295
+#: ../src/totem-preferences.c:297
 msgid "Preferences"
 msgstr "Předvolby"
 
-#: ../src/totem-preferences.c:451
+#: ../src/totem-preferences.c:445
 msgid "Select Subtitle Font"
 msgstr "Zvolte písmo titulků"
 
-#: ../src/totem-properties-main.c:115 ../src/totem-properties-view.c:266
+#: ../src/totem-properties-main.c:116 ../src/totem-properties-view.c:271
 msgid "Audio/Video"
 msgstr "Zvuk/video"
 
-#: ../src/totem-properties-view.c:128
+#: ../src/totem-properties-view.c:131
 msgid "N/A"
 msgstr "---"
 
-#: ../src/totem-properties-view.c:157
+#: ../src/totem-properties-view.c:160
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 msgctxt "Stream bit rate"
 msgid "N/A"
 msgstr "---"
 
-#: ../src/totem-properties-view.c:160
+#: ../src/totem-properties-view.c:163
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 #, c-format
 msgid "%d kbps"
 msgstr "%d kb/s"
 
-#: ../src/totem-properties-view.c:177
+#: ../src/totem-properties-view.c:180
 #: ../src/plugins/properties/totem-movie-properties.c:149
 #, c-format
 msgid "%d x %d"
 msgstr "%d × %d"
 
-#: ../src/totem-properties-view.c:209
+#: ../src/totem-properties-view.c:212
 #: ../src/plugins/properties/totem-movie-properties.c:166
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: ../src/totem-properties-view.c:216
+#: ../src/totem-properties-view.c:220
 #: ../src/plugins/properties/totem-movie-properties.c:166
 msgctxt "Sample rate"
 msgid "N/A"
 msgstr "---"
 
-#: ../src/totem-properties-view.c:224
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5589
-msgid "Surround"
-msgstr "Surround"
-
-#: ../src/totem-properties-view.c:226
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5591
-msgid "Mono"
-msgstr "Mono"
-
-#: ../src/totem-properties-view.c:236
+#: ../src/totem-properties-view.c:241
 msgctxt "Number of audio channels"
 msgid "N/A"
 msgstr "---"
@@ -1623,8 +1619,8 @@
 #. eg: 75 %
 #: ../src/totem-statusbar.c:250
 #, c-format
-msgid "%d %%"
-msgstr "%d %%"
+msgid "%lf %%"
+msgstr "%lf %%"
 
 #. eg: Paused, 0:32 / 1:05
 #: ../src/totem-statusbar.c:325
@@ -1635,8 +1631,8 @@
 #. eg: Buffering, 75 %
 #: ../src/totem-statusbar.c:330
 #, c-format
-msgid "%s, %d %%"
-msgstr "%s, %d %%"
+msgid "%s, %f %%"
+msgstr "%s, %f %%"
 
 #: ../src/totem-subtitle-encoding.c:156
 msgid "Current Locale"
@@ -1780,236 +1776,100 @@
 msgid "Vietnamese"
 msgstr "Vietnamské"
 
-#: ../src/totem-video-list.c:330
-msgid "No video URI"
-msgstr "Žádné URI videa"
-
-# TEST
-#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
-#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
-#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
-#: ../src/totem-video-thumbnailer.c:872
-#, c-format
-msgid ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-msgstr ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-
-# TEST
-#: ../src/totem-video-thumbnailer.c:873
-msgid "Filename"
-msgstr "Název souboru"
-
-# TEST
-#: ../src/totem-video-thumbnailer.c:875
-msgid "Resolution"
-msgstr "Rozlišení"
-
-# TEST
-#: ../src/totem-video-thumbnailer.c:878
-msgid "Duration"
-msgstr "Délka"
-
-#: ../src/totem-uri.c:506 ../src/plugins/chapters/totem-chapters.c:998
+#: ../src/totem-uri.c:343 ../src/plugins/chapters/totem-chapters.c:998
 msgid "All files"
 msgstr "Všechny soubory"
 
-#: ../src/totem-uri.c:511 ../src/plugins/chapters/totem-chapters.c:995
+#: ../src/totem-uri.c:348 ../src/plugins/chapters/totem-chapters.c:995
 msgid "Supported files"
 msgstr "Podporované soubory"
 
-#: ../src/totem-uri.c:523
+#: ../src/totem-uri.c:360
 msgid "Audio files"
 msgstr "Hudební soubory"
 
-#: ../src/totem-uri.c:531
+#: ../src/totem-uri.c:368
 msgid "Video files"
 msgstr "Soubory videa"
 
-#: ../src/totem-uri.c:541
+#: ../src/totem-uri.c:378
 msgid "Subtitle files"
 msgstr "Soubory s titulky"
 
 # TEST
-#: ../src/totem-uri.c:593
+#: ../src/totem-uri.c:430
 msgid "Select Text Subtitles"
 msgstr "Zvolte titulky"
 
-#: ../src/totem-uri.c:656
+#: ../src/totem-uri.c:495
 msgid "Select Movies or Playlists"
 msgstr "Zvolte filmy nebo seznamy k přehrání"
 
-#. Options parsing
-#: ../src/totem.c:201
-msgid "- Play movies and songs"
-msgstr "- přehrává filmy a písničky"
-
-#: ../src/totem.c:212
-#, c-format
-msgid ""
-"%s\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"%s\n"
-"Seznam všech dostupných možností získáte příkazem „%s --help“.\n"
-
-#: ../src/totem.c:254 ../src/totem.c:265
-#: ../browser-plugin/totem-plugin-viewer.c:663
-#: ../browser-plugin/totem-plugin-viewer.c:1793
-msgid "Totem Movie Player"
-msgstr "Přehrávač filmů Totem"
-
-#: ../src/totem.c:255 ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Could not initialize the thread-safe libraries."
-msgstr "Nelze inicializovat knihovny podporující vlákna."
-
-#: ../src/totem.c:255
-msgid "Verify your system installation. Totem will now exit."
-msgstr "Zkontrolujte svou instalaci systému. Totem nyní skončí."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:1589
-msgid "Password requested for RTSP server"
-msgstr "Heslo vyžadované pro server RTSP"
+#: ../src/totem-uri.c:499
+msgid "Add Directory"
+msgstr "Přidat složku"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2858
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2862
-#, c-format
-msgid "Audio Track #%d"
-msgstr "Zvuková stopa #%d"
+#: ../src/totem-video-list.c:330
+msgid "No video URI"
+msgstr "Žádné URI videa"
 
 # TEST
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2890
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2894
+#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
+#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
+#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
+#: ../src/totem-video-thumbnailer.c:841
 #, c-format
-msgid "Subtitle #%d"
-msgstr "Titulek #%d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3298
-msgid ""
-"The requested audio output was not found. Please select another audio output "
-"in the Multimedia Systems Selector."
-msgstr ""
-"Požadovaný výstup zvuku nebyl nalezen. Zvolte jiný výstup zvuku ve Výběru "
-"systému multimédií."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3303
-msgid "Location not found."
-msgstr "Umístění nenalezeno."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3307
-msgid ""
-"Could not open location; you might not have permission to open the file."
-msgstr "Nelze otevřít umístění; možná nemáte oprávnění otevřít tento soubor."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3318
 msgid ""
-"The video output is in use by another application. Please close other video "
-"applications, or select another video output in the Multimedia Systems "
-"Selector."
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 msgstr ""
-"Výstup videa používá jiná aplikace. Zavřete jiné aplikace videa, nebo zvolte "
-"jiný výstup videa ve Výběru systému multimédií."
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3324
-msgid ""
-"The audio output is in use by another application. Please select another "
-"audio output in the Multimedia Systems Selector. You may want to consider "
-"using a sound server."
-msgstr ""
-"Výstup zvuku používá jiná aplikace. Zvolte jiný výstup zvuku ve Výběru "
-"systému multimédií. Možná by bylo vhodné použít zvukový server."
+# TEST
+#: ../src/totem-video-thumbnailer.c:842
+msgid "Filename"
+msgstr "Název souboru"
 
-#. should be exactly one missing thing (source or converter)
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3342
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3348
-#, c-format
-msgid "The playback of this movie requires a %s plugin which is not installed."
-msgid_plural ""
-"The playback of this movie requires the following decoders which are not "
-"installed:\n"
-"\n"
-"%s"
-msgstr[0] ""
-"Pro přehrání tohoto filmu je vyžadován zásuvný modul %s, který není "
-"nainstalován."
-msgstr[1] ""
-"Pro přehrání tohoto filmu jsou vyžadovány následující dekodéry, které nejsou "
-"nainstalovány:\n"
-"\n"
-"%s"
-msgstr[2] ""
-"Pro přehrání tohoto filmu jsou vyžadovány následující dekodéry, které nejsou "
-"nainstalovány:\n"
-"\n"
-"%s"
+# TEST
+#: ../src/totem-video-thumbnailer.c:844
+msgid "Resolution"
+msgstr "Rozlišení"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3374
-msgid ""
-"Cannot play this file over the network. Try downloading it to disk first."
-msgstr ""
-"Tento soubor nelze přehrávat po síti. Zkuste jej nejdřív stáhnout na disk."
+# TEST
+#: ../src/totem-video-thumbnailer.c:847
+msgid "Duration"
+msgstr "Délka"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5878
-msgid "Media contains no supported video streams."
-msgstr "Médium neobsahuje žádný podporovaný proud videa."
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:1
+msgid "Apple Trailers"
+msgstr "Upoutávky Apple"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6052
-msgid ""
-"Failed to create a GStreamer play object. Please check your GStreamer "
-"installation."
-msgstr ""
-"Nelze vytvořit přehrávací objekt GStreamer. Zkontrolujte svou instalaci "
-"systému GStreamer."
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:2
+msgid "Sets the user agent for the Apple Trailers site"
+msgstr "Nastaví uživatelského agenta pro stránku upoutávek Apple"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6172
-msgid ""
-"Failed to open audio output. You may not have permission to open the sound "
-"device, or the sound server may not be running. Please select another audio "
-"output in the Multimedia Systems Selector."
-msgstr ""
-"Nelze otevřít zvukový výstup. Možná nemáte oprávnění otevřít zvukové "
-"zařízení, nebo neběží zvukový server. Zvolte jiný zvukový výstup ve Výběru "
-"systému multimédií."
+# TEST
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:1
+msgid "Autoload Subtitles"
+msgstr "Načítat titulky"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6192
-msgid ""
-"Could not find the audio output. You may need to install additional "
-"GStreamer plugins, or select another audio output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"Nelze najít zvukový výstup. Možná bude nutné nainstalovat další zásuvné "
-"moduly GStreamer, nebo vybrat jiný zvukový výstup ve Výběru systému "
-"multimédií."
+# TEST
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:2
+msgid "Autoloads text subtitles"
+msgstr "Automaticky načítá titulky"
 
 # TEST
-#. hour:minutes:seconds
-#. Translators: This is a time format, like "9:05:02" for 9
-#. * hours, 5 minutes, and 2 seconds. You may change ":" to
-#. * the separator that your locale uses or use "%Id" instead
-#. * of "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:83 ../src/plugins/skipto/totem-time-entry.c:57
-#, c-format
-msgctxt "long time format"
-msgid "%d:%02d:%02d"
-msgstr "%d:%02d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
+msgid "Video Disc Recorder"
+msgstr "Vypalování filmových disků"
 
 # TEST
-#. minutes:seconds
-#. Translators: This is a time format, like "5:02" for 5
-#. * minutes and 2 seconds. You may change ":" to the
-#. * separator that your locale uses or use "%Id" instead of
-#. * "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:92
-#, c-format
-msgctxt "short time format"
-msgid "%d:%02d"
-msgstr "%d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
+msgid "Records (S)VCDs or video DVDs"
+msgstr "Vypalování disků (S)VCD nebo video DVD"
 
 # TEST
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:65
@@ -2042,42 +1902,23 @@
 msgstr "Zkopírovat právě přehrávané (S)VCD"
 
 # TEST
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:129
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:136
 msgid "The video disc could not be duplicated."
 msgstr "Filmový disk se nepodařilo zkopírovat."
 
 # TEST
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:131
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:276
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:138
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:283
 msgid "The movie could not be recorded."
 msgstr "Film se nepodařilo vypálit."
 
 # TEST
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:157
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:167
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:263
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:164
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:174
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:270
 msgid "Unable to write a project."
 msgstr "Nepodařilo se zapsat projekt."
 
-# TEST
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
-msgid "Video Disc Recorder"
-msgstr "Vypalování filmových disků"
-
-# TEST
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
-msgid "Records (S)VCDs or video DVDs"
-msgstr "Vypalování disků (S)VCD nebo video DVD"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:1
-#: ../src/plugins/chapters/totem-chapters.c:1139
-msgid "Chapters"
-msgstr "Kapitoly"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:2
-msgid "Support chapter markers in movies."
-msgstr "Podpora značení kapitol ve filmech."
-
 #: ../src/plugins/chapters/chapters-edit.ui.h:1
 msgid "Name for new chapter:"
 msgstr "Název pro novou kapitolu:"
@@ -2130,9 +1971,18 @@
 msgid "Add New Chapters"
 msgstr "Přidat nové kapitoly"
 
-#: ../src/plugins/chapters/chapters-list.ui.h:13
-msgid "Create a new chapter list for the movie"
-msgstr "Vytvořit nový seznam kapitol pro film"
+#: ../src/plugins/chapters/chapters-list.ui.h:13
+msgid "Create a new chapter list for the movie"
+msgstr "Vytvořit nový seznam kapitol pro film"
+
+#: ../src/plugins/chapters/chapters.plugin.in.h:1
+#: ../src/plugins/chapters/totem-chapters.c:1139
+msgid "Chapters"
+msgstr "Kapitoly"
+
+#: ../src/plugins/chapters/chapters.plugin.in.h:2
+msgid "Support chapter markers in movies"
+msgstr "Podpora značení kapitol ve filmech"
 
 #: ../src/plugins/chapters/totem-chapters.c:56
 #, c-format
@@ -2242,13 +2092,39 @@
 msgid "The URI ‘%s’ is not supported."
 msgstr "Adresa URI „%s“ není podporována."
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
-msgid "Instant Messenger status"
-msgstr "Status komunikátoru"
+# TEST
+#: ../src/plugins/grilo/grilo.plugin.in.h:1
+msgid "Grilo Browser"
+msgstr "Prohlížeč Grilo"
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
-msgid "Set your Instant Messenger status to away when a movie is playing"
-msgstr "Při přehrávání filmu nastavit stav ve vašem komunikátoru na ‚pryč‘"
+#: ../src/plugins/grilo/grilo.plugin.in.h:2
+msgid "A plugin to let you browse media content from various sources"
+msgstr ""
+"Zásuvný modul, který vám umožní procházet mediální obsah z různých zdrojů"
+
+#: ../src/plugins/grilo/grilo.ui.h:1
+msgid "Add to Playlist"
+msgstr "Přidat do seznamu k přehrání"
+
+#: ../src/plugins/grilo/grilo.ui.h:2
+msgid "Copy Location"
+msgstr "Kopírovat umístění"
+
+#: ../src/plugins/grilo/grilo.ui.h:3 ../src/plugins/grilo/totem-grilo.c:1186
+msgid "Browse"
+msgstr "Procházet"
+
+#: ../src/plugins/grilo/grilo.ui.h:4 ../src/plugins/grilo/totem-grilo.c:1229
+msgid "Search"
+msgstr "Hledat"
+
+#: ../src/plugins/grilo/totem-grilo.c:454
+msgid "Browse Error"
+msgstr "Chyba při procházení"
+
+#: ../src/plugins/grilo/totem-grilo.c:609
+msgid "Search Error"
+msgstr "Chyba při hledání"
 
 #: ../src/plugins/gromit/gromit.plugin.in.h:1
 msgid "Gromit Annotations"
@@ -2262,57 +2138,13 @@
 msgid "The gromit binary was not found."
 msgstr "Binární soubor gromit nebyl nalezen."
 
-#. Add the interface to Totem's sidebar
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:1
-#: ../src/plugins/iplayer/iplayer.py:46
-msgid "BBC iPlayer"
-msgstr "BBC iPlayer"
-
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:2
-msgid "Stream BBC programs from the last 7 days from the BBC iPlayer service."
-msgstr "Proud programů BBC za posledních 7 dní ze služby BBC iPlayer."
-
-#: ../src/plugins/iplayer/iplayer.py:72
-msgid "Error listing channel categories"
-msgstr "Chyba při vypisování kategorií kanálů"
-
-#: ../src/plugins/iplayer/iplayer.py:73
-msgid ""
-"There was an unknown error getting the list of television channels available "
-"on BBC iPlayer."
-msgstr ""
-"Vyskytla se neznámá chyba při získávání seznamu televizních kanálů "
-"dostupných na BBC iPlayer."
-
-#. Append a dummy child row so that the expander's visible; we can
-#. then queue off the expander to load the programme listing for this
-#. category
-#: ../src/plugins/iplayer/iplayer.py:84
-msgid "Loading…"
-msgstr "Načítá se…"
-
-#. Translators: the "programme feed" is the list of TV shows
-#. available to watch online
-#: ../src/plugins/iplayer/iplayer.py:136
-msgid "Error getting programme feed"
-msgstr "Chyba při získávání programové nabídky"
-
-#: ../src/plugins/iplayer/iplayer.py:137
-msgid ""
-"There was an error getting the list of programmes for this channel and "
-"category combination."
-msgstr ""
-"Vyskytla se chyba při získávání seznamu programů pro tento kanál a kombinaci "
-"kategorií."
-
-#: ../src/plugins/iplayer/iplayer2.py:298
-msgid ""
-msgstr ""
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
+msgid "Instant Messenger Status"
+msgstr "Status komunikátoru"
 
-#: ../src/plugins/iplayer/iplayer2.py:299
-#, python-format
-msgid "Programme unavailable (\"%s\")"
-msgstr "Program není dostupný („%s“)"
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
+msgid "Set your Instant Messenger status to away when a movie is playing"
+msgstr "Při přehrávání filmu nastavit stav ve vašem komunikátoru na ‚pryč‘"
 
 #: ../src/plugins/lirc/lirc.plugin.in.h:1
 msgid "Infrared Remote Control"
@@ -2330,20 +2162,21 @@
 msgid "Couldn't read lirc configuration."
 msgstr "Nelze načíst nastavení lirc."
 
-# TEST
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
-msgid "Download Movie Subtitles"
-msgstr "Stahování titulků k filmům"
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:1
+msgid "Media Player Keys"
+msgstr "Klávesy přehrávače"
+
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:2
+msgid "Support additional media player keys"
+msgstr "Podpora doplňkových kláves pro přehrávače"
 
-# TEST
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
-msgid "Subtitle _language:"
-msgstr "_Jazyk titulků:"
+#: ../src/plugins/ontop/ontop.plugin.in.h:1
+msgid "Always On Top"
+msgstr "Vždy nahoře"
 
-# TEST
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
-msgid "_Play with Subtitle"
-msgstr "_Přehrát s titulky"
+#: ../src/plugins/ontop/ontop.plugin.in.h:2
+msgid "Keep the main window on top when playing a movie"
+msgstr "Během přehrávání videa udržovat hlavní okno nahoře"
 
 # TEST
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:1
@@ -2352,8 +2185,8 @@
 
 # TEST
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:2
-msgid "Look for subtitles for the currently playing movie."
-msgstr "Vyhledat titulky k právě přehrávanému filmu."
+msgid "Look for subtitles for the currently playing movie"
+msgstr "Vyhledat titulky k právě přehrávanému filmu"
 
 # TEST
 #: ../src/plugins/opensubtitles/opensubtitles.py:42
@@ -2422,6 +2255,21 @@
 msgstr "Vyhledávají se titulky…"
 
 # TEST
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
+msgid "Download Movie Subtitles"
+msgstr "Stahování titulků k filmům"
+
+# TEST
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
+msgid "Subtitle _language:"
+msgstr "_Jazyk titulků:"
+
+# TEST
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
+msgid "_Play with Subtitle"
+msgstr "_Přehrát s titulky"
+
+# TEST
 #: ../src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in.h:1
 msgid "Subtitle language"
 msgstr "Jazyk titulků"
@@ -2430,111 +2278,113 @@
 msgid "The language to search for subtitles for movies in."
 msgstr "Jazyk, pro který se mají ve filmu hledat titulky."
 
-#: ../src/plugins/ontop/ontop.plugin.in.h:1
-msgid "Always On Top"
-msgstr "Vždy nahoře"
-
-#: ../src/plugins/ontop/ontop.plugin.in.h:2
-msgid "Keep the main window on top when playing a movie"
-msgstr "Během přehrávání videa udržovat hlavní okno nahoře"
+#: ../src/plugins/properties/movie-properties.plugin.in.h:1
+msgid "Movie Properties"
+msgstr "Vlastnosti filmu"
+
+#: ../src/plugins/properties/movie-properties.plugin.in.h:2
+msgid "Adds movie properties to the sidebar"
+msgstr "Přidá vlastnosti filmu na postranní panel"
 
 #: ../src/plugins/properties/totem-movie-properties.c:246
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:1
-msgid "Publisher protocol to use"
-msgstr "Protokol použitý ke zveřejnění"
+#: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:1
+msgid "rpdb2 password"
+msgstr "heslo rpdb2"
 
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:2
+#: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:2
 msgid ""
-"The transport protocol to use when publishing playlists over the network."
+"A password to protect the rpdb2 server for debugging Totem from unauthorized "
+"remote access. If this is empty, a default of 'totem' will be used."
 msgstr ""
-"Přenosový protokol, který se má použít, když se zveřejňuje seznam k přehrání "
-"přes síť."
+"Heslo sloužící k ochraně serveru rpdb2, používaného pro ladění aplikace "
+"Totem, při neautorizovaném vzdáleném přístupu. Pokud je prázdné, platí "
+"výchozí heslo „totem“."
 
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:3
-msgid "Format for network service name"
-msgstr "Formát pro název síťových služeb"
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
+msgid "Python Console"
+msgstr "Konzola python"
 
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:5
-#, no-c-format
-msgid ""
-"A format string used to build the network service name used when publishing "
-"playlists over the network. The following format placeholders can be used: • "
-"%a: the program name as returned by g_get_application_name() • %h: the "
-"machine's host name in title case • %u: the user's login name in title case "
-"• %U: the user's real name • %%: the percent sign"
-msgstr ""
-"Formát řetězce použitý k sestavení názvu síťové služby, který se použije při "
-"zveřejnění seznamu k přehrání přes síť. Lze použít následující zástupné "
-"proměnné: • %a: název programu, tak jak jej vrací funkce "
-"g_get_application_name() • %h: název hostujícího počítače, první písmena "
-"slov velká • %u: uživatelovo přihlašovací jméno, první písmena slov velká • "
-"%U: uživatelovo skutečné jméno • %%: znak procenta"
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
+msgid "Interactive Python console"
+msgstr "Interaktivní konzola jazyka Python"
 
-# TEST
-#. Translators: computers on the local network which are publishing their playlists over the network
-#: ../src/plugins/publish/totem-publish.c:552
-msgid "Neighbors"
-msgstr "Okolí"
+#: ../src/plugins/pythonconsole/pythonconsole.py:88
+msgid "Python Console Menu"
+msgstr "Nabídka konzoly python"
 
-#: ../src/plugins/publish/publish.plugin.in.h:1
-msgid "Publish Playlist"
-msgstr "Zveřejnit seznam k přehrání"
+#: ../src/plugins/pythonconsole/pythonconsole.py:93
+msgid "_Python Console"
+msgstr "Konzola _python"
 
-#: ../src/plugins/publish/publish.plugin.in.h:2
-msgid "Share the current playlist via HTTP"
-msgstr "Sdílení aktuálního seznamu k přehrání přes HTTP"
+#: ../src/plugins/pythonconsole/pythonconsole.py:94
+msgid "Show Totem's Python console"
+msgstr "Zobrazit konzolu jazyka Python v aplikaci Totem"
 
-#: ../src/plugins/publish/publish-plugin.ui.h:1
-msgid "Service _Name:"
-msgstr "_Název služby:"
+#: ../src/plugins/pythonconsole/pythonconsole.py:100
+msgid "Python Debugger"
+msgstr "Ladicí program pro jazyk Python"
 
-#: ../src/plugins/publish/publish-plugin.ui.h:3
-#, no-c-format
-msgid ""
-"The name used for announcing the playlist service on the network.\n"
-"All occurrences of the string %u will be replaced by your name,\n"
-"and %h will be replaced by your computer's host name."
-msgstr ""
-"Název použitý pro službu sdělování seznamu k přehrání na sítí.\n"
-"Všechny výskyty řetězce %u budou nahrazeny vaším jménem\n"
-"a %h bude nahrazeno názvem vašeho počítače."
+#: ../src/plugins/pythonconsole/pythonconsole.py:101
+msgid "Enable remote Python debugging with rpdb2"
+msgstr "Povolit vzdálené ladění jazyka Python za pomoci rpdb2"
 
-#: ../src/plugins/publish/publish-plugin.ui.h:6
-msgid "Use _encrypted transport protocol (HTTPS)"
-msgstr "Použít zab_ezpečený přenosový protokol (HTTPS)"
+#. pylint: disable-msg=E1101
+#: ../src/plugins/pythonconsole/pythonconsole.py:125
+#, python-format
+msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
+msgstr "K objektu Totem.Object můžete přistupovat pomocí „totem_object“ :\\n%s"
 
-#: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:1
-msgid "rpdb2 password"
-msgstr "heslo rpdb2"
+#: ../src/plugins/pythonconsole/pythonconsole.py:129
+msgid "Totem Python Console"
+msgstr "Konzola Python aplikace Totem"
 
-#: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:2
+#: ../src/plugins/pythonconsole/pythonconsole.py:139
 msgid ""
-"A password to protect the rpdb2 server for debugging Totem from unauthorized "
-"remote access. If this is empty, a default of 'totem' will be used."
+"After you press OK, Totem will wait until you connect to it with winpdb or "
+"rpdb2. If you have not set a debugger password in DConf, it will use the "
+"default password ('totem')."
 msgstr ""
-"Heslo sloužící k ochraně serveru rpdb2, používaného pro ladění aplikace "
-"Totem, při neautorizovaném vzdáleném přístupu. Pokud je prázdné, platí "
-"výchozí heslo „totem“."
+"Po stisknutí Budiž aplikace Totem počká, než se k ní připojíte pomocí winpdb "
+"nebo rpdb2. Pokud jste nenastavili heslo ladění v GConf, tak se použije "
+"výchozí heslo („totem“)."
+
+#: ../src/plugins/recent/recent.plugin.in.h:1
+msgid "Recent files"
+msgstr "Nedávné soubory"
+
+#: ../src/plugins/recent/recent.plugin.in.h:2
+msgid "Adds files that have been played to recent files"
+msgstr "Přidává přehrané soubory do nedávných souborů"
 
 #: ../src/plugins/rotation/rotation.plugin.in.h:1
 msgid "Rotation Plugin"
 msgstr "Zásuvný modul otáčení"
 
 #: ../src/plugins/rotation/rotation.plugin.in.h:2
-msgid "Allows videos to be rotated if they're in the wrong orientation."
-msgstr "Umožňuje video otočit v případě, že je nesprávně orientováno"
+msgid "Allows videos to be rotated if they are in the wrong orientation"
+msgstr "Umožňuje video otočit v případě, že je otočeno nesprávně"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:60
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:50
 msgid "_Rotate Clockwise"
 msgstr "Otočit po smě_ru hodinových ručiček"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:62
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:52
 msgid "Rotate Counterc_lockwise"
 msgstr "Otočit pro_ti směru hodinových ručiček"
 
+# TEST
+#: ../src/plugins/save-file/save-file.plugin.in.h:1
+msgid "Save Copy"
+msgstr "Uložit kopii"
+
+# TEST
+#: ../src/plugins/save-file/save-file.plugin.in.h:2
+msgid "Save a copy of the currently playing movie"
+msgstr "Uložit kopii právě přehráváného filmu"
+
 #: ../src/plugins/save-file/totem-save-file.c:63
 msgid "Save a Copy..."
 msgstr "Uložit kopii…"
@@ -2558,10 +2408,13 @@
 msgid "Movie stream"
 msgstr "Filmový proud"
 
-#: ../src/plugins/screensaver/totem-screensaver.c:116
-#: ../browser-plugin/totem-plugin-viewer.c:1891
-msgid "Playing a movie"
-msgstr "Přehrávání videa"
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:1
+msgid "Screen Saver"
+msgstr "Šetřič obrazovky"
+
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:2
+msgid "Deactivates the screen saver when a movie is playing"
+msgstr "Vypne šetřič obrazovky, když se přehrává film"
 
 # TEST
 #: ../src/plugins/screenshot/gallery.ui.h:1
@@ -2578,23 +2431,28 @@
 msgid "Number of screenshots:"
 msgstr "Počet snímků:"
 
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:1
-msgid "_Name:"
-msgstr "_Název:"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:2
-msgid "Save in _folder:"
-msgstr "Uložit do _složky:"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:3
-msgid "Select a folder"
-msgstr "Výběr složky"
-
-#. Write the screenshot to the temporary file
-#: ../src/plugins/screenshot/gnome-screenshot-widget.c:385
-#: ../src/plugins/screenshot/totem-screenshot.c:64
-msgid "Screenshot.png"
-msgstr "Snímek.png"
+#. translators: this is the name of the file that gets made up
+#. * with the screenshot if the entire screen is taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:147
+#, c-format
+msgid "Screenshot from %s.png"
+msgstr "Snímek z %s.png"
+
+#. translators: this is the name of the file that gets
+#. * made up with the screenshot if the entire screen is
+#. * taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:154
+#, c-format
+msgid "Screenshot from %s - %d.png"
+msgstr "Snímek z %s – %d.png"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:1
+msgid "Screenshot"
+msgstr "Snímek obrazovky"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:2
+msgid "Allows screenshots and galleries to be taken of videos"
+msgstr "Umožňuje vytvářet snímky a galerie z přehrávaných videí"
 
 # TEST
 #: ../src/plugins/screenshot/totem-gallery.c:91
@@ -2623,52 +2481,50 @@
 msgid "Saving gallery as \"%s\""
 msgstr "Galerie se ukládá jako „%s“"
 
-#: ../src/plugins/screenshot/totem-screenshot.c:113
-msgid "There was an error saving the screenshot."
-msgstr "Při ukládání obrazovky došlo k chybě."
-
-#: ../src/plugins/screenshot/totem-screenshot.c:139
-msgid "Save Screenshot"
-msgstr "Uložení snímku"
-
-#. Create the screenshot widget
-#. Translators: %s is the movie title and %d is an auto-incrementing number to make filename unique
-#: ../src/plugins/screenshot/totem-screenshot.c:160
-#, c-format
-msgid "Screenshot-%s-%d.png"
-msgstr "Snímek - %s (%d).png"
-
 # TEST
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:88
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:220
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "Totem could not get a screenshot of the video."
 msgstr "Aplikaci Totem se nepodařilo zachytit snímek z tohoto videa."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "This is not supposed to happen; please file a bug report."
 msgstr "Tato situace by neměla nikdy nastat; ohlaste chybu vývojářům programu."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
-msgid "Take _Screenshot..."
-msgstr "Vytvořit _snímek…"
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
+msgid "Take _Screenshot"
+msgstr "Zachytit _snímek obrazovky"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
 msgid "Take a screenshot"
 msgstr "Vytvořit snímek z přehrávání"
 
 # TEST
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create Screenshot _Gallery..."
 msgstr "Vytvořit _galerii snímků…"
 
 # TEST
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create a gallery of screenshots"
 msgstr "Vytvořit galerii snímků z přehrávání"
 
+#: ../src/plugins/skipto/skipto.plugin.in.h:1
+#: ../src/plugins/skipto/totem-skipto.c:196
+msgid "Skip To"
+msgstr "Přeskočit na"
+
+#: ../src/plugins/skipto/skipto.plugin.in.h:2
+msgid "Provides the \"Skip to\" dialog"
+msgstr "Nabízí dialog „Přeskočit na“"
+
+#: ../src/plugins/skipto/skipto.ui.h:1
+msgid "_Skip to:"
+msgstr "_Přeskočit na:"
+
 #. Update the "seconds" label so that it always has the correct singular/plural form
 #. Translators: label for the seconds selector in the "Skip to" dialogue
-#: ../src/plugins/skipto/totem-skipto.c:160
+#: ../src/plugins/skipto/totem-skipto.c:159
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "sekunda"
@@ -2679,15 +2535,11 @@
 #. Translators: you should translate this string to a number (written in digits) which corresponds to the longer character length of the
 #. * translations for "second" and "seconds", as translated elsewhere in this file. For example, in English, "second" is 6 characters long and
 #. * "seconds" is 7 characters long, so this string should be translated to "7". See: bgo#639398
-#: ../src/plugins/skipto/totem-skipto.c:190
+#: ../src/plugins/skipto/totem-skipto.c:189
 msgctxt "Skip To label length"
 msgid "7"
 msgstr "7"
 
-#: ../src/plugins/skipto/totem-skipto.c:197
-msgid "Skip To"
-msgstr "Přeskočit na"
-
 #: ../src/plugins/skipto/totem-skipto-plugin.c:182
 msgid "_Skip To..."
 msgstr "_Přeskočit na…"
@@ -2696,114 +2548,266 @@
 msgid "Skip to a specific time"
 msgstr "Přeskočit na konkrétní čas"
 
-#: ../src/plugins/skipto/skipto.ui.h:1
-msgid "_Skip to:"
-msgstr "_Přeskočit na:"
-
-#: ../browser-plugin/totem-plugin-viewer.c:431
-msgid "No URI to play"
-msgstr "Žádné URI k přehrání"
-
-#. translators: this is:
-#. * Open With ApplicationName
-#. * as in nautilus' right-click menu
-#: ../browser-plugin/totem-plugin-viewer.c:1107
-#, c-format
-msgid "_Open with \"%s\""
-msgstr "_Otevřít s „%s“"
-
-#: ../browser-plugin/totem-plugin-viewer.c:2136
-msgid "No playlist or playlist empty"
-msgstr "Žádný nebo prázdný seznam k přehrání"
-
-#: ../browser-plugin/totem-plugin-viewer.c:2235
-msgid "Movie browser plugin"
-msgstr "Zásuvný modul prohlížeče na přehrávání filmů"
-
-#: ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Verify your system installation. The Totem plugin will now exit."
-msgstr ""
-"Zkontrolujte svou instalaci systému. Zásuvný modul programu Totem bude nyní "
-"ukončen."
-
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
-msgid "Python Console"
-msgstr "Konzola python"
-
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
-msgid "Interactive Python console."
-msgstr "Interaktivní konzola jazyka Python."
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:88
-msgid "Python Console Menu"
-msgstr "Nabídka konzoly python"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:93
-msgid "_Python Console"
-msgstr "Konzola _python"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:94
-msgid "Show Totem's Python console"
-msgstr "Zobrazit konzolu jazyka Python v aplikaci Totem"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:100
-msgid "Python Debugger"
-msgstr "Ladicí program pro jazyk Python"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:101
-msgid "Enable remote Python debugging with rpdb2"
-msgstr "Povolit vzdálené ladění jazyka Python za pomoci rpdb2"
-
-#. pylint: disable-msg=E1101
-#: ../src/plugins/pythonconsole/pythonconsole.py:125
-#, python-format
-msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
-msgstr "K objektu Totem.Object můžete přistupovat pomocí „totem_object“ :\\n%s"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:129
-msgid "Totem Python Console"
-msgstr "Konzola Python aplikace Totem"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:139
-msgid ""
-"After you press OK, Totem will wait until you connect to it with winpdb or "
-"rpdb2. If you have not set a debugger password in DConf, it will use the "
-"default password ('totem')."
-msgstr ""
-"Po stisknutí Budiž aplikace Totem počká, než se k ní připojíte pomocí winpdb "
-"nebo rpdb2. Pokud jste nenastavili heslo ladění v GConf, tak se použije "
-"výchozí heslo („totem“)."
-
-# TEST
-#: ../src/plugins/grilo/grilo.plugin.in.h:1
-msgid "Grilo Browser"
-msgstr "Prohlížeč Grilo"
-
-#: ../src/plugins/grilo/grilo.plugin.in.h:2
-msgid "A plugin to let you browse media content from various sources."
-msgstr ""
-"Zásuvný modul, který vám umožní procházet mediální obsah z různých zdrojů."
-
-#: ../src/plugins/grilo/totem-grilo.c:452
-msgid "Browse Error"
-msgstr "Chyba při procházení"
-
-#: ../src/plugins/grilo/totem-grilo.c:599
-msgid "Search Error"
-msgstr "Chyba při hledání"
-
-#: ../src/plugins/grilo/totem-grilo.c:1219 ../src/plugins/grilo/grilo.ui.h:3
-msgid "Browse"
-msgstr "Procházet"
+#~ msgid "Play movies and songs"
+#~ msgstr "Přehrávání filmů a písniček"
 
-#: ../src/plugins/grilo/totem-grilo.c:1285 ../src/plugins/grilo/grilo.ui.h:4
-msgid "Search"
-msgstr "Hledat"
+#~ msgid "Open a file"
+#~ msgstr "Otevřít soubor"
 
-#: ../src/plugins/grilo/grilo.ui.h:1
-msgid "Add to Playlist"
-msgstr "Přidat do seznamu k přehrání"
+#~ msgid "Open a non-local file"
+#~ msgstr "Otevřít vzdálený soubor"
 
-#: ../src/plugins/grilo/grilo.ui.h:2
-msgid "Copy Location"
-msgstr "Kopírovat umístění"
\ No newline at end of file
+#~ msgid "Quit the program"
+#~ msgstr "Ukončit aplikaci"
+
+#~ msgid "Configure the application"
+#~ msgstr "Nastavit aplikaci"
+
+#~ msgid "Switch to fullscreen"
+#~ msgstr "Přepnout do celoobrazovkového režimu"
+
+#~ msgid "Set the repeat mode"
+#~ msgstr "Nastavit režim opakování"
+
+#~ msgid "Set the shuffle mode"
+#~ msgstr "Nastavit náhodný režim"
+
+#~ msgid "14.4 Kbps Modem"
+#~ msgstr "Modem 14,4 kb/s"
+
+#~ msgid "19.2 Kbps Modem"
+#~ msgstr "Modem 19,2 kb/s"
+
+#~ msgid "28.8 Kbps Modem"
+#~ msgstr "Modem 28,8 kb/s"
+
+#~ msgid "33.6 Kbps Modem"
+#~ msgstr "Modem 33,6 kb/s"
+
+#~ msgid "34.4 Kbps Modem"
+#~ msgstr "Modem 34,4 kb/s"
+
+#~ msgid "56 Kbps Modem/ISDN"
+#~ msgstr "Modem/ISDN 56 kb/s"
+
+#~ msgid "112 Kbps Dual ISDN/DSL"
+#~ msgstr "Dvojité ISDN/DSL 112 kb/s"
+
+#~ msgid "256 Kbps DSL/Cable"
+#~ msgstr "DSL/kabel 256 kb/s"
+
+#~ msgid "384 Kbps DSL/Cable"
+#~ msgstr "DSL/kabel 384 kb/s"
+
+#~ msgid "512 Kbps DSL/Cable"
+#~ msgstr "DSL/kabel 512 kb/s"
+
+#~ msgid "1.5 Mbps T1/Intranet/LAN"
+#~ msgstr "T1/Intranet/LAN 1,5 Mb/s"
+
+#~ msgid "Intranet/LAN"
+#~ msgstr "Intranet/LAN"
+
+#~ msgid "Networking"
+#~ msgstr "Síť"
+
+#~ msgid "Connection _speed:"
+#~ msgstr "_Rychlost připojení:"
+
+#~ msgid "Network connection speed"
+#~ msgstr "Rychlost připojení"
+
+#~ msgid ""
+#~ "Approximate network connection speed, used to select quality on media "
+#~ "over the network."
+#~ msgstr ""
+#~ "Přibližná rychlost síťového připojení použitá k výběru kvality pro média "
+#~ "přenášená přes síť."
+
+#~ msgid "Play Image '%s'"
+#~ msgstr "Přehrát obraz „%s“"
+
+#~ msgid "device%d"
+#~ msgstr "zařízení%d"
+
+#~ msgid "Play Disc '%s'"
+#~ msgstr "Přehrát disk „%s“"
+
+#~ msgid "Movie Player using %s"
+#~ msgstr "Přehrávač filmů používající %s"
+
+#~ msgid ""
+#~ "Totem could not play this media (%s) although a plugin is present to "
+#~ "handle it."
+#~ msgstr ""
+#~ "Totem nemohl přehrát tento typ médií (%s), přestože je nainstalován "
+#~ "zásuvný modul, který umí tento typ médií zpracovat."
+
+#~ msgid ""
+#~ "You might want to check that a disc is present in the drive and that it "
+#~ "is correctly configured."
+#~ msgstr ""
+#~ "Zkuste zkontrolovat, zda je v zařízení přítomen disk a zda je zařízení "
+#~ "správně nastaveno."
+
+#~ msgid "More information about media plugins"
+#~ msgstr "Více informací o multimediálních zásuvných modulech"
+
+#~ msgid ""
+#~ "Please install the necessary plugins and restart Totem to be able to play "
+#~ "this media."
+#~ msgstr ""
+#~ "Aby Totem mohl tento typ médií přehrávat, nainstalujte odpovídající "
+#~ "zásuvné moduly a poté spusťte Totem znovu."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it does not have the "
+#~ "appropriate plugins to be able to read from the disc."
+#~ msgstr ""
+#~ "Totem nemůže přehrát tento typ média (%s), protože nemá vhodný zásuvný "
+#~ "modul, který by umožnil čtení z disku."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because you do not have the "
+#~ "appropriate plugins to handle it."
+#~ msgstr ""
+#~ "Totem nemůže přehrávat tento typ médií (%s), protože nemáte zásuvné "
+#~ "moduly potřebné k jeho zpracování."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it is not supported."
+#~ msgstr ""
+#~ "Totem nemůže přehrávat tento typ médií (%s), protože není podporován."
+
+#~ msgid "Please insert another disc to play back."
+#~ msgstr "Vložte další disk, který chcete přehrát."
+
+#~ msgid "Totem does not support playback of Audio CDs"
+#~ msgstr "Totem nepodporuje přehrávání hudebních CD"
+
+#~ msgid ""
+#~ "Please consider using a music player or a CD extractor to play this CD"
+#~ msgstr ""
+#~ "Zvažte použití hudebního přehrávače nebo extraktoru CD pro přehrání "
+#~ "tohoto hudebního disku"
+
+#~ msgid "%d %%"
+#~ msgstr "%d %%"
+
+#~ msgid ""
+#~ "The requested audio output was not found. Please select another audio "
+#~ "output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "Požadovaný výstup zvuku nebyl nalezen. Zvolte jiný výstup zvuku ve Výběru "
+#~ "systému multimédií."
+
+#~ msgid "Location not found."
+#~ msgstr "Umístění nenalezeno."
+
+#~ msgid ""
+#~ "Could not open location; you might not have permission to open the file."
+#~ msgstr ""
+#~ "Nelze otevřít umístění; možná nemáte oprávnění otevřít tento soubor."
+
+#~ msgid ""
+#~ "The video output is in use by another application. Please close other "
+#~ "video applications, or select another video output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "Výstup videa používá jiná aplikace. Zavřete jiné aplikace videa, nebo "
+#~ "zvolte jiný výstup videa ve Výběru systému multimédií."
+
+#~ msgid ""
+#~ "The audio output is in use by another application. Please select another "
+#~ "audio output in the Multimedia Systems Selector. You may want to consider "
+#~ "using a sound server."
+#~ msgstr ""
+#~ "Výstup zvuku používá jiná aplikace. Zvolte jiný výstup zvuku ve Výběru "
+#~ "systému multimédií. Možná by bylo vhodné použít zvukový server."
+
+#~ msgid ""
+#~ "Failed to create a GStreamer play object. Please check your GStreamer "
+#~ "installation."
+#~ msgstr ""
+#~ "Nelze vytvořit přehrávací objekt GStreamer. Zkontrolujte svou instalaci "
+#~ "systému GStreamer."
+
+#~ msgid ""
+#~ "Failed to open audio output. You may not have permission to open the "
+#~ "sound device, or the sound server may not be running. Please select "
+#~ "another audio output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "Nelze otevřít zvukový výstup. Možná nemáte oprávnění otevřít zvukové "
+#~ "zařízení, nebo neběží zvukový server. Zvolte jiný zvukový výstup ve "
+#~ "Výběru systému multimédií."
+
+#~ msgid ""
+#~ "Could not find the audio output. You may need to install additional "
+#~ "GStreamer plugins, or select another audio output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "Nelze najít zvukový výstup. Možná bude nutné nainstalovat další zásuvné "
+#~ "moduly GStreamer, nebo vybrat jiný zvukový výstup ve Výběru systému "
+#~ "multimédií."
+
+#~ msgid "BBC iPlayer"
+#~ msgstr "BBC iPlayer"
+
+#~ msgid ""
+#~ "Stream BBC programs from the last 7 days from the BBC iPlayer service."
+#~ msgstr "Proud programů BBC za posledních 7 dní ze služby BBC iPlayer."
+
+#~ msgid "Error listing channel categories"
+#~ msgstr "Chyba při vypisování kategorií kanálů"
+
+#~ msgid ""
+#~ "There was an unknown error getting the list of television channels "
+#~ "available on BBC iPlayer."
+#~ msgstr ""
+#~ "Vyskytla se neznámá chyba při získávání seznamu televizních kanálů "
+#~ "dostupných na BBC iPlayer."
+
+#~ msgid "Loading…"
+#~ msgstr "Načítá se…"
+
+#~ msgid "Error getting programme feed"
+#~ msgstr "Chyba při získávání programové nabídky"
+
+#~ msgid ""
+#~ "There was an error getting the list of programmes for this channel and "
+#~ "category combination."
+#~ msgstr ""
+#~ "Vyskytla se chyba při získávání seznamu programů pro tento kanál a "
+#~ "kombinaci kategorií."
+
+#~ msgid ""
+#~ msgstr ""
+
+#~ msgid "Programme unavailable (\"%s\")"
+#~ msgstr "Program není dostupný („%s“)"
+
+#~ msgid "Publisher protocol to use"
+#~ msgstr "Protokol použitý ke zveřejnění"
+
+#~ msgid ""
+#~ "The transport protocol to use when publishing playlists over the network."
+#~ msgstr ""
+#~ "Přenosový protokol, který se má použít, když se zveřejňuje seznam k "
+#~ "přehrání přes síť."
+
+#~ msgid "Format for network service name"
+#~ msgstr "Formát pro název síťových služeb"
+
+#~ msgid ""
+#~ "A format string used to build the network service name used when "
+#~ "publishing playlists over the network. The following format placeholders "
+#~ "can be used: • %a: the program name as returned by g_get_application_name"
+#~ "() • %h: the machine's host name in title case • %u: the user's login "
+#~ "name in title case • %U: the user's real name • %%: the percent sign"
+#~ msgstr ""
+#~ "Formát řetězce použitý k sestavení názvu síťové služby, který se použije "
+#~ "při zveřejnění seznamu k přehrání přes síť. Lze použít následující "
+#~ "zástupné proměnné: • %a: název programu, tak jak jej vrací funkce "
+#~ "g_get_application_name() • %h: název hostujícího počítače, první písmena "
+#~ "slov velká • %u: uživatelovo přihlašovací jméno, první písmena slov velká "
+#~ "• %U: uživatelovo skutečné jméno • %%: znak procenta"
diff -Nru totem-3.4.3/po/da.po totem-3.6.2/po/da.po
--- totem-3.4.3/po/da.po	2012-04-02 14:15:40.000000000 +0000
+++ totem-3.6.2/po/da.po	2012-10-25 13:15:32.000000000 +0000
@@ -4,8 +4,8 @@
 # Ole Laursen , 2002, 03.
 # Martin Willemoes Hansen , 2005.
 # Lasse Bang Mikkelsen , 2006.
-# Ask Hjorth Larsen , 2007, 08, 09, 10, 11.
 # flemming christensen , 2011.
+# Ask Hjorth Larsen , 2007, 08, 09, 10, 11, 12.
 # Konventioner:
 #
 #   plugin -> udvidelsesmodul
@@ -15,9 +15,9 @@
 msgstr ""
 "Project-Id-Version: totem\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-25 22:42+0200\n"
-"PO-Revision-Date: 2012-03-25 20:06+0200\n"
-"Last-Translator: flemming christensen \n"
+"POT-Creation-Date: 2012-09-15 23:45+0200\n"
+"PO-Revision-Date: 2012-09-15 18:20+0200\n"
+"Last-Translator: Ask Hjorth Larsen \n"
 "Language-Team: Danish \n"
 "Language: da\n"
 "MIME-Version: 1.0\n"
@@ -25,863 +25,929 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
+#: ../browser-plugin/totem-plugin-viewer.c:352 ../src/totem-object.c:1180
+#: ../src/totem-object.c:1650 ../src/totem-statusbar.c:115
+msgid "Stopped"
+msgstr "Stoppet"
+
+#: ../browser-plugin/totem-plugin-viewer.c:364 ../src/totem-object.c:1173
+msgid "Paused"
+msgstr "På pause"
+
+#: ../browser-plugin/totem-plugin-viewer.c:368 ../src/totem-object.c:1166
+msgid "Playing"
+msgstr "Afspiller"
+
+# Enten "afspilning af (en) film" eller "afspiller en film". Lad os håbe sidstnævnte er korrekt...
+#: ../browser-plugin/totem-plugin-viewer.c:386
+#: ../src/plugins/screensaver/totem-screensaver.c:97
+msgid "Playing a movie"
+msgstr "Afspiller en film"
+
+#: ../browser-plugin/totem-plugin-viewer.c:443
+msgid "No URI to play"
+msgstr "Ingen URI at afspille"
+
+#: ../browser-plugin/totem-plugin-viewer.c:676
+#: ../browser-plugin/totem-plugin-viewer.c:1700
+msgid "Totem Movie Player"
+msgstr "Totem - filmafspiller"
+
+#. translators: this is:
+#. * Open With ApplicationName
+#. * as in nautilus' right-click menu
+#: ../browser-plugin/totem-plugin-viewer.c:1120
+#, c-format
+msgid "_Open with \"%s\""
+msgstr "_Åbn med \"%s\""
+
+#: ../browser-plugin/totem-plugin-viewer.c:1341 ../src/totem-object.c:2475
+msgid "An error occurred"
+msgstr "Der opstod en fejl"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2033
+msgid "No playlist or playlist empty"
+msgstr "Ingen eller tom afspilningsliste"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2128
+msgid "Movie browser plugin"
+msgstr "Udvidelsesmodul til filmgennemsyn"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144 ../src/totem.c:240
+msgid "Could not initialize the thread-safe libraries."
+msgstr "Kunne ikke klargøre de trådsikre biblioteker."
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144
+msgid "Verify your system installation. The Totem plugin will now exit."
+msgstr ""
+"Kontrollér din systeminstallation. Totem-udvidelsesmodulet vil nu afslutte."
+
 #: ../data/fullscreen.ui.h:1
 msgid "Leave Fullscreen"
 msgstr "Forlad fuldskærm"
 
-#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:102
+#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:81
 msgid "Time:"
 msgstr "Tid:"
 
-#: ../data/playlist.ui.h:1
-msgid "Add..."
-msgstr "Tilføj..."
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
+msgid "Allow the screensaver to activate when playing audio"
+msgstr "Tillad aktivering af pauseskærmen når der afspilles lyd"
 
-#: ../data/playlist.ui.h:2 ../data/video-list.ui.h:2
-msgid "Copy the location to the clipboard"
-msgstr "Kopiér placeringen til udklipsholderen"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
+msgid ""
+"Allow the screensaver to activate when playing audio. Disable if you have "
+"monitor-powered speakers."
+msgstr ""
+"Tillad aktivering af pauseskærm når der afspilles lyd. Slå fra, hvis du har "
+"højttalere, der får strøm fra skærmen."
 
-#: ../data/playlist.ui.h:3
-msgid "Move Down"
-msgstr "Flyt ned"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
+msgid "Show visual effects when no video is displayed"
+msgstr "Vis visuelle effekter når der ikke afspilles en video"
 
-#: ../data/playlist.ui.h:4
-msgid "Move Up"
-msgstr "Flyt op"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
+msgid "Show visual effects when playing an audio only file."
+msgstr "Vis visuelle effekter når en fil med kun lyd afspilles."
 
-#: ../data/playlist.ui.h:5
-msgid "Remove"
-msgstr "Fjern"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
+msgid "Name of the visual effects plugin"
+msgstr "Navn på udvidelsesmodul til visuelle effekter"
 
-#: ../data/playlist.ui.h:6
-msgid "Remove file from playlist"
-msgstr "Fjern fil fra afspilningsliste"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
+msgid "The brightness of the video"
+msgstr "Lysstyrken for videoen"
 
-#: ../data/playlist.ui.h:7
-msgid "Save Playlist..."
-msgstr "Gem afspilningsliste..."
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
+msgid "The contrast of the video"
+msgstr "Kontrasten for videoen"
 
-#: ../data/playlist.ui.h:8 ../data/totem.ui.h:77
-msgid "Select a file to use for text subtitles"
-msgstr "Vælg en fil at læse undertekster fra"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
+msgid "The hue of the video"
+msgstr "Videoens farvetone"
 
-#: ../data/playlist.ui.h:9 ../data/video-list.ui.h:4
-msgid "_Copy Location"
-msgstr "_Kopiér placering"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
+msgid "The saturation of the video"
+msgstr "Videoens mætning"
 
-#: ../data/playlist.ui.h:10
-msgid "_Remove"
-msgstr "_Fjern"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
+msgid "Resize the canvas automatically on file load"
+msgstr "Ændr størrelsen af lærredet automatisk ved filåbninger"
 
-#: ../data/playlist.ui.h:11 ../data/totem.ui.h:141
-msgid "_Select Text Subtitles..."
-msgstr "_Vælg undertekster..."
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
+msgid "Repeat mode"
+msgstr "Gentagelsestilstand"
 
-#: ../data/properties.ui.h:1
-msgid "Album:"
-msgstr "Album:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
+msgid "Shuffle mode"
+msgstr "Blandingstilstand"
 
-#: ../data/properties.ui.h:2
-msgid "Artist:"
-msgstr "Kunstner:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
+msgid "Whether to disable deinterlacing for interlaced movies"
+msgstr "Om deinterlacing for interlacede film skal deaktiveres"
 
-#: ../data/properties.ui.h:3 ../data/totem.ui.h:23
-#: ../src/totem-properties-view.c:268
-msgid "Audio"
-msgstr "Lyd"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
+msgid "Whether to enable debug for the playback engine"
+msgstr "Om fejlanalysering skal slåes til for afspilningsmotoren"
 
-#: ../data/properties.ui.h:4
-msgid "Bitrate:"
-msgstr "Bitfrekvens:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
+msgid "Type of audio output to use"
+msgstr "Type lyd-uddata der skal benyttes"
 
-#: ../data/properties.ui.h:5
-msgid "Channels:"
-msgstr "Kanaler:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
+msgid "Visualization quality setting"
+msgstr "Kvalitetsindstilling for visualisering"
 
-#: ../data/properties.ui.h:6
-msgid "Codec:"
-msgstr "Kodning:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
+msgid "Quality setting for the audio visualization."
+msgstr "Kvalitetsindstilling til lydvisualisering."
 
-#: ../data/properties.ui.h:7
-msgid "Comment:"
-msgstr "Kommentar:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
+msgid "Network buffering threshold"
+msgstr "Tærskel for netværksbuffer"
 
-#: ../data/properties.ui.h:8
-msgid "Container:"
-msgstr "Beholder:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
+msgid ""
+"Amount of data to buffer for network streams before starting to display the "
+"stream (in seconds)."
+msgstr ""
+"Mængden af data som skal mellemlagres for netværksstrømme inden strømmen "
+"vises (i sekunder)."
 
-#: ../data/properties.ui.h:9
-msgid "Dimensions:"
-msgstr "Dimensioner:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
+msgid "Subtitle font"
+msgstr "Skrifttype for undertekster"
 
-#: ../data/properties.ui.h:10
-msgid "Duration:"
-msgstr "Varighed:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
+msgid "Pango font description for subtitle rendering."
+msgstr "Pango-skrifttypebeskrivelse for optegning af undertekster."
 
-#: ../data/properties.ui.h:11
-msgid "Framerate:"
-msgstr "Billedfrekvens:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
+msgid "Subtitle encoding"
+msgstr "Kodning af undertekster"
 
-#: ../data/properties.ui.h:12 ../data/totem.ui.h:41
-msgid "General"
-msgstr "Generelt"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
+msgid "Encoding character set for subtitle."
+msgstr "Tegnkodning til undertekster."
 
-#: ../data/properties.ui.h:13
-msgid "Sample rate:"
-msgstr "Samplefrekvens:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
+msgid "Default location for the \"Open...\" dialogs"
+msgstr "Forvalgt placering for \"Åbn...\"-vinduerne"
 
-#: ../data/properties.ui.h:14
-msgid "Title:"
-msgstr "Titel:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
+msgid ""
+"Default location for the \"Open...\" dialogs. Default is the current "
+"directory."
+msgstr ""
+"Standardplacering for \"Åbn...\"-vinduerne. Standardværdien er den nuværende "
+"mappe."
 
-#: ../data/properties.ui.h:15 ../data/totem.ui.h:104
-#: ../src/totem-properties-view.c:270
-msgid "Video"
-msgstr "Video"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
+msgid "Default location for the \"Take Screenshot\" dialogs"
+msgstr "Forvalgt placering for \"Gem skærmbillede\"-vinduerne"
 
-#: ../data/properties.ui.h:16
-msgid "Year:"
-msgstr "År:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
+msgid ""
+"Default location for the \"Take Screenshot\" dialogs. Default is the "
+"Pictures directory."
+msgstr ""
+"Standardplacering for \"Gem skærmbillede\"-vinduerne. Standardværdien er "
+"mappen Billeder."
 
-#: ../data/video-list.ui.h:1
-msgid "Add the video to the playlist"
-msgstr "Føj video til afspilningslisten"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
+msgid "Whether to disable the plugins in the user's home directory"
+msgstr "Om udvidelsesmoduler i brugerens hjemmemappe skal deaktiveres"
 
-#: ../data/video-list.ui.h:3 ../src/totem-dnd-menu.c:97
-msgid "_Add to Playlist"
-msgstr "_Føj til afspilningsliste"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
+msgid "Whether to disable the keyboard shortcuts"
+msgstr "Om tastaturgenveje skal deaktiveres"
 
-#. Title
-#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:53
-#: ../src/totem-object.c:1667
-msgid "Movie Player"
-msgstr "Filmafspiller"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
+msgid "Whether to autoload text subtitle files when a movie is loaded"
+msgstr "Om undertekster skal hentes automatisk når en film indlæses"
 
-#: ../data/totem.desktop.in.in.in.h:2
-msgid "Play movies and songs"
-msgstr "Afspil film og sange"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
+msgid "Whether to autoload external chapter files when a movie is loaded"
+msgstr "Om eksterne kapitelfiler skal hentes automatisk når en film indlæses"
 
-#: ../data/totem.ui.h:1
-msgid "1.5 Mbps T1/Intranet/LAN"
-msgstr "1.5 Mbps T1/Intranet/LAN"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
+msgid ""
+"Whether to remember the position of played audio/video files when pausing or "
+"closing them"
+msgstr ""
+"Hvorvidt positionen i de afspillede lyd-/videofiler skal huskes, når de "
+"sættes på pause eller lukkes"
 
-#: ../data/totem.ui.h:2
-msgid "112 Kbps Dual ISDN/DSL"
-msgstr "112 Kbps dobbelt ISDN/DSL"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
+msgid "Active plugins list"
+msgstr "Liste over aktive udvidelsesmoduler"
 
-#: ../data/totem.ui.h:3
-msgid "14.4 Kbps Modem"
-msgstr "14.4 Kbps-modem"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+msgid ""
+"A list of the names of the plugins which are currently active (loaded and "
+"running)."
+msgstr ""
+"En liste af navne på udvidelsesmodulerne, der i øjeblikket er aktiveret "
+"(indlæst og kører)."
 
-#: ../data/totem.ui.h:4
-msgid "16:9 (Widescreen)"
-msgstr "16:9 (bredskærm)"
+#: ../data/playlist.ui.h:1
+msgid "_Remove"
+msgstr "_Fjern"
 
-#: ../data/totem.ui.h:5
-msgid "19.2 Kbps Modem"
-msgstr "19.2 Kbps-modem"
+#: ../data/playlist.ui.h:2
+msgid "Remove file from playlist"
+msgstr "Fjern fil fra afspilningsliste"
 
-#: ../data/totem.ui.h:6
-msgid "2.11:1 (DVB)"
-msgstr "2.11:1 (DVB)"
+#: ../data/playlist.ui.h:3 ../data/video-list.ui.h:3
+msgid "_Copy Location"
+msgstr "_Kopiér placering"
 
-#: ../data/totem.ui.h:7
-msgid "256 Kbps DSL/Cable"
-msgstr "256 Kbps-DSL/kabel"
+#: ../data/playlist.ui.h:4 ../data/video-list.ui.h:4
+msgid "Copy the location to the clipboard"
+msgstr "Kopiér placeringen til udklipsholderen"
 
-#: ../data/totem.ui.h:8
-msgid "28.8 Kbps Modem"
-msgstr "28.8 Kbps-modem"
+#: ../data/playlist.ui.h:5 ../data/totem.ui.h:71
+msgid "_Select Text Subtitles..."
+msgstr "_Vælg undertekster..."
 
-#: ../data/totem.ui.h:9
-msgid "33.6 Kbps Modem"
-msgstr "33.6 Kbps-modem"
+#: ../data/playlist.ui.h:6 ../data/totem.ui.h:72
+msgid "Select a file to use for text subtitles"
+msgstr "Vælg en fil at læse undertekster fra"
 
-#: ../data/totem.ui.h:10
-msgid "34.4 Kbps Modem"
-msgstr "34.4 Kbps-modem"
+#: ../data/playlist.ui.h:7
+msgid "Add..."
+msgstr "Tilføj..."
 
-#: ../data/totem.ui.h:11
-msgid "384 Kbps DSL/Cable"
-msgstr "384 Kbps-DSL/kabel"
+#: ../data/playlist.ui.h:8
+msgid "Remove"
+msgstr "Fjern"
 
-#: ../data/totem.ui.h:12
+#: ../data/playlist.ui.h:9
+msgid "Save Playlist..."
+msgstr "Gem afspilningsliste..."
+
+#: ../data/playlist.ui.h:10
+msgid "Move Up"
+msgstr "Flyt op"
+
+#: ../data/playlist.ui.h:11
+msgid "Move Down"
+msgstr "Flyt ned"
+
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:2
+msgid "Normal"
+msgstr "Normal"
+
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:4
+msgid "Large"
+msgstr "Stor"
+
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:6
+msgid "Extra Large"
+msgstr "Ekstra stor"
+
+#: ../data/preferences.ui.h:7 ../src/backend/bacon-video-widget.c:5498
+#: ../src/totem-properties-view.c:231
+msgid "Stereo"
+msgstr "Stereo"
+
+#: ../data/preferences.ui.h:8
 msgid "4-channel"
 msgstr "4-kanal"
 
-#: ../data/totem.ui.h:13
+#: ../data/preferences.ui.h:9
 msgid "4.1-channel"
 msgstr "4.1-kanal"
 
-#: ../data/totem.ui.h:14
-msgid "4:3 (TV)"
-msgstr "4:3 (tv)"
-
-#: ../data/totem.ui.h:15
+#: ../data/preferences.ui.h:10
 msgid "5.0-channel"
 msgstr "5.0-kanal"
 
-#: ../data/totem.ui.h:16
+#: ../data/preferences.ui.h:11
 msgid "5.1-channel"
 msgstr "5.1-kanal"
 
-#: ../data/totem.ui.h:17
-msgid "512 Kbps DSL/Cable"
-msgstr "512 Kbps-DSL/kabel"
-
-#: ../data/totem.ui.h:18
-msgid "56 Kbps Modem/ISDN"
-msgstr "56 Kbps-modem/ISDN"
-
 # Jeg aner ikke hvad dette passthrough er for noget, jeg kan kun finde kommentarer på nettet der bruger ordet uden at komme ind på hvad det er
-#: ../data/totem.ui.h:19
+#: ../data/preferences.ui.h:12
 msgid "AC3 Passthrough"
 msgstr "AC3-gennemløb"
 
-#: ../data/totem.ui.h:20
-msgid "A_udio Menu"
-msgstr "_Lydmenu"
+#: ../data/preferences.ui.h:13
+msgid "Totem Preferences"
+msgstr "Indstillinger for Totem"
 
-#: ../data/totem.ui.h:21
-msgid "About this application"
-msgstr "Om dette program"
+#: ../data/preferences.ui.h:14
+msgid "Playback"
+msgstr "Afspilning"
 
-#: ../data/totem.ui.h:22
-msgctxt "Aspect ratio"
-msgid "Auto"
-msgstr "Auto"
+#: ../data/preferences.ui.h:15
+msgid "Start playing files from last position"
+msgstr "Start afspilning af filer fra sidste position"
 
-#: ../data/totem.ui.h:24
-msgid "Audio Output"
-msgstr "Lyd-ud"
+#: ../data/preferences.ui.h:16
+msgid "Text Subtitles"
+msgstr "Undertekster som tekst"
 
-#: ../data/totem.ui.h:25
-msgid "Clear the playlist"
-msgstr "Ryd afspilningslisten"
+#: ../data/preferences.ui.h:17
+msgid "_Load subtitle files when movie is loaded"
+msgstr "_Hent undertekstfiler når filmen indlæses"
 
-#: ../data/totem.ui.h:26
-msgid "Co_ntrast:"
-msgstr "_Kontrast:"
+#: ../data/preferences.ui.h:18
+msgid "_Font:"
+msgstr "_Skrifttype:"
 
-#: ../data/totem.ui.h:27
-msgid "Color Balance"
-msgstr "Farvebalance"
+#: ../data/preferences.ui.h:19
+msgid "_Encoding:"
+msgstr "_Indkodning:"
 
-#: ../data/totem.ui.h:28
-msgid "Configure plugins to extend the application"
-msgstr "Konfigurér udvidelsesmoduler til dette program"
+#: ../data/preferences.ui.h:20
+msgid "External Chapters"
+msgstr "Eksterne kapitler"
 
-#: ../data/totem.ui.h:29
-msgid "Configure the application"
-msgstr "Konfigurér programmet"
+#: ../data/preferences.ui.h:21
+msgid "Load _chapter files when movie is loaded"
+msgstr "Indlæs _kapitelfiler når filmen indlæses"
 
-#: ../data/totem.ui.h:30
-msgid "Connection _speed:"
-msgstr "Forbindelses_hastighed:"
+#: ../data/preferences.ui.h:22 ../data/properties.ui.h:1
+msgid "General"
+msgstr "Generelt"
 
-#: ../data/totem.ui.h:31
-msgid "Decrease volume"
-msgstr "Mindsk lydstyrken"
+#. Tab label in the Preferences dialogue
+#: ../data/preferences.ui.h:24
+msgid "Display"
+msgstr "Fremvisning"
 
-#: ../data/totem.ui.h:32
+#: ../data/preferences.ui.h:25
+msgid "_Resize the window when a new video is loaded"
+msgstr "Ændr automatisk _størrelsen på vinduet når en video indlæses"
+
+#: ../data/preferences.ui.h:26
 msgid "Disable _deinterlacing of interlaced videos"
 msgstr ""
 "Deaktivér _deinterlacing (kompensation for alternerende linjevis "
 "billedlagring) af interlacede videoer"
 
-#: ../data/totem.ui.h:33
+#: ../data/preferences.ui.h:27
 msgid "Disable screensaver when playing "
 msgstr "Deaktivér pauseskærm når der afspilles "
 
-#. Tab label in the Preferences dialogue
-#: ../data/totem.ui.h:35
-msgid "Display"
-msgstr "Fremvisning"
-
-#: ../data/totem.ui.h:36
-msgid "Eject the current disc"
-msgstr "Skub den aktuelle skive ud"
-
-#: ../data/totem.ui.h:37
-msgid "External Chapters"
-msgstr "Eksterne kapitler"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:39
-msgid "Extra Large"
-msgstr "Ekstra stor"
-
-#: ../data/totem.ui.h:40
-msgid "Fit Window to Movie"
-msgstr "Tilpas vinduet til filmen"
-
-#: ../data/totem.ui.h:42
-msgid "Go to the DVD menu"
-msgstr "Gå til dvd-menuen"
-
-#: ../data/totem.ui.h:43
-msgid "Go to the angle menu"
-msgstr "Gå til vinkelmenuen"
-
-#: ../data/totem.ui.h:44
-msgid "Go to the audio menu"
-msgstr "Gå til lydmenuen"
-
-#: ../data/totem.ui.h:45
-msgid "Go to the chapter menu"
-msgstr "Gå til kapitelmenuen"
-
-#: ../data/totem.ui.h:46
-msgid "Go to the title menu"
-msgstr "Gå til titelmenuen"
-
-#: ../data/totem.ui.h:47
-msgid "Help contents"
-msgstr "Indhold af hjælp"
-
-#: ../data/totem.ui.h:48
-msgid "Increase volume"
-msgstr "Forøg lydstyrken"
-
-#: ../data/totem.ui.h:49
-msgid "Intranet/LAN"
-msgstr "Intranet/LAN"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:51
-msgid "Large"
-msgstr "Stor"
-
-#: ../data/totem.ui.h:52
-msgid "Load _chapter files when movie is loaded"
-msgstr "Indlæs _kapitelfiler når filmen indlæses"
-
-#: ../data/totem.ui.h:54
-msgid "Networking"
-msgstr "Netværk"
-
-#: ../data/totem.ui.h:55
-msgid "Next chapter or movie"
-msgstr "Næste kapitel eller film"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:57
-msgid "Normal"
-msgstr "Normal"
+#: ../data/preferences.ui.h:28 ../data/properties.ui.h:9
+#: ../src/totem-properties-view.c:273
+msgid "Video"
+msgstr "Video"
 
-#: ../data/totem.ui.h:58
-msgid "Open _Location..."
-msgstr "Åbn _placering..."
+#: ../data/preferences.ui.h:29
+msgid "Video or Audio"
+msgstr "Video eller lyd"
 
-#: ../data/totem.ui.h:59
-msgid "Open a file"
-msgstr "Åbn en fil"
+#: ../data/preferences.ui.h:30
+msgid "Visual Effects"
+msgstr "Visuelle effekter"
 
-#: ../data/totem.ui.h:60
-msgid "Open a non-local file"
-msgstr "Åbn en ikke-lokal fil"
+#: ../data/preferences.ui.h:31
+msgid "Show _visual effects when an audio file is played"
+msgstr "Vis _visuelle effekter når en lydfil afspilles"
 
-#: ../data/totem.ui.h:61
-msgid "Play / P_ause"
-msgstr "Afspil / p_ause"
+#: ../data/preferences.ui.h:32
+msgid "_Type of visualization:"
+msgstr "_Visualiseringstype:"
 
-#: ../data/totem.ui.h:62
-msgid "Play or pause the movie"
-msgstr "Afspil eller sæt filmen på pause"
+#: ../data/preferences.ui.h:33
+msgid "Visualization _size:"
+msgstr "Visualiserings_størrelse:"
 
-#: ../data/totem.ui.h:63
-msgid "Playback"
-msgstr "Afspilning"
+#: ../data/preferences.ui.h:34
+msgid "Color Balance"
+msgstr "Farvebalance"
 
-#: ../data/totem.ui.h:64
-msgid "Plugins..."
-msgstr "Udvidelsesmoduler..."
+# Genvejstasten _Lys... er ikke i konflikt med _Lyd... ovenfor, da de indgår i forskellige skærmbilleder
+#: ../data/preferences.ui.h:35
+msgid "_Brightness:"
+msgstr "_Lysstyrke:"
 
-#: ../data/totem.ui.h:65
-msgid "Prefere_nces"
-msgstr "_Indstillinger for Totem"
+#: ../data/preferences.ui.h:36
+msgid "Co_ntrast:"
+msgstr "_Kontrast:"
 
-#: ../data/totem.ui.h:66
-msgid "Previous chapter or movie"
-msgstr "Forrige kapitel eller film"
+#: ../data/preferences.ui.h:37
+msgid "Sat_uration:"
+msgstr "_Mætning:"
 
-#: ../data/totem.ui.h:67
-msgid "Quit the program"
-msgstr "Afslut programmet"
+#: ../data/preferences.ui.h:38
+msgid "_Hue:"
+msgstr "_Farvetone:"
 
-#: ../data/totem.ui.h:68
+#: ../data/preferences.ui.h:39
 msgid "Reset to _Defaults"
 msgstr "Nulstil til fo_rvalg"
 
-#: ../data/totem.ui.h:69
-msgid "Resize _1:1"
-msgstr "Ændr størrelsen _1:1"
+#: ../data/preferences.ui.h:40
+msgid "Audio Output"
+msgstr "Lyd-ud"
 
-#: ../data/totem.ui.h:70
-msgid "Resize _2:1"
-msgstr "Ændr størrelsen _2:1"
+#: ../data/preferences.ui.h:41
+msgid "_Audio output type:"
+msgstr "_Lyduddata-type:"
 
-#: ../data/totem.ui.h:71
-msgid "Resize to double the original video size"
-msgstr "Anvend videoens dobbelte originalstørrelse"
+#: ../data/preferences.ui.h:42 ../data/properties.ui.h:14
+#: ../src/totem-properties-view.c:271
+msgid "Audio"
+msgstr "Lyd"
 
-#: ../data/totem.ui.h:72
-msgid "Resize to half the original video size"
-msgstr "Anvend videoens halve originalstørrelse"
+#: ../data/properties.ui.h:2
+msgid "Title:"
+msgstr "Titel:"
 
-#: ../data/totem.ui.h:73
-msgid "Resize to the original video size"
-msgstr "Anvend videoens originalstørrelse"
+#: ../data/properties.ui.h:3
+msgid "Artist:"
+msgstr "Kunstner:"
 
-#: ../data/totem.ui.h:74
-msgid "S_idebar"
-msgstr "_Sidepanel"
+#: ../data/properties.ui.h:4
+msgid "Duration:"
+msgstr "Varighed:"
 
-#: ../data/totem.ui.h:75
-msgid "S_ubtitles"
-msgstr "_Undertekster"
+#: ../data/properties.ui.h:5
+msgid "Year:"
+msgstr "År:"
 
-#: ../data/totem.ui.h:76
-msgid "Sat_uration:"
-msgstr "_Mætning:"
+#: ../data/properties.ui.h:6
+msgid "Album:"
+msgstr "Album:"
 
-#: ../data/totem.ui.h:78
-msgid "Set the repeat mode"
-msgstr "Angiv gentagelsestilstanden"
+#: ../data/properties.ui.h:7
+msgid "Comment:"
+msgstr "Kommentar:"
 
-#: ../data/totem.ui.h:79
-msgid "Set the shuffle mode"
-msgstr "Angiv blandingstilstanden"
+#: ../data/properties.ui.h:8
+msgid "Container:"
+msgstr "Beholder:"
 
-#: ../data/totem.ui.h:80
-msgid "Sets 16:9 (widescreen) aspect ratio"
-msgstr "Sætter højde-/breddeforholdet til 16:9 (bredskærm)"
+#: ../data/properties.ui.h:10
+msgid "Dimensions:"
+msgstr "Dimensioner:"
 
-#: ../data/totem.ui.h:81
-msgid "Sets 2.11:1 (DVB) aspect ratio"
-msgstr "Sætter højde-/breddeforholdet til 2.11:1 (DVB)"
+#: ../data/properties.ui.h:11
+msgid "Codec:"
+msgstr "Kodning:"
 
-#: ../data/totem.ui.h:82
-msgid "Sets 4:3 (TV) aspect ratio"
-msgstr "Sætter højde-/breddeforholdet til 4:3 (TV)"
+#: ../data/properties.ui.h:12
+msgid "Framerate:"
+msgstr "Billedfrekvens:"
 
-#: ../data/totem.ui.h:83
-msgid "Sets automatic aspect ratio"
-msgstr "Sætter højde-/breddeforholdet automatisk"
+#: ../data/properties.ui.h:13
+msgid "Bitrate:"
+msgstr "Bitfrekvens:"
 
-#: ../data/totem.ui.h:84
-msgid "Sets square aspect ratio"
-msgstr "Sætter kvadratisk højde-/breddeforhold"
+#: ../data/properties.ui.h:15
+msgid "Sample rate:"
+msgstr "Samplefrekvens:"
 
-#: ../data/totem.ui.h:85
-msgid "Show _Controls"
-msgstr "Vis _kontroller"
+#: ../data/properties.ui.h:16
+msgid "Channels:"
+msgstr "Kanaler:"
 
-#: ../data/totem.ui.h:86
-msgid "Show _visual effects when an audio file is played"
-msgstr "Vis _visuelle effekter når en lydfil afspilles"
+#. Title
+#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:80 ../src/totem.c:239
+#: ../src/totem.c:248 ../src/totem-menu.c:790 ../src/totem-object.c:1658
+msgid "Videos"
+msgstr "Videoer"
 
-#: ../data/totem.ui.h:87
-msgid "Show controls"
-msgstr "Vis kontroller"
+# Enten "afspilning af (en) film" eller "afspiller en film". Lad os håbe sidstnævnte er korrekt...
+#: ../data/totem.desktop.in.in.in.h:2
+msgid "Play movies"
+msgstr "Afspil film"
 
-#: ../data/totem.ui.h:88
-msgid "Show or hide the sidebar"
-msgstr "Vis eller skjul sidepanelet"
+#: ../data/totem.desktop.in.in.in.h:3
+msgid "Video;Movie;Film;Clip;Series;Player;DVD;TV;Disc;"
+msgstr "Video;Film;Klip;Serie;Afspiller;Dvd;Tv;Disk;"
 
-#: ../data/totem.ui.h:89
-msgid "Shuff_le Mode"
-msgstr "_Blandingstilstand"
+#: ../data/totem.ui.h:1
+msgid "_Open"
+msgstr "_Åbn"
 
-#: ../data/totem.ui.h:90
-msgid "Skip _Backwards"
-msgstr "Spring t_ilbage"
+#: ../data/totem.ui.h:2
+msgid "Open _Location"
+msgstr "Åbn _sted"
 
-#: ../data/totem.ui.h:91
-msgid "Skip _Forward"
-msgstr "Spring f_remad"
+#: ../data/totem.ui.h:3
+msgid "_Fullscreen"
+msgstr "_Fuldskærm"
 
-#: ../data/totem.ui.h:92
-msgid "Skip backwards"
-msgstr "Spring tilbage"
+#: ../data/totem.ui.h:4
+msgid "Prefere_nces"
+msgstr "_Indstillinger for Totem"
 
-#: ../data/totem.ui.h:93
-msgid "Skip forward"
-msgstr "Spring fremad"
+#: ../data/totem.ui.h:5
+msgid "Shuff_le"
+msgstr "_Tilfældig"
 
-#: ../data/totem.ui.h:94
-msgid "Square"
-msgstr "Kvadratisk"
+#: ../data/totem.ui.h:6
+msgid "_Repeat"
+msgstr "_Gentag"
 
-#: ../data/totem.ui.h:95
-msgid "Start playing files from last position"
-msgstr "Start afspilning af filer fra sidste position"
+#: ../data/totem.ui.h:7
+msgid "_Quit"
+msgstr "_Afslut"
 
-#: ../data/totem.ui.h:96 ../src/totem-properties-view.c:228
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5593
-msgid "Stereo"
-msgstr "Stereo"
+#: ../data/totem.ui.h:8
+msgid "_Movie"
+msgstr "_Film"
 
-#: ../data/totem.ui.h:97
-msgid "Switch An_gles"
-msgstr "Skift vi_nkler"
+#: ../data/totem.ui.h:9
+msgid "_Eject"
+msgstr "_Skub ud"
 
-#: ../data/totem.ui.h:98
-msgid "Switch camera angles"
-msgstr "Skift kameravinkel"
+#: ../data/totem.ui.h:10
+msgid "Eject the current disc"
+msgstr "Skub den aktuelle skive ud"
 
-#: ../data/totem.ui.h:99
-msgid "Switch to fullscreen"
-msgstr "Skift til fuldskærm"
+#: ../data/totem.ui.h:11
+msgid "_Properties"
+msgstr "_Egenskaber"
 
-#: ../data/totem.ui.h:100
-msgid "Text Subtitles"
-msgstr "Undertekster som tekst"
+#: ../data/totem.ui.h:12
+msgid "View the properties of the current stream"
+msgstr "Vis egenskaberne for den aktuelle strøm"
 
-#: ../data/totem.ui.h:101
-msgid "Time seek bar"
-msgstr "Søgebjælke"
+#: ../data/totem.ui.h:13
+msgid "Play / P_ause"
+msgstr "Afspil / p_ause"
 
-#: ../data/totem.ui.h:103
-msgid "Totem Preferences"
-msgstr "Indstillinger for Totem"
+#: ../data/totem.ui.h:14
+msgid "Play or pause the movie"
+msgstr "Afspil eller sæt filmen på pause"
 
-#: ../data/totem.ui.h:105
-msgid "Video or Audio"
-msgstr "Video eller lyd"
+#: ../data/totem.ui.h:15
+msgid "_Edit"
+msgstr "_Redigér"
 
-#: ../data/totem.ui.h:106
-msgid "View the properties of the current stream"
-msgstr "Vis egenskaberne for den aktuelle strøm"
+#: ../data/totem.ui.h:16
+msgid "_Clear Playlist"
+msgstr "_Ryd afspilningsliste"
 
-#: ../data/totem.ui.h:107
-msgid "Visual Effects"
-msgstr "Visuelle effekter"
+#: ../data/totem.ui.h:17
+msgid "Clear the playlist"
+msgstr "Ryd afspilningslisten"
 
-#: ../data/totem.ui.h:108
-msgid "Visualization _size:"
-msgstr "Visualiserings_størrelse:"
+#: ../data/totem.ui.h:18
+msgid "Plugins..."
+msgstr "Udvidelsesmoduler..."
 
-#: ../data/totem.ui.h:109
-msgid "Volume _Down"
-msgstr "Lydstyrke _ned"
+#: ../data/totem.ui.h:19
+msgid "Configure plugins to extend the application"
+msgstr "Konfigurér udvidelsesmoduler til dette program"
 
-#: ../data/totem.ui.h:110
-msgid "Volume _Up"
-msgstr "Lydstyrke _op"
+#: ../data/totem.ui.h:20
+msgid "_View"
+msgstr "_Vis"
 
-#: ../data/totem.ui.h:111
-msgid "Zoom In"
-msgstr "Zoom ind"
+#: ../data/totem.ui.h:21
+msgid "Fit Window to Movie"
+msgstr "Tilpas vinduet til filmen"
 
-#: ../data/totem.ui.h:112
-msgid "Zoom in"
-msgstr "Zoom ind"
+#: ../data/totem.ui.h:22
+msgid "_Resize 1:2"
+msgstr "_Ændr størrelse til 1:2"
 
-#: ../data/totem.ui.h:113
-msgid "_About"
-msgstr "_Om"
+#: ../data/totem.ui.h:23
+msgid "Resize to half the original video size"
+msgstr "Anvend videoens halve originalstørrelse"
 
-#: ../data/totem.ui.h:114
-msgid "_Angle Menu"
-msgstr "_Vinkelmenu"
+#: ../data/totem.ui.h:24
+msgid "Resize _1:1"
+msgstr "Ændr størrelsen _1:1"
 
-#: ../data/totem.ui.h:115
-msgid "_Aspect Ratio"
-msgstr "_Højde-/breddeforhold"
+#: ../data/totem.ui.h:25
+msgid "Resize to the original video size"
+msgstr "Anvend videoens originalstørrelse"
 
-#: ../data/totem.ui.h:116
-msgid "_Audio output type:"
-msgstr "_Lyduddata-type:"
+#: ../data/totem.ui.h:26
+msgid "Resize _2:1"
+msgstr "Ændr størrelsen _2:1"
 
-# Genvejstasten _Lys... er ikke i konflikt med _Lyd... ovenfor, da de indgår i forskellige skærmbilleder
-#: ../data/totem.ui.h:117
-msgid "_Brightness:"
-msgstr "_Lysstyrke:"
+#: ../data/totem.ui.h:27
+msgid "Resize to double the original video size"
+msgstr "Anvend videoens dobbelte originalstørrelse"
 
-#: ../data/totem.ui.h:118
-msgid "_Chapter Menu"
-msgstr "_Kapitelmenu"
+#: ../data/totem.ui.h:28
+msgid "_Aspect Ratio"
+msgstr "_Højde-/breddeforhold"
 
-#: ../data/totem.ui.h:119
-msgid "_Clear Playlist"
-msgstr "_Ryd afspilningsliste"
+#: ../data/totem.ui.h:29
+msgid "Switch An_gles"
+msgstr "Skift vi_nkler"
 
-#: ../data/totem.ui.h:120
-msgid "_Contents"
-msgstr "_Indhold"
+#: ../data/totem.ui.h:30
+msgid "Switch camera angles"
+msgstr "Skift kameravinkel"
+
+#: ../data/totem.ui.h:31
+msgid "_Go"
+msgstr "_Start"
 
-#: ../data/totem.ui.h:121
+#: ../data/totem.ui.h:32
 msgid "_DVD Menu"
 msgstr "_Dvd-menu"
 
-#: ../data/totem.ui.h:122
-msgid "_Edit"
-msgstr "_Redigér"
-
-#: ../data/totem.ui.h:123
-msgid "_Eject"
-msgstr "_Skub ud"
-
-#: ../data/totem.ui.h:124
-msgid "_Encoding:"
-msgstr "_Indkodning:"
-
-#: ../data/totem.ui.h:125
-msgid "_Font:"
-msgstr "_Skrifttype:"
+#: ../data/totem.ui.h:33
+msgid "Go to the DVD menu"
+msgstr "Gå til dvd-menuen"
 
-#: ../data/totem.ui.h:126
-msgid "_Fullscreen"
-msgstr "_Fuldskærm"
+#: ../data/totem.ui.h:34
+msgid "_Title Menu"
+msgstr "_Titelmenu"
 
-#: ../data/totem.ui.h:127
-msgid "_Go"
-msgstr "_Start"
+#: ../data/totem.ui.h:35
+msgid "Go to the title menu"
+msgstr "Gå til titelmenuen"
 
-#: ../data/totem.ui.h:128
-msgid "_Help"
-msgstr "_Hjælp"
+#: ../data/totem.ui.h:36
+msgid "A_udio Menu"
+msgstr "_Lydmenu"
 
-#: ../data/totem.ui.h:129
-msgid "_Hue:"
-msgstr "_Farvetone:"
+#: ../data/totem.ui.h:37
+msgid "Go to the audio menu"
+msgstr "Gå til lydmenuen"
 
-#: ../data/totem.ui.h:130
-msgid "_Languages"
-msgstr "_Sprog"
+#: ../data/totem.ui.h:38
+msgid "_Angle Menu"
+msgstr "_Vinkelmenu"
 
-#: ../data/totem.ui.h:131
-msgid "_Load subtitle files when movie is loaded"
-msgstr "_Hent undertekstfiler når filmen indlæses"
+#: ../data/totem.ui.h:39
+msgid "Go to the angle menu"
+msgstr "Gå til vinkelmenuen"
 
-#: ../data/totem.ui.h:132
-msgid "_Movie"
-msgstr "_Film"
+#: ../data/totem.ui.h:40
+msgid "_Chapter Menu"
+msgstr "_Kapitelmenu"
 
-#: ../data/totem.ui.h:133
+#: ../data/totem.ui.h:41
+msgid "Go to the chapter menu"
+msgstr "Gå til kapitelmenuen"
+
+#: ../data/totem.ui.h:42
 msgid "_Next Chapter/Movie"
 msgstr "_Næste kapitel/film"
 
-#: ../data/totem.ui.h:134
-msgid "_Open..."
-msgstr "_Åbn..."
+#: ../data/totem.ui.h:43
+msgid "Next chapter or movie"
+msgstr "Næste kapitel eller film"
 
-#: ../data/totem.ui.h:135
+#: ../data/totem.ui.h:44
 msgid "_Previous Chapter/Movie"
 msgstr "_Forrige kapitel/film"
 
-#: ../data/totem.ui.h:136
-msgid "_Properties"
-msgstr "_Egenskaber"
+#: ../data/totem.ui.h:45
+msgid "Previous chapter or movie"
+msgstr "Forrige kapitel eller film"
 
-#: ../data/totem.ui.h:137
-msgid "_Quit"
-msgstr "_Afslut"
+#: ../data/totem.ui.h:46
+msgid "_Sound"
+msgstr "_Lyd"
 
-#: ../data/totem.ui.h:138
-msgid "_Repeat Mode"
-msgstr "_Gentagelsestilstand"
+#: ../data/totem.ui.h:47
+msgid "Volume _Up"
+msgstr "Lydstyrke _op"
 
-#: ../data/totem.ui.h:139
-msgid "_Resize 1:2"
-msgstr "_Ændr størrelse til 1:2"
+#: ../data/totem.ui.h:48
+msgid "Increase volume"
+msgstr "Forøg lydstyrken"
 
-#: ../data/totem.ui.h:140
-msgid "_Resize the window when a new video is loaded"
-msgstr "Ændr automatisk _størrelsen på vinduet når en video indlæses"
+#: ../data/totem.ui.h:49
+msgid "Volume _Down"
+msgstr "Lydstyrke _ned"
 
-#: ../data/totem.ui.h:142
-msgid "_Sound"
-msgstr "_Lyd"
+#: ../data/totem.ui.h:50
+msgid "Decrease volume"
+msgstr "Mindsk lydstyrken"
 
-#: ../data/totem.ui.h:143
-msgid "_Title Menu"
-msgstr "_Titelmenu"
+#: ../data/totem.ui.h:51
+msgid "_Help"
+msgstr "_Hjælp"
 
-#: ../data/totem.ui.h:144
-msgid "_Type of visualization:"
-msgstr "_Visualiseringstype:"
+#: ../data/totem.ui.h:52
+msgid "_Contents"
+msgstr "_Indhold"
 
-#: ../data/totem.ui.h:145
-msgid "_View"
-msgstr "_Vis"
+#: ../data/totem.ui.h:53
+msgid "Help contents"
+msgstr "Indhold af hjælp"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
-msgid ""
-"A list of the names of the plugins which are currently active (loaded and "
-"running)."
-msgstr ""
-"En liste af navne på udvidelsesmodulerne, der i øjeblikket er aktiveret "
-"(indlæst og kører)."
+#: ../data/totem.ui.h:54
+msgid "_About"
+msgstr "_Om"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
-msgid "Active plugins list"
-msgstr "Liste over aktive udvidelsesmoduler"
+#: ../data/totem.ui.h:55
+msgid "About this application"
+msgstr "Om dette program"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
-msgid "Allow the screensaver to activate when playing audio"
-msgstr "Tillad aktivering af pauseskærmen når der afspilles lyd"
+#: ../data/totem.ui.h:56
+msgid "Show _Controls"
+msgstr "Vis _kontroller"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
-msgid ""
-"Allow the screensaver to activate when playing audio. Disable if you have "
-"monitor-powered speakers."
-msgstr ""
-"Tillad aktivering af pauseskærm når der afspilles lyd. Slå fra, hvis du har "
-"højttalere, der får strøm fra skærmen."
+#: ../data/totem.ui.h:57
+msgid "Show controls"
+msgstr "Vis kontroller"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
-msgid ""
-"Amount of data to buffer for network streams before starting to display the "
-"stream (in seconds)."
-msgstr ""
-"Mængden af data som skal mellemlagres for netværksstrømme inden strømmen "
-"vises (i sekunder)."
+#: ../data/totem.ui.h:58
+msgid "S_idebar"
+msgstr "_Sidepanel"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
-msgid ""
-"Approximate network connection speed, used to select quality on media over "
-"the network."
-msgstr ""
-"Tilnærmet hastighed af netværksforbindelsen, der bruges til at vælge "
-"mediekvalitet over netværket."
+#: ../data/totem.ui.h:59
+msgid "Show or hide the sidebar"
+msgstr "Vis eller skjul sidepanelet"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
-msgid "Default location for the \"Open...\" dialogs"
-msgstr "Forvalgt placering for \"Åbn...\"-vinduerne"
+#: ../data/totem.ui.h:60
+msgctxt "Aspect ratio"
+msgid "Auto"
+msgstr "Auto"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
-msgid ""
-"Default location for the \"Open...\" dialogs. Default is the current "
-"directory."
-msgstr ""
-"Standardplacering for \"Åbn...\"-vinduerne. Standardværdien er den nuværende "
-"mappe."
+#: ../data/totem.ui.h:61
+msgid "Sets automatic aspect ratio"
+msgstr "Sætter højde-/breddeforholdet automatisk"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
-msgid "Default location for the \"Take Screenshot\" dialogs"
-msgstr "Forvalgt placering for \"Gem skærmbillede\"-vinduerne"
+#: ../data/totem.ui.h:62
+msgid "Square"
+msgstr "Kvadratisk"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
-msgid ""
-"Default location for the \"Take Screenshot\" dialogs. Default is the "
-"Pictures directory."
-msgstr ""
-"Standardplacering for \"Gem skærmbillede\"-vinduerne. Standardværdien er "
-"mappen Billeder."
+#: ../data/totem.ui.h:63
+msgid "Sets square aspect ratio"
+msgstr "Sætter kvadratisk højde-/breddeforhold"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
-msgid "Encoding character set for subtitle."
-msgstr "Tegnkodning til undertekster."
+#: ../data/totem.ui.h:64
+msgid "4:3 (TV)"
+msgstr "4:3 (tv)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
-msgid "Name of the visual effects plugin"
-msgstr "Navn på udvidelsesmodul til visuelle effekter"
+#: ../data/totem.ui.h:65
+msgid "Sets 4:3 (TV) aspect ratio"
+msgstr "Sætter højde-/breddeforholdet til 4:3 (TV)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
-msgid "Network buffering threshold"
-msgstr "Tærskel for netværksbuffer"
+#: ../data/totem.ui.h:66
+msgid "16:9 (Widescreen)"
+msgstr "16:9 (bredskærm)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
-msgid "Network connection speed"
-msgstr "Hastighed af netværksforbindelse"
+#: ../data/totem.ui.h:67
+msgid "Sets 16:9 (widescreen) aspect ratio"
+msgstr "Sætter højde-/breddeforholdet til 16:9 (bredskærm)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
-msgid "Pango font description for subtitle rendering."
-msgstr "Pango-skrifttypebeskrivelse for optegning af undertekster."
+#: ../data/totem.ui.h:68
+msgid "2.11:1 (DVB)"
+msgstr "2.11:1 (DVB)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
-msgid "Quality setting for the audio visualization."
-msgstr "Kvalitetsindstilling til lydvisualisering."
+#: ../data/totem.ui.h:69
+msgid "Sets 2.11:1 (DVB) aspect ratio"
+msgstr "Sætter højde-/breddeforholdet til 2.11:1 (DVB)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
-msgid "Repeat mode"
-msgstr "Gentagelsestilstand"
+#: ../data/totem.ui.h:70
+msgid "S_ubtitles"
+msgstr "_Undertekster"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
-msgid "Resize the canvas automatically on file load"
-msgstr "Ændr størrelsen af lærredet automatisk ved filåbninger"
+#: ../data/totem.ui.h:73
+msgid "_Languages"
+msgstr "_Sprog"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
-msgid "Show visual effects when no video is displayed"
-msgstr "Vis visuelle effekter når der ikke afspilles en video"
+#: ../data/totem.ui.h:74
+msgid "Zoom In"
+msgstr "Zoom ind"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
-msgid "Show visual effects when playing an audio only file."
-msgstr "Vis visuelle effekter når en fil med kun lyd afspilles."
+#: ../data/totem.ui.h:75
+msgid "Zoom in"
+msgstr "Zoom ind"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
-msgid "Shuffle mode"
-msgstr "Blandingstilstand"
+#: ../data/totem.ui.h:76
+msgid "Skip _Forward"
+msgstr "Spring f_remad"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
-msgid "Subtitle encoding"
-msgstr "Kodning af undertekster"
+#: ../data/totem.ui.h:77
+msgid "Skip forward"
+msgstr "Spring fremad"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
-msgid "Subtitle font"
-msgstr "Skrifttype for undertekster"
+#: ../data/totem.ui.h:78
+msgid "Skip _Backwards"
+msgstr "Spring t_ilbage"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
-msgid "The brightness of the video"
-msgstr "Lysstyrken for videoen"
+#: ../data/totem.ui.h:79
+msgid "Skip backwards"
+msgstr "Spring tilbage"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
-msgid "The contrast of the video"
-msgstr "Kontrasten for videoen"
+#: ../data/totem.ui.h:82
+msgid "Time seek bar"
+msgstr "Søgebjælke"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
-msgid "The hue of the video"
-msgstr "Videoens farvetone"
+#: ../data/uri.ui.h:1
+msgid "Enter the _address of the file you would like to open:"
+msgstr "Angiv _adressen på den fil du ønsker at åbne:"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
-msgid "The saturation of the video"
-msgstr "Videoens mætning"
+#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
+msgid "_Add to Playlist"
+msgstr "_Føj til afspilningsliste"
+
+#: ../data/video-list.ui.h:2
+msgid "Add the video to the playlist"
+msgstr "Føj video til afspilningslisten"
+
+#: ../src/backend/bacon-video-widget.c:1643
+msgid "Password requested for RTSP server"
+msgstr "Adgangskode afventes for RTSP-server"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
-msgid "Type of audio output to use"
-msgstr "Type lyd-uddata der skal benyttes"
+#: ../src/backend/bacon-video-widget.c:2944
+#, c-format
+msgid "Audio Track #%d"
+msgstr "Lydspor #%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
-msgid "Visualization quality setting"
-msgstr "Kvalitetsindstilling for visualisering"
+#: ../src/backend/bacon-video-widget.c:2948
+#, c-format
+msgid "Subtitle #%d"
+msgstr "Undertekst #%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
-msgid "Whether to autoload external chapter files when a movie is loaded"
-msgstr "Om eksterne kapitelfiler skal hentes automatisk når en film indlæses"
+#: ../src/backend/bacon-video-widget.c:3345
+msgid "The server you are trying to connect to is not known."
+msgstr "Den server du forsøger at tilkoble til, er ikke kendt."
+
+#: ../src/backend/bacon-video-widget.c:3348
+msgid "The connection to this server was refused."
+msgstr "Forbindelses til denne server blev nægtet."
+
+#: ../src/backend/bacon-video-widget.c:3351
+msgid "The specified movie could not be found."
+msgstr "Den angivne film blev ikke fundet."
+
+#: ../src/backend/bacon-video-widget.c:3358
+msgid "The server refused access to this file or stream."
+msgstr "Serveren nægtede adgang til denne fil eller strøm."
+
+#: ../src/backend/bacon-video-widget.c:3364
+msgid "Authentication is required to access this file or stream."
+msgstr "Denne fil eller strøm kan ikke tilgås uden godkendelse."
+
+#: ../src/backend/bacon-video-widget.c:3371
+msgid "You are not allowed to open this file."
+msgstr "Du har ikke rettigheder til at åbne denne fil."
+
+#: ../src/backend/bacon-video-widget.c:3376
+msgid "This location is not a valid one."
+msgstr "Denne placering er ikke gyldig."
+
+#: ../src/backend/bacon-video-widget.c:3384
+msgid "The movie could not be read."
+msgstr "Filmen kunne ikke læses."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
-msgid "Whether to autoload text subtitle files when a movie is loaded"
-msgstr "Om undertekster skal hentes automatisk når en film indlæses"
+#. should be exactly one missing thing (source or converter)
+#: ../src/backend/bacon-video-widget.c:3407
+#: ../src/backend/bacon-video-widget.c:3415
+#, c-format
+msgid "The playback of this movie requires a %s plugin which is not installed."
+msgid_plural ""
+"The playback of this movie requires the following decoders which are not "
+"installed:\n"
+"\n"
+"%s"
+msgstr[0] ""
+"Afspilning af denne film kræver et udvidelsesmodul til %s som ikke er "
+"installeret."
+msgstr[1] ""
+"Afspilning af denne film kræver følgende dekodere som ikke er installeret:\n"
+"\n"
+"%s"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
-msgid "Whether to disable deinterlacing for interlaced movies"
-msgstr "Om deinterlacing for interlacede film skal deaktiveres"
+#: ../src/backend/bacon-video-widget.c:3426
+msgid ""
+"An audio or video stream is not handled due to missing codecs. You might "
+"need to install additional plugins to be able to play some types of movies"
+msgstr ""
+"En lyd- eller videostrøm kan ikke håndteres på grund af manglende codec. Du "
+"bliver muligvis nødt til at installere yderligere udvidelsesmoduler for at "
+"afspille visse typer film"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
-msgid "Whether to disable the keyboard shortcuts"
-msgstr "Om tastaturgenveje skal deaktiveres"
+#: ../src/backend/bacon-video-widget.c:3436
+msgid ""
+"This file cannot be played over the network. Try downloading it locally "
+"first."
+msgstr ""
+"Denne fil kan ikke afspilles over netværket. Prøv at hente den lokalt først."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
-msgid "Whether to disable the plugins in the user's home directory"
-msgstr "Om udvidelsesmoduler i brugerens hjemmemappe skal deaktiveres"
+#: ../src/backend/bacon-video-widget.c:5494 ../src/totem-properties-view.c:227
+msgid "Surround"
+msgstr "Surround"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:35
-msgid "Whether to enable debug for the playback engine"
-msgstr "Om fejlanalysering skal slåes til for afspilningsmotoren"
+#: ../src/backend/bacon-video-widget.c:5496 ../src/totem-properties-view.c:229
+msgid "Mono"
+msgstr "Mono"
+
+#: ../src/backend/bacon-video-widget.c:5781
+msgid "Media contains no supported video streams."
+msgstr "Medie indeholder ingen understøttede video-strømme."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:36
+#: ../src/backend/bacon-video-widget.c:5963
 msgid ""
-"Whether to remember the position of played audio/video files when pausing or "
-"closing them"
+"Some necessary plug-ins are missing. Make sure that the program is correctly "
+"installed."
 msgstr ""
-"Hvorvidt positionen i de afspillede lyd-/videofiler skal huskes, når de "
-"sættes på pause eller lukkes"
-
-#: ../data/uri.ui.h:1
-msgid "Enter the _address of the file you would like to open:"
-msgstr "Angiv _adressen på den fil du ønsker at åbne:"
+"Der mangler visse nødvendige udvidelsesmoduler. Kontrollér at programmet er "
+"korrekt installeret."
 
 #: ../src/eggdesktopfile.c:165
 #, c-format
@@ -988,6 +1054,31 @@
 msgid "Show session management options"
 msgstr "Vis indstillinger for sessionshåndtering"
 
+#. hour:minutes:seconds
+#. Translators: This is a time format, like "9:05:02" for 9
+#. * hours, 5 minutes, and 2 seconds. You may change ":" to
+#. * the separator that your locale uses or use "%Id" instead
+#. * of "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:56
+#: ../src/plugins/skipto/totem-time-entry.c:57
+#, c-format
+msgctxt "long time format"
+msgid "%d:%02d:%02d"
+msgstr "%d:%02d:%02d"
+
+#. minutes:seconds
+#. Translators: This is a time format, like "5:02" for 5
+#. * minutes and 2 seconds. You may change ":" to the
+#. * separator that your locale uses or use "%Id" instead of
+#. * "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:65
+#, c-format
+msgctxt "short time format"
+msgid "%d:%02d"
+msgstr "%d:%02d"
+
 #. Title
 #. Artist
 #. Album
@@ -1092,10 +1183,14 @@
 msgstr[0] "%d billede pr. sekund"
 msgstr[1] "%d billeder pr. sekund"
 
-#: ../src/totem-audio-preview.c:168
+#: ../src/totem-audio-preview.c:137
 msgid "Audio Preview"
 msgstr "Forhåndsafspilning af lyd"
 
+#: ../src/totem.c:240
+msgid "Verify your system installation. Totem will now exit."
+msgstr "Kontrollér din systeminstallation. Totem vil nu afslutte."
+
 #: ../src/totem-cell-renderer-video.c:126
 msgid "Unknown video"
 msgstr "Ukendt video"
@@ -1108,7 +1203,7 @@
 msgid "Cancel"
 msgstr "Annullér"
 
-#: ../src/totem-fullscreen.c:616
+#: ../src/totem-fullscreen.c:573
 msgid "No File"
 msgstr "Ingen fil"
 
@@ -1126,7 +1221,7 @@
 msgid "Make sure that Totem is properly installed."
 msgstr "Sikr dig at Totem er korrekt installeret."
 
-#: ../src/totem-interface.c:347
+#: ../src/totem-interface.c:357
 msgid ""
 "Totem 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 "
@@ -1138,7 +1233,7 @@
 "Foundation; enten version 2 af licensen eller, efter eget valg, enhver nyere "
 "version."
 
-#: ../src/totem-interface.c:351
+#: ../src/totem-interface.c:361
 msgid ""
 "Totem is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -1150,7 +1245,7 @@
 "ET BESTEMT FORMÅL, idet der henvises til GNU General Public License for "
 "detaljer."
 
-#: ../src/totem-interface.c:355
+#: ../src/totem-interface.c:365
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Totem; if not, write to the Free Software Foundation, Inc., 59 Temple Place, "
@@ -1160,7 +1255,7 @@
 "er dette ikke tilfældet, så skriv til Free Software Foundation, Inc., 59 "
 "Temple Place, Suite 330, Boston, MA  02111-1307  USA"
 
-#: ../src/totem-interface.c:358
+#: ../src/totem-interface.c:368
 msgid ""
 "Totem contains an exception to allow the use of proprietary GStreamer "
 "plugins."
@@ -1169,46 +1264,21 @@
 "udvidelsesmoduler."
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:190
+#: ../src/totem-menu.c:291
 msgid "None"
 msgstr "Ingen"
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:195
+#: ../src/totem-menu.c:296
 msgctxt "Language"
 msgid "Auto"
 msgstr "Auto"
 
-#. Translators:
-#. * This is not a JPEG image, but a disc image, for example,
-#. * an ISO file
-#: ../src/totem-menu.c:765
-#, c-format
-msgid "Play Image '%s'"
-msgstr "Afspil aftryk \"%s\""
-
-#: ../src/totem-menu.c:768 ../src/totem-menu.c:851
-#, c-format
-msgid "device%d"
-msgstr "enhed%d"
-
-#: ../src/totem-menu.c:848
-#, c-format
-msgid "Play Disc '%s'"
-msgstr "Afspil disk \"%s\""
-
-#. This lists the back-end type and version, such as
-#. * Movie Player using GStreamer 0.10.1
-#: ../src/totem-menu.c:1189
-#, c-format
-msgid "Movie Player using %s"
-msgstr "Filmafspiller med %s"
-
-#: ../src/totem-menu.c:1193
+#: ../src/totem-menu.c:789
 msgid "Copyright © 2002-2009 Bastien Nocera"
 msgstr "Copyright © 2002-2009 Bastien Nocera"
 
-#: ../src/totem-menu.c:1198
+#: ../src/totem-menu.c:794
 msgid "translator-credits"
 msgstr ""
 "Ole Laursen\n"
@@ -1219,158 +1289,77 @@
 "Dansk-gruppen \n"
 "Mere info: http://www.dansk-gruppen.dk"
 
-#: ../src/totem-menu.c:1202
+#: ../src/totem-menu.c:798
 msgid "Totem Website"
 msgstr "Totems hjemmeside"
 
-#: ../src/totem-menu.c:1236
+#: ../src/totem-menu.c:829
 msgid "Configure Plugins"
 msgstr "Konfigurér udvidelsesmoduler"
 
+#: ../src/totem-object.c:162
+#, c-format
+msgid ""
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"%s\n"
+"Kør \"%s --help\" for at se en fuldstændig liste af kommandolinjetilvalg.\n"
+
 #. Translators: %s is the totem version number
-#: ../src/totem-object.c:471
+#: ../src/totem-object.c:591
 #, c-format
 msgid "Totem %s"
 msgstr "Totem %s"
 
-#: ../src/totem-object.c:1047 ../browser-plugin/totem-plugin-viewer.c:367
-msgid "Playing"
-msgstr "Afspiller"
-
-#: ../src/totem-object.c:1049 ../src/totem-options.c:52
+#: ../src/totem-object.c:1168 ../src/totem-options.c:52
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/totem-object.c:1054 ../browser-plugin/totem-plugin-viewer.c:363
-msgid "Paused"
-msgstr "På pause"
-
-#: ../src/totem-object.c:1056 ../src/totem-object.c:1066
+#: ../src/totem-object.c:1175 ../src/totem-object.c:1185
 #: ../src/totem-options.c:51
 msgid "Play"
 msgstr "Afspil"
 
-#: ../src/totem-object.c:1061 ../src/totem-object.c:1659
-#: ../src/totem-statusbar.c:115 ../browser-plugin/totem-plugin-viewer.c:351
-msgid "Stopped"
-msgstr "Stoppet"
-
-#: ../src/totem-object.c:1142 ../src/totem-object.c:1169
-#: ../src/totem-object.c:1799 ../src/totem-object.c:1963
+#: ../src/totem-object.c:1267 ../src/totem-object.c:1294
+#: ../src/totem-object.c:1787 ../src/totem-object.c:1942
 #, c-format
 msgid "Totem could not play '%s'."
 msgstr "Totem kunne ikke afspille \"%s\"."
 
-#: ../src/totem-object.c:1246
-#, c-format
-msgid ""
-"Totem could not play this media (%s) although a plugin is present to handle "
-"it."
-msgstr ""
-"Totem kunne ikke afspille dette medie (%s), selvom et modul er tilgængeligt "
-"til at håndtere det."
-
-#: ../src/totem-object.c:1247
-msgid ""
-"You might want to check that a disc is present in the drive and that it is "
-"correctly configured."
-msgstr ""
-"Kontrollér at disken sidder i drevet og at det er korrekt konfigureret."
-
-#: ../src/totem-object.c:1255
-msgid "More information about media plugins"
-msgstr "Mere information om mediemoduler"
-
-#: ../src/totem-object.c:1256
-msgid ""
-"Please install the necessary plugins and restart Totem to be able to play "
-"this media."
-msgstr ""
-"Installér de nødvendige moduler og genstart Totem hvis du vil afspille denne "
-"type."
-
-#: ../src/totem-object.c:1258
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because it does not have the "
-"appropriate plugins to be able to read from the disc."
-msgstr ""
-"Totem kan ikke afspille denne medietype (%s), da du ikke har de nødvendige "
-"udvidelsesmoduler til at læse dem fra disken."
-
-#: ../src/totem-object.c:1260
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because you do not have the "
-"appropriate plugins to handle it."
-msgstr ""
-"Totem kan ikke afspille denne medietype (%s), da du ikke har de nødvendige "
-"udvidelsesmoduler til at håndtere den."
-
-#: ../src/totem-object.c:1263
-#, c-format
-msgid "Totem cannot play this type of media (%s) because it is not supported."
-msgstr ""
-"Totem kan ikke afspille denne medietype (%s), fordi den ikke understøttes."
-
-# ???
-#: ../src/totem-object.c:1264
-msgid "Please insert another disc to play back."
-msgstr "Indsæt venligst en ny disk for at afspille."
-
-#: ../src/totem-object.c:1300
-msgid "Totem was not able to play this disc."
-msgstr "Totem kunne ikke afspille disken."
-
-#: ../src/totem-object.c:1301 ../src/totem-object.c:4229
-msgid "No reason."
-msgstr "Ingen begrundelse."
-
-#: ../src/totem-object.c:1315
-msgid "Totem does not support playback of Audio CDs"
-msgstr "Totem understøtter ikke afspilning af lyd-cd'er"
-
-#: ../src/totem-object.c:1316
-msgid "Please consider using a music player or a CD extractor to play this CD"
-msgstr ""
-"Overvej venligst at bruge en musikafspiller eller en cd-udpakker til at "
-"afspille denne cd"
-
-#: ../src/totem-object.c:1805
+#: ../src/totem-object.c:1793
 msgid "No error message"
 msgstr "Ingen fejlmeddelelse"
 
-#: ../src/totem-object.c:2154
+#: ../src/totem-object.c:2133
 msgid "Totem could not display the help contents."
 msgstr "Totem kunne ikke vise indholdet af hjælp."
 
-#: ../src/totem-object.c:2493 ../src/totem-object.c:2495
-#: ../browser-plugin/totem-plugin-viewer.c:1417
-msgid "An error occurred"
-msgstr "Der opstod en fejl"
-
-#: ../src/totem-object.c:4064 ../src/totem-object.c:4066
+#: ../src/totem-object.c:4019 ../src/totem-object.c:4021
 msgid "Previous Chapter/Movie"
 msgstr "Forrige kapitel/film"
 
-#: ../src/totem-object.c:4073 ../src/totem-object.c:4075
+#: ../src/totem-object.c:4028 ../src/totem-object.c:4030
 msgid "Play / Pause"
 msgstr "Afspil / pause"
 
-#: ../src/totem-object.c:4083 ../src/totem-object.c:4085
+#: ../src/totem-object.c:4038 ../src/totem-object.c:4040
 msgid "Next Chapter/Movie"
 msgstr "Næste kapitel/film"
 
-#. Translators: this is the tooltip text for the fullscreen button in the controls box in Totem's main window.
 #. Translators: this is the accessibility text for the fullscreen button in the controls box in Totem's main window.
-#: ../src/totem-object.c:4097 ../src/totem-object.c:4099
+#: ../src/totem-object.c:4051 ../src/totem-object.c:4053
 msgid "Fullscreen"
 msgstr "Fuldskærm"
 
-#: ../src/totem-object.c:4229
+#: ../src/totem-object.c:4184
 msgid "Totem could not startup."
 msgstr "Totem kunne ikke starte."
 
+#: ../src/totem-object.c:4184
+msgid "No reason."
+msgstr "Ingen begrundelse."
+
 #: ../src/totem-open-location.c:182
 msgid "Open Location..."
 msgstr "Åbn placering..."
@@ -1444,118 +1433,112 @@
 msgid "Movies to play"
 msgstr "Film til afspilning"
 
-#: ../src/totem-options.c:117
+#: ../src/totem-options.c:79
+msgid "- Play movies and songs"
+msgstr "- Afspil film og sange"
+
+#: ../src/totem-options.c:142
 msgid "Can't enqueue and replace at the same time"
 msgstr "Kan ikke sætte i kø og erstatte på samme tid"
 
 #. By extension entry
-#: ../src/totem-playlist.c:161
+#: ../src/totem-playlist.c:162
 msgid "MP3 ShoutCast playlist"
 msgstr "Afspilningsliste for MP3-ShoutCast"
 
-#: ../src/totem-playlist.c:162
+#: ../src/totem-playlist.c:163
 msgid "MP3 audio (streamed)"
 msgstr "MP3-audio (strøm)"
 
-#: ../src/totem-playlist.c:163
+#: ../src/totem-playlist.c:164
 msgid "MP3 audio (streamed, DOS format)"
 msgstr "MP3-audio (strøm, DOS-format)"
 
-#: ../src/totem-playlist.c:164
+#: ../src/totem-playlist.c:165
 msgid "XML Shareable Playlist"
 msgstr "Delelig XML-afspilningsliste"
 
 #. This is "Title 3", where title is a DVD title
 #. * Note: NOT a DVD chapter
-#: ../src/totem-playlist.c:347
+#: ../src/totem-playlist.c:348
 #, c-format
 msgid "Title %d"
 msgstr "Titel %d"
 
-#: ../src/totem-playlist.c:446
+#: ../src/totem-playlist.c:447
 msgid "Could not save the playlist"
 msgstr "Kunne ikke gemme afspilningslisten"
 
-#: ../src/totem-playlist.c:1021
+#: ../src/totem-playlist.c:1022
 msgid "Save Playlist"
 msgstr "Gem afspilningsliste"
 
 #. translators: Playlist is the default saved playlist filename,
 #. * without the suffix
-#: ../src/totem-playlist.c:1033 ../src/totem-playlist.c:1264
-#: ../src/totem-sidebar.c:142
+#: ../src/totem-playlist.c:1034 ../src/totem-playlist.c:1263
+#: ../src/totem-sidebar.c:145
 msgid "Playlist"
 msgstr "Afspilningsliste"
 
-#: ../src/totem-playlist.c:1857
+#: ../src/totem-playlist.c:1862
 #, c-format
 msgid "The playlist '%s' could not be parsed. It might be damaged."
 msgstr ""
 "Afspilningslisten \"%s\" kunne ikke fortolkes. Den kan være beskadiget."
 
-#: ../src/totem-playlist.c:1858
+#: ../src/totem-playlist.c:1863
 msgid "Playlist error"
 msgstr "Afspilningslistefejl"
 
-#: ../src/totem-preferences.c:295
+#: ../src/totem-preferences.c:297
 msgid "Preferences"
 msgstr "Indstillinger"
 
-#: ../src/totem-preferences.c:451
+#: ../src/totem-preferences.c:445
 msgid "Select Subtitle Font"
 msgstr "Vælg skrifttype for undertekster"
 
-#: ../src/totem-properties-main.c:115 ../src/totem-properties-view.c:266
+#: ../src/totem-properties-main.c:116 ../src/totem-properties-view.c:269
 msgid "Audio/Video"
 msgstr "Lyd/video"
 
-#: ../src/totem-properties-view.c:128
+#: ../src/totem-properties-view.c:131
 msgid "N/A"
 msgstr "Ikke tilgængelig"
 
-#: ../src/totem-properties-view.c:157
+#: ../src/totem-properties-view.c:160
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 msgctxt "Stream bit rate"
 msgid "N/A"
 msgstr "Ikke tilgængelig"
 
-#: ../src/totem-properties-view.c:160
+#: ../src/totem-properties-view.c:163
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: ../src/totem-properties-view.c:177
+#: ../src/totem-properties-view.c:180
 #: ../src/plugins/properties/totem-movie-properties.c:149
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../src/totem-properties-view.c:209
+#: ../src/totem-properties-view.c:212
 #: ../src/plugins/properties/totem-movie-properties.c:166
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: ../src/totem-properties-view.c:216
+#: ../src/totem-properties-view.c:219
 #: ../src/plugins/properties/totem-movie-properties.c:166
 msgctxt "Sample rate"
 msgid "N/A"
 msgstr "-"
 
-#: ../src/totem-properties-view.c:224
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5589
-msgid "Surround"
-msgstr "Surround"
-
-#: ../src/totem-properties-view.c:226
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5591
-msgid "Mono"
-msgstr "Mono"
-
-#: ../src/totem-properties-view.c:236
+#: ../src/totem-properties-view.c:239
 msgctxt "Number of audio channels"
 msgid "N/A"
 msgstr "Ikke tilgængelig"
@@ -1588,8 +1571,8 @@
 #. eg: 75 %
 #: ../src/totem-statusbar.c:250
 #, c-format
-msgid "%d %%"
-msgstr "%d %%"
+msgid "%lf %%"
+msgstr "%lf %%"
 
 #. eg: Paused, 0:32 / 1:05
 #: ../src/totem-statusbar.c:325
@@ -1600,8 +1583,8 @@
 #. eg: Buffering, 75 %
 #: ../src/totem-statusbar.c:330
 #, c-format
-msgid "%s, %d %%"
-msgstr "%s, %d %%"
+msgid "%s, %f %%"
+msgstr "%s, %f %%"
 
 #: ../src/totem-subtitle-encoding.c:156
 msgid "Current Locale"
@@ -1745,224 +1728,91 @@
 msgid "Vietnamese"
 msgstr "Vietnamesisk"
 
-#: ../src/totem-video-list.c:330
-msgid "No video URI"
-msgstr "Ingen video-URI"
-
-#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
-#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
-#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
-#: ../src/totem-video-thumbnailer.c:872
-#, c-format
-msgid ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-msgstr ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-
-#: ../src/totem-video-thumbnailer.c:873
-msgid "Filename"
-msgstr "Filnavn"
-
-#: ../src/totem-video-thumbnailer.c:875
-msgid "Resolution"
-msgstr "Opløsning"
-
-#: ../src/totem-video-thumbnailer.c:878
-msgid "Duration"
-msgstr "Varighed"
-
-#: ../src/totem-uri.c:506 ../src/plugins/chapters/totem-chapters.c:998
+#: ../src/totem-uri.c:343 ../src/plugins/chapters/totem-chapters.c:998
 msgid "All files"
 msgstr "Alle filer"
 
-#: ../src/totem-uri.c:511 ../src/plugins/chapters/totem-chapters.c:995
+#: ../src/totem-uri.c:348 ../src/plugins/chapters/totem-chapters.c:995
 msgid "Supported files"
 msgstr "Understøttede filer"
 
-#: ../src/totem-uri.c:523
+#: ../src/totem-uri.c:360
 msgid "Audio files"
 msgstr "Lydfiler"
 
-#: ../src/totem-uri.c:531
+#: ../src/totem-uri.c:368
 msgid "Video files"
 msgstr "Videofiler"
 
-#: ../src/totem-uri.c:541
+#: ../src/totem-uri.c:378
 msgid "Subtitle files"
 msgstr "Undertekstfiler"
 
-#: ../src/totem-uri.c:593
+#: ../src/totem-uri.c:430
 msgid "Select Text Subtitles"
 msgstr "Vælg undertekster"
 
-#: ../src/totem-uri.c:656
-msgid "Select Movies or Playlists"
-msgstr "Vælg film eller afspilningslister"
-
-#. Options parsing
-#: ../src/totem.c:201
-msgid "- Play movies and songs"
-msgstr "- Afspil film og sange"
-
-#: ../src/totem.c:212
-#, c-format
-msgid ""
-"%s\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"%s\n"
-"Kør \"%s --help\" for at se en fuldstændig liste af kommandolinjetilvalg.\n"
-
-#: ../src/totem.c:254 ../src/totem.c:265
-#: ../browser-plugin/totem-plugin-viewer.c:663
-#: ../browser-plugin/totem-plugin-viewer.c:1793
-msgid "Totem Movie Player"
-msgstr "Totem - filmafspiller"
-
-#: ../src/totem.c:255 ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Could not initialize the thread-safe libraries."
-msgstr "Kunne ikke klargøre de trådsikre biblioteker."
-
-#: ../src/totem.c:255
-msgid "Verify your system installation. Totem will now exit."
-msgstr "Kontrollér din systeminstallation. Totem vil nu afslutte."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:1589
-msgid "Password requested for RTSP server"
-msgstr "Adgangskode afventes for RTSP-server"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2858
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2862
-#, c-format
-msgid "Audio Track #%d"
-msgstr "Lydspor #%d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2890
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2894
-#, c-format
-msgid "Subtitle #%d"
-msgstr "Undertekst #%d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3298
-msgid ""
-"The requested audio output was not found. Please select another audio output "
-"in the Multimedia Systems Selector."
-msgstr ""
-"Den forespurgte lyd-uddata blev ikke fundet. Vælg venligst en anden lyd-"
-"uddata i multimediesystems-vælgeren."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3303
-msgid "Location not found."
-msgstr "Sted ikke fundet."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3307
-msgid ""
-"Could not open location; you might not have permission to open the file."
-msgstr ""
-"Kunne ikke åbne sted; du har muligvis ikke rettigheder til at åbne filen."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3318
-msgid ""
-"The video output is in use by another application. Please close other video "
-"applications, or select another video output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"Video-uddata er i brug af et andet program. Luk venligst andre video-"
-"programmer, eller vælg en anden video-uddata i multimediesystems-vælgeren."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3324
-msgid ""
-"The audio output is in use by another application. Please select another "
-"audio output in the Multimedia Systems Selector. You may want to consider "
-"using a sound server."
-msgstr ""
-"Lyd-uddata bruges af et andet program. Vælg venligst en anden lyd-uddata i "
-"multimediesystems-vælgeren. Du bør overveje at bruge en lydserver."
-
-#. should be exactly one missing thing (source or converter)
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3342
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3348
-#, c-format
-msgid "The playback of this movie requires a %s plugin which is not installed."
-msgid_plural ""
-"The playback of this movie requires the following decoders which are not "
-"installed:\n"
-"\n"
-"%s"
-msgstr[0] ""
-"Afspilning af denne film kræver et udvidelsesmodul til %s som ikke er "
-"installeret."
-msgstr[1] ""
-"Afspilning af denne film kræver følgende dekodere som ikke er installeret:\n"
-"\n"
-"%s"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3374
-msgid ""
-"Cannot play this file over the network. Try downloading it to disk first."
-msgstr ""
-"Kan ikke afspille denne fil over netværket. Prøv at hente den ned på disken "
-"først."
+#: ../src/totem-uri.c:495
+msgid "Select Movies or Playlists"
+msgstr "Vælg film eller afspilningslister"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5878
-msgid "Media contains no supported video streams."
-msgstr "Medie indeholder ingen understøttede video-strømme."
+#: ../src/totem-uri.c:499
+msgid "Add Directory"
+msgstr "Tilføj mappe"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6052
-msgid ""
-"Failed to create a GStreamer play object. Please check your GStreamer "
-"installation."
-msgstr ""
-"Det mislykkedes at oprette et GStreamer-spilleobjekt. Kontrollér venligst "
-"din installation af GStreamer."
+#: ../src/totem-video-list.c:330
+msgid "No video URI"
+msgstr "Ingen video-URI"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6172
+#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
+#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
+#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
+#: ../src/totem-video-thumbnailer.c:841
+#, c-format
 msgid ""
-"Failed to open audio output. You may not have permission to open the sound "
-"device, or the sound server may not be running. Please select another audio "
-"output in the Multimedia Systems Selector."
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 msgstr ""
-"Det mislykkedes at åbne lyd-uddata. Du har muligvis ikke rettigheder til at "
-"åbne lydenheden, eller lydserveren er ikke startet. Vælg venligst en anden "
-"lyd-uddata i multimediesystems-vælgeren."
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6192
-msgid ""
-"Could not find the audio output. You may need to install additional "
-"GStreamer plugins, or select another audio output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"Kunne ikke finde lyd-uddata. Du er muligvis nødt til at installere "
-"yderligere GStreamer-udvidelsesmoduler, eller vælge en anden lyd-uddata i "
-"multimediesystems-vælgeren."
+#: ../src/totem-video-thumbnailer.c:842
+msgid "Filename"
+msgstr "Filnavn"
 
-#. hour:minutes:seconds
-#. Translators: This is a time format, like "9:05:02" for 9
-#. * hours, 5 minutes, and 2 seconds. You may change ":" to
-#. * the separator that your locale uses or use "%Id" instead
-#. * of "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:83 ../src/plugins/skipto/totem-time-entry.c:57
-#, c-format
-msgctxt "long time format"
-msgid "%d:%02d:%02d"
-msgstr "%d:%02d:%02d"
+#: ../src/totem-video-thumbnailer.c:844
+msgid "Resolution"
+msgstr "Opløsning"
 
-#. minutes:seconds
-#. Translators: This is a time format, like "5:02" for 5
-#. * minutes and 2 seconds. You may change ":" to the
-#. * separator that your locale uses or use "%Id" instead of
-#. * "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:92
-#, c-format
-msgctxt "short time format"
-msgid "%d:%02d"
-msgstr "%d:%02d"
+#: ../src/totem-video-thumbnailer.c:847
+msgid "Duration"
+msgstr "Varighed"
+
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:1
+msgid "Apple Trailers"
+msgstr "Apple-trailere"
+
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:2
+msgid "Sets the user agent for the Apple Trailers site"
+msgstr "Sætter brugeragenten for Apple-trailerstedet"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:1
+msgid "Autoload Subtitles"
+msgstr "Hent automatisk undertekster"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:2
+msgid "Autoloads text subtitles"
+msgstr "Henter undertekster automatisk"
+
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
+msgid "Video Disc Recorder"
+msgstr "Video-diskoptager"
+
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
+msgid "Records (S)VCDs or video DVDs"
+msgstr "Optager (S)VCD'er eller video-dvd'er"
 
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:65
 msgid "_Create Video Disc..."
@@ -1988,93 +1838,85 @@
 msgid "Copy the currently playing (S)VCD"
 msgstr "Kopiér (S)VCD'en, der afspilles nu"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:129
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:136
 msgid "The video disc could not be duplicated."
 msgstr "Videodisken kunne ikke duplikeres."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:131
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:276
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:138
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:283
 msgid "The movie could not be recorded."
 msgstr "Filmen kunne ikke optages."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:157
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:167
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:263
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:164
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:174
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:270
 msgid "Unable to write a project."
 msgstr "Kan ikke skrive et projekt."
 
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
-msgid "Records (S)VCDs or video DVDs"
-msgstr "Optager (S)VCD'er eller video-dvd'er"
-
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
-msgid "Video Disc Recorder"
-msgstr "Video-diskoptager"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:1
-#: ../src/plugins/chapters/totem-chapters.c:1139
-msgid "Chapters"
-msgstr "Kapitler"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:2
-msgid "Support chapter markers in movies."
-msgstr "Understøttelse for kapitelmarkører i film."
-
 #: ../src/plugins/chapters/chapters-edit.ui.h:1
 msgid "Name for new chapter:"
 msgstr "Navn på nyt kapitel:"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:1
-msgid "Add Chapter..."
-msgstr "Tilføj kapitel..."
+msgid "_Remove Chapter"
+msgstr "_Fjern kapitel"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:2
-msgid "Add New Chapters"
-msgstr "Tilføj nye kapitler"
+msgid "Remove the chapter from the list"
+msgstr "Fjern kapitlet fra listen"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:3
-msgid "Create a new chapter list for the movie"
-msgstr "Opret en ny kapitelliste for filmen"
+msgid "_Go to Chapter"
+msgstr "_Gå til kapitel"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:4
-msgid "Go to Chapter"
-msgstr "Gå til kapitel"
-
-#: ../src/plugins/chapters/chapters-list.ui.h:5
 msgid "Go to the chapter in the movie"
 msgstr "Gå til kapitlet i filmen"
 
+#: ../src/plugins/chapters/chapters-list.ui.h:5
+msgid "Add Chapter..."
+msgstr "Tilføj kapitel..."
+
 #: ../src/plugins/chapters/chapters-list.ui.h:6
-msgid "Load Chapters..."
-msgstr "Indlæs kapitler..."
+msgid "Remove Chapter"
+msgstr "Fjern kapitel"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:7
-msgid "Load chapters from an external CMML file"
-msgstr "Indlæs kapitler fra ekstern CMML-fil"
+msgid "Go to Chapter"
+msgstr "Gå til kapitel"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:8
-msgid "No chapter data"
-msgstr "Ingen kapiteldata"
+msgid "Save Changes"
+msgstr "Gem ændringer"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:9
-msgid "Remove Chapter"
-msgstr "Fjern kapitel"
+msgid "No chapter data"
+msgstr "Ingen kapiteldata"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:10
-msgid "Remove the chapter from the list"
-msgstr "Fjern kapitlet fra listen"
+msgid "Load Chapters..."
+msgstr "Indlæs kapitler..."
 
 #: ../src/plugins/chapters/chapters-list.ui.h:11
-msgid "Save Changes"
-msgstr "Gem ændringer"
+msgid "Load chapters from an external CMML file"
+msgstr "Indlæs kapitler fra ekstern CMML-fil"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:12
-msgid "_Go to Chapter"
-msgstr "_Gå til kapitel"
+msgid "Add New Chapters"
+msgstr "Tilføj nye kapitler"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:13
-msgid "_Remove Chapter"
-msgstr "_Fjern kapitel"
+msgid "Create a new chapter list for the movie"
+msgstr "Opret en ny kapitelliste for filmen"
+
+#: ../src/plugins/chapters/chapters.plugin.in.h:1
+#: ../src/plugins/chapters/totem-chapters.c:1139
+msgid "Chapters"
+msgstr "Kapitler"
+
+#: ../src/plugins/chapters/chapters.plugin.in.h:2
+msgid "Support chapter markers in movies"
+msgstr "Understøttelse for kapitelmarkører i film"
 
 #: ../src/plugins/chapters/totem-chapters.c:56
 #, c-format
@@ -2166,32 +2008,56 @@
 #: ../src/plugins/dbusservice/dbusservice.py:243
 #, python-format
 msgid "The MediaPlayer2 object does not implement the ‘%s’ interface"
-msgstr "MediaPlayer2-objektet anvender ikke brugergrænsefladen \\\"%s\\\""
+msgstr "MediaPlayer2-objektet anvender ikke brugergrænsefladen \"%s\""
 
 #: ../src/plugins/dbusservice/dbusservice.py:222
 #, python-format
 msgid "The property ‘%s’ is not writeable."
-msgstr "Egenskaben \\\"%s\\\" er ikke skrivbar."
+msgstr "Egenskaben \"%s\" er ikke skrivbar."
 
 #: ../src/plugins/dbusservice/dbusservice.py:238
 #, python-format
 msgid "Unknown property ‘%s’ requested of a MediaPlayer 2 object"
-msgstr "Et MediaPlayer2-objekt kræver en ukendt egenskab \\\"%s\\\""
+msgstr "Et MediaPlayer2-objekt kræver en ukendt egenskab \"%s\""
 
 #: ../src/plugins/dbusservice/dbusservice.py:341
 #, python-format
 msgid "The URI ‘%s’ is not supported."
-msgstr "URI \\\"%s\\\" er ikke understøttet."
+msgstr "URI \"%s\" er ikke understøttet."
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
-msgid "Instant Messenger status"
-msgstr "Online-status for samtaleklienter"
+#: ../src/plugins/grilo/grilo.plugin.in.h:1
+msgid "Grilo Browser"
+msgstr "Grillo-læser"
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
-msgid "Set your Instant Messenger status to away when a movie is playing"
+#: ../src/plugins/grilo/grilo.plugin.in.h:2
+msgid "A plugin to let you browse media content from various sources"
 msgstr ""
-"Lad din online-status for samtaleklienter skifte til fraværende når en film "
-"spiller"
+"Et udvidelsesmodul, der lader dig gennemse medieindhold fra forskellige "
+"kilder"
+
+#: ../src/plugins/grilo/grilo.ui.h:1
+msgid "Add to Playlist"
+msgstr "Føj til afspilningsliste"
+
+#: ../src/plugins/grilo/grilo.ui.h:2
+msgid "Copy Location"
+msgstr "Kopiér placering"
+
+#: ../src/plugins/grilo/grilo.ui.h:3 ../src/plugins/grilo/totem-grilo.c:1184
+msgid "Browse"
+msgstr "Gennemse"
+
+#: ../src/plugins/grilo/grilo.ui.h:4 ../src/plugins/grilo/totem-grilo.c:1227
+msgid "Search"
+msgstr "Søg"
+
+#: ../src/plugins/grilo/totem-grilo.c:454
+msgid "Browse Error"
+msgstr "Fejl ved gennemsyn"
+
+#: ../src/plugins/grilo/totem-grilo.c:609
+msgid "Search Error"
+msgstr "Fejl ved søgning"
 
 #: ../src/plugins/gromit/gromit.plugin.in.h:1
 msgid "Gromit Annotations"
@@ -2205,58 +2071,15 @@
 msgid "The gromit binary was not found."
 msgstr "Den binære gromit-fil blev ikke fundet."
 
-#. Add the interface to Totem's sidebar
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:1
-#: ../src/plugins/iplayer/iplayer.py:46
-msgid "BBC iPlayer"
-msgstr "BBC iPlayer"
-
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:2
-msgid "Stream BBC programs from the last 7 days from the BBC iPlayer service."
-msgstr ""
-"Stream BBC-programmer fra de sidste syv dage fra BBC's iPlayer-tjeneste."
-
-#: ../src/plugins/iplayer/iplayer.py:72
-msgid "Error listing channel categories"
-msgstr "Fejl ved visning af kanalkategorier"
-
-#: ../src/plugins/iplayer/iplayer.py:73
-msgid ""
-"There was an unknown error getting the list of television channels available "
-"on BBC iPlayer."
-msgstr ""
-"Der opstod en ukendt fejl ved indhentning af listen af tilgængelige "
-"fjernsynskanaler på BBC iPlayer."
-
-#. Append a dummy child row so that the expander's visible; we can
-#. then queue off the expander to load the programme listing for this
-#. category
-#: ../src/plugins/iplayer/iplayer.py:84
-msgid "Loading…"
-msgstr "Indlæser…"
-
-#. Translators: the "programme feed" is the list of TV shows
-#. available to watch online
-#: ../src/plugins/iplayer/iplayer.py:136
-msgid "Error getting programme feed"
-msgstr "Fejl under indhentning af programkilde"
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
+msgid "Instant Messenger Status"
+msgstr "Status for samtaleklienter"
 
-#: ../src/plugins/iplayer/iplayer.py:137
-msgid ""
-"There was an error getting the list of programmes for this channel and "
-"category combination."
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
+msgid "Set your Instant Messenger status to away when a movie is playing"
 msgstr ""
-"Der opstod en fejl ved indhentning af listen af programmer for denne "
-"kombination af kanal og kategori."
-
-#: ../src/plugins/iplayer/iplayer2.py:298
-msgid ""
-msgstr ""
-
-#: ../src/plugins/iplayer/iplayer2.py:299
-#, python-format
-msgid "Programme unavailable (\"%s\")"
-msgstr "Programmet er utilgængeligt (\"%s\")"
+"Lad din online-status for samtaleklienter skifte til fraværende når en film "
+"spiller"
 
 #: ../src/plugins/lirc/lirc.plugin.in.h:1
 msgid "Infrared Remote Control"
@@ -2274,26 +2097,30 @@
 msgid "Couldn't read lirc configuration."
 msgstr "Kunne ikke læse lirc-konfiguration."
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
-msgid "Download Movie Subtitles"
-msgstr "Hent undertekster til film"
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:1
+msgid "Media Player Keys"
+msgstr "Medieafspiller-taster"
+
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:2
+msgid "Support additional media player keys"
+msgstr "Understøt yderligere medie-afspillertaster"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
-msgid "Subtitle _language:"
-msgstr "Undertekst_sprog:"
+#: ../src/plugins/ontop/ontop.plugin.in.h:1
+msgid "Always On Top"
+msgstr "Altid øverst"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
-msgid "_Play with Subtitle"
-msgstr "_Afspil med undertekster"
+#: ../src/plugins/ontop/ontop.plugin.in.h:2
+msgid "Keep the main window on top when playing a movie"
+msgstr "Bevar hovedvinduet øverst når en film bliver afspillet"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:1
-msgid "Look for subtitles for the currently playing movie."
-msgstr "Kig efter undertekster for filmen, der nu afspilles."
-
-#: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:2
 msgid "Subtitle Downloader"
 msgstr "Underteksthenter"
 
+#: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:2
+msgid "Look for subtitles for the currently playing movie"
+msgstr "Kig efter undertekster for filmen, der afspilles nu"
+
 #: ../src/plugins/opensubtitles/opensubtitles.py:42
 msgid "Brazilian Portuguese"
 msgstr "Brasiliansk portugisisk"
@@ -2348,6 +2175,18 @@
 msgid "Searching subtitles…"
 msgstr "Søger i undertekster…"
 
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
+msgid "Download Movie Subtitles"
+msgstr "Hent undertekster til film"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
+msgid "Subtitle _language:"
+msgstr "Undertekst_sprog:"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
+msgid "_Play with Subtitle"
+msgstr "_Afspil med undertekster"
+
 #: ../src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in.h:1
 msgid "Subtitle language"
 msgstr "Undertekstsprog"
@@ -2356,110 +2195,112 @@
 msgid "The language to search for subtitles for movies in."
 msgstr "Sproget der bruges til at søge efter filmundertekster i."
 
-#: ../src/plugins/ontop/ontop.plugin.in.h:1
-msgid "Always On Top"
-msgstr "Altid øverst"
+#: ../src/plugins/properties/movie-properties.plugin.in.h:1
+msgid "Movie Properties"
+msgstr "Filmegenskaber"
+
+#: ../src/plugins/properties/movie-properties.plugin.in.h:2
+msgid "Adds movie properties to the sidebar"
+msgstr "Tilføjer filmegenskaber til sidepanelet"
 
-#: ../src/plugins/ontop/ontop.plugin.in.h:2
-msgid "Keep the main window on top when playing a movie"
-msgstr "Bevar hovedvinduet øverst når en film bliver afspillet"
+#: ../src/plugins/properties/totem-movie-properties.c:246
+msgid "Properties"
+msgstr "Egenskaber"
+
+#: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:1
+msgid "rpdb2 password"
+msgstr "rpdb2-adgangskode"
+
+#: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:2
+msgid ""
+"A password to protect the rpdb2 server for debugging Totem from unauthorized "
+"remote access. If this is empty, a default of 'totem' will be used."
+msgstr ""
+"En adgangskode til at beskytte rpdb2-serveren til fejlsøgning af Totem fra "
+"uautoriseret fjerntilgang, Hvis denne er tom, bruges standardværdien \"totem"
+"\"."
+
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
+msgid "Python Console"
+msgstr "Python-konsol"
+
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
+msgid "Interactive Python console"
+msgstr "Interaktiv Python-konsol"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:88
+msgid "Python Console Menu"
+msgstr "Python-konsolmenu"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:93
+msgid "_Python Console"
+msgstr "_Python-konsol"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:94
+msgid "Show Totem's Python console"
+msgstr "Vis Totems Python-konsol"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:100
+msgid "Python Debugger"
+msgstr "Python-fejlsøger"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:101
+msgid "Enable remote Python debugging with rpdb2"
+msgstr "Aktivér fjern Python-fejlsøgning med rpdb2"
 
-#: ../src/plugins/properties/totem-movie-properties.c:246
-msgid "Properties"
-msgstr "Egenskaber"
+#. pylint: disable-msg=E1101
+#: ../src/plugins/pythonconsole/pythonconsole.py:125
+#, python-format
+msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
+msgstr "Du kan tilgå Totem.Objekt'et med \"totem_object\" : \\n%s"
 
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:2
-#, no-c-format
-msgid ""
-"A format string used to build the network service name used when publishing "
-"playlists over the network. The following format placeholders can be used: • "
-"%a: the program name as returned by g_get_application_name() • %h: the "
-"machine's host name in title case • %u: the user's login name in title case "
-"• %U: the user's real name • %%: the percent sign"
-msgstr ""
-"En formatstreng, der bruges til at bygge netværkstjenestenavnet, der bruges "
-"når der udgives afspilningslister over netværket. Følgende erstatningskoder "
-"kan bruges: • %a: programnavnet, som returneres af g_get_application_name() "
-"• %h: maskinens værtsnavn med store forbogstaver • %i: brugerens logindnavn "
-"med store forbogstaver • %U: brugerens virkelige navn • %%: procenttegn"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:3
-msgid "Format for network service name"
-msgstr "Format for netværkstjenestenavn"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:4
-msgid "Publisher protocol to use"
-msgstr "Udgiverprotokol, der skal bruges"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:5
-msgid ""
-"The transport protocol to use when publishing playlists over the network."
-msgstr ""
-"Transportprotokollen der skal bruges, når der udgives afspilningslister over "
-"netværket."
-
-#. Translators: computers on the local network which are publishing their playlists over the network
-#: ../src/plugins/publish/totem-publish.c:552
-msgid "Neighbors"
-msgstr "Naboer"
-
-#: ../src/plugins/publish/publish.plugin.in.h:1
-msgid "Publish Playlist"
-msgstr "Offentliggør afspilningsliste"
-
-#: ../src/plugins/publish/publish.plugin.in.h:2
-msgid "Share the current playlist via HTTP"
-msgstr "Del den aktuelle afspilningsliste via HTTP"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:1
-msgid "Service _Name:"
-msgstr "Tjeneste_navn:"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:3
-#, no-c-format
-msgid ""
-"The name used for announcing the playlist service on the network.\n"
-"All occurrences of the string %u will be replaced by your name,\n"
-"and %h will be replaced by your computer's host name."
-msgstr ""
-"Navnet der bruges til at annoncere spilleliste-tjenesten på netværket.\n"
-"Alle forekomster af strengen %u vil bliver erstattet med dit navn,\n"
-"og %h vil blive erstattet med din computers værtsnavn."
-
-#: ../src/plugins/publish/publish-plugin.ui.h:6
-msgid "Use _encrypted transport protocol (HTTPS)"
-msgstr "Brug _krypteret transportprotokol (HTTPS)"
+#: ../src/plugins/pythonconsole/pythonconsole.py:129
+msgid "Totem Python Console"
+msgstr "Python-konsol til Totem"
 
-#: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:1
+#: ../src/plugins/pythonconsole/pythonconsole.py:139
 msgid ""
-"A password to protect the rpdb2 server for debugging Totem from unauthorized "
-"remote access. If this is empty, a default of 'totem' will be used."
+"After you press OK, Totem will wait until you connect to it with winpdb or "
+"rpdb2. If you have not set a debugger password in DConf, it will use the "
+"default password ('totem')."
 msgstr ""
-"En adgangskode til at beskytte rpdb2-serveren til fejlsøgning af Totem fra "
-"uautoriseret fjerntilgang, Hvis denne er tom, bruges standardværdien \"totem"
-"\"."
+"Efter du har trykket O.k., ventes indtil du forbinder til Totem med winpdb "
+"eller rpdb2. Hvis du ikke har indstillet et fejlsøgerkodeord i DConf, vil "
+"standardkodeordet blive benyttet (\"totem\")."
 
-#: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:2
-msgid "rpdb2 password"
-msgstr "rpdb2-adgangskode"
+#: ../src/plugins/recent/recent.plugin.in.h:1
+msgid "Recent files"
+msgstr "Seneste filer"
+
+#: ../src/plugins/recent/recent.plugin.in.h:2
+msgid "Adds files that have been played to recent files"
+msgstr "Føjer filer som er blevet afspillet til de seneste filer"
 
 #: ../src/plugins/rotation/rotation.plugin.in.h:1
-msgid "Allows videos to be rotated if they're in the wrong orientation."
-msgstr "Tillader at videoer roteres, hvis de ikke vender rigtigt."
-
-#: ../src/plugins/rotation/rotation.plugin.in.h:2
 msgid "Rotation Plugin"
 msgstr "Udvidelsesmodul til rotering"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:60
+#: ../src/plugins/rotation/rotation.plugin.in.h:2
+msgid "Allows videos to be rotated if they are in the wrong orientation"
+msgstr "Tillader at videoer roteres, hvis de ikke vender rigtigt"
+
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:50
 msgid "_Rotate Clockwise"
 msgstr "_Rotér med uret"
 
 # Er det rigtigt noteret?
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:62
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:52
 msgid "Rotate Counterc_lockwise"
 msgstr "Rotér _mod uret"
 
+#: ../src/plugins/save-file/save-file.plugin.in.h:1
+msgid "Save Copy"
+msgstr "Gem en kopi"
+
+#: ../src/plugins/save-file/save-file.plugin.in.h:2
+msgid "Save a copy of the currently playing movie"
+msgstr "Gem en kopi af den film, der afspilles nu"
+
 #: ../src/plugins/save-file/totem-save-file.c:63
 msgid "Save a Copy..."
 msgstr "Gem en kopi..."
@@ -2482,41 +2323,48 @@
 msgid "Movie stream"
 msgstr "Filmstrøm"
 
-# Enten "afspilning af (en) film" eller "afspiller en film". Lad os håbe sidstnævnte er korrekt...
-#: ../src/plugins/screensaver/totem-screensaver.c:116
-#: ../browser-plugin/totem-plugin-viewer.c:1891
-msgid "Playing a movie"
-msgstr "Afspiller en film"
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:1
+msgid "Screen Saver"
+msgstr "Pauseskærm"
+
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:2
+msgid "Deactivates the screen saver when a movie is playing"
+msgstr "Deaktivér pauseskærm når der afspilles en film"
 
 #: ../src/plugins/screenshot/gallery.ui.h:1
+msgid "Screenshot width (in pixels):"
+msgstr "Bredde af skærmbillede (i billedpunkter):"
+
+#: ../src/plugins/screenshot/gallery.ui.h:2
 msgid "Calculate the number of screenshots"
 msgstr "Udregn antallet af skærmbilleder"
 
-#: ../src/plugins/screenshot/gallery.ui.h:2
+#: ../src/plugins/screenshot/gallery.ui.h:3
 msgid "Number of screenshots:"
 msgstr "Antal skærmbilleder:"
 
-#: ../src/plugins/screenshot/gallery.ui.h:3
-msgid "Screenshot width (in pixels):"
-msgstr "Bredde af skærmbillede (i billedpunkter):"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:1
-msgid "Save in _folder:"
-msgstr "Gem i _mappe:"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:2
-msgid "Select a folder"
-msgstr "Vælg en mappe"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:3
-msgid "_Name:"
-msgstr "_Navn:"
-
-#. Write the screenshot to the temporary file
-#: ../src/plugins/screenshot/gnome-screenshot-widget.c:385
-#: ../src/plugins/screenshot/totem-screenshot.c:64
-msgid "Screenshot.png"
-msgstr "Skærmbillede.png"
+#. translators: this is the name of the file that gets made up
+#. * with the screenshot if the entire screen is taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:147
+#, c-format
+msgid "Screenshot from %s.png"
+msgstr "Skærmbillede fra %s.png"
+
+#. translators: this is the name of the file that gets
+#. * made up with the screenshot if the entire screen is
+#. * taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:154
+#, c-format
+msgid "Screenshot from %s - %d.png"
+msgstr "Skærmbillede fra %s - %d.png"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:1
+msgid "Screenshot"
+msgstr "Skærmbillede"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:2
+msgid "Allows screenshots and galleries to be taken of videos"
+msgstr "Tillader at der tages skærmbilleder og gallerier af videoer"
 
 #: ../src/plugins/screenshot/totem-gallery.c:91
 msgid "Save Gallery"
@@ -2542,49 +2390,47 @@
 msgid "Saving gallery as \"%s\""
 msgstr "Gemmer galleri som \"%s\""
 
-#: ../src/plugins/screenshot/totem-screenshot.c:113
-msgid "There was an error saving the screenshot."
-msgstr "Der opstod en fejl ved gemning af fejlbilledet."
-
-#: ../src/plugins/screenshot/totem-screenshot.c:139
-msgid "Save Screenshot"
-msgstr "Gem skærmbillede"
-
-#. Create the screenshot widget
-#. Translators: %s is the movie title and %d is an auto-incrementing number to make filename unique
-#: ../src/plugins/screenshot/totem-screenshot.c:160
-#, c-format
-msgid "Screenshot-%s-%d.png"
-msgstr "Skærmbillede-%s-%d.png"
-
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:88
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:220
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "Totem could not get a screenshot of the video."
 msgstr "Totem kunne ikke skaffe et skærmbillede af videoen."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "This is not supposed to happen; please file a bug report."
 msgstr "Dette burde ikke ske. Rapportér venligst fejlen."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
-msgid "Take _Screenshot..."
-msgstr "Gem _skærmbillede..."
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
+msgid "Take _Screenshot"
+msgstr "Gem _skærmbillede"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
 msgid "Take a screenshot"
 msgstr "Gem et skærmbillede"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create Screenshot _Gallery..."
 msgstr "Opret _galleri af skærmbilleder..."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create a gallery of screenshots"
 msgstr "Opret et galleri af skærmbilleder"
 
+#: ../src/plugins/skipto/skipto.plugin.in.h:1
+#: ../src/plugins/skipto/totem-skipto.c:196
+msgid "Skip To"
+msgstr "Spring til"
+
+#: ../src/plugins/skipto/skipto.plugin.in.h:2
+msgid "Provides the \"Skip to\" dialog"
+msgstr "Giver \"Spring til\"-vinduet"
+
+#: ../src/plugins/skipto/skipto.ui.h:1
+msgid "_Skip to:"
+msgstr "_Spring til:"
+
 #. Update the "seconds" label so that it always has the correct singular/plural form
 #. Translators: label for the seconds selector in the "Skip to" dialogue
-#: ../src/plugins/skipto/totem-skipto.c:160
+#: ../src/plugins/skipto/totem-skipto.c:159
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "sekund"
@@ -2594,15 +2440,11 @@
 #. Translators: you should translate this string to a number (written in digits) which corresponds to the longer character length of the
 #. * translations for "second" and "seconds", as translated elsewhere in this file. For example, in English, "second" is 6 characters long and
 #. * "seconds" is 7 characters long, so this string should be translated to "7". See: bgo#639398
-#: ../src/plugins/skipto/totem-skipto.c:190
+#: ../src/plugins/skipto/totem-skipto.c:189
 msgctxt "Skip To label length"
 msgid "7"
 msgstr "8"
 
-#: ../src/plugins/skipto/totem-skipto.c:197
-msgid "Skip To"
-msgstr "Spring til"
-
 #: ../src/plugins/skipto/totem-skipto-plugin.c:182
 msgid "_Skip To..."
 msgstr "_Spring til..."
@@ -2611,116 +2453,319 @@
 msgid "Skip to a specific time"
 msgstr "Spring til angivet tidspunkt"
 
-#: ../src/plugins/skipto/skipto.ui.h:1
-msgid "_Skip to:"
-msgstr "_Spring til:"
+#~ msgid "Movie Player"
+#~ msgstr "Filmafspiller"
 
-#: ../browser-plugin/totem-plugin-viewer.c:431
-msgid "No URI to play"
-msgstr "Ingen URI at afspille"
+#~ msgid "Play movies and songs"
+#~ msgstr "Afspil film og sange"
 
-#. translators: this is:
-#. * Open With ApplicationName
-#. * as in nautilus' right-click menu
-#: ../browser-plugin/totem-plugin-viewer.c:1107
-#, c-format
-msgid "_Open with \"%s\""
-msgstr "_Åbn med \"%s\""
+#~ msgid "1.5 Mbps T1/Intranet/LAN"
+#~ msgstr "1.5 Mbps T1/Intranet/LAN"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2136
-msgid "No playlist or playlist empty"
-msgstr "Ingen eller tom afspilningsliste"
+#~ msgid "112 Kbps Dual ISDN/DSL"
+#~ msgstr "112 Kbps dobbelt ISDN/DSL"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2235
-msgid "Movie browser plugin"
-msgstr "Udvidelsesmodul til filmgennemsyn"
+#~ msgid "14.4 Kbps Modem"
+#~ msgstr "14.4 Kbps-modem"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Verify your system installation. The Totem plugin will now exit."
-msgstr ""
-"Kontrollér din systeminstallation. Totem-udvidelsesmodulet vil nu afslutte."
+#~ msgid "19.2 Kbps Modem"
+#~ msgstr "19.2 Kbps-modem"
 
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
-msgid "Interactive Python console."
-msgstr "Interaktiv Python-konsol."
+#~ msgid "256 Kbps DSL/Cable"
+#~ msgstr "256 Kbps-DSL/kabel"
 
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
-msgid "Python Console"
-msgstr "Python-konsol"
+#~ msgid "28.8 Kbps Modem"
+#~ msgstr "28.8 Kbps-modem"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:88
-msgid "Python Console Menu"
-msgstr "Python-konsolmenu"
+#~ msgid "33.6 Kbps Modem"
+#~ msgstr "33.6 Kbps-modem"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:93
-msgid "_Python Console"
-msgstr "_Python-konsol"
+#~ msgid "34.4 Kbps Modem"
+#~ msgstr "34.4 Kbps-modem"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:94
-msgid "Show Totem's Python console"
-msgstr "Vis Totems Python-konsol"
+#~ msgid "384 Kbps DSL/Cable"
+#~ msgstr "384 Kbps-DSL/kabel"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:100
-msgid "Python Debugger"
-msgstr "Python-fejlsøger"
+#~ msgid "512 Kbps DSL/Cable"
+#~ msgstr "512 Kbps-DSL/kabel"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:101
-msgid "Enable remote Python debugging with rpdb2"
-msgstr "Aktivér fjern Python-fejlsøgning med rpdb2"
+#~ msgid "56 Kbps Modem/ISDN"
+#~ msgstr "56 Kbps-modem/ISDN"
 
-#. pylint: disable-msg=E1101
-#: ../src/plugins/pythonconsole/pythonconsole.py:125
-#, python-format
-msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
-msgstr "Du kan tilgå Totem.Objekt'et med \"totem_object\" : \\n%s"
+#~ msgid "Configure the application"
+#~ msgstr "Konfigurér programmet"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:129
-msgid "Totem Python Console"
-msgstr "Python-konsol til Totem"
+#~ msgid "Connection _speed:"
+#~ msgstr "Forbindelses_hastighed:"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:139
-msgid ""
-"After you press OK, Totem will wait until you connect to it with winpdb or "
-"rpdb2. If you have not set a debugger password in DConf, it will use the "
-"default password ('totem')."
-msgstr ""
-"Efter du har trykket O.k., ventes indtil du forbinder til Totem med winpdb "
-"eller rpdb2. Hvis du ikke har indstillet et fejlsøgerkodeord i DConf, vil "
-"standardkodeordet blive benyttet (\"totem\")."
+#~ msgid "Intranet/LAN"
+#~ msgstr "Intranet/LAN"
 
-#: ../src/plugins/grilo/grilo.plugin.in.h:1
-msgid "A plugin to let you browse media content from various sources."
-msgstr ""
-"Et udvidelsesmodul, der lader dig gennemse medieindhold fra forskellige "
-"kilder."
+#~ msgid "Networking"
+#~ msgstr "Netværk"
 
-#: ../src/plugins/grilo/grilo.plugin.in.h:2
-msgid "Grilo Browser"
-msgstr "Grillo-læser"
+#~ msgid "Open _Location..."
+#~ msgstr "Åbn _placering..."
 
-#: ../src/plugins/grilo/totem-grilo.c:452
-msgid "Browse Error"
-msgstr "Fejl ved gennemsyn"
+#~ msgid "Open a file"
+#~ msgstr "Åbn en fil"
 
-#: ../src/plugins/grilo/totem-grilo.c:599
-msgid "Search Error"
-msgstr "Fejl ved søgning"
+#~ msgid "Open a non-local file"
+#~ msgstr "Åbn en ikke-lokal fil"
 
-#: ../src/plugins/grilo/totem-grilo.c:1219 ../src/plugins/grilo/grilo.ui.h:2
-msgid "Browse"
-msgstr "Gennemse"
+#~ msgid "Quit the program"
+#~ msgstr "Afslut programmet"
 
-#: ../src/plugins/grilo/totem-grilo.c:1285 ../src/plugins/grilo/grilo.ui.h:4
-msgid "Search"
-msgstr "Søg"
+#~ msgid "Set the repeat mode"
+#~ msgstr "Angiv gentagelsestilstanden"
 
-#: ../src/plugins/grilo/grilo.ui.h:1
-msgid "Add to Playlist"
-msgstr "Føj til afspilningsliste"
+#~ msgid "Set the shuffle mode"
+#~ msgstr "Angiv blandingstilstanden"
 
-#: ../src/plugins/grilo/grilo.ui.h:3
-msgid "Copy Location"
-msgstr "Kopiér placering"
+#~ msgid "Switch to fullscreen"
+#~ msgstr "Skift til fuldskærm"
+
+#~ msgid ""
+#~ "Approximate network connection speed, used to select quality on media "
+#~ "over the network."
+#~ msgstr ""
+#~ "Tilnærmet hastighed af netværksforbindelsen, der bruges til at vælge "
+#~ "mediekvalitet over netværket."
+
+#~ msgid "Network connection speed"
+#~ msgstr "Hastighed af netværksforbindelse"
+
+#~ msgid "Play Image '%s'"
+#~ msgstr "Afspil aftryk \"%s\""
+
+#~ msgid "device%d"
+#~ msgstr "enhed%d"
+
+#~ msgid "Play Disc '%s'"
+#~ msgstr "Afspil disk \"%s\""
+
+#~ msgid "Movie Player using %s"
+#~ msgstr "Filmafspiller med %s"
+
+#~ msgid ""
+#~ "Totem could not play this media (%s) although a plugin is present to "
+#~ "handle it."
+#~ msgstr ""
+#~ "Totem kunne ikke afspille dette medie (%s), selvom et modul er "
+#~ "tilgængeligt til at håndtere det."
+
+#~ msgid ""
+#~ "You might want to check that a disc is present in the drive and that it "
+#~ "is correctly configured."
+#~ msgstr ""
+#~ "Kontrollér at disken sidder i drevet og at det er korrekt konfigureret."
+
+#~ msgid "More information about media plugins"
+#~ msgstr "Mere information om mediemoduler"
+
+#~ msgid ""
+#~ "Please install the necessary plugins and restart Totem to be able to play "
+#~ "this media."
+#~ msgstr ""
+#~ "Installér de nødvendige moduler og genstart Totem hvis du vil afspille "
+#~ "denne type."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it does not have the "
+#~ "appropriate plugins to be able to read from the disc."
+#~ msgstr ""
+#~ "Totem kan ikke afspille denne medietype (%s), da du ikke har de "
+#~ "nødvendige udvidelsesmoduler til at læse dem fra disken."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because you do not have the "
+#~ "appropriate plugins to handle it."
+#~ msgstr ""
+#~ "Totem kan ikke afspille denne medietype (%s), da du ikke har de "
+#~ "nødvendige udvidelsesmoduler til at håndtere den."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it is not supported."
+#~ msgstr ""
+#~ "Totem kan ikke afspille denne medietype (%s), fordi den ikke understøttes."
+
+# ???
+#~ msgid "Please insert another disc to play back."
+#~ msgstr "Indsæt venligst en ny disk for at afspille."
+
+#~ msgid "Totem was not able to play this disc."
+#~ msgstr "Totem kunne ikke afspille disken."
+
+#~ msgid "Totem does not support playback of Audio CDs"
+#~ msgstr "Totem understøtter ikke afspilning af lyd-cd'er"
+
+#~ msgid ""
+#~ "Please consider using a music player or a CD extractor to play this CD"
+#~ msgstr ""
+#~ "Overvej venligst at bruge en musikafspiller eller en cd-udpakker til at "
+#~ "afspille denne cd"
+
+#~ msgid "%d %%"
+#~ msgstr "%d %%"
+
+#~ msgid ""
+#~ "The requested audio output was not found. Please select another audio "
+#~ "output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "Den forespurgte lyd-uddata blev ikke fundet. Vælg venligst en anden lyd-"
+#~ "uddata i multimediesystems-vælgeren."
+
+#~ msgid "Location not found."
+#~ msgstr "Sted ikke fundet."
+
+#~ msgid ""
+#~ "Could not open location; you might not have permission to open the file."
+#~ msgstr ""
+#~ "Kunne ikke åbne sted; du har muligvis ikke rettigheder til at åbne filen."
+
+#~ msgid ""
+#~ "The video output is in use by another application. Please close other "
+#~ "video applications, or select another video output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "Video-uddata er i brug af et andet program. Luk venligst andre video-"
+#~ "programmer, eller vælg en anden video-uddata i multimediesystems-vælgeren."
+
+#~ msgid ""
+#~ "The audio output is in use by another application. Please select another "
+#~ "audio output in the Multimedia Systems Selector. You may want to consider "
+#~ "using a sound server."
+#~ msgstr ""
+#~ "Lyd-uddata bruges af et andet program. Vælg venligst en anden lyd-uddata "
+#~ "i multimediesystems-vælgeren. Du bør overveje at bruge en lydserver."
+
+#~ msgid ""
+#~ "Failed to create a GStreamer play object. Please check your GStreamer "
+#~ "installation."
+#~ msgstr ""
+#~ "Det mislykkedes at oprette et GStreamer-spilleobjekt. Kontrollér venligst "
+#~ "din installation af GStreamer."
+
+#~ msgid ""
+#~ "Failed to open audio output. You may not have permission to open the "
+#~ "sound device, or the sound server may not be running. Please select "
+#~ "another audio output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "Det mislykkedes at åbne lyd-uddata. Du har muligvis ikke rettigheder til "
+#~ "at åbne lydenheden, eller lydserveren er ikke startet. Vælg venligst en "
+#~ "anden lyd-uddata i multimediesystems-vælgeren."
+
+#~ msgid ""
+#~ "Could not find the audio output. You may need to install additional "
+#~ "GStreamer plugins, or select another audio output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "Kunne ikke finde lyd-uddata. Du er muligvis nødt til at installere "
+#~ "yderligere GStreamer-udvidelsesmoduler, eller vælge en anden lyd-uddata i "
+#~ "multimediesystems-vælgeren."
+
+#~ msgid "BBC iPlayer"
+#~ msgstr "BBC iPlayer"
+
+#~ msgid ""
+#~ "Stream BBC programs from the last 7 days from the BBC iPlayer service."
+#~ msgstr ""
+#~ "Stream BBC-programmer fra de sidste syv dage fra BBC's iPlayer-tjeneste."
+
+#~ msgid "Error listing channel categories"
+#~ msgstr "Fejl ved visning af kanalkategorier"
+
+#~ msgid ""
+#~ "There was an unknown error getting the list of television channels "
+#~ "available on BBC iPlayer."
+#~ msgstr ""
+#~ "Der opstod en ukendt fejl ved indhentning af listen af tilgængelige "
+#~ "fjernsynskanaler på BBC iPlayer."
+
+#~ msgid "Loading…"
+#~ msgstr "Indlæser…"
+
+#~ msgid "Error getting programme feed"
+#~ msgstr "Fejl under indhentning af programkilde"
+
+#~ msgid ""
+#~ "There was an error getting the list of programmes for this channel and "
+#~ "category combination."
+#~ msgstr ""
+#~ "Der opstod en fejl ved indhentning af listen af programmer for denne "
+#~ "kombination af kanal og kategori."
+
+#~ msgid ""
+#~ msgstr ""
+
+#~ msgid "Programme unavailable (\"%s\")"
+#~ msgstr "Programmet er utilgængeligt (\"%s\")"
+
+#~ msgid ""
+#~ "A format string used to build the network service name used when "
+#~ "publishing playlists over the network. The following format placeholders "
+#~ "can be used: • %a: the program name as returned by g_get_application_name"
+#~ "() • %h: the machine's host name in title case • %u: the user's login "
+#~ "name in title case • %U: the user's real name • %%: the percent sign"
+#~ msgstr ""
+#~ "En formatstreng, der bruges til at bygge netværkstjenestenavnet, der "
+#~ "bruges når der udgives afspilningslister over netværket. Følgende "
+#~ "erstatningskoder kan bruges: • %a: programnavnet, som returneres af "
+#~ "g_get_application_name() • %h: maskinens værtsnavn med store forbogstaver "
+#~ "• %i: brugerens logindnavn med store forbogstaver • %U: brugerens "
+#~ "virkelige navn • %%: procenttegn"
+
+#~ msgid "Format for network service name"
+#~ msgstr "Format for netværkstjenestenavn"
+
+#~ msgid "Publisher protocol to use"
+#~ msgstr "Udgiverprotokol, der skal bruges"
+
+#~ msgid ""
+#~ "The transport protocol to use when publishing playlists over the network."
+#~ msgstr ""
+#~ "Transportprotokollen der skal bruges, når der udgives afspilningslister "
+#~ "over netværket."
+
+#~ msgid "Neighbors"
+#~ msgstr "Naboer"
+
+#~ msgid "Publish Playlist"
+#~ msgstr "Offentliggør afspilningsliste"
+
+#~ msgid "Share the current playlist via HTTP"
+#~ msgstr "Del den aktuelle afspilningsliste via HTTP"
+
+#~ msgid "Service _Name:"
+#~ msgstr "Tjeneste_navn:"
+
+#~ msgid ""
+#~ "The name used for announcing the playlist service on the network.\n"
+#~ "All occurrences of the string %u will be replaced by your name,\n"
+#~ "and %h will be replaced by your computer's host name."
+#~ msgstr ""
+#~ "Navnet der bruges til at annoncere spilleliste-tjenesten på netværket.\n"
+#~ "Alle forekomster af strengen %u vil bliver erstattet med dit "
+#~ "navn,\n"
+#~ "og %h vil blive erstattet med din computers værtsnavn."
+
+#~ msgid "Use _encrypted transport protocol (HTTPS)"
+#~ msgstr "Brug _krypteret transportprotokol (HTTPS)"
+
+#~ msgid "Save in _folder:"
+#~ msgstr "Gem i _mappe:"
+
+#~ msgid "Select a folder"
+#~ msgstr "Vælg en mappe"
+
+#~ msgid "_Name:"
+#~ msgstr "_Navn:"
+
+#~ msgid "There was an error saving the screenshot."
+#~ msgstr "Der opstod en fejl ved gemning af fejlbilledet."
+
+#~ msgid "Save Screenshot"
+#~ msgstr "Gem skærmbillede"
 
 #~ msgid "Bemused"
 #~ msgstr "Bemused"
@@ -2749,9 +2794,6 @@
 #~ msgid "Search Results"
 #~ msgstr "Søgeresultater"
 
-#~ msgid "Videos"
-#~ msgstr "Videoer"
-
 #~ msgid "_Open in Web Browser"
 #~ msgstr "_Åbn i webbrowser"
 
@@ -3267,34 +3309,18 @@
 #~ "Kontrollér at enheden ikke benyttes af et andet program."
 
 #~ msgid ""
-#~ "No video output is available. Make sure that the program is correctly "
-#~ "installed."
-#~ msgstr ""
-#~ "Ingen video-uddata tilgængelig. Kontrollér at Totem er korrekt "
-#~ "installeret."
-
-#~ msgid ""
 #~ "The TV adapter could not tune into the channel. Please check your "
 #~ "hardware setup and channel configuration."
 #~ msgstr ""
 #~ "TV-adapteren kunne ikke tune ind på kanalen. Kontrollér venligst din "
 #~ "hardwareopsætning samt kanalkonfiguration."
 
-#~ msgid "The server you are trying to connect to is not known."
-#~ msgstr "Den server du forsøger at tilkoble til, er ikke kendt."
-
 #~ msgid "The device name you specified (%s) seems to be invalid."
 #~ msgstr "Det enhedsnavn du angav (%s), ser ud til at være ugyldigt."
 
 #~ msgid "The server you are trying to connect to (%s) is unreachable."
 #~ msgstr "Den server du forsøger at tilkoble til (%s), kan ikke nås."
 
-#~ msgid "The connection to this server was refused."
-#~ msgstr "Forbindelses til denne server blev nægtet."
-
-#~ msgid "The specified movie could not be found."
-#~ msgstr "Den angivne film blev ikke fundet."
-
 #~ msgid ""
 #~ "The source seems encrypted and can't be read. Are you trying to play an "
 #~ "encrypted DVD without libdvdcss?"
@@ -3302,9 +3328,6 @@
 #~ "Kilden ser ud til at være krypteret og kan ikke læses. Måske prøver du at "
 #~ "afspille en krypteret dvd uden libdvdcss?"
 
-#~ msgid "The movie could not be read."
-#~ msgstr "Filmen kunne ikke læses."
-
 #~ msgid "A problem occurred while loading a library or a decoder (%s)."
 #~ msgstr ""
 #~ "Der opstod et problem under indlæsning af et bibliotek eller en afkoder "
@@ -3322,15 +3345,6 @@
 #~ msgid "Authentication is required to access this file."
 #~ msgstr "Denne fil kan ikke tilgås uden godkendelse."
 
-#~ msgid "Authentication is required to access this file or stream."
-#~ msgstr "Denne fil eller strøm kan ikke tilgås uden godkendelse."
-
-#~ msgid "You are not allowed to open this file."
-#~ msgstr "Du har ikke rettigheder til at åbne denne fil."
-
-#~ msgid "The server refused access to this file or stream."
-#~ msgstr "Serveren nægtede adgang til denne fil eller strøm."
-
 #~ msgid "The file you tried to play is an empty file."
 #~ msgstr "Filen du prøvede at spille, er tom."
 
@@ -3345,9 +3359,6 @@
 #~ msgid "This movie is broken and can not be played further."
 #~ msgstr "Denne film er ødelagt og kan ikke afspilles yderligere."
 
-#~ msgid "This location is not a valid one."
-#~ msgstr "Denne placering er ikke gyldig."
-
 #~ msgid "This movie could not be opened."
 #~ msgstr "Denne film kan ikke åbnes."
 
@@ -3358,13 +3369,6 @@
 #~ "Videokodningen \"%s\" er ikke håndteret. Du bliver muligvis nødt til at "
 #~ "installere yderligere udvidelsesmoduler for at afspille nogle typer film"
 
-#~ msgid ""
-#~ "Audio codec '%s' is not handled. You might need to install additional "
-#~ "plugins to be able to play some types of movies"
-#~ msgstr ""
-#~ "Lydkodningen \"%s\" er ikke håndteret. Du bliver muligvis nødt til at "
-#~ "installere yderligere udvidelsesmoduler for at afspille nogle typer film"
-
 #~ msgid "This is an audio-only file and there is no audio output available."
 #~ msgstr ""
 #~ "Dette er en fil med kun lyd, og der er ikke nogen lydudgang tilgængelig."
@@ -3475,24 +3479,6 @@
 #~ msgid "Totem could not eject the optical media."
 #~ msgstr "Totem kunne ikke skubbe det optiske medium ud."
 
-#~ msgid "Media Player Keys"
-#~ msgstr "Medieafspiller-taster"
-
-#~ msgid "Support additional media player keys"
-#~ msgstr "Understøt yderligere medie-afspillertaster"
-
-#~ msgid "Adds movie properties to the sidebar"
-#~ msgstr "Tilføjer filmegenskaber til sidepanelet"
-
-#~ msgid "Movie Properties"
-#~ msgstr "Filmegenskaber"
-
-#~ msgid "Screensaver"
-#~ msgstr "Pauseskærm"
-
-#~ msgid "Provides the \"Skip to\" dialog."
-#~ msgstr "Giver \"Spring til\"-vinduet."
-
 #~ msgid "Skipto"
 #~ msgstr "Spring til"
 
@@ -3522,9 +3508,6 @@
 #~ "5.1-kanaler\n"
 #~ "AC3-gennemgående"
 
-#~ msgid "Open Location"
-#~ msgstr "Åbn sted"
-
 #~ msgid "Volume"
 #~ msgstr "Lydstyrke"
 
diff -Nru totem-3.4.3/po/de.po totem-3.6.2/po/de.po
--- totem-3.4.3/po/de.po	2012-04-02 14:15:40.000000000 +0000
+++ totem-3.6.2/po/de.po	2012-10-09 15:42:00.000000000 +0000
@@ -5,7 +5,7 @@
 # Hendrik Richter , 2004-2008.
 # Hendrik Brandt , 2004-2005.
 # Denis Washington , 2008.
-# Mario Blättermann , 2008-2009, 2011-2012.
+# Mario Blättermann , 2008-2009, 2011-2012.
 # Andre Klapper , 2009.
 # Wolfgang Stoeggl , 2009, 2010.
 # Paul Seyfert , 2011.
@@ -17,28 +17,256 @@
 "Project-Id-Version: totem master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=totem&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-03-23 21:04+0000\n"
-"PO-Revision-Date: 2012-03-23 22:55+0100\n"
+"POT-Creation-Date: 2012-09-18 10:30+0000\n"
+"PO-Revision-Date: 2012-09-15 20:28+0100\n"
 "Last-Translator: Mario Blättermann \n"
 "Language-Team: Deutsch \n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Generator: Virtaal 0.7.0\n"
 "X-Poedit-Language: German\n"
 "X-Poedit-Country: GERMANY\n"
 "X-Project-Style: gnome\n"
 
+#: ../browser-plugin/totem-plugin-viewer.c:352 ../src/totem-object.c:1180
+#: ../src/totem-object.c:1650 ../src/totem-statusbar.c:115
+msgid "Stopped"
+msgstr "Angehalten"
+
+#: ../browser-plugin/totem-plugin-viewer.c:364 ../src/totem-object.c:1173
+msgid "Paused"
+msgstr "Pause"
+
+#: ../browser-plugin/totem-plugin-viewer.c:368 ../src/totem-object.c:1166
+msgid "Playing"
+msgstr "Wiedergabe"
+
+#: ../browser-plugin/totem-plugin-viewer.c:386
+#: ../src/plugins/screensaver/totem-screensaver.c:97
+msgid "Playing a movie"
+msgstr "Ein Video wird wiedergegeben"
+
+#: ../browser-plugin/totem-plugin-viewer.c:443
+msgid "No URI to play"
+msgstr "Keine Adresse zum Wiedergeben"
+
+#: ../browser-plugin/totem-plugin-viewer.c:676
+#: ../browser-plugin/totem-plugin-viewer.c:1700
+msgid "Totem Movie Player"
+msgstr "Totem Filmwiedergabe"
+
+#. translators: this is:
+#. * Open With ApplicationName
+#. * as in nautilus' right-click menu
+#: ../browser-plugin/totem-plugin-viewer.c:1120
+#, c-format
+msgid "_Open with \"%s\""
+msgstr "Öffnen _mit »%s«"
+
+#: ../browser-plugin/totem-plugin-viewer.c:1341 ../src/totem-object.c:2475
+msgid "An error occurred"
+msgstr "Es ist ein Fehler aufgetreten"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2033
+msgid "No playlist or playlist empty"
+msgstr "Keine oder leere Wiedergabeliste vorhanden"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2128
+msgid "Movie browser plugin"
+msgstr "Film-Browser-Plugin"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144 ../src/totem.c:240
+msgid "Could not initialize the thread-safe libraries."
+msgstr "Die Thread-sicheren Bibliotheken konnten nicht initialisiert werden."
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144
+msgid "Verify your system installation. The Totem plugin will now exit."
+msgstr ""
+"Bitte überprüfen Sie Ihre System-Installation. Das Totem-Plugin wird nun "
+"beendet."
+
 #: ../data/fullscreen.ui.h:1
 msgid "Leave Fullscreen"
 msgstr "Vollbild verlassen"
 
-#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:144
+#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:81
 msgid "Time:"
 msgstr "Dauer:"
 
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
+msgid "Allow the screensaver to activate when playing audio"
+msgstr ""
+"Bildschirmschoner darf auch starten, wenn lediglich Audio wiedergegeben wird"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
+msgid ""
+"Allow the screensaver to activate when playing audio. Disable if you have "
+"monitor-powered speakers."
+msgstr ""
+"Legt fest, ob der Bildschirmschoner auch starten darf, wenn lediglich Audio "
+"wiedergegeben wird. Dies ist nützlich für im Monitor eingebaute Lautsprecher."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
+msgid "Show visual effects when no video is displayed"
+msgstr "Visuelle Effekte anzeigen, wenn kein Video angezeigt wird"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
+msgid "Show visual effects when playing an audio only file."
+msgstr ""
+"Visuelle Effekte anzeigen, wenn eine Datei wiedergegeben wird, die lediglich "
+"eine Audio-Spur enthält."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
+msgid "Name of the visual effects plugin"
+msgstr "Name des visuellen Effekt-Plugins"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
+msgid "The brightness of the video"
+msgstr "Die Helligkeit des Videos"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
+msgid "The contrast of the video"
+msgstr "Der Kontrast des Videos"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
+msgid "The hue of the video"
+msgstr "Der Farbton des Videos"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
+msgid "The saturation of the video"
+msgstr "Der Sättigung des Videos"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
+msgid "Resize the canvas automatically on file load"
+msgstr "Fenstergröße beim Laden automatisch der geöffneten Datei anpassen"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
+msgid "Repeat mode"
+msgstr "Endlosschleife"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
+msgid "Shuffle mode"
+msgstr "Zufallsmodus"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
+msgid "Whether to disable deinterlacing for interlaced movies"
+msgstr ""
+"Soll das Deinterlacing für aus Halbbildern bestehende Videos deaktiviert "
+"werden?"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
+msgid "Whether to enable debug for the playback engine"
+msgstr "Soll die Wiedergabe-Engine im Fehlerdiagnosemodus ausgeführt werden?"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
+msgid "Type of audio output to use"
+msgstr "Zu verwendender Audio-Ausgabetyp"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
+msgid "Visualization quality setting"
+msgstr "Qualität der Visualisierung einstellen"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
+msgid "Quality setting for the audio visualization."
+msgstr "Qualitätseinstellungen für die Klangvisualisierung."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
+msgid "Network buffering threshold"
+msgstr "Grenzwert des Netzwerkzwischenspeichers"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
+msgid ""
+"Amount of data to buffer for network streams before starting to display the "
+"stream (in seconds)."
+msgstr ""
+"Größe des anzulegenden Zwischenspeichers für Netzwerk-Streams, bevor der "
+"Stream wiedergegeben wird (in Sekunden)"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
+msgid "Subtitle font"
+msgstr "Untertitelschrift"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
+msgid "Pango font description for subtitle rendering."
+msgstr "Pango-Schriftbeschreibung für die Untertiteldarstellung."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
+msgid "Subtitle encoding"
+msgstr "Untertitelkodierung"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
+msgid "Encoding character set for subtitle."
+msgstr "Zeichenkodierung für Untertitel."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
+msgid "Default location for the \"Open...\" dialogs"
+msgstr "Voreingestellter Ort des »Öffnen …«-Dialogs"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
+msgid ""
+"Default location for the \"Open...\" dialogs. Default is the current "
+"directory."
+msgstr ""
+"Voreingestellter Ort des »Öffnen …«-Dialogs, Vorgabe ist der momentane "
+"Ordner."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
+msgid "Default location for the \"Take Screenshot\" dialogs"
+msgstr "Voreingestellter Ort des »Bildschirmfoto aufnehmen …«-Dialogs"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
+msgid ""
+"Default location for the \"Take Screenshot\" dialogs. Default is the "
+"Pictures directory."
+msgstr ""
+"Voreingestellter Ort des »Bildschirmfoto aufnehmen …«-Dialogs. Vorgabe ist "
+"der Bilder-Ordner."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
+msgid "Whether to disable the plugins in the user's home directory"
+msgstr ""
+"Legt fest, ob die Plugins im persönlichen Ordner des Benutzers deaktiviert "
+"werden."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
+msgid "Whether to disable the keyboard shortcuts"
+msgstr "Legt fest, ob die Tastenkombinationen deaktiviert sein sollen"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
+msgid "Whether to autoload text subtitle files when a movie is loaded"
+msgstr ""
+"Legt fest, ob Untertitel beim Laden eines Filmes automatisch geladen werden "
+"sollen"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
+msgid "Whether to autoload external chapter files when a movie is loaded"
+msgstr ""
+"Legt fest, ob externe Kapiteldateien beim Laden eines Filmes automatisch "
+"geladen werden sollen"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
+msgid ""
+"Whether to remember the position of played audio/video files when pausing or "
+"closing them"
+msgstr ""
+"Legt fest, ob die Wiedergabeposition von Audio- und Videodateien beim "
+"Unterbrechen oder Schließen gespeichert werden soll"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
+msgid "Active plugins list"
+msgstr "Liste aktiver Plugins"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+msgid ""
+"A list of the names of the plugins which are currently active (loaded and "
+"running)."
+msgstr ""
+"Eine Liste der Namen von Plugins, die derzeit aktiv sind (geladen und in "
+"Ausführung)."
+
 #: ../data/playlist.ui.h:1
 msgid "_Remove"
 msgstr "_Entfernen"
@@ -55,11 +283,11 @@
 msgid "Copy the location to the clipboard"
 msgstr "Ort in die Zwischenablage kopieren"
 
-#: ../data/playlist.ui.h:5 ../data/totem.ui.h:78
+#: ../data/playlist.ui.h:5 ../data/totem.ui.h:71
 msgid "_Select Text Subtitles..."
 msgstr "_Untertitel auswählen …"
 
-#: ../data/playlist.ui.h:6 ../data/totem.ui.h:79
+#: ../data/playlist.ui.h:6 ../data/totem.ui.h:72
 msgid "Select a file to use for text subtitles"
 msgstr "Wählen Sie eine Datei für Untertitel aus"
 
@@ -83,42 +311,193 @@
 msgid "Move Down"
 msgstr "Hinunter schieben"
 
-#: ../data/properties.ui.h:1 ../data/totem.ui.h:122
-msgid "General"
-msgstr "Allgemein"
-
-#: ../data/properties.ui.h:2
-msgid "Title:"
-msgstr "Titel:"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:2
+msgid "Normal"
+msgstr "Normal"
 
-#: ../data/properties.ui.h:3
-msgid "Artist:"
-msgstr "Interpret:"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:4
+msgid "Large"
+msgstr "Groß"
 
-#: ../data/properties.ui.h:4
-msgid "Duration:"
-msgstr "Dauer:"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:6
+msgid "Extra Large"
+msgstr "Sehr groß"
 
-#: ../data/properties.ui.h:5
-msgid "Year:"
-msgstr "Jahr:"
+#: ../data/preferences.ui.h:7 ../src/backend/bacon-video-widget.c:5518
+#: ../src/totem-properties-view.c:232
+msgid "Stereo"
+msgstr "Stereo"
 
-#: ../data/properties.ui.h:6
-msgid "Album:"
-msgstr "Album:"
+#: ../data/preferences.ui.h:8
+msgid "4-channel"
+msgstr "4-Kanal"
 
-#: ../data/properties.ui.h:7
-msgid "Comment:"
-msgstr "Kommentar:"
+#: ../data/preferences.ui.h:9
+msgid "4.1-channel"
+msgstr "4.1-Kanal"
 
-#: ../data/properties.ui.h:8
-msgid "Container:"
-msgstr "Container:"
+#: ../data/preferences.ui.h:10
+msgid "5.0-channel"
+msgstr "5.0-Kanal"
 
-#: ../data/properties.ui.h:9 ../data/totem.ui.h:128
-#: ../src/totem-properties-view.c:270
-msgid "Video"
-msgstr "Video"
+#: ../data/preferences.ui.h:11
+msgid "5.1-channel"
+msgstr "5.1-Kanal"
+
+#: ../data/preferences.ui.h:12
+msgid "AC3 Passthrough"
+msgstr "AC3-Durchschleifen"
+
+#: ../data/preferences.ui.h:13
+msgid "Totem Preferences"
+msgstr "Einstellungen von Totem"
+
+#: ../data/preferences.ui.h:14
+msgid "Playback"
+msgstr "Wiedergabe"
+
+#: ../data/preferences.ui.h:15
+msgid "Start playing files from last position"
+msgstr "Wiedergabe von Dateien an der letzten Position beginnen"
+
+#: ../data/preferences.ui.h:16
+msgid "Text Subtitles"
+msgstr "Untertitel"
+
+#: ../data/preferences.ui.h:17
+msgid "_Load subtitle files when movie is loaded"
+msgstr "_Untertitel laden, sobald ein Video geladen wird"
+
+#: ../data/preferences.ui.h:18
+msgid "_Font:"
+msgstr "_Schrift:"
+
+#: ../data/preferences.ui.h:19
+msgid "_Encoding:"
+msgstr "_Kodierung:"
+
+#: ../data/preferences.ui.h:20
+msgid "External Chapters"
+msgstr "Externe Kapitel"
+
+#: ../data/preferences.ui.h:21
+msgid "Load _chapter files when movie is loaded"
+msgstr "_Kapiteldateien laden, sobald ein Video geladen wird"
+
+#: ../data/preferences.ui.h:22 ../data/properties.ui.h:1
+msgid "General"
+msgstr "Allgemein"
+
+#. Tab label in the Preferences dialogue
+#: ../data/preferences.ui.h:24
+msgid "Display"
+msgstr "Anzeige"
+
+#: ../data/preferences.ui.h:25
+msgid "_Resize the window when a new video is loaded"
+msgstr "_Fenstergröße automatisch ändern, sobald ein neues Video geladen wird"
+
+# Hab ich absichtlich kurz gehalten, es gibt noch eine Minihilfe dazu.
+#: ../data/preferences.ui.h:26
+msgid "Disable _deinterlacing of interlaced videos"
+msgstr "_Deinterlacing deaktivieren"
+
+#: ../data/preferences.ui.h:27
+msgid "Disable screensaver when playing "
+msgstr "Bildschirmschoner bei Wiedergabe deaktivieren"
+
+#: ../data/preferences.ui.h:28 ../data/properties.ui.h:9
+#: ../src/totem-properties-view.c:275
+msgid "Video"
+msgstr "Video"
+
+#: ../data/preferences.ui.h:29
+msgid "Video or Audio"
+msgstr "Video oder Audio"
+
+#: ../data/preferences.ui.h:30
+msgid "Visual Effects"
+msgstr "Visuelle Effekte"
+
+#: ../data/preferences.ui.h:31
+msgid "Show _visual effects when an audio file is played"
+msgstr "Bei der Wiedergabe von Audio-Dateien _visuelle Effekte anzeigen"
+
+#: ../data/preferences.ui.h:32
+msgid "_Type of visualization:"
+msgstr "Visualisierungs_typ:"
+
+#: ../data/preferences.ui.h:33
+msgid "Visualization _size:"
+msgstr "Visualisierungs_größe:"
+
+#: ../data/preferences.ui.h:34
+msgid "Color Balance"
+msgstr "Farbabgleich"
+
+#: ../data/preferences.ui.h:35
+msgid "_Brightness:"
+msgstr "_Helligkeit:"
+
+#: ../data/preferences.ui.h:36
+msgid "Co_ntrast:"
+msgstr "_Kontrast:"
+
+#: ../data/preferences.ui.h:37
+msgid "Sat_uration:"
+msgstr "_Sättigung:"
+
+#: ../data/preferences.ui.h:38
+msgid "_Hue:"
+msgstr "F_arbton:"
+
+#: ../data/preferences.ui.h:39
+msgid "Reset to _Defaults"
+msgstr "Auf V_orgaben zurücksetzen"
+
+#: ../data/preferences.ui.h:40
+msgid "Audio Output"
+msgstr "Audio-Ausgabe"
+
+#: ../data/preferences.ui.h:41
+msgid "_Audio output type:"
+msgstr "Audio-_Ausgabetyp:"
+
+#: ../data/preferences.ui.h:42 ../data/properties.ui.h:14
+#: ../src/totem-properties-view.c:273
+msgid "Audio"
+msgstr "Audio"
+
+#: ../data/properties.ui.h:2
+msgid "Title:"
+msgstr "Titel:"
+
+#: ../data/properties.ui.h:3
+msgid "Artist:"
+msgstr "Interpret:"
+
+#: ../data/properties.ui.h:4
+msgid "Duration:"
+msgstr "Dauer:"
+
+#: ../data/properties.ui.h:5
+msgid "Year:"
+msgstr "Jahr:"
+
+#: ../data/properties.ui.h:6
+msgid "Album:"
+msgstr "Album:"
+
+#: ../data/properties.ui.h:7
+msgid "Comment:"
+msgstr "Kommentar:"
+
+#: ../data/properties.ui.h:8
+msgid "Container:"
+msgstr "Container:"
 
 #: ../data/properties.ui.h:10
 msgid "Dimensions:"
@@ -136,11 +515,6 @@
 msgid "Bitrate:"
 msgstr "Bitrate:"
 
-#: ../data/properties.ui.h:14 ../data/totem.ui.h:142
-#: ../src/totem-properties-view.c:268
-msgid "Audio"
-msgstr "Audio"
-
 #: ../data/properties.ui.h:15
 msgid "Sample rate:"
 msgstr "Abtastrate:"
@@ -149,753 +523,449 @@
 msgid "Channels:"
 msgstr "Kanäle:"
 
-#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
-msgid "_Add to Playlist"
-msgstr "Zur Wiedergabeliste _hinzufügen"
-
-#: ../data/video-list.ui.h:2
-msgid "Add the video to the playlist"
-msgstr "Das Video zur Wiedergabeliste hinzufügen"
-
 #. Title
-#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:143
-#: ../src/totem-object.c:1667
-msgid "Movie Player"
-msgstr "Filmwiedergabe"
+#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:80 ../src/totem.c:239
+#: ../src/totem.c:248 ../src/totem-menu.c:789 ../src/totem-object.c:1658
+msgid "Videos"
+msgstr "Videos"
 
 #: ../data/totem.desktop.in.in.in.h:2
-msgid "Play movies and songs"
-msgstr "Filme und Musik wiedergeben"
+msgid "Play movies"
+msgstr "Filme abspielen"
+
+# Vielleicht gehört hier noch mehr rein. Ideen?
+#: ../data/totem.desktop.in.in.in.h:3
+msgid "Video;Movie;Film;Clip;Series;Player;DVD;TV;Disc;"
+msgstr "Video;Film;Clip;Serie;Player;DVD;TV;CD;"
 
 #: ../data/totem.ui.h:1
-msgid "_Movie"
-msgstr "_Film"
+msgid "_Open"
+msgstr "Ö_ffnen"
 
 #: ../data/totem.ui.h:2
-msgid "_Open..."
-msgstr "Ö_ffnen …"
+msgid "Open _Location"
+msgstr "_Ort öffnen"
 
 #: ../data/totem.ui.h:3
-msgid "Open a file"
-msgstr "Eine Datei öffnen"
+msgid "_Fullscreen"
+msgstr "_Vollbild"
 
 #: ../data/totem.ui.h:4
-msgid "Open _Location..."
-msgstr "_Ort öffnen …"
+msgid "Prefere_nces"
+msgstr "_Einstellungen"
 
 #: ../data/totem.ui.h:5
-msgid "Open a non-local file"
-msgstr "Eine entfernte Datei öffnen"
+msgid "Shuff_le"
+msgstr "Z_ufallsmodus"
 
 #: ../data/totem.ui.h:6
+msgid "_Repeat"
+msgstr "_Endlosschleife"
+
+#: ../data/totem.ui.h:7
+msgid "_Quit"
+msgstr "_Beenden"
+
+#: ../data/totem.ui.h:8
+msgid "_Movie"
+msgstr "_Film"
+
+#: ../data/totem.ui.h:9
 msgid "_Eject"
 msgstr "_Auswerfen"
 
-#: ../data/totem.ui.h:7
+#: ../data/totem.ui.h:10
 msgid "Eject the current disc"
 msgstr "Aktuelles Medium auswerfen"
 
-#: ../data/totem.ui.h:8
+#: ../data/totem.ui.h:11
 msgid "_Properties"
 msgstr "_Eigenschaften"
 
-#: ../data/totem.ui.h:9
+#: ../data/totem.ui.h:12
 msgid "View the properties of the current stream"
 msgstr "Eigenschaften des aktuellen Datenstroms betrachten"
 
-#: ../data/totem.ui.h:10
+#: ../data/totem.ui.h:13
 msgid "Play / P_ause"
 msgstr "Wiedergabe / _Pause"
 
-#: ../data/totem.ui.h:11
+#: ../data/totem.ui.h:14
 msgid "Play or pause the movie"
 msgstr "Den Film wiedergeben oder die Wiedergabe unterbrechen"
 
-#: ../data/totem.ui.h:12
-msgid "_Quit"
-msgstr "_Beenden"
-
-#: ../data/totem.ui.h:13
-msgid "Quit the program"
-msgstr "Das Programm beenden"
-
-#: ../data/totem.ui.h:14
+#: ../data/totem.ui.h:15
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
-#: ../data/totem.ui.h:15
+#: ../data/totem.ui.h:16
 msgid "_Clear Playlist"
 msgstr "Wiedergabeliste _leeren"
 
-#: ../data/totem.ui.h:16
+#: ../data/totem.ui.h:17
 msgid "Clear the playlist"
 msgstr "Wiedergabeliste leeren"
 
-#: ../data/totem.ui.h:17
-msgid "Prefere_nces"
-msgstr "_Einstellungen"
-
 #: ../data/totem.ui.h:18
-msgid "Configure the application"
-msgstr "Die Anwendung konfigurieren"
-
-#: ../data/totem.ui.h:19
 msgid "Plugins..."
 msgstr "Plugins …"
 
-#: ../data/totem.ui.h:20
+#: ../data/totem.ui.h:19
 msgid "Configure plugins to extend the application"
 msgstr "Plugins zur Erweiterung der Anwendung konfigurieren"
 
-#: ../data/totem.ui.h:21
+#: ../data/totem.ui.h:20
 msgid "_View"
 msgstr "_Ansicht"
 
-#: ../data/totem.ui.h:22
-msgid "_Fullscreen"
-msgstr "_Vollbild"
-
-#: ../data/totem.ui.h:23
-msgid "Switch to fullscreen"
-msgstr "In den Vollbild-Modus wechseln"
-
-#: ../data/totem.ui.h:24
+#: ../data/totem.ui.h:21
 msgid "Fit Window to Movie"
 msgstr "Fenstergröße an Film anpassen"
 
-#: ../data/totem.ui.h:25
+#: ../data/totem.ui.h:22
 msgid "_Resize 1:2"
 msgstr "_Maßstab 1:2"
 
-#: ../data/totem.ui.h:26
+#: ../data/totem.ui.h:23
 msgid "Resize to half the original video size"
 msgstr "Auf halbe Video-Größe verkleinern"
 
-#: ../data/totem.ui.h:27
+#: ../data/totem.ui.h:24
 msgid "Resize _1:1"
 msgstr "Maßstab _1:1"
 
-#: ../data/totem.ui.h:28
+#: ../data/totem.ui.h:25
 msgid "Resize to the original video size"
 msgstr "An Video-Größe anpassen"
 
-#: ../data/totem.ui.h:29
+#: ../data/totem.ui.h:26
 msgid "Resize _2:1"
 msgstr "Maßstab _2:1"
 
-#: ../data/totem.ui.h:30
+#: ../data/totem.ui.h:27
 msgid "Resize to double the original video size"
 msgstr "Auf doppelte Video-Größe vergrößern"
 
-#: ../data/totem.ui.h:31
+#: ../data/totem.ui.h:28
 msgid "_Aspect Ratio"
 msgstr "_Ansichtsverhältnis"
 
-#: ../data/totem.ui.h:32
+#: ../data/totem.ui.h:29
 msgid "Switch An_gles"
 msgstr "Blick_winkel wechseln"
 
-#: ../data/totem.ui.h:33
+#: ../data/totem.ui.h:30
 msgid "Switch camera angles"
 msgstr "Blickwinkel wechseln"
 
-#: ../data/totem.ui.h:34
+#: ../data/totem.ui.h:31
 msgid "_Go"
 msgstr "_Gehe zu"
 
-#: ../data/totem.ui.h:35
+#: ../data/totem.ui.h:32
 msgid "_DVD Menu"
 msgstr "_DVD-Menü"
 
-#: ../data/totem.ui.h:36
+#: ../data/totem.ui.h:33
 msgid "Go to the DVD menu"
 msgstr "Zum DVD-Menü gehen"
 
-#: ../data/totem.ui.h:37
+#: ../data/totem.ui.h:34
 msgid "_Title Menu"
 msgstr "_Titelmenü"
 
-#: ../data/totem.ui.h:38
+#: ../data/totem.ui.h:35
 msgid "Go to the title menu"
 msgstr "Zum Titel-Menü gehen"
 
-#: ../data/totem.ui.h:39
+#: ../data/totem.ui.h:36
 msgid "A_udio Menu"
 msgstr "_Audio-Menü"
 
-#: ../data/totem.ui.h:40
+#: ../data/totem.ui.h:37
 msgid "Go to the audio menu"
 msgstr "Zum Audio-Menü gehen"
 
-#: ../data/totem.ui.h:41
+#: ../data/totem.ui.h:38
 msgid "_Angle Menu"
 msgstr "_Kameramenü"
 
-#: ../data/totem.ui.h:42
+#: ../data/totem.ui.h:39
 msgid "Go to the angle menu"
 msgstr "Zum Kamera-Menü gehen"
 
-#: ../data/totem.ui.h:43
+#: ../data/totem.ui.h:40
 msgid "_Chapter Menu"
 msgstr "Ka_pitelmenü"
 
-#: ../data/totem.ui.h:44
+#: ../data/totem.ui.h:41
 msgid "Go to the chapter menu"
 msgstr "Zum Kapitel-Menü gehen"
 
-#: ../data/totem.ui.h:45
+#: ../data/totem.ui.h:42
 msgid "_Next Chapter/Movie"
 msgstr "_Nächstes Kapitel/Film"
 
-#: ../data/totem.ui.h:46
+#: ../data/totem.ui.h:43
 msgid "Next chapter or movie"
 msgstr "Nächstes Kapitel oder nächster Film"
 
-#: ../data/totem.ui.h:47
+#: ../data/totem.ui.h:44
 msgid "_Previous Chapter/Movie"
 msgstr "_Vorheriges Kapitel/Film"
 
-#: ../data/totem.ui.h:48
+#: ../data/totem.ui.h:45
 msgid "Previous chapter or movie"
 msgstr "Vorheriges Kapitel oder vorheriger Film"
 
-#: ../data/totem.ui.h:49
+#: ../data/totem.ui.h:46
 msgid "_Sound"
 msgstr "A_udio"
 
-#: ../data/totem.ui.h:50
+#: ../data/totem.ui.h:47
 msgid "Volume _Up"
 msgstr "L_auter"
 
-#: ../data/totem.ui.h:51
+#: ../data/totem.ui.h:48
 msgid "Increase volume"
 msgstr "Lautstärke erhöhen"
 
-#: ../data/totem.ui.h:52
+#: ../data/totem.ui.h:49
 msgid "Volume _Down"
 msgstr "L_eiser"
 
-#: ../data/totem.ui.h:53
+#: ../data/totem.ui.h:50
 msgid "Decrease volume"
 msgstr "Lautstärke senken"
 
-#: ../data/totem.ui.h:54
+#: ../data/totem.ui.h:51
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: ../data/totem.ui.h:55
+#: ../data/totem.ui.h:52
 msgid "_Contents"
 msgstr "I_nhalt"
 
-#: ../data/totem.ui.h:56
+#: ../data/totem.ui.h:53
 msgid "Help contents"
 msgstr "Inhalt der Hilfe"
 
-#: ../data/totem.ui.h:57
+#: ../data/totem.ui.h:54
 msgid "_About"
 msgstr "_Info"
 
-#: ../data/totem.ui.h:58
+#: ../data/totem.ui.h:55
 msgid "About this application"
 msgstr "Info zu dieser Anwendung"
 
-#: ../data/totem.ui.h:59
-msgid "_Repeat Mode"
-msgstr "_Endlosschleife"
-
-#: ../data/totem.ui.h:60
-msgid "Set the repeat mode"
-msgstr "Den Wiederholmodus festlegen"
-
-#: ../data/totem.ui.h:61
-msgid "Shuff_le Mode"
-msgstr "Z_ufallsmodus"
-
-#: ../data/totem.ui.h:62
-msgid "Set the shuffle mode"
-msgstr "Den Zufallsmodus festlegen"
-
-#: ../data/totem.ui.h:63
+#: ../data/totem.ui.h:56
 msgid "Show _Controls"
 msgstr "_Bedienelemente anzeigen"
 
-#: ../data/totem.ui.h:64
+#: ../data/totem.ui.h:57
 msgid "Show controls"
 msgstr "Bedienelemente anzeigen"
 
-#: ../data/totem.ui.h:65
+#: ../data/totem.ui.h:58
 msgid "S_idebar"
 msgstr "_Seitenleiste"
 
-#: ../data/totem.ui.h:66
+#: ../data/totem.ui.h:59
 msgid "Show or hide the sidebar"
 msgstr "Die Seitenleiste anzeigen oder verbergen"
 
-#: ../data/totem.ui.h:67
+#: ../data/totem.ui.h:60
 msgctxt "Aspect ratio"
 msgid "Auto"
 msgstr "Auto"
 
-#: ../data/totem.ui.h:68
+#: ../data/totem.ui.h:61
 msgid "Sets automatic aspect ratio"
 msgstr "Das Ansichtsverhältnis automatisch festlegen"
 
-#: ../data/totem.ui.h:69
+#: ../data/totem.ui.h:62
 msgid "Square"
 msgstr "Quadratisch"
 
-#: ../data/totem.ui.h:70
+#: ../data/totem.ui.h:63
 msgid "Sets square aspect ratio"
 msgstr "Das Ansichtsverhältnis auf 1:1 setzen"
 
-#: ../data/totem.ui.h:71
+#: ../data/totem.ui.h:64
 msgid "4:3 (TV)"
 msgstr "4:3 (TV)"
 
-#: ../data/totem.ui.h:72
+#: ../data/totem.ui.h:65
 msgid "Sets 4:3 (TV) aspect ratio"
 msgstr "Das Ansichtsverhältnis auf 4:3 (TV) setzen"
 
-#: ../data/totem.ui.h:73
+#: ../data/totem.ui.h:66
 msgid "16:9 (Widescreen)"
 msgstr "16:9 (Breitbild)"
 
-#: ../data/totem.ui.h:74
+#: ../data/totem.ui.h:67
 msgid "Sets 16:9 (widescreen) aspect ratio"
 msgstr "Das Bildverhältnis auf 16:9 (Breitbild) setzen"
 
-#: ../data/totem.ui.h:75
+#: ../data/totem.ui.h:68
 msgid "2.11:1 (DVB)"
 msgstr "2.11:1 (DVB)"
 
-#: ../data/totem.ui.h:76
+#: ../data/totem.ui.h:69
 msgid "Sets 2.11:1 (DVB) aspect ratio"
 msgstr "Das Ansichtsverhältnis auf 2.11:1 (DVB) setzen"
 
-#: ../data/totem.ui.h:77
+#: ../data/totem.ui.h:70
 msgid "S_ubtitles"
 msgstr "_Untertitel"
 
-#: ../data/totem.ui.h:80
+#: ../data/totem.ui.h:73
 msgid "_Languages"
 msgstr "_Sprachen"
 
-#: ../data/totem.ui.h:81
+#: ../data/totem.ui.h:74
 msgid "Zoom In"
 msgstr "Vergrößern"
 
-#: ../data/totem.ui.h:82
+#: ../data/totem.ui.h:75
 msgid "Zoom in"
 msgstr "Vergrößern"
 
-#: ../data/totem.ui.h:83
+#: ../data/totem.ui.h:76
 msgid "Skip _Forward"
 msgstr "V_orspulen"
 
-#: ../data/totem.ui.h:84
+#: ../data/totem.ui.h:77
 msgid "Skip forward"
 msgstr "Vorspulen"
 
-#: ../data/totem.ui.h:85
+#: ../data/totem.ui.h:78
 msgid "Skip _Backwards"
 msgstr "_Zurückspulen"
 
-#: ../data/totem.ui.h:86
+#: ../data/totem.ui.h:79
 msgid "Skip backwards"
 msgstr "Zurückspulen"
 
-#: ../data/totem.ui.h:87
-msgid "14.4 Kbps Modem"
-msgstr "14.4 Kb/s Modem"
-
-#: ../data/totem.ui.h:88
-msgid "19.2 Kbps Modem"
-msgstr "19.2 Kb/s Modem"
-
-#: ../data/totem.ui.h:89
-msgid "28.8 Kbps Modem"
-msgstr "28.8 Kb/s Modem"
-
-#: ../data/totem.ui.h:90
-msgid "33.6 Kbps Modem"
-msgstr "33.6 Kb/s Modem"
-
-#: ../data/totem.ui.h:91
-msgid "34.4 Kbps Modem"
-msgstr "34.4 Kb/s Modem"
-
-#: ../data/totem.ui.h:92
-msgid "56 Kbps Modem/ISDN"
-msgstr "56 Kb/s Modem/ISDN"
-
-#: ../data/totem.ui.h:93
-msgid "112 Kbps Dual ISDN/DSL"
-msgstr "112 Kb/s Dual-ISDN/DSL"
-
-#: ../data/totem.ui.h:94
-msgid "256 Kbps DSL/Cable"
-msgstr "256 Kb/s DSL/Kabel"
-
-#: ../data/totem.ui.h:95
-msgid "384 Kbps DSL/Cable"
-msgstr "384 Kb/s DSL/Kabel"
-
-#: ../data/totem.ui.h:96
-msgid "512 Kbps DSL/Cable"
-msgstr "512 Kb/s DSL/Kabel"
-
-#: ../data/totem.ui.h:97
-msgid "1.5 Mbps T1/Intranet/LAN"
-msgstr "1.5 Mb/s T1/Intranet/LAN"
-
-#: ../data/totem.ui.h:98
-msgid "Intranet/LAN"
-msgstr "Intranet/LAN"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:100
-msgid "Normal"
-msgstr "Normal"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:102
-msgid "Large"
-msgstr "Groß"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:104
-msgid "Extra Large"
-msgstr "Sehr groß"
-
-#: ../data/totem.ui.h:105 ../src/totem-properties-view.c:228
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5593
-msgid "Stereo"
-msgstr "Stereo"
-
-#: ../data/totem.ui.h:106
-msgid "4-channel"
-msgstr "4-Kanal"
-
-#: ../data/totem.ui.h:107
-msgid "4.1-channel"
-msgstr "4.1-Kanal"
-
-#: ../data/totem.ui.h:108
-msgid "5.0-channel"
-msgstr "5.0-Kanal"
-
-#: ../data/totem.ui.h:109
-msgid "5.1-channel"
-msgstr "5.1-Kanal"
-
-#: ../data/totem.ui.h:110
-msgid "AC3 Passthrough"
-msgstr "AC3-Durchschleifen"
-
-#: ../data/totem.ui.h:111
-msgid "Totem Preferences"
-msgstr "Einstellungen von Totem"
-
-#: ../data/totem.ui.h:112
-msgid "Playback"
-msgstr "Wiedergabe"
-
-#: ../data/totem.ui.h:113
-msgid "Start playing files from last position"
-msgstr "Wiedergabe von Dateien an der letzten Position beginnen"
-
-#: ../data/totem.ui.h:114
-msgid "Networking"
-msgstr "Netzwerk"
-
-#: ../data/totem.ui.h:115
-msgid "Connection _speed:"
-msgstr "_Verbindungsgeschwindigkeit:"
-
-#: ../data/totem.ui.h:116
-msgid "Text Subtitles"
-msgstr "Untertitel"
-
-#: ../data/totem.ui.h:117
-msgid "_Load subtitle files when movie is loaded"
-msgstr "_Untertitel laden, sobald ein Video geladen wird"
-
-#: ../data/totem.ui.h:118
-msgid "_Font:"
-msgstr "_Schrift:"
-
-#: ../data/totem.ui.h:119
-msgid "_Encoding:"
-msgstr "_Kodierung:"
-
-#: ../data/totem.ui.h:120
-msgid "External Chapters"
-msgstr "Externe Kapitel"
-
-#: ../data/totem.ui.h:121
-msgid "Load _chapter files when movie is loaded"
-msgstr "_Kapiteldateien laden, sobald ein Video geladen wird"
-
-#. Tab label in the Preferences dialogue
-#: ../data/totem.ui.h:124
-msgid "Display"
-msgstr "Anzeige"
-
-#: ../data/totem.ui.h:125
-msgid "_Resize the window when a new video is loaded"
-msgstr "_Fenstergröße automatisch ändern, sobald ein neues Video geladen wird"
-
-# Hab ich absichtlich kurz gehalten, es gibt noch eine Minihilfe dazu.
-#: ../data/totem.ui.h:126
-msgid "Disable _deinterlacing of interlaced videos"
-msgstr "_Deinterlacing deaktivieren"
-
-#: ../data/totem.ui.h:127
-msgid "Disable screensaver when playing "
-msgstr "Bildschirmschoner bei Wiedergabe deaktivieren"
-
-#: ../data/totem.ui.h:129
-msgid "Video or Audio"
-msgstr "Video oder Audio"
-
-#: ../data/totem.ui.h:130
-msgid "Visual Effects"
-msgstr "Visuelle Effekte"
-
-#: ../data/totem.ui.h:131
-msgid "Show _visual effects when an audio file is played"
-msgstr "Bei der Wiedergabe von Audio-Dateien _visuelle Effekte anzeigen"
-
-#: ../data/totem.ui.h:132
-msgid "_Type of visualization:"
-msgstr "Visualisierungs_typ:"
-
-#: ../data/totem.ui.h:133
-msgid "Visualization _size:"
-msgstr "Visualisierungs_größe:"
-
-#: ../data/totem.ui.h:134
-msgid "Color Balance"
-msgstr "Farbabgleich"
-
-#: ../data/totem.ui.h:135
-msgid "_Brightness:"
-msgstr "_Helligkeit:"
-
-#: ../data/totem.ui.h:136
-msgid "Co_ntrast:"
-msgstr "_Kontrast:"
-
-#: ../data/totem.ui.h:137
-msgid "Sat_uration:"
-msgstr "_Sättigung:"
-
-#: ../data/totem.ui.h:138
-msgid "_Hue:"
-msgstr "F_arbton:"
-
-#: ../data/totem.ui.h:139
-msgid "Reset to _Defaults"
-msgstr "Auf V_orgaben zurücksetzen"
-
-#: ../data/totem.ui.h:140
-msgid "Audio Output"
-msgstr "Audio-Ausgabe"
-
-#: ../data/totem.ui.h:141
-msgid "_Audio output type:"
-msgstr "Audio-_Ausgabetyp:"
-
 # CHECK ‒ Jemand 'ne bessere Idee?
-#: ../data/totem.ui.h:145
+#: ../data/totem.ui.h:82
 msgid "Time seek bar"
 msgstr "Zeitleiste"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
-msgid "Allow the screensaver to activate when playing audio"
-msgstr ""
-"Bildschirmschoner darf auch starten, wenn lediglich Audio wiedergegeben wird"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
-msgid ""
-"Allow the screensaver to activate when playing audio. Disable if you have "
-"monitor-powered speakers."
-msgstr ""
-"Legt fest, ob der Bildschirmschoner auch starten darf, wenn lediglich Audio "
-"wiedergegeben wird. Dies ist nützlich für im Monitor eingebaute Lautsprecher."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
-msgid "Show visual effects when no video is displayed"
-msgstr "Visuelle Effekte anzeigen, wenn kein Video angezeigt wird"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
-msgid "Show visual effects when playing an audio only file."
-msgstr ""
-"Visuelle Effekte anzeigen, wenn eine Datei wiedergegeben wird, die lediglich "
-"eine Audio-Spur enthält."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
-msgid "Name of the visual effects plugin"
-msgstr "Name des visuellen Effekt-Plugins"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
-msgid "The brightness of the video"
-msgstr "Die Helligkeit des Videos"
+#: ../data/uri.ui.h:1
+msgid "Enter the _address of the file you would like to open:"
+msgstr "Bitte geben Sie die Adresse der zu öffnenden Datei ein:"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
-msgid "The contrast of the video"
-msgstr "Der Kontrast des Videos"
+#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
+msgid "_Add to Playlist"
+msgstr "Zur Wiedergabeliste _hinzufügen"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
-msgid "The hue of the video"
-msgstr "Der Farbton des Videos"
+#: ../data/video-list.ui.h:2
+msgid "Add the video to the playlist"
+msgstr "Das Video zur Wiedergabeliste hinzufügen"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
-msgid "The saturation of the video"
-msgstr "Der Sättigung des Videos"
+#: ../src/backend/bacon-video-widget.c:1643
+msgid "Password requested for RTSP server"
+msgstr "Für den RTSP-Server wird ein Passwort angefordert"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
-msgid "Resize the canvas automatically on file load"
-msgstr "Fenstergröße beim Laden automatisch der geöffneten Datei anpassen"
+#: ../src/backend/bacon-video-widget.c:2940
+#, c-format
+msgid "Audio Track #%d"
+msgstr "Audio-Titel #%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
-msgid "Network connection speed"
-msgstr "Verbindungsgeschwindigkeit"
+#: ../src/backend/bacon-video-widget.c:2944
+#, c-format
+msgid "Subtitle #%d"
+msgstr "Untertitel #%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
-msgid ""
-"Approximate network connection speed, used to select quality on media over "
-"the network."
+#: ../src/backend/bacon-video-widget.c:3341
+msgid "The server you are trying to connect to is not known."
 msgstr ""
-"Ungefähre Geschwindigkeit der Netzwerkverbindung, um die Qualität eines übers "
-"Netzwerk übertragenen Mediums zu wählen."
+"Der Server, zu dem eine Verbindung aufgebaut werden soll, ist unbekannt."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
-msgid "Repeat mode"
-msgstr "Endlosschleife"
+#: ../src/backend/bacon-video-widget.c:3344
+msgid "The connection to this server was refused."
+msgstr "Die Verbindung zu diesem Server wurde abgewiesen."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
-msgid "Shuffle mode"
-msgstr "Zufallsmodus"
+#: ../src/backend/bacon-video-widget.c:3347
+msgid "The specified movie could not be found."
+msgstr "Der angegebene Film konnte nicht gefunden werden."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
-msgid "Whether to disable deinterlacing for interlaced movies"
+#: ../src/backend/bacon-video-widget.c:3354
+msgid "The server refused access to this file or stream."
 msgstr ""
-"Soll das Deinterlacing für aus Halbbildern bestehende Videos deaktiviert "
-"werden?"
+"Der Server hat den Zugriff auf die Datei oder den Datenstrom verweigert."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
-msgid "Whether to enable debug for the playback engine"
-msgstr "Soll die Wiedergabe-Engine im Fehlerdiagnosemodus ausgeführt werden?"
+#: ../src/backend/bacon-video-widget.c:3360
+msgid "Authentication is required to access this file or stream."
+msgstr "Sie müssen sich legitimieren"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
-msgid "Type of audio output to use"
-msgstr "Zu verwendender Audio-Ausgabetyp"
+#: ../src/backend/bacon-video-widget.c:3367
+msgid "You are not allowed to open this file."
+msgstr "Es ist Ihnen nicht gestattet, diese Datei zu öffnen."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
-msgid "Visualization quality setting"
-msgstr "Qualität der Visualisierung einstellen"
+#: ../src/backend/bacon-video-widget.c:3372
+msgid "This location is not a valid one."
+msgstr "Dieser Ort ist ungültig."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
-msgid "Quality setting for the audio visualization."
-msgstr "Qualitätseinstellungen für die Klangvisualisierung."
+#: ../src/backend/bacon-video-widget.c:3380
+msgid "The movie could not be read."
+msgstr "Der Film konnte nicht gelesen werden."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
-msgid "Network buffering threshold"
-msgstr "Grenzwert des Netzwerkzwischenspeichers"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
-msgid ""
-"Amount of data to buffer for network streams before starting to display the "
-"stream (in seconds)."
-msgstr ""
-"Größe des anzulegenden Zwischenspeichers für Netzwerk-Streams, bevor der "
-"Stream wiedergegeben wird (in Sekunden)"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
-msgid "Subtitle font"
-msgstr "Untertitelschrift"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
-msgid "Pango font description for subtitle rendering."
-msgstr "Pango-Schriftbeschreibung für die Untertiteldarstellung."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
-msgid "Subtitle encoding"
-msgstr "Untertitelkodierung"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
-msgid "Encoding character set for subtitle."
-msgstr "Zeichenkodierung für Untertitel."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
-msgid "Default location for the \"Open...\" dialogs"
-msgstr "Voreingestellter Ort des »Öffnen …«-Dialogs"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
-msgid ""
-"Default location for the \"Open...\" dialogs. Default is the current "
-"directory."
-msgstr ""
-"Voreingestellter Ort des »Öffnen …«-Dialogs, Vorgabe ist der momentane Ordner."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
-msgid "Default location for the \"Take Screenshot\" dialogs"
-msgstr "Voreingestellter Ort des »Bildschirmfoto aufnehmen …«-Dialogs"
+#. should be exactly one missing thing (source or converter)
+#: ../src/backend/bacon-video-widget.c:3403
+#: ../src/backend/bacon-video-widget.c:3411
+#, c-format
+msgid "The playback of this movie requires a %s plugin which is not installed."
+msgid_plural ""
+"The playback of this movie requires the following decoders which are not "
+"installed:\n"
+"\n"
+"%s"
+msgstr[0] ""
+"Zum Abspielen dieses Videos wird das nicht installierte Plugin %s benötigt."
+msgstr[1] ""
+"Zum Abspielen dieses Videos werden die folgenden nicht installierten Codecs "
+"benötigt:\n"
+"\n"
+"%s"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
+#: ../src/backend/bacon-video-widget.c:3422
 msgid ""
-"Default location for the \"Take Screenshot\" dialogs. Default is the Pictures "
-"directory."
-msgstr ""
-"Voreingestellter Ort des »Bildschirmfoto aufnehmen …«-Dialogs. Vorgabe ist "
-"der Bilder-Ordner."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
-msgid "Whether to disable the plugins in the user's home directory"
-msgstr ""
-"Legt fest, ob die Plugins im persönlichen Ordner des Benutzers deaktiviert "
-"werden."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
-msgid "Whether to disable the keyboard shortcuts"
-msgstr "Legt fest, ob die Tastenkombinationen deaktiviert sein sollen"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
-msgid "Whether to autoload text subtitle files when a movie is loaded"
+"An audio or video stream is not handled due to missing codecs. You might "
+"need to install additional plugins to be able to play some types of movies"
 msgstr ""
-"Legt fest, ob Untertitel beim Laden eines Filmes automatisch geladen werden "
-"sollen"
+"Ein Audio- oder Video-Datenstrom kann wegen fehlender Codecs nicht "
+"verarbeitet werden. Sie müssen zusätzliche Plugins installieren, um "
+"bestimmte Filmtypen abspielen zu können"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
-msgid "Whether to autoload external chapter files when a movie is loaded"
-msgstr ""
-"Legt fest, ob externe Kapiteldateien beim Laden eines Filmes automatisch "
-"geladen werden sollen"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+#: ../src/backend/bacon-video-widget.c:3432
 msgid ""
-"Whether to remember the position of played audio/video files when pausing or "
-"closing them"
+"This file cannot be played over the network. Try downloading it locally "
+"first."
 msgstr ""
-"Legt fest, ob die Wiedergabeposition von Audio- und Videodateien beim "
-"Unterbrechen oder Schließen gespeichert werden soll"
+"Diese Datei kann nicht über Netzwerk abgespielt werden. Versuchen Sie die "
+"Datei vorher herunterzuladen."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:35
-msgid "Active plugins list"
-msgstr "Liste aktiver Plugins"
+#: ../src/backend/bacon-video-widget.c:5514 ../src/totem-properties-view.c:228
+msgid "Surround"
+msgstr "Surround"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:36
-msgid ""
-"A list of the names of the plugins which are currently active (loaded and "
-"running)."
-msgstr ""
-"Eine Liste der Namen von Plugins, die derzeit aktiv sind (geladen und in "
-"Ausführung)."
+#: ../src/backend/bacon-video-widget.c:5516 ../src/totem-properties-view.c:230
+msgid "Mono"
+msgstr "Mono"
 
-#: ../data/uri.ui.h:1
-msgid "Enter the _address of the file you would like to open:"
-msgstr "Bitte geben Sie die Adresse der zu öffnenden Datei ein:"
+#: ../src/backend/bacon-video-widget.c:5801
+msgid "Media contains no supported video streams."
+msgstr "Das Medium enthält nicht unterstützte Video-Formate."
+
+#: ../src/backend/bacon-video-widget.c:5983
+msgid ""
+"Some necessary plug-ins are missing. Make sure that the program is correctly "
+"installed."
+msgstr ""
+"Einige benötigte Plugins fehlen. Stellen Sie sicher, dass das Programm "
+"korrekt installiert ist."
 
 #: ../src/eggdesktopfile.c:165
 #, c-format
@@ -1003,6 +1073,31 @@
 msgid "Show session management options"
 msgstr "Optionen der Sitzungsverwaltung anzeigen"
 
+#. hour:minutes:seconds
+#. Translators: This is a time format, like "9:05:02" for 9
+#. * hours, 5 minutes, and 2 seconds. You may change ":" to
+#. * the separator that your locale uses or use "%Id" instead
+#. * of "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:56
+#: ../src/plugins/skipto/totem-time-entry.c:57
+#, c-format
+msgctxt "long time format"
+msgid "%d:%02d:%02d"
+msgstr "%d:%02d:%02d"
+
+#. minutes:seconds
+#. Translators: This is a time format, like "5:02" for 5
+#. * minutes and 2 seconds. You may change ":" to the
+#. * separator that your locale uses or use "%Id" instead of
+#. * "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:65
+#, c-format
+msgctxt "short time format"
+msgid "%d:%02d"
+msgstr "%d:%02d"
+
 #. Title
 #. Artist
 #. Album
@@ -1109,10 +1204,14 @@
 msgstr[0] "%d Einzelbild pro Sekunde"
 msgstr[1] "%d Einzelbilder pro Sekunde"
 
-#: ../src/totem-audio-preview.c:168
+#: ../src/totem-audio-preview.c:137
 msgid "Audio Preview"
 msgstr "Audiovorschau"
 
+#: ../src/totem.c:240
+msgid "Verify your system installation. Totem will now exit."
+msgstr "Bitte überprüfen Sie Ihre System-Installation. Totem wird nun beendet."
+
 #: ../src/totem-cell-renderer-video.c:126
 msgid "Unknown video"
 msgstr "Unbekanntes Video"
@@ -1125,7 +1224,7 @@
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: ../src/totem-fullscreen.c:616
+#: ../src/totem-fullscreen.c:573
 msgid "No File"
 msgstr "Keine Datei"
 
@@ -1143,7 +1242,7 @@
 msgid "Make sure that Totem is properly installed."
 msgstr "Bitte stellen Sie sicher, dass Totem korrekt installiert ist."
 
-#: ../src/totem-interface.c:347
+#: ../src/totem-interface.c:357
 msgid ""
 "Totem 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 "
@@ -1152,21 +1251,22 @@
 msgstr ""
 "Totem ist freie Software, Sie können sie weitergeben und/oder verändern, "
 "solange Sie sich an die Regeln der GNU General Public License halten, so wie "
-"sie von der Free Software Foundation festgelegt wurden; entweder in Version 2 "
-"der Lizenz oder (nach Ihrem Ermessen) in jeder folgenden Version."
+"sie von der Free Software Foundation festgelegt wurden; entweder in Version "
+"2 der Lizenz oder (nach Ihrem Ermessen) in jeder folgenden Version."
 
-#: ../src/totem-interface.c:351
+#: ../src/totem-interface.c:361
 msgid ""
 "Totem 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 General Public License for more details."
+"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
+"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
+"details."
 msgstr ""
 "Totem wurde in der Hoffnung veröffentlicht, dass Sie es als nützlich "
 "empfinden, jedoch OHNE JEGLICHE GARANTIE AUF FUNKTIONSFÄHIGKEIT UND OHNE "
 "RECHTSANSPRUCH BEI FEHLERHAFTEM VERHALTEN DER SOFTWARE. Lesen Sie die GNU "
 "General Public License für weiterführende Informationen."
 
-#: ../src/totem-interface.c:355
+#: ../src/totem-interface.c:365
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Totem; if not, write to the Free Software Foundation, Inc., 59 Temple Place, "
@@ -1176,54 +1276,30 @@
 "License erhalten haben. Wenn nicht, schreiben Sie bitte an die Free Software "
 "Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA"
 
-#: ../src/totem-interface.c:358
+#: ../src/totem-interface.c:368
 msgid ""
-"Totem contains an exception to allow the use of proprietary GStreamer plugins."
+"Totem contains an exception to allow the use of proprietary GStreamer "
+"plugins."
 msgstr ""
 "Totem enthält eine Ausnahme, um das Benutzen von proprietären GStreamer-"
 "Plugins zu erlauben."
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:190
+#: ../src/totem-menu.c:291
 msgid "None"
 msgstr "Keine"
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:195
+#: ../src/totem-menu.c:296
 msgctxt "Language"
 msgid "Auto"
 msgstr "Auto"
 
-#. Translators:
-#. * This is not a JPEG image, but a disc image, for example,
-#. * an ISO file
-#: ../src/totem-menu.c:765
-#, c-format
-msgid "Play Image '%s'"
-msgstr "Abbild »%s« wiedergeben"
-
-#: ../src/totem-menu.c:768 ../src/totem-menu.c:851
-#, c-format
-msgid "device%d"
-msgstr "Gerät%d"
-
-#: ../src/totem-menu.c:848
-#, c-format
-msgid "Play Disc '%s'"
-msgstr "Medium »%s« abspielen"
-
-#. This lists the back-end type and version, such as
-#. * Movie Player using GStreamer 0.10.1
-#: ../src/totem-menu.c:1189
-#, c-format
-msgid "Movie Player using %s"
-msgstr "Anwendung zur Filmwiedergabe, die %s verwendet"
-
-#: ../src/totem-menu.c:1193
+#: ../src/totem-menu.c:788
 msgid "Copyright © 2002-2009 Bastien Nocera"
 msgstr "Copyright © 2002-2009 Bastien Nocera"
 
-#: ../src/totem-menu.c:1198
+#: ../src/totem-menu.c:792
 msgid "translator-credits"
 msgstr ""
 "Christian Neumair \n"
@@ -1233,160 +1309,78 @@
 "Paul Seyfert \n"
 "Christian Kirbach "
 
-#: ../src/totem-menu.c:1202
+#: ../src/totem-menu.c:796
 msgid "Totem Website"
 msgstr "Totem-Website"
 
-#: ../src/totem-menu.c:1236
+#: ../src/totem-menu.c:827
 msgid "Configure Plugins"
 msgstr "Plugins konfigurieren"
 
+#: ../src/totem-object.c:162
+#, c-format
+msgid ""
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"%s\n"
+"Geben Sie '%s --help' ein, um eine vollständige Liste verfügbarer "
+"Befehlszeilenoptionen anzuzeigen.\n"
+
 #. Translators: %s is the totem version number
-#: ../src/totem-object.c:471
+#: ../src/totem-object.c:591
 #, c-format
 msgid "Totem %s"
 msgstr "Totem %s"
 
-#: ../src/totem-object.c:1047 ../browser-plugin/totem-plugin-viewer.c:367
-msgid "Playing"
-msgstr "Wiedergabe"
-
-#: ../src/totem-object.c:1049 ../src/totem-options.c:52
+#: ../src/totem-object.c:1168 ../src/totem-options.c:52
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/totem-object.c:1054 ../browser-plugin/totem-plugin-viewer.c:363
-msgid "Paused"
-msgstr "Pause"
-
-#: ../src/totem-object.c:1056 ../src/totem-object.c:1066
+#: ../src/totem-object.c:1175 ../src/totem-object.c:1185
 #: ../src/totem-options.c:51
 msgid "Play"
 msgstr "Wiedergabe"
 
-#: ../src/totem-object.c:1061 ../src/totem-object.c:1659
-#: ../src/totem-statusbar.c:115 ../browser-plugin/totem-plugin-viewer.c:351
-msgid "Stopped"
-msgstr "Angehalten"
-
-#: ../src/totem-object.c:1142 ../src/totem-object.c:1169
-#: ../src/totem-object.c:1799 ../src/totem-object.c:1963
+#: ../src/totem-object.c:1267 ../src/totem-object.c:1294
+#: ../src/totem-object.c:1787 ../src/totem-object.c:1942
 #, c-format
 msgid "Totem could not play '%s'."
 msgstr "Totem konnte »%s« nicht wiedergeben."
 
-#: ../src/totem-object.c:1246
-#, c-format
-msgid ""
-"Totem could not play this media (%s) although a plugin is present to handle "
-"it."
-msgstr ""
-"Obwohl ein Plugin für diesen Medientyp (%s) verfügbar ist, konnte Totem das "
-"Medium nicht wiedergeben."
-
-#: ../src/totem-object.c:1247
-msgid ""
-"You might want to check that a disc is present in the drive and that it is "
-"correctly configured."
-msgstr ""
-"Stellen Sie sicher, dass sich ein Medium im Laufwerk befindet und dieses "
-"korrekt konfiguriert ist."
-
-#: ../src/totem-object.c:1255
-msgid "More information about media plugins"
-msgstr "Weitere Informationen über Medien-Plugins"
-
-#: ../src/totem-object.c:1256
-msgid ""
-"Please install the necessary plugins and restart Totem to be able to play "
-"this media."
-msgstr ""
-"Installieren Sie diese und starten Sie Totem neu, um dieses Medium "
-"wiedergeben zu können."
-
-#: ../src/totem-object.c:1258
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because it does not have the "
-"appropriate plugins to be able to read from the disc."
-msgstr ""
-"Dieser Medientyp (%s) kann nicht von Totem wiedergegeben werden, da die zum "
-"Lesen des Datenträgers notwendigen Plugins nicht verfügbar sind."
-
-#: ../src/totem-object.c:1260
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because you do not have the "
-"appropriate plugins to handle it."
-msgstr ""
-"Dieser Medientyp (%s) kann nicht von Totem wiedergegeben werden, da die dafür "
-"notwendigen Plugins nicht verfügbar sind."
-
-#: ../src/totem-object.c:1263
-#, c-format
-msgid "Totem cannot play this type of media (%s) because it is not supported."
-msgstr ""
-"Dieser Medientyp (%s) kann nicht von Totem wiedergegeben werden, da er nicht "
-"unterstützt wird."
-
-#: ../src/totem-object.c:1264
-msgid "Please insert another disc to play back."
-msgstr "Bitte legen Sie einen anderen Datenträger zum Abspielen ein."
-
-#: ../src/totem-object.c:1300
-msgid "Totem was not able to play this disc."
-msgstr "Das eingelegte Medium konnte nicht abgespielt werden."
-
-#: ../src/totem-object.c:1301 ../src/totem-object.c:4229
-msgid "No reason."
-msgstr "Kein Grund."
-
-#: ../src/totem-object.c:1315
-msgid "Totem does not support playback of Audio CDs"
-msgstr "Totem unterstützt das Abspielen von Audio-CDs nicht."
-
-# CHECK: Ist "CD-Extraktor" als Übersetzung gut genug?
-#: ../src/totem-object.c:1316
-msgid "Please consider using a music player or a CD extractor to play this CD"
-msgstr ""
-"Ziehen Sie bitte die Benutzung einer Anwendung zur Musikwiedergabe oder eines "
-"CD-Auslesers zum Abspielen dieser CD in Betracht."
-
-#: ../src/totem-object.c:1805
+#: ../src/totem-object.c:1793
 msgid "No error message"
 msgstr "Keine Fehlermeldung"
 
-#: ../src/totem-object.c:2154
+#: ../src/totem-object.c:2133
 msgid "Totem could not display the help contents."
 msgstr "Totem konnte den Hilfeindex nicht anzeigen."
 
-#: ../src/totem-object.c:2493 ../src/totem-object.c:2495
-#: ../browser-plugin/totem-plugin-viewer.c:1417
-msgid "An error occurred"
-msgstr "Es ist ein Fehler aufgetreten"
-
-#: ../src/totem-object.c:4064 ../src/totem-object.c:4066
+#: ../src/totem-object.c:4019 ../src/totem-object.c:4021
 msgid "Previous Chapter/Movie"
 msgstr "Vorheriges Kapitel/Film"
 
-#: ../src/totem-object.c:4073 ../src/totem-object.c:4075
+#: ../src/totem-object.c:4028 ../src/totem-object.c:4030
 msgid "Play / Pause"
 msgstr "Wiedergabe / Pause"
 
-#: ../src/totem-object.c:4083 ../src/totem-object.c:4085
+#: ../src/totem-object.c:4038 ../src/totem-object.c:4040
 msgid "Next Chapter/Movie"
 msgstr "Nächstes Kapitel/Film"
 
-#. Translators: this is the tooltip text for the fullscreen button in the controls box in Totem's main window.
 #. Translators: this is the accessibility text for the fullscreen button in the controls box in Totem's main window.
-#: ../src/totem-object.c:4097 ../src/totem-object.c:4099
+#: ../src/totem-object.c:4051 ../src/totem-object.c:4053
 msgid "Fullscreen"
 msgstr "Vollbild"
 
-#: ../src/totem-object.c:4229
+#: ../src/totem-object.c:4184
 msgid "Totem could not startup."
 msgstr "Totem konnte nicht gestartet werden."
 
+#: ../src/totem-object.c:4184
+msgid "No reason."
+msgstr "Kein Grund."
+
 #: ../src/totem-open-location.c:182
 msgid "Open Location..."
 msgstr "Ort öffnen …"
@@ -1461,120 +1455,114 @@
 msgid "Movies to play"
 msgstr "Filme zum Abspielen"
 
-#: ../src/totem-options.c:117
+#: ../src/totem-options.c:79
+msgid "- Play movies and songs"
+msgstr "‒ Filme und Musik wiedergeben"
+
+#: ../src/totem-options.c:142
 msgid "Can't enqueue and replace at the same time"
 msgstr ""
 "In die Warteschlange stellen und Ersetzen ist nicht gleichzeitig möglich"
 
 #. By extension entry
-#: ../src/totem-playlist.c:161
+#: ../src/totem-playlist.c:162
 msgid "MP3 ShoutCast playlist"
 msgstr "MP3-ShoutCast-Wiedergabeliste"
 
-#: ../src/totem-playlist.c:162
+#: ../src/totem-playlist.c:163
 msgid "MP3 audio (streamed)"
 msgstr "MP3-Audio (Datenstrom)"
 
-#: ../src/totem-playlist.c:163
+#: ../src/totem-playlist.c:164
 msgid "MP3 audio (streamed, DOS format)"
 msgstr "MP3-Audio (Datenstrom, DOS-Format)"
 
-#: ../src/totem-playlist.c:164
+#: ../src/totem-playlist.c:165
 msgid "XML Shareable Playlist"
 msgstr "Gemeinsame Wiedergabeliste im XML-Format"
 
 #. This is "Title 3", where title is a DVD title
 #. * Note: NOT a DVD chapter
-#: ../src/totem-playlist.c:347
+#: ../src/totem-playlist.c:348
 #, c-format
 msgid "Title %d"
 msgstr "Titel %d"
 
-#: ../src/totem-playlist.c:446
+#: ../src/totem-playlist.c:447
 msgid "Could not save the playlist"
 msgstr "Die Wiedergabeliste konnte nicht gespeichert werden"
 
-#: ../src/totem-playlist.c:1021
+#: ../src/totem-playlist.c:1022
 msgid "Save Playlist"
 msgstr "Wiedergabeliste speichern"
 
 #. translators: Playlist is the default saved playlist filename,
 #. * without the suffix
-#: ../src/totem-playlist.c:1033 ../src/totem-playlist.c:1264
-#: ../src/totem-sidebar.c:142
+#: ../src/totem-playlist.c:1034 ../src/totem-playlist.c:1263
+#: ../src/totem-sidebar.c:145
 msgid "Playlist"
 msgstr "Wiedergabeliste"
 
-#: ../src/totem-playlist.c:1857
+#: ../src/totem-playlist.c:1862
 #, c-format
 msgid "The playlist '%s' could not be parsed. It might be damaged."
 msgstr ""
 "Die Wiedergabeliste »%s« konnte nicht verarbeitet werden, möglicherweise ist "
 "sie fehlerhaft."
 
-#: ../src/totem-playlist.c:1858
+#: ../src/totem-playlist.c:1863
 msgid "Playlist error"
 msgstr "Wiedergabelistenfehler"
 
-#: ../src/totem-preferences.c:295
+#: ../src/totem-preferences.c:297
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: ../src/totem-preferences.c:451
+#: ../src/totem-preferences.c:445
 msgid "Select Subtitle Font"
 msgstr "Untertitelschrift auswählen"
 
-#: ../src/totem-properties-main.c:115 ../src/totem-properties-view.c:266
+#: ../src/totem-properties-main.c:116 ../src/totem-properties-view.c:271
 msgid "Audio/Video"
 msgstr "Audio/Video"
 
-#: ../src/totem-properties-view.c:128
+#: ../src/totem-properties-view.c:131
 msgid "N/A"
 msgstr "k.A."
 
-#: ../src/totem-properties-view.c:157
+#: ../src/totem-properties-view.c:160
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 msgctxt "Stream bit rate"
 msgid "N/A"
 msgstr "k.A."
 
-#: ../src/totem-properties-view.c:160
+#: ../src/totem-properties-view.c:163
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 #, c-format
 msgid "%d kbps"
 msgstr "%d Kb/s"
 
-#: ../src/totem-properties-view.c:177
+#: ../src/totem-properties-view.c:180
 #: ../src/plugins/properties/totem-movie-properties.c:149
 #, c-format
 msgid "%d x %d"
 msgstr "%d × %d"
 
-#: ../src/totem-properties-view.c:209
+#: ../src/totem-properties-view.c:212
 #: ../src/plugins/properties/totem-movie-properties.c:166
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: ../src/totem-properties-view.c:216
+#: ../src/totem-properties-view.c:220
 #: ../src/plugins/properties/totem-movie-properties.c:166
 msgctxt "Sample rate"
 msgid "N/A"
 msgstr "k.A."
 
-#: ../src/totem-properties-view.c:224
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5589
-msgid "Surround"
-msgstr "Surround"
-
-#: ../src/totem-properties-view.c:226
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5591
-msgid "Mono"
-msgstr "Mono"
-
-#: ../src/totem-properties-view.c:236
+#: ../src/totem-properties-view.c:241
 msgctxt "Number of audio channels"
 msgid "N/A"
 msgstr "k.A."
@@ -1608,8 +1596,8 @@
 #. eg: 75 %
 #: ../src/totem-statusbar.c:250
 #, c-format
-msgid "%d %%"
-msgstr "%d %%"
+msgid "%lf %%"
+msgstr "%lf%%"
 
 #. eg: Paused, 0:32 / 1:05
 #: ../src/totem-statusbar.c:325
@@ -1620,8 +1608,8 @@
 #. eg: Buffering, 75 %
 #: ../src/totem-statusbar.c:330
 #, c-format
-msgid "%s, %d %%"
-msgstr "%s, %d %%"
+msgid "%s, %f %%"
+msgstr "%s, %f%%"
 
 #: ../src/totem-subtitle-encoding.c:156
 msgid "Current Locale"
@@ -1764,227 +1752,91 @@
 msgid "Vietnamese"
 msgstr "Vietnamesisch"
 
-#: ../src/totem-video-list.c:330
-msgid "No video URI"
-msgstr "Keine Video-Adresse"
-
-#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
-#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
-#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
-#: ../src/totem-video-thumbnailer.c:872
-#, c-format
-msgid ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-msgstr ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-
-#: ../src/totem-video-thumbnailer.c:873
-msgid "Filename"
-msgstr "Dateiname"
-
-#: ../src/totem-video-thumbnailer.c:875
-msgid "Resolution"
-msgstr "Auflösung"
-
-#: ../src/totem-video-thumbnailer.c:878
-msgid "Duration"
-msgstr "Dauer"
-
-#: ../src/totem-uri.c:506 ../src/plugins/chapters/totem-chapters.c:998
+#: ../src/totem-uri.c:343 ../src/plugins/chapters/totem-chapters.c:998
 msgid "All files"
 msgstr "Alle Dateien"
 
-#: ../src/totem-uri.c:511 ../src/plugins/chapters/totem-chapters.c:995
+#: ../src/totem-uri.c:348 ../src/plugins/chapters/totem-chapters.c:995
 msgid "Supported files"
 msgstr "Unterstützte Dateien"
 
-#: ../src/totem-uri.c:523
+#: ../src/totem-uri.c:360
 msgid "Audio files"
 msgstr "Audiodateien"
 
-#: ../src/totem-uri.c:531
+#: ../src/totem-uri.c:368
 msgid "Video files"
 msgstr "Videodateien"
 
-#: ../src/totem-uri.c:541
+#: ../src/totem-uri.c:378
 msgid "Subtitle files"
 msgstr "Untertitel-Dateien"
 
-#: ../src/totem-uri.c:593
+#: ../src/totem-uri.c:430
 msgid "Select Text Subtitles"
 msgstr "Untertitel auswählen"
 
-#: ../src/totem-uri.c:656
+#: ../src/totem-uri.c:495
 msgid "Select Movies or Playlists"
 msgstr "Filme oder Wiedergabelisten auswählen"
 
-#. Options parsing
-#: ../src/totem.c:201
-msgid "- Play movies and songs"
-msgstr "‒ Filme und Musik wiedergeben"
-
-#: ../src/totem.c:212
-#, c-format
-msgid ""
-"%s\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"%s\n"
-"Geben Sie '%s --help' ein, um eine vollständige Liste verfügbarer "
-"Befehlszeilenoptionen anzuzeigen.\n"
-
-#: ../src/totem.c:254 ../src/totem.c:265
-#: ../browser-plugin/totem-plugin-viewer.c:663
-#: ../browser-plugin/totem-plugin-viewer.c:1793
-msgid "Totem Movie Player"
-msgstr "Totem Filmwiedergabe"
-
-#: ../src/totem.c:255 ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Could not initialize the thread-safe libraries."
-msgstr "Die Thread-sicheren Bibliotheken konnten nicht initialisiert werden."
-
-#: ../src/totem.c:255
-msgid "Verify your system installation. Totem will now exit."
-msgstr "Bitte überprüfen Sie Ihre System-Installation. Totem wird nun beendet."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:1589
-msgid "Password requested for RTSP server"
-msgstr "Für den RTSP-Server wird ein Passwort angefordert"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2858
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2862
-#, c-format
-msgid "Audio Track #%d"
-msgstr "Audio-Titel #%d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2890
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2894
-#, c-format
-msgid "Subtitle #%d"
-msgstr "Untertitel #%d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3298
-msgid ""
-"The requested audio output was not found. Please select another audio output "
-"in the Multimedia Systems Selector."
-msgstr ""
-"Die angeforderte Audio-Ausgabe wurde nicht gefunden. Bitte wählen Sie in den "
-"Einstellungen des Multimedia-Systems eine andere aus."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3303
-msgid "Location not found."
-msgstr "Der Ort wurde nicht gefunden."
+#: ../src/totem-uri.c:499
+msgid "Add Directory"
+msgstr "Ordner hinzufügen"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3307
-msgid "Could not open location; you might not have permission to open the file."
-msgstr ""
-"Der Ort konnte nicht geöffnet werden; möglicherweise besitzen Sie nicht die "
-"notwendigen Zugriffsrechte, um die Datei zu öffnen."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3318
-msgid ""
-"The video output is in use by another application. Please close other video "
-"applications, or select another video output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"Die Video-Ausgabe wird von einer anderen Anwendung verwendet. Bitte schließen "
-"Sie alle anderen Video-Anwendungen oder wählen Sie in den Einstellungen des "
-"Multimedia-Systems eine andere Video-Ausgabe aus."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3324
-msgid ""
-"The audio output is in use by another application. Please select another "
-"audio output in the Multimedia Systems Selector. You may want to consider "
-"using a sound server."
-msgstr ""
-"Die Audio-Ausgabe wird von einer anderen Anwendung verwendet. Bitte wählen "
-"Sie in den Einstellungen des Multimedia-Systems eine andere Video-Ausgabe "
-"aus. Eventuell sollten Sie auch einen Sound-Server verwenden."
+#: ../src/totem-video-list.c:330
+msgid "No video URI"
+msgstr "Keine Video-Adresse"
 
-#. should be exactly one missing thing (source or converter)
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3342
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3348
+#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
+#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
+#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
+#: ../src/totem-video-thumbnailer.c:841
 #, c-format
-msgid "The playback of this movie requires a %s plugin which is not installed."
-msgid_plural ""
-"The playback of this movie requires the following decoders which are not "
-"installed:\n"
-"\n"
-"%s"
-msgstr[0] ""
-"Zum Abspielen dieses Videos wird das nicht installierte Plugin %s benötigt."
-msgstr[1] ""
-"Zum Abspielen dieses Videos werden die folgenden nicht installierten Codecs "
-"benötigt:\n"
-"\n"
-"%s"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3374
 msgid ""
-"Cannot play this file over the network. Try downloading it to disk first."
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 msgstr ""
-"Diese Datei kann nicht über Netzwerk abgespielt werden. Versuchen Sie die "
-"Datei vorher herunterzuladen und abzuspeichern."
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5878
-msgid "Media contains no supported video streams."
-msgstr "Das Medium enthält nicht unterstützte Video-Formate."
+#: ../src/totem-video-thumbnailer.c:842
+msgid "Filename"
+msgstr "Dateiname"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6052
-msgid ""
-"Failed to create a GStreamer play object. Please check your GStreamer "
-"installation."
-msgstr ""
-"Es konnte kein GStreamer-Wiedergabeobjekt erzeugt werden. Bitte überprüfen "
-"Sie Ihre GStreamer-Installation."
+#: ../src/totem-video-thumbnailer.c:844
+msgid "Resolution"
+msgstr "Auflösung"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6172
-msgid ""
-"Failed to open audio output. You may not have permission to open the sound "
-"device, or the sound server may not be running. Please select another audio "
-"output in the Multimedia Systems Selector."
-msgstr ""
-"Die Audio-Ausgabe konnte nicht geöffnet werden. Sie haben entweder nicht die "
-"notwendigen Rechte, um das Audio-Gerät zu öffnen oder Sound-Server läuft "
-"nicht. Bitte wählen Sie in den Einstellungen des Multimedia-Systems eine "
-"andere Audio-Ausgabe aus."
+#: ../src/totem-video-thumbnailer.c:847
+msgid "Duration"
+msgstr "Dauer"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6192
-msgid ""
-"Could not find the audio output. You may need to install additional GStreamer "
-"plugins, or select another audio output in the Multimedia Systems Selector."
-msgstr ""
-"Die angeforderte Audio-Ausgabe wurde nicht gefunden. Möglicherweise müssen "
-"Sie weitere GStreamer-Plugins installieren oder in den Einstellungen des "
-"Multimedia-Systems eine andere Audio-Ausgabe auswählen."
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:1
+msgid "Apple Trailers"
+msgstr "Apple-Trailer"
+
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:2
+msgid "Sets the user agent for the Apple Trailers site"
+msgstr "Richtet den Benutzeragenten für die Apple-Trailers-Webseite ein"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:1
+msgid "Autoload Subtitles"
+msgstr "Untertitel automatisch herunterladen"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:2
+msgid "Autoloads text subtitles"
+msgstr "Lädt Untertitel automatisch herunter"
 
-#. hour:minutes:seconds
-#. Translators: This is a time format, like "9:05:02" for 9
-#. * hours, 5 minutes, and 2 seconds. You may change ":" to
-#. * the separator that your locale uses or use "%Id" instead
-#. * of "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:83 ../src/plugins/skipto/totem-time-entry.c:57
-#, c-format
-msgctxt "long time format"
-msgid "%d:%02d:%02d"
-msgstr "%d:%02d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
+msgid "Video Disc Recorder"
+msgstr "Videodisk-Rekorder"
 
-#. minutes:seconds
-#. Translators: This is a time format, like "5:02" for 5
-#. * minutes and 2 seconds. You may change ":" to the
-#. * separator that your locale uses or use "%Id" instead of
-#. * "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:92
-#, c-format
-msgctxt "short time format"
-msgid "%d:%02d"
-msgstr "%d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
+msgid "Records (S)VCDs or video DVDs"
+msgstr "Nimmt (S)VCDs oder Video-DVDs auf"
 
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:65
 msgid "_Create Video Disc..."
@@ -2010,37 +1862,20 @@
 msgid "Copy the currently playing (S)VCD"
 msgstr "Gegenwärtig abgespielte (S)VCD kopieren"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:129
-msgid "The video disc could not be duplicated."
-msgstr "Die Videodisk konnte nicht vervielfältigt werden."
-
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:131
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:276
-msgid "The movie could not be recorded."
-msgstr "Der Film konnte nicht aufgenommen werden."
-
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:157
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:167
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:263
-msgid "Unable to write a project."
-msgstr "Schreiben eines Projekts nicht möglich."
-
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
-msgid "Video Disc Recorder"
-msgstr "Videodisk-Rekorder"
-
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
-msgid "Records (S)VCDs or video DVDs"
-msgstr "Nimmt (S)VCDs oder Video-DVDs auf"
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:136
+msgid "The video disc could not be duplicated."
+msgstr "Die Videodisk konnte nicht vervielfältigt werden."
 
-#: ../src/plugins/chapters/chapters.plugin.in.h:1
-#: ../src/plugins/chapters/totem-chapters.c:1139
-msgid "Chapters"
-msgstr "Kapitel"
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:138
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:283
+msgid "The movie could not be recorded."
+msgstr "Der Film konnte nicht aufgenommen werden."
 
-#: ../src/plugins/chapters/chapters.plugin.in.h:2
-msgid "Support chapter markers in movies."
-msgstr "Unterstützung für Kapitelmarkierungen in Filmen."
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:164
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:174
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:270
+msgid "Unable to write a project."
+msgstr "Schreiben eines Projekts nicht möglich."
 
 #: ../src/plugins/chapters/chapters-edit.ui.h:1
 msgid "Name for new chapter:"
@@ -2098,6 +1933,15 @@
 msgid "Create a new chapter list for the movie"
 msgstr "Neue Kapitelliste für den Film erstellen"
 
+#: ../src/plugins/chapters/chapters.plugin.in.h:1
+#: ../src/plugins/chapters/totem-chapters.c:1139
+msgid "Chapters"
+msgstr "Kapitel"
+
+#: ../src/plugins/chapters/chapters.plugin.in.h:2
+msgid "Support chapter markers in movies"
+msgstr "Unterstützung für Kapitelmarkierungen in Filmen"
+
 #: ../src/plugins/chapters/totem-chapters.c:56
 #, c-format
 msgid ""
@@ -2210,15 +2054,39 @@
 msgid "The URI ‘%s’ is not supported."
 msgstr "Die Adresse »%s« wird nicht unterstützt."
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
-msgid "Instant Messenger status"
-msgstr "Sofortnachrichten-Status"
+#: ../src/plugins/grilo/grilo.plugin.in.h:1
+msgid "Grilo Browser"
+msgstr "Grilo-Browser"
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
-msgid "Set your Instant Messenger status to away when a movie is playing"
+#: ../src/plugins/grilo/grilo.plugin.in.h:2
+msgid "A plugin to let you browse media content from various sources"
 msgstr ""
-"Setzt den Sofortnachrichten-Status auf »Abwesend«, wenn ein Video abgespielt "
-"wird"
+"Ein Plugin, das die Suche nach Medieninhalten aus verschiedenen Quellen "
+"ermöglicht"
+
+#: ../src/plugins/grilo/grilo.ui.h:1
+msgid "Add to Playlist"
+msgstr "Zur Wiedergabeliste hinzufügen"
+
+#: ../src/plugins/grilo/grilo.ui.h:2
+msgid "Copy Location"
+msgstr "Ort kopieren"
+
+#: ../src/plugins/grilo/grilo.ui.h:3 ../src/plugins/grilo/totem-grilo.c:1186
+msgid "Browse"
+msgstr "Durchsuchen"
+
+#: ../src/plugins/grilo/grilo.ui.h:4 ../src/plugins/grilo/totem-grilo.c:1229
+msgid "Search"
+msgstr "Suche"
+
+#: ../src/plugins/grilo/totem-grilo.c:454
+msgid "Browse Error"
+msgstr "Fehler beim Durchsuchen"
+
+#: ../src/plugins/grilo/totem-grilo.c:609
+msgid "Search Error"
+msgstr "Fehler beim Suchen"
 
 #: ../src/plugins/gromit/gromit.plugin.in.h:1
 msgid "Gromit Annotations"
@@ -2232,59 +2100,15 @@
 msgid "The gromit binary was not found."
 msgstr "Die Gromit-Binärdatei konnte nicht gefunden werden."
 
-#. Add the interface to Totem's sidebar
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:1
-#: ../src/plugins/iplayer/iplayer.py:46
-msgid "BBC iPlayer"
-msgstr "BBC iPlayer"
-
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:2
-msgid "Stream BBC programs from the last 7 days from the BBC iPlayer service."
-msgstr ""
-"Holt einen Datenstrom der BBC-Programme der letzten 7 Tage vom BBC iPlayer-"
-"Dienst."
-
-#: ../src/plugins/iplayer/iplayer.py:72
-msgid "Error listing channel categories"
-msgstr "Fehler beim Auflisten der Kanalkategorien"
-
-#: ../src/plugins/iplayer/iplayer.py:73
-msgid ""
-"There was an unknown error getting the list of television channels available "
-"on BBC iPlayer."
-msgstr ""
-"Beim Holen der auf dem BBC iPlayer verfügbaren Programmliste trat ein Fehler "
-"auf."
-
-#. Append a dummy child row so that the expander's visible; we can
-#. then queue off the expander to load the programme listing for this
-#. category
-#: ../src/plugins/iplayer/iplayer.py:84
-msgid "Loading…"
-msgstr "Wird geladen …"
-
-#. Translators: the "programme feed" is the list of TV shows
-#. available to watch online
-#: ../src/plugins/iplayer/iplayer.py:136
-msgid "Error getting programme feed"
-msgstr "Fehler beim Holen des Programm-Feeds"
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
+msgid "Instant Messenger Status"
+msgstr "Sofortnachrichten-Status"
 
-#: ../src/plugins/iplayer/iplayer.py:137
-msgid ""
-"There was an error getting the list of programmes for this channel and "
-"category combination."
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
+msgid "Set your Instant Messenger status to away when a movie is playing"
 msgstr ""
-"Beim Holen der Programmliste für diese Kombination aus Kanal und Kategorie "
-"trat ein Fehler auf."
-
-#: ../src/plugins/iplayer/iplayer2.py:298
-msgid ""
-msgstr ""
-
-#: ../src/plugins/iplayer/iplayer2.py:299
-#, python-format
-msgid "Programme unavailable (\"%s\")"
-msgstr "Programm nicht verfügbar (»%s«)"
+"Setzt den Sofortnachrichten-Status auf »Abwesend«, wenn ein Video abgespielt "
+"wird"
 
 #: ../src/plugins/lirc/lirc.plugin.in.h:1
 msgid "Infrared Remote Control"
@@ -2302,25 +2126,31 @@
 msgid "Couldn't read lirc configuration."
 msgstr "»lirc«-Konfiguration konnte nicht gelesen werden."
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
-msgid "Download Movie Subtitles"
-msgstr "Film-Untertitel herunterladen"
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:1
+msgid "Media Player Keys"
+msgstr "Medienwiedergabetasten"
+
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:2
+msgid "Support additional media player keys"
+msgstr "Zusätzliche Medienwiedergabetasten"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
-msgid "Subtitle _language:"
-msgstr "Untertitel-_Sprache:"
+#: ../src/plugins/ontop/ontop.plugin.in.h:1
+msgid "Always On Top"
+msgstr "Immer im Vordergrund"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
-msgid "_Play with Subtitle"
-msgstr "_Untertitel anzeigen"
+#: ../src/plugins/ontop/ontop.plugin.in.h:2
+msgid "Keep the main window on top when playing a movie"
+msgstr ""
+"Das Hauptfenster wird immer im Vordergrund gehalten, wenn ein Video "
+"abgespielt wird"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:1
 msgid "Subtitle Downloader"
 msgstr "Untertitel-Downloader"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:2
-msgid "Look for subtitles for the currently playing movie."
-msgstr "Nach Untertiteln für den gegenwärtig abgespielten Film suchen."
+msgid "Look for subtitles for the currently playing movie"
+msgstr "Nach Untertiteln für den gegenwärtig abgespielten Film suchen"
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:42
 msgid "Brazilian Portuguese"
@@ -2376,6 +2206,18 @@
 msgid "Searching subtitles…"
 msgstr "Untertitel werden gesucht …"
 
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
+msgid "Download Movie Subtitles"
+msgstr "Film-Untertitel herunterladen"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
+msgid "Subtitle _language:"
+msgstr "Untertitel-_Sprache:"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
+msgid "_Play with Subtitle"
+msgstr "_Untertitel anzeigen"
+
 #: ../src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in.h:1
 msgid "Subtitle language"
 msgstr "Untertitel-Sprache"
@@ -2384,85 +2226,18 @@
 msgid "The language to search for subtitles for movies in."
 msgstr "Die Sprache, in der Filmuntertitel durchsucht werden sollen."
 
-#: ../src/plugins/ontop/ontop.plugin.in.h:1
-msgid "Always On Top"
-msgstr "Immer im Vordergrund"
-
-#: ../src/plugins/ontop/ontop.plugin.in.h:2
-msgid "Keep the main window on top when playing a movie"
-msgstr ""
-"Das Hauptfenster wird immer im Vordergrund gehalten, wenn ein Video "
-"abgespielt wird"
+#: ../src/plugins/properties/movie-properties.plugin.in.h:1
+msgid "Movie Properties"
+msgstr "Film-Eigenschaften"
+
+#: ../src/plugins/properties/movie-properties.plugin.in.h:2
+msgid "Adds movie properties to the sidebar"
+msgstr "Fügt die Filmeigenschaften zur Seitenleiste hinzu"
 
 #: ../src/plugins/properties/totem-movie-properties.c:246
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:1
-msgid "Publisher protocol to use"
-msgstr "Protokoll zur Veröffentlichung"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:2
-msgid ""
-"The transport protocol to use when publishing playlists over the network."
-msgstr ""
-"Das Transportprotokoll zur Veröffentlichung der Wiedergabelisten übers "
-"Netzwerk."
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:3
-msgid "Format for network service name"
-msgstr "Format des Namens des Netzwerkdienstes"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:5
-#, no-c-format
-msgid ""
-"A format string used to build the network service name used when publishing "
-"playlists over the network. The following format placeholders can be used: • "
-"%a: the program name as returned by g_get_application_name() • %h: the "
-"machine's host name in title case • %u: the user's login name in title case • "
-"%U: the user's real name • %%: the percent sign"
-msgstr ""
-"Eine Formatzeichenkette zum Erstellen des Namens des Netzwerkdienstes für die "
-"Veröffentlichung von Wiedergabelisten im Netzwerk. Die folgenden Platzhalter "
-"können verwendet werden: • %a: der Programmname, wie er von "
-"g_get_application_name() zurückgegeben wird • %h: der Rechnername mit großen "
-"Anfangsbuchstaben • %u: der Name des Benutzers in Blockschrift • %U: Der "
-"tatsächliche Benutzername • %%: das Prozentzeichen"
-
-# CHECK
-#. Translators: computers on the local network which are publishing their playlists over the network
-#: ../src/plugins/publish/totem-publish.c:552
-msgid "Neighbors"
-msgstr "Nachbarn"
-
-#: ../src/plugins/publish/publish.plugin.in.h:1
-msgid "Publish Playlist"
-msgstr "Wiedergabeliste veröffentlichen"
-
-#: ../src/plugins/publish/publish.plugin.in.h:2
-msgid "Share the current playlist via HTTP"
-msgstr "Die derzeitige Wiedergabeliste per HTTP freigeben"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:1
-msgid "Service _Name:"
-msgstr "_Name des Dienstes:"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:3
-#, no-c-format
-msgid ""
-"The name used for announcing the playlist service on the network.\n"
-"All occurrences of the string %u will be replaced by your name,\n"
-"and %h will be replaced by your computer's host name."
-msgstr ""
-"Der Name, der für die Anzeige des Wiedergabelisten-Dienstes im Netzwerk "
-"benutzt wird.\n"
-"Jedes Auftreten der Zeichenkette %u wird durch Ihren Namen ersetzt\n"
-"und %h durch den Namen Ihres Rechners."
-
-#: ../src/plugins/publish/publish-plugin.ui.h:6
-msgid "Use _encrypted transport protocol (HTTPS)"
-msgstr "Sich_eres Verbindungsprotokoll verwenden (HTTPS)"
-
 #: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:1
 msgid "rpdb2 password"
 msgstr "rpdb2-Passwort"
@@ -2472,28 +2247,92 @@
 "A password to protect the rpdb2 server for debugging Totem from unauthorized "
 "remote access. If this is empty, a default of 'totem' will be used."
 msgstr ""
-"Ein Passwort für den rpdb2-Server zur Fehlerdiagnose von Totem zum Schutz vor "
-"unerlaubtem entferntem Zugriff. Falls es leer ist, wird das Standardpasswort "
-"»totem« verwendet."
+"Ein Passwort für den rpdb2-Server zur Fehlerdiagnose von Totem zum Schutz "
+"vor unerlaubtem entferntem Zugriff. Falls es leer ist, wird das "
+"Standardpasswort »totem« verwendet."
+
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
+msgid "Python Console"
+msgstr "Python-Konsole"
+
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
+msgid "Interactive Python console"
+msgstr "Interaktive Python-Konsole"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:88
+msgid "Python Console Menu"
+msgstr "Python-Konsolenmenü"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:93
+msgid "_Python Console"
+msgstr "_Python-Konsole"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:94
+msgid "Show Totem's Python console"
+msgstr "Python-Konsole von Totem anzeigen"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:100
+msgid "Python Debugger"
+msgstr "Python-Debugger"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:101
+msgid "Enable remote Python debugging with rpdb2"
+msgstr "Entferntes Python-Debugging mittels rpdb2 aktivieren"
+
+#. pylint: disable-msg=E1101
+#: ../src/plugins/pythonconsole/pythonconsole.py:125
+#, python-format
+msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
+msgstr "Sie können auf das Totem.Object über 'totem_object' zugreifen:\\n%s"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:129
+msgid "Totem Python Console"
+msgstr "Totem Python-Konsole"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:139
+msgid ""
+"After you press OK, Totem will wait until you connect to it with winpdb or "
+"rpdb2. If you have not set a debugger password in DConf, it will use the "
+"default password ('totem')."
+msgstr ""
+"Nachdem Sie auf OK geklickt haben, wartet Totem, bis Sie sich über winpdb "
+"oder rpdb2 verbunden haben. Falls Sie in DConf kein Debugger-Passwort "
+"gesetzt haben, wird das vorgegebene Passwort »totem« benutzt."
+
+#: ../src/plugins/recent/recent.plugin.in.h:1
+msgid "Recent files"
+msgstr "Zuletzt verwendete Dateien"
+
+#: ../src/plugins/recent/recent.plugin.in.h:2
+msgid "Adds files that have been played to recent files"
+msgstr "Fügt abgespielte Dateien zu den kürzlich geöffneten Dateien hinzu"
 
 #: ../src/plugins/rotation/rotation.plugin.in.h:1
 msgid "Rotation Plugin"
 msgstr "Drehungs-Plugin"
 
 #: ../src/plugins/rotation/rotation.plugin.in.h:2
-msgid "Allows videos to be rotated if they're in the wrong orientation."
+msgid "Allows videos to be rotated if they are in the wrong orientation"
 msgstr ""
 "Ermöglicht das Drehen von Videos, falls diese in falscher Orientierung "
-"vorliegen."
+"vorliegen"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:60
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:50
 msgid "_Rotate Clockwise"
 msgstr "Im Uhrzeigersinn d_rehen"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:62
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:52
 msgid "Rotate Counterc_lockwise"
 msgstr "_Gegen den Uhrzeigersinn drehen"
 
+#: ../src/plugins/save-file/save-file.plugin.in.h:1
+msgid "Save Copy"
+msgstr "Eine Kopie speichern"
+
+#: ../src/plugins/save-file/save-file.plugin.in.h:2
+msgid "Save a copy of the currently playing movie"
+msgstr "Eine Kopie des gegenwärtig abgespielten Films kopieren"
+
 #: ../src/plugins/save-file/totem-save-file.c:63
 msgid "Save a Copy..."
 msgstr "Eine Kopie speichern …"
@@ -2516,10 +2355,13 @@
 msgid "Movie stream"
 msgstr "Film-Datenstrom"
 
-#: ../src/plugins/screensaver/totem-screensaver.c:116
-#: ../browser-plugin/totem-plugin-viewer.c:1891
-msgid "Playing a movie"
-msgstr "Ein Video wird wiedergegeben"
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:1
+msgid "Screen Saver"
+msgstr "Bildschirmschoner"
+
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:2
+msgid "Deactivates the screen saver when a movie is playing"
+msgstr "Deaktiviert den Bildschirmschoner bei Filmwiedergabe"
 
 #: ../src/plugins/screenshot/gallery.ui.h:1
 msgid "Screenshot width (in pixels):"
@@ -2533,23 +2375,28 @@
 msgid "Number of screenshots:"
 msgstr "Anzahl der Bildschirmfotos:"
 
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:1
-msgid "_Name:"
-msgstr "_Name:"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:2
-msgid "Save in _folder:"
-msgstr "In _Ordner speichern:"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:3
-msgid "Select a folder"
-msgstr "Ordner auswählen"
-
-#. Write the screenshot to the temporary file
-#: ../src/plugins/screenshot/gnome-screenshot-widget.c:385
-#: ../src/plugins/screenshot/totem-screenshot.c:64
-msgid "Screenshot.png"
-msgstr "Bildschirmfoto.png"
+#. translators: this is the name of the file that gets made up
+#. * with the screenshot if the entire screen is taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:147
+#, c-format
+msgid "Screenshot from %s.png"
+msgstr "Bildschirmfoto von %s.png"
+
+#. translators: this is the name of the file that gets
+#. * made up with the screenshot if the entire screen is
+#. * taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:154
+#, c-format
+msgid "Screenshot from %s - %d.png"
+msgstr "Bildschirmfoto von %s - %d.png"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:1
+msgid "Screenshot"
+msgstr "Bildschirmfoto"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:2
+msgid "Allows screenshots and galleries to be taken of videos"
+msgstr "Ermöglicht die Aufnahme von Bildschirmfotos und Galerien von Videos"
 
 #: ../src/plugins/screenshot/totem-gallery.c:91
 msgid "Save Gallery"
@@ -2575,51 +2422,49 @@
 msgid "Saving gallery as \"%s\""
 msgstr "Galerie als »%s« speichern"
 
-#: ../src/plugins/screenshot/totem-screenshot.c:113
-msgid "There was an error saving the screenshot."
-msgstr "Beim Speichern des Bildschirmfotos ist ein Fehler aufgetreten."
-
-#: ../src/plugins/screenshot/totem-screenshot.c:139
-msgid "Save Screenshot"
-msgstr "Bildschirmfoto speichern"
-
-#. Create the screenshot widget
-#. Translators: %s is the movie title and %d is an auto-incrementing number to make filename unique
-#: ../src/plugins/screenshot/totem-screenshot.c:160
-#, c-format
-msgid "Screenshot-%s-%d.png"
-msgstr "Bildschirmfoto-%s-%d.png"
-
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:88
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:220
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "Totem could not get a screenshot of the video."
 msgstr "Totem konnte kein Bildschirmfoto aus diesem Film erzeugen."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "This is not supposed to happen; please file a bug report."
 msgstr ""
 "Dies sollte eigentlich nicht passieren, bitte schicken Sie einen "
 "Fehlerbericht ein."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
-msgid "Take _Screenshot..."
-msgstr "_Bildschirmfoto aufnehmen …"
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
+msgid "Take _Screenshot"
+msgstr "Take _Screenshot"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
 msgid "Take a screenshot"
 msgstr "Ein Bildschirmfoto aufnehmen"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create Screenshot _Gallery..."
 msgstr "_Bildschirmfoto-Galerie erstellen …"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create a gallery of screenshots"
 msgstr "Galerie aus Bildschirmfotos erstellen"
 
+#: ../src/plugins/skipto/skipto.plugin.in.h:1
+#: ../src/plugins/skipto/totem-skipto.c:196
+msgid "Skip To"
+msgstr "Springen zu"
+
+#: ../src/plugins/skipto/skipto.plugin.in.h:2
+msgid "Provides the \"Skip to\" dialog"
+msgstr "Stellt den »Springen zu«-Dialog bereit"
+
+#: ../src/plugins/skipto/skipto.ui.h:1
+msgid "_Skip to:"
+msgstr "_Springen zu:"
+
 #. Update the "seconds" label so that it always has the correct singular/plural form
 #. Translators: label for the seconds selector in the "Skip to" dialogue
-#: ../src/plugins/skipto/totem-skipto.c:160
+#: ../src/plugins/skipto/totem-skipto.c:159
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "Sekunde"
@@ -2630,15 +2475,11 @@
 #. Translators: you should translate this string to a number (written in digits) which corresponds to the longer character length of the
 #. * translations for "second" and "seconds", as translated elsewhere in this file. For example, in English, "second" is 6 characters long and
 #. * "seconds" is 7 characters long, so this string should be translated to "7". See: bgo#639398
-#: ../src/plugins/skipto/totem-skipto.c:190
+#: ../src/plugins/skipto/totem-skipto.c:189
 msgctxt "Skip To label length"
 msgid "7"
 msgstr "8"
 
-#: ../src/plugins/skipto/totem-skipto.c:197
-msgid "Skip To"
-msgstr "Springen zu"
-
 #: ../src/plugins/skipto/totem-skipto-plugin.c:182
 msgid "_Skip To..."
 msgstr "_Springen zu …"
@@ -2647,126 +2488,140 @@
 msgid "Skip to a specific time"
 msgstr "Zu einer angegebenen Zeit springen"
 
-#: ../src/plugins/skipto/skipto.ui.h:1
-msgid "_Skip to:"
-msgstr "_Springen zu:"
+#~ msgid "Play movies and songs"
+#~ msgstr "Filme und Musik wiedergeben"
 
-#: ../browser-plugin/totem-plugin-viewer.c:431
-msgid "No URI to play"
-msgstr "Keine Adresse zum Wiedergeben"
+#~ msgid "Open a file"
+#~ msgstr "Eine Datei öffnen"
 
-#. translators: this is:
-#. * Open With ApplicationName
-#. * as in nautilus' right-click menu
-#: ../browser-plugin/totem-plugin-viewer.c:1107
-#, c-format
-msgid "_Open with \"%s\""
-msgstr "Öffnen _mit »%s«"
+#~ msgid "Open a non-local file"
+#~ msgstr "Eine entfernte Datei öffnen"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2136
-msgid "No playlist or playlist empty"
-msgstr "Keine oder leere Wiedergabeliste vorhanden"
+#~ msgid "Quit the program"
+#~ msgstr "Das Programm beenden"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2235
-msgid "Movie browser plugin"
-msgstr "Film-Browser-Plugin"
+#~ msgid "Configure the application"
+#~ msgstr "Die Anwendung konfigurieren"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Verify your system installation. The Totem plugin will now exit."
-msgstr ""
-"Bitte überprüfen Sie Ihre System-Installation. Das Totem-Plugin wird nun "
-"beendet."
+#~ msgid "Switch to fullscreen"
+#~ msgstr "In den Vollbild-Modus wechseln"
 
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
-msgid "Python Console"
-msgstr "Python-Konsole"
+#~ msgid "Set the repeat mode"
+#~ msgstr "Den Wiederholmodus festlegen"
 
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
-msgid "Interactive Python console."
-msgstr "Interaktive Python-Konsole."
+#~ msgid "Set the shuffle mode"
+#~ msgstr "Den Zufallsmodus festlegen"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:88
-msgid "Python Console Menu"
-msgstr "Python-Konsolenmenü"
+#~ msgid "14.4 Kbps Modem"
+#~ msgstr "14.4 Kb/s Modem"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:93
-msgid "_Python Console"
-msgstr "_Python-Konsole"
+#~ msgid "19.2 Kbps Modem"
+#~ msgstr "19.2 Kb/s Modem"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:94
-msgid "Show Totem's Python console"
-msgstr "Python-Konsole von Totem anzeigen"
+#~ msgid "28.8 Kbps Modem"
+#~ msgstr "28.8 Kb/s Modem"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:100
-msgid "Python Debugger"
-msgstr "Python-Debugger"
+#~ msgid "33.6 Kbps Modem"
+#~ msgstr "33.6 Kb/s Modem"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:101
-msgid "Enable remote Python debugging with rpdb2"
-msgstr "Entferntes Python-Debugging mittels rpdb2 aktivieren"
+#~ msgid "34.4 Kbps Modem"
+#~ msgstr "34.4 Kb/s Modem"
 
-#. pylint: disable-msg=E1101
-#: ../src/plugins/pythonconsole/pythonconsole.py:125
-#, python-format
-msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
-msgstr "Sie können auf das Totem.Object über 'totem_object' zugreifen:\\n%s"
+#~ msgid "56 Kbps Modem/ISDN"
+#~ msgstr "56 Kb/s Modem/ISDN"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:129
-msgid "Totem Python Console"
-msgstr "Totem Python-Konsole"
+#~ msgid "112 Kbps Dual ISDN/DSL"
+#~ msgstr "112 Kb/s Dual-ISDN/DSL"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:139
-msgid ""
-"After you press OK, Totem will wait until you connect to it with winpdb or "
-"rpdb2. If you have not set a debugger password in DConf, it will use the "
-"default password ('totem')."
-msgstr ""
-"Nachdem Sie auf OK geklickt haben, wartet Totem, bis Sie sich über winpdb "
-"oder rpdb2 verbunden haben. Falls Sie in DConf kein Debugger-Passwort gesetzt "
-"haben, wird das vorgegebene Passwort »totem« benutzt."
+#~ msgid "256 Kbps DSL/Cable"
+#~ msgstr "256 Kb/s DSL/Kabel"
 
-#: ../src/plugins/grilo/grilo.plugin.in.h:1
-msgid "Grilo Browser"
-msgstr "Grilo-Browser"
+#~ msgid "384 Kbps DSL/Cable"
+#~ msgstr "384 Kb/s DSL/Kabel"
 
-#: ../src/plugins/grilo/grilo.plugin.in.h:2
-msgid "A plugin to let you browse media content from various sources."
-msgstr ""
-"Ein Plugin, das die Suche nach Medieninhalten aus verschiedenen Quellen "
-"ermöglicht."
+#~ msgid "512 Kbps DSL/Cable"
+#~ msgstr "512 Kb/s DSL/Kabel"
 
-#: ../src/plugins/grilo/totem-grilo.c:452
-msgid "Browse Error"
-msgstr "Fehler beim Durchsuchen"
+#~ msgid "1.5 Mbps T1/Intranet/LAN"
+#~ msgstr "1.5 Mb/s T1/Intranet/LAN"
 
-#: ../src/plugins/grilo/totem-grilo.c:599
-msgid "Search Error"
-msgstr "Fehler beim Suchen"
+#~ msgid "Intranet/LAN"
+#~ msgstr "Intranet/LAN"
 
-#: ../src/plugins/grilo/totem-grilo.c:1219 ../src/plugins/grilo/grilo.ui.h:3
-msgid "Browse"
-msgstr "Durchsuchen"
+#~ msgid "Networking"
+#~ msgstr "Netzwerk"
 
-#: ../src/plugins/grilo/totem-grilo.c:1285 ../src/plugins/grilo/grilo.ui.h:4
-msgid "Search"
-msgstr "Suche"
+#~ msgid "Connection _speed:"
+#~ msgstr "_Verbindungsgeschwindigkeit:"
 
-#: ../src/plugins/grilo/grilo.ui.h:1
-msgid "Add to Playlist"
-msgstr "Zur Wiedergabeliste hinzufügen"
+#~ msgid "Network connection speed"
+#~ msgstr "Verbindungsgeschwindigkeit"
 
-#: ../src/plugins/grilo/grilo.ui.h:2
-msgid "Copy Location"
-msgstr "Ort kopieren"
+#~ msgid ""
+#~ "Approximate network connection speed, used to select quality on media "
+#~ "over the network."
+#~ msgstr ""
+#~ "Ungefähre Geschwindigkeit der Netzwerkverbindung, um die Qualität eines "
+#~ "übers Netzwerk übertragenen Mediums zu wählen."
+
+#~ msgid "Play Image '%s'"
+#~ msgstr "Abbild »%s« wiedergeben"
+
+#~ msgid "device%d"
+#~ msgstr "Gerät%d"
+
+#~ msgid "Play Disc '%s'"
+#~ msgstr "Medium »%s« abspielen"
+
+#~ msgid "Movie Player using %s"
+#~ msgstr "Anwendung zur Filmwiedergabe, die %s verwendet"
+
+#~ msgid ""
+#~ "Totem could not play this media (%s) although a plugin is present to "
+#~ "handle it."
+#~ msgstr ""
+#~ "Obwohl ein Plugin für diesen Medientyp (%s) verfügbar ist, konnte Totem "
+#~ "das Medium nicht wiedergeben."
+
+#~ msgid ""
+#~ "You might want to check that a disc is present in the drive and that it "
+#~ "is correctly configured."
+#~ msgstr ""
+#~ "Stellen Sie sicher, dass sich ein Medium im Laufwerk befindet und dieses "
+#~ "korrekt konfiguriert ist."
+
+#~ msgid "More information about media plugins"
+#~ msgstr "Weitere Informationen über Medien-Plugins"
+
+#~ msgid ""
+#~ "Please install the necessary plugins and restart Totem to be able to play "
+#~ "this media."
+#~ msgstr ""
+#~ "Installieren Sie diese und starten Sie Totem neu, um dieses Medium "
+#~ "wiedergeben zu können."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it does not have the "
+#~ "appropriate plugins to be able to read from the disc."
+#~ msgstr ""
+#~ "Dieser Medientyp (%s) kann nicht von Totem wiedergegeben werden, da die "
+#~ "zum Lesen des Datenträgers notwendigen Plugins nicht verfügbar sind."
 
-#~ msgid "0 frames per second"
-#~ msgstr "0 fps"
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because you do not have the "
+#~ "appropriate plugins to handle it."
+#~ msgstr ""
+#~ "Dieser Medientyp (%s) kann nicht von Totem wiedergegeben werden, da die "
+#~ "dafür notwendigen Plugins nicht verfügbar sind."
 
-#~ msgid "0 kbps"
-#~ msgstr "0 kB/s"
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it is not supported."
+#~ msgstr ""
+#~ "Dieser Medientyp (%s) kann nicht von Totem wiedergegeben werden, da er "
+#~ "nicht unterstützt wird."
 
-#~ msgid "0 x 0"
-#~ msgstr "0 × 0"
+#~ msgid "Please insert another disc to play back."
+#~ msgstr "Bitte legen Sie einen anderen Datenträger zum Abspielen ein."
 
-#~ msgid "Bemused"
-#~ msgstr "Bemused"
+#~ msgid "Totem does not support playback of Audio CDs"
+#~ msgstr "Totem unterstützt das Abspielen von Audio-CDs nicht."
diff -Nru totem-3.4.3/po/el.po totem-3.6.2/po/el.po
--- totem-3.4.3/po/el.po	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/po/el.po	2012-08-29 23:07:45.000000000 +0000
@@ -1,955 +1,926 @@
 # Greek translation of Totem
 # This file is distributed under the same license as the totem package.
 # Copyright (C) Free Software Foundation Inc, 2009~2011
-#
-# Kostas Papadimas , 2003, 2005.
+# Kostas Papadimas , 2003, 2005, 2012.
 # Nikos Charonitakis , 2005.
 # Athanasios Lefteris , 2007, 2008.
 # Simos Xenitellis , 2008.
 # Jennie Petoumenou , 2009.
 # Marios Zindilis , 2010, 2011.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: totem.HEAD\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-19 12:32+0200\n"
-"PO-Revision-Date: 2011-01-16 22:29+0200\n"
-"Last-Translator: Marios Zindilis \n"
-"Language-Team: Greek \n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=totem&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2012-07-17 09:30+0000\n"
+"PO-Revision-Date: 2012-07-20 00:33+0200\n"
+"Last-Translator: Tom Tryfonidis \n"
+"Language-Team: team@gnome.gr\n"
 "Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Virtaal 0.6.1\n"
 
-#: ../data/fullscreen.ui.h:1
-msgid "Leave Fullscreen"
-msgstr "Έξοδος από πλήρη οθόνη"
-
-#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:102
-msgid "Time:"
-msgstr "Χρόνος:"
-
-#: ../data/playlist.ui.h:1
-msgid "Add..."
-msgstr "Προσθήκη…"
-
-#: ../data/playlist.ui.h:2 ../data/video-list.ui.h:2
-msgid "Copy the location to the clipboard"
-msgstr "Αντιγραφή της τοποθεσίας στο πρόχειρο"
-
-#: ../data/playlist.ui.h:3
-msgid "Move Down"
-msgstr "Μετακίνηση κάτω"
-
-#: ../data/playlist.ui.h:4
-msgid "Move Up"
-msgstr "Μετακίνηση επάνω"
-
-#: ../data/playlist.ui.h:5
-msgid "Remove"
-msgstr "Απομάκρυνση"
-
-#: ../data/playlist.ui.h:6
-msgid "Remove file from playlist"
-msgstr "Αφαίρεση αρχείου από τη λίστα αναπαραγωγής"
-
-#: ../data/playlist.ui.h:7
-msgid "Save Playlist..."
-msgstr "Αποθήκευση λίστας αναπαραγωγής..."
-
-#: ../data/playlist.ui.h:8 ../data/totem.ui.h:77
-msgid "Select a file to use for text subtitles"
-msgstr "Επιλέξτε ένα αρχείο για να χρησιμοποιηθεί για υπότιτλους"
-
-#: ../data/playlist.ui.h:9 ../data/video-list.ui.h:4
-msgid "_Copy Location"
-msgstr "Αντι_γραφή τοποθεσίας"
-
-#: ../data/playlist.ui.h:10
-msgid "_Remove"
-msgstr "Απομάκ_ρυνση"
-
-#: ../data/playlist.ui.h:11 ../data/totem.ui.h:145
-msgid "_Select Text Subtitles..."
-msgstr "_Επιλογή υποτίτλων..."
-
-#. Channels
-#: ../data/properties.ui.h:1
-#: ../src/plugins/properties/bacon-video-widget-properties.c:175
-msgid "0 Channels"
-msgstr "0 Κανάλια"
-
-#. Sample rate
-#: ../data/properties.ui.h:2
-#: ../src/plugins/properties/bacon-video-widget-properties.c:173
-msgid "0 Hz"
-msgstr "0 Hz"
-
-#: ../data/properties.ui.h:3
-msgid "0 frames per second"
-msgstr "0 καρέ ανά δευτερόλεπτο"
+#: ../browser-plugin/totem-plugin-viewer.c:352
+#: ../src/totem-object.c:1180
+#: ../src/totem-object.c:1650
+#: ../src/totem-statusbar.c:115
+msgid "Stopped"
+msgstr "Διακόπηκε"
 
-#: ../data/properties.ui.h:4
-msgid "0 kbps"
-msgstr "0 kbps"
+#: ../browser-plugin/totem-plugin-viewer.c:364
+#: ../src/totem-object.c:1173
+msgid "Paused"
+msgstr "Σε παύση"
 
-#. 0 seconds
-#: ../data/properties.ui.h:5 ../src/backend/video-utils.c:158
-msgid "0 seconds"
-msgstr "0 δευτερόλεπτα"
+#: ../browser-plugin/totem-plugin-viewer.c:368
+#: ../src/totem-object.c:1166
+msgid "Playing"
+msgstr "Αναπαραγωγή"
 
-#: ../data/properties.ui.h:6
-msgid "0 x 0"
-msgstr "0 x 0"
+#: ../browser-plugin/totem-plugin-viewer.c:386
+#: ../src/plugins/screensaver/totem-screensaver.c:97
+msgid "Playing a movie"
+msgstr "Γίνεται αναπαραγωγή μιας ταινίας"
 
-#: ../data/properties.ui.h:7
-msgid "Album:"
-msgstr "Άλμπουμ:"
+#: ../browser-plugin/totem-plugin-viewer.c:443
+msgid "No URI to play"
+msgstr "Δεν υπάρχει URI προς αναπαραγωγή"
 
-#: ../data/properties.ui.h:8
-msgid "Artist:"
-msgstr "Καλλιτέχνης:"
+#: ../browser-plugin/totem-plugin-viewer.c:676
+#: ../browser-plugin/totem-plugin-viewer.c:1700
+msgid "Totem Movie Player"
+msgstr "Totem αναπαραγωγή ταινιών"
 
-#: ../data/properties.ui.h:9 ../data/totem.ui.h:23
-#: ../src/totem-properties-view.c:89
-msgid "Audio"
-msgstr "Ήχος"
+#. translators: this is:
+#. * Open With ApplicationName
+#. * as in nautilus' right-click menu
+#: ../browser-plugin/totem-plugin-viewer.c:1120
+#, c-format
+msgid "_Open with \"%s\""
+msgstr "Άν_οιγμα με \"%s\""
 
-#. Audio Codec
-#: ../data/properties.ui.h:10
-#: ../src/plugins/properties/bacon-video-widget-properties.c:171
-msgctxt "Audio codec"
-msgid "N/A"
-msgstr "Μη διαθέσιμο"
+#: ../browser-plugin/totem-plugin-viewer.c:1341
+#: ../src/totem-object.c:2475
+msgid "An error occurred"
+msgstr "Προέκυψε ένα σφάλμα"
 
-#: ../data/properties.ui.h:11
-msgid "Bitrate:"
-msgstr "Ρυθμός δεδομένων:"
+#: ../browser-plugin/totem-plugin-viewer.c:2033
+msgid "No playlist or playlist empty"
+msgstr "Δεν υπάρχει λίστα αναπαραγωγής ή η λίστα είναι κενή"
 
-#: ../data/properties.ui.h:12
-msgid "Channels:"
-msgstr "Κανάλια:"
+#: ../browser-plugin/totem-plugin-viewer.c:2128
+msgid "Movie browser plugin"
+msgstr "Πρόσθετη λειτουργία περιήγησης ταινιών"
 
-#: ../data/properties.ui.h:13
-msgid "Codec:"
-msgstr "Κωδικοποίηση:"
+#: ../browser-plugin/totem-plugin-viewer.c:2144
+#: ../src/totem.c:239
+msgid "Could not initialize the thread-safe libraries."
+msgstr "Αδυναμία αρχικοποίησης των βιβλιοθηκών thread-safe."
 
-#: ../data/properties.ui.h:14
-msgid "Comment:"
-msgstr "Σχόλιο:"
+#: ../browser-plugin/totem-plugin-viewer.c:2144
+msgid "Verify your system installation. The Totem plugin will now exit."
+msgstr "Επιβεβαιώστε τη σωστή εγκατάσταση του συστήματος σας. Το πρόσθετο Totem θα τερματιστεί τώρα."
 
-#: ../data/properties.ui.h:15
-msgid "Dimensions:"
-msgstr "Διαστάσεις:"
+#: ../data/fullscreen.ui.h:1
+msgid "Leave Fullscreen"
+msgstr "Έξοδος από πλήρη οθόνη"
 
-#: ../data/properties.ui.h:16
-msgid "Duration:"
-msgstr "Διάρκεια:"
+#: ../data/fullscreen.ui.h:2
+#: ../data/totem.ui.h:81
+msgid "Time:"
+msgstr "Χρόνος:"
 
-#: ../data/properties.ui.h:17
-msgid "Framerate:"
-msgstr "Ρυθμός καρέ:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
+msgid "Allow the screensaver to activate when playing audio"
+msgstr "Να επιτρέπεται η ενεργοποίηση της προστασίας οθόνης κατά την αναπαραγωγή ήχου"
 
-#: ../data/properties.ui.h:18 ../data/totem.ui.h:41
-msgid "General"
-msgstr "Γενικά"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
+msgid "Allow the screensaver to activate when playing audio. Disable if you have monitor-powered speakers."
+msgstr "Να επιτρέπεται η ενεργοποίηση της προστασίας οθόνης κατά την αναπαραγωγή ήχου. Απενεργοποιήστε το αν τα ηχεία σας τροφοδοτούνται από την οθόνη."
 
-#: ../data/properties.ui.h:19
-msgid "Sample rate:"
-msgstr "Ρυθμός δειγματοληψίας:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
+msgid "Show visual effects when no video is displayed"
+msgstr "Εμφάνιση οπτικών εφέ όταν δεν αναπαράγεται βίντεο"
 
-#: ../data/properties.ui.h:20
-msgid "Title:"
-msgstr "Τίτλος:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
+msgid "Show visual effects when playing an audio only file."
+msgstr "Εμφάνιση οπτικών εφέ κατά την αναπαραγωγή αρχείου με ήχο μόνο."
 
-#. Title
-#. Artist
-#. Album
-#. Year
-#: ../data/properties.ui.h:21
-#: ../src/plugins/properties/bacon-video-widget-properties.c:145
-#: ../src/plugins/properties/bacon-video-widget-properties.c:147
-#: ../src/plugins/properties/bacon-video-widget-properties.c:149
-#: ../src/plugins/properties/bacon-video-widget-properties.c:151
-msgid "Unknown"
-msgstr "Άγνωστο"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
+msgid "Name of the visual effects plugin"
+msgstr "Όνομα του πρόσθετου για οπτικά εφέ"
 
-#: ../data/properties.ui.h:22 ../data/totem.ui.h:104
-#: ../src/totem-properties-view.c:85
-msgid "Video"
-msgstr "Βίντεο"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
+msgid "The brightness of the video"
+msgstr "Η φωτεινότητα του βίντεο"
 
-#. Video Codec
-#: ../data/properties.ui.h:23
-#: ../src/plugins/properties/bacon-video-widget-properties.c:160
-msgctxt "Video codec"
-msgid "N/A"
-msgstr "Μη διαθέσιμο"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
+msgid "The contrast of the video"
+msgstr "Η αντίθεση του βίντεο"
 
-#: ../data/properties.ui.h:24
-msgid "Year:"
-msgstr "Έτος:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
+msgid "The hue of the video"
+msgstr "Η απόχρωση του βίντεο"
 
-#: ../data/video-list.ui.h:1
-msgid "Add the video to the playlist"
-msgstr "Προσθήκη του βίντεο στη λίστα αναπαραγωγής"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
+msgid "The saturation of the video"
+msgstr "Ο κορεσμός του βίντεο"
 
-#: ../data/video-list.ui.h:3 ../src/totem-dnd-menu.c:97
-#: ../src/plugins/jamendo/jamendo.ui.h:9
-msgid "_Add to Playlist"
-msgstr "_Προσθήκη στη λίστα αναπαραγωγής"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
+msgid "Resize the canvas automatically on file load"
+msgstr "Αυτόματη αλλαγή του μεγέθους του καμβά κατά τη φόρτωση αρχείου"
 
-#. Title
-#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:53
-#: ../src/totem-object.c:1666
-msgid "Movie Player"
-msgstr "Αναπαραγωγή πολυμέσων"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
+msgid "Repeat mode"
+msgstr "Λειτουργία επανάληψης"
 
-#: ../data/totem.desktop.in.in.in.h:2
-msgid "Play movies and songs"
-msgstr "Αναπαραγωγή τραγουδιών και ταινιών"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
+msgid "Shuffle mode"
+msgstr "Λειτουργία τυχαίας αναπαραγωγής"
 
-#: ../data/totem.ui.h:1
-msgid "1.5 Mbps T1/Intranet/LAN"
-msgstr "1.5 Mbps T1/Intranet/LAN"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
+msgid "Whether to disable deinterlacing for interlaced movies"
+msgstr "Αν θα απενεργοποιηθεί η απόπλεξη για ταινίες με πεπλεγμένη εικόνα"
 
-#: ../data/totem.ui.h:2
-msgid "112 Kbps Dual ISDN/DSL"
-msgstr "112 Kbps Διπλό ISDN/DSL"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
+msgid "Whether to enable debug for the playback engine"
+msgstr "Αν θα ενεργοποιηθεί η αποσφαλμάτωση για τη μηχανή αναπαραγωγής"
 
-#: ../data/totem.ui.h:3
-msgid "14.4 Kbps Modem"
-msgstr "14.4 Kbps Μόντεμ"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
+msgid "Type of audio output to use"
+msgstr "Τύπος εξόδου ήχου για χρήση"
 
-#: ../data/totem.ui.h:4
-msgid "16:9 (Widescreen)"
-msgstr "16:9 (Ευρεία οθόνη)"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
+msgid "Visualization quality setting"
+msgstr "Ρύθμιση ποιότητας οπτικών εφέ"
 
-#: ../data/totem.ui.h:5
-msgid "19.2 Kbps Modem"
-msgstr "19.2 Kbps Μόντεμ"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
+msgid "Quality setting for the audio visualization."
+msgstr "Ρύθμιση ποιότητας για τα οπτικά εφέ κατά την αναπαραγωγή αρχείων ήχου."
 
-#: ../data/totem.ui.h:6
-msgid "2.11:1 (DVB)"
-msgstr "2.11:1 (DVB)"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
+msgid "Network buffering threshold"
+msgstr "Κατώφλι ενδιάμεσης μνήμης για το δίκτυο"
 
-#: ../data/totem.ui.h:7
-msgid "256 Kbps DSL/Cable"
-msgstr "256 Kbps DSL/καλωδιακή"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
+msgid "Amount of data to buffer for network streams before starting to display the stream (in seconds)."
+msgstr "Ποσότητα δεδομένων που θα χρησιμοποιείται ως ενδιάμεση μνήμη για ροές δικτύου μέχρι να αρχίσει να προβάλλεται η ροή (σε δευτερόλεπτα)."
 
-#: ../data/totem.ui.h:8
-msgid "28.8 Kbps Modem"
-msgstr "28.8 Kbps Μόντεμ"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
+msgid "Subtitle font"
+msgstr "Γραμματοσειρά υποτίτλων"
 
-#: ../data/totem.ui.h:9
-msgid "33.6 Kbps Modem"
-msgstr "33.6 Kbps Μόντεμ"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
+msgid "Pango font description for subtitle rendering."
+msgstr "Περιγραφή γραμματοσειράς Pango για την εμφάνιση υποτίτλων."
 
-#: ../data/totem.ui.h:10
-msgid "34.4 Kbps Modem"
-msgstr "34.4 Kbps Μόντεμ"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
+msgid "Subtitle encoding"
+msgstr "Κωδικοποίηση υποτίτλων"
 
-#: ../data/totem.ui.h:11
-msgid "384 Kbps DSL/Cable"
-msgstr "384 Kbps DSL/καλωδιακή"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
+msgid "Encoding character set for subtitle."
+msgstr "Κωδικοποίηση χαρακτήρων για τους υπότιτλους."
 
-#: ../data/totem.ui.h:12
-msgid "4-channel"
-msgstr "4 Κανάλια"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
+msgid "Default location for the \"Open...\" dialogs"
+msgstr "Προεπιλεγμένη τοποθεσία για τους διαλόγους \"Άνοιγμα...\""
 
-#: ../data/totem.ui.h:13
-msgid "4.1-channel"
-msgstr "4.1 Κανάλια"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
+msgid "Default location for the \"Open...\" dialogs. Default is the current directory."
+msgstr "Προεπιλεγμένη τοποθεσία για τους διαλόγους \"Άνοιγμα...\"· η προεπιλογή είναι ο τρέχων κατάλογος."
 
-#: ../data/totem.ui.h:14
-msgid "4:3 (TV)"
-msgstr "4:3 (Τηλεόραση)"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
+msgid "Default location for the \"Take Screenshot\" dialogs"
+msgstr "Προεπιλεγμένη τοποθεσία για τους διαλόγους \"Λήψη στιγμιότυπου οθόνης\""
 
-#: ../data/totem.ui.h:15
-msgid "5.0-channel"
-msgstr "5.0 Κανάλια"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
+msgid "Default location for the \"Take Screenshot\" dialogs. Default is the Pictures directory."
+msgstr "Προεπιλεγμένη τοποθεσία για τους διαλόγους \"Λήψη στιγμιότυπου οθόνης\"· η προεπιλογή είναι ο κατάλογος Εικόνες."
 
-#: ../data/totem.ui.h:16
-msgid "5.1-channel"
-msgstr "5.1 Κανάλια"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
+msgid "Whether to disable the plugins in the user's home directory"
+msgstr "Αν θα απενεργοποιηθούν οι πρόσθετες λειτουργίες στο αρχικό κατάλογο του χρήστη"
 
-#: ../data/totem.ui.h:17
-msgid "512 Kbps DSL/Cable"
-msgstr "512 Kbps DSL/καλωδιακή"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
+msgid "Whether to disable the keyboard shortcuts"
+msgstr "Αν θα εμφανίζονται οι συντομεύσεις πληκτρολογίου"
 
-#: ../data/totem.ui.h:18
-msgid "56 Kbps Modem/ISDN"
-msgstr "56 Kbps Μόντεμ/ISDN"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
+msgid "Whether to autoload text subtitle files when a movie is loaded"
+msgstr "Αν θα φορτώνονται αυτόματα τα αρχεία υποτίτλων όταν φορτώνεται μια ταινία"
 
-#: ../data/totem.ui.h:19
-msgid "AC3 Passthrough"
-msgstr "AC3 Passthrough"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
+msgid "Whether to autoload external chapter files when a movie is loaded"
+msgstr "Αν θα φορτώνονται αυτόματα τα εξωτερικά αρχεία κεφαλαίων όταν φορτώνεται μια ταινία"
 
-#: ../data/totem.ui.h:20
-msgid "A_udio Menu"
-msgstr "Μενού ή_χου"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
+msgid "Whether to remember the position of played audio/video files when pausing or closing them"
+msgstr "Αν θα διατηρείται η τελευταία χρονική στιγμή κατά την αναπαραγωγή ενός αρχείου ήχου/βίντεο όταν το παύσετε ή το κλείσετε."
 
-#: ../data/totem.ui.h:21
-msgid "About this application"
-msgstr "Περί αυτής της εφαρμογής"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
+msgid "Active plugins list"
+msgstr "Λίστα ενεργών πρόσθετων λειτουργιών"
 
-#: ../data/totem.ui.h:22
-msgctxt "Aspect ratio"
-msgid "Auto"
-msgstr "Αυτόματο"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+msgid "A list of the names of the plugins which are currently active (loaded and running)."
+msgstr "Μια λίστα με τα ονόματα των πρόσθετων λειτουργιών οι οποίες είναι ενεργές αυτή τη στιγμή (έχουν φορτωθεί και τρέχουν)."
 
-#: ../data/totem.ui.h:24
-msgid "Audio Output"
-msgstr "Έξοδος ήχου"
+#: ../data/playlist.ui.h:1
+msgid "_Remove"
+msgstr "Απομάκ_ρυνση"
 
-#: ../data/totem.ui.h:25
-msgid "Clear the playlist"
-msgstr "Καθαρισμός λίστας αναπαραγωγής"
+#: ../data/playlist.ui.h:2
+msgid "Remove file from playlist"
+msgstr "Αφαίρεση αρχείου από τη λίστα αναπαραγωγής"
 
-#: ../data/totem.ui.h:26
-msgid "Co_ntrast:"
-msgstr "Α_ντίθεση:"
+#: ../data/playlist.ui.h:3
+#: ../data/video-list.ui.h:3
+msgid "_Copy Location"
+msgstr "Αντι_γραφή τοποθεσίας"
 
-#: ../data/totem.ui.h:27
-msgid "Color Balance"
-msgstr "Εξισορρόπηση χρωμάτων"
+#: ../data/playlist.ui.h:4
+#: ../data/video-list.ui.h:4
+msgid "Copy the location to the clipboard"
+msgstr "Αντιγραφή της τοποθεσίας στο πρόχειρο"
 
-#: ../data/totem.ui.h:28
-msgid "Configure plugins to extend the application"
-msgstr "Ρύθμιση πρόσθετων για την επέκταση των λειτουργιών της εφαρμογής"
+#: ../data/playlist.ui.h:5
+#: ../data/totem.ui.h:71
+msgid "_Select Text Subtitles..."
+msgstr "_Επιλογή υποτίτλων..."
 
-#: ../data/totem.ui.h:29
-msgid "Configure the application"
-msgstr "Ρύθμιση της εφαρμογής"
+#: ../data/playlist.ui.h:6
+#: ../data/totem.ui.h:72
+msgid "Select a file to use for text subtitles"
+msgstr "Επιλέξτε ένα αρχείο για να χρησιμοποιηθεί για υπότιτλους"
 
-#: ../data/totem.ui.h:30
-msgid "Connection _speed:"
-msgstr "Ταχύτητα _σύνδεσης:"
+#: ../data/playlist.ui.h:7
+msgid "Add..."
+msgstr "Προσθήκη…"
 
-#: ../data/totem.ui.h:31
-msgid "Decrease volume"
-msgstr "Μείωση έντασης"
+#: ../data/playlist.ui.h:8
+msgid "Remove"
+msgstr "Απομάκρυνση"
 
-#: ../data/totem.ui.h:32
-msgid "Disable _deinterlacing of interlaced videos"
-msgstr "Απενεργοποίηση _απόπλεξης πεπλεγμένων βίντεο"
+#: ../data/playlist.ui.h:9
+msgid "Save Playlist..."
+msgstr "Αποθήκευση λίστας αναπαραγωγής..."
 
-#: ../data/totem.ui.h:33
-msgid "Disable screensaver when playing "
-msgstr "Απενεργοποίηση προστασίας οθόνης κατά την αναπαραγωγή"
+#: ../data/playlist.ui.h:10
+msgid "Move Up"
+msgstr "Μετακίνηση επάνω"
 
-#. Tab label in the Preferences dialogue
-#: ../data/totem.ui.h:35
-msgid "Display"
-msgstr "Προβολή"
+#: ../data/playlist.ui.h:11
+msgid "Move Down"
+msgstr "Μετακίνηση κάτω"
 
-#: ../data/totem.ui.h:36
-msgid "Eject the current disc"
-msgstr "Εξαγωγή του παρόντος δίσκου"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:2
+msgid "Normal"
+msgstr "Κανονικό"
 
-#: ../data/totem.ui.h:37
-msgid "External Chapters"
-msgstr "Εξωτερικά κεφάλαια"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:4
+msgid "Large"
+msgstr "Μεγάλο"
 
 #. Audio visualization dimensions
-#: ../data/totem.ui.h:39
+#: ../data/preferences.ui.h:6
 msgid "Extra Large"
 msgstr "Πολύ μεγάλο"
 
-#: ../data/totem.ui.h:40
-msgid "Fit Window to Movie"
-msgstr "Ταίριασμα παραθύρου στην ταινία"
+#: ../data/preferences.ui.h:7
+#: ../src/backend/bacon-video-widget.c:5479
+#: ../src/totem-properties-view.c:231
+msgid "Stereo"
+msgstr "Στερεοφωνικό"
 
-#: ../data/totem.ui.h:42
-msgid "Go to the DVD menu"
-msgstr "Μετάβαση στο μενού του DVD"
+#: ../data/preferences.ui.h:8
+msgid "4-channel"
+msgstr "4 Κανάλια"
 
-#: ../data/totem.ui.h:43
-msgid "Go to the angle menu"
-msgstr "Μετάβαση στο μενού οπτικής γωνίας"
+#: ../data/preferences.ui.h:9
+msgid "4.1-channel"
+msgstr "4.1 Κανάλια"
 
-#: ../data/totem.ui.h:44
-msgid "Go to the audio menu"
-msgstr "Μετάβαση στο μενού ήχου"
+#: ../data/preferences.ui.h:10
+msgid "5.0-channel"
+msgstr "5.0 Κανάλια"
 
-#: ../data/totem.ui.h:45
-msgid "Go to the chapter menu"
-msgstr "Μετάβαση στο μενού κεφαλαίων"
+#: ../data/preferences.ui.h:11
+msgid "5.1-channel"
+msgstr "5.1 Κανάλια"
 
-#: ../data/totem.ui.h:46
-msgid "Go to the title menu"
-msgstr "Μετάβαση στο μενού τίτλων"
+#: ../data/preferences.ui.h:12
+msgid "AC3 Passthrough"
+msgstr "AC3 Passthrough"
 
-#: ../data/totem.ui.h:47
-msgid "Help contents"
-msgstr "Περιεχόμενα βοήθειας"
+#: ../data/preferences.ui.h:13
+msgid "Totem Preferences"
+msgstr "Προτιμήσεις για το Totem"
 
-#: ../data/totem.ui.h:48
-msgid "Increase volume"
-msgstr "Αύξηση έντασης"
+#: ../data/preferences.ui.h:14
+msgid "Playback"
+msgstr "Αναπαραγωγή"
 
-#: ../data/totem.ui.h:49
-msgid "Intranet/LAN"
-msgstr "Intranet/LAN"
+#: ../data/preferences.ui.h:15
+msgid "Start playing files from last position"
+msgstr "Έναρξη αναπαραγωγής των αρχείων από την τελευταία θέση"
 
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:51
-msgid "Large"
-msgstr "Μεγάλο"
+#: ../data/preferences.ui.h:16
+msgid "Text Subtitles"
+msgstr "Υπότιτλοι"
 
-#: ../data/totem.ui.h:52
+#: ../data/preferences.ui.h:17
+msgid "_Load subtitle files when movie is loaded"
+msgstr "Αυτόματη _φόρτωση αρχείων υποτίτλων όταν φορτώνεται μια ταινία"
+
+#: ../data/preferences.ui.h:18
+msgid "_Font:"
+msgstr "_Γραμματοσειρά:"
+
+#: ../data/preferences.ui.h:19
+msgid "_Encoding:"
+msgstr "_Κωδικοποίηση:"
+
+#: ../data/preferences.ui.h:20
+msgid "External Chapters"
+msgstr "Εξωτερικά κεφάλαια"
+
+#: ../data/preferences.ui.h:21
 msgid "Load _chapter files when movie is loaded"
 msgstr "Αυτόματη _φόρτωση αρχείων κεφαλαίων όταν φορτώνεται μια ταινία"
 
-#: ../data/totem.ui.h:54
-msgid "Networking"
-msgstr "Δικτύωση"
-
-#: ../data/totem.ui.h:55
-msgid "Next chapter or movie"
-msgstr "Επόμενο κεφάλαιο ή ταινία"
+#: ../data/preferences.ui.h:22
+#: ../data/properties.ui.h:1
+msgid "General"
+msgstr "Γενικά"
 
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:57
-msgid "Normal"
-msgstr "Κανονικό"
+#. Tab label in the Preferences dialogue
+#: ../data/preferences.ui.h:24
+msgid "Display"
+msgstr "Προβολή"
 
-#: ../data/totem.ui.h:58
-msgid "Open _Location..."
-msgstr "Άνοιγμα _τοποθεσίας..."
+#: ../data/preferences.ui.h:25
+msgid "_Resize the window when a new video is loaded"
+msgstr "Αλλαγή του _μεγέθους του παραθύρου όταν φορτώνεται ένα νέο βίντεο"
 
-#: ../data/totem.ui.h:59
-msgid "Open a file"
-msgstr "Άνοιγμα ενός αρχείου"
+#: ../data/preferences.ui.h:26
+msgid "Disable _deinterlacing of interlaced videos"
+msgstr "Απενεργοποίηση _απόπλεξης πεπλεγμένων βίντεο"
 
-#: ../data/totem.ui.h:60
-msgid "Open a non-local file"
-msgstr "Άνοιγμα ενός μη τοπικού αρχείου"
+#: ../data/preferences.ui.h:27
+msgid "Disable screensaver when playing "
+msgstr "Απενεργοποίηση προστασίας οθόνης κατά την αναπαραγωγή"
 
-#: ../data/totem.ui.h:61
-msgid "Play / P_ause"
-msgstr "Αναπαραγωγή / Π_αύση"
+#: ../data/preferences.ui.h:28
+#: ../data/properties.ui.h:9
+#: ../src/totem-properties-view.c:273
+msgid "Video"
+msgstr "Βίντεο"
 
-#: ../data/totem.ui.h:62
-msgid "Play or pause the movie"
-msgstr "Αναπαραγωγή ή παύση της ταινίας"
+#: ../data/preferences.ui.h:29
+msgid "Video or Audio"
+msgstr "Βίντεο ή ήχος"
 
-#: ../data/totem.ui.h:63
-msgid "Playback"
-msgstr "Αναπαραγωγή"
+#: ../data/preferences.ui.h:30
+msgid "Visual Effects"
+msgstr "Οπτικά εφέ"
 
-#: ../data/totem.ui.h:64
-msgid "Plugins..."
-msgstr "Πρόσθετες λειτουργίες..."
+#: ../data/preferences.ui.h:31
+msgid "Show _visual effects when an audio file is played"
+msgstr "Εμφάνιση οπτικών ε_φέ κατά την αναπαραγωγή αρχείων ήχου"
 
-#: ../data/totem.ui.h:65
-msgid "Prefere_nces"
-msgstr "Προτι_μήσεις"
+#: ../data/preferences.ui.h:32
+msgid "_Type of visualization:"
+msgstr "_Τύπος οπτικών εφέ:"
 
-#: ../data/totem.ui.h:66
-msgid "Previous chapter or movie"
-msgstr "Προηγούμενο κεφάλαιο ή ταινία"
+#: ../data/preferences.ui.h:33
+msgid "Visualization _size:"
+msgstr "_Μέγεθος οπτικών εφέ:"
 
-#: ../data/totem.ui.h:67
-msgid "Quit the program"
-msgstr "Έξοδος από το πρόγραμμα"
+#: ../data/preferences.ui.h:34
+msgid "Color Balance"
+msgstr "Εξισορρόπηση χρωμάτων"
 
-#: ../data/totem.ui.h:68
-msgid "Reset to _Defaults"
-msgstr "Επανα_φορά προεπιλογών"
+#: ../data/preferences.ui.h:35
+msgid "_Brightness:"
+msgstr "_Φωτεινότητα:"
 
-#: ../data/totem.ui.h:69
-msgid "Resize _1:1"
-msgstr "Αλλαγή μεγέθους _1:1"
+#: ../data/preferences.ui.h:36
+msgid "Co_ntrast:"
+msgstr "Α_ντίθεση:"
 
-#: ../data/totem.ui.h:70
-msgid "Resize _2:1"
-msgstr "Αλλαγή μεγέθους _2:1"
+#: ../data/preferences.ui.h:37
+msgid "Sat_uration:"
+msgstr "_Κορεσμός:"
 
-#: ../data/totem.ui.h:71
-msgid "Resize to double the original video size"
-msgstr "Αλλαγή μεγέθους στο διπλάσιο του αρχικού μεγέθους του βίντεο"
+#: ../data/preferences.ui.h:38
+msgid "_Hue:"
+msgstr "_Απόχρωση:"
 
-#: ../data/totem.ui.h:72
-msgid "Resize to half the original video size"
-msgstr "Αλλαγή μεγέθους στο μισό του αρχικού μεγέθους του βίντεο"
+#: ../data/preferences.ui.h:39
+msgid "Reset to _Defaults"
+msgstr "Επανα_φορά προεπιλογών"
 
-#: ../data/totem.ui.h:73
-msgid "Resize to the original video size"
-msgstr "Αλλαγή μεγέθους στο αρχικό μέγεθος του βίντεο"
+#: ../data/preferences.ui.h:40
+msgid "Audio Output"
+msgstr "Έξοδος ήχου"
 
-#: ../data/totem.ui.h:74
-msgid "S_idebar"
-msgstr "Πλευ_ρική στήλη"
+#: ../data/preferences.ui.h:41
+msgid "_Audio output type:"
+msgstr "Τύπος εξόδου ή_χου:"
 
-#: ../data/totem.ui.h:75
-msgid "S_ubtitles"
-msgstr "_Υπότιτλοι"
+#: ../data/preferences.ui.h:42
+#: ../data/properties.ui.h:14
+#: ../src/totem-properties-view.c:271
+msgid "Audio"
+msgstr "Ήχος"
 
-#: ../data/totem.ui.h:76
-msgid "Sat_uration:"
-msgstr "_Κορεσμός:"
+#: ../data/properties.ui.h:2
+msgid "Title:"
+msgstr "Τίτλος:"
 
-#: ../data/totem.ui.h:78
-msgid "Set the repeat mode"
-msgstr "Ορισμός της λειτουργίας επανάληψης"
+#: ../data/properties.ui.h:3
+msgid "Artist:"
+msgstr "Καλλιτέχνης:"
 
-#: ../data/totem.ui.h:79
-msgid "Set the shuffle mode"
-msgstr "Ορισμός της λειτουργίας τυχαίας αναπαραγωγής"
+#: ../data/properties.ui.h:4
+msgid "Duration:"
+msgstr "Διάρκεια:"
 
-#: ../data/totem.ui.h:80
-msgid "Sets 16:9 (widescreen) aspect ratio"
-msgstr "Ορίζει συντελεστή αναλογίας 16:9 (ευρεία οθόνη)"
+#: ../data/properties.ui.h:5
+msgid "Year:"
+msgstr "Έτος:"
 
-#: ../data/totem.ui.h:81
-msgid "Sets 2.11:1 (DVB) aspect ratio"
-msgstr "Ορίζει συντελεστή αναλογίας 2.11:1 (DVB)"
+#: ../data/properties.ui.h:6
+msgid "Album:"
+msgstr "Άλμπουμ:"
 
-#: ../data/totem.ui.h:82
-msgid "Sets 4:3 (TV) aspect ratio"
-msgstr "Ορίζει συντελεστή αναλογίας 4:3 (TV)"
+#: ../data/properties.ui.h:7
+msgid "Comment:"
+msgstr "Σχόλιο:"
 
-#: ../data/totem.ui.h:83
-msgid "Sets automatic aspect ratio"
-msgstr "Ορίζει αυτόματο συντελεστή αναλογίας"
+#: ../data/properties.ui.h:8
+msgid "Container:"
+msgstr "Πλαίσιο:"
 
-#: ../data/totem.ui.h:84
-msgid "Sets square aspect ratio"
-msgstr "Ορίζει τετράγωνο συντελεστή αναλογίας"
+#: ../data/properties.ui.h:10
+msgid "Dimensions:"
+msgstr "Διαστάσεις:"
 
-#: ../data/totem.ui.h:85
-msgid "Show _Controls"
-msgstr "Εμφάνιση ε_λέγχων"
+#: ../data/properties.ui.h:11
+msgid "Codec:"
+msgstr "Κωδικοποίηση:"
 
-#: ../data/totem.ui.h:86
-msgid "Show _visual effects when an audio file is played"
-msgstr "Εμφάνιση οπτικών ε_φέ κατά την αναπαραγωγή αρχείων ήχου"
+#: ../data/properties.ui.h:12
+msgid "Framerate:"
+msgstr "Ρυθμός καρέ:"
 
-#: ../data/totem.ui.h:87
-msgid "Show controls"
-msgstr "Εμφάνιση ελέγχων"
+#: ../data/properties.ui.h:13
+msgid "Bitrate:"
+msgstr "Ρυθμός δεδομένων:"
 
-#: ../data/totem.ui.h:88
-msgid "Show or hide the sidebar"
-msgstr "Εμφάνιση ή απόκρυψη της πλευρικής στήλης"
+#: ../data/properties.ui.h:15
+msgid "Sample rate:"
+msgstr "Ρυθμός δειγματοληψίας:"
 
-#: ../data/totem.ui.h:89
-msgid "Shuff_le Mode"
-msgstr "Λειτουργία τυ_χαίας αναπαραγωγής"
+#: ../data/properties.ui.h:16
+msgid "Channels:"
+msgstr "Κανάλια:"
 
-#: ../data/totem.ui.h:90
-msgid "Skip _Backwards"
-msgstr "Παράκαμψη προς τα _πίσω"
+#. Title
+#: ../data/totem.desktop.in.in.in.h:1
+#: ../data/totem.ui.h:80
+#: ../src/totem.c:238
+#: ../src/totem.c:247
+#: ../src/totem-menu.c:790
+#: ../src/totem-object.c:1658
+msgid "Videos"
+msgstr "Βίντεο"
 
-#: ../data/totem.ui.h:91
-msgid "Skip _Forward"
-msgstr "Παράκαμψη προς τα _μπροστά"
+#: ../data/totem.desktop.in.in.in.h:2
+msgid "Play movies"
+msgstr "Αναπαραγωγή ταινιών"
 
-#: ../data/totem.ui.h:92
-msgid "Skip backwards"
-msgstr "Παράκαμψη προς τα πίσω"
+#: ../data/totem.desktop.in.in.in.h:3
+msgid "Video;Movie;Film;Clip;Series;Player;DVD;TV;Disc;"
+msgstr "Βίντεο;Ταινία;Φιλμ;Clip;Σειρά;Αναπαραγωγέας;DVD;Τηλεόραση;Δίσκος"
 
-#: ../data/totem.ui.h:93
-msgid "Skip forward"
-msgstr "Παράκαμψη προς τα μπροστά"
+#: ../data/totem.ui.h:1
+msgid "_Open"
+msgstr "Άν_οιγμα"
 
-#: ../data/totem.ui.h:94
-msgid "Square"
-msgstr "Τετράγωνο"
+#: ../data/totem.ui.h:2
+msgid "Open _Location"
+msgstr "Άνοιγμα το_ποθεσίας"
 
-#: ../data/totem.ui.h:95
-msgid "Start playing files from last position"
-msgstr "Έναρξη αναπαραγωγής των αρχείων από την τελευταία θέση"
+#: ../data/totem.ui.h:3
+msgid "_Fullscreen"
+msgstr "_Πλήρης οθόνη"
 
-#: ../data/totem.ui.h:96 ../src/backend/bacon-video-widget-gst-0.10.c:6003
-msgid "Stereo"
-msgstr "Στερεοφωνικό"
+#: ../data/totem.ui.h:4
+msgid "Prefere_nces"
+msgstr "Προτι_μήσεις"
 
-#: ../data/totem.ui.h:97
-msgid "Switch An_gles"
-msgstr "Αλλαγή _γωνίας"
+#: ../data/totem.ui.h:5
+msgid "Shuff_le"
+msgstr "Τυχαία ανα_παραγωγή"
 
-#: ../data/totem.ui.h:98
-msgid "Switch camera angles"
-msgstr "Αλλαγή γωνίας κάμερας"
+#: ../data/totem.ui.h:6
+msgid "_Repeat"
+msgstr "_Επανάληψη"
 
-#: ../data/totem.ui.h:99
-msgid "Switch to fullscreen"
-msgstr "Αλλαγή σε πλήρη οθόνη"
+#: ../data/totem.ui.h:7
+msgid "_Quit"
+msgstr "Έ_ξοδος"
 
-#: ../data/totem.ui.h:100
-msgid "Text Subtitles"
-msgstr "Υπότιτλοι"
+#: ../data/totem.ui.h:8
+msgid "_Movie"
+msgstr "_Ταινία"
 
-#: ../data/totem.ui.h:101
-msgid "Time seek bar"
-msgstr "Μπάρα χρονικής αναζήτησης"
+#: ../data/totem.ui.h:9
+msgid "_Eject"
+msgstr "Ε_ξαγωγή"
 
-#: ../data/totem.ui.h:103
-msgid "Totem Preferences"
-msgstr "Προτιμήσεις για το Totem"
+#: ../data/totem.ui.h:10
+msgid "Eject the current disc"
+msgstr "Εξαγωγή του παρόντος δίσκου"
 
-#: ../data/totem.ui.h:105
-msgid "Video or Audio"
-msgstr "Βίντεο ή ήχος"
+#: ../data/totem.ui.h:11
+msgid "_Properties"
+msgstr "_Ιδιότητες"
 
-#: ../data/totem.ui.h:106
+#: ../data/totem.ui.h:12
 msgid "View the properties of the current stream"
 msgstr "Προβολή των ιδιοτήτων της τρέχουσας ροής"
 
-#: ../data/totem.ui.h:107
-msgid "Visual Effects"
-msgstr "Οπτικά εφέ"
+#: ../data/totem.ui.h:13
+msgid "Play / P_ause"
+msgstr "Αναπαραγωγή / Π_αύση"
 
-#: ../data/totem.ui.h:108
-msgid "Visualization _size:"
-msgstr "_Μέγεθος οπτικών εφέ:"
+#: ../data/totem.ui.h:14
+msgid "Play or pause the movie"
+msgstr "Αναπαραγωγή ή παύση της ταινίας"
 
-#: ../data/totem.ui.h:109
-msgid "Volume _Down"
-msgstr "_Μείωση έντασης"
+#: ../data/totem.ui.h:15
+msgid "_Edit"
+msgstr "_Επεξεργασία"
 
-#: ../data/totem.ui.h:110
-msgid "Volume _Up"
-msgstr "_Αύξηση έντασης"
+#: ../data/totem.ui.h:16
+msgid "_Clear Playlist"
+msgstr "_Καθαρισμός λίστας αναπαραγωγής"
 
-#: ../data/totem.ui.h:111
-msgid "Zoom In"
-msgstr "Μεγέθυνση"
+#: ../data/totem.ui.h:17
+msgid "Clear the playlist"
+msgstr "Καθαρισμός λίστας αναπαραγωγής"
 
-#: ../data/totem.ui.h:112
-msgid "Zoom Out"
-msgstr "Σμίκρυνση"
-
-#: ../data/totem.ui.h:113
-msgid "Zoom Reset"
-msgstr "Επαναφορά μεγέθυνσης"
+#: ../data/totem.ui.h:18
+msgid "Plugins..."
+msgstr "Πρόσθετες λειτουργίες..."
 
-#: ../data/totem.ui.h:114
-msgid "Zoom in"
-msgstr "Μεγέθυνση"
+#: ../data/totem.ui.h:19
+msgid "Configure plugins to extend the application"
+msgstr "Ρύθμιση πρόσθετων για την επέκταση των λειτουργιών της εφαρμογής"
 
-#: ../data/totem.ui.h:115
-msgid "Zoom out"
-msgstr "Σμίκρυνση"
-
-#: ../data/totem.ui.h:116
-msgid "Zoom reset"
-msgstr "Επαναφορά μεγέθυνσης"
+#: ../data/totem.ui.h:20
+msgid "_View"
+msgstr "_Προβολή"
 
-#: ../data/totem.ui.h:117
-msgid "_About"
-msgstr "_Περί"
+#: ../data/totem.ui.h:21
+msgid "Fit Window to Movie"
+msgstr "Ταίριασμα παραθύρου στην ταινία"
 
-#: ../data/totem.ui.h:118
-msgid "_Angle Menu"
-msgstr "Μενού οπτικής _γωνίας"
+#: ../data/totem.ui.h:22
+msgid "_Resize 1:2"
+msgstr "Α_λλαγή μεγέθους 1:2"
 
-#: ../data/totem.ui.h:119
-msgid "_Aspect Ratio"
-msgstr "_Συντελεστής αναλογίας"
+#: ../data/totem.ui.h:23
+msgid "Resize to half the original video size"
+msgstr "Αλλαγή μεγέθους στο μισό του αρχικού μεγέθους του βίντεο"
 
-#: ../data/totem.ui.h:120
-msgid "_Audio output type:"
-msgstr "Τύπος εξόδου ή_χου:"
+#: ../data/totem.ui.h:24
+msgid "Resize _1:1"
+msgstr "Αλλαγή μεγέθους _1:1"
 
-#: ../data/totem.ui.h:121
-msgid "_Brightness:"
-msgstr "_Φωτεινότητα:"
+#: ../data/totem.ui.h:25
+msgid "Resize to the original video size"
+msgstr "Αλλαγή μεγέθους στο αρχικό μέγεθος του βίντεο"
 
-#: ../data/totem.ui.h:122
-msgid "_Chapter Menu"
-msgstr "Μενού κε_φαλαίων"
+#: ../data/totem.ui.h:26
+msgid "Resize _2:1"
+msgstr "Αλλαγή μεγέθους _2:1"
 
-#: ../data/totem.ui.h:123
-msgid "_Clear Playlist"
-msgstr "_Καθαρισμός λίστας αναπαραγωγής"
+#: ../data/totem.ui.h:27
+msgid "Resize to double the original video size"
+msgstr "Αλλαγή μεγέθους στο διπλάσιο του αρχικού μεγέθους του βίντεο"
 
-#: ../data/totem.ui.h:124
-msgid "_Contents"
-msgstr "Περιε_χόμενα"
+#: ../data/totem.ui.h:28
+msgid "_Aspect Ratio"
+msgstr "_Συντελεστής αναλογίας"
 
-#: ../data/totem.ui.h:125
-msgid "_DVD Menu"
-msgstr "Μενού _DVD"
+#: ../data/totem.ui.h:29
+msgid "Switch An_gles"
+msgstr "Αλλαγή _γωνίας"
 
-#: ../data/totem.ui.h:126
-msgid "_Edit"
-msgstr "_Επεξεργασία"
+#: ../data/totem.ui.h:30
+msgid "Switch camera angles"
+msgstr "Αλλαγή γωνίας κάμερας"
 
-#: ../data/totem.ui.h:127
-msgid "_Eject"
-msgstr "Ε_ξαγωγή"
+#: ../data/totem.ui.h:31
+msgid "_Go"
+msgstr "_Μετάβαση"
 
-#: ../data/totem.ui.h:128
-msgid "_Encoding:"
-msgstr "_Κωδικοποίηση:"
+#: ../data/totem.ui.h:32
+msgid "_DVD Menu"
+msgstr "Μενού _DVD"
 
-#: ../data/totem.ui.h:129
-msgid "_Font:"
-msgstr "_Γραμματοσειρά:"
+#: ../data/totem.ui.h:33
+msgid "Go to the DVD menu"
+msgstr "Μετάβαση στο μενού του DVD"
 
-#: ../data/totem.ui.h:130
-msgid "_Fullscreen"
-msgstr "_Πλήρης οθόνη"
+#: ../data/totem.ui.h:34
+msgid "_Title Menu"
+msgstr "Μενού _τίτλων"
 
-#: ../data/totem.ui.h:131
-msgid "_Go"
-msgstr "_Μετάβαση"
+#: ../data/totem.ui.h:35
+msgid "Go to the title menu"
+msgstr "Μετάβαση στο μενού τίτλων"
 
-#: ../data/totem.ui.h:132
-msgid "_Help"
-msgstr "_Βοήθεια"
+#: ../data/totem.ui.h:36
+msgid "A_udio Menu"
+msgstr "Μενού ή_χου"
 
-#: ../data/totem.ui.h:133
-msgid "_Hue:"
-msgstr "_Απόχρωση:"
+#: ../data/totem.ui.h:37
+msgid "Go to the audio menu"
+msgstr "Μετάβαση στο μενού ήχου"
 
-#: ../data/totem.ui.h:134
-msgid "_Languages"
-msgstr "Γ_λώσσες"
+#: ../data/totem.ui.h:38
+msgid "_Angle Menu"
+msgstr "Μενού οπτικής _γωνίας"
 
-#: ../data/totem.ui.h:135
-msgid "_Load subtitle files when movie is loaded"
-msgstr "Αυτόματη _φόρτωση αρχείων υποτίτλων όταν φορτώνεται μια ταινία"
+#: ../data/totem.ui.h:39
+msgid "Go to the angle menu"
+msgstr "Μετάβαση στο μενού οπτικής γωνίας"
 
-#: ../data/totem.ui.h:136
-msgid "_Movie"
-msgstr "_Ταινία"
+#: ../data/totem.ui.h:40
+msgid "_Chapter Menu"
+msgstr "Μενού κε_φαλαίων"
 
-#: ../data/totem.ui.h:137
+#: ../data/totem.ui.h:41
+msgid "Go to the chapter menu"
+msgstr "Μετάβαση στο μενού κεφαλαίων"
+
+#: ../data/totem.ui.h:42
 msgid "_Next Chapter/Movie"
 msgstr "Επόμε_νο κεφάλαιο/ταινία"
 
-#: ../data/totem.ui.h:138
-msgid "_Open..."
-msgstr "Άν_οιγμα..."
+#: ../data/totem.ui.h:43
+msgid "Next chapter or movie"
+msgstr "Επόμενο κεφάλαιο ή ταινία"
 
-#: ../data/totem.ui.h:139
+#: ../data/totem.ui.h:44
 msgid "_Previous Chapter/Movie"
 msgstr "_Προηγούμενο κεφάλαιο/ταινία"
 
-#: ../data/totem.ui.h:140
-msgid "_Properties"
-msgstr "_Ιδιότητες"
+#: ../data/totem.ui.h:45
+msgid "Previous chapter or movie"
+msgstr "Προηγούμενο κεφάλαιο ή ταινία"
 
-#: ../data/totem.ui.h:141
-msgid "_Quit"
-msgstr "Έ_ξοδος"
+#: ../data/totem.ui.h:46
+msgid "_Sound"
+msgstr "Ή_χος"
 
-#: ../data/totem.ui.h:142
-msgid "_Repeat Mode"
-msgstr "Λειτουργία επανάλη_ψης"
+#: ../data/totem.ui.h:47
+msgid "Volume _Up"
+msgstr "_Αύξηση έντασης"
 
-#: ../data/totem.ui.h:143
-msgid "_Resize 1:2"
-msgstr "Α_λλαγή μεγέθους 1:2"
+#: ../data/totem.ui.h:48
+msgid "Increase volume"
+msgstr "Αύξηση έντασης"
 
-#: ../data/totem.ui.h:144
-msgid "_Resize the window when a new video is loaded"
-msgstr "Αλλαγή του _μεγέθους του παραθύρου όταν φορτώνεται ένα νέο βίντεο"
+#: ../data/totem.ui.h:49
+msgid "Volume _Down"
+msgstr "_Μείωση έντασης"
 
-#: ../data/totem.ui.h:146
-msgid "_Sound"
-msgstr "Ή_χος"
+#: ../data/totem.ui.h:50
+msgid "Decrease volume"
+msgstr "Μείωση έντασης"
 
-#: ../data/totem.ui.h:147
-msgid "_Title Menu"
-msgstr "Μενού _τίτλων"
+#: ../data/totem.ui.h:51
+msgid "_Help"
+msgstr "_Βοήθεια"
 
-#: ../data/totem.ui.h:148
-msgid "_Type of visualization:"
-msgstr "_Τύπος οπτικών εφέ:"
+#: ../data/totem.ui.h:52
+msgid "_Contents"
+msgstr "Περιε_χόμενα"
 
-#: ../data/totem.ui.h:149
-msgid "_View"
-msgstr "_Προβολή"
+#: ../data/totem.ui.h:53
+msgid "Help contents"
+msgstr "Περιεχόμενα βοήθειας"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
-msgid ""
-"A list of the names of the plugins which are currently active (loaded and "
-"running)."
-msgstr ""
-"Μια λίστα με τα ονόματα των πρόσθετων λειτουργιών οι οποίες είναι ενεργές "
-"αυτή τη στιγμή (έχουν φορτωθεί και τρέχουν)."
+#: ../data/totem.ui.h:54
+msgid "_About"
+msgstr "_Περί"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
-msgid "Active plugins list"
-msgstr "Λίστα ενεργών πρόσθετων λειτουργιών"
+#: ../data/totem.ui.h:55
+msgid "About this application"
+msgstr "Περί αυτής της εφαρμογής"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
-msgid "Allow the screensaver to activate when playing audio"
-msgstr ""
-"Να επιτρέπεται η ενεργοποίηση της προστασίας οθόνης κατά την αναπαραγωγή ήχου"
+#: ../data/totem.ui.h:56
+msgid "Show _Controls"
+msgstr "Εμφάνιση ε_λέγχων"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
-msgid ""
-"Allow the screensaver to activate when playing audio. Disable if you have "
-"monitor-powered speakers."
-msgstr ""
-"Να επιτρέπεται η ενεργοποίηση της προστασίας οθόνης κατά την αναπαραγωγή "
-"ήχου. Απενεργοποιήστε το αν τα ηχεία σας τροφοδοτούνται από την οθόνη."
+#: ../data/totem.ui.h:57
+msgid "Show controls"
+msgstr "Εμφάνιση ελέγχων"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
-msgid ""
-"Amount of data to buffer for network streams before starting to display the "
-"stream (in seconds)."
-msgstr ""
-"Ποσότητα δεδομένων που θα χρησιμοποιείται ως ενδιάμεση μνήμη για ροές "
-"δικτύου μέχρι να αρχίσει να προβάλλεται η ροή (σε δευτερόλεπτα)."
+#: ../data/totem.ui.h:58
+msgid "S_idebar"
+msgstr "Πλευ_ρική στήλη"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
-msgid ""
-"Approximate network connection speed, used to select quality on media over "
-"the network."
-msgstr ""
-"Ταχύτητα δικτύου (κατά προσέγγιση), χρησιμοποιείται για την επιλογή της "
-"ποιότητας πολυμέσων στο δίκτυο."
+#: ../data/totem.ui.h:59
+msgid "Show or hide the sidebar"
+msgstr "Εμφάνιση ή απόκρυψη της πλευρικής στήλης"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
-msgid "Default location for the \"Open...\" dialogs"
-msgstr "Προεπιλεγμένη τοποθεσία για τους διαλόγους \"Άνοιγμα...\""
+#: ../data/totem.ui.h:60
+msgctxt "Aspect ratio"
+msgid "Auto"
+msgstr "Αυτόματο"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
-msgid ""
-"Default location for the \"Open...\" dialogs. Default is the current "
-"directory."
-msgstr ""
-"Προεπιλεγμένη τοποθεσία για τους διαλόγους \"Άνοιγμα...\"· η προεπιλογή "
-"είναι ο τρέχων κατάλογος."
+#: ../data/totem.ui.h:61
+msgid "Sets automatic aspect ratio"
+msgstr "Ορίζει αυτόματο συντελεστή αναλογίας"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
-msgid "Default location for the \"Take Screenshot\" dialogs"
-msgstr ""
-"Προεπιλεγμένη τοποθεσία για τους διαλόγους \"Λήψη στιγμιότυπου οθόνης\""
+#: ../data/totem.ui.h:62
+msgid "Square"
+msgstr "Τετράγωνο"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
-msgid ""
-"Default location for the \"Take Screenshot\" dialogs. Default is the "
-"Pictures directory."
-msgstr ""
-"Προεπιλεγμένη τοποθεσία για τους διαλόγους \"Λήψη στιγμιότυπου οθόνης\"· η "
-"προεπιλογή είναι ο κατάλογος Εικόνες."
+#: ../data/totem.ui.h:63
+msgid "Sets square aspect ratio"
+msgstr "Ορίζει τετράγωνο συντελεστή αναλογίας"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
-msgid "Encoding character set for subtitle."
-msgstr "Κωδικοποίηση χαρακτήρων για τους υπότιτλους."
+#: ../data/totem.ui.h:64
+msgid "4:3 (TV)"
+msgstr "4:3 (Τηλεόραση)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
-msgid "Name of the visual effects plugin"
-msgstr "Όνομα του πρόσθετου για οπτικά εφέ"
+#: ../data/totem.ui.h:65
+msgid "Sets 4:3 (TV) aspect ratio"
+msgstr "Ορίζει συντελεστή αναλογίας 4:3 (TV)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
-msgid "Network buffering threshold"
-msgstr "Κατώφλι ενδιάμεσης μνήμης για το δίκτυο"
+#: ../data/totem.ui.h:66
+msgid "16:9 (Widescreen)"
+msgstr "16:9 (Ευρεία οθόνη)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
-msgid "Network connection speed"
-msgstr "Ταχύτητα σύνδεσης δικτύου"
+#: ../data/totem.ui.h:67
+msgid "Sets 16:9 (widescreen) aspect ratio"
+msgstr "Ορίζει συντελεστή αναλογίας 16:9 (ευρεία οθόνη)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
-msgid "Pango font description for subtitle rendering."
-msgstr "Περιγραφή γραμματοσειράς Pango για την εμφάνιση υποτίτλων."
+#: ../data/totem.ui.h:68
+msgid "2.11:1 (DVB)"
+msgstr "2.11:1 (DVB)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
-msgid "Quality setting for the audio visualization."
-msgstr "Ρύθμιση ποιότητας για τα οπτικά εφέ κατά την αναπαραγωγή αρχείων ήχου."
+#: ../data/totem.ui.h:69
+msgid "Sets 2.11:1 (DVB) aspect ratio"
+msgstr "Ορίζει συντελεστή αναλογίας 2.11:1 (DVB)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
-msgid "Repeat mode"
-msgstr "Λειτουργία επανάληψης"
+#: ../data/totem.ui.h:70
+msgid "S_ubtitles"
+msgstr "_Υπότιτλοι"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
-msgid "Resize the canvas automatically on file load"
-msgstr "Αυτόματη αλλαγή του μεγέθους του καμβά κατά τη φόρτωση αρχείου"
+#: ../data/totem.ui.h:73
+msgid "_Languages"
+msgstr "Γ_λώσσες"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
-msgid "Show visual effects when no video is displayed"
-msgstr "Εμφάνιση οπτικών εφέ όταν δεν αναπαράγεται βίντεο"
+#: ../data/totem.ui.h:74
+msgid "Zoom In"
+msgstr "Μεγέθυνση"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
-msgid "Show visual effects when playing an audio only file."
-msgstr "Εμφάνιση οπτικών εφέ κατά την αναπαραγωγή αρχείου με ήχο μόνο."
+#: ../data/totem.ui.h:75
+msgid "Zoom in"
+msgstr "Μεγέθυνση"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
-msgid "Shuffle mode"
-msgstr "Λειτουργία τυχαίας αναπαραγωγής"
+#: ../data/totem.ui.h:76
+msgid "Skip _Forward"
+msgstr "Παράκαμψη προς τα _μπροστά"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
-msgid "Subtitle encoding"
-msgstr "Κωδικοποίηση υποτίτλων"
+#: ../data/totem.ui.h:77
+msgid "Skip forward"
+msgstr "Παράκαμψη προς τα μπροστά"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
-msgid "Subtitle font"
-msgstr "Γραμματοσειρά υποτίτλων"
+#: ../data/totem.ui.h:78
+msgid "Skip _Backwards"
+msgstr "Παράκαμψη προς τα _πίσω"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
-msgid "The brightness of the video"
-msgstr "Η φωτεινότητα του βίντεο"
+#: ../data/totem.ui.h:79
+msgid "Skip backwards"
+msgstr "Παράκαμψη προς τα πίσω"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
-msgid "The contrast of the video"
-msgstr "Η αντίθεση του βίντεο"
+#: ../data/totem.ui.h:82
+msgid "Time seek bar"
+msgstr "Μπάρα χρονικής αναζήτησης"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
-msgid "The hue of the video"
-msgstr "Η απόχρωση του βίντεο"
+#: ../data/uri.ui.h:1
+msgid "Enter the _address of the file you would like to open:"
+msgstr "Εισάγετε τη _διεύθυνση του αρχείου που θέλετε να ανοίξετε:"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
-msgid "The saturation of the video"
-msgstr "Ο κορεσμός του βίντεο"
+#: ../data/video-list.ui.h:1
+#: ../src/totem-dnd-menu.c:97
+msgid "_Add to Playlist"
+msgstr "_Προσθήκη στη λίστα αναπαραγωγής"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
-msgid "Type of audio output to use"
-msgstr "Τύπος εξόδου ήχου για χρήση"
+#: ../data/video-list.ui.h:2
+msgid "Add the video to the playlist"
+msgstr "Προσθήκη του βίντεο στη λίστα αναπαραγωγής"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
-msgid "Visualization quality setting"
-msgstr "Ρύθμιση ποιότητας οπτικών εφέ"
+#: ../src/backend/bacon-video-widget.c:1641
+msgid "Password requested for RTSP server"
+msgstr "Αίτηση συνθηματιικού πρόσβασης για τον διακομιστή RTSP"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
-msgid "Whether to autoload external chapter files when a movie is loaded"
-msgstr ""
-"Αν θα φορτώνονται αυτόματα τα εξωτερικά αρχεία κεφαλαίων όταν φορτώνεται μια "
-"ταινία"
+#: ../src/backend/bacon-video-widget.c:2927
+#, c-format
+msgid "Audio Track #%d"
+msgstr "Κομμάτι ήχου #%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
-msgid "Whether to autoload text subtitle files when a movie is loaded"
-msgstr ""
-"Αν θα φορτώνονται αυτόματα τα αρχεία υποτίτλων όταν φορτώνεται μια ταινία"
+#: ../src/backend/bacon-video-widget.c:2931
+#, c-format
+msgid "Subtitle #%d"
+msgstr "Υπότιτλος #%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
-msgid "Whether to disable deinterlacing for interlaced movies"
-msgstr "Αν θα απενεργοποιηθεί η απόπλεξη για ταινίες με πεπλεγμένη εικόνα"
+#: ../src/backend/bacon-video-widget.c:3328
+msgid "The server you are trying to connect to is not known."
+msgstr "Ο διακομιστής που προσπαθείτε να συνδεθείτε δεν είναι γνωστός."
+
+#: ../src/backend/bacon-video-widget.c:3331
+msgid "The connection to this server was refused."
+msgstr "Απορρίφθηκε η σύνδεση σε αυτόν τον διακομιστή."
+
+#: ../src/backend/bacon-video-widget.c:3334
+msgid "The specified movie could not be found."
+msgstr "Δε βρέθηκε η συγκεκριμένη ταινία."
+
+#: ../src/backend/bacon-video-widget.c:3341
+msgid "The server refused access to this file or stream."
+msgstr "Ο διακομιστής αρνήθηκε την πρόσβαση σε αυτό το αρχείο ή την ροή."
+
+#: ../src/backend/bacon-video-widget.c:3347
+msgid "Authentication is required to access this file or stream."
+msgstr "Απαιτείται πιστοποίηση για την πρόσβαση σε αυτό το αρχείο ή την ροή."
+
+#: ../src/backend/bacon-video-widget.c:3354
+msgid "You are not allowed to open this file."
+msgstr "Δεν επιτρέπεται να ανοίξετε αυτό το αρχείο."
+
+#: ../src/backend/bacon-video-widget.c:3359
+msgid "This location is not a valid one."
+msgstr "Δεν είναι έγκυρη αυτή η τοποθεσία."
+
+#: ../src/backend/bacon-video-widget.c:3367
+msgid "The movie could not be read."
+msgstr "Δεν ήταν δυνατή η ανάγνωση της ταινίας."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
-msgid "Whether to disable the keyboard shortcuts"
-msgstr "Αν θα εμφανίζονται οι συντομεύσεις πληκτρολογίου"
+#. should be exactly one missing thing (source or converter)
+#: ../src/backend/bacon-video-widget.c:3390
+#: ../src/backend/bacon-video-widget.c:3398
+#, c-format
+msgid "The playback of this movie requires a %s plugin which is not installed."
+msgid_plural ""
+"The playback of this movie requires the following decoders which are not installed:\n"
+"\n"
+"%s"
+msgstr[0] "Η αναπαραγωγή αυτής της ταινίας απαιτεί την πρόσθετη λειτουργία %s, η οποία δεν είναι εγκατεστημένη."
+msgstr[1] ""
+"Η αναπαραγωγή αυτής της ταινίας απαιτεί τους ακόλουθους decoders οι οποίοι δεν είναι εγκατεστημένοι:\n"
+"\n"
+"%s"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
-msgid "Whether to disable the plugins in the user's home directory"
-msgstr ""
-"Αν θα απενεργοποιηθούν οι πρόσθετες λειτουργίες στο αρχικό κατάλογο του "
-"χρήστη"
+#: ../src/backend/bacon-video-widget.c:3409
+msgid "An audio or video stream is not handled due to missing codecs. You might need to install additional plugins to be able to play some types of movies"
+msgstr "Μια ροή ήχου ή βίντεο δεν μπορεί να αναπαραχθεί λόγω έλλειψης κωδικοποιητών. Ίσως χρειαστεί να εγκαταστήσετε πρόσθετα για να είστε σε θέση να αναπαραγάγετε κάποιους τύπους ταινιών"
+
+#: ../src/backend/bacon-video-widget.c:3419
+msgid "This file cannot be played over the network. Try downloading it locally first."
+msgstr "Αυτό το αρχείο δεν μπορεί να αναπαραχθεί μέσω του δικτύου. Αρχικά δοκιμάστε να το μεταφορτώσετε τοπικά."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:35
-msgid "Whether to enable debug for the playback engine"
-msgstr "Αν θα ενεργοποιηθεί η αποσφαλμάτωση για τη μηχανή αναπαραγωγής"
+#: ../src/backend/bacon-video-widget.c:5475
+#: ../src/totem-properties-view.c:227
+msgid "Surround"
+msgstr "Περιφερειακό"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:36
-msgid ""
-"Whether to remember the position of played audio/video files when pausing or "
-"closing them"
-msgstr ""
-"Αν θα διατηρείται η τελευταία χρονική στιγμή κατά την αναπαραγωγή ενός "
-"αρχείου ήχου/βίντεο όταν το παύσετε ή το κλείσετε."
+#: ../src/backend/bacon-video-widget.c:5477
+#: ../src/totem-properties-view.c:229
+msgid "Mono"
+msgstr "Μονοφωνικό"
 
-#: ../data/uri.ui.h:1
-msgid "Enter the _address of the file you would like to open:"
-msgstr "Εισάγετε τη _διεύθυνση του αρχείου που θέλετε να ανοίξετε:"
+#: ../src/backend/bacon-video-widget.c:5762
+msgid "Media contains no supported video streams."
+msgstr "Το αρχείο περιέχει μη υποστηριζόμενες ροές βίντεο."
+
+#: ../src/backend/bacon-video-widget.c:5944
+msgid "Some necessary plug-ins are missing. Make sure that the program is correctly installed."
+msgstr "Λείπουν μερικά απαραίτητα πρόσθετα. Βεβαιωθείτε πως το πρόγραμμα έχει εγκατασταθεί σωστά."
 
 #: ../src/eggdesktopfile.c:165
 #, c-format
@@ -979,54 +950,45 @@
 #: ../src/eggdesktopfile.c:1383
 #, c-format
 msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
-msgstr ""
-"Αδυναμία ορισμού του URI του εγγράφου ως εγγραφής 'Type=Link' (συνδέσμου) "
-"της επιφάνειας εργασίας"
+msgstr "Αδυναμία ορισμού του URI του εγγράφου ως εγγραφής 'Type=Link' (συνδέσμου) της επιφάνειας εργασίας"
 
 #: ../src/eggdesktopfile.c:1404
 #, c-format
 msgid "Not a launchable item"
 msgstr "Μη εκκινήσιμο αντικείμενο"
 
-#: ../src/eggfileformatchooser.c:235
+#: ../src/eggfileformatchooser.c:240
 #, c-format
 msgid "File _Format: %s"
 msgstr "_Μορφή αρχείου: %s"
 
-#: ../src/eggfileformatchooser.c:374
+#: ../src/eggfileformatchooser.c:379
 msgid "All Files"
 msgstr "Όλα τα αρχεία"
 
-#: ../src/eggfileformatchooser.c:375
+#: ../src/eggfileformatchooser.c:380
 msgid "All Supported Files"
 msgstr "Όλα τα υποστηριζόμενα αρχεία"
 
-#: ../src/eggfileformatchooser.c:384
+#: ../src/eggfileformatchooser.c:389
 msgid "By Extension"
 msgstr "Κατά επέκταση"
 
-#: ../src/eggfileformatchooser.c:399
+#: ../src/eggfileformatchooser.c:404
 msgid "File Format"
 msgstr "Μορφή αρχείου"
 
-#: ../src/eggfileformatchooser.c:417
+#: ../src/eggfileformatchooser.c:422
 msgid "Extension(s)"
 msgstr "Επεκτάσεις"
 
 #. Translators: the parameter is a filename
-#: ../src/eggfileformatchooser.c:652
+#: ../src/eggfileformatchooser.c:657
 #, c-format
-msgid ""
-"The program was not able to find out the file format you want to use for `"
-"%s'. Please make sure to use a known extension for that file or manually "
-"choose a file format from the list below."
-msgstr ""
-"Η εφαρμογή δεν μπόρεσε να βρει τη μορφή αρχείου που θέλετε να "
-"χρησιμοποιήσετε για το `%s'. Παρακαλώ βεβαιωθείτε ότι χρησιμοποιείτε μια "
-"γνωστή επέκταση για αυτό το αρχείο ή διαλέξτε μόνοι σας τη μορφή αρχείου από "
-"την παρακάτω λίστα."
+msgid "The program was not able to find out the file format you want to use for `%s'. Please make sure to use a known extension for that file or manually choose a file format from the list below."
+msgstr "Η εφαρμογή δεν μπόρεσε να βρει τη μορφή αρχείου που θέλετε να χρησιμοποιήσετε για το `%s'. Παρακαλώ βεβαιωθείτε ότι χρησιμοποιείτε μια γνωστή επέκταση για αυτό το αρχείο ή διαλέξτε μόνοι σας τη μορφή αρχείου από την παρακάτω λίστα."
 
-#: ../src/eggfileformatchooser.c:659
+#: ../src/eggfileformatchooser.c:664
 msgid "File format not recognized"
 msgstr "Η μορφή αρχείου δεν αναγνωρίστηκε"
 
@@ -1038,30 +1000,163 @@
 msgid "Specify file containing saved configuration"
 msgstr "Ορισμός του αρχείου που περιέχει τις αποθηκευμένες ρυθμίσεις"
 
-#: ../src/eggsmclient.c:229
-msgid "FILE"
-msgstr "ΑΡΧΕΙΟ"
+#: ../src/eggsmclient.c:229
+msgid "FILE"
+msgstr "ΑΡΧΕΙΟ"
+
+#: ../src/eggsmclient.c:232
+msgid "Specify session management ID"
+msgstr "Καθορισμός ταυτότητας διαχείρισης συνεδρίας"
+
+#: ../src/eggsmclient.c:232
+msgid "ID"
+msgstr "ID"
+
+#: ../src/eggsmclient.c:253
+msgid "Session management options:"
+msgstr "Επιλογές διαχείρισης συνεδρίας:"
+
+#: ../src/eggsmclient.c:254
+msgid "Show session management options"
+msgstr "Προβολή επιλογών διαχείρισης συνεδρίας"
+
+#. hour:minutes:seconds
+#. Translators: This is a time format, like "9:05:02" for 9
+#. * hours, 5 minutes, and 2 seconds. You may change ":" to
+#. * the separator that your locale uses or use "%Id" instead
+#. * of "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:56
+#: ../src/plugins/skipto/totem-time-entry.c:57
+#, c-format
+msgctxt "long time format"
+msgid "%d:%02d:%02d"
+msgstr "%d:%02d:%02d"
+
+#. minutes:seconds
+#. Translators: This is a time format, like "5:02" for 5
+#. * minutes and 2 seconds. You may change ":" to the
+#. * separator that your locale uses or use "%Id" instead of
+#. * "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:65
+#, c-format
+msgctxt "short time format"
+msgid "%d:%02d"
+msgstr "%d:%02d"
+
+#. Title
+#. Artist
+#. Album
+#. Year
+#. Container
+#: ../src/properties/bacon-video-widget-properties.c:107
+#: ../src/properties/bacon-video-widget-properties.c:109
+#: ../src/properties/bacon-video-widget-properties.c:111
+#: ../src/properties/bacon-video-widget-properties.c:113
+#: ../src/properties/bacon-video-widget-properties.c:119
+msgid "Unknown"
+msgstr "Άγνωστο"
+
+#. Dimensions
+#: ../src/properties/bacon-video-widget-properties.c:122
+msgctxt "Dimensions"
+msgid "N/A"
+msgstr "N/A"
+
+#. Video Codec
+#: ../src/properties/bacon-video-widget-properties.c:124
+msgctxt "Video codec"
+msgid "N/A"
+msgstr "N/A"
+
+#: ../src/properties/bacon-video-widget-properties.c:127
+msgctxt "Video bit rate"
+msgid "N/A"
+msgstr "N/A"
+
+#: ../src/properties/bacon-video-widget-properties.c:130
+#: ../src/properties/bacon-video-widget-properties.c:240
+msgctxt "Frame rate"
+msgid "N/A"
+msgstr "N/A"
+
+#: ../src/properties/bacon-video-widget-properties.c:134
+msgctxt "Audio bit rate"
+msgid "N/A"
+msgstr "N/A"
+
+#. Audio Codec
+#: ../src/properties/bacon-video-widget-properties.c:136
+msgctxt "Audio codec"
+msgid "N/A"
+msgstr "N/A"
+
+#. Sample rate
+#: ../src/properties/bacon-video-widget-properties.c:138
+msgid "0 Hz"
+msgstr "0 Hz"
+
+#. Channels
+#: ../src/properties/bacon-video-widget-properties.c:140
+msgid "0 Channels"
+msgstr "0 Κανάλια"
+
+#: ../src/properties/bacon-video-widget-properties.c:156
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d ώρα"
+msgstr[1] "%d ώρες"
+
+#: ../src/properties/bacon-video-widget-properties.c:158
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d λεπτό"
+msgstr[1] "%d λεπτά"
+
+#: ../src/properties/bacon-video-widget-properties.c:161
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d δευτερόλεπτο"
+msgstr[1] "%d δευτερόλεπτα"
 
-#: ../src/eggsmclient.c:232
-msgid "Specify session management ID"
-msgstr "Καθορισμός ταυτότητας διαχείρισης συνεδρίας"
+#. 5 hours 2 minutes 12 seconds
+#: ../src/properties/bacon-video-widget-properties.c:167
+#, c-format
+msgctxt "time"
+msgid "%s %s %s"
+msgstr "%s %s %s"
 
-#: ../src/eggsmclient.c:232
-msgid "ID"
-msgstr "ID"
+#. 2 minutes 12 seconds
+#: ../src/properties/bacon-video-widget-properties.c:170
+#, c-format
+msgctxt "time"
+msgid "%s %s"
+msgstr "%s %s"
 
-#: ../src/eggsmclient.c:253
-msgid "Session management options:"
-msgstr "Επιλογές διαχείρισης συνεδρίας:"
+#. 0 seconds
+#: ../src/properties/bacon-video-widget-properties.c:176
+msgid "0 seconds"
+msgstr "0 δευτερόλεπτα"
 
-#: ../src/eggsmclient.c:254
-msgid "Show session management options"
-msgstr "Προβολή επιλογών διαχείρισης συνεδρίας"
+#: ../src/properties/bacon-video-widget-properties.c:237
+#, c-format
+msgid "%d frame per second"
+msgid_plural "%d frames per second"
+msgstr[0] "%d καρέ ανά δευτερόλεπτο"
+msgstr[1] "%d καρέ ανά δευτερόλεπτο"
 
-#: ../src/totem-audio-preview.c:82
+#: ../src/totem-audio-preview.c:137
 msgid "Audio Preview"
 msgstr "Προεπισκόπηση ήχου"
 
+#: ../src/totem.c:239
+msgid "Verify your system installation. Totem will now exit."
+msgstr "Επιβεβαιώστε την εγκατάσταση του συστήματος σας. Το Totem τώρα θα τερματιστεί."
+
 #: ../src/totem-cell-renderer-video.c:126
 msgid "Unknown video"
 msgstr "Άγνωστο βίντεο"
@@ -1074,107 +1169,59 @@
 msgid "Cancel"
 msgstr "Ακύρωση"
 
-#: ../src/totem-fullscreen.c:617
+#: ../src/totem-fullscreen.c:573
 msgid "No File"
 msgstr "Δεν υπάρχει αρχείο"
 
-#: ../src/totem-interface.c:180 ../src/totem-interface.c:223
+#: ../src/totem-interface.c:181
+#: ../src/totem-interface.c:224
 #, c-format
 msgid "Couldn't load the '%s' interface. %s"
 msgstr "Αδυναμία φόρτωσης του '%s' περιβάλλοντος χρήστη. %s"
 
-#: ../src/totem-interface.c:180
+#: ../src/totem-interface.c:181
 msgid "The file does not exist."
 msgstr "Το αρχείο δεν υπάρχει."
 
-#: ../src/totem-interface.c:182 ../src/totem-interface.c:184
-#: ../src/totem-interface.c:225 ../src/totem-interface.c:227
+#: ../src/totem-interface.c:183
+#: ../src/totem-interface.c:185
+#: ../src/totem-interface.c:226
+#: ../src/totem-interface.c:228
 msgid "Make sure that Totem is properly installed."
 msgstr "Βεβαιωθείτε ότι το Totem έχει εγκατασταθεί σωστά."
 
-#: ../src/totem-interface.c:346
-msgid ""
-"Totem 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."
-msgstr ""
-"Το Totem είναι ελεύθερο λογισμικό: Μπορείτε να το διανείμετε εκ νέου και/ή "
-"να το τροποποιήσετε κάτω από τους όρους της GNU Γενικής Δημόσιας Άδειας "
-"Χρήσης (GPL) όπως είναι δημοσιευμένη από το Free Software Foundation· είτε "
-"με την έκδοση 2 της Άδειας, είτε (κατά την επιλογή σας) με οποιαδήποτε "
-"νεότερη έκδοση."
-
-#: ../src/totem-interface.c:350
-msgid ""
-"Totem 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 General Public License for more "
-"details."
-msgstr ""
-"Το Totem διανέμεται με την ελπίδα ότι θα είναι χρήσιμο αλλά ΧΩΡΙΣ ΚΑΜΙΑ "
-"ΑΠΟΛΥΤΩΣ ΕΓΓΥΗΣΗ για συγκεκριμένο σκοπό. Δείτε για περισσότερες λεπτομέρειες "
-"την GNU General Public License."
-
-#: ../src/totem-interface.c:354
-msgid ""
-"You should have received a copy of the GNU General Public License along with "
-"Totem; if not, write to the Free Software Foundation, Inc., 59 Temple Place, "
-"Suite 330, Boston, MA  02111-1307  USA"
-msgstr ""
-"Θα πρέπει να έχετε λάβει ένα αντίγραφο της GNU General Public License μαζί "
-"με το Totem. Αν όχι γράψτε στο Free Software Foundation, Inc., 59 Temple "
-"Place, Suite 330, Boston, MA 02111-1307 USA"
-
 #: ../src/totem-interface.c:357
-msgid ""
-"Totem contains an exception to allow the use of proprietary GStreamer "
-"plugins."
-msgstr ""
-"Το Totem περιέχει μια εξαίρεση για να επιτραπεί η χρήση ιδιωτικών πρόσθετων "
-"λειτουργιών GStreamer."
+msgid "Totem 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."
+msgstr "Το Totem είναι ελεύθερο λογισμικό: Μπορείτε να το διανείμετε εκ νέου και/ή να το τροποποιήσετε κάτω από τους όρους της GNU Γενικής Δημόσιας Άδειας Χρήσης (GPL) όπως είναι δημοσιευμένη από το Free Software Foundation· είτε με την έκδοση 2 της Άδειας, είτε (κατά την επιλογή σας) με οποιαδήποτε νεότερη έκδοση."
+
+#: ../src/totem-interface.c:361
+msgid "Totem 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 General Public License for more details."
+msgstr "Το Totem διανέμεται με την ελπίδα ότι θα είναι χρήσιμο αλλά ΧΩΡΙΣ ΚΑΜΙΑ ΑΠΟΛΥΤΩΣ ΕΓΓΥΗΣΗ για συγκεκριμένο σκοπό. Δείτε για περισσότερες λεπτομέρειες την GNU General Public License."
+
+#: ../src/totem-interface.c:365
+msgid "You should have received a copy of the GNU General Public License along with Totem; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA"
+msgstr "Θα πρέπει να έχετε λάβει ένα αντίγραφο της GNU General Public License μαζί με το Totem. Αν όχι γράψτε στο Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA"
+
+#: ../src/totem-interface.c:368
+msgid "Totem contains an exception to allow the use of proprietary GStreamer plugins."
+msgstr "Το Totem περιέχει μια εξαίρεση για να επιτραπεί η χρήση ιδιωτικών πρόσθετων λειτουργιών GStreamer."
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:192
+#: ../src/totem-menu.c:291
 msgid "None"
 msgstr "Κανένα"
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:197
+#: ../src/totem-menu.c:296
 msgctxt "Language"
 msgid "Auto"
 msgstr "Αυτόματο"
 
-#. Translators:
-#. * This is not a JPEG image, but a disc image, for example,
-#. * an ISO file
-#: ../src/totem-menu.c:739
-#, c-format
-msgid "Play Image '%s'"
-msgstr "Αναπαραγωγή εικόνας '%s'"
-
-#: ../src/totem-menu.c:742 ../src/totem-menu.c:824
-#, c-format
-msgid "device%d"
-msgstr "συσκευή%d"
-
-#: ../src/totem-menu.c:821
-#, c-format
-msgid "Play Disc '%s'"
-msgstr "Αναπαραγωγή δίσκου '%s'"
-
-#. This lists the back-end type and version, such as
-#. * Movie Player using GStreamer 0.10.1
-#: ../src/totem-menu.c:1172
-#, c-format
-msgid "Movie Player using %s"
-msgstr "Αναπαραγωγή ταινιών με χρήση %s"
-
-#: ../src/totem-menu.c:1176
+#: ../src/totem-menu.c:789
 msgid "Copyright © 2002-2009 Bastien Nocera"
 msgstr "Πνευματικά δικαιώματα © 2002-2009 Bastien Nocera"
 
-#: ../src/totem-menu.c:1181 ../browser-plugin/totem-plugin-viewer.c:1166
+#: ../src/totem-menu.c:794
 msgid "translator-credits"
 msgstr ""
 "Κώστας Παπαδήμας \n"
@@ -1184,164 +1231,86 @@
 "Τζένη Πετούμενου \n"
 "Μάριος Ζηντίλης "
 
-#: ../src/totem-menu.c:1185
+#: ../src/totem-menu.c:798
 msgid "Totem Website"
 msgstr "Ιστοσελίδα του Totem"
 
-#: ../src/totem-menu.c:1220
+#: ../src/totem-menu.c:829
 msgid "Configure Plugins"
 msgstr "Ρύθμιση πρόσθετων λειτουργιών"
 
+#: ../src/totem-object.c:162
+#, c-format
+msgid ""
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"%s\n"
+"Τρέξτε: '%s --help' για να δείτε μια πλήρη λίστα με επιλογές γραμμής εντολών.\n"
+
 #. Translators: %s is the totem version number
-#: ../src/totem-object.c:473
+#: ../src/totem-object.c:591
 #, c-format
 msgid "Totem %s"
 msgstr "Totem %s"
 
-#: ../src/totem-object.c:1046 ../browser-plugin/totem-plugin-viewer.c:368
-msgid "Playing"
-msgstr "Αναπαραγωγή"
-
-#: ../src/totem-object.c:1048 ../src/totem-options.c:52
+#: ../src/totem-object.c:1168
+#: ../src/totem-options.c:52
 msgid "Pause"
 msgstr "Παύση"
 
-#: ../src/totem-object.c:1053 ../browser-plugin/totem-plugin-viewer.c:364
-msgid "Paused"
-msgstr "Σε παύση"
-
-#. Translators: this refers to a media file
-#: ../src/totem-object.c:1055 ../src/totem-object.c:1065
+#: ../src/totem-object.c:1175
+#: ../src/totem-object.c:1185
 #: ../src/totem-options.c:51
-#: ../src/plugins/coherence_upnp/coherence_upnp.py:84
-#: ../src/plugins/coherence_upnp/coherence_upnp.py:96
 msgid "Play"
 msgstr "Αναπαραγωγή"
 
-#: ../src/totem-object.c:1060 ../src/totem-object.c:1658
-#: ../src/totem-statusbar.c:115 ../browser-plugin/totem-plugin-viewer.c:352
-msgid "Stopped"
-msgstr "Διακόπηκε"
-
-#: ../src/totem-object.c:1141 ../src/totem-object.c:1168
-#: ../src/totem-object.c:1796 ../src/totem-object.c:1959
+#: ../src/totem-object.c:1267
+#: ../src/totem-object.c:1294
+#: ../src/totem-object.c:1787
+#: ../src/totem-object.c:1942
 #, c-format
 msgid "Totem could not play '%s'."
 msgstr "Το Totem δε μπορεί να αναπαράγει '%s'."
 
-#: ../src/totem-object.c:1245
-#, c-format
-msgid ""
-"Totem could not play this media (%s) although a plugin is present to handle "
-"it."
-msgstr ""
-"Το Totem δε μπορεί να αναπαράγει αυτό το μέσο (%s) αν και υπάρχει μια "
-"πρόσθετη λειτουργία για το χειρισμό του."
-
-#: ../src/totem-object.c:1246
-msgid ""
-"You might want to check that a disc is present in the drive and that it is "
-"correctly configured."
-msgstr "Ελέγξτε ότι υπάρχει ο δίσκος στον οδηγό και ότι έχει ρυθμιστεί σωστά."
-
-#: ../src/totem-object.c:1254
-msgid "More information about media plugins"
-msgstr ""
-"Περισσότερες πληροφορίες σχετικά με τις πρόσθετες λειτουργίες πολυμέσων"
-
-#: ../src/totem-object.c:1255
-msgid ""
-"Please install the necessary plugins and restart Totem to be able to play "
-"this media."
-msgstr ""
-"Εγκαταστήστε τις απαραίτητες πρόσθετες λειτουργίες και επανεκκινήστε το "
-"Totem για να μπορέσετε να αναπαραγάγετε αυτό το μέσο."
-
-#: ../src/totem-object.c:1257
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because it does not have the "
-"appropriate plugins to be able to read from the disc."
-msgstr ""
-"Το Totem δε μπορεί να αναπαράγει πολυμέσα αυτού του είδους (%s) επειδή δεν "
-"έχετε εγκατεστημένες τις απαραίτητες πρόσθετες λειτουργίες για μπορέσει να "
-"διαβάσει από το δίσκο."
-
-#: ../src/totem-object.c:1259
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because you do not have the "
-"appropriate plugins to handle it."
-msgstr ""
-"Το Totem δε μπορεί να αναπαράγει πολυμέσα αυτού του είδους (%s) επειδή δεν "
-"έχετε εγκατεστημένες τις απαραίτητες πρόσθετες λειτουργίες για το χειρισμό "
-"τους."
-
-#: ../src/totem-object.c:1262
-#, c-format
-msgid "Totem cannot play this type of media (%s) because it is not supported."
-msgstr ""
-"Το Totem δε μπορεί να αναπαράγει πολυμέσα αυτού του είδους (%s) επειδή δεν "
-"υποστηρίζεται."
-
-#: ../src/totem-object.c:1263
-msgid "Please insert another disc to play back."
-msgstr "Παρακαλώ εισάγετε κάποιον άλλο δίσκο για να αναπαραγάγετε."
-
-#: ../src/totem-object.c:1299
-msgid "Totem was not able to play this disc."
-msgstr "Το Totem δε μπόρεσε να αναπαράγει αυτόν το δίσκο."
-
-#: ../src/totem-object.c:1300 ../src/totem-object.c:4273
-msgid "No reason."
-msgstr "Χωρίς λόγο."
-
-#: ../src/totem-object.c:1314
-msgid "Totem does not support playback of Audio CDs"
-msgstr "Το Totem δεν υποστηρίζει την αναπαραγωγή Audio CD"
-
-#: ../src/totem-object.c:1315
-msgid "Please consider using a music player or a CD extractor to play this CD"
-msgstr ""
-"Παρακαλώ χρησιμοποιήστε μια εφαρμογή αναπαραγωγής μουσικής ή μια εφαρμογή "
-"εξαγωγής ήχου από CD για να αναπαράγετε αυτό το CD"
-
-#: ../src/totem-object.c:1802
+#: ../src/totem-object.c:1793
 msgid "No error message"
 msgstr "Δεν υπάρχει μήνυμα σφάλματος"
 
-#: ../src/totem-object.c:2194
+#: ../src/totem-object.c:2133
 msgid "Totem could not display the help contents."
 msgstr "Το Totem δε μπορεί να εμφανίσει τα περιεχόμενα βοήθειας."
 
-#: ../src/totem-object.c:2532 ../src/totem-object.c:2534
-#: ../browser-plugin/totem-plugin-viewer.c:1469
-msgid "An error occurred"
-msgstr "Προέκυψε ένα σφάλμα"
-
-#: ../src/totem-object.c:4107 ../src/totem-object.c:4109
+#: ../src/totem-object.c:4019
+#: ../src/totem-object.c:4021
 msgid "Previous Chapter/Movie"
 msgstr "Προηγούμενο κεφάλαιο/ταινία"
 
-#: ../src/totem-object.c:4116 ../src/totem-object.c:4118
+#: ../src/totem-object.c:4028
+#: ../src/totem-object.c:4030
 msgid "Play / Pause"
 msgstr "Αναπαραγωγή / Παύση"
 
-#: ../src/totem-object.c:4126 ../src/totem-object.c:4128
+#: ../src/totem-object.c:4038
+#: ../src/totem-object.c:4040
 msgid "Next Chapter/Movie"
 msgstr "Επόμενο κεφάλαιο/ταινία"
 
-#. Translators: this is the tooltip text for the fullscreen button in the controls box in Totem's main window.
 #. Translators: this is the accessibility text for the fullscreen button in the controls box in Totem's main window.
-#: ../src/totem-object.c:4140 ../src/totem-object.c:4142
+#: ../src/totem-object.c:4051
+#: ../src/totem-object.c:4053
 msgid "Fullscreen"
 msgstr "Πλήρης οθόνη"
 
-#: ../src/totem-object.c:4273
+#: ../src/totem-object.c:4184
 msgid "Totem could not startup."
 msgstr "Το Totem δε μπορεί να ξεκινήσει."
 
-#: ../src/totem-open-location.c:179
+#: ../src/totem-object.c:4184
+msgid "No reason."
+msgstr "Χωρίς λόγο."
+
+#: ../src/totem-open-location.c:182
 msgid "Open Location..."
 msgstr "Άνοιγμα τοποθεσίας..."
 
@@ -1393,10 +1362,7 @@
 msgid "Quit"
 msgstr "Έξοδος"
 
-#. Translators: this refers to a media file
 #: ../src/totem-options.c:63
-#: ../src/plugins/coherence_upnp/coherence_upnp.py:87
-#: ../src/plugins/coherence_upnp/coherence_upnp.py:99
 msgid "Enqueue"
 msgstr "Σε αναμονή"
 
@@ -1417,84 +1383,117 @@
 msgid "Movies to play"
 msgstr "Ταινίες προς αναπαραγωγή"
 
-#: ../src/totem-options.c:117
+#: ../src/totem-options.c:79
+msgid "- Play movies and songs"
+msgstr "- Αναπαραγωγή ταινιών και τραγουδιών"
+
+#: ../src/totem-options.c:142
 msgid "Can't enqueue and replace at the same time"
 msgstr "Δεν γίνεται προσθήκη στη λίστα και αντικατάσταση ταυτόχρονα"
 
 #. By extension entry
-#: ../src/totem-playlist.c:157
+#: ../src/totem-playlist.c:162
 msgid "MP3 ShoutCast playlist"
 msgstr "Λίστα αναπαραγωγής MP3 ShoutCast"
 
-#: ../src/totem-playlist.c:158
+#: ../src/totem-playlist.c:163
 msgid "MP3 audio (streamed)"
 msgstr "ήχος MP3 (εκπεμπόμενος)"
 
-#: ../src/totem-playlist.c:159
+#: ../src/totem-playlist.c:164
 msgid "MP3 audio (streamed, DOS format)"
 msgstr "ήχος MP3 (εκπεμπόμενος, μορφή DOS)"
 
-#: ../src/totem-playlist.c:160
+#: ../src/totem-playlist.c:165
 msgid "XML Shareable Playlist"
 msgstr "Κοινόχρηστη λίστα αναπαραγωγής XML"
 
 #. This is "Title 3", where title is a DVD title
 #. * Note: NOT a DVD chapter
-#: ../src/totem-playlist.c:359
+#: ../src/totem-playlist.c:348
 #, c-format
 msgid "Title %d"
 msgstr "Τίτλος %d"
 
-#: ../src/totem-playlist.c:458
+#: ../src/totem-playlist.c:447
 msgid "Could not save the playlist"
 msgstr "Αδυναμία αποθήκευσης της λίστας αναπαραγωγής"
 
-#: ../src/totem-playlist.c:1033
+#: ../src/totem-playlist.c:1022
 msgid "Save Playlist"
 msgstr "Αποθήκευση λίστας αναπαραγωγής"
 
 #. translators: Playlist is the default saved playlist filename,
 #. * without the suffix
-#: ../src/totem-playlist.c:1045 ../src/totem-sidebar.c:140
+#: ../src/totem-playlist.c:1034
+#: ../src/totem-playlist.c:1263
+#: ../src/totem-sidebar.c:145
 msgid "Playlist"
 msgstr "Λίστα αναπαραγωγής"
 
-#: ../src/totem-playlist.c:1852
+#: ../src/totem-playlist.c:1862
 #, c-format
 msgid "The playlist '%s' could not be parsed. It might be damaged."
-msgstr ""
-"Η λίστα αναπαραγωγής '%s' δεν είναι αναγνώσιμη, πιθανώς να έχει καταστραφεί."
+msgstr "Η λίστα αναπαραγωγής '%s' δεν είναι αναγνώσιμη, πιθανώς να έχει καταστραφεί."
 
-#: ../src/totem-playlist.c:1853
+#: ../src/totem-playlist.c:1863
 msgid "Playlist error"
 msgstr "Σφάλμα λίστας αναπαραγωγής"
 
-#: ../src/totem-preferences.c:66
-msgid "Enable visual effects?"
-msgstr "Ενεργοποίηση οπτικών εφέ;"
-
-#: ../src/totem-preferences.c:68
-msgid ""
-"It seems you are running Totem remotely.\n"
-"Are you sure you want to enable the visual effects?"
-msgstr ""
-"Φαίνεται ότι τρέχετε το Totem μέσω απομακρυσμένης σύνδεσης.\n"
-"Είστε σίγουροι ότι θέλετε να ενεργοποιήσετε τα οπτικά εφέ;"
-
-#: ../src/totem-preferences.c:332
+#: ../src/totem-preferences.c:297
 msgid "Preferences"
 msgstr "Προτιμήσεις"
 
-#: ../src/totem-preferences.c:490
+#: ../src/totem-preferences.c:445
 msgid "Select Subtitle Font"
 msgstr "Επιλογή γραμματοσειράς υποτίτλων"
 
-#. FIXME this should be setting an error?
-#: ../src/totem-properties-main.c:114 ../src/totem-properties-view.c:83
-#: ../src/totem-properties-view.c:91
+#: ../src/totem-properties-main.c:116
+#: ../src/totem-properties-view.c:269
 msgid "Audio/Video"
 msgstr "Ήχος/Βίντεο"
 
+#: ../src/totem-properties-view.c:131
+msgid "N/A"
+msgstr "N/A"
+
+#: ../src/totem-properties-view.c:160
+#: ../src/plugins/properties/totem-movie-properties.c:152
+#: ../src/plugins/properties/totem-movie-properties.c:163
+msgctxt "Stream bit rate"
+msgid "N/A"
+msgstr "N/A"
+
+#: ../src/totem-properties-view.c:163
+#: ../src/plugins/properties/totem-movie-properties.c:152
+#: ../src/plugins/properties/totem-movie-properties.c:163
+#, c-format
+msgid "%d kbps"
+msgstr "%d kbps"
+
+#: ../src/totem-properties-view.c:180
+#: ../src/plugins/properties/totem-movie-properties.c:149
+#, c-format
+msgid "%d x %d"
+msgstr "%d x %d"
+
+#: ../src/totem-properties-view.c:212
+#: ../src/plugins/properties/totem-movie-properties.c:166
+#, c-format
+msgid "%d Hz"
+msgstr "%d Hz"
+
+#: ../src/totem-properties-view.c:219
+#: ../src/plugins/properties/totem-movie-properties.c:166
+msgctxt "Sample rate"
+msgid "N/A"
+msgstr "Μη διαθέσιμο"
+
+#: ../src/totem-properties-view.c:239
+msgctxt "Number of audio channels"
+msgid "N/A"
+msgstr "N/A"
+
 #: ../src/totem-statusbar.c:110
 msgid "0:00 / 0:00"
 msgstr "0:00 / 0:00"
@@ -1505,13 +1504,15 @@
 msgstr "%s (Ροή)"
 
 #. Elapsed / Total Length
-#: ../src/totem-statusbar.c:140 ../src/totem-time-label.c:64
+#: ../src/totem-statusbar.c:140
+#: ../src/totem-time-label.c:64
 #, c-format
 msgid "%s / %s"
 msgstr "%s / %s"
 
 #. Seeking to Time / Total Length
-#: ../src/totem-statusbar.c:143 ../src/totem-time-label.c:67
+#: ../src/totem-statusbar.c:143
+#: ../src/totem-time-label.c:67
 #, c-format
 msgid "Seek to %s / %s"
 msgstr "Αναζήτηση σε %s / %s"
@@ -1523,8 +1524,8 @@
 #. eg: 75 %
 #: ../src/totem-statusbar.c:250
 #, c-format
-msgid "%d %%"
-msgstr "%d %%"
+msgid "%lf %%"
+msgstr "%lf %%"
 
 #. eg: Paused, 0:32 / 1:05
 #: ../src/totem-statusbar.c:325
@@ -1535,15 +1536,18 @@
 #. eg: Buffering, 75 %
 #: ../src/totem-statusbar.c:330
 #, c-format
-msgid "%s, %d %%"
-msgstr "%s, %d %%"
+#| msgid "%s, %d %%"
+msgid "%s, %f %%"
+msgstr "%s, %f %%"
 
 #: ../src/totem-subtitle-encoding.c:156
 msgid "Current Locale"
 msgstr "Τρέχουσα εντοπιότητα (locale)"
 
-#: ../src/totem-subtitle-encoding.c:159 ../src/totem-subtitle-encoding.c:161
-#: ../src/totem-subtitle-encoding.c:163 ../src/totem-subtitle-encoding.c:165
+#: ../src/totem-subtitle-encoding.c:159
+#: ../src/totem-subtitle-encoding.c:161
+#: ../src/totem-subtitle-encoding.c:163
+#: ../src/totem-subtitle-encoding.c:165
 msgid "Arabic"
 msgstr "Αραβικά"
 
@@ -1551,7 +1555,8 @@
 msgid "Armenian"
 msgstr "Αρμένικα"
 
-#: ../src/totem-subtitle-encoding.c:171 ../src/totem-subtitle-encoding.c:173
+#: ../src/totem-subtitle-encoding.c:171
+#: ../src/totem-subtitle-encoding.c:173
 #: ../src/totem-subtitle-encoding.c:175
 msgid "Baltic"
 msgstr "Βαλτικής"
@@ -1560,17 +1565,22 @@
 msgid "Celtic"
 msgstr "Κελτικά"
 
-#: ../src/totem-subtitle-encoding.c:181 ../src/totem-subtitle-encoding.c:183
-#: ../src/totem-subtitle-encoding.c:185 ../src/totem-subtitle-encoding.c:187
+#: ../src/totem-subtitle-encoding.c:181
+#: ../src/totem-subtitle-encoding.c:183
+#: ../src/totem-subtitle-encoding.c:185
+#: ../src/totem-subtitle-encoding.c:187
 msgid "Central European"
 msgstr "Κεντρικής Ευρώπης"
 
-#: ../src/totem-subtitle-encoding.c:190 ../src/totem-subtitle-encoding.c:192
-#: ../src/totem-subtitle-encoding.c:194 ../src/totem-subtitle-encoding.c:196
+#: ../src/totem-subtitle-encoding.c:190
+#: ../src/totem-subtitle-encoding.c:192
+#: ../src/totem-subtitle-encoding.c:194
+#: ../src/totem-subtitle-encoding.c:196
 msgid "Chinese Simplified"
 msgstr "Κινέζικα Απλοποιημένα"
 
-#: ../src/totem-subtitle-encoding.c:199 ../src/totem-subtitle-encoding.c:201
+#: ../src/totem-subtitle-encoding.c:199
+#: ../src/totem-subtitle-encoding.c:201
 #: ../src/totem-subtitle-encoding.c:203
 msgid "Chinese Traditional"
 msgstr "Κινέζικα Παραδοσιακά"
@@ -1579,9 +1589,12 @@
 msgid "Croatian"
 msgstr "Κροατικά"
 
-#: ../src/totem-subtitle-encoding.c:209 ../src/totem-subtitle-encoding.c:211
-#: ../src/totem-subtitle-encoding.c:213 ../src/totem-subtitle-encoding.c:215
-#: ../src/totem-subtitle-encoding.c:217 ../src/totem-subtitle-encoding.c:219
+#: ../src/totem-subtitle-encoding.c:209
+#: ../src/totem-subtitle-encoding.c:211
+#: ../src/totem-subtitle-encoding.c:213
+#: ../src/totem-subtitle-encoding.c:215
+#: ../src/totem-subtitle-encoding.c:217
+#: ../src/totem-subtitle-encoding.c:219
 msgid "Cyrillic"
 msgstr "Κυριλλικά"
 
@@ -1589,7 +1602,8 @@
 msgid "Cyrillic/Russian"
 msgstr "Κυριλλικά/Ρώσικα"
 
-#: ../src/totem-subtitle-encoding.c:225 ../src/totem-subtitle-encoding.c:227
+#: ../src/totem-subtitle-encoding.c:225
+#: ../src/totem-subtitle-encoding.c:227
 msgid "Cyrillic/Ukrainian"
 msgstr "Κυριλλικά/Ουκρανικά"
 
@@ -1597,7 +1611,8 @@
 msgid "Georgian"
 msgstr "Γεωργιανά"
 
-#: ../src/totem-subtitle-encoding.c:233 ../src/totem-subtitle-encoding.c:235
+#: ../src/totem-subtitle-encoding.c:233
+#: ../src/totem-subtitle-encoding.c:235
 #: ../src/totem-subtitle-encoding.c:237
 msgid "Greek"
 msgstr "Ελληνικά"
@@ -1610,8 +1625,10 @@
 msgid "Gurmukhi"
 msgstr "Γκουρμούχι"
 
-#: ../src/totem-subtitle-encoding.c:246 ../src/totem-subtitle-encoding.c:248
-#: ../src/totem-subtitle-encoding.c:250 ../src/totem-subtitle-encoding.c:252
+#: ../src/totem-subtitle-encoding.c:246
+#: ../src/totem-subtitle-encoding.c:248
+#: ../src/totem-subtitle-encoding.c:250
+#: ../src/totem-subtitle-encoding.c:252
 msgid "Hebrew"
 msgstr "Εβραϊκά"
 
@@ -1627,13 +1644,16 @@
 msgid "Icelandic"
 msgstr "Ισλανδικά"
 
-#: ../src/totem-subtitle-encoding.c:264 ../src/totem-subtitle-encoding.c:266
+#: ../src/totem-subtitle-encoding.c:264
+#: ../src/totem-subtitle-encoding.c:266
 #: ../src/totem-subtitle-encoding.c:268
 msgid "Japanese"
 msgstr "Ιαπωνικά"
 
-#: ../src/totem-subtitle-encoding.c:271 ../src/totem-subtitle-encoding.c:273
-#: ../src/totem-subtitle-encoding.c:275 ../src/totem-subtitle-encoding.c:277
+#: ../src/totem-subtitle-encoding.c:271
+#: ../src/totem-subtitle-encoding.c:273
+#: ../src/totem-subtitle-encoding.c:275
+#: ../src/totem-subtitle-encoding.c:277
 msgid "Korean"
 msgstr "Κορεάτικα"
 
@@ -1645,366 +1665,135 @@
 msgid "Persian"
 msgstr "Περσικά"
 
-#: ../src/totem-subtitle-encoding.c:286 ../src/totem-subtitle-encoding.c:288
+#: ../src/totem-subtitle-encoding.c:286
+#: ../src/totem-subtitle-encoding.c:288
 msgid "Romanian"
-msgstr "Ρουμανικά"
-
-#: ../src/totem-subtitle-encoding.c:291
-msgid "South European"
-msgstr "Νότιας Ευρώπης"
-
-#: ../src/totem-subtitle-encoding.c:294
-msgid "Thai"
-msgstr "Ταϋλανδικά"
-
-#: ../src/totem-subtitle-encoding.c:297 ../src/totem-subtitle-encoding.c:299
-#: ../src/totem-subtitle-encoding.c:301 ../src/totem-subtitle-encoding.c:303
-msgid "Turkish"
-msgstr "Τουρκικά"
-
-#: ../src/totem-subtitle-encoding.c:306 ../src/totem-subtitle-encoding.c:308
-#: ../src/totem-subtitle-encoding.c:310 ../src/totem-subtitle-encoding.c:312
-#: ../src/totem-subtitle-encoding.c:314
-msgid "Unicode"
-msgstr "Unicode"
-
-#: ../src/totem-subtitle-encoding.c:317 ../src/totem-subtitle-encoding.c:319
-#: ../src/totem-subtitle-encoding.c:321 ../src/totem-subtitle-encoding.c:323
-#: ../src/totem-subtitle-encoding.c:325
-msgid "Western"
-msgstr "Δυτική"
-
-#: ../src/totem-subtitle-encoding.c:328 ../src/totem-subtitle-encoding.c:330
-#: ../src/totem-subtitle-encoding.c:332
-msgid "Vietnamese"
-msgstr "Βιετναμέζικα"
-
-#: ../src/totem-video-list.c:329
-msgid "No video URI"
-msgstr "Χωρίς URI για βίντεο"
-
-#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
-#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
-#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
-#: ../src/totem-video-thumbnailer.c:679
-#, c-format
-msgid ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-msgstr ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-
-#: ../src/totem-video-thumbnailer.c:680
-msgid "Filename"
-msgstr "Όνομα αρχείου"
-
-#: ../src/totem-video-thumbnailer.c:682
-msgid "Resolution"
-msgstr "Ανάλυση"
-
-#: ../src/totem-video-thumbnailer.c:685
-msgid "Duration"
-msgstr "Διάρκεια"
-
-#: ../src/totem-uri.c:502 ../src/plugins/chapters/totem-chapters.c:1000
-msgid "All files"
-msgstr "Όλα τα αρχεία"
-
-#: ../src/totem-uri.c:507 ../src/plugins/chapters/totem-chapters.c:997
-msgid "Supported files"
-msgstr "Υποστηριζόμενα αρχεία"
-
-#: ../src/totem-uri.c:519
-msgid "Audio files"
-msgstr "Αρχεία ήχου"
-
-#: ../src/totem-uri.c:527
-msgid "Video files"
-msgstr "Αρχεία βίντεο"
-
-#: ../src/totem-uri.c:537
-msgid "Subtitle files"
-msgstr "Αρχεία υποτίτλων"
-
-#: ../src/totem-uri.c:589
-msgid "Select Text Subtitles"
-msgstr "Επιλογή υποτίτλων"
-
-#: ../src/totem-uri.c:652
-msgid "Select Movies or Playlists"
-msgstr "Επιλογή ταινιών ή λιστών αναπαραγωγής"
-
-#. Options parsing
-#: ../src/totem.c:201
-msgid "- Play movies and songs"
-msgstr "- Αναπαραγωγή ταινιών και τραγουδιών"
-
-#: ../src/totem.c:212
-#, c-format
-msgid ""
-"%s\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"%s\n"
-"Τρέξτε: '%s --help' για να δείτε μια πλήρη λίστα με επιλογές γραμμής "
-"εντολών.\n"
-
-#: ../src/totem.c:254 ../src/totem.c:263
-#: ../browser-plugin/totem-plugin-viewer.c:666
-#: ../browser-plugin/totem-plugin-viewer.c:1864
-msgid "Totem Movie Player"
-msgstr "Totem αναπαραγωγή ταινιών"
-
-#: ../src/totem.c:255 ../browser-plugin/totem-plugin-viewer.c:2305
-msgid "Could not initialize the thread-safe libraries."
-msgstr "Αδυναμία αρχικοποίησης των βιβλιοθηκών thread-safe."
-
-#: ../src/totem.c:255
-msgid "Verify your system installation. Totem will now exit."
-msgstr ""
-"Επιβεβαιώστε την εγκατάσταση του συστήματος σας. Το Totem τώρα θα "
-"τερματιστεί."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:1843
-msgid "Password requested for RTSP server"
-msgstr "Αίτηση συνθηματιικού πρόσβασης για τον διακομιστή RTSP"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3115
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3119
-#, c-format
-msgid "Audio Track #%d"
-msgstr "Κομμάτι ήχου #%d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3147
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3151
-#, c-format
-msgid "Subtitle #%d"
-msgstr "Υπότιτλος #%d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3560
-msgid ""
-"The requested audio output was not found. Please select another audio output "
-"in the Multimedia Systems Selector."
-msgstr ""
-"Η απαιτούμενη έξοδος ήχου δε βρέθηκε. Παρακαλώ επιλέξτε μια άλλη έξοδο ήχου "
-"από τον Επιλογέα συστημάτων πολυμέσων."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3565
-msgid "Location not found."
-msgstr "Δε βρέθηκε η τοποθεσία."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3569
-msgid ""
-"Could not open location; you might not have permission to open the file."
-msgstr ""
-"Είναι αδύνατο το άνοιγμα της τοποθεσίας· ίσως δεν έχετε τα δικαιώματα για να "
-"ανοίξετε το αρχείο."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3580
-msgid ""
-"The video output is in use by another application. Please close other video "
-"applications, or select another video output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"Η έξοδος βίντεο χρησιμοποιείται από άλλη εφαρμογή. Παρακαλώ κλείστε τις "
-"άλλες εφαρμογές βίντεο, ή επιλέξτε μια άλλη έξοδο βίντεο από τον Επιλογέα "
-"συστημάτων πολυμέσων."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3586
-msgid ""
-"The audio output is in use by another application. Please select another "
-"audio output in the Multimedia Systems Selector. You may want to consider "
-"using a sound server."
-msgstr ""
-"Η έξοδος ήχου χρησιμοποιείται από άλλη εφαρμογή. Παρακαλώ κλείστε τις άλλες "
-"εφαρμογές ήχου, ή επιλέξτε μια άλλη έξοδο ήχου από τον Επιλογέα συστημάτων "
-"πολυμέσων. Ίσως να πρέπει να χρησιμοποιήσετε ένα εξυπηρετητή ήχου."
-
-#. should be exactly one missing thing (source or converter)
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3604
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3610
-#, c-format
-msgid "The playback of this movie requires a %s plugin which is not installed."
-msgstr ""
-"Η αναπαραγωγή αυτής της ταινίας απαιτεί την πρόσθετη λειτουργία %s, η οποία "
-"δεν είναι εγκατεστημένη."
+msgstr "Ρουμανικά"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3611
-#, c-format
-msgid ""
-"The playback of this movie requires the following decoders which are not "
-"installed:\n"
-"\n"
-"%s"
-msgstr ""
-"Για την αναπαραγωγή αυτής της ταινίας απαιτούνται οι ακόλουθοι "
-"αποκωδικοποιητές, οι οποίοι δεν είναι εγκατεστημένοι:\n"
-"\n"
-"%s"
+#: ../src/totem-subtitle-encoding.c:291
+msgid "South European"
+msgstr "Νότιας Ευρώπης"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3636
-msgid ""
-"Cannot play this file over the network. Try downloading it to disk first."
-msgstr ""
-"Αδυναμία αναπαραγωγής αυτού του αρχείου μέσω δικτύου. Μεταφορτώστε το στο "
-"δίσκο πρώτα."
+#: ../src/totem-subtitle-encoding.c:294
+msgid "Thai"
+msgstr "Ταϋλανδικά"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3708
-msgid "Media file could not be played."
-msgstr "Το αρχείο πολυμέσων δεν είναι αναγνώσιμο."
+#: ../src/totem-subtitle-encoding.c:297
+#: ../src/totem-subtitle-encoding.c:299
+#: ../src/totem-subtitle-encoding.c:301
+#: ../src/totem-subtitle-encoding.c:303
+msgid "Turkish"
+msgstr "Τουρκικά"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5999
-msgid "Surround"
-msgstr "Περιφερειακό"
+#: ../src/totem-subtitle-encoding.c:306
+#: ../src/totem-subtitle-encoding.c:308
+#: ../src/totem-subtitle-encoding.c:310
+#: ../src/totem-subtitle-encoding.c:312
+#: ../src/totem-subtitle-encoding.c:314
+msgid "Unicode"
+msgstr "Unicode"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6001
-msgid "Mono"
-msgstr "Μονοφωνικό"
+#: ../src/totem-subtitle-encoding.c:317
+#: ../src/totem-subtitle-encoding.c:319
+#: ../src/totem-subtitle-encoding.c:321
+#: ../src/totem-subtitle-encoding.c:323
+#: ../src/totem-subtitle-encoding.c:325
+msgid "Western"
+msgstr "Δυτική"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6348
-msgid "Too old version of GStreamer installed."
-msgstr "Η εγκατεστημένη έκδοση του GStreamer είναι πολύ παλιά."
+#: ../src/totem-subtitle-encoding.c:328
+#: ../src/totem-subtitle-encoding.c:330
+#: ../src/totem-subtitle-encoding.c:332
+msgid "Vietnamese"
+msgstr "Βιετναμέζικα"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6355
-msgid "Media contains no supported video streams."
-msgstr "Το αρχείο περιέχει μη υποστηριζόμενες ροές βίντεο."
+#: ../src/totem-uri.c:343
+#: ../src/plugins/chapters/totem-chapters.c:998
+msgid "All files"
+msgstr "Όλα τα αρχεία"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6840
-msgid ""
-"Failed to create a GStreamer play object. Please check your GStreamer "
-"installation."
-msgstr ""
-"Αδυναμία δημιουργίας αντικειμένου αναπαραγωγής GStreamer. Παρακαλώ ελέγξτε "
-"την εγκατάσταση του GStreamer."
+#: ../src/totem-uri.c:348
+#: ../src/plugins/chapters/totem-chapters.c:995
+msgid "Supported files"
+msgstr "Υποστηριζόμενα αρχεία"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6951
-#: ../src/backend/bacon-video-widget-gst-0.10.c:7086
-msgid ""
-"Failed to open video output. It may not be available. Please select another "
-"video output in the Multimedia Systems Selector."
-msgstr ""
-"Αποτυχία ανοίγματος εξόδου βίντεο. Μπορεί να μην είναι διαθέσιμη. Παρακαλώ "
-"επιλέξτε μια άλλη έξοδο βίντεο από τον Επιλογέα συστημάτων πολυμέσων."
+#: ../src/totem-uri.c:360
+msgid "Audio files"
+msgstr "Αρχεία ήχου"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6963
-msgid ""
-"Could not find the video output. You may need to install additional "
-"GStreamer plugins, or select another video output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"Αποτυχία ανοίγματος εξόδου βίντεο. Ίσως να χρειαστεί να εγκαταστήσετε "
-"πρόσθετες λειτουργίες GStreamer ή να επιλέξετε μια άλλη έξοδο βίντεο από τον "
-"Επιλογέα συστημάτων πολυμέσων."
+#: ../src/totem-uri.c:368
+msgid "Video files"
+msgstr "Αρχεία βίντεο"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6998
-msgid ""
-"Failed to open audio output. You may not have permission to open the sound "
-"device, or the sound server may not be running. Please select another audio "
-"output in the Multimedia Systems Selector."
-msgstr ""
-"Αποτυχία ανοίγματος εξόδου ήχου. Μπορεί να μην έχετε τα απαραίτητα "
-"δικαιώματα για να ανοίξετε τη συσκευή ήχου, ή να μην εκτελείται ο "
-"εξυπηρετητής ήχου. Παρακαλώ επιλέξτε μια άλλη έξοδο βίντεο από τον Επιλογέα "
-"συστημάτων πολυμέσων."
+#: ../src/totem-uri.c:378
+msgid "Subtitle files"
+msgstr "Αρχεία υποτίτλων"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:7018
-msgid ""
-"Could not find the audio output. You may need to install additional "
-"GStreamer plugins, or select another audio output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"Η απαιτούμενη έξοδος ήχου δε βρέθηκε. Ίσως να χρειαστεί να εγκαταστήσετε "
-"πρόσθετες λειτουργίες GStreamer ή να επιλέξετε μια άλλη έξοδο ήχου από τον "
-"Επιλογέα συστημάτων πολυμέσων."
+#: ../src/totem-uri.c:430
+msgid "Select Text Subtitles"
+msgstr "Επιλογή υποτίτλων"
 
-#. hour:minutes:seconds
-#. Translators: This is a time format, like "9:05:02" for 9
-#. * hours, 5 minutes, and 2 seconds. You may change ":" to
-#. * the separator that your locale uses or use "%Id" instead
-#. * of "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:91 ../src/backend/video-utils.c:108
-#, c-format
-msgctxt "long time format"
-msgid "%d:%02d:%02d"
-msgstr "%d:%02d:%02d"
+#: ../src/totem-uri.c:495
+msgid "Select Movies or Playlists"
+msgstr "Επιλογή ταινιών ή λιστών αναπαραγωγής"
 
-#. minutes:seconds
-#. Translators: This is a time format, like "5:02" for 5
-#. * minutes and 2 seconds. You may change ":" to the
-#. * separator that your locale uses or use "%Id" instead of
-#. * "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:100
-#, c-format
-msgctxt "short time format"
-msgid "%d:%02d"
-msgstr "%d:%02d"
+#: ../src/totem-uri.c:499
+msgid "Add Directory"
+msgstr "Προσθήκη καταλόγου"
 
-#: ../src/backend/video-utils.c:138
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d ώρα"
-msgstr[1] "%d ώρες"
+#: ../src/totem-video-list.c:330
+msgid "No video URI"
+msgstr "Χωρίς URI για βίντεο"
 
-#: ../src/backend/video-utils.c:140
+#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
+#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
+#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
+#: ../src/totem-video-thumbnailer.c:841
 #, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d λεπτό"
-msgstr[1] "%d λεπτά"
+msgid ""
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
+msgstr ""
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 
-#: ../src/backend/video-utils.c:143
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d δευτερόλεπτο"
-msgstr[1] "%d δευτερόλεπτα"
+#: ../src/totem-video-thumbnailer.c:842
+msgid "Filename"
+msgstr "Όνομα αρχείου"
 
-#. hour:minutes:seconds
-#: ../src/backend/video-utils.c:149
-#, c-format
-msgid "%s %s %s"
-msgstr "%s %s %s"
+#: ../src/totem-video-thumbnailer.c:844
+msgid "Resolution"
+msgstr "Ανάλυση"
 
-#. minutes:seconds
-#: ../src/backend/video-utils.c:152
-#, c-format
-msgid "%s %s"
-msgstr "%s %s"
+#: ../src/totem-video-thumbnailer.c:847
+msgid "Duration"
+msgstr "Διάρκεια"
 
-#. seconds
-#: ../src/backend/video-utils.c:155
-#, c-format
-msgid "%s"
-msgstr "%s"
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:1
+msgid "Apple Trailers"
+msgstr "Apple Trailers"
+
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:2
+msgid "Sets the user agent for the Apple Trailers site"
+msgstr "Ορίστε το user agent για την ιστοσελίδα Apple Trailers"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:1
+msgid "Autoload Subtitles"
+msgstr "Αυτόματη φόρτωση υποτίτλων"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:2
+msgid "Autoloads text subtitles"
+msgstr "Φορτώνει αυτόματα τους υπότιτλους"
+
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
+msgid "Video Disc Recorder"
+msgstr "Εγγραφή δίσκων βίντεο"
 
-#: ../src/plugins/bemused/bemused.plugin.in.h:1
-msgid "Bemused"
-msgstr "Bemused"
-
-#: ../src/plugins/bemused/bemused.plugin.in.h:2
-msgid "Control Totem through a mobile phone with a Bemused client"
-msgstr "Λειτουργία του Totem μέσω κινητού με το λογισμικό πελάτη Bemused"
-
-#. Translators: the parameter is a number used to identify this playlist entry
-#: ../src/plugins/bemused/totem-bemused.c:171
-#, c-format
-msgid "Untitled %d"
-msgstr "Χωρίς τίτλο %d"
-
-#: ../src/plugins/bemused/totem-bemused.c:597
-msgid "Totem Bemused Server"
-msgstr "Εξυπηρετητής Bemused για Totem"
-
-#. FIXME version
-#: ../src/plugins/bemused/totem-bemused.c:599
-msgid "Totem Bemused Server version 1.0"
-msgstr "Εξυπηρετητής Bemused για Totem έκδοση 1.0"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
+msgid "Records (S)VCDs or video DVDs"
+msgstr "Γράφει (S)VCD ή βίντεο DVD"
 
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:65
 msgid "_Create Video Disc..."
@@ -2030,93 +1819,85 @@
 msgid "Copy the currently playing (S)VCD"
 msgstr "Αντιγραφή του αναπαραγόμενου (S)VCD"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:129
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:136
 msgid "The video disc could not be duplicated."
 msgstr "Δεν ήταν δυνατή η αντιγραφή του δίσκου βίντεο."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:131
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:276
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:138
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:283
 msgid "The movie could not be recorded."
 msgstr "Δεν ήταν δυνατή η εγγραφή της ταινίας."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:157
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:167
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:263
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:164
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:174
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:270
 msgid "Unable to write a project."
 msgstr "Αδύνατη η εγγραφή έργου."
 
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
-msgid "Records (S)VCDs or video DVDs"
-msgstr "Γράφει (S)VCD ή βίντεο DVD"
-
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
-msgid "Video Disc Recorder"
-msgstr "Εγγραφή δίσκων βίντεο"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:1
-#: ../src/plugins/chapters/totem-chapters.c:1139
-msgid "Chapters"
-msgstr "Κε_φάλαια"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:2
-msgid "Support chapter markers in movies."
-msgstr "Υποστήριξη σημαδιών κεφαλαίου στις ταινίες."
-
 #: ../src/plugins/chapters/chapters-edit.ui.h:1
 msgid "Name for new chapter:"
 msgstr "Όνομα για το νέο κεφάλαιο:"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:1
-msgid "Add Chapter..."
-msgstr "Προσθήκη κεφαλαίου…"
+msgid "_Remove Chapter"
+msgstr "Απομάκ_ρυνση κεφαλαίου"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:2
-msgid "Add New Chapters"
-msgstr "Προσθήκη νέων κεφαλαίων"
+msgid "Remove the chapter from the list"
+msgstr "Αφαίρεση του κεφαλαίου από τη λίστα"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:3
-msgid "Create a new chapter list for the movie"
-msgstr "Δημιουργία μια νέας λίστας κεφαλαίων για τη ταινία"
+msgid "_Go to Chapter"
+msgstr "Μετά_βαση σε κεφάλαιο"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:4
-msgid "Go to Chapter"
-msgstr "Μετάβαση σε κεφάλαιο"
-
-#: ../src/plugins/chapters/chapters-list.ui.h:5
 msgid "Go to the chapter in the movie"
 msgstr "Μετάβαση στο κεφάλαιο στη ταινία"
 
+#: ../src/plugins/chapters/chapters-list.ui.h:5
+msgid "Add Chapter..."
+msgstr "Προσθήκη κεφαλαίου…"
+
 #: ../src/plugins/chapters/chapters-list.ui.h:6
-msgid "Load Chapters..."
-msgstr "Φόρτωση κεφαλαίων…"
+msgid "Remove Chapter"
+msgstr "Απομάκρυνση κεφαλαίου"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:7
-msgid "Load chapters from an external CMML file"
-msgstr "Φόρτωση κεφαλαίων από εξωτερικό αρχείο CMML"
+msgid "Go to Chapter"
+msgstr "Μετάβαση σε κεφάλαιο"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:8
-msgid "No chapter data"
-msgstr "Δεν υπάρχουν δεδομένα κεφαλαίων"
+msgid "Save Changes"
+msgstr "Αποθήκευση αλλαγών"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:9
-msgid "Remove Chapter"
-msgstr "Απομάκρυνση κεφαλαίου"
+msgid "No chapter data"
+msgstr "Δεν υπάρχουν δεδομένα κεφαλαίων"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:10
-msgid "Remove the chapter from the list"
-msgstr "Αφαίρεση του κεφαλαίου από τη λίστα"
+msgid "Load Chapters..."
+msgstr "Φόρτωση κεφαλαίων…"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:11
-msgid "Save Changes"
-msgstr "Αποθήκευση αλλαγών"
+msgid "Load chapters from an external CMML file"
+msgstr "Φόρτωση κεφαλαίων από εξωτερικό αρχείο CMML"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:12
-msgid "_Go to Chapter"
-msgstr "Μετά_βαση σε κεφάλαιο"
+msgid "Add New Chapters"
+msgstr "Προσθήκη νέων κεφαλαίων"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:13
-msgid "_Remove Chapter"
-msgstr "Απομάκ_ρυνση κεφαλαίου"
+msgid "Create a new chapter list for the movie"
+msgstr "Δημιουργία μια νέας λίστας κεφαλαίων για τη ταινία"
+
+#: ../src/plugins/chapters/chapters.plugin.in.h:1
+#: ../src/plugins/chapters/totem-chapters.c:1139
+msgid "Chapters"
+msgstr "Κε_φάλαια"
+
+#: ../src/plugins/chapters/chapters.plugin.in.h:2
+msgid "Support chapter markers in movies"
+msgstr "Υποστήριξη σημαδιών κεφαλαίου στις ταινίες"
 
 #: ../src/plugins/chapters/totem-chapters.c:56
 #, c-format
@@ -2127,42 +1908,39 @@
 "Τίτλος: %s\n"
 "Χρόνος έναρξης: %s"
 
-#: ../src/plugins/chapters/totem-chapters.c:330
+#: ../src/plugins/chapters/totem-chapters.c:328
 msgid "Error while reading file with chapters"
 msgstr "Σφάλμα κατά την ανάγνωση αρχείου με κεφάλαια"
 
-#: ../src/plugins/chapters/totem-chapters.c:545
+#: ../src/plugins/chapters/totem-chapters.c:543
 msgid "Chapter with the same time already exists"
 msgstr "Υπάρχει ήδη κεφάλαιο με το ίδιο χρονικό σημείο"
 
-#: ../src/plugins/chapters/totem-chapters.c:546
+#: ../src/plugins/chapters/totem-chapters.c:544
 msgid "Try another name or remove an existing chapter."
 msgstr "Δοκιμάστε άλλο όνομα ή αφαιρέστε ένα υπάρχον κεφάλαιο."
 
-#: ../src/plugins/chapters/totem-chapters.c:719
+#: ../src/plugins/chapters/totem-chapters.c:717
 msgid "Error while writing file with chapters"
 msgstr "Σφάλμα κατά την εγγραφή αρχείου με κεφάλαια"
 
-#: ../src/plugins/chapters/totem-chapters.c:844
+#: ../src/plugins/chapters/totem-chapters.c:842
 msgid "Error occurred while saving chapters"
 msgstr "Προέκυψε σφάλμα κατά την αποθήκευση των κεφαλαίων"
 
-#: ../src/plugins/chapters/totem-chapters.c:845
-msgid ""
-"Please check you have permission to write to the folder containing the movie."
-msgstr ""
-"Παρακαλώ ελέγξτε για το αν έχετε τα απαραίτητα δικαιώματα εγγραφής στο "
-"φάκελο που περιέχει την ταινία."
+#: ../src/plugins/chapters/totem-chapters.c:843
+msgid "Please check you have permission to write to the folder containing the movie."
+msgstr "Παρακαλώ ελέγξτε για το αν έχετε τα απαραίτητα δικαιώματα εγγραφής στο φάκελο που περιέχει την ταινία."
 
-#: ../src/plugins/chapters/totem-chapters.c:978
+#: ../src/plugins/chapters/totem-chapters.c:976
 msgid "Open Chapter File"
 msgstr "Άνοιγμα αρχείου κεφαλαίου"
 
-#: ../src/plugins/chapters/totem-chapters.c:1095
+#: ../src/plugins/chapters/totem-chapters.c:1093
 msgid "Chapter Screenshot"
 msgstr "Στιγμιότυπο κεφαλαίου"
 
-#: ../src/plugins/chapters/totem-chapters.c:1106
+#: ../src/plugins/chapters/totem-chapters.c:1104
 msgid "Chapter Title"
 msgstr "Τίτλος κεφαλαίου"
 
@@ -2175,293 +1953,105 @@
 msgid "Close without Saving"
 msgstr "Κλείσιμο χωρίς αποθήκευση"
 
-#. Translators: save changes to the chapter list of the current movie before closing Totem.
-#: ../src/plugins/chapters/totem-chapters.c:1191
-msgid "Save"
-msgstr "Αποθήκευση"
-
-#: ../src/plugins/chapters/totem-chapters.c:1194
-msgid "If you don't save, changes to the chapter list will be lost."
-msgstr "Αν δεν αποθηκεύσετε, θα χαθούν όλες οι αλλαγές στη λίστα κεφαλαίων."
-
-#: ../src/plugins/chapters/totem-cmml-parser.c:559
-msgid "Failed to parse CMML file"
-msgstr "Αδυναμία ανάλυσης αρχείου CMML"
-
-#. Translators: this refers to a media file
-#: ../src/plugins/coherence_upnp/coherence_upnp.py:105
-msgid "Delete"
-msgstr "Διαγραφή"
-
-#: ../src/plugins/coherence_upnp/coherence_upnp.py:116
-#: ../src/plugins/coherence_upnp/coherence_upnp.plugin.in.h:2
-msgid "Coherence DLNA/UPnP Client"
-msgstr "Coherence πελάτης DLNA/UPnP"
-
-#: ../src/plugins/coherence_upnp/coherence_upnp.plugin.in.h:1
-msgid "A DLNA/UPnP client for Totem powered by Coherence"
-msgstr "Πελάτης DLNA/UPnP για το Totem βασισμένος στο Coherence"
-
-#: ../src/plugins/dbus-service/dbus-service.plugin.in.h:1
-msgid "D-Bus Service"
-msgstr "Υπηρεσία D-Bus"
-
-#: ../src/plugins/dbus-service/dbus-service.plugin.in.h:2
-msgid ""
-"Plugin for sending notifications of currently playing movies to the D-Bus "
-"subsystem."
-msgstr ""
-"Πρόσθετη λειτουργία για αποστολή ειδοποιήσεων για ταινίες που αναπαράγονται "
-"στο υποσύστημα D-Bus."
-
-#: ../src/plugins/galago/galago.plugin.in.h:1
-msgid "Instant Messenger status"
-msgstr "Κατάσταση αποστολέα άμεσων μηνυμάτων"
-
-#: ../src/plugins/galago/galago.plugin.in.h:2
-msgid "Set your Instant Messenger status to away when a movie is playing"
-msgstr ""
-"Ορισμός κατάστασης αποστολέα άμεσων μηνυμάτων σε απουσία όταν αναπαράγεται "
-"μια ταινία"
-
-#: ../src/plugins/galago/totem-galago.c:117
-msgid "Error loading Galago plugin"
-msgstr "Σφάλμα κατά τη φόρτωση του πρόσθετου Galago"
-
-#: ../src/plugins/galago/totem-galago.c:117
-msgid "Could not connect to the Galago daemon."
-msgstr "Αδυναμία σύνδεσης με την υπηρεσία Galago."
-
-#: ../src/plugins/gromit/gromit.plugin.in.h:1
-msgid "Gromit Annotations"
-msgstr "Επισημάνσεις Gromit"
-
-#: ../src/plugins/gromit/gromit.plugin.in.h:2
-msgid "Presentation helper to make annotations on screen"
-msgstr "Βοηθός παρουσιάσεων για τη δημιουργία επισημάνσεων στην οθόνη"
-
-#: ../src/plugins/gromit/totem-gromit.c:231
-msgid "The gromit binary was not found."
-msgstr "Το εκτελέσιμο αρχείο του gromit δε βρέθηκε."
-
-#. Add the interface to Totem's sidebar
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:1
-#: ../src/plugins/iplayer/iplayer.py:41
-msgid "BBC iPlayer"
-msgstr "BBC iPlayer"
-
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:2
-msgid "Stream BBC programs from the last 7 days from the BBC iPlayer service."
-msgstr ""
-"Αναπαραγωγή προγραμμάτων του BBC από τις τελευταίες 7 ημέρες από την "
-"υπηρεσία BBC iPlayer."
-
-#: ../src/plugins/iplayer/iplayer.py:66
-msgid "Error listing channel categories"
-msgstr "Σφάλμα κατά την εμφάνιση κατηγοριών καναλιών"
-
-#: ../src/plugins/iplayer/iplayer.py:66
-msgid ""
-"There was an unknown error getting the list of television channels available "
-"on BBC iPlayer."
-msgstr ""
-"Εμφανίστηκε ένα άγνωστο σφάλμα κατά την ανάκτηση της λίστα των τηλεοπτικών "
-"καναλιών που διατίθενται στο BBC iPlayer."
-
-#. Append a dummy child row so that the expander's visible; we can
-#. then queue off the expander to load the programme listing for this category
-#: ../src/plugins/iplayer/iplayer.py:74
-msgid "Loading…"
-msgstr "Φόρτωση…"
-
-#. Translators: the "programme feed" is the list of TV shows available to watch online
-#: ../src/plugins/iplayer/iplayer.py:119
-msgid "Error getting programme feed"
-msgstr "Σφάλμα κατά την ανάκτηση ροής προγραμμάτων"
-
-#: ../src/plugins/iplayer/iplayer.py:119
-msgid ""
-"There was an error getting the list of programmes for this channel and "
-"category combination."
-msgstr ""
-"Εμφανίστηκε ένα σφάλμα κατά την ανάκτηση της λίστας των προγραμμάτων για "
-"αυτό το συνδυασμό καναλιού και κατηγορίας."
-
-#: ../src/plugins/iplayer/iplayer2.py:299
-msgid ""
-msgstr "<άγνωστη αιτία>"
-
-#: ../src/plugins/iplayer/iplayer2.py:300
-#, python-format
-msgid "Programme unavailable (\"%s\")"
-msgstr "Μη διαθέσιμο πρόγραμμα (\"%s\")"
-
-#: ../src/plugins/jamendo/jamendo.ui.h:1
-msgid "By artist"
-msgstr "Του καλλιτέχνη"
-
-#: ../src/plugins/jamendo/jamendo.ui.h:2
-msgid "By tag"
-msgstr "Κατά ετικέτα"
-
-#: ../src/plugins/jamendo/jamendo.ui.h:3
-msgid "Jamendo Album Page"
-msgstr "Σελίδα άλμπουμ Jamendo"
-
-#: ../src/plugins/jamendo/jamendo.ui.h:4
-msgid "Latest Releases"
-msgstr "Τελευταίες κυκλοφορίες"
-
-#: ../src/plugins/jamendo/jamendo.ui.h:5
-msgid "Number of albums to _retrieve:"
-msgstr "Αριθμός άλμπουμ που θα ανακτη_θούν:"
-
-#: ../src/plugins/jamendo/jamendo.ui.h:6
-msgid "Popular"
-msgstr "Δημοφιλή"
-
-#: ../src/plugins/jamendo/jamendo.ui.h:7
-msgid "Preferred audio _format:"
-msgstr "Προτιμώμενη _μορφή ήχου:"
-
-#: ../src/plugins/jamendo/jamendo.ui.h:8
-#: ../src/plugins/tracker/totem-tracker-widget.c:521
-#: ../src/plugins/youtube/youtube.ui.h:2
-msgid "Search Results"
-msgstr "Αποτελέσματα αναζήτησης"
-
-#: ../src/plugins/jamendo/jamendo.ui.h:10
-msgid "_Open Jamendo Album Page in Browser"
-msgstr "Άν_οιγμα της σελίδας άλμπουμ του Jamendo στον περιηγητή"
-
-#: ../src/plugins/jamendo/jamendo.plugin.in.h:1
-#: ../src/plugins/jamendo/jamendo.py:127
-msgid "Jamendo"
-msgstr "Jamendo"
-
-#: ../src/plugins/jamendo/jamendo.plugin.in.h:2
-msgid ""
-"Listen to the large collection of Creative Commons licensed music on Jamendo."
-msgstr ""
-"Ακούστε την τεράστια συλλογή μουσικής υπό άδεια Creative Commons του Jamendo."
+#. Translators: save changes to the chapter list of the current movie before closing Totem.
+#: ../src/plugins/chapters/totem-chapters.c:1191
+msgid "Save"
+msgstr "Αποθήκευση"
 
-#: ../src/plugins/jamendo/jamendo.py:58
-msgid "You need to install the Python simplejson module."
-msgstr "Πρέπει να εγκαταστήσετε το άρθρωμα Python simplejson."
+#: ../src/plugins/chapters/totem-chapters.c:1194
+msgid "If you don't save, changes to the chapter list will be lost."
+msgstr "Αν δεν αποθηκεύσετε, θα χαθούν όλες οι αλλαγές στη λίστα κεφαλαίων."
 
-#: ../src/plugins/jamendo/jamendo.py:260 ../src/plugins/jamendo/jamendo.py:273
-#: ../src/plugins/jamendo/jamendo.py:297
-#, python-format
-msgid "Artist: %s"
-msgstr "Καλλιτέχνης: %s"
+#: ../src/plugins/chapters/totem-cmml-parser.c:651
+msgid "Failed to parse CMML file"
+msgstr "Αδυναμία ανάλυσης αρχείου CMML"
 
-#. Translators: this is the release date of an album in Python strptime format
-#: ../src/plugins/jamendo/jamendo.py:266
-msgid "%Y-%m-%d"
-msgstr "%d-%m-%Y"
+#: ../src/plugins/chapters/totem-edit-chapter.c:95
+msgid "Add Chapter"
+msgstr "Προσθήκη κεφαλαίου"
 
-#. Translators: this is the release time of an album in Python strftime format
-#: ../src/plugins/jamendo/jamendo.py:268
-#, python-format
-msgid "%x"
-msgstr "%x"
+#: ../src/plugins/dbusservice/dbusservice.plugin.in.h:1
+msgid "D-Bus Service"
+msgstr "Υπηρεσία D-Bus"
 
-#: ../src/plugins/jamendo/jamendo.py:274
-#, python-format
-msgid "Genre: %s"
-msgstr "Είδος: %s"
+#: ../src/plugins/dbusservice/dbusservice.plugin.in.h:2
+msgid "Plugin for sending notifications of currently playing movies to the D-Bus subsystem."
+msgstr "Πρόσθετη λειτουργία για αποστολή ειδοποιήσεων για ταινίες που αναπαράγονται στο υποσύστημα D-Bus."
 
-#: ../src/plugins/jamendo/jamendo.py:275
+#: ../src/plugins/dbusservice/dbusservice.py:213
+#: ../src/plugins/dbusservice/dbusservice.py:243
 #, python-format
-msgid "Released on: %s"
-msgstr "Κυκλοφορία: %s"
+msgid "The MediaPlayer2 object does not implement the ‘%s’ interface"
+msgstr "Ο MediaPlayer2 δεν εκτελεί την ‘%s’ διεπαφή"
 
-#: ../src/plugins/jamendo/jamendo.py:276
+#: ../src/plugins/dbusservice/dbusservice.py:222
 #, python-format
-msgid "License: %s"
-msgstr "Άδεια: %s"
+msgid "The property ‘%s’ is not writeable."
+msgstr "Δεν είναι εγγράψιμη η τιμή ‘%s’"
 
-#. track title
-#. Translators: this is the title of a track in Python format
-#. (first argument is the track number, second is the track title)
-#: ../src/plugins/jamendo/jamendo.py:289
+#: ../src/plugins/dbusservice/dbusservice.py:238
 #, python-format
-msgid "%02d. %s"
-msgstr "%02d. %s"
+msgid "Unknown property ‘%s’ requested of a MediaPlayer 2 object"
+msgstr "Ζητήθηκε άγνωστη ιδιότητα ‘%s’ από τον MediaPlayer 2"
 
-#: ../src/plugins/jamendo/jamendo.py:296
+#: ../src/plugins/dbusservice/dbusservice.py:341
 #, python-format
-msgid "Album: %s"
-msgstr "Άλμπουμ: %s"
+msgid "The URI ‘%s’ is not supported."
+msgstr "Δεν υποστηρίζεται το URI ‘%s’."
 
-#: ../src/plugins/jamendo/jamendo.py:298
-#, python-format
-msgid "Duration: %s"
-msgstr "Διάρκεια: %s"
+#: ../src/plugins/grilo/grilo.plugin.in.h:1
+msgid "Grilo Browser"
+msgstr "Περιηγητής Grilo"
+
+#: ../src/plugins/grilo/grilo.plugin.in.h:2
+msgid "A plugin to let you browse media content from various sources"
+msgstr "Μια πρόσθετη λειτουργία που σας επιτρέπει να περιηγηθείτε σε πολυμέσα από διάφορες πηγές."
+
+#: ../src/plugins/grilo/grilo.ui.h:1
+msgid "Add to Playlist"
+msgstr "Προσθήκη στη λίστα αναπαραγωγής"
+
+#: ../src/plugins/grilo/grilo.ui.h:2
+msgid "Copy Location"
+msgstr "Αντιγραφή τοποθεσίας"
+
+#: ../src/plugins/grilo/grilo.ui.h:3
+#: ../src/plugins/grilo/totem-grilo.c:1184
+msgid "Browse"
+msgstr "Περιήγηση"
+
+#: ../src/plugins/grilo/grilo.ui.h:4
+#: ../src/plugins/grilo/totem-grilo.c:1227
+msgid "Search"
+msgstr "Αναζήτηση"
 
-#: ../src/plugins/jamendo/jamendo.py:355
-msgid "Fetching albums, please wait…"
-msgstr "Ανάκτηση άλμπουμ, παρακαλώ περιμένετε…"
+#: ../src/plugins/grilo/totem-grilo.c:454
+msgid "Browse Error"
+msgstr "Σφάλμα περιηγητή"
+
+#: ../src/plugins/grilo/totem-grilo.c:609
+msgid "Search Error"
+msgstr "Σφάλμα αναζήτησης"
 
-#: ../src/plugins/jamendo/jamendo.py:410
-#, python-format
-msgid ""
-"Failed to connect to Jamendo server.\n"
-"%s."
-msgstr ""
-"Απέτυχε η σύνδεση με τον εξυπηρετητή του Jamendo.\n"
-"%s."
+#: ../src/plugins/gromit/gromit.plugin.in.h:1
+msgid "Gromit Annotations"
+msgstr "Επισημάνσεις Gromit"
 
-#: ../src/plugins/jamendo/jamendo.py:412
-#, python-format
-msgid "The Jamendo server returned code %s."
-msgstr "Ο εξυπηρετητής του Jamendo επέστρεψε κωδικό %s."
+#: ../src/plugins/gromit/gromit.plugin.in.h:2
+msgid "Presentation helper to make annotations on screen"
+msgstr "Βοηθός παρουσιάσεων για τη δημιουργία επισημάνσεων στην οθόνη"
 
-#: ../src/plugins/jamendo/jamendo.py:416
-msgid "An error occurred while fetching albums."
-msgstr "Προέκυψε σφάλμα κατά την ανάκτηση των άλμπουμ."
-
-#. Translators: time formatting (in Python strftime format) for the Jamendo plugin
-#. for times longer than an hour
-#: ../src/plugins/jamendo/jamendo.py:618
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
-
-#. Translators: time formatting (in Python strftime format) for the Jamendo plugin
-#. for times shorter than an hour
-#: ../src/plugins/jamendo/jamendo.py:621
-msgid "%M:%S"
-msgstr "%M:%S"
-
-#. Translators: If Jamendo supports your language, replace "en" with the language code, enclosed
-#. in slashes, used to view pages in your language on the Jamendo website. e.g. For French, "en"
-#. would be translated to "fr", as Jamendo uses that in its URLs:
-#. http://www.jamendo.com/fr/album/4818
-#. Compared to:
-#. http://www.jamendo.com/en/album/4818
-#. If Jamendo doesn't support your language, *do not translate this string*!
-#: ../src/plugins/jamendo/jamendo.py:671
-msgid "en"
-msgstr "en"
-
-#: ../src/plugins/jamendo/org.gnome.totem.plugins.jamendo.gschema.xml.in.in.h:1
-msgid "Audio format to download from Jamendo"
-msgstr "Μορφή αρχείου για λήψη από το Jamendo"
-
-#: ../src/plugins/jamendo/org.gnome.totem.plugins.jamendo.gschema.xml.in.in.h:2
-msgid "Number of results per page"
-msgstr "Αριθμός αποτελεσμάτων ανά σελίδα"
+#: ../src/plugins/gromit/totem-gromit.c:231
+msgid "The gromit binary was not found."
+msgstr "Το εκτελέσιμο αρχείο του gromit δε βρέθηκε."
 
-#: ../src/plugins/jamendo/org.gnome.totem.plugins.jamendo.gschema.xml.in.in.h:3
-msgid ""
-"The number of Jamendo search results to display in each page of results."
-msgstr ""
-"Ο αριθμός των αποτελεσμάτων που θα εμφανίζονται σε κάθε σελίδα, από την "
-"αναζήτηση στο Jamendo."
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
+msgid "Instant Messenger Status"
+msgstr "Κατάσταση αποστολέα άμεσων μηνυμάτων"
 
-#: ../src/plugins/jamendo/org.gnome.totem.plugins.jamendo.gschema.xml.in.in.h:4
-msgid "The preferred audio format to download tracks from Jamendo in."
-msgstr "Η προτιμώμενη μορφή για λήψη κομματιών από το Jamendo."
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
+msgid "Set your Instant Messenger status to away when a movie is playing"
+msgstr "Ορισμός κατάστασης αποστολέα άμεσων μηνυμάτων σε απουσία όταν αναπαράγεται μια ταινία"
 
 #: ../src/plugins/lirc/lirc.plugin.in.h:1
 msgid "Infrared Remote Control"
@@ -2479,76 +2069,95 @@
 msgid "Couldn't read lirc configuration."
 msgstr "Αδυναμία ανάγνωσης των ρυθμίσεων του lirc."
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
-msgid "Download Movie Subtitles"
-msgstr "Λήψη υποτίτλων ταινίας"
-
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
-msgid "Language"
-msgstr "Γλώσσα"
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:1
+msgid "Media Player Keys"
+msgstr "Πλήκτρα αναπαραγωγής πολυμέσων"
+
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:2
+msgid "Support additional media player keys"
+msgstr "Υποστήριξη επιπλέον πλήκτρων αναπαραγωγής πολυμέσων"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
-msgid "Subtitle _language:"
-msgstr "Γλώσσα _υποτίτλων:"
+#: ../src/plugins/ontop/ontop.plugin.in.h:1
+msgid "Always On Top"
+msgstr "Πάντα σε επικάλυψη"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:4
-msgid "_Play with Subtitle"
-msgstr "_Αναπαραγωγή με υπότιτλους"
+#: ../src/plugins/ontop/ontop.plugin.in.h:2
+msgid "Keep the main window on top when playing a movie"
+msgstr "Διατήρηση του κεντρικού παραθύρου σε επικάλυψη όταν αναπαράγεται μια ταινία"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:1
-msgid "Look for subtitles for the currently playing movie."
-msgstr "Αναζήτηση υποτίτλων για την αναπαραγόμενη ταινία."
-
-#: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:2
 msgid "Subtitle Downloader"
 msgstr "Λήψη υποτίτλων"
 
-#: ../src/plugins/opensubtitles/opensubtitles.py:44
-msgid "Brasilian Portuguese"
+#: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:2
+msgid "Look for subtitles for the currently playing movie"
+msgstr "Αναζήτηση υποτίτλων για την αναπαραγόμενη ταινία."
+
+#: ../src/plugins/opensubtitles/opensubtitles.py:42
+msgid "Brazilian Portuguese"
 msgstr "Πορτογαλικά Βραζιλίας"
 
-#: ../src/plugins/opensubtitles/opensubtitles.py:247
-#: ../src/plugins/opensubtitles/opensubtitles.py:263
-#: ../src/plugins/opensubtitles/opensubtitles.py:280
-#: ../src/plugins/opensubtitles/opensubtitles.py:286
+#: ../src/plugins/opensubtitles/opensubtitles.py:177
+msgid "Searching for subtitles…"
+msgstr "Αναζήτηση υποτίτλων…"
+
+#: ../src/plugins/opensubtitles/opensubtitles.py:225
+#: ../src/plugins/opensubtitles/opensubtitles.py:645
+msgid "Downloading the subtitles…"
+msgstr "Λήψη υποτίτλων…"
+
+#: ../src/plugins/opensubtitles/opensubtitles.py:290
 msgid "Could not contact the OpenSubtitles website"
 msgstr "Δεν ήταν δυνατή η σύνδεση με την ιστοσελίδα του OpenSubtitles"
 
-#: ../src/plugins/opensubtitles/opensubtitles.py:268
-msgid "No results found"
-msgstr "Δε βρέθηκαν αποτελέσματα"
+#: ../src/plugins/opensubtitles/opensubtitles.py:323
+#: ../src/plugins/opensubtitles/opensubtitles.py:341
+msgid "Could not contact the OpenSubtitles website."
+msgstr "Δεν ήταν δυνατή η σύνδεση με την ιστοσελίδα του OpenSubtitles"
+
+#: ../src/plugins/opensubtitles/opensubtitles.py:329
+msgid "No results found."
+msgstr "Δε βρέθηκαν αποτελέσματα."
 
-#: ../src/plugins/opensubtitles/opensubtitles.py:374
+#: ../src/plugins/opensubtitles/opensubtitles.py:478
 msgid "Subtitles"
 msgstr "Υπότιτλοι"
 
 #. translators comment:
 #. This is the file-type of the subtitle file detected
-#: ../src/plugins/opensubtitles/opensubtitles.py:380
+#: ../src/plugins/opensubtitles/opensubtitles.py:484
 msgid "Format"
 msgstr "Μορφή"
 
 #. translators comment:
 #. This is a rating of the quality of the subtitle
-#: ../src/plugins/opensubtitles/opensubtitles.py:385
+#: ../src/plugins/opensubtitles/opensubtitles.py:489
 msgid "Rating"
 msgstr "Βαθμολογία"
 
-#: ../src/plugins/opensubtitles/opensubtitles.py:426
-msgid "_Download Movie Subtitles…"
-msgstr "_Λήψη υποτίτλων ταινίας…"
-
-#: ../src/plugins/opensubtitles/opensubtitles.py:427
+#: ../src/plugins/opensubtitles/opensubtitles.py:525
 msgid "Download movie subtitles from OpenSubtitles"
 msgstr "Λήψη υποτίτλων ταινίας από το OpenSubtitles"
 
-#: ../src/plugins/opensubtitles/opensubtitles.py:486
+#: ../src/plugins/opensubtitles/opensubtitles.py:527
+msgid "_Download Movie Subtitles…"
+msgstr "_Λήψη υποτίτλων ταινίας…"
+
+#: ../src/plugins/opensubtitles/opensubtitles.py:589
 msgid "Searching subtitles…"
 msgstr "Αναζήτηση υποτίτλων…"
 
-#: ../src/plugins/opensubtitles/opensubtitles.py:544
-msgid "Downloading the subtitles…"
-msgstr "Λήψη υποτίτλων…"
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
+msgid "Download Movie Subtitles"
+msgstr "Λήψη υποτίτλων ταινίας"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
+msgid "Subtitle _language:"
+msgstr "Γλώσσα _υποτίτλων:"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
+msgid "_Play with Subtitle"
+msgstr "_Αναπαραγωγή με υπότιτλους"
 
 #: ../src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in.h:1
 msgid "Subtitle language"
@@ -2558,149 +2167,104 @@
 msgid "The language to search for subtitles for movies in."
 msgstr "Η γλώσσα στην οποία θα γίνεται η αναζήτηση για υπότιτλους."
 
-#: ../src/plugins/ontop/ontop.plugin.in.h:1
-msgid "Always On Top"
-msgstr "Πάντα σε επικάλυψη"
-
-#: ../src/plugins/ontop/ontop.plugin.in.h:2
-msgid "Keep the main window on top when playing a movie"
-msgstr ""
-"Διατήρηση του κεντρικού παραθύρου σε επικάλυψη όταν αναπαράγεται μια ταινία"
+#: ../src/plugins/properties/movie-properties.plugin.in.h:1
+msgid "Movie Properties"
+msgstr "Ιδιότητες ταινίας"
+
+#: ../src/plugins/properties/movie-properties.plugin.in.h:2
+msgid "Adds movie properties to the sidebar"
+msgstr "Προσθέτει τις ιδιότητες της ταινίας στην πλευρική στήλη"
 
-#: ../src/plugins/properties/totem-movie-properties.c:128
+#: ../src/plugins/properties/totem-movie-properties.c:246
 msgid "Properties"
 msgstr "Ιδιότητες"
 
-#. Dimensions
-#: ../src/plugins/properties/bacon-video-widget-properties.c:158
-msgctxt "Dimensions"
-msgid "N/A"
-msgstr "Μη διαθέσιμο"
-
-#: ../src/plugins/properties/bacon-video-widget-properties.c:163
-#: ../src/plugins/properties/bacon-video-widget-properties.c:240
-msgctxt "Video bit rate"
-msgid "N/A"
-msgstr "Μη διαθέσιμο"
-
-#: ../src/plugins/properties/bacon-video-widget-properties.c:166
-#: ../src/plugins/properties/bacon-video-widget-properties.c:250
-msgctxt "Frame rate"
-msgid "N/A"
-msgstr "Μη διαθέσιμο"
-
-#: ../src/plugins/properties/bacon-video-widget-properties.c:169
-#: ../src/plugins/properties/bacon-video-widget-properties.c:273
-msgctxt "Audio bit rate"
-msgid "N/A"
-msgstr "Μη διαθέσιμο"
+#: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:1
+msgid "rpdb2 password"
+msgstr "Συνθηματικό rpdb2"
 
-#: ../src/plugins/properties/bacon-video-widget-properties.c:237
-#, c-format
-msgid "%d x %d"
-msgstr "%d x %d"
+#: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:2
+msgid "A password to protect the rpdb2 server for debugging Totem from unauthorized remote access. If this is empty, a default of 'totem' will be used."
+msgstr "Ένα συνθηματικό προστασίας του εξυπηρετητή rpdb2 για αποσφαλμάτωση του Totem από μη εξουσιοδοτημένη απομακρυσμένη πρόσβαση. Αν είναι άδειο, χρησιμοποιείται το προεπιλεγμένο «totem»."
 
-#: ../src/plugins/properties/bacon-video-widget-properties.c:240
-#: ../src/plugins/properties/bacon-video-widget-properties.c:273
-#, c-format
-msgid "%d kbps"
-msgstr "%d kbps"
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
+msgid "Python Console"
+msgstr "Κονσόλα Python"
 
-#: ../src/plugins/properties/bacon-video-widget-properties.c:247
-#, c-format
-msgid "%d frame per second"
-msgid_plural "%d frames per second"
-msgstr[0] "%d καρέ ανά δευτερόλεπτο"
-msgstr[1] "%d καρέ ανά δευτερόλεπτο"
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
+msgid "Interactive Python console"
+msgstr "Διαδραστική κονσόλα Python"
 
-#: ../src/plugins/properties/bacon-video-widget-properties.c:276
-#, c-format
-msgid "%d Hz"
-msgstr "%d Hz"
+#: ../src/plugins/pythonconsole/pythonconsole.py:88
+msgid "Python Console Menu"
+msgstr "Μενού κονσόλας Python"
 
-#: ../src/plugins/properties/bacon-video-widget-properties.c:276
-msgctxt "Sample rate"
-msgid "N/A"
-msgstr "Μη διαθέσιμο"
+#: ../src/plugins/pythonconsole/pythonconsole.py:93
+msgid "_Python Console"
+msgstr "Κον_σόλα Python"
 
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:2
-#, no-c-format
-msgid ""
-"A format string used to build the network service name used when publishing "
-"playlists over the network. The following format placeholders can be used: • "
-"%a: the program name as returned by g_get_application_name() • %h: the "
-"machine's host name in title case • %u: the user's login name in title case "
-"• %U: the user's real name • %%: the percent sign"
-msgstr ""
-"Μια συμβολοσειρά μορφοποίησης η οποία χρησιμοποιείται για τη δημιουργία του "
-"ονόματος της υπηρεσίας δικτύου η οποία χρησιμοποιείται όταν δημοσιεύετε "
-"λίστες αναπαραγωγής στο δίκτυο. Μπορείτε να χρησιμοποιήσετε τις εξής "
-"μεταβλητές: • %a: το όνομα του προγράμματος όπως επιστρέφεται από τη "
-"g_get_application_name() • %h: το όνομα τομέα του συστήματος (οι "
-"περισσότερες λέξεις με κεφαλαίο το πρώτο γράμμα) • %u: το όνομα σύνδεσης του "
-"χρήστη (οι περισσότερες λέξεις με κεφαλαίο το πρώτο γράμμα) • %U: το "
-"πραγματικό όνομα του χρήστη • %%: το σύμβολο ποσοστού"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:3
-msgid "Format for network service name"
-msgstr "Μορφή ονόματος της υπηρεσίας δικτύου"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:4
-msgid "Publisher protocol to use"
-msgstr "Πρωτόκολλο δημοσίευσης"
+#: ../src/plugins/pythonconsole/pythonconsole.py:94
+msgid "Show Totem's Python console"
+msgstr "Εμφάνιση της κονσόλας Python του Totem"
 
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:5
-msgid ""
-"The transport protocol to use when publishing playlists over the network."
-msgstr ""
-"Το πρωτόκολλο μεταφοράς που θα χρησιμοποιείται όταν δημοσιεύονται λίστες "
-"αναπαραγωγής στο δίκτυο."
+#: ../src/plugins/pythonconsole/pythonconsole.py:100
+msgid "Python Debugger"
+msgstr "Εφαρμογή αποσφαλμάτωσης Python"
 
-#. Translators: computers on the local network which are publishing their playlists over the network
-#: ../src/plugins/publish/totem-publish.c:552
-msgid "Neighbors"
-msgstr "Γείτονες"
-
-#: ../src/plugins/publish/publish.plugin.in.h:1
-msgid "Publish Playlist"
-msgstr "Δημοσίευση λίστας αναπαραγωγής"
-
-#: ../src/plugins/publish/publish.plugin.in.h:2
-msgid "Share the current playlist via HTTP"
-msgstr "Διαμοιρασμός της τρέχουσας λίστας αναπαραγωγής μέσω HTTP"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:1
-msgid "Service _Name:"
-msgstr "Ό_νομα υπηρεσίας:"
+#: ../src/plugins/pythonconsole/pythonconsole.py:101
+msgid "Enable remote Python debugging with rpdb2"
+msgstr "Ενεργοποίηση απομακρυσμένης αποσφαλμάτωσης Python με rpdb2"
 
-#: ../src/plugins/publish/publish-plugin.ui.h:3
-#, no-c-format
+#. pylint: disable-msg=E1101
+#: ../src/plugins/pythonconsole/pythonconsole.py:125
+#, python-format
 msgid ""
-"The name used for announcing the playlist service on the network.\n"
-"All occurrences of the string %u will be replaced by your name,\n"
-"and %h will be replaced by your computer's host name."
+"You can access the Totem.Object through 'totem_object' :\\n"
+"%s"
 msgstr ""
-"Το όνομα που θα χρησιμοποιηθεί για την ανακοίνωση της υπηρεσίας\n"
-"λίστας αναπαραγωγής στο δίκτυο. Όλες οι εμφανίσεις του αλφαριθμητικού\n"
-"%u θα αντικατασταθούν από το όνομα σας και το %h\n"
-"θα αντικατασταθεί από το όνομα του συστήματος."
-
-#: ../src/plugins/publish/publish-plugin.ui.h:6
-msgid "Use _encrypted transport protocol (HTTPS)"
-msgstr "Χρήση πρωτοκόλλου _κρυπτογραφημένης επικοινωνίας (HTTPS)"
+"Μπορείτε να έχετε πρόσβαση στο Totem.Object μέσω του «totem_object» :\\n"
+"%s"
 
-#: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:1
-msgid ""
-"A password to protect the rpdb2 server for debugging Totem from unauthorized "
-"remote access. If this is empty, a default of 'totem' will be used."
-msgstr ""
-"Ένα συνθηματικό προστασίας του εξυπηρετητή rpdb2 για αποσφαλμάτωση του Totem "
-"από μη εξουσιοδοτημένη απομακρυσμένη πρόσβαση. Αν είναι άδειο, "
-"χρησιμοποιείται το προεπιλεγμένο «totem»."
+#: ../src/plugins/pythonconsole/pythonconsole.py:129
+msgid "Totem Python Console"
+msgstr "Κονσόλα Python του Totem"
 
-#: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:2
-msgid "rpdb2 password"
-msgstr "Συνθηματικό rpdb2"
+#: ../src/plugins/pythonconsole/pythonconsole.py:139
+msgid "After you press OK, Totem will wait until you connect to it with winpdb or rpdb2. If you have not set a debugger password in DConf, it will use the default password ('totem')."
+msgstr "Όταν πατήσετε Εντάξει, το Totem θα περιμένει μέχρι να συνδεθείτε μαζί του μέσω winpdb ή rpdb2. Αν δεν έχετε καθορίσει ένα συνθηματικό για την εφαρμογή αποσφαλμάτωσης στο DConf, θα χρησιμοποιηθεί το προεπιλεγμένο («totem»)."
+
+#: ../src/plugins/recent/recent.plugin.in.h:1
+#| msgid "Video files"
+msgid "Recent files"
+msgstr "Πρόσφατα αρχεία"
+
+#: ../src/plugins/recent/recent.plugin.in.h:2
+msgid "Adds files that have been played to recent files"
+msgstr "Πρσοθέτει αρχεία που έχουν αναπαραχθεί στα πρόσφατα αρχεία"
+
+#: ../src/plugins/rotation/rotation.plugin.in.h:1
+msgid "Rotation Plugin"
+msgstr "Πρόσθετο περιστροφής"
+
+#: ../src/plugins/rotation/rotation.plugin.in.h:2
+msgid "Allows videos to be rotated if they are in the wrong orientation"
+msgstr "Επιτρέπει την περιστροφή των βίντεο αν έχουν λάθος προσανατολισμό"
+
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:50
+msgid "_Rotate Clockwise"
+msgstr "Πε_ριστροφή προς τα δεξιά"
+
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:52
+msgid "Rotate Counterc_lockwise"
+msgstr "Περιστροφή προς τα αρ_ιστερά"
+
+#: ../src/plugins/save-file/save-file.plugin.in.h:1
+msgid "Save Copy"
+msgstr "Αποθήκευση ενός αντιγράφου"
+
+#: ../src/plugins/save-file/save-file.plugin.in.h:2
+msgid "Save a copy of the currently playing movie"
+msgstr "Αποθήκευση ενός αντιγράφου της αναπαραγόμενης ταινίας"
 
 #: ../src/plugins/save-file/totem-save-file.c:63
 msgid "Save a Copy..."
@@ -2724,40 +2288,48 @@
 msgid "Movie stream"
 msgstr "Stream ταινίας"
 
-#: ../src/plugins/screensaver/totem-screensaver.c:112
-#: ../browser-plugin/totem-plugin-viewer.c:1964
-msgid "Playing a movie"
-msgstr "Γίνεται αναπαραγωγή μιας ταινίας"
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:1
+msgid "Screen Saver"
+msgstr "Προστασία οθόνης"
+
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:2
+msgid "Deactivates the screen saver when a movie is playing"
+msgstr "Απενεργοποίηση προστασίας οθόνης κατά την αναπαραγωγή"
 
 #: ../src/plugins/screenshot/gallery.ui.h:1
+msgid "Screenshot width (in pixels):"
+msgstr "Πλάτος στιγμιοτύπου (σε pixel):"
+
+#: ../src/plugins/screenshot/gallery.ui.h:2
 msgid "Calculate the number of screenshots"
 msgstr "Υπολογισμός του αριθμού στιγμιοτύπων"
 
-#: ../src/plugins/screenshot/gallery.ui.h:2
+#: ../src/plugins/screenshot/gallery.ui.h:3
 msgid "Number of screenshots:"
 msgstr "Αριθμός στιγμιοτύπων:"
 
-#: ../src/plugins/screenshot/gallery.ui.h:3
-msgid "Screenshot width (in pixels):"
-msgstr "Πλάτος στιγμιοτύπου (σε pixel):"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:1
-msgid "Save in _folder:"
-msgstr "Αποθήκευση στον _φάκελο:"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:2
-msgid "Select a folder"
-msgstr "Επιλογή φακέλου"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:3
-msgid "_Name:"
-msgstr "Ό_νομα:"
-
-#. Write the screenshot to the temporary file
-#: ../src/plugins/screenshot/gnome-screenshot-widget.c:387
-#: ../src/plugins/screenshot/totem-screenshot.c:64
-msgid "Screenshot.png"
-msgstr "Στιγμιότυπο οθόνης.png"
+#. translators: this is the name of the file that gets made up
+#. * with the screenshot if the entire screen is taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:147
+#, c-format
+msgid "Screenshot from %s.png"
+msgstr "Στιγμιότυπο οθόνης από %s.png"
+
+#. translators: this is the name of the file that gets
+#. * made up with the screenshot if the entire screen is
+#. * taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:154
+#, c-format
+msgid "Screenshot from %s - %d.png"
+msgstr "Στιγμιότυπο οθόνης από %s - %d.png"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:1
+msgid "Screenshot"
+msgstr "Στιγμιότυπο οθόνης"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:2
+msgid "Allows screenshots and galleries to be taken of videos"
+msgstr "Επιτρέπει τη λήψη στιγμιοτύπων και συλλογών από βίντεο"
 
 #: ../src/plugins/screenshot/totem-gallery.c:91
 msgid "Save Gallery"
@@ -2783,50 +2355,47 @@
 msgid "Saving gallery as \"%s\""
 msgstr "Αποθήκευση συλλογής ως \"%s\""
 
-#: ../src/plugins/screenshot/totem-screenshot.c:113
-msgid "There was an error saving the screenshot."
-msgstr "Σφάλμα κατά την αποθήκευση του στιγμιότυπου οθόνης."
-
-#: ../src/plugins/screenshot/totem-screenshot.c:139
-msgid "Save Screenshot"
-msgstr "Αποθήκευση στιγμιότυπου οθόνης"
-
-#. Create the screenshot widget
-#. Translators: %s is the movie title and %d is an auto-incrementing number to make filename unique
-#: ../src/plugins/screenshot/totem-screenshot.c:160
-#, c-format
-msgid "Screenshot-%s-%d.png"
-msgstr "Στιγμιότυπο οθόνης-%s-%d.png"
-
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:88
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:220
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "Totem could not get a screenshot of the video."
 msgstr "Το Totem δε μπορεί να λάβει στιγμιότυπο οθόνης από αυτό το βίντεο."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "This is not supposed to happen; please file a bug report."
-msgstr ""
-"Αυτό δεν προβλεπόταν να συμβεί, παρακαλώ στείλτε μια αναφορά σφάλματος."
+msgstr "Αυτό δεν προβλεπόταν να συμβεί, παρακαλώ στείλτε μια αναφορά σφάλματος."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
-msgid "Take _Screenshot..."
-msgstr "Λήψη _στιγμιότυπου οθόνης..."
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
+msgid "Take _Screenshot"
+msgstr "Λήψη _στιγμιότυπου οθόνης"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
 msgid "Take a screenshot"
 msgstr "Λήψη ενός στιγμιότυπου οθόνης"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create Screenshot _Gallery..."
 msgstr "Δημιουργία Συλλο_γής στιγμιοτύπων..."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create a gallery of screenshots"
 msgstr "Δημιουργία συλλογής στιγμιοτύπων οθόνης"
 
+#: ../src/plugins/skipto/skipto.plugin.in.h:1
+#: ../src/plugins/skipto/totem-skipto.c:196
+msgid "Skip To"
+msgstr "Παράκαμψη σε"
+
+#: ../src/plugins/skipto/skipto.plugin.in.h:2
+msgid "Provides the \"Skip to\" dialog"
+msgstr "Παρέχει τον διάλογο \"Παράκαμψη σε\""
+
+#: ../src/plugins/skipto/skipto.ui.h:1
+msgid "_Skip to:"
+msgstr "Παρά_καμψη σε:"
+
 #. Update the "seconds" label so that it always has the correct singular/plural form
 #. Translators: label for the seconds selector in the "Skip to" dialogue
-#: ../src/plugins/skipto/totem-skipto.c:160
+#: ../src/plugins/skipto/totem-skipto.c:159
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "δευτερόλεπτο"
@@ -2836,15 +2405,11 @@
 #. Translators: you should translate this string to a number (written in digits) which corresponds to the longer character length of the
 #. * translations for "second" and "seconds", as translated elsewhere in this file. For example, in English, "second" is 6 characters long and
 #. * "seconds" is 7 characters long, so this string should be translated to "7". See: bgo#639398
-#: ../src/plugins/skipto/totem-skipto.c:190
+#: ../src/plugins/skipto/totem-skipto.c:189
 msgctxt "Skip To label length"
 msgid "7"
 msgstr "12"
 
-#: ../src/plugins/skipto/totem-skipto.c:197
-msgid "Skip To"
-msgstr "Παράκαμψη σε"
-
 #: ../src/plugins/skipto/totem-skipto-plugin.c:182
 msgid "_Skip To..."
 msgstr "Παρά_καμψη σε…"
@@ -2853,225 +2418,74 @@
 msgid "Skip to a specific time"
 msgstr "Παράκαμψη σε συγκεκριμένο χρονικό σημείο"
 
-#: ../src/plugins/skipto/skipto.ui.h:1
-msgid "_Skip to:"
-msgstr "Παρά_καμψη σε:"
-
-#. Display an error
-#: ../src/plugins/tracker/totem-tracker-widget.c:173
-#, c-format
-msgid "Could not get name and thumbnail for %s: %s"
-msgstr "Αδυναμία ανάκτησης ονόματος και μικρογραφίας για το %s: %s"
-
-#: ../src/plugins/tracker/totem-tracker-widget.c:174
-msgid "File Error"
-msgstr "Σφάλμα αρχείου"
-
-#: ../src/plugins/tracker/totem-tracker-widget.c:251
-#: ../src/plugins/tracker/totem-tracker-widget.c:368
-msgid "Could not connect to Tracker"
-msgstr "Αδυναμία σύνδεσης με τον Tracker."
-
-#: ../src/plugins/tracker/totem-tracker-widget.c:258
-msgid "No results"
-msgstr "Δε βρέθηκαν αποτελέσματα"
-
-#. Translators:
-#. * This is used to show which items are listed in the list view, for example:
-#. * Showing 10-20 of 128 matches
-#. * This is similar to what web searches use, eg. Google on the top-right of their search results page show:
-#. * Personalized Results 1 - 10 of about 4,130,000 for foobar
-#: ../src/plugins/tracker/totem-tracker-widget.c:283
-#, c-format
-msgid "Showing %i - %i of %i match"
-msgid_plural "Showing %i - %i of %i matches"
-msgstr[0] "Εμφάνιση %i - %i από %i αποτελέσματος"
-msgstr[1] "Εμφάνιση %i - %i από %i αποτελεσμάτων"
-
-#: ../src/plugins/tracker/totem-tracker-widget.c:581
-msgid "Page"
-msgstr "Σελίδα"
-
-#: ../src/plugins/tracker/totem-tracker.c:65
-#: ../src/plugins/tracker/tracker.plugin.in.h:1
-msgid "Local Search"
-msgstr "Τοπική αναζήτηση"
-
-#: ../src/plugins/thumbnail/thumbnail.plugin.in.h:1
-msgid "Set the window icon to the thumbnail of the playing movie"
-msgstr ""
-"Ορίστε του εικονιδίου του παραθύρου σε μια μικρογραφία της αναπαραγόμενης "
-"ταινίας"
-
-#: ../src/plugins/thumbnail/thumbnail.plugin.in.h:2
-msgid "Thumbnail"
-msgstr "Μικρογραφία"
-
-#: ../src/plugins/tracker/tracker.plugin.in.h:2
-msgid "Search for local videos using Tracker"
-msgstr "Αναζήτηση τοπικών βίντεο με το Tracker"
-
-#: ../src/plugins/youtube/youtube.plugin.in.h:1
-msgid "A plugin to let you browse YouTube videos."
-msgstr ""
-"Μια πρόσθετη λειτουργία που σας επιτρέπει να περιηγηθείτε σε βίντεο του "
-"YouTube."
-
-#: ../src/plugins/youtube/youtube.plugin.in.h:2
-msgid "YouTube Browser"
-msgstr "Περιηγητής για το YouTube"
-
-#: ../src/plugins/youtube/youtube.ui.h:1
-msgid "Related Videos"
-msgstr "Σχετικά βίντεο"
-
-#: ../src/plugins/youtube/youtube.ui.h:3
-msgid "Videos"
-msgstr "Βίντεο"
-
-#: ../src/plugins/youtube/totem-youtube.c:144
-#: ../src/plugins/youtube/totem-youtube.c:803
-msgid "_Open in Web Browser"
-msgstr "Άν_οιγμα στον Περιηγητή ιστοσελίδων"
-
-#: ../src/plugins/youtube/totem-youtube.c:144
-msgid "Open the video in your web browser"
-msgstr "Άνοιγμα του βίντεο στον περιηγητή ιστοσελίδων σας"
-
-#. Add the sidebar page
-#: ../src/plugins/youtube/totem-youtube.c:195
-msgid "YouTube"
-msgstr "YouTube"
-
-#: ../src/plugins/youtube/totem-youtube.c:279
-msgid "Cancelling query…"
-msgstr "Ακύρωση επερωτήματος…"
-
-#. Hide the ugly technical message libgdata gives behind a nice one telling them it's out of date (which it likely is
-#. * if we're receiving a protocol error).
-#. Spew out the error message as provided
-#: ../src/plugins/youtube/totem-youtube.c:424
-#: ../src/plugins/youtube/totem-youtube.c:429
-msgid "Error Searching for Videos"
-msgstr "Σφάλμα κατά την αναζήτηση για βίντεο"
-
-#: ../src/plugins/youtube/totem-youtube.c:425
-msgid ""
-"The response from the server could not be understood. Please check you are "
-"running the latest version of libgdata."
-msgstr ""
-"Η απάντηση από τον εξυπηρετητή δεν έγινε αντιληπτή. Παρακαλώ έλεγξε ότι "
-"χρησιμοποιείτε την τελευταία έκδοση του libgdata."
-
-#. Update the UI
-#: ../src/plugins/youtube/totem-youtube.c:618
-msgid "Fetching search results…"
-msgstr "Ανάκτηση αποτελεσμάτων αναζήτησης…"
-
-#. Update the UI
-#: ../src/plugins/youtube/totem-youtube.c:680
-msgid "Fetching related videos…"
-msgstr "Ανάκτηση σχετικών βίντεο…"
-
-#: ../src/plugins/youtube/totem-youtube.c:732
-msgid "Error Opening Video in Web Browser"
-msgstr "Σφάλμα κατά το άνοιγμα του βίντεο στον Περιηγητή ιστοσελίδων"
-
-#: ../src/plugins/youtube/totem-youtube.c:752
-msgid "Fetching more videos…"
-msgstr "Ανάκτηση περισσότερων βίντεο…"
-
-#: ../src/plugins/youtube/totem-youtube.c:797
-msgid "Video Format Not Supported"
-msgstr "Μη υποστηριζόμενη μορφή βίντεο"
-
-#: ../src/plugins/youtube/totem-youtube.c:799
-msgid ""
-"This video is not available in any formats which Totem supports. Would you "
-"like to open it in your web browser instead?"
-msgstr ""
-"Αυτό το βίντεο δεν είναι διαθέσιμο σε κάποια μορφή που υποστηρίζει το Totem. "
-"Θα θέλατε να το ανοίξετε στον περιηγητή ιστού σας;"
-
-#: ../browser-plugin/totem-plugin-viewer.c:431
-msgid "No URI to play"
-msgstr "Δεν υπάρχει URI προς αναπαραγωγή"
-
-#. translators: this is:
-#. * Open With ApplicationName
-#. * as in nautilus' right-click menu
-#: ../browser-plugin/totem-plugin-viewer.c:1104
-#, c-format
-msgid "_Open with \"%s\""
-msgstr "Άν_οιγμα με \"%s\""
-
-#: ../browser-plugin/totem-plugin-viewer.c:1155
-#, c-format
-msgid "Browser Plugin using %s"
-msgstr "Η πρόσθετη λειτουργία του προγράμματος περιήγησης χρησιμοποιεί %s"
-
-#: ../browser-plugin/totem-plugin-viewer.c:1160
-msgid "Totem Browser Plugin"
-msgstr "Πρόσθετη λειτουργία του προγράμματος περιήγησης για το Totem"
-
-#: ../browser-plugin/totem-plugin-viewer.c:2198
-msgid "No playlist or playlist empty"
-msgstr "Δεν υπάρχει λίστα αναπαραγωγής ή η λίστα είναι κενή"
-
-#: ../browser-plugin/totem-plugin-viewer.c:2289
-msgid "Movie browser plugin"
-msgstr "Πρόσθετη λειτουργία περιήγησης ταινιών"
-
-#: ../browser-plugin/totem-plugin-viewer.c:2305
-msgid "Verify your system installation. The Totem plugin will now exit."
-msgstr ""
-"Επιβεβαιώστε τη σωστή εγκατάσταση του συστήματος σας. Το πρόσθετο Totem θα "
-"τερματιστεί τώρα."
-
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
-msgid "Interactive Python console."
-msgstr "Διαδραστική κονσόλα Python."
-
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
-msgid "Python Console"
-msgstr "Κονσόλα Python"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:85
-msgid "Python Console Menu"
-msgstr "Μενού κονσόλας Python"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:88
-msgid "_Python Console"
-msgstr "Κον_σόλα Python"
+#~ msgid "%d %%"
+#~ msgstr "%d %%"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:89
-msgid "Show Totem's Python console"
-msgstr "Εμφάνιση της κονσόλας Python του Totem"
+#~ msgid ""
+#~ msgstr "<άγνωστη αιτία>"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:94
-msgid "Python Debugger"
-msgstr "Εφαρμογή αποσφαλμάτωσης Python"
+#~ msgid "Programme unavailable (\"%s\")"
+#~ msgstr "Μη διαθέσιμο πρόγραμμα (\"%s\")"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:95
-msgid "Enable remote Python debugging with rpdb2"
-msgstr "Ενεργοποίηση απομακρυσμένης αποσφαλμάτωσης Python με rpdb2"
+#~ msgid "BBC iPlayer"
+#~ msgstr "BBC iPlayer"
+
+#~ msgid ""
+#~ "Stream BBC programs from the last 7 days from the BBC iPlayer service"
+#~ msgstr ""
+#~ "Αναπαραγωγή προγραμμάτων του BBC από τις τελευταίες 7 ημέρες από την "
+#~ "υπηρεσία BBC iPlayer."
+
+#~ msgid "Error listing channel categories"
+#~ msgstr "Σφάλμα κατά την εμφάνιση κατηγοριών καναλιών"
+
+#~ msgid ""
+#~ "There was an unknown error getting the list of television channels "
+#~ "available on BBC iPlayer."
+#~ msgstr ""
+#~ "Εμφανίστηκε ένα άγνωστο σφάλμα κατά την ανάκτηση της λίστα των "
+#~ "τηλεοπτικών καναλιών που διατίθενται στο BBC iPlayer."
+
+#~ msgid "Loading…"
+#~ msgstr "Φόρτωση…"
+
+#~ msgid "Error getting programme feed"
+#~ msgstr "Σφάλμα κατά την ανάκτηση ροής προγραμμάτων"
+
+#~ msgid ""
+#~ "There was an error getting the list of programmes for this channel and "
+#~ "category combination."
+#~ msgstr ""
+#~ "Εμφανίστηκε ένα σφάλμα κατά την ανάκτηση της λίστας των προγραμμάτων για "
+#~ "αυτό το συνδυασμό καναλιού και κατηγορίας."
+
+#~ msgid "Location not found."
+#~ msgstr "Δε βρέθηκε η τοποθεσία."
+
+#~ msgid ""
+#~ "Could not open location; you might not have permission to open the file."
+#~ msgstr ""
+#~ "Είναι αδύνατο το άνοιγμα της τοποθεσίας· ίσως δεν έχετε τα δικαιώματα για "
+#~ "να ανοίξετε το αρχείο."
+
+#~ msgid ""
+#~ "Failed to create a GStreamer play object. Please check your GStreamer "
+#~ "installation."
+#~ msgstr ""
+#~ "Αδυναμία δημιουργίας αντικειμένου αναπαραγωγής GStreamer. Παρακαλώ "
+#~ "ελέγξτε την εγκατάσταση του GStreamer."
+
+#~ msgid "_Name:"
+#~ msgstr "Ό_νομα:"
+
+#~ msgid "Save in _folder:"
+#~ msgstr "Αποθήκευση στον _φάκελο:"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:116
-#, python-format
-msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
-msgstr ""
-"Μπορείτε να έχετε πρόσβαση στο Totem.Object μέσω του «totem_object» :\\n%s"
+#~ msgid "Select a folder"
+#~ msgstr "Επιλογή φακέλου"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:120
-msgid "Totem Python Console"
-msgstr "Κονσόλα Python του Totem"
+#~ msgid "There was an error saving the screenshot."
+#~ msgstr "Σφάλμα κατά την αποθήκευση του στιγμιότυπου οθόνης."
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:129
-msgid ""
-"After you press OK, Totem will wait until you connect to it with winpdb or "
-"rpdb2. If you have not set a debugger password in DConf, it will use the "
-"default password ('totem')."
-msgstr ""
-"Όταν πατήσετε Εντάξει, το Totem θα περιμένει μέχρι να συνδεθείτε μαζί του "
-"μέσω winpdb ή rpdb2. Αν δεν έχετε καθορίσει ένα συνθηματικό για την εφαρμογή "
-"αποσφαλμάτωσης στο DConf, θα χρησιμοποιηθεί το προεπιλεγμένο («totem»)."
+#~ msgid "Save Screenshot"
+#~ msgstr "Αποθήκευση στιγμιότυπου οθόνης"
diff -Nru totem-3.4.3/po/en_GB.po totem-3.6.2/po/en_GB.po
--- totem-3.4.3/po/en_GB.po	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/po/en_GB.po	2012-10-25 13:15:32.000000000 +0000
@@ -3,875 +3,938 @@
 # This file is distributed under the same license as the totem package.
 # Abigail Brady , Bastien Nocera , 2005.
 # Philip Withnall , 2010, 2012.
-# Bruce Cowan , 2010, 2011.
+# Bruce Cowan , 2010, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: totem\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-27 09:54+0100\n"
-"PO-Revision-Date: 2011-09-08 16:42+0100\n"
-"Last-Translator: Philip Withnall \n"
+"POT-Creation-Date: 2012-09-17 21:02+0100\n"
+"PO-Revision-Date: 2012-09-17 21:03+0100\n"
+"Last-Translator: Bruce Cowan \n"
 "Language-Team: British English \n"
 "Language: en_GB\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Virtaal 0.7.1-beta1\n"
+"X-Generator: Virtaal 0.7.1\n"
 
-#: ../data/fullscreen.ui.h:1
-msgid "Leave Fullscreen"
-msgstr "Leave Fullscreen"
-
-#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:102
-msgid "Time:"
-msgstr "Time:"
-
-#: ../data/playlist.ui.h:1
-msgid "Add..."
-msgstr "Add…"
-
-#: ../data/playlist.ui.h:2 ../data/video-list.ui.h:2
-msgid "Copy the location to the clipboard"
-msgstr "Copy the location to the clipboard"
+#: ../browser-plugin/totem-plugin-viewer.c:352 ../src/totem-object.c:1180
+#: ../src/totem-object.c:1650 ../src/totem-statusbar.c:115
+msgid "Stopped"
+msgstr "Stopped"
 
-#: ../data/playlist.ui.h:3
-msgid "Move Down"
-msgstr "Move Down"
+#: ../browser-plugin/totem-plugin-viewer.c:364 ../src/totem-object.c:1173
+msgid "Paused"
+msgstr "Paused"
 
-#: ../data/playlist.ui.h:4
-msgid "Move Up"
-msgstr "Move Up"
+#: ../browser-plugin/totem-plugin-viewer.c:368 ../src/totem-object.c:1166
+msgid "Playing"
+msgstr "Playing"
 
-#: ../data/playlist.ui.h:5
-msgid "Remove"
-msgstr "Remove"
+#: ../browser-plugin/totem-plugin-viewer.c:386
+#: ../src/plugins/screensaver/totem-screensaver.c:97
+msgid "Playing a movie"
+msgstr "Playing a movie"
 
-#: ../data/playlist.ui.h:6
-msgid "Remove file from playlist"
-msgstr "Remove file from playlist"
+#: ../browser-plugin/totem-plugin-viewer.c:443
+msgid "No URI to play"
+msgstr "No URI to play"
 
-#: ../data/playlist.ui.h:7
-msgid "Save Playlist..."
-msgstr "Save Playlist…"
+#: ../browser-plugin/totem-plugin-viewer.c:676
+#: ../browser-plugin/totem-plugin-viewer.c:1700
+msgid "Totem Movie Player"
+msgstr "Totem Movie Player"
 
-#: ../data/playlist.ui.h:8 ../data/totem.ui.h:77
-msgid "Select a file to use for text subtitles"
-msgstr "Select a file to use for text subtitles"
+#. translators: this is:
+#. * Open With ApplicationName
+#. * as in nautilus' right-click menu
+#: ../browser-plugin/totem-plugin-viewer.c:1120
+#, c-format
+msgid "_Open with \"%s\""
+msgstr "_Open with \"%s\""
 
-#: ../data/playlist.ui.h:9 ../data/video-list.ui.h:4
-msgid "_Copy Location"
-msgstr "_Copy Location"
+#: ../browser-plugin/totem-plugin-viewer.c:1341 ../src/totem-object.c:2475
+msgid "An error occurred"
+msgstr "An error occurred"
 
-#: ../data/playlist.ui.h:10
-msgid "_Remove"
-msgstr "_Remove"
+#: ../browser-plugin/totem-plugin-viewer.c:2033
+msgid "No playlist or playlist empty"
+msgstr "No playlist or playlist empty"
 
-#: ../data/playlist.ui.h:11 ../data/totem.ui.h:141
-msgid "_Select Text Subtitles..."
-msgstr "_Select Text Subtitles…"
+#: ../browser-plugin/totem-plugin-viewer.c:2128
+msgid "Movie browser plugin"
+msgstr "Movie browser plugin"
 
-#: ../data/properties.ui.h:1
-msgid "Album:"
-msgstr "Album:"
+#: ../browser-plugin/totem-plugin-viewer.c:2144 ../src/totem.c:240
+msgid "Could not initialize the thread-safe libraries."
+msgstr "Could not initialise the thread-safe libraries."
 
-#: ../data/properties.ui.h:2
-msgid "Artist:"
-msgstr "Artist:"
+#: ../browser-plugin/totem-plugin-viewer.c:2144
+msgid "Verify your system installation. The Totem plugin will now exit."
+msgstr "Verify your system installation. The Totem plugin will now exit."
 
-#: ../data/properties.ui.h:3 ../data/totem.ui.h:23
-#: ../src/totem-properties-view.c:268
-msgid "Audio"
-msgstr "Audio"
+#: ../data/fullscreen.ui.h:1
+msgid "Leave Fullscreen"
+msgstr "Leave Fullscreen"
 
-#: ../data/properties.ui.h:4
-msgid "Bitrate:"
-msgstr "Bitrate:"
+#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:81
+msgid "Time:"
+msgstr "Time:"
 
-#: ../data/properties.ui.h:5
-msgid "Channels:"
-msgstr "Channels:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
+msgid "Allow the screensaver to activate when playing audio"
+msgstr "Allow the screensaver to activate when playing audio"
 
-#: ../data/properties.ui.h:6
-msgid "Codec:"
-msgstr "Codec:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
+msgid ""
+"Allow the screensaver to activate when playing audio. Disable if you have "
+"monitor-powered speakers."
+msgstr ""
+"Allow the screensaver to activate when playing audio. Disable if you have "
+"monitor-powered speakers."
 
-#: ../data/properties.ui.h:7
-msgid "Comment:"
-msgstr "Comment:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
+msgid "Show visual effects when no video is displayed"
+msgstr "Show visual effects when no video is displayed"
 
-#: ../data/properties.ui.h:8
-msgid "Container:"
-msgstr "Container:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
+msgid "Show visual effects when playing an audio only file."
+msgstr "Show visual effects when playing an audio only file."
 
-#: ../data/properties.ui.h:9
-msgid "Dimensions:"
-msgstr "Dimensions:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
+msgid "Name of the visual effects plugin"
+msgstr "Name of the visual effects plugin"
 
-#: ../data/properties.ui.h:10
-msgid "Duration:"
-msgstr "Duration:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
+msgid "The brightness of the video"
+msgstr "The brightness of the video"
 
-#: ../data/properties.ui.h:11
-msgid "Framerate:"
-msgstr "Framerate:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
+msgid "The contrast of the video"
+msgstr "The contrast of the video"
 
-#: ../data/properties.ui.h:12 ../data/totem.ui.h:41
-msgid "General"
-msgstr "General"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
+msgid "The hue of the video"
+msgstr "The hue of the video"
 
-#: ../data/properties.ui.h:13
-msgid "Sample rate:"
-msgstr "Sample rate:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
+msgid "The saturation of the video"
+msgstr "The saturation of the video"
 
-#: ../data/properties.ui.h:14
-msgid "Title:"
-msgstr "Title:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
+msgid "Resize the canvas automatically on file load"
+msgstr "Resize the canvas automatically on file load"
 
-#: ../data/properties.ui.h:15 ../data/totem.ui.h:104
-#: ../src/totem-properties-view.c:270
-msgid "Video"
-msgstr "Video"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
+msgid "Repeat mode"
+msgstr "Repeat mode"
 
-#: ../data/properties.ui.h:16
-msgid "Year:"
-msgstr "Year:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
+msgid "Shuffle mode"
+msgstr "Shuffle mode"
 
-#: ../data/video-list.ui.h:1
-msgid "Add the video to the playlist"
-msgstr "Add the video to the playlist"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
+msgid "Whether to disable deinterlacing for interlaced movies"
+msgstr "Whether to disable deinterlacing for interlaced movies"
 
-#: ../data/video-list.ui.h:3 ../src/totem-dnd-menu.c:97
-msgid "_Add to Playlist"
-msgstr "_Add to Playlist"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
+msgid "Whether to enable debug for the playback engine"
+msgstr "Whether to enable debug for the playback engine"
 
-#. Title
-#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:53
-#: ../src/totem-object.c:1667
-msgid "Movie Player"
-msgstr "Movie Player"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
+msgid "Type of audio output to use"
+msgstr "Type of audio output to use"
 
-#: ../data/totem.desktop.in.in.in.h:2
-msgid "Play movies and songs"
-msgstr "Play movies and songs"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
+msgid "Visualization quality setting"
+msgstr "Visualisation quality setting"
 
-#: ../data/totem.ui.h:1
-msgid "1.5 Mbps T1/Intranet/LAN"
-msgstr "1.5 Mbps T1/Intranet/LAN"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
+msgid "Quality setting for the audio visualization."
+msgstr "Quality setting for the audio visualisation."
 
-#: ../data/totem.ui.h:2
-msgid "112 Kbps Dual ISDN/DSL"
-msgstr "112 Kbps Dual ISDN/DSL"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
+msgid "Network buffering threshold"
+msgstr "Network buffering threshold"
 
-#: ../data/totem.ui.h:3
-msgid "14.4 Kbps Modem"
-msgstr "14.4 Kbps Modem"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
+msgid ""
+"Amount of data to buffer for network streams before starting to display the "
+"stream (in seconds)."
+msgstr ""
+"Amount of data to buffer for network streams before starting to display the "
+"stream (in seconds)."
 
-#: ../data/totem.ui.h:4
-msgid "16:9 (Widescreen)"
-msgstr "16:9 (Widescreen)"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
+msgid "Subtitle font"
+msgstr "Subtitle font"
 
-#: ../data/totem.ui.h:5
-msgid "19.2 Kbps Modem"
-msgstr "19.2 Kbps Modem"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
+msgid "Pango font description for subtitle rendering."
+msgstr "Pango font description for subtitle rendering."
 
-#: ../data/totem.ui.h:6
-msgid "2.11:1 (DVB)"
-msgstr "2.11:1 (DVB)"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
+msgid "Subtitle encoding"
+msgstr "Subtitle encoding"
 
-#: ../data/totem.ui.h:7
-msgid "256 Kbps DSL/Cable"
-msgstr "256 Kbps DSL/Cable"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
+msgid "Encoding character set for subtitle."
+msgstr "Encoding character set for subtitles."
 
-#: ../data/totem.ui.h:8
-msgid "28.8 Kbps Modem"
-msgstr "28.8 Kbps Modem"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
+msgid "Default location for the \"Open...\" dialogs"
+msgstr "Default location for the \"Open…\" dialogues"
 
-#: ../data/totem.ui.h:9
-msgid "33.6 Kbps Modem"
-msgstr "33.6 Kbps Modem"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
+msgid ""
+"Default location for the \"Open...\" dialogs. Default is the current "
+"directory."
+msgstr ""
+"Default location for the \"Open…\" dialogues. Default is the current "
+"directory."
 
-#: ../data/totem.ui.h:10
-msgid "34.4 Kbps Modem"
-msgstr "34.4 Kbps Modem"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
+msgid "Default location for the \"Take Screenshot\" dialogs"
+msgstr "Default location for the \"Take Screenshot\" dialogues"
 
-#: ../data/totem.ui.h:11
-msgid "384 Kbps DSL/Cable"
-msgstr "384 Kbps DSL/Cable"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
+msgid ""
+"Default location for the \"Take Screenshot\" dialogs. Default is the "
+"Pictures directory."
+msgstr ""
+"Default location for the \"Take Screenshot\" dialogues. Default is the "
+"Pictures directory."
 
-#: ../data/totem.ui.h:12
-msgid "4-channel"
-msgstr "4-channel"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
+msgid "Whether to disable the plugins in the user's home directory"
+msgstr "Whether to disable the plugins in the user's home directory"
 
-#: ../data/totem.ui.h:13
-msgid "4.1-channel"
-msgstr "4.1-channel"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
+msgid "Whether to disable the keyboard shortcuts"
+msgstr "Whether to disable the keyboard shortcuts"
 
-#: ../data/totem.ui.h:14
-msgid "4:3 (TV)"
-msgstr "4:3 (TV)"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
+msgid "Whether to autoload text subtitle files when a movie is loaded"
+msgstr "Whether to autoload text subtitle files when a movie is loaded"
 
-#: ../data/totem.ui.h:15
-msgid "5.0-channel"
-msgstr "5.0-channel"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
+msgid "Whether to autoload external chapter files when a movie is loaded"
+msgstr "Whether to autoload external chapter files when a movie is loaded"
 
-#: ../data/totem.ui.h:16
-msgid "5.1-channel"
-msgstr "5.1-channel"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
+msgid ""
+"Whether to remember the position of played audio/video files when pausing or "
+"closing them"
+msgstr ""
+"Whether to remember the position of played audio/video files when pausing or "
+"closing them"
 
-#: ../data/totem.ui.h:17
-msgid "512 Kbps DSL/Cable"
-msgstr "512 Kbps DSL/Cable"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
+msgid "Active plugins list"
+msgstr "Active plugins list"
 
-#: ../data/totem.ui.h:18
-msgid "56 Kbps Modem/ISDN"
-msgstr "56 Kbps Modem/ISDN"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+msgid ""
+"A list of the names of the plugins which are currently active (loaded and "
+"running)."
+msgstr ""
+"A list of the names of the plugins which are currently active (loaded and "
+"running)."
 
-#: ../data/totem.ui.h:19
-msgid "AC3 Passthrough"
-msgstr "AC3 Passthrough"
+#: ../data/playlist.ui.h:1
+msgid "_Remove"
+msgstr "_Remove"
 
-#: ../data/totem.ui.h:20
-msgid "A_udio Menu"
-msgstr "A_udio Menu"
+#: ../data/playlist.ui.h:2
+msgid "Remove file from playlist"
+msgstr "Remove file from playlist"
 
-#: ../data/totem.ui.h:21
-msgid "About this application"
-msgstr "About this application"
+#: ../data/playlist.ui.h:3 ../data/video-list.ui.h:3
+msgid "_Copy Location"
+msgstr "_Copy Location"
 
-#: ../data/totem.ui.h:22
-msgctxt "Aspect ratio"
-msgid "Auto"
-msgstr "Auto"
+#: ../data/playlist.ui.h:4 ../data/video-list.ui.h:4
+msgid "Copy the location to the clipboard"
+msgstr "Copy the location to the clipboard"
 
-#: ../data/totem.ui.h:24
-msgid "Audio Output"
-msgstr "Audio Output"
+#: ../data/playlist.ui.h:5 ../data/totem.ui.h:71
+msgid "_Select Text Subtitles..."
+msgstr "_Select Text Subtitles…"
 
-#: ../data/totem.ui.h:25
-msgid "Clear the playlist"
-msgstr "Clear the playlist"
+#: ../data/playlist.ui.h:6 ../data/totem.ui.h:72
+msgid "Select a file to use for text subtitles"
+msgstr "Select a file to use for text subtitles"
 
-#: ../data/totem.ui.h:26
-msgid "Co_ntrast:"
-msgstr "Co_ntrast:"
+#: ../data/playlist.ui.h:7
+msgid "Add..."
+msgstr "Add…"
 
-#: ../data/totem.ui.h:27
-msgid "Color Balance"
-msgstr "Colour Balance"
+#: ../data/playlist.ui.h:8
+msgid "Remove"
+msgstr "Remove"
 
-#: ../data/totem.ui.h:28
-msgid "Configure plugins to extend the application"
-msgstr "Configure plugins to extend the application"
+#: ../data/playlist.ui.h:9
+msgid "Save Playlist..."
+msgstr "Save Playlist…"
 
-#: ../data/totem.ui.h:29
-msgid "Configure the application"
-msgstr "Configure the application"
+#: ../data/playlist.ui.h:10
+msgid "Move Up"
+msgstr "Move Up"
 
-#: ../data/totem.ui.h:30
-msgid "Connection _speed:"
-msgstr "Connection _speed:"
+#: ../data/playlist.ui.h:11
+msgid "Move Down"
+msgstr "Move Down"
 
-#: ../data/totem.ui.h:31
-msgid "Decrease volume"
-msgstr "Decrease volume"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:2
+msgid "Normal"
+msgstr "Normal"
 
-#: ../data/totem.ui.h:32
-msgid "Disable _deinterlacing of interlaced videos"
-msgstr "Disable _deinterlacing of interlaced videos"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:4
+msgid "Large"
+msgstr "Large"
 
-#: ../data/totem.ui.h:33
-msgid "Disable screensaver when playing "
-msgstr "Disable screensaver when playing "
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:6
+msgid "Extra Large"
+msgstr "Extra Large"
 
-#. Tab label in the Preferences dialogue
-#: ../data/totem.ui.h:35
-msgid "Display"
-msgstr "Display"
+#: ../data/preferences.ui.h:7 ../src/backend/bacon-video-widget.c:5498
+#: ../src/totem-properties-view.c:231
+msgid "Stereo"
+msgstr "Stereo"
 
-#: ../data/totem.ui.h:36
-msgid "Eject the current disc"
-msgstr "Eject the current disc"
+#: ../data/preferences.ui.h:8
+msgid "4-channel"
+msgstr "4-channel"
 
-#: ../data/totem.ui.h:37
-msgid "External Chapters"
-msgstr "External Chapters"
+#: ../data/preferences.ui.h:9
+msgid "4.1-channel"
+msgstr "4.1-channel"
 
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:39
-msgid "Extra Large"
-msgstr "Extra Large"
+#: ../data/preferences.ui.h:10
+msgid "5.0-channel"
+msgstr "5.0-channel"
 
-#: ../data/totem.ui.h:40
-msgid "Fit Window to Movie"
-msgstr "Fit Window to Movie"
+#: ../data/preferences.ui.h:11
+msgid "5.1-channel"
+msgstr "5.1-channel"
 
-#: ../data/totem.ui.h:42
-msgid "Go to the DVD menu"
-msgstr "Go to the DVD menu"
+#: ../data/preferences.ui.h:12
+msgid "AC3 Passthrough"
+msgstr "AC3 Passthrough"
 
-#: ../data/totem.ui.h:43
-msgid "Go to the angle menu"
-msgstr "Go to the angle menu"
+#: ../data/preferences.ui.h:13
+msgid "Totem Preferences"
+msgstr "Totem Preferences"
 
-#: ../data/totem.ui.h:44
-msgid "Go to the audio menu"
-msgstr "Go to the audio menu"
+#: ../data/preferences.ui.h:14
+msgid "Playback"
+msgstr "Playback"
 
-#: ../data/totem.ui.h:45
-msgid "Go to the chapter menu"
-msgstr "Go to the chapter menu"
+#: ../data/preferences.ui.h:15
+msgid "Start playing files from last position"
+msgstr "Start playing files from last position"
 
-#: ../data/totem.ui.h:46
-msgid "Go to the title menu"
-msgstr "Go to the title menu"
+#: ../data/preferences.ui.h:16
+msgid "Text Subtitles"
+msgstr "Text Subtitles"
 
-#: ../data/totem.ui.h:47
-msgid "Help contents"
-msgstr "Help contents"
+#: ../data/preferences.ui.h:17
+msgid "_Load subtitle files when movie is loaded"
+msgstr "_Load subtitle files when movie is loaded"
 
-#: ../data/totem.ui.h:48
-msgid "Increase volume"
-msgstr "Increase volume"
+#: ../data/preferences.ui.h:18
+msgid "_Font:"
+msgstr "_Font:"
 
-#: ../data/totem.ui.h:49
-msgid "Intranet/LAN"
-msgstr "Intranet/LAN"
+#: ../data/preferences.ui.h:19
+msgid "_Encoding:"
+msgstr "_Encoding:"
 
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:51
-msgid "Large"
-msgstr "Large"
+#: ../data/preferences.ui.h:20
+msgid "External Chapters"
+msgstr "External Chapters"
 
-#: ../data/totem.ui.h:52
+#: ../data/preferences.ui.h:21
 msgid "Load _chapter files when movie is loaded"
 msgstr "Load _chapter files when movie is loaded"
 
-#: ../data/totem.ui.h:54
-msgid "Networking"
-msgstr "Networking"
+#: ../data/preferences.ui.h:22 ../data/properties.ui.h:1
+msgid "General"
+msgstr "General"
 
-#: ../data/totem.ui.h:55
-msgid "Next chapter or movie"
-msgstr "Next chapter or movie"
+#. Tab label in the Preferences dialogue
+#: ../data/preferences.ui.h:24
+msgid "Display"
+msgstr "Display"
 
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:57
-msgid "Normal"
-msgstr "Normal"
+#: ../data/preferences.ui.h:25
+msgid "_Resize the window when a new video is loaded"
+msgstr "_Resize the window when a new video is loaded"
 
-#: ../data/totem.ui.h:58
-msgid "Open _Location..."
-msgstr "Open _Location…"
+#: ../data/preferences.ui.h:26
+msgid "Disable _deinterlacing of interlaced videos"
+msgstr "Disable _deinterlacing of interlaced videos"
 
-#: ../data/totem.ui.h:59
-msgid "Open a file"
-msgstr "Open a file"
+#: ../data/preferences.ui.h:27
+msgid "Disable screensaver when playing "
+msgstr "Disable screensaver when playing "
 
-#: ../data/totem.ui.h:60
-msgid "Open a non-local file"
-msgstr "Open a non-local file"
+#: ../data/preferences.ui.h:28 ../data/properties.ui.h:9
+#: ../src/totem-properties-view.c:273
+msgid "Video"
+msgstr "Video"
 
-#: ../data/totem.ui.h:61
-msgid "Play / P_ause"
-msgstr "Play / P_ause"
+#: ../data/preferences.ui.h:29
+msgid "Video or Audio"
+msgstr "Video or Audio"
+
+#: ../data/preferences.ui.h:30
+msgid "Visual Effects"
+msgstr "Visual Effects"
+
+#: ../data/preferences.ui.h:31
+msgid "Show _visual effects when an audio file is played"
+msgstr "Show _visual effects when an audio file is played"
 
-#: ../data/totem.ui.h:62
-msgid "Play or pause the movie"
-msgstr "Play or pause the movie"
+#: ../data/preferences.ui.h:32
+msgid "_Type of visualization:"
+msgstr "_Type of visualisation:"
 
-#: ../data/totem.ui.h:63
-msgid "Playback"
-msgstr "Playback"
+#: ../data/preferences.ui.h:33
+msgid "Visualization _size:"
+msgstr "Visualisation _size:"
 
-#: ../data/totem.ui.h:64
-msgid "Plugins..."
-msgstr "Plugins…"
+#: ../data/preferences.ui.h:34
+msgid "Color Balance"
+msgstr "Colour Balance"
 
-#: ../data/totem.ui.h:65
-msgid "Prefere_nces"
-msgstr "Prefere_nces"
+#: ../data/preferences.ui.h:35
+msgid "_Brightness:"
+msgstr "_Brightness:"
 
-#: ../data/totem.ui.h:66
-msgid "Previous chapter or movie"
-msgstr "Previous chapter or movie"
+#: ../data/preferences.ui.h:36
+msgid "Co_ntrast:"
+msgstr "Co_ntrast:"
 
-#: ../data/totem.ui.h:67
-msgid "Quit the program"
-msgstr "Quit the program"
+#: ../data/preferences.ui.h:37
+msgid "Sat_uration:"
+msgstr "Sat_uration:"
 
-#: ../data/totem.ui.h:68
+#: ../data/preferences.ui.h:38
+msgid "_Hue:"
+msgstr "_Hue:"
+
+#: ../data/preferences.ui.h:39
 msgid "Reset to _Defaults"
 msgstr "Reset to _Defaults"
 
-#: ../data/totem.ui.h:69
-msgid "Resize _1:1"
-msgstr "Resize _1:1"
+#: ../data/preferences.ui.h:40
+msgid "Audio Output"
+msgstr "Audio Output"
 
-#: ../data/totem.ui.h:70
-msgid "Resize _2:1"
-msgstr "Resize _2:1"
+#: ../data/preferences.ui.h:41
+msgid "_Audio output type:"
+msgstr "_Audio output type:"
 
-#: ../data/totem.ui.h:71
-msgid "Resize to double the original video size"
-msgstr "Resize to double the original video size"
+#: ../data/preferences.ui.h:42 ../data/properties.ui.h:14
+#: ../src/totem-properties-view.c:271
+msgid "Audio"
+msgstr "Audio"
 
-#: ../data/totem.ui.h:72
-msgid "Resize to half the original video size"
-msgstr "Resize to half the original video size"
+#: ../data/properties.ui.h:2
+msgid "Title:"
+msgstr "Title:"
 
-#: ../data/totem.ui.h:73
-msgid "Resize to the original video size"
-msgstr "Resize to the original video size"
+#: ../data/properties.ui.h:3
+msgid "Artist:"
+msgstr "Artist:"
 
-#: ../data/totem.ui.h:74
-msgid "S_idebar"
-msgstr "S_idebar"
+#: ../data/properties.ui.h:4
+msgid "Duration:"
+msgstr "Duration:"
 
-#: ../data/totem.ui.h:75
-msgid "S_ubtitles"
-msgstr "S_ubtitles"
+#: ../data/properties.ui.h:5
+msgid "Year:"
+msgstr "Year:"
 
-#: ../data/totem.ui.h:76
-msgid "Sat_uration:"
-msgstr "Sat_uration:"
+#: ../data/properties.ui.h:6
+msgid "Album:"
+msgstr "Album:"
 
-#: ../data/totem.ui.h:78
-msgid "Set the repeat mode"
-msgstr "Set the repeat mode"
+#: ../data/properties.ui.h:7
+msgid "Comment:"
+msgstr "Comment:"
 
-#: ../data/totem.ui.h:79
-msgid "Set the shuffle mode"
-msgstr "Set the shuffle mode"
+#: ../data/properties.ui.h:8
+msgid "Container:"
+msgstr "Container:"
 
-#: ../data/totem.ui.h:80
-msgid "Sets 16:9 (widescreen) aspect ratio"
-msgstr "Sets 16:9 (widescreen) aspect ratio"
+#: ../data/properties.ui.h:10
+msgid "Dimensions:"
+msgstr "Dimensions:"
 
-#: ../data/totem.ui.h:81
-msgid "Sets 2.11:1 (DVB) aspect ratio"
-msgstr "Sets 2.11:1 (DVB) aspect ratio"
+#: ../data/properties.ui.h:11
+msgid "Codec:"
+msgstr "Codec:"
 
-#: ../data/totem.ui.h:82
-msgid "Sets 4:3 (TV) aspect ratio"
-msgstr "Sets 4:3 (TV) aspect ratio"
+#: ../data/properties.ui.h:12
+msgid "Framerate:"
+msgstr "Framerate:"
 
-#: ../data/totem.ui.h:83
-msgid "Sets automatic aspect ratio"
-msgstr "Sets automatic aspect ratio"
+#: ../data/properties.ui.h:13
+msgid "Bitrate:"
+msgstr "Bitrate:"
 
-#: ../data/totem.ui.h:84
-msgid "Sets square aspect ratio"
-msgstr "Sets square aspect ratio"
+#: ../data/properties.ui.h:15
+msgid "Sample rate:"
+msgstr "Sample rate:"
 
-#: ../data/totem.ui.h:85
-msgid "Show _Controls"
-msgstr "Show _Controls"
+#: ../data/properties.ui.h:16
+msgid "Channels:"
+msgstr "Channels:"
 
-#: ../data/totem.ui.h:86
-msgid "Show _visual effects when an audio file is played"
-msgstr "Show _visual effects when an audio file is played"
+#. Title
+#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:80 ../src/totem.c:239
+#: ../src/totem.c:248 ../src/totem-menu.c:790 ../src/totem-object.c:1658
+msgid "Videos"
+msgstr "Videos"
 
-#: ../data/totem.ui.h:87
-msgid "Show controls"
-msgstr "Show controls"
+#: ../data/totem.desktop.in.in.in.h:2
+msgid "Play movies"
+msgstr "Play movies"
 
-#: ../data/totem.ui.h:88
-msgid "Show or hide the sidebar"
-msgstr "Show or hide the sidebar"
+#: ../data/totem.desktop.in.in.in.h:3
+msgid "Video;Movie;Film;Clip;Series;Player;DVD;TV;Disc;"
+msgstr "Video;Movie;Film;Clip;Series;Player;DVD;TV;Disc;"
 
-#: ../data/totem.ui.h:89
-msgid "Shuff_le Mode"
-msgstr "Shuff_le Mode"
+#: ../data/totem.ui.h:1
+msgid "_Open"
+msgstr "_Open"
 
-#: ../data/totem.ui.h:90
-msgid "Skip _Backwards"
-msgstr "Skip _Backwards"
+#: ../data/totem.ui.h:2
+msgid "Open _Location"
+msgstr "Open _Location"
 
-#: ../data/totem.ui.h:91
-msgid "Skip _Forward"
-msgstr "Skip _Forward"
+#: ../data/totem.ui.h:3
+msgid "_Fullscreen"
+msgstr "_Fullscreen"
 
-#: ../data/totem.ui.h:92
-msgid "Skip backwards"
-msgstr "Skip backwards"
+#: ../data/totem.ui.h:4
+msgid "Prefere_nces"
+msgstr "Prefere_nces"
 
-#: ../data/totem.ui.h:93
-msgid "Skip forward"
-msgstr "Skip forward"
+#: ../data/totem.ui.h:5
+msgid "Shuff_le"
+msgstr "Shuff_le"
 
-#: ../data/totem.ui.h:94
-msgid "Square"
-msgstr "Square"
+#: ../data/totem.ui.h:6
+msgid "_Repeat"
+msgstr "_Repeat"
 
-#: ../data/totem.ui.h:95
-msgid "Start playing files from last position"
-msgstr "Start playing files from last position"
+#: ../data/totem.ui.h:7
+msgid "_Quit"
+msgstr "_Quit"
 
-#: ../data/totem.ui.h:96 ../src/totem-properties-view.c:228
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5593
-msgid "Stereo"
-msgstr "Stereo"
+#: ../data/totem.ui.h:8
+msgid "_Movie"
+msgstr "_Movie"
 
-#: ../data/totem.ui.h:97
-msgid "Switch An_gles"
-msgstr "Switch An_gles"
+#: ../data/totem.ui.h:9
+msgid "_Eject"
+msgstr "_Eject"
 
-#: ../data/totem.ui.h:98
-msgid "Switch camera angles"
-msgstr "Switch camera angles"
+#: ../data/totem.ui.h:10
+msgid "Eject the current disc"
+msgstr "Eject the current disc"
 
-#: ../data/totem.ui.h:99
-msgid "Switch to fullscreen"
-msgstr "Switch to fullscreen"
+#: ../data/totem.ui.h:11
+msgid "_Properties"
+msgstr "_Properties"
 
-#: ../data/totem.ui.h:100
-msgid "Text Subtitles"
-msgstr "Text Subtitles"
+#: ../data/totem.ui.h:12
+msgid "View the properties of the current stream"
+msgstr "View the properties of the current stream"
 
-#: ../data/totem.ui.h:101
-msgid "Time seek bar"
-msgstr "Time seek bar"
+#: ../data/totem.ui.h:13
+msgid "Play / P_ause"
+msgstr "Play / P_ause"
 
-#: ../data/totem.ui.h:103
-msgid "Totem Preferences"
-msgstr "Totem Preferences"
+#: ../data/totem.ui.h:14
+msgid "Play or pause the movie"
+msgstr "Play or pause the movie"
 
-#: ../data/totem.ui.h:105
-msgid "Video or Audio"
-msgstr "Video or Audio"
+#: ../data/totem.ui.h:15
+msgid "_Edit"
+msgstr "_Edit"
 
-#: ../data/totem.ui.h:106
-msgid "View the properties of the current stream"
-msgstr "View the properties of the current stream"
+#: ../data/totem.ui.h:16
+msgid "_Clear Playlist"
+msgstr "_Clear Playlist"
 
-#: ../data/totem.ui.h:107
-msgid "Visual Effects"
-msgstr "Visual Effects"
+#: ../data/totem.ui.h:17
+msgid "Clear the playlist"
+msgstr "Clear the playlist"
 
-#: ../data/totem.ui.h:108
-msgid "Visualization _size:"
-msgstr "Visualisation _size:"
+#: ../data/totem.ui.h:18
+msgid "Plugins..."
+msgstr "Plugins…"
 
-#: ../data/totem.ui.h:109
-msgid "Volume _Down"
-msgstr "Volume _Down"
+#: ../data/totem.ui.h:19
+msgid "Configure plugins to extend the application"
+msgstr "Configure plugins to extend the application"
 
-#: ../data/totem.ui.h:110
-msgid "Volume _Up"
-msgstr "Volume _Up"
+#: ../data/totem.ui.h:20
+msgid "_View"
+msgstr "_View"
 
-#: ../data/totem.ui.h:111
-msgid "Zoom In"
-msgstr "Zoom In"
+#: ../data/totem.ui.h:21
+msgid "Fit Window to Movie"
+msgstr "Fit Window to Movie"
 
-#: ../data/totem.ui.h:112
-msgid "Zoom in"
-msgstr "Zoom in"
+#: ../data/totem.ui.h:22
+msgid "_Resize 1:2"
+msgstr "_Resize 1:2"
 
-#: ../data/totem.ui.h:113
-msgid "_About"
-msgstr "_About"
+#: ../data/totem.ui.h:23
+msgid "Resize to half the original video size"
+msgstr "Resize to half the original video size"
 
-#: ../data/totem.ui.h:114
-msgid "_Angle Menu"
-msgstr "_Angle Menu"
+#: ../data/totem.ui.h:24
+msgid "Resize _1:1"
+msgstr "Resize _1:1"
 
-#: ../data/totem.ui.h:115
-msgid "_Aspect Ratio"
-msgstr "_Aspect Ratio"
+#: ../data/totem.ui.h:25
+msgid "Resize to the original video size"
+msgstr "Resize to the original video size"
 
-#: ../data/totem.ui.h:116
-msgid "_Audio output type:"
-msgstr "_Audio output type:"
+#: ../data/totem.ui.h:26
+msgid "Resize _2:1"
+msgstr "Resize _2:1"
 
-#: ../data/totem.ui.h:117
-msgid "_Brightness:"
-msgstr "_Brightness:"
+#: ../data/totem.ui.h:27
+msgid "Resize to double the original video size"
+msgstr "Resize to double the original video size"
 
-#: ../data/totem.ui.h:118
-msgid "_Chapter Menu"
-msgstr "_Chapter Menu"
+#: ../data/totem.ui.h:28
+msgid "_Aspect Ratio"
+msgstr "_Aspect Ratio"
 
-#: ../data/totem.ui.h:119
-msgid "_Clear Playlist"
-msgstr "_Clear Playlist"
+#: ../data/totem.ui.h:29
+msgid "Switch An_gles"
+msgstr "Switch An_gles"
 
-#: ../data/totem.ui.h:120
-msgid "_Contents"
-msgstr "_Contents"
+#: ../data/totem.ui.h:30
+msgid "Switch camera angles"
+msgstr "Switch camera angles"
 
-#: ../data/totem.ui.h:121
+#: ../data/totem.ui.h:31
+msgid "_Go"
+msgstr "_Go"
+
+#: ../data/totem.ui.h:32
 msgid "_DVD Menu"
 msgstr "_DVD Menu"
 
-#: ../data/totem.ui.h:122
-msgid "_Edit"
-msgstr "_Edit"
-
-#: ../data/totem.ui.h:123
-msgid "_Eject"
-msgstr "_Eject"
-
-#: ../data/totem.ui.h:124
-msgid "_Encoding:"
-msgstr "_Encoding:"
+#: ../data/totem.ui.h:33
+msgid "Go to the DVD menu"
+msgstr "Go to the DVD menu"
 
-#: ../data/totem.ui.h:125
-msgid "_Font:"
-msgstr "_Font:"
+#: ../data/totem.ui.h:34
+msgid "_Title Menu"
+msgstr "_Title Menu"
 
-#: ../data/totem.ui.h:126
-msgid "_Fullscreen"
-msgstr "_Fullscreen"
+#: ../data/totem.ui.h:35
+msgid "Go to the title menu"
+msgstr "Go to the title menu"
 
-#: ../data/totem.ui.h:127
-msgid "_Go"
-msgstr "_Go"
+#: ../data/totem.ui.h:36
+msgid "A_udio Menu"
+msgstr "A_udio Menu"
 
-#: ../data/totem.ui.h:128
-msgid "_Help"
-msgstr "_Help"
+#: ../data/totem.ui.h:37
+msgid "Go to the audio menu"
+msgstr "Go to the audio menu"
 
-#: ../data/totem.ui.h:129
-msgid "_Hue:"
-msgstr "_Hue:"
+#: ../data/totem.ui.h:38
+msgid "_Angle Menu"
+msgstr "_Angle Menu"
 
-#: ../data/totem.ui.h:130
-msgid "_Languages"
-msgstr "_Languages"
+#: ../data/totem.ui.h:39
+msgid "Go to the angle menu"
+msgstr "Go to the angle menu"
 
-#: ../data/totem.ui.h:131
-msgid "_Load subtitle files when movie is loaded"
-msgstr "_Load subtitle files when movie is loaded"
+#: ../data/totem.ui.h:40
+msgid "_Chapter Menu"
+msgstr "_Chapter Menu"
 
-#: ../data/totem.ui.h:132
-msgid "_Movie"
-msgstr "_Movie"
+#: ../data/totem.ui.h:41
+msgid "Go to the chapter menu"
+msgstr "Go to the chapter menu"
 
-#: ../data/totem.ui.h:133
+#: ../data/totem.ui.h:42
 msgid "_Next Chapter/Movie"
 msgstr "_Next Chapter/Movie"
 
-#: ../data/totem.ui.h:134
-msgid "_Open..."
-msgstr "_Open…"
+#: ../data/totem.ui.h:43
+msgid "Next chapter or movie"
+msgstr "Next chapter or movie"
 
-#: ../data/totem.ui.h:135
+#: ../data/totem.ui.h:44
 msgid "_Previous Chapter/Movie"
 msgstr "_Previous Chapter/Movie"
 
-#: ../data/totem.ui.h:136
-msgid "_Properties"
-msgstr "_Properties"
+#: ../data/totem.ui.h:45
+msgid "Previous chapter or movie"
+msgstr "Previous chapter or movie"
 
-#: ../data/totem.ui.h:137
-msgid "_Quit"
-msgstr "_Quit"
+#: ../data/totem.ui.h:46
+msgid "_Sound"
+msgstr "_Sound"
 
-#: ../data/totem.ui.h:138
-msgid "_Repeat Mode"
-msgstr "_Repeat Mode"
+#: ../data/totem.ui.h:47
+msgid "Volume _Up"
+msgstr "Volume _Up"
 
-#: ../data/totem.ui.h:139
-msgid "_Resize 1:2"
-msgstr "_Resize 1:2"
+#: ../data/totem.ui.h:48
+msgid "Increase volume"
+msgstr "Increase volume"
 
-#: ../data/totem.ui.h:140
-msgid "_Resize the window when a new video is loaded"
-msgstr "_Resize the window when a new video is loaded"
+#: ../data/totem.ui.h:49
+msgid "Volume _Down"
+msgstr "Volume _Down"
 
-#: ../data/totem.ui.h:142
-msgid "_Sound"
-msgstr "_Sound"
+#: ../data/totem.ui.h:50
+msgid "Decrease volume"
+msgstr "Decrease volume"
 
-#: ../data/totem.ui.h:143
-msgid "_Title Menu"
-msgstr "_Title Menu"
+#: ../data/totem.ui.h:51
+msgid "_Help"
+msgstr "_Help"
 
-#: ../data/totem.ui.h:144
-msgid "_Type of visualization:"
-msgstr "_Type of visualisation:"
+#: ../data/totem.ui.h:52
+msgid "_Contents"
+msgstr "_Contents"
 
-#: ../data/totem.ui.h:145
-msgid "_View"
-msgstr "_View"
+#: ../data/totem.ui.h:53
+msgid "Help contents"
+msgstr "Help contents"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
-msgid ""
-"A list of the names of the plugins which are currently active (loaded and "
-"running)."
-msgstr ""
-"A list of the names of the plugins which are currently active (loaded and "
-"running)."
+#: ../data/totem.ui.h:54
+msgid "_About"
+msgstr "_About"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
-msgid "Active plugins list"
-msgstr "Active plugins list"
+#: ../data/totem.ui.h:55
+msgid "About this application"
+msgstr "About this application"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
-msgid "Allow the screensaver to activate when playing audio"
-msgstr "Allow the screensaver to activate when playing audio"
+#: ../data/totem.ui.h:56
+msgid "Show _Controls"
+msgstr "Show _Controls"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
-msgid ""
-"Allow the screensaver to activate when playing audio. Disable if you have "
-"monitor-powered speakers."
-msgstr ""
-"Allow the screensaver to activate when playing audio. Disable if you have "
-"monitor-powered speakers."
+#: ../data/totem.ui.h:57
+msgid "Show controls"
+msgstr "Show controls"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
-msgid ""
-"Amount of data to buffer for network streams before starting to display the "
-"stream (in seconds)."
-msgstr ""
-"Amount of data to buffer for network streams before starting to display the "
-"stream (in seconds)."
+#: ../data/totem.ui.h:58
+msgid "S_idebar"
+msgstr "S_idebar"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
-msgid ""
-"Approximate network connection speed, used to select quality on media over "
-"the network."
-msgstr ""
-"Approximate network connection speed, used to select quality on media over "
-"the network."
+#: ../data/totem.ui.h:59
+msgid "Show or hide the sidebar"
+msgstr "Show or hide the sidebar"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
-msgid "Default location for the \"Open...\" dialogs"
-msgstr "Default location for the \"Open…\" dialogues"
+#: ../data/totem.ui.h:60
+msgctxt "Aspect ratio"
+msgid "Auto"
+msgstr "Auto"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
-msgid ""
-"Default location for the \"Open...\" dialogs. Default is the current "
-"directory."
-msgstr ""
-"Default location for the \"Open…\" dialogues. Default is the current "
-"directory."
+#: ../data/totem.ui.h:61
+msgid "Sets automatic aspect ratio"
+msgstr "Sets automatic aspect ratio"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
-msgid "Default location for the \"Take Screenshot\" dialogs"
-msgstr "Default location for the \"Take Screenshot\" dialogues"
+#: ../data/totem.ui.h:62
+msgid "Square"
+msgstr "Square"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
-msgid ""
-"Default location for the \"Take Screenshot\" dialogs. Default is the "
-"Pictures directory."
-msgstr ""
-"Default location for the \"Take Screenshot\" dialogues. Default is the "
-"Pictures directory."
+#: ../data/totem.ui.h:63
+msgid "Sets square aspect ratio"
+msgstr "Sets square aspect ratio"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
-msgid "Encoding character set for subtitle."
-msgstr "Encoding character set for subtitles."
+#: ../data/totem.ui.h:64
+msgid "4:3 (TV)"
+msgstr "4:3 (TV)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
-msgid "Name of the visual effects plugin"
-msgstr "Name of the visual effects plugin"
+#: ../data/totem.ui.h:65
+msgid "Sets 4:3 (TV) aspect ratio"
+msgstr "Sets 4:3 (TV) aspect ratio"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
-msgid "Network buffering threshold"
-msgstr "Network buffering threshold"
+#: ../data/totem.ui.h:66
+msgid "16:9 (Widescreen)"
+msgstr "16:9 (Widescreen)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
-msgid "Network connection speed"
-msgstr "Network connection speed"
+#: ../data/totem.ui.h:67
+msgid "Sets 16:9 (widescreen) aspect ratio"
+msgstr "Sets 16:9 (widescreen) aspect ratio"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
-msgid "Pango font description for subtitle rendering."
-msgstr "Pango font description for subtitle rendering."
+#: ../data/totem.ui.h:68
+msgid "2.11:1 (DVB)"
+msgstr "2.11:1 (DVB)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
-msgid "Quality setting for the audio visualization."
-msgstr "Quality setting for the audio visualisation."
+#: ../data/totem.ui.h:69
+msgid "Sets 2.11:1 (DVB) aspect ratio"
+msgstr "Sets 2.11:1 (DVB) aspect ratio"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
-msgid "Repeat mode"
-msgstr "Repeat mode"
+#: ../data/totem.ui.h:70
+msgid "S_ubtitles"
+msgstr "S_ubtitles"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
-msgid "Resize the canvas automatically on file load"
-msgstr "Resize the canvas automatically on file load"
+#: ../data/totem.ui.h:73
+msgid "_Languages"
+msgstr "_Languages"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
-msgid "Show visual effects when no video is displayed"
-msgstr "Show visual effects when no video is displayed"
+#: ../data/totem.ui.h:74
+msgid "Zoom In"
+msgstr "Zoom In"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
-msgid "Show visual effects when playing an audio only file."
-msgstr "Show visual effects when playing an audio only file."
+#: ../data/totem.ui.h:75
+msgid "Zoom in"
+msgstr "Zoom in"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
-msgid "Shuffle mode"
-msgstr "Shuffle mode"
+#: ../data/totem.ui.h:76
+msgid "Skip _Forward"
+msgstr "Skip _Forward"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
-msgid "Subtitle encoding"
-msgstr "Subtitle encoding"
+#: ../data/totem.ui.h:77
+msgid "Skip forward"
+msgstr "Skip forward"
+
+#: ../data/totem.ui.h:78
+msgid "Skip _Backwards"
+msgstr "Skip _Backwards"
+
+#: ../data/totem.ui.h:79
+msgid "Skip backwards"
+msgstr "Skip backwards"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
-msgid "Subtitle font"
-msgstr "Subtitle font"
+#: ../data/totem.ui.h:82
+msgid "Time seek bar"
+msgstr "Time seek bar"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
-msgid "The brightness of the video"
-msgstr "The brightness of the video"
+#: ../data/uri.ui.h:1
+msgid "Enter the _address of the file you would like to open:"
+msgstr "Enter the _address of the file you would like to open:"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
-msgid "The contrast of the video"
-msgstr "The contrast of the video"
+#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
+msgid "_Add to Playlist"
+msgstr "_Add to Playlist"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
-msgid "The hue of the video"
-msgstr "The hue of the video"
+#: ../data/video-list.ui.h:2
+msgid "Add the video to the playlist"
+msgstr "Add the video to the playlist"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
-msgid "The saturation of the video"
-msgstr "The saturation of the video"
+#: ../src/backend/bacon-video-widget.c:1643
+msgid "Password requested for RTSP server"
+msgstr "Password requested for RTSP server"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
-msgid "Type of audio output to use"
-msgstr "Type of audio output to use"
+#: ../src/backend/bacon-video-widget.c:2944
+#, c-format
+msgid "Audio Track #%d"
+msgstr "Audio Track #%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
-msgid "Visualization quality setting"
-msgstr "Visualisation quality setting"
+#: ../src/backend/bacon-video-widget.c:2948
+#, c-format
+msgid "Subtitle #%d"
+msgstr "Subtitle #%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
-msgid "Whether to autoload external chapter files when a movie is loaded"
-msgstr "Whether to autoload external chapter files when a movie is loaded"
+#: ../src/backend/bacon-video-widget.c:3345
+msgid "The server you are trying to connect to is not known."
+msgstr "The server you are trying to connect to is not known."
+
+#: ../src/backend/bacon-video-widget.c:3348
+msgid "The connection to this server was refused."
+msgstr "The connection to this server was refused."
+
+#: ../src/backend/bacon-video-widget.c:3351
+msgid "The specified movie could not be found."
+msgstr "The specified movie could not be found."
+
+#: ../src/backend/bacon-video-widget.c:3358
+msgid "The server refused access to this file or stream."
+msgstr "The server refused access to this file or stream."
+
+#: ../src/backend/bacon-video-widget.c:3364
+msgid "Authentication is required to access this file or stream."
+msgstr "Authentication is required to access this file or stream."
+
+#: ../src/backend/bacon-video-widget.c:3371
+msgid "You are not allowed to open this file."
+msgstr "You are not allowed to open this file."
+
+#: ../src/backend/bacon-video-widget.c:3376
+msgid "This location is not a valid one."
+msgstr "This location is not a valid one."
+
+#: ../src/backend/bacon-video-widget.c:3384
+msgid "The movie could not be read."
+msgstr "The movie could not be read."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
-msgid "Whether to autoload text subtitle files when a movie is loaded"
-msgstr "Whether to autoload text subtitle files when a movie is loaded"
+#. should be exactly one missing thing (source or converter)
+#: ../src/backend/bacon-video-widget.c:3407
+#: ../src/backend/bacon-video-widget.c:3415
+#, c-format
+msgid "The playback of this movie requires a %s plugin which is not installed."
+msgid_plural ""
+"The playback of this movie requires the following decoders which are not "
+"installed:\n"
+"\n"
+"%s"
+msgstr[0] ""
+"The playback of this movie requires a %s plugin which is not installed."
+msgstr[1] ""
+"The playback of this movie requires the following decoders which are not "
+"installed:\n"
+"\n"
+"%s"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
-msgid "Whether to disable deinterlacing for interlaced movies"
-msgstr "Whether to disable deinterlacing for interlaced movies"
+#: ../src/backend/bacon-video-widget.c:3426
+msgid ""
+"An audio or video stream is not handled due to missing codecs. You might "
+"need to install additional plugins to be able to play some types of movies"
+msgstr ""
+"An audio or video stream is not handled due to missing codecs. You might "
+"need to install additional plugins to be able to play some types of movies"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
-msgid "Whether to disable the keyboard shortcuts"
-msgstr "Whether to disable the keyboard shortcuts"
+#: ../src/backend/bacon-video-widget.c:3436
+msgid ""
+"This file cannot be played over the network. Try downloading it locally "
+"first."
+msgstr ""
+"This file cannot be played over the network. Try downloading it locally "
+"first."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
-msgid "Whether to disable the plugins in the user's home directory"
-msgstr "Whether to disable the plugins in the user's home directory"
+#: ../src/backend/bacon-video-widget.c:5494 ../src/totem-properties-view.c:227
+msgid "Surround"
+msgstr "Surround"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:35
-msgid "Whether to enable debug for the playback engine"
-msgstr "Whether to enable debug for the playback engine"
+#: ../src/backend/bacon-video-widget.c:5496 ../src/totem-properties-view.c:229
+msgid "Mono"
+msgstr "Mono"
+
+#: ../src/backend/bacon-video-widget.c:5781
+msgid "Media contains no supported video streams."
+msgstr "Media contains no supported video streams."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:36
+#: ../src/backend/bacon-video-widget.c:5963
 msgid ""
-"Whether to remember the position of played audio/video files when pausing or "
-"closing them"
+"Some necessary plug-ins are missing. Make sure that the program is correctly "
+"installed."
 msgstr ""
-"Whether to remember the position of played audio/video files when pausing or "
-"closing them"
-
-#: ../data/uri.ui.h:1
-msgid "Enter the _address of the file you would like to open:"
-msgstr "Enter the _address of the file you would like to open:"
+"Some necessary plug-ins are missing. Make sure that the program is correctly "
+"installed."
 
 #: ../src/eggdesktopfile.c:165
 #, c-format
@@ -977,6 +1040,31 @@
 msgid "Show session management options"
 msgstr "Show session management options"
 
+#. hour:minutes:seconds
+#. Translators: This is a time format, like "9:05:02" for 9
+#. * hours, 5 minutes, and 2 seconds. You may change ":" to
+#. * the separator that your locale uses or use "%Id" instead
+#. * of "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:56
+#: ../src/plugins/skipto/totem-time-entry.c:57
+#, c-format
+msgctxt "long time format"
+msgid "%d:%02d:%02d"
+msgstr "%d:%02d:%02d"
+
+#. minutes:seconds
+#. Translators: This is a time format, like "5:02" for 5
+#. * minutes and 2 seconds. You may change ":" to the
+#. * separator that your locale uses or use "%Id" instead of
+#. * "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:65
+#, c-format
+msgctxt "short time format"
+msgid "%d:%02d"
+msgstr "%d:%02d"
+
 #. Title
 #. Artist
 #. Album
@@ -1081,10 +1169,14 @@
 msgstr[0] "%d frame per second"
 msgstr[1] "%d frames per second"
 
-#: ../src/totem-audio-preview.c:168
+#: ../src/totem-audio-preview.c:137
 msgid "Audio Preview"
 msgstr "Audio Preview"
 
+#: ../src/totem.c:240
+msgid "Verify your system installation. Totem will now exit."
+msgstr "Verify your system installation. Totem will now exit."
+
 #: ../src/totem-cell-renderer-video.c:126
 msgid "Unknown video"
 msgstr "Unknown video"
@@ -1097,7 +1189,7 @@
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../src/totem-fullscreen.c:616
+#: ../src/totem-fullscreen.c:573
 msgid "No File"
 msgstr "No File"
 
@@ -1115,7 +1207,7 @@
 msgid "Make sure that Totem is properly installed."
 msgstr "Make sure that Totem is properly installed."
 
-#: ../src/totem-interface.c:347
+#: ../src/totem-interface.c:357
 msgid ""
 "Totem 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 "
@@ -1127,7 +1219,7 @@
 "Foundation; either version 2 of the Licence, or (at your option) any later "
 "version."
 
-#: ../src/totem-interface.c:351
+#: ../src/totem-interface.c:361
 msgid ""
 "Totem is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -1139,7 +1231,7 @@
 "FOR A PARTICULAR PURPOSE.  See the GNU General Public Licence for more "
 "details."
 
-#: ../src/totem-interface.c:355
+#: ../src/totem-interface.c:365
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Totem; if not, write to the Free Software Foundation, Inc., 59 Temple Place, "
@@ -1149,7 +1241,7 @@
 "Totem; if not, write to the Free Software Foundation, Inc., 59 Temple Place, "
 "Suite 330, Boston, MA  02111-1307  USA"
 
-#: ../src/totem-interface.c:358
+#: ../src/totem-interface.c:368
 msgid ""
 "Totem contains an exception to allow the use of proprietary GStreamer "
 "plugins."
@@ -1158,46 +1250,21 @@
 "plugins."
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:190
+#: ../src/totem-menu.c:291
 msgid "None"
 msgstr "None"
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:195
+#: ../src/totem-menu.c:296
 msgctxt "Language"
 msgid "Auto"
 msgstr "Auto"
 
-#. Translators:
-#. * This is not a JPEG image, but a disc image, for example,
-#. * an ISO file
-#: ../src/totem-menu.c:765
-#, c-format
-msgid "Play Image '%s'"
-msgstr "Play Image '%s'"
-
-#: ../src/totem-menu.c:768 ../src/totem-menu.c:851
-#, c-format
-msgid "device%d"
-msgstr "device%d"
-
-#: ../src/totem-menu.c:848
-#, c-format
-msgid "Play Disc '%s'"
-msgstr "Play Disc '%s'"
-
-#. This lists the back-end type and version, such as
-#. * Movie Player using GStreamer 0.10.1
-#: ../src/totem-menu.c:1189
-#, c-format
-msgid "Movie Player using %s"
-msgstr "Movie Player using %s"
-
-#: ../src/totem-menu.c:1193
+#: ../src/totem-menu.c:789
 msgid "Copyright © 2002-2009 Bastien Nocera"
 msgstr "Copyright © 2002–2009 Bastien Nocera"
 
-#: ../src/totem-menu.c:1198
+#: ../src/totem-menu.c:794
 msgid "translator-credits"
 msgstr ""
 "Bastien Nocera \n"
@@ -1206,155 +1273,77 @@
 "Philip Withnall \n"
 "Bruce Cowan "
 
-#: ../src/totem-menu.c:1202
+#: ../src/totem-menu.c:798
 msgid "Totem Website"
 msgstr "Totem Website"
 
-#: ../src/totem-menu.c:1236
+#: ../src/totem-menu.c:829
 msgid "Configure Plugins"
 msgstr "Configure Plugins"
 
+#: ../src/totem-object.c:162
+#, c-format
+msgid ""
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+
 #. Translators: %s is the totem version number
-#: ../src/totem-object.c:471
+#: ../src/totem-object.c:591
 #, c-format
 msgid "Totem %s"
 msgstr "Totem %s"
 
-#: ../src/totem-object.c:1047 ../browser-plugin/totem-plugin-viewer.c:367
-msgid "Playing"
-msgstr "Playing"
-
-#: ../src/totem-object.c:1049 ../src/totem-options.c:52
+#: ../src/totem-object.c:1168 ../src/totem-options.c:52
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/totem-object.c:1054 ../browser-plugin/totem-plugin-viewer.c:363
-msgid "Paused"
-msgstr "Paused"
-
-#: ../src/totem-object.c:1056 ../src/totem-object.c:1066
+#: ../src/totem-object.c:1175 ../src/totem-object.c:1185
 #: ../src/totem-options.c:51
 msgid "Play"
 msgstr "Play"
 
-#: ../src/totem-object.c:1061 ../src/totem-object.c:1659
-#: ../src/totem-statusbar.c:115 ../browser-plugin/totem-plugin-viewer.c:351
-msgid "Stopped"
-msgstr "Stopped"
-
-#: ../src/totem-object.c:1142 ../src/totem-object.c:1169
-#: ../src/totem-object.c:1799 ../src/totem-object.c:1963
+#: ../src/totem-object.c:1267 ../src/totem-object.c:1294
+#: ../src/totem-object.c:1787 ../src/totem-object.c:1942
 #, c-format
 msgid "Totem could not play '%s'."
 msgstr "Totem could not play '%s'."
 
-#: ../src/totem-object.c:1246
-#, c-format
-msgid ""
-"Totem could not play this media (%s) although a plugin is present to handle "
-"it."
-msgstr ""
-"Totem could not play this media (%s) although a plugin is present to handle "
-"it."
-
-#: ../src/totem-object.c:1247
-msgid ""
-"You might want to check that a disc is present in the drive and that it is "
-"correctly configured."
-msgstr ""
-"You might want to check that a disc is present in the drive and that it is "
-"correctly configured."
-
-#: ../src/totem-object.c:1255
-msgid "More information about media plugins"
-msgstr "More information about media plugins"
-
-#: ../src/totem-object.c:1256
-msgid ""
-"Please install the necessary plugins and restart Totem to be able to play "
-"this media."
-msgstr ""
-"Please install the necessary plugins and restart Totem to be able to play "
-"this media."
-
-#: ../src/totem-object.c:1258
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because it does not have the "
-"appropriate plugins to be able to read from the disc."
-msgstr ""
-"Totem cannot play this type of media (%s) because it does not have the "
-"appropriate plugins to be able to read from the disc."
-
-#: ../src/totem-object.c:1260
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because you do not have the "
-"appropriate plugins to handle it."
-msgstr ""
-"Totem cannot play this type of media (%s) because you do not have the "
-"appropriate plugins to handle it."
-
-#: ../src/totem-object.c:1263
-#, c-format
-msgid "Totem cannot play this type of media (%s) because it is not supported."
-msgstr "Totem cannot play this type of media (%s) because it is not supported."
-
-#: ../src/totem-object.c:1264
-msgid "Please insert another disc to play back."
-msgstr "Please insert another disc to play back."
-
-#: ../src/totem-object.c:1300
-msgid "Totem was not able to play this disc."
-msgstr "Totem was not able to play this disc."
-
-#: ../src/totem-object.c:1301 ../src/totem-object.c:4229
-msgid "No reason."
-msgstr "No reason."
-
-#: ../src/totem-object.c:1315
-msgid "Totem does not support playback of Audio CDs"
-msgstr "Totem does not support playback of Audio CDs"
-
-#: ../src/totem-object.c:1316
-msgid "Please consider using a music player or a CD extractor to play this CD"
-msgstr "Please consider using a music player or a CD extractor to play this CD"
-
-#: ../src/totem-object.c:1805
+#: ../src/totem-object.c:1793
 msgid "No error message"
 msgstr "No error message"
 
-#: ../src/totem-object.c:2154
+#: ../src/totem-object.c:2133
 msgid "Totem could not display the help contents."
 msgstr "Totem could not display the help contents."
 
-#: ../src/totem-object.c:2493 ../src/totem-object.c:2495
-#: ../browser-plugin/totem-plugin-viewer.c:1417
-msgid "An error occurred"
-msgstr "An error occurred"
-
-#: ../src/totem-object.c:4064 ../src/totem-object.c:4066
+#: ../src/totem-object.c:4019 ../src/totem-object.c:4021
 msgid "Previous Chapter/Movie"
 msgstr "Previous Chapter/Movie"
 
-#: ../src/totem-object.c:4073 ../src/totem-object.c:4075
+#: ../src/totem-object.c:4028 ../src/totem-object.c:4030
 msgid "Play / Pause"
 msgstr "Play/Pause"
 
-#: ../src/totem-object.c:4083 ../src/totem-object.c:4085
+#: ../src/totem-object.c:4038 ../src/totem-object.c:4040
 msgid "Next Chapter/Movie"
 msgstr "Next Chapter/Movie"
 
-#. Translators: this is the tooltip text for the fullscreen button in the controls box in Totem's main window.
 #. Translators: this is the accessibility text for the fullscreen button in the controls box in Totem's main window.
-#: ../src/totem-object.c:4097 ../src/totem-object.c:4099
+#: ../src/totem-object.c:4051 ../src/totem-object.c:4053
 msgid "Fullscreen"
 msgstr "Fullscreen"
 
-#: ../src/totem-object.c:4229
+#: ../src/totem-object.c:4184
 msgid "Totem could not startup."
 msgstr "Totem could not startup."
 
+#: ../src/totem-object.c:4184
+msgid "No reason."
+msgstr "No reason."
+
 #: ../src/totem-open-location.c:182
 msgid "Open Location..."
 msgstr "Open Location…"
@@ -1428,117 +1417,111 @@
 msgid "Movies to play"
 msgstr "Movies to play"
 
-#: ../src/totem-options.c:117
+#: ../src/totem-options.c:79
+msgid "- Play movies and songs"
+msgstr "- Play movies and songs"
+
+#: ../src/totem-options.c:142
 msgid "Can't enqueue and replace at the same time"
 msgstr "Can't enqueue and replace at the same time"
 
 #. By extension entry
-#: ../src/totem-playlist.c:161
+#: ../src/totem-playlist.c:162
 msgid "MP3 ShoutCast playlist"
 msgstr "MP3 ShoutCast playlist"
 
-#: ../src/totem-playlist.c:162
+#: ../src/totem-playlist.c:163
 msgid "MP3 audio (streamed)"
 msgstr "MP3 audio (streamed)"
 
-#: ../src/totem-playlist.c:163
+#: ../src/totem-playlist.c:164
 msgid "MP3 audio (streamed, DOS format)"
 msgstr "MP3 audio (streamed, DOS format)"
 
-#: ../src/totem-playlist.c:164
+#: ../src/totem-playlist.c:165
 msgid "XML Shareable Playlist"
 msgstr "XML Shareable Playlist"
 
 #. This is "Title 3", where title is a DVD title
 #. * Note: NOT a DVD chapter
-#: ../src/totem-playlist.c:347
+#: ../src/totem-playlist.c:348
 #, c-format
 msgid "Title %d"
 msgstr "Title %d"
 
-#: ../src/totem-playlist.c:446
+#: ../src/totem-playlist.c:447
 msgid "Could not save the playlist"
 msgstr "Could not save the playlist"
 
-#: ../src/totem-playlist.c:1021
+#: ../src/totem-playlist.c:1022
 msgid "Save Playlist"
 msgstr "Save Playlist"
 
 #. translators: Playlist is the default saved playlist filename,
 #. * without the suffix
-#: ../src/totem-playlist.c:1033 ../src/totem-playlist.c:1264
-#: ../src/totem-sidebar.c:142
+#: ../src/totem-playlist.c:1034 ../src/totem-playlist.c:1263
+#: ../src/totem-sidebar.c:145
 msgid "Playlist"
 msgstr "Playlist"
 
-#: ../src/totem-playlist.c:1857
+#: ../src/totem-playlist.c:1862
 #, c-format
 msgid "The playlist '%s' could not be parsed. It might be damaged."
 msgstr "The playlist '%s' could not be parsed. It might be damaged."
 
-#: ../src/totem-playlist.c:1858
+#: ../src/totem-playlist.c:1863
 msgid "Playlist error"
 msgstr "Playlist error"
 
-#: ../src/totem-preferences.c:295
+#: ../src/totem-preferences.c:297
 msgid "Preferences"
 msgstr "Preferences"
 
-#: ../src/totem-preferences.c:451
+#: ../src/totem-preferences.c:445
 msgid "Select Subtitle Font"
 msgstr "Select Subtitle Font"
 
-#: ../src/totem-properties-main.c:115 ../src/totem-properties-view.c:266
+#: ../src/totem-properties-main.c:116 ../src/totem-properties-view.c:269
 msgid "Audio/Video"
 msgstr "Audio/Video"
 
-#: ../src/totem-properties-view.c:128
+#: ../src/totem-properties-view.c:131
 msgid "N/A"
 msgstr "N/A"
 
-#: ../src/totem-properties-view.c:157
+#: ../src/totem-properties-view.c:160
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 msgctxt "Stream bit rate"
 msgid "N/A"
 msgstr "N/A"
 
-#: ../src/totem-properties-view.c:160
+#: ../src/totem-properties-view.c:163
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: ../src/totem-properties-view.c:177
+#: ../src/totem-properties-view.c:180
 #: ../src/plugins/properties/totem-movie-properties.c:149
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../src/totem-properties-view.c:209
+#: ../src/totem-properties-view.c:212
 #: ../src/plugins/properties/totem-movie-properties.c:166
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: ../src/totem-properties-view.c:216
+#: ../src/totem-properties-view.c:219
 #: ../src/plugins/properties/totem-movie-properties.c:166
 msgctxt "Sample rate"
 msgid "N/A"
 msgstr "N/A"
 
-#: ../src/totem-properties-view.c:224
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5589
-msgid "Surround"
-msgstr "Surround"
-
-#: ../src/totem-properties-view.c:226
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5591
-msgid "Mono"
-msgstr "Mono"
-
-#: ../src/totem-properties-view.c:236
+#: ../src/totem-properties-view.c:239
 msgctxt "Number of audio channels"
 msgid "N/A"
 msgstr "N/A"
@@ -1571,8 +1554,8 @@
 #. eg: 75 %
 #: ../src/totem-statusbar.c:250
 #, c-format
-msgid "%d %%"
-msgstr "%d %%"
+msgid "%lf %%"
+msgstr "%lf %%"
 
 #. eg: Paused, 0:32 / 1:05
 #: ../src/totem-statusbar.c:325
@@ -1583,8 +1566,8 @@
 #. eg: Buffering, 75 %
 #: ../src/totem-statusbar.c:330
 #, c-format
-msgid "%s, %d %%"
-msgstr "%s, %d %%"
+msgid "%s, %f %%"
+msgstr "%s, %f %%"
 
 #: ../src/totem-subtitle-encoding.c:156
 msgid "Current Locale"
@@ -1727,225 +1710,91 @@
 msgid "Vietnamese"
 msgstr "Vietnamese"
 
-#: ../src/totem-video-list.c:330
-msgid "No video URI"
-msgstr "No video URI"
-
-#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
-#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
-#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
-#: ../src/totem-video-thumbnailer.c:872
-#, c-format
-msgid ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-msgstr ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-
-#: ../src/totem-video-thumbnailer.c:873
-msgid "Filename"
-msgstr "Filename"
-
-#: ../src/totem-video-thumbnailer.c:875
-msgid "Resolution"
-msgstr "Resolution"
-
-#: ../src/totem-video-thumbnailer.c:878
-msgid "Duration"
-msgstr "Duration"
-
-#: ../src/totem-uri.c:506 ../src/plugins/chapters/totem-chapters.c:998
+#: ../src/totem-uri.c:343 ../src/plugins/chapters/totem-chapters.c:998
 msgid "All files"
 msgstr "All files"
 
-#: ../src/totem-uri.c:511 ../src/plugins/chapters/totem-chapters.c:995
+#: ../src/totem-uri.c:348 ../src/plugins/chapters/totem-chapters.c:995
 msgid "Supported files"
 msgstr "Supported files"
 
-#: ../src/totem-uri.c:523
+#: ../src/totem-uri.c:360
 msgid "Audio files"
 msgstr "Audio files"
 
-#: ../src/totem-uri.c:531
+#: ../src/totem-uri.c:368
 msgid "Video files"
 msgstr "Video files"
 
-#: ../src/totem-uri.c:541
+#: ../src/totem-uri.c:378
 msgid "Subtitle files"
 msgstr "Subtitle files"
 
-#: ../src/totem-uri.c:593
+#: ../src/totem-uri.c:430
 msgid "Select Text Subtitles"
 msgstr "Select Text Subtitles"
 
-#: ../src/totem-uri.c:656
+#: ../src/totem-uri.c:495
 msgid "Select Movies or Playlists"
 msgstr "Select Movies or Playlists"
 
-#. Options parsing
-#: ../src/totem.c:201
-msgid "- Play movies and songs"
-msgstr "- Play movies and songs"
-
-#: ../src/totem.c:217
-#, c-format
-msgid ""
-"%s\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"%s\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-
-#: ../src/totem.c:259 ../src/totem.c:270
-#: ../browser-plugin/totem-plugin-viewer.c:663
-#: ../browser-plugin/totem-plugin-viewer.c:1793
-msgid "Totem Movie Player"
-msgstr "Totem Movie Player"
-
-#: ../src/totem.c:260 ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Could not initialize the thread-safe libraries."
-msgstr "Could not initialise the thread-safe libraries."
-
-#: ../src/totem.c:260
-msgid "Verify your system installation. Totem will now exit."
-msgstr "Verify your system installation. Totem will now exit."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:1589
-msgid "Password requested for RTSP server"
-msgstr "Password requested for RTSP server"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2858
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2862
-#, c-format
-msgid "Audio Track #%d"
-msgstr "Audio Track #%d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2890
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2894
-#, c-format
-msgid "Subtitle #%d"
-msgstr "Subtitle #%d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3298
-msgid ""
-"The requested audio output was not found. Please select another audio output "
-"in the Multimedia Systems Selector."
-msgstr ""
-"The requested audio output was not found. Please select another audio output "
-"in the Multimedia Systems Selector."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3303
-msgid "Location not found."
-msgstr "Location not found."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3307
-msgid ""
-"Could not open location; you might not have permission to open the file."
-msgstr ""
-"Could not open location; you might not have permission to open the file."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3318
-msgid ""
-"The video output is in use by another application. Please close other video "
-"applications, or select another video output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"The video output is in use by another application. Please close other video "
-"applications, or select another video output in the Multimedia Systems "
-"Selector."
+#: ../src/totem-uri.c:499
+msgid "Add Directory"
+msgstr "Add Directory"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3324
-msgid ""
-"The audio output is in use by another application. Please select another "
-"audio output in the Multimedia Systems Selector. You may want to consider "
-"using a sound server."
-msgstr ""
-"The audio output is in use by another application. Please select another "
-"audio output in the Multimedia Systems Selector. You may want to consider "
-"using a sound server."
+#: ../src/totem-video-list.c:330
+msgid "No video URI"
+msgstr "No video URI"
 
-#. should be exactly one missing thing (source or converter)
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3342
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3348
+#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
+#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
+#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
+#: ../src/totem-video-thumbnailer.c:841
 #, c-format
-msgid "The playback of this movie requires a %s plugin which is not installed."
-msgid_plural ""
-"The playback of this movie requires the following decoders which are not "
-"installed:\n"
-"\n"
-"%s"
-msgstr[0] ""
-"The playback of this movie requires a %s plugin which is not installed."
-msgstr[1] ""
-"The playback of this movie requires the following decoders which are not "
-"installed:\n"
-"\n"
-"%s"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3374
 msgid ""
-"Cannot play this file over the network. Try downloading it to disk first."
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 msgstr ""
-"Cannot play this file over the network. Try downloading it to disk first."
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5878
-msgid "Media contains no supported video streams."
-msgstr "Media contains no supported video streams."
+#: ../src/totem-video-thumbnailer.c:842
+msgid "Filename"
+msgstr "Filename"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6053
-msgid ""
-"Failed to create a GStreamer play object. Please check your GStreamer "
-"installation."
-msgstr ""
-"Failed to create a GStreamer play object. Please check your GStreamer "
-"installation."
+#: ../src/totem-video-thumbnailer.c:844
+msgid "Resolution"
+msgstr "Resolution"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6173
-msgid ""
-"Failed to open audio output. You may not have permission to open the sound "
-"device, or the sound server may not be running. Please select another audio "
-"output in the Multimedia Systems Selector."
-msgstr ""
-"Failed to open audio output. You may not have permission to open the sound "
-"device, or the sound server may not be running. Please select another audio "
-"output in the Multimedia Systems Selector."
+#: ../src/totem-video-thumbnailer.c:847
+msgid "Duration"
+msgstr "Duration"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6193
-msgid ""
-"Could not find the audio output. You may need to install additional "
-"GStreamer plugins, or select another audio output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"Could not find the audio output. You may need to install additional "
-"GStreamer plugins, or select another audio output in the Multimedia Systems "
-"Selector."
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:1
+msgid "Apple Trailers"
+msgstr "Apple Trailers"
+
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:2
+msgid "Sets the user agent for the Apple Trailers site"
+msgstr "Sets the user agent for the Apple Trailers site"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:1
+msgid "Autoload Subtitles"
+msgstr "Autoload Subtitles"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:2
+msgid "Autoloads text subtitles"
+msgstr "Autoloads text subtitles"
 
-#. hour:minutes:seconds
-#. Translators: This is a time format, like "9:05:02" for 9
-#. * hours, 5 minutes, and 2 seconds. You may change ":" to
-#. * the separator that your locale uses or use "%Id" instead
-#. * of "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:83 ../src/plugins/skipto/totem-time-entry.c:57
-#, c-format
-msgctxt "long time format"
-msgid "%d:%02d:%02d"
-msgstr "%d:%02d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
+msgid "Video Disc Recorder"
+msgstr "Video Disc Recorder"
 
-#. minutes:seconds
-#. Translators: This is a time format, like "5:02" for 5
-#. * minutes and 2 seconds. You may change ":" to the
-#. * separator that your locale uses or use "%Id" instead of
-#. * "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:92
-#, c-format
-msgctxt "short time format"
-msgid "%d:%02d"
-msgstr "%d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
+msgid "Records (S)VCDs or video DVDs"
+msgstr "Records (S)VCDs or video DVDs"
 
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:65
 msgid "_Create Video Disc..."
@@ -1971,93 +1820,85 @@
 msgid "Copy the currently playing (S)VCD"
 msgstr "Copy the currently-playing (S)VCD"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:129
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:136
 msgid "The video disc could not be duplicated."
 msgstr "The video disc could not be duplicated."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:131
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:276
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:138
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:283
 msgid "The movie could not be recorded."
 msgstr "The movie could not be recorded."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:157
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:167
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:263
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:164
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:174
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:270
 msgid "Unable to write a project."
 msgstr "Unable to write a project."
 
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
-msgid "Records (S)VCDs or video DVDs"
-msgstr "Records (S)VCDs or video DVDs"
-
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
-msgid "Video Disc Recorder"
-msgstr "Video Disc Recorder"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:1
-#: ../src/plugins/chapters/totem-chapters.c:1139
-msgid "Chapters"
-msgstr "Chapters"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:2
-msgid "Support chapter markers in movies."
-msgstr "Support chapter markers in movies."
-
 #: ../src/plugins/chapters/chapters-edit.ui.h:1
 msgid "Name for new chapter:"
 msgstr "Name for new chapter:"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:1
-msgid "Add Chapter..."
-msgstr "Add Chapter…"
+msgid "_Remove Chapter"
+msgstr "_Remove Chapter"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:2
-msgid "Add New Chapters"
-msgstr "Add New Chapters"
+msgid "Remove the chapter from the list"
+msgstr "Remove the chapter from the list"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:3
-msgid "Create a new chapter list for the movie"
-msgstr "Create a new chapter list for the movie"
+msgid "_Go to Chapter"
+msgstr "_Go to Chapter"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:4
-msgid "Go to Chapter"
-msgstr "Go to Chapter"
-
-#: ../src/plugins/chapters/chapters-list.ui.h:5
 msgid "Go to the chapter in the movie"
 msgstr "Go to the chapter in the movie"
 
+#: ../src/plugins/chapters/chapters-list.ui.h:5
+msgid "Add Chapter..."
+msgstr "Add Chapter…"
+
 #: ../src/plugins/chapters/chapters-list.ui.h:6
-msgid "Load Chapters..."
-msgstr "Load Chapters…"
+msgid "Remove Chapter"
+msgstr "Remove Chapter"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:7
-msgid "Load chapters from an external CMML file"
-msgstr "Load chapters from an external CMML file"
+msgid "Go to Chapter"
+msgstr "Go to Chapter"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:8
-msgid "No chapter data"
-msgstr "No chapter data"
+msgid "Save Changes"
+msgstr "Save Changes"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:9
-msgid "Remove Chapter"
-msgstr "Remove Chapter"
+msgid "No chapter data"
+msgstr "No chapter data"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:10
-msgid "Remove the chapter from the list"
-msgstr "Remove the chapter from the list"
+msgid "Load Chapters..."
+msgstr "Load Chapters…"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:11
-msgid "Save Changes"
-msgstr "Save Changes"
+msgid "Load chapters from an external CMML file"
+msgstr "Load chapters from an external CMML file"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:12
-msgid "_Go to Chapter"
-msgstr "_Go to Chapter"
+msgid "Add New Chapters"
+msgstr "Add New Chapters"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:13
-msgid "_Remove Chapter"
-msgstr "_Remove Chapter"
+msgid "Create a new chapter list for the movie"
+msgstr "Create a new chapter list for the movie"
+
+#: ../src/plugins/chapters/chapters.plugin.in.h:1
+#: ../src/plugins/chapters/totem-chapters.c:1139
+msgid "Chapters"
+msgstr "Chapters"
+
+#: ../src/plugins/chapters/chapters.plugin.in.h:2
+msgid "Support chapter markers in movies"
+msgstr "Support chapter markers in movies"
 
 #: ../src/plugins/chapters/totem-chapters.c:56
 #, c-format
@@ -2165,13 +2006,37 @@
 msgid "The URI ‘%s’ is not supported."
 msgstr "The URI ‘%s’ is not supported."
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
-msgid "Instant Messenger status"
-msgstr "Instant Messenger status"
+#: ../src/plugins/grilo/grilo.plugin.in.h:1
+msgid "Grilo Browser"
+msgstr "Grilo Browser"
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
-msgid "Set your Instant Messenger status to away when a movie is playing"
-msgstr "Set your Instant Messenger status to away when a movie is playing"
+#: ../src/plugins/grilo/grilo.plugin.in.h:2
+msgid "A plugin to let you browse media content from various sources"
+msgstr "A plugin to let you browse media content from various sources"
+
+#: ../src/plugins/grilo/grilo.ui.h:1
+msgid "Add to Playlist"
+msgstr "Add to Playlist"
+
+#: ../src/plugins/grilo/grilo.ui.h:2
+msgid "Copy Location"
+msgstr "Copy Location"
+
+#: ../src/plugins/grilo/grilo.ui.h:3 ../src/plugins/grilo/totem-grilo.c:1184
+msgid "Browse"
+msgstr "Browse"
+
+#: ../src/plugins/grilo/grilo.ui.h:4 ../src/plugins/grilo/totem-grilo.c:1227
+msgid "Search"
+msgstr "Search"
+
+#: ../src/plugins/grilo/totem-grilo.c:454
+msgid "Browse Error"
+msgstr "Browse Error"
+
+#: ../src/plugins/grilo/totem-grilo.c:609
+msgid "Search Error"
+msgstr "Search Error"
 
 #: ../src/plugins/gromit/gromit.plugin.in.h:1
 msgid "Gromit Annotations"
@@ -2185,58 +2050,13 @@
 msgid "The gromit binary was not found."
 msgstr "The gromit binary was not found."
 
-#. Add the interface to Totem's sidebar
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:1
-#: ../src/plugins/iplayer/iplayer.py:46
-msgid "BBC iPlayer"
-msgstr "BBC iPlayer"
-
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:2
-msgid "Stream BBC programs from the last 7 days from the BBC iPlayer service."
-msgstr ""
-"Stream BBC programmes from the last seven days from the BBC iPlayer service."
-
-#: ../src/plugins/iplayer/iplayer.py:72
-msgid "Error listing channel categories"
-msgstr "Error listing channel categories"
-
-#: ../src/plugins/iplayer/iplayer.py:73
-msgid ""
-"There was an unknown error getting the list of television channels available "
-"on BBC iPlayer."
-msgstr ""
-"There was an unknown error getting the list of television channels available "
-"on BBC iPlayer."
-
-#. Append a dummy child row so that the expander's visible; we can
-#. then queue off the expander to load the programme listing for this
-#. category
-#: ../src/plugins/iplayer/iplayer.py:84
-msgid "Loading…"
-msgstr "Loading…"
-
-#. Translators: the "programme feed" is the list of TV shows
-#. available to watch online
-#: ../src/plugins/iplayer/iplayer.py:136
-msgid "Error getting programme feed"
-msgstr "Error getting programme feed"
-
-#: ../src/plugins/iplayer/iplayer.py:137
-msgid ""
-"There was an error getting the list of programmes for this channel and "
-"category combination."
-msgstr ""
-"There was an error getting the list of programmes for this channel and "
-"category combination."
-
-#: ../src/plugins/iplayer/iplayer2.py:298
-msgid ""
-msgstr ""
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
+msgid "Instant Messenger Status"
+msgstr "Instant Messenger Status"
 
-#: ../src/plugins/iplayer/iplayer2.py:299
-#, python-format
-msgid "Programme unavailable (\"%s\")"
-msgstr "Programme unavailable (\"%s\")"
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
+msgid "Set your Instant Messenger status to away when a movie is playing"
+msgstr "Set your Instant Messenger status to away when a movie is playing"
 
 #: ../src/plugins/lirc/lirc.plugin.in.h:1
 msgid "Infrared Remote Control"
@@ -2254,26 +2074,30 @@
 msgid "Couldn't read lirc configuration."
 msgstr "Couldn't read lirc configuration."
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
-msgid "Download Movie Subtitles"
-msgstr "Download Movie Subtitles"
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:1
+msgid "Media Player Keys"
+msgstr "Media Player Keys"
+
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:2
+msgid "Support additional media player keys"
+msgstr "Support additional media player keys"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
-msgid "Subtitle _language:"
-msgstr "Subtitle _language:"
+#: ../src/plugins/ontop/ontop.plugin.in.h:1
+msgid "Always On Top"
+msgstr "Always On Top"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
-msgid "_Play with Subtitle"
-msgstr "_Play with Subtitle"
+#: ../src/plugins/ontop/ontop.plugin.in.h:2
+msgid "Keep the main window on top when playing a movie"
+msgstr "Keep the main window on top when playing a movie"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:1
-msgid "Look for subtitles for the currently playing movie."
-msgstr "Look for subtitles for the currently playing movie."
-
-#: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:2
 msgid "Subtitle Downloader"
 msgstr "Subtitle Downloader"
 
+#: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:2
+msgid "Look for subtitles for the currently playing movie"
+msgstr "Look for subtitles for the currently playing movie"
+
 #: ../src/plugins/opensubtitles/opensubtitles.py:42
 msgid "Brazilian Portuguese"
 msgstr "Brazilian Portuguese"
@@ -2328,6 +2152,18 @@
 msgid "Searching subtitles…"
 msgstr "Searching subtitles…"
 
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
+msgid "Download Movie Subtitles"
+msgstr "Download Movie Subtitles"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
+msgid "Subtitle _language:"
+msgstr "Subtitle _language:"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
+msgid "_Play with Subtitle"
+msgstr "_Play with Subtitle"
+
 #: ../src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in.h:1
 msgid "Subtitle language"
 msgstr "Subtitle language"
@@ -2336,107 +2172,110 @@
 msgid "The language to search for subtitles for movies in."
 msgstr "The language to search for subtitles for movies in."
 
-#: ../src/plugins/ontop/ontop.plugin.in.h:1
-msgid "Always On Top"
-msgstr "Always On Top"
+#: ../src/plugins/properties/movie-properties.plugin.in.h:1
+msgid "Movie Properties"
+msgstr "Movie Properties"
+
+#: ../src/plugins/properties/movie-properties.plugin.in.h:2
+msgid "Adds movie properties to the sidebar"
+msgstr "Adds movie properties to the sidebar"
+
+#: ../src/plugins/properties/totem-movie-properties.c:246
+msgid "Properties"
+msgstr "Properties"
+
+#: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:1
+msgid "rpdb2 password"
+msgstr "rpdb2 password"
+
+#: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:2
+msgid ""
+"A password to protect the rpdb2 server for debugging Totem from unauthorized "
+"remote access. If this is empty, a default of 'totem' will be used."
+msgstr ""
+"A password to protect the rpdb2 server for debugging Totem from unauthorised "
+"remote access. If this is empty, a default of 'totem' will be used."
+
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
+msgid "Python Console"
+msgstr "Python Console"
+
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
+msgid "Interactive Python console"
+msgstr "Interactive Python console"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:88
+msgid "Python Console Menu"
+msgstr "Python Console Menu"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:93
+msgid "_Python Console"
+msgstr "_Python Console"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:94
+msgid "Show Totem's Python console"
+msgstr "Show Totem's Python console"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:100
+msgid "Python Debugger"
+msgstr "Python Debugger"
 
-#: ../src/plugins/ontop/ontop.plugin.in.h:2
-msgid "Keep the main window on top when playing a movie"
-msgstr "Keep the main window on top when playing a movie"
+#: ../src/plugins/pythonconsole/pythonconsole.py:101
+msgid "Enable remote Python debugging with rpdb2"
+msgstr "Enable remote Python debugging with rpdb2"
 
-#: ../src/plugins/properties/totem-movie-properties.c:246
-msgid "Properties"
-msgstr "Properties"
+#. pylint: disable-msg=E1101
+#: ../src/plugins/pythonconsole/pythonconsole.py:125
+#, python-format
+msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
+msgstr "You can access the Totem.Object through 'totem_object' :\\n%s"
 
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:2
-#, no-c-format
-msgid ""
-"A format string used to build the network service name used when publishing "
-"playlists over the network. The following format placeholders can be used: • "
-"%a: the program name as returned by g_get_application_name() • %h: the "
-"machine's host name in title case • %u: the user's login name in title case "
-"• %U: the user's real name • %%: the percent sign"
-msgstr ""
-"A format string used to build the network service name used when publishing "
-"playlists over the network. The following format placeholders can be used: • "
-"%a: the program name as returned by g_get_application_name() • %h: the "
-"machine's host name in title case • %u: the user's login name in title case "
-"• %U: the user's real name • %%: the percent sign"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:3
-msgid "Format for network service name"
-msgstr "Format for network service name"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:4
-msgid "Publisher protocol to use"
-msgstr "Publisher protocol to use"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:5
-msgid ""
-"The transport protocol to use when publishing playlists over the network."
-msgstr ""
-"The transport protocol to use when publishing playlists over the network."
-
-#. Translators: computers on the local network which are publishing their playlists over the network
-#: ../src/plugins/publish/totem-publish.c:552
-msgid "Neighbors"
-msgstr "Neighbours"
-
-#: ../src/plugins/publish/publish.plugin.in.h:1
-msgid "Publish Playlist"
-msgstr "Publish Playlist"
-
-#: ../src/plugins/publish/publish.plugin.in.h:2
-msgid "Share the current playlist via HTTP"
-msgstr "Share the current playlist via HTTP"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:1
-msgid "Service _Name:"
-msgstr "Service _Name:"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:3
-#, no-c-format
-msgid ""
-"The name used for announcing the playlist service on the network.\n"
-"All occurrences of the string %u will be replaced by your name,\n"
-"and %h will be replaced by your computer's host name."
-msgstr ""
-"The name used for announcing the playlist service on the network.\n"
-"All occurrences of the string %u will be replaced by your name,\n"
-"and %h will be replaced by your computer's host name."
-
-#: ../src/plugins/publish/publish-plugin.ui.h:6
-msgid "Use _encrypted transport protocol (HTTPS)"
-msgstr "Use _encrypted transport protocol (HTTPS)"
+#: ../src/plugins/pythonconsole/pythonconsole.py:129
+msgid "Totem Python Console"
+msgstr "Totem Python Console"
 
-#: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:1
+#: ../src/plugins/pythonconsole/pythonconsole.py:139
 msgid ""
-"A password to protect the rpdb2 server for debugging Totem from unauthorized "
-"remote access. If this is empty, a default of 'totem' will be used."
+"After you press OK, Totem will wait until you connect to it with winpdb or "
+"rpdb2. If you have not set a debugger password in DConf, it will use the "
+"default password ('totem')."
 msgstr ""
-"A password to protect the rpdb2 server for debugging Totem from unauthorised "
-"remote access. If this is empty, a default of 'totem' will be used."
+"After you press OK, Totem will wait until you connect to it with winpdb or "
+"rpdb2. If you have not set a debugger password in DConf, it will use the "
+"default password ('totem')."
 
-#: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:2
-msgid "rpdb2 password"
-msgstr "rpdb2 password"
+#: ../src/plugins/recent/recent.plugin.in.h:1
+msgid "Recent files"
+msgstr "Recent files"
+
+#: ../src/plugins/recent/recent.plugin.in.h:2
+msgid "Adds files that have been played to recent files"
+msgstr "Adds files that have been played to recent files"
 
 #: ../src/plugins/rotation/rotation.plugin.in.h:1
-msgid "Allows videos to be rotated if they're in the wrong orientation."
-msgstr "Allows videos to be rotated if they're in the wrong orientation."
-
-#: ../src/plugins/rotation/rotation.plugin.in.h:2
 msgid "Rotation Plugin"
 msgstr "Rotation Plugin"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:60
+#: ../src/plugins/rotation/rotation.plugin.in.h:2
+msgid "Allows videos to be rotated if they are in the wrong orientation"
+msgstr "Allows videos to be rotated if they are in the wrong orientation"
+
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:50
 msgid "_Rotate Clockwise"
 msgstr "_Rotate Clockwise"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:62
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:52
 msgid "Rotate Counterc_lockwise"
 msgstr "Rotate Anti-c_lockwise"
 
+#: ../src/plugins/save-file/save-file.plugin.in.h:1
+msgid "Save Copy"
+msgstr "Save Copy"
+
+#: ../src/plugins/save-file/save-file.plugin.in.h:2
+msgid "Save a copy of the currently playing movie"
+msgstr "Save a copy of the currently playing movie"
+
 #: ../src/plugins/save-file/totem-save-file.c:63
 msgid "Save a Copy..."
 msgstr "Save a Copy…"
@@ -2459,40 +2298,48 @@
 msgid "Movie stream"
 msgstr "Movie stream"
 
-#: ../src/plugins/screensaver/totem-screensaver.c:116
-#: ../browser-plugin/totem-plugin-viewer.c:1891
-msgid "Playing a movie"
-msgstr "Playing a movie"
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:1
+msgid "Screen Saver"
+msgstr "Screensaver"
+
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:2
+msgid "Deactivates the screen saver when a movie is playing"
+msgstr "Deactivates the screensaver when a movie is playing"
 
 #: ../src/plugins/screenshot/gallery.ui.h:1
+msgid "Screenshot width (in pixels):"
+msgstr "Screenshot width (in pixels):"
+
+#: ../src/plugins/screenshot/gallery.ui.h:2
 msgid "Calculate the number of screenshots"
 msgstr "Calculate the number of screenshots"
 
-#: ../src/plugins/screenshot/gallery.ui.h:2
+#: ../src/plugins/screenshot/gallery.ui.h:3
 msgid "Number of screenshots:"
 msgstr "Number of screenshots:"
 
-#: ../src/plugins/screenshot/gallery.ui.h:3
-msgid "Screenshot width (in pixels):"
-msgstr "Screenshot width (in pixels):"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:1
-msgid "Save in _folder:"
-msgstr "Save in _folder:"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:2
-msgid "Select a folder"
-msgstr "Select a folder"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:3
-msgid "_Name:"
-msgstr "_Name:"
-
-#. Write the screenshot to the temporary file
-#: ../src/plugins/screenshot/gnome-screenshot-widget.c:385
-#: ../src/plugins/screenshot/totem-screenshot.c:64
-msgid "Screenshot.png"
-msgstr "Screenshot.png"
+#. translators: this is the name of the file that gets made up
+#. * with the screenshot if the entire screen is taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:147
+#, c-format
+msgid "Screenshot from %s.png"
+msgstr "Screenshot from %s.png"
+
+#. translators: this is the name of the file that gets
+#. * made up with the screenshot if the entire screen is
+#. * taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:154
+#, c-format
+msgid "Screenshot from %s - %d.png"
+msgstr "Screenshot from %s - %d.png"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:1
+msgid "Screenshot"
+msgstr "Screenshot"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:2
+msgid "Allows screenshots and galleries to be taken of videos"
+msgstr "Allows screenshots and galleries to be taken of videos"
 
 #: ../src/plugins/screenshot/totem-gallery.c:91
 msgid "Save Gallery"
@@ -2518,49 +2365,47 @@
 msgid "Saving gallery as \"%s\""
 msgstr "Saving gallery as \"%s\""
 
-#: ../src/plugins/screenshot/totem-screenshot.c:113
-msgid "There was an error saving the screenshot."
-msgstr "There was an error saving the screenshot."
-
-#: ../src/plugins/screenshot/totem-screenshot.c:139
-msgid "Save Screenshot"
-msgstr "Save Screenshot"
-
-#. Create the screenshot widget
-#. Translators: %s is the movie title and %d is an auto-incrementing number to make filename unique
-#: ../src/plugins/screenshot/totem-screenshot.c:160
-#, c-format
-msgid "Screenshot-%s-%d.png"
-msgstr "Screenshot-%s-%d.png"
-
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:88
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:220
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "Totem could not get a screenshot of the video."
 msgstr "Totem could not get a screenshot of the video."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "This is not supposed to happen; please file a bug report."
 msgstr "This is not supposed to happen; please file a bug report."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
-msgid "Take _Screenshot..."
-msgstr "Take _Screenshot…"
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
+msgid "Take _Screenshot"
+msgstr "Take _Screenshot"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
 msgid "Take a screenshot"
 msgstr "Take a screenshot"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create Screenshot _Gallery..."
 msgstr "Create Screenshot _Gallery…"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create a gallery of screenshots"
 msgstr "Create a gallery of screenshots"
 
+#: ../src/plugins/skipto/skipto.plugin.in.h:1
+#: ../src/plugins/skipto/totem-skipto.c:196
+msgid "Skip To"
+msgstr "Skip To"
+
+#: ../src/plugins/skipto/skipto.plugin.in.h:2
+msgid "Provides the \"Skip to\" dialog"
+msgstr "Provides the \"Skip to\" dialogue"
+
+#: ../src/plugins/skipto/skipto.ui.h:1
+msgid "_Skip to:"
+msgstr "_Skip to:"
+
 #. Update the "seconds" label so that it always has the correct singular/plural form
 #. Translators: label for the seconds selector in the "Skip to" dialogue
-#: ../src/plugins/skipto/totem-skipto.c:160
+#: ../src/plugins/skipto/totem-skipto.c:159
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "second"
@@ -2570,15 +2415,11 @@
 #. Translators: you should translate this string to a number (written in digits) which corresponds to the longer character length of the
 #. * translations for "second" and "seconds", as translated elsewhere in this file. For example, in English, "second" is 6 characters long and
 #. * "seconds" is 7 characters long, so this string should be translated to "7". See: bgo#639398
-#: ../src/plugins/skipto/totem-skipto.c:190
+#: ../src/plugins/skipto/totem-skipto.c:189
 msgctxt "Skip To label length"
 msgid "7"
 msgstr "7"
 
-#: ../src/plugins/skipto/totem-skipto.c:197
-msgid "Skip To"
-msgstr "Skip To"
-
 #: ../src/plugins/skipto/totem-skipto-plugin.c:182
 msgid "_Skip To..."
 msgstr "_Skip To…"
@@ -2587,113 +2428,318 @@
 msgid "Skip to a specific time"
 msgstr "Skip to a specific time"
 
-#: ../src/plugins/skipto/skipto.ui.h:1
-msgid "_Skip to:"
-msgstr "_Skip to:"
+#~ msgid "Location not found."
+#~ msgstr "Location not found."
 
-#: ../browser-plugin/totem-plugin-viewer.c:431
-msgid "No URI to play"
-msgstr "No URI to play"
+#~ msgid ""
+#~ "Could not open location; you might not have permission to open the file."
+#~ msgstr ""
+#~ "Could not open location; you might not have permission to open the file."
 
-#. translators: this is:
-#. * Open With ApplicationName
-#. * as in nautilus' right-click menu
-#: ../browser-plugin/totem-plugin-viewer.c:1107
-#, c-format
-msgid "_Open with \"%s\""
-msgstr "_Open with \"%s\""
+#~ msgid ""
+#~ "Failed to create a GStreamer play object. Please check your GStreamer "
+#~ "installation."
+#~ msgstr ""
+#~ "Failed to create a GStreamer play object. Please check your GStreamer "
+#~ "installation."
 
-#: ../browser-plugin/totem-plugin-viewer.c:2136
-msgid "No playlist or playlist empty"
-msgstr "No playlist or playlist empty"
+#~ msgid "%d %%"
+#~ msgstr "%d %%"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2235
-msgid "Movie browser plugin"
-msgstr "Movie browser plugin"
+#~ msgid ""
+#~ msgstr ""
 
-#: ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Verify your system installation. The Totem plugin will now exit."
-msgstr "Verify your system installation. The Totem plugin will now exit."
+#~ msgid "Programme unavailable (\"%s\")"
+#~ msgstr "Programme unavailable (\"%s\")"
 
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
-msgid "Interactive Python console."
-msgstr "Interactive Python console."
+#~ msgid "BBC iPlayer"
+#~ msgstr "BBC iPlayer"
 
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
-msgid "Python Console"
-msgstr "Python Console"
+#~ msgid ""
+#~ "Stream BBC programs from the last 7 days from the BBC iPlayer service"
+#~ msgstr ""
+#~ "Stream BBC programmes from the last seven days from the BBC iPlayer "
+#~ "service"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:88
-msgid "Python Console Menu"
-msgstr "Python Console Menu"
+#~ msgid "Error listing channel categories"
+#~ msgstr "Error listing channel categories"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:93
-msgid "_Python Console"
-msgstr "_Python Console"
+#~ msgid ""
+#~ "There was an unknown error getting the list of television channels "
+#~ "available on BBC iPlayer."
+#~ msgstr ""
+#~ "There was an unknown error getting the list of television channels "
+#~ "available on BBC iPlayer."
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:94
-msgid "Show Totem's Python console"
-msgstr "Show Totem's Python console"
+#~ msgid "Loading…"
+#~ msgstr "Loading…"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:100
-msgid "Python Debugger"
-msgstr "Python Debugger"
+#~ msgid "Error getting programme feed"
+#~ msgstr "Error getting programme feed"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:101
-msgid "Enable remote Python debugging with rpdb2"
-msgstr "Enable remote Python debugging with rpdb2"
+#~ msgid ""
+#~ "There was an error getting the list of programmes for this channel and "
+#~ "category combination."
+#~ msgstr ""
+#~ "There was an error getting the list of programmes for this channel and "
+#~ "category combination."
 
-#. pylint: disable-msg=E1101
-#: ../src/plugins/pythonconsole/pythonconsole.py:125
-#, python-format
-msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
-msgstr "You can access the Totem.Object through 'totem_object' :\\n%s"
+#~ msgid "_Name:"
+#~ msgstr "_Name:"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:129
-msgid "Totem Python Console"
-msgstr "Totem Python Console"
+#~ msgid "Save in _folder:"
+#~ msgstr "Save in _folder:"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:139
-msgid ""
-"After you press OK, Totem will wait until you connect to it with winpdb or "
-"rpdb2. If you have not set a debugger password in DConf, it will use the "
-"default password ('totem')."
-msgstr ""
-"After you press OK, Totem will wait until you connect to it with winpdb or "
-"rpdb2. If you have not set a debugger password in DConf, it will use the "
-"default password ('totem')."
+#~ msgid "Select a folder"
+#~ msgstr "Select a folder"
 
-#: ../src/plugins/grilo/grilo.plugin.in.h:1
-msgid "A plugin to let you browse media content from various sources."
-msgstr "A plugin to let you browse media content from various sources."
+#~ msgid "There was an error saving the screenshot."
+#~ msgstr "There was an error saving the screenshot."
 
-#: ../src/plugins/grilo/grilo.plugin.in.h:2
-msgid "Grilo Browser"
-msgstr "Grilo Browser"
+#~ msgid "Save Screenshot"
+#~ msgstr "Save Screenshot"
 
-#: ../src/plugins/grilo/totem-grilo.c:452
-msgid "Browse Error"
-msgstr "Browse Error"
+#~ msgid "Movie Player"
+#~ msgstr "Movie Player"
 
-#: ../src/plugins/grilo/totem-grilo.c:599
-msgid "Search Error"
-msgstr "Search Error"
+#~ msgid "Play movies and songs"
+#~ msgstr "Play movies and songs"
 
-#: ../src/plugins/grilo/totem-grilo.c:1219 ../src/plugins/grilo/grilo.ui.h:2
-msgid "Browse"
-msgstr "Browse"
+#~ msgid "1.5 Mbps T1/Intranet/LAN"
+#~ msgstr "1.5 Mbps T1/Intranet/LAN"
 
-#: ../src/plugins/grilo/totem-grilo.c:1285 ../src/plugins/grilo/grilo.ui.h:4
-msgid "Search"
-msgstr "Search"
+#~ msgid "112 Kbps Dual ISDN/DSL"
+#~ msgstr "112 Kbps Dual ISDN/DSL"
 
-#: ../src/plugins/grilo/grilo.ui.h:1
-msgid "Add to Playlist"
-msgstr "Add to Playlist"
+#~ msgid "14.4 Kbps Modem"
+#~ msgstr "14.4 Kbps Modem"
 
-#: ../src/plugins/grilo/grilo.ui.h:3
-msgid "Copy Location"
-msgstr "Copy Location"
+#~ msgid "19.2 Kbps Modem"
+#~ msgstr "19.2 Kbps Modem"
+
+#~ msgid "256 Kbps DSL/Cable"
+#~ msgstr "256 Kbps DSL/Cable"
+
+#~ msgid "28.8 Kbps Modem"
+#~ msgstr "28.8 Kbps Modem"
+
+#~ msgid "33.6 Kbps Modem"
+#~ msgstr "33.6 Kbps Modem"
+
+#~ msgid "34.4 Kbps Modem"
+#~ msgstr "34.4 Kbps Modem"
+
+#~ msgid "384 Kbps DSL/Cable"
+#~ msgstr "384 Kbps DSL/Cable"
+
+#~ msgid "512 Kbps DSL/Cable"
+#~ msgstr "512 Kbps DSL/Cable"
+
+#~ msgid "56 Kbps Modem/ISDN"
+#~ msgstr "56 Kbps Modem/ISDN"
+
+#~ msgid "Configure the application"
+#~ msgstr "Configure the application"
+
+#~ msgid "Connection _speed:"
+#~ msgstr "Connection _speed:"
+
+#~ msgid "Intranet/LAN"
+#~ msgstr "Intranet/LAN"
+
+#~ msgid "Networking"
+#~ msgstr "Networking"
+
+#~ msgid "Open _Location..."
+#~ msgstr "Open _Location…"
+
+#~ msgid "Open a file"
+#~ msgstr "Open a file"
+
+#~ msgid "Open a non-local file"
+#~ msgstr "Open a non-local file"
+
+#~ msgid "Quit the program"
+#~ msgstr "Quit the program"
+
+#~ msgid "Set the repeat mode"
+#~ msgstr "Set the repeat mode"
+
+#~ msgid "Set the shuffle mode"
+#~ msgstr "Set the shuffle mode"
+
+#~ msgid "Switch to fullscreen"
+#~ msgstr "Switch to fullscreen"
+
+#~ msgid ""
+#~ "Approximate network connection speed, used to select quality on media "
+#~ "over the network."
+#~ msgstr ""
+#~ "Approximate network connection speed, used to select quality on media "
+#~ "over the network."
+
+#~ msgid "Network connection speed"
+#~ msgstr "Network connection speed"
+
+#~ msgid "Play Image '%s'"
+#~ msgstr "Play Image '%s'"
+
+#~ msgid "device%d"
+#~ msgstr "device%d"
+
+#~ msgid "Play Disc '%s'"
+#~ msgstr "Play Disc '%s'"
+
+#~ msgid "Movie Player using %s"
+#~ msgstr "Movie Player using %s"
+
+#~ msgid ""
+#~ "Totem could not play this media (%s) although a plugin is present to "
+#~ "handle it."
+#~ msgstr ""
+#~ "Totem could not play this media (%s) although a plugin is present to "
+#~ "handle it."
+
+#~ msgid ""
+#~ "You might want to check that a disc is present in the drive and that it "
+#~ "is correctly configured."
+#~ msgstr ""
+#~ "You might want to check that a disc is present in the drive and that it "
+#~ "is correctly configured."
+
+#~ msgid "More information about media plugins"
+#~ msgstr "More information about media plugins"
+
+#~ msgid ""
+#~ "Please install the necessary plugins and restart Totem to be able to play "
+#~ "this media."
+#~ msgstr ""
+#~ "Please install the necessary plugins and restart Totem to be able to play "
+#~ "this media."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it does not have the "
+#~ "appropriate plugins to be able to read from the disc."
+#~ msgstr ""
+#~ "Totem cannot play this type of media (%s) because it does not have the "
+#~ "appropriate plugins to be able to read from the disc."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because you do not have the "
+#~ "appropriate plugins to handle it."
+#~ msgstr ""
+#~ "Totem cannot play this type of media (%s) because you do not have the "
+#~ "appropriate plugins to handle it."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it is not supported."
+#~ msgstr ""
+#~ "Totem cannot play this type of media (%s) because it is not supported."
+
+#~ msgid "Please insert another disc to play back."
+#~ msgstr "Please insert another disc to play back."
+
+#~ msgid "Totem was not able to play this disc."
+#~ msgstr "Totem was not able to play this disc."
+
+#~ msgid "Totem does not support playback of Audio CDs"
+#~ msgstr "Totem does not support playback of Audio CDs"
+
+#~ msgid ""
+#~ "Please consider using a music player or a CD extractor to play this CD"
+#~ msgstr ""
+#~ "Please consider using a music player or a CD extractor to play this CD"
+
+#~ msgid ""
+#~ "The requested audio output was not found. Please select another audio "
+#~ "output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "The requested audio output was not found. Please select another audio "
+#~ "output in the Multimedia Systems Selector."
+
+#~ msgid ""
+#~ "The video output is in use by another application. Please close other "
+#~ "video applications, or select another video output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "The video output is in use by another application. Please close other "
+#~ "video applications, or select another video output in the Multimedia "
+#~ "Systems Selector."
+
+#~ msgid ""
+#~ "The audio output is in use by another application. Please select another "
+#~ "audio output in the Multimedia Systems Selector. You may want to consider "
+#~ "using a sound server."
+#~ msgstr ""
+#~ "The audio output is in use by another application. Please select another "
+#~ "audio output in the Multimedia Systems Selector. You may want to consider "
+#~ "using a sound server."
+
+#~ msgid ""
+#~ "Failed to open audio output. You may not have permission to open the "
+#~ "sound device, or the sound server may not be running. Please select "
+#~ "another audio output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "Failed to open audio output. You may not have permission to open the "
+#~ "sound device, or the sound server may not be running. Please select "
+#~ "another audio output in the Multimedia Systems Selector."
+
+#~ msgid ""
+#~ "Could not find the audio output. You may need to install additional "
+#~ "GStreamer plugins, or select another audio output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "Could not find the audio output. You may need to install additional "
+#~ "GStreamer plugins, or select another audio output in the Multimedia "
+#~ "Systems Selector."
+
+#~ msgid ""
+#~ "A format string used to build the network service name used when "
+#~ "publishing playlists over the network. The following format placeholders "
+#~ "can be used: • %a: the program name as returned by g_get_application_name"
+#~ "() • %h: the machine's host name in title case • %u: the user's login "
+#~ "name in title case • %U: the user's real name • %%: the percent sign"
+#~ msgstr ""
+#~ "A format string used to build the network service name used when "
+#~ "publishing playlists over the network. The following format placeholders "
+#~ "can be used: • %a: the program name as returned by g_get_application_name"
+#~ "() • %h: the machine's host name in title case • %u: the user's login "
+#~ "name in title case • %U: the user's real name • %%: the percent sign"
+
+#~ msgid "Format for network service name"
+#~ msgstr "Format for network service name"
+
+#~ msgid "Publisher protocol to use"
+#~ msgstr "Publisher protocol to use"
+
+#~ msgid ""
+#~ "The transport protocol to use when publishing playlists over the network."
+#~ msgstr ""
+#~ "The transport protocol to use when publishing playlists over the network."
+
+#~ msgid "Neighbors"
+#~ msgstr "Neighbours"
+
+#~ msgid "Publish Playlist"
+#~ msgstr "Publish Playlist"
+
+#~ msgid "Share the current playlist via HTTP"
+#~ msgstr "Share the current playlist via HTTP"
+
+#~ msgid "Service _Name:"
+#~ msgstr "Service _Name:"
+
+#~ msgid ""
+#~ "The name used for announcing the playlist service on the network.\n"
+#~ "All occurrences of the string %u will be replaced by your name,\n"
+#~ "and %h will be replaced by your computer's host name."
+#~ msgstr ""
+#~ "The name used for announcing the playlist service on the network.\n"
+#~ "All occurrences of the string %u will be replaced by your name,\n"
+#~ "and %h will be replaced by your computer's host name."
+
+#~ msgid "Use _encrypted transport protocol (HTTPS)"
+#~ msgstr "Use _encrypted transport protocol (HTTPS)"
 
 #~ msgid "Bemused"
 #~ msgstr "Bemused"
@@ -2722,9 +2768,6 @@
 #~ msgid "Search Results"
 #~ msgstr "Search Results"
 
-#~ msgid "Videos"
-#~ msgstr "Videos"
-
 #~ msgid "_Open in Web Browser"
 #~ msgstr "_Open in Web Browser"
 
@@ -3237,34 +3280,18 @@
 #~ "Check that the device is not busy."
 
 #~ msgid ""
-#~ "No video output is available. Make sure that the program is correctly "
-#~ "installed."
-#~ msgstr ""
-#~ "No video output is available. Make sure that the program is correctly "
-#~ "installed."
-
-#~ msgid ""
 #~ "The TV adapter could not tune into the channel. Please check your "
 #~ "hardware setup and channel configuration."
 #~ msgstr ""
 #~ "The TV adapter could not tune into the channel. Please check your "
 #~ "hardware setup and channel configuration."
 
-#~ msgid "The server you are trying to connect to is not known."
-#~ msgstr "The server you are trying to connect to is not known."
-
 #~ msgid "The device name you specified (%s) seems to be invalid."
 #~ msgstr "The device name you specified (%s) seems to be invalid."
 
 #~ msgid "The server you are trying to connect to (%s) is unreachable."
 #~ msgstr "The server you are trying to connect to (%s) is unreachable."
 
-#~ msgid "The connection to this server was refused."
-#~ msgstr "The connection to this server was refused."
-
-#~ msgid "The specified movie could not be found."
-#~ msgstr "The specified movie could not be found."
-
 #~ msgid ""
 #~ "The source seems encrypted and can't be read. Are you trying to play an "
 #~ "encrypted DVD without libdvdcss?"
@@ -3272,9 +3299,6 @@
 #~ "The source seems encrypted, and can't be read. Are you trying to play an "
 #~ "encrypted DVD without libdvdcss?"
 
-#~ msgid "The movie could not be read."
-#~ msgstr "The movie could not be read."
-
 #~ msgid "A problem occurred while loading a library or a decoder (%s)."
 #~ msgstr "A problem occurred while loading a library or a decoder (%s)."
 
@@ -3290,15 +3314,6 @@
 #~ msgid "Authentication is required to access this file."
 #~ msgstr "Authentication is required to access this file."
 
-#~ msgid "Authentication is required to access this file or stream."
-#~ msgstr "Authentication is required to access this file or stream."
-
-#~ msgid "You are not allowed to open this file."
-#~ msgstr "You are not allowed to open this file."
-
-#~ msgid "The server refused access to this file or stream."
-#~ msgstr "The server refused access to this file or stream."
-
 #~ msgid "The file you tried to play is an empty file."
 #~ msgstr "The file you tried to play is an empty file."
 
@@ -3311,9 +3326,6 @@
 #~ msgid "This movie is broken and can not be played further."
 #~ msgstr "This movie is broken and can not be played further."
 
-#~ msgid "This location is not a valid one."
-#~ msgstr "This location is not a valid one."
-
 #~ msgid "This movie could not be opened."
 #~ msgstr "This movie could not be opened."
 
@@ -3324,13 +3336,6 @@
 #~ "Video codec '%s' is not handled. You might need to install additional "
 #~ "plugins to be able to play some types of movies"
 
-#~ msgid ""
-#~ "Audio codec '%s' is not handled. You might need to install additional "
-#~ "plugins to be able to play some types of movies"
-#~ msgstr ""
-#~ "Audio codec '%s' is not handled. You might need to install additional "
-#~ "plugins to be able to play some types of movies"
-
 #~ msgid "This is an audio-only file and there is no audio output available."
 #~ msgstr "This is an audio-only file and there is no audio output available."
 
@@ -3436,9 +3441,6 @@
 #~ "5.1-channel\n"
 #~ "AC3 Passthrough"
 
-#~ msgid "Open Location"
-#~ msgstr "Open Location"
-
 #~ msgid "Properties dialog"
 #~ msgstr "Properties dialogue"
 
@@ -3505,18 +3507,6 @@
 #~ msgid "Plugins Manager"
 #~ msgstr "Plugins Manager"
 
-#~ msgid "Media Player Keys"
-#~ msgstr "Media Player Keys"
-
-#~ msgid "Support additional media player keys"
-#~ msgstr "Support additional media player keys"
-
-#~ msgid "Screensaver"
-#~ msgstr "Screensaver"
-
-#~ msgid "Provides the \"Skip to\" dialog."
-#~ msgstr "Provides the \"Skip to\" dialogue."
-
 #~ msgid "Skipto"
 #~ msgstr "Skipto"
 
diff -Nru totem-3.4.3/po/es.po totem-3.6.2/po/es.po
--- totem-3.4.3/po/es.po	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/po/es.po	2012-08-29 23:07:45.000000000 +0000
@@ -15,25 +15,254 @@
 "Project-Id-Version: totem.master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=totem&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-03-23 06:16+0000\n"
-"PO-Revision-Date: 2012-03-23 11:06+0100\n"
+"POT-Creation-Date: 2012-07-14 23:31+0000\n"
+"PO-Revision-Date: 2012-07-16 16:14+0200\n"
 "Last-Translator: Daniel Mustieles \n"
 "Language-Team: Español \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Gtranslator 1.9.3\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Poedit-Language: Spanish\n"
 
+#: ../browser-plugin/totem-plugin-viewer.c:352 ../src/totem-object.c:1180
+#: ../src/totem-object.c:1650 ../src/totem-statusbar.c:115
+msgid "Stopped"
+msgstr "Detenido"
+
+#: ../browser-plugin/totem-plugin-viewer.c:364 ../src/totem-object.c:1173
+msgid "Paused"
+msgstr "Pausa"
+
+#: ../browser-plugin/totem-plugin-viewer.c:368 ../src/totem-object.c:1166
+msgid "Playing"
+msgstr "Reproduciendo"
+
+#: ../browser-plugin/totem-plugin-viewer.c:386
+#: ../src/plugins/screensaver/totem-screensaver.c:97
+msgid "Playing a movie"
+msgstr "Reproduciendo una película"
+
+#: ../browser-plugin/totem-plugin-viewer.c:443
+msgid "No URI to play"
+msgstr "No hay una URI para reproducir"
+
+#: ../browser-plugin/totem-plugin-viewer.c:676
+#: ../browser-plugin/totem-plugin-viewer.c:1700
+msgid "Totem Movie Player"
+msgstr "Reproductor de películas Totem"
+
+#. translators: this is:
+#. * Open With ApplicationName
+#. * as in nautilus' right-click menu
+#: ../browser-plugin/totem-plugin-viewer.c:1120
+#, c-format
+msgid "_Open with \"%s\""
+msgstr "_Abrir con «%s»"
+
+#: ../browser-plugin/totem-plugin-viewer.c:1341 ../src/totem-object.c:2475
+msgid "An error occurred"
+msgstr "Ha ocurrido un error"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2033
+msgid "No playlist or playlist empty"
+msgstr "Ninguna lista o lista vacía"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2128
+msgid "Movie browser plugin"
+msgstr "Complemento de examinador de películas"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144 ../src/totem.c:239
+msgid "Could not initialize the thread-safe libraries."
+msgstr "No se pudo inicializar el soporte de hilos seguro."
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144
+msgid "Verify your system installation. The Totem plugin will now exit."
+msgstr ""
+"Verifique la instalación de su sistema. EL complemento de Totem ahora "
+"terminará."
+
 #: ../data/fullscreen.ui.h:1
 msgid "Leave Fullscreen"
 msgstr "Salir de pantalla completa"
 
-#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:144
+#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:81
 msgid "Time:"
 msgstr "Tiempo:"
 
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
+msgid "Allow the screensaver to activate when playing audio"
+msgstr ""
+"Permitir que el salvapantallas se active cuando se está reproduciendo sonido"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
+msgid ""
+"Allow the screensaver to activate when playing audio. Disable if you have "
+"monitor-powered speakers."
+msgstr ""
+"Permitir que el salvapantallas se active cuando se está reproduciendo "
+"sonido. Desactívelo si tiene altavoces alimentados desde la pantalla."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
+msgid "Show visual effects when no video is displayed"
+msgstr "Mostrar efectos visuales cuando no se muestre vídeo"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
+msgid "Show visual effects when playing an audio only file."
+msgstr ""
+"Mostrar efectos visuales al reproducir un archivo que sólo tenga sonido."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
+msgid "Name of the visual effects plugin"
+msgstr "Nombre del complemento de efectos visuales"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
+msgid "The brightness of the video"
+msgstr "El brillo del vídeo"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
+msgid "The contrast of the video"
+msgstr "El contraste del vídeo"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
+msgid "The hue of the video"
+msgstr "El tono del vídeo"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
+msgid "The saturation of the video"
+msgstr "La saturación del vídeo"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
+msgid "Resize the canvas automatically on file load"
+msgstr "Autoredimensionar la ventana al cargar el archivo"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
+msgid "Repeat mode"
+msgstr "Modo de repetición"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
+msgid "Shuffle mode"
+msgstr "Modo aleatorio"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
+msgid "Whether to disable deinterlacing for interlaced movies"
+msgstr ""
+"Indica si se debe desactivar el desentrelazado para películas entrelazadas"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
+msgid "Whether to enable debug for the playback engine"
+msgstr ""
+"Indica si se debe activar la depuración para el motor de reproducción de "
+"vídeo"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
+msgid "Type of audio output to use"
+msgstr "Tipo de salida de sonido que usar"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
+msgid "Visualization quality setting"
+msgstr "Ajuste de calidad de visualización"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
+msgid "Quality setting for the audio visualization."
+msgstr "Configuración de calidad para la visualización del sonido."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
+msgid "Network buffering threshold"
+msgstr "Umbral de búfer de red"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
+msgid ""
+"Amount of data to buffer for network streams before starting to display the "
+"stream (in seconds)."
+msgstr ""
+"Cantidad de datos que almacenar para los flujos de red antes de empezar a "
+"mostrar el flujo (en segundos)."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
+msgid "Subtitle font"
+msgstr "Tipografía para subtítulos"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
+msgid "Pango font description for subtitle rendering."
+msgstr "Descripción de tipografía Pango para el renderizado de subtítulos"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
+msgid "Subtitle encoding"
+msgstr "Codificación para subtítulos"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
+msgid "Encoding character set for subtitle."
+msgstr "Conjunto de caracteres para el subtítulo."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
+msgid "Default location for the \"Open...\" dialogs"
+msgstr "Ubicación predeterminada para los diálogos «Abrir…»"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
+msgid ""
+"Default location for the \"Open...\" dialogs. Default is the current "
+"directory."
+msgstr ""
+"Ubicación predeterminada para los diálogos «Abrir…», lo predeterminado es la "
+"carpeta actual."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
+msgid "Default location for the \"Take Screenshot\" dialogs"
+msgstr "Unicación predeterminada para los diálogos «Capturar pantalla»"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
+msgid ""
+"Default location for the \"Take Screenshot\" dialogs. Default is the "
+"Pictures directory."
+msgstr ""
+"Ubicación predeterminada para los diálogos «Capturar pantalla», lo "
+"predeterminado es la carpeta Imágenes."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
+msgid "Whether to disable the plugins in the user's home directory"
+msgstr ""
+"Indica si se deben desactivar los complementos en la carpeta personal del "
+"usuario"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
+msgid "Whether to disable the keyboard shortcuts"
+msgstr "Indica si se deben desactivar las combinaciones de teclas"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
+msgid "Whether to autoload text subtitle files when a movie is loaded"
+msgstr ""
+"Indica si se deben cargar los archivos de texto de subtítulos "
+"automáticamente al cargar una película"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
+msgid "Whether to autoload external chapter files when a movie is loaded"
+msgstr ""
+"Indica si se deben cargar automáticamente los archivos de capítulos externos "
+"al cargar una película"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
+msgid ""
+"Whether to remember the position of played audio/video files when pausing or "
+"closing them"
+msgstr ""
+"Indica si se debe recordar la posición de los archivos de sonido y/o vídeo "
+"al pausarlos o cerrarlos"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
+msgid "Active plugins list"
+msgstr "Lista de complementos activos"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+msgid ""
+"A list of the names of the plugins which are currently active (loaded and "
+"running)."
+msgstr ""
+"Una lista de los nombres de los complementos que están actualmente activos "
+"(cargados y en ejecución)."
+
 #: ../data/playlist.ui.h:1
 msgid "_Remove"
 msgstr "_Quitar"
@@ -50,11 +279,11 @@
 msgid "Copy the location to the clipboard"
 msgstr "Copiar la dirección en el portapapeles"
 
-#: ../data/playlist.ui.h:5 ../data/totem.ui.h:78
+#: ../data/playlist.ui.h:5 ../data/totem.ui.h:71
 msgid "_Select Text Subtitles..."
 msgstr "_Seleccionar subtítulos de texto…"
 
-#: ../data/playlist.ui.h:6 ../data/totem.ui.h:79
+#: ../data/playlist.ui.h:6 ../data/totem.ui.h:72
 msgid "Select a file to use for text subtitles"
 msgstr "Seleccione un archivo que usar como subtítulos"
 
@@ -78,10 +307,165 @@
 msgid "Move Down"
 msgstr "Mover abajo"
 
-#: ../data/properties.ui.h:1 ../data/totem.ui.h:122
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:2
+msgid "Normal"
+msgstr "Normal"
+
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:4
+msgid "Large"
+msgstr "Grande"
+
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:6
+msgid "Extra Large"
+msgstr "Muy grande"
+
+#: ../data/preferences.ui.h:7 ../src/backend/bacon-video-widget.c:5473
+#: ../src/totem-properties-view.c:231
+msgid "Stereo"
+msgstr "Estéreo"
+
+#: ../data/preferences.ui.h:8
+msgid "4-channel"
+msgstr "4 canales"
+
+#: ../data/preferences.ui.h:9
+msgid "4.1-channel"
+msgstr "4.1 canales"
+
+#: ../data/preferences.ui.h:10
+msgid "5.0-channel"
+msgstr "5.0 canales"
+
+#: ../data/preferences.ui.h:11
+msgid "5.1-channel"
+msgstr "5.1 canales"
+
+#: ../data/preferences.ui.h:12
+msgid "AC3 Passthrough"
+msgstr "Pasada AC3"
+
+#: ../data/preferences.ui.h:13
+msgid "Totem Preferences"
+msgstr "Preferencias de Totem"
+
+#: ../data/preferences.ui.h:14
+msgid "Playback"
+msgstr "Reproducir"
+
+#: ../data/preferences.ui.h:15
+msgid "Start playing files from last position"
+msgstr "Reproducir archivos desde la última posición"
+
+#: ../data/preferences.ui.h:16
+msgid "Text Subtitles"
+msgstr "Subtítulos"
+
+#: ../data/preferences.ui.h:17
+msgid "_Load subtitle files when movie is loaded"
+msgstr "_Cargar los archivos de subtítulos al cargar la película"
+
+#: ../data/preferences.ui.h:18
+msgid "_Font:"
+msgstr "_Tipografía:"
+
+#: ../data/preferences.ui.h:19
+msgid "_Encoding:"
+msgstr "_Codificación:"
+
+#: ../data/preferences.ui.h:20
+msgid "External Chapters"
+msgstr "Capítulos externos"
+
+#: ../data/preferences.ui.h:21
+msgid "Load _chapter files when movie is loaded"
+msgstr "Ca_rgar los archivos de capítulos al cargar la película"
+
+#: ../data/preferences.ui.h:22 ../data/properties.ui.h:1
 msgid "General"
 msgstr "General"
 
+#. Tab label in the Preferences dialogue
+#: ../data/preferences.ui.h:24
+msgid "Display"
+msgstr "Pantalla"
+
+#: ../data/preferences.ui.h:25
+msgid "_Resize the window when a new video is loaded"
+msgstr "_Redimensionar la ventana al cargar un vídeo nuevo"
+
+#: ../data/preferences.ui.h:26
+msgid "Disable _deinterlacing of interlaced videos"
+msgstr "Desactivar _desentrelazado de vídeos entrelazados"
+
+#: ../data/preferences.ui.h:27
+msgid "Disable screensaver when playing "
+msgstr "Desactivar salvapantallas al reproducir"
+
+#: ../data/preferences.ui.h:28 ../data/properties.ui.h:9
+#: ../src/totem-properties-view.c:273
+msgid "Video"
+msgstr "Vídeo"
+
+#: ../data/preferences.ui.h:29
+msgid "Video or Audio"
+msgstr "Vídeo o sonido"
+
+#: ../data/preferences.ui.h:30
+msgid "Visual Effects"
+msgstr "Efectos visuales"
+
+#: ../data/preferences.ui.h:31
+msgid "Show _visual effects when an audio file is played"
+msgstr "Mostrar efectos _visuales al reproducir un archivo de sonido"
+
+#: ../data/preferences.ui.h:32
+msgid "_Type of visualization:"
+msgstr "_Tipo de visualización:"
+
+#: ../data/preferences.ui.h:33
+msgid "Visualization _size:"
+msgstr "_Tamaño de visualización:"
+
+#: ../data/preferences.ui.h:34
+msgid "Color Balance"
+msgstr "Balance de color"
+
+#: ../data/preferences.ui.h:35
+msgid "_Brightness:"
+msgstr "_Brillo:"
+
+#: ../data/preferences.ui.h:36
+msgid "Co_ntrast:"
+msgstr "Co_ntraste:"
+
+#: ../data/preferences.ui.h:37
+msgid "Sat_uration:"
+msgstr "Sat_uración:"
+
+#: ../data/preferences.ui.h:38
+msgid "_Hue:"
+msgstr "_Tono:"
+
+#: ../data/preferences.ui.h:39
+msgid "Reset to _Defaults"
+msgstr "_Restablecer predeterminados"
+
+#: ../data/preferences.ui.h:40
+msgid "Audio Output"
+msgstr "Salida de sonido"
+
+#: ../data/preferences.ui.h:41
+msgid "_Audio output type:"
+msgstr "Tipo de salida de _sonido:"
+
+#: ../data/preferences.ui.h:42 ../data/properties.ui.h:14
+#: ../src/totem-properties-view.c:271
+msgid "Audio"
+msgstr "Sonido"
+
 #: ../data/properties.ui.h:2
 msgid "Title:"
 msgstr "Título:"
@@ -110,11 +494,6 @@
 msgid "Container:"
 msgstr "Contenedor:"
 
-#: ../data/properties.ui.h:9 ../data/totem.ui.h:128
-#: ../src/totem-properties-view.c:270
-msgid "Video"
-msgstr "Vídeo"
-
 #: ../data/properties.ui.h:10
 msgid "Dimensions:"
 msgstr "Dimensiones:"
@@ -131,11 +510,6 @@
 msgid "Bitrate:"
 msgstr "Tasa de bits:"
 
-#: ../data/properties.ui.h:14 ../data/totem.ui.h:142
-#: ../src/totem-properties-view.c:268
-msgid "Audio"
-msgstr "Sonido"
-
 #: ../data/properties.ui.h:15
 msgid "Sample rate:"
 msgstr "Frec. de muestreo:"
@@ -144,752 +518,446 @@
 msgid "Channels:"
 msgstr "Canales:"
 
-#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
-msgid "_Add to Playlist"
-msgstr "_Añadir a la lista de reproducción"
-
-#: ../data/video-list.ui.h:2
-msgid "Add the video to the playlist"
-msgstr "Añadir el vídeo a la lista de reproducción"
-
 #. Title
-#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:143
-#: ../src/totem-object.c:1667
-msgid "Movie Player"
-msgstr "Reproductor de películas"
+#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:80 ../src/totem.c:238
+#: ../src/totem.c:247 ../src/totem-menu.c:790 ../src/totem-object.c:1658
+msgid "Videos"
+msgstr "Vídeos"
 
 #: ../data/totem.desktop.in.in.in.h:2
-msgid "Play movies and songs"
-msgstr "Reproduzca películas y canciones"
+msgid "Play movies"
+msgstr "Reproducir películas"
+
+#: ../data/totem.desktop.in.in.in.h:3
+msgid "Video;Movie;Film;Clip;Series;Player;DVD;TV;Disc;"
+msgstr "Vídeo;Película;Clip,Serie;Reproductor;DVD;TV;Disco;"
 
 #: ../data/totem.ui.h:1
-msgid "_Movie"
-msgstr "_Película"
+msgid "_Open"
+msgstr "_Abrir"
 
 #: ../data/totem.ui.h:2
-msgid "_Open..."
-msgstr "_Abrir…"
+msgid "Open _Location"
+msgstr "Abrir _ubicación"
 
 #: ../data/totem.ui.h:3
-msgid "Open a file"
-msgstr "Abrir un archivo"
+msgid "_Fullscreen"
+msgstr "_Pantalla completa"
 
 #: ../data/totem.ui.h:4
-msgid "Open _Location..."
-msgstr "Abrir _dirección…"
+msgid "Prefere_nces"
+msgstr "Prefere_ncias"
 
 #: ../data/totem.ui.h:5
-msgid "Open a non-local file"
-msgstr "Abrir un archivo no local"
+msgid "Shuff_le"
+msgstr "Mezc_lar"
 
 #: ../data/totem.ui.h:6
+msgid "_Repeat"
+msgstr "_Repetir"
+
+#: ../data/totem.ui.h:7
+msgid "_Quit"
+msgstr "_Salir"
+
+#: ../data/totem.ui.h:8
+msgid "_Movie"
+msgstr "_Película"
+
+#: ../data/totem.ui.h:9
 msgid "_Eject"
 msgstr "_Expulsar"
 
-#: ../data/totem.ui.h:7
+#: ../data/totem.ui.h:10
 msgid "Eject the current disc"
 msgstr "Expulsar el disco actual"
 
-#: ../data/totem.ui.h:8
+#: ../data/totem.ui.h:11
 msgid "_Properties"
 msgstr "_Propiedades"
 
-#: ../data/totem.ui.h:9
+#: ../data/totem.ui.h:12
 msgid "View the properties of the current stream"
 msgstr "Ver las propiedades del flujo actual"
 
-#: ../data/totem.ui.h:10
+#: ../data/totem.ui.h:13
 msgid "Play / P_ause"
 msgstr "_Reproducir / Pausar"
 
-#: ../data/totem.ui.h:11
+#: ../data/totem.ui.h:14
 msgid "Play or pause the movie"
 msgstr "Reproducir o pausar la película"
 
-#: ../data/totem.ui.h:12
-msgid "_Quit"
-msgstr "_Salir"
-
-#: ../data/totem.ui.h:13
-msgid "Quit the program"
-msgstr "Salir del programa"
-
-#: ../data/totem.ui.h:14
+#: ../data/totem.ui.h:15
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../data/totem.ui.h:15
+#: ../data/totem.ui.h:16
 msgid "_Clear Playlist"
 msgstr "_Limpiar la lista de reproducción"
 
-#: ../data/totem.ui.h:16
+#: ../data/totem.ui.h:17
 msgid "Clear the playlist"
 msgstr "Limpiar la lista de reproducción"
 
-#: ../data/totem.ui.h:17
-msgid "Prefere_nces"
-msgstr "Prefere_ncias"
-
 #: ../data/totem.ui.h:18
-msgid "Configure the application"
-msgstr "Configurar la aplicación"
-
-#: ../data/totem.ui.h:19
 msgid "Plugins..."
 msgstr "Complementos…"
 
-#: ../data/totem.ui.h:20
+#: ../data/totem.ui.h:19
 msgid "Configure plugins to extend the application"
 msgstr "Configurar complementos para extender la aplicación"
 
-#: ../data/totem.ui.h:21
+#: ../data/totem.ui.h:20
 msgid "_View"
 msgstr "_Ver"
 
-#: ../data/totem.ui.h:22
-msgid "_Fullscreen"
-msgstr "_Pantalla completa"
-
-#: ../data/totem.ui.h:23
-msgid "Switch to fullscreen"
-msgstr "Cambiar a pantalla completa"
-
-#: ../data/totem.ui.h:24
+#: ../data/totem.ui.h:21
 msgid "Fit Window to Movie"
 msgstr "Ajustar la ventana a la película"
 
-#: ../data/totem.ui.h:25
+#: ../data/totem.ui.h:22
 msgid "_Resize 1:2"
 msgstr "_Redimensionar a 1:2"
 
-#: ../data/totem.ui.h:26
+#: ../data/totem.ui.h:23
 msgid "Resize to half the original video size"
 msgstr "Redimensionar a la mitad del tamaño original del vídeo"
 
-#: ../data/totem.ui.h:27
+#: ../data/totem.ui.h:24
 msgid "Resize _1:1"
 msgstr "Redimensionar a _1:1"
 
-#: ../data/totem.ui.h:28
+#: ../data/totem.ui.h:25
 msgid "Resize to the original video size"
 msgstr "Redimensionar al tamaño original del vídeo"
 
-#: ../data/totem.ui.h:29
+#: ../data/totem.ui.h:26
 msgid "Resize _2:1"
 msgstr "Redimensionar a _2:1"
 
-#: ../data/totem.ui.h:30
+#: ../data/totem.ui.h:27
 msgid "Resize to double the original video size"
 msgstr "Redimensionar al doble del tamaño original del vídeo"
 
-#: ../data/totem.ui.h:31
+#: ../data/totem.ui.h:28
 msgid "_Aspect Ratio"
 msgstr "Pr_oporción"
 
-#: ../data/totem.ui.h:32
+#: ../data/totem.ui.h:29
 msgid "Switch An_gles"
 msgstr "_Cambiar ángulos"
 
-#: ../data/totem.ui.h:33
+#: ../data/totem.ui.h:30
 msgid "Switch camera angles"
 msgstr "Cambiar los ángulos de la cámara"
 
-#: ../data/totem.ui.h:34
+#: ../data/totem.ui.h:31
 msgid "_Go"
 msgstr "_Ir"
 
-#: ../data/totem.ui.h:35
+#: ../data/totem.ui.h:32
 msgid "_DVD Menu"
 msgstr "Menú de _DVD"
 
-#: ../data/totem.ui.h:36
+#: ../data/totem.ui.h:33
 msgid "Go to the DVD menu"
 msgstr "Ir al menú DVD"
 
-#: ../data/totem.ui.h:37
+#: ../data/totem.ui.h:34
 msgid "_Title Menu"
 msgstr "Menú de _títulos"
 
-#: ../data/totem.ui.h:38
+#: ../data/totem.ui.h:35
 msgid "Go to the title menu"
 msgstr "Ir al menú de títulos"
 
-#: ../data/totem.ui.h:39
+#: ../data/totem.ui.h:36
 msgid "A_udio Menu"
 msgstr "Menú de s_onido"
 
-#: ../data/totem.ui.h:40
+#: ../data/totem.ui.h:37
 msgid "Go to the audio menu"
 msgstr "Ir al menú de sonido"
 
-#: ../data/totem.ui.h:41
+#: ../data/totem.ui.h:38
 msgid "_Angle Menu"
 msgstr "Menú de á_ngulos"
 
-#: ../data/totem.ui.h:42
+#: ../data/totem.ui.h:39
 msgid "Go to the angle menu"
 msgstr "Ir al menú de ángulo"
 
-#: ../data/totem.ui.h:43
+#: ../data/totem.ui.h:40
 msgid "_Chapter Menu"
 msgstr "Menú de _capítulos"
 
-#: ../data/totem.ui.h:44
+#: ../data/totem.ui.h:41
 msgid "Go to the chapter menu"
 msgstr "Ir al menú de capítulos"
 
-#: ../data/totem.ui.h:45
+#: ../data/totem.ui.h:42
 msgid "_Next Chapter/Movie"
 msgstr "_Siguiente capítulo / película"
 
-#: ../data/totem.ui.h:46
+#: ../data/totem.ui.h:43
 msgid "Next chapter or movie"
 msgstr "Siguiente capítulo o película"
 
-#: ../data/totem.ui.h:47
+#: ../data/totem.ui.h:44
 msgid "_Previous Chapter/Movie"
 msgstr "Capítulo / película _anterior"
 
-#: ../data/totem.ui.h:48
+#: ../data/totem.ui.h:45
 msgid "Previous chapter or movie"
 msgstr "Capítulo o película anterior"
 
-#: ../data/totem.ui.h:49
+#: ../data/totem.ui.h:46
 msgid "_Sound"
 msgstr "_Sonido"
 
-#: ../data/totem.ui.h:50
+#: ../data/totem.ui.h:47
 msgid "Volume _Up"
 msgstr "_Subir volumen"
 
-#: ../data/totem.ui.h:51
+#: ../data/totem.ui.h:48
 msgid "Increase volume"
 msgstr "Aumentar volumen"
 
-#: ../data/totem.ui.h:52
+#: ../data/totem.ui.h:49
 msgid "Volume _Down"
 msgstr "_Bajar volumen"
 
-#: ../data/totem.ui.h:53
+#: ../data/totem.ui.h:50
 msgid "Decrease volume"
 msgstr "Disminuir volumen"
 
-#: ../data/totem.ui.h:54
+#: ../data/totem.ui.h:51
 msgid "_Help"
 msgstr "Ay_uda"
 
-#: ../data/totem.ui.h:55
+#: ../data/totem.ui.h:52
 msgid "_Contents"
 msgstr "Índ_ice"
 
-#: ../data/totem.ui.h:56
+#: ../data/totem.ui.h:53
 msgid "Help contents"
 msgstr "Contenido de la ayuda"
 
-#: ../data/totem.ui.h:57
+#: ../data/totem.ui.h:54
 msgid "_About"
 msgstr "Acerca _de"
 
-#: ../data/totem.ui.h:58
+#: ../data/totem.ui.h:55
 msgid "About this application"
 msgstr "Acerca de esta aplicación"
 
-#: ../data/totem.ui.h:59
-msgid "_Repeat Mode"
-msgstr "Modo _repetición"
-
-#: ../data/totem.ui.h:60
-msgid "Set the repeat mode"
-msgstr "Establecer el modo de repetición"
-
-#: ../data/totem.ui.h:61
-msgid "Shuff_le Mode"
-msgstr "Modo _aleatorio"
-
-#: ../data/totem.ui.h:62
-msgid "Set the shuffle mode"
-msgstr "Establecer el modo aleatorio"
-
-#: ../data/totem.ui.h:63
+#: ../data/totem.ui.h:56
 msgid "Show _Controls"
 msgstr "_Mostrar controles"
 
-#: ../data/totem.ui.h:64
+#: ../data/totem.ui.h:57
 msgid "Show controls"
 msgstr "Mostrar los controles"
 
-#: ../data/totem.ui.h:65
+#: ../data/totem.ui.h:58
 msgid "S_idebar"
 msgstr "_Barra lateral"
 
-#: ../data/totem.ui.h:66
+#: ../data/totem.ui.h:59
 msgid "Show or hide the sidebar"
 msgstr "Mostrar u ocultar la barra lateral"
 
-#: ../data/totem.ui.h:67
+#: ../data/totem.ui.h:60
 msgctxt "Aspect ratio"
 msgid "Auto"
 msgstr "Automática"
 
-#: ../data/totem.ui.h:68
+#: ../data/totem.ui.h:61
 msgid "Sets automatic aspect ratio"
 msgstr "Establecer la proporción automáticamente"
 
-#: ../data/totem.ui.h:69
+#: ../data/totem.ui.h:62
 msgid "Square"
 msgstr "Cuadrada"
 
-#: ../data/totem.ui.h:70
+#: ../data/totem.ui.h:63
 msgid "Sets square aspect ratio"
 msgstr "Establecer la proporción cuadrada"
 
-#: ../data/totem.ui.h:71
+#: ../data/totem.ui.h:64
 msgid "4:3 (TV)"
 msgstr "4:3 (TV)"
 
-#: ../data/totem.ui.h:72
+#: ../data/totem.ui.h:65
 msgid "Sets 4:3 (TV) aspect ratio"
 msgstr "Establecer la proporción a 4:3 (TV)"
 
-#: ../data/totem.ui.h:73
+#: ../data/totem.ui.h:66
 msgid "16:9 (Widescreen)"
 msgstr "16:9 (Panorámico)"
 
-#: ../data/totem.ui.h:74
+#: ../data/totem.ui.h:67
 msgid "Sets 16:9 (widescreen) aspect ratio"
 msgstr "Establecer la proporción a 16:9 (pantalla ancha)"
 
-#: ../data/totem.ui.h:75
-msgid "2.11:1 (DVB)"
-msgstr "2.11:1 (DVB)"
-
-#: ../data/totem.ui.h:76
-msgid "Sets 2.11:1 (DVB) aspect ratio"
-msgstr "Establecer la proporción a 2.11:1 (DVB)"
-
-#: ../data/totem.ui.h:77
-msgid "S_ubtitles"
-msgstr "S_ubtítulos"
-
-#: ../data/totem.ui.h:80
-msgid "_Languages"
-msgstr "_Idiomas"
-
-#: ../data/totem.ui.h:81
-msgid "Zoom In"
-msgstr "Ampliar"
-
-#: ../data/totem.ui.h:82
-msgid "Zoom in"
-msgstr "Ampliar"
-
-#: ../data/totem.ui.h:83
-msgid "Skip _Forward"
-msgstr "Saltar ad_elante"
-
-#: ../data/totem.ui.h:84
-msgid "Skip forward"
-msgstr "Saltar adelante"
-
-#: ../data/totem.ui.h:85
-msgid "Skip _Backwards"
-msgstr "Saltar at_rás"
-
-#: ../data/totem.ui.h:86
-msgid "Skip backwards"
-msgstr "Saltar atrás"
-
-#: ../data/totem.ui.h:87
-msgid "14.4 Kbps Modem"
-msgstr "Módem de 14.4 Kbps"
-
-#: ../data/totem.ui.h:88
-msgid "19.2 Kbps Modem"
-msgstr "Módem de 19.2 Kbps"
-
-#: ../data/totem.ui.h:89
-msgid "28.8 Kbps Modem"
-msgstr "Módem de 28.8 Kbps"
-
-#: ../data/totem.ui.h:90
-msgid "33.6 Kbps Modem"
-msgstr "Módem de 33.6 Kbps"
-
-#: ../data/totem.ui.h:91
-msgid "34.4 Kbps Modem"
-msgstr "Módem de 34.4 Kbps"
-
-#: ../data/totem.ui.h:92
-msgid "56 Kbps Modem/ISDN"
-msgstr "Módem/RDSI 56 de Kbps"
-
-#: ../data/totem.ui.h:93
-msgid "112 Kbps Dual ISDN/DSL"
-msgstr "RDSI/DSL Dual de 112 Kbps"
-
-#: ../data/totem.ui.h:94
-msgid "256 Kbps DSL/Cable"
-msgstr "DSL/Cable de 256 Kbps"
-
-#: ../data/totem.ui.h:95
-msgid "384 Kbps DSL/Cable"
-msgstr "DSL/Cable de 384 Kbps"
-
-#: ../data/totem.ui.h:96
-msgid "512 Kbps DSL/Cable"
-msgstr "DSL/Cable 512 de Kbps"
-
-#: ../data/totem.ui.h:97
-msgid "1.5 Mbps T1/Intranet/LAN"
-msgstr "T1/Intranet/LAN de 1.5 Mbps"
-
-#: ../data/totem.ui.h:98
-msgid "Intranet/LAN"
-msgstr "Intranet/LAN"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:100
-msgid "Normal"
-msgstr "Normal"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:102
-msgid "Large"
-msgstr "Grande"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:104
-msgid "Extra Large"
-msgstr "Muy grande"
-
-#: ../data/totem.ui.h:105 ../src/totem-properties-view.c:228
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5593
-msgid "Stereo"
-msgstr "Estéreo"
-
-#: ../data/totem.ui.h:106
-msgid "4-channel"
-msgstr "4 canales"
-
-#: ../data/totem.ui.h:107
-msgid "4.1-channel"
-msgstr "4.1 canales"
-
-#: ../data/totem.ui.h:108
-msgid "5.0-channel"
-msgstr "5.0 canales"
-
-#: ../data/totem.ui.h:109
-msgid "5.1-channel"
-msgstr "5.1 canales"
-
-#: ../data/totem.ui.h:110
-msgid "AC3 Passthrough"
-msgstr "Pasada AC3"
-
-#: ../data/totem.ui.h:111
-msgid "Totem Preferences"
-msgstr "Preferencias de Totem"
-
-#: ../data/totem.ui.h:112
-msgid "Playback"
-msgstr "Reproducir"
-
-#: ../data/totem.ui.h:113
-msgid "Start playing files from last position"
-msgstr "Reproducir archivos desde la última posición"
-
-#: ../data/totem.ui.h:114
-msgid "Networking"
-msgstr "Red"
-
-#: ../data/totem.ui.h:115
-msgid "Connection _speed:"
-msgstr "_Velocidad de la conexión:"
-
-#: ../data/totem.ui.h:116
-msgid "Text Subtitles"
-msgstr "Subtítulos"
-
-#: ../data/totem.ui.h:117
-msgid "_Load subtitle files when movie is loaded"
-msgstr "_Cargar los archivos de subtítulos al cargar la película"
-
-#: ../data/totem.ui.h:118
-msgid "_Font:"
-msgstr "_Tipografía:"
-
-#: ../data/totem.ui.h:119
-msgid "_Encoding:"
-msgstr "_Codificación:"
-
-#: ../data/totem.ui.h:120
-msgid "External Chapters"
-msgstr "Capítulos externos"
-
-#: ../data/totem.ui.h:121
-msgid "Load _chapter files when movie is loaded"
-msgstr "Ca_rgar los archivos de capítulos al cargar la película"
-
-#. Tab label in the Preferences dialogue
-#: ../data/totem.ui.h:124
-msgid "Display"
-msgstr "Pantalla"
-
-#: ../data/totem.ui.h:125
-msgid "_Resize the window when a new video is loaded"
-msgstr "_Redimensionar la ventana al cargar un vídeo nuevo"
-
-#: ../data/totem.ui.h:126
-msgid "Disable _deinterlacing of interlaced videos"
-msgstr "Desactivar _desentrelazado de vídeos entrelazados"
-
-#: ../data/totem.ui.h:127
-msgid "Disable screensaver when playing "
-msgstr "Desactivar salvapantallas al reproducir"
-
-#: ../data/totem.ui.h:129
-msgid "Video or Audio"
-msgstr "Vídeo o sonido"
-
-#: ../data/totem.ui.h:130
-msgid "Visual Effects"
-msgstr "Efectos visuales"
-
-#: ../data/totem.ui.h:131
-msgid "Show _visual effects when an audio file is played"
-msgstr "Mostrar efectos _visuales al reproducir un archivo de sonido"
-
-#: ../data/totem.ui.h:132
-msgid "_Type of visualization:"
-msgstr "_Tipo de visualización:"
-
-#: ../data/totem.ui.h:133
-msgid "Visualization _size:"
-msgstr "_Tamaño de visualización:"
-
-#: ../data/totem.ui.h:134
-msgid "Color Balance"
-msgstr "Balance de color"
-
-#: ../data/totem.ui.h:135
-msgid "_Brightness:"
-msgstr "_Brillo:"
-
-#: ../data/totem.ui.h:136
-msgid "Co_ntrast:"
-msgstr "Co_ntraste:"
-
-#: ../data/totem.ui.h:137
-msgid "Sat_uration:"
-msgstr "Sat_uración:"
-
-#: ../data/totem.ui.h:138
-msgid "_Hue:"
-msgstr "_Tono:"
-
-#: ../data/totem.ui.h:139
-msgid "Reset to _Defaults"
-msgstr "_Restablecer predeterminados"
-
-#: ../data/totem.ui.h:140
-msgid "Audio Output"
-msgstr "Salida de sonido"
-
-#: ../data/totem.ui.h:141
-msgid "_Audio output type:"
-msgstr "Tipo de salida de _sonido:"
-
-#: ../data/totem.ui.h:145
-msgid "Time seek bar"
-msgstr "Barra de tiempo"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
-msgid "Allow the screensaver to activate when playing audio"
-msgstr ""
-"Permitir que el salvapantallas se active cuando se está reproduciendo sonido"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
-msgid ""
-"Allow the screensaver to activate when playing audio. Disable if you have "
-"monitor-powered speakers."
-msgstr ""
-"Permitir que el salvapantallas se active cuando se está reproduciendo "
-"sonido. Desactívelo si tiene altavoces alimentados desde la pantalla."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
-msgid "Show visual effects when no video is displayed"
-msgstr "Mostrar efectos visuales cuando no se muestre vídeo"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
-msgid "Show visual effects when playing an audio only file."
-msgstr ""
-"Mostrar efectos visuales al reproducir un archivo que sólo tenga sonido."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
-msgid "Name of the visual effects plugin"
-msgstr "Nombre del complemento de efectos visuales"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
-msgid "The brightness of the video"
-msgstr "El brillo del vídeo"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
-msgid "The contrast of the video"
-msgstr "El contraste del vídeo"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
-msgid "The hue of the video"
-msgstr "El tono del vídeo"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
-msgid "The saturation of the video"
-msgstr "La saturación del vídeo"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
-msgid "Resize the canvas automatically on file load"
-msgstr "Autoredimensionar la ventana al cargar el archivo"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
-msgid "Network connection speed"
-msgstr "Velocidad de la conexión de la red"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
-msgid ""
-"Approximate network connection speed, used to select quality on media over "
-"the network."
-msgstr ""
-"Velocidad de conexión aproximada, usada para seleccionar la calidad del "
-"medio sobre la red."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
-msgid "Repeat mode"
-msgstr "Modo de repetición"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
-msgid "Shuffle mode"
-msgstr "Modo aleatorio"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
-msgid "Whether to disable deinterlacing for interlaced movies"
-msgstr ""
-"Indica si se debe desactivar el desentrelazado para películas entrelazadas"
+#: ../data/totem.ui.h:68
+msgid "2.11:1 (DVB)"
+msgstr "2.11:1 (DVB)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
-msgid "Whether to enable debug for the playback engine"
-msgstr ""
-"Indica si se debe activar la depuración para el motor de reproducción de "
-"vídeo"
+#: ../data/totem.ui.h:69
+msgid "Sets 2.11:1 (DVB) aspect ratio"
+msgstr "Establecer la proporción a 2.11:1 (DVB)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
-msgid "Type of audio output to use"
-msgstr "Tipo de salida de sonido que usar"
+#: ../data/totem.ui.h:70
+msgid "S_ubtitles"
+msgstr "S_ubtítulos"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
-msgid "Visualization quality setting"
-msgstr "Ajuste de calidad de visualización"
+#: ../data/totem.ui.h:73
+msgid "_Languages"
+msgstr "_Idiomas"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
-msgid "Quality setting for the audio visualization."
-msgstr "Configuración de calidad para la visualización del sonido."
+#: ../data/totem.ui.h:74
+msgid "Zoom In"
+msgstr "Ampliar"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
-msgid "Network buffering threshold"
-msgstr "Umbral de búfer de red"
+#: ../data/totem.ui.h:75
+msgid "Zoom in"
+msgstr "Ampliar"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
-msgid ""
-"Amount of data to buffer for network streams before starting to display the "
-"stream (in seconds)."
-msgstr ""
-"Cantidad de datos que almacenar para los flujos de red antes de empezar a "
-"mostrar el flujo (en segundos)."
+#: ../data/totem.ui.h:76
+msgid "Skip _Forward"
+msgstr "Saltar ad_elante"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
-msgid "Subtitle font"
-msgstr "Tipografía para subtítulos"
+#: ../data/totem.ui.h:77
+msgid "Skip forward"
+msgstr "Saltar adelante"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
-msgid "Pango font description for subtitle rendering."
-msgstr "Descripción de tipografía Pango para el renderizado de subtítulos"
+#: ../data/totem.ui.h:78
+msgid "Skip _Backwards"
+msgstr "Saltar at_rás"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
-msgid "Subtitle encoding"
-msgstr "Codificación para subtítulos"
+#: ../data/totem.ui.h:79
+msgid "Skip backwards"
+msgstr "Saltar atrás"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
-msgid "Encoding character set for subtitle."
-msgstr "Conjunto de caracteres para el subtítulo."
+#: ../data/totem.ui.h:82
+msgid "Time seek bar"
+msgstr "Barra de tiempo"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
-msgid "Default location for the \"Open...\" dialogs"
-msgstr "Ubicación predeterminada para los diálogos «Abrir…»"
+#: ../data/uri.ui.h:1
+msgid "Enter the _address of the file you would like to open:"
+msgstr "Introduzca la _dirección del archivo que quiere abrir:"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
-msgid ""
-"Default location for the \"Open...\" dialogs. Default is the current "
-"directory."
-msgstr ""
-"Ubicación predeterminada para los diálogos «Abrir…», lo predeterminado es la "
-"carpeta actual."
+#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
+msgid "_Add to Playlist"
+msgstr "_Añadir a la lista de reproducción"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
-msgid "Default location for the \"Take Screenshot\" dialogs"
-msgstr "Unicación predeterminada para los diálogos «Capturar pantalla»"
+#: ../data/video-list.ui.h:2
+msgid "Add the video to the playlist"
+msgstr "Añadir el vídeo a la lista de reproducción"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
-msgid ""
-"Default location for the \"Take Screenshot\" dialogs. Default is the "
-"Pictures directory."
-msgstr ""
-"Ubicación predeterminada para los diálogos «Capturar pantalla», lo "
-"predeterminado es la carpeta Imágenes."
+#: ../src/backend/bacon-video-widget.c:1629
+msgid "Password requested for RTSP server"
+msgstr "Contraseña solicitada para el servidor RTSP"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
-msgid "Whether to disable the plugins in the user's home directory"
-msgstr ""
-"Indica si se deben desactivar los complementos en la carpeta personal del "
-"usuario"
+#: ../src/backend/bacon-video-widget.c:2916
+#, c-format
+msgid "Audio Track #%d"
+msgstr "Pista de sonido nº %d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
-msgid "Whether to disable the keyboard shortcuts"
-msgstr "Indica si se deben desactivar las combinaciones de teclas"
+#: ../src/backend/bacon-video-widget.c:2920
+#, c-format
+msgid "Subtitle #%d"
+msgstr "Subtítulo nº %d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
-msgid "Whether to autoload text subtitle files when a movie is loaded"
-msgstr ""
-"Indica si se deben cargar los archivos de texto de subtítulos "
-"automáticamente al cargar una película"
+#: ../src/backend/bacon-video-widget.c:3317
+msgid "The server you are trying to connect to is not known."
+msgstr "El servidor al que está intentando conectar no es conocido."
+
+#: ../src/backend/bacon-video-widget.c:3320
+msgid "The connection to this server was refused."
+msgstr "La conexión a este servidor fue rehusada."
+
+#: ../src/backend/bacon-video-widget.c:3323
+msgid "The specified movie could not be found."
+msgstr "La película especificada no se pudo encontrar."
+
+#: ../src/backend/bacon-video-widget.c:3330
+msgid "The server refused access to this file or stream."
+msgstr "El servidor rechazó el acceso a este archivo a flujo."
+
+#: ../src/backend/bacon-video-widget.c:3336
+msgid "Authentication is required to access this file or stream."
+msgstr "Se requiere autenticación para acceder a este archivo o flujo."
+
+#: ../src/backend/bacon-video-widget.c:3343
+msgid "You are not allowed to open this file."
+msgstr "No se le permite abrir este archivo."
+
+#: ../src/backend/bacon-video-widget.c:3348
+msgid "This location is not a valid one."
+msgstr "Esta dirección no es válida."
+
+#: ../src/backend/bacon-video-widget.c:3356
+msgid "The movie could not be read."
+msgstr "La película no se pudo leer."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
-msgid "Whether to autoload external chapter files when a movie is loaded"
+#. should be exactly one missing thing (source or converter)
+#: ../src/backend/bacon-video-widget.c:3379
+#: ../src/backend/bacon-video-widget.c:3387
+#, c-format
+msgid "The playback of this movie requires a %s plugin which is not installed."
+msgid_plural ""
+"The playback of this movie requires the following decoders which are not "
+"installed:\n"
+"\n"
+"%s"
+msgstr[0] ""
+"La reproducción de esta película requiere un complemento %s que no está "
+"instalado."
+msgstr[1] ""
+"La reproducción de esta película requiere los siguientes decodificadores que "
+"no están instalados:\n"
+"\n"
+"%s"
+
+#: ../src/backend/bacon-video-widget.c:3398
+msgid ""
+"An audio or video stream is not handled due to missing codecs. You might "
+"need to install additional plugins to be able to play some types of movies"
 msgstr ""
-"Indica si se deben cargar automáticamente los archivos de capítulos externos "
-"al cargar una película"
+"El flujo de vídeo o de sonido no está soportado porque falta códecs. Quizá "
+"necesite instalar complementos adicionales para ser capaz de reproducir "
+"algunos tipos de películas"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+#: ../src/backend/bacon-video-widget.c:3408
 msgid ""
-"Whether to remember the position of played audio/video files when pausing or "
-"closing them"
+"This file cannot be played over the network. Try downloading it locally "
+"first."
 msgstr ""
-"Indica si se debe recordar la posición de los archivos de sonido y/o vídeo "
-"al pausarlos o cerrarlos"
+"No se puede reproducir este archivo a través de la red. Intente descargarlo "
+"primero."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:35
-msgid "Active plugins list"
-msgstr "Lista de complementos activos"
+#: ../src/backend/bacon-video-widget.c:5469 ../src/totem-properties-view.c:227
+msgid "Surround"
+msgstr "Envolvente"
+
+#: ../src/backend/bacon-video-widget.c:5471 ../src/totem-properties-view.c:229
+msgid "Mono"
+msgstr "Mono"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:36
+#: ../src/backend/bacon-video-widget.c:5756
+msgid "Media contains no supported video streams."
+msgstr "El soporte no contiene ningún flujo de vídeo soportado."
+
+#: ../src/backend/bacon-video-widget.c:5938
 msgid ""
-"A list of the names of the plugins which are currently active (loaded and "
-"running)."
+"Some necessary plug-ins are missing. Make sure that the program is correctly "
+"installed."
 msgstr ""
-"Una lista de los nombres de los complementos que están actualmente activos "
-"(cargados y en ejecución)."
-
-#: ../data/uri.ui.h:1
-msgid "Enter the _address of the file you would like to open:"
-msgstr "Introduzca la _dirección del archivo que quiere abrir:"
+"Falta algún complemento necesario. Asegúrese de que el programa está "
+"instalado correctamente."
 
 #: ../src/eggdesktopfile.c:165
 #, c-format
@@ -996,6 +1064,31 @@
 msgid "Show session management options"
 msgstr "Mostrar las opciones de gestión de la sesión"
 
+#. hour:minutes:seconds
+#. Translators: This is a time format, like "9:05:02" for 9
+#. * hours, 5 minutes, and 2 seconds. You may change ":" to
+#. * the separator that your locale uses or use "%Id" instead
+#. * of "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:56
+#: ../src/plugins/skipto/totem-time-entry.c:57
+#, c-format
+msgctxt "long time format"
+msgid "%d:%02d:%02d"
+msgstr "%d:%02d:%02d"
+
+#. minutes:seconds
+#. Translators: This is a time format, like "5:02" for 5
+#. * minutes and 2 seconds. You may change ":" to the
+#. * separator that your locale uses or use "%Id" instead of
+#. * "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:65
+#, c-format
+msgctxt "short time format"
+msgid "%d:%02d"
+msgstr "%d:%02d"
+
 #. Title
 #. Artist
 #. Album
@@ -1100,10 +1193,14 @@
 msgstr[0] "%d fotograma por segundo"
 msgstr[1] "%d fotogramas por segundo"
 
-#: ../src/totem-audio-preview.c:168
+#: ../src/totem-audio-preview.c:137
 msgid "Audio Preview"
 msgstr "Vista previa del sonido"
 
+#: ../src/totem.c:239
+msgid "Verify your system installation. Totem will now exit."
+msgstr "Verifique la instalación de su sistema. Totem ahora terminará."
+
 #: ../src/totem-cell-renderer-video.c:126
 msgid "Unknown video"
 msgstr "Vídeo desconocido"
@@ -1116,7 +1213,7 @@
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../src/totem-fullscreen.c:616
+#: ../src/totem-fullscreen.c:573
 msgid "No File"
 msgstr "Ningún archivo"
 
@@ -1134,7 +1231,7 @@
 msgid "Make sure that Totem is properly installed."
 msgstr "Asegúrese de que Totem está instalado correctamente."
 
-#: ../src/totem-interface.c:347
+#: ../src/totem-interface.c:357
 msgid ""
 "Totem 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 "
@@ -1146,7 +1243,7 @@
 "se publica por la Free Software Foundation; tanto en la versión 2de la "
 "Licencia, como a (su elección) cualquier versión posterior."
 
-#: ../src/totem-interface.c:351
+#: ../src/totem-interface.c:361
 msgid ""
 "Totem is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -1158,7 +1255,7 @@
 "ADECUACIÓN PARA UN PROPÓSITO PARTICULAR. Vea la Licencia Publica General "
 "para más detalles."
 
-#: ../src/totem-interface.c:355
+#: ../src/totem-interface.c:365
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Totem; if not, write to the Free Software Foundation, Inc., 59 Temple Place, "
@@ -1168,7 +1265,7 @@
 "con este programa. De lo contrario, escriba a la Free Software Foundation, "
 "Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, EE. UU."
 
-#: ../src/totem-interface.c:358
+#: ../src/totem-interface.c:368
 msgid ""
 "Totem contains an exception to allow the use of proprietary GStreamer "
 "plugins."
@@ -1177,46 +1274,21 @@
 "propietarios de GStreamer."
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:190
+#: ../src/totem-menu.c:291
 msgid "None"
 msgstr "Ninguno"
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:195
+#: ../src/totem-menu.c:296
 msgctxt "Language"
 msgid "Auto"
 msgstr "Automático"
 
-#. Translators:
-#. * This is not a JPEG image, but a disc image, for example,
-#. * an ISO file
-#: ../src/totem-menu.c:765
-#, c-format
-msgid "Play Image '%s'"
-msgstr "Reproducir imagen «%s»"
-
-#: ../src/totem-menu.c:768 ../src/totem-menu.c:851
-#, c-format
-msgid "device%d"
-msgstr "dispositivo%d"
-
-#: ../src/totem-menu.c:848
-#, c-format
-msgid "Play Disc '%s'"
-msgstr "Reproducir disco «%s»"
-
-#. This lists the back-end type and version, such as
-#. * Movie Player using GStreamer 0.10.1
-#: ../src/totem-menu.c:1189
-#, c-format
-msgid "Movie Player using %s"
-msgstr "Reproductor de películas que usa %s"
-
-#: ../src/totem-menu.c:1193
+#: ../src/totem-menu.c:789
 msgid "Copyright © 2002-2009 Bastien Nocera"
 msgstr "Copyright © 2002-2009 Bastien Nocera"
 
-#: ../src/totem-menu.c:1198
+#: ../src/totem-menu.c:794
 msgid "translator-credits"
 msgstr ""
 "Jorge González \n"
@@ -1227,158 +1299,78 @@
 "Germán Poo Caamaño \n"
 "Daniel Mustieles "
 
-#: ../src/totem-menu.c:1202
+#: ../src/totem-menu.c:798
 msgid "Totem Website"
 msgstr "Página web de Totem"
 
-#: ../src/totem-menu.c:1236
+#: ../src/totem-menu.c:829
 msgid "Configure Plugins"
 msgstr "Configurar complementos"
 
+#: ../src/totem-object.c:162
+#, c-format
+msgid ""
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"%s\n"
+"Ejecute «%s --help» para ver una lista completa de todas las opciones "
+"disponibles de la línea de comandos.\n"
+
 #. Translators: %s is the totem version number
-#: ../src/totem-object.c:471
+#: ../src/totem-object.c:591
 #, c-format
 msgid "Totem %s"
 msgstr "Totem %s"
 
-#: ../src/totem-object.c:1047 ../browser-plugin/totem-plugin-viewer.c:367
-msgid "Playing"
-msgstr "Reproduciendo"
-
-#: ../src/totem-object.c:1049 ../src/totem-options.c:52
+#: ../src/totem-object.c:1168 ../src/totem-options.c:52
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../src/totem-object.c:1054 ../browser-plugin/totem-plugin-viewer.c:363
-msgid "Paused"
-msgstr "Pausa"
-
-#: ../src/totem-object.c:1056 ../src/totem-object.c:1066
+#: ../src/totem-object.c:1175 ../src/totem-object.c:1185
 #: ../src/totem-options.c:51
 msgid "Play"
 msgstr "Reproducir"
 
-#: ../src/totem-object.c:1061 ../src/totem-object.c:1659
-#: ../src/totem-statusbar.c:115 ../browser-plugin/totem-plugin-viewer.c:351
-msgid "Stopped"
-msgstr "Detenido"
-
-#: ../src/totem-object.c:1142 ../src/totem-object.c:1169
-#: ../src/totem-object.c:1799 ../src/totem-object.c:1963
+#: ../src/totem-object.c:1267 ../src/totem-object.c:1294
+#: ../src/totem-object.c:1787 ../src/totem-object.c:1942
 #, c-format
 msgid "Totem could not play '%s'."
 msgstr "Totem no pudo reproducir «%s»."
 
-#: ../src/totem-object.c:1246
-#, c-format
-msgid ""
-"Totem could not play this media (%s) although a plugin is present to handle "
-"it."
-msgstr ""
-"Totem no pudo reproducir este soporte (%s) aunque hay un complemento "
-"instalado que puede manipularlo."
-
-#: ../src/totem-object.c:1247
-msgid ""
-"You might want to check that a disc is present in the drive and that it is "
-"correctly configured."
-msgstr ""
-"Compruebe que haya un disco en la unidad y que esté correctamente "
-"configurada."
-
-#: ../src/totem-object.c:1255
-msgid "More information about media plugins"
-msgstr "Más información acerca de los complementos de soportes"
-
-#: ../src/totem-object.c:1256
-msgid ""
-"Please install the necessary plugins and restart Totem to be able to play "
-"this media."
-msgstr ""
-"Por favor, instale los complementos necesarios y reinicie Totem para poder "
-"reproducir este soporte."
-
-#: ../src/totem-object.c:1258
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because it does not have the "
-"appropriate plugins to be able to read from the disc."
-msgstr ""
-"Totem no puede reproducir este tipo de soporte (%s) porque no tiene los "
-"complementos apropiados para leer del disco."
-
-#: ../src/totem-object.c:1260
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because you do not have the "
-"appropriate plugins to handle it."
-msgstr ""
-"Totem no puede reproducir este tipo de soporte (%s) porque no tiene los "
-"complementos apropiados para manejarlo."
-
-#: ../src/totem-object.c:1263
-#, c-format
-msgid "Totem cannot play this type of media (%s) because it is not supported."
-msgstr ""
-"Totem no puede reproducir este tipo de soporte (%s) porque no está soportado."
-
-#: ../src/totem-object.c:1264
-msgid "Please insert another disc to play back."
-msgstr "Introduzca otro disco para reproducir."
-
-#: ../src/totem-object.c:1300
-msgid "Totem was not able to play this disc."
-msgstr "No no fue capaz de reproducir este disco."
-
-#: ../src/totem-object.c:1301 ../src/totem-object.c:4229
-msgid "No reason."
-msgstr "No hay razón."
-
-#: ../src/totem-object.c:1315
-msgid "Totem does not support playback of Audio CDs"
-msgstr "Totem no soporta la reproducción de CD de sonido"
-
-#: ../src/totem-object.c:1316
-msgid "Please consider using a music player or a CD extractor to play this CD"
-msgstr ""
-"Considere usar un reproductor de música o un extractor de CD para reproducir "
-"este CD"
-
-#: ../src/totem-object.c:1805
+#: ../src/totem-object.c:1793
 msgid "No error message"
 msgstr "Sin mensaje de error"
 
-#: ../src/totem-object.c:2154
+#: ../src/totem-object.c:2133
 msgid "Totem could not display the help contents."
 msgstr "Totem no pudo mostrar el contenido de la ayuda."
 
-#: ../src/totem-object.c:2493 ../src/totem-object.c:2495
-#: ../browser-plugin/totem-plugin-viewer.c:1417
-msgid "An error occurred"
-msgstr "Ha ocurrido un error"
-
-#: ../src/totem-object.c:4064 ../src/totem-object.c:4066
+#: ../src/totem-object.c:4019 ../src/totem-object.c:4021
 msgid "Previous Chapter/Movie"
 msgstr "Capítulo / película anterior"
 
-#: ../src/totem-object.c:4073 ../src/totem-object.c:4075
+#: ../src/totem-object.c:4028 ../src/totem-object.c:4030
 msgid "Play / Pause"
 msgstr "Reproducir / Pausar"
 
-#: ../src/totem-object.c:4083 ../src/totem-object.c:4085
+#: ../src/totem-object.c:4038 ../src/totem-object.c:4040
 msgid "Next Chapter/Movie"
 msgstr "Capítulo / película siguiente"
 
-#. Translators: this is the tooltip text for the fullscreen button in the controls box in Totem's main window.
 #. Translators: this is the accessibility text for the fullscreen button in the controls box in Totem's main window.
-#: ../src/totem-object.c:4097 ../src/totem-object.c:4099
+#: ../src/totem-object.c:4051 ../src/totem-object.c:4053
 msgid "Fullscreen"
 msgstr "Pantalla completa"
 
-#: ../src/totem-object.c:4229
+#: ../src/totem-object.c:4184
 msgid "Totem could not startup."
 msgstr "No se ha podido iniciar Totem."
 
+#: ../src/totem-object.c:4184
+msgid "No reason."
+msgstr "No hay razón."
+
 #: ../src/totem-open-location.c:182
 msgid "Open Location..."
 msgstr "Abrir dirección…"
@@ -1452,117 +1444,111 @@
 msgid "Movies to play"
 msgstr "Películas que reproducir"
 
-#: ../src/totem-options.c:117
+#: ../src/totem-options.c:79
+msgid "- Play movies and songs"
+msgstr "- Reproduzca películas y canciones"
+
+#: ../src/totem-options.c:142
 msgid "Can't enqueue and replace at the same time"
 msgstr "No se puede encolar y reemplazar al mismo tiempo"
 
 #. By extension entry
-#: ../src/totem-playlist.c:161
+#: ../src/totem-playlist.c:162
 msgid "MP3 ShoutCast playlist"
 msgstr "Lista de reproducción MP3 ShoutCast"
 
-#: ../src/totem-playlist.c:162
+#: ../src/totem-playlist.c:163
 msgid "MP3 audio (streamed)"
 msgstr "Sonido MP3 (en flujo)"
 
-#: ../src/totem-playlist.c:163
+#: ../src/totem-playlist.c:164
 msgid "MP3 audio (streamed, DOS format)"
 msgstr "Sonido MP3 (en flujo, formato DOS)"
 
-#: ../src/totem-playlist.c:164
+#: ../src/totem-playlist.c:165
 msgid "XML Shareable Playlist"
 msgstr "Lista de reproducción XML compartible"
 
 #. This is "Title 3", where title is a DVD title
 #. * Note: NOT a DVD chapter
-#: ../src/totem-playlist.c:347
+#: ../src/totem-playlist.c:348
 #, c-format
 msgid "Title %d"
 msgstr "Título %d"
 
-#: ../src/totem-playlist.c:446
+#: ../src/totem-playlist.c:447
 msgid "Could not save the playlist"
 msgstr "No se pudo guardar la lista de reproducción"
 
-#: ../src/totem-playlist.c:1021
+#: ../src/totem-playlist.c:1022
 msgid "Save Playlist"
 msgstr "Guardar lista de reproducción"
 
 #. translators: Playlist is the default saved playlist filename,
 #. * without the suffix
-#: ../src/totem-playlist.c:1033 ../src/totem-playlist.c:1264
-#: ../src/totem-sidebar.c:142
+#: ../src/totem-playlist.c:1034 ../src/totem-playlist.c:1263
+#: ../src/totem-sidebar.c:145
 msgid "Playlist"
 msgstr "Lista de reproducción"
 
-#: ../src/totem-playlist.c:1857
+#: ../src/totem-playlist.c:1862
 #, c-format
 msgid "The playlist '%s' could not be parsed. It might be damaged."
 msgstr "La lista de reproducción «%s» no se pudo analizar. Puede estar dañada."
 
-#: ../src/totem-playlist.c:1858
+#: ../src/totem-playlist.c:1863
 msgid "Playlist error"
 msgstr "Error en la lista de reproducción"
 
-#: ../src/totem-preferences.c:295
+#: ../src/totem-preferences.c:297
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../src/totem-preferences.c:451
+#: ../src/totem-preferences.c:445
 msgid "Select Subtitle Font"
 msgstr "Seleccionar la tipografía de los subtítulos"
 
-#: ../src/totem-properties-main.c:115 ../src/totem-properties-view.c:266
+#: ../src/totem-properties-main.c:116 ../src/totem-properties-view.c:269
 msgid "Audio/Video"
 msgstr "Sonido / Vídeo"
 
-#: ../src/totem-properties-view.c:128
+#: ../src/totem-properties-view.c:131
 msgid "N/A"
 msgstr "N/D"
 
-#: ../src/totem-properties-view.c:157
+#: ../src/totem-properties-view.c:160
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 msgctxt "Stream bit rate"
 msgid "N/A"
 msgstr "N/D"
 
-#: ../src/totem-properties-view.c:160
+#: ../src/totem-properties-view.c:163
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 #, c-format
 msgid "%d kbps"
 msgstr "%d Kbps"
 
-#: ../src/totem-properties-view.c:177
+#: ../src/totem-properties-view.c:180
 #: ../src/plugins/properties/totem-movie-properties.c:149
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../src/totem-properties-view.c:209
+#: ../src/totem-properties-view.c:212
 #: ../src/plugins/properties/totem-movie-properties.c:166
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: ../src/totem-properties-view.c:216
+#: ../src/totem-properties-view.c:219
 #: ../src/plugins/properties/totem-movie-properties.c:166
 msgctxt "Sample rate"
 msgid "N/A"
 msgstr "N/D"
 
-#: ../src/totem-properties-view.c:224
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5589
-msgid "Surround"
-msgstr "Envolvente"
-
-#: ../src/totem-properties-view.c:226
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5591
-msgid "Mono"
-msgstr "Mono"
-
-#: ../src/totem-properties-view.c:236
+#: ../src/totem-properties-view.c:239
 msgctxt "Number of audio channels"
 msgid "N/A"
 msgstr "N/D"
@@ -1595,8 +1581,8 @@
 #. eg: 75 %
 #: ../src/totem-statusbar.c:250
 #, c-format
-msgid "%d %%"
-msgstr "%d %%"
+msgid "%lf %%"
+msgstr "%lf %%"
 
 #. eg: Paused, 0:32 / 1:05
 #: ../src/totem-statusbar.c:325
@@ -1607,8 +1593,8 @@
 #. eg: Buffering, 75 %
 #: ../src/totem-statusbar.c:330
 #, c-format
-msgid "%s, %d %%"
-msgstr "%s, %d %%"
+msgid "%s, %f %%"
+msgstr "%s, %f %%"
 
 #: ../src/totem-subtitle-encoding.c:156
 msgid "Current Locale"
@@ -1751,228 +1737,91 @@
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
-#: ../src/totem-video-list.c:330
-msgid "No video URI"
-msgstr "No existe el URI del vídeo"
-
-#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
-#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
-#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
-#: ../src/totem-video-thumbnailer.c:872
-#, c-format
-msgid ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-msgstr ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-
-#: ../src/totem-video-thumbnailer.c:873
-msgid "Filename"
-msgstr "Nombre del archivo"
-
-#: ../src/totem-video-thumbnailer.c:875
-msgid "Resolution"
-msgstr "Resolución"
-
-#: ../src/totem-video-thumbnailer.c:878
-msgid "Duration"
-msgstr "Duración"
-
-#: ../src/totem-uri.c:506 ../src/plugins/chapters/totem-chapters.c:998
+#: ../src/totem-uri.c:343 ../src/plugins/chapters/totem-chapters.c:998
 msgid "All files"
 msgstr "Todos los archivos"
 
-#: ../src/totem-uri.c:511 ../src/plugins/chapters/totem-chapters.c:995
+#: ../src/totem-uri.c:348 ../src/plugins/chapters/totem-chapters.c:995
 msgid "Supported files"
 msgstr "Archivos soportados"
 
-#: ../src/totem-uri.c:523
+#: ../src/totem-uri.c:360
 msgid "Audio files"
 msgstr "Archivos de audio"
 
-#: ../src/totem-uri.c:531
+#: ../src/totem-uri.c:368
 msgid "Video files"
 msgstr "Archivos de vídeo"
 
-#: ../src/totem-uri.c:541
+#: ../src/totem-uri.c:378
 msgid "Subtitle files"
 msgstr "Archivos de subtítulos"
 
-#: ../src/totem-uri.c:593
+#: ../src/totem-uri.c:430
 msgid "Select Text Subtitles"
 msgstr "Seleccionar los subtítulos de texto"
 
-#: ../src/totem-uri.c:656
+#: ../src/totem-uri.c:495
 msgid "Select Movies or Playlists"
 msgstr "Seleccionar películas o listas de reproducción"
 
-#. Options parsing
-#: ../src/totem.c:201
-msgid "- Play movies and songs"
-msgstr "- Reproduzca películas y canciones"
-
-#: ../src/totem.c:212
-#, c-format
-msgid ""
-"%s\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"%s\n"
-"Ejecute «%s --help» para ver una lista completa de todas las opciones "
-"disponibles de la línea de comandos.\n"
-
-#: ../src/totem.c:254 ../src/totem.c:265
-#: ../browser-plugin/totem-plugin-viewer.c:663
-#: ../browser-plugin/totem-plugin-viewer.c:1793
-msgid "Totem Movie Player"
-msgstr "Reproductor de películas Totem"
-
-#: ../src/totem.c:255 ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Could not initialize the thread-safe libraries."
-msgstr "No se pudo inicializar el soporte de hilos seguro."
-
-#: ../src/totem.c:255
-msgid "Verify your system installation. Totem will now exit."
-msgstr "Verifique la instalación de su sistema. Totem ahora terminará."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:1589
-msgid "Password requested for RTSP server"
-msgstr "Contraseña solicitada para el servidor RTSP"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2858
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2862
-#, c-format
-msgid "Audio Track #%d"
-msgstr "Pista de sonido nº %d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2890
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2894
-#, c-format
-msgid "Subtitle #%d"
-msgstr "Subtítulo nº %d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3298
-msgid ""
-"The requested audio output was not found. Please select another audio output "
-"in the Multimedia Systems Selector."
-msgstr ""
-"No se encontró la salida de sonido solicitada. Seleccione otra salida de "
-"sonido en el «Selector de sistemas multimedia»."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3303
-msgid "Location not found."
-msgstr "No se encontró la dirección."
+#: ../src/totem-uri.c:499
+msgid "Add Directory"
+msgstr "Añadir carpeta"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3307
-msgid ""
-"Could not open location; you might not have permission to open the file."
-msgstr ""
-"No se pudo abrir la dirección; quizá no tiene permiso para abrir el archivo."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3318
-msgid ""
-"The video output is in use by another application. Please close other video "
-"applications, or select another video output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"La salida de vídeo la está usando otra aplicación. Cierre las otras "
-"aplicaciones de vídeo o seleccione otra salida de vídeo en el selector de "
-"Sistemas Multimedia."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3324
-msgid ""
-"The audio output is in use by another application. Please select another "
-"audio output in the Multimedia Systems Selector. You may want to consider "
-"using a sound server."
-msgstr ""
-"La salida de sonido la está usando otra aplicación. Seleccione otra salida "
-"de sonido en el «Selector de sistemas multimedia». Quizá deba considerar usar "
-"un servidor de sonido."
+#: ../src/totem-video-list.c:330
+msgid "No video URI"
+msgstr "No existe el URI del vídeo"
 
-#. should be exactly one missing thing (source or converter)
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3342
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3348
+#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
+#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
+#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
+#: ../src/totem-video-thumbnailer.c:841
 #, c-format
-msgid "The playback of this movie requires a %s plugin which is not installed."
-msgid_plural ""
-"The playback of this movie requires the following decoders which are not "
-"installed:\n"
-"\n"
-"%s"
-msgstr[0] ""
-"La reproducción de esta película requiere un complemento %s que no está "
-"instalado."
-msgstr[1] ""
-"La reproducción de esta película requiere los siguientes decodificadores que "
-"no están instalados:\n"
-"\n"
-"%s"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3374
 msgid ""
-"Cannot play this file over the network. Try downloading it to disk first."
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 msgstr ""
-"No se puede reproducir este archivo a través de la red. Intente descargarlo "
-"primero."
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5878
-msgid "Media contains no supported video streams."
-msgstr "El soporte no contiene ningún flujo de vídeo soportado."
+#: ../src/totem-video-thumbnailer.c:842
+msgid "Filename"
+msgstr "Nombre del archivo"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6052
-msgid ""
-"Failed to create a GStreamer play object. Please check your GStreamer "
-"installation."
-msgstr ""
-"Falló al crear el objeto de reproducción GStreamer. Compruebe su instalación "
-"de GStreamer."
+#: ../src/totem-video-thumbnailer.c:844
+msgid "Resolution"
+msgstr "Resolución"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6172
-msgid ""
-"Failed to open audio output. You may not have permission to open the sound "
-"device, or the sound server may not be running. Please select another audio "
-"output in the Multimedia Systems Selector."
-msgstr ""
-"Falló al abrir la salida de sonido. Quizá no tenga permiso para abrir el "
-"dispositivo de sonido, o el servidor de sonido quizá no esté funcionando. "
-"Seleccione otra salida de sonido en el «Selector de Sistemas Multimedia»."
+#: ../src/totem-video-thumbnailer.c:847
+msgid "Duration"
+msgstr "Duración"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6192
-msgid ""
-"Could not find the audio output. You may need to install additional "
-"GStreamer plugins, or select another audio output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"La salida de sonido solicitada no se encontró. Quizá necesite instalar "
-"complementos adicionales de GStreamer, o seleccionar otra salida de sonido "
-"en el «Selector de sistemas multimedia»."
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:1
+msgid "Apple Trailers"
+msgstr "Trailers de Apple"
+
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:2
+msgid "Sets the user agent for the Apple Trailers site"
+msgstr "Establecer el agente de usuario para la página de trailers de Apple"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:1
+msgid "Autoload Subtitles"
+msgstr "Cargar subtítulos automáticamente"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:2
+msgid "Autoloads text subtitles"
+msgstr "Carga el texto de los subtítulos automáticamente"
 
-#. hour:minutes:seconds
-#. Translators: This is a time format, like "9:05:02" for 9
-#. * hours, 5 minutes, and 2 seconds. You may change ":" to
-#. * the separator that your locale uses or use "%Id" instead
-#. * of "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:83 ../src/plugins/skipto/totem-time-entry.c:57
-#, c-format
-msgctxt "long time format"
-msgid "%d:%02d:%02d"
-msgstr "%d:%02d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
+msgid "Video Disc Recorder"
+msgstr "Grabador de discos de vídeo"
 
-#. minutes:seconds
-#. Translators: This is a time format, like "5:02" for 5
-#. * minutes and 2 seconds. You may change ":" to the
-#. * separator that your locale uses or use "%Id" instead of
-#. * "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:92
-#, c-format
-msgctxt "short time format"
-msgid "%d:%02d"
-msgstr "%d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
+msgid "Records (S)VCDs or video DVDs"
+msgstr "Grabar (S)VCD o DVD de vídeo"
 
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:65
 msgid "_Create Video Disc..."
@@ -1999,38 +1848,21 @@
 msgid "Copy the currently playing (S)VCD"
 msgstr "Copiar el vídeo (S)VCD actualmente en reproducción"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:129
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:136
 msgid "The video disc could not be duplicated."
 msgstr "No se pudo duplicar el disco de vídeo."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:131
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:276
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:138
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:283
 msgid "The movie could not be recorded."
 msgstr "No se pudo grabar la película."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:157
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:167
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:263
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:164
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:174
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:270
 msgid "Unable to write a project."
 msgstr "No se pudo escribir un proyecto."
 
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
-msgid "Video Disc Recorder"
-msgstr "Grabador de discos de vídeo"
-
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
-msgid "Records (S)VCDs or video DVDs"
-msgstr "Grabar (S)VCD o DVD de vídeo"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:1
-#: ../src/plugins/chapters/totem-chapters.c:1139
-msgid "Chapters"
-msgstr "Capítulos"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:2
-msgid "Support chapter markers in movies."
-msgstr "Soporte de marcadores de capítulos en películas."
-
 #: ../src/plugins/chapters/chapters-edit.ui.h:1
 msgid "Name for new chapter:"
 msgstr "Nombre del capítulo nuevo:"
@@ -2087,6 +1919,15 @@
 msgid "Create a new chapter list for the movie"
 msgstr "Crear una lista nueva de capítulos para la película"
 
+#: ../src/plugins/chapters/chapters.plugin.in.h:1
+#: ../src/plugins/chapters/totem-chapters.c:1139
+msgid "Chapters"
+msgstr "Capítulos"
+
+#: ../src/plugins/chapters/chapters.plugin.in.h:2
+msgid "Support chapter markers in movies"
+msgstr "Soportar marcadores de capítulos en películas"
+
 #: ../src/plugins/chapters/totem-chapters.c:56
 #, c-format
 msgid ""
@@ -2158,7 +1999,6 @@
 msgstr "Falló al analizar el archivo CMML"
 
 #: ../src/plugins/chapters/totem-edit-chapter.c:95
-#| msgid "Add Chapter..."
 msgid "Add Chapter"
 msgstr "Añadir capítulo"
 
@@ -2195,15 +2035,39 @@
 msgid "The URI ‘%s’ is not supported."
 msgstr "El URI «%s» no está soportado."
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
-msgid "Instant Messenger status"
-msgstr "Estado de la mensajería instantánea"
+#: ../src/plugins/grilo/grilo.plugin.in.h:1
+msgid "Grilo Browser"
+msgstr "Examinador Grilo"
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
-msgid "Set your Instant Messenger status to away when a movie is playing"
+#: ../src/plugins/grilo/grilo.plugin.in.h:2
+msgid "A plugin to let you browse media content from various sources"
 msgstr ""
-"Establecer el estado de su programa de mensajería instantánea a ausente "
-"cuando se está reproduciendo una película"
+"Un complemento que le permite examinar contenido multimedia desde varias "
+"fuentes"
+
+#: ../src/plugins/grilo/grilo.ui.h:1
+msgid "Add to Playlist"
+msgstr "Añadir a la lista de reproducción"
+
+#: ../src/plugins/grilo/grilo.ui.h:2
+msgid "Copy Location"
+msgstr "Copiar ubicación"
+
+#: ../src/plugins/grilo/grilo.ui.h:3 ../src/plugins/grilo/totem-grilo.c:1184
+msgid "Browse"
+msgstr "Examinar"
+
+#: ../src/plugins/grilo/grilo.ui.h:4 ../src/plugins/grilo/totem-grilo.c:1227
+msgid "Search"
+msgstr "Buscar"
+
+#: ../src/plugins/grilo/totem-grilo.c:454
+msgid "Browse Error"
+msgstr "Error al examinar"
+
+#: ../src/plugins/grilo/totem-grilo.c:609
+msgid "Search Error"
+msgstr "Error al buscar"
 
 #: ../src/plugins/gromit/gromit.plugin.in.h:1
 msgid "Gromit Annotations"
@@ -2217,6 +2081,25 @@
 msgid "The gromit binary was not found."
 msgstr "No se encontró el binario gromit."
 
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
+msgid "Instant Messenger Status"
+msgstr "Estado de la mensajería instantánea"
+
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
+msgid "Set your Instant Messenger status to away when a movie is playing"
+msgstr ""
+"Establecer el estado de su programa de mensajería instantánea a ausente "
+"cuando se está reproduciendo una película"
+
+#: ../src/plugins/iplayer/iplayer2.py:298
+msgid ""
+msgstr ""
+
+#: ../src/plugins/iplayer/iplayer2.py:299
+#, python-format
+msgid "Programme unavailable (\"%s\")"
+msgstr "La programación no está disponible («%s»)"
+
 #. Add the interface to Totem's sidebar
 #: ../src/plugins/iplayer/iplayer.plugin.in.h:1
 #: ../src/plugins/iplayer/iplayer.py:46
@@ -2224,10 +2107,10 @@
 msgstr "Reproductor iPlayer de la BBC"
 
 #: ../src/plugins/iplayer/iplayer.plugin.in.h:2
-msgid "Stream BBC programs from the last 7 days from the BBC iPlayer service."
+msgid "Stream BBC programs from the last 7 days from the BBC iPlayer service"
 msgstr ""
 "Reproducir programas de la BBC de los últimos 7 días desde el servicio "
-"iPlayer de la BBC."
+"iPlayer de la BBC"
 
 #: ../src/plugins/iplayer/iplayer.py:72
 msgid "Error listing channel categories"
@@ -2262,15 +2145,6 @@
 "Hubo un error al obtener la lista de programas para este canal y la "
 "combinación de categoría."
 
-#: ../src/plugins/iplayer/iplayer2.py:298
-msgid ""
-msgstr ""
-
-#: ../src/plugins/iplayer/iplayer2.py:299
-#, python-format
-msgid "Programme unavailable (\"%s\")"
-msgstr "La programación no está disponible («%s»)"
-
 #: ../src/plugins/lirc/lirc.plugin.in.h:1
 msgid "Infrared Remote Control"
 msgstr "Control remoto por infrarrojos"
@@ -2287,26 +2161,32 @@
 msgid "Couldn't read lirc configuration."
 msgstr "No se pudo leer la configuración de lirc."
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
-msgid "Download Movie Subtitles"
-msgstr "Descargar subtítulos para la película"
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:1
+msgid "Media Player Keys"
+msgstr "Teclas del reproductor"
+
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:2
+msgid "Support additional media player keys"
+msgstr "Soportar teclas del reproductor adicionales"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
-msgid "Subtitle _language:"
-msgstr "_Idioma de los subtítulos:"
+#: ../src/plugins/ontop/ontop.plugin.in.h:1
+msgid "Always On Top"
+msgstr "Siempre encima"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
-msgid "_Play with Subtitle"
-msgstr "_Reproducir con subtítulos"
+#: ../src/plugins/ontop/ontop.plugin.in.h:2
+msgid "Keep the main window on top when playing a movie"
+msgstr ""
+"Mantener la ventana principal encima cuando se está reproduciendo una "
+"película"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:1
 msgid "Subtitle Downloader"
 msgstr "Descargador de subtítulos"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:2
-msgid "Look for subtitles for the currently playing movie."
+msgid "Look for subtitles for the currently playing movie"
 msgstr ""
-"Buscar subtítulos para la película que se está reproduciendo actualmente."
+"Buscar subtítulos para la película que se está reproduciendo actualmente"
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:42
 msgid "Brazilian Portuguese"
@@ -2358,9 +2238,21 @@
 msgid "_Download Movie Subtitles…"
 msgstr "_Descargar subtítulos para la película…"
 
-#: ../src/plugins/opensubtitles/opensubtitles.py:589
-msgid "Searching subtitles…"
-msgstr "Buscando subtítulos…"
+#: ../src/plugins/opensubtitles/opensubtitles.py:589
+msgid "Searching subtitles…"
+msgstr "Buscando subtítulos…"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
+msgid "Download Movie Subtitles"
+msgstr "Descargar subtítulos para la película"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
+msgid "Subtitle _language:"
+msgstr "_Idioma de los subtítulos:"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
+msgid "_Play with Subtitle"
+msgstr "_Reproducir con subtítulos"
 
 #: ../src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in.h:1
 msgid "Subtitle language"
@@ -2370,84 +2262,18 @@
 msgid "The language to search for subtitles for movies in."
 msgstr "El idioma en el que buscar los subtítulos para las películas."
 
-#: ../src/plugins/ontop/ontop.plugin.in.h:1
-msgid "Always On Top"
-msgstr "Siempre encima"
-
-#: ../src/plugins/ontop/ontop.plugin.in.h:2
-msgid "Keep the main window on top when playing a movie"
-msgstr ""
-"Mantener la ventana principal encima cuando se está reproduciendo una "
-"película"
+#: ../src/plugins/properties/movie-properties.plugin.in.h:1
+msgid "Movie Properties"
+msgstr "Propiedades de la película"
+
+#: ../src/plugins/properties/movie-properties.plugin.in.h:2
+msgid "Adds movie properties to the sidebar"
+msgstr "Añade las propiedades de la película a la barra lateral"
 
 #: ../src/plugins/properties/totem-movie-properties.c:246
 msgid "Properties"
 msgstr "Propiedades"
 
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:1
-msgid "Publisher protocol to use"
-msgstr "Protocolo de publicación que usar"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:2
-msgid ""
-"The transport protocol to use when publishing playlists over the network."
-msgstr ""
-"El protocolo de transporte que usar para la publicación de listas de "
-"reproducción en red."
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:3
-msgid "Format for network service name"
-msgstr "Formato para el nombre del servicio de red"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:5
-#, no-c-format
-msgid ""
-"A format string used to build the network service name used when publishing "
-"playlists over the network. The following format placeholders can be used: • "
-"%a: the program name as returned by g_get_application_name() • %h: the "
-"machine's host name in title case • %u: the user's login name in title case "
-"• %U: the user's real name • %%: the percent sign"
-msgstr ""
-"Una cadena de formato usada para construir el nombre de servicio de red al "
-"publicar listas de reproducción en red. Se pueden usar los siguientes "
-"marcadores de posición de formato: • %a: el nombre del programa como lo "
-"devuelve g_get_application_name() • %h: el nombre del servidor caso de "
-"título • %u: el nombre de inicio de sesión en caso de título • %U: el nombre "
-"real del usuario • %%: el signo de porcentaje"
-
-#. Translators: computers on the local network which are publishing their playlists over the network
-#: ../src/plugins/publish/totem-publish.c:552
-msgid "Neighbors"
-msgstr "Vecinos"
-
-#: ../src/plugins/publish/publish.plugin.in.h:1
-msgid "Publish Playlist"
-msgstr "Publicar lista de reproducción"
-
-#: ../src/plugins/publish/publish.plugin.in.h:2
-msgid "Share the current playlist via HTTP"
-msgstr "Compartir la lista de reproducción actual a través de HTTP"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:1
-msgid "Service _Name:"
-msgstr "_Nombre del servicio:"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:3
-#, no-c-format
-msgid ""
-"The name used for announcing the playlist service on the network.\n"
-"All occurrences of the string %u will be replaced by your name,\n"
-"and %h will be replaced by your computer's host name."
-msgstr ""
-"El nombre que usar para anunciar el servicio de las listas de reproducción "
-"en la red.\n"
-"Todas las apariciones de la cadena %u se reemplazarán con su nombre,\n"
-"y %h se reemplazará con el nombre de su equipo."
-
-#: ../src/plugins/publish/publish-plugin.ui.h:6
-msgid "Use _encrypted transport protocol (HTTPS)"
-msgstr "Usar protocolo de transporte ci_frado (HTTPS)"
-
 #: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:1
 msgid "rpdb2 password"
 msgstr "Contraseña rpdb2"
@@ -2461,22 +2287,87 @@
 "remotos no autorizados. Si esta vacía, se usará el valor predeterminado "
 "«totem»."
 
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
+msgid "Python Console"
+msgstr "Consola Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
+msgid "Interactive Python console"
+msgstr "Consola Python interactiva"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:88
+msgid "Python Console Menu"
+msgstr "Menú de la consola Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:93
+msgid "_Python Console"
+msgstr "Consola _Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:94
+msgid "Show Totem's Python console"
+msgstr "Mostrar la consola Python de Totem"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:100
+msgid "Python Debugger"
+msgstr "Depurador Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:101
+msgid "Enable remote Python debugging with rpdb2"
+msgstr "Activar la depuración remota Python con rpdb2"
+
+#. pylint: disable-msg=E1101
+#: ../src/plugins/pythonconsole/pythonconsole.py:125
+#, python-format
+msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
+msgstr "Puede acceder al objeto de Totem a través de «totem_object»: \\n%s"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:129
+msgid "Totem Python Console"
+msgstr "Consola Python de Totem"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:139
+msgid ""
+"After you press OK, Totem will wait until you connect to it with winpdb or "
+"rpdb2. If you have not set a debugger password in DConf, it will use the "
+"default password ('totem')."
+msgstr ""
+"Después de que pulse Aceptar, Totem esperará a que se conecte con winpdb o "
+"rpdb2. Si no ha establecido una contraseña para el depurador en DConf, se "
+"usará la contraseña predeterminada («totem»)."
+
+#: ../src/plugins/recent/recent.plugin.in.h:1
+#| msgid "Video files"
+msgid "Recent files"
+msgstr "Archivos recientes"
+
+#: ../src/plugins/recent/recent.plugin.in.h:2
+msgid "Adds files that have been played to recent files"
+msgstr "Añadir archivos que ya se han reproducido a los archivos recientes"
+
 #: ../src/plugins/rotation/rotation.plugin.in.h:1
 msgid "Rotation Plugin"
 msgstr "Complemento de rotación"
 
 #: ../src/plugins/rotation/rotation.plugin.in.h:2
-msgid "Allows videos to be rotated if they're in the wrong orientation."
-msgstr "Permite rotar los vídeos si no tienen la orientación correcta."
+msgid "Allows videos to be rotated if they are in the wrong orientation"
+msgstr "Permite rotar los vídeos si no tienen la orientación correcta"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:60
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:50
 msgid "_Rotate Clockwise"
 msgstr "_Rotar en sentido horario"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:62
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:52
 msgid "Rotate Counterc_lockwise"
 msgstr "Rotar en sentido _antihorario"
 
+#: ../src/plugins/save-file/save-file.plugin.in.h:1
+msgid "Save Copy"
+msgstr "Guardar una copia"
+
+#: ../src/plugins/save-file/save-file.plugin.in.h:2
+msgid "Save a copy of the currently playing movie"
+msgstr "Guardar una copia de la película que se está reproduciendo actualmente"
+
 #: ../src/plugins/save-file/totem-save-file.c:63
 msgid "Save a Copy..."
 msgstr "Guardar una copia…"
@@ -2499,10 +2390,13 @@
 msgid "Movie stream"
 msgstr "Flujo de la película"
 
-#: ../src/plugins/screensaver/totem-screensaver.c:116
-#: ../browser-plugin/totem-plugin-viewer.c:1891
-msgid "Playing a movie"
-msgstr "Reproduciendo una película"
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:1
+msgid "Screen Saver"
+msgstr "Salvapantallas"
+
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:2
+msgid "Deactivates the screen saver when a movie is playing"
+msgstr "Desactiva el salvapantallas al reproducir una película"
 
 #: ../src/plugins/screenshot/gallery.ui.h:1
 msgid "Screenshot width (in pixels):"
@@ -2516,23 +2410,28 @@
 msgid "Number of screenshots:"
 msgstr "Número de capturas:"
 
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:1
-msgid "_Name:"
-msgstr "_Nombre:"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:2
-msgid "Save in _folder:"
-msgstr "_Guardar en la carpeta:"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:3
-msgid "Select a folder"
-msgstr "Seleccionar una carpeta"
-
-#. Write the screenshot to the temporary file
-#: ../src/plugins/screenshot/gnome-screenshot-widget.c:385
-#: ../src/plugins/screenshot/totem-screenshot.c:64
-msgid "Screenshot.png"
-msgstr "Pantallazo.png"
+#. translators: this is the name of the file that gets made up
+#. * with the screenshot if the entire screen is taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:147
+#, c-format
+msgid "Screenshot from %s.png"
+msgstr "Captura de pantalla de %s.png"
+
+#. translators: this is the name of the file that gets
+#. * made up with the screenshot if the entire screen is
+#. * taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:154
+#, c-format
+msgid "Screenshot from %s - %d.png"
+msgstr "Captura de pantalla de %s - %d.png"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:1
+msgid "Screenshot"
+msgstr "Captura de pantalla"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:2
+msgid "Allows screenshots and galleries to be taken of videos"
+msgstr "Permite que se hagan capturas de pantalla y galerías de los vídeos"
 
 #: ../src/plugins/screenshot/totem-gallery.c:91
 msgid "Save Gallery"
@@ -2558,49 +2457,47 @@
 msgid "Saving gallery as \"%s\""
 msgstr "Guardando galería como «%s»"
 
-#: ../src/plugins/screenshot/totem-screenshot.c:113
-msgid "There was an error saving the screenshot."
-msgstr "Ha ocurrido un error al guardar la captura de pantalla."
-
-#: ../src/plugins/screenshot/totem-screenshot.c:139
-msgid "Save Screenshot"
-msgstr "Guardar la captura"
-
-#. Create the screenshot widget
-#. Translators: %s is the movie title and %d is an auto-incrementing number to make filename unique
-#: ../src/plugins/screenshot/totem-screenshot.c:160
-#, c-format
-msgid "Screenshot-%s-%d.png"
-msgstr "Captura-%s-%d.png"
-
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:88
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:220
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "Totem could not get a screenshot of the video."
 msgstr "Totem no pudo obtener una captura de pantalla del vídeo."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "This is not supposed to happen; please file a bug report."
 msgstr "Esto no se supone que debe ocurrir; rellene un informe de errores."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
-msgid "Take _Screenshot..."
-msgstr "_Capturar pantalla…"
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
+msgid "Take _Screenshot"
+msgstr "Cap_turar pantalla"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
 msgid "Take a screenshot"
 msgstr "Capturar la pantalla"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create Screenshot _Gallery..."
 msgstr "Crear una gal_ería de capturas…"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create a gallery of screenshots"
 msgstr "Crear una galería de capturas"
 
+#: ../src/plugins/skipto/skipto.plugin.in.h:1
+#: ../src/plugins/skipto/totem-skipto.c:196
+msgid "Skip To"
+msgstr "Saltar a"
+
+#: ../src/plugins/skipto/skipto.plugin.in.h:2
+msgid "Provides the \"Skip to\" dialog"
+msgstr "Proporciona el diálogo «Saltar a»"
+
+#: ../src/plugins/skipto/skipto.ui.h:1
+msgid "_Skip to:"
+msgstr "_Saltar a:"
+
 #. Update the "seconds" label so that it always has the correct singular/plural form
 #. Translators: label for the seconds selector in the "Skip to" dialogue
-#: ../src/plugins/skipto/totem-skipto.c:160
+#: ../src/plugins/skipto/totem-skipto.c:159
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "segundo"
@@ -2610,15 +2507,11 @@
 #. Translators: you should translate this string to a number (written in digits) which corresponds to the longer character length of the
 #. * translations for "second" and "seconds", as translated elsewhere in this file. For example, in English, "second" is 6 characters long and
 #. * "seconds" is 7 characters long, so this string should be translated to "7". See: bgo#639398
-#: ../src/plugins/skipto/totem-skipto.c:190
+#: ../src/plugins/skipto/totem-skipto.c:189
 msgctxt "Skip To label length"
 msgid "7"
 msgstr "7"
 
-#: ../src/plugins/skipto/totem-skipto.c:197
-msgid "Skip To"
-msgstr "Saltar a"
-
 #: ../src/plugins/skipto/totem-skipto-plugin.c:182
 msgid "_Skip To..."
 msgstr "Sa_ltar a…"
@@ -2627,119 +2520,281 @@
 msgid "Skip to a specific time"
 msgstr "Salta a un tiempo específico"
 
-#: ../src/plugins/skipto/skipto.ui.h:1
-msgid "_Skip to:"
-msgstr "_Saltar a:"
+#~ msgid "%d %%"
+#~ msgstr "%d %%"
 
-#: ../browser-plugin/totem-plugin-viewer.c:431
-msgid "No URI to play"
-msgstr "No hay una URI para reproducir"
+#~ msgid "Location not found."
+#~ msgstr "No se encontró la dirección."
 
-#. translators: this is:
-#. * Open With ApplicationName
-#. * as in nautilus' right-click menu
-#: ../browser-plugin/totem-plugin-viewer.c:1107
-#, c-format
-msgid "_Open with \"%s\""
-msgstr "_Abrir con «%s»"
+#~ msgid ""
+#~ "Could not open location; you might not have permission to open the file."
+#~ msgstr ""
+#~ "No se pudo abrir la dirección; quizá no tiene permiso para abrir el "
+#~ "archivo."
 
-#: ../browser-plugin/totem-plugin-viewer.c:2136
-msgid "No playlist or playlist empty"
-msgstr "Ninguna lista o lista vacía"
+#~ msgid ""
+#~ "Failed to create a GStreamer play object. Please check your GStreamer "
+#~ "installation."
+#~ msgstr ""
+#~ "Falló al crear el objeto de reproducción GStreamer. Compruebe su "
+#~ "instalación de GStreamer."
 
-#: ../browser-plugin/totem-plugin-viewer.c:2235
-msgid "Movie browser plugin"
-msgstr "Complemento de examinador de películas"
+#~ msgid "_Name:"
+#~ msgstr "_Nombre:"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Verify your system installation. The Totem plugin will now exit."
-msgstr ""
-"Verifique la instalación de su sistema. EL complemento de Totem ahora "
-"terminará."
+#~ msgid "Save in _folder:"
+#~ msgstr "_Guardar en la carpeta:"
 
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
-msgid "Python Console"
-msgstr "Consola Python"
+#~ msgid "Select a folder"
+#~ msgstr "Seleccionar una carpeta"
 
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
-msgid "Interactive Python console."
-msgstr "Consola Python interactiva."
+#~ msgid "There was an error saving the screenshot."
+#~ msgstr "Ha ocurrido un error al guardar la captura de pantalla."
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:88
-msgid "Python Console Menu"
-msgstr "Menú de la consola Python"
+#~ msgid "Save Screenshot"
+#~ msgstr "Guardar la captura"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:93
-msgid "_Python Console"
-msgstr "Consola _Python"
+#~ msgid "14.4 Kbps Modem"
+#~ msgstr "Módem de 14.4 Kbps"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:94
-msgid "Show Totem's Python console"
-msgstr "Mostrar la consola Python de Totem"
+#~ msgid "19.2 Kbps Modem"
+#~ msgstr "Módem de 19.2 Kbps"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:100
-msgid "Python Debugger"
-msgstr "Depurador Python"
+#~ msgid "28.8 Kbps Modem"
+#~ msgstr "Módem de 28.8 Kbps"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:101
-msgid "Enable remote Python debugging with rpdb2"
-msgstr "Activar la depuración remota Python con rpdb2"
+#~ msgid "33.6 Kbps Modem"
+#~ msgstr "Módem de 33.6 Kbps"
 
-#. pylint: disable-msg=E1101
-#: ../src/plugins/pythonconsole/pythonconsole.py:125
-#, python-format
-msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
-msgstr "Puede acceder al objeto de Totem a través de «totem_object»: \\n%s"
+#~ msgid "34.4 Kbps Modem"
+#~ msgstr "Módem de 34.4 Kbps"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:129
-msgid "Totem Python Console"
-msgstr "Consola Python de Totem"
+#~ msgid "56 Kbps Modem/ISDN"
+#~ msgstr "Módem/RDSI 56 de Kbps"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:139
-msgid ""
-"After you press OK, Totem will wait until you connect to it with winpdb or "
-"rpdb2. If you have not set a debugger password in DConf, it will use the "
-"default password ('totem')."
-msgstr ""
-"Después de que pulse Aceptar, Totem esperará a que se conecte con winpdb o "
-"rpdb2. Si no ha establecido una contraseña para el depurador en DConf, se "
-"usará la contraseña predeterminada («totem»)."
+#~ msgid "112 Kbps Dual ISDN/DSL"
+#~ msgstr "RDSI/DSL Dual de 112 Kbps"
 
-#: ../src/plugins/grilo/grilo.plugin.in.h:1
-msgid "Grilo Browser"
-msgstr "Examinador Grilo"
+#~ msgid "256 Kbps DSL/Cable"
+#~ msgstr "DSL/Cable de 256 Kbps"
 
-#: ../src/plugins/grilo/grilo.plugin.in.h:2
-msgid "A plugin to let you browse media content from various sources."
-msgstr ""
-"Un complemento que le permite examinar contenido multimedia desde varias "
-"fuentes."
+#~ msgid "384 Kbps DSL/Cable"
+#~ msgstr "DSL/Cable de 384 Kbps"
 
-#: ../src/plugins/grilo/totem-grilo.c:452
-msgid "Browse Error"
-msgstr "Error al examinar"
+#~ msgid "512 Kbps DSL/Cable"
+#~ msgstr "DSL/Cable 512 de Kbps"
 
-#: ../src/plugins/grilo/totem-grilo.c:599
-msgid "Search Error"
-msgstr "Error al buscar"
+#~ msgid "1.5 Mbps T1/Intranet/LAN"
+#~ msgstr "T1/Intranet/LAN de 1.5 Mbps"
 
-#: ../src/plugins/grilo/totem-grilo.c:1219 ../src/plugins/grilo/grilo.ui.h:3
-msgid "Browse"
-msgstr "Examinar"
+#~ msgid "Intranet/LAN"
+#~ msgstr "Intranet/LAN"
 
-#: ../src/plugins/grilo/totem-grilo.c:1285 ../src/plugins/grilo/grilo.ui.h:4
-msgid "Search"
-msgstr "Buscar"
+#~ msgid "Networking"
+#~ msgstr "Red"
 
-#: ../src/plugins/grilo/grilo.ui.h:1
-#| msgid "_Add to Playlist"
-msgid "Add to Playlist"
-msgstr "Añadir a la lista de reproducción"
+#~ msgid "Connection _speed:"
+#~ msgstr "_Velocidad de la conexión:"
 
-#: ../src/plugins/grilo/grilo.ui.h:2
-#| msgid "_Copy Location"
-msgid "Copy Location"
-msgstr "Copiar ubicación"
+#~ msgid "Network connection speed"
+#~ msgstr "Velocidad de la conexión de la red"
+
+#~ msgid ""
+#~ "Approximate network connection speed, used to select quality on media "
+#~ "over the network."
+#~ msgstr ""
+#~ "Velocidad de conexión aproximada, usada para seleccionar la calidad del "
+#~ "medio sobre la red."
+
+#~ msgid "Play movies and songs"
+#~ msgstr "Reproduzca películas y canciones"
+
+#~ msgid "Movie Player using %s"
+#~ msgstr "Reproductor de películas que usa %s"
+
+#~ msgid "Play Image '%s'"
+#~ msgstr "Reproducir imagen «%s»"
+
+#~ msgid "Play Disc '%s'"
+#~ msgstr "Reproducir disco «%s»"
+
+#~ msgid ""
+#~ "Totem could not play this media (%s) although a plugin is present to "
+#~ "handle it."
+#~ msgstr ""
+#~ "Totem no pudo reproducir este soporte (%s) aunque hay un complemento "
+#~ "instalado que puede manipularlo."
+
+#~ msgid ""
+#~ "You might want to check that a disc is present in the drive and that it "
+#~ "is correctly configured."
+#~ msgstr ""
+#~ "Compruebe que haya un disco en la unidad y que esté correctamente "
+#~ "configurada."
+
+#~ msgid "More information about media plugins"
+#~ msgstr "Más información acerca de los complementos de soportes"
+
+#~ msgid ""
+#~ "Please install the necessary plugins and restart Totem to be able to play "
+#~ "this media."
+#~ msgstr ""
+#~ "Por favor, instale los complementos necesarios y reinicie Totem para "
+#~ "poder reproducir este soporte."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it does not have the "
+#~ "appropriate plugins to be able to read from the disc."
+#~ msgstr ""
+#~ "Totem no puede reproducir este tipo de soporte (%s) porque no tiene los "
+#~ "complementos apropiados para leer del disco."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because you do not have the "
+#~ "appropriate plugins to handle it."
+#~ msgstr ""
+#~ "Totem no puede reproducir este tipo de soporte (%s) porque no tiene los "
+#~ "complementos apropiados para manejarlo."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it is not supported."
+#~ msgstr ""
+#~ "Totem no puede reproducir este tipo de soporte (%s) porque no está "
+#~ "soportado."
+
+#~ msgid "Please insert another disc to play back."
+#~ msgstr "Introduzca otro disco para reproducir."
+
+#~ msgid "Totem was not able to play this disc."
+#~ msgstr "No no fue capaz de reproducir este disco."
+
+#~ msgid "Totem does not support playback of Audio CDs"
+#~ msgstr "Totem no soporta la reproducción de CD de sonido"
+
+#~ msgid ""
+#~ "Please consider using a music player or a CD extractor to play this CD"
+#~ msgstr ""
+#~ "Considere usar un reproductor de música o un extractor de CD para "
+#~ "reproducir este CD"
+
+#~ msgid ""
+#~ "The requested audio output was not found. Please select another audio "
+#~ "output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "No se encontró la salida de sonido solicitada. Seleccione otra salida de "
+#~ "sonido en el «Selector de sistemas multimedia»."
+
+#~ msgid ""
+#~ "The video output is in use by another application. Please close other "
+#~ "video applications, or select another video output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "La salida de vídeo la está usando otra aplicación. Cierre las otras "
+#~ "aplicaciones de vídeo o seleccione otra salida de vídeo en el selector de "
+#~ "Sistemas Multimedia."
+
+#~ msgid ""
+#~ "The audio output is in use by another application. Please select another "
+#~ "audio output in the Multimedia Systems Selector. You may want to consider "
+#~ "using a sound server."
+#~ msgstr ""
+#~ "La salida de sonido la está usando otra aplicación. Seleccione otra "
+#~ "salida de sonido en el «Selector de sistemas multimedia». Quizá deba "
+#~ "considerar usar un servidor de sonido."
+
+#~ msgid ""
+#~ "Failed to open audio output. You may not have permission to open the "
+#~ "sound device, or the sound server may not be running. Please select "
+#~ "another audio output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "Falló al abrir la salida de sonido. Quizá no tenga permiso para abrir el "
+#~ "dispositivo de sonido, o el servidor de sonido quizá no esté funcionando. "
+#~ "Seleccione otra salida de sonido en el «Selector de Sistemas Multimedia»."
+
+#~ msgid ""
+#~ "Could not find the audio output. You may need to install additional "
+#~ "GStreamer plugins, or select another audio output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "La salida de sonido solicitada no se encontró. Quizá necesite instalar "
+#~ "complementos adicionales de GStreamer, o seleccionar otra salida de "
+#~ "sonido en el «Selector de sistemas multimedia»."
+
+#~ msgid "Publisher protocol to use"
+#~ msgstr "Protocolo de publicación que usar"
+
+#~ msgid ""
+#~ "The transport protocol to use when publishing playlists over the network."
+#~ msgstr ""
+#~ "El protocolo de transporte que usar para la publicación de listas de "
+#~ "reproducción en red."
+
+#~ msgid "Format for network service name"
+#~ msgstr "Formato para el nombre del servicio de red"
+
+#~ msgid ""
+#~ "A format string used to build the network service name used when "
+#~ "publishing playlists over the network. The following format placeholders "
+#~ "can be used: • %a: the program name as returned by g_get_application_name"
+#~ "() • %h: the machine's host name in title case • %u: the user's login "
+#~ "name in title case • %U: the user's real name • %%: the percent sign"
+#~ msgstr ""
+#~ "Una cadena de formato usada para construir el nombre de servicio de red "
+#~ "al publicar listas de reproducción en red. Se pueden usar los siguientes "
+#~ "marcadores de posición de formato: • %a: el nombre del programa como lo "
+#~ "devuelve g_get_application_name() • %h: el nombre del servidor caso de "
+#~ "título • %u: el nombre de inicio de sesión en caso de título • %U: el "
+#~ "nombre real del usuario • %%: el signo de porcentaje"
+
+#~ msgid "Neighbors"
+#~ msgstr "Vecinos"
+
+#~ msgid "Publish Playlist"
+#~ msgstr "Publicar lista de reproducción"
+
+#~ msgid "Share the current playlist via HTTP"
+#~ msgstr "Compartir la lista de reproducción actual a través de HTTP"
+
+#~ msgid "Service _Name:"
+#~ msgstr "_Nombre del servicio:"
+
+#~ msgid ""
+#~ "The name used for announcing the playlist service on the network.\n"
+#~ "All occurrences of the string %u will be replaced by your name,\n"
+#~ "and %h will be replaced by your computer's host name."
+#~ msgstr ""
+#~ "El nombre que usar para anunciar el servicio de las listas de "
+#~ "reproducción en la red.\n"
+#~ "Todas las apariciones de la cadena %u se reemplazarán con su "
+#~ "nombre,\n"
+#~ "y %h se reemplazará con el nombre de su equipo."
+
+#~ msgid "Use _encrypted transport protocol (HTTPS)"
+#~ msgstr "Usar protocolo de transporte ci_frado (HTTPS)"
+
+#~ msgid "Open a file"
+#~ msgstr "Abrir un archivo"
+
+#~ msgid "Open a non-local file"
+#~ msgstr "Abrir un archivo no local"
+
+#~ msgid "Quit the program"
+#~ msgstr "Salir del programa"
+
+#~ msgid "Configure the application"
+#~ msgstr "Configurar la aplicación"
+
+#~ msgid "Switch to fullscreen"
+#~ msgstr "Cambiar a pantalla completa"
+
+#~ msgid "Set the repeat mode"
+#~ msgstr "Establecer el modo de repetición"
+
+#~ msgid "Set the shuffle mode"
+#~ msgstr "Establecer el modo aleatorio"
+
+#~ msgid "device%d"
+#~ msgstr "dispositivo%d"
 
 #~ msgid "Bemused"
 #~ msgstr "Bemused"
@@ -2769,9 +2824,6 @@
 #~ msgid "Search Results"
 #~ msgstr "Resultados de la búsqueda"
 
-#~ msgid "Videos"
-#~ msgstr "Vídeos"
-
 #~ msgid "_Open in Web Browser"
 #~ msgstr "Abrir en un navegador _web"
 
@@ -3177,9 +3229,6 @@
 #~ msgid "Plugin Error"
 #~ msgstr "Error del complemento"
 
-#~ msgid "Could not load the \"Skip to\" dialog interface."
-#~ msgstr "No se pudo cargar la interfaz de diálogo «Saltar a»."
-
 #~ msgid "Deinterlace"
 #~ msgstr "Desentrelazar"
 
@@ -3293,34 +3342,18 @@
 #~ "Verifique que el dispositivo no este ocupado."
 
 #~ msgid ""
-#~ "No video output is available. Make sure that the program is correctly "
-#~ "installed."
-#~ msgstr ""
-#~ "No hay salida de vídeo disponible. Asegúrese de que el programa está "
-#~ "instalado correctamente."
-
-#~ msgid ""
 #~ "The TV adapter could not tune into the channel. Please check your "
 #~ "hardware setup and channel configuration."
 #~ msgstr ""
 #~ "El adaptador de TV no pudo sintonizar el canal. Compruebe su "
 #~ "configuración del hardware y la configuración del canal."
 
-#~ msgid "The server you are trying to connect to is not known."
-#~ msgstr "El servidor al que está intentando conectar no es conocido."
-
 #~ msgid "The device name you specified (%s) seems to be invalid."
 #~ msgstr "El nombre de dispositivo que especificó (%s) parece ser inválido."
 
 #~ msgid "The server you are trying to connect to (%s) is unreachable."
 #~ msgstr "El servidor al que está intentando conectar (%s) es inalcanzable."
 
-#~ msgid "The connection to this server was refused."
-#~ msgstr "La conexión a este servidor fue rehusada."
-
-#~ msgid "The specified movie could not be found."
-#~ msgstr "La película especificada no se pudo encontrar."
-
 #~ msgid ""
 #~ "The source seems encrypted and can't be read. Are you trying to play an "
 #~ "encrypted DVD without libdvdcss?"
@@ -3328,9 +3361,6 @@
 #~ "La fuente parece cifrada y no puede leerse. ¿Está intentando reproducir "
 #~ "un DVD cifrado sin libdvdcss?"
 
-#~ msgid "The movie could not be read."
-#~ msgstr "La película no se pudo leer."
-
 #~ msgid "A problem occurred while loading a library or a decoder (%s)."
 #~ msgstr ""
 #~ "Ocurrió un problema durante la carga de una biblioteca o un decodificador "
@@ -3350,15 +3380,6 @@
 #~ msgid "Authentication is required to access this file."
 #~ msgstr "Se requiere autenticación para acceder a este archivo."
 
-#~ msgid "Authentication is required to access this file or stream."
-#~ msgstr "Se requiere autenticación para acceder a este archivo o flujo."
-
-#~ msgid "You are not allowed to open this file."
-#~ msgstr "No se le permite abrir este archivo."
-
-#~ msgid "The server refused access to this file or stream."
-#~ msgstr "El servidor rechazó el acceso a este archivo a flujo."
-
 #~ msgid "The file you tried to play is an empty file."
 #~ msgstr "El archivo que intentó reproducir está vacío."
 
@@ -3374,9 +3395,6 @@
 #~ msgstr ""
 #~ "Esta película está corrompida y no se puede continuar reproduciendo."
 
-#~ msgid "This location is not a valid one."
-#~ msgstr "Esta dirección no es válida."
-
 #~ msgid "This movie could not be opened."
 #~ msgstr "Esta película no pudo abrirse."
 
@@ -3388,14 +3406,6 @@
 #~ "complementos adicionales para ser capaz de reproducir algunos tipos de "
 #~ "películas"
 
-#~ msgid ""
-#~ "Audio codec '%s' is not handled. You might need to install additional "
-#~ "plugins to be able to play some types of movies"
-#~ msgstr ""
-#~ "El códec de sonido «%s» no está soportado. Quizá necesite instalar "
-#~ "complementos adicionales para ser capaz de reproducir algunos tipos de "
-#~ "películas"
-
 #~ msgid "This is an audio-only file and there is no audio output available."
 #~ msgstr ""
 #~ "Este es un archivo que sólo tiene sonido, no hay salida de vídeo "
diff -Nru totem-3.4.3/po/et.po totem-3.6.2/po/et.po
--- totem-3.4.3/po/et.po	2012-04-02 14:15:40.000000000 +0000
+++ totem-3.6.2/po/et.po	2012-10-09 15:42:00.000000000 +0000
@@ -15,148 +15,235 @@
 "Project-Id-Version: totem MASTER\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=totem&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-11-01 10:59+0000\n"
-"PO-Revision-Date: 2012-02-29 10:41+0200\n"
+"POT-Creation-Date: 2012-09-22 23:17+0000\n"
+"PO-Revision-Date: 2012-08-21 09:18+0300\n"
 "Last-Translator: Mattias Põldaru \n"
-"Language-Team: Estonian <>\n"
+"Language-Team: Estonian \n"
 "Language: et\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bits\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
+msgid "Stopped"
+msgstr "Seisatud"
+
+msgid "Paused"
+msgstr "Pausitud"
+
+msgid "Playing"
+msgstr "Esitamine"
+
+msgid "Playing a movie"
+msgstr "Filmi esitamine"
+
+msgid "No URI to play"
+msgstr "Esitamiseks puudub URI"
+
+msgid "Totem Movie Player"
+msgstr "Totem filmiesitaja"
+
+#. translators: this is:
+#. * Open With ApplicationName
+#. * as in nautilus' right-click menu
+#, c-format
+msgid "_Open with \"%s\""
+msgstr "_Ava programmiga \"%s\""
+
+msgid "An error occurred"
+msgstr "Tekkis veaolukord"
+
+msgid "No playlist or playlist empty"
+msgstr "Esitusnimekiri on puudu või tühi"
+
+msgid "Movie browser plugin"
+msgstr "Filmisirvija plugin"
+
+msgid "Could not initialize the thread-safe libraries."
+msgstr "Thread-safe teeke pole võimalik lähtestada."
+
+msgid "Verify your system installation. The Totem plugin will now exit."
+msgstr "Kontrolli oma süsteemi paigaldust. Totemi plugin lõpetab oma töö."
+
 msgid "Leave Fullscreen"
 msgstr "Välju täisekraanvaatest"
 
 msgid "Time:"
 msgstr "Aeg:"
 
-msgid "Add..."
-msgstr "Lisamine..."
+msgid "Allow the screensaver to activate when playing audio"
+msgstr "Ekraanisäästja aktiveerimise lubamine audoesituse ajal"
 
-msgid "Copy the location to the clipboard"
-msgstr "Asukoha kopeerimine lõikelauale"
+msgid ""
+"Allow the screensaver to activate when playing audio. Disable if you have "
+"monitor-powered speakers."
+msgstr ""
+"Ekraanisäästja aktiveerimise lubamine isegi siis, kui esitatakse audiot. Kui "
+"kasutatad monitori sisseehitatud kõlareid, siis on mõistlik see keelata."
 
-msgid "Move Down"
-msgstr "Liigutamine alla"
+msgid "Show visual effects when no video is displayed"
+msgstr "Visuaalefektide näitamine, kui videot ei esitata"
 
-msgid "Move Up"
-msgstr "Liigutamine üles"
+msgid "Show visual effects when playing an audio only file."
+msgstr "Visuaalefektide näitamine, kui videot ei esitata."
 
-msgid "Remove"
-msgstr "Eemalda"
+msgid "Name of the visual effects plugin"
+msgstr "Visuaalefektide plugina nimi"
 
-msgid "Remove file from playlist"
-msgstr "Esitusnimekirjast eemaldamine"
+msgid "The brightness of the video"
+msgstr "Video heledus"
 
-msgid "Save Playlist..."
-msgstr "Salvesta esitusnimekiri..."
+msgid "The contrast of the video"
+msgstr "Video kontrast"
 
-msgid "Select a file to use for text subtitles"
-msgstr "Vali subtiitrid"
+msgid "The hue of the video"
+msgstr "Video toon"
 
-msgid "_Copy Location"
-msgstr "_Kopeeri asukoht"
+msgid "The saturation of the video"
+msgstr "Video küllastatus"
 
-msgid "_Remove"
-msgstr "_Eemalda"
+msgid "Resize the canvas automatically on file load"
+msgstr "Lõuendi suuruse automaatne muutmine faili laadimisel"
 
-msgid "_Select Text Subtitles..."
-msgstr "_Vali tekstisubtiitrid..."
+msgid "Repeat mode"
+msgstr "Kordav režiim"
 
-msgid "Album:"
-msgstr "Album:"
+msgid "Shuffle mode"
+msgstr "Segatud režiim"
 
-msgid "Artist:"
-msgstr "Esitaja:"
+msgid "Whether to disable deinterlacing for interlaced movies"
+msgstr ""
+"Kas ülerealaotusega videote puhul tuleb ülerealaotus eemaldada või mitte"
 
-msgid "Audio"
-msgstr "Audio"
+msgid "Whether to enable debug for the playback engine"
+msgstr "Kas lubada silumisteabe väljastamist esitusmootori poolt"
 
-msgid "Bitrate:"
-msgstr "Bitikiirus:"
+msgid "Type of audio output to use"
+msgstr "Kasutatav heliväljund"
 
-msgid "Channels:"
-msgstr "Kanaleid:"
+msgid "Visualization quality setting"
+msgstr "Visualisee_rimise kvaliteet"
 
-msgid "Codec:"
-msgstr "Koodek:"
+msgid "Quality setting for the audio visualization."
+msgstr "Audio visualiseerimise kvaliteedisätted."
 
-msgid "Comment:"
-msgstr "Kommentaar:"
+msgid "Network buffering threshold"
+msgstr "Võrgupuhverdamise lävi"
 
-msgid "Container:"
-msgstr "Konteiner:"
+msgid ""
+"Amount of data to buffer for network streams before starting to display the "
+"stream (in seconds)."
+msgstr ""
+"Andmehulk, mida puhverdatakse enne kui võrgust tulevat striimi esitama "
+"hakatakse (sekundites)."
 
-msgid "Dimensions:"
-msgstr "Mõõtmed:"
+msgid "Subtitle font"
+msgstr "Subtiitri kirjatüüp"
 
-msgid "Duration:"
-msgstr "Kestus:"
+msgid "Pango font description for subtitle rendering."
+msgstr "Pango kirjatüübikirjeldus subtiitrite esitamiseks."
 
-msgid "Framerate:"
-msgstr "Kaadrisagedus:"
+msgid "Subtitle encoding"
+msgstr "Subtiitri kooditabel"
 
-msgid "General"
-msgstr "Üldine"
+msgid "Encoding character set for subtitle."
+msgstr "Subtriitrite kooditabel."
 
-msgid "Sample rate:"
-msgstr "Diskreetimissagedus:"
+msgid "Default location for the \"Open...\" dialogs"
+msgstr "Vaikimisi asukoht \"Ava...\" dialoogidele"
 
-msgid "Title:"
-msgstr "Pealkiri:"
+msgid ""
+"Default location for the \"Open...\" dialogs. Default is the current "
+"directory."
+msgstr ""
+"Vaikimisi asukoht \"Ava...\" dialoogidele, vaikimisi on selleks aktiivne "
+"kataloog"
 
-msgid "Video"
-msgstr "Video"
+msgid "Default location for the \"Take Screenshot\" dialogs"
+msgstr "Vaikimisi asukoht \"Võta stoppkaader\" dialoogidele"
 
-msgid "Year:"
-msgstr "Aasta:"
+msgid ""
+"Default location for the \"Take Screenshot\" dialogs. Default is the "
+"Pictures directory."
+msgstr ""
+"Vaikimisi asukoht \"Võta stoppkaader\" dialoogidele, vaikimisi on selleks "
+"piltide kataloog."
 
-msgid "Add the video to the playlist"
-msgstr "Lisa video esitusnimekirja"
+msgid "Whether to disable the plugins in the user's home directory"
+msgstr "Kas kasutaja kodukataloogis olevad pluginad on lubatud või mitte"
 
-msgid "_Add to Playlist"
-msgstr "_Lisa esitusnimekirja"
+msgid "Whether to disable the keyboard shortcuts"
+msgstr "Kas kiirklahvid on keelatud või mitte"
 
-#. Title
-msgid "Movie Player"
-msgstr "Filmiesitaja"
+msgid "Whether to autoload text subtitle files when a movie is loaded"
+msgstr ""
+"Kas subtiitrid laaditakse pärast filmi laadimist automaatselt või mitte"
 
-msgid "Play movies and songs"
-msgstr "Filmide ja muusika esitamine"
+msgid "Whether to autoload external chapter files when a movie is loaded"
+msgstr "Kas filmiga koos laaditakse automaatselt ka välised peatükifailid"
 
-msgid "1.5 Mbps T1/Intranet/LAN"
-msgstr "1.5 Mb/s T1/intranet/kohtvõrk"
+msgid ""
+"Whether to remember the position of played audio/video files when pausing or "
+"closing them"
+msgstr ""
+"Kas audio- ja videofailide viimane asukoht tuleb esitamise pausimisel või "
+"faili sulgemisel meelde jätta või mitte"
 
-msgid "112 Kbps Dual ISDN/DSL"
-msgstr "112 kb/s duaalne ISDN/DSL"
+msgid "Active plugins list"
+msgstr "Aktiivsete pluginate nimekiri"
 
-msgid "14.4 Kbps Modem"
-msgstr "14.4 kb/s modem"
+msgid ""
+"A list of the names of the plugins which are currently active (loaded and "
+"running)."
+msgstr "Hetkel aktiivsete (laaditud ja töötavate) pluginate nimekiri."
 
-msgid "16:9 (Widescreen)"
-msgstr "16:3 (laiekraan)"
+msgid "_Remove"
+msgstr "_Eemalda"
 
-msgid "19.2 Kbps Modem"
-msgstr "19.2 kb/s modem"
+msgid "Remove file from playlist"
+msgstr "Esitusnimekirjast eemaldamine"
 
-msgid "2.11:1 (DVB)"
-msgstr "2.11:1 (DVB)"
+msgid "_Copy Location"
+msgstr "_Kopeeri asukoht"
+
+msgid "Copy the location to the clipboard"
+msgstr "Asukoha kopeerimine lõikelauale"
+
+msgid "_Select Text Subtitles..."
+msgstr "_Vali tekstisubtiitrid..."
+
+msgid "Select a file to use for text subtitles"
+msgstr "Vali subtiitrid"
+
+msgid "Add..."
+msgstr "Lisamine..."
 
-msgid "256 Kbps DSL/Cable"
-msgstr "256 kb/s DSL/kaabel"
+msgid "Remove"
+msgstr "Eemalda"
 
-msgid "28.8 Kbps Modem"
-msgstr "28.8 kb/s modem"
+msgid "Save Playlist..."
+msgstr "Salvesta esitusnimekiri..."
 
-msgid "33.6 Kbps Modem"
-msgstr "33.6 kb/s modem"
+msgid "Move Up"
+msgstr "Liigutamine üles"
 
-msgid "34.4 Kbps Modem"
-msgstr "34.4 kb/s modem"
+msgid "Move Down"
+msgstr "Liigutamine alla"
+
+#. Audio visualization dimensions
+msgid "Normal"
+msgstr "Tavaline"
+
+#. Audio visualization dimensions
+msgid "Large"
+msgstr "Suur"
+
+#. Audio visualization dimensions
+msgid "Extra Large"
+msgstr "Eriti suur"
 
-msgid "384 Kbps DSL/Cable"
-msgstr "384 kb/s DSL/kaabel"
+msgid "Stereo"
+msgstr "Stereo"
 
 msgid "4-channel"
 msgstr "4 kanalit"
@@ -164,57 +251,51 @@
 msgid "4.1-channel"
 msgstr "4.1 kanalit"
 
-msgid "4:3 (TV)"
-msgstr "4:3 (TV)"
-
 msgid "5.0-channel"
 msgstr "5.0 kanalit"
 
 msgid "5.1-channel"
 msgstr "5.1 kanalit"
 
-msgid "512 Kbps DSL/Cable"
-msgstr "512 kb/s DSL/kaabel"
-
-msgid "56 Kbps Modem/ISDN"
-msgstr "56 kb/s modem/ISDN"
-
 msgid "AC3 Passthrough"
 msgstr "AC3 läbilaskerežiim"
 
-msgid "A_udio Menu"
-msgstr "_Helimenüü"
+msgid "Totem Preferences"
+msgstr "Totem'i eelistused"
 
-msgid "About this application"
-msgstr "Lähem teave selle rakenduse kohta"
+msgid "Playback"
+msgstr "Esitamine"
 
-msgctxt "Aspect ratio"
-msgid "Auto"
-msgstr "Automaatne"
+msgid "Start playing files from last position"
+msgstr "Failide esitust jätkatakse sealt, kus pooleli jäi"
 
-msgid "Audio Output"
-msgstr "Heliväljund"
+msgid "Text Subtitles"
+msgstr "Tekstilised subtiitrid"
 
-msgid "Clear the playlist"
-msgstr "Esitusnimekirja tühjendamine"
+msgid "_Load subtitle files when movie is loaded"
+msgstr "_Video avamisel laaditakse subtiitrid"
 
-msgid "Co_ntrast:"
-msgstr "Ko_ntrast:"
+msgid "_Font:"
+msgstr "_Kirjatüüp:"
 
-msgid "Color Balance"
-msgstr "Värvustasakaal"
+msgid "_Encoding:"
+msgstr "Koo_ditabel:"
 
-msgid "Configure plugins to extend the application"
-msgstr "Rakenduse laienduspluginate seadistamine"
+msgid "External Chapters"
+msgstr "Välised peatükid"
 
-msgid "Configure the application"
-msgstr "Rakenduse seadistamine"
+msgid "Load _chapter files when movie is loaded"
+msgstr "_Peatükkide failid laaditakse koos filmiga"
+
+msgid "General"
+msgstr "Üldine"
 
-msgid "Connection _speed:"
-msgstr "Ühenduse kii_rus:"
+#. Tab label in the Preferences dialogue
+msgid "Display"
+msgstr "Kuva"
 
-msgid "Decrease volume"
-msgstr "Heli vaiksemaks"
+msgid "_Resize the window when a new video is loaded"
+msgstr "_Uue video avamisel sobitatakse akna suurus"
 
 msgid "Disable _deinterlacing of interlaced videos"
 msgstr "Üle_realaotusega videotelt ülerealaotuse eemaldamine"
@@ -222,177 +303,185 @@
 msgid "Disable screensaver when playing "
 msgstr "Ekraanisäästja keelamine esituse ajaks"
 
-#. Tab label in the Preferences dialogue
-msgid "Display"
-msgstr "Kuva"
+msgid "Video"
+msgstr "Video"
 
-msgid "Eject the current disc"
-msgstr "Praeguse plaadi väljastamine"
+msgid "Video or Audio"
+msgstr "Video või audio"
 
-msgid "External Chapters"
-msgstr "Välised peatükid"
+msgid "Visual Effects"
+msgstr "Visuaalefektid"
 
-#. Audio visualization dimensions
-msgid "Extra Large"
-msgstr "Eriti suur"
+msgid "Show _visual effects when an audio file is played"
+msgstr "_Visuaalefektide näitamine audiofailide esitamise ajal"
 
-msgid "Fit Window to Movie"
-msgstr "Sobita aken filmi järgi"
+msgid "_Type of visualization:"
+msgstr "Visualiseerimise l_iik:"
 
-msgid "Go to the DVD menu"
-msgstr "Liigu DVD menüüsse"
+msgid "Visualization _size:"
+msgstr "Visualisee_rimise suurus:"
 
-msgid "Go to the angle menu"
-msgstr "Nurgamenüü avamine"
+msgid "Color Balance"
+msgstr "Värvustasakaal"
 
-msgid "Go to the audio menu"
-msgstr "Liigu audio menüüsse"
+msgid "_Brightness:"
+msgstr "_Heledus:"
 
-msgid "Go to the chapter menu"
-msgstr "Peatükimenüü avamine"
+msgid "Co_ntrast:"
+msgstr "Ko_ntrast:"
 
-msgid "Go to the title menu"
-msgstr "Pealkirjamenüü avamine"
+msgid "Sat_uration:"
+msgstr "_Küllastus:"
 
-msgid "Help contents"
-msgstr "Abiteabe sisukord"
+msgid "_Hue:"
+msgstr "_Toon:"
 
-msgid "Increase volume"
-msgstr "Heli valjemaks"
+msgid "Reset to _Defaults"
+msgstr "_Lähtesta"
 
-msgid "Intranet/LAN"
-msgstr "Intranet/kohtvõrk"
+msgid "Audio Output"
+msgstr "Heliväljund"
 
-#. Audio visualization dimensions
-msgid "Large"
-msgstr "Suur"
+msgid "_Audio output type:"
+msgstr "_Heliväljundi liik:"
 
-msgid "Load _chapter files when movie is loaded"
-msgstr "_Peatükkide failid laaditakse koos filmiga"
+msgid "Audio"
+msgstr "Audio"
 
-msgid "Networking"
-msgstr "Võrk"
+msgid "Title:"
+msgstr "Pealkiri:"
 
-msgid "Next chapter or movie"
-msgstr "Järgmisele filmilõigule või filmile lülitumine"
+msgid "Artist:"
+msgstr "Esitaja:"
 
-#. Audio visualization dimensions
-msgid "Normal"
-msgstr "Tavaline"
+msgid "Duration:"
+msgstr "Kestus:"
 
-msgid "Open _Location..."
-msgstr "Ava a_sukoht..."
+msgid "Year:"
+msgstr "Aasta:"
+
+msgid "Album:"
+msgstr "Album:"
 
-msgid "Open a file"
-msgstr "Faili avamine"
+msgid "Comment:"
+msgstr "Kommentaar:"
+
+msgid "Container:"
+msgstr "Konteiner:"
+
+msgid "Dimensions:"
+msgstr "Mõõtmed:"
 
-msgid "Open a non-local file"
-msgstr "Faili avamine võrgust"
+msgid "Codec:"
+msgstr "Koodek:"
 
-msgid "Play / P_ause"
-msgstr "Esita / p_ausi"
+msgid "Framerate:"
+msgstr "Kaadrisagedus:"
 
-msgid "Play or pause the movie"
-msgstr "Filmi esitamine või esitamisse pausi tegemine"
+msgid "Bitrate:"
+msgstr "Bitikiirus:"
 
-msgid "Playback"
-msgstr "Esitamine"
+msgid "Sample rate:"
+msgstr "Diskreetimissagedus:"
 
-msgid "Plugins..."
-msgstr "Pluginad..."
+msgid "Channels:"
+msgstr "Kanaleid:"
 
-msgid "Prefere_nces"
-msgstr "_Eelistused"
+#. Title
+msgid "Videos"
+msgstr "Videod"
 
-msgid "Previous chapter or movie"
-msgstr "Eelmisele filmilõigule või filmile lülitumine"
+msgid "Play movies"
+msgstr "Filmide esitamine"
 
-msgid "Quit the program"
-msgstr "Programmi töö lõpetamine"
+msgid "Video;Movie;Film;Clip;Series;Player;DVD;TV;Disc;"
+msgstr ""
+"Video;Film;Klipp;Kaader;Seeriad;Seebikad;Seebiooperid;Esitaja;Mängija;Pleier;"
+"DVD;TV;Plaat;"
 
-msgid "Reset to _Defaults"
-msgstr "_Lähtesta"
+msgid "_Open"
+msgstr "_Ava"
 
-msgid "Resize _1:1"
-msgstr "Suurus _1:1"
+msgid "Open _Location"
+msgstr "Ava a_sukoht"
 
-msgid "Resize _2:1"
-msgstr "Suurus _2:1"
+msgid "_Fullscreen"
+msgstr "_Täisekraanvaade"
 
-msgid "Resize to double the original video size"
-msgstr "Suurenda topeltsuurusele originaalsuurusest"
+msgid "Prefere_nces"
+msgstr "_Eelistused"
 
-msgid "Resize to half the original video size"
-msgstr "Suurenda poole suuruseni originaalsuurusest"
+msgid "Shuff_le"
+msgstr "_Segatud režiim"
 
-msgid "Resize to the original video size"
-msgstr "Taasta video originaalsuurus"
+msgid "_Repeat"
+msgstr "_Kordav režiim"
 
-msgid "S_idebar"
-msgstr "_Külgriba"
+msgid "_Quit"
+msgstr "_Lõpeta"
 
-msgid "S_ubtitles"
-msgstr "S_ubtiitrid"
+msgid "_Movie"
+msgstr "_Film"
 
-msgid "Sat_uration:"
-msgstr "_Küllastus:"
+msgid "_Eject"
+msgstr "_Väljasta"
 
-msgid "Set the repeat mode"
-msgstr "Esitusnimekirja kordava režiimi määramine"
+msgid "Eject the current disc"
+msgstr "Praeguse plaadi väljastamine"
 
-msgid "Set the shuffle mode"
-msgstr "Esitusjärjekorra juhusliku valiku määramine"
+msgid "_Properties"
+msgstr "_Omadused"
 
-msgid "Sets 16:9 (widescreen) aspect ratio"
-msgstr "16:9 (laiekraan) kuvasuhte määramine"
+msgid "View the properties of the current stream"
+msgstr "Praeguse andmevoo omaduste vaatamine"
 
-msgid "Sets 2.11:1 (DVB) aspect ratio"
-msgstr "2.11:1 (DVB) kuvasuhte määramine"
+msgid "Play / P_ause"
+msgstr "Esita / p_ausi"
 
-msgid "Sets 4:3 (TV) aspect ratio"
-msgstr "4:3 (TV) kuvasuhte määramine"
+msgid "Play or pause the movie"
+msgstr "Filmi esitamine või esitamisse pausi tegemine"
 
-msgid "Sets automatic aspect ratio"
-msgstr "Automaatse kuvasuhte määramine"
+msgid "_Edit"
+msgstr "_Redaktor"
 
-msgid "Sets square aspect ratio"
-msgstr "Ruudukujulise kuvasuhte määramine"
+msgid "_Clear Playlist"
+msgstr "_Tühjenda esitusnimekiri"
 
-msgid "Show _Controls"
-msgstr "Näita _juhtnuppe"
+msgid "Clear the playlist"
+msgstr "Esitusnimekirja tühjendamine"
 
-msgid "Show _visual effects when an audio file is played"
-msgstr "_Visuaalefektide näitamine audiofailide esitamise ajal"
+msgid "Plugins..."
+msgstr "Pluginad..."
 
-msgid "Show controls"
-msgstr "Juhtnuppude näitamine"
+msgid "Configure plugins to extend the application"
+msgstr "Rakenduse laienduspluginate seadistamine"
 
-msgid "Show or hide the sidebar"
-msgstr "Külgriba näitamine või peitmine"
+msgid "_View"
+msgstr "_Vaade"
 
-msgid "Shuff_le Mode"
-msgstr "_Segatud režiim"
+msgid "Fit Window to Movie"
+msgstr "Sobita aken filmi järgi"
 
-msgid "Skip _Backwards"
-msgstr "Keri _tagasi"
+msgid "_Resize 1:2"
+msgstr "_Suurus 1:2"
 
-msgid "Skip _Forward"
-msgstr "Keri _edasi"
+msgid "Resize to half the original video size"
+msgstr "Suurenda poole suuruseni originaalsuurusest"
 
-msgid "Skip backwards"
-msgstr "Tagasikerimine"
+msgid "Resize _1:1"
+msgstr "Suurus _1:1"
 
-msgid "Skip forward"
-msgstr "Edasikerimine"
+msgid "Resize to the original video size"
+msgstr "Taasta video originaalsuurus"
 
-msgid "Square"
-msgstr "Ruut"
+msgid "Resize _2:1"
+msgstr "Suurus _2:1"
 
-msgid "Start playing files from last position"
-msgstr "Failide esitust jätkatakse sealt, kus pooleli jäi"
+msgid "Resize to double the original video size"
+msgstr "Suurenda topeltsuurusele originaalsuurusest"
 
-msgid "Stereo"
-msgstr "Stereo"
+msgid "_Aspect Ratio"
+msgstr "_Kuvasuhe"
 
 msgid "Switch An_gles"
 msgstr "Muuda _vaatenurka"
@@ -400,276 +489,239 @@
 msgid "Switch camera angles"
 msgstr "Vaatenurkade muutmine"
 
-msgid "Switch to fullscreen"
-msgstr "Lülitumine täisekraanvaatesse"
-
-msgid "Text Subtitles"
-msgstr "Tekstilised subtiitrid"
-
-msgid "Time seek bar"
-msgstr "Kerimisriba"
-
-msgid "Totem Preferences"
-msgstr "Totem'i eelistused"
-
-msgid "Video or Audio"
-msgstr "Video või audio"
-
-msgid "View the properties of the current stream"
-msgstr "Praeguse andmevoo omaduste vaatamine"
-
-msgid "Visual Effects"
-msgstr "Visuaalefektid"
+msgid "_Go"
+msgstr "_Liikumine"
 
-msgid "Visualization _size:"
-msgstr "Visualisee_rimise suurus:"
+msgid "_DVD Menu"
+msgstr "_DVD menüü"
 
-msgid "Volume _Down"
-msgstr "Heli _vaiksemaks"
+msgid "Go to the DVD menu"
+msgstr "Liigu DVD menüüsse"
 
-msgid "Volume _Up"
-msgstr "Heli va_ljemaks"
+msgid "_Title Menu"
+msgstr "_Pealkirjamenüü"
 
-msgid "Zoom In"
-msgstr "Suurenda"
+msgid "Go to the title menu"
+msgstr "Pealkirjamenüü avamine"
 
-msgid "Zoom in"
-msgstr "Suurendamine"
+msgid "A_udio Menu"
+msgstr "_Helimenüü"
 
-msgid "_About"
-msgstr "_Programmist"
+msgid "Go to the audio menu"
+msgstr "Liigu audio menüüsse"
 
 msgid "_Angle Menu"
 msgstr "_Nurgamenüü"
 
-msgid "_Aspect Ratio"
-msgstr "_Kuvasuhe"
-
-msgid "_Audio output type:"
-msgstr "_Heliväljundi liik:"
-
-msgid "_Brightness:"
-msgstr "_Heledus:"
+msgid "Go to the angle menu"
+msgstr "Nurgamenüü avamine"
 
 msgid "_Chapter Menu"
 msgstr "_Peatükimenüü"
 
-msgid "_Clear Playlist"
-msgstr "_Tühjenda esitusnimekiri"
+msgid "Go to the chapter menu"
+msgstr "Peatükimenüü avamine"
 
-msgid "_Contents"
-msgstr "_Sisukord"
+msgid "_Next Chapter/Movie"
+msgstr "_Järgmine lõik/film"
 
-msgid "_DVD Menu"
-msgstr "_DVD menüü"
+msgid "Next chapter or movie"
+msgstr "Järgmisele filmilõigule või filmile lülitumine"
 
-msgid "_Edit"
-msgstr "_Redaktor"
+msgid "_Previous Chapter/Movie"
+msgstr "_Eelmine lõik/film"
 
-msgid "_Eject"
-msgstr "_Väljasta"
+msgid "Previous chapter or movie"
+msgstr "Eelmisele filmilõigule või filmile lülitumine"
 
-msgid "_Encoding:"
-msgstr "Koo_ditabel:"
+msgid "_Sound"
+msgstr "_Heli"
 
-msgid "_Font:"
-msgstr "_Kirjatüüp:"
+msgid "Volume _Up"
+msgstr "Heli va_ljemaks"
 
-msgid "_Fullscreen"
-msgstr "_Täisekraanvaade"
+msgid "Increase volume"
+msgstr "Heli valjemaks"
 
-msgid "_Go"
-msgstr "_Liikumine"
+msgid "Volume _Down"
+msgstr "Heli _vaiksemaks"
+
+msgid "Decrease volume"
+msgstr "Heli vaiksemaks"
 
 msgid "_Help"
 msgstr "A_bi"
 
-msgid "_Hue:"
-msgstr "_Toon:"
-
-msgid "_Languages"
-msgstr "_Keeled"
-
-msgid "_Load subtitle files when movie is loaded"
-msgstr "_Video avamisel laaditakse subtiitrid"
-
-msgid "_Movie"
-msgstr "_Film"
-
-msgid "_Next Chapter/Movie"
-msgstr "_Järgmine lõik/film"
+msgid "_Contents"
+msgstr "_Sisukord"
 
-msgid "_Open..."
-msgstr "_Ava..."
+msgid "Help contents"
+msgstr "Abiteabe sisukord"
 
-msgid "_Previous Chapter/Movie"
-msgstr "_Eelmine lõik/film"
+msgid "_About"
+msgstr "_Programmist"
 
-msgid "_Properties"
-msgstr "_Omadused"
+msgid "About this application"
+msgstr "Lähem teave selle rakenduse kohta"
 
-msgid "_Quit"
-msgstr "_Lõpeta"
+msgid "Show _Controls"
+msgstr "Näita _juhtnuppe"
 
-msgid "_Repeat Mode"
-msgstr "_Kordav režiim"
+msgid "Show controls"
+msgstr "Juhtnuppude näitamine"
 
-msgid "_Resize 1:2"
-msgstr "_Suurus 1:2"
+msgid "S_idebar"
+msgstr "_Külgriba"
 
-msgid "_Resize the window when a new video is loaded"
-msgstr "_Uue video avamisel sobitatakse akna suurus"
+msgid "Show or hide the sidebar"
+msgstr "Külgriba näitamine või peitmine"
 
-msgid "_Sound"
-msgstr "_Heli"
+msgctxt "Aspect ratio"
+msgid "Auto"
+msgstr "Automaatne"
 
-msgid "_Title Menu"
-msgstr "_Pealkirjamenüü"
+msgid "Sets automatic aspect ratio"
+msgstr "Automaatse kuvasuhte määramine"
 
-msgid "_Type of visualization:"
-msgstr "Visualiseerimise l_iik:"
+msgid "Square"
+msgstr "Ruut"
 
-msgid "_View"
-msgstr "_Vaade"
+msgid "Sets square aspect ratio"
+msgstr "Ruudukujulise kuvasuhte määramine"
 
-msgid ""
-"A list of the names of the plugins which are currently active (loaded and "
-"running)."
-msgstr "Hetkel aktiivsete (laaditud ja töötavate) pluginate nimekiri."
+msgid "4:3 (TV)"
+msgstr "4:3 (TV)"
 
-msgid "Active plugins list"
-msgstr "Aktiivsete pluginate nimekiri"
+msgid "Sets 4:3 (TV) aspect ratio"
+msgstr "4:3 (TV) kuvasuhte määramine"
 
-msgid "Allow the screensaver to activate when playing audio"
-msgstr "Ekraanisäästja aktiveerimise lubamine audoesituse ajal"
+msgid "16:9 (Widescreen)"
+msgstr "16:3 (laiekraan)"
 
-msgid ""
-"Allow the screensaver to activate when playing audio. Disable if you have "
-"monitor-powered speakers."
-msgstr ""
-"Ekraanisäästja aktiveerimise lubamine isegi siis, kui esitatakse audiot. Kui "
-"kasutatad monitori sisseehitatud kõlareid, siis on mõistlik see keelata."
+msgid "Sets 16:9 (widescreen) aspect ratio"
+msgstr "16:9 (laiekraan) kuvasuhte määramine"
 
-msgid ""
-"Amount of data to buffer for network streams before starting to display the "
-"stream (in seconds)."
-msgstr ""
-"Andmehulk, mida puhverdatakse enne kui võrgust tulevat striimi esitama "
-"hakatakse (sekundites)."
+msgid "2.11:1 (DVB)"
+msgstr "2.11:1 (DVB)"
 
-msgid ""
-"Approximate network connection speed, used to select quality on media over "
-"the network."
-msgstr ""
-"Võrgust esitatava meedia kvaliteedi valimisel kasutatav võrguühenduse "
-"ligikaudne kiirus."
+msgid "Sets 2.11:1 (DVB) aspect ratio"
+msgstr "2.11:1 (DVB) kuvasuhte määramine"
 
-msgid "Default location for the \"Open...\" dialogs"
-msgstr "Vaikimisi asukoht \"Ava...\" dialoogidele"
+msgid "S_ubtitles"
+msgstr "S_ubtiitrid"
 
-msgid ""
-"Default location for the \"Open...\" dialogs. Default is the current "
-"directory."
-msgstr ""
-"Vaikimisi asukoht \"Ava...\" dialoogidele, vaikimisi on selleks aktiivne "
-"kataloog"
+msgid "_Languages"
+msgstr "_Keeled"
 
-msgid "Default location for the \"Take Screenshot\" dialogs"
-msgstr "Vaikimisi asukoht \"Võta stoppkaader\" dialoogidele"
+msgid "Zoom In"
+msgstr "Suurenda"
 
-msgid ""
-"Default location for the \"Take Screenshot\" dialogs. Default is the "
-"Pictures directory."
-msgstr ""
-"Vaikimisi asukoht \"Võta stoppkaader\" dialoogidele, vaikimisi on selleks "
-"piltide kataloog."
+msgid "Zoom in"
+msgstr "Suurendamine"
 
-msgid "Encoding character set for subtitle."
-msgstr "Subtriitrite kooditabel."
+msgid "Skip _Forward"
+msgstr "Keri _edasi"
 
-msgid "Name of the visual effects plugin"
-msgstr "Visuaalefektide plugina nimi"
+msgid "Skip forward"
+msgstr "Edasikerimine"
 
-msgid "Network buffering threshold"
-msgstr "Võrgupuhverdamise lävi"
+msgid "Skip _Backwards"
+msgstr "Keri _tagasi"
 
-msgid "Network connection speed"
-msgstr "Võrguühenduse kiirus"
+msgid "Skip backwards"
+msgstr "Tagasikerimine"
 
-msgid "Pango font description for subtitle rendering."
-msgstr "Pango kirjatüübikirjeldus subtiitrite esitamiseks."
+msgid "Time seek bar"
+msgstr "Kerimisriba"
 
-msgid "Quality setting for the audio visualization."
-msgstr "Audio visualiseerimise kvaliteedisätted."
+msgid "Enter the _address of the file you would like to open:"
+msgstr "Sisesta faili _aadress, mida sa soovid avada:"
 
-msgid "Repeat mode"
-msgstr "Kordav režiim"
+msgid "_Add to Playlist"
+msgstr "_Lisa esitusnimekirja"
 
-msgid "Resize the canvas automatically on file load"
-msgstr "Lõuendi suuruse automaatne muutmine faili laadimisel"
+msgid "Add the video to the playlist"
+msgstr "Lisa video esitusnimekirja"
 
-msgid "Show visual effects when no video is displayed"
-msgstr "Visuaalefektide näitamine, kui videot ei esitata"
+msgid "Password requested for RTSP server"
+msgstr "RTSP-serveri jaoks nõutav parool"
 
-msgid "Show visual effects when playing an audio only file."
-msgstr "Visuaalefektide näitamine, kui videot ei esitata."
+#, c-format
+msgid "Audio Track #%d"
+msgstr "Audiorada nr. %d"
 
-msgid "Shuffle mode"
-msgstr "Segatud režiim"
+#, c-format
+msgid "Subtitle #%d"
+msgstr "Subtiiter nr. %d"
 
-msgid "Subtitle encoding"
-msgstr "Subtiitri kooditabel"
+msgid "The server you are trying to connect to is not known."
+msgstr "Server, millega üritad ühenduda, on tundmatu."
 
-msgid "Subtitle font"
-msgstr "Subtiitri kirjatüüp"
+msgid "The connection to this server was refused."
+msgstr "See server keeldus ühendusest."
 
-msgid "The brightness of the video"
-msgstr "Video heledus"
+msgid "The specified movie could not be found."
+msgstr "Antud filmi ei leitud."
 
-msgid "The contrast of the video"
-msgstr "Video kontrast"
+msgid "The server refused access to this file or stream."
+msgstr "Server keeldus ligipääsust failile või voole."
 
-msgid "The hue of the video"
-msgstr "Video toon"
+msgid "Authentication is required to access this file or stream."
+msgstr "Ligipääsuks sellele failile või voole on vajalik autentimine."
 
-msgid "The saturation of the video"
-msgstr "Video küllastatus"
+msgid "You are not allowed to open this file."
+msgstr "Sul puuduvad õigused selle faili avamiseks."
 
-msgid "Type of audio output to use"
-msgstr "Kasutatav heliväljund"
+msgid "This location is not a valid one."
+msgstr "Asukoht pole korrektne."
 
-msgid "Visualization quality setting"
-msgstr "Visualisee_rimise kvaliteet"
+msgid "The movie could not be read."
+msgstr "Filmi pole võimalik lugeda."
 
-msgid "Whether to autoload external chapter files when a movie is loaded"
-msgstr "Kas filmiga koos laaditakse automaatselt ka välised peatükifailid"
+#. should be exactly one missing thing (source or converter)
+#, c-format
+msgid "The playback of this movie requires a %s plugin which is not installed."
+msgid_plural ""
+"The playback of this movie requires the following decoders which are not "
+"installed:\n"
+"\n"
+"%s"
+msgstr[0] "Selle filmi esitamiseks on vaja %s pluginat, mis pole paigaldatud."
+msgstr[1] ""
+"Selle filmi esitamiseks on vaja järgnevaid dekoodereid, mis pole "
+"paigaldatud:\n"
+"\n"
+"%s"
 
-msgid "Whether to autoload text subtitle files when a movie is loaded"
+msgid ""
+"An audio or video stream is not handled due to missing codecs. You might "
+"need to install additional plugins to be able to play some types of movies"
 msgstr ""
-"Kas subtiitrid laaditakse pärast filmi laadimist automaatselt või mitte"
+"Audio- või videovoogu pole võimalik puuduva koodeki tõttu kasutada. Mõnede "
+"eriliiki videote mängimiseks võib olla vajalik lisapluginate paigaldamine."
 
-msgid "Whether to disable deinterlacing for interlaced movies"
+msgid ""
+"This file cannot be played over the network. Try downloading it locally "
+"first."
 msgstr ""
-"Kas ülerealaotusega videote puhul tuleb ülerealaotus eemaldada või mitte"
+"Seda faili pole võimalik otse võrgust mängida. Proovi see kõigepealt "
+"allalaadida."
 
-msgid "Whether to disable the keyboard shortcuts"
-msgstr "Kas kiirklahvid on keelatud või mitte"
+msgid "Surround"
+msgstr "Surround"
 
-msgid "Whether to disable the plugins in the user's home directory"
-msgstr "Kas kasutaja kodukataloogis olevad pluginad on lubatud või mitte"
+msgid "Mono"
+msgstr "Mono"
 
-msgid "Whether to enable debug for the playback engine"
-msgstr "Kas lubada silumisteabe väljastamist esitusmootori poolt"
+msgid "Media contains no supported video streams."
+msgstr "Meedia ei sisalda ühtegi toetatud videostriimi."
 
 msgid ""
-"Whether to remember the position of played audio/video files when pausing or "
-"closing them"
+"Some necessary plug-ins are missing. Make sure that the program is correctly "
+"installed."
 msgstr ""
-"Kas audio- ja videofailide viimane asukoht tuleb esitamise pausimisel või "
-"faili sulgemisel meelde jätta või mitte"
-
-msgid "Enter the _address of the file you would like to open:"
-msgstr "Sisesta faili _aadress, mida sa soovid avada:"
+"Mõned vajalikud pluginad on puudu. Veendu, et see rakendus on korrektselt "
+"paigaldatud."
 
 #, c-format
 msgid "File is not a valid .desktop file"
@@ -754,6 +806,28 @@
 msgid "Show session management options"
 msgstr "Seansihalduse valikute näitamine"
 
+#. hour:minutes:seconds
+#. Translators: This is a time format, like "9:05:02" for 9
+#. * hours, 5 minutes, and 2 seconds. You may change ":" to
+#. * the separator that your locale uses or use "%Id" instead
+#. * of "%d" if your locale uses localized digits.
+#.
+#, c-format
+msgctxt "long time format"
+msgid "%d:%02d:%02d"
+msgstr "%d:%02d:%02d"
+
+#. minutes:seconds
+#. Translators: This is a time format, like "5:02" for 5
+#. * minutes and 2 seconds. You may change ":" to the
+#. * separator that your locale uses or use "%Id" instead of
+#. * "%d" if your locale uses localized digits.
+#.
+#, c-format
+msgctxt "short time format"
+msgid "%d:%02d"
+msgstr "%d:%02d"
+
 #. Title
 #. Artist
 #. Album
@@ -840,6 +914,9 @@
 msgid "Audio Preview"
 msgstr "Audio eelvaatlemine"
 
+msgid "Verify your system installation. Totem will now exit."
+msgstr "Kontrolli oma süsteemi paigaldust. Totem lõpetab oma töö."
+
 msgid "Unknown video"
 msgstr "Tundmatu video"
 
@@ -909,27 +986,6 @@
 msgid "Auto"
 msgstr "Automaatne"
 
-#. Translators:
-#. * This is not a JPEG image, but a disc image, for example,
-#. * an ISO file
-#, c-format
-msgid "Play Image '%s'"
-msgstr "Näita pilti '%s'"
-
-#, c-format
-msgid "device%d"
-msgstr "seade%d"
-
-#, c-format
-msgid "Play Disc '%s'"
-msgstr "Esita plaati '%s'"
-
-#. This lists the back-end type and version, such as
-#. * Movie Player using GStreamer 0.10.1
-#, c-format
-msgid "Movie Player using %s"
-msgstr "Filmiesitaja (%s)"
-
 msgid "Copyright © 2002-2009 Bastien Nocera"
 msgstr "Autoriõigused © 2002-2009 Bastien Nocera"
 
@@ -946,92 +1002,28 @@
 msgid "Configure Plugins"
 msgstr "Pluginate seadistamine"
 
-#. Translators: %s is the totem version number
-#, c-format
-msgid "Totem %s"
-msgstr "Totem %s"
-
-msgid "Playing"
-msgstr "Esitamine"
-
-msgid "Pause"
-msgstr "Pausitud"
-
-msgid "Paused"
-msgstr "Pausitud"
-
-msgid "Play"
-msgstr "Esitamine"
-
-msgid "Stopped"
-msgstr "Seisatud"
-
-#, c-format
-msgid "Totem could not play '%s'."
-msgstr "Totemil pole võimalik esitada '%s'."
-
-#, c-format
-msgid ""
-"Totem could not play this media (%s) although a plugin is present to handle "
-"it."
-msgstr ""
-"Totem pole võimeline seda meedialiiki (%s) esitama, kuigi selle "
-"käsitlemiseks on plugin olemas."
-
-msgid ""
-"You might want to check that a disc is present in the drive and that it is "
-"correctly configured."
-msgstr ""
-"Sa võiksid kontrollida, kas plaat on seadmes ja kas seade on korralikult "
-"seadistatud."
-
-msgid "More information about media plugins"
-msgstr "Lähem teave meediapluginate kohta"
-
-msgid ""
-"Please install the necessary plugins and restart Totem to be able to play "
-"this media."
-msgstr ""
-"Selle meedia esitamiseks on vaja paigaldada tarvilikud pluginad ja "
-"taaskäivitada Totem."
-
 #, c-format
 msgid ""
-"Totem cannot play this type of media (%s) because it does not have the "
-"appropriate plugins to be able to read from the disc."
-msgstr ""
-"Totem pole võimeline seda meedialiiki (%s) esitama, kuna plaadilt lugemiseks "
-"pole sobivaid pluginaid."
-
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because you do not have the "
-"appropriate plugins to handle it."
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
-"Totem pole võimeline seda meedialiiki (%s) esitama, kuna selle käsitlemiseks "
-"pole sobivaid pluginaid."
+"%s\n"
+"Kõigi saadaolevate käsureavõtmete vaatamiseks käivita '%s --help'.\n"
 
+#. Translators: %s is the totem version number
 #, c-format
-msgid "Totem cannot play this type of media (%s) because it is not supported."
-msgstr ""
-"Totem pole võimeline seda meedialiiki (%s) esitama, kuna see pole toetatud."
-
-msgid "Please insert another disc to play back."
-msgstr "Palun sisesta edasise esituse jaoks järgmine plaat."
-
-msgid "Totem was not able to play this disc."
-msgstr "Totem ei suutnud seda plaati mängida."
+msgid "Totem %s"
+msgstr "Totem %s"
 
-msgid "No reason."
-msgstr "Põhjendus puudub."
+msgid "Pause"
+msgstr "Pausitud"
 
-msgid "Totem does not support playback of Audio CDs"
-msgstr "Totem ei toeta audioplaatide esitamist"
+msgid "Play"
+msgstr "Esitamine"
 
-msgid "Please consider using a music player or a CD extractor to play this CD"
-msgstr ""
-"Selle plaadi esitamiseks oleks sobilik kasutada muusikaesitajat või CD-"
-"rippijat"
+#, c-format
+msgid "Totem could not play '%s'."
+msgstr "Totemil pole võimalik esitada '%s'."
 
 msgid "No error message"
 msgstr "Veateadet pole"
@@ -1039,9 +1031,6 @@
 msgid "Totem could not display the help contents."
 msgstr "Totemil pole võimalik abiteabe sisu näidata."
 
-msgid "An error occurred"
-msgstr "Tekkis veaolukord"
-
 msgid "Previous Chapter/Movie"
 msgstr "Eelmine lõik/film"
 
@@ -1051,7 +1040,6 @@
 msgid "Next Chapter/Movie"
 msgstr "Järgmine lõik/film"
 
-#. Translators: this is the tooltip text for the fullscreen button in the controls box in Totem's main window.
 #. Translators: this is the accessibility text for the fullscreen button in the controls box in Totem's main window.
 msgid "Fullscreen"
 msgstr "Täisekraanvaade"
@@ -1059,6 +1047,9 @@
 msgid "Totem could not startup."
 msgstr "Totemil pole võimalik käivituda."
 
+msgid "No reason."
+msgstr "Põhjendus puudub."
+
 msgid "Open Location..."
 msgstr "Asukoha avamine..."
 
@@ -1114,6 +1105,9 @@
 msgid "Movies to play"
 msgstr "Esitatavad filmid"
 
+msgid "- Play movies and songs"
+msgstr "- Filmide ja muusika esitamine"
+
 msgid "Can't enqueue and replace at the same time"
 msgstr "Üheaegselt pole võimalik järjekorda panna ja asendada"
 
@@ -1186,12 +1180,6 @@
 msgid "N/A"
 msgstr "Puudub"
 
-msgid "Surround"
-msgstr "Surround"
-
-msgid "Mono"
-msgstr "Mono"
-
 msgctxt "Number of audio channels"
 msgid "N/A"
 msgstr "Puudub"
@@ -1218,8 +1206,8 @@
 
 #. eg: 75 %
 #, c-format
-msgid "%d %%"
-msgstr "%d%%"
+msgid "%lf %%"
+msgstr "%lf %%"
 
 #. eg: Paused, 0:32 / 1:05
 #, c-format
@@ -1228,8 +1216,8 @@
 
 #. eg: Buffering, 75 %
 #, c-format
-msgid "%s, %d %%"
-msgstr "%s, %d%%"
+msgid "%s, %f %%"
+msgstr "%s, %f %%"
 
 msgid "Current Locale"
 msgstr "Aktiivne lokaat"
@@ -1324,31 +1312,6 @@
 msgid "Vietnamese"
 msgstr "Vietnami"
 
-msgid "No video URI"
-msgstr "Video-URI'd pole"
-
-#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
-#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
-#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
-#, c-format
-msgid ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-msgstr ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-
-msgid "Filename"
-msgstr "Failinimi"
-
-msgid "Resolution"
-msgstr "Lahutus"
-
-msgid "Duration"
-msgstr "Kestus"
-
 msgid "All files"
 msgstr "Kõik failid"
 
@@ -1370,161 +1333,51 @@
 msgid "Select Movies or Playlists"
 msgstr "Filmide või esitusnimekirjade valimine"
 
-#. Options parsing
-msgid "- Play movies and songs"
-msgstr "- Filmide ja muusika esitamine"
-
-#, c-format
-msgid ""
-"%s\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"%s\n"
-"Kõigi saadaolevate käsureavõtmete vaatamiseks käivita '%s --help'.\n"
-
-msgid "Totem Movie Player"
-msgstr "Totem filmiesitaja"
-
-msgid "Could not initialize the thread-safe libraries."
-msgstr "Thread-safe teeke pole võimalik lähtestada."
-
-msgid "Verify your system installation. Totem will now exit."
-msgstr "Kontrolli oma süsteemi paigaldust. Totem lõpetab oma töö."
-
-msgid "Password requested for RTSP server"
-msgstr "RTSP-serveri jaoks nõutav parool"
-
-#, c-format
-msgid "Audio Track #%d"
-msgstr "Audiorada nr. %d"
-
-#, c-format
-msgid "Subtitle #%d"
-msgstr "Subtiiter nr. %d"
-
-msgid ""
-"The requested audio output was not found. Please select another audio output "
-"in the Multimedia Systems Selector."
-msgstr ""
-"Soovitud audioväljundit ei leitud. Palun vali Multimeediasüsteemide valija "
-"abil mõni teine audioväljund."
-
-msgid "Location not found."
-msgstr "Asukohta ei leitud."
-
-msgid ""
-"Could not open location; you might not have permission to open the file."
-msgstr ""
-"Asukohta pole võimalik avada. Võib-olla pole Sul selle faili avamiseks "
-"õiguseid."
-
-msgid ""
-"The video output is in use by another application. Please close other video "
-"applications, or select another video output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"Videoväljund on mõne teise rakenduse kasutuses. Palun sulge muud "
-"videorakendused või vali mõni teine videoväljund Multimeediasüsteemide "
-"valija abil."
+msgid "Add Directory"
+msgstr "Kataloogi lisamine"
 
-msgid ""
-"The audio output is in use by another application. Please select another "
-"audio output in the Multimedia Systems Selector. You may want to consider "
-"using a sound server."
-msgstr ""
-"Audioväljund on mõne teise rakenduse kasutuses. Palun vali mõni  "
-"Multimeediasüsteemide valija abil mõni muu audioväljund. Sa võiksid kaaluda "
-"audioserveri kasutamist."
+msgid "No video URI"
+msgstr "Video-URI'd pole"
 
-#. should be exactly one missing thing (source or converter)
+#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
+#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
+#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
 #, c-format
-msgid "The playback of this movie requires a %s plugin which is not installed."
-msgid_plural ""
-"The playback of this movie requires the following decoders which are not "
-"installed:\n"
-"\n"
-"%s"
-msgstr[0] ""
-"Selle filmi esitamiseks on vaja %s pluginat, see plugin pole aga paigaldatud."
-msgstr[1] ""
-"Selle filmi esitamiseks on vaja järgnevaid dekoodereid, need pole aga "
-"paigaldatud:\n"
-"\n"
-"%s"
-
-msgid ""
-"Cannot play this file over the network. Try downloading it to disk first."
-msgstr ""
-"Seda faili pole võimalik otse võrgust mängida. Proovi see kõigepealt kettale "
-"laadida."
-
-msgid "Media contains no supported video streams."
-msgstr "Meedia ei sisalda ühtegi toetatud videostriimi."
-
 msgid ""
-"Failed to create a GStreamer play object. Please check your GStreamer "
-"installation."
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 msgstr ""
-"Tõrge GStreamer esitusobjekti loomisel. Palun kontrolli GStreameri "
-"paigaldust."
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 
-msgid ""
-"Failed to open audio output. You may not have permission to open the sound "
-"device, or the sound server may not be running. Please select another audio "
-"output in the Multimedia Systems Selector."
-msgstr ""
-"Tõrge audioväljundi avamisel. Sul ei ole võib-olla õiguseid audioväljundi "
-"avamiseks või audioserver ei ole käivitatud. Palun vali "
-"Multimeediasüsteemide valija abil mõni teine audioväljund."
+msgid "Filename"
+msgstr "Failinimi"
 
-msgid ""
-"Could not find the audio output. You may need to install additional "
-"GStreamer plugins, or select another audio output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"Audioväljundit pole võimalik leida. Võib-olla on Sul tarvis paigaldada "
-"täiendavaid GStreamer'i pluginaid või valida Multimeediasüsteemide valija "
-"abil mõni teine audioväljund."
+msgid "Resolution"
+msgstr "Lahutus"
 
-#. hour:minutes:seconds
-#. Translators: This is a time format, like "9:05:02" for 9
-#. * hours, 5 minutes, and 2 seconds. You may change ":" to
-#. * the separator that your locale uses or use "%Id" instead
-#. * of "%d" if your locale uses localized digits.
-#.
-#, c-format
-msgctxt "long time format"
-msgid "%d:%02d:%02d"
-msgstr "%d:%02d:%02d"
+msgid "Duration"
+msgstr "Kestus"
 
-#. minutes:seconds
-#. Translators: This is a time format, like "5:02" for 5
-#. * minutes and 2 seconds. You may change ":" to the
-#. * separator that your locale uses or use "%Id" instead of
-#. * "%d" if your locale uses localized digits.
-#.
-#, c-format
-msgctxt "short time format"
-msgid "%d:%02d"
-msgstr "%d:%02d"
+msgid "Apple Trailers"
+msgstr "Apple'i treilerid"
 
-msgid "Bemused"
-msgstr "Bemused"
+msgid "Sets the user agent for the Apple Trailers site"
+msgstr "Apple'i treilerite saidi jaoks kasutajaagendi määramine"
 
-msgid "Control Totem through a mobile phone with a Bemused client"
-msgstr "Totemi juhtimine mobiiltelefoni kaudu Bemused kliendi abil"
+msgid "Autoload Subtitles"
+msgstr "Subtiitrite automaatne laadimine"
 
-#. Translators: the parameter is a number used to identify this playlist entry
-#, c-format
-msgid "Untitled %d"
-msgstr "Pealkirjata %d"
+msgid "Autoloads text subtitles"
+msgstr "Tekstisubtriitrite automaatne laadimine"
 
-msgid "Totem Bemused Server"
-msgstr "Totemi Bemused Server"
+msgid "Video Disc Recorder"
+msgstr "Videoplaadi lindistaja"
 
-#. FIXME version
-msgid "Totem Bemused Server version 1.0"
-msgstr "Totemi Bemused Server versioon 1.0"
+msgid "Records (S)VCDs or video DVDs"
+msgstr "(S)VCD'de või video-DVD'de lindistamine"
 
 msgid "_Create Video Disc..."
 msgstr "_Loo videoplaat..."
@@ -1553,35 +1406,35 @@
 msgid "Unable to write a project."
 msgstr "Projekti pole võimalik kirjutada."
 
-msgid "Records (S)VCDs or video DVDs"
-msgstr "(S)VCD'de või video-DVD'de lindistamine"
+msgid "Name for new chapter:"
+msgstr "Uue peatüki nimi:"
 
-msgid "Video Disc Recorder"
-msgstr "Videoplaadi lindistaja"
+msgid "_Remove Chapter"
+msgstr "_Eemalda peatükk"
 
-msgid "Chapters"
-msgstr "Peatükid"
+msgid "Remove the chapter from the list"
+msgstr "Peatüki eemaldamine nimekirjast"
 
-msgid "Support chapter markers in movies."
-msgstr "Peatükimarkerite tugi filmidele."
+msgid "_Go to Chapter"
+msgstr "_Liigu peatükile"
 
-msgid "Name for new chapter:"
-msgstr "Uue peatüki nimi:"
+msgid "Go to the chapter in the movie"
+msgstr "Filmi peatükile liikumine"
 
 msgid "Add Chapter..."
 msgstr "Lisa peatükk..."
 
-msgid "Add New Chapters"
-msgstr "Uute peatükkide lisamine"
-
-msgid "Create a new chapter list for the movie"
-msgstr "Filmile uue peatükkide nimekirja loomine"
+msgid "Remove Chapter"
+msgstr "Eemalda peatükk"
 
 msgid "Go to Chapter"
 msgstr "Liikumine peatükile"
 
-msgid "Go to the chapter in the movie"
-msgstr "Filmi peatükile liikumine"
+msgid "Save Changes"
+msgstr "Salvesta muutused"
+
+msgid "No chapter data"
+msgstr "Peatükkide andmed puuduvad"
 
 msgid "Load Chapters..."
 msgstr "Laadi peatükid..."
@@ -1589,23 +1442,17 @@
 msgid "Load chapters from an external CMML file"
 msgstr "Peatükkide laadimine välisest CMML-failist"
 
-msgid "No chapter data"
-msgstr "Peatükkide andmed puuduvad"
-
-msgid "Remove Chapter"
-msgstr "Eemalda peatükk"
-
-msgid "Remove the chapter from the list"
-msgstr "Peatüki eemaldamine nimekirjast"
+msgid "Add New Chapters"
+msgstr "Uute peatükkide lisamine"
 
-msgid "Save Changes"
-msgstr "Salvesta muutused"
+msgid "Create a new chapter list for the movie"
+msgstr "Filmile uue peatükkide nimekirja loomine"
 
-msgid "_Go to Chapter"
-msgstr "_Liigu peatükile"
+msgid "Chapters"
+msgstr "Peatükid"
 
-msgid "_Remove Chapter"
-msgstr "_Eemalda peatükk"
+msgid "Support chapter markers in movies"
+msgstr "Peatükimarkerite tugi filmidele"
 
 #, c-format
 msgid ""
@@ -1662,6 +1509,9 @@
 msgid "Failed to parse CMML file"
 msgstr "Tõrge CMML-faili parsimisel"
 
+msgid "Add Chapter"
+msgstr "Peatüki lisamine"
+
 msgid "D-Bus Service"
 msgstr "D-Bus teenus"
 
@@ -1688,62 +1538,44 @@
 msgid "The URI ‘%s’ is not supported."
 msgstr "URI '%s' pole toetatud."
 
-msgid "Instant Messenger status"
-msgstr "Välksõnumirakenduse olek"
-
-msgid "Set your Instant Messenger status to away when a movie is playing"
-msgstr "Välksõnumirakendusele \"eemal\" oleku määramine filmi esitamise ajaks"
+msgid "Grilo Browser"
+msgstr "Grilo sirvija"
 
-msgid "Gromit Annotations"
-msgstr "Gromiti kommentaarid"
+msgid "A plugin to let you browse media content from various sources"
+msgstr "Plugin erinevatest allikatest meedia sirvimiseks"
 
-msgid "Presentation helper to make annotations on screen"
-msgstr "Esitlusabiline kommentaaride lisamiseks ekraanile"
+msgid "Add to Playlist"
+msgstr "Esitusnimekirja lisamine"
 
-msgid "The gromit binary was not found."
-msgstr "gromit-i binaarfaili ei leitud"
+msgid "Copy Location"
+msgstr "Asukoha kopeerimine"
 
-#. Add the interface to Totem's sidebar
-msgid "BBC iPlayer"
-msgstr "BBC iPlayer"
+msgid "Browse"
+msgstr "Sirvi"
 
-msgid "Stream BBC programs from the last 7 days from the BBC iPlayer service."
-msgstr "BBC programmi viimase 7 päeva voog BBC IPlayer'i teenusest."
+msgid "Search"
+msgstr "Otsing"
 
-msgid "Error listing channel categories"
-msgstr "Viga kanalite kategooriate loendi kuvamisel"
+msgid "Browse Error"
+msgstr "Viga sirvimisel"
 
-msgid ""
-"There was an unknown error getting the list of television channels available "
-"on BBC iPlayer."
-msgstr ""
-"BBC iPlayeri jaoks saadaolevate telekanalite nimekirja hankimisel tekkis "
-"tundmatu viga."
+msgid "Search Error"
+msgstr "Viga otsimisel"
 
-#. Append a dummy child row so that the expander's visible; we can
-#. then queue off the expander to load the programme listing for this
-#. category
-msgid "Loading…"
-msgstr "Laadimine…"
+msgid "Gromit Annotations"
+msgstr "Gromiti kommentaarid"
 
-#. Translators: the "programme feed" is the list of TV shows
-#. available to watch online
-msgid "Error getting programme feed"
-msgstr "Viga saatekava voo hankimisel"
+msgid "Presentation helper to make annotations on screen"
+msgstr "Esitlusabiline kommentaaride lisamiseks ekraanile"
 
-msgid ""
-"There was an error getting the list of programmes for this channel and "
-"category combination."
-msgstr ""
-"Selle kanali ja kategooria kombinatsioonile vastava saatekava hankimisel "
-"tekkis viga."
+msgid "The gromit binary was not found."
+msgstr "gromit-i binaarfaili ei leitud"
 
-msgid ""
-msgstr "<ühtegi põhjust ei määratud>"
+msgid "Instant Messenger Status"
+msgstr "Välksõnumirakenduse olek"
 
-#, python-format
-msgid "Programme unavailable (\"%s\")"
-msgstr "Saade pole saadaval (\"%s\")"
+msgid "Set your Instant Messenger status to away when a movie is playing"
+msgstr "Välksõnumirakendusele \"eemal\" oleku määramine filmi esitamise ajaks"
 
 msgid "Infrared Remote Control"
 msgstr "Infrapuna-kaugjuhtimine"
@@ -1757,21 +1589,24 @@
 msgid "Couldn't read lirc configuration."
 msgstr "Lirc'i sätteid pole võimalik lugeda."
 
-msgid "Download Movie Subtitles"
-msgstr "Filmi subtiitrite allalaadimine"
+msgid "Media Player Keys"
+msgstr "Meediaesitaja klahvid"
 
-msgid "Subtitle _language:"
-msgstr "Subtiitrite _keel:"
+msgid "Support additional media player keys"
+msgstr "Meediaesitaja lisaklahvide tugi"
 
-msgid "_Play with Subtitle"
-msgstr "_Esita subtiitritega"
+msgid "Always On Top"
+msgstr "Alati pealmine"
 
-msgid "Look for subtitles for the currently playing movie."
-msgstr "Esitatavale filmile subtiitrite otsimine."
+msgid "Keep the main window on top when playing a movie"
+msgstr "Filmi esitamise ajal hoitakse peaakent alati teiste akende peal"
 
 msgid "Subtitle Downloader"
 msgstr "Subtiitrite allalaadija"
 
+msgid "Look for subtitles for the currently playing movie"
+msgstr "Praegu esitatavale filmile subtiitrite otsimine."
+
 msgid "Brazilian Portuguese"
 msgstr "Brasiilia-portugali"
 
@@ -1812,93 +1647,102 @@
 msgid "Searching subtitles…"
 msgstr "Subtiitrite otsimine…"
 
+msgid "Download Movie Subtitles"
+msgstr "Filmi subtiitrite allalaadimine"
+
+msgid "Subtitle _language:"
+msgstr "Subtiitrite _keel:"
+
+msgid "_Play with Subtitle"
+msgstr "_Esita subtiitritega"
+
 msgid "Subtitle language"
 msgstr "Subtiitrite keel"
 
 msgid "The language to search for subtitles for movies in."
 msgstr "Filmides kasutatavate subtiitrite keel."
 
-msgid "Always On Top"
-msgstr "Alati pealmine"
+msgid "Movie Properties"
+msgstr "Filmi omadused"
 
-msgid "Keep the main window on top when playing a movie"
-msgstr "Filmi esitamise ajal hoitakse peaakent alati teiste akende peal"
+msgid "Adds movie properties to the sidebar"
+msgstr "Filmi omaduste lisamine külgribale"
 
 msgid "Properties"
 msgstr "Omadused"
 
-#, no-c-format
+msgid "rpdb2 password"
+msgstr "rpdb2 parool"
+
 msgid ""
-"A format string used to build the network service name used when publishing "
-"playlists over the network. The following format placeholders can be used: • "
-"%a: the program name as returned by g_get_application_name() • %h: the "
-"machine's host name in title case • %u: the user's login name in title case "
-"• %U: the user's real name • %%: the percent sign"
+"A password to protect the rpdb2 server for debugging Totem from unauthorized "
+"remote access. If this is empty, a default of 'totem' will be used."
 msgstr ""
-"Esitusnimekirjade võrgus avaldamise teenuse vormingustring. Vormingus on "
-"võimalik kasutada järgnevaid eritähenduslikke alamstringe: • %a: programmi "
-"nimi, hangitakse g_get_application_name() abil • %h: hostinimi, "
-"suurtähtedega • %u: kasutajakonto nimi, suurtähtedega • %U: kasutaja "
-"pärisnimi • %%: protsendimärk"
+"Parool, millega kaitstakse Totemi rpdb2 silumisserverit mittesoovitavate "
+"kaugühenduste eest. Kui see on tühi, kasutatakse vaikimisi väärtust 'totem'."
 
-msgid "Format for network service name"
-msgstr "Võrguteenuse nime vorming"
+msgid "Python Console"
+msgstr "Pythoni konsool"
 
-msgid "Publisher protocol to use"
-msgstr "Avaldamisprotokoll"
+msgid "Interactive Python console"
+msgstr "Interaktiivne Pythoni konsool"
 
-msgid ""
-"The transport protocol to use when publishing playlists over the network."
-msgstr "Esitusnimekirjade võrgus avaldamiseks kasutatav ülekandeprotokoll."
+msgid "Python Console Menu"
+msgstr "Pythoni konsooli menüü"
 
-#. Translators: computers on the local network which are publishing their playlists over the network
-msgid "Neighbors"
-msgstr "Naabrid"
+msgid "_Python Console"
+msgstr "_Pythoni konsool"
 
-msgid "Publish Playlist"
-msgstr "Esitusnimekirja avaldamine"
+msgid "Show Totem's Python console"
+msgstr "Totemi Pythoni konsooli näitamine"
 
-msgid "Share the current playlist via HTTP"
-msgstr "Praeguse esitusnimekirja jagamine HTTP kaudu"
+msgid "Python Debugger"
+msgstr "Pythoni silur"
 
-msgid "Service _Name:"
-msgstr "Teenuse _nimi:"
+msgid "Enable remote Python debugging with rpdb2"
+msgstr "Pythoni kaugsilumise lubamine rpdb2 abil"
 
-#, no-c-format
-msgid ""
-"The name used for announcing the playlist service on the network.\n"
-"All occurrences of the string %u will be replaced by your name,\n"
-"and %h will be replaced by your computer's host name."
-msgstr ""
-"Nime kasutatakse võrgus oleva esitusnimekirjateenuse teavitamiseks.\n"
-"Kõik alamstringid %u asendatakse sinu nimega ja %h sinu\n"
-"arvuti hostinimega."
+#. pylint: disable-msg=E1101
+#, python-format
+msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
+msgstr "Totem.Object'i on võimalik kasutada 'totem_object' kaudu:\\n%s"
 
-msgid "Use _encrypted transport protocol (HTTPS)"
-msgstr "_Kasutatakse krüptitud transpordiprotokolli (HTTPS)"
+msgid "Totem Python Console"
+msgstr "Totemi pythoni konsool"
 
 msgid ""
-"A password to protect the rpdb2 server for debugging Totem from unauthorized "
-"remote access. If this is empty, a default of 'totem' will be used."
+"After you press OK, Totem will wait until you connect to it with winpdb or "
+"rpdb2. If you have not set a debugger password in DConf, it will use the "
+"default password ('totem')."
 msgstr ""
-"Parool, millega kaitstakse Totemi rpdb2 silumisserverit mittesoovitavate "
-"kaugühenduste eest. Kui see on tühi, kasutatakse vaikimisi väärtust 'totem'."
+"Pärast \"Olgu\" vajutamist ootab Totem winpdb või rpdb2 abil loodud "
+"ühendust. Kui DConfi's pole siluri parooli määratud, siis kasutatakse "
+"vaikimisi parooli ('totem')."
 
-msgid "rpdb2 password"
-msgstr "rpdb2 parool"
+msgid "Recent files"
+msgstr "Hiljutised failid"
 
-msgid "Allows videos to be rotated if they're in the wrong orientation."
-msgstr "Võimaldab videot pöörata, kui see on vales suunas."
+msgid "Adds files that have been played to recent files"
+msgstr "Esitatud failide lisamine hiljutiste failide nimekirja"
 
 msgid "Rotation Plugin"
 msgstr "Pööramise plugin"
 
+msgid "Allows videos to be rotated if they are in the wrong orientation"
+msgstr "Võimaldab videot pöörata, kui see on vales suunas"
+
 msgid "_Rotate Clockwise"
 msgstr "_Pööra päripäeva"
 
 msgid "Rotate Counterc_lockwise"
 msgstr "Pööra _vastupäeva"
 
+msgid "Save Copy"
+msgstr "Koopia salvestamine"
+
+msgid "Save a copy of the currently playing movie"
+msgstr "Koopia salvestamine praegu mängivast filmist"
+
 msgid "Save a Copy..."
 msgstr "Salvesta koopia..."
 
@@ -1916,8 +1760,14 @@
 msgid "Movie stream"
 msgstr "Filmivoog"
 
-msgid "Playing a movie"
-msgstr "Filmi esitamine"
+msgid "Screen Saver"
+msgstr "Ekraanisäästja"
+
+msgid "Deactivates the screen saver when a movie is playing"
+msgstr "Ekraanisäästja keelamine filmi mängimise ajaks"
+
+msgid "Screenshot width (in pixels):"
+msgstr "Stoppkaadri laius (pikslites):"
 
 msgid "Calculate the number of screenshots"
 msgstr "Stoppkaadrite arv arvutatakse"
@@ -1925,21 +1775,24 @@
 msgid "Number of screenshots:"
 msgstr "Stoppkaadrite arv:"
 
-msgid "Screenshot width (in pixels):"
-msgstr "Stoppkaadri laius (pikslites):"
-
-msgid "Save in _folder:"
-msgstr "Salvesta _kataloogi:"
+#. translators: this is the name of the file that gets made up
+#. * with the screenshot if the entire screen is taken
+#, c-format
+msgid "Screenshot from %s.png"
+msgstr "%s stoppkaader.png"
 
-msgid "Select a folder"
-msgstr "Kataloogi valimine"
+#. translators: this is the name of the file that gets
+#. * made up with the screenshot if the entire screen is
+#. * taken
+#, c-format
+msgid "Screenshot from %s - %d.png"
+msgstr "%s - %d stoppkaader.png"
 
-msgid "_Name:"
-msgstr "_Nimi:"
+msgid "Screenshot"
+msgstr "Stoppkaader"
 
-#. Write the screenshot to the temporary file
-msgid "Screenshot.png"
-msgstr "Stoppkaader.png"
+msgid "Allows screenshots and galleries to be taken of videos"
+msgstr "Võimaldab videotest stoppkaadrite ja galeriide loomise"
 
 msgid "Save Gallery"
 msgstr "Galerii salvestamine"
@@ -1961,26 +1814,14 @@
 msgid "Saving gallery as \"%s\""
 msgstr "Galerii salvestamine nimega \"%s\""
 
-msgid "There was an error saving the screenshot."
-msgstr "Stoppkaadri salvestamisel esines viga."
-
-msgid "Save Screenshot"
-msgstr "Stoppkaadri salvestamine"
-
-#. Create the screenshot widget
-#. Translators: %s is the movie title and %d is an auto-incrementing number to make filename unique
-#, c-format
-msgid "Screenshot-%s-%d.png"
-msgstr "Stoppkaader-%s-%d.png"
-
 msgid "Totem could not get a screenshot of the video."
 msgstr "Totem pole suuteline sellest filmist stoppkaadrit tegema."
 
 msgid "This is not supposed to happen; please file a bug report."
 msgstr "Seda ei oleks tohtinud juhtuda; palun saada veateade."
 
-msgid "Take _Screenshot..."
-msgstr "Võta _stoppkaader..."
+msgid "Take _Screenshot"
+msgstr "Võta _stoppkaader"
 
 msgid "Take a screenshot"
 msgstr "Stoppkaadri võtmine"
@@ -1991,6 +1832,15 @@
 msgid "Create a gallery of screenshots"
 msgstr "Stoppkaadrite galerii loomine"
 
+msgid "Skip To"
+msgstr "Asukoha vahetamine"
+
+msgid "Provides the \"Skip to\" dialog"
+msgstr "Pakub dialoogi \"Asukoha vahetamine\""
+
+msgid "_Skip to:"
+msgstr "_Liikumine asukohale:"
+
 #. Update the "seconds" label so that it always has the correct singular/plural form
 #. Translators: label for the seconds selector in the "Skip to" dialogue
 msgid "second"
@@ -2006,426 +1856,8 @@
 msgid "7"
 msgstr "8"
 
-msgid "Skip To"
-msgstr "Asukoha vahetamine"
-
 msgid "_Skip To..."
-msgstr "_Hüppa asukohale..."
+msgstr "_Liigu asukohale..."
 
 msgid "Skip to a specific time"
 msgstr "Liikumine määratud ajahetkele"
-
-msgid "_Skip to:"
-msgstr "_Liikumine asukohale:"
-
-msgid "A plugin to let you browse YouTube videos."
-msgstr "Plugin YouTube videote sirvimiseks."
-
-msgid "YouTube Browser"
-msgstr "YouTube sirvija"
-
-msgid "Related Videos"
-msgstr "Seotud videod"
-
-msgid "Search Results"
-msgstr "Otsing"
-
-msgid "Videos"
-msgstr "Videod"
-
-msgid "_Open in Web Browser"
-msgstr "Ava _veebisirvijas"
-
-msgid "Open the video in your web browser"
-msgstr "Video avamine veebisirvijas"
-
-#. Add the sidebar page
-msgid "YouTube"
-msgstr "YouTube"
-
-msgid "Cancelling query…"
-msgstr "Päringu tühistamine…"
-
-#. Hide the ugly technical message libgdata gives behind a nice one telling them it's out of date (which it likely is
-#. * if we're receiving a protocol error).
-#. Spew out the error message as provided
-msgid "Error Searching for Videos"
-msgstr "Viga videote otsimisel"
-
-msgid ""
-"The response from the server could not be understood. Please check you are "
-"running the latest version of libgdata."
-msgstr ""
-"Serverist saadud vastust ei osatud tõlgendada. Kontrolli, kas sa kasutad "
-"libgdata viimast versiooni."
-
-#. Update the UI
-msgid "Fetching search results…"
-msgstr "Otsingutulemuste hankimine…"
-
-#. Update the UI
-msgid "Fetching related videos…"
-msgstr "Seotud videote hankimine…"
-
-msgid "Error Opening Video in Web Browser"
-msgstr "Viga video avamisel veebisirvijas"
-
-msgid "Fetching more videos…"
-msgstr "Lisavideote hankimine…"
-
-msgid "Video Format Not Supported"
-msgstr "Toetamata videovorming"
-
-msgid ""
-"This video is not available in any formats which Totem supports. Would you "
-"like to open it in your web browser instead?"
-msgstr ""
-"See video pole Totemi poolt toetatud vormingus. Kas soovid video hoopis "
-"veebisirvijaga avada?"
-
-msgid "No URI to play"
-msgstr "Esitamiseks puudub URI"
-
-#. translators: this is:
-#. * Open With ApplicationName
-#. * as in nautilus' right-click menu
-#, c-format
-msgid "_Open with \"%s\""
-msgstr "_Ava programmiga \"%s\""
-
-msgid "No playlist or playlist empty"
-msgstr "Esitusnimekiri on puudu või tühi"
-
-msgid "Movie browser plugin"
-msgstr "Filmisirvija plugin"
-
-msgid "Verify your system installation. The Totem plugin will now exit."
-msgstr "Kontrolli oma süsteemi paigaldust. Totemi plugin lõpetab oma töö."
-
-msgid "Interactive Python console."
-msgstr "Interaktiivne Pythoni konsool."
-
-msgid "Python Console"
-msgstr "Pythoni konsool"
-
-msgid "Python Console Menu"
-msgstr "Pythoni konsooli menüü"
-
-msgid "_Python Console"
-msgstr "_Pythoni konsool"
-
-msgid "Show Totem's Python console"
-msgstr "Totemi Pythoni konsooli näitamine"
-
-msgid "Python Debugger"
-msgstr "Pythoni silur"
-
-msgid "Enable remote Python debugging with rpdb2"
-msgstr "Pythoni kaugsilumise lubamine rpdb2 abil"
-
-#. pylint: disable-msg=E1101
-#, python-format
-msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
-msgstr "Totem.Object'i on võimalik kasutada 'totem_object' kaudu:\\n%s"
-
-msgid "Totem Python Console"
-msgstr "Totemi pythoni konsool"
-
-msgid ""
-"After you press OK, Totem will wait until you connect to it with winpdb or "
-"rpdb2. If you have not set a debugger password in DConf, it will use the "
-"default password ('totem')."
-msgstr ""
-"Pärast \"Olgu\" vajutamist ootab Totem winpdb või rpdb2 abil loodud "
-"ühendust. Kui DConfi's pole siluri parooli määratud, siis kasutatakse "
-"vaikimisi parooli ('totem')."
-
-msgid "A plugin to let you browse media content from various sources."
-msgstr "Plugin erinevatest allikatest meedia sirvimiseks."
-
-msgid "Grilo Browser"
-msgstr "Grilo sirvija"
-
-msgid "Browse Error"
-msgstr "Viga sirvimisel"
-
-msgid "Search Error"
-msgstr "Viga otsimisel"
-
-msgid "Browse"
-msgstr "Sirvi"
-
-msgid "Search"
-msgstr "Otsing"
-
-#~ msgid "0 frames per second"
-#~ msgstr "0 kaadrit sekundis"
-
-#~ msgid "0 kbps"
-#~ msgstr "0 kb/s"
-
-#~ msgid "0 x 0"
-#~ msgstr "0 x 0"
-
-#~ msgid "Zoom Out"
-#~ msgstr "Vähendamine"
-
-#~ msgid "Zoom Reset"
-#~ msgstr "Algsuurus"
-
-#~ msgid "Zoom out"
-#~ msgstr "Vähendamine"
-
-#~ msgid "Zoom reset"
-#~ msgstr "Algse suuruse määramine"
-
-#~ msgid ""
-#~ "The playback of this movie requires the following decoders which are not "
-#~ "installed:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Selle filmi esitamine vajab järgnevaid dekoodereid, need dekoordid pole "
-#~ "aga paigaldatud:\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid "Media file could not be played."
-#~ msgstr "Meediumifaili pole võimalik esitada."
-
-#~ msgid "Too old version of GStreamer installed."
-#~ msgstr "Paigaldatud GStreamer on liiga vana."
-
-#~ msgid ""
-#~ "Failed to open video output. It may not be available. Please select "
-#~ "another video output in the Multimedia Systems Selector."
-#~ msgstr ""
-#~ "Tõrge videoväljundi avamisel. See pole võib-olla saadaval. Palun vali "
-#~ "Multimeediasüsteemide valija abil mõni muu videoväljund."
-
-#~ msgid ""
-#~ "Could not find the video output. You may need to install additional "
-#~ "GStreamer plugins, or select another video output in the Multimedia "
-#~ "Systems Selector."
-#~ msgstr ""
-#~ "Videoväljundit pole võimalik leida. Võib-olla on Sul tarvis paigaldada "
-#~ "täiendavaid GStreamer'i pluginaid või valida Multimeediasüsteemide valija "
-#~ "abil mõni teine videoväljund."
-
-#~ msgid "%s"
-#~ msgstr "%s"
-
-#~ msgid "Delete"
-#~ msgstr "Kustutatud"
-
-#~ msgid "Coherence DLNA/UPnP Client"
-#~ msgstr "Coherence DLNA/UPnP klient"
-
-#~ msgid "A DLNA/UPnP client for Totem powered by Coherence"
-#~ msgstr "DLNA/UPnP klient Totemi jaoks, mille on tootnud Coherence"
-
-#~ msgid "By artist"
-#~ msgstr "Esitaja"
-
-#~ msgid "By tag"
-#~ msgstr "Märksõna"
-
-#~ msgid "Jamendo Album Page"
-#~ msgstr "Jamendo albumilehekülg"
-
-#~ msgid "Latest Releases"
-#~ msgstr "Hiljutised väljalasked"
-
-#~ msgid "Number of albums to _retrieve:"
-#~ msgstr "_Tõmmatavate albumite arv:"
-
-#~ msgid "Popular"
-#~ msgstr "Populaarsed"
-
-#~ msgid "Preferred audio _format:"
-#~ msgstr "Eelistatud audio_vorming:"
-
-#~ msgid "_Open Jamendo Album Page in Browser"
-#~ msgstr "_Ava Jamendo albumileht"
-
-#~ msgid "Jamendo"
-#~ msgstr "Jamendo"
-
-#~ msgid ""
-#~ "Listen to the large collection of Creative Commons licensed music on "
-#~ "Jamendo."
-#~ msgstr ""
-#~ "Kuula suurt Creative Commons litsentsi alla kuuluvat muusikakogu Jamendos."
-
-#~ msgid "You need to install the Python simplejson module."
-#~ msgstr "Pead paigaldama Python'i mooduli simplejson."
-
-#~ msgid "Artist: %s"
-#~ msgstr "Esitaja: %s"
-
-#~ msgid "%Y-%m-%d"
-#~ msgstr "%Y-%m-%d"
-
-#~ msgid "%x"
-#~ msgstr "%x"
-
-#~ msgid "Genre: %s"
-#~ msgstr "Žanr: %s"
-
-#~ msgid "Released on: %s"
-#~ msgstr "Välja tulnud: %s"
-
-#~ msgid "License: %s"
-#~ msgstr "Litsents: %s"
-
-#~ msgid "%02d. %s"
-#~ msgstr "%02d. %s"
-
-#~ msgid "Album: %s"
-#~ msgstr "Album: %s"
-
-#~ msgid "Duration: %s"
-#~ msgstr "Kestus: %s"
-
-#~ msgid "Fetching albums, please wait…"
-#~ msgstr "Albumite tõmbamine, palun oota…"
-
-#~ msgid ""
-#~ "Failed to connect to Jamendo server.\n"
-#~ "%s."
-#~ msgstr ""
-#~ "Jamendo serverisse ühendumine nurjus.\n"
-#~ "%s."
-
-#~ msgid "The Jamendo server returned code %s."
-#~ msgstr "Jamendo server tagastas veakoodi %s."
-
-#~ msgid "An error occurred while fetching albums."
-#~ msgstr "Albumite tõmbamisel esines viga."
-
-#~ msgid "%H:%M:%S"
-#~ msgstr "%H:%M:%S"
-
-#~ msgid "%M:%S"
-#~ msgstr "%M:%S"
-
-#~ msgid "en"
-#~ msgstr "en"
-
-#~ msgid "Audio format to download from Jamendo"
-#~ msgstr "Jamendost allalaaditava audio vorming"
-
-#~ msgid "Number of results per page"
-#~ msgstr "Tulemuste arv lehe kohta"
-
-#~ msgid ""
-#~ "The number of Jamendo search results to display in each page of results."
-#~ msgstr "Mitu Jamendo otsingutulemust ühel tulemustelehel kuvatakse."
-
-#~ msgid "The preferred audio format to download tracks from Jamendo in."
-#~ msgstr "Eelistatav andmevorming Jamendost allalaaditavatele lugudele."
-
-#~ msgid "Language"
-#~ msgstr "Keel"
-
-#~ msgid "Could not connect to Tracker"
-#~ msgstr "Trackeriga pole võimalik ühendust luua"
-
-#~ msgid "No results"
-#~ msgstr "Tulemused puuduvad"
-
-#~ msgid "Showing %i - %i of %i match"
-#~ msgid_plural "Showing %i - %i of %i matches"
-#~ msgstr[0] "Näidatakse %i - %i %i tulemust"
-#~ msgstr[1] "Näidatakse %i - %i %i tulemuse seast"
-
-#~ msgid "Page"
-#~ msgstr "Leht"
-
-#~ msgid "Set the window icon to the thumbnail of the playing movie"
-#~ msgstr "Filmi esitamise ajaks akna ikooni asendamine pisipildiga"
-
-#~ msgid "Thumbnail"
-#~ msgstr "Pisipilt"
-
-#~ msgid "Search for local videos using Tracker"
-#~ msgstr "Kohalike videote otsimine Trackeri abil"
-
-#~ msgid "Browser Plugin using %s"
-#~ msgstr "Veebisirvija plugin, kasutab abiprogrammi %s"
-
-#~ msgid "Totem Browser Plugin"
-#~ msgstr "Totemi plugin veebisirvijale"
-
-#~ msgid "Enable visual effects?"
-#~ msgstr "Kas lubada visuaalsed efektid?"
-
-#~ msgid ""
-#~ "It seems you are running Totem remotely.\n"
-#~ "Are you sure you want to enable the visual effects?"
-#~ msgstr ""
-#~ "Paistab, et sa käivitasid Totem'i üle võrgu.\n"
-#~ "Kas visuaalsed efektid peavad olema lubatud?"
-
-#~ msgid "Error loading Galago plugin"
-#~ msgstr "Viga Galago plugina laadimisel"
-
-#~ msgid "Could not connect to the Galago daemon."
-#~ msgstr "Galago deemoniga pole võimalik ühendust luua"
-
-#~ msgid "Could not get name and thumbnail for %s: %s"
-#~ msgstr "\"%s\" kohta pole võimalik nime ja pisipilti hankida: %s"
-
-#~ msgid "seconds"
-#~ msgstr "sekundit"
-
-#~ msgid "Error Looking Up Video URI"
-#~ msgstr "Video-URI otsimisel esines viga"
-
-#~ msgid "Chapters support"
-#~ msgstr "Peatükkide tugi"
-
-#~ msgid "Continue to watch movie without loaded chapters"
-#~ msgstr "Vaatamise jätkamine ilma peatükke laadimata"
-
-#~ msgid "_Go to"
-#~ msgstr "_Liikumine"
-
-#~ msgid "Please check you rights and free space"
-#~ msgstr "Palun kontrolli oma pääsuõigusi ja ketta vaba ruumi"
-
-#~ msgid ""
-#~ "Approximate network connection speed, used to select quality on media "
-#~ "over the network: \"0\" for 14.4 Kbps Modem, \"1\" for 19.2 Kbps Modem, "
-#~ "\"2\" for 28.8 Kbps Modem, \"3\" for 33.6 Kbps Modem, \"4\" for 34.4 Kbps "
-#~ "Modem, \"5\" for 56 Kbps Modem/ISDN, \"6\" for 112 Kbps Dual ISDN/DSL, "
-#~ "\"7\" for 256 Kbps DSL/Cable, \"8\" for 384 Kbps DSL/Cable, \"9\" for 512 "
-#~ "Kbps DSL/Cable, \"10\" for 1.5 Mbps T1/Intranet/LAN, \"11\" for Intranet/"
-#~ "LAN."
-#~ msgstr ""
-#~ "Arvestuslik võrguühenduse kiirus, mille järgi valitakse üle võrgu "
-#~ "esitatava voo kvaliteet: \"0\" on 14.4 kb/s modem, \"1\" on 19.2 kb/s "
-#~ "modem, \"2\" on 28.8 kb/s modem, \"3\" on 33.6 kb/s modem, \"4\" on 34.4 "
-#~ "kb/s modem, \"5\" on 56 kb/s modem/ISDN, \"6\" on 112 kb/s topelt-ISDN/"
-#~ "DSL, \"7\" on 256 kb/s DSL/kaabel, \"8\" on 384 kb/s DSL/kaabel, \"9\" on "
-#~ "512 kb/s DSL/kaabel, \"10\" on 1.5 mb/s T1/Intranet/LAN, \"11\" on "
-#~ "Intranet/LAN."
-
-#~ msgid ""
-#~ "Quality settings for the audio visualization: \"0\" for small, \"1\" for "
-#~ "normal, \"2\" for large, \"3\" for extra large."
-#~ msgstr ""
-#~ "Audio visualiseerimise kvaliteedisätted: \"0\" on väike, \"1\" on "
-#~ "keskmine, \"2\" on suur, \"3\" on eriti suur."
-
-#~ msgid ""
-#~ "Type of audio output to use: \"0\" for stereo, \"1\" for 4-channel "
-#~ "output, \"2\" for 5.0 channel output, \"3\" for 5.1 channel output, \"4\" "
-#~ "for AC3 Passthrough."
-#~ msgstr ""
-#~ "Audioväljund, mida kasutada: \"0\" stereo jaoks, \"1\" 4 kanali "
-#~ "väljundile, \"2\" 5.0 kanali väljundile, \"3\" 5.1 kanali väljundile, "
-#~ "\"4\" AC3 Passthrough jaoks."
-
-#~ msgid "Copyright © 2002-2011 Bastien Nocera"
-#~ msgstr "Autoriõigused © 2002-2011 Bastien Nocera"
diff -Nru totem-3.4.3/po/fa.po totem-3.6.2/po/fa.po
--- totem-3.4.3/po/fa.po	2012-04-02 14:15:40.000000000 +0000
+++ totem-3.6.2/po/fa.po	2012-10-16 06:35:28.000000000 +0000
@@ -11,29 +11,242 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: totem HEAD\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=totem&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-03-23 06:16+0000\n"
-"PO-Revision-Date: 2012-03-31 16:54+0330\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=totem&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2012-10-12 15:15+0000\n"
+"PO-Revision-Date: 2012-10-12 18:45+0330\n"
 "Last-Translator: Arash Mousavi \n"
 "Language-Team: Persian\n"
+"Language: fa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fa\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Poedit-Language: Persian\n"
-"X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
+#: ../browser-plugin/totem-plugin-viewer.c:352 ../src/totem-object.c:1180
+#: ../src/totem-object.c:1650 ../src/totem-statusbar.c:115
+msgid "Stopped"
+msgstr "متوقف شده"
+
+#: ../browser-plugin/totem-plugin-viewer.c:364 ../src/totem-object.c:1173
+msgid "Paused"
+msgstr "مکث شده"
+
+#: ../browser-plugin/totem-plugin-viewer.c:368 ../src/totem-object.c:1166
+msgid "Playing"
+msgstr "در حال پخش"
+
+#: ../browser-plugin/totem-plugin-viewer.c:386
+#: ../src/plugins/screensaver/totem-screensaver.c:97
+msgid "Playing a movie"
+msgstr "در حال پخش فیلم"
+
+#: ../browser-plugin/totem-plugin-viewer.c:443
+msgid "No URI to play"
+msgstr "آدرسی برای پخش نیست"
+
+#: ../browser-plugin/totem-plugin-viewer.c:676
+#: ../browser-plugin/totem-plugin-viewer.c:1700
+msgid "Totem Movie Player"
+msgstr "پخش‌کننده‌ی فیلم توتم"
+
+#. translators: this is:
+#. * Open With ApplicationName
+#. * as in nautilus' right-click menu
+#: ../browser-plugin/totem-plugin-viewer.c:1120
+#, c-format
+msgid "_Open with \"%s\""
+msgstr "_باز کردن با «%s»"
+
+#: ../browser-plugin/totem-plugin-viewer.c:1341 ../src/totem-object.c:2475
+msgid "An error occurred"
+msgstr "خطایی پیش آمد"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2033
+msgid "No playlist or playlist empty"
+msgstr "فهرست پخشی وجود ندارد و یا خالی است"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2128
+msgid "Movie browser plugin"
+msgstr "افزونه‌ی مرورگر فیلم"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144 ../src/totem.c:246
+msgid "Could not initialize the thread-safe libraries."
+msgstr "مقدار دهی اولیه کتابخانه‌های thread-safe امکان‌پذیر نبود."
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144
+msgid "Verify your system installation. The Totem plugin will now exit."
+msgstr "از درستی نصب سیستمتان مطمئن شوید. افزونه‌ی توتم هم‌اکنون خارج می‌شود."
+
 #: ../data/fullscreen.ui.h:1
 msgid "Leave Fullscreen"
 msgstr "ترک حالت تمام‌صفحه"
 
-#: ../data/fullscreen.ui.h:2
-#: ../data/totem.ui.h:144
+#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:81
 msgid "Time:"
 msgstr "زمان:"
 
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
+msgid "Allow the screensaver to activate when playing audio"
+msgstr "اجازه بده تا محافظ صفحه‌نمایش در هنگام پخش صوت فعال شود"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
+msgid ""
+"Allow the screensaver to activate when playing audio. Disable if you have "
+"monitor-powered speakers."
+msgstr ""
+"هنگام پخش صوت اجازه‌ی فعالیت محافظ صفحه نمایش را بده. در صورت داشتن بلندگوهای "
+"monitor-powered این گزینه را غیرفعال کنید."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
+msgid "Show visual effects when no video is displayed"
+msgstr "نشان دادن جلوه‌های تصویری وقتی ویدیویی پخش نمی‌شود"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
+msgid "Show visual effects when playing an audio only file."
+msgstr "نشان دادن جلوه‌های تصویری هنگام پخش پرونده‌های فقط صوتی"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
+msgid "Name of the visual effects plugin"
+msgstr "نام متصل‌شونده‌ی جلوه‌های تصویری"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
+msgid "The brightness of the video"
+msgstr "روشنی ویدیو"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
+msgid "The contrast of the video"
+msgstr "کنتراست ویدیو"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
+msgid "The hue of the video"
+msgstr "پرده‌ی رنگ ویدیو"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
+msgid "The saturation of the video"
+msgstr "غلظت رنگ ویدیو"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
+msgid "Resize the canvas automatically on file load"
+msgstr "تغییر اندازه‌ی خودکار بوم هنگام بار کردن پرونده"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
+msgid "Repeat mode"
+msgstr "حالت تکرار"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
+msgid "Shuffle mode"
+msgstr "حالت تصادفی"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
+msgid "Whether to disable deinterlacing for interlaced movies"
+msgstr "اینکه آیا مشبک‌زدایی از تصاویر مشبک غیرفعال شود"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
+msgid "Whether to enable debug for the playback engine"
+msgstr "این که آیا اشکال‌زدا برای موتور پخش به کار انداخته بشود یا نه."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
+msgid "Type of audio output to use"
+msgstr "نوع خروجی صوتی که استفاده می‌شود"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
+msgid "Visualization quality setting"
+msgstr "تنظیمات کیفیت تصویرسازی"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
+msgid "Quality setting for the audio visualization."
+msgstr "تنظیمات کیفیت برای تصویر‌سازی صوتی"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
+msgid "Network buffering threshold"
+msgstr "آستانه‌ی میانگیری شبکه"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
+msgid ""
+"Amount of data to buffer for network streams before starting to display the "
+"stream (in seconds)."
+msgstr ""
+"مقدار اطلاعاتی که برای جریان‌های شبکه‌ای، قبل از نمایش دادن جریان‌ها میانگیر "
+"می‌شود (به ثانیه)"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
+msgid "Subtitle font"
+msgstr "قلم زیرنویس"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
+msgid "Pango font description for subtitle rendering."
+msgstr "شرح قلم پانگو برای رسم زیرنویس"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
+msgid "Subtitle encoding"
+msgstr "کدگذاری زیرنویس"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
+msgid "Encoding character set for subtitle."
+msgstr "دسته‌ی کدگذاری، برای زیرنویس"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
+msgid "Default location for the \"Open...\" dialogs"
+msgstr "مکان پیش فرض برای محاوره‌های «باز کردن...»"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
+msgid ""
+"Default location for the \"Open...\" dialogs. Default is the current "
+"directory."
+msgstr ""
+"مکان پیش فرض برای محاوره‌های «بازکردن...». مکان پیش فرض شاخه‌ی فعلی می باشد"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
+msgid "Default location for the \"Take Screenshot\" dialogs"
+msgstr "مکان پیش فرض برای محاوره‌های «عکس گرفتن از صفحه»"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
+msgid ""
+"Default location for the \"Take Screenshot\" dialogs. Default is the "
+"Pictures directory."
+msgstr ""
+"مکان پیش فرض برای محاوره‌های «عکس گرفتن از صفحه». محل پیش‌فرض شاخه‌ی عکس‌ها "
+"می‌باشد"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
+msgid "Whether to disable the plugins in the user's home directory"
+msgstr "اینکه متصل‌شونده‌های موجود در شاخه home کاربر غیر فعال شوند"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
+msgid "Whether to disable the keyboard shortcuts"
+msgstr "اینکه آیا میانبرهای صفحه کلید غیرفعال شوند"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
+msgid "Whether to autoload text subtitle files when a movie is loaded"
+msgstr "اینکه پس از بارگیری فیلم به طور خودکار پرونده‌های زیرنویس بارگیری شوند."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
+msgid "Whether to autoload external chapter files when a movie is loaded"
+msgstr ""
+"اینکه پس از بارگیری فیلم، پرونده‌های فصل‌های خارجی به طور خودکار بارگیری شوند."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
+msgid ""
+"Whether to remember the position of played audio/video files when pausing or "
+"closing them"
+msgstr ""
+"اینکه آیا محل پرونده‌ی صوتی/تصویری که پخش شده است در زمان مکث با خروج به خاطر "
+"بماند با خیر"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
+msgid "Active plugins list"
+msgstr "فهرست متصل‌شونده‌های فعال"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+msgid ""
+"A list of the names of the plugins which are currently active (loaded and "
+"running)."
+msgstr ""
+"فهرستی از نام متصل شونده‌ها که در حال حاضر فعال هستند (بارگذاری شده و در حال "
+"اجرا)."
+
 #: ../data/playlist.ui.h:1
 msgid "_Remove"
 msgstr "_حذف"
@@ -42,23 +255,19 @@
 msgid "Remove file from playlist"
 msgstr "حذف فایل از فهرست پخش"
 
-#: ../data/playlist.ui.h:3
-#: ../data/video-list.ui.h:3
+#: ../data/playlist.ui.h:3 ../data/video-list.ui.h:3
 msgid "_Copy Location"
 msgstr "_رونوشت از مکان"
 
-#: ../data/playlist.ui.h:4
-#: ../data/video-list.ui.h:4
+#: ../data/playlist.ui.h:4 ../data/video-list.ui.h:4
 msgid "Copy the location to the clipboard"
 msgstr "رونوشت از مکان در تخته‌گیره"
 
-#: ../data/playlist.ui.h:5
-#: ../data/totem.ui.h:78
+#: ../data/playlist.ui.h:5 ../data/totem.ui.h:71
 msgid "_Select Text Subtitles..."
 msgstr "_انتخاب متن زیرنویس..."
 
-#: ../data/playlist.ui.h:6
-#: ../data/totem.ui.h:79
+#: ../data/playlist.ui.h:6 ../data/totem.ui.h:72
 msgid "Select a file to use for text subtitles"
 msgstr "یک فایل را برای استفاده به عنوان زیرنویس انتخاب کنید"
 
@@ -82,785 +291,652 @@
 msgid "Move Down"
 msgstr "پایین رفتن"
 
-#: ../data/properties.ui.h:1
-#: ../data/totem.ui.h:122
-msgid "General"
-msgstr "کلی"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:2
+msgid "Normal"
+msgstr "معمولی"
 
-#: ../data/properties.ui.h:2
-msgid "Title:"
-msgstr "عنوان:"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:4
+msgid "Large"
+msgstr "بزرگ"
 
-#: ../data/properties.ui.h:3
-msgid "Artist:"
-msgstr "هنرمند:"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:6
+msgid "Extra Large"
+msgstr "خیلی بزرگ"
 
-#: ../data/properties.ui.h:4
-msgid "Duration:"
-msgstr "مدت:"
+#: ../data/preferences.ui.h:7 ../src/backend/bacon-video-widget.c:5518
+#: ../src/totem-properties-view.c:232
+msgid "Stereo"
+msgstr "استریو"
 
-#: ../data/properties.ui.h:5
-msgid "Year:"
-msgstr "سال:"
+#: ../data/preferences.ui.h:8
+msgid "4-channel"
+msgstr "۴-کانله"
 
-#: ../data/properties.ui.h:6
-msgid "Album:"
-msgstr "آلبوم:"
+#: ../data/preferences.ui.h:9
+msgid "4.1-channel"
+msgstr "۴.۱-کاناله"
 
-#: ../data/properties.ui.h:7
-msgid "Comment:"
-msgstr "توضیح:"
+#: ../data/preferences.ui.h:10
+msgid "5.0-channel"
+msgstr "۵٫۰ -کاناله"
 
-#: ../data/properties.ui.h:8
-msgid "Container:"
-msgstr "محفظه:"
+#: ../data/preferences.ui.h:11
+msgid "5.1-channel"
+msgstr "۵.۱-کاناله"
 
-#: ../data/properties.ui.h:9
-#: ../data/totem.ui.h:128
-#: ../src/totem-properties-view.c:270
-msgid "Video"
-msgstr "ویديو"
+#: ../data/preferences.ui.h:12
+msgid "AC3 Passthrough"
+msgstr "AC3 Passthrough"
 
-#: ../data/properties.ui.h:10
-msgid "Dimensions:"
-msgstr "ابعاد:"
+#: ../data/preferences.ui.h:13
+msgid "Totem Preferences"
+msgstr "ترجیحات توتم"
 
-#: ../data/properties.ui.h:11
-msgid "Codec:"
-msgstr "کُدِک:"
+#: ../data/preferences.ui.h:14
+msgid "Playback"
+msgstr "پخش"
 
-#: ../data/properties.ui.h:12
-msgid "Framerate:"
-msgstr "سرعت فریم:"
+#: ../data/preferences.ui.h:15
+msgid "Start playing files from last position"
+msgstr "شروع به پخش پرونده‌ها از محل قبلی"
 
-#: ../data/properties.ui.h:13
-msgid "Bitrate:"
-msgstr "سرعت بیتی:"
+#: ../data/preferences.ui.h:16
+msgid "Text Subtitles"
+msgstr "زیرنویس‌های متنی"
 
-#: ../data/properties.ui.h:14
-#: ../data/totem.ui.h:142
-#: ../src/totem-properties-view.c:268
-msgid "Audio"
-msgstr "صدا"
+#: ../data/preferences.ui.h:17
+msgid "_Load subtitle files when movie is loaded"
+msgstr "پس از پخش ویديو، _زیرنویس بارگیری شود"
 
-#: ../data/properties.ui.h:15
-msgid "Sample rate:"
-msgstr "سرعت نمونه‌:"
+#: ../data/preferences.ui.h:18
+msgid "_Font:"
+msgstr "_قلم:"
 
-#: ../data/properties.ui.h:16
-msgid "Channels:"
-msgstr "کانال‌ها:"
+#: ../data/preferences.ui.h:19
+msgid "_Encoding:"
+msgstr "_کدگذاری:"
 
-#: ../data/video-list.ui.h:1
-#: ../src/totem-dnd-menu.c:97
-msgid "_Add to Playlist"
-msgstr "_افزودن به فهرست پخش"
+#: ../data/preferences.ui.h:20
+msgid "External Chapters"
+msgstr "فصل‌های خارجی"
 
-#: ../data/video-list.ui.h:2
-msgid "Add the video to the playlist"
-msgstr "افزودن ویديو به فهرست پخش"
+#: ../data/preferences.ui.h:21
+msgid "Load _chapter files when movie is loaded"
+msgstr "بعد از بارگیری فیلم، پرونده‌های فصل _بارگیری شوند"
+
+#: ../data/preferences.ui.h:22 ../data/properties.ui.h:1
+msgid "General"
+msgstr "کلی"
+
+#. Tab label in the Preferences dialogue
+#: ../data/preferences.ui.h:24
+msgid "Display"
+msgstr "نمایش"
+
+#: ../data/preferences.ui.h:25
+msgid "_Resize the window when a new video is loaded"
+msgstr "_تنظیم اندازه پنجره هنگام بارگیری یک ویدیو جدید"
+
+#: ../data/preferences.ui.h:26
+msgid "Disable _deinterlacing of interlaced videos"
+msgstr "غیرفعال کردن _مشبک‌زدایی از ویدیوهای مشبک"
+
+#: ../data/preferences.ui.h:27
+msgid "Disable screensaver when playing "
+msgstr "از کار انداختن محافظ صفحه‌ی نمایش هنگام پخش"
+
+#: ../data/preferences.ui.h:28 ../data/properties.ui.h:9
+#: ../src/totem-properties-view.c:275
+msgid "Video"
+msgstr "ویديو"
+
+#: ../data/preferences.ui.h:29
+msgid "Video or Audio"
+msgstr "ویدیو یا صوت"
+
+#: ../data/preferences.ui.h:30
+msgid "Visual Effects"
+msgstr "جلوه‌های تصویری"
+
+#: ../data/preferences.ui.h:31
+msgid "Show _visual effects when an audio file is played"
+msgstr "نشان دادن _جلوه‌های تصویری هنگام پخش پرونده‌های صوتی"
+
+#: ../data/preferences.ui.h:32
+msgid "_Type of visualization:"
+msgstr "نو_ع تصویرسازی:"
+
+#: ../data/preferences.ui.h:33
+msgid "Visualization _size:"
+msgstr "ا_ندازه‌ی تصویرسازی:"
+
+#: ../data/preferences.ui.h:34
+msgid "Color Balance"
+msgstr "موازنه‌ی رنگی"
+
+#: ../data/preferences.ui.h:35
+msgid "_Brightness:"
+msgstr "_روشنی:"
+
+#: ../data/preferences.ui.h:36
+msgid "Co_ntrast:"
+msgstr "_کنتراست:"
+
+#: ../data/preferences.ui.h:37
+msgid "Sat_uration:"
+msgstr "_غلظت:"
+
+#: ../data/preferences.ui.h:38
+msgid "_Hue:"
+msgstr "_پرده:"
+
+#: ../data/preferences.ui.h:39
+msgid "Reset to _Defaults"
+msgstr "_بازنشانی به پیش‌فرض‌ها"
+
+#: ../data/preferences.ui.h:40
+msgid "Audio Output"
+msgstr "خروجی صوتی"
+
+#: ../data/preferences.ui.h:41
+msgid "_Audio output type:"
+msgstr "نوع خروجی _صوتی:"
+
+#: ../data/preferences.ui.h:42 ../data/properties.ui.h:14
+#: ../src/totem-properties-view.c:273
+msgid "Audio"
+msgstr "صدا"
+
+#: ../data/properties.ui.h:2
+msgid "Title:"
+msgstr "عنوان:"
+
+#: ../data/properties.ui.h:3
+msgid "Artist:"
+msgstr "هنرمند:"
+
+#: ../data/properties.ui.h:4
+msgid "Duration:"
+msgstr "مدت:"
+
+#: ../data/properties.ui.h:5
+msgid "Year:"
+msgstr "سال:"
+
+#: ../data/properties.ui.h:6
+msgid "Album:"
+msgstr "آلبوم:"
+
+#: ../data/properties.ui.h:7
+msgid "Comment:"
+msgstr "توضیح:"
+
+#: ../data/properties.ui.h:8
+msgid "Container:"
+msgstr "محفظه:"
+
+#: ../data/properties.ui.h:10
+msgid "Dimensions:"
+msgstr "ابعاد:"
+
+#: ../data/properties.ui.h:11
+msgid "Codec:"
+msgstr "کُدِک:"
+
+#: ../data/properties.ui.h:12
+msgid "Framerate:"
+msgstr "سرعت فریم:"
+
+#: ../data/properties.ui.h:13
+msgid "Bitrate:"
+msgstr "سرعت بیتی:"
+
+#: ../data/properties.ui.h:15
+msgid "Sample rate:"
+msgstr "سرعت نمونه‌:"
+
+#: ../data/properties.ui.h:16
+msgid "Channels:"
+msgstr "کانال‌ها:"
 
 #. Title
-#: ../data/totem.desktop.in.in.in.h:1
-#: ../data/totem.ui.h:143
-#: ../src/totem-object.c:1667
-msgid "Movie Player"
-msgstr "پخش‌کننده‌ی فیلم"
+#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:80 ../src/totem.c:245
+#: ../src/totem.c:253 ../src/totem-menu.c:789 ../src/totem-object.c:1658
+msgid "Videos"
+msgstr "ویدیوها"
 
 #: ../data/totem.desktop.in.in.in.h:2
-msgid "Play movies and songs"
-msgstr "پخش فیلم و آهنگ"
+msgid "Play movies"
+msgstr "پخش فیلم‌ها"
+
+#: ../data/totem.desktop.in.in.in.h:3
+msgid "Video;Movie;Film;Clip;Series;Player;DVD;TV;Disc;"
+msgstr "ویدئو;فیلم سینمایی;فیلم;کلیپ;سریال;پخش کننده;دی وی دی;تلویزیون;دیسک;"
 
 #: ../data/totem.ui.h:1
-msgid "_Movie"
-msgstr "_فیلم"
+msgid "_Open"
+msgstr "_باز کردن"
 
 #: ../data/totem.ui.h:2
-msgid "_Open..."
-msgstr "_باز کردن..."
+msgid "Open _Location"
+msgstr "باز کردن _مکان"
 
 #: ../data/totem.ui.h:3
-msgid "Open a file"
-msgstr "باز کردن یک پرونده"
+msgid "_Fullscreen"
+msgstr "_تمام‌صفحه"
 
 #: ../data/totem.ui.h:4
-msgid "Open _Location..."
-msgstr "باز کردن _مکان..."
+msgid "Prefere_nces"
+msgstr "_ترجیحات"
 
 #: ../data/totem.ui.h:5
-msgid "Open a non-local file"
-msgstr "باز کردن یک پرونده‌ی غیر محلی"
+msgid "Shuff_le"
+msgstr "حالت ت_صادفی"
 
 #: ../data/totem.ui.h:6
+msgid "_Repeat"
+msgstr "_تکرار"
+
+#: ../data/totem.ui.h:7
+msgid "_Quit"
+msgstr "_خروج"
+
+#: ../data/totem.ui.h:8
+msgid "_Movie"
+msgstr "_فیلم"
+
+#: ../data/totem.ui.h:9
 msgid "_Eject"
 msgstr "_بیرون دادن"
 
-#: ../data/totem.ui.h:7
+#: ../data/totem.ui.h:10
 msgid "Eject the current disc"
 msgstr "بیرون دادن دیسک کنونی"
 
-#: ../data/totem.ui.h:8
+#: ../data/totem.ui.h:11
 msgid "_Properties"
 msgstr "_ویژگی‌ها"
 
-#: ../data/totem.ui.h:9
+#: ../data/totem.ui.h:12
 msgid "View the properties of the current stream"
 msgstr "نمایش ترجیحات جریان جاری"
 
-#: ../data/totem.ui.h:10
+#: ../data/totem.ui.h:13
 msgid "Play / P_ause"
 msgstr "_پخش/مکث"
 
-#: ../data/totem.ui.h:11
+#: ../data/totem.ui.h:14
 msgid "Play or pause the movie"
 msgstr "پخش یا مکث در پخش فیلم"
 
-#: ../data/totem.ui.h:12
-msgid "_Quit"
-msgstr "_خروج"
-
-#: ../data/totem.ui.h:13
-msgid "Quit the program"
-msgstr "ترک برنامه"
-
-#: ../data/totem.ui.h:14
+#: ../data/totem.ui.h:15
 msgid "_Edit"
 msgstr "_ویرایش"
 
-#: ../data/totem.ui.h:15
+#: ../data/totem.ui.h:16
 msgid "_Clear Playlist"
 msgstr "پا_ک کردن فهرست پخش"
 
-#: ../data/totem.ui.h:16
+#: ../data/totem.ui.h:17
 msgid "Clear the playlist"
 msgstr "پاک کردن فهرست پخش"
 
-#: ../data/totem.ui.h:17
-msgid "Prefere_nces"
-msgstr "_ترجیحات"
-
 #: ../data/totem.ui.h:18
-msgid "Configure the application"
-msgstr "پیکربندی برنامه"
-
-#: ../data/totem.ui.h:19
 msgid "Plugins..."
 msgstr "افزونه‌ها..."
 
-#: ../data/totem.ui.h:20
+#: ../data/totem.ui.h:19
 msgid "Configure plugins to extend the application"
 msgstr "پیکربندی افزونه‌ها برای گسترش برنامه"
 
-#: ../data/totem.ui.h:21
+#: ../data/totem.ui.h:20
 msgid "_View"
 msgstr "ن_مایش"
 
-#: ../data/totem.ui.h:22
-msgid "_Fullscreen"
-msgstr "_تمام‌صفحه"
-
-#: ../data/totem.ui.h:23
-msgid "Switch to fullscreen"
-msgstr "رفتن به حالت تمام‌صفحه"
-
-#: ../data/totem.ui.h:24
+#: ../data/totem.ui.h:21
 msgid "Fit Window to Movie"
 msgstr "_هم‌اندازه کردن پنجره با فیلم"
 
-#: ../data/totem.ui.h:25
+#: ../data/totem.ui.h:22
 msgid "_Resize 1:2"
 msgstr "ت_غییر اندازه ۱:۲"
 
-#: ../data/totem.ui.h:26
+#: ../data/totem.ui.h:23
 msgid "Resize to half the original video size"
 msgstr "تغییر اندازه به نصف اندازه‌ی ویدیوی اصلی"
 
-#: ../data/totem.ui.h:27
+#: ../data/totem.ui.h:24
 msgid "Resize _1:1"
 msgstr "تغییر اندازه _۱:۱"
 
-#: ../data/totem.ui.h:28
+#: ../data/totem.ui.h:25
 msgid "Resize to the original video size"
 msgstr "تغییر اندازه به اندازه‌ی ویدیوی اصلی"
 
-#: ../data/totem.ui.h:29
+#: ../data/totem.ui.h:26
 msgid "Resize _2:1"
 msgstr "تغییر اندازه _۲:۱"
 
-#: ../data/totem.ui.h:30
+#: ../data/totem.ui.h:27
 msgid "Resize to double the original video size"
 msgstr "تغییر اندازه به دوبرابر اندازه‌ی ویدیوی اصلی"
 
-#: ../data/totem.ui.h:31
+#: ../data/totem.ui.h:28
 msgid "_Aspect Ratio"
 msgstr "_نسبت عرض به ارتفاع"
 
-#: ../data/totem.ui.h:32
+#: ../data/totem.ui.h:29
 msgid "Switch An_gles"
 msgstr "تعویض _زاویه‌ها"
 
-#: ../data/totem.ui.h:33
+#: ../data/totem.ui.h:30
 msgid "Switch camera angles"
 msgstr "تعویض زاویه‌های دوربین"
 
-#: ../data/totem.ui.h:34
+#: ../data/totem.ui.h:31
 msgid "_Go"
 msgstr "_رفتن"
 
-#: ../data/totem.ui.h:35
+#: ../data/totem.ui.h:32
 msgid "_DVD Menu"
 msgstr "منوی _دی‌وی‌دی"
 
-#: ../data/totem.ui.h:36
+#: ../data/totem.ui.h:33
 msgid "Go to the DVD menu"
 msgstr "رفتن به منوی دی‌وی‌دی"
 
-#: ../data/totem.ui.h:37
+#: ../data/totem.ui.h:34
 msgid "_Title Menu"
 msgstr "منوی _عنوان"
 
-#: ../data/totem.ui.h:38
+#: ../data/totem.ui.h:35
 msgid "Go to the title menu"
 msgstr "رفتن به منوی عنوان"
 
-#: ../data/totem.ui.h:39
+#: ../data/totem.ui.h:36
 msgid "A_udio Menu"
 msgstr "منوی _صدا"
 
-#: ../data/totem.ui.h:40
+#: ../data/totem.ui.h:37
 msgid "Go to the audio menu"
 msgstr "رفتن به منوی صدا"
 
-#: ../data/totem.ui.h:41
+#: ../data/totem.ui.h:38
 msgid "_Angle Menu"
 msgstr "منوی _زاویه"
 
-#: ../data/totem.ui.h:42
+#: ../data/totem.ui.h:39
 msgid "Go to the angle menu"
 msgstr "رفتن به منوی زاویه"
 
-#: ../data/totem.ui.h:43
+#: ../data/totem.ui.h:40
 msgid "_Chapter Menu"
 msgstr "منوی _فصل‌ها"
 
-#: ../data/totem.ui.h:44
+#: ../data/totem.ui.h:41
 msgid "Go to the chapter menu"
 msgstr "‌رفتن به منوی فصل‌ها"
 
-#: ../data/totem.ui.h:45
+#: ../data/totem.ui.h:42
 msgid "_Next Chapter/Movie"
 msgstr "فصل/فیلم _بعدی"
 
-#: ../data/totem.ui.h:46
+#: ../data/totem.ui.h:43
 msgid "Next chapter or movie"
 msgstr "فصل یا فیلم بعدی"
 
-#: ../data/totem.ui.h:47
+#: ../data/totem.ui.h:44
 msgid "_Previous Chapter/Movie"
 msgstr "فصل/فیلم _قبلی"
 
-#: ../data/totem.ui.h:48
+#: ../data/totem.ui.h:45
 msgid "Previous chapter or movie"
 msgstr "فصل یا فیلم قبلی"
 
-#: ../data/totem.ui.h:49
+#: ../data/totem.ui.h:46
 msgid "_Sound"
-msgstr "_صدا"
-
-#: ../data/totem.ui.h:50
-msgid "Volume _Up"
-msgstr "_زیاد کردن صدا"
-
-#: ../data/totem.ui.h:51
-msgid "Increase volume"
-msgstr "بلند کردن صدا"
-
-#: ../data/totem.ui.h:52
-msgid "Volume _Down"
-msgstr "_کم کردن صدا"
-
-#: ../data/totem.ui.h:53
-msgid "Decrease volume"
-msgstr "کم کردن صدا"
-
-#: ../data/totem.ui.h:54
-msgid "_Help"
-msgstr "_راهنما"
-
-#: ../data/totem.ui.h:55
-msgid "_Contents"
-msgstr "_محتویات"
-
-#: ../data/totem.ui.h:56
-msgid "Help contents"
-msgstr "محتویات راهنما"
-
-#: ../data/totem.ui.h:57
-msgid "_About"
-msgstr "_درباره"
-
-#: ../data/totem.ui.h:58
-msgid "About this application"
-msgstr "درباره‌ی این برنامه"
-
-#: ../data/totem.ui.h:59
-msgid "_Repeat Mode"
-msgstr "حالت _تکرار"
-
-#: ../data/totem.ui.h:60
-msgid "Set the repeat mode"
-msgstr "تنظیم حالت تکرار"
-
-#: ../data/totem.ui.h:61
-msgid "Shuff_le Mode"
-msgstr "حالت ت_صادفی"
-
-#: ../data/totem.ui.h:62
-msgid "Set the shuffle mode"
-msgstr "تنظیم حالت تصادفی"
-
-#: ../data/totem.ui.h:63
-msgid "Show _Controls"
-msgstr "نشان دادن _کنترل‌ها"
-
-#: ../data/totem.ui.h:64
-msgid "Show controls"
-msgstr "نشان دادن کنترل‌ها"
-
-#: ../data/totem.ui.h:65
-msgid "S_idebar"
-msgstr "نوار _کناری"
-
-#: ../data/totem.ui.h:66
-msgid "Show or hide the sidebar"
-msgstr "نمایش یا عدم نمایش نوار کناری"
-
-#: ../data/totem.ui.h:67
-msgctxt "Aspect ratio"
-msgid "Auto"
-msgstr "خودکار"
-
-#: ../data/totem.ui.h:68
-msgid "Sets automatic aspect ratio"
-msgstr "تنظیم خودکار نسبت عرض به ارتفاع"
-
-#: ../data/totem.ui.h:69
-msgid "Square"
-msgstr "مربع"
-
-#: ../data/totem.ui.h:70
-msgid "Sets square aspect ratio"
-msgstr "تنظیم نسبت عرض به ارتفاع مربعی"
-
-#: ../data/totem.ui.h:71
-msgid "4:3 (TV)"
-msgstr "۴:۳ (تلویزیون)"
-
-#: ../data/totem.ui.h:72
-msgid "Sets 4:3 (TV) aspect ratio"
-msgstr "تنظیم نسبت عرض به ارتفاع ۴:۳ (تلویزیون)‏"
-
-#: ../data/totem.ui.h:73
-msgid "16:9 (Widescreen)"
-msgstr "۱۶:۹ (صفحه‌ی عریض)"
-
-#: ../data/totem.ui.h:74
-msgid "Sets 16:9 (widescreen) aspect ratio"
-msgstr "تنظیم نسبت عرض به ارتفاع ۱۶:۹ (عریض)‏"
-
-#: ../data/totem.ui.h:75
-msgid "2.11:1 (DVB)"
-msgstr "۲٫۱۱:۱ (DVB)"
-
-#: ../data/totem.ui.h:76
-msgid "Sets 2.11:1 (DVB) aspect ratio"
-msgstr "تنظیم نسبت عرض به ارتفاع ۲٫۱۱:۱ (DVB)"
-
-#: ../data/totem.ui.h:77
-msgid "S_ubtitles"
-msgstr "_زیرنویس‌ها"
-
-#: ../data/totem.ui.h:80
-msgid "_Languages"
-msgstr "_زبان‌ها"
-
-#: ../data/totem.ui.h:81
-msgid "Zoom In"
-msgstr "بزرگ‌نمایی"
-
-#: ../data/totem.ui.h:82
-msgid "Zoom in"
-msgstr "بزرگ‌نمایی"
-
-#: ../data/totem.ui.h:83
-msgid "Skip _Forward"
-msgstr "پرش به _جلو"
-
-#: ../data/totem.ui.h:84
-msgid "Skip forward"
-msgstr "پرش به جلو"
-
-#: ../data/totem.ui.h:85
-msgid "Skip _Backwards"
-msgstr "پرش به _عقب"
-
-#: ../data/totem.ui.h:86
-msgid "Skip backwards"
-msgstr "پرش به عقب"
-
-#: ../data/totem.ui.h:87
-msgid "14.4 Kbps Modem"
-msgstr "مودم با سرعت ۱۴.۴ کیلوبیت/ثانیه"
-
-#: ../data/totem.ui.h:88
-msgid "19.2 Kbps Modem"
-msgstr "مودم با سرعت ۱۹.۲ کیلوبیت/ثانیه"
-
-#: ../data/totem.ui.h:89
-msgid "28.8 Kbps Modem"
-msgstr "مودم با سرعت ۲۸.۸ کیلوبیت/ثانیه"
-
-#: ../data/totem.ui.h:90
-msgid "33.6 Kbps Modem"
-msgstr "مودم با سرعت ۳۳.۶ کیلوبیت/ثانیه"
-
-#: ../data/totem.ui.h:91
-msgid "34.4 Kbps Modem"
-msgstr "مودم با سرعت ۲۴.۴ کیلوبیت/ثانیه"
-
-#: ../data/totem.ui.h:92
-msgid "56 Kbps Modem/ISDN"
-msgstr "مودم/ISDN با سرعت ۵۶ کیلوبیت/ثانیه"
-
-#: ../data/totem.ui.h:93
-msgid "112 Kbps Dual ISDN/DSL"
-msgstr "نوع ISDN/DSL دوگانه با سرعت ۱۱۲ کیلوبیت/ثانیه"
-
-#: ../data/totem.ui.h:94
-msgid "256 Kbps DSL/Cable"
-msgstr "DSL/Cable با سرعت ۲۵۶ کیلوبیت/ثانیه"
-
-#: ../data/totem.ui.h:95
-msgid "384 Kbps DSL/Cable"
-msgstr "نوع DSL/Cable با سرعت ۳۸۴ کیلوبیت/ثانیه"
-
-#: ../data/totem.ui.h:96
-msgid "512 Kbps DSL/Cable"
-msgstr "نوع DSL/Cable با سرعت ۵۱۲ کیلوبیت/ثانیه"
-
-#: ../data/totem.ui.h:97
-msgid "1.5 Mbps T1/Intranet/LAN"
-msgstr "اینترانت/شبکه محلی/T1 با سرعت ۱.۵ Mbps"
-
-#: ../data/totem.ui.h:98
-msgid "Intranet/LAN"
-msgstr "اینترانت/شبکه محلی"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:100
-msgid "Normal"
-msgstr "معمولی"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:102
-msgid "Large"
-msgstr "بزرگ"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:104
-msgid "Extra Large"
-msgstr "خیلی بزرگ"
-
-#: ../data/totem.ui.h:105
-#: ../src/totem-properties-view.c:228
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5593
-msgid "Stereo"
-msgstr "استریو"
-
-#: ../data/totem.ui.h:106
-msgid "4-channel"
-msgstr "۴-کانله"
-
-#: ../data/totem.ui.h:107
-msgid "4.1-channel"
-msgstr "۴.۱-کاناله"
-
-#: ../data/totem.ui.h:108
-msgid "5.0-channel"
-msgstr "۵٫۰ -کاناله"
-
-#: ../data/totem.ui.h:109
-msgid "5.1-channel"
-msgstr "۵.۱-کاناله"
-
-#: ../data/totem.ui.h:110
-msgid "AC3 Passthrough"
-msgstr "AC3 Passthrough"
-
-#: ../data/totem.ui.h:111
-msgid "Totem Preferences"
-msgstr "ترجیحات توتم"
-
-#: ../data/totem.ui.h:112
-msgid "Playback"
-msgstr "پخش"
-
-#: ../data/totem.ui.h:113
-msgid "Start playing files from last position"
-msgstr "شروع به پخش پرونده‌ها از محل قبلی"
-
-#: ../data/totem.ui.h:114
-msgid "Networking"
-msgstr "شبکه"
-
-#: ../data/totem.ui.h:115
-msgid "Connection _speed:"
-msgstr "_سرعت اتصال:"
-
-#: ../data/totem.ui.h:116
-msgid "Text Subtitles"
-msgstr "زیرنویس‌های متنی"
-
-#: ../data/totem.ui.h:117
-msgid "_Load subtitle files when movie is loaded"
-msgstr "پس از پخش ویديو، _زیرنویس بارگیری شود"
-
-#: ../data/totem.ui.h:118
-msgid "_Font:"
-msgstr "_قلم:"
-
-#: ../data/totem.ui.h:119
-msgid "_Encoding:"
-msgstr "_کدگذاری:"
-
-#: ../data/totem.ui.h:120
-msgid "External Chapters"
-msgstr "فصل‌های خارجی"
-
-#: ../data/totem.ui.h:121
-msgid "Load _chapter files when movie is loaded"
-msgstr "بعد از بارگیری فیلم، پرونده‌های فصل _بارگیری شوند"
-
-#. Tab label in the Preferences dialogue
-#: ../data/totem.ui.h:124
-msgid "Display"
-msgstr "نمایش"
-
-#: ../data/totem.ui.h:125
-msgid "_Resize the window when a new video is loaded"
-msgstr "_تنظیم اندازه پنجره هنگام بارگیری یک ویدیو جدید"
-
-#: ../data/totem.ui.h:126
-msgid "Disable _deinterlacing of interlaced videos"
-msgstr "غیرفعال کردن _مشبک‌زدایی از ویدیوهای مشبک"
-
-#: ../data/totem.ui.h:127
-msgid "Disable screensaver when playing "
-msgstr "از کار انداختن محافظ صفحه‌ی نمایش هنگام پخش"
-
-#: ../data/totem.ui.h:129
-msgid "Video or Audio"
-msgstr "ویدیو یا صوت"
-
-#: ../data/totem.ui.h:130
-msgid "Visual Effects"
-msgstr "جلوه‌های تصویری"
-
-#: ../data/totem.ui.h:131
-msgid "Show _visual effects when an audio file is played"
-msgstr "نشان دادن _جلوه‌های تصویری هنگام پخش پرونده‌های صوتی"
-
-#: ../data/totem.ui.h:132
-msgid "_Type of visualization:"
-msgstr "نو_ع تصویرسازی:"
-
-#: ../data/totem.ui.h:133
-msgid "Visualization _size:"
-msgstr "ا_ندازه‌ی تصویرسازی:"
+msgstr "_صدا"
 
-#: ../data/totem.ui.h:134
-msgid "Color Balance"
-msgstr "موازنه‌ی رنگی"
+#: ../data/totem.ui.h:47
+msgid "Volume _Up"
+msgstr "_زیاد کردن صدا"
 
-#: ../data/totem.ui.h:135
-msgid "_Brightness:"
-msgstr "_روشنی:"
+#: ../data/totem.ui.h:48
+msgid "Increase volume"
+msgstr "بلند کردن صدا"
 
-#: ../data/totem.ui.h:136
-msgid "Co_ntrast:"
-msgstr "_کنتراست:"
+#: ../data/totem.ui.h:49
+msgid "Volume _Down"
+msgstr "_کم کردن صدا"
 
-#: ../data/totem.ui.h:137
-msgid "Sat_uration:"
-msgstr "_غلظت:"
+#: ../data/totem.ui.h:50
+msgid "Decrease volume"
+msgstr "کم کردن صدا"
 
-#: ../data/totem.ui.h:138
-msgid "_Hue:"
-msgstr "_پرده:"
+#: ../data/totem.ui.h:51
+msgid "_Help"
+msgstr "_راهنما"
 
-#: ../data/totem.ui.h:139
-msgid "Reset to _Defaults"
-msgstr "_بازنشانی به پیش‌فرض‌ها"
+#: ../data/totem.ui.h:52
+msgid "_Contents"
+msgstr "_محتویات"
 
-#: ../data/totem.ui.h:140
-msgid "Audio Output"
-msgstr "خروجی صوتی"
+#: ../data/totem.ui.h:53
+msgid "Help contents"
+msgstr "محتویات راهنما"
 
-#: ../data/totem.ui.h:141
-msgid "_Audio output type:"
-msgstr "نوع خروجی _صوتی:"
+#: ../data/totem.ui.h:54
+msgid "_About"
+msgstr "_درباره"
 
-#: ../data/totem.ui.h:145
-msgid "Time seek bar"
-msgstr "نوار پویش زمان"
+#: ../data/totem.ui.h:55
+msgid "About this application"
+msgstr "درباره‌ی این برنامه"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
-msgid "Allow the screensaver to activate when playing audio"
-msgstr "اجازه بده تا محافظ صفحه‌نمایش در هنگام پخش صوت فعال شود"
+#: ../data/totem.ui.h:56
+msgid "Show _Controls"
+msgstr "نشان دادن _کنترل‌ها"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
-msgid "Allow the screensaver to activate when playing audio. Disable if you have monitor-powered speakers."
-msgstr "هنگام پخش صوت اجازه‌ی فعالیت محافظ صفحه نمایش را بده. در صورت داشتن بلندگوهای monitor-powered این گزینه را غیرفعال کنید."
+#: ../data/totem.ui.h:57
+msgid "Show controls"
+msgstr "نشان دادن کنترل‌ها"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
-msgid "Show visual effects when no video is displayed"
-msgstr "نشان دادن جلوه‌های تصویری وقتی ویدیویی پخش نمی‌شود"
+#: ../data/totem.ui.h:58
+msgid "S_idebar"
+msgstr "نوار _کناری"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
-msgid "Show visual effects when playing an audio only file."
-msgstr "نشان دادن جلوه‌های تصویری هنگام پخش پرونده‌های فقط صوتی"
+#: ../data/totem.ui.h:59
+msgid "Show or hide the sidebar"
+msgstr "نمایش یا عدم نمایش نوار کناری"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
-msgid "Name of the visual effects plugin"
-msgstr "نام متصل‌شونده‌ی جلوه‌های تصویری"
+#: ../data/totem.ui.h:60
+msgctxt "Aspect ratio"
+msgid "Auto"
+msgstr "خودکار"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
-msgid "The brightness of the video"
-msgstr "روشنی ویدیو"
+#: ../data/totem.ui.h:61
+msgid "Sets automatic aspect ratio"
+msgstr "تنظیم خودکار نسبت عرض به ارتفاع"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
-msgid "The contrast of the video"
-msgstr "کنتراست ویدیو"
+#: ../data/totem.ui.h:62
+msgid "Square"
+msgstr "مربع"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
-msgid "The hue of the video"
-msgstr "پرده‌ی رنگ ویدیو"
+#: ../data/totem.ui.h:63
+msgid "Sets square aspect ratio"
+msgstr "تنظیم نسبت عرض به ارتفاع مربعی"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
-msgid "The saturation of the video"
-msgstr "غلظت رنگ ویدیو"
+#: ../data/totem.ui.h:64
+msgid "4:3 (TV)"
+msgstr "۴:۳ (تلویزیون)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
-msgid "Resize the canvas automatically on file load"
-msgstr "تغییر اندازه‌ی خودکار بوم هنگام بار کردن پرونده"
+#: ../data/totem.ui.h:65
+msgid "Sets 4:3 (TV) aspect ratio"
+msgstr "تنظیم نسبت عرض به ارتفاع ۴:۳ (تلویزیون)‏"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
-msgid "Network connection speed"
-msgstr "سرعت اتصال شبکه"
+#: ../data/totem.ui.h:66
+msgid "16:9 (Widescreen)"
+msgstr "۱۶:۹ (صفحه‌ی عریض)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
-msgid "Approximate network connection speed, used to select quality on media over the network."
-msgstr "سرعت تقریبی اتصال شبکه، برای انتخاب کیفیت در رسانه بر روی شبکه استفاده می‌شود."
+#: ../data/totem.ui.h:67
+msgid "Sets 16:9 (widescreen) aspect ratio"
+msgstr "تنظیم نسبت عرض به ارتفاع ۱۶:۹ (عریض)‏"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
-msgid "Repeat mode"
-msgstr "حالت تکرار"
+#: ../data/totem.ui.h:68
+msgid "2.11:1 (DVB)"
+msgstr "۲٫۱۱:۱ (DVB)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
-msgid "Shuffle mode"
-msgstr "حالت تصادفی"
+#: ../data/totem.ui.h:69
+msgid "Sets 2.11:1 (DVB) aspect ratio"
+msgstr "تنظیم نسبت عرض به ارتفاع ۲٫۱۱:۱ (DVB)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
-msgid "Whether to disable deinterlacing for interlaced movies"
-msgstr "اینکه آیا مشبک‌زدایی از تصاویر مشبک غیرفعال شود"
+#: ../data/totem.ui.h:70
+msgid "S_ubtitles"
+msgstr "_زیرنویس‌ها"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
-msgid "Whether to enable debug for the playback engine"
-msgstr "این که آیا اشکال‌زدا برای موتور پخش به کار انداخته بشود یا نه."
+#: ../data/totem.ui.h:73
+msgid "_Languages"
+msgstr "_زبان‌ها"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
-msgid "Type of audio output to use"
-msgstr "نوع خروجی صوتی که استفاده می‌شود"
+#: ../data/totem.ui.h:74
+msgid "Zoom In"
+msgstr "بزرگ‌نمایی"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
-msgid "Visualization quality setting"
-msgstr "تنظیمات کیفیت تصویرسازی"
+#: ../data/totem.ui.h:75
+msgid "Zoom in"
+msgstr "بزرگ‌نمایی"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
-msgid "Quality setting for the audio visualization."
-msgstr "تنظیمات کیفیت برای تصویر‌سازی صوتی"
+#: ../data/totem.ui.h:76
+msgid "Skip _Forward"
+msgstr "پرش به _جلو"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
-msgid "Network buffering threshold"
-msgstr "آستانه‌ی میانگیری شبکه"
+#: ../data/totem.ui.h:77
+msgid "Skip forward"
+msgstr "پرش به جلو"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
-msgid "Amount of data to buffer for network streams before starting to display the stream (in seconds)."
-msgstr "مقدار اطلاعاتی که برای جریان‌های شبکه‌ای، قبل از نمایش دادن جریان‌ها میانگیر می‌شود (به ثانیه)"
+#: ../data/totem.ui.h:78
+msgid "Skip _Backwards"
+msgstr "پرش به _عقب"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
-msgid "Subtitle font"
-msgstr "قلم زیرنویس"
+#: ../data/totem.ui.h:79
+msgid "Skip backwards"
+msgstr "پرش به عقب"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
-msgid "Pango font description for subtitle rendering."
-msgstr "شرح قلم پانگو برای رسم زیرنویس"
+#: ../data/totem.ui.h:82
+msgid "Time seek bar"
+msgstr "نوار پویش زمان"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
-msgid "Subtitle encoding"
-msgstr "کدگذاری زیرنویس"
+#: ../data/uri.ui.h:1
+msgid "Enter the _address of the file you would like to open:"
+msgstr "_نشانی پرونده‌ای را که می‌خواهید باز کنید وارد کنید:"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
-msgid "Encoding character set for subtitle."
-msgstr "دسته‌ی کدگذاری، برای زیرنویس"
+#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
+msgid "_Add to Playlist"
+msgstr "_افزودن به فهرست پخش"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
-msgid "Default location for the \"Open...\" dialogs"
-msgstr "مکان پیش فرض برای محاوره‌های «باز کردن...»"
+#: ../data/video-list.ui.h:2
+msgid "Add the video to the playlist"
+msgstr "افزودن ویديو به فهرست پخش"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
-msgid "Default location for the \"Open...\" dialogs. Default is the current directory."
-msgstr "مکان پیش فرض برای محاوره‌های «بازکردن...». مکان پیش فرض شاخه‌ی فعلی می باشد"
+#: ../src/backend/bacon-video-widget.c:1643
+msgid "Password requested for RTSP server"
+msgstr "گذرواژه برای کارگزار RTSP درخواست شده است"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
-msgid "Default location for the \"Take Screenshot\" dialogs"
-msgstr "مکان پیش فرض برای محاوره‌های «عکس گرفتن از صفحه»"
+#: ../src/backend/bacon-video-widget.c:2940
+#, c-format
+msgid "Audio Track #%d"
+msgstr "قطعه صدا #%Id"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
-msgid "Default location for the \"Take Screenshot\" dialogs. Default is the Pictures directory."
-msgstr "مکان پیش فرض برای محاوره‌های «عکس گرفتن از صفحه». محل پیش‌فرض شاخه‌ی عکس‌ها می‌باشد"
+#: ../src/backend/bacon-video-widget.c:2944
+#, c-format
+msgid "Subtitle #%d"
+msgstr "زیرنویس #%Id"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
-msgid "Whether to disable the plugins in the user's home directory"
-msgstr "اینکه متصل‌شونده‌های موجود در شاخه home کاربر غیر فعال شوند"
+#: ../src/backend/bacon-video-widget.c:3341
+msgid "The server you are trying to connect to is not known."
+msgstr "کارگزاری که شما در تلاش برای اتصال به آن هستید، شناخته شده نیست."
+
+#: ../src/backend/bacon-video-widget.c:3344
+msgid "The connection to this server was refused."
+msgstr "اتصال به کارگزار رد شد."
+
+#: ../src/backend/bacon-video-widget.c:3347
+msgid "The specified movie could not be found."
+msgstr "فیلم مشخص شده را نمی‌توان پیدا کرد."
+
+#: ../src/backend/bacon-video-widget.c:3354
+msgid "The server refused access to this file or stream."
+msgstr "کارگزار دسترسی به این پرونده یا جریان را رد کرد."
+
+#: ../src/backend/bacon-video-widget.c:3360
+msgid "Authentication is required to access this file or stream."
+msgstr "تصدیق‌هویت جهت دسترسی به این پرونده یا جریان لازم است."
+
+#: ../src/backend/bacon-video-widget.c:3367
+msgid "You are not allowed to open this file."
+msgstr "شما اجازه باز کردن این پرونده را ندارید."
+
+#: ../src/backend/bacon-video-widget.c:3372
+msgid "This location is not a valid one."
+msgstr "این مکان یک مکان معتبر نیست."
+
+#: ../src/backend/bacon-video-widget.c:3380
+msgid "The movie could not be read."
+msgstr "فیلم قابل خواندن نیست."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
-msgid "Whether to disable the keyboard shortcuts"
-msgstr "اینکه آیا میانبرهای صفحه کلید غیرفعال شوند"
+#. should be exactly one missing thing (source or converter)
+#: ../src/backend/bacon-video-widget.c:3403
+#: ../src/backend/bacon-video-widget.c:3411
+#, c-format
+msgid "The playback of this movie requires a %s plugin which is not installed."
+msgid_plural ""
+"The playback of this movie requires the following decoders which are not "
+"installed:\n"
+"\n"
+"%s"
+msgstr[0] "پخش این فیلم نیازمند پلاگین %s است که نصب نشده است."
+msgstr[1] ""
+"پخش این فیلم نیازمند رمزگشاهای مقابل است که نصب نشده‌اند:\n"
+"\n"
+"%s"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
-msgid "Whether to autoload text subtitle files when a movie is loaded"
-msgstr "اینکه پس از بارگیری فیلم به طور خودکار پرونده‌های زیرنویس بارگیری شوند."
+#: ../src/backend/bacon-video-widget.c:3422
+msgid ""
+"An audio or video stream is not handled due to missing codecs. You might "
+"need to install additional plugins to be able to play some types of movies"
+msgstr ""
+"یک جریان صوتی یا تصویری به دلیل نبود کُدِک مناسب قابل اجرا نیست. ممکن است لازم "
+"باشد جهت پخش بعضی از انواع فیلم‌ها، افزونه‌ای اضافی نصب کنید"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
-msgid "Whether to autoload external chapter files when a movie is loaded"
-msgstr "اینکه پس از بارگیری فیلم، پرونده‌های فصل‌های خارجی به طور خودکار بارگیری شوند."
+#: ../src/backend/bacon-video-widget.c:3432
+msgid ""
+"This file cannot be played over the network. Try downloading it locally "
+"first."
+msgstr ""
+"نمی توان این فایل را از شبکه پخش نمود. سعی کنید اول آنرا اول بارگیری کنید."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
-msgid "Whether to remember the position of played audio/video files when pausing or closing them"
-msgstr "اینکه آیا محل پرونده‌ی صوتی/تصویری که پخش شده است در زمان مکث با خروج به خاطر بماند با خیر"
+#: ../src/backend/bacon-video-widget.c:5514 ../src/totem-properties-view.c:228
+msgid "Surround"
+msgstr "فراگیر"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:35
-msgid "Active plugins list"
-msgstr "فهرست متصل‌شونده‌های فعال"
+#: ../src/backend/bacon-video-widget.c:5516 ../src/totem-properties-view.c:230
+msgid "Mono"
+msgstr "واحد"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:36
-msgid "A list of the names of the plugins which are currently active (loaded and running)."
-msgstr "فهرستی از نام متصل شونده‌ها که در حال حاضر فعال هستند (بارگذاری شده و در حال اجرا)."
+#: ../src/backend/bacon-video-widget.c:5801
+msgid "Media contains no supported video streams."
+msgstr "رسانه حاوی هیچ ویدیوی جاری پشتیبانی شده‌ای نیست."
 
-#: ../data/uri.ui.h:1
-msgid "Enter the _address of the file you would like to open:"
-msgstr "_نشانی پرونده‌ای را که می‌خواهید باز کنید وارد کنید:"
+#: ../src/backend/bacon-video-widget.c:5981
+msgid ""
+"Some necessary plug-ins are missing. Make sure that the program is correctly "
+"installed."
+msgstr ""
+"تعدادی از افزونه‌های لازم موجود نیست. مطمئن شوید که برنامه به‌درستی نصب شده "
+"است."
 
 #: ../src/eggdesktopfile.c:165
 #, c-format
@@ -925,8 +1001,14 @@
 #. Translators: the parameter is a filename
 #: ../src/eggfileformatchooser.c:657
 #, c-format
-msgid "The program was not able to find out the file format you want to use for `%s'. Please make sure to use a known extension for that file or manually choose a file format from the list below."
-msgstr "برنامه قادر به پیدا کردن قالبی که شما برای استفاده در «%s» انتخاب کرده‌اید نشد. لطفا مطمئن شوید که از یک پسوند شناخته شده برای آن پرونده استفاده می‌کنید و یا به صورت دستی یک قالب از فهرست زیر انتخاب کنید."
+msgid ""
+"The program was not able to find out the file format you want to use for `"
+"%s'. Please make sure to use a known extension for that file or manually "
+"choose a file format from the list below."
+msgstr ""
+"برنامه قادر به پیدا کردن قالبی که شما برای استفاده در «%s» انتخاب کرده‌اید "
+"نشد. لطفا مطمئن شوید که از یک پسوند شناخته شده برای آن پرونده استفاده می‌کنید "
+"و یا به صورت دستی یک قالب از فهرست زیر انتخاب کنید."
 
 #: ../src/eggfileformatchooser.c:664
 msgid "File format not recognized"
@@ -956,9 +1038,34 @@
 msgid "Session management options:"
 msgstr "گزینه‌های مدیریت نشست:"
 
-#: ../src/eggsmclient.c:254
-msgid "Show session management options"
-msgstr "نمایش گزینه‌های مدیریت نشست"
+#: ../src/eggsmclient.c:254
+msgid "Show session management options"
+msgstr "نمایش گزینه‌های مدیریت نشست"
+
+#. hour:minutes:seconds
+#. Translators: This is a time format, like "9:05:02" for 9
+#. * hours, 5 minutes, and 2 seconds. You may change ":" to
+#. * the separator that your locale uses or use "%Id" instead
+#. * of "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:56
+#: ../src/plugins/skipto/totem-time-entry.c:57
+#, c-format
+msgctxt "long time format"
+msgid "%d:%02d:%02d"
+msgstr "%Id:%I02d:%I02d"
+
+#. minutes:seconds
+#. Translators: This is a time format, like "5:02" for 5
+#. * minutes and 2 seconds. You may change ":" to the
+#. * separator that your locale uses or use "%Id" instead of
+#. * "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:65
+#, c-format
+msgctxt "short time format"
+msgid "%d:%02d"
+msgstr "%Id:%I02d"
 
 #. Title
 #. Artist
@@ -1064,10 +1171,14 @@
 msgstr[0] "%Id فریم بر ثانیه"
 msgstr[1] "%Id فریم بر ثانیه"
 
-#: ../src/totem-audio-preview.c:168
+#: ../src/totem-audio-preview.c:137
 msgid "Audio Preview"
 msgstr "پیش‌نمایش صوتی"
 
+#: ../src/totem.c:246
+msgid "Verify your system installation. Totem will now exit."
+msgstr "از صحت نصب سیستمتان مطمئن شوید. توتم خارج می‌شود."
+
 #: ../src/totem-cell-renderer-video.c:126
 msgid "Unknown video"
 msgstr "ویديوی ناشناس"
@@ -1080,12 +1191,11 @@
 msgid "Cancel"
 msgstr "لغو"
 
-#: ../src/totem-fullscreen.c:616
+#: ../src/totem-fullscreen.c:573
 msgid "No File"
 msgstr "پرونده‌ای نیست"
 
-#: ../src/totem-interface.c:181
-#: ../src/totem-interface.c:224
+#: ../src/totem-interface.c:181 ../src/totem-interface.c:224
 #, c-format
 msgid "Couldn't load the '%s' interface. %s"
 msgstr "بار کردن واسط «%s» ممکن نبود. %s"
@@ -1094,71 +1204,66 @@
 msgid "The file does not exist."
 msgstr "پرونده وجود ندارد."
 
-#: ../src/totem-interface.c:183
-#: ../src/totem-interface.c:185
-#: ../src/totem-interface.c:226
-#: ../src/totem-interface.c:228
+#: ../src/totem-interface.c:183 ../src/totem-interface.c:185
+#: ../src/totem-interface.c:226 ../src/totem-interface.c:228
 msgid "Make sure that Totem is properly installed."
 msgstr "اطمینان حاصل کنید که توتم درست نصب شده است."
 
-#: ../src/totem-interface.c:347
-msgid "Totem 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."
-msgstr "توتم یک نرم افزار آزاد است. شما می توانید بر اساس شروط مجوز GPL که توسط بنیاد نرم افزار های آزاد (FSF) منتشر شده است، آنرا تغییر داده و یا توزیع مجدد نمایید شما می توانید با صلاحدید خودتان از نسخه ۲ مجوز GPL یا نسخه های بعدی استفاده کنید."
-
-#: ../src/totem-interface.c:351
-msgid "Totem 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 General Public License for more details."
-msgstr "توتم به این امید توزیع می شود که کارآیی لازم را داشته باشد، ولی هیچ تضمینی نمی دهد. حتی تضمین ضمنی برای کارامدی یا مناسب بودن برای یک کاربرد خاص. برای اطلاعات بیشتر مجوز GPL را ملاحظه نمایید."
-
-#: ../src/totem-interface.c:355
-msgid "You should have received a copy of the GNU General Public License along with Totem; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA"
-msgstr "احتمالا شما یک کپی از مجوز GPL را همراه توتم دریافت نموده اید. در غیر این صورت تقاضای دریافت یک کپی را به آدرس زیر ارسال نمایید: Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA"
+#: ../src/totem-interface.c:357
+msgid ""
+"Totem 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."
+msgstr ""
+"توتم یک نرم افزار آزاد است. شما می توانید بر اساس شروط مجوز GPL که توسط "
+"بنیاد نرم افزار های آزاد (FSF) منتشر شده است، آنرا تغییر داده و یا توزیع "
+"مجدد نمایید شما می توانید با صلاحدید خودتان از نسخه ۲ مجوز GPL یا نسخه های "
+"بعدی استفاده کنید."
+
+#: ../src/totem-interface.c:361
+msgid ""
+"Totem 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 General Public License for more "
+"details."
+msgstr ""
+"توتم به این امید توزیع می شود که کارآیی لازم را داشته باشد، ولی هیچ تضمینی "
+"نمی دهد. حتی تضمین ضمنی برای کارامدی یا مناسب بودن برای یک کاربرد خاص. برای "
+"اطلاعات بیشتر مجوز GPL را ملاحظه نمایید."
+
+#: ../src/totem-interface.c:365
+msgid ""
+"You should have received a copy of the GNU General Public License along with "
+"Totem; if not, write to the Free Software Foundation, Inc., 59 Temple Place, "
+"Suite 330, Boston, MA  02111-1307  USA"
+msgstr ""
+"احتمالا شما یک کپی از مجوز GPL را همراه توتم دریافت نموده اید. در غیر این "
+"صورت تقاضای دریافت یک کپی را به آدرس زیر ارسال نمایید: Free Software "
+"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA"
 
-#: ../src/totem-interface.c:358
-msgid "Totem contains an exception to allow the use of proprietary GStreamer plugins."
+#: ../src/totem-interface.c:368
+msgid ""
+"Totem contains an exception to allow the use of proprietary GStreamer "
+"plugins."
 msgstr "توتم حاوی یک استثنا برای استفاده اختصاصی از پلاگین GStreamer می باشد."
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:190
+#: ../src/totem-menu.c:291
 msgid "None"
 msgstr "هیچ‌کدام"
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:195
+#: ../src/totem-menu.c:296
 msgctxt "Language"
 msgid "Auto"
 msgstr "خودکار"
 
-#. Translators:
-#. * This is not a JPEG image, but a disc image, for example,
-#. * an ISO file
-#: ../src/totem-menu.c:765
-#, c-format
-msgid "Play Image '%s'"
-msgstr "پخش تصویر دیسک '%s'"
-
-#: ../src/totem-menu.c:768
-#: ../src/totem-menu.c:851
-#, c-format
-msgid "device%d"
-msgstr "ابزار %Id"
-
-#: ../src/totem-menu.c:848
-#, c-format
-msgid "Play Disc '%s'"
-msgstr "پخش دیسک «%s»"
-
-#. This lists the back-end type and version, such as
-#. * Movie Player using GStreamer 0.10.1
-#: ../src/totem-menu.c:1189
-#, c-format
-msgid "Movie Player using %s"
-msgstr "پخش‌کننده‌ی فیلم با استفاده از %s"
-
-#: ../src/totem-menu.c:1193
+#: ../src/totem-menu.c:788
 msgid "Copyright © 2002-2009 Bastien Nocera"
 msgstr "Copyright © 2002-2005 Bastien Nocera"
 
-#: ../src/totem-menu.c:1198
+#: ../src/totem-menu.c:792
 msgid "translator-credits"
 msgstr ""
 "مهیار مقیمی \n"
@@ -1167,149 +1272,78 @@
 "روزبه پورنادر \n"
 "آرش موسوی "
 
-#: ../src/totem-menu.c:1202
+#: ../src/totem-menu.c:796
 msgid "Totem Website"
 msgstr "پایگاه وب توتم"
 
-#: ../src/totem-menu.c:1236
+#: ../src/totem-menu.c:827
 msgid "Configure Plugins"
 msgstr "پیکربندی افزونه‌ها"
 
+#: ../src/totem-object.c:162
+#, c-format
+msgid ""
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"%s\n"
+"برای مشاهده لیست کاملی از گزینه‌های خط فرمان دستور '%s --help' را اجرا "
+"نمایید.\n"
+
 #. Translators: %s is the totem version number
-#: ../src/totem-object.c:471
+#: ../src/totem-object.c:591
 #, c-format
 msgid "Totem %s"
 msgstr "توتم  %s"
 
-#: ../src/totem-object.c:1047
-#: ../browser-plugin/totem-plugin-viewer.c:367
-msgid "Playing"
-msgstr "در حال پخش"
-
-#: ../src/totem-object.c:1049
-#: ../src/totem-options.c:52
+#: ../src/totem-object.c:1168 ../src/totem-options.c:52
 msgid "Pause"
 msgstr "مکث"
 
-#: ../src/totem-object.c:1054
-#: ../browser-plugin/totem-plugin-viewer.c:363
-msgid "Paused"
-msgstr "مکث شده"
-
-#: ../src/totem-object.c:1056
-#: ../src/totem-object.c:1066
+#: ../src/totem-object.c:1175 ../src/totem-object.c:1185
 #: ../src/totem-options.c:51
 msgid "Play"
 msgstr "پخش"
 
-#: ../src/totem-object.c:1061
-#: ../src/totem-object.c:1659
-#: ../src/totem-statusbar.c:115
-#: ../browser-plugin/totem-plugin-viewer.c:351
-msgid "Stopped"
-msgstr "متوقف شده"
-
-#: ../src/totem-object.c:1142
-#: ../src/totem-object.c:1169
-#: ../src/totem-object.c:1799
-#: ../src/totem-object.c:1963
+#: ../src/totem-object.c:1267 ../src/totem-object.c:1294
+#: ../src/totem-object.c:1787 ../src/totem-object.c:1942
 #, c-format
 msgid "Totem could not play '%s'."
 msgstr "توتم نتوانست «%s» را پخش کند."
 
-#: ../src/totem-object.c:1246
-#, c-format
-msgid "Totem could not play this media (%s) although a plugin is present to handle it."
-msgstr "توتم نتوانست این رسانه (%s) را پخش کند هر چند متصل‌شونده‌ای برای کار کردن با آن موجود است."
-
-#: ../src/totem-object.c:1247
-msgid "You might want to check that a disc is present in the drive and that it is correctly configured."
-msgstr "بهتر از وجود دیسک در دیسک‌گردان و پیکریندی صحیح آن  مطمئن شوید."
-
-#: ../src/totem-object.c:1255
-msgid "More information about media plugins"
-msgstr "اطلاعات بیشتر درباره افزونه‌های صوتی/تصویری"
-
-#: ../src/totem-object.c:1256
-msgid "Please install the necessary plugins and restart Totem to be able to play this media."
-msgstr "لطفاٌ متصل‌شونده‌های مورد نیاز را نصب کنید و توتم را مجدداً راه‌اندازی کنید تا بتواند این رسانه را پخش کند."
-
-#: ../src/totem-object.c:1258
-#, c-format
-msgid "Totem cannot play this type of media (%s) because it does not have the appropriate plugins to be able to read from the disc."
-msgstr "توتم نمی‌تواند این نوع رسانه (%s) را پخش کند چون پلاگین های مناسب برای کار کردن با آن را ندارد تا بتواند دیسک را بخواند."
-
-#: ../src/totem-object.c:1260
-#, c-format
-msgid "Totem cannot play this type of media (%s) because you do not have the appropriate plugins to handle it."
-msgstr "توتم نمی‌تواند این نوع رسانه (%s) را پخش کند چون شما متصل‌شونده‌های مناسب برای کار کردن با آن را ندارید."
-
-#: ../src/totem-object.c:1263
-#, c-format
-msgid "Totem cannot play this type of media (%s) because it is not supported."
-msgstr "توتم نمی‌تواند این نوع رسانه (%s) را پخش کند چون این نوع رسانه پشتیبانی نمی شود."
-
-#: ../src/totem-object.c:1264
-msgid "Please insert another disc to play back."
-msgstr "لطفا دیسک دیگری برای پخش کردن وارد کنید."
-
-#: ../src/totem-object.c:1300
-msgid "Totem was not able to play this disc."
-msgstr "توتم نتوانست این دیسک را پخش نماید."
-
-#: ../src/totem-object.c:1301
-#: ../src/totem-object.c:4229
-msgid "No reason."
-msgstr "بدون دلیل."
-
-#: ../src/totem-object.c:1315
-msgid "Totem does not support playback of Audio CDs"
-msgstr "توتم از دیسک های صوتی پشتیبانی نمی‌کند."
-
-#: ../src/totem-object.c:1316
-msgid "Please consider using a music player or a CD extractor to play this CD"
-msgstr "برای پخش کردن این سی دی بهتر است از یک نرم افزار پخش موزیک یا نرم افزار استخراج فایل‌های صوتی استفاده کنید"
-
-#: ../src/totem-object.c:1805
+#: ../src/totem-object.c:1793
 msgid "No error message"
 msgstr "پیغام خطایی وجود ندارد"
 
-#: ../src/totem-object.c:2154
+#: ../src/totem-object.c:2133
 msgid "Totem could not display the help contents."
 msgstr "توتم نتوانست محتویات راهنما را نمایش دهد."
 
-#: ../src/totem-object.c:2493
-#: ../src/totem-object.c:2495
-#: ../browser-plugin/totem-plugin-viewer.c:1417
-msgid "An error occurred"
-msgstr "خطایی پیش آمد"
-
-#: ../src/totem-object.c:4064
-#: ../src/totem-object.c:4066
+#: ../src/totem-object.c:4019 ../src/totem-object.c:4021
 msgid "Previous Chapter/Movie"
 msgstr "فصل/فیلم قبلی"
 
-#: ../src/totem-object.c:4073
-#: ../src/totem-object.c:4075
+#: ../src/totem-object.c:4028 ../src/totem-object.c:4030
 msgid "Play / Pause"
 msgstr "پخش / مکث"
 
-#: ../src/totem-object.c:4083
-#: ../src/totem-object.c:4085
+#: ../src/totem-object.c:4038 ../src/totem-object.c:4040
 msgid "Next Chapter/Movie"
 msgstr "فصل/فیلم بعدی"
 
-#. Translators: this is the tooltip text for the fullscreen button in the controls box in Totem's main window.
 #. Translators: this is the accessibility text for the fullscreen button in the controls box in Totem's main window.
-#: ../src/totem-object.c:4097
-#: ../src/totem-object.c:4099
+#: ../src/totem-object.c:4051 ../src/totem-object.c:4053
 msgid "Fullscreen"
 msgstr "تمام‌صفحه"
 
-#: ../src/totem-object.c:4229
+#: ../src/totem-object.c:4184
 msgid "Totem could not startup."
 msgstr "توتم نتوانست شروع به کار کند."
 
+#: ../src/totem-object.c:4184
+msgid "No reason."
+msgstr "بدون دلیل."
+
 #: ../src/totem-open-location.c:182
 msgid "Open Location..."
 msgstr "باز کردن مکان..."
@@ -1364,7 +1398,7 @@
 
 #: ../src/totem-options.c:63
 msgid "Enqueue"
-msgstr "ورود به صف"
+msgstr "قراردادن در صف"
 
 #: ../src/totem-options.c:64
 msgid "Replace"
@@ -1383,119 +1417,111 @@
 msgid "Movies to play"
 msgstr "فیلم هایی که پخش خواهد شد"
 
-#: ../src/totem-options.c:117
+#: ../src/totem-options.c:79
+msgid "- Play movies and songs"
+msgstr "- آهنگ ها و فیلم ها را پخش کن"
+
+#: ../src/totem-options.c:142
 msgid "Can't enqueue and replace at the same time"
 msgstr "صف‌بندی و جایگزین‌کردن در یک‌زمان ممکن نیست"
 
 #. By extension entry
-#: ../src/totem-playlist.c:161
+#: ../src/totem-playlist.c:162
 msgid "MP3 ShoutCast playlist"
 msgstr "فهرست پخش MP3 ShoutCast"
 
-#: ../src/totem-playlist.c:162
+#: ../src/totem-playlist.c:163
 msgid "MP3 audio (streamed)"
 msgstr "قالب صوتی MP3(جریان یافته)"
 
-#: ../src/totem-playlist.c:163
+#: ../src/totem-playlist.c:164
 msgid "MP3 audio (streamed, DOS format)"
 msgstr "قالب صوتی MP3 (جریان یافته،قالب DOS)"
 
-#: ../src/totem-playlist.c:164
+#: ../src/totem-playlist.c:165
 msgid "XML Shareable Playlist"
 msgstr "قالب فهرست پخش قابل اشتراک XML ‏(XSPF)"
 
 #. This is "Title 3", where title is a DVD title
 #. * Note: NOT a DVD chapter
-#: ../src/totem-playlist.c:347
+#: ../src/totem-playlist.c:348
 #, c-format
 msgid "Title %d"
 msgstr "عنوان: %Id"
 
-#: ../src/totem-playlist.c:446
+#: ../src/totem-playlist.c:447
 msgid "Could not save the playlist"
 msgstr "ذخیره‌ی فهرست پخش ممکن نشد"
 
-#: ../src/totem-playlist.c:1021
+#: ../src/totem-playlist.c:1022
 msgid "Save Playlist"
 msgstr "ذخیره‌ی فهرست پخش"
 
 #. translators: Playlist is the default saved playlist filename,
 #. * without the suffix
-#: ../src/totem-playlist.c:1033
-#: ../src/totem-playlist.c:1264
-#: ../src/totem-sidebar.c:142
+#: ../src/totem-playlist.c:1034 ../src/totem-playlist.c:1263
+#: ../src/totem-sidebar.c:145
 msgid "Playlist"
 msgstr "فهرست پخش"
 
-#: ../src/totem-playlist.c:1857
+#: ../src/totem-playlist.c:1862
 #, c-format
 msgid "The playlist '%s' could not be parsed. It might be damaged."
 msgstr "تجزیه‌ی فهرست پخش «%s» ممکن نبود، ممکن است آسیب دیده باشد."
 
-#: ../src/totem-playlist.c:1858
+#: ../src/totem-playlist.c:1863
 msgid "Playlist error"
 msgstr "خطای فهرست پخش"
 
-#: ../src/totem-preferences.c:295
+#: ../src/totem-preferences.c:297
 msgid "Preferences"
 msgstr "ترجیحات"
 
-#: ../src/totem-preferences.c:451
+#: ../src/totem-preferences.c:445
 msgid "Select Subtitle Font"
 msgstr "انتخاب قلم زیرنویس"
 
-#: ../src/totem-properties-main.c:115
-#: ../src/totem-properties-view.c:266
+#: ../src/totem-properties-main.c:116 ../src/totem-properties-view.c:271
 msgid "Audio/Video"
 msgstr "صوتی/تصویری"
 
-#: ../src/totem-properties-view.c:128
+#: ../src/totem-properties-view.c:131
 msgid "N/A"
 msgstr "نامعلوم"
 
-#: ../src/totem-properties-view.c:157
+#: ../src/totem-properties-view.c:160
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 msgctxt "Stream bit rate"
 msgid "N/A"
 msgstr "نامعلوم"
 
-#: ../src/totem-properties-view.c:160
+#: ../src/totem-properties-view.c:163
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 #, c-format
 msgid "%d kbps"
 msgstr "%Id کیلوبیت بر ثانیه"
 
-#: ../src/totem-properties-view.c:177
+#: ../src/totem-properties-view.c:180
 #: ../src/plugins/properties/totem-movie-properties.c:149
 #, c-format
 msgid "%d x %d"
 msgstr "%Id × %Id"
 
-#: ../src/totem-properties-view.c:209
+#: ../src/totem-properties-view.c:212
 #: ../src/plugins/properties/totem-movie-properties.c:166
 #, c-format
 msgid "%d Hz"
 msgstr "%Id هرتز"
 
-#: ../src/totem-properties-view.c:216
+#: ../src/totem-properties-view.c:220
 #: ../src/plugins/properties/totem-movie-properties.c:166
 msgctxt "Sample rate"
 msgid "N/A"
 msgstr "نامعلوم"
 
-#: ../src/totem-properties-view.c:224
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5589
-msgid "Surround"
-msgstr "فراگیر"
-
-#: ../src/totem-properties-view.c:226
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5591
-msgid "Mono"
-msgstr "واحد"
-
-#: ../src/totem-properties-view.c:236
+#: ../src/totem-properties-view.c:241
 msgctxt "Number of audio channels"
 msgid "N/A"
 msgstr "نامعلوم"
@@ -1510,15 +1536,13 @@
 msgstr "%s (جاری)"
 
 #. Elapsed / Total Length
-#: ../src/totem-statusbar.c:140
-#: ../src/totem-time-label.c:64
+#: ../src/totem-statusbar.c:140 ../src/totem-time-label.c:64
 #, c-format
 msgid "%s / %s"
 msgstr "‏%s‏ / ‏%s‏"
 
 #. Seeking to Time / Total Length
-#: ../src/totem-statusbar.c:143
-#: ../src/totem-time-label.c:67
+#: ../src/totem-statusbar.c:143 ../src/totem-time-label.c:67
 #, c-format
 msgid "Seek to %s / %s"
 msgstr "پریدن به ‏%s‏ / ‏%s‏"
@@ -1530,8 +1554,8 @@
 #. eg: 75 %
 #: ../src/totem-statusbar.c:250
 #, c-format
-msgid "%d %%"
-msgstr "٪%Id"
+msgid "%lf %%"
+msgstr "٪%lf"
 
 #. eg: Paused, 0:32 / 1:05
 #: ../src/totem-statusbar.c:325
@@ -1542,17 +1566,15 @@
 #. eg: Buffering, 75 %
 #: ../src/totem-statusbar.c:330
 #, c-format
-msgid "%s, %d %%"
-msgstr "%s و %Id %%"
+msgid "%s, %f %%"
+msgstr "%s و ٪%If"
 
 #: ../src/totem-subtitle-encoding.c:156
 msgid "Current Locale"
 msgstr "محل فعلی"
 
-#: ../src/totem-subtitle-encoding.c:159
-#: ../src/totem-subtitle-encoding.c:161
-#: ../src/totem-subtitle-encoding.c:163
-#: ../src/totem-subtitle-encoding.c:165
+#: ../src/totem-subtitle-encoding.c:159 ../src/totem-subtitle-encoding.c:161
+#: ../src/totem-subtitle-encoding.c:163 ../src/totem-subtitle-encoding.c:165
 msgid "Arabic"
 msgstr "عربی"
 
@@ -1560,8 +1582,7 @@
 msgid "Armenian"
 msgstr "ارمنی"
 
-#: ../src/totem-subtitle-encoding.c:171
-#: ../src/totem-subtitle-encoding.c:173
+#: ../src/totem-subtitle-encoding.c:171 ../src/totem-subtitle-encoding.c:173
 #: ../src/totem-subtitle-encoding.c:175
 msgid "Baltic"
 msgstr "بالتیک"
@@ -1570,22 +1591,17 @@
 msgid "Celtic"
 msgstr "سلتی"
 
-#: ../src/totem-subtitle-encoding.c:181
-#: ../src/totem-subtitle-encoding.c:183
-#: ../src/totem-subtitle-encoding.c:185
-#: ../src/totem-subtitle-encoding.c:187
+#: ../src/totem-subtitle-encoding.c:181 ../src/totem-subtitle-encoding.c:183
+#: ../src/totem-subtitle-encoding.c:185 ../src/totem-subtitle-encoding.c:187
 msgid "Central European"
 msgstr "اروپای مرکزی"
 
-#: ../src/totem-subtitle-encoding.c:190
-#: ../src/totem-subtitle-encoding.c:192
-#: ../src/totem-subtitle-encoding.c:194
-#: ../src/totem-subtitle-encoding.c:196
+#: ../src/totem-subtitle-encoding.c:190 ../src/totem-subtitle-encoding.c:192
+#: ../src/totem-subtitle-encoding.c:194 ../src/totem-subtitle-encoding.c:196
 msgid "Chinese Simplified"
 msgstr "چینی ساده‌شده"
 
-#: ../src/totem-subtitle-encoding.c:199
-#: ../src/totem-subtitle-encoding.c:201
+#: ../src/totem-subtitle-encoding.c:199 ../src/totem-subtitle-encoding.c:201
 #: ../src/totem-subtitle-encoding.c:203
 msgid "Chinese Traditional"
 msgstr "چینی سنتی"
@@ -1594,12 +1610,9 @@
 msgid "Croatian"
 msgstr "کرواتی"
 
-#: ../src/totem-subtitle-encoding.c:209
-#: ../src/totem-subtitle-encoding.c:211
-#: ../src/totem-subtitle-encoding.c:213
-#: ../src/totem-subtitle-encoding.c:215
-#: ../src/totem-subtitle-encoding.c:217
-#: ../src/totem-subtitle-encoding.c:219
+#: ../src/totem-subtitle-encoding.c:209 ../src/totem-subtitle-encoding.c:211
+#: ../src/totem-subtitle-encoding.c:213 ../src/totem-subtitle-encoding.c:215
+#: ../src/totem-subtitle-encoding.c:217 ../src/totem-subtitle-encoding.c:219
 msgid "Cyrillic"
 msgstr "سیریلیک"
 
@@ -1607,8 +1620,7 @@
 msgid "Cyrillic/Russian"
 msgstr "سیریلیک/روسی"
 
-#: ../src/totem-subtitle-encoding.c:225
-#: ../src/totem-subtitle-encoding.c:227
+#: ../src/totem-subtitle-encoding.c:225 ../src/totem-subtitle-encoding.c:227
 msgid "Cyrillic/Ukrainian"
 msgstr "سیریلیک/اوکراینی"
 
@@ -1616,8 +1628,7 @@
 msgid "Georgian"
 msgstr "گرجی"
 
-#: ../src/totem-subtitle-encoding.c:233
-#: ../src/totem-subtitle-encoding.c:235
+#: ../src/totem-subtitle-encoding.c:233 ../src/totem-subtitle-encoding.c:235
 #: ../src/totem-subtitle-encoding.c:237
 msgid "Greek"
 msgstr "یونانی"
@@ -1630,10 +1641,8 @@
 msgid "Gurmukhi"
 msgstr "گورموکی"
 
-#: ../src/totem-subtitle-encoding.c:246
-#: ../src/totem-subtitle-encoding.c:248
-#: ../src/totem-subtitle-encoding.c:250
-#: ../src/totem-subtitle-encoding.c:252
+#: ../src/totem-subtitle-encoding.c:246 ../src/totem-subtitle-encoding.c:248
+#: ../src/totem-subtitle-encoding.c:250 ../src/totem-subtitle-encoding.c:252
 msgid "Hebrew"
 msgstr "عبری"
 
@@ -1649,16 +1658,13 @@
 msgid "Icelandic"
 msgstr "ایسلندی"
 
-#: ../src/totem-subtitle-encoding.c:264
-#: ../src/totem-subtitle-encoding.c:266
+#: ../src/totem-subtitle-encoding.c:264 ../src/totem-subtitle-encoding.c:266
 #: ../src/totem-subtitle-encoding.c:268
 msgid "Japanese"
 msgstr "ژاپنی"
 
-#: ../src/totem-subtitle-encoding.c:271
-#: ../src/totem-subtitle-encoding.c:273
-#: ../src/totem-subtitle-encoding.c:275
-#: ../src/totem-subtitle-encoding.c:277
+#: ../src/totem-subtitle-encoding.c:271 ../src/totem-subtitle-encoding.c:273
+#: ../src/totem-subtitle-encoding.c:275 ../src/totem-subtitle-encoding.c:277
 msgid "Korean"
 msgstr "کره‌ای"
 
@@ -1670,8 +1676,7 @@
 msgid "Persian"
 msgstr "فارسی"
 
-#: ../src/totem-subtitle-encoding.c:286
-#: ../src/totem-subtitle-encoding.c:288
+#: ../src/totem-subtitle-encoding.c:286 ../src/totem-subtitle-encoding.c:288
 msgid "Romanian"
 msgstr "رومانیایی"
 
@@ -1683,220 +1688,113 @@
 msgid "Thai"
 msgstr "تایلندی"
 
-#: ../src/totem-subtitle-encoding.c:297
-#: ../src/totem-subtitle-encoding.c:299
-#: ../src/totem-subtitle-encoding.c:301
-#: ../src/totem-subtitle-encoding.c:303
+#: ../src/totem-subtitle-encoding.c:297 ../src/totem-subtitle-encoding.c:299
+#: ../src/totem-subtitle-encoding.c:301 ../src/totem-subtitle-encoding.c:303
 msgid "Turkish"
 msgstr "ترکی"
 
-#: ../src/totem-subtitle-encoding.c:306
-#: ../src/totem-subtitle-encoding.c:308
-#: ../src/totem-subtitle-encoding.c:310
-#: ../src/totem-subtitle-encoding.c:312
+#: ../src/totem-subtitle-encoding.c:306 ../src/totem-subtitle-encoding.c:308
+#: ../src/totem-subtitle-encoding.c:310 ../src/totem-subtitle-encoding.c:312
 #: ../src/totem-subtitle-encoding.c:314
 msgid "Unicode"
 msgstr "یونی‌کد"
 
-#: ../src/totem-subtitle-encoding.c:317
-#: ../src/totem-subtitle-encoding.c:319
-#: ../src/totem-subtitle-encoding.c:321
-#: ../src/totem-subtitle-encoding.c:323
+#: ../src/totem-subtitle-encoding.c:317 ../src/totem-subtitle-encoding.c:319
+#: ../src/totem-subtitle-encoding.c:321 ../src/totem-subtitle-encoding.c:323
 #: ../src/totem-subtitle-encoding.c:325
 msgid "Western"
 msgstr "غربی"
 
-#: ../src/totem-subtitle-encoding.c:328
-#: ../src/totem-subtitle-encoding.c:330
+#: ../src/totem-subtitle-encoding.c:328 ../src/totem-subtitle-encoding.c:330
 #: ../src/totem-subtitle-encoding.c:332
 msgid "Vietnamese"
 msgstr "ویتنامی"
 
-#: ../src/totem-video-list.c:330
-msgid "No video URI"
-msgstr "بدون آدرس ویدیو"
-
-#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
-#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
-#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
-#: ../src/totem-video-thumbnailer.c:872
-#, c-format
-msgid ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-msgstr ""
-"%s: %s\n"
-"%s: %Id×%Id\n"
-"%s: %s"
-
-#: ../src/totem-video-thumbnailer.c:873
-msgid "Filename"
-msgstr "نام پرونده"
-
-#: ../src/totem-video-thumbnailer.c:875
-msgid "Resolution"
-msgstr "تفکیک‌پذیری"
-
-#: ../src/totem-video-thumbnailer.c:878
-msgid "Duration"
-msgstr "مدت پخش"
-
-#: ../src/totem-uri.c:506
-#: ../src/plugins/chapters/totem-chapters.c:998
+#: ../src/totem-uri.c:343 ../src/plugins/chapters/totem-chapters.c:998
 msgid "All files"
 msgstr "همه‌ی پرونده‌ها"
 
-#: ../src/totem-uri.c:511
-#: ../src/plugins/chapters/totem-chapters.c:995
+#: ../src/totem-uri.c:348 ../src/plugins/chapters/totem-chapters.c:995
 msgid "Supported files"
 msgstr "پرونده‌هایی که پشتیبانی می‌شود"
 
-#: ../src/totem-uri.c:523
+#: ../src/totem-uri.c:360
 msgid "Audio files"
 msgstr "پرونده‌های صوتی"
 
-#: ../src/totem-uri.c:531
+#: ../src/totem-uri.c:368
 msgid "Video files"
 msgstr "پرونده‌های تصویری"
 
-#: ../src/totem-uri.c:541
+#: ../src/totem-uri.c:378
 msgid "Subtitle files"
 msgstr "پرونده‌های زیرنویس"
 
-#: ../src/totem-uri.c:593
+#: ../src/totem-uri.c:430
 msgid "Select Text Subtitles"
 msgstr "انتخاب زیرنویس"
 
-#: ../src/totem-uri.c:656
+#: ../src/totem-uri.c:495
 msgid "Select Movies or Playlists"
 msgstr "فیلم یا فهرست پخش انتخاب کنید"
 
-#. Options parsing
-#: ../src/totem.c:201
-msgid "- Play movies and songs"
-msgstr "- آهنگ ها و فیلم ها را پخش کن"
+#: ../src/totem-uri.c:499
+msgid "Add Directory"
+msgstr "اضافه‌کردن لغت‌نامه"
+
+#: ../src/totem-video-list.c:330
+msgid "No video URI"
+msgstr "بدون آدرس ویدیو"
 
-#: ../src/totem.c:212
+#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
+#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
+#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
+#: ../src/totem-video-thumbnailer.c:848
 #, c-format
 msgid ""
-"%s\n"
-"Run '%s --help' to see a full list of available command line options.\n"
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 msgstr ""
-"%s\n"
-"برای مشاهده لیست کاملی از گزینه‌های خط فرمان دستور '%s --help' را اجرا نمایید.\n"
-
-#: ../src/totem.c:254
-#: ../src/totem.c:265
-#: ../browser-plugin/totem-plugin-viewer.c:663
-#: ../browser-plugin/totem-plugin-viewer.c:1793
-msgid "Totem Movie Player"
-msgstr "پخش‌کننده‌ی فیلم توتم"
-
-#: ../src/totem.c:255
-#: ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Could not initialize the thread-safe libraries."
-msgstr "مقدار دهی اولیه کتابخانه‌های thread-safe امکان‌پذیر نبود."
-
-#: ../src/totem.c:255
-msgid "Verify your system installation. Totem will now exit."
-msgstr "از صحت نصب سیستمتان مطمئن شوید. توتم خارج می‌شود."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:1589
-msgid "Password requested for RTSP server"
-msgstr "گذرواژه برای کارگزار RTSP درخواست شده است"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2858
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2862
-#, c-format
-msgid "Audio Track #%d"
-msgstr "قطعه صدا #%Id"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2890
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2894
-#, c-format
-msgid "Subtitle #%d"
-msgstr "زیرنویس #%Id"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3298
-msgid "The requested audio output was not found. Please select another audio output in the Multimedia Systems Selector."
-msgstr "خروجی صوتی درخواست شده پیدا نشد. لطفاً در انتخاب‌گر سیستم‌های چندرسانه‌ای خروجی صوتی دیگری را انتخاب کنید."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3303
-msgid "Location not found."
-msgstr "مکان پیدا نشد."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3307
-msgid "Could not open location; you might not have permission to open the file."
-msgstr "نمی توان این مکان را باز کرد. شاید شما اجازه‌ی باز کردن آن را ندارید."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3318
-msgid "The video output is in use by another application. Please close other video applications, or select another video output in the Multimedia Systems Selector."
-msgstr "خروجی ویدیو توسط برنامه دیگری در حال استفاده می باشد. لطفا برنامه های ویدیویی دیگر را ببندید، یا از طریق انتخاب گر سیستم های جند رسانه ای خروجی ویدیویی دیگری انتخاب کنید."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3324
-msgid "The audio output is in use by another application. Please select another audio output in the Multimedia Systems Selector. You may want to consider using a sound server."
-msgstr "خروجی صوتی توسط برنامه‌ی دیگری در حال استفاده می‌باشد. لطفا برنامه‌های صوتی دیگر را ببندید، یا از طریق انتخاب‌گر سیستم‌های جند رسانه‌ای خروجی صوتی دیگری انتخاب کنید. شاید بهتر باشد از یک کارگزار صدا استفاده کنید."
+"%s: %s\n"
+"%s: %Id×%Id\n"
+"%s: %s"
 
-#. should be exactly one missing thing (source or converter)
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3342
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3348
-#, c-format
-msgid "The playback of this movie requires a %s plugin which is not installed."
-msgid_plural ""
-"The playback of this movie requires the following decoders which are not installed:\n"
-"\n"
-"%s"
-msgstr[0] "پخش این فیلم نیازمند پلاگین %s است که نصب نشده است."
-msgstr[1] ""
-"پخش این فیلم نیازمند رمزگشاهای مقابل است که نصب نشده‌اند:\n"
-"\n"
-"%s"
+#: ../src/totem-video-thumbnailer.c:849
+msgid "Filename"
+msgstr "نام پرونده"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3374
-msgid "Cannot play this file over the network. Try downloading it to disk first."
-msgstr "نمی توان این فایل را از شبکه پخش نمود. سعی کنید اول آنرا روی دیسک بارگیری کنید."
+#: ../src/totem-video-thumbnailer.c:851
+msgid "Resolution"
+msgstr "تفکیک‌پذیری"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5878
-msgid "Media contains no supported video streams."
-msgstr "رسانه حاوی هیچ ویدیوی جاری پشتیبانی شده‌ای نیست."
+#: ../src/totem-video-thumbnailer.c:854
+msgid "Duration"
+msgstr "مدت پخش"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6052
-msgid "Failed to create a GStreamer play object. Please check your GStreamer installation."
-msgstr "نمی توان شیئ پخش GStreamer را ایجاد کرد. لطفا نصب GStreamer را بررسی کنید."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6172
-msgid "Failed to open audio output. You may not have permission to open the sound device, or the sound server may not be running. Please select another audio output in the Multimedia Systems Selector."
-msgstr "خطا در هنگام باز کردن خروجی صوتی. ممکن است حق دسترسی به دستگاه صوتی را نداشته باشید، یا اینکه سرور صوتی در حال اجرا نباشد. لطفا از طریق انتخاب‌گر چندرسانه‌ای یک خروجی صوتی دیگر انتخاب نمایید."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6192
-msgid "Could not find the audio output. You may need to install additional GStreamer plugins, or select another audio output in the Multimedia Systems Selector."
-msgstr "امکان پیدا کردن خروجی صوتی نبود. ممکن است نیاز باشد که افزونه‌های اضافی GStreamer را نصب کنید، و یا از طریق انتخاب‌گر سیستم‌های جندرسانه ای خروجی صوتی دیگری را انتخاب نمایید."
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:1
+msgid "Apple Trailers"
+msgstr "تریلر اپل"
+
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:2
+msgid "Sets the user agent for the Apple Trailers site"
+msgstr "تنظیم پیشکار کاربر (user agent) برای استفاده از سایت تریلرهای اپل"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:1
+msgid "Autoload Subtitles"
+msgstr "بارگیری خودکار زیرنویس‌ها"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:2
+msgid "Autoloads text subtitles"
+msgstr "بارگیری خودکار زیرنویس‌های متنی"
 
-#. hour:minutes:seconds
-#. Translators: This is a time format, like "9:05:02" for 9
-#. * hours, 5 minutes, and 2 seconds. You may change ":" to
-#. * the separator that your locale uses or use "%Id" instead
-#. * of "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:83
-#: ../src/plugins/skipto/totem-time-entry.c:57
-#, c-format
-msgctxt "long time format"
-msgid "%d:%02d:%02d"
-msgstr "%Id:%I02d:%I02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
+msgid "Video Disc Recorder"
+msgstr "ضبط کننده دیسک ویدیو"
 
-#. minutes:seconds
-#. Translators: This is a time format, like "5:02" for 5
-#. * minutes and 2 seconds. You may change ":" to the
-#. * separator that your locale uses or use "%Id" instead of
-#. * "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:92
-#, c-format
-msgctxt "short time format"
-msgid "%d:%02d"
-msgstr "%Id:%I02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
+msgid "Records (S)VCDs or video DVDs"
+msgstr "ضبط (اس)وی‌سی‌دی یا ویدیو دی‌وی‌دی"
 
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:65
 msgid "_Create Video Disc..."
@@ -1922,38 +1820,21 @@
 msgid "Copy the currently playing (S)VCD"
 msgstr "رونوشت از (اس)وی‌سی‌دی که هم‌اکنون پخش می‌شود"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:129
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:136
 msgid "The video disc could not be duplicated."
 msgstr "امکان رونوشت از دیسک ویدیو نبود."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:131
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:276
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:138
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:283
 msgid "The movie could not be recorded."
 msgstr "نمی‌توان فیلم را ضبط کرد."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:157
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:167
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:263
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:164
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:174
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:270
 msgid "Unable to write a project."
 msgstr "نمی‌توان یک پروژه نوشت."
 
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
-msgid "Video Disc Recorder"
-msgstr "ضبط کننده دیسک ویدیو"
-
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
-msgid "Records (S)VCDs or video DVDs"
-msgstr "ضبط (اس)وی‌سی‌دی یا ویدیو دی‌وی‌دی"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:1
-#: ../src/plugins/chapters/totem-chapters.c:1139
-msgid "Chapters"
-msgstr "فصل‌ها"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:2
-msgid "Support chapter markers in movies."
-msgstr "پشتیبانی سازنده‌های فصل در فیلم‌ها"
-
 #: ../src/plugins/chapters/chapters-edit.ui.h:1
 msgid "Name for new chapter:"
 msgstr "نام برای فصل جدید:"
@@ -2010,6 +1891,15 @@
 msgid "Create a new chapter list for the movie"
 msgstr "ایجاد یک فهرست فصل‌های جدید برایاین فیلم"
 
+#: ../src/plugins/chapters/chapters.plugin.in.h:1
+#: ../src/plugins/chapters/totem-chapters.c:1139
+msgid "Chapters"
+msgstr "فصل‌ها"
+
+#: ../src/plugins/chapters/chapters.plugin.in.h:2
+msgid "Support chapter markers in movies"
+msgstr "پشتیبانی از نشانگرهای فصل در فیلم‌ها"
+
 #: ../src/plugins/chapters/totem-chapters.c:56
 #, c-format
 msgid ""
@@ -2040,8 +1930,11 @@
 msgstr "خطایی هنگام ذخیره‌ی فصل‌ها رخ داد."
 
 #: ../src/plugins/chapters/totem-chapters.c:843
-msgid "Please check you have permission to write to the folder containing the movie."
-msgstr "لطفا بررسی کنید که آیا مجوز برای نوشتن در پوشه‌ی دربرگیرنده‌ی فیلم را داشته باشید."
+msgid ""
+"Please check you have permission to write to the folder containing the movie."
+msgstr ""
+"لطفا بررسی کنید که آیا مجوز برای نوشتن در پوشه‌ی دربرگیرنده‌ی فیلم را داشته "
+"باشید."
 
 #: ../src/plugins/chapters/totem-chapters.c:976
 msgid "Open Chapter File"
@@ -2078,7 +1971,6 @@
 msgstr "شکست در تجزیه‌ی پرونده‌ی CMML"
 
 #: ../src/plugins/chapters/totem-edit-chapter.c:95
-#| msgid "Add Chapter..."
 msgid "Add Chapter"
 msgstr "اضافه‌کردن فصل"
 
@@ -2087,7 +1979,9 @@
 msgstr "سرویس D-Bus"
 
 #: ../src/plugins/dbusservice/dbusservice.plugin.in.h:2
-msgid "Plugin for sending notifications of currently playing movies to the D-Bus subsystem."
+msgid ""
+"Plugin for sending notifications of currently playing movies to the D-Bus "
+"subsystem."
 msgstr "افزونه‌ای برای ارسال اعلان‌های فیلم‌های درحال پخش به سیستم D-Bus."
 
 #: ../src/plugins/dbusservice/dbusservice.py:213
@@ -2111,13 +2005,37 @@
 msgid "The URI ‘%s’ is not supported."
 msgstr "آدرس «%s» پشتیبانی می‌شود."
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
-msgid "Instant Messenger status"
-msgstr "وضعیت پیام رسان فوری"
+#: ../src/plugins/grilo/grilo.plugin.in.h:1
+msgid "Grilo Browser"
+msgstr "مرورگر گریلو"
+
+#: ../src/plugins/grilo/grilo.plugin.in.h:2
+msgid "A plugin to let you browse media content from various sources"
+msgstr "یک پلاگین که به شما امکان مرور رسانه‌ها از منابع مختلف می‌دهد"
+
+#: ../src/plugins/grilo/grilo.ui.h:1
+msgid "Add to Playlist"
+msgstr "اضافه‌کردن به فهرست پخش"
+
+#: ../src/plugins/grilo/grilo.ui.h:2
+msgid "Copy Location"
+msgstr "رونوشت از مکان"
+
+#: ../src/plugins/grilo/grilo.ui.h:3 ../src/plugins/grilo/totem-grilo.c:1186
+msgid "Browse"
+msgstr "مرور"
+
+#: ../src/plugins/grilo/grilo.ui.h:4 ../src/plugins/grilo/totem-grilo.c:1229
+msgid "Search"
+msgstr "جستجو"
+
+#: ../src/plugins/grilo/totem-grilo.c:454
+msgid "Browse Error"
+msgstr "خطای مرور"
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
-msgid "Set your Instant Messenger status to away when a movie is playing"
-msgstr "تغییر وضعیت پیام رسان فوری شما را به «دور از دسترس» در زمان پخش فیلم"
+#: ../src/plugins/grilo/totem-grilo.c:609
+msgid "Search Error"
+msgstr "خطای جستجو"
 
 #: ../src/plugins/gromit/gromit.plugin.in.h:1
 msgid "Gromit Annotations"
@@ -2131,49 +2049,13 @@
 msgid "The gromit binary was not found."
 msgstr "فایل اجرایی گرومیت (grmoit) یافت نشد."
 
-#. Add the interface to Totem's sidebar
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:1
-#: ../src/plugins/iplayer/iplayer.py:46
-msgid "BBC iPlayer"
-msgstr "BBC iPlayer"
-
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:2
-msgid "Stream BBC programs from the last 7 days from the BBC iPlayer service."
-msgstr "اجرای برنامه‌های BBC در ۷ روز گذشته از سرویس BBC iPlayer."
-
-#: ../src/plugins/iplayer/iplayer.py:72
-msgid "Error listing channel categories"
-msgstr "خطا در فهرست کردن شاخه‌های کانال‌ها"
-
-#: ../src/plugins/iplayer/iplayer.py:73
-msgid "There was an unknown error getting the list of television channels available on BBC iPlayer."
-msgstr "خطایی در هنگام دریافت فهرست کانل‌های تلویزیون موجود در BBC iPlayer رخ داد."
-
-#. Append a dummy child row so that the expander's visible; we can
-#. then queue off the expander to load the programme listing for this
-#. category
-#: ../src/plugins/iplayer/iplayer.py:84
-msgid "Loading…"
-msgstr "درحال بارکردن..."
-
-#. Translators: the "programme feed" is the list of TV shows
-#. available to watch online
-#: ../src/plugins/iplayer/iplayer.py:136
-msgid "Error getting programme feed"
-msgstr "خطا در گرفتن فید برنامه"
-
-#: ../src/plugins/iplayer/iplayer.py:137
-msgid "There was an error getting the list of programmes for this channel and category combination."
-msgstr "خطایی هنگام دریافت فهرست برنامه‌های این کانال و مجموعه‌ی دسته‌های آن رخ داده است."
-
-#: ../src/plugins/iplayer/iplayer2.py:298
-msgid ""
-msgstr "<هیچ دلیلی داده نشده>"
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
+msgid "Instant Messenger Status"
+msgstr "وضعیت پیام‌رسان فوری"
 
-#: ../src/plugins/iplayer/iplayer2.py:299
-#, python-format
-msgid "Programme unavailable (\"%s\")"
-msgstr "برنامه در دسترس نیست («%s»)"
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
+msgid "Set your Instant Messenger status to away when a movie is playing"
+msgstr "تغییر وضعیت پیام رسان فوری شما را به «دور از دسترس» در زمان پخش فیلم"
 
 #: ../src/plugins/lirc/lirc.plugin.in.h:1
 msgid "Infrared Remote Control"
@@ -2191,25 +2073,29 @@
 msgid "Couldn't read lirc configuration."
 msgstr "نمی‌توان تنظیمات lirc را خواند."
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
-msgid "Download Movie Subtitles"
-msgstr "بارگیری زیرنویس‌های فیلم"
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:1
+msgid "Media Player Keys"
+msgstr "کلیدهای پخش‌کننده‌ی رسانه‌ای"
+
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:2
+msgid "Support additional media player keys"
+msgstr "از کلیدای رسانه‌ای بیشتر پشتیبانی می‌کند"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
-msgid "Subtitle _language:"
-msgstr "زبان _زیرنویس:"
+#: ../src/plugins/ontop/ontop.plugin.in.h:1
+msgid "Always On Top"
+msgstr "همیشه در بالا"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
-msgid "_Play with Subtitle"
-msgstr "_پخش همراه با زیرنویس"
+#: ../src/plugins/ontop/ontop.plugin.in.h:2
+msgid "Keep the main window on top when playing a movie"
+msgstr "بالا نگاه داشتن پنجره‌ی اصلی هنگام پخش فیلم"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:1
 msgid "Subtitle Downloader"
 msgstr "بارگیری زیرنویس"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:2
-msgid "Look for subtitles for the currently playing movie."
-msgstr "جستجو برای زیرنویس‌های فیلمی که هم‌اکنون پخش می‌شود."
+msgid "Look for subtitles for the currently playing movie"
+msgstr "جستجو برای زیرنویس‌های فیلمی که هم‌اکنون پخش می‌شود"
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:42
 msgid "Brazilian Portuguese"
@@ -2265,6 +2151,18 @@
 msgid "Searching subtitles…"
 msgstr "درحال جستجوی زیرنویس‌ها..."
 
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
+msgid "Download Movie Subtitles"
+msgstr "بارگیری زیرنویس‌های فیلم"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
+msgid "Subtitle _language:"
+msgstr "زبان _زیرنویس:"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
+msgid "_Play with Subtitle"
+msgstr "_پخش همراه با زیرنویس"
+
 #: ../src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in.h:1
 msgid "Subtitle language"
 msgstr "زبان زیرنویس:"
@@ -2273,91 +2171,111 @@
 msgid "The language to search for subtitles for movies in."
 msgstr "زبانی که در آن جستجوی زیرنویس فیلم انجام شود."
 
-#: ../src/plugins/ontop/ontop.plugin.in.h:1
-msgid "Always On Top"
-msgstr "همیشه در بالا"
-
-#: ../src/plugins/ontop/ontop.plugin.in.h:2
-msgid "Keep the main window on top when playing a movie"
-msgstr "بالا نگاه داشتن پنجره‌ی اصلی هنگام پخش فیلم"
+#: ../src/plugins/properties/movie-properties.plugin.in.h:1
+msgid "Movie Properties"
+msgstr "‌ویژگی‌های فیلم"
+
+#: ../src/plugins/properties/movie-properties.plugin.in.h:2
+msgid "Adds movie properties to the sidebar"
+msgstr "ویژگی‌های فیلم را در نوار کناری نمایش می‌دهد"
 
 #: ../src/plugins/properties/totem-movie-properties.c:246
 msgid "Properties"
 msgstr "‌ویژگی‌ها"
 
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:1
-msgid "Publisher protocol to use"
-msgstr "پروتکل منتشر‌کننده برای استفاده"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:2
-msgid "The transport protocol to use when publishing playlists over the network."
-msgstr "پروتکل حمل و نقلی که بهنگام نشر فهرست پخش در شبکه استفاده می‌شود."
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:3
-msgid "Format for network service name"
-msgstr "قالب برای نام سرویس شبکه"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:5
-#, no-c-format
-msgid "A format string used to build the network service name used when publishing playlists over the network. The following format placeholders can be used: • %a: the program name as returned by g_get_application_name() • %h: the machine's host name in title case • %u: the user's login name in title case • %U: the user's real name • %%: the percent sign"
-msgstr "یک رشته‌ی قالب که برای ساختن نام سرویس شبکه استفاده می‌شود، برای منتشر کردن فهرست پخش روی شبکه. این رشته‌های را می‌توان استفاده کرد: • %a: اسم برنامه که با g_get_application_name()  گرفته می‌شود • %h: اسم میزبان ماشین در حالت عنوان •  %u: اسم کاربری کاربر در حالت عنوان • %U: اسم واقعی کاربر • %%: علامت درصد"
-
-#. Translators: computers on the local network which are publishing their playlists over the network
-#: ../src/plugins/publish/totem-publish.c:552
-msgid "Neighbors"
-msgstr "همسایه‌ها"
-
-#: ../src/plugins/publish/publish.plugin.in.h:1
-msgid "Publish Playlist"
-msgstr "انتشار فهرست پخش"
-
-#: ../src/plugins/publish/publish.plugin.in.h:2
-msgid "Share the current playlist via HTTP"
-msgstr "به اشتراک گذاشتن فهرست پخش فعلی از طریق پروتکل HTTP"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:1
-msgid "Service _Name:"
-msgstr "_نام خدمات:"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:3
-#, no-c-format
-msgid ""
-"The name used for announcing the playlist service on the network.\n"
-"All occurrences of the string %u will be replaced by your name,\n"
-"and %h will be replaced by your computer's host name."
-msgstr ""
-"نامی که برای شناسایی فهرست پخش بر روی شبکه استفاده می‌شود.\n"
-"تمامی موارد رشته‌ی %u جایگزین با نام شما خواهد شد.\n"
-"و %h جایگزین با نام میزبان رایانه شما خواهد شد."
-
-#: ../src/plugins/publish/publish-plugin.ui.h:6
-msgid "Use _encrypted transport protocol (HTTPS)"
-msgstr "از پروتکل انتقال _رمزنگاری‌شده استفاده شود (HTTPS)"
-
 #: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:1
 msgid "rpdb2 password"
 msgstr "گذرواژه‌ی rpdb2"
 
 #: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:2
-msgid "A password to protect the rpdb2 server for debugging Totem from unauthorized remote access. If this is empty, a default of 'totem' will be used."
-msgstr "یک گذرواژه برای محافظت کارگزار rpdb2 از اشکال زدایی توتم با دسترسی‌های از راه دور هویت‌یابی نشده. اگر اینجا خالی باشد، مقدار پیش‌فرض 'totem' استفاده خواهد شد."
+msgid ""
+"A password to protect the rpdb2 server for debugging Totem from unauthorized "
+"remote access. If this is empty, a default of 'totem' will be used."
+msgstr ""
+"یک گذرواژه برای محافظت کارگزار rpdb2 از اشکال زدایی توتم با دسترسی‌های از راه "
+"دور هویت‌یابی نشده. اگر اینجا خالی باشد، مقدار پیش‌فرض 'totem' استفاده خواهد "
+"شد."
+
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
+msgid "Python Console"
+msgstr "پایانه پیتون"
+
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
+msgid "Interactive Python console"
+msgstr "پایانه‌ی تعاملی پایتون"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:88
+msgid "Python Console Menu"
+msgstr "منوی پایانه‌ی پیتون"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:93
+msgid "_Python Console"
+msgstr "پایانه‌ی _پیتون"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:94
+msgid "Show Totem's Python console"
+msgstr "نمایش پایانه‌ی پیتون توتم"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:100
+msgid "Python Debugger"
+msgstr "اشکال‌یاب پیتون"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:101
+msgid "Enable remote Python debugging with rpdb2"
+msgstr "فعال کردن اشکال‌یابی دوردست پیتون بوسیله rpdb2"
+
+#. pylint: disable-msg=E1101
+#: ../src/plugins/pythonconsole/pythonconsole.py:125
+#, python-format
+msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
+msgstr "شما می‌توانید از طریق «totem_object« به توتم دسترسی داشته باشید:\\n%s"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:129
+msgid "Totem Python Console"
+msgstr "پایانه‌ی پیتون توتم"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:139
+msgid ""
+"After you press OK, Totem will wait until you connect to it with winpdb or "
+"rpdb2. If you have not set a debugger password in DConf, it will use the "
+"default password ('totem')."
+msgstr ""
+"پس از تایید، توتم منتظر می‌ماند تا شما بوسیله winpdb یا rpdb2 متصل شوید. "
+"چنانچه شما گذرواژه‌ای برای اشکال‌زدا در GConf تعیین نکرده‌اید، از گذرواژه "
+"پیش‌فرض ('totem') استفاده می‌شود."
+
+#: ../src/plugins/recent/recent.plugin.in.h:1
+msgid "Recent files"
+msgstr "پرونده‌های اخیر"
+
+#: ../src/plugins/recent/recent.plugin.in.h:2
+msgid "Adds files that have been played to recent files"
+msgstr "پرونده‌هایی که پخش شده‌اند را به موارد اخیر اضافه می‌کند"
 
 #: ../src/plugins/rotation/rotation.plugin.in.h:1
 msgid "Rotation Plugin"
 msgstr "افزونه چرخش"
 
 #: ../src/plugins/rotation/rotation.plugin.in.h:2
-msgid "Allows videos to be rotated if they're in the wrong orientation."
-msgstr "به شما اجازه می‌دهد ویدئوهایی که جهت درستی ندارند را بچرخانید."
+msgid "Allows videos to be rotated if they are in the wrong orientation"
+msgstr "به شما اجازه می‌دهد ویدئوهایی که جهت درستی ندارند را بچرخانید"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:60
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:50
 msgid "_Rotate Clockwise"
 msgstr "_چرخش در جهت عقربه‌ها"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:62
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:52
 msgid "Rotate Counterc_lockwise"
 msgstr "جرخش بر_خلاف جهت عقربه‌ها"
 
+#: ../src/plugins/save-file/save-file.plugin.in.h:1
+msgid "Save Copy"
+msgstr "ذخیره‌ی یک رونوشت"
+
+#: ../src/plugins/save-file/save-file.plugin.in.h:2
+msgid "Save a copy of the currently playing movie"
+msgstr "ذخیره یک رونوشت از فیلمی که هم‌اکنون پخش می‌شود"
+
 #: ../src/plugins/save-file/totem-save-file.c:63
 msgid "Save a Copy..."
 msgstr "ذخیرهٔ یک رونوشت..."
@@ -2380,10 +2298,13 @@
 msgid "Movie stream"
 msgstr "جریان فیلم"
 
-#: ../src/plugins/screensaver/totem-screensaver.c:116
-#: ../browser-plugin/totem-plugin-viewer.c:1891
-msgid "Playing a movie"
-msgstr "در حال پخش فیلم"
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:1
+msgid "Screen Saver"
+msgstr "محافظ صفحه‌نمایش"
+
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:2
+msgid "Deactivates the screen saver when a movie is playing"
+msgstr "از کار انداختن محافظ صفحه‌ی نمایش هنگام پخش فیلم"
 
 #: ../src/plugins/screenshot/gallery.ui.h:1
 msgid "Screenshot width (in pixels):"
@@ -2397,23 +2318,28 @@
 msgid "Number of screenshots:"
 msgstr "تعداد عکس‌ها:"
 
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:1
-msgid "_Name:"
-msgstr "_نام:"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:2
-msgid "Save in _folder:"
-msgstr "ذخیره در _پوشه:"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:3
-msgid "Select a folder"
-msgstr "یک پوشه انتخاب کنید"
-
-#. Write the screenshot to the temporary file
-#: ../src/plugins/screenshot/gnome-screenshot-widget.c:385
-#: ../src/plugins/screenshot/totem-screenshot.c:64
-msgid "Screenshot.png"
-msgstr "Screenshot.png"
+#. translators: this is the name of the file that gets made up
+#. * with the screenshot if the entire screen is taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:147
+#, c-format
+msgid "Screenshot from %s.png"
+msgstr "عکس‌صفحه از %s.png"
+
+#. translators: this is the name of the file that gets
+#. * made up with the screenshot if the entire screen is
+#. * taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:154
+#, c-format
+msgid "Screenshot from %s - %d.png"
+msgstr "عکس‌صفحه-%s-%Id.png"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:1
+msgid "Screenshot"
+msgstr "عکس‌صفحه"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:2
+msgid "Allows screenshots and galleries to be taken of videos"
+msgstr "اجازه می‌دهد از ویدئوها عکس‌صفحه و گالری تهیه شود"
 
 #: ../src/plugins/screenshot/totem-gallery.c:91
 msgid "Save Gallery"
@@ -2439,49 +2365,47 @@
 msgid "Saving gallery as \"%s\""
 msgstr "ذخیره‌ی گالری به عنوان «%s»"
 
-#: ../src/plugins/screenshot/totem-screenshot.c:113
-msgid "There was an error saving the screenshot."
-msgstr "هنگام ذخیره کردن عکس صفحه خطایی رخ داد."
-
-#: ../src/plugins/screenshot/totem-screenshot.c:139
-msgid "Save Screenshot"
-msgstr "ذخیره‌ی عکس صفحه"
-
-#. Create the screenshot widget
-#. Translators: %s is the movie title and %d is an auto-incrementing number to make filename unique
-#: ../src/plugins/screenshot/totem-screenshot.c:160
-#, c-format
-msgid "Screenshot-%s-%d.png"
-msgstr "Screenshot-%s-%d.png"
-
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:88
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:220
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "Totem could not get a screenshot of the video."
 msgstr "توتم نتوانست از این فیلم عکس بگیرد."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "This is not supposed to happen; please file a bug report."
 msgstr "این اتفاق نباید می‌افتاد؛ لطفاً یک گزارش اشکال ثبت کنید."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
-msgid "Take _Screenshot..."
-msgstr "_عکس گرفتن از صفحه ..."
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
+msgid "Take _Screenshot"
+msgstr "گرفتن _عکس از صفحه"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
 msgid "Take a screenshot"
 msgstr "گرفتن یک عکس از صفحه"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create Screenshot _Gallery..."
 msgstr "ساخت _گالری عکس از صفحه..."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create a gallery of screenshots"
 msgstr "ساخت یک گالری از عکس‌های صفحه"
 
+#: ../src/plugins/skipto/skipto.plugin.in.h:1
+#: ../src/plugins/skipto/totem-skipto.c:196
+msgid "Skip To"
+msgstr "پرش به"
+
+#: ../src/plugins/skipto/skipto.plugin.in.h:2
+msgid "Provides the \"Skip to\" dialog"
+msgstr "محاوره «پرش به» را فراهم می‌کند"
+
+#: ../src/plugins/skipto/skipto.ui.h:1
+msgid "_Skip to:"
+msgstr "_پرش به:"
+
 #. Update the "seconds" label so that it always has the correct singular/plural form
 #. Translators: label for the seconds selector in the "Skip to" dialogue
-#: ../src/plugins/skipto/totem-skipto.c:160
+#: ../src/plugins/skipto/totem-skipto.c:159
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "ثانیه"
@@ -2491,15 +2415,11 @@
 #. Translators: you should translate this string to a number (written in digits) which corresponds to the longer character length of the
 #. * translations for "second" and "seconds", as translated elsewhere in this file. For example, in English, "second" is 6 characters long and
 #. * "seconds" is 7 characters long, so this string should be translated to "7". See: bgo#639398
-#: ../src/plugins/skipto/totem-skipto.c:190
+#: ../src/plugins/skipto/totem-skipto.c:189
 msgctxt "Skip To label length"
 msgid "7"
 msgstr "5"
 
-#: ../src/plugins/skipto/totem-skipto.c:197
-msgid "Skip To"
-msgstr "پرش به"
-
 #: ../src/plugins/skipto/totem-skipto-plugin.c:182
 msgid "_Skip To..."
 msgstr "_پرش به..."
@@ -2508,115 +2428,304 @@
 msgid "Skip to a specific time"
 msgstr "پرش به زمان مشخص"
 
-#: ../src/plugins/skipto/skipto.ui.h:1
-msgid "_Skip to:"
-msgstr "_پرش به:"
+#~ msgid "Play movies and songs"
+#~ msgstr "پخش فیلم و آهنگ"
 
-#: ../browser-plugin/totem-plugin-viewer.c:431
-msgid "No URI to play"
-msgstr "آدرسی برای پخش نیست"
+#~ msgid "Open a file"
+#~ msgstr "باز کردن یک پرونده"
 
-#. translators: this is:
-#. * Open With ApplicationName
-#. * as in nautilus' right-click menu
-#: ../browser-plugin/totem-plugin-viewer.c:1107
-#, c-format
-msgid "_Open with \"%s\""
-msgstr "_باز کردن با «%s»"
+#~ msgid "Open a non-local file"
+#~ msgstr "باز کردن یک پرونده‌ی غیر محلی"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2136
-msgid "No playlist or playlist empty"
-msgstr "فهرست پخشی وجود ندارد و یا خالی است"
+#~ msgid "Quit the program"
+#~ msgstr "ترک برنامه"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2235
-msgid "Movie browser plugin"
-msgstr "افزونه‌ی مرورگر فیلم"
+#~ msgid "Configure the application"
+#~ msgstr "پیکربندی برنامه"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Verify your system installation. The Totem plugin will now exit."
-msgstr "از درستی نصب سیستمتان مطمئن شوید. افزونه‌ی توتم هم‌اکنون خارج می‌شود."
+#~ msgid "Switch to fullscreen"
+#~ msgstr "رفتن به حالت تمام‌صفحه"
 
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
-msgid "Python Console"
-msgstr "پایانه پیتون"
+#~ msgid "Set the repeat mode"
+#~ msgstr "تنظیم حالت تکرار"
 
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
-msgid "Interactive Python console."
-msgstr "پایانه‌ی تعاملی پیتون"
+#~ msgid "Set the shuffle mode"
+#~ msgstr "تنظیم حالت تصادفی"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:88
-msgid "Python Console Menu"
-msgstr "منوی پایانه‌ی پیتون"
+#~ msgid "14.4 Kbps Modem"
+#~ msgstr "مودم با سرعت ۱۴.۴ کیلوبیت/ثانیه"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:93
-msgid "_Python Console"
-msgstr "پایانه‌ی _پیتون"
+#~ msgid "19.2 Kbps Modem"
+#~ msgstr "مودم با سرعت ۱۹.۲ کیلوبیت/ثانیه"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:94
-msgid "Show Totem's Python console"
-msgstr "نمایش پایانه‌ی پیتون توتم"
+#~ msgid "28.8 Kbps Modem"
+#~ msgstr "مودم با سرعت ۲۸.۸ کیلوبیت/ثانیه"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:100
-msgid "Python Debugger"
-msgstr "اشکال‌یاب پیتون"
+#~ msgid "33.6 Kbps Modem"
+#~ msgstr "مودم با سرعت ۳۳.۶ کیلوبیت/ثانیه"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:101
-msgid "Enable remote Python debugging with rpdb2"
-msgstr "فعال کردن اشکال‌یابی دوردست پیتون بوسیله rpdb2"
+#~ msgid "34.4 Kbps Modem"
+#~ msgstr "مودم با سرعت ۲۴.۴ کیلوبیت/ثانیه"
 
-#. pylint: disable-msg=E1101
-#: ../src/plugins/pythonconsole/pythonconsole.py:125
-#, python-format
-msgid ""
-"You can access the Totem.Object through 'totem_object' :\\n"
-"%s"
-msgstr ""
-"شما می‌توانید از طریق «totem_object« به توتم دسترسی داشته باشید:\\n"
-"%s"
+#~ msgid "56 Kbps Modem/ISDN"
+#~ msgstr "مودم/ISDN با سرعت ۵۶ کیلوبیت/ثانیه"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:129
-msgid "Totem Python Console"
-msgstr "پایانه‌ی پیتون توتم"
+#~ msgid "112 Kbps Dual ISDN/DSL"
+#~ msgstr "نوع ISDN/DSL دوگانه با سرعت ۱۱۲ کیلوبیت/ثانیه"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:139
-msgid "After you press OK, Totem will wait until you connect to it with winpdb or rpdb2. If you have not set a debugger password in DConf, it will use the default password ('totem')."
-msgstr "پس از تایید، توتم منتظر می‌ماند تا شما بوسیله winpdb یا rpdb2 متصل شوید. چنانچه شما گذرواژه‌ای برای اشکال‌زدا در GConf تعیین نکرده‌اید، از گذرواژه پیش‌فرض ('totem') استفاده می‌شود."
+#~ msgid "256 Kbps DSL/Cable"
+#~ msgstr "DSL/Cable با سرعت ۲۵۶ کیلوبیت/ثانیه"
 
-#: ../src/plugins/grilo/grilo.plugin.in.h:1
-msgid "Grilo Browser"
-msgstr "مرورگر گریلو"
+#~ msgid "384 Kbps DSL/Cable"
+#~ msgstr "نوع DSL/Cable با سرعت ۳۸۴ کیلوبیت/ثانیه"
 
-#: ../src/plugins/grilo/grilo.plugin.in.h:2
-msgid "A plugin to let you browse media content from various sources."
-msgstr "یک پلاگین که به شما امکان مرور رسانه‌ها از منابع مختلف می‌دهد."
+#~ msgid "512 Kbps DSL/Cable"
+#~ msgstr "نوع DSL/Cable با سرعت ۵۱۲ کیلوبیت/ثانیه"
 
-#: ../src/plugins/grilo/totem-grilo.c:452
-msgid "Browse Error"
-msgstr "خطای مرور"
+#~ msgid "1.5 Mbps T1/Intranet/LAN"
+#~ msgstr "اینترانت/شبکه محلی/T1 با سرعت ۱.۵ Mbps"
 
-#: ../src/plugins/grilo/totem-grilo.c:599
-msgid "Search Error"
-msgstr "خطای جستجو"
+#~ msgid "Intranet/LAN"
+#~ msgstr "اینترانت/شبکه محلی"
 
-#: ../src/plugins/grilo/totem-grilo.c:1219
-#: ../src/plugins/grilo/grilo.ui.h:3
-msgid "Browse"
-msgstr "مرور"
+#~ msgid "Networking"
+#~ msgstr "شبکه"
 
-#: ../src/plugins/grilo/totem-grilo.c:1285
-#: ../src/plugins/grilo/grilo.ui.h:4
-msgid "Search"
-msgstr "جستجو"
+#~ msgid "Connection _speed:"
+#~ msgstr "_سرعت اتصال:"
 
-#: ../src/plugins/grilo/grilo.ui.h:1
-#| msgid "_Add to Playlist"
-msgid "Add to Playlist"
-msgstr "اضافه‌کردن به فهرست پخش"
+#~ msgid "Network connection speed"
+#~ msgstr "سرعت اتصال شبکه"
 
-#: ../src/plugins/grilo/grilo.ui.h:2
-#| msgid "_Copy Location"
-msgid "Copy Location"
-msgstr "رونوشت از مکان"
+#~ msgid ""
+#~ "Approximate network connection speed, used to select quality on media "
+#~ "over the network."
+#~ msgstr ""
+#~ "سرعت تقریبی اتصال شبکه، برای انتخاب کیفیت در رسانه بر روی شبکه استفاده "
+#~ "می‌شود."
+
+#~ msgid "Play Image '%s'"
+#~ msgstr "پخش تصویб دیسک '%s'"
+
+#~ msgid "device%l"
+#~ msgstr "ابزار %Id"
+
+#~ msgid "Play Disc '%s'"
+#~ msgstr "پخش دیسک «%s»"
+
+#~ msgid "Movie Player using %s"
+#~ msgstr "پخش‌کننده‌ی فیلم با استفاده از %s"
+
+#~ msgid ""
+#~ "Totem could not play this media (%s) although a plugin is present to "
+#~ "handle it."
+#~ msgstr ""
+#~ "توتم نتوانست این رسانه (%s) را پخش کند هر چند متصل‌شونده‌ای برای کار کردن "
+#~ "با آن موجود است."
+
+#~ msgid ""
+#~ "You might want to check that a disc is present in the drive and that it "
+#~ "is correctly configured."
+#~ msgstr "بهتر از وجود دیسک در دیسک‌گردان و پیکریندی صحیح آن  مطمئن شوید."
+
+#~ msgid "More information about media plugins"
+#~ msgstr "اطلاعات بیشتر درباره افزونه‌های صوتی/تصویری"
+
+#~ msgid ""
+#~ "Please install the necessary plugins and restart Totem to be able to play "
+#~ "this media."
+#~ msgstr ""
+#~ "لطفاٌ متصل‌شونده‌های مورد نیاز را نصب کنید و توتم را مجدداً راه‌اندازی کنید تا "
+#~ "بتواند این رسانه را پخش کند."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it does not have the "
+#~ "appropriate plugins to be able to read from the disc."
+#~ msgstr ""
+#~ "توتم نمی‌تواند این نوع رسانه (%s) را پخش کند چون پلاگین های مناسب برای کار "
+#~ "کردن با آن را ندارد تا بتواند دیسک را بخواند."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because you do not have the "
+#~ "appropriate plugins to handle it."
+#~ msgstr ""
+#~ "توتم نمی‌تواند این نوع رسانه (%s) را پخش کند چون شما متصل‌شونده‌های مناسب "
+#~ "برای کار کردن با آن را ندارید."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it is not supported."
+#~ msgstr ""
+#~ "توتم نمی‌تواند این نوع رسانه (%s) را پخش کند چون این نوع رسانه پشتیبانی "
+#~ "نمی شود."
+
+#~ msgid "Please insert another disc to play back."
+#~ msgstr "لطفا دیسک دیگری برای پخش کردن وارد کنید."
+
+#~ msgid "Totem does not support playback of Audio CDs"
+#~ msgstr "توتم از دیسک های صوتی پشتیبانی نمی‌کند."
+
+#~ msgid ""
+#~ "Please consider using a music player or a CD extractor to play this CD"
+#~ msgstr ""
+#~ "برای پخش کردن این سی دی بهتر است از یک نرم افزار پخش موزیک یا نرم افزار "
+#~ "استخراج فایل‌های صوتی استفاده کنید"
+
+#~ msgid "%d %%"
+#~ msgstr "٪%Id"
+
+#~ msgid ""
+#~ "The requested audio output was not found. Please select another audio "
+#~ "output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "خروجی صوتی درخواست شده پیدا نشد. لطفاً در انتخاب‌گر سیستم‌های چندرسانه‌ای "
+#~ "خروجی صوتی دیگری را انتخاب کنید."
+
+#~ msgid "Location not found."
+#~ msgstr "مکان پیدا نشد."
+
+#~ msgid ""
+#~ "Could not open location; you might not have permission to open the file."
+#~ msgstr ""
+#~ "نمی توان این مکان را باز کرد. شاید شما اجازه‌ی باز کردن آن را ندارید."
+
+#~ msgid ""
+#~ "The video output is in use by another application. Please close other "
+#~ "video applications, or select another video output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "خروجی ویدیو توسط برنامه دیگری در حال استفاده می باشد. لطفا برنامه های "
+#~ "ویدیویی دیگر را ببندید، یا از طریق انتخاب گر سیستم های جند رسانه ای خروجی "
+#~ "ویدیویی دیگری انتخاب کنید."
+
+#~ msgid ""
+#~ "The audio output is in use by another application. Please select another "
+#~ "audio output in the Multimedia Systems Selector. You may want to consider "
+#~ "using a sound server."
+#~ msgstr ""
+#~ "خروجی صوتی توسط برنامه‌ی دیگری در حال استفاده می‌باشد. لطفا برنامه‌های صوتی "
+#~ "دیگر را ببندید، یا از طریق انتخاب‌گر سیستم‌های جند رسانه‌ای خروجی صوتی دیگری "
+#~ "انتخاب کنید. شاید بهتر باشد از یک کارگزار صدا استفاده کنید."
+
+#~ msgid ""
+#~ "Failed to create a GStreamer play object. Please check your GStreamer "
+#~ "installation."
+#~ msgstr ""
+#~ "نمی توان شیئ پخش GStreamer را ایجاد کرد. لطفا نصب GStreamer را بررسی کنید."
+
+#~ msgid ""
+#~ "Failed to open audio output. You may not have permission to open the "
+#~ "sound device, or the sound server may not be running. Please select "
+#~ "another audio output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "خطا در هنگام باز کردن خروجی صوتی. ممکن است حق دسترسی به دستگاه صوتی را "
+#~ "نداشته باشید، یا اینکه سرور صوتی در حال اجرا نباشد. لطفا از طریق انتخاب‌گر "
+#~ "چندرسانه‌ای یک خروجی صوتی دیگر انتخاب نمایید."
+
+#~ msgid ""
+#~ "Could not find the audio output. You may need to install additional "
+#~ "GStreamer plugins, or select another audio output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "امکان پیدا کردن خروجی صوتی نبود. ممکن است نیاز باشد که افزونه‌های اضافی "
+#~ "GStreamer را نصب کنید، و یا از طریق انتخاب‌گر سیستم‌های جندرسانه ای خروجی "
+#~ "صوتی دیگری را انتخاب نمایید."
+
+#~ msgid "BBC iPlayer"
+#~ msgstr "BBC iPlayer"
+
+#~ msgid ""
+#~ "Stream BBC programs from the last 7 days from the BBC iPlayer service."
+#~ msgstr "اجرای برنامه‌های BBC در ۷ روز گذشته از سرویس BBC iPlayer."
+
+#~ msgid "Error listing channel categories"
+#~ msgstr "خطا در فهرست کردن شاخه‌های کانال‌ها"
+
+#~ msgid ""
+#~ "There was an unknown error getting the list of television channels "
+#~ "available on BBC iPlayer."
+#~ msgstr ""
+#~ "خطایی در هنگام دریافت فهرست کانل‌های تلویزیون موجود در BBC iPlayer رخ داد."
+
+#~ msgid "Loading…"
+#~ msgstr "درحال بارکردن..."
+
+#~ msgid "Error getting programme feed"
+#~ msgstr "خطا در گرفتن فید برنامه"
+
+#~ msgid ""
+#~ "There was an error getting the list of programmes for this channel and "
+#~ "category combination."
+#~ msgstr ""
+#~ "خطایی هنگام دریافت فهرست برنامه‌های این کانال و مجموعه‌ی دسته‌های آن رخ داده "
+#~ "است."
+
+#~ msgid ""
+#~ msgstr "<هیچ دلیلی داده نشده>"
+
+#~ msgid "Programme unavailable (\"%s\")"
+#~ msgstr "برنامه در دسترس نیست («%s»)"
+
+#~ msgid "Publisher protocol to use"
+#~ msgstr "پروتکل منتشر‌کننده برای استفاده"
+
+#~ msgid ""
+#~ "The transport protocol to use when publishing playlists over the network."
+#~ msgstr "پروتکل حمل و نقلی که بهنگام نشر فهرست پخش در شبکه استفاده می‌شود."
+
+#~ msgid "Format for network service name"
+#~ msgstr "قالب برای نام سرویس شبکه"
+
+#~ msgid ""
+#~ "A format string used to build the network service name used when "
+#~ "publishing playlists over the network. The following format placeholders "
+#~ "can be used: • %a: the program name as returned by g_get_application_name"
+#~ "() • %h: the machine's host name in title case • %u: the user's login "
+#~ "name in title case • %U: the user's real name • %%: the percent sign"
+#~ msgstr ""
+#~ "یک رشته‌ی قالب که برای ساختن نام سرویس شبکه استفاده می‌شود، برای منتشر کردن "
+#~ "فهرست پخش روی شبکه. این رشته‌های را می‌توان استفاده کرد: • %a: اسم برنامه "
+#~ "که با g_get_application_name()  گرفته می‌شود • %h: اسم میزبان ماشین در "
+#~ "حالت عنوان •  %u: اسم کاربری کاربر در حالت عنوان • %U: اسم واقعی کاربر • %"
+#~ "%: علامت درصد"
+
+#~ msgid "Neighbors"
+#~ msgstr "همسایه‌ها"
+
+#~ msgid "Publish Playlist"
+#~ msgstr "انتشار فهرست پخش"
+
+#~ msgid "Share the current playlist via HTTP"
+#~ msgstr "به اشتراک گذاشتن فهرست پخش فعلی از طریق پروتکل HTTP"
+
+#~ msgid "Service _Name:"
+#~ msgstr "_نام خدمات:"
+
+#~ msgid ""
+#~ "The name used for announcing the playlist service on the network.\n"
+#~ "All occurrences of the string %u will be replaced by your name,\n"
+#~ "and %h will be replaced by your computer's host name."
+#~ msgstr ""
+#~ "نامی که برای شناسایی فهرست پخش بر روی شبکه استفاده می‌شود.\n"
+#~ "تمامی موارد رشته‌ی %u جایگزین با نام شما خواهد شد.\n"
+#~ "و %h جایگزین با نام میزبان رایانه شما خواهد شد."
+
+#~ msgid "Use _encrypted transport protocol (HTTPS)"
+#~ msgstr "از پروتکل انتقال _رمزنگاری‌شده استفاده شود (HTTPS)"
+
+#~ msgid "_Name:"
+#~ msgstr "_نام:"
+
+#~ msgid "Save in _folder:"
+#~ msgstr "ذخیره در _پوشه:"
+
+#~ msgid "Select a folder"
+#~ msgstr "یک پوشه انتخاب کنید"
+
+#~ msgid "There was an error saving the screenshot."
+#~ msgstr "هنگام ذخیره کردن عکس صفحه خطایی رخ داد."
+
+#~ msgid "Save Screenshot"
+#~ msgstr "ذخیره‌ی عکس صفحه"
 
 #~ msgid "Bemused"
 #~ msgstr "Bemused"
@@ -2645,9 +2754,6 @@
 #~ msgid "Search Results"
 #~ msgstr "نتایج جستجو"
 
-#~ msgid "Videos"
-#~ msgstr "ویدیوها"
-
 #~ msgid "_Open in Web Browser"
 #~ msgstr "باز کردن در مرورگر وب"
 
diff -Nru totem-3.4.3/po/fi.po totem-3.6.2/po/fi.po
--- totem-3.4.3/po/fi.po	2012-04-02 14:15:40.000000000 +0000
+++ totem-3.6.2/po/fi.po	2012-10-09 15:42:00.000000000 +0000
@@ -2,39 +2,254 @@
 # Copyright (C) 2002-2009 Free Software Foundation, Inc.
 # Suomennos: http://gnome.fi/
 #
-# Tommi Vainikainen , 2003-2005, 2008-2009.
-# Ilkka Tuohela , 2002,2003,2005-2009.
-# Timo Jyrinki , 2008-2010.
 #
 # Additional Launchpad translators:
 #  Christian Hellberg https://launchpad.net/~christian-hellberg\n"
 #  JTY https://launchpad.net/~jukka-yrjola\n"
 #  Jiri Grönroos https://launchpad.net/~jiri-gronroos\n"
 #  Jussi Aalto https://launchpad.net/~jtaalto\n"
-# Jiri Grönroos , 2012.
 #
+# Tommi Vainikainen , 2003-2005, 2008-2009.
+# Ilkka Tuohela , 2002,2003,2005-2009.
+# Timo Jyrinki , 2008-2010.
+# Jiri Grönroos , 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: totem\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-24 16:57+0200\n"
-"PO-Revision-Date: 2012-03-23 18:27+0200\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=totem&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2012-07-17 09:30+0000\n"
+"PO-Revision-Date: 2012-09-09 22:04+0300\n"
 "Last-Translator: Jiri Grönroos \n"
-"Language-Team: Finnish \n"
+"Language-Team: Finnish <>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"X-Generator: Lokalize 1.5\n"
+
+#: ../browser-plugin/totem-plugin-viewer.c:352 ../src/totem-object.c:1180
+#: ../src/totem-object.c:1650 ../src/totem-statusbar.c:115
+msgid "Stopped"
+msgstr "Pysäytetty"
+
+#: ../browser-plugin/totem-plugin-viewer.c:364 ../src/totem-object.c:1173
+msgid "Paused"
+msgstr "Tauko"
+
+#: ../browser-plugin/totem-plugin-viewer.c:368 ../src/totem-object.c:1166
+msgid "Playing"
+msgstr "Toistetaan"
+
+#: ../browser-plugin/totem-plugin-viewer.c:386
+#: ../src/plugins/screensaver/totem-screensaver.c:97
+msgid "Playing a movie"
+msgstr "Toistetaan elokuvaa"
+
+#: ../browser-plugin/totem-plugin-viewer.c:443
+msgid "No URI to play"
+msgstr "Soitettavaa URI:a ei annettu"
+
+#: ../browser-plugin/totem-plugin-viewer.c:676
+#: ../browser-plugin/totem-plugin-viewer.c:1700
+msgid "Totem Movie Player"
+msgstr "Totem-elokuvasoitin"
+
+#. translators: this is:
+#. * Open With ApplicationName
+#. * as in nautilus' right-click menu
+#: ../browser-plugin/totem-plugin-viewer.c:1120
+#, c-format
+msgid "_Open with \"%s\""
+msgstr "_Avaa sovelluksella ”%s”"
+
+#: ../browser-plugin/totem-plugin-viewer.c:1341 ../src/totem-object.c:2475
+msgid "An error occurred"
+msgstr "Tapahtui virhe"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2033
+msgid "No playlist or playlist empty"
+msgstr "Soittolistaa ei ole tai se on tyhjä"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2128
+msgid "Movie browser plugin"
+msgstr "Elokuvaselainliitännäinen"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144 ../src/totem.c:239
+msgid "Could not initialize the thread-safe libraries."
+msgstr "Säieturvallisia kirjastoja ei voi alustaa."
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144
+msgid "Verify your system installation. The Totem plugin will now exit."
+msgstr "Tarkista järjestelmäasennuksesi. Totemin liitännäinen suljetaan."
 
 #: ../data/fullscreen.ui.h:1
 msgid "Leave Fullscreen"
-msgstr "Poistu kokoruudusta"
+msgstr "Poistu koko näytön tilasta"
 
-#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:144
+#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:81
 msgid "Time:"
 msgstr "Aika:"
 
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
+msgid "Allow the screensaver to activate when playing audio"
+msgstr "Salli näytönsäästäjän käynnistyä kun toistetaan pelkkää ääntä"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
+msgid ""
+"Allow the screensaver to activate when playing audio. Disable if you have "
+"monitor-powered speakers."
+msgstr ""
+"Salli näytönsäästäjän käynnistyä kun toistetaan pelkkää ääntä. Älä salli jos "
+"sinulla on näytöstä virtansa ottavat kaiuttimet."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
+msgid "Show visual effects when no video is displayed"
+msgstr "Näytä visuaalisia tehosteita, kun videokuvaa ei näytetä"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
+msgid "Show visual effects when playing an audio only file."
+msgstr ""
+"Näytä visuaalisia tehosteita, kun soitetaan tiedostoa, jossa on vain ääntä."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
+msgid "Name of the visual effects plugin"
+msgstr "Visuaalisten tehosteiden liitännäisen nimi"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
+msgid "The brightness of the video"
+msgstr "Videon kirkkaus"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
+msgid "The contrast of the video"
+msgstr "Videon kontrasti"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
+msgid "The hue of the video"
+msgstr "Videon värisävy"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
+msgid "The saturation of the video"
+msgstr "Videon värikylläisyys"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
+msgid "Resize the canvas automatically on file load"
+msgstr "Muuta näyttöalueen kokoa automaattisesti tiedoston latautuessa"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
+msgid "Repeat mode"
+msgstr "Kertaustila"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
+msgid "Shuffle mode"
+msgstr "Satunnaistoisto"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
+msgid "Whether to disable deinterlacing for interlaced movies"
+msgstr "Poistetaanko lomituksenpoisto käytöstä lomitetuilla elokuvilla"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
+msgid "Whether to enable debug for the playback engine"
+msgstr "Pidetäänkö soittomoottorin vianetsintä päällä"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
+msgid "Type of audio output to use"
+msgstr "Käytettävän ääniulostulon tyyppi"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
+msgid "Visualization quality setting"
+msgstr "Visualisoinnin laatuasetus"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
+msgid "Quality setting for the audio visualization."
+msgstr "Laatuasetus äänen visualisointiin."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
+msgid "Network buffering threshold"
+msgstr "Verkkopuskuroinnin kynnys"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
+msgid ""
+"Amount of data to buffer for network streams before starting to display the "
+"stream (in seconds)."
+msgstr ""
+"Puskuroitavan tiedon määrä verkkovirroille ennen kuin virtauksen toisto "
+"alkaa (sekunteina)."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
+msgid "Subtitle font"
+msgstr "Tekstityksen kirjasin"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
+msgid "Pango font description for subtitle rendering."
+msgstr "Pango-kirjasinkuvaus tekstityksen piirtoon."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
+msgid "Subtitle encoding"
+msgstr "Tekstityksen merkistökoodaus"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
+msgid "Encoding character set for subtitle."
+msgstr "Merkistöenkoodaus tekstitykselle."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
+msgid "Default location for the \"Open...\" dialogs"
+msgstr "Oletus-sijainti ”Avaa…”-ikkunoille"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
+msgid ""
+"Default location for the \"Open...\" dialogs. Default is the current "
+"directory."
+msgstr "Oletussijainti ”Avaa…”-valintaikkunassa. Oletus on nykyinen kansio."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
+msgid "Default location for the \"Take Screenshot\" dialogs"
+msgstr "Oletuskansio ”Ota kuvakaappaus”-ikkunoille"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
+msgid ""
+"Default location for the \"Take Screenshot\" dialogs. Default is the "
+"Pictures directory."
+msgstr "Oletussijainti ”Ota kuvakaappaus”-ikkunalle. Oletus on Kuvat-kansio."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
+msgid "Whether to disable the plugins in the user's home directory"
+msgstr "Poistetaanko käyttäjän kotihakemiston liitännäiset käytöstä"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
+msgid "Whether to disable the keyboard shortcuts"
+msgstr "Otetaanko pikanäppäimet pois käytöstä"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
+msgid "Whether to autoload text subtitle files when a movie is loaded"
+msgstr "Ladataanko tekstitystiedostot automaattisesti kun elokuva ladataan"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
+msgid "Whether to autoload external chapter files when a movie is loaded"
+msgstr ""
+"Ladataanko ulkoiset kappaletiedostot automaattisesti kun elokuva ladataan"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
+msgid ""
+"Whether to remember the position of played audio/video files when pausing or "
+"closing them"
+msgstr ""
+"Muistetaanko toistetun ääni- tai kuvatiedoston sijainti tauon/sulkemisen "
+"jälkeen"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
+msgid "Active plugins list"
+msgstr "Aktiivisten liitännäisten luettelo"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+msgid ""
+"A list of the names of the plugins which are currently active (loaded and "
+"running)."
+msgstr ""
+"Luettelo niiden liitännäisten nimistä, jotka ovat tällä hetkellä aktiivisia "
+"(ladattu ja suorituksessa)."
+
 #: ../data/playlist.ui.h:1
 msgid "_Remove"
 msgstr "_Poista"
@@ -51,11 +266,11 @@
 msgid "Copy the location to the clipboard"
 msgstr "Kopioi sijainti leikepöydälle"
 
-#: ../data/playlist.ui.h:5 ../data/totem.ui.h:78
+#: ../data/playlist.ui.h:5 ../data/totem.ui.h:71
 msgid "_Select Text Subtitles..."
 msgstr "Valitse tek_stitys…"
 
-#: ../data/playlist.ui.h:6 ../data/totem.ui.h:79
+#: ../data/playlist.ui.h:6 ../data/totem.ui.h:72
 msgid "Select a file to use for text subtitles"
 msgstr "Valitse tekstitykseen käytettävä tiedosto"
 
@@ -79,48 +294,198 @@
 msgid "Move Down"
 msgstr "Siirrä alas"
 
-#: ../data/properties.ui.h:1 ../data/totem.ui.h:122
-msgid "General"
-msgstr "Yleistä"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:2
+msgid "Normal"
+msgstr "Tavallinen"
 
-#: ../data/properties.ui.h:2
-msgid "Title:"
-msgstr "Nimi:"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:4
+msgid "Large"
+msgstr "Suuri"
 
-#: ../data/properties.ui.h:3
-msgid "Artist:"
-msgstr "Esittäjä:"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:6
+msgid "Extra Large"
+msgstr "Erityisen suuri"
 
-#: ../data/properties.ui.h:4
-msgid "Duration:"
-msgstr "Kesto:"
+#: ../data/preferences.ui.h:7 ../src/backend/bacon-video-widget.c:5479
+#: ../src/totem-properties-view.c:231
+msgid "Stereo"
+msgstr "Stereo"
 
-#: ../data/properties.ui.h:5
-msgid "Year:"
-msgstr "Vuosi:"
+#: ../data/preferences.ui.h:8
+msgid "4-channel"
+msgstr "4-kanava"
 
-#: ../data/properties.ui.h:6
-msgid "Album:"
-msgstr "Levy:"
+#: ../data/preferences.ui.h:9
+msgid "4.1-channel"
+msgstr "4.1-kanava"
 
-#: ../data/properties.ui.h:7
-msgid "Comment:"
-msgstr "Kommentti:"
+#: ../data/preferences.ui.h:10
+msgid "5.0-channel"
+msgstr "5.0-kanava"
 
-#: ../data/properties.ui.h:8
-msgid "Container:"
-msgstr "Säiliö:"
+#: ../data/preferences.ui.h:11
+msgid "5.1-channel"
+msgstr "5.1-kanava"
 
-#: ../data/properties.ui.h:9 ../data/totem.ui.h:128
-#: ../src/totem-properties-view.c:270
-msgid "Video"
-msgstr "Video"
+#: ../data/preferences.ui.h:12
+msgid "AC3 Passthrough"
+msgstr "AC3-läpivienti"
 
-#: ../data/properties.ui.h:10
-msgid "Dimensions:"
-msgstr "Mitat:"
+#: ../data/preferences.ui.h:13
+msgid "Totem Preferences"
+msgstr "Totemin asetukset"
 
-#: ../data/properties.ui.h:11
+#: ../data/preferences.ui.h:14
+msgid "Playback"
+msgstr "Toisto"
+
+#: ../data/preferences.ui.h:15
+msgid "Start playing files from last position"
+msgstr "Aloita tiedostojen toisto viimeksi jääneestä kohdasta"
+
+#: ../data/preferences.ui.h:16
+msgid "Text Subtitles"
+msgstr "Tekstitys"
+
+#: ../data/preferences.ui.h:17
+msgid "_Load subtitle files when movie is loaded"
+msgstr "_Lataa tekstitys elokuvan käynnistyessä"
+
+#: ../data/preferences.ui.h:18
+msgid "_Font:"
+msgstr "_Kirjasin:"
+
+#: ../data/preferences.ui.h:19
+msgid "_Encoding:"
+msgstr "_Merkistökoodaus:"
+
+#: ../data/preferences.ui.h:20
+msgid "External Chapters"
+msgstr "Ulkoiset kappaleet"
+
+#: ../data/preferences.ui.h:21
+msgid "Load _chapter files when movie is loaded"
+msgstr "Lataa _kappaletiedostoja kun elokuva avataan"
+
+#: ../data/preferences.ui.h:22 ../data/properties.ui.h:1
+msgid "General"
+msgstr "Yleistä"
+
+#. Tab label in the Preferences dialogue
+#: ../data/preferences.ui.h:24
+msgid "Display"
+msgstr "Näyttö"
+
+#: ../data/preferences.ui.h:25
+msgid "_Resize the window when a new video is loaded"
+msgstr "_Sovita ikkunan koko elokuvan kokoon videon avauksen yhteydessä"
+
+#: ../data/preferences.ui.h:26
+msgid "Disable _deinterlacing of interlaced videos"
+msgstr "Poista lomitettujen videoiden lomituksen poisto käytöstä"
+
+#: ../data/preferences.ui.h:27
+msgid "Disable screensaver when playing "
+msgstr "Estä näytönsäästäjä, kun toistetaan "
+
+#: ../data/preferences.ui.h:28 ../data/properties.ui.h:9
+#: ../src/totem-properties-view.c:273
+msgid "Video"
+msgstr "Video"
+
+#: ../data/preferences.ui.h:29
+msgid "Video or Audio"
+msgstr "Videoa tai ääntä"
+
+#: ../data/preferences.ui.h:30
+msgid "Visual Effects"
+msgstr "Visuaaliset tehosteet"
+
+#: ../data/preferences.ui.h:31
+msgid "Show _visual effects when an audio file is played"
+msgstr "Näytä _visuaalisia tehosteita soitettaessa ääntä"
+
+#: ../data/preferences.ui.h:32
+msgid "_Type of visualization:"
+msgstr "Visualisoinnin _tyyppi:"
+
+#: ../data/preferences.ui.h:33
+msgid "Visualization _size:"
+msgstr "Visualisointik_oko:"
+
+#: ../data/preferences.ui.h:34
+msgid "Color Balance"
+msgstr "Väritasapaino"
+
+#: ../data/preferences.ui.h:35
+msgid "_Brightness:"
+msgstr "_Kirkkaus:"
+
+#: ../data/preferences.ui.h:36
+msgid "Co_ntrast:"
+msgstr "Ko_ntrasti:"
+
+#: ../data/preferences.ui.h:37
+msgid "Sat_uration:"
+msgstr "_Kylläisyys:"
+
+#: ../data/preferences.ui.h:38
+msgid "_Hue:"
+msgstr "_Sävy:"
+
+#: ../data/preferences.ui.h:39
+msgid "Reset to _Defaults"
+msgstr "Palauta _oletusasetukset"
+
+#: ../data/preferences.ui.h:40
+msgid "Audio Output"
+msgstr "Ääniulostulo"
+
+#: ../data/preferences.ui.h:41
+msgid "_Audio output type:"
+msgstr "_Ääniulostulon tyyppi:"
+
+#: ../data/preferences.ui.h:42 ../data/properties.ui.h:14
+#: ../src/totem-properties-view.c:271
+msgid "Audio"
+msgstr "Ääni"
+
+#: ../data/properties.ui.h:2
+msgid "Title:"
+msgstr "Nimi:"
+
+#: ../data/properties.ui.h:3
+msgid "Artist:"
+msgstr "Esittäjä:"
+
+#: ../data/properties.ui.h:4
+msgid "Duration:"
+msgstr "Kesto:"
+
+#: ../data/properties.ui.h:5
+msgid "Year:"
+msgstr "Vuosi:"
+
+#: ../data/properties.ui.h:6
+msgid "Album:"
+msgstr "Levy:"
+
+#: ../data/properties.ui.h:7
+msgid "Comment:"
+msgstr "Kommentti:"
+
+#: ../data/properties.ui.h:8
+msgid "Container:"
+msgstr "Säiliö:"
+
+#: ../data/properties.ui.h:10
+msgid "Dimensions:"
+msgstr "Mitat:"
+
+#: ../data/properties.ui.h:11
 msgid "Codec:"
 msgstr "Koodekki:"
 
@@ -132,11 +497,6 @@
 msgid "Bitrate:"
 msgstr "Bittinopeus:"
 
-#: ../data/properties.ui.h:14 ../data/totem.ui.h:142
-#: ../src/totem-properties-view.c:268
-msgid "Audio"
-msgstr "Ääni"
-
 #: ../data/properties.ui.h:15
 msgid "Sample rate:"
 msgstr "Näytetaajuus:"
@@ -145,739 +505,459 @@
 msgid "Channels:"
 msgstr "Kanavat:"
 
-#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
-msgid "_Add to Playlist"
-msgstr "_Lisää soittolistaan"
-
-#: ../data/video-list.ui.h:2
-msgid "Add the video to the playlist"
-msgstr "Lisää video soittolistaan"
-
 #. Title
-#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:143
-#: ../src/totem-object.c:1667
-msgid "Movie Player"
-msgstr "Elokuvasoitin"
+#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:80 ../src/totem.c:238
+#: ../src/totem.c:247 ../src/totem-menu.c:790 ../src/totem-object.c:1658
+msgid "Videos"
+msgstr "Videot"
 
 #: ../data/totem.desktop.in.in.in.h:2
-msgid "Play movies and songs"
-msgstr "Toista elokuvia ja musiikkia"
+#| msgid "Playing a movie"
+msgid "Play movies"
+msgstr "Toista elokuvia"
+
+#: ../data/totem.desktop.in.in.in.h:3
+msgid "Video;Movie;Film;Clip;Series;Player;DVD;TV;Disc;"
+msgstr ""
+"Video;Movie;Film;Clip;Series;Player;DVD;TV;Disc;Elokuva;Filmi;Sarja;Soitin;lev"
+"y;"
 
 #: ../data/totem.ui.h:1
-msgid "_Movie"
-msgstr "_Elokuva"
+#| msgid "_Open..."
+msgid "_Open"
+msgstr "_Avaa"
 
 #: ../data/totem.ui.h:2
-msgid "_Open..."
-msgstr "_Avaa…"
+#| msgid "Open _Location..."
+msgid "Open _Location"
+msgstr "Avaa _sijainti"
 
 #: ../data/totem.ui.h:3
-msgid "Open a file"
-msgstr "Avaa tiedosto"
+msgid "_Fullscreen"
+msgstr "_Koko näyttö"
 
 #: ../data/totem.ui.h:4
-msgid "Open _Location..."
-msgstr "Avaa _sijainnista…"
+msgid "Prefere_nces"
+msgstr "_Asetukset"
 
 #: ../data/totem.ui.h:5
-msgid "Open a non-local file"
-msgstr "Avaa ei-paikallinen tiedosto"
+#| msgid "Shuff_le Mode"
+msgid "Shuff_le"
+msgstr "_Satunnaistoisto"
 
 #: ../data/totem.ui.h:6
+#| msgid "_Repeat Mode"
+msgid "_Repeat"
+msgstr "Kertaus_tila"
+
+#: ../data/totem.ui.h:7
+msgid "_Quit"
+msgstr "_Lopeta"
+
+#: ../data/totem.ui.h:8
+msgid "_Movie"
+msgstr "_Elokuva"
+
+#: ../data/totem.ui.h:9
 msgid "_Eject"
 msgstr "L_evy ulos"
 
-#: ../data/totem.ui.h:7
+#: ../data/totem.ui.h:10
 msgid "Eject the current disc"
 msgstr "Poista nykyinen levy asemasta"
 
-#: ../data/totem.ui.h:8
+#: ../data/totem.ui.h:11
 msgid "_Properties"
 msgstr "_Ominaisuudet"
 
-#: ../data/totem.ui.h:9
+#: ../data/totem.ui.h:12
 msgid "View the properties of the current stream"
 msgstr "Katso nykyisen virtauksen ominaisuuksia"
 
-#: ../data/totem.ui.h:10
+#: ../data/totem.ui.h:13
 msgid "Play / P_ause"
-msgstr "Toista / _Pidä tauko"
+msgstr "Toista / _pidä tauko"
 
-#: ../data/totem.ui.h:11
+#: ../data/totem.ui.h:14
 msgid "Play or pause the movie"
 msgstr "Toista tai pidä tauko elokuvassa"
 
-#: ../data/totem.ui.h:12
-msgid "_Quit"
-msgstr "_Lopeta"
-
-#: ../data/totem.ui.h:13
-msgid "Quit the program"
-msgstr "Lopeta ohjelma"
-
-#: ../data/totem.ui.h:14
+#: ../data/totem.ui.h:15
 msgid "_Edit"
 msgstr "_Muokkaa"
 
-#: ../data/totem.ui.h:15
+#: ../data/totem.ui.h:16
 msgid "_Clear Playlist"
 msgstr "_Tyhjennä soittolista"
 
-#: ../data/totem.ui.h:16
+#: ../data/totem.ui.h:17
 msgid "Clear the playlist"
 msgstr "Tyhjennä soittolista"
 
-#: ../data/totem.ui.h:17
-msgid "Prefere_nces"
-msgstr "_Asetukset"
-
 #: ../data/totem.ui.h:18
-msgid "Configure the application"
-msgstr "Säädä sovellusta"
-
-#: ../data/totem.ui.h:19
 msgid "Plugins..."
 msgstr "Liitännäiset…"
 
-#: ../data/totem.ui.h:20
+#: ../data/totem.ui.h:19
 msgid "Configure plugins to extend the application"
 msgstr "Säädä liitännäisiä laajentamaan sovellusta"
 
-#: ../data/totem.ui.h:21
+#: ../data/totem.ui.h:20
 msgid "_View"
 msgstr "_Näytä"
 
-#: ../data/totem.ui.h:22
-msgid "_Fullscreen"
-msgstr "_Kokoruutu"
-
-#: ../data/totem.ui.h:23
-msgid "Switch to fullscreen"
-msgstr "Vaihda kokoruututilaan"
-
-#: ../data/totem.ui.h:24
+#: ../data/totem.ui.h:21
 msgid "Fit Window to Movie"
 msgstr "Sovita ikkuna elokuvalle"
 
-#: ../data/totem.ui.h:25
+#: ../data/totem.ui.h:22
 msgid "_Resize 1:2"
 msgstr "_Muuta kooksi 1:2"
 
-#: ../data/totem.ui.h:26
+#: ../data/totem.ui.h:23
 msgid "Resize to half the original video size"
 msgstr "Muuta kooksi puolet videon koosta"
 
-#: ../data/totem.ui.h:27
+#: ../data/totem.ui.h:24
 msgid "Resize _1:1"
 msgstr "Muuta kooksi _1:1"
 
-#: ../data/totem.ui.h:28
+#: ../data/totem.ui.h:25
 msgid "Resize to the original video size"
 msgstr "Muuta kooksi alkuperäinen videon koko"
 
-#: ../data/totem.ui.h:29
+#: ../data/totem.ui.h:26
 msgid "Resize _2:1"
 msgstr "Muuta kooksi _2:1"
 
-#: ../data/totem.ui.h:30
+#: ../data/totem.ui.h:27
 msgid "Resize to double the original video size"
 msgstr "Muuta kooksi kaksi kertaa videon koko"
 
-#: ../data/totem.ui.h:31
+#: ../data/totem.ui.h:28
 msgid "_Aspect Ratio"
 msgstr "_Kuvasuhde"
 
-#: ../data/totem.ui.h:32
+#: ../data/totem.ui.h:29
 msgid "Switch An_gles"
 msgstr "Vaihda _kulmaa"
 
-#: ../data/totem.ui.h:33
+#: ../data/totem.ui.h:30
 msgid "Switch camera angles"
 msgstr "Vaihda kamerakulmaa"
 
-#: ../data/totem.ui.h:34
+#: ../data/totem.ui.h:31
 msgid "_Go"
 msgstr "_Siirry"
 
-#: ../data/totem.ui.h:35
+#: ../data/totem.ui.h:32
 msgid "_DVD Menu"
 msgstr "_DVD-valikko"
 
-#: ../data/totem.ui.h:36
+#: ../data/totem.ui.h:33
 msgid "Go to the DVD menu"
 msgstr "Siirry DVD-valikkoon"
 
-#: ../data/totem.ui.h:37
+#: ../data/totem.ui.h:34
 msgid "_Title Menu"
 msgstr "_Otsikkovalikko"
 
-#: ../data/totem.ui.h:38
+#: ../data/totem.ui.h:35
 msgid "Go to the title menu"
 msgstr "Siirry nimivalikkoon"
 
-#: ../data/totem.ui.h:39
+#: ../data/totem.ui.h:36
 msgid "A_udio Menu"
 msgstr "_Äänivalikko"
 
-#: ../data/totem.ui.h:40
+#: ../data/totem.ui.h:37
 msgid "Go to the audio menu"
 msgstr "Siirry äänivalikkoon"
 
-#: ../data/totem.ui.h:41
+#: ../data/totem.ui.h:38
 msgid "_Angle Menu"
 msgstr "K_atselukulmavalikko"
 
-#: ../data/totem.ui.h:42
+#: ../data/totem.ui.h:39
 msgid "Go to the angle menu"
 msgstr "Siirry kuvakulmavalikkoon"
 
-#: ../data/totem.ui.h:43
+#: ../data/totem.ui.h:40
 msgid "_Chapter Menu"
 msgstr "Ka_ppalevalikko"
 
-#: ../data/totem.ui.h:44
+#: ../data/totem.ui.h:41
 msgid "Go to the chapter menu"
 msgstr "Siirry kappalevalikkoon"
 
-#: ../data/totem.ui.h:45
+#: ../data/totem.ui.h:42
 msgid "_Next Chapter/Movie"
 msgstr "_Seuraava kappale/elokuva"
 
-#: ../data/totem.ui.h:46
+#: ../data/totem.ui.h:43
 msgid "Next chapter or movie"
 msgstr "Seuraava kappale/elokuva"
 
-#: ../data/totem.ui.h:47
+#: ../data/totem.ui.h:44
 msgid "_Previous Chapter/Movie"
 msgstr "Ede_llinen kappale/elokuva"
 
-#: ../data/totem.ui.h:48
+#: ../data/totem.ui.h:45
 msgid "Previous chapter or movie"
 msgstr "Edellinen kappale/elokuva"
 
-#: ../data/totem.ui.h:49
+#: ../data/totem.ui.h:46
 msgid "_Sound"
 msgstr "_Ääni"
 
-#: ../data/totem.ui.h:50
+#: ../data/totem.ui.h:47
 msgid "Volume _Up"
 msgstr "_Kovemmalle"
 
-#: ../data/totem.ui.h:51
+#: ../data/totem.ui.h:48
 msgid "Increase volume"
 msgstr "Kasvata äänenvoimakkuutta"
 
-#: ../data/totem.ui.h:52
+#: ../data/totem.ui.h:49
 msgid "Volume _Down"
 msgstr "_Hiljemmalle"
 
-#: ../data/totem.ui.h:53
+#: ../data/totem.ui.h:50
 msgid "Decrease volume"
 msgstr "Vähennä äänenvoimakkuutta"
 
-#: ../data/totem.ui.h:54
+#: ../data/totem.ui.h:51
 msgid "_Help"
 msgstr "O_hje"
 
-#: ../data/totem.ui.h:55
+#: ../data/totem.ui.h:52
 msgid "_Contents"
 msgstr "_Sisältö"
 
-#: ../data/totem.ui.h:56
+#: ../data/totem.ui.h:53
 msgid "Help contents"
 msgstr "Ohjeen sisältö"
 
-#: ../data/totem.ui.h:57
+#: ../data/totem.ui.h:54
 msgid "_About"
 msgstr "_Tietoja"
 
-#: ../data/totem.ui.h:58
+#: ../data/totem.ui.h:55
 msgid "About this application"
 msgstr "Tietoja tästä sovelluksesta"
 
-#: ../data/totem.ui.h:59
-msgid "_Repeat Mode"
-msgstr "Kertaus_tila"
-
-#: ../data/totem.ui.h:60
-msgid "Set the repeat mode"
-msgstr "Aseta kertaustila"
-
-#: ../data/totem.ui.h:61
-msgid "Shuff_le Mode"
-msgstr "_Satunnaissoitto"
-
-#: ../data/totem.ui.h:62
-msgid "Set the shuffle mode"
-msgstr "Aseta satunnaissoittotila"
-
-#: ../data/totem.ui.h:63
+#: ../data/totem.ui.h:56
 msgid "Show _Controls"
 msgstr "Näytä _säätimet"
 
-#: ../data/totem.ui.h:64
+#: ../data/totem.ui.h:57
 msgid "Show controls"
 msgstr "Näytä säätimet"
 
-#: ../data/totem.ui.h:65
+#: ../data/totem.ui.h:58
 msgid "S_idebar"
 msgstr "S_ivupalkki"
 
-#: ../data/totem.ui.h:66
+#: ../data/totem.ui.h:59
 msgid "Show or hide the sidebar"
 msgstr "Näytä tai piilota sivupalkki"
 
-#: ../data/totem.ui.h:67
+#: ../data/totem.ui.h:60
 msgctxt "Aspect ratio"
 msgid "Auto"
 msgstr "Automaattinen"
 
-#: ../data/totem.ui.h:68
+#: ../data/totem.ui.h:61
 msgid "Sets automatic aspect ratio"
 msgstr "Valitsee kuvasuhteen automaattisesti"
 
-#: ../data/totem.ui.h:69
-msgid "Square"
-msgstr "Neliö"
-
-#: ../data/totem.ui.h:70
-msgid "Sets square aspect ratio"
-msgstr "Aseta neliönmuotoinen kuvasuhde"
-
-#: ../data/totem.ui.h:71
-msgid "4:3 (TV)"
-msgstr "4:3 (TV)"
-
-#: ../data/totem.ui.h:72
-msgid "Sets 4:3 (TV) aspect ratio"
-msgstr "Asettaa 4:3 (TV) kuvasuhteen"
-
-#: ../data/totem.ui.h:73
-msgid "16:9 (Widescreen)"
-msgstr "16:9 (Laajakuva)"
-
-#: ../data/totem.ui.h:74
-msgid "Sets 16:9 (widescreen) aspect ratio"
-msgstr "Asettaa 16:9 (leveä kuva) kuvasuhteen"
-
-#: ../data/totem.ui.h:75
-msgid "2.11:1 (DVB)"
-msgstr "2.11:1 (DVB)"
-
-#: ../data/totem.ui.h:76
-msgid "Sets 2.11:1 (DVB) aspect ratio"
-msgstr "Asettaa 2.11:1 (DVB) kuvasuhteen"
-
-#: ../data/totem.ui.h:77
-msgid "S_ubtitles"
-msgstr "_Tekstitys"
-
-#: ../data/totem.ui.h:80
-msgid "_Languages"
-msgstr "_Kielet"
-
-#: ../data/totem.ui.h:81
-msgid "Zoom In"
-msgstr "Lähennä"
-
-#: ../data/totem.ui.h:82
-msgid "Zoom in"
-msgstr "Lähennä"
-
-#: ../data/totem.ui.h:83
-msgid "Skip _Forward"
-msgstr "Kelaa _eteenpäin"
-
-#: ../data/totem.ui.h:84
-msgid "Skip forward"
-msgstr "Kelaa eteenpäin"
-
-#: ../data/totem.ui.h:85
-msgid "Skip _Backwards"
-msgstr "Kelaa _taaksepäin"
-
-#: ../data/totem.ui.h:86
-msgid "Skip backwards"
-msgstr "Kelaa taaksepäin"
-
-#: ../data/totem.ui.h:87
-msgid "14.4 Kbps Modem"
-msgstr "14.4 kbps modeemi"
-
-#: ../data/totem.ui.h:88
-msgid "19.2 Kbps Modem"
-msgstr "19.2 kbps modeemi"
-
-#: ../data/totem.ui.h:89
-msgid "28.8 Kbps Modem"
-msgstr "28.8 kbps modeemi"
-
-#: ../data/totem.ui.h:90
-msgid "33.6 Kbps Modem"
-msgstr "33.6 kbps modeemi"
-
-#: ../data/totem.ui.h:91
-msgid "34.4 Kbps Modem"
-msgstr "34.4 kbps modeemi"
-
-#: ../data/totem.ui.h:92
-msgid "56 Kbps Modem/ISDN"
-msgstr "56 kbps modeemi/ISDN"
-
-#: ../data/totem.ui.h:93
-msgid "112 Kbps Dual ISDN/DSL"
-msgstr "112 kbps kaksinkertainen ISDN/DSL"
-
-#: ../data/totem.ui.h:94
-msgid "256 Kbps DSL/Cable"
-msgstr "256 kbps DSL/kaapeli"
-
-#: ../data/totem.ui.h:95
-msgid "384 Kbps DSL/Cable"
-msgstr "384 kbps DSL/kaapeli"
-
-#: ../data/totem.ui.h:96
-msgid "512 Kbps DSL/Cable"
-msgstr "512 kbps DSL/kaapeli"
-
-#: ../data/totem.ui.h:97
-msgid "1.5 Mbps T1/Intranet/LAN"
-msgstr "1.5 Mbps T1/lähiverkko/LAN"
-
-#: ../data/totem.ui.h:98
-msgid "Intranet/LAN"
-msgstr "Lähiverkko"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:100
-msgid "Normal"
-msgstr "Tavallinen"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:102
-msgid "Large"
-msgstr "Suuri"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:104
-msgid "Extra Large"
-msgstr "Erityisen suuri"
-
-#: ../data/totem.ui.h:105 ../src/totem-properties-view.c:228
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5593
-msgid "Stereo"
-msgstr "Stereo"
-
-#: ../data/totem.ui.h:106
-msgid "4-channel"
-msgstr "4-kanava"
-
-#: ../data/totem.ui.h:107
-msgid "4.1-channel"
-msgstr "4.1-kanava"
-
-#: ../data/totem.ui.h:108
-msgid "5.0-channel"
-msgstr "5.0-kanava"
-
-#: ../data/totem.ui.h:109
-msgid "5.1-channel"
-msgstr "5.1-kanava"
-
-#: ../data/totem.ui.h:110
-msgid "AC3 Passthrough"
-msgstr "AC3-läpivienti"
-
-#: ../data/totem.ui.h:111
-msgid "Totem Preferences"
-msgstr "Totemin asetukset"
-
-#: ../data/totem.ui.h:112
-msgid "Playback"
-msgstr "Toisto"
-
-#: ../data/totem.ui.h:113
-msgid "Start playing files from last position"
-msgstr "Aloita tiedostojen toisto viimeksi jääneestä kohdasta"
-
-#: ../data/totem.ui.h:114
-msgid "Networking"
-msgstr "Verkko"
-
-#: ../data/totem.ui.h:115
-msgid "Connection _speed:"
-msgstr "Yhteys_nopeus:"
-
-#: ../data/totem.ui.h:116
-msgid "Text Subtitles"
-msgstr "Tekstitys"
-
-#: ../data/totem.ui.h:117
-msgid "_Load subtitle files when movie is loaded"
-msgstr "_Lataa tekstitys elokuvan käynnistyessä"
-
-#: ../data/totem.ui.h:118
-msgid "_Font:"
-msgstr "_Kirjasin:"
-
-#: ../data/totem.ui.h:119
-msgid "_Encoding:"
-msgstr "_Merkistökoodaus:"
-
-#: ../data/totem.ui.h:120
-msgid "External Chapters"
-msgstr "Ulkoiset kappaleet"
-
-#: ../data/totem.ui.h:121
-msgid "Load _chapter files when movie is loaded"
-msgstr "Lataa _kappaletiedostoja kun elokuva avataan"
-
-#. Tab label in the Preferences dialogue
-#: ../data/totem.ui.h:124
-msgid "Display"
-msgstr "Näyttö"
-
-#: ../data/totem.ui.h:125
-msgid "_Resize the window when a new video is loaded"
-msgstr "_Sovita ikkunan koko elokuvan kokoon videon avauksen yhtedessä"
-
-#: ../data/totem.ui.h:126
-msgid "Disable _deinterlacing of interlaced videos"
-msgstr "Poista lomitettujen videoiden lomituksen poisto käytöstä"
-
-#: ../data/totem.ui.h:127
-msgid "Disable screensaver when playing "
-msgstr "Estä näytönsäästäjä, kun toistetaan "
-
-#: ../data/totem.ui.h:129
-msgid "Video or Audio"
-msgstr "Videoa tai ääntä"
-
-#: ../data/totem.ui.h:130
-msgid "Visual Effects"
-msgstr "Visuaaliset tehosteet"
-
-#: ../data/totem.ui.h:131
-msgid "Show _visual effects when an audio file is played"
-msgstr "Näytä _visuaalisia tehosteita soitettaessa ääntä"
-
-#: ../data/totem.ui.h:132
-msgid "_Type of visualization:"
-msgstr "Visualisoinnin _tyyppi:"
-
-#: ../data/totem.ui.h:133
-msgid "Visualization _size:"
-msgstr "Visualisointik_oko:"
-
-#: ../data/totem.ui.h:134
-msgid "Color Balance"
-msgstr "Väritasapaino"
-
-#: ../data/totem.ui.h:135
-msgid "_Brightness:"
-msgstr "_Kirkkaus:"
-
-#: ../data/totem.ui.h:136
-msgid "Co_ntrast:"
-msgstr "Ko_ntrasti:"
-
-#: ../data/totem.ui.h:137
-msgid "Sat_uration:"
-msgstr "_Kylläisyys:"
-
-#: ../data/totem.ui.h:138
-msgid "_Hue:"
-msgstr "_Sävy:"
-
-#: ../data/totem.ui.h:139
-msgid "Reset to _Defaults"
-msgstr "Palauta _oletusasetukset"
-
-#: ../data/totem.ui.h:140
-msgid "Audio Output"
-msgstr "Ääniulostulo"
-
-#: ../data/totem.ui.h:141
-msgid "_Audio output type:"
-msgstr "_Ääniulostulon tyyppi:"
-
-#: ../data/totem.ui.h:145
-msgid "Time seek bar"
-msgstr "Aikasiirtymäpalkki"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
-msgid "Allow the screensaver to activate when playing audio"
-msgstr "Salli näytönsäästäjän käynnistyä kun toistetaan pelkkää ääntä"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
-msgid ""
-"Allow the screensaver to activate when playing audio. Disable if you have "
-"monitor-powered speakers."
-msgstr ""
-"Salli näytönsäästäjän käynnistyä kun toistetaan pelkkää ääntä. Älä salli jos "
-"sinulla on näytöstä virtansa ottavat kaiuttimet."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
-msgid "Show visual effects when no video is displayed"
-msgstr "Näytä visuaalisia tehosteita, kun videokuvaa ei näytetä"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
-msgid "Show visual effects when playing an audio only file."
-msgstr ""
-"Näytä visuaalisia tehosteita, kun soitetaan tiedostoa, jossa on vain ääntä."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
-msgid "Name of the visual effects plugin"
-msgstr "Visuaalisten efektien liitännäisen nimi"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
-msgid "The brightness of the video"
-msgstr "Videon kirkkaus"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
-msgid "The contrast of the video"
-msgstr "Videon kontrasti"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
-msgid "The hue of the video"
-msgstr "Videon värisävy"
+#: ../data/totem.ui.h:62
+msgid "Square"
+msgstr "Neliö"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
-msgid "The saturation of the video"
-msgstr "Videon värikylläisyys"
+#: ../data/totem.ui.h:63
+msgid "Sets square aspect ratio"
+msgstr "Aseta neliönmuotoinen kuvasuhde"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
-msgid "Resize the canvas automatically on file load"
-msgstr "Muuta näyttöalueen kokoa automaattisesti tiedoston latautuessa"
+#: ../data/totem.ui.h:64
+msgid "4:3 (TV)"
+msgstr "4:3 (TV)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
-msgid "Network connection speed"
-msgstr "Verkkoyhteyden nopeus"
+#: ../data/totem.ui.h:65
+msgid "Sets 4:3 (TV) aspect ratio"
+msgstr "Asettaa kuvasuhteen 4:3 (TV)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
-msgid ""
-"Approximate network connection speed, used to select quality on media over "
-"the network."
-msgstr ""
-"Arvioitu verkkoyhteyden nopeus, käytetään valitsemaan median laatua verkon "
-"yli."
+#: ../data/totem.ui.h:66
+msgid "16:9 (Widescreen)"
+msgstr "16:9 (Laajakuva)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
-msgid "Repeat mode"
-msgstr "Kertaustila"
+#: ../data/totem.ui.h:67
+msgid "Sets 16:9 (widescreen) aspect ratio"
+msgstr "Asettaa kuvasuhteen 16:9 (leveä kuva)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
-msgid "Shuffle mode"
-msgstr "Satunnaissoitto"
+#: ../data/totem.ui.h:68
+msgid "2.11:1 (DVB)"
+msgstr "2.11:1 (DVB)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
-msgid "Whether to disable deinterlacing for interlaced movies"
-msgstr "Poistetaanko lomituksenpoisto käytöstä lomitetuilla elokuvilla"
+#: ../data/totem.ui.h:69
+msgid "Sets 2.11:1 (DVB) aspect ratio"
+msgstr "Asettaa kuvasuhteen 2.11:1 (DVB)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
-msgid "Whether to enable debug for the playback engine"
-msgstr "Pidetäänkö soittomoottorin vianetsintä päällä"
+#: ../data/totem.ui.h:70
+msgid "S_ubtitles"
+msgstr "_Tekstitys"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
-msgid "Type of audio output to use"
-msgstr "Käytettävän ääniulostulon tyyppi"
+#: ../data/totem.ui.h:73
+msgid "_Languages"
+msgstr "_Kielet"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
-msgid "Visualization quality setting"
-msgstr "Visualisoinnin laatuasetus"
+#: ../data/totem.ui.h:74
+msgid "Zoom In"
+msgstr "Lähennä"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
-msgid "Quality setting for the audio visualization."
-msgstr "Laatuasetus äänen visualisointiin."
+#: ../data/totem.ui.h:75
+msgid "Zoom in"
+msgstr "Lähennä"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
-msgid "Network buffering threshold"
-msgstr "Verkkopuskuroinnin kynnys"
+#: ../data/totem.ui.h:76
+msgid "Skip _Forward"
+msgstr "Kelaa _eteenpäin"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
-msgid ""
-"Amount of data to buffer for network streams before starting to display the "
-"stream (in seconds)."
-msgstr ""
-"Puskuroitavan tiedon määrä verkkovirroille ennen kuin virtauksen toisto "
-"alkaa (sekunteina)."
+#: ../data/totem.ui.h:77
+msgid "Skip forward"
+msgstr "Kelaa eteenpäin"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
-msgid "Subtitle font"
-msgstr "Tekstityksen kirjasin"
+#: ../data/totem.ui.h:78
+msgid "Skip _Backwards"
+msgstr "Kelaa _taaksepäin"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
-msgid "Pango font description for subtitle rendering."
-msgstr "Pango-kirjasinkuvaus tekstityksen piirtoon."
+#: ../data/totem.ui.h:79
+msgid "Skip backwards"
+msgstr "Kelaa taaksepäin"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
-msgid "Subtitle encoding"
-msgstr "Tekstityksen merkistökoodaus"
+#: ../data/totem.ui.h:82
+msgid "Time seek bar"
+msgstr "Aikasiirtymäpalkki"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
-msgid "Encoding character set for subtitle."
-msgstr "Merkistöenkoodaus tekstitykselle."
+#: ../data/uri.ui.h:1
+msgid "Enter the _address of the file you would like to open:"
+msgstr "Syötä avattavan tiedoston _sijainti:"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
-msgid "Default location for the \"Open...\" dialogs"
-msgstr "Oletus-sijainti ”Avaa…”-ikkunoille"
+#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
+msgid "_Add to Playlist"
+msgstr "_Lisää soittolistaan"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
-msgid ""
-"Default location for the \"Open...\" dialogs. Default is the current "
-"directory."
-msgstr "Oletussijainti ”Avaa…”-valintaikkunassa. Oletus on nykyinen kansio."
+#: ../data/video-list.ui.h:2
+msgid "Add the video to the playlist"
+msgstr "Lisää video soittolistaan"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
-msgid "Default location for the \"Take Screenshot\" dialogs"
-msgstr "Oletuskansio ”Ota kuvakaappaus”-ikkunoille"
+#: ../src/backend/bacon-video-widget.c:1641
+msgid "Password requested for RTSP server"
+msgstr "RTSP-palvelin pyytää salasanaa"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
-msgid ""
-"Default location for the \"Take Screenshot\" dialogs. Default is the "
-"Pictures directory."
-msgstr "Oletussijainti ”Ota kuvakaappaus”-ikkunalle. Oletus on Kuvat-kansio."
+#: ../src/backend/bacon-video-widget.c:2927
+#, c-format
+msgid "Audio Track #%d"
+msgstr "Ääniraita #%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
-msgid "Whether to disable the plugins in the user's home directory"
-msgstr "Poistetaanko käyttäjän kotihakemiston liitännäiset käytöstä"
+#: ../src/backend/bacon-video-widget.c:2931
+#, c-format
+msgid "Subtitle #%d"
+msgstr "Tekstitys #%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
-msgid "Whether to disable the keyboard shortcuts"
-msgstr "Otetaanko pikanäppäimet pois käytöstä"
+#: ../src/backend/bacon-video-widget.c:3328
+msgid "The server you are trying to connect to is not known."
+msgstr "Pavelin, johon yrität yhdistää, ei ole tunnettu."
+
+#: ../src/backend/bacon-video-widget.c:3331
+msgid "The connection to this server was refused."
+msgstr "Yhteys tähän palvelimeen hylättiin."
+
+#: ../src/backend/bacon-video-widget.c:3334
+#| msgid "The movie could not be recorded."
+msgid "The specified movie could not be found."
+msgstr "Määriteltyä elokuvaa ei löytynyt."
+
+#: ../src/backend/bacon-video-widget.c:3341
+msgid "The server refused access to this file or stream."
+msgstr "Palvelin hylkäsi pääsyn tähän tiedostoon tai suoratoistovirtaan."
+
+#: ../src/backend/bacon-video-widget.c:3347
+msgid "Authentication is required to access this file or stream."
+msgstr "Pääsy tähän tiedostoon tai suoratoistovirtaan vaatii tunnistautumisen."
+
+#: ../src/backend/bacon-video-widget.c:3354
+#| msgid "Totem was not able to play this disc."
+msgid "You are not allowed to open this file."
+msgstr "Sinulla ei ole oikeuksia avata tätä tiedostoa."
+
+#: ../src/backend/bacon-video-widget.c:3359
+#| msgid "File is not a valid .desktop file"
+msgid "This location is not a valid one."
+msgstr "Tämä sijainti on virheellinen."
+
+#: ../src/backend/bacon-video-widget.c:3367
+#| msgid "The movie could not be recorded."
+msgid "The movie could not be read."
+msgstr "Elokuvaa ei voitu lukea."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
-msgid "Whether to autoload text subtitle files when a movie is loaded"
-msgstr "Ladataanko tekstitystiedostot automaattisesti kun elokuva ladataan"
+#. should be exactly one missing thing (source or converter)
+#: ../src/backend/bacon-video-widget.c:3390
+#: ../src/backend/bacon-video-widget.c:3398
+#, c-format
+msgid "The playback of this movie requires a %s plugin which is not installed."
+msgid_plural ""
+"The playback of this movie requires the following decoders which are not "
+"installed:\n"
+"\n"
+"%s"
+msgstr[0] ""
+"Tämän elokuvan näyttäminen vaatii liitännäisen %s, jota ei ole asennettu."
+msgstr[1] ""
+"Tämän elokuvan näyttäminen vaatii seuraavat dekooderit, joita ei ole "
+"asennettu:\n"
+"\n"
+"%s"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
-msgid "Whether to autoload external chapter files when a movie is loaded"
+#: ../src/backend/bacon-video-widget.c:3409
+msgid ""
+"An audio or video stream is not handled due to missing codecs. You might "
+"need to install additional plugins to be able to play some types of movies"
 msgstr ""
-"Ladataanko ulkoiset kappaletiedostot automaattisesti kun elokuva ladataan"
+"Puuttuvat koodekit estävät ääni- tai videosuoratoiston käsittelyn. "
+"Liitännäisten "
+"asennus saattaa olla tarpeen, jotta tietynlaisten mediatiedostojen toisto on "
+"mahdollista"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+#: ../src/backend/bacon-video-widget.c:3419
+#| msgid ""
+#| "Cannot play this file over the network. Try downloading it to disk first."
 msgid ""
-"Whether to remember the position of played audio/video files when pausing or "
-"closing them"
+"This file cannot be played over the network. Try downloading it locally "
+"first."
 msgstr ""
-"Muistetaanko toistetun ääni- tai kuvatiedoston sijainti tauon/sulkemisen "
-"jälkeen"
+"Tätä tiedostoa ei voi näyttää verkon yli. Hae se ensin "
+"omalle kiintolevylle."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:35
-msgid "Active plugins list"
-msgstr "Aktiivisten liitännäisten luettelo"
+#: ../src/backend/bacon-video-widget.c:5475 ../src/totem-properties-view.c:227
+msgid "Surround"
+msgstr "Surround"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:36
+#: ../src/backend/bacon-video-widget.c:5477 ../src/totem-properties-view.c:229
+msgid "Mono"
+msgstr "Mono"
+
+#: ../src/backend/bacon-video-widget.c:5762
+msgid "Media contains no supported video streams."
+msgstr "Media ei sisällä tuettuja videomuotoja."
+
+#: ../src/backend/bacon-video-widget.c:5944
 msgid ""
-"A list of the names of the plugins which are currently active (loaded and "
-"running)."
+"Some necessary plug-ins are missing. Make sure that the program is correctly "
+"installed."
 msgstr ""
-"Luettelo niiden liitännäisten nimistä, jotka ovat tällä hetkellä aktiivisia "
-"(ladattu ja suorituksessa)."
-
-#: ../data/uri.ui.h:1
-msgid "Enter the _address of the file you would like to open:"
-msgstr "Syötä avattavan tiedoston _sijainti:"
+"Jotkin tarpeelliset liitännäiset puuttuvat. Varmista, että ohjelma on "
+"asennettu oikein."
 
 #: ../src/eggdesktopfile.c:165
 #, c-format
@@ -983,6 +1063,31 @@
 msgid "Show session management options"
 msgstr "Näytä istunnonhallinnan valitsimet"
 
+#. hour:minutes:seconds
+#. Translators: This is a time format, like "9:05:02" for 9
+#. * hours, 5 minutes, and 2 seconds. You may change ":" to
+#. * the separator that your locale uses or use "%Id" instead
+#. * of "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:56
+#: ../src/plugins/skipto/totem-time-entry.c:57
+#, c-format
+msgctxt "long time format"
+msgid "%d:%02d:%02d"
+msgstr "%d:%02d:%02d"
+
+#. minutes:seconds
+#. Translators: This is a time format, like "5:02" for 5
+#. * minutes and 2 seconds. You may change ":" to the
+#. * separator that your locale uses or use "%Id" instead of
+#. * "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:65
+#, c-format
+msgctxt "short time format"
+msgid "%d:%02d"
+msgstr "%d:%02d"
+
 #. Title
 #. Artist
 #. Album
@@ -1087,10 +1192,14 @@
 msgstr[0] "%d kuva sekunnissa"
 msgstr[1] "%d kuvaa sekunnissa"
 
-#: ../src/totem-audio-preview.c:168
+#: ../src/totem-audio-preview.c:137
 msgid "Audio Preview"
 msgstr "Ääniesikatselu"
 
+#: ../src/totem.c:239
+msgid "Verify your system installation. Totem will now exit."
+msgstr "Tarkista järjestelmäasennuksesi. Totem sulkeutuu."
+
 #: ../src/totem-cell-renderer-video.c:126
 msgid "Unknown video"
 msgstr "Tuntematon video"
@@ -1103,7 +1212,7 @@
 msgid "Cancel"
 msgstr "Peru"
 
-#: ../src/totem-fullscreen.c:616
+#: ../src/totem-fullscreen.c:573
 msgid "No File"
 msgstr "Ei tiedostoa"
 
@@ -1121,7 +1230,7 @@
 msgid "Make sure that Totem is properly installed."
 msgstr "Tarkista, että Totem on oikein asennettu."
 
-#: ../src/totem-interface.c:347
+#: ../src/totem-interface.c:357
 msgid ""
 "Totem 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 "
@@ -1129,11 +1238,11 @@
 "version."
 msgstr ""
 "Totem on vapaa ohjelma; sitä on sallittu levittää edelleen ja muuttaa GNU "
-"yleisen lisenssin (GPL lisenssin) ehtojen mukaan  sellaisina kuin Free "
+"yleisen lisenssin (GPL-lisenssin) ehtojen mukaan  sellaisina kuin Free "
 "Software Foundation on ne julkaissut; joko lisenssin version 2, tai "
 "(valinnan mukaan) minkä tahansa myöhemmän version mukaisesti."
 
-#: ../src/totem-interface.c:351
+#: ../src/totem-interface.c:361
 msgid ""
 "Totem is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -1142,10 +1251,10 @@
 msgstr ""
 "Totemia levitetään siinä toivossa, että se olisi hyödyllinen, mutta ilman "
 "mitään takuuta; ilman edes hiljaista takuuta kaupallisesti hyväksyttävästä "
-"laadusta tai soveltuvuudesta tiettyyn tarkoitukseen. Katso GPL lisenssistä "
+"laadusta tai soveltuvuudesta tiettyyn tarkoitukseen. Katso GPL-lisenssistä "
 "lisää yksityiskohtia."
 
-#: ../src/totem-interface.c:355
+#: ../src/totem-interface.c:365
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Totem; if not, write to the Free Software Foundation, Inc., 59 Temple Place, "
@@ -1155,57 +1264,33 @@
 "kirjoita osoitteeseen Free Software Foundation Inc., 59 Temple Place, Suite "
 "330, Boston, MA  02111-1307  USA"
 
-#: ../src/totem-interface.c:358
+#: ../src/totem-interface.c:368
 msgid ""
 "Totem contains an exception to allow the use of proprietary GStreamer "
 "plugins."
 msgstr ""
-"Totem sisältää poikkeuksen, joka sallii ei-vapaiden GStreamer -liitännäisten "
+"Totem sisältää poikkeuksen, joka sallii ei-vapaiden GStreamer-liitännäisten "
 "käytön."
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:190
+#: ../src/totem-menu.c:291
 msgid "None"
 msgstr "Ei mikään"
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:195
+#: ../src/totem-menu.c:296
 msgctxt "Language"
 msgid "Auto"
 msgstr "Automaattinen"
 
-#. Translators:
-#. * This is not a JPEG image, but a disc image, for example,
-#. * an ISO file
-#: ../src/totem-menu.c:765
-#, c-format
-msgid "Play Image '%s'"
-msgstr "Toista levykuva ”%s”"
-
-#: ../src/totem-menu.c:768 ../src/totem-menu.c:851
-#, c-format
-msgid "device%d"
-msgstr "laite%d"
-
-#: ../src/totem-menu.c:848
-#, c-format
-msgid "Play Disc '%s'"
-msgstr "Toista levy ”%s”"
-
-#. This lists the back-end type and version, such as
-#. * Movie Player using GStreamer 0.10.1
-#: ../src/totem-menu.c:1189
-#, c-format
-msgid "Movie Player using %s"
-msgstr "%s -kirjastoja käyttävä elokuvasoitin"
-
-#: ../src/totem-menu.c:1193
+#: ../src/totem-menu.c:789
 msgid "Copyright © 2002-2009 Bastien Nocera"
 msgstr "Tekijänoikeudet © 2002-2009 Bastien Nocera"
 
-#: ../src/totem-menu.c:1198
+#: ../src/totem-menu.c:794
 msgid "translator-credits"
 msgstr ""
+"Jiri Grönroos, 2012\n"
 "Ilkka Tuohela, 2002-2009\n"
 "Tommi Vainikainen, 2003-2005, 2008-2009\n"
 "Timo Jyrinki, 2008-2009\n"
@@ -1219,154 +1304,77 @@
 "  Jussi Aalto https://launchpad.net/~jtaalto-deactivatedaccount\n"
 "  Timo Jyrinki https://launchpad.net/~timo-jyrinki"
 
-#: ../src/totem-menu.c:1202
+#: ../src/totem-menu.c:798
 msgid "Totem Website"
-msgstr "Totemin WWW-sivut"
+msgstr "Totemin verkkosivusto"
 
-#: ../src/totem-menu.c:1236
+#: ../src/totem-menu.c:829
 msgid "Configure Plugins"
-msgstr "Liitännäisten asetukset"
-
-#. Translators: %s is the totem version number
-#: ../src/totem-object.c:471
-#, c-format
-msgid "Totem %s"
-msgstr "Totem %s"
-
-#: ../src/totem-object.c:1047 ../browser-plugin/totem-plugin-viewer.c:367
-msgid "Playing"
-msgstr "Toistetaan"
-
-#: ../src/totem-object.c:1049 ../src/totem-options.c:52
-msgid "Pause"
-msgstr "Tauko"
-
-#: ../src/totem-object.c:1054 ../browser-plugin/totem-plugin-viewer.c:363
-msgid "Paused"
-msgstr "Tauko"
-
-#: ../src/totem-object.c:1056 ../src/totem-object.c:1066
-#: ../src/totem-options.c:51
-msgid "Play"
-msgstr "Toista"
-
-#: ../src/totem-object.c:1061 ../src/totem-object.c:1659
-#: ../src/totem-statusbar.c:115 ../browser-plugin/totem-plugin-viewer.c:351
-msgid "Stopped"
-msgstr "Pysäytetty"
-
-#: ../src/totem-object.c:1142 ../src/totem-object.c:1169
-#: ../src/totem-object.c:1799 ../src/totem-object.c:1963
-#, c-format
-msgid "Totem could not play '%s'."
-msgstr "Totem ei voinut toistaa sijaintia ”%s”."
-
-#: ../src/totem-object.c:1246
-#, c-format
-msgid ""
-"Totem could not play this media (%s) although a plugin is present to handle "
-"it."
-msgstr ""
-"Totem ei voi soittaa mediaa (%s), vaikka sille tarkoitettu liitännäinen on "
-"asennettu."
-
-#: ../src/totem-object.c:1247
-msgid ""
-"You might want to check that a disc is present in the drive and that it is "
-"correctly configured."
-msgstr "Varmista, että levy on asemassa ja että aseman asetukset ovat oikein."
-
-#: ../src/totem-object.c:1255
-msgid "More information about media plugins"
-msgstr "Lisätietoja medialiitännäisistä"
-
-#: ../src/totem-object.c:1256
-msgid ""
-"Please install the necessary plugins and restart Totem to be able to play "
-"this media."
-msgstr ""
-"Soittaaksesi tiedoston asenna tarvittavat liitännäiset ja käynnistä Totem "
-"uudestaan."
-
-#: ../src/totem-object.c:1258
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because it does not have the "
-"appropriate plugins to be able to read from the disc."
-msgstr ""
-"Totem ei voi soittaa tämäntyyppisiä tiedostoja (%s), koska sopivaa "
-"liitännäistä levyltä lukua varten ei ole asennettu."
+msgstr "Liitännäisten asetukset"
 
-#: ../src/totem-object.c:1260
+#: ../src/totem-object.c:162
 #, c-format
 msgid ""
-"Totem cannot play this type of media (%s) because you do not have the "
-"appropriate plugins to handle it."
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
-"Totem ei voi soittaa tämäntyyppisiä tiedostoja (%s), koska sopivaa "
-"liitännäistä ei ole asennettu."
+"%s\n"
+"Komennolla '%s --help' näet kaikki mahdolliset komentorivivalitsimet.\n"
 
-#: ../src/totem-object.c:1263
+#. Translators: %s is the totem version number
+#: ../src/totem-object.c:591
 #, c-format
-msgid "Totem cannot play this type of media (%s) because it is not supported."
-msgstr ""
-"Totem ei voi näyttää tämäntyyppistä mediaa (%s), koska se ei ole tuettu."
-
-#: ../src/totem-object.c:1264
-msgid "Please insert another disc to play back."
-msgstr "Laita asemaan muu toistettava levy."
+msgid "Totem %s"
+msgstr "Totem %s"
 
-#: ../src/totem-object.c:1300
-msgid "Totem was not able to play this disc."
-msgstr "Totem ei voinut soittaa tätä levyä."
+#: ../src/totem-object.c:1168 ../src/totem-options.c:52
+msgid "Pause"
+msgstr "Tauko"
 
-#: ../src/totem-object.c:1301 ../src/totem-object.c:4229
-msgid "No reason."
-msgstr "Ei syytä."
+#: ../src/totem-object.c:1175 ../src/totem-object.c:1185
+#: ../src/totem-options.c:51
+msgid "Play"
+msgstr "Toista"
 
-#: ../src/totem-object.c:1315
-msgid "Totem does not support playback of Audio CDs"
-msgstr "Totem ei osaa soittaa tavallisia CD-levyjä"
-
-#: ../src/totem-object.c:1316
-msgid "Please consider using a music player or a CD extractor to play this CD"
-msgstr "Soita tavalliset CD-levyt musiikkisoittimella tai kopiointiohjelmalla"
+#: ../src/totem-object.c:1267 ../src/totem-object.c:1294
+#: ../src/totem-object.c:1787 ../src/totem-object.c:1942
+#, c-format
+msgid "Totem could not play '%s'."
+msgstr "Totem ei voinut toistaa sijaintia ”%s”."
 
-#: ../src/totem-object.c:1805
+#: ../src/totem-object.c:1793
 msgid "No error message"
 msgstr "Ei virheviestiä"
 
-#: ../src/totem-object.c:2154
+#: ../src/totem-object.c:2133
 msgid "Totem could not display the help contents."
 msgstr "Totem ei voinut näyttää ohjeen sisältöä."
 
-#: ../src/totem-object.c:2493 ../src/totem-object.c:2495
-#: ../browser-plugin/totem-plugin-viewer.c:1417
-msgid "An error occurred"
-msgstr "Tapahtui virhe"
-
-#: ../src/totem-object.c:4064 ../src/totem-object.c:4066
+#: ../src/totem-object.c:4019 ../src/totem-object.c:4021
 msgid "Previous Chapter/Movie"
 msgstr "Edellinen kappale/elokuva"
 
-#: ../src/totem-object.c:4073 ../src/totem-object.c:4075
+#: ../src/totem-object.c:4028 ../src/totem-object.c:4030
 msgid "Play / Pause"
 msgstr "Toista / keskeytä"
 
-#: ../src/totem-object.c:4083 ../src/totem-object.c:4085
+#: ../src/totem-object.c:4038 ../src/totem-object.c:4040
 msgid "Next Chapter/Movie"
 msgstr "Seuraava kappale/elokuva"
 
-#. Translators: this is the tooltip text for the fullscreen button in the controls box in Totem's main window.
 #. Translators: this is the accessibility text for the fullscreen button in the controls box in Totem's main window.
-#: ../src/totem-object.c:4097 ../src/totem-object.c:4099
+#: ../src/totem-object.c:4051 ../src/totem-object.c:4053
 msgid "Fullscreen"
-msgstr "Kokoruutu"
+msgstr "Koko näyttö"
 
-#: ../src/totem-object.c:4229
+#: ../src/totem-object.c:4184
 msgid "Totem could not startup."
 msgstr "Totemia ei voi käynnistää."
 
+#: ../src/totem-object.c:4184
+msgid "No reason."
+msgstr "Ei syytä."
+
 #: ../src/totem-open-location.c:182
 msgid "Open Location..."
 msgstr "Avaa sijainnista…"
@@ -1377,7 +1385,7 @@
 
 #: ../src/totem-options.c:50
 msgid "Play/Pause"
-msgstr "Toista/Pidä tauko"
+msgstr "Toista/pidä tauko"
 
 #: ../src/totem-options.c:53
 msgid "Next"
@@ -1409,7 +1417,7 @@
 
 #: ../src/totem-options.c:60
 msgid "Toggle Fullscreen"
-msgstr "Kokoruutu"
+msgstr "Koko näyttö"
 
 #: ../src/totem-options.c:61
 msgid "Show/Hide Controls"
@@ -1440,118 +1448,112 @@
 msgid "Movies to play"
 msgstr "Näytettävät elokuvat"
 
-#: ../src/totem-options.c:117
+#: ../src/totem-options.c:79
+msgid "- Play movies and songs"
+msgstr "- Näytä elokuvia ja soita musiikkia"
+
+#: ../src/totem-options.c:142
 msgid "Can't enqueue and replace at the same time"
 msgstr "Ei voida lisätä jonon perään ja korvata samaan aikaan"
 
 #. By extension entry
-#: ../src/totem-playlist.c:161
+#: ../src/totem-playlist.c:162
 msgid "MP3 ShoutCast playlist"
 msgstr "MP3 ShoutCast -soittolista"
 
-#: ../src/totem-playlist.c:162
+#: ../src/totem-playlist.c:163
 msgid "MP3 audio (streamed)"
 msgstr "MP3-ääni (virta)"
 
-#: ../src/totem-playlist.c:163
+#: ../src/totem-playlist.c:164
 msgid "MP3 audio (streamed, DOS format)"
 msgstr "MP3-ääni (virta, DOS-muoto)"
 
-#: ../src/totem-playlist.c:164
+#: ../src/totem-playlist.c:165
 msgid "XML Shareable Playlist"
 msgstr "XML Shareable -soittolista"
 
 #. This is "Title 3", where title is a DVD title
 #. * Note: NOT a DVD chapter
-#: ../src/totem-playlist.c:347
+#: ../src/totem-playlist.c:348
 #, c-format
 msgid "Title %d"
 msgstr "Jakso %d"
 
-#: ../src/totem-playlist.c:446
+#: ../src/totem-playlist.c:447
 msgid "Could not save the playlist"
 msgstr "Soittolistaa ei voi tallentaa"
 
-#: ../src/totem-playlist.c:1021
+#: ../src/totem-playlist.c:1022
 msgid "Save Playlist"
 msgstr "Tallenna soittolista"
 
 #. translators: Playlist is the default saved playlist filename,
 #. * without the suffix
-#: ../src/totem-playlist.c:1033 ../src/totem-playlist.c:1264
-#: ../src/totem-sidebar.c:142
+#: ../src/totem-playlist.c:1034 ../src/totem-playlist.c:1263
+#: ../src/totem-sidebar.c:145
 msgid "Playlist"
 msgstr "Soittolista"
 
-#: ../src/totem-playlist.c:1857
+#: ../src/totem-playlist.c:1862
 #, c-format
 msgid "The playlist '%s' could not be parsed. It might be damaged."
 msgstr ""
 "Soittolistan '%s' jäsennys epäonnistui. Soittolista saattaa olla rikkoutunut."
 
-#: ../src/totem-playlist.c:1858
+#: ../src/totem-playlist.c:1863
 msgid "Playlist error"
 msgstr "Soittolistan virhe"
 
-#: ../src/totem-preferences.c:295
+#: ../src/totem-preferences.c:297
 msgid "Preferences"
 msgstr "Asetukset"
 
-#: ../src/totem-preferences.c:451
+#: ../src/totem-preferences.c:445
 msgid "Select Subtitle Font"
 msgstr "Valitse tekstityksen kirjasin"
 
-#: ../src/totem-properties-main.c:115 ../src/totem-properties-view.c:266
+#: ../src/totem-properties-main.c:116 ../src/totem-properties-view.c:269
 msgid "Audio/Video"
 msgstr "Ääni/kuva"
 
-#: ../src/totem-properties-view.c:128
+#: ../src/totem-properties-view.c:131
 msgid "N/A"
 msgstr "-"
 
-#: ../src/totem-properties-view.c:157
+#: ../src/totem-properties-view.c:160
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 msgctxt "Stream bit rate"
 msgid "N/A"
 msgstr "-"
 
-#: ../src/totem-properties-view.c:160
+#: ../src/totem-properties-view.c:163
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: ../src/totem-properties-view.c:177
+#: ../src/totem-properties-view.c:180
 #: ../src/plugins/properties/totem-movie-properties.c:149
 #, c-format
 msgid "%d x %d"
 msgstr "%d × %d"
 
-#: ../src/totem-properties-view.c:209
+#: ../src/totem-properties-view.c:212
 #: ../src/plugins/properties/totem-movie-properties.c:166
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: ../src/totem-properties-view.c:216
+#: ../src/totem-properties-view.c:219
 #: ../src/plugins/properties/totem-movie-properties.c:166
 msgctxt "Sample rate"
 msgid "N/A"
 msgstr "-"
 
-#: ../src/totem-properties-view.c:224
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5589
-msgid "Surround"
-msgstr "Surround"
-
-#: ../src/totem-properties-view.c:226
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5591
-msgid "Mono"
-msgstr "Mono"
-
-#: ../src/totem-properties-view.c:236
+#: ../src/totem-properties-view.c:239
 msgctxt "Number of audio channels"
 msgid "N/A"
 msgstr "-"
@@ -1584,8 +1586,8 @@
 #. eg: 75 %
 #: ../src/totem-statusbar.c:250
 #, c-format
-msgid "%d %%"
-msgstr "%d %%"
+msgid "%lf %%"
+msgstr "%lf %%"
 
 #. eg: Paused, 0:32 / 1:05
 #: ../src/totem-statusbar.c:325
@@ -1596,8 +1598,9 @@
 #. eg: Buffering, 75 %
 #: ../src/totem-statusbar.c:330
 #, c-format
-msgid "%s, %d %%"
-msgstr "%s, %d %%"
+#| msgid "%s, %d %%"
+msgid "%s, %f %%"
+msgstr "%s, %f %%"
 
 #: ../src/totem-subtitle-encoding.c:156
 msgid "Current Locale"
@@ -1740,225 +1743,93 @@
 msgid "Vietnamese"
 msgstr "Vietnam"
 
-#: ../src/totem-video-list.c:330
-msgid "No video URI"
-msgstr "Ei video-URI"
-
-#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
-#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
-#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
-#: ../src/totem-video-thumbnailer.c:872
-#, c-format
-msgid ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-msgstr ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-
-#: ../src/totem-video-thumbnailer.c:873
-msgid "Filename"
-msgstr "Tiedostonimi"
-
-#: ../src/totem-video-thumbnailer.c:875
-msgid "Resolution"
-msgstr "Tarkkuus"
-
-#: ../src/totem-video-thumbnailer.c:878
-msgid "Duration"
-msgstr "Kesto"
-
-#: ../src/totem-uri.c:506 ../src/plugins/chapters/totem-chapters.c:998
+#: ../src/totem-uri.c:343 ../src/plugins/chapters/totem-chapters.c:998
 msgid "All files"
 msgstr "Kaikki tiedostot"
 
-#: ../src/totem-uri.c:511 ../src/plugins/chapters/totem-chapters.c:995
+#: ../src/totem-uri.c:348 ../src/plugins/chapters/totem-chapters.c:995
 msgid "Supported files"
 msgstr "Tuetut tiedostot"
 
-#: ../src/totem-uri.c:523
+#: ../src/totem-uri.c:360
 msgid "Audio files"
 msgstr "Äänitiedostot"
 
-#: ../src/totem-uri.c:531
+#: ../src/totem-uri.c:368
 msgid "Video files"
 msgstr "Videotiedostot"
 
-#: ../src/totem-uri.c:541
+#: ../src/totem-uri.c:378
 msgid "Subtitle files"
 msgstr "Tekstitystiedostot"
 
-#: ../src/totem-uri.c:593
+#: ../src/totem-uri.c:430
 msgid "Select Text Subtitles"
 msgstr "Valitse tekstitys"
 
-#: ../src/totem-uri.c:656
+#: ../src/totem-uri.c:495
 msgid "Select Movies or Playlists"
 msgstr "Valitse elokuvia tai soittolistoja"
 
-#. Options parsing
-#: ../src/totem.c:201
-msgid "- Play movies and songs"
-msgstr "- Näytä elokuvia ja soita musiikkia"
-
-#: ../src/totem.c:212
-#, c-format
-msgid ""
-"%s\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"%s\n"
-"Komennolla '%s --help' näet kaikki mahdolliset komentorivivalitsimet.\n"
-
-#: ../src/totem.c:254 ../src/totem.c:265
-#: ../browser-plugin/totem-plugin-viewer.c:663
-#: ../browser-plugin/totem-plugin-viewer.c:1793
-msgid "Totem Movie Player"
-msgstr "Totem-elokuvasoitin"
-
-#: ../src/totem.c:255 ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Could not initialize the thread-safe libraries."
-msgstr "Säieturvallisia kirjastoja ei voi alustaa."
-
-#: ../src/totem.c:255
-msgid "Verify your system installation. Totem will now exit."
-msgstr "Tarkista järjestelmäasennuksesi. Totem sulkeutuu."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:1589
-msgid "Password requested for RTSP server"
-msgstr "RTSP-palvelin pyytää salasanaa"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2858
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2862
-#, c-format
-msgid "Audio Track #%d"
-msgstr "Ääniraita #%d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2890
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2894
-#, c-format
-msgid "Subtitle #%d"
-msgstr "Tekstitys #%d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3298
-msgid ""
-"The requested audio output was not found. Please select another audio output "
-"in the Multimedia Systems Selector."
-msgstr ""
-"Pyydettyä äänen ulostulokanavaa ei löytynyt. Valitse toinen äänen ulostulo "
-"Multimediajärjestelmien valitsimesta."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3303
-msgid "Location not found."
-msgstr "Sijaintia ei löytynyt."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3307
-msgid ""
-"Could not open location; you might not have permission to open the file."
-msgstr ""
-"Sijaintia ei voitu avata: oikeutesi eivät ehkä riitä tiedoston avaamiseen."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3318
-msgid ""
-"The video output is in use by another application. Please close other video "
-"applications, or select another video output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"Videoulostulo on toisen ohjelman käytössä. Sulje muut videota käyttävät "
-"ohjelmat tai valitse toinen videoulostulo Multimediajärjestelmien "
-"valitsimesta."
+#: ../src/totem-uri.c:499
+msgid "Add Directory"
+msgstr "Lisää kansio"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3324
-msgid ""
-"The audio output is in use by another application. Please select another "
-"audio output in the Multimedia Systems Selector. You may want to consider "
-"using a sound server."
-msgstr ""
-"Äänen ulostulo on toisen ohjelman käytössä. Valitse toinen ulostulo "
-"Multimediajärjestelmien valitsimesta. Voi myös olla että haluaisit käyttää "
-"äänipalvelinta."
+#: ../src/totem-video-list.c:330
+msgid "No video URI"
+msgstr "Ei video-URI"
 
-#. should be exactly one missing thing (source or converter)
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3342
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3348
+#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
+#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
+#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
+#: ../src/totem-video-thumbnailer.c:841
 #, c-format
-msgid "The playback of this movie requires a %s plugin which is not installed."
-msgid_plural ""
-"The playback of this movie requires the following decoders which are not "
-"installed:\n"
-"\n"
-"%s"
-msgstr[0] ""
-"Tämän elokuvan näyttäminen vaatii liitännäisen %s, jota ei ole asennettu."
-msgstr[1] ""
-"Tämän elokuvan näyttäminen vaatii seuraavat dekooderit, joita ei ole "
-"asennettu:\n"
-"\n"
-"%s"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3374
 msgid ""
-"Cannot play this file over the network. Try downloading it to disk first."
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 msgstr ""
-"Tätä tiedostoa ei voi näyttä verkon yli. Hae se ensin omalle kiintolevylle."
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5878
-msgid "Media contains no supported video streams."
-msgstr "Media ei sisällä tuettuja videomuotoja."
+#: ../src/totem-video-thumbnailer.c:842
+msgid "Filename"
+msgstr "Tiedostonimi"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6052
-msgid ""
-"Failed to create a GStreamer play object. Please check your GStreamer "
-"installation."
-msgstr ""
-"GStreamer-soitto-olion luominen epäonnistui. Tarkista että GStreamer on "
-"asennettu oikein."
+#: ../src/totem-video-thumbnailer.c:844
+msgid "Resolution"
+msgstr "Tarkkuus"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6172
-msgid ""
-"Failed to open audio output. You may not have permission to open the sound "
-"device, or the sound server may not be running. Please select another audio "
-"output in the Multimedia Systems Selector."
-msgstr ""
-"Äänen ulostulon avaus epäonnistui. Voi olla ettei sinulla ole oikeuksia "
-"käyttää äänilaitetta tai että äänipalvelin ei ole käytössä. Valitse toinen "
-"äänen ulostulo Multimediajärjestelmien valitsimesta."
+#: ../src/totem-video-thumbnailer.c:847
+msgid "Duration"
+msgstr "Kesto"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6192
-msgid ""
-"Could not find the audio output. You may need to install additional "
-"GStreamer plugins, or select another audio output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"Haluttua äänen ulostuloa ei löytynyt. Voi olla että sinun täytyy asentaa "
-"jotain uusia GStreamerin liitännäisiä tai valita toinen äänen ulostulo "
-"Multimediajärjestelmien valitsimesta."
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:1
+msgid "Apple Trailers"
+msgstr "Applen trailerit"
+
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:2
+msgid "Sets the user agent for the Apple Trailers site"
+msgstr "Asettaa user agent -tunnisteen Applen trailerisivustoa varten"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:1
+#| msgid "Download Movie Subtitles"
+msgid "Autoload Subtitles"
+msgstr "Lataa tekstitykset automaattisesti"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:2
+#| msgid "Downloading the subtitles…"
+msgid "Autoloads text subtitles"
+msgstr "Lataa teksitykset automaattisesti"
 
-#. hour:minutes:seconds
-#. Translators: This is a time format, like "9:05:02" for 9
-#. * hours, 5 minutes, and 2 seconds. You may change ":" to
-#. * the separator that your locale uses or use "%Id" instead
-#. * of "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:83 ../src/plugins/skipto/totem-time-entry.c:57
-#, c-format
-msgctxt "long time format"
-msgid "%d:%02d:%02d"
-msgstr "%d:%02d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
+msgid "Video Disc Recorder"
+msgstr "Videolevyjen nauhoitin"
 
-#. minutes:seconds
-#. Translators: This is a time format, like "5:02" for 5
-#. * minutes and 2 seconds. You may change ":" to the
-#. * separator that your locale uses or use "%Id" instead of
-#. * "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:92
-#, c-format
-msgctxt "short time format"
-msgid "%d:%02d"
-msgstr "%d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
+msgid "Records (S)VCDs or video DVDs"
+msgstr "Kirjoittaa (S)VCD- ja DVD-videolevyjä"
 
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:65
 msgid "_Create Video Disc..."
@@ -1984,38 +1855,21 @@
 msgid "Copy the currently playing (S)VCD"
 msgstr "Kopioi toistettava (S)VCD"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:129
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:136
 msgid "The video disc could not be duplicated."
 msgstr "Videolevyä ei voitu kopioida."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:131
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:276
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:138
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:283
 msgid "The movie could not be recorded."
 msgstr "Elokuvaa ei voitu nauhoittaa."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:157
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:167
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:263
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:164
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:174
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:270
 msgid "Unable to write a project."
 msgstr "Projektia ei voitu kirjoittaa."
 
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
-msgid "Video Disc Recorder"
-msgstr "Videolevyjen nauhoitin"
-
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
-msgid "Records (S)VCDs or video DVDs"
-msgstr "Kirjoittaa (S)VCD- ja DVD-videolevyjä"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:1
-#: ../src/plugins/chapters/totem-chapters.c:1139
-msgid "Chapters"
-msgstr "Kappaleet"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:2
-msgid "Support chapter markers in movies."
-msgstr "Tue kappalemerkintöjä elokuvissa."
-
 #: ../src/plugins/chapters/chapters-edit.ui.h:1
 msgid "Name for new chapter:"
 msgstr "Uuden kappaleen nimi:"
@@ -2072,6 +1926,16 @@
 msgid "Create a new chapter list for the movie"
 msgstr "Luo uusi kappalelista elokuvaan"
 
+#: ../src/plugins/chapters/chapters.plugin.in.h:1
+#: ../src/plugins/chapters/totem-chapters.c:1139
+msgid "Chapters"
+msgstr "Kappaleet"
+
+#: ../src/plugins/chapters/chapters.plugin.in.h:2
+#| msgid "Support chapter markers in movies."
+msgid "Support chapter markers in movies"
+msgstr "Tue kappalemerkintöjä elokuvissa"
+
 #: ../src/plugins/chapters/totem-chapters.c:56
 #, c-format
 msgid ""
@@ -2178,13 +2042,38 @@
 msgid "The URI ‘%s’ is not supported."
 msgstr "URI ”%s” ei ole tuettu."
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
-msgid "Instant Messenger status"
-msgstr "Pikaviestimen tila"
+#: ../src/plugins/grilo/grilo.plugin.in.h:1
+msgid "Grilo Browser"
+msgstr "Grilo-selain"
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
-msgid "Set your Instant Messenger status to away when a movie is playing"
-msgstr "Aseta pikaviestimen tila poissaolevaksi näytettäessä elokuvaa"
+#: ../src/plugins/grilo/grilo.plugin.in.h:2
+#| msgid "A plugin to let you browse media content from various sources."
+msgid "A plugin to let you browse media content from various sources"
+msgstr "Liitännäinen mediasisällön selailuun useista lähteistä"
+
+#: ../src/plugins/grilo/grilo.ui.h:1
+msgid "Add to Playlist"
+msgstr "Lisää soittolistaan"
+
+#: ../src/plugins/grilo/grilo.ui.h:2
+msgid "Copy Location"
+msgstr "Kopioi sijainti"
+
+#: ../src/plugins/grilo/grilo.ui.h:3 ../src/plugins/grilo/totem-grilo.c:1184
+msgid "Browse"
+msgstr "Selaa"
+
+#: ../src/plugins/grilo/grilo.ui.h:4 ../src/plugins/grilo/totem-grilo.c:1227
+msgid "Search"
+msgstr "Etsi"
+
+#: ../src/plugins/grilo/totem-grilo.c:454
+msgid "Browse Error"
+msgstr "Selausvirhe"
+
+#: ../src/plugins/grilo/totem-grilo.c:609
+msgid "Search Error"
+msgstr "Hakuvirhe"
 
 #: ../src/plugins/gromit/gromit.plugin.in.h:1
 msgid "Gromit Annotations"
@@ -2198,58 +2087,14 @@
 msgid "The gromit binary was not found."
 msgstr "Ohjelmaa gromit ei löytynyt."
 
-#. Add the interface to Totem's sidebar
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:1
-#: ../src/plugins/iplayer/iplayer.py:46
-msgid "BBC iPlayer"
-msgstr "BBC iPlayer"
-
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:2
-msgid "Stream BBC programs from the last 7 days from the BBC iPlayer service."
-msgstr ""
-"Toista BBC-ohjelmia viimeiseltä seitsemältä päivältä BBC-iPlayer-palvelusta."
-
-#: ../src/plugins/iplayer/iplayer.py:72
-msgid "Error listing channel categories"
-msgstr "Virhe kanavaluokkien listauksessa"
-
-#: ../src/plugins/iplayer/iplayer.py:73
-msgid ""
-"There was an unknown error getting the list of television channels available "
-"on BBC iPlayer."
-msgstr ""
-"Tuntematon virhe noudettaessa BBC-iPlayerissa saatavilla olevia "
-"televisiokanavia."
-
-#. Append a dummy child row so that the expander's visible; we can
-#. then queue off the expander to load the programme listing for this
-#. category
-#: ../src/plugins/iplayer/iplayer.py:84
-msgid "Loading…"
-msgstr "Ladataan…"
-
-#. Translators: the "programme feed" is the list of TV shows
-#. available to watch online
-#: ../src/plugins/iplayer/iplayer.py:136
-msgid "Error getting programme feed"
-msgstr "Virhe noudettaessa ohjelmasyötettä"
-
-#: ../src/plugins/iplayer/iplayer.py:137
-msgid ""
-"There was an error getting the list of programmes for this channel and "
-"category combination."
-msgstr ""
-"Tapahtui virhe noudettaessa ohjelmaluetteloa tälle kanava- ja "
-"luokkayhdistelmälle."
-
-#: ../src/plugins/iplayer/iplayer2.py:298
-msgid ""
-msgstr ""
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
+#| msgid "Instant Messenger status"
+msgid "Instant Messenger Status"
+msgstr "Pikaviestimen tila"
 
-#: ../src/plugins/iplayer/iplayer2.py:299
-#, python-format
-msgid "Programme unavailable (\"%s\")"
-msgstr "Ohjelma ei saatavilla (”%s”)"
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
+msgid "Set your Instant Messenger status to away when a movie is playing"
+msgstr "Aseta pikaviestimen tila poissaolevaksi näytettäessä elokuvaa"
 
 #: ../src/plugins/lirc/lirc.plugin.in.h:1
 msgid "Infrared Remote Control"
@@ -2267,25 +2112,31 @@
 msgid "Couldn't read lirc configuration."
 msgstr "LIRC:in asetuksia ei voitu lukea."
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
-msgid "Download Movie Subtitles"
-msgstr "Lataa elokuvan tekstityksiä"
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:1
+#| msgid "Movie Player"
+msgid "Media Player Keys"
+msgstr "Mediasoittimen näppäimet"
+
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:2
+msgid "Support additional media player keys"
+msgstr "Tuki mediasoitinnäppäimille"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
-msgid "Subtitle _language:"
-msgstr "Tekstityksen kie_li:"
+#: ../src/plugins/ontop/ontop.plugin.in.h:1
+msgid "Always On Top"
+msgstr "Aina päällimmäisenä"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
-msgid "_Play with Subtitle"
-msgstr "_Toista tekstityksellä"
+#: ../src/plugins/ontop/ontop.plugin.in.h:2
+msgid "Keep the main window on top when playing a movie"
+msgstr "Pidä pääikkuna aina päällimmäisenä näytettäessä elokuvaa"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:1
 msgid "Subtitle Downloader"
 msgstr "Tekstitysten latain"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:2
-msgid "Look for subtitles for the currently playing movie."
-msgstr "Etsi tekstityksiä parhaillaan toistettavalle elokuvalle."
+#| msgid "Look for subtitles for the currently playing movie."
+msgid "Look for subtitles for the currently playing movie"
+msgstr "Etsi tekstityksiä parhaillaan toistettavalle elokuvalle"
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:42
 msgid "Brazilian Portuguese"
@@ -2302,12 +2153,12 @@
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:290
 msgid "Could not contact the OpenSubtitles website"
-msgstr "OpenSubtitles-WWW-sivustoon ei voi yhdistää"
+msgstr "OpenSubtitles-verkkosivustoon ei voi yhdistää"
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:323
 #: ../src/plugins/opensubtitles/opensubtitles.py:341
 msgid "Could not contact the OpenSubtitles website."
-msgstr "OpenSubtitles-WWW-sivustoon ei voi yhdistää"
+msgstr "OpenSubtitles-verkkosivustoon ei voi yhdistää"
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:329
 msgid "No results found."
@@ -2341,6 +2192,18 @@
 msgid "Searching subtitles…"
 msgstr "Etsitään tekstityksiä…"
 
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
+msgid "Download Movie Subtitles"
+msgstr "Lataa elokuvan tekstityksiä"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
+msgid "Subtitle _language:"
+msgstr "Tekstityksen kie_li:"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
+msgid "_Play with Subtitle"
+msgstr "_Toista tekstityksellä"
+
 #: ../src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in.h:1
 msgid "Subtitle language"
 msgstr "Tekstityksen kieli"
@@ -2349,79 +2212,20 @@
 msgid "The language to search for subtitles for movies in."
 msgstr "Kieli, jolla etsitään tekstityksiä elokuvaan."
 
-#: ../src/plugins/ontop/ontop.plugin.in.h:1
-msgid "Always On Top"
-msgstr "Aina päällimmäisenä"
-
-#: ../src/plugins/ontop/ontop.plugin.in.h:2
-msgid "Keep the main window on top when playing a movie"
-msgstr "Pidä pääikkuna aina päällimmäisenä näytettäessä elokuvaa"
+#: ../src/plugins/properties/movie-properties.plugin.in.h:1
+#| msgid "Properties"
+msgid "Movie Properties"
+msgstr "Elokuvan ominaisuudet"
+
+#: ../src/plugins/properties/movie-properties.plugin.in.h:2
+#| msgid "Show or hide the sidebar"
+msgid "Adds movie properties to the sidebar"
+msgstr "Lisää elokuvan ominaisuudet sivupalkkiin"
 
 #: ../src/plugins/properties/totem-movie-properties.c:246
 msgid "Properties"
 msgstr "Ominaisuudet"
 
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:1
-msgid "Publisher protocol to use"
-msgstr "Käytettävä julkaisuprotokolla"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:2
-msgid ""
-"The transport protocol to use when publishing playlists over the network."
-msgstr "Käytettävä siirtoprotokolla kun julkaistaan soittolistoja verkossa."
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:3
-msgid "Format for network service name"
-msgstr "Muotoilu verkkopalvelun nimelle"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:5
-#, no-c-format
-msgid ""
-"A format string used to build the network service name used when publishing "
-"playlists over the network. The following format placeholders can be used: • "
-"%a: the program name as returned by g_get_application_name() • %h: the "
-"machine's host name in title case • %u: the user's login name in title case "
-"• %U: the user's real name • %%: the percent sign"
-msgstr ""
-"Muotoilumerkkijono jota käytetään muodostamaan verkkopalvelunimi kun "
-"julkaistaan soittolistoja verkossa. Seuraavia muotoilumerkintöjä voi "
-"käyttää: • %a: ohjelman nimi kutsulta g_get_application_name() • %h: "
-"tietokoneen nimi isolla alkukirjaimella  • %u: käyttäjän "
-"sisäänkirjautumisnimi isolla alkukirjaimella • %U: käyttäjän oikea nimi • %"
-"%: prosenttimerkki"
-
-#. Translators: computers on the local network which are publishing their playlists over the network
-#: ../src/plugins/publish/totem-publish.c:552
-msgid "Neighbors"
-msgstr "Naapurit"
-
-#: ../src/plugins/publish/publish.plugin.in.h:1
-msgid "Publish Playlist"
-msgstr "Julkista soittolista"
-
-#: ../src/plugins/publish/publish.plugin.in.h:2
-msgid "Share the current playlist via HTTP"
-msgstr "Jaa tämänhetkinen soittolista HTTP:lla"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:1
-msgid "Service _Name:"
-msgstr "Palvelun _nimi:"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:3
-#, no-c-format
-msgid ""
-"The name used for announcing the playlist service on the network.\n"
-"All occurrences of the string %u will be replaced by your name,\n"
-"and %h will be replaced by your computer's host name."
-msgstr ""
-"Nimi, jolla soittolistapalvelua mainostetaan verkossa.\n"
-"Jokainen merkkijono %u korvataan nimelläsi ja\n"
-"jokainen merkkijono %h korvataan tietokoneesi nimellä."
-
-#: ../src/plugins/publish/publish-plugin.ui.h:6
-msgid "Use _encrypted transport protocol (HTTPS)"
-msgstr "Käytä _salattu siirtoprotokollaa (HTTPS)"
-
 #: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:1
 msgid "rpdb2 password"
 msgstr "rpdb2-salasana"
@@ -2434,22 +2238,91 @@
 "Salasana suojaamaan rpdb2-palvelinta Totemin vianselvityksessä luvattomalta "
 "etäkäytöltä. Jos tämä on tyhjä, oletusta ”totem” käytetään."
 
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
+msgid "Python Console"
+msgstr "Python-konsoli"
+
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
+#| msgid "Interactive Python console."
+msgid "Interactive Python console"
+msgstr "Vuorovaikutteinen python-konsoli"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:88
+msgid "Python Console Menu"
+msgstr "Python-konsolin valikko"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:93
+msgid "_Python Console"
+msgstr "_Python-konsoli"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:94
+msgid "Show Totem's Python console"
+msgstr "Näytä Totemin python-konsoli"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:100
+msgid "Python Debugger"
+msgstr "Python-vianetsintä"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:101
+msgid "Enable remote Python debugging with rpdb2"
+msgstr "Käytä python-vianetsintää etänä rpdb2:n avulla"
+
+#. pylint: disable-msg=E1101
+#: ../src/plugins/pythonconsole/pythonconsole.py:125
+#, python-format
+msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
+msgstr "Voit käyttää Totem.Objectia ”totem_object”:n kautta :\\n%s"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:129
+msgid "Totem Python Console"
+msgstr "Totemin python-konsoli"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:139
+msgid ""
+"After you press OK, Totem will wait until you connect to it with winpdb or "
+"rpdb2. If you have not set a debugger password in DConf, it will use the "
+"default password ('totem')."
+msgstr ""
+"Sen jälkeen kun painat OK, Totem odottaa kunnes otat siihen yhteyttä winpdb:"
+"llä tai rpdb2:lla. Jos sinulla ei ole vianselvityssalasanaa asetettuna "
+"DConfissa, käytetään oletussalasanaa ”totem”."
+
+#: ../src/plugins/recent/recent.plugin.in.h:1
+#| msgid "Video files"
+msgid "Recent files"
+msgstr "Viimeisimmät tiedostot"
+
+#: ../src/plugins/recent/recent.plugin.in.h:2
+msgid "Adds files that have been played to recent files"
+msgstr "Lisää toistettuja tiedostoja viimeisimpien tiedostojen valikkoon"
+
 #: ../src/plugins/rotation/rotation.plugin.in.h:1
 msgid "Rotation Plugin"
 msgstr "Kiertoliitännäinen"
 
 #: ../src/plugins/rotation/rotation.plugin.in.h:2
-msgid "Allows videos to be rotated if they're in the wrong orientation."
-msgstr "Mahdollistaa videoiden kääntämisen, jos ne ovat väärässä asennossa."
+#| msgid "Allows videos to be rotated if they're in the wrong orientation."
+msgid "Allows videos to be rotated if they are in the wrong orientation"
+msgstr "Mahdollistaa videoiden kääntämisen, jos ne ovat väärässä asennossa"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:60
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:50
 msgid "_Rotate Clockwise"
 msgstr "Kie_rrä myötäpäivään"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:62
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:52
 msgid "Rotate Counterc_lockwise"
 msgstr "Kierrä _vastapäivään"
 
+#: ../src/plugins/save-file/save-file.plugin.in.h:1
+#| msgid "Save a Copy"
+msgid "Save Copy"
+msgstr "Tallenna kopio"
+
+#: ../src/plugins/save-file/save-file.plugin.in.h:2
+#| msgid "Copy the currently playing video DVD"
+msgid "Save a copy of the currently playing movie"
+msgstr "Tallenna kopio parhaillaan toistettavasta elokuvasta"
+
 #: ../src/plugins/save-file/totem-save-file.c:63
 msgid "Save a Copy..."
 msgstr "Tallenna kopio…"
@@ -2472,10 +2345,14 @@
 msgid "Movie stream"
 msgstr "Elokuvavirta"
 
-#: ../src/plugins/screensaver/totem-screensaver.c:116
-#: ../browser-plugin/totem-plugin-viewer.c:1891
-msgid "Playing a movie"
-msgstr "Toistetaan elokuvaa"
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:1
+msgid "Screen Saver"
+msgstr "Näytönsäästäjä"
+
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:2
+#| msgid "Disable screensaver when playing "
+msgid "Deactivates the screen saver when a movie is playing"
+msgstr "Estää näytönsäästäjän käynnistymisen, kun elokuvaa toistetaan"
 
 #: ../src/plugins/screenshot/gallery.ui.h:1
 msgid "Screenshot width (in pixels):"
@@ -2489,23 +2366,31 @@
 msgid "Number of screenshots:"
 msgstr "Kuvakaappausten lukumäärä:"
 
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:1
-msgid "_Name:"
-msgstr "_Nimi:"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:2
-msgid "Save in _folder:"
-msgstr "Tallenna _kansioon:"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:3
-msgid "Select a folder"
-msgstr "Valitse kansio"
-
-#. Write the screenshot to the temporary file
-#: ../src/plugins/screenshot/gnome-screenshot-widget.c:385
-#: ../src/plugins/screenshot/totem-screenshot.c:64
-msgid "Screenshot.png"
-msgstr "Kuvakaappaus.png"
+#. translators: this is the name of the file that gets made up
+#. * with the screenshot if the entire screen is taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:147
+#, c-format
+#| msgid "Screenshot.png"
+msgid "Screenshot from %s.png"
+msgstr "Kuvakaappaus-%s.png"
+
+#. translators: this is the name of the file that gets
+#. * made up with the screenshot if the entire screen is
+#. * taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:154
+#, c-format
+#| msgid "Screenshot-%s-%d.png"
+msgid "Screenshot from %s - %d.png"
+msgstr "Kuvakaappaus-%s-%d.png"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:1
+#| msgid "Screenshot.png"
+msgid "Screenshot"
+msgstr "Kuvakaappaus"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:2
+msgid "Allows screenshots and galleries to be taken of videos"
+msgstr "Mahdollistaa kuvakaappausten oton videoista"
 
 #: ../src/plugins/screenshot/totem-gallery.c:91
 msgid "Save Gallery"
@@ -2531,49 +2416,48 @@
 msgid "Saving gallery as \"%s\""
 msgstr "Tallennetaan galleria nimellä ”%s”"
 
-#: ../src/plugins/screenshot/totem-screenshot.c:113
-msgid "There was an error saving the screenshot."
-msgstr "Kuvakaappauksen tallennuksessa tapahtui virhe."
-
-#: ../src/plugins/screenshot/totem-screenshot.c:139
-msgid "Save Screenshot"
-msgstr "Tallenna kuvakaappaus"
-
-#. Create the screenshot widget
-#. Translators: %s is the movie title and %d is an auto-incrementing number to make filename unique
-#: ../src/plugins/screenshot/totem-screenshot.c:160
-#, c-format
-msgid "Screenshot-%s-%d.png"
-msgstr "Kuvakaappaus-%s-%d.png"
-
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:88
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:220
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "Totem could not get a screenshot of the video."
 msgstr "Totem ei voinut kaapata kuvaa tästä videosta."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "This is not supposed to happen; please file a bug report."
 msgstr "Näin ei pitäisi päästä tapahtumaan. Ole hyvä ja ilmoita viasta."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
-msgid "Take _Screenshot..."
-msgstr "Ota _kuvakaappaus…"
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
+#| msgid "Take _Screenshot..."
+msgid "Take _Screenshot"
+msgstr "Ota _kuvakaappaus"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
 msgid "Take a screenshot"
 msgstr "Ota kuvakaappaus"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create Screenshot _Gallery..."
 msgstr "Luo kuvakaappaus_galleria…"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create a gallery of screenshots"
 msgstr "Luo galleria kuvakaappauksista"
 
+#: ../src/plugins/skipto/skipto.plugin.in.h:1
+#: ../src/plugins/skipto/totem-skipto.c:196
+msgid "Skip To"
+msgstr "Siirry kohtaan"
+
+#: ../src/plugins/skipto/skipto.plugin.in.h:2
+msgid "Provides the \"Skip to\" dialog"
+msgstr "Tarjoaa \"Siirry kohtaan\"-ikkunan"
+
+#: ../src/plugins/skipto/skipto.ui.h:1
+msgid "_Skip to:"
+msgstr "Siirry _kohtaan:"
+
 #. Update the "seconds" label so that it always has the correct singular/plural form
 #. Translators: label for the seconds selector in the "Skip to" dialogue
-#: ../src/plugins/skipto/totem-skipto.c:160
+#: ../src/plugins/skipto/totem-skipto.c:159
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "sekunti"
@@ -2583,130 +2467,321 @@
 #. Translators: you should translate this string to a number (written in digits) which corresponds to the longer character length of the
 #. * translations for "second" and "seconds", as translated elsewhere in this file. For example, in English, "second" is 6 characters long and
 #. * "seconds" is 7 characters long, so this string should be translated to "7". See: bgo#639398
-#: ../src/plugins/skipto/totem-skipto.c:190
+#: ../src/plugins/skipto/totem-skipto.c:189
 msgctxt "Skip To label length"
 msgid "7"
 msgstr "8"
 
-#: ../src/plugins/skipto/totem-skipto.c:197
-msgid "Skip To"
-msgstr "Siirry kohtaan"
-
 #: ../src/plugins/skipto/totem-skipto-plugin.c:182
 msgid "_Skip To..."
 msgstr "Sii_rry kohtaan…"
 
 #: ../src/plugins/skipto/totem-skipto-plugin.c:182
 msgid "Skip to a specific time"
-msgstr "Kelaa annettuun ajankohtaan"
+msgstr "Siirry annettuun ajankohtaan"
 
-#: ../src/plugins/skipto/skipto.ui.h:1
-msgid "_Skip to:"
-msgstr "_Kelaa kohtaan:"
+#~ msgid "Play movies and songs"
+#~ msgstr "Toista elokuvia ja musiikkia"
 
-#: ../browser-plugin/totem-plugin-viewer.c:431
-msgid "No URI to play"
-msgstr "Soitettavaa URI:a ei annettu"
+#~ msgid "Open a file"
+#~ msgstr "Avaa tiedosto"
 
-#. translators: this is:
-#. * Open With ApplicationName
-#. * as in nautilus' right-click menu
-#: ../browser-plugin/totem-plugin-viewer.c:1107
-#, c-format
-msgid "_Open with \"%s\""
-msgstr "_Avaa sovelluksella ”%s”"
+#~ msgid "Open a non-local file"
+#~ msgstr "Avaa ei-paikallinen tiedosto"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2136
-msgid "No playlist or playlist empty"
-msgstr "Soittolistaa ei ole tai se on tyhjä"
+#~ msgid "Quit the program"
+#~ msgstr "Lopeta ohjelma"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2235
-msgid "Movie browser plugin"
-msgstr "Elokuvaselainliitännäinen"
+#~ msgid "Configure the application"
+#~ msgstr "Säädä sovellusta"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Verify your system installation. The Totem plugin will now exit."
-msgstr "Tarkista järjestelmäasennuksesi. Totemin liitännäinen suljetaan."
+#~ msgid "Switch to fullscreen"
+#~ msgstr "Vaihda kokoruututilaan"
 
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
-msgid "Python Console"
-msgstr "Python-konsoli"
+#~ msgid "Set the repeat mode"
+#~ msgstr "Aseta kertaustila"
 
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
-msgid "Interactive Python console."
-msgstr "Interaktiivinen python-konsoli."
+#~ msgid "Set the shuffle mode"
+#~ msgstr "Aseta satunnaissoittotila"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:88
-msgid "Python Console Menu"
-msgstr "Python-konsolin valikko"
+#~ msgid "14.4 Kbps Modem"
+#~ msgstr "14.4 kbps modeemi"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:93
-msgid "_Python Console"
-msgstr "_Python-konsoli"
+#~ msgid "19.2 Kbps Modem"
+#~ msgstr "19.2 kbps modeemi"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:94
-msgid "Show Totem's Python console"
-msgstr "Näytä Totemin python-konsoli"
+#~ msgid "28.8 Kbps Modem"
+#~ msgstr "28.8 kbps modeemi"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:100
-msgid "Python Debugger"
-msgstr "Python-vianetsintä"
+#~ msgid "33.6 Kbps Modem"
+#~ msgstr "33.6 kbps modeemi"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:101
-msgid "Enable remote Python debugging with rpdb2"
-msgstr "Käytä python-vianetsintää etänä rpdb2:n avulla"
+#~ msgid "34.4 Kbps Modem"
+#~ msgstr "34.4 kbps modeemi"
 
-#. pylint: disable-msg=E1101
-#: ../src/plugins/pythonconsole/pythonconsole.py:125
-#, python-format
-msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
-msgstr "Voit käyttää Totem.Objectia ”totem_object”:n kautta :\\n%s"
+#~ msgid "56 Kbps Modem/ISDN"
+#~ msgstr "56 kbps modeemi/ISDN"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:129
-msgid "Totem Python Console"
-msgstr "Totemin python-konsoli"
+#~ msgid "112 Kbps Dual ISDN/DSL"
+#~ msgstr "112 kbps kaksinkertainen ISDN/DSL"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:139
-msgid ""
-"After you press OK, Totem will wait until you connect to it with winpdb or "
-"rpdb2. If you have not set a debugger password in DConf, it will use the "
-"default password ('totem')."
-msgstr ""
-"Sen jälkeen kun painat OK, Totem odottaa kunnes otat siihen yhteyttä winpdb:"
-"llä tai rpdb2:lla. Jos sinulla ei ole vianselvityssalasanaa asetettuna "
-"DConfissa, käytetään oletussalasanaa ”totem”."
+#~ msgid "256 Kbps DSL/Cable"
+#~ msgstr "256 kbps DSL/kaapeli"
 
-#: ../src/plugins/grilo/grilo.plugin.in.h:1
-msgid "Grilo Browser"
-msgstr "Grilo-selain"
+#~ msgid "384 Kbps DSL/Cable"
+#~ msgstr "384 kbps DSL/kaapeli"
 
-#: ../src/plugins/grilo/grilo.plugin.in.h:2
-msgid "A plugin to let you browse media content from various sources."
-msgstr "Liitännäinen mediasisällön selailuun useista lähteistä."
+#~ msgid "512 Kbps DSL/Cable"
+#~ msgstr "512 kbps DSL/kaapeli"
 
-#: ../src/plugins/grilo/totem-grilo.c:452
-msgid "Browse Error"
-msgstr "Selausvirhe"
+#~ msgid "1.5 Mbps T1/Intranet/LAN"
+#~ msgstr "1.5 Mbps T1/lähiverkko/LAN"
 
-#: ../src/plugins/grilo/totem-grilo.c:599
-msgid "Search Error"
-msgstr "Hakuvirhe"
+#~ msgid "Intranet/LAN"
+#~ msgstr "Lähiverkko"
 
-#: ../src/plugins/grilo/totem-grilo.c:1219 ../src/plugins/grilo/grilo.ui.h:3
-msgid "Browse"
-msgstr "Selaa"
+#~ msgid "Networking"
+#~ msgstr "Verkko"
 
-#: ../src/plugins/grilo/totem-grilo.c:1285 ../src/plugins/grilo/grilo.ui.h:4
-msgid "Search"
-msgstr "Etsi"
+#~ msgid "Connection _speed:"
+#~ msgstr "Yhteys_nopeus:"
 
-#: ../src/plugins/grilo/grilo.ui.h:1
-msgid "Add to Playlist"
-msgstr "Lisää soittolistaan"
+#~ msgid "Network connection speed"
+#~ msgstr "Verkkoyhteyden nopeus"
 
-#: ../src/plugins/grilo/grilo.ui.h:2
-msgid "Copy Location"
-msgstr "Kopioi sijainti"
+#~ msgid ""
+#~ "Approximate network connection speed, used to select quality on media "
+#~ "over the network."
+#~ msgstr ""
+#~ "Arvioitu verkkoyhteyden nopeus, käytetään valitsemaan median laatua "
+#~ "verkon yli."
+
+#~ msgid "Play Image '%s'"
+#~ msgstr "Toista levykuva ”%s”"
+
+#~ msgid "device%d"
+#~ msgstr "laite%d"
+
+#~ msgid "Play Disc '%s'"
+#~ msgstr "Toista levy ”%s”"
+
+#~ msgid "Movie Player using %s"
+#~ msgstr "%s -kirjastoja käyttävä elokuvasoitin"
+
+#~ msgid ""
+#~ "Totem could not play this media (%s) although a plugin is present to "
+#~ "handle it."
+#~ msgstr ""
+#~ "Totem ei voi soittaa mediaa (%s), vaikka sille tarkoitettu liitännäinen "
+#~ "on asennettu."
+
+#~ msgid ""
+#~ "You might want to check that a disc is present in the drive and that it "
+#~ "is correctly configured."
+#~ msgstr ""
+#~ "Varmista, että levy on asemassa ja että aseman asetukset ovat oikein."
+
+#~ msgid "More information about media plugins"
+#~ msgstr "Lisätietoja medialiitännäisistä"
+
+#~ msgid ""
+#~ "Please install the necessary plugins and restart Totem to be able to play "
+#~ "this media."
+#~ msgstr ""
+#~ "Soittaaksesi tiedoston asenna tarvittavat liitännäiset ja käynnistä Totem "
+#~ "uudestaan."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it does not have the "
+#~ "appropriate plugins to be able to read from the disc."
+#~ msgstr ""
+#~ "Totem ei voi soittaa tämäntyyppisiä tiedostoja (%s), koska sopivaa "
+#~ "liitännäistä levyltä lukua varten ei ole asennettu."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because you do not have the "
+#~ "appropriate plugins to handle it."
+#~ msgstr ""
+#~ "Totem ei voi soittaa tämäntyyppisiä tiedostoja (%s), koska sopivaa "
+#~ "liitännäistä ei ole asennettu."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it is not supported."
+#~ msgstr ""
+#~ "Totem ei voi näyttää tämäntyyppistä mediaa (%s), koska se ei ole tuettu."
+
+#~ msgid "Please insert another disc to play back."
+#~ msgstr "Laita asemaan muu toistettava levy."
+
+#~ msgid "Totem does not support playback of Audio CDs"
+#~ msgstr "Totem ei osaa soittaa tavallisia CD-levyjä"
+
+#~ msgid ""
+#~ "Please consider using a music player or a CD extractor to play this CD"
+#~ msgstr ""
+#~ "Soita tavalliset CD-levyt musiikkisoittimella tai kopiointiohjelmalla"
+
+#~ msgid "%d %%"
+#~ msgstr "%d %%"
+
+#~ msgid ""
+#~ "The requested audio output was not found. Please select another audio "
+#~ "output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "Pyydettyä äänen ulostulokanavaa ei löytynyt. Valitse toinen äänen "
+#~ "ulostulo Multimediajärjestelmien valitsimesta."
+
+#~ msgid "Location not found."
+#~ msgstr "Sijaintia ei löytynyt."
+
+#~ msgid ""
+#~ "Could not open location; you might not have permission to open the file."
+#~ msgstr ""
+#~ "Sijaintia ei voitu avata: oikeutesi eivät ehkä riitä tiedoston avaamiseen."
+
+#~ msgid ""
+#~ "The video output is in use by another application. Please close other "
+#~ "video applications, or select another video output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "Videoulostulo on toisen ohjelman käytössä. Sulje muut videota käyttävät "
+#~ "ohjelmat tai valitse toinen videoulostulo Multimediajärjestelmien "
+#~ "valitsimesta."
+
+#~ msgid ""
+#~ "The audio output is in use by another application. Please select another "
+#~ "audio output in the Multimedia Systems Selector. You may want to consider "
+#~ "using a sound server."
+#~ msgstr ""
+#~ "Äänen ulostulo on toisen ohjelman käytössä. Valitse toinen ulostulo "
+#~ "Multimediajärjestelmien valitsimesta. Voi myös olla että haluaisit "
+#~ "käyttää äänipalvelinta."
+
+#~ msgid ""
+#~ "Failed to create a GStreamer play object. Please check your GStreamer "
+#~ "installation."
+#~ msgstr ""
+#~ "GStreamer-soitto-olion luominen epäonnistui. Tarkista että GStreamer on "
+#~ "asennettu oikein."
+
+#~ msgid ""
+#~ "Failed to open audio output. You may not have permission to open the "
+#~ "sound device, or the sound server may not be running. Please select "
+#~ "another audio output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "Äänen ulostulon avaus epäonnistui. Voi olla ettei sinulla ole oikeuksia "
+#~ "käyttää äänilaitetta tai että äänipalvelin ei ole käytössä. Valitse "
+#~ "toinen äänen ulostulo Multimediajärjestelmien valitsimesta."
+
+#~ msgid ""
+#~ "Could not find the audio output. You may need to install additional "
+#~ "GStreamer plugins, or select another audio output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "Haluttua äänen ulostuloa ei löytynyt. Voi olla että sinun täytyy asentaa "
+#~ "jotain uusia GStreamerin liitännäisiä tai valita toinen äänen ulostulo "
+#~ "Multimediajärjestelmien valitsimesta."
+
+#~ msgid "BBC iPlayer"
+#~ msgstr "BBC iPlayer"
+
+#~ msgid ""
+#~ "Stream BBC programs from the last 7 days from the BBC iPlayer service."
+#~ msgstr ""
+#~ "Toista BBC-ohjelmia viimeiseltä seitsemältä päivältä BBC-iPlayer-"
+#~ "palvelusta."
+
+#~ msgid "Error listing channel categories"
+#~ msgstr "Virhe kanavaluokkien listauksessa"
+
+#~ msgid ""
+#~ "There was an unknown error getting the list of television channels "
+#~ "available on BBC iPlayer."
+#~ msgstr ""
+#~ "Tuntematon virhe noudettaessa BBC-iPlayerissa saatavilla olevia "
+#~ "televisiokanavia."
+
+#~ msgid "Loading…"
+#~ msgstr "Ladataan…"
+
+#~ msgid "Error getting programme feed"
+#~ msgstr "Virhe noudettaessa ohjelmasyötettä"
+
+#~ msgid ""
+#~ "There was an error getting the list of programmes for this channel and "
+#~ "category combination."
+#~ msgstr ""
+#~ "Tapahtui virhe noudettaessa ohjelmaluetteloa tälle kanava- ja "
+#~ "luokkayhdistelmälle."
+
+#~ msgid ""
+#~ msgstr ""
+
+#~ msgid "Programme unavailable (\"%s\")"
+#~ msgstr "Ohjelma ei saatavilla (”%s”)"
+
+#~ msgid "Publisher protocol to use"
+#~ msgstr "Käytettävä julkaisuprotokolla"
+
+#~ msgid ""
+#~ "The transport protocol to use when publishing playlists over the network."
+#~ msgstr "Käytettävä siirtoprotokolla kun julkaistaan soittolistoja verkossa."
+
+#~ msgid "Format for network service name"
+#~ msgstr "Muotoilu verkkopalvelun nimelle"
+
+#~ msgid ""
+#~ "A format string used to build the network service name used when "
+#~ "publishing playlists over the network. The following format placeholders "
+#~ "can be used: • %a: the program name as returned by g_get_application_name"
+#~ "() • %h: the machine's host name in title case • %u: the user's login "
+#~ "name in title case • %U: the user's real name • %%: the percent sign"
+#~ msgstr ""
+#~ "Muotoilumerkkijono jota käytetään muodostamaan verkkopalvelunimi kun "
+#~ "julkaistaan soittolistoja verkossa. Seuraavia muotoilumerkintöjä voi "
+#~ "käyttää: • %a: ohjelman nimi kutsulta g_get_application_name() • %h: "
+#~ "tietokoneen nimi isolla alkukirjaimella  • %u: käyttäjän "
+#~ "sisäänkirjautumisnimi isolla alkukirjaimella • %U: käyttäjän oikea nimi • "
+#~ "%%: prosenttimerkki"
+
+#~ msgid "Neighbors"
+#~ msgstr "Naapurit"
+
+#~ msgid "Publish Playlist"
+#~ msgstr "Julkista soittolista"
+
+#~ msgid "Share the current playlist via HTTP"
+#~ msgstr "Jaa tämänhetkinen soittolista HTTP:lla"
+
+#~ msgid "Service _Name:"
+#~ msgstr "Palvelun _nimi:"
+
+#~ msgid ""
+#~ "The name used for announcing the playlist service on the network.\n"
+#~ "All occurrences of the string %u will be replaced by your name,\n"
+#~ "and %h will be replaced by your computer's host name."
+#~ msgstr ""
+#~ "Nimi, jolla soittolistapalvelua mainostetaan verkossa.\n"
+#~ "Jokainen merkkijono %u korvataan nimelläsi ja\n"
+#~ "jokainen merkkijono %h korvataan tietokoneesi nimellä."
+
+#~ msgid "Use _encrypted transport protocol (HTTPS)"
+#~ msgstr "Käytä _salattu siirtoprotokollaa (HTTPS)"
+
+#~ msgid "_Name:"
+#~ msgstr "_Nimi:"
+
+#~ msgid "Save in _folder:"
+#~ msgstr "Tallenna _kansioon:"
+
+#~ msgid "Select a folder"
+#~ msgstr "Valitse kansio"
+
+#~ msgid "There was an error saving the screenshot."
+#~ msgstr "Kuvakaappauksen tallennuksessa tapahtui virhe."
+
+#~ msgid "Save Screenshot"
+#~ msgstr "Tallenna kuvakaappaus"
 
 #~ msgid "Bemused"
 #~ msgstr "Bemused"
@@ -2735,9 +2810,6 @@
 #~ msgid "Search Results"
 #~ msgstr "Hakutulokset"
 
-#~ msgid "Videos"
-#~ msgstr "Videot"
-
 #~ msgid "_Open in Web Browser"
 #~ msgstr "_Avaa selaimessa"
 
diff -Nru totem-3.4.3/po/fr.po totem-3.6.2/po/fr.po
--- totem-3.4.3/po/fr.po	2012-04-02 14:15:40.000000000 +0000
+++ totem-3.6.2/po/fr.po	2012-10-25 13:15:32.000000000 +0000
@@ -2,6 +2,7 @@
 # Copyright (C) 2002-2012 Free Software Foundation, Inc.
 # This file is distributed under the same license as the totem package.
 #
+#
 # Christophe Fergeau , 2002.
 # Sébastien Oustric , 2002.
 # Baptiste Mille-Mathias , 2003.
@@ -16,29 +17,257 @@
 # Laurent Pomarede , 2008.
 # Nicolas Repentin , 2009, 2010.
 # Gérard Baylard , 2011.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: totem.HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=totem&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-03-24 07:27+0000\n"
-"PO-Revision-Date: 2012-03-23 21:03+0200\n"
-"Last-Translator: Pierre Henry \n"
+"POT-Creation-Date: 2012-09-15 09:32+0000\n"
+"PO-Revision-Date: 2012-09-15 14:18+0200\n"
+"Last-Translator: Bruno Brouard \n"
 "Language-Team: GNOME French Team \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n>1;\n"
 
+#: ../browser-plugin/totem-plugin-viewer.c:352 ../src/totem-object.c:1180
+#: ../src/totem-object.c:1650 ../src/totem-statusbar.c:115
+msgid "Stopped"
+msgstr "Arrêté"
+
+#: ../browser-plugin/totem-plugin-viewer.c:364 ../src/totem-object.c:1173
+msgid "Paused"
+msgstr "Suspendu"
+
+#: ../browser-plugin/totem-plugin-viewer.c:368 ../src/totem-object.c:1166
+msgid "Playing"
+msgstr "Lecture en cours"
+
+#: ../browser-plugin/totem-plugin-viewer.c:386
+#: ../src/plugins/screensaver/totem-screensaver.c:97
+msgid "Playing a movie"
+msgstr "Lecture d'un film"
+
+#: ../browser-plugin/totem-plugin-viewer.c:443
+msgid "No URI to play"
+msgstr "Aucun URI à lire"
+
+#: ../browser-plugin/totem-plugin-viewer.c:676
+#: ../browser-plugin/totem-plugin-viewer.c:1700
+msgid "Totem Movie Player"
+msgstr "Lecteur vidéo Totem"
+
+#. translators: this is:
+#. * Open With ApplicationName
+#. * as in nautilus' right-click menu
+#: ../browser-plugin/totem-plugin-viewer.c:1120
+#, c-format
+msgid "_Open with \"%s\""
+msgstr "_Ouvrir avec « %s »"
+
+#: ../browser-plugin/totem-plugin-viewer.c:1341 ../src/totem-object.c:2475
+msgid "An error occurred"
+msgstr "Une erreur est survenue"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2033
+msgid "No playlist or playlist empty"
+msgstr "Aucune liste de lecture ou liste vide"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2128
+msgid "Movie browser plugin"
+msgstr "Greffon Explorateur de films"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144 ../src/totem.c:240
+msgid "Could not initialize the thread-safe libraries."
+msgstr "Impossible d'initialiser les bibliothèques thread-safe."
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144
+msgid "Verify your system installation. The Totem plugin will now exit."
+msgstr ""
+"Vérifiez l'installation de votre système. Le greffon Totem va maintenant "
+"s'arrêter."
+
 #: ../data/fullscreen.ui.h:1
 msgid "Leave Fullscreen"
 msgstr "Quitter le mode plein écran"
 
-#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:144
+#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:81
 msgid "Time:"
 msgstr "Minutage :"
 
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
+msgid "Allow the screensaver to activate when playing audio"
+msgstr "Autoriser l'économiseur d'écran lors des lectures audio"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
+msgid ""
+"Allow the screensaver to activate when playing audio. Disable if you have "
+"monitor-powered speakers."
+msgstr ""
+"Autorise l'activation de l'économiseur d'écran pendant une lecture audio. À "
+"désactiver si vous disposez de haut-parleurs intégrés à l'écran."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
+msgid "Show visual effects when no video is displayed"
+msgstr "Afficher les effets visuels si aucune vidéo n'est en cours de lecture"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
+msgid "Show visual effects when playing an audio only file."
+msgstr ""
+"Affiche des effets visuels lors de la lecture d'un fichier ne contenant que "
+"du son."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
+msgid "Name of the visual effects plugin"
+msgstr "Nom des greffons d'effets visuels"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
+msgid "The brightness of the video"
+msgstr "La luminosité de la vidéo"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
+msgid "The contrast of the video"
+msgstr "Le contraste de la vidéo"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
+msgid "The hue of the video"
+msgstr "La teinte de la vidéo"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
+msgid "The saturation of the video"
+msgstr "La saturation de la vidéo"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
+msgid "Resize the canvas automatically on file load"
+msgstr ""
+"Redimensionner automatiquement le canevas lors du chargement du fichier"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
+msgid "Repeat mode"
+msgstr "Lecture en boucle"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
+msgid "Shuffle mode"
+msgstr "Lecture aléatoire"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
+msgid "Whether to disable deinterlacing for interlaced movies"
+msgstr ""
+"Indique s'il faut désactiver le désentrelacement pour les vidéos entrelacées"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
+msgid "Whether to enable debug for the playback engine"
+msgstr "Indique s'il faut activer le débogage pour le moteur de lecture"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
+msgid "Type of audio output to use"
+msgstr "Type de sortie audio à utiliser"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
+msgid "Visualization quality setting"
+msgstr "Réglage de la qualité de visualisation"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
+msgid "Quality setting for the audio visualization."
+msgstr "Paramètre de qualité pour la visualisation audio."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
+msgid "Network buffering threshold"
+msgstr "Seuil de tampon réseau"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
+msgid ""
+"Amount of data to buffer for network streams before starting to display the "
+"stream (in seconds)."
+msgstr ""
+"Quantité de données du flux réseau à mettre en tampon avant d'en débuter "
+"l'affichage (en secondes)."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
+msgid "Subtitle font"
+msgstr "Police des sous-titres"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
+msgid "Pango font description for subtitle rendering."
+msgstr "Description de la police Pango pour le rendu des sous-titres."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
+msgid "Subtitle encoding"
+msgstr "Codage des sous-titres"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
+msgid "Encoding character set for subtitle."
+msgstr "Codage des caractères pour les sous-titres."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
+msgid "Default location for the \"Open...\" dialogs"
+msgstr "Emplacement par défaut de la boîte de dialogue « Ouvrir... »"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
+msgid ""
+"Default location for the \"Open...\" dialogs. Default is the current "
+"directory."
+msgstr ""
+"Emplacement par défaut de la boîte de dialogue « Ouvrir... ». Par défaut, le "
+"répertoire actuel."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
+msgid "Default location for the \"Take Screenshot\" dialogs"
+msgstr "Emplacement par défaut de la boîte de dialogue « Capturer une image »"
+
+# Lien avec xdg-user-dirs
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
+msgid ""
+"Default location for the \"Take Screenshot\" dialogs. Default is the "
+"Pictures directory."
+msgstr ""
+"Emplacement par défaut pour les fichiers de capture d'écran, par défaut le "
+"répertoire Images."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
+msgid "Whether to disable the plugins in the user's home directory"
+msgstr ""
+"Indique s'il faut désactiver les greffons dans le répertoire personnel de "
+"l'utilisateur"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
+msgid "Whether to disable the keyboard shortcuts"
+msgstr "Indique s'il faut désactiver les raccourcis clavier"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
+msgid "Whether to autoload text subtitle files when a movie is loaded"
+msgstr ""
+"Indique s'il faut charger automatiquement les fichiers de sous-titrage avec "
+"le film"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
+msgid "Whether to autoload external chapter files when a movie is loaded"
+msgstr ""
+"Indique s'il faut charger automatiquement les fichiers de chapitrage avec le "
+"film"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
+msgid ""
+"Whether to remember the position of played audio/video files when pausing or "
+"closing them"
+msgstr ""
+"Indique s'il faut mémoriser la position de lecture des fichiers vidéo et "
+"audio à la mise en pause ou à la fermeture"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
+msgid "Active plugins list"
+msgstr "Liste des greffons actifs"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+msgid ""
+"A list of the names of the plugins which are currently active (loaded and "
+"running)."
+msgstr ""
+"Une liste des noms des greffons actuellement actifs (chargés et en cours "
+"d'exécution)."
+
 #: ../data/playlist.ui.h:1
 msgid "_Remove"
 msgstr "_Enlever"
@@ -55,11 +284,11 @@
 msgid "Copy the location to the clipboard"
 msgstr "Copie l'emplacement dans le presse-papiers"
 
-#: ../data/playlist.ui.h:5 ../data/totem.ui.h:78
+#: ../data/playlist.ui.h:5 ../data/totem.ui.h:71
 msgid "_Select Text Subtitles..."
 msgstr "_Sélectionner les sous-titres..."
 
-#: ../data/playlist.ui.h:6 ../data/totem.ui.h:79
+#: ../data/playlist.ui.h:6 ../data/totem.ui.h:72
 msgid "Select a file to use for text subtitles"
 msgstr "Choisit un fichier de sous-titres à utiliser"
 
@@ -83,43 +312,194 @@
 msgid "Move Down"
 msgstr "Descendre"
 
-#: ../data/properties.ui.h:1 ../data/totem.ui.h:122
-msgid "General"
-msgstr "Général"
-
-#: ../data/properties.ui.h:2
-msgid "Title:"
-msgstr "Titre :"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:2
+msgid "Normal"
+msgstr "Normale"
 
-#: ../data/properties.ui.h:3
-msgid "Artist:"
-msgstr "Artiste :"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:4
+msgid "Large"
+msgstr "Grande"
 
-#: ../data/properties.ui.h:4
-msgid "Duration:"
-msgstr "Durée :"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:6
+msgid "Extra Large"
+msgstr "Très grande"
 
-#: ../data/properties.ui.h:5
-msgid "Year:"
-msgstr "Année :"
+#: ../data/preferences.ui.h:7 ../src/backend/bacon-video-widget.c:5498
+#: ../src/totem-properties-view.c:231
+msgid "Stereo"
+msgstr "Stéréo"
 
-#: ../data/properties.ui.h:6
-msgid "Album:"
-msgstr "Album :"
+#: ../data/preferences.ui.h:8
+msgid "4-channel"
+msgstr "4 canaux"
 
-#: ../data/properties.ui.h:7
-msgid "Comment:"
-msgstr "Commentaire :"
+#: ../data/preferences.ui.h:9
+msgid "4.1-channel"
+msgstr "4.1 canaux"
 
-#: ../data/properties.ui.h:8
-msgid "Container:"
-msgstr "Conteneur :"
+#: ../data/preferences.ui.h:10
+msgid "5.0-channel"
+msgstr "5.0 canaux"
 
-#: ../data/properties.ui.h:9 ../data/totem.ui.h:128
-#: ../src/totem-properties-view.c:270
+#: ../data/preferences.ui.h:11
+msgid "5.1-channel"
+msgstr "5.1 canaux"
+
+#: ../data/preferences.ui.h:12
+msgid "AC3 Passthrough"
+msgstr "Sortie directe AC3"
+
+#: ../data/preferences.ui.h:13
+msgid "Totem Preferences"
+msgstr "Préférences de Totem"
+
+#: ../data/preferences.ui.h:14
+msgid "Playback"
+msgstr "Lecture"
+
+#: ../data/preferences.ui.h:15
+msgid "Start playing files from last position"
+msgstr "Démarre la lecture des fichiers à la dernière position connue"
+
+#: ../data/preferences.ui.h:16
+msgid "Text Subtitles"
+msgstr "Sous-titres"
+
+#: ../data/preferences.ui.h:17
+msgid "_Load subtitle files when movie is loaded"
+msgstr "C_harger les fichiers de sous-titrage au chargement du film"
+
+#: ../data/preferences.ui.h:18
+msgid "_Font:"
+msgstr "_Police :"
+
+#: ../data/preferences.ui.h:19
+msgid "_Encoding:"
+msgstr "_Codage :"
+
+#: ../data/preferences.ui.h:20
+msgid "External Chapters"
+msgstr "Chapitres externes"
+
+#: ../data/preferences.ui.h:21
+msgid "Load _chapter files when movie is loaded"
+msgstr "Ch_arger les fichiers de chapitrage au chargement d'un film"
+
+#: ../data/preferences.ui.h:22 ../data/properties.ui.h:1
+msgid "General"
+msgstr "Général"
+
+#. Tab label in the Preferences dialogue
+#: ../data/preferences.ui.h:24
+msgid "Display"
+msgstr "Affichage"
+
+#: ../data/preferences.ui.h:25
+msgid "_Resize the window when a new video is loaded"
+msgstr "_Redimensionner la fenêtre au chargement d'une nouvelle vidéo"
+
+#: ../data/preferences.ui.h:26
+msgid "Disable _deinterlacing of interlaced videos"
+msgstr "_Désactiver le désentrelacement des vidéos entrelacées"
+
+# Suivent deux boutons radio : Video / Video or Audio
+#: ../data/preferences.ui.h:27
+msgid "Disable screensaver when playing "
+msgstr "Désactiver l'économiseur d'écran pendant une lecture "
+
+#: ../data/preferences.ui.h:28 ../data/properties.ui.h:9
+#: ../src/totem-properties-view.c:273
 msgid "Video"
 msgstr "Vidéo"
 
+#: ../data/preferences.ui.h:29
+msgid "Video or Audio"
+msgstr "Vidéo ou audio"
+
+#: ../data/preferences.ui.h:30
+msgid "Visual Effects"
+msgstr "Effets visuels"
+
+#: ../data/preferences.ui.h:31
+msgid "Show _visual effects when an audio file is played"
+msgstr "Afficher des effets _visuels à la lecture d'un fichier audio"
+
+#: ../data/preferences.ui.h:32
+msgid "_Type of visualization:"
+msgstr "Ty_pe de visualisation :"
+
+#: ../data/preferences.ui.h:33
+msgid "Visualization _size:"
+msgstr "Di_mension de visualisation :"
+
+#: ../data/preferences.ui.h:34
+msgid "Color Balance"
+msgstr "Balance des couleurs"
+
+#: ../data/preferences.ui.h:35
+msgid "_Brightness:"
+msgstr "_Luminosité :"
+
+#: ../data/preferences.ui.h:36
+msgid "Co_ntrast:"
+msgstr "Co_ntraste :"
+
+#: ../data/preferences.ui.h:37
+msgid "Sat_uration:"
+msgstr "Sat_uration :"
+
+#: ../data/preferences.ui.h:38
+msgid "_Hue:"
+msgstr "_Teinte :"
+
+#: ../data/preferences.ui.h:39
+msgid "Reset to _Defaults"
+msgstr "Rétablir les valeurs par _défaut"
+
+#: ../data/preferences.ui.h:40
+msgid "Audio Output"
+msgstr "Sortie audio"
+
+#: ../data/preferences.ui.h:41
+msgid "_Audio output type:"
+msgstr "Type de sortie _audio :"
+
+#: ../data/preferences.ui.h:42 ../data/properties.ui.h:14
+#: ../src/totem-properties-view.c:271
+msgid "Audio"
+msgstr "Audio"
+
+#: ../data/properties.ui.h:2
+msgid "Title:"
+msgstr "Titre :"
+
+#: ../data/properties.ui.h:3
+msgid "Artist:"
+msgstr "Artiste :"
+
+#: ../data/properties.ui.h:4
+msgid "Duration:"
+msgstr "Durée :"
+
+#: ../data/properties.ui.h:5
+msgid "Year:"
+msgstr "Année :"
+
+#: ../data/properties.ui.h:6
+msgid "Album:"
+msgstr "Album :"
+
+#: ../data/properties.ui.h:7
+msgid "Comment:"
+msgstr "Commentaire :"
+
+#: ../data/properties.ui.h:8
+msgid "Container:"
+msgstr "Conteneur :"
+
 #: ../data/properties.ui.h:10
 msgid "Dimensions:"
 msgstr "Dimensions :"
@@ -137,11 +517,6 @@
 msgid "Bitrate:"
 msgstr "Débit :"
 
-#: ../data/properties.ui.h:14 ../data/totem.ui.h:142
-#: ../src/totem-properties-view.c:268
-msgid "Audio"
-msgstr "Audio"
-
 #: ../data/properties.ui.h:15
 msgid "Sample rate:"
 msgstr "Échantillonnage :"
@@ -150,755 +525,447 @@
 msgid "Channels:"
 msgstr "Canaux :"
 
-#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
-msgid "_Add to Playlist"
-msgstr "_Ajouter à la liste de lecture"
-
-#: ../data/video-list.ui.h:2
-msgid "Add the video to the playlist"
-msgstr "Ajoute la vidéo à la liste de lecture"
-
 #. Title
-#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:143
-#: ../src/totem-object.c:1667
-msgid "Movie Player"
-msgstr "Lecteur vidéo"
+#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:80 ../src/totem.c:239
+#: ../src/totem.c:248 ../src/totem-menu.c:790 ../src/totem-object.c:1658
+msgid "Videos"
+msgstr "Vidéos"
 
-# Infinitif pour les infobulles du Bureau
 #: ../data/totem.desktop.in.in.in.h:2
-msgid "Play movies and songs"
-msgstr "Lire des films et de la musique"
+msgid "Play movies"
+msgstr "Lecture de films"
+
+#: ../data/totem.desktop.in.in.in.h:3
+msgid "Video;Movie;Film;Clip;Series;Player;DVD;TV;Disc;"
+msgstr "Vidéo;Film;Cinéma;Séquence;Clip;Séries;Lecteur;DVD;TV;Disque;"
 
 #: ../data/totem.ui.h:1
-msgid "_Movie"
-msgstr "_Film"
+msgid "_Open"
+msgstr "_Ouvrir"
 
 #: ../data/totem.ui.h:2
-msgid "_Open..."
-msgstr "_Ouvrir..."
+msgid "Open _Location"
+msgstr "Ouvrir un _emplacement"
 
 #: ../data/totem.ui.h:3
-msgid "Open a file"
-msgstr "Ouvre un fichier"
+msgid "_Fullscreen"
+msgstr "_Plein écran"
 
 #: ../data/totem.ui.h:4
-msgid "Open _Location..."
-msgstr "Ouvrir un _emplacement..."
+msgid "Prefere_nces"
+msgstr "_Préférences"
 
 #: ../data/totem.ui.h:5
-msgid "Open a non-local file"
-msgstr "Ouvre un fichier non-local"
+msgid "Shuff_le"
+msgstr "A_léatoire"
 
 #: ../data/totem.ui.h:6
+msgid "_Repeat"
+msgstr "En _boucle"
+
+#: ../data/totem.ui.h:7
+msgid "_Quit"
+msgstr "_Quitter"
+
+#: ../data/totem.ui.h:8
+msgid "_Movie"
+msgstr "_Film"
+
+#: ../data/totem.ui.h:9
 msgid "_Eject"
 msgstr "É_jecter"
 
-#: ../data/totem.ui.h:7
+#: ../data/totem.ui.h:10
 msgid "Eject the current disc"
 msgstr "Éjecter le disque courant"
 
-#: ../data/totem.ui.h:8
+#: ../data/totem.ui.h:11
 msgid "_Properties"
 msgstr "_Propriétés"
 
-#: ../data/totem.ui.h:9
+#: ../data/totem.ui.h:12
 msgid "View the properties of the current stream"
 msgstr "Affiche les propriétés du flux actuel"
 
-#: ../data/totem.ui.h:10
+#: ../data/totem.ui.h:13
 msgid "Play / P_ause"
 msgstr "Lecture / P_ause"
 
-#: ../data/totem.ui.h:11
+#: ../data/totem.ui.h:14
 msgid "Play or pause the movie"
 msgstr "Démarre ou suspend la vidéo"
 
-#: ../data/totem.ui.h:12
-msgid "_Quit"
-msgstr "_Quitter"
-
-#: ../data/totem.ui.h:13
-msgid "Quit the program"
-msgstr "Quitte le programme"
-
-#: ../data/totem.ui.h:14
+#: ../data/totem.ui.h:15
 msgid "_Edit"
 msgstr "É_dition"
 
-#: ../data/totem.ui.h:15
+#: ../data/totem.ui.h:16
 msgid "_Clear Playlist"
 msgstr "_Effacer la liste de lecture"
 
-#: ../data/totem.ui.h:16
+#: ../data/totem.ui.h:17
 msgid "Clear the playlist"
 msgstr "Effacer la liste de lecture"
 
-#: ../data/totem.ui.h:17
-msgid "Prefere_nces"
-msgstr "_Préférences"
-
 #: ../data/totem.ui.h:18
-msgid "Configure the application"
-msgstr "Configuration de l'application"
-
-#: ../data/totem.ui.h:19
 msgid "Plugins..."
 msgstr "Greffons..."
 
-#: ../data/totem.ui.h:20
+#: ../data/totem.ui.h:19
 msgid "Configure plugins to extend the application"
 msgstr "Configuration des greffons d'extension de l'application"
 
-#: ../data/totem.ui.h:21
+#: ../data/totem.ui.h:20
 msgid "_View"
 msgstr "_Affichage"
 
-#: ../data/totem.ui.h:22
-msgid "_Fullscreen"
-msgstr "_Plein écran"
-
-#: ../data/totem.ui.h:23
-msgid "Switch to fullscreen"
-msgstr "Bascule en mode plein écran"
-
-#: ../data/totem.ui.h:24
+#: ../data/totem.ui.h:21
 msgid "Fit Window to Movie"
 msgstr "Adapter la fenêtre au film"
 
-#: ../data/totem.ui.h:25
+#: ../data/totem.ui.h:22
 msgid "_Resize 1:2"
 msgstr "_Ratio 1:2"
 
-#: ../data/totem.ui.h:26
+#: ../data/totem.ui.h:23
 msgid "Resize to half the original video size"
 msgstr "Redimensionne à la moitié de la taille originale de la vidéo"
 
-#: ../data/totem.ui.h:27
+#: ../data/totem.ui.h:24
 msgid "Resize _1:1"
 msgstr "Ratio _1:1"
 
-#: ../data/totem.ui.h:28
+#: ../data/totem.ui.h:25
 msgid "Resize to the original video size"
 msgstr "Redimensionne à la taille originale de la vidéo"
 
-#: ../data/totem.ui.h:29
+#: ../data/totem.ui.h:26
 msgid "Resize _2:1"
 msgstr "Ratio _2:1"
 
-#: ../data/totem.ui.h:30
+#: ../data/totem.ui.h:27
 msgid "Resize to double the original video size"
 msgstr "Redimensionne au double de la taille originale de la vidéo"
 
-#: ../data/totem.ui.h:31
+#: ../data/totem.ui.h:28
 msgid "_Aspect Ratio"
 msgstr "Rapport d'_affichage"
 
-#: ../data/totem.ui.h:32
+#: ../data/totem.ui.h:29
 msgid "Switch An_gles"
 msgstr "Changer d'an_gle"
 
-#: ../data/totem.ui.h:33
+#: ../data/totem.ui.h:30
 msgid "Switch camera angles"
 msgstr "Change l'angle de prise de vue"
 
-#: ../data/totem.ui.h:34
+#: ../data/totem.ui.h:31
 msgid "_Go"
 msgstr "A_ller à"
 
-#: ../data/totem.ui.h:35
+#: ../data/totem.ui.h:32
 msgid "_DVD Menu"
 msgstr "Menu _DVD"
 
-#: ../data/totem.ui.h:36
+#: ../data/totem.ui.h:33
 msgid "Go to the DVD menu"
 msgstr "Va au menu DVD"
 
-#: ../data/totem.ui.h:37
+#: ../data/totem.ui.h:34
 msgid "_Title Menu"
 msgstr "Menu _titre"
 
-#: ../data/totem.ui.h:38
+#: ../data/totem.ui.h:35
 msgid "Go to the title menu"
 msgstr "Va au menu titre"
 
-#: ../data/totem.ui.h:39
+#: ../data/totem.ui.h:36
 msgid "A_udio Menu"
 msgstr "Menu a_udio"
 
-#: ../data/totem.ui.h:40
+#: ../data/totem.ui.h:37
 msgid "Go to the audio menu"
 msgstr "Va au menu audio"
 
-#: ../data/totem.ui.h:41
+#: ../data/totem.ui.h:38
 msgid "_Angle Menu"
 msgstr "Menu _angle"
 
-#: ../data/totem.ui.h:42
+#: ../data/totem.ui.h:39
 msgid "Go to the angle menu"
 msgstr "Va au menu angle"
 
-#: ../data/totem.ui.h:43
+#: ../data/totem.ui.h:40
 msgid "_Chapter Menu"
 msgstr "Menu _chapitre"
 
-#: ../data/totem.ui.h:44
+#: ../data/totem.ui.h:41
 msgid "Go to the chapter menu"
 msgstr "Va au menu chapitres"
 
-#: ../data/totem.ui.h:45
+#: ../data/totem.ui.h:42
 msgid "_Next Chapter/Movie"
 msgstr "Chapitre/Film _suivant"
 
-#: ../data/totem.ui.h:46
+#: ../data/totem.ui.h:43
 msgid "Next chapter or movie"
 msgstr "Chapitre ou film suivant"
 
-#: ../data/totem.ui.h:47
+#: ../data/totem.ui.h:44
 msgid "_Previous Chapter/Movie"
 msgstr "Chapitre/Film _précédent"
 
-#: ../data/totem.ui.h:48
+#: ../data/totem.ui.h:45
 msgid "Previous chapter or movie"
 msgstr "Chapitre ou film précédent"
 
-#: ../data/totem.ui.h:49
+#: ../data/totem.ui.h:46
 msgid "_Sound"
 msgstr "_Son"
 
-#: ../data/totem.ui.h:50
+#: ../data/totem.ui.h:47
 msgid "Volume _Up"
 msgstr "_Monter le son"
 
-#: ../data/totem.ui.h:51
+#: ../data/totem.ui.h:48
 msgid "Increase volume"
 msgstr "Monte le son"
 
-#: ../data/totem.ui.h:52
+#: ../data/totem.ui.h:49
 msgid "Volume _Down"
 msgstr "_Baisser le son"
 
-#: ../data/totem.ui.h:53
+#: ../data/totem.ui.h:50
 msgid "Decrease volume"
 msgstr "Baisse le son"
 
-#: ../data/totem.ui.h:54
+#: ../data/totem.ui.h:51
 msgid "_Help"
 msgstr "Aid_e"
 
-#: ../data/totem.ui.h:55
+#: ../data/totem.ui.h:52
 msgid "_Contents"
 msgstr "_Sommaire"
 
-#: ../data/totem.ui.h:56
+#: ../data/totem.ui.h:53
 msgid "Help contents"
 msgstr "Sommaire de l'aide"
 
-#: ../data/totem.ui.h:57
+#: ../data/totem.ui.h:54
 msgid "_About"
 msgstr "À _propos"
 
-#: ../data/totem.ui.h:58
+#: ../data/totem.ui.h:55
 msgid "About this application"
 msgstr "À propos de cette application"
 
-#: ../data/totem.ui.h:59
-msgid "_Repeat Mode"
-msgstr "Lecture en _boucle"
-
-#: ../data/totem.ui.h:60
-msgid "Set the repeat mode"
-msgstr "Active la lecture en boucle (répétition)"
-
-#: ../data/totem.ui.h:61
-msgid "Shuff_le Mode"
-msgstr "Lecture a_léatoire"
-
-#: ../data/totem.ui.h:62
-msgid "Set the shuffle mode"
-msgstr "Active la lecture aléatoire"
-
-#: ../data/totem.ui.h:63
+#: ../data/totem.ui.h:56
 msgid "Show _Controls"
 msgstr "Afficher les _contrôles"
 
-#: ../data/totem.ui.h:64
+#: ../data/totem.ui.h:57
 msgid "Show controls"
 msgstr "Affiche les contrôles"
 
 # _Plein écran dans le même sous menu
-#: ../data/totem.ui.h:65
+#: ../data/totem.ui.h:58
 msgid "S_idebar"
-msgstr "Panneau _latéral"
-
-#: ../data/totem.ui.h:66
-msgid "Show or hide the sidebar"
-msgstr "Affiche ou masque le panneau latéral"
-
-#: ../data/totem.ui.h:67
-msgctxt "Aspect ratio"
-msgid "Auto"
-msgstr "Auto"
-
-#: ../data/totem.ui.h:68
-msgid "Sets automatic aspect ratio"
-msgstr "Active le rapport d'affichage automatique"
-
-#: ../data/totem.ui.h:69
-msgid "Square"
-msgstr "Carré"
-
-#: ../data/totem.ui.h:70
-msgid "Sets square aspect ratio"
-msgstr "Active le rapport d'affichage carré"
-
-#: ../data/totem.ui.h:71
-msgid "4:3 (TV)"
-msgstr "4:3 (TV)"
-
-#: ../data/totem.ui.h:72
-msgid "Sets 4:3 (TV) aspect ratio"
-msgstr "Règle le rapport d'affichage en 4:3 (TV)"
-
-#: ../data/totem.ui.h:73
-msgid "16:9 (Widescreen)"
-msgstr "16:9 (grand écran)"
-
-#: ../data/totem.ui.h:74
-msgid "Sets 16:9 (widescreen) aspect ratio"
-msgstr "Règle le rapport d'affichage en 16:9 (anamorphique)"
-
-#: ../data/totem.ui.h:75
-msgid "2.11:1 (DVB)"
-msgstr "2.11:1 (DVB)"
-
-#: ../data/totem.ui.h:76
-msgid "Sets 2.11:1 (DVB) aspect ratio"
-msgstr "Règle le rapport d'affichage en 2.11:1 (DVB)"
-
-#: ../data/totem.ui.h:77
-msgid "S_ubtitles"
-msgstr "_Sous-titres"
-
-#: ../data/totem.ui.h:80
-msgid "_Languages"
-msgstr "_Langues"
-
-#: ../data/totem.ui.h:81
-msgid "Zoom In"
-msgstr "Zoom avant"
-
-#: ../data/totem.ui.h:82
-msgid "Zoom in"
-msgstr "Zoom avant"
-
-#: ../data/totem.ui.h:83
-msgid "Skip _Forward"
-msgstr "_Avance rapide"
-
-#: ../data/totem.ui.h:84
-msgid "Skip forward"
-msgstr "Avance rapide"
-
-#: ../data/totem.ui.h:85
-msgid "Skip _Backwards"
-msgstr "_Retour rapide"
-
-#: ../data/totem.ui.h:86
-msgid "Skip backwards"
-msgstr "Retour rapide"
-
-#: ../data/totem.ui.h:87
-msgid "14.4 Kbps Modem"
-msgstr "Modem 14,4 Kb/s"
-
-#: ../data/totem.ui.h:88
-msgid "19.2 Kbps Modem"
-msgstr "Modem 19,2 Kb/s"
-
-#: ../data/totem.ui.h:89
-msgid "28.8 Kbps Modem"
-msgstr "Modem 28,8 Kb/s"
-
-#: ../data/totem.ui.h:90
-msgid "33.6 Kbps Modem"
-msgstr "Modem 33,6 Kb/s"
-
-#: ../data/totem.ui.h:91
-msgid "34.4 Kbps Modem"
-msgstr "Modem 34,4 Kb/s"
-
-#: ../data/totem.ui.h:92
-msgid "56 Kbps Modem/ISDN"
-msgstr "Modem/RNIS 56 Kb/s"
-
-#: ../data/totem.ui.h:93
-msgid "112 Kbps Dual ISDN/DSL"
-msgstr "RNIS double/DSL 112 Kb/s"
-
-#: ../data/totem.ui.h:94
-msgid "256 Kbps DSL/Cable"
-msgstr "DSL/Câble 256 Kb/s"
-
-#: ../data/totem.ui.h:95
-msgid "384 Kbps DSL/Cable"
-msgstr "DSL/Câble 384 Kb/s"
-
-#: ../data/totem.ui.h:96
-msgid "512 Kbps DSL/Cable"
-msgstr "DSL/Câble 512 Kb/s"
-
-#: ../data/totem.ui.h:97
-msgid "1.5 Mbps T1/Intranet/LAN"
-msgstr "T1/Intranet/LAN 1,5 Mb/s"
-
-#: ../data/totem.ui.h:98
-msgid "Intranet/LAN"
-msgstr "Intranet/LAN"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:100
-msgid "Normal"
-msgstr "Normale"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:102
-msgid "Large"
-msgstr "Grande"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:104
-msgid "Extra Large"
-msgstr "Très grande"
-
-#: ../data/totem.ui.h:105 ../src/totem-properties-view.c:228
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5593
-msgid "Stereo"
-msgstr "Stéréo"
-
-#: ../data/totem.ui.h:106
-msgid "4-channel"
-msgstr "4 canaux"
-
-#: ../data/totem.ui.h:107
-msgid "4.1-channel"
-msgstr "4.1 canaux"
-
-#: ../data/totem.ui.h:108
-msgid "5.0-channel"
-msgstr "5.0 canaux"
-
-#: ../data/totem.ui.h:109
-msgid "5.1-channel"
-msgstr "5.1 canaux"
-
-#: ../data/totem.ui.h:110
-msgid "AC3 Passthrough"
-msgstr "Sortie directe AC3"
-
-#: ../data/totem.ui.h:111
-msgid "Totem Preferences"
-msgstr "Préférences de Totem"
-
-#: ../data/totem.ui.h:112
-msgid "Playback"
-msgstr "Lecture"
-
-#: ../data/totem.ui.h:113
-msgid "Start playing files from last position"
-msgstr "Démarre la lecture des fichiers à la dernière position connue"
-
-#: ../data/totem.ui.h:114
-msgid "Networking"
-msgstr "Réseau"
-
-#: ../data/totem.ui.h:115
-msgid "Connection _speed:"
-msgstr "Vite_sse de la connexion :"
-
-#: ../data/totem.ui.h:116
-msgid "Text Subtitles"
-msgstr "Sous-titres"
-
-#: ../data/totem.ui.h:117
-msgid "_Load subtitle files when movie is loaded"
-msgstr "C_harger les fichiers de sous-titrage au chargement du film"
-
-#: ../data/totem.ui.h:118
-msgid "_Font:"
-msgstr "_Police :"
-
-#: ../data/totem.ui.h:119
-msgid "_Encoding:"
-msgstr "_Codage :"
-
-#: ../data/totem.ui.h:120
-msgid "External Chapters"
-msgstr "Chapitres externes"
-
-#: ../data/totem.ui.h:121
-msgid "Load _chapter files when movie is loaded"
-msgstr "Ch_arger les fichiers de chapitrage au chargement d'un film"
-
-#. Tab label in the Preferences dialogue
-#: ../data/totem.ui.h:124
-msgid "Display"
-msgstr "Affichage"
-
-#: ../data/totem.ui.h:125
-msgid "_Resize the window when a new video is loaded"
-msgstr "_Redimensionner la fenêtre au chargement d'une nouvelle vidéo"
-
-#: ../data/totem.ui.h:126
-msgid "Disable _deinterlacing of interlaced videos"
-msgstr "_Désactiver le désentrelacement des vidéos entrelacées"
-
-# Suivent deux boutons radio : Video / Video or Audio
-#: ../data/totem.ui.h:127
-msgid "Disable screensaver when playing "
-msgstr "Désactiver l'économiseur d'écran pendant une lecture "
-
-#: ../data/totem.ui.h:129
-msgid "Video or Audio"
-msgstr "Vidéo ou audio"
-
-#: ../data/totem.ui.h:130
-msgid "Visual Effects"
-msgstr "Effets visuels"
-
-#: ../data/totem.ui.h:131
-msgid "Show _visual effects when an audio file is played"
-msgstr "Afficher des effets _visuels à la lecture d'un fichier audio"
-
-#: ../data/totem.ui.h:132
-msgid "_Type of visualization:"
-msgstr "Ty_pe de visualisation :"
-
-#: ../data/totem.ui.h:133
-msgid "Visualization _size:"
-msgstr "Di_mension de visualisation :"
-
-#: ../data/totem.ui.h:134
-msgid "Color Balance"
-msgstr "Balance des couleurs"
-
-#: ../data/totem.ui.h:135
-msgid "_Brightness:"
-msgstr "_Luminosité :"
-
-#: ../data/totem.ui.h:136
-msgid "Co_ntrast:"
-msgstr "Co_ntraste :"
-
-#: ../data/totem.ui.h:137
-msgid "Sat_uration:"
-msgstr "Sat_uration :"
-
-#: ../data/totem.ui.h:138
-msgid "_Hue:"
-msgstr "_Teinte :"
-
-#: ../data/totem.ui.h:139
-msgid "Reset to _Defaults"
-msgstr "Rétablir les valeurs par _défaut"
-
-#: ../data/totem.ui.h:140
-msgid "Audio Output"
-msgstr "Sortie audio"
-
-#: ../data/totem.ui.h:141
-msgid "_Audio output type:"
-msgstr "Type de sortie _audio :"
-
-#: ../data/totem.ui.h:145
-msgid "Time seek bar"
-msgstr "Barre de navigation temporelle"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
-msgid "Allow the screensaver to activate when playing audio"
-msgstr "Autoriser l'économiseur d'écran lors des lectures audio"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
-msgid ""
-"Allow the screensaver to activate when playing audio. Disable if you have "
-"monitor-powered speakers."
-msgstr ""
-"Autorise l'activation de l'économiseur d'écran pendant une lecture audio. À "
-"désactiver si vous disposez de haut-parleurs intégrés à l'écran."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
-msgid "Show visual effects when no video is displayed"
-msgstr "Afficher les effets visuels si aucune vidéo n'est en cours de lecture"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
-msgid "Show visual effects when playing an audio only file."
-msgstr ""
-"Affiche des effets visuels lors de la lecture d'un fichier ne contenant que "
-"du son."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
-msgid "Name of the visual effects plugin"
-msgstr "Nom des greffons d'effets visuels"
+msgstr "Panneau _latéral"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
-msgid "The brightness of the video"
-msgstr "La luminosité de la vidéo"
+#: ../data/totem.ui.h:59
+msgid "Show or hide the sidebar"
+msgstr "Affiche ou masque le panneau latéral"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
-msgid "The contrast of the video"
-msgstr "Le contraste de la vidéo"
+#: ../data/totem.ui.h:60
+msgctxt "Aspect ratio"
+msgid "Auto"
+msgstr "Auto"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
-msgid "The hue of the video"
-msgstr "La teinte de la vidéo"
+#: ../data/totem.ui.h:61
+msgid "Sets automatic aspect ratio"
+msgstr "Active le rapport d'affichage automatique"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
-msgid "The saturation of the video"
-msgstr "La saturation de la vidéo"
+#: ../data/totem.ui.h:62
+msgid "Square"
+msgstr "Carré"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
-msgid "Resize the canvas automatically on file load"
-msgstr ""
-"Redimensionner automatiquement le canevas lors du chargement du fichier"
+#: ../data/totem.ui.h:63
+msgid "Sets square aspect ratio"
+msgstr "Active le rapport d'affichage carré"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
-msgid "Network connection speed"
-msgstr "Vitesse de la connexion réseau"
+#: ../data/totem.ui.h:64
+msgid "4:3 (TV)"
+msgstr "4:3 (TV)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
-msgid ""
-"Approximate network connection speed, used to select quality on media over "
-"the network."
-msgstr ""
-"Vitesse approximative de la connexion réseau : utilisée pour choisir la "
-"qualité d'un média via le réseau."
+#: ../data/totem.ui.h:65
+msgid "Sets 4:3 (TV) aspect ratio"
+msgstr "Règle le rapport d'affichage en 4:3 (TV)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
-msgid "Repeat mode"
-msgstr "Lecture en boucle"
+#: ../data/totem.ui.h:66
+msgid "16:9 (Widescreen)"
+msgstr "16:9 (grand écran)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
-msgid "Shuffle mode"
-msgstr "Lecture aléatoire"
+#: ../data/totem.ui.h:67
+msgid "Sets 16:9 (widescreen) aspect ratio"
+msgstr "Règle le rapport d'affichage en 16:9 (anamorphique)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
-msgid "Whether to disable deinterlacing for interlaced movies"
-msgstr ""
-"Indique s'il faut désactiver le désentrelacement pour les vidéos entrelacées"
+#: ../data/totem.ui.h:68
+msgid "2.11:1 (DVB)"
+msgstr "2.11:1 (DVB)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
-msgid "Whether to enable debug for the playback engine"
-msgstr "Indique s'il faut activer le débogage pour le moteur de lecture"
+#: ../data/totem.ui.h:69
+msgid "Sets 2.11:1 (DVB) aspect ratio"
+msgstr "Règle le rapport d'affichage en 2.11:1 (DVB)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
-msgid "Type of audio output to use"
-msgstr "Type de sortie audio à utiliser"
+#: ../data/totem.ui.h:70
+msgid "S_ubtitles"
+msgstr "_Sous-titres"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
-msgid "Visualization quality setting"
-msgstr "Réglage de la qualité de visualisation"
+#: ../data/totem.ui.h:73
+msgid "_Languages"
+msgstr "_Langues"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
-msgid "Quality setting for the audio visualization."
-msgstr "Paramètre de qualité pour la visualisation audio."
+#: ../data/totem.ui.h:74
+msgid "Zoom In"
+msgstr "Zoom avant"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
-msgid "Network buffering threshold"
-msgstr "Seuil de tampon réseau"
+#: ../data/totem.ui.h:75
+msgid "Zoom in"
+msgstr "Zoom avant"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
-msgid ""
-"Amount of data to buffer for network streams before starting to display the "
-"stream (in seconds)."
-msgstr ""
-"Quantité de données du flux réseau à mettre en tampon avant d'en débuter "
-"l'affichage (en secondes)."
+#: ../data/totem.ui.h:76
+msgid "Skip _Forward"
+msgstr "_Avance rapide"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
-msgid "Subtitle font"
-msgstr "Police des sous-titres"
+#: ../data/totem.ui.h:77
+msgid "Skip forward"
+msgstr "Avance rapide"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
-msgid "Pango font description for subtitle rendering."
-msgstr "Description de la police Pango pour le rendu des sous-titres."
+#: ../data/totem.ui.h:78
+msgid "Skip _Backwards"
+msgstr "_Retour rapide"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
-msgid "Subtitle encoding"
-msgstr "Codage des sous-titres"
+#: ../data/totem.ui.h:79
+msgid "Skip backwards"
+msgstr "Retour rapide"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
-msgid "Encoding character set for subtitle."
-msgstr "Codage des caractères pour les sous-titres."
+#: ../data/totem.ui.h:82
+msgid "Time seek bar"
+msgstr "Barre de navigation temporelle"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
-msgid "Default location for the \"Open...\" dialogs"
-msgstr "Emplacement par défaut de la boîte de dialogue « Ouvrir... »"
+#: ../data/uri.ui.h:1
+msgid "Enter the _address of the file you would like to open:"
+msgstr "Saisissez l'_emplacement du fichier que vous voulez ouvrir :"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
-msgid ""
-"Default location for the \"Open...\" dialogs. Default is the current "
-"directory."
-msgstr ""
-"Emplacement par défaut de la boîte de dialogue « Ouvrir... ». Par défaut, le "
-"répertoire actuel."
+#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
+msgid "_Add to Playlist"
+msgstr "_Ajouter à la liste de lecture"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
-msgid "Default location for the \"Take Screenshot\" dialogs"
-msgstr "Emplacement par défaut de la boîte de dialogue « Capturer une image »"
+#: ../data/video-list.ui.h:2
+msgid "Add the video to the playlist"
+msgstr "Ajoute la vidéo à la liste de lecture"
 
-# Lien avec xdg-user-dirs
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
-msgid ""
-"Default location for the \"Take Screenshot\" dialogs. Default is the "
-"Pictures directory."
-msgstr ""
-"Emplacement par défaut pour les fichiers de capture d'écran, par défaut le "
-"répertoire Images."
+#: ../src/backend/bacon-video-widget.c:1643
+msgid "Password requested for RTSP server"
+msgstr "Mot de passe demandé pour le serveur RTSP"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
-msgid "Whether to disable the plugins in the user's home directory"
-msgstr ""
-"Indique s'il faut désactiver les greffons dans le répertoire personnel de "
-"l'utilisateur"
+#: ../src/backend/bacon-video-widget.c:2944
+#, c-format
+msgid "Audio Track #%d"
+msgstr "Piste audio n° %d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
-msgid "Whether to disable the keyboard shortcuts"
-msgstr "Indique s'il faut désactiver les raccourcis clavier"
+#: ../src/backend/bacon-video-widget.c:2948
+#, c-format
+msgid "Subtitle #%d"
+msgstr "Sous-titre n° %d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
-msgid "Whether to autoload text subtitle files when a movie is loaded"
-msgstr ""
-"Indique s'il faut charger automatiquement les fichiers de sous-titrage avec "
-"le film"
+#: ../src/backend/bacon-video-widget.c:3345
+msgid "The server you are trying to connect to is not known."
+msgstr "Le serveur auquel vous tentez de vous connecter est inconnu."
+
+#: ../src/backend/bacon-video-widget.c:3348
+msgid "The connection to this server was refused."
+msgstr "La connexion à ce serveur a été refusée."
+
+#: ../src/backend/bacon-video-widget.c:3351
+msgid "The specified movie could not be found."
+msgstr "Le film spécifié n'a pas pu être trouvé."
+
+#: ../src/backend/bacon-video-widget.c:3358
+msgid "The server refused access to this file or stream."
+msgstr "Le serveur a refusé l'accès à ce fichier ou ce flux."
+
+#: ../src/backend/bacon-video-widget.c:3364
+msgid "Authentication is required to access this file or stream."
+msgstr ""
+"Il est nécessaire de s'authentifier pour accéder à ce fichier ou ce flux."
+
+#: ../src/backend/bacon-video-widget.c:3371
+msgid "You are not allowed to open this file."
+msgstr "L'ouverture de ce fichier n'est pas permise."
+
+#: ../src/backend/bacon-video-widget.c:3376
+msgid "This location is not a valid one."
+msgstr "L'emplacement n'est pas valide."
+
+#: ../src/backend/bacon-video-widget.c:3384
+msgid "The movie could not be read."
+msgstr "Le film n'a pas pu être lu."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
-msgid "Whether to autoload external chapter files when a movie is loaded"
+# Voir bug #403011
+#. should be exactly one missing thing (source or converter)
+#: ../src/backend/bacon-video-widget.c:3407
+#: ../src/backend/bacon-video-widget.c:3415
+#, c-format
+msgid "The playback of this movie requires a %s plugin which is not installed."
+msgid_plural ""
+"The playback of this movie requires the following decoders which are not "
+"installed:\n"
+"\n"
+"%s"
+msgstr[0] "La lecture de ce film exige un greffon %s qui n'est pas installé."
+msgstr[1] ""
+"La lecture de ce film exige les décodeurs suivants qui ne sont pas "
+"installés :\n"
+"\n"
+"%s"
+
+#: ../src/backend/bacon-video-widget.c:3426
+msgid ""
+"An audio or video stream is not handled due to missing codecs. You might "
+"need to install additional plugins to be able to play some types of movies"
 msgstr ""
-"Indique s'il faut charger automatiquement les fichiers de chapitrage avec le "
-"film"
+"Un flux audio ou vidéo n'est pas géré pour cause d'absence de codecs. Il se "
+"peut que vous deviez installer des greffons supplémentaires pour être "
+"capable de visualiser certains types de films"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+#: ../src/backend/bacon-video-widget.c:3436
 msgid ""
-"Whether to remember the position of played audio/video files when pausing or "
-"closing them"
+"This file cannot be played over the network. Try downloading it locally "
+"first."
 msgstr ""
-"Indique s'il faut mémoriser la position de lecture des fichiers vidéo et "
-"audio à la mise en pause ou à la fermeture"
+"Impossible de lire ce fichier via le réseau. Essayez de le télécharger sur "
+"disque au préalable."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:35
-msgid "Active plugins list"
-msgstr "Liste des greffons actifs"
+#: ../src/backend/bacon-video-widget.c:5494 ../src/totem-properties-view.c:227
+msgid "Surround"
+msgstr "Surround"
+
+#: ../src/backend/bacon-video-widget.c:5496 ../src/totem-properties-view.c:229
+msgid "Mono"
+msgstr "Mono"
+
+#: ../src/backend/bacon-video-widget.c:5781
+msgid "Media contains no supported video streams."
+msgstr "Le média ne contient pas de flux vidéo pris en charge."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:36
+#: ../src/backend/bacon-video-widget.c:5963
 msgid ""
-"A list of the names of the plugins which are currently active (loaded and "
-"running)."
+"Some necessary plug-ins are missing. Make sure that the program is correctly "
+"installed."
 msgstr ""
-"Une liste des noms des greffons actuellement actifs (chargés et en cours "
-"d'exécution)."
-
-#: ../data/uri.ui.h:1
-msgid "Enter the _address of the file you would like to open:"
-msgstr "Saisissez l'_emplacement du fichier que vous voulez ouvrir :"
+"Des greffons indispensables manquent. Assurez-vous que le programme est "
+"correctement installé."
 
 #: ../src/eggdesktopfile.c:165
 #, c-format
@@ -966,13 +1033,13 @@
 #: ../src/eggfileformatchooser.c:657
 #, c-format
 msgid ""
-"The program was not able to find out the file format you want to use for `%"
-"s'. Please make sure to use a known extension for that file or manually "
+"The program was not able to find out the file format you want to use for `"
+"%s'. Please make sure to use a known extension for that file or manually "
 "choose a file format from the list below."
 msgstr ""
 "Le programme n'a pas réussi à trouver le format de fichier dont vous voulez "
-"vous servir pour « %s ». Assurez-vous d'utiliser une extension connue pour ce "
-"fichier ou choisissez manuellement un format de fichier dans la liste ci-"
+"vous servir pour « %s ». Assurez-vous d'utiliser une extension connue pour "
+"ce fichier ou choisissez manuellement un format de fichier dans la liste ci-"
 "dessous."
 
 #: ../src/eggfileformatchooser.c:664
@@ -1007,6 +1074,31 @@
 msgid "Show session management options"
 msgstr "Afficher les options de gestion de session"
 
+#. hour:minutes:seconds
+#. Translators: This is a time format, like "9:05:02" for 9
+#. * hours, 5 minutes, and 2 seconds. You may change ":" to
+#. * the separator that your locale uses or use "%Id" instead
+#. * of "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:56
+#: ../src/plugins/skipto/totem-time-entry.c:57
+#, c-format
+msgctxt "long time format"
+msgid "%d:%02d:%02d"
+msgstr "%d:%02d:%02d"
+
+#. minutes:seconds
+#. Translators: This is a time format, like "5:02" for 5
+#. * minutes and 2 seconds. You may change ":" to the
+#. * separator that your locale uses or use "%Id" instead of
+#. * "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:65
+#, c-format
+msgctxt "short time format"
+msgid "%d:%02d"
+msgstr "%d:%02d"
+
 #. Title
 #. Artist
 #. Album
@@ -1111,10 +1203,15 @@
 msgstr[0] "%d image par seconde"
 msgstr[1] "%d images par seconde"
 
-#: ../src/totem-audio-preview.c:168
+#: ../src/totem-audio-preview.c:137
 msgid "Audio Preview"
 msgstr "Pré-écoute audio"
 
+#: ../src/totem.c:240
+msgid "Verify your system installation. Totem will now exit."
+msgstr ""
+"Vérifiez l'installation de votre système. Totem va maintenant s'arrêter."
+
 #: ../src/totem-cell-renderer-video.c:126
 msgid "Unknown video"
 msgstr "Vidéo inconnue"
@@ -1127,7 +1224,7 @@
 msgid "Cancel"
 msgstr "Annuler"
 
-#: ../src/totem-fullscreen.c:616
+#: ../src/totem-fullscreen.c:573
 msgid "No File"
 msgstr "Aucun fichier"
 
@@ -1145,7 +1242,7 @@
 msgid "Make sure that Totem is properly installed."
 msgstr "Veuillez vérifier que Totem est correctement installé."
 
-#: ../src/totem-interface.c:347
+#: ../src/totem-interface.c:357
 msgid ""
 "Totem 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 "
@@ -1157,7 +1254,7 @@
 "la Free Software Foundation ; version 2 de la licence, ou (à votre "
 "discrétion) toute version ultérieure."
 
-#: ../src/totem-interface.c:351
+#: ../src/totem-interface.c:361
 msgid ""
 "Totem is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -1169,7 +1266,7 @@
 "D'ADÉQUATION À UNE UTILISATION PARTICULIÈRE. Pour plus de détails, voir la "
 "Licence Publique Générale GNU."
 
-#: ../src/totem-interface.c:355
+#: ../src/totem-interface.c:365
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Totem; if not, write to the Free Software Foundation, Inc., 59 Temple Place, "
@@ -1177,9 +1274,9 @@
 msgstr ""
 "Un exemplaire de la Licence Publique Générale GNU doit être fourni avec "
 "Totem ; si ce n'est pas le cas, écrivez à la Free Software Foundation, Inc., "
-"59 Temple Place, Suite 330, Boston, MA  02111-1307  USA"
+"59 Temple Place, Suite 330, Boston, MA 02111-1307 USA"
 
-#: ../src/totem-interface.c:358
+#: ../src/totem-interface.c:368
 msgid ""
 "Totem contains an exception to allow the use of proprietary GStreamer "
 "plugins."
@@ -1188,46 +1285,21 @@
 "propriétaires."
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:190
+#: ../src/totem-menu.c:291
 msgid "None"
 msgstr "Aucun"
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:195
+#: ../src/totem-menu.c:296
 msgctxt "Language"
 msgid "Auto"
-msgstr "Auto"
-
-#. Translators:
-#. * This is not a JPEG image, but a disc image, for example,
-#. * an ISO file
-#: ../src/totem-menu.c:765
-#, c-format
-msgid "Play Image '%s'"
-msgstr "Lire l'image disque « %s »"
-
-#: ../src/totem-menu.c:768 ../src/totem-menu.c:851
-#, c-format
-msgid "device%d"
-msgstr "périphérique%d"
-
-#: ../src/totem-menu.c:848
-#, c-format
-msgid "Play Disc '%s'"
-msgstr "Lire le disque « %s »"
-
-#. This lists the back-end type and version, such as
-#. * Movie Player using GStreamer 0.10.1
-#: ../src/totem-menu.c:1189
-#, c-format
-msgid "Movie Player using %s"
-msgstr "Lecteur vidéo utilisant %s"
+msgstr "Auto"
 
-#: ../src/totem-menu.c:1193
+#: ../src/totem-menu.c:789
 msgid "Copyright © 2002-2009 Bastien Nocera"
 msgstr "Copyright © 2002-2009 Bastien Nocera"
 
-#: ../src/totem-menu.c:1198
+#: ../src/totem-menu.c:794
 msgid "translator-credits"
 msgstr ""
 "Christophe Fergeau \n"
@@ -1242,158 +1314,78 @@
 "Nicolas Repentin \n"
 "Gérard Baylard "
 
-#: ../src/totem-menu.c:1202
+#: ../src/totem-menu.c:798
 msgid "Totem Website"
 msgstr "Site Web de Totem"
 
-#: ../src/totem-menu.c:1236
+#: ../src/totem-menu.c:829
 msgid "Configure Plugins"
 msgstr "Configuration des greffons"
 
+#: ../src/totem-object.c:162
+#, c-format
+msgid ""
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"%s\n"
+"Lancez « %s --help » pour afficher une liste complète des options "
+"disponibles en ligne de commande.\n"
+
 #. Translators: %s is the totem version number
-#: ../src/totem-object.c:471
+#: ../src/totem-object.c:591
 #, c-format
 msgid "Totem %s"
 msgstr "Totem %s"
 
-#: ../src/totem-object.c:1047 ../browser-plugin/totem-plugin-viewer.c:367
-msgid "Playing"
-msgstr "Lecture en cours"
-
-#: ../src/totem-object.c:1049 ../src/totem-options.c:52
+#: ../src/totem-object.c:1168 ../src/totem-options.c:52
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/totem-object.c:1054 ../browser-plugin/totem-plugin-viewer.c:363
-msgid "Paused"
-msgstr "Suspendu"
-
-#: ../src/totem-object.c:1056 ../src/totem-object.c:1066
+#: ../src/totem-object.c:1175 ../src/totem-object.c:1185
 #: ../src/totem-options.c:51
 msgid "Play"
 msgstr "Lecture"
 
-#: ../src/totem-object.c:1061 ../src/totem-object.c:1659
-#: ../src/totem-statusbar.c:115 ../browser-plugin/totem-plugin-viewer.c:351
-msgid "Stopped"
-msgstr "Arrêté"
-
-#: ../src/totem-object.c:1142 ../src/totem-object.c:1169
-#: ../src/totem-object.c:1799 ../src/totem-object.c:1963
+#: ../src/totem-object.c:1267 ../src/totem-object.c:1294
+#: ../src/totem-object.c:1787 ../src/totem-object.c:1942
 #, c-format
 msgid "Totem could not play '%s'."
 msgstr "Totem n'a pas pu lire « %s »."
 
-#: ../src/totem-object.c:1246
-#, c-format
-msgid ""
-"Totem could not play this media (%s) although a plugin is present to handle "
-"it."
-msgstr ""
-"Totem n'a pas pu lire ce média (%s) bien qu'un greffon le prenant en charge "
-"soit installé."
-
-#: ../src/totem-object.c:1247
-msgid ""
-"You might want to check that a disc is present in the drive and that it is "
-"correctly configured."
-msgstr ""
-"Vous devriez vérifier qu'un disque est présent dans le lecteur et que celui-"
-"ci est correctement configuré."
-
-#: ../src/totem-object.c:1255
-msgid "More information about media plugins"
-msgstr "Plus d'informations sur les greffons de média"
-
-#: ../src/totem-object.c:1256
-msgid ""
-"Please install the necessary plugins and restart Totem to be able to play "
-"this media."
-msgstr ""
-"Veuillez installer les greffons nécessaires et redémarrer Totem pour lire ce "
-"média."
-
-#: ../src/totem-object.c:1258
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because it does not have the "
-"appropriate plugins to be able to read from the disc."
-msgstr ""
-"Totem ne peut pas lire ce type de média (%s) car il n'y a pas le ou les "
-"greffons appropriés lui permettant une lecture depuis le disque."
-
-#: ../src/totem-object.c:1260
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because you do not have the "
-"appropriate plugins to handle it."
-msgstr ""
-"Totem ne peut pas lire ce type de média (%s) car les greffons appropriés "
-"pour sa prise en charge ne sont pas installés."
-
-#: ../src/totem-object.c:1263
-#, c-format
-msgid "Totem cannot play this type of media (%s) because it is not supported."
-msgstr ""
-"Totem ne peut pas lire ce type de média (%s) car il n'est pas pris en charge."
-
-#: ../src/totem-object.c:1264
-msgid "Please insert another disc to play back."
-msgstr "Veuillez insérer un autre disque à lire."
-
-#: ../src/totem-object.c:1300
-msgid "Totem was not able to play this disc."
-msgstr "Totem n'a pas été capable de lire ce disque."
-
-#: ../src/totem-object.c:1301 ../src/totem-object.c:4229
-msgid "No reason."
-msgstr "Aucune raison."
-
-#: ../src/totem-object.c:1315
-msgid "Totem does not support playback of Audio CDs"
-msgstr "Totem ne prend pas en charge la lecture des CD audio"
-
-#: ../src/totem-object.c:1316
-msgid "Please consider using a music player or a CD extractor to play this CD"
-msgstr ""
-"Veuillez utiliser un lecteur de musique ou un extracteur de CD pour lire ce "
-"CD"
-
-#: ../src/totem-object.c:1805
+#: ../src/totem-object.c:1793
 msgid "No error message"
 msgstr "Aucun message d'erreur"
 
-#: ../src/totem-object.c:2154
+#: ../src/totem-object.c:2133
 msgid "Totem could not display the help contents."
 msgstr "Totem ne peut afficher le contenu de l'aide."
 
-#: ../src/totem-object.c:2493 ../src/totem-object.c:2495
-#: ../browser-plugin/totem-plugin-viewer.c:1417
-msgid "An error occurred"
-msgstr "Une erreur est survenue"
-
-#: ../src/totem-object.c:4064 ../src/totem-object.c:4066
+#: ../src/totem-object.c:4019 ../src/totem-object.c:4021
 msgid "Previous Chapter/Movie"
 msgstr "Chapitre/Film précédent"
 
-#: ../src/totem-object.c:4073 ../src/totem-object.c:4075
+#: ../src/totem-object.c:4028 ../src/totem-object.c:4030
 msgid "Play / Pause"
 msgstr "Lecture / Pause"
 
-#: ../src/totem-object.c:4083 ../src/totem-object.c:4085
+#: ../src/totem-object.c:4038 ../src/totem-object.c:4040
 msgid "Next Chapter/Movie"
 msgstr "Chapitre/Film suivant"
 
-#. Translators: this is the tooltip text for the fullscreen button in the controls box in Totem's main window.
 #. Translators: this is the accessibility text for the fullscreen button in the controls box in Totem's main window.
-#: ../src/totem-object.c:4097 ../src/totem-object.c:4099
+#: ../src/totem-object.c:4051 ../src/totem-object.c:4053
 msgid "Fullscreen"
 msgstr "Plein écran"
 
-#: ../src/totem-object.c:4229
+#: ../src/totem-object.c:4184
 msgid "Totem could not startup."
 msgstr "Totem n'a pas pu démarrer."
 
+#: ../src/totem-object.c:4184
+msgid "No reason."
+msgstr "Aucune raison."
+
 #: ../src/totem-open-location.c:182
 msgid "Open Location..."
 msgstr "Ouvrir un emplacement..."
@@ -1467,118 +1459,112 @@
 msgid "Movies to play"
 msgstr "Films à lire"
 
-#: ../src/totem-options.c:117
+#: ../src/totem-options.c:79
+msgid "- Play movies and songs"
+msgstr "- Lit films et musiques"
+
+#: ../src/totem-options.c:142
 msgid "Can't enqueue and replace at the same time"
 msgstr "Impossible de mettre en attente et remplacer en même temps"
 
 #. By extension entry
-#: ../src/totem-playlist.c:161
+#: ../src/totem-playlist.c:162
 msgid "MP3 ShoutCast playlist"
 msgstr "Liste de lecture MP3 ShoutCast"
 
-#: ../src/totem-playlist.c:162
+#: ../src/totem-playlist.c:163
 msgid "MP3 audio (streamed)"
 msgstr "audio MP3 (en flux)"
 
-#: ../src/totem-playlist.c:163
+#: ../src/totem-playlist.c:164
 msgid "MP3 audio (streamed, DOS format)"
 msgstr "audio MP3 (en flux, format DOS)"
 
-#: ../src/totem-playlist.c:164
+#: ../src/totem-playlist.c:165
 msgid "XML Shareable Playlist"
 msgstr "Liste de lecture XML Shareable"
 
 #. This is "Title 3", where title is a DVD title
 #. * Note: NOT a DVD chapter
-#: ../src/totem-playlist.c:347
+#: ../src/totem-playlist.c:348
 #, c-format
 msgid "Title %d"
 msgstr "Titre %d"
 
-#: ../src/totem-playlist.c:446
+#: ../src/totem-playlist.c:447
 msgid "Could not save the playlist"
 msgstr "Impossible d'enregistrer la liste de lecture"
 
-#: ../src/totem-playlist.c:1021
+#: ../src/totem-playlist.c:1022
 msgid "Save Playlist"
 msgstr "Enregistrer la liste de lecture"
 
 #. translators: Playlist is the default saved playlist filename,
 #. * without the suffix
-#: ../src/totem-playlist.c:1033 ../src/totem-playlist.c:1264
-#: ../src/totem-sidebar.c:142
+#: ../src/totem-playlist.c:1034 ../src/totem-playlist.c:1263
+#: ../src/totem-sidebar.c:145
 msgid "Playlist"
 msgstr "Liste de lecture"
 
-#: ../src/totem-playlist.c:1857
+#: ../src/totem-playlist.c:1862
 #, c-format
 msgid "The playlist '%s' could not be parsed. It might be damaged."
 msgstr ""
 "Impossible de lire la liste de lecture « %s ». Peut-être est-elle endommagée."
 
-#: ../src/totem-playlist.c:1858
+#: ../src/totem-playlist.c:1863
 msgid "Playlist error"
 msgstr "Erreur de liste de lecture"
 
-#: ../src/totem-preferences.c:295
+#: ../src/totem-preferences.c:297
 msgid "Preferences"
 msgstr "Préférences"
 
-#: ../src/totem-preferences.c:451
+#: ../src/totem-preferences.c:445
 msgid "Select Subtitle Font"
 msgstr "Sélection des polices de sous-titres"
 
-#: ../src/totem-properties-main.c:115 ../src/totem-properties-view.c:266
+#: ../src/totem-properties-main.c:116 ../src/totem-properties-view.c:269
 msgid "Audio/Video"
 msgstr "Audio/Vidéo"
 
-#: ../src/totem-properties-view.c:128
+#: ../src/totem-properties-view.c:131
 msgid "N/A"
 msgstr "N/D"
 
-#: ../src/totem-properties-view.c:157
+#: ../src/totem-properties-view.c:160
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 msgctxt "Stream bit rate"
 msgid "N/A"
 msgstr "N/D"
 
-#: ../src/totem-properties-view.c:160
+#: ../src/totem-properties-view.c:163
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 #, c-format
 msgid "%d kbps"
 msgstr "%d kb/s"
 
-#: ../src/totem-properties-view.c:177
+#: ../src/totem-properties-view.c:180
 #: ../src/plugins/properties/totem-movie-properties.c:149
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../src/totem-properties-view.c:209
+#: ../src/totem-properties-view.c:212
 #: ../src/plugins/properties/totem-movie-properties.c:166
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: ../src/totem-properties-view.c:216
+#: ../src/totem-properties-view.c:219
 #: ../src/plugins/properties/totem-movie-properties.c:166
 msgctxt "Sample rate"
 msgid "N/A"
 msgstr "N/D"
 
-#: ../src/totem-properties-view.c:224
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5589
-msgid "Surround"
-msgstr "Surround"
-
-#: ../src/totem-properties-view.c:226
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5591
-msgid "Mono"
-msgstr "Mono"
-
-#: ../src/totem-properties-view.c:236
+#: ../src/totem-properties-view.c:239
 msgctxt "Number of audio channels"
 msgid "N/A"
 msgstr "N/D"
@@ -1611,8 +1597,8 @@
 #. eg: 75 %
 #: ../src/totem-statusbar.c:250
 #, c-format
-msgid "%d %%"
-msgstr "%d %%"
+msgid "%lf %%"
+msgstr "%lf %%"
 
 #. eg: Paused, 0:32 / 1:05
 #: ../src/totem-statusbar.c:325
@@ -1623,8 +1609,8 @@
 #. eg: Buffering, 75 %
 #: ../src/totem-statusbar.c:330
 #, c-format
-msgid "%s, %d %%"
-msgstr "%s, %d %%"
+msgid "%s, %f %%"
+msgstr "%s, %f %%"
 
 #: ../src/totem-subtitle-encoding.c:156
 msgid "Current Locale"
@@ -1767,230 +1753,91 @@
 msgid "Vietnamese"
 msgstr "Vietnamien"
 
-#: ../src/totem-video-list.c:330
-msgid "No video URI"
-msgstr "Aucun URI de vidéo"
-
-#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
-#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
-#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
-#: ../src/totem-video-thumbnailer.c:872
-#, c-format
-msgid ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-msgstr ""
-"%s : %s\n"
-"%s : %d×%d\n"
-"%s : %s"
-
-#: ../src/totem-video-thumbnailer.c:873
-msgid "Filename"
-msgstr "Nom du fichier"
-
-#: ../src/totem-video-thumbnailer.c:875
-msgid "Resolution"
-msgstr "Résolution"
-
-#: ../src/totem-video-thumbnailer.c:878
-msgid "Duration"
-msgstr "Durée"
-
-#: ../src/totem-uri.c:506 ../src/plugins/chapters/totem-chapters.c:998
+#: ../src/totem-uri.c:343 ../src/plugins/chapters/totem-chapters.c:998
 msgid "All files"
 msgstr "Tous les fichiers"
 
-#: ../src/totem-uri.c:511 ../src/plugins/chapters/totem-chapters.c:995
+#: ../src/totem-uri.c:348 ../src/plugins/chapters/totem-chapters.c:995
 msgid "Supported files"
 msgstr "Fichiers pris en charge"
 
-#: ../src/totem-uri.c:523
+#: ../src/totem-uri.c:360
 msgid "Audio files"
 msgstr "Fichiers audio"
 
-#: ../src/totem-uri.c:531
+#: ../src/totem-uri.c:368
 msgid "Video files"
 msgstr "Fichiers vidéo"
 
-#: ../src/totem-uri.c:541
+#: ../src/totem-uri.c:378
 msgid "Subtitle files"
 msgstr "Fichiers de sous-titres"
 
-#: ../src/totem-uri.c:593
+#: ../src/totem-uri.c:430
 msgid "Select Text Subtitles"
 msgstr "Sélection des sous-titres"
 
-#: ../src/totem-uri.c:656
+#: ../src/totem-uri.c:495
 msgid "Select Movies or Playlists"
 msgstr "Sélectionner les films ou les listes de lecture"
 
-#. Options parsing
-#: ../src/totem.c:201
-msgid "- Play movies and songs"
-msgstr "- Lit films et musiques"
-
-#: ../src/totem.c:212
-#, c-format
-msgid ""
-"%s\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"%s\n"
-"Lancez « %s --help » pour afficher une liste complète des options disponibles "
-"en ligne de commande.\n"
-
-#: ../src/totem.c:254 ../src/totem.c:265
-#: ../browser-plugin/totem-plugin-viewer.c:663
-#: ../browser-plugin/totem-plugin-viewer.c:1793
-msgid "Totem Movie Player"
-msgstr "Lecteur vidéo Totem"
-
-#: ../src/totem.c:255 ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Could not initialize the thread-safe libraries."
-msgstr "Impossible d'initialiser les bibliothèques thread-safe."
-
-#: ../src/totem.c:255
-msgid "Verify your system installation. Totem will now exit."
-msgstr ""
-"Vérifiez l'installation de votre système. Totem va maintenant s'arrêter."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:1589
-msgid "Password requested for RTSP server"
-msgstr "Mot de passe demandé pour le serveur RTSP"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2858
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2862
-#, c-format
-msgid "Audio Track #%d"
-msgstr "Piste audio n° %d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2890
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2894
-#, c-format
-msgid "Subtitle #%d"
-msgstr "Sous-titre n° %d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3298
-msgid ""
-"The requested audio output was not found. Please select another audio output "
-"in the Multimedia Systems Selector."
-msgstr ""
-"Impossible de trouver la sortie audio demandée. Sélectionnez une autre "
-"sortie audio dans le Sélecteur de systèmes multimédia."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3303
-msgid "Location not found."
-msgstr "Emplacement introuvable."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3307
-msgid ""
-"Could not open location; you might not have permission to open the file."
-msgstr ""
-"Impossible d'ouvrir l'emplacement ; vous n'avez peut-être pas la permission "
-"d'ouvrir le fichier."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3318
-msgid ""
-"The video output is in use by another application. Please close other video "
-"applications, or select another video output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"La sortie vidéo est utilisée par une autre application. Fermez les autres "
-"applications vidéo ou sélectionnez une autre sortie vidéo dans le Sélecteur "
-"de systèmes multimédia."
+#: ../src/totem-uri.c:499
+msgid "Add Directory"
+msgstr "Ajouter un répertoire"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3324
-msgid ""
-"The audio output is in use by another application. Please select another "
-"audio output in the Multimedia Systems Selector. You may want to consider "
-"using a sound server."
-msgstr ""
-"La sortie audio est utilisée par une autre application. Choisissez une autre "
-"sortie audio dans le Sélecteur de systèmes multimédia. Vous pouvez aussi "
-"envisager l'utilisation d'un serveur audio."
+#: ../src/totem-video-list.c:330
+msgid "No video URI"
+msgstr "Aucun URI de vidéo"
 
-# Voir bug #403011
-#. should be exactly one missing thing (source or converter)
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3342
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3348
+#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
+#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
+#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
+#: ../src/totem-video-thumbnailer.c:841
 #, c-format
-msgid "The playback of this movie requires a %s plugin which is not installed."
-msgid_plural ""
-"The playback of this movie requires the following decoders which are not "
-"installed:\n"
-"\n"
-"%s"
-msgstr[0] "La lecture de ce film exige un greffon %s qui n'est pas installé."
-msgstr[1] ""
-"La lecture de ce film exige les décodeurs suivants qui ne sont pas "
-"installés :\n"
-"\n"
-"%s"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3374
 msgid ""
-"Cannot play this file over the network. Try downloading it to disk first."
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 msgstr ""
-"Impossible de lire ce fichier via le réseau. Essayez de le télécharger sur "
-"disque au préalable."
+"%s : %s\n"
+"%s : %d×%d\n"
+"%s : %s"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5878
-msgid "Media contains no supported video streams."
-msgstr "Le média ne contient pas de flux vidéo pris en charge."
+#: ../src/totem-video-thumbnailer.c:842
+msgid "Filename"
+msgstr "Nom du fichier"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6052
-msgid ""
-"Failed to create a GStreamer play object. Please check your GStreamer "
-"installation."
-msgstr ""
-"La création d'un objet de lecture GStreamer a échoué. Vérifiez "
-"l'installation de GStreamer."
+#: ../src/totem-video-thumbnailer.c:844
+msgid "Resolution"
+msgstr "Résolution"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6172
-msgid ""
-"Failed to open audio output. You may not have permission to open the sound "
-"device, or the sound server may not be running. Please select another audio "
-"output in the Multimedia Systems Selector."
-msgstr ""
-"L'ouverture de la sortie audio a échoué. Vous n'avez peut-être pas la "
-"permission d'ouvrir le périphérique audio ou bien le serveur audio est "
-"arrêté. Veuillez choisir une autre sortie audio dans le Sélecteur de "
-"systèmes multimédia."
+#: ../src/totem-video-thumbnailer.c:847
+msgid "Duration"
+msgstr "Durée"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6192
-msgid ""
-"Could not find the audio output. You may need to install additional "
-"GStreamer plugins, or select another audio output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"Impossible de trouver la sortie audio. Vous avez peut-être besoin "
-"d'installer des greffons GStreamer supplémentaires ou de sélectionner une "
-"autre sortie audio dans le Sélecteur de systèmes multimédia."
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:1
+msgid "Apple Trailers"
+msgstr "Apple Trailers"
+
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:2
+msgid "Sets the user agent for the Apple Trailers site"
+msgstr "Définit l'agent utilisateur pour le site Apple Trailers"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:1
+msgid "Autoload Subtitles"
+msgstr "Chargement automatique des sous-titres"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:2
+msgid "Autoloads text subtitles"
+msgstr "Charge automatiquement les sous-titres"
 
-#. hour:minutes:seconds
-#. Translators: This is a time format, like "9:05:02" for 9
-#. * hours, 5 minutes, and 2 seconds. You may change ":" to
-#. * the separator that your locale uses or use "%Id" instead
-#. * of "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:83 ../src/plugins/skipto/totem-time-entry.c:57
-#, c-format
-msgctxt "long time format"
-msgid "%d:%02d:%02d"
-msgstr "%d:%02d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
+msgid "Video Disc Recorder"
+msgstr "Enregistreur de disque vidéo"
 
-#. minutes:seconds
-#. Translators: This is a time format, like "5:02" for 5
-#. * minutes and 2 seconds. You may change ":" to the
-#. * separator that your locale uses or use "%Id" instead of
-#. * "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:92
-#, c-format
-msgctxt "short time format"
-msgid "%d:%02d"
-msgstr "%d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
+msgid "Records (S)VCDs or video DVDs"
+msgstr "Enregistre les (S)VCD ou les DVD vidéos"
 
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:65
 msgid "_Create Video Disc..."
@@ -2016,38 +1863,21 @@
 msgid "Copy the currently playing (S)VCD"
 msgstr "Copie le (S)VCD en cours de lecture"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:129
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:136
 msgid "The video disc could not be duplicated."
 msgstr "Le disque vidéo n'a pas pu être copié."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:131
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:276
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:138
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:283
 msgid "The movie could not be recorded."
 msgstr "Le film n'a pas pu être enregistré."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:157
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:167
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:263
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:164
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:174
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:270
 msgid "Unable to write a project."
 msgstr "Impossible d'écrire un projet."
 
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
-msgid "Video Disc Recorder"
-msgstr "Enregistreur de disque vidéo"
-
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
-msgid "Records (S)VCDs or video DVDs"
-msgstr "Enregistre les (S)VCD ou les DVD vidéos"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:1
-#: ../src/plugins/chapters/totem-chapters.c:1139
-msgid "Chapters"
-msgstr "Chapitres"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:2
-msgid "Support chapter markers in movies."
-msgstr "Prendre en charge les marqueurs de chapitres dans les films."
-
 #: ../src/plugins/chapters/chapters-edit.ui.h:1
 msgid "Name for new chapter:"
 msgstr "Nom du nouveau chapitre :"
@@ -2104,6 +1934,15 @@
 msgid "Create a new chapter list for the movie"
 msgstr "Créer une nouvelle liste de chapitres pour le film"
 
+#: ../src/plugins/chapters/chapters.plugin.in.h:1
+#: ../src/plugins/chapters/totem-chapters.c:1139
+msgid "Chapters"
+msgstr "Chapitres"
+
+#: ../src/plugins/chapters/chapters.plugin.in.h:2
+msgid "Support chapter markers in movies"
+msgstr "Prendre en charge les marqueurs de chapitres dans les films"
+
 #: ../src/plugins/chapters/totem-chapters.c:56
 #, c-format
 msgid ""
@@ -2198,30 +2037,54 @@
 msgid "The MediaPlayer2 object does not implement the ‘%s’ interface"
 msgstr "L'objet MediaPlayer2 n'implémente pas l'interface « %s »"
 
-#: ../src/plugins/dbusservice/dbusservice.py:222
-#, python-format
-msgid "The property ‘%s’ is not writeable."
-msgstr "La propriété « %s » n'est pas accessible en écriture."
+#: ../src/plugins/dbusservice/dbusservice.py:222
+#, python-format
+msgid "The property ‘%s’ is not writeable."
+msgstr "La propriété « %s » n'est pas accessible en écriture."
+
+#: ../src/plugins/dbusservice/dbusservice.py:238
+#, python-format
+msgid "Unknown property ‘%s’ requested of a MediaPlayer 2 object"
+msgstr "Requête sur une propriété « %s » inconnue de l'objet MediaPlayer2"
+
+#: ../src/plugins/dbusservice/dbusservice.py:341
+#, python-format
+msgid "The URI ‘%s’ is not supported."
+msgstr "L'URI « %s » n'est pas pris en charge."
+
+#: ../src/plugins/grilo/grilo.plugin.in.h:1
+msgid "Grilo Browser"
+msgstr "Navigateur Grilo"
+
+#: ../src/plugins/grilo/grilo.plugin.in.h:2
+msgid "A plugin to let you browse media content from various sources"
+msgstr ""
+"Un greffon vous permettant de parcourir du contenu multimédia de différentes "
+"sources"
+
+#: ../src/plugins/grilo/grilo.ui.h:1
+msgid "Add to Playlist"
+msgstr "Ajouter à la liste de lecture"
+
+#: ../src/plugins/grilo/grilo.ui.h:2
+msgid "Copy Location"
+msgstr "Copier l'emplacement"
 
-#: ../src/plugins/dbusservice/dbusservice.py:238
-#, python-format
-msgid "Unknown property ‘%s’ requested of a MediaPlayer 2 object"
-msgstr "Requête sur une propriété « %s » inconnue de l'objet MediaPlayer2"
+#: ../src/plugins/grilo/grilo.ui.h:3 ../src/plugins/grilo/totem-grilo.c:1184
+msgid "Browse"
+msgstr "Parcourir"
 
-#: ../src/plugins/dbusservice/dbusservice.py:341
-#, python-format
-msgid "The URI ‘%s’ is not supported."
-msgstr "L'URI « %s » n'est pas pris en charge."
+#: ../src/plugins/grilo/grilo.ui.h:4 ../src/plugins/grilo/totem-grilo.c:1227
+msgid "Search"
+msgstr "Rechercher"
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
-msgid "Instant Messenger status"
-msgstr "État de la messagerie instantanée"
+#: ../src/plugins/grilo/totem-grilo.c:454
+msgid "Browse Error"
+msgstr "Erreur lors du parcours"
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
-msgid "Set your Instant Messenger status to away when a movie is playing"
-msgstr ""
-"Paramètre l'état de la messagerie instantanée à « non disponible » quand un "
-"film est en cours de lecture"
+#: ../src/plugins/grilo/totem-grilo.c:609
+msgid "Search Error"
+msgstr "Erreur lors de la recherche"
 
 #: ../src/plugins/gromit/gromit.plugin.in.h:1
 msgid "Gromit Annotations"
@@ -2235,59 +2098,15 @@
 msgid "The gromit binary was not found."
 msgstr "Le binaire Gromit n'a pas été trouvé."
 
-#. Add the interface to Totem's sidebar
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:1
-#: ../src/plugins/iplayer/iplayer.py:46
-msgid "BBC iPlayer"
-msgstr "iPlayer BBC"
-
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:2
-msgid "Stream BBC programs from the last 7 days from the BBC iPlayer service."
-msgstr ""
-"Diffusion des programmes de la BBC des 7 derniers jours par le service BBC "
-"iPlayer."
-
-#: ../src/plugins/iplayer/iplayer.py:72
-msgid "Error listing channel categories"
-msgstr "Erreur lors de l'obtention des catégories de canaux"
-
-#: ../src/plugins/iplayer/iplayer.py:73
-msgid ""
-"There was an unknown error getting the list of television channels available "
-"on BBC iPlayer."
-msgstr ""
-"Une erreur inconnue s'est produite durant l'obtention de la liste des canaux "
-"de télévision disponibles sur le service iPlayer de la BBC."
-
-#. Append a dummy child row so that the expander's visible; we can
-#. then queue off the expander to load the programme listing for this
-#. category
-#: ../src/plugins/iplayer/iplayer.py:84
-msgid "Loading…"
-msgstr "Chargement…"
-
-#. Translators: the "programme feed" is the list of TV shows
-#. available to watch online
-#: ../src/plugins/iplayer/iplayer.py:136
-msgid "Error getting programme feed"
-msgstr "Erreur lors de l'obtention du flux du programme"
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
+msgid "Instant Messenger Status"
+msgstr "État de la messagerie instantanée"
 
-#: ../src/plugins/iplayer/iplayer.py:137
-msgid ""
-"There was an error getting the list of programmes for this channel and "
-"category combination."
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
+msgid "Set your Instant Messenger status to away when a movie is playing"
 msgstr ""
-"Une erreur s'est produite lors de l'obtention de la liste des programmes "
-"avec cette combinaison canal/catégorie."
-
-#: ../src/plugins/iplayer/iplayer2.py:298
-msgid ""
-msgstr ""
-
-#: ../src/plugins/iplayer/iplayer2.py:299
-#, python-format
-msgid "Programme unavailable (\"%s\")"
-msgstr "Programme non disponible (« %s »)"
+"Paramètre l'état de la messagerie instantanée à « non disponible » quand un "
+"film est en cours de lecture"
 
 #: ../src/plugins/lirc/lirc.plugin.in.h:1
 msgid "Infrared Remote Control"
@@ -2305,25 +2124,30 @@
 msgid "Couldn't read lirc configuration."
 msgstr "Impossible de lire la configuration lirc."
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
-msgid "Download Movie Subtitles"
-msgstr "Télécharger les sous-titres du film"
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:1
+msgid "Media Player Keys"
+msgstr "Touches du lecteur de média"
+
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:2
+msgid "Support additional media player keys"
+msgstr "Prise en charge de touches de lecteur de média supplémentaire"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
-msgid "Subtitle _language:"
-msgstr "_Langue des sous-titres :"
+#: ../src/plugins/ontop/ontop.plugin.in.h:1
+msgid "Always On Top"
+msgstr "Toujours au premier plan"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
-msgid "_Play with Subtitle"
-msgstr "L_ire avec les sous-titres"
+#: ../src/plugins/ontop/ontop.plugin.in.h:2
+msgid "Keep the main window on top when playing a movie"
+msgstr ""
+"Conserver la fenêtre principale au premier plan pendant la lecture d'un film"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:1
 msgid "Subtitle Downloader"
 msgstr "Téléchargement de sous-titres"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:2
-msgid "Look for subtitles for the currently playing movie."
-msgstr "Recherche des sous-titres pour le film en cours de lecture."
+msgid "Look for subtitles for the currently playing movie"
+msgstr "Recherche des sous-titres pour le film en cours de lecture"
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:42
 msgid "Brazilian Portuguese"
@@ -2379,6 +2203,18 @@
 msgid "Searching subtitles…"
 msgstr "Recherche des sous-titres en cours…"
 
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
+msgid "Download Movie Subtitles"
+msgstr "Télécharger les sous-titres du film"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
+msgid "Subtitle _language:"
+msgstr "_Langue des sous-titres :"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
+msgid "_Play with Subtitle"
+msgstr "L_ire avec les sous-titres"
+
 #: ../src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in.h:1
 msgid "Subtitle language"
 msgstr "Langue des sous-titres"
@@ -2387,85 +2223,18 @@
 msgid "The language to search for subtitles for movies in."
 msgstr "La langue à rechercher pour le sous-titrage des films."
 
-#: ../src/plugins/ontop/ontop.plugin.in.h:1
-msgid "Always On Top"
-msgstr "Toujours au premier plan"
-
-#: ../src/plugins/ontop/ontop.plugin.in.h:2
-msgid "Keep the main window on top when playing a movie"
-msgstr ""
-"Conserver la fenêtre principale au premier plan pendant la lecture d'un film"
+#: ../src/plugins/properties/movie-properties.plugin.in.h:1
+msgid "Movie Properties"
+msgstr "Propriétés du film"
+
+#: ../src/plugins/properties/movie-properties.plugin.in.h:2
+msgid "Adds movie properties to the sidebar"
+msgstr "Ajoute les propriétés du film dans le panneau latéral"
 
 #: ../src/plugins/properties/totem-movie-properties.c:246
 msgid "Properties"
 msgstr "Propriétés"
 
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:1
-msgid "Publisher protocol to use"
-msgstr "Protocole de publication à utiliser"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:2
-msgid ""
-"The transport protocol to use when publishing playlists over the network."
-msgstr ""
-"Le protocole de transport à utiliser lors de la publication de listes de "
-"lecture sur le réseau."
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:3
-msgid "Format for network service name"
-msgstr "Format pour le nom du service réseau"
-
-# vérifier les espaces insécables :s avec tous ces "•"
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:5
-#, no-c-format
-msgid ""
-"A format string used to build the network service name used when publishing "
-"playlists over the network. The following format placeholders can be used: • "
-"%a: the program name as returned by g_get_application_name() • %h: the "
-"machine's host name in title case • %u: the user's login name in title case "
-"• %U: the user's real name • %%: the percent sign"
-msgstr ""
-"Une chaîne de format servant à créer le nom du service réseau utilisé lors "
-"de la publication de listes de lecture sur le réseau. Les substituants "
-"suivants peuvent être utilisés dans la chaîne de format : • %a : le nom du "
-"programme renvoyé par g_get_application_name() • %h : le nom d'hôte de la "
-"machine dans la case titre • %u : le nom de connexion de l'utilisateur dans "
-"la case titre • %U : le véritable nom de l'utilisateur • %% : le signe "
-"pourcentage"
-
-#. Translators: computers on the local network which are publishing their playlists over the network
-#: ../src/plugins/publish/totem-publish.c:552
-msgid "Neighbors"
-msgstr "Voisins"
-
-#: ../src/plugins/publish/publish.plugin.in.h:1
-msgid "Publish Playlist"
-msgstr "Publier la liste de lecture"
-
-#: ../src/plugins/publish/publish.plugin.in.h:2
-msgid "Share the current playlist via HTTP"
-msgstr "Partage la liste de lecture actuelle via HTTP"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:1
-msgid "Service _Name:"
-msgstr "_Nom du service :"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:3
-#, no-c-format
-msgid ""
-"The name used for announcing the playlist service on the network.\n"
-"All occurrences of the string %u will be replaced by your name,\n"
-"and %h will be replaced by your computer's host name."
-msgstr ""
-"Le nom utilisé pour annoncer le service de liste de lecture sur le réseau.\n"
-"Toutes les occurrences de la chaîne %u seront remplacées par votre "
-"nom, \n"
-"et %h sera remplacé par le nom d'hôte de votre ordinateur."
-
-#: ../src/plugins/publish/publish-plugin.ui.h:6
-msgid "Use _encrypted transport protocol (HTTPS)"
-msgstr "Utiliser un protocole de transfert _chiffré (HTTPS)"
-
 #: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:1
 msgid "rpdb2 password"
 msgstr "Mot de passe rpdb2"
@@ -2479,22 +2248,87 @@
 "rpdb2 de débogage de Totem. Si vide, le mot de passe « totem » est utilisé "
 "par défaut."
 
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
+msgid "Python Console"
+msgstr "Console Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
+msgid "Interactive Python console"
+msgstr "Console interactive Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:88
+msgid "Python Console Menu"
+msgstr "Menu de la console Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:93
+msgid "_Python Console"
+msgstr "Console _Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:94
+msgid "Show Totem's Python console"
+msgstr "Affiche la console Python de Totem"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:100
+msgid "Python Debugger"
+msgstr "Débogueur Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:101
+msgid "Enable remote Python debugging with rpdb2"
+msgstr "Activer le débogage distant de Python avec rpdb2"
+
+#. pylint: disable-msg=E1101
+#: ../src/plugins/pythonconsole/pythonconsole.py:125
+#, python-format
+msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
+msgstr "Vous pouvez accéder à Totem.Object via « totem_object » :\\n%s"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:129
+msgid "Totem Python Console"
+msgstr "Console Python de Totem"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:139
+msgid ""
+"After you press OK, Totem will wait until you connect to it with winpdb or "
+"rpdb2. If you have not set a debugger password in DConf, it will use the "
+"default password ('totem')."
+msgstr ""
+"Après avoir validé, Totem attend que vous vous connectiez à lui avec winpdb "
+"ou rpdb2. Si vous n'avez pas défini de mot de passe de débogage dans GConf, "
+"utilisez le mot de passe par défaut (« totem »)."
+
+#: ../src/plugins/recent/recent.plugin.in.h:1
+msgid "Recent files"
+msgstr "Fichiers récents"
+
+#: ../src/plugins/recent/recent.plugin.in.h:2
+msgid "Adds files that have been played to recent files"
+msgstr "Ajoute les fichiers qui ont été lus aux fichiers récents"
+
 #: ../src/plugins/rotation/rotation.plugin.in.h:1
 msgid "Rotation Plugin"
 msgstr "Greffon de rotation"
 
 #: ../src/plugins/rotation/rotation.plugin.in.h:2
-msgid "Allows videos to be rotated if they're in the wrong orientation."
-msgstr "Permet la rotation des vidéos mal orientées."
+msgid "Allows videos to be rotated if they are in the wrong orientation"
+msgstr "Permet la rotation des vidéos mal orientées"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:60
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:50
 msgid "_Rotate Clockwise"
 msgstr "_Rotation dans le sens horaire"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:62
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:52
 msgid "Rotate Counterc_lockwise"
 msgstr "Rotation dans _le sens anti-horaire"
 
+# Titre de fenêtre
+#: ../src/plugins/save-file/save-file.plugin.in.h:1
+msgid "Save Copy"
+msgstr "Enregistrer la copie"
+
+#: ../src/plugins/save-file/save-file.plugin.in.h:2
+msgid "Save a copy of the currently playing movie"
+msgstr "Enregistrement d'une copie de la vidéo en cours de lecture"
+
 #: ../src/plugins/save-file/totem-save-file.c:63
 msgid "Save a Copy..."
 msgstr "Enregistrer une copie..."
@@ -2518,10 +2352,14 @@
 msgid "Movie stream"
 msgstr "Flux de film"
 
-#: ../src/plugins/screensaver/totem-screensaver.c:116
-#: ../browser-plugin/totem-plugin-viewer.c:1891
-msgid "Playing a movie"
-msgstr "Lecture d'un film"
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:1
+msgid "Screen Saver"
+msgstr "Économiseur d'écran"
+
+# Suivent deux boutons radio : Video / Video or Audio
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:2
+msgid "Deactivates the screen saver when a movie is playing"
+msgstr "Désactive l'économiseur d'écran lorsqu'un film est en cours de lecture"
 
 #: ../src/plugins/screenshot/gallery.ui.h:1
 msgid "Screenshot width (in pixels):"
@@ -2535,23 +2373,29 @@
 msgid "Number of screenshots:"
 msgstr "Nombre de captures d'écran :"
 
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:1
-msgid "_Name:"
-msgstr "_Nom :"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:2
-msgid "Save in _folder:"
-msgstr "Enregistrer dans le _dossier :"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:3
-msgid "Select a folder"
-msgstr "Choisir un dossier"
-
-#. Write the screenshot to the temporary file
-#: ../src/plugins/screenshot/gnome-screenshot-widget.c:385
-#: ../src/plugins/screenshot/totem-screenshot.c:64
-msgid "Screenshot.png"
-msgstr "Capture.png"
+#. translators: this is the name of the file that gets made up
+#. * with the screenshot if the entire screen is taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:147
+#, c-format
+msgid "Screenshot from %s.png"
+msgstr "Capture de %s.png"
+
+#. translators: this is the name of the file that gets
+#. * made up with the screenshot if the entire screen is
+#. * taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:154
+#, c-format
+msgid "Screenshot from %s - %d.png"
+msgstr "Capture de %s - %d.png"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:1
+msgid "Screenshot"
+msgstr "Capture"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:2
+msgid "Allows screenshots and galleries to be taken of videos"
+msgstr ""
+"Permet la prise de captures d'écran et de galerie photos à partir de vidéos"
 
 # Titre de fenêtre
 #: ../src/plugins/screenshot/totem-gallery.c:91
@@ -2578,51 +2422,49 @@
 msgid "Saving gallery as \"%s\""
 msgstr "Enregistrement de la galerie sous « %s »"
 
-#: ../src/plugins/screenshot/totem-screenshot.c:113
-msgid "There was an error saving the screenshot."
-msgstr "Une erreur est survenue lors de l'enregistrement de la capture."
-
-#: ../src/plugins/screenshot/totem-screenshot.c:139
-msgid "Save Screenshot"
-msgstr "Enregistrement de l'image capturée"
-
-#. Create the screenshot widget
-#. Translators: %s is the movie title and %d is an auto-incrementing number to make filename unique
-#: ../src/plugins/screenshot/totem-screenshot.c:160
-#, c-format
-msgid "Screenshot-%s-%d.png"
-msgstr "Capture-%s-%d.png"
-
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:88
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:220
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "Totem could not get a screenshot of the video."
 msgstr "Totem n'a pu prendre une capture d'écran de cette vidéo."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "This is not supposed to happen; please file a bug report."
 msgstr ""
 "Ce problème n'est pas censé se produire, veuillez remplir un rapport "
 "d'anomalie."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
-msgid "Take _Screenshot..."
-msgstr "_Capturer une image..."
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
+msgid "Take _Screenshot"
+msgstr "_Faire la capture d'écran"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
 msgid "Take a screenshot"
 msgstr "Capture une image de la vidéo en cours"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create Screenshot _Gallery..."
 msgstr "Créer une _galerie de captures d'écran..."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create a gallery of screenshots"
 msgstr "Crée une galerie de captures d'écran"
 
+#: ../src/plugins/skipto/skipto.plugin.in.h:1
+#: ../src/plugins/skipto/totem-skipto.c:196
+msgid "Skip To"
+msgstr "Sauter à"
+
+#: ../src/plugins/skipto/skipto.plugin.in.h:2
+msgid "Provides the \"Skip to\" dialog"
+msgstr "Fournit la boîte de dialogue « Sauter à »"
+
+#: ../src/plugins/skipto/skipto.ui.h:1
+msgid "_Skip to:"
+msgstr "_Sauter à :"
+
 #. Update the "seconds" label so that it always has the correct singular/plural form
 #. Translators: label for the seconds selector in the "Skip to" dialogue
-#: ../src/plugins/skipto/totem-skipto.c:160
+#: ../src/plugins/skipto/totem-skipto.c:159
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "seconde"
@@ -2632,15 +2474,11 @@
 #. Translators: you should translate this string to a number (written in digits) which corresponds to the longer character length of the
 #. * translations for "second" and "seconds", as translated elsewhere in this file. For example, in English, "second" is 6 characters long and
 #. * "seconds" is 7 characters long, so this string should be translated to "7". See: bgo#639398
-#: ../src/plugins/skipto/totem-skipto.c:190
+#: ../src/plugins/skipto/totem-skipto.c:189
 msgctxt "Skip To label length"
 msgid "7"
 msgstr "8"
 
-#: ../src/plugins/skipto/totem-skipto.c:197
-msgid "Skip To"
-msgstr "Sauter à"
-
 #: ../src/plugins/skipto/totem-skipto-plugin.c:182
 msgid "_Skip To..."
 msgstr "_Sauter à..."
@@ -2648,115 +2486,3 @@
 #: ../src/plugins/skipto/totem-skipto-plugin.c:182
 msgid "Skip to a specific time"
 msgstr "Se rendre à un minutage donné"
-
-#: ../src/plugins/skipto/skipto.ui.h:1
-msgid "_Skip to:"
-msgstr "_Sauter à :"
-
-#: ../browser-plugin/totem-plugin-viewer.c:431
-msgid "No URI to play"
-msgstr "Aucun URI à lire"
-
-#. translators: this is:
-#. * Open With ApplicationName
-#. * as in nautilus' right-click menu
-#: ../browser-plugin/totem-plugin-viewer.c:1107
-#, c-format
-msgid "_Open with \"%s\""
-msgstr "_Ouvrir avec « %s »"
-
-#: ../browser-plugin/totem-plugin-viewer.c:2136
-msgid "No playlist or playlist empty"
-msgstr "Aucune liste de lecture ou liste vide"
-
-#: ../browser-plugin/totem-plugin-viewer.c:2235
-msgid "Movie browser plugin"
-msgstr "Greffon Explorateur de films"
-
-#: ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Verify your system installation. The Totem plugin will now exit."
-msgstr ""
-"Vérifiez l'installation de votre système. Le greffon Totem va maintenant "
-"s'arrêter."
-
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
-msgid "Python Console"
-msgstr "Console Python"
-
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
-msgid "Interactive Python console."
-msgstr "Console interactive Python."
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:88
-msgid "Python Console Menu"
-msgstr "Menu de la console Python"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:93
-msgid "_Python Console"
-msgstr "Console _Python"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:94
-msgid "Show Totem's Python console"
-msgstr "Affiche la console Python de Totem"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:100
-msgid "Python Debugger"
-msgstr "Débogueur Python"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:101
-msgid "Enable remote Python debugging with rpdb2"
-msgstr "Activer le débogage distant de Python avec rpdb2"
-
-#. pylint: disable-msg=E1101
-#: ../src/plugins/pythonconsole/pythonconsole.py:125
-#, python-format
-msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
-msgstr "Vous pouvez accéder à Totem.Object via « totem_object » :\\n%s"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:129
-msgid "Totem Python Console"
-msgstr "Console Python de Totem"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:139
-msgid ""
-"After you press OK, Totem will wait until you connect to it with winpdb or "
-"rpdb2. If you have not set a debugger password in DConf, it will use the "
-"default password ('totem')."
-msgstr ""
-"Après avoir validé, Totem attend que vous vous connectiez à lui avec winpdb "
-"ou rpdb2. Si vous n'avez pas défini de mot de passe de débogage dans GConf, "
-"utilisez le mot de passe par défaut (« totem »)."
-
-#: ../src/plugins/grilo/grilo.plugin.in.h:1
-msgid "Grilo Browser"
-msgstr "Navigateur Grilo"
-
-#: ../src/plugins/grilo/grilo.plugin.in.h:2
-msgid "A plugin to let you browse media content from various sources."
-msgstr ""
-"Un greffon vous permettant de parcourir du contenu multimédia de différentes "
-"sources."
-
-#: ../src/plugins/grilo/totem-grilo.c:452
-msgid "Browse Error"
-msgstr "Erreur lors du parcours"
-
-#: ../src/plugins/grilo/totem-grilo.c:599
-msgid "Search Error"
-msgstr "Erreur lors de la recherche"
-
-#: ../src/plugins/grilo/totem-grilo.c:1219 ../src/plugins/grilo/grilo.ui.h:3
-msgid "Browse"
-msgstr "Parcourir"
-
-#: ../src/plugins/grilo/totem-grilo.c:1285 ../src/plugins/grilo/grilo.ui.h:4
-msgid "Search"
-msgstr "Rechercher"
-
-#: ../src/plugins/grilo/grilo.ui.h:1
-msgid "Add to Playlist"
-msgstr "Ajouter à la liste de lecture"
-
-#: ../src/plugins/grilo/grilo.ui.h:2
-msgid "Copy Location"
-msgstr "Copier l'emplacement"
diff -Nru totem-3.4.3/po/gl.po totem-3.6.2/po/gl.po
--- totem-3.4.3/po/gl.po	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/po/gl.po	2012-10-25 13:15:32.000000000 +0000
@@ -16,8 +16,8 @@
 msgstr ""
 "Project-Id-Version: totem-master-po-gl-55923\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 10:37+0100\n"
-"PO-Revision-Date: 2012-03-23 10:37+0100\n"
+"POT-Creation-Date: 2012-07-30 03:23+0200\n"
+"PO-Revision-Date: 2012-07-30 03:23+0200\n"
 "Last-Translator: Fran Dieguez \n"
 "Language-Team: Galician \n"
 "Language: gl\n"
@@ -25,16 +25,243 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
-"X-Generator: Lokalize 1.0\n"
+"X-Generator: Gtranslator 2.91.5\n"
+
+#: ../browser-plugin/totem-plugin-viewer.c:352 ../src/totem-object.c:1180
+#: ../src/totem-object.c:1650 ../src/totem-statusbar.c:115
+msgid "Stopped"
+msgstr "Detido"
+
+#: ../browser-plugin/totem-plugin-viewer.c:364 ../src/totem-object.c:1173
+msgid "Paused"
+msgstr "Detido"
+
+#: ../browser-plugin/totem-plugin-viewer.c:368 ../src/totem-object.c:1166
+msgid "Playing"
+msgstr "Reproducindo"
+
+#: ../browser-plugin/totem-plugin-viewer.c:386
+#: ../src/plugins/screensaver/totem-screensaver.c:97
+msgid "Playing a movie"
+msgstr "Reproducindo un filme"
+
+#: ../browser-plugin/totem-plugin-viewer.c:443
+msgid "No URI to play"
+msgstr "Non hai un URI para reproducir"
+
+#: ../browser-plugin/totem-plugin-viewer.c:676
+#: ../browser-plugin/totem-plugin-viewer.c:1700
+msgid "Totem Movie Player"
+msgstr "Reprodutor de filmes Totem"
+
+#. translators: this is:
+#. * Open With ApplicationName
+#. * as in nautilus' right-click menu
+#: ../browser-plugin/totem-plugin-viewer.c:1120
+#, c-format
+msgid "_Open with \"%s\""
+msgstr "_Abrir con «%s»"
+
+#: ../browser-plugin/totem-plugin-viewer.c:1341 ../src/totem-object.c:2475
+msgid "An error occurred"
+msgstr "Produciuse un erro"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2033
+msgid "No playlist or playlist empty"
+msgstr ""
+"Ou non hai ningunha lista de reprodución ou a lista de reprodución está "
+"baleira"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2128
+msgid "Movie browser plugin"
+msgstr "Engadido de navegador para filmes"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144 ../src/totem.c:239
+msgid "Could not initialize the thread-safe libraries."
+msgstr "Non foi posíbel inicializar as bibliotecas de fío seguro."
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144
+msgid "Verify your system installation. The Totem plugin will now exit."
+msgstr ""
+"Verifique a instalación do seu sistema. O engadido do Totem sairá agora."
 
 #: ../data/fullscreen.ui.h:1
 msgid "Leave Fullscreen"
 msgstr "Saír do modo de pantalla completa"
 
-#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:144
+#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:81
 msgid "Time:"
 msgstr "Tempo:"
 
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
+msgid "Allow the screensaver to activate when playing audio"
+msgstr ""
+"Permitirlle ao protector de pantalla activarse cando se estea reproducindo "
+"son"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
+msgid ""
+"Allow the screensaver to activate when playing audio. Disable if you have "
+"monitor-powered speakers."
+msgstr ""
+"Permitirlle ao protector de pantalla activarse cando se estea reproducindo "
+"son. Desactíveo se ten altofalantes alimentados desde a pantalla."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
+msgid "Show visual effects when no video is displayed"
+msgstr "Mostrar os efectos visuais cando non se mostre o vídeo"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
+msgid "Show visual effects when playing an audio only file."
+msgstr "Mostrar os efectos visuais cando se reproduza un ficheiro de só son."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
+msgid "Name of the visual effects plugin"
+msgstr "Nome do engadido de efectos visuais"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
+msgid "The brightness of the video"
+msgstr "O brillo do vídeo"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
+msgid "The contrast of the video"
+msgstr "O contraste do vídeo"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
+msgid "The hue of the video"
+msgstr "O ton do vídeo"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
+msgid "The saturation of the video"
+msgstr "A saturación do vídeo"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
+msgid "Resize the canvas automatically on file load"
+msgstr "Redimensionar automaticamente o lenzo ao cargar o ficheiro"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
+msgid "Repeat mode"
+msgstr "Modo de repetición"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
+msgid "Shuffle mode"
+msgstr "Modo aleatorio"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
+msgid "Whether to disable deinterlacing for interlaced movies"
+msgstr ""
+"Indica se se debe desactivar o desentrelazado para os filmes entrelazados"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
+msgid "Whether to enable debug for the playback engine"
+msgstr "Indica se se activa a depuración para o motor de reprodución de vídeo"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
+msgid "Type of audio output to use"
+msgstr "O tipo de saída de son que se vai usar"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
+msgid "Visualization quality setting"
+msgstr "Configuración de calidade de visualización"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
+msgid "Quality setting for the audio visualization."
+msgstr "Configuracións de calidade para a visualización de son."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
+msgid "Network buffering threshold"
+msgstr "Límite do búfer de rede"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
+msgid ""
+"Amount of data to buffer for network streams before starting to display the "
+"stream (in seconds)."
+msgstr ""
+"Cantidade de datos que almacenar no búfer para os fluxos de rede antes de "
+"comezar a mostrar o fluxo (en segundos)."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
+msgid "Subtitle font"
+msgstr "Tipo de letra para os subtítulos"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
+msgid "Pango font description for subtitle rendering."
+msgstr "Descrición do tipo de letra Pango para a renderización de subtítulos."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
+msgid "Subtitle encoding"
+msgstr "Codificación dos subtítulos"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
+msgid "Encoding character set for subtitle."
+msgstr "Codificación de caracteres para os subtítulos."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
+msgid "Default location for the \"Open...\" dialogs"
+msgstr "Localización predeterminada para os diálogos \"Abrir…\""
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
+msgid ""
+"Default location for the \"Open...\" dialogs. Default is the current "
+"directory."
+msgstr ""
+"Localización por omisión para os diálogos \"Abrir…\". Por omisión o cartafol "
+"actual"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
+msgid "Default location for the \"Take Screenshot\" dialogs"
+msgstr ""
+"Localización por omisión para os diálogos \"Facer captura de pantalla\""
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
+msgid ""
+"Default location for the \"Take Screenshot\" dialogs. Default is the "
+"Pictures directory."
+msgstr ""
+"Localización por omisión para os diálogos \"Facer captura de pantalla\". Por "
+"omisión o cartafol Imaxes"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
+msgid "Whether to disable the plugins in the user's home directory"
+msgstr ""
+"Indica se se deben desactivar os engadidos no cartafol persoal do usuario"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
+msgid "Whether to disable the keyboard shortcuts"
+msgstr "Indica se se desactivan os atallos de teclado"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
+msgid "Whether to autoload text subtitle files when a movie is loaded"
+msgstr ""
+"Indica se se deben cargar os ficheiros de subtítulos automaticamente ao "
+"cargar o filme"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
+msgid "Whether to autoload external chapter files when a movie is loaded"
+msgstr ""
+"Indica se se deben cargar os ficheiros de capítulos automaticamente ao "
+"cargar o filme"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
+msgid ""
+"Whether to remember the position of played audio/video files when pausing or "
+"closing them"
+msgstr ""
+"Indica se se debe lembrar ou non a posición dos ficheiros de son/vídeo "
+"reproducidos cando se deteñan ou se pechen."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
+msgid "Active plugins list"
+msgstr "Lista de engadidos activados"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+msgid ""
+"A list of the names of the plugins which are currently active (loaded and "
+"running)."
+msgstr ""
+"Unha lista de nomes dos engadidos activados actualmente (cargados e en "
+"execución)."
+
 #: ../data/playlist.ui.h:1
 msgid "_Remove"
 msgstr "Elimina_r"
@@ -51,11 +278,11 @@
 msgid "Copy the location to the clipboard"
 msgstr "Copiar a localización ao portapapeis"
 
-#: ../data/playlist.ui.h:5 ../data/totem.ui.h:78
+#: ../data/playlist.ui.h:5 ../data/totem.ui.h:71
 msgid "_Select Text Subtitles..."
 msgstr "_Seleccionar os subtítulos de texto…"
 
-#: ../data/playlist.ui.h:6 ../data/totem.ui.h:79
+#: ../data/playlist.ui.h:6 ../data/totem.ui.h:72
 msgid "Select a file to use for text subtitles"
 msgstr "Seleccione un ficheiro para usalo como subtítulos de texto"
 
@@ -79,10 +306,165 @@
 msgid "Move Down"
 msgstr "Mover abaixo"
 
-#: ../data/properties.ui.h:1 ../data/totem.ui.h:122
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:2
+msgid "Normal"
+msgstr "Normal"
+
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:4
+msgid "Large"
+msgstr "Grande"
+
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:6
+msgid "Extra Large"
+msgstr "Moi grande"
+
+#: ../data/preferences.ui.h:7 ../src/backend/bacon-video-widget.c:5498
+#: ../src/totem-properties-view.c:231
+msgid "Stereo"
+msgstr "Estéreo"
+
+#: ../data/preferences.ui.h:8
+msgid "4-channel"
+msgstr "4-canle"
+
+#: ../data/preferences.ui.h:9
+msgid "4.1-channel"
+msgstr "4.1-canle"
+
+#: ../data/preferences.ui.h:10
+msgid "5.0-channel"
+msgstr "5.0-canle"
+
+#: ../data/preferences.ui.h:11
+msgid "5.1-channel"
+msgstr "5.1-canle"
+
+#: ../data/preferences.ui.h:12
+msgid "AC3 Passthrough"
+msgstr "Pasada AC3"
+
+#: ../data/preferences.ui.h:13
+msgid "Totem Preferences"
+msgstr "Preferencias do Totem"
+
+#: ../data/preferences.ui.h:14
+msgid "Playback"
+msgstr "Reproducir"
+
+#: ../data/preferences.ui.h:15
+msgid "Start playing files from last position"
+msgstr "Iniciar reproducindo os ficheiros desde a última posición"
+
+#: ../data/preferences.ui.h:16
+msgid "Text Subtitles"
+msgstr "Subtítulos de texto"
+
+#: ../data/preferences.ui.h:17
+msgid "_Load subtitle files when movie is loaded"
+msgstr "_Cargar os ficheiros de subtítulos cando se cargue o filme"
+
+#: ../data/preferences.ui.h:18
+msgid "_Font:"
+msgstr "_Tipo de letra:"
+
+#: ../data/preferences.ui.h:19
+msgid "_Encoding:"
+msgstr "_Codificación:"
+
+#: ../data/preferences.ui.h:20
+msgid "External Chapters"
+msgstr "Capítulos externos"
+
+#: ../data/preferences.ui.h:21
+msgid "Load _chapter files when movie is loaded"
+msgstr "_Cargar os ficheiros de capítulos cando se cargue o filme"
+
+#: ../data/preferences.ui.h:22 ../data/properties.ui.h:1
 msgid "General"
 msgstr "Xeral"
 
+#. Tab label in the Preferences dialogue
+#: ../data/preferences.ui.h:24
+msgid "Display"
+msgstr "Visualización"
+
+#: ../data/preferences.ui.h:25
+msgid "_Resize the window when a new video is loaded"
+msgstr "_Redimensionar a xanela cando se cargue un novo vídeo"
+
+#: ../data/preferences.ui.h:26
+msgid "Disable _deinterlacing of interlaced videos"
+msgstr "Desactivar o _desentrelazado de vídeos entrelazados"
+
+#: ../data/preferences.ui.h:27
+msgid "Disable screensaver when playing "
+msgstr "Desactivar o protector de pantalla ao reproducir "
+
+#: ../data/preferences.ui.h:28 ../data/properties.ui.h:9
+#: ../src/totem-properties-view.c:273
+msgid "Video"
+msgstr "Vídeo"
+
+#: ../data/preferences.ui.h:29
+msgid "Video or Audio"
+msgstr "Vídeo ou son"
+
+#: ../data/preferences.ui.h:30
+msgid "Visual Effects"
+msgstr "Efectos visuais"
+
+#: ../data/preferences.ui.h:31
+msgid "Show _visual effects when an audio file is played"
+msgstr "Mostrar os efectos _visuais cando se reproduce un ficheiro de son"
+
+#: ../data/preferences.ui.h:32
+msgid "_Type of visualization:"
+msgstr "_Tipo de visualización:"
+
+#: ../data/preferences.ui.h:33
+msgid "Visualization _size:"
+msgstr "Tamaño da vi_sualización:"
+
+#: ../data/preferences.ui.h:34
+msgid "Color Balance"
+msgstr "Balance de cor"
+
+#: ../data/preferences.ui.h:35
+msgid "_Brightness:"
+msgstr "_Brillo:"
+
+#: ../data/preferences.ui.h:36
+msgid "Co_ntrast:"
+msgstr "Co_ntraste:"
+
+#: ../data/preferences.ui.h:37
+msgid "Sat_uration:"
+msgstr "Sat_uración:"
+
+#: ../data/preferences.ui.h:38
+msgid "_Hue:"
+msgstr "_Ton:"
+
+#: ../data/preferences.ui.h:39
+msgid "Reset to _Defaults"
+msgstr "Restabelecer aos valores pre_determinados"
+
+#: ../data/preferences.ui.h:40
+msgid "Audio Output"
+msgstr "Saída de son"
+
+#: ../data/preferences.ui.h:41
+msgid "_Audio output type:"
+msgstr "Tipo de saída de _son:"
+
+#: ../data/preferences.ui.h:42 ../data/properties.ui.h:14
+#: ../src/totem-properties-view.c:271
+msgid "Audio"
+msgstr "Son"
+
 #: ../data/properties.ui.h:2
 msgid "Title:"
 msgstr "Título:"
@@ -111,11 +493,6 @@
 msgid "Container:"
 msgstr "Contedor:"
 
-#: ../data/properties.ui.h:9 ../data/totem.ui.h:128
-#: ../src/totem-properties-view.c:270
-msgid "Video"
-msgstr "Vídeo"
-
 #: ../data/properties.ui.h:10
 msgid "Dimensions:"
 msgstr "Dimensións:"
@@ -132,11 +509,6 @@
 msgid "Bitrate:"
 msgstr "Taxa de bits:"
 
-#: ../data/properties.ui.h:14 ../data/totem.ui.h:142
-#: ../src/totem-properties-view.c:268
-msgid "Audio"
-msgstr "Son"
-
 #: ../data/properties.ui.h:15
 msgid "Sample rate:"
 msgstr "Taxa de mostras:"
@@ -145,750 +517,441 @@
 msgid "Channels:"
 msgstr "Canles:"
 
-#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
-msgid "_Add to Playlist"
-msgstr "_Engadir á lista de reprodución"
-
-#: ../data/video-list.ui.h:2
-msgid "Add the video to the playlist"
-msgstr "Engadir o vídeo á lista de reprodución"
-
 #. Title
-#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:143
-#: ../src/totem-object.c:1667
-msgid "Movie Player"
-msgstr "Reprodutor de filmes"
+#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:80 ../src/totem.c:238
+#: ../src/totem.c:247 ../src/totem-menu.c:790 ../src/totem-object.c:1658
+msgid "Videos"
+msgstr "Vídeos"
 
 #: ../data/totem.desktop.in.in.in.h:2
-msgid "Play movies and songs"
-msgstr "Reproducir filmes e cancións"
+msgid "Play movies"
+msgstr "Reproducir filmes"
+
+#: ../data/totem.desktop.in.in.in.h:3
+msgid "Video;Movie;Film;Clip;Series;Player;DVD;TV;Disc;"
+msgstr "Vídeo;Filme;Clip;Serie;Reprodutor;DVD;TV;Disco;"
 
 #: ../data/totem.ui.h:1
-msgid "_Movie"
-msgstr "_Filme"
+msgid "_Open"
+msgstr "_Abrir"
 
 #: ../data/totem.ui.h:2
-msgid "_Open..."
-msgstr "_Abrir…"
+msgid "Open _Location"
+msgstr "Abrir _localización"
 
 #: ../data/totem.ui.h:3
-msgid "Open a file"
-msgstr "Abrir un ficheiro"
+msgid "_Fullscreen"
+msgstr "_Pantalla completa"
 
 #: ../data/totem.ui.h:4
-msgid "Open _Location..."
-msgstr "Abrir a _localización…"
+msgid "Prefere_nces"
+msgstr "Prefere_ncias"
 
 #: ../data/totem.ui.h:5
-msgid "Open a non-local file"
-msgstr "Abrir un ficheiro non local"
+msgid "Shuff_le"
+msgstr "Mistu_rar"
 
 #: ../data/totem.ui.h:6
+msgid "_Repeat"
+msgstr "_Repetir"
+
+#: ../data/totem.ui.h:7
+msgid "_Quit"
+msgstr "_Saír"
+
+#: ../data/totem.ui.h:8
+msgid "_Movie"
+msgstr "_Filme"
+
+#: ../data/totem.ui.h:9
 msgid "_Eject"
 msgstr "_Expulsar"
 
-#: ../data/totem.ui.h:7
+#: ../data/totem.ui.h:10
 msgid "Eject the current disc"
 msgstr "Expulsar o disco actual"
 
-#: ../data/totem.ui.h:8
+#: ../data/totem.ui.h:11
 msgid "_Properties"
 msgstr "_Propiedades"
 
-#: ../data/totem.ui.h:9
+#: ../data/totem.ui.h:12
 msgid "View the properties of the current stream"
 msgstr "Ver as propiedades do fluxo actual"
 
-#: ../data/totem.ui.h:10
+#: ../data/totem.ui.h:13
 msgid "Play / P_ause"
 msgstr "Reproducir / _Deter"
 
-#: ../data/totem.ui.h:11
+#: ../data/totem.ui.h:14
 msgid "Play or pause the movie"
 msgstr "Reproducir ou deter o filme"
 
-#: ../data/totem.ui.h:12
-msgid "_Quit"
-msgstr "_Saír"
-
-#: ../data/totem.ui.h:13
-msgid "Quit the program"
-msgstr "Saír do programa"
-
-#: ../data/totem.ui.h:14
+#: ../data/totem.ui.h:15
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../data/totem.ui.h:15
+#: ../data/totem.ui.h:16
 msgid "_Clear Playlist"
 msgstr "_Limpar a lista de reprodución"
 
-#: ../data/totem.ui.h:16
+#: ../data/totem.ui.h:17
 msgid "Clear the playlist"
 msgstr "Limpar a lista de reprodución"
 
-#: ../data/totem.ui.h:17
-msgid "Prefere_nces"
-msgstr "Prefere_ncias"
-
 #: ../data/totem.ui.h:18
-msgid "Configure the application"
-msgstr "Configurar o aplicativo"
-
-#: ../data/totem.ui.h:19
 msgid "Plugins..."
 msgstr "Engadidos…"
 
-#: ../data/totem.ui.h:20
+#: ../data/totem.ui.h:19
 msgid "Configure plugins to extend the application"
 msgstr "Configurar os engadidos para estender o aplicativo"
 
-#: ../data/totem.ui.h:21
+#: ../data/totem.ui.h:20
 msgid "_View"
 msgstr "_Ver"
 
-#: ../data/totem.ui.h:22
-msgid "_Fullscreen"
-msgstr "_Pantalla completa"
-
-#: ../data/totem.ui.h:23
-msgid "Switch to fullscreen"
-msgstr "Cambiar a pantalla completa"
-
-#: ../data/totem.ui.h:24
+#: ../data/totem.ui.h:21
 msgid "Fit Window to Movie"
 msgstr "Axustar a xanela ao filme"
 
-#: ../data/totem.ui.h:25
+#: ../data/totem.ui.h:22
 msgid "_Resize 1:2"
 msgstr "_Redimensionar 1:2"
 
-#: ../data/totem.ui.h:26
+#: ../data/totem.ui.h:23
 msgid "Resize to half the original video size"
 msgstr "Redimensionar á metade do tamaño do vídeo"
 
-#: ../data/totem.ui.h:27
+#: ../data/totem.ui.h:24
 msgid "Resize _1:1"
 msgstr "Redimensionar _1:1"
 
-#: ../data/totem.ui.h:28
+#: ../data/totem.ui.h:25
 msgid "Resize to the original video size"
 msgstr "Redimensionar ao tamaño orixinal do vídeo"
 
-#: ../data/totem.ui.h:29
+#: ../data/totem.ui.h:26
 msgid "Resize _2:1"
 msgstr "Redimensionar _2:1"
 
-#: ../data/totem.ui.h:30
+#: ../data/totem.ui.h:27
 msgid "Resize to double the original video size"
 msgstr "Redimensionar ao dobre do tamaño do vídeo"
 
-#: ../data/totem.ui.h:31
+#: ../data/totem.ui.h:28
 msgid "_Aspect Ratio"
 msgstr "_Proporción de aspecto"
 
-#: ../data/totem.ui.h:32
+#: ../data/totem.ui.h:29
 msgid "Switch An_gles"
 msgstr "Cambier án_gulos"
 
-#: ../data/totem.ui.h:33
+#: ../data/totem.ui.h:30
 msgid "Switch camera angles"
 msgstr "Cambiar ángulos de cámara"
 
-#: ../data/totem.ui.h:34
+#: ../data/totem.ui.h:31
 msgid "_Go"
 msgstr "_Ir"
 
-#: ../data/totem.ui.h:35
+#: ../data/totem.ui.h:32
 msgid "_DVD Menu"
 msgstr "Menú de _DVD"
 
-#: ../data/totem.ui.h:36
+#: ../data/totem.ui.h:33
 msgid "Go to the DVD menu"
 msgstr "Ir ao menú do DVD"
 
-#: ../data/totem.ui.h:37
+#: ../data/totem.ui.h:34
 msgid "_Title Menu"
 msgstr "Menú de _título"
 
-#: ../data/totem.ui.h:38
+#: ../data/totem.ui.h:35
 msgid "Go to the title menu"
 msgstr "Ir ao menú de título"
 
-#: ../data/totem.ui.h:39
+#: ../data/totem.ui.h:36
 msgid "A_udio Menu"
 msgstr "Menú de a_udio"
 
-#: ../data/totem.ui.h:40
+#: ../data/totem.ui.h:37
 msgid "Go to the audio menu"
 msgstr "Ir ao menú de son"
 
-#: ../data/totem.ui.h:41
+#: ../data/totem.ui.h:38
 msgid "_Angle Menu"
 msgstr "Menú de _ángulo"
 
-#: ../data/totem.ui.h:42
+#: ../data/totem.ui.h:39
 msgid "Go to the angle menu"
 msgstr "Ir ao menú de ángulo"
 
-#: ../data/totem.ui.h:43
+#: ../data/totem.ui.h:40
 msgid "_Chapter Menu"
 msgstr "Menú de _capítulos"
 
-#: ../data/totem.ui.h:44
+#: ../data/totem.ui.h:41
 msgid "Go to the chapter menu"
 msgstr "Ir ao menú de capítulos"
 
-#: ../data/totem.ui.h:45
+#: ../data/totem.ui.h:42
 msgid "_Next Chapter/Movie"
 msgstr "Capítulo ou filme _seguinte"
 
-#: ../data/totem.ui.h:46
+#: ../data/totem.ui.h:43
 msgid "Next chapter or movie"
 msgstr "O seguinte capítulo ou filme"
 
-#: ../data/totem.ui.h:47
+#: ../data/totem.ui.h:44
 msgid "_Previous Chapter/Movie"
 msgstr "Capítulo ou filme anterior"
 
-#: ../data/totem.ui.h:48
+#: ../data/totem.ui.h:45
 msgid "Previous chapter or movie"
 msgstr "O capítulo ou filme anterior"
 
-#: ../data/totem.ui.h:49
+#: ../data/totem.ui.h:46
 msgid "_Sound"
 msgstr "_Son"
 
-#: ../data/totem.ui.h:50
+#: ../data/totem.ui.h:47
 msgid "Volume _Up"
 msgstr "_Subir o volume"
 
-#: ../data/totem.ui.h:51
+#: ../data/totem.ui.h:48
 msgid "Increase volume"
 msgstr "Incrementar o volume"
 
-#: ../data/totem.ui.h:52
+#: ../data/totem.ui.h:49
 msgid "Volume _Down"
 msgstr "_Baixar o volume"
 
-#: ../data/totem.ui.h:53
+#: ../data/totem.ui.h:50
 msgid "Decrease volume"
 msgstr "Diminuír o volume"
 
-#: ../data/totem.ui.h:54
+#: ../data/totem.ui.h:51
 msgid "_Help"
 msgstr "A_xuda"
 
-#: ../data/totem.ui.h:55
+#: ../data/totem.ui.h:52
 msgid "_Contents"
 msgstr "_Contidos"
 
-#: ../data/totem.ui.h:56
+#: ../data/totem.ui.h:53
 msgid "Help contents"
 msgstr "Contido da axuda"
 
-#: ../data/totem.ui.h:57
+#: ../data/totem.ui.h:54
 msgid "_About"
 msgstr "_Sobre"
 
-#: ../data/totem.ui.h:58
+#: ../data/totem.ui.h:55
 msgid "About this application"
 msgstr "Sobre este aplicativo"
 
-#: ../data/totem.ui.h:59
-msgid "_Repeat Mode"
-msgstr "Modo de _repetición"
-
-#: ../data/totem.ui.h:60
-msgid "Set the repeat mode"
-msgstr "Estabelecer o modo de repetición"
-
-#: ../data/totem.ui.h:61
-msgid "Shuff_le Mode"
-msgstr "Modo a_leatorio"
-
-#: ../data/totem.ui.h:62
-msgid "Set the shuffle mode"
-msgstr "Estabelecer o modo aleatorio"
-
-#: ../data/totem.ui.h:63
+#: ../data/totem.ui.h:56
 msgid "Show _Controls"
 msgstr "Mostrar os _controis"
 
-#: ../data/totem.ui.h:64
+#: ../data/totem.ui.h:57
 msgid "Show controls"
 msgstr "Mostrar os controis"
 
-#: ../data/totem.ui.h:65
+#: ../data/totem.ui.h:58
 msgid "S_idebar"
 msgstr "Barra _lateral"
 
-#: ../data/totem.ui.h:66
+#: ../data/totem.ui.h:59
 msgid "Show or hide the sidebar"
 msgstr "Mostrar ou ocultar a barra lateral"
 
-#: ../data/totem.ui.h:67
+#: ../data/totem.ui.h:60
 msgctxt "Aspect ratio"
 msgid "Auto"
 msgstr "Automática"
 
-#: ../data/totem.ui.h:68
+#: ../data/totem.ui.h:61
 msgid "Sets automatic aspect ratio"
 msgstr "Estabelece a proporción de aspecto automática"
 
-#: ../data/totem.ui.h:69
+#: ../data/totem.ui.h:62
 msgid "Square"
 msgstr "Cadrado"
 
-#: ../data/totem.ui.h:70
+#: ../data/totem.ui.h:63
 msgid "Sets square aspect ratio"
 msgstr "Estabelece a proporción de aspecto cadrada"
 
-#: ../data/totem.ui.h:71
+#: ../data/totem.ui.h:64
 msgid "4:3 (TV)"
 msgstr "4:3 (TV)"
 
-#: ../data/totem.ui.h:72
+#: ../data/totem.ui.h:65
 msgid "Sets 4:3 (TV) aspect ratio"
 msgstr "Estabelece a proporción de aspecto 4:3 (TV)"
 
-#: ../data/totem.ui.h:73
+#: ../data/totem.ui.h:66
 msgid "16:9 (Widescreen)"
-msgstr "16:9 (Panorámico)"
-
-#: ../data/totem.ui.h:74
-msgid "Sets 16:9 (widescreen) aspect ratio"
-msgstr "Estabelece a proporción de aspecto 16:9 (panorámico)"
-
-#: ../data/totem.ui.h:75
-msgid "2.11:1 (DVB)"
-msgstr "2.11:1 (DVB)"
-
-#: ../data/totem.ui.h:76
-msgid "Sets 2.11:1 (DVB) aspect ratio"
-msgstr "Estabelece a proporción de aspecto 2.11:1 (DVB)"
-
-#: ../data/totem.ui.h:77
-msgid "S_ubtitles"
-msgstr "S_ubtítulos"
-
-#: ../data/totem.ui.h:80
-msgid "_Languages"
-msgstr "_Idiomas"
-
-#: ../data/totem.ui.h:81
-msgid "Zoom In"
-msgstr "Ampliar"
-
-#: ../data/totem.ui.h:82
-msgid "Zoom in"
-msgstr "Ampliar"
-
-#: ../data/totem.ui.h:83
-msgid "Skip _Forward"
-msgstr "Saltar cara _adiante"
-
-#: ../data/totem.ui.h:84
-msgid "Skip forward"
-msgstr "Saltar cara adiante"
-
-#: ../data/totem.ui.h:85
-msgid "Skip _Backwards"
-msgstr "Saltar _cara a atrás"
-
-#: ../data/totem.ui.h:86
-msgid "Skip backwards"
-msgstr "Saltar cara atrás"
-
-#: ../data/totem.ui.h:87
-msgid "14.4 Kbps Modem"
-msgstr "14.4 Kbps Módem"
-
-#: ../data/totem.ui.h:88
-msgid "19.2 Kbps Modem"
-msgstr "19.2 Kbps Módem"
-
-#: ../data/totem.ui.h:89
-msgid "28.8 Kbps Modem"
-msgstr "28.8 Kbps Módem"
-
-#: ../data/totem.ui.h:90
-msgid "33.6 Kbps Modem"
-msgstr "33.6 Kbps Módem"
-
-#: ../data/totem.ui.h:91
-msgid "34.4 Kbps Modem"
-msgstr "34.4 Kbps Módem"
-
-#: ../data/totem.ui.h:92
-msgid "56 Kbps Modem/ISDN"
-msgstr "56 Kbps Módem/ISDN"
-
-#: ../data/totem.ui.h:93
-msgid "112 Kbps Dual ISDN/DSL"
-msgstr "112 Kbps Dual ISDN/DSL"
-
-#: ../data/totem.ui.h:94
-msgid "256 Kbps DSL/Cable"
-msgstr "256 Kbps DSL/Cable"
-
-#: ../data/totem.ui.h:95
-msgid "384 Kbps DSL/Cable"
-msgstr "384 Kbps DSL/Cable"
-
-#: ../data/totem.ui.h:96
-msgid "512 Kbps DSL/Cable"
-msgstr "512 Kbps DSL/Cable"
-
-#: ../data/totem.ui.h:97
-msgid "1.5 Mbps T1/Intranet/LAN"
-msgstr "1.5 Mbps T1/Intranet/LAN"
-
-#: ../data/totem.ui.h:98
-msgid "Intranet/LAN"
-msgstr "Intranet/LAN"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:100
-msgid "Normal"
-msgstr "Normal"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:102
-msgid "Large"
-msgstr "Grande"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:104
-msgid "Extra Large"
-msgstr "Moi grande"
-
-#: ../data/totem.ui.h:105 ../src/totem-properties-view.c:228
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5593
-msgid "Stereo"
-msgstr "Estéreo"
-
-#: ../data/totem.ui.h:106
-msgid "4-channel"
-msgstr "4-canle"
-
-#: ../data/totem.ui.h:107
-msgid "4.1-channel"
-msgstr "4.1-canle"
-
-#: ../data/totem.ui.h:108
-msgid "5.0-channel"
-msgstr "5.0-canle"
-
-#: ../data/totem.ui.h:109
-msgid "5.1-channel"
-msgstr "5.1-canle"
-
-#: ../data/totem.ui.h:110
-msgid "AC3 Passthrough"
-msgstr "Pasada AC3"
-
-#: ../data/totem.ui.h:111
-msgid "Totem Preferences"
-msgstr "Preferencias do Totem"
-
-#: ../data/totem.ui.h:112
-msgid "Playback"
-msgstr "Reproducir"
-
-#: ../data/totem.ui.h:113
-msgid "Start playing files from last position"
-msgstr "Iniciar reproducindo os ficheiros desde a última posición"
-
-#: ../data/totem.ui.h:114
-msgid "Networking"
-msgstr "Rede"
-
-#: ../data/totem.ui.h:115
-msgid "Connection _speed:"
-msgstr "_Velocidade de conexión:"
-
-#: ../data/totem.ui.h:116
-msgid "Text Subtitles"
-msgstr "Subtítulos de texto"
-
-#: ../data/totem.ui.h:117
-msgid "_Load subtitle files when movie is loaded"
-msgstr "_Cargar os ficheiros de subtítulos cando se cargue o filme"
-
-#: ../data/totem.ui.h:118
-msgid "_Font:"
-msgstr "_Tipo de letra:"
-
-#: ../data/totem.ui.h:119
-msgid "_Encoding:"
-msgstr "_Codificación:"
-
-#: ../data/totem.ui.h:120
-msgid "External Chapters"
-msgstr "Capítulos externos"
-
-#: ../data/totem.ui.h:121
-msgid "Load _chapter files when movie is loaded"
-msgstr "_Cargar os ficheiros de capítulos cando se cargue o filme"
-
-#. Tab label in the Preferences dialogue
-#: ../data/totem.ui.h:124
-msgid "Display"
-msgstr "Visualización"
-
-#: ../data/totem.ui.h:125
-msgid "_Resize the window when a new video is loaded"
-msgstr "_Redimensionar a xanela cando se cargue un novo vídeo"
-
-#: ../data/totem.ui.h:126
-msgid "Disable _deinterlacing of interlaced videos"
-msgstr "Desactivar o _desentrelazado de vídeos entrelazados"
-
-#: ../data/totem.ui.h:127
-msgid "Disable screensaver when playing "
-msgstr "Desactivar o protector de pantalla ao reproducir "
-
-#: ../data/totem.ui.h:129
-msgid "Video or Audio"
-msgstr "Vídeo ou son"
-
-#: ../data/totem.ui.h:130
-msgid "Visual Effects"
-msgstr "Efectos visuais"
-
-#: ../data/totem.ui.h:131
-msgid "Show _visual effects when an audio file is played"
-msgstr "Mostrar os efectos _visuais cando se reproduce un ficheiro de son"
-
-#: ../data/totem.ui.h:132
-msgid "_Type of visualization:"
-msgstr "_Tipo de visualización:"
-
-#: ../data/totem.ui.h:133
-msgid "Visualization _size:"
-msgstr "Tamaño da vi_sualización:"
-
-#: ../data/totem.ui.h:134
-msgid "Color Balance"
-msgstr "Balance de cor"
-
-#: ../data/totem.ui.h:135
-msgid "_Brightness:"
-msgstr "_Brillo:"
-
-#: ../data/totem.ui.h:136
-msgid "Co_ntrast:"
-msgstr "Co_ntraste:"
-
-#: ../data/totem.ui.h:137
-msgid "Sat_uration:"
-msgstr "Sat_uración:"
-
-#: ../data/totem.ui.h:138
-msgid "_Hue:"
-msgstr "_Ton:"
-
-#: ../data/totem.ui.h:139
-msgid "Reset to _Defaults"
-msgstr "Restabelecer aos valores pre_determinados"
-
-#: ../data/totem.ui.h:140
-msgid "Audio Output"
-msgstr "Saída de son"
-
-#: ../data/totem.ui.h:141
-msgid "_Audio output type:"
-msgstr "Tipo de saída de _son:"
-
-#: ../data/totem.ui.h:145
-msgid "Time seek bar"
-msgstr "Barra de tempo"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
-msgid "Allow the screensaver to activate when playing audio"
-msgstr ""
-"Permitirlle ao protector de pantalla activarse cando se estea reproducindo "
-"son"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
-msgid ""
-"Allow the screensaver to activate when playing audio. Disable if you have "
-"monitor-powered speakers."
-msgstr ""
-"Permitirlle ao protector de pantalla activarse cando se estea reproducindo "
-"son. Desactíveo se ten altofalantes alimentados desde a pantalla."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
-msgid "Show visual effects when no video is displayed"
-msgstr "Mostrar os efectos visuais cando non se mostre o vídeo"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
-msgid "Show visual effects when playing an audio only file."
-msgstr "Mostrar os efectos visuais cando se reproduza un ficheiro de só son."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
-msgid "Name of the visual effects plugin"
-msgstr "Nome do engadido de efectos visuais"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
-msgid "The brightness of the video"
-msgstr "O brillo do vídeo"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
-msgid "The contrast of the video"
-msgstr "O contraste do vídeo"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
-msgid "The hue of the video"
-msgstr "O ton do vídeo"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
-msgid "The saturation of the video"
-msgstr "A saturación do vídeo"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
-msgid "Resize the canvas automatically on file load"
-msgstr "Redimensionar automaticamente o lenzo ao cargar o ficheiro"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
-msgid "Network connection speed"
-msgstr "Velocidade de conexión á rede"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
-msgid ""
-"Approximate network connection speed, used to select quality on media over "
-"the network."
-msgstr ""
-"Velocidade da conexión de rede aproximada, usado para seleccionar a calidade "
-"dos ficheiros e fluxos multimedia sobre a rede."
+msgstr "16:9 (Panorámico)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
-msgid "Repeat mode"
-msgstr "Modo de repetición"
+#: ../data/totem.ui.h:67
+msgid "Sets 16:9 (widescreen) aspect ratio"
+msgstr "Estabelece a proporción de aspecto 16:9 (panorámico)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
-msgid "Shuffle mode"
-msgstr "Modo aleatorio"
+#: ../data/totem.ui.h:68
+msgid "2.11:1 (DVB)"
+msgstr "2.11:1 (DVB)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
-msgid "Whether to disable deinterlacing for interlaced movies"
-msgstr ""
-"Indica se se debe desactivar o desentrelazado para os filmes entrelazados"
+#: ../data/totem.ui.h:69
+msgid "Sets 2.11:1 (DVB) aspect ratio"
+msgstr "Estabelece a proporción de aspecto 2.11:1 (DVB)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
-msgid "Whether to enable debug for the playback engine"
-msgstr "Indica se se activa a depuración para o motor de reprodución de vídeo"
+#: ../data/totem.ui.h:70
+msgid "S_ubtitles"
+msgstr "S_ubtítulos"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
-msgid "Type of audio output to use"
-msgstr "O tipo de saída de son que se vai usar"
+#: ../data/totem.ui.h:73
+msgid "_Languages"
+msgstr "_Idiomas"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
-msgid "Visualization quality setting"
-msgstr "Configuración de calidade de visualización"
+#: ../data/totem.ui.h:74
+msgid "Zoom In"
+msgstr "Ampliar"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
-msgid "Quality setting for the audio visualization."
-msgstr "Configuracións de calidade para a visualización de son."
+#: ../data/totem.ui.h:75
+msgid "Zoom in"
+msgstr "Ampliar"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
-msgid "Network buffering threshold"
-msgstr "Límite do búfer de rede"
+#: ../data/totem.ui.h:76
+msgid "Skip _Forward"
+msgstr "Saltar cara _adiante"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
-msgid ""
-"Amount of data to buffer for network streams before starting to display the "
-"stream (in seconds)."
-msgstr ""
-"Cantidade de datos que almacenar no búfer para os fluxos de rede antes de "
-"comezar a mostrar o fluxo (en segundos)."
+#: ../data/totem.ui.h:77
+msgid "Skip forward"
+msgstr "Saltar cara adiante"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
-msgid "Subtitle font"
-msgstr "Tipo de letra para os subtítulos"
+#: ../data/totem.ui.h:78
+msgid "Skip _Backwards"
+msgstr "Saltar _cara a atrás"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
-msgid "Pango font description for subtitle rendering."
-msgstr "Descrición do tipo de letra Pango para a renderización de subtítulos."
+#: ../data/totem.ui.h:79
+msgid "Skip backwards"
+msgstr "Saltar cara atrás"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
-msgid "Subtitle encoding"
-msgstr "Codificación dos subtítulos"
+#: ../data/totem.ui.h:82
+msgid "Time seek bar"
+msgstr "Barra de tempo"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
-msgid "Encoding character set for subtitle."
-msgstr "Codificación de caracteres para os subtítulos."
+#: ../data/uri.ui.h:1
+msgid "Enter the _address of the file you would like to open:"
+msgstr "Introduza o _enderezo do ficheiro que quere abrir:"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
-msgid "Default location for the \"Open...\" dialogs"
-msgstr "Localización predeterminada para os diálogos \"Abrir…\""
+#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
+msgid "_Add to Playlist"
+msgstr "_Engadir á lista de reprodución"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
-msgid ""
-"Default location for the \"Open...\" dialogs. Default is the current "
-"directory."
-msgstr ""
-"Localización por omisión para os diálogos \"Abrir…\". Por omisión o cartafol "
-"actual"
+#: ../data/video-list.ui.h:2
+msgid "Add the video to the playlist"
+msgstr "Engadir o vídeo á lista de reprodución"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
-msgid "Default location for the \"Take Screenshot\" dialogs"
-msgstr ""
-"Localización por omisión para os diálogos \"Facer captura de pantalla\""
+#: ../src/backend/bacon-video-widget.c:1643
+msgid "Password requested for RTSP server"
+msgstr "O contrasinal foi solicitado polo servidor RTSP"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
-msgid ""
-"Default location for the \"Take Screenshot\" dialogs. Default is the "
-"Pictures directory."
-msgstr ""
-"Localización por omisión para os diálogos \"Facer captura de pantalla\". Por "
-"omisión o cartafol Imaxes"
+#: ../src/backend/bacon-video-widget.c:2944
+#, c-format
+msgid "Audio Track #%d"
+msgstr "Pista de son #%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
-msgid "Whether to disable the plugins in the user's home directory"
-msgstr ""
-"Indica se se deben desactivar os engadidos no cartafol persoal do usuario"
+#: ../src/backend/bacon-video-widget.c:2948
+#, c-format
+msgid "Subtitle #%d"
+msgstr "Subtítulo #%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
-msgid "Whether to disable the keyboard shortcuts"
-msgstr "Indica se se desactivan os atallos de teclado"
+#: ../src/backend/bacon-video-widget.c:3345
+msgid "The server you are trying to connect to is not known."
+msgstr "O servidor ao que está tentando conectarse non se recoñece."
+
+#: ../src/backend/bacon-video-widget.c:3348
+msgid "The connection to this server was refused."
+msgstr "Rexeitouse a conexión a este servidor."
+
+#: ../src/backend/bacon-video-widget.c:3351
+msgid "The specified movie could not be found."
+msgstr "Non foi posíbel atopar o filme especificado."
+
+#: ../src/backend/bacon-video-widget.c:3358
+msgid "The server refused access to this file or stream."
+msgstr "O servidor rexeitou o acceso a este ficheiro ou fluxo."
+
+#: ../src/backend/bacon-video-widget.c:3364
+msgid "Authentication is required to access this file or stream."
+msgstr "Requírese autenticación para acceder a este ficheiro ou fluxo."
+
+#: ../src/backend/bacon-video-widget.c:3371
+msgid "You are not allowed to open this file."
+msgstr "Non tes permisos para abrir este ficheiro."
+
+#: ../src/backend/bacon-video-widget.c:3376
+msgid "This location is not a valid one."
+msgstr "Esta localización non é válida."
+
+#: ../src/backend/bacon-video-widget.c:3384
+msgid "The movie could not be read."
+msgstr "Non é posíbel ler o filme."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
-msgid "Whether to autoload text subtitle files when a movie is loaded"
-msgstr ""
-"Indica se se deben cargar os ficheiros de subtítulos automaticamente ao "
-"cargar o filme"
+#. should be exactly one missing thing (source or converter)
+#: ../src/backend/bacon-video-widget.c:3407
+#: ../src/backend/bacon-video-widget.c:3415
+#, c-format
+msgid "The playback of this movie requires a %s plugin which is not installed."
+msgid_plural ""
+"The playback of this movie requires the following decoders which are not "
+"installed:\n"
+"\n"
+"%s"
+msgstr[0] ""
+"A reprodución deste filme necesita o engadido %s que non está instalado."
+msgstr[1] ""
+"A reprodución deste filme necesita os engadidos %s que non están instalados."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
-msgid "Whether to autoload external chapter files when a movie is loaded"
+#: ../src/backend/bacon-video-widget.c:3426
+msgid ""
+"An audio or video stream is not handled due to missing codecs. You might "
+"need to install additional plugins to be able to play some types of movies"
 msgstr ""
-"Indica se se deben cargar os ficheiros de capítulos automaticamente ao "
-"cargar o filme"
+"Non se pode xestionar un son ou vídeo xa que falta algún códec. Debe "
+"instalar engadidos adicionais para poder reproducir algúns tipos de filmes"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+#: ../src/backend/bacon-video-widget.c:3436
 msgid ""
-"Whether to remember the position of played audio/video files when pausing or "
-"closing them"
+"This file cannot be played over the network. Try downloading it locally "
+"first."
 msgstr ""
-"Indica se se debe lembrar ou non a posición dos ficheiros de son/vídeo "
-"reproducidos cando se deteñan ou se pechen."
+"Non foi posíbel reproducir este ficheiro a través da rede. Ténteo de novo "
+"descargándoo primeiro a local."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:35
-msgid "Active plugins list"
-msgstr "Lista de engadidos activados"
+#: ../src/backend/bacon-video-widget.c:5494 ../src/totem-properties-view.c:227
+msgid "Surround"
+msgstr "Envolvente"
+
+#: ../src/backend/bacon-video-widget.c:5496 ../src/totem-properties-view.c:229
+msgid "Mono"
+msgstr "Mono"
+
+#: ../src/backend/bacon-video-widget.c:5781
+msgid "Media contains no supported video streams."
+msgstr "O multimedia contén fluxos de vídeo non compatíbeis."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:36
+#: ../src/backend/bacon-video-widget.c:5963
 msgid ""
-"A list of the names of the plugins which are currently active (loaded and "
-"running)."
+"Some necessary plug-ins are missing. Make sure that the program is correctly "
+"installed."
 msgstr ""
-"Unha lista de nomes dos engadidos activados actualmente (cargados e en "
-"execución)."
-
-#: ../data/uri.ui.h:1
-msgid "Enter the _address of the file you would like to open:"
-msgstr "Introduza o _enderezo do ficheiro que quere abrir:"
+"Faltan algúns dos engadidos necesarios. Asegúrese de que o programa está "
+"correctamente instalado."
 
 #: ../src/eggdesktopfile.c:165
 #, c-format
@@ -996,6 +1059,31 @@
 msgid "Show session management options"
 msgstr "Mostrar as opcións de xestión de sesión"
 
+#. hour:minutes:seconds
+#. Translators: This is a time format, like "9:05:02" for 9
+#. * hours, 5 minutes, and 2 seconds. You may change ":" to
+#. * the separator that your locale uses or use "%Id" instead
+#. * of "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:56
+#: ../src/plugins/skipto/totem-time-entry.c:57
+#, c-format
+msgctxt "long time format"
+msgid "%d:%02d:%02d"
+msgstr "%d:%02d:%02d"
+
+#. minutes:seconds
+#. Translators: This is a time format, like "5:02" for 5
+#. * minutes and 2 seconds. You may change ":" to the
+#. * separator that your locale uses or use "%Id" instead of
+#. * "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:65
+#, c-format
+msgctxt "short time format"
+msgid "%d:%02d"
+msgstr "%d:%02d"
+
 #. Title
 #. Artist
 #. Album
@@ -1100,10 +1188,14 @@
 msgstr[0] "%d fotograma por segundo"
 msgstr[1] "%d fotogramas por segundo"
 
-#: ../src/totem-audio-preview.c:168
+#: ../src/totem-audio-preview.c:137
 msgid "Audio Preview"
 msgstr "Previsualización de son"
 
+#: ../src/totem.c:239
+msgid "Verify your system installation. Totem will now exit."
+msgstr "Verifique a instalación do seu sistema. O Totem sairá agora."
+
 #: ../src/totem-cell-renderer-video.c:126
 msgid "Unknown video"
 msgstr "Vídeo descoñecido"
@@ -1116,7 +1208,7 @@
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../src/totem-fullscreen.c:616
+#: ../src/totem-fullscreen.c:573
 msgid "No File"
 msgstr "Non hai ningún ficheiro"
 
@@ -1134,7 +1226,7 @@
 msgid "Make sure that Totem is properly installed."
 msgstr "Asegúrese de que Totem está instalado correctamente."
 
-#: ../src/totem-interface.c:347
+#: ../src/totem-interface.c:357
 msgid ""
 "Totem 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 "
@@ -1146,7 +1238,7 @@
 "sexa na versión 2 da Licenza como (segundo a súa escolla) en calquera "
 "versión posterior."
 
-#: ../src/totem-interface.c:351
+#: ../src/totem-interface.c:361
 msgid ""
 "Totem is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -1158,7 +1250,7 @@
 "PARA UN PROPÓSITO PARTICULAR. Para máis detalles vexa a Licenza pública "
 "xeral de GNU."
 
-#: ../src/totem-interface.c:355
+#: ../src/totem-interface.c:365
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Totem; if not, write to the Free Software Foundation, Inc., 59 Temple Place, "
@@ -1168,7 +1260,7 @@
 "Nautilus; en caso contrario, escriba á Free Software Foundation, Inc., 59 "
 "Temple Place, Suite 330, Boston, MA  02111-1307  USA"
 
-#: ../src/totem-interface.c:358
+#: ../src/totem-interface.c:368
 msgid ""
 "Totem contains an exception to allow the use of proprietary GStreamer "
 "plugins."
@@ -1177,46 +1269,21 @@
 "GStreamer."
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:190
+#: ../src/totem-menu.c:291
 msgid "None"
 msgstr "Ningún"
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:195
+#: ../src/totem-menu.c:296
 msgctxt "Language"
 msgid "Auto"
 msgstr "Automático"
 
-#. Translators:
-#. * This is not a JPEG image, but a disc image, for example,
-#. * an ISO file
-#: ../src/totem-menu.c:765
-#, c-format
-msgid "Play Image '%s'"
-msgstr "Reproducir imaxe «%s»"
-
-#: ../src/totem-menu.c:768 ../src/totem-menu.c:851
-#, c-format
-msgid "device%d"
-msgstr "dispositivo%d"
-
-#: ../src/totem-menu.c:848
-#, c-format
-msgid "Play Disc '%s'"
-msgstr "Reproducir o disco «%s»"
-
-#. This lists the back-end type and version, such as
-#. * Movie Player using GStreamer 0.10.1
-#: ../src/totem-menu.c:1189
-#, c-format
-msgid "Movie Player using %s"
-msgstr "Reprodutor de filmes utilizando %s"
-
-#: ../src/totem-menu.c:1193
+#: ../src/totem-menu.c:789
 msgid "Copyright © 2002-2009 Bastien Nocera"
 msgstr "Copyright © 2002-2007 Bastien Nocera"
 
-#: ../src/totem-menu.c:1198
+#: ../src/totem-menu.c:794
 msgid "translator-credits"
 msgstr ""
 "Leandro Regueiro , 2011.\n"
@@ -1225,158 +1292,78 @@
 "Suso Baleato , 2009.\n"
 "Ignacio Casal Quinteiro , 2005, 2006, 2007, 2008."
 
-#: ../src/totem-menu.c:1202
+#: ../src/totem-menu.c:798
 msgid "Totem Website"
 msgstr "Sitio web do Totem"
 
-#: ../src/totem-menu.c:1236
+#: ../src/totem-menu.c:829
 msgid "Configure Plugins"
 msgstr "Configurar os engadidos"
 
+#: ../src/totem-object.c:162
+#, c-format
+msgid ""
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"%s\n"
+"Executar '%s --help' para ver a lista de opcións da liña de ordes "
+"dispoñíbeis.\n"
+
 #. Translators: %s is the totem version number
-#: ../src/totem-object.c:471
+#: ../src/totem-object.c:591
 #, c-format
 msgid "Totem %s"
 msgstr "Totem %s"
 
-#: ../src/totem-object.c:1047 ../browser-plugin/totem-plugin-viewer.c:367
-msgid "Playing"
-msgstr "Reproducindo"
-
-#: ../src/totem-object.c:1049 ../src/totem-options.c:52
+#: ../src/totem-object.c:1168 ../src/totem-options.c:52
 msgid "Pause"
 msgstr "Deter"
 
-#: ../src/totem-object.c:1054 ../browser-plugin/totem-plugin-viewer.c:363
-msgid "Paused"
-msgstr "Detido"
-
-#: ../src/totem-object.c:1056 ../src/totem-object.c:1066
-#: ../src/totem-options.c:51
-msgid "Play"
-msgstr "Reproducir"
-
-#: ../src/totem-object.c:1061 ../src/totem-object.c:1659
-#: ../src/totem-statusbar.c:115 ../browser-plugin/totem-plugin-viewer.c:351
-msgid "Stopped"
-msgstr "Detido"
-
-#: ../src/totem-object.c:1142 ../src/totem-object.c:1169
-#: ../src/totem-object.c:1799 ../src/totem-object.c:1963
-#, c-format
-msgid "Totem could not play '%s'."
-msgstr "O Totem non puido reproducir «%s»."
-
-#: ../src/totem-object.c:1246
-#, c-format
-msgid ""
-"Totem could not play this media (%s) although a plugin is present to handle "
-"it."
-msgstr ""
-"O Totem non puido reproducir este medio (%s) aínda que hai un engadido "
-"instalado que pode manipulalo."
-
-#: ../src/totem-object.c:1247
-msgid ""
-"You might want to check that a disc is present in the drive and that it is "
-"correctly configured."
-msgstr ""
-"Comprobe que hai un disco no dispositivo e que está correctamente "
-"configurado."
-
-#: ../src/totem-object.c:1255
-msgid "More information about media plugins"
-msgstr "Máis información sobre os engadidos de medios"
-
-#: ../src/totem-object.c:1256
-msgid ""
-"Please install the necessary plugins and restart Totem to be able to play "
-"this media."
-msgstr ""
-"Instale os engadidos necesarios e reinicie o Totem para poder reproducir "
-"este medio."
-
-#: ../src/totem-object.c:1258
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because it does not have the "
-"appropriate plugins to be able to read from the disc."
-msgstr ""
-"O Totem non pode reproducir este tipo de medio (%s) porque non ten os "
-"engadidos axeitados para ler do disco."
-
-#: ../src/totem-object.c:1260
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because you do not have the "
-"appropriate plugins to handle it."
-msgstr ""
-"O Totem non pode reproducir este tipo de medio (%s) porque non ten os "
-"engadidos axeitados para manipulalo."
-
-#: ../src/totem-object.c:1263
-#, c-format
-msgid "Totem cannot play this type of media (%s) because it is not supported."
-msgstr ""
-"O Totem non pode reproducir este tipo de medio (%s) porque non é compatíbel."
-
-#: ../src/totem-object.c:1264
-msgid "Please insert another disc to play back."
-msgstr "Insira outro disco para reproducir."
-
-#: ../src/totem-object.c:1300
-msgid "Totem was not able to play this disc."
-msgstr "O Totem non foi capaz de reproducir este disco."
-
-#: ../src/totem-object.c:1301 ../src/totem-object.c:4229
-msgid "No reason."
-msgstr "Sen motivo."
-
-#: ../src/totem-object.c:1315
-msgid "Totem does not support playback of Audio CDs"
-msgstr "Totem non permite a reprodución de CD de son"
+#: ../src/totem-object.c:1175 ../src/totem-object.c:1185
+#: ../src/totem-options.c:51
+msgid "Play"
+msgstr "Reproducir"
 
-#: ../src/totem-object.c:1316
-msgid "Please consider using a music player or a CD extractor to play this CD"
-msgstr ""
-"Considere usar un reprodutor de música ou un extractor de CD para reproducir "
-"este CD"
+#: ../src/totem-object.c:1267 ../src/totem-object.c:1294
+#: ../src/totem-object.c:1787 ../src/totem-object.c:1942
+#, c-format
+msgid "Totem could not play '%s'."
+msgstr "O Totem non puido reproducir «%s»."
 
-#: ../src/totem-object.c:1805
+#: ../src/totem-object.c:1793
 msgid "No error message"
 msgstr "Non hai unha mensaxe de erro"
 
-#: ../src/totem-object.c:2154
+#: ../src/totem-object.c:2133
 msgid "Totem could not display the help contents."
 msgstr "O Totem non puido mostrar os contidos da axuda."
 
-#: ../src/totem-object.c:2493 ../src/totem-object.c:2495
-#: ../browser-plugin/totem-plugin-viewer.c:1417
-msgid "An error occurred"
-msgstr "Produciuse un erro"
-
-#: ../src/totem-object.c:4064 ../src/totem-object.c:4066
+#: ../src/totem-object.c:4019 ../src/totem-object.c:4021
 msgid "Previous Chapter/Movie"
 msgstr "Capítulo/Filme anterior"
 
-#: ../src/totem-object.c:4073 ../src/totem-object.c:4075
+#: ../src/totem-object.c:4028 ../src/totem-object.c:4030
 msgid "Play / Pause"
 msgstr "Reproducir / Deter"
 
-#: ../src/totem-object.c:4083 ../src/totem-object.c:4085
+#: ../src/totem-object.c:4038 ../src/totem-object.c:4040
 msgid "Next Chapter/Movie"
 msgstr "Capítulo/Filme seguinte"
 
-#. Translators: this is the tooltip text for the fullscreen button in the controls box in Totem's main window.
 #. Translators: this is the accessibility text for the fullscreen button in the controls box in Totem's main window.
-#: ../src/totem-object.c:4097 ../src/totem-object.c:4099
+#: ../src/totem-object.c:4051 ../src/totem-object.c:4053
 msgid "Fullscreen"
 msgstr "Pantalla completa"
 
-#: ../src/totem-object.c:4229
+#: ../src/totem-object.c:4184
 msgid "Totem could not startup."
 msgstr "Non foi posíbel iniciar o Totem."
 
+#: ../src/totem-object.c:4184
+msgid "No reason."
+msgstr "Sen motivo."
+
 #: ../src/totem-open-location.c:182
 msgid "Open Location..."
 msgstr "Abrir localización…"
@@ -1450,118 +1437,112 @@
 msgid "Movies to play"
 msgstr "Filmes para reproducir"
 
-#: ../src/totem-options.c:117
+#: ../src/totem-options.c:79
+msgid "- Play movies and songs"
+msgstr "- Reproducir filmes e cancións"
+
+#: ../src/totem-options.c:142
 msgid "Can't enqueue and replace at the same time"
 msgstr "Non foi posíbel incluír na cola e substituír ao mesmo tempo"
 
 #. By extension entry
-#: ../src/totem-playlist.c:161
+#: ../src/totem-playlist.c:162
 msgid "MP3 ShoutCast playlist"
 msgstr "Lista de reprodución de MP3"
 
-#: ../src/totem-playlist.c:162
+#: ../src/totem-playlist.c:163
 msgid "MP3 audio (streamed)"
 msgstr "Son MP3 (en fluxo)"
 
-#: ../src/totem-playlist.c:163
+#: ../src/totem-playlist.c:164
 msgid "MP3 audio (streamed, DOS format)"
 msgstr "Son MP3 (en fluxo, formato DOS)"
 
-#: ../src/totem-playlist.c:164
+#: ../src/totem-playlist.c:165
 msgid "XML Shareable Playlist"
 msgstr "Lista de reprodución XML compatíbel"
 
 #. This is "Title 3", where title is a DVD title
 #. * Note: NOT a DVD chapter
-#: ../src/totem-playlist.c:347
+#: ../src/totem-playlist.c:348
 #, c-format
 msgid "Title %d"
 msgstr "Título %d"
 
-#: ../src/totem-playlist.c:446
+#: ../src/totem-playlist.c:447
 msgid "Could not save the playlist"
 msgstr "Non foi posíbel gardar a lista de reprodución"
 
-#: ../src/totem-playlist.c:1021
+#: ../src/totem-playlist.c:1022
 msgid "Save Playlist"
 msgstr "Gardar a lista de reprodución"
 
 #. translators: Playlist is the default saved playlist filename,
 #. * without the suffix
-#: ../src/totem-playlist.c:1033 ../src/totem-playlist.c:1264
-#: ../src/totem-sidebar.c:142
+#: ../src/totem-playlist.c:1034 ../src/totem-playlist.c:1263
+#: ../src/totem-sidebar.c:145
 msgid "Playlist"
 msgstr "Lista de reprodución"
 
-#: ../src/totem-playlist.c:1857
+#: ../src/totem-playlist.c:1862
 #, c-format
 msgid "The playlist '%s' could not be parsed. It might be damaged."
 msgstr ""
 "Non foi posíbel analizar a lista de reprodución «%s», pode que estea danada."
 
-#: ../src/totem-playlist.c:1858
+#: ../src/totem-playlist.c:1863
 msgid "Playlist error"
 msgstr "Erro na lista de reprodución"
 
-#: ../src/totem-preferences.c:295
+#: ../src/totem-preferences.c:297
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../src/totem-preferences.c:451
+#: ../src/totem-preferences.c:445
 msgid "Select Subtitle Font"
 msgstr "Seleccionar o tipo de letra para os subtítulos"
 
-#: ../src/totem-properties-main.c:115 ../src/totem-properties-view.c:266
+#: ../src/totem-properties-main.c:116 ../src/totem-properties-view.c:269
 msgid "Audio/Video"
 msgstr "Son/Vídeo"
 
-#: ../src/totem-properties-view.c:128
+#: ../src/totem-properties-view.c:131
 msgid "N/A"
 msgstr "N/D"
 
-#: ../src/totem-properties-view.c:157
+#: ../src/totem-properties-view.c:160
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 msgctxt "Stream bit rate"
 msgid "N/A"
 msgstr "N/D"
 
-#: ../src/totem-properties-view.c:160
+#: ../src/totem-properties-view.c:163
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: ../src/totem-properties-view.c:177
+#: ../src/totem-properties-view.c:180
 #: ../src/plugins/properties/totem-movie-properties.c:149
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../src/totem-properties-view.c:209
+#: ../src/totem-properties-view.c:212
 #: ../src/plugins/properties/totem-movie-properties.c:166
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: ../src/totem-properties-view.c:216
+#: ../src/totem-properties-view.c:219
 #: ../src/plugins/properties/totem-movie-properties.c:166
 msgctxt "Sample rate"
 msgid "N/A"
 msgstr "N/D"
 
-#: ../src/totem-properties-view.c:224
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5589
-msgid "Surround"
-msgstr "Envolvente"
-
-#: ../src/totem-properties-view.c:226
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5591
-msgid "Mono"
-msgstr "Mono"
-
-#: ../src/totem-properties-view.c:236
+#: ../src/totem-properties-view.c:239
 msgctxt "Number of audio channels"
 msgid "N/A"
 msgstr "N/D"
@@ -1594,8 +1575,8 @@
 #. eg: 75 %
 #: ../src/totem-statusbar.c:250
 #, c-format
-msgid "%d %%"
-msgstr "%d %%"
+msgid "%lf %%"
+msgstr "%lf %%"
 
 #. eg: Paused, 0:32 / 1:05
 #: ../src/totem-statusbar.c:325
@@ -1606,8 +1587,8 @@
 #. eg: Buffering, 75 %
 #: ../src/totem-statusbar.c:330
 #, c-format
-msgid "%s, %d %%"
-msgstr "%s, %d %%"
+msgid "%s, %f %%"
+msgstr "%s, %f %%"
 
 #: ../src/totem-subtitle-encoding.c:156
 msgid "Current Locale"
@@ -1750,225 +1731,91 @@
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
-#: ../src/totem-video-list.c:330
-msgid "No video URI"
-msgstr "Non hai URI de vídeo"
-
-#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
-#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
-#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
-#: ../src/totem-video-thumbnailer.c:872
-#, c-format
-msgid ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-msgstr ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-
-#: ../src/totem-video-thumbnailer.c:873
-msgid "Filename"
-msgstr "Nome de ficheiro"
-
-#: ../src/totem-video-thumbnailer.c:875
-msgid "Resolution"
-msgstr "Resolución"
-
-#: ../src/totem-video-thumbnailer.c:878
-msgid "Duration"
-msgstr "Duración"
-
-#: ../src/totem-uri.c:506 ../src/plugins/chapters/totem-chapters.c:998
+#: ../src/totem-uri.c:343 ../src/plugins/chapters/totem-chapters.c:998
 msgid "All files"
 msgstr "Todos os ficheiros"
 
-#: ../src/totem-uri.c:511 ../src/plugins/chapters/totem-chapters.c:995
+#: ../src/totem-uri.c:348 ../src/plugins/chapters/totem-chapters.c:995
 msgid "Supported files"
 msgstr "Ficheiros compatíbeis"
 
-#: ../src/totem-uri.c:523
+#: ../src/totem-uri.c:360
 msgid "Audio files"
 msgstr "Ficheiros de son"
 
-#: ../src/totem-uri.c:531
+#: ../src/totem-uri.c:368
 msgid "Video files"
 msgstr "Ficheiros de vídeo"
 
-#: ../src/totem-uri.c:541
+#: ../src/totem-uri.c:378
 msgid "Subtitle files"
 msgstr "Subtítulos"
 
-#: ../src/totem-uri.c:593
+#: ../src/totem-uri.c:430
 msgid "Select Text Subtitles"
 msgstr "Seleccionar subtítulos de texto"
 
-#: ../src/totem-uri.c:656
+#: ../src/totem-uri.c:495
 msgid "Select Movies or Playlists"
 msgstr "Seleccionar os filmes ou as listas de reprodución"
 
-#. Options parsing
-#: ../src/totem.c:201
-msgid "- Play movies and songs"
-msgstr "- Reproducir filmes e cancións"
-
-#: ../src/totem.c:212
-#, c-format
-msgid ""
-"%s\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"%s\n"
-"Executar '%s --help' para ver a lista de opcións da liña de ordes "
-"dispoñíbeis.\n"
-
-#: ../src/totem.c:254 ../src/totem.c:265
-#: ../browser-plugin/totem-plugin-viewer.c:663
-#: ../browser-plugin/totem-plugin-viewer.c:1793
-msgid "Totem Movie Player"
-msgstr "Reprodutor de filmes Totem"
-
-#: ../src/totem.c:255 ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Could not initialize the thread-safe libraries."
-msgstr "Non foi posíbel inicializar as bibliotecas de fío seguro."
-
-#: ../src/totem.c:255
-msgid "Verify your system installation. Totem will now exit."
-msgstr "Verifique a instalación do seu sistema. O Totem sairá agora."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:1589
-msgid "Password requested for RTSP server"
-msgstr "O contrasinal foi solicitado polo servidor RTSP"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2858
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2862
-#, c-format
-msgid "Audio Track #%d"
-msgstr "Pista de son #%d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2890
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2894
-#, c-format
-msgid "Subtitle #%d"
-msgstr "Subtítulo #%d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3298
-msgid ""
-"The requested audio output was not found. Please select another audio output "
-"in the Multimedia Systems Selector."
-msgstr ""
-"Non se localizou a saída de son solicitada. Seleccione outra saída de son no "
-"Selector de sistemas multimedia."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3303
-msgid "Location not found."
-msgstr "Non se atopou a localización."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3307
-msgid ""
-"Could not open location; you might not have permission to open the file."
-msgstr ""
-"Non foi posíbel abrir a localización; pode que non teña permiso para abrir o "
-"ficheiro."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3318
-msgid ""
-"The video output is in use by another application. Please close other video "
-"applications, or select another video output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"Outro aplicativo está usando a saída de vídeo. Peche os outros aplicativos "
-"de vídeo ou seleccione outra saída de vídeo no Selector de sistemas "
-"multimedia."
+#: ../src/totem-uri.c:499
+msgid "Add Directory"
+msgstr "Engadir cartafol"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3324
-msgid ""
-"The audio output is in use by another application. Please select another "
-"audio output in the Multimedia Systems Selector. You may want to consider "
-"using a sound server."
-msgstr ""
-"Outro aplicativo está usando a saída de son. Seleccione outra saída de son "
-"no Selector de sistemas multimedia. Pode que deba considerar o uso dun "
-"servidor de son."
+#: ../src/totem-video-list.c:330
+msgid "No video URI"
+msgstr "Non hai URI de vídeo"
 
-#. should be exactly one missing thing (source or converter)
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3342
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3348
+#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
+#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
+#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
+#: ../src/totem-video-thumbnailer.c:841
 #, c-format
-msgid "The playback of this movie requires a %s plugin which is not installed."
-msgid_plural ""
-"The playback of this movie requires the following decoders which are not "
-"installed:\n"
-"\n"
-"%s"
-msgstr[0] ""
-"A reprodución deste filme necesita o engadido %s que non está instalado."
-msgstr[1] ""
-"A reprodución deste filme necesita os engadidos %s que non están instalados."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3374
 msgid ""
-"Cannot play this file over the network. Try downloading it to disk first."
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 msgstr ""
-"Non foi posíbel reproducir este ficheiro a través da rede. Ténteo de novo "
-"descargándoo primeiro ao disco."
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5878
-msgid "Media contains no supported video streams."
-msgstr "O multimedia contén fluxos de vídeo non compatíbeis."
+#: ../src/totem-video-thumbnailer.c:842
+msgid "Filename"
+msgstr "Nome de ficheiro"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6052
-msgid ""
-"Failed to create a GStreamer play object. Please check your GStreamer "
-"installation."
-msgstr ""
-"Produciuse un fallo ao crear o obxecto de reprodución GStreamer. Comprobe a "
-"súa instalación de GStreamer."
+#: ../src/totem-video-thumbnailer.c:844
+msgid "Resolution"
+msgstr "Resolución"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6172
-msgid ""
-"Failed to open audio output. You may not have permission to open the sound "
-"device, or the sound server may not be running. Please select another audio "
-"output in the Multimedia Systems Selector."
-msgstr ""
-"Produciuse un fallo ao abrir a saída de son. Pode que non teña permiso para "
-"abrir o dispositivo de son ou que o servidor de son non estea funcionando. "
-"Seleccione outra saída de son no Selector de sistemas multimedia."
+#: ../src/totem-video-thumbnailer.c:847
+msgid "Duration"
+msgstr "Duración"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6192
-msgid ""
-"Could not find the audio output. You may need to install additional "
-"GStreamer plugins, or select another audio output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"Non foi posíbel atopar a saída de son. Pode que necesite instalar engadidos "
-"adicionais do GStreamer ou seleccionar outra saída de son no Selector de "
-"sistemas multimedia."
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:1
+msgid "Apple Trailers"
+msgstr "Trailers de Apple"
+
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:2
+msgid "Sets the user agent for the Apple Trailers site"
+msgstr "Estabelecer o axente de usuario para o sitio de Trailers de Apple"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:1
+msgid "Autoload Subtitles"
+msgstr "Cargar automaticamente subtítulos"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:2
+msgid "Autoloads text subtitles"
+msgstr "Carga automaticamente o texto dos subtitulos"
 
-#. hour:minutes:seconds
-#. Translators: This is a time format, like "9:05:02" for 9
-#. * hours, 5 minutes, and 2 seconds. You may change ":" to
-#. * the separator that your locale uses or use "%Id" instead
-#. * of "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:83 ../src/plugins/skipto/totem-time-entry.c:57
-#, c-format
-msgctxt "long time format"
-msgid "%d:%02d:%02d"
-msgstr "%d:%02d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
+msgid "Video Disc Recorder"
+msgstr "Gravadora de disco de vídeo"
 
-#. minutes:seconds
-#. Translators: This is a time format, like "5:02" for 5
-#. * minutes and 2 seconds. You may change ":" to the
-#. * separator that your locale uses or use "%Id" instead of
-#. * "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:92
-#, c-format
-msgctxt "short time format"
-msgid "%d:%02d"
-msgstr "%d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
+msgid "Records (S)VCDs or video DVDs"
+msgstr "Grava (S)VCD ou DVD de vídeo"
 
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:65
 msgid "_Create Video Disc..."
@@ -1994,38 +1841,21 @@
 msgid "Copy the currently playing (S)VCD"
 msgstr "Copiar o (S)VCD que se está a reproducir neste momento"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:129
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:136
 msgid "The video disc could not be duplicated."
 msgstr "O disco de vídeo podería non ser duplicado."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:131
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:276
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:138
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:283
 msgid "The movie could not be recorded."
 msgstr "Non foi posíbel gravar o filme."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:157
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:167
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:263
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:164
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:174
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:270
 msgid "Unable to write a project."
 msgstr "Resulta imposíbel escribir un proxecto."
 
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
-msgid "Video Disc Recorder"
-msgstr "Gravadora de disco de vídeo"
-
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
-msgid "Records (S)VCDs or video DVDs"
-msgstr "Grava (S)VCD ou DVD de vídeo"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:1
-#: ../src/plugins/chapters/totem-chapters.c:1139
-msgid "Chapters"
-msgstr "Capítulos"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:2
-msgid "Support chapter markers in movies."
-msgstr "Compatibilidade de marcadores de capítulos en filmes."
-
 #: ../src/plugins/chapters/chapters-edit.ui.h:1
 msgid "Name for new chapter:"
 msgstr "Nome para o novo capítulo:"
@@ -2082,6 +1912,15 @@
 msgid "Create a new chapter list for the movie"
 msgstr "Crea unha nova lista de capítulos para o filme"
 
+#: ../src/plugins/chapters/chapters.plugin.in.h:1
+#: ../src/plugins/chapters/totem-chapters.c:1139
+msgid "Chapters"
+msgstr "Capítulos"
+
+#: ../src/plugins/chapters/chapters.plugin.in.h:2
+msgid "Support chapter markers in movies"
+msgstr "Compatibilidade de marcadores de capítulos en filmes"
+
 #: ../src/plugins/chapters/totem-chapters.c:56
 #, c-format
 msgid ""
@@ -2187,15 +2026,38 @@
 msgid "The URI ‘%s’ is not supported."
 msgstr "O URI «%s» non é compatíbel."
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
-msgid "Instant Messenger status"
-msgstr "Estado da mensaxería instantánea"
+#: ../src/plugins/grilo/grilo.plugin.in.h:1
+msgid "Grilo Browser"
+msgstr "Navegador Grilo"
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
-msgid "Set your Instant Messenger status to away when a movie is playing"
+#: ../src/plugins/grilo/grilo.plugin.in.h:2
+msgid "A plugin to let you browse media content from various sources"
 msgstr ""
-"Estabelecer o estado do seu programa de mensaxería instantánea como ausente "
-"cando se está reproducindo un filme"
+"Un engadido que lle permite examinar o contido multimedia de varias orixes"
+
+#: ../src/plugins/grilo/grilo.ui.h:1
+msgid "Add to Playlist"
+msgstr "Engadir á lista de reprodución"
+
+#: ../src/plugins/grilo/grilo.ui.h:2
+msgid "Copy Location"
+msgstr "Copiar a localización"
+
+#: ../src/plugins/grilo/grilo.ui.h:3 ../src/plugins/grilo/totem-grilo.c:1184
+msgid "Browse"
+msgstr "Examinar"
+
+#: ../src/plugins/grilo/grilo.ui.h:4 ../src/plugins/grilo/totem-grilo.c:1227
+msgid "Search"
+msgstr "Buscar"
+
+#: ../src/plugins/grilo/totem-grilo.c:454
+msgid "Browse Error"
+msgstr "Erro ao examinar"
+
+#: ../src/plugins/grilo/totem-grilo.c:609
+msgid "Search Error"
+msgstr "Erro ao buscar"
 
 #: ../src/plugins/gromit/gromit.plugin.in.h:1
 msgid "Gromit Annotations"
@@ -2209,58 +2071,15 @@
 msgid "The gromit binary was not found."
 msgstr "Non se atopou o binario gromit."
 
-#. Add the interface to Totem's sidebar
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:1
-#: ../src/plugins/iplayer/iplayer.py:46
-msgid "BBC iPlayer"
-msgstr "iPlayer da BBC"
-
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:2
-msgid "Stream BBC programs from the last 7 days from the BBC iPlayer service."
-msgstr ""
-"Fluxo de programas da BBC dos últimos 7 días desde o servizo iPlayer da BBC."
-
-#: ../src/plugins/iplayer/iplayer.py:72
-msgid "Error listing channel categories"
-msgstr "Produciuse un erro ao mostrar as categorías de canles"
-
-#: ../src/plugins/iplayer/iplayer.py:73
-msgid ""
-"There was an unknown error getting the list of television channels available "
-"on BBC iPlayer."
-msgstr ""
-"Produciuse un erro descoñecido ao obter a lista das canles de televisión "
-"dispoñíbeis no iPlayer da BBC."
-
-#. Append a dummy child row so that the expander's visible; we can
-#. then queue off the expander to load the programme listing for this
-#. category
-#: ../src/plugins/iplayer/iplayer.py:84
-msgid "Loading…"
-msgstr "Cargando…"
-
-#. Translators: the "programme feed" is the list of TV shows
-#. available to watch online
-#: ../src/plugins/iplayer/iplayer.py:136
-msgid "Error getting programme feed"
-msgstr "Produciuse un erro ao recibir a fonte do programa"
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
+msgid "Instant Messenger Status"
+msgstr "Estado na mensaxería instantánea"
 
-#: ../src/plugins/iplayer/iplayer.py:137
-msgid ""
-"There was an error getting the list of programmes for this channel and "
-"category combination."
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
+msgid "Set your Instant Messenger status to away when a movie is playing"
 msgstr ""
-"Produciuse un erro ao obter a lista de programas para esta canle e "
-"combinación de categorías."
-
-#: ../src/plugins/iplayer/iplayer2.py:298
-msgid ""
-msgstr ""
-
-#: ../src/plugins/iplayer/iplayer2.py:299
-#, python-format
-msgid "Programme unavailable (\"%s\")"
-msgstr "O programa non está dispoñíbel («%s»)"
+"Estabelecer o estado do seu programa de mensaxería instantánea como ausente "
+"cando se está reproducindo un filme"
 
 #: ../src/plugins/lirc/lirc.plugin.in.h:1
 msgid "Infrared Remote Control"
@@ -2278,25 +2097,31 @@
 msgid "Couldn't read lirc configuration."
 msgstr "Non foi posíbel ler a configuración de lirc."
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
-msgid "Download Movie Subtitles"
-msgstr "Descargar os subtítulos do filme"
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:1
+msgid "Media Player Keys"
+msgstr "Teclas do reprodutor multimedia"
+
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:2
+msgid "Support additional media player keys"
+msgstr "Compatíbel coas teclas de reprodución multimedia adicionais"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
-msgid "Subtitle _language:"
-msgstr "Idioma dos subtítu_los:"
+#: ../src/plugins/ontop/ontop.plugin.in.h:1
+msgid "Always On Top"
+msgstr "Sempre en primeiro plano"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
-msgid "_Play with Subtitle"
-msgstr "Re_producir con subtítulo"
+#: ../src/plugins/ontop/ontop.plugin.in.h:2
+msgid "Keep the main window on top when playing a movie"
+msgstr ""
+"Mantén a xanela principal en primeiro plano cando se está reproducindo un "
+"filme"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:1
 msgid "Subtitle Downloader"
 msgstr "Descargador de subtítulos"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:2
-msgid "Look for subtitles for the currently playing movie."
-msgstr "Buscar os subtítulos do filme que se está a reproducir."
+msgid "Look for subtitles for the currently playing movie"
+msgstr "Buscar os subtítulos do filme executándose actualmente"
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:42
 msgid "Brazilian Portuguese"
@@ -2348,9 +2173,21 @@
 msgid "_Download Movie Subtitles…"
 msgstr "_Descargar os subtítulos do filme..."
 
-#: ../src/plugins/opensubtitles/opensubtitles.py:589
-msgid "Searching subtitles…"
-msgstr "Buscando subtítulos…"
+#: ../src/plugins/opensubtitles/opensubtitles.py:589
+msgid "Searching subtitles…"
+msgstr "Buscando subtítulos…"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
+msgid "Download Movie Subtitles"
+msgstr "Descargar os subtítulos do filme"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
+msgid "Subtitle _language:"
+msgstr "Idioma dos subtítu_los:"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
+msgid "_Play with Subtitle"
+msgstr "Re_producir con subtítulo"
 
 #: ../src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in.h:1
 msgid "Subtitle language"
@@ -2360,83 +2197,18 @@
 msgid "The language to search for subtitles for movies in."
 msgstr "O idioma no que buscar os subtítulos para os filmes"
 
-#: ../src/plugins/ontop/ontop.plugin.in.h:1
-msgid "Always On Top"
-msgstr "Sempre en primeiro plano"
-
-#: ../src/plugins/ontop/ontop.plugin.in.h:2
-msgid "Keep the main window on top when playing a movie"
-msgstr ""
-"Mantén a xanela principal en primeiro plano cando se está reproducindo un "
-"filme"
+#: ../src/plugins/properties/movie-properties.plugin.in.h:1
+msgid "Movie Properties"
+msgstr "Propiedades do filme"
+
+#: ../src/plugins/properties/movie-properties.plugin.in.h:2
+msgid "Adds movie properties to the sidebar"
+msgstr "Engade as propiedades do filme á barra lateral"
 
 #: ../src/plugins/properties/totem-movie-properties.c:246
 msgid "Properties"
 msgstr "Propiedades"
 
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:1
-msgid "Publisher protocol to use"
-msgstr "Protocolo de publicación que usar"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:2
-msgid ""
-"The transport protocol to use when publishing playlists over the network."
-msgstr ""
-"O protocolo de transporte que usar para a publicación de listas de "
-"reprodución en rede."
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:3
-msgid "Format for network service name"
-msgstr "Formato para o nome de servizo de rede"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:5
-#, no-c-format
-msgid ""
-"A format string used to build the network service name used when publishing "
-"playlists over the network. The following format placeholders can be used: • "
-"%a: the program name as returned by g_get_application_name() • %h: the "
-"machine's host name in title case • %u: the user's login name in title case "
-"• %U: the user's real name • %%: the percent sign"
-msgstr ""
-"Unha cadea de formato usada para construír o nome do servizo de rede ao "
-"publicar listas de reprodución en rede. Pódense usar os seguintes marcadores "
-"de posición de formato: • %a: o nome do programa como o devolve "
-"g_get_application_name() • %h: o nome do servidor en caso de título • %u: o "
-"nome de inicio de sesión en caso de título • %U: o nome real do usuario • %"
-"%: o símbolo de porcentaxe"
-
-#. Translators: computers on the local network which are publishing their playlists over the network
-#: ../src/plugins/publish/totem-publish.c:552
-msgid "Neighbors"
-msgstr "Veciños"
-
-#: ../src/plugins/publish/publish.plugin.in.h:1
-msgid "Publish Playlist"
-msgstr "Publicar a lista de reprodución"
-
-#: ../src/plugins/publish/publish.plugin.in.h:2
-msgid "Share the current playlist via HTTP"
-msgstr "Compartir a lista de reprodución actual vía HTTP"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:1
-msgid "Service _Name:"
-msgstr "_Nome do servizo:"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:3
-#, no-c-format
-msgid ""
-"The name used for announcing the playlist service on the network.\n"
-"All occurrences of the string %u will be replaced by your name,\n"
-"and %h will be replaced by your computer's host name."
-msgstr ""
-"O nome usado para anunciar o servizo das listas de reprodución na rede.\n"
-"Todas as aparicións da cadea%u substituiranse co seu nome,\n"
-"e %h substituirase co nome do nome de host do seu computador."
-
-#: ../src/plugins/publish/publish-plugin.ui.h:6
-msgid "Use _encrypted transport protocol (HTTPS)"
-msgstr "Usar protocolo de transporte ci_frado (HTTPS)"
-
 #: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:1
 msgid "rpdb2 password"
 msgstr "Contrasinal para rpdb2"
@@ -2450,22 +2222,88 @@
 "remotos non autorizados. Se está baleiro, usarase o valor por omisión "
 "«totem»."
 
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
+msgid "Python Console"
+msgstr "Consola de Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
+msgid "Interactive Python console"
+msgstr "Consola interactiva de Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:88
+msgid "Python Console Menu"
+msgstr "Menú da consola de Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:93
+msgid "_Python Console"
+msgstr "Consola de _Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:94
+msgid "Show Totem's Python console"
+msgstr "Mostra a consola de Python de Totem"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:100
+msgid "Python Debugger"
+msgstr "Depurador de Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:101
+msgid "Enable remote Python debugging with rpdb2"
+msgstr "Activar o depurador remoto de Python con rpdb2"
+
+#. pylint: disable-msg=E1101
+#: ../src/plugins/pythonconsole/pythonconsole.py:125
+#, python-format
+msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
+msgstr "Pode acceder ao obxecto Totem por medio de 'totem_object' :\\n%s"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:129
+msgid "Totem Python Console"
+msgstr "Consola de Python de Totem"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:139
+msgid ""
+"After you press OK, Totem will wait until you connect to it with winpdb or "
+"rpdb2. If you have not set a debugger password in DConf, it will use the "
+"default password ('totem')."
+msgstr ""
+"Despois de que prema Aceptar, Totem esperará até que se conecte con winpdb "
+"ou rpdb2. Se non estabeleceu un contrasinal para o depurador en DConf, "
+"usarase o contrasinal por omisión («totem»)."
+
+#: ../src/plugins/recent/recent.plugin.in.h:1
+msgid "Recent files"
+msgstr "Ficheiros recentes"
+
+#: ../src/plugins/recent/recent.plugin.in.h:2
+msgid "Adds files that have been played to recent files"
+msgstr "Engadir ficheiros que xa se reproduciron aos ficheiros recentes"
+
 #: ../src/plugins/rotation/rotation.plugin.in.h:1
 msgid "Rotation Plugin"
 msgstr "Engadido de rotación"
 
 #: ../src/plugins/rotation/rotation.plugin.in.h:2
-msgid "Allows videos to be rotated if they're in the wrong orientation."
-msgstr "Permite rotar os vídeos se non teñen a orientación correcta."
+msgid "Allows videos to be rotated if they are in the wrong orientation"
+msgstr ""
+"Permítelle aos vídeos que se poidan rotar se teñen unha orientación "
+"incorrecta"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:60
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:50
 msgid "_Rotate Clockwise"
 msgstr "_Rotar en sentido horario"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:62
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:52
 msgid "Rotate Counterc_lockwise"
 msgstr "Rotar en sentido _antihorario"
 
+#: ../src/plugins/save-file/save-file.plugin.in.h:1
+msgid "Save Copy"
+msgstr "Gardar unha copia"
+
+#: ../src/plugins/save-file/save-file.plugin.in.h:2
+msgid "Save a copy of the currently playing movie"
+msgstr "Garda unha copia do filme reproducíndose actualmente"
+
 #: ../src/plugins/save-file/totem-save-file.c:63
 msgid "Save a Copy..."
 msgstr "Gardar unha copia…"
@@ -2488,10 +2326,13 @@
 msgid "Movie stream"
 msgstr "Fluxo de filme"
 
-#: ../src/plugins/screensaver/totem-screensaver.c:116
-#: ../browser-plugin/totem-plugin-viewer.c:1891
-msgid "Playing a movie"
-msgstr "Reproducindo un filme"
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:1
+msgid "Screen Saver"
+msgstr "Protector de pantalla"
+
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:2
+msgid "Deactivates the screen saver when a movie is playing"
+msgstr "Desactivar o protector de pantalla ao reproducir un filme"
 
 #: ../src/plugins/screenshot/gallery.ui.h:1
 msgid "Screenshot width (in pixels):"
@@ -2505,23 +2346,28 @@
 msgid "Number of screenshots:"
 msgstr "Número de capturas de pantalla:"
 
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:1
-msgid "_Name:"
-msgstr "_Nome:"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:2
-msgid "Save in _folder:"
-msgstr "Gardar no _cartafol:"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:3
-msgid "Select a folder"
-msgstr "Seleccione un cartafol"
-
-#. Write the screenshot to the temporary file
-#: ../src/plugins/screenshot/gnome-screenshot-widget.c:385
-#: ../src/plugins/screenshot/totem-screenshot.c:64
-msgid "Screenshot.png"
-msgstr "Captura de pantalla.png"
+#. translators: this is the name of the file that gets made up
+#. * with the screenshot if the entire screen is taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:147
+#, c-format
+msgid "Screenshot from %s.png"
+msgstr "Captura de pantalla desde %s.png"
+
+#. translators: this is the name of the file that gets
+#. * made up with the screenshot if the entire screen is
+#. * taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:154
+#, c-format
+msgid "Screenshot from %s - %d.png"
+msgstr "Captura desde %s - %d.png"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:1
+msgid "Screenshot"
+msgstr "Captura de pantalla"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:2
+msgid "Allows screenshots and galleries to be taken of videos"
+msgstr "Permite que se fagan capturas de pantalla e galerías dun vídeo"
 
 #: ../src/plugins/screenshot/totem-gallery.c:91
 msgid "Save Gallery"
@@ -2547,49 +2393,47 @@
 msgid "Saving gallery as \"%s\""
 msgstr "Gardando a galería como «%s»"
 
-#: ../src/plugins/screenshot/totem-screenshot.c:113
-msgid "There was an error saving the screenshot."
-msgstr "Produciuse un erro ao gardar a captura de pantalla."
-
-#: ../src/plugins/screenshot/totem-screenshot.c:139
-msgid "Save Screenshot"
-msgstr "Gardar a captura de pantalla"
-
-#. Create the screenshot widget
-#. Translators: %s is the movie title and %d is an auto-incrementing number to make filename unique
-#: ../src/plugins/screenshot/totem-screenshot.c:160
-#, c-format
-msgid "Screenshot-%s-%d.png"
-msgstr "Captura-%s-%d.png"
-
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:88
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:220
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "Totem could not get a screenshot of the video."
 msgstr "O Totem non puido obter unha captura do vídeo."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "This is not supposed to happen; please file a bug report."
 msgstr "Suponse que isto non debe ocorrer; escriba un informe de erros."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
-msgid "Take _Screenshot..."
-msgstr "Facer unha _captura de pantalla…"
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
+msgid "Take _Screenshot"
+msgstr "Facer _captura de pantalla"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
 msgid "Take a screenshot"
 msgstr "Facer unha captura de pantalla-"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create Screenshot _Gallery..."
 msgstr "Crear unha _galería de capturas…"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create a gallery of screenshots"
 msgstr "Crear unha galería coas capturas"
 
+#: ../src/plugins/skipto/skipto.plugin.in.h:1
+#: ../src/plugins/skipto/totem-skipto.c:196
+msgid "Skip To"
+msgstr "Saltar a"
+
+#: ../src/plugins/skipto/skipto.plugin.in.h:2
+msgid "Provides the \"Skip to\" dialog"
+msgstr "Fornece o diálogo «Saltar a»"
+
+#: ../src/plugins/skipto/skipto.ui.h:1
+msgid "_Skip to:"
+msgstr "_Salta a:"
+
 #. Update the "seconds" label so that it always has the correct singular/plural form
 #. Translators: label for the seconds selector in the "Skip to" dialogue
-#: ../src/plugins/skipto/totem-skipto.c:160
+#: ../src/plugins/skipto/totem-skipto.c:159
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "segundo"
@@ -2599,15 +2443,11 @@
 #. Translators: you should translate this string to a number (written in digits) which corresponds to the longer character length of the
 #. * translations for "second" and "seconds", as translated elsewhere in this file. For example, in English, "second" is 6 characters long and
 #. * "seconds" is 7 characters long, so this string should be translated to "7". See: bgo#639398
-#: ../src/plugins/skipto/totem-skipto.c:190
+#: ../src/plugins/skipto/totem-skipto.c:189
 msgctxt "Skip To label length"
 msgid "7"
 msgstr "8"
 
-#: ../src/plugins/skipto/totem-skipto.c:197
-msgid "Skip To"
-msgstr "Saltar a"
-
 #: ../src/plugins/skipto/totem-skipto-plugin.c:182
 msgid "_Skip To..."
 msgstr "_Saltar a…"
@@ -2616,117 +2456,315 @@
 msgid "Skip to a specific time"
 msgstr "Saltar a un tempo específico"
 
-#: ../src/plugins/skipto/skipto.ui.h:1
-msgid "_Skip to:"
-msgstr "_Salta a:"
+#~ msgid ""
+#~ msgstr ""
 
-#: ../browser-plugin/totem-plugin-viewer.c:431
-msgid "No URI to play"
-msgstr "Non hai un URI para reproducir"
+#~ msgid "Programme unavailable (\"%s\")"
+#~ msgstr "O programa non está dispoñíbel («%s»)"
 
-#. translators: this is:
-#. * Open With ApplicationName
-#. * as in nautilus' right-click menu
-#: ../browser-plugin/totem-plugin-viewer.c:1107
-#, c-format
-msgid "_Open with \"%s\""
-msgstr "_Abrir con «%s»"
+#~ msgid "BBC iPlayer"
+#~ msgstr "iPlayer da BBC"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2136
-msgid "No playlist or playlist empty"
-msgstr ""
-"Ou non hai ningunha lista de reprodución ou a lista de reprodución está "
-"baleira"
+#~ msgid ""
+#~ "Stream BBC programs from the last 7 days from the BBC iPlayer service"
+#~ msgstr ""
+#~ "Fluxo de programas da BBC dos últimos 7 días desde o servizo iPlayer da "
+#~ "BBC"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2235
-msgid "Movie browser plugin"
-msgstr "Engadido de navegador para filmes"
+#~ msgid "Error listing channel categories"
+#~ msgstr "Produciuse un erro ao mostrar as categorías de canles"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Verify your system installation. The Totem plugin will now exit."
-msgstr ""
-"Verifique a instalación do seu sistema. O engadido do Totem sairá agora."
+#~ msgid ""
+#~ "There was an unknown error getting the list of television channels "
+#~ "available on BBC iPlayer."
+#~ msgstr ""
+#~ "Produciuse un erro descoñecido ao obter a lista das canles de televisión "
+#~ "dispoñíbeis no iPlayer da BBC."
 
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
-msgid "Python Console"
-msgstr "Consola de Python"
+#~ msgid "Loading…"
+#~ msgstr "Cargando…"
 
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
-msgid "Interactive Python console."
-msgstr "Consola interactiva de Python."
+#~ msgid "Error getting programme feed"
+#~ msgstr "Produciuse un erro ao recibir a fonte do programa"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:88
-msgid "Python Console Menu"
-msgstr "Menú da consola de Python"
+#~ msgid ""
+#~ "There was an error getting the list of programmes for this channel and "
+#~ "category combination."
+#~ msgstr ""
+#~ "Produciuse un erro ao obter a lista de programas para esta canle e "
+#~ "combinación de categorías."
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:93
-msgid "_Python Console"
-msgstr "Consola de _Python"
+#~ msgid "Location not found."
+#~ msgstr "Non se atopou a localización."
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:94
-msgid "Show Totem's Python console"
-msgstr "Mostra a consola de Python de Totem"
+#~ msgid ""
+#~ "Could not open location; you might not have permission to open the file."
+#~ msgstr ""
+#~ "Non foi posíbel abrir a localización; pode que non teña permiso para "
+#~ "abrir o ficheiro."
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:100
-msgid "Python Debugger"
-msgstr "Depurador de Python"
+#~ msgid ""
+#~ "Failed to create a GStreamer play object. Please check your GStreamer "
+#~ "installation."
+#~ msgstr ""
+#~ "Produciuse un fallo ao crear o obxecto de reprodución GStreamer. Comprobe "
+#~ "a súa instalación de GStreamer."
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:101
-msgid "Enable remote Python debugging with rpdb2"
-msgstr "Activar o depurador remoto de Python con rpdb2"
+#~ msgid "%d %%"
+#~ msgstr "%d %%"
 
-#. pylint: disable-msg=E1101
-#: ../src/plugins/pythonconsole/pythonconsole.py:125
-#, python-format
-msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
-msgstr "Pode acceder ao obxecto Totem por medio de 'totem_object' :\\n%s"
+#~ msgid "_Name:"
+#~ msgstr "_Nome:"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:129
-msgid "Totem Python Console"
-msgstr "Consola de Python de Totem"
+#~ msgid "Save in _folder:"
+#~ msgstr "Gardar no _cartafol:"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:139
-msgid ""
-"After you press OK, Totem will wait until you connect to it with winpdb or "
-"rpdb2. If you have not set a debugger password in DConf, it will use the "
-"default password ('totem')."
-msgstr ""
-"Despois de que prema Aceptar, Totem esperará até que se conecte con winpdb "
-"ou rpdb2. Se non estabeleceu un contrasinal para o depurador en DConf, "
-"usarase o contrasinal por omisión («totem»)."
+#~ msgid "Select a folder"
+#~ msgstr "Seleccione un cartafol"
 
-#: ../src/plugins/grilo/grilo.plugin.in.h:1
-msgid "Grilo Browser"
-msgstr "Navegador Grilo"
+#~ msgid "There was an error saving the screenshot."
+#~ msgstr "Produciuse un erro ao gardar a captura de pantalla."
 
-#: ../src/plugins/grilo/grilo.plugin.in.h:2
-msgid "A plugin to let you browse media content from various sources."
-msgstr ""
-"Un engadido que lle permite examinar o contido multimedia de varias orixes."
+#~ msgid "Save Screenshot"
+#~ msgstr "Gardar a captura de pantalla"
 
-#: ../src/plugins/grilo/totem-grilo.c:452
-msgid "Browse Error"
-msgstr "Erro ao examinar"
+#~ msgid "14.4 Kbps Modem"
+#~ msgstr "14.4 Kbps Módem"
 
-#: ../src/plugins/grilo/totem-grilo.c:599
-msgid "Search Error"
-msgstr "Erro ao buscar"
+#~ msgid "19.2 Kbps Modem"
+#~ msgstr "19.2 Kbps Módem"
 
-#: ../src/plugins/grilo/totem-grilo.c:1219 ../src/plugins/grilo/grilo.ui.h:3
-msgid "Browse"
-msgstr "Examinar"
+#~ msgid "28.8 Kbps Modem"
+#~ msgstr "28.8 Kbps Módem"
 
-#: ../src/plugins/grilo/totem-grilo.c:1285 ../src/plugins/grilo/grilo.ui.h:4
-msgid "Search"
-msgstr "Buscar"
+#~ msgid "33.6 Kbps Modem"
+#~ msgstr "33.6 Kbps Módem"
 
-#: ../src/plugins/grilo/grilo.ui.h:1
-msgid "Add to Playlist"
-msgstr "Engadir á lista de reprodución"
+#~ msgid "34.4 Kbps Modem"
+#~ msgstr "34.4 Kbps Módem"
 
-#: ../src/plugins/grilo/grilo.ui.h:2
-msgid "Copy Location"
-msgstr "Copiar a localización"
+#~ msgid "56 Kbps Modem/ISDN"
+#~ msgstr "56 Kbps Módem/ISDN"
+
+#~ msgid "112 Kbps Dual ISDN/DSL"
+#~ msgstr "112 Kbps Dual ISDN/DSL"
+
+#~ msgid "256 Kbps DSL/Cable"
+#~ msgstr "256 Kbps DSL/Cable"
+
+#~ msgid "384 Kbps DSL/Cable"
+#~ msgstr "384 Kbps DSL/Cable"
+
+#~ msgid "512 Kbps DSL/Cable"
+#~ msgstr "512 Kbps DSL/Cable"
+
+#~ msgid "1.5 Mbps T1/Intranet/LAN"
+#~ msgstr "1.5 Mbps T1/Intranet/LAN"
+
+#~ msgid "Intranet/LAN"
+#~ msgstr "Intranet/LAN"
+
+#~ msgid "Networking"
+#~ msgstr "Rede"
+
+#~ msgid "Connection _speed:"
+#~ msgstr "_Velocidade de conexión:"
+
+#~ msgid "Network connection speed"
+#~ msgstr "Velocidade de conexión á rede"
+
+#~ msgid ""
+#~ "Approximate network connection speed, used to select quality on media "
+#~ "over the network."
+#~ msgstr ""
+#~ "Velocidade da conexión de rede aproximada, usado para seleccionar a "
+#~ "calidade dos ficheiros e fluxos multimedia sobre a rede."
+
+#~ msgid "Play movies and songs"
+#~ msgstr "Reproducir filmes e cancións"
+
+#~ msgid "Movie Player using %s"
+#~ msgstr "Reprodutor de filmes utilizando %s"
+
+#~ msgid "Open a file"
+#~ msgstr "Abrir un ficheiro"
+
+#~ msgid "Open a non-local file"
+#~ msgstr "Abrir un ficheiro non local"
+
+#~ msgid "Quit the program"
+#~ msgstr "Saír do programa"
+
+#~ msgid "Configure the application"
+#~ msgstr "Configurar o aplicativo"
+
+#~ msgid "Switch to fullscreen"
+#~ msgstr "Cambiar a pantalla completa"
+
+#~ msgid "Set the repeat mode"
+#~ msgstr "Estabelecer o modo de repetición"
+
+#~ msgid "Set the shuffle mode"
+#~ msgstr "Estabelecer o modo aleatorio"
+
+#~ msgid "Play Image '%s'"
+#~ msgstr "Reproducir imaxe «%s»"
+
+#~ msgid "device%d"
+#~ msgstr "dispositivo%d"
+
+#~ msgid "Play Disc '%s'"
+#~ msgstr "Reproducir o disco «%s»"
+
+#~ msgid ""
+#~ "Totem could not play this media (%s) although a plugin is present to "
+#~ "handle it."
+#~ msgstr ""
+#~ "O Totem non puido reproducir este medio (%s) aínda que hai un engadido "
+#~ "instalado que pode manipulalo."
+
+#~ msgid ""
+#~ "You might want to check that a disc is present in the drive and that it "
+#~ "is correctly configured."
+#~ msgstr ""
+#~ "Comprobe que hai un disco no dispositivo e que está correctamente "
+#~ "configurado."
+
+#~ msgid "More information about media plugins"
+#~ msgstr "Máis información sobre os engadidos de medios"
+
+#~ msgid ""
+#~ "Please install the necessary plugins and restart Totem to be able to play "
+#~ "this media."
+#~ msgstr ""
+#~ "Instale os engadidos necesarios e reinicie o Totem para poder reproducir "
+#~ "este medio."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it does not have the "
+#~ "appropriate plugins to be able to read from the disc."
+#~ msgstr ""
+#~ "O Totem non pode reproducir este tipo de medio (%s) porque non ten os "
+#~ "engadidos axeitados para ler do disco."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because you do not have the "
+#~ "appropriate plugins to handle it."
+#~ msgstr ""
+#~ "O Totem non pode reproducir este tipo de medio (%s) porque non ten os "
+#~ "engadidos axeitados para manipulalo."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it is not supported."
+#~ msgstr ""
+#~ "O Totem non pode reproducir este tipo de medio (%s) porque non é "
+#~ "compatíbel."
+
+#~ msgid "Please insert another disc to play back."
+#~ msgstr "Insira outro disco para reproducir."
+
+#~ msgid "Totem does not support playback of Audio CDs"
+#~ msgstr "Totem non permite a reprodución de CD de son"
+
+#~ msgid ""
+#~ "Please consider using a music player or a CD extractor to play this CD"
+#~ msgstr ""
+#~ "Considere usar un reprodutor de música ou un extractor de CD para "
+#~ "reproducir este CD"
+
+#~ msgid ""
+#~ "The requested audio output was not found. Please select another audio "
+#~ "output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "Non se localizou a saída de son solicitada. Seleccione outra saída de son "
+#~ "no Selector de sistemas multimedia."
+
+#~ msgid ""
+#~ "The video output is in use by another application. Please close other "
+#~ "video applications, or select another video output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "Outro aplicativo está usando a saída de vídeo. Peche os outros "
+#~ "aplicativos de vídeo ou seleccione outra saída de vídeo no Selector de "
+#~ "sistemas multimedia."
+
+#~ msgid ""
+#~ "The audio output is in use by another application. Please select another "
+#~ "audio output in the Multimedia Systems Selector. You may want to consider "
+#~ "using a sound server."
+#~ msgstr ""
+#~ "Outro aplicativo está usando a saída de son. Seleccione outra saída de "
+#~ "son no Selector de sistemas multimedia. Pode que deba considerar o uso "
+#~ "dun servidor de son."
+
+#~ msgid ""
+#~ "Failed to open audio output. You may not have permission to open the "
+#~ "sound device, or the sound server may not be running. Please select "
+#~ "another audio output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "Produciuse un fallo ao abrir a saída de son. Pode que non teña permiso "
+#~ "para abrir o dispositivo de son ou que o servidor de son non estea "
+#~ "funcionando. Seleccione outra saída de son no Selector de sistemas "
+#~ "multimedia."
+
+#~ msgid ""
+#~ "Could not find the audio output. You may need to install additional "
+#~ "GStreamer plugins, or select another audio output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "Non foi posíbel atopar a saída de son. Pode que necesite instalar "
+#~ "engadidos adicionais do GStreamer ou seleccionar outra saída de son no "
+#~ "Selector de sistemas multimedia."
+
+#~ msgid "Publisher protocol to use"
+#~ msgstr "Protocolo de publicación que usar"
+
+#~ msgid ""
+#~ "The transport protocol to use when publishing playlists over the network."
+#~ msgstr ""
+#~ "O protocolo de transporte que usar para a publicación de listas de "
+#~ "reprodución en rede."
+
+#~ msgid "Format for network service name"
+#~ msgstr "Formato para o nome de servizo de rede"
+
+#~ msgid ""
+#~ "A format string used to build the network service name used when "
+#~ "publishing playlists over the network. The following format placeholders "
+#~ "can be used: • %a: the program name as returned by g_get_application_name"
+#~ "() • %h: the machine's host name in title case • %u: the user's login "
+#~ "name in title case • %U: the user's real name • %%: the percent sign"
+#~ msgstr ""
+#~ "Unha cadea de formato usada para construír o nome do servizo de rede ao "
+#~ "publicar listas de reprodución en rede. Pódense usar os seguintes "
+#~ "marcadores de posición de formato: • %a: o nome do programa como o "
+#~ "devolve g_get_application_name() • %h: o nome do servidor en caso de "
+#~ "título • %u: o nome de inicio de sesión en caso de título • %U: o nome "
+#~ "real do usuario • %%: o símbolo de porcentaxe"
+
+#~ msgid "Neighbors"
+#~ msgstr "Veciños"
+
+#~ msgid "Publish Playlist"
+#~ msgstr "Publicar a lista de reprodución"
+
+#~ msgid "Share the current playlist via HTTP"
+#~ msgstr "Compartir a lista de reprodución actual vía HTTP"
+
+#~ msgid "Service _Name:"
+#~ msgstr "_Nome do servizo:"
+
+#~ msgid ""
+#~ "The name used for announcing the playlist service on the network.\n"
+#~ "All occurrences of the string %u will be replaced by your name,\n"
+#~ "and %h will be replaced by your computer's host name."
+#~ msgstr ""
+#~ "O nome usado para anunciar o servizo das listas de reprodución na rede.\n"
+#~ "Todas as aparicións da cadea%u substituiranse co seu nome,\n"
+#~ "e %h substituirase co nome do nome de host do seu computador."
+
+#~ msgid "Use _encrypted transport protocol (HTTPS)"
+#~ msgstr "Usar protocolo de transporte ci_frado (HTTPS)"
 
 #~ msgid "Bemused"
 #~ msgstr "Bemused"
@@ -2755,9 +2793,6 @@
 #~ msgid "Search Results"
 #~ msgstr "Resultados da busca"
 
-#~ msgid "Videos"
-#~ msgstr "Vídeos"
-
 #~ msgid "_Open in Web Browser"
 #~ msgstr "_Abrir no navegador web"
 
diff -Nru totem-3.4.3/po/gu.po totem-3.6.2/po/gu.po
--- totem-3.4.3/po/gu.po	2012-04-02 14:15:40.000000000 +0000
+++ totem-3.6.2/po/gu.po	2012-10-25 13:15:32.000000000 +0000
@@ -7,10 +7,11 @@
 "Project-Id-Version: gu\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
 "cgi?product=totem&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-03-22 23:18+0000\n"
-"PO-Revision-Date: 2012-03-26 16:23+0530\n"
+"POT-Creation-Date: 2012-09-15 21:46+0000\n"
+"PO-Revision-Date: 2012-09-17 11:30+0530\n"
 "Last-Translator: \n"
 "Language-Team: gu_IN \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -38,14 +39,222 @@
 "\n"
 "\n"
 
+#: ../browser-plugin/totem-plugin-viewer.c:352 ../src/totem-object.c:1180
+#: ../src/totem-object.c:1650 ../src/totem-statusbar.c:115
+msgid "Stopped"
+msgstr "બંધ થયેલ છે"
+
+#: ../browser-plugin/totem-plugin-viewer.c:364 ../src/totem-object.c:1173
+msgid "Paused"
+msgstr "અટકાવાયેલ છે"
+
+#: ../browser-plugin/totem-plugin-viewer.c:368 ../src/totem-object.c:1166
+msgid "Playing"
+msgstr "વગાડી રહ્યા છીએ"
+
+#: ../browser-plugin/totem-plugin-viewer.c:386
+#: ../src/plugins/screensaver/totem-screensaver.c:97
+msgid "Playing a movie"
+msgstr "ચિત્રપટ વગાડી રહ્યા છીએ"
+
+#: ../browser-plugin/totem-plugin-viewer.c:443
+msgid "No URI to play"
+msgstr "વગાડવા માટે કોઈ URI નથી"
+
+#: ../browser-plugin/totem-plugin-viewer.c:676
+#: ../browser-plugin/totem-plugin-viewer.c:1700
+msgid "Totem Movie Player"
+msgstr "ટોટેમ ચિત્રપટ પ્લેયર"
+
+#. translators: this is:
+#. * Open With ApplicationName
+#. * as in nautilus' right-click menu
+#: ../browser-plugin/totem-plugin-viewer.c:1120
+#, c-format
+msgid "_Open with \"%s\""
+msgstr "\"%s\" સાથે ખોલો (_O)"
+
+#: ../browser-plugin/totem-plugin-viewer.c:1341 ../src/totem-object.c:2475
+msgid "An error occurred"
+msgstr "ભૂલ ઉદ્દભવી"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2033
+msgid "No playlist or playlist empty"
+msgstr "વગાડવાની યાદી નથી અથવા વગાડવાની યાદી ખાલી છે"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2128
+msgid "Movie browser plugin"
+msgstr "મુવી બ્રાઉઝર પ્લગઈન"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144 ../src/totem.c:240
+msgid "Could not initialize the thread-safe libraries."
+msgstr "થ્રેડ-સુરક્ષા લાઈબ્રેરીઓનો પ્રારંભ કરી શક્યા નહિં."
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144
+msgid "Verify your system installation. The Totem plugin will now exit."
+msgstr "તમારા સિસ્ટમ સ્થાપનની ખાતરી કરો. ટોટેમ પ્લગઈન હવે બંધ થઈ જશે."
+
 #: ../data/fullscreen.ui.h:1
 msgid "Leave Fullscreen"
 msgstr "પૂર્ણ સ્ક્રીન ને છોડી દો"
 
-#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:144
+#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:81
 msgid "Time:"
 msgstr "સમય:"
 
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
+msgid "Allow the screensaver to activate when playing audio"
+msgstr "જ્યારે ફક્ત ઓડિઓ વગાડી રહ્યા છે ત્યારે સક્રિય કરવા માટે સ્ક્રીનસેવર ને પરવાનગી આપો"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
+msgid ""
+"Allow the screensaver to activate when playing audio. Disable if you have "
+"monitor-powered speakers."
+msgstr ""
+"જ્યારે ફક્ત ઓડિયો વગાડી રહ્યા હોય ત્યારે સ્ક્રીનસેવર ને સક્રિય કરવાની પરવાનગી આપો. જો "
+"તમે મોનિટર પાવર થયેલ બોલનારાઓ છો તો નિષ્ક્રિય કરો."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
+msgid "Show visual effects when no video is displayed"
+msgstr "જ્યારે કોઈ વિડિઓ પ્રદર્શિત નહિં થાય ત્યાં સુધી દ્રશ્ય અસરો બતાવો"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
+msgid "Show visual effects when playing an audio only file."
+msgstr "જ્યારે માત્ર ઓડિયો ફાઈલ વગાડી રહ્યા હોય ત્યારે દ્રશ્ય અસરો બતાવો."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
+msgid "Name of the visual effects plugin"
+msgstr "દ્રશ્ય અસરો પ્લગઈનોનું નામ"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
+msgid "The brightness of the video"
+msgstr "વિડિઓની તેજસ્વીતા"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
+msgid "The contrast of the video"
+msgstr "વિડિઓનો વિરોધાભાસ"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
+msgid "The hue of the video"
+msgstr "વિડિઓનું હ્યુ"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
+msgid "The saturation of the video"
+msgstr "વિડિઓનું સેચ્યુરેશન"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
+msgid "Resize the canvas automatically on file load"
+msgstr "ફાઈલ લાવવા પર કેનવાસનું માપ આપોઆપ બદલો"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
+msgid "Repeat mode"
+msgstr "પુનરાવર્તિત સ્થિતિ"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
+msgid "Shuffle mode"
+msgstr "રેન્ડમ સ્થિતિ"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
+msgid "Whether to disable deinterlacing for interlaced movies"
+msgstr "ક્યાંતો અંતર્ગથિત ચિત્રપટો માટે અંતર્ગથિત ન કરવાનું નિષ્ક્રિય કરો"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
+msgid "Whether to enable debug for the playback engine"
+msgstr "વગાડતા એંજિન માટે શું ડિબગ સક્રિય કરવું"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
+msgid "Type of audio output to use"
+msgstr "વાપરવા માટેના ઓડિયો આઉટપુટનો પ્રકાર"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
+msgid "Visualization quality setting"
+msgstr "કાલ્પનિક ગુણવત્તા સુયોજન"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
+msgid "Quality setting for the audio visualization."
+msgstr "ઓડિયો વિઝ્યુલાઇઝેશન માટે ગુણવત્તા સુયોજન."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
+msgid "Network buffering threshold"
+msgstr "નેટવર્ક બફરીંગ થ્રેશોલ્ડ"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
+msgid ""
+"Amount of data to buffer for network streams before starting to display the "
+"stream (in seconds)."
+msgstr ""
+"નેટવર્ક સ્ટ્રીમો માટે સ્ટ્રીમ દર્શાવવા પહેલાં બફર કરવાની માહિતીનો જથ્થો (સેકન્ડોમાં)."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
+msgid "Subtitle font"
+msgstr "ઉપશીર્ષક ફોન્ટ"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
+msgid "Pango font description for subtitle rendering."
+msgstr "ઉપશીર્ષક રેન્ડરીંગ માટે પેન્ગો ફોન્ટ વર્ણન"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
+msgid "Subtitle encoding"
+msgstr "ઉપશીર્ષક સંગ્રહપદ્ધતિ"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
+msgid "Encoding character set for subtitle."
+msgstr "ઉપશીર્ષક માટે સંગ્રહપદ્ધતિ અક્ષરસમૂહ"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
+msgid "Default location for the \"Open...\" dialogs"
+msgstr "\"Open...\" સંવાદો માટેનું મૂળભૂત સ્થાન"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
+msgid ""
+"Default location for the \"Open...\" dialogs. Default is the current "
+"directory."
+msgstr "\"ખોલો...\" સંવાદો માટેનું મૂળભૂત સ્થાન, વર્તમાન ડિરેક્ટરી મૂળભૂત છે."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
+msgid "Default location for the \"Take Screenshot\" dialogs"
+msgstr "\"Take Screenshot\" સંવાદો માટેનું મૂળભૂત સ્થાન"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
+msgid ""
+"Default location for the \"Take Screenshot\" dialogs. Default is the "
+"Pictures directory."
+msgstr "\"સ્ક્રીનશોટ લો\" સંવાદો માટેનું મૂળભૂત સ્થાન, મૂળભૂત ચિત્રો ડિરેક્ટરી છે."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
+msgid "Whether to disable the plugins in the user's home directory"
+msgstr "વપરાશકર્તાની ઘર ડિરેક્ટરીમાં શું પ્લગઈનો નિષ્ક્રિય કરવા છે"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
+msgid "Whether to disable the keyboard shortcuts"
+msgstr "ક્યાંતો કિબોર્ડ ટૂકાણોને નિષ્ક્રિય કરવાનાં છે"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
+msgid "Whether to autoload text subtitle files when a movie is loaded"
+msgstr "જ્યારે મુવી લોડ થયેલ હોય ત્યારે ક્યાંતો લખાણ ઉપશિર્ષક ફાઇલો આપોઆપ લોડ થશે કે નહિં "
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
+msgid "Whether to autoload external chapter files when a movie is loaded"
+msgstr "જ્યારે મુવી લોડ થયેલ હોય ત્યારે ક્યાંતો લખાણ ઉપશિર્ષક ફાઇલો આપોઆપ લોડ થશે કે નહિં "
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
+msgid ""
+"Whether to remember the position of played audio/video files when pausing or "
+"closing them"
+msgstr ""
+"જ્યારે તેઓને અટકાવી અથવા બંધ કરી રહ્યા હોય ત્યારે વગાડેલ ઓડિયો/વિડીયો નાં સ્થાનને ક્યાંતો "
+"યાદ રાખો"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
+msgid "Active plugins list"
+msgstr "સક્રિય પ્લગઇન યાદી"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+msgid ""
+"A list of the names of the plugins which are currently active (loaded and "
+"running)."
+msgstr "પ્લગઇનોનાં નામની યાદી કે જે હાલમાં સક્રિય છે (લાવેલ છે અને ચાલી રહ્યુ છે)."
+
 #: ../data/playlist.ui.h:1
 msgid "_Remove"
 msgstr "દૂર કરો (_R)"
@@ -62,11 +271,11 @@
 msgid "Copy the location to the clipboard"
 msgstr "સ્થાનને ક્લિપબોર્ડમાં નકલ કરો"
 
-#: ../data/playlist.ui.h:5 ../data/totem.ui.h:78
+#: ../data/playlist.ui.h:5 ../data/totem.ui.h:71
 msgid "_Select Text Subtitles..."
 msgstr "ઉપશીર્ષક લખાણ પસંદ કરો (_S)..."
 
-#: ../data/playlist.ui.h:6 ../data/totem.ui.h:79
+#: ../data/playlist.ui.h:6 ../data/totem.ui.h:72
 msgid "Select a file to use for text subtitles"
 msgstr "લખાણ ઉપશીર્ષકો માટે વાપરવા માટે ફાઇલ પસંદ કરો"
 
@@ -90,65 +299,209 @@
 msgid "Move Down"
 msgstr "નીચે ખસેડો"
 
-#: ../data/properties.ui.h:1 ../data/totem.ui.h:122
-msgid "General"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:2
+msgid "Normal"
 msgstr "સામાન્ય"
 
-#: ../data/properties.ui.h:2
-msgid "Title:"
-msgstr "શીર્ષક:"
-
-#: ../data/properties.ui.h:3
-msgid "Artist:"
-msgstr "કલાકાર:"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:4
+msgid "Large"
+msgstr "વિશાળ"
 
-#: ../data/properties.ui.h:4
-msgid "Duration:"
-msgstr "સમયગાળો:"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:6
+msgid "Extra Large"
+msgstr "વધારાનું વિશાળ"
 
-#: ../data/properties.ui.h:5
-msgid "Year:"
-msgstr "વર્ષ:"
+#: ../data/preferences.ui.h:7 ../src/backend/bacon-video-widget.c:5498
+#: ../src/totem-properties-view.c:231
+msgid "Stereo"
+msgstr "સ્ટીરીયો"
 
-#: ../data/properties.ui.h:6
-msgid "Album:"
-msgstr "આલ્બમ:"
+#: ../data/preferences.ui.h:8
+msgid "4-channel"
+msgstr "4-ચેનલ"
 
-#: ../data/properties.ui.h:7
-msgid "Comment:"
-msgstr "ટિપ્પણીઓ:"
+#: ../data/preferences.ui.h:9
+msgid "4.1-channel"
+msgstr "4.1-ચેનલ"
 
-#: ../data/properties.ui.h:8
-#| msgid "Co_ntrast:"
-msgid "Container:"
-msgstr "પાત્ર:"
+#: ../data/preferences.ui.h:10
+msgid "5.0-channel"
+msgstr "5.0-ચેનલ"
 
-#: ../data/properties.ui.h:9 ../data/totem.ui.h:128
-#: ../src/totem-properties-view.c:270
-msgid "Video"
-msgstr "વિડિઓ"
+#: ../data/preferences.ui.h:11
+msgid "5.1-channel"
+msgstr "5.1-ચેનલ"
 
-#: ../data/properties.ui.h:10
-msgid "Dimensions:"
-msgstr "પરિમાણો:"
+#: ../data/preferences.ui.h:12
+msgid "AC3 Passthrough"
+msgstr "AC3 માંથી પસાર થવુ"
 
-#: ../data/properties.ui.h:11
-msgid "Codec:"
-msgstr "કોડેક:"
+#: ../data/preferences.ui.h:13
+msgid "Totem Preferences"
+msgstr "ટોટેમ પસંદગીઓ"
 
-#: ../data/properties.ui.h:12
-msgid "Framerate:"
-msgstr "ફ્રેમરેટ:"
+#: ../data/preferences.ui.h:14
+msgid "Playback"
+msgstr "વગાડો"
 
-#: ../data/properties.ui.h:13
-msgid "Bitrate:"
-msgstr "બીટરેટ:"
+#: ../data/preferences.ui.h:15
+msgid "Start playing files from last position"
+msgstr "છેલ્લા સ્થાનમાંથી ફાઇલોને વગાડવાનું શરૂ કરો"
 
-#: ../data/properties.ui.h:14 ../data/totem.ui.h:142
-#: ../src/totem-properties-view.c:268
+#: ../data/preferences.ui.h:16
+msgid "Text Subtitles"
+msgstr "લખાણ ઉપશીર્ષકો"
+
+#: ../data/preferences.ui.h:17
+msgid "_Load subtitle files when movie is loaded"
+msgstr "જ્યારે ફિલ્મ લોડ થાય છે ત્યારે ફાઇલોના ઉપશિર્ષકને લોડ કરો (_L)"
+
+#: ../data/preferences.ui.h:18
+msgid "_Font:"
+msgstr "ફોન્ટ (_F):"
+
+#: ../data/preferences.ui.h:19
+msgid "_Encoding:"
+msgstr "સંકેત લેખન (_E):"
+
+#: ../data/preferences.ui.h:20
+msgid "External Chapters"
+msgstr "બાહ્ય પ્રકરણો"
+
+#: ../data/preferences.ui.h:21
+msgid "Load _chapter files when movie is loaded"
+msgstr "જ્યારે ફિલ્મ લોડ થાય છે ત્યારે પ્રકરણ ફાઇલોને લાવો (_c)"
+
+#: ../data/preferences.ui.h:22 ../data/properties.ui.h:1
+msgid "General"
+msgstr "સામાન્ય"
+
+#. Tab label in the Preferences dialogue
+#: ../data/preferences.ui.h:24
+msgid "Display"
+msgstr "ડિસ્પ્લે"
+
+#: ../data/preferences.ui.h:25
+msgid "_Resize the window when a new video is loaded"
+msgstr "જ્યારે નવો વિડિઓ લોડ થયેલ હોય છે ત્યારે વિન્ડોનુ માપ બદલો (_R)"
+
+#: ../data/preferences.ui.h:26
+msgid "Disable _deinterlacing of interlaced videos"
+msgstr "અંતર્ગથિત વિડિયોને અંતર્ગથિત ન કરવાનું નિષ્ક્રિય કરો (_d)"
+
+#: ../data/preferences.ui.h:27
+msgid "Disable screensaver when playing "
+msgstr "જ્યારે વગાડી રહ્યા હોય ત્યારે સ્ક્રીનસેવરને નિષ્ક્રિય કરો "
+
+#: ../data/preferences.ui.h:28 ../data/properties.ui.h:9
+#: ../src/totem-properties-view.c:273
+msgid "Video"
+msgstr "વિડિઓ"
+
+#: ../data/preferences.ui.h:29
+msgid "Video or Audio"
+msgstr "વિડિયો અથવા ઓડિયો"
+
+#: ../data/preferences.ui.h:30
+msgid "Visual Effects"
+msgstr "દ્રશ્ય અસરો"
+
+#: ../data/preferences.ui.h:31
+msgid "Show _visual effects when an audio file is played"
+msgstr "જ્યારે ઓડિયો ફાઇલ વગાડી રહ્યા હોય ત્યારે દ્રશ્ય અસરો બતાવો"
+
+#: ../data/preferences.ui.h:32
+msgid "_Type of visualization:"
+msgstr "કલ્પના નો પ્રકાર (_T):"
+
+#: ../data/preferences.ui.h:33
+msgid "Visualization _size:"
+msgstr "કાલ્પનિક માપ (_s):"
+
+#: ../data/preferences.ui.h:34
+msgid "Color Balance"
+msgstr "રંગ સંતુલન"
+
+#: ../data/preferences.ui.h:35
+msgid "_Brightness:"
+msgstr "તેજસ્વિતા (_B):"
+
+#: ../data/preferences.ui.h:36
+msgid "Co_ntrast:"
+msgstr "વિરોધી (_n):"
+
+#: ../data/preferences.ui.h:37
+msgid "Sat_uration:"
+msgstr "સંતૃપ્તિ:"
+
+#: ../data/preferences.ui.h:38
+msgid "_Hue:"
+msgstr "રંગ (_H):"
+
+#: ../data/preferences.ui.h:39
+msgid "Reset to _Defaults"
+msgstr "મૂળભૂતોને ફરીથી સુયોજિત કરો (_D)"
+
+#: ../data/preferences.ui.h:40
+msgid "Audio Output"
+msgstr "ઓડિયો આઉટપુટ"
+
+#: ../data/preferences.ui.h:41
+msgid "_Audio output type:"
+msgstr "ઓડિયો આઉટપુટનો પ્રકાર (_A):"
+
+#: ../data/preferences.ui.h:42 ../data/properties.ui.h:14
+#: ../src/totem-properties-view.c:271
 msgid "Audio"
 msgstr "ઓડિયો"
 
+#: ../data/properties.ui.h:2
+msgid "Title:"
+msgstr "શીર્ષક:"
+
+#: ../data/properties.ui.h:3
+msgid "Artist:"
+msgstr "કલાકાર:"
+
+#: ../data/properties.ui.h:4
+msgid "Duration:"
+msgstr "સમયગાળો:"
+
+#: ../data/properties.ui.h:5
+msgid "Year:"
+msgstr "વર્ષ:"
+
+#: ../data/properties.ui.h:6
+msgid "Album:"
+msgstr "આલ્બમ:"
+
+#: ../data/properties.ui.h:7
+msgid "Comment:"
+msgstr "ટિપ્પણીઓ:"
+
+#: ../data/properties.ui.h:8
+msgid "Container:"
+msgstr "પાત્ર:"
+
+#: ../data/properties.ui.h:10
+msgid "Dimensions:"
+msgstr "પરિમાણો:"
+
+#: ../data/properties.ui.h:11
+msgid "Codec:"
+msgstr "કોડેક:"
+
+#: ../data/properties.ui.h:12
+msgid "Framerate:"
+msgstr "ફ્રેમરેટ:"
+
+#: ../data/properties.ui.h:13
+msgid "Bitrate:"
+msgstr "બીટરેટ:"
+
 #: ../data/properties.ui.h:15
 msgid "Sample rate:"
 msgstr "નમૂનાનો દર:"
@@ -157,748 +510,450 @@
 msgid "Channels:"
 msgstr "ચેનલો:"
 
-#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
-msgid "_Add to Playlist"
-msgstr "વગાડવા માટેની યાદીમાં ઉમેરો (_A)"
-
-#: ../data/video-list.ui.h:2
-msgid "Add the video to the playlist"
-msgstr "વગાડવાની યાદી માં વિડિઓને ઉમેરો"
-
 #. Title
-#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:143
-#: ../src/totem-object.c:1667
-msgid "Movie Player"
-msgstr "ચિત્રપટ પ્લેયર"
+#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:80 ../src/totem.c:239
+#: ../src/totem.c:248 ../src/totem-menu.c:790 ../src/totem-object.c:1658
+msgid "Videos"
+msgstr "વિડીઓ"
 
 #: ../data/totem.desktop.in.in.in.h:2
-msgid "Play movies and songs"
-msgstr "ફિલ્મ અને ગીત ને ચલાવો"
+#| msgid "Playing a movie"
+msgid "Play movies"
+msgstr "ચિત્રપટ વગાડો"
+
+#: ../data/totem.desktop.in.in.in.h:3
+msgid "Video;Movie;Film;Clip;Series;Player;DVD;TV;Disc;"
+msgstr "વિડિયો;ચિત્રપટ;ફિલ્મ;ક્લિપ;સીરીઝ;પ્લેયર;DVD;TV;ડિસ્ક;"
 
 #: ../data/totem.ui.h:1
-msgid "_Movie"
-msgstr "ફિલ્મ (_M)"
+#| msgid "_Open..."
+msgid "_Open"
+msgstr "ખોલો (_O)"
 
 #: ../data/totem.ui.h:2
-msgid "_Open..."
-msgstr "ખોલો (_O)..."
+#| msgid "Open _Location..."
+msgid "Open _Location"
+msgstr "સ્થાન ખોલો (_L)"
 
 #: ../data/totem.ui.h:3
-msgid "Open a file"
-msgstr "ફાઈલ ખોલો"
+msgid "_Fullscreen"
+msgstr "પૂર્ણ સ્ક્રીન (_F)"
 
 #: ../data/totem.ui.h:4
-msgid "Open _Location..."
-msgstr "સ્થાન ખોલો (_L)..."
+msgid "Prefere_nces"
+msgstr "પસંદગીઓ (_n)"
 
 #: ../data/totem.ui.h:5
-msgid "Open a non-local file"
-msgstr "બિન-સ્થાનીય ફાઈલ ખોલો"
+#| msgid "Shuff_le Mode"
+msgid "Shuff_le"
+msgstr "રેન્ડમ સ્થિતિ (_l)"
 
 #: ../data/totem.ui.h:6
+#| msgid "_Repeat Mode"
+msgid "_Repeat"
+msgstr "પુનરાવર્તિત સ્થિતિ (_R)"
+
+#: ../data/totem.ui.h:7
+msgid "_Quit"
+msgstr "બહાર નીકળો (_Q)"
+
+#: ../data/totem.ui.h:8
+msgid "_Movie"
+msgstr "ફિલ્મ (_M)"
+
+#: ../data/totem.ui.h:9
 msgid "_Eject"
 msgstr "બહાર કાઢો (_E)"
 
-#: ../data/totem.ui.h:7
+#: ../data/totem.ui.h:10
 msgid "Eject the current disc"
 msgstr "હાલની ડિસ્ક ને બહાર નીકાળો"
 
-#: ../data/totem.ui.h:8
+#: ../data/totem.ui.h:11
 msgid "_Properties"
 msgstr "ગુણધર્મો (_P)"
 
-#: ../data/totem.ui.h:9
+#: ../data/totem.ui.h:12
 msgid "View the properties of the current stream"
 msgstr "હાલની સ્ટ્રીમનાં ગુણધર્મોને દર્શાવો"
 
-#: ../data/totem.ui.h:10
+#: ../data/totem.ui.h:13
 msgid "Play / P_ause"
 msgstr "વગાડો / અટકાવો (_a)"
 
-#: ../data/totem.ui.h:11
+#: ../data/totem.ui.h:14
 msgid "Play or pause the movie"
 msgstr "ફિલ્મને વગાડો અથવા અટકાવો"
 
-#: ../data/totem.ui.h:12
-msgid "_Quit"
-msgstr "બહાર નીકળો (_Q)"
-
-#: ../data/totem.ui.h:13
-msgid "Quit the program"
-msgstr "કાર્યક્રમ બંધ કરો"
-
-#: ../data/totem.ui.h:14
+#: ../data/totem.ui.h:15
 msgid "_Edit"
 msgstr "ફેરફાર (_E)"
 
-#: ../data/totem.ui.h:15
+#: ../data/totem.ui.h:16
 msgid "_Clear Playlist"
 msgstr "વગાડવાની યાદી સાફ કરો (_C)"
 
-#: ../data/totem.ui.h:16
+#: ../data/totem.ui.h:17
 msgid "Clear the playlist"
 msgstr "વગાડવાની યાદી સાફ કરો"
 
-#: ../data/totem.ui.h:17
-msgid "Prefere_nces"
-msgstr "પસંદગીઓ (_n)"
-
 #: ../data/totem.ui.h:18
-msgid "Configure the application"
-msgstr "કાર્યક્રમને રૂપરેખાંકિત કરો"
-
-#: ../data/totem.ui.h:19
 msgid "Plugins..."
 msgstr "પ્લગઈનો..."
 
-#: ../data/totem.ui.h:20
+#: ../data/totem.ui.h:19
 msgid "Configure plugins to extend the application"
 msgstr "કાર્યક્રમને વિસ્તારવા માટે પ્લગઇનોને રૂપરેખાંકિત કરો"
 
-#: ../data/totem.ui.h:21
+#: ../data/totem.ui.h:20
 msgid "_View"
 msgstr "દેખાવ (_V)"
 
-#: ../data/totem.ui.h:22
-msgid "_Fullscreen"
-msgstr "પૂર્ણ સ્ક્રીન (_F)"
-
-#: ../data/totem.ui.h:23
-msgid "Switch to fullscreen"
-msgstr "પૂર્ણ સ્ક્રીનમાં ફેરબદલી કરો"
-
-#: ../data/totem.ui.h:24
+#: ../data/totem.ui.h:21
 msgid "Fit Window to Movie"
 msgstr "ફિલ્મને વિન્ડોમાં બંધબેસાડો"
 
-#: ../data/totem.ui.h:25
+#: ../data/totem.ui.h:22
 msgid "_Resize 1:2"
 msgstr "૧:૨ માપ બદલો (_R)"
 
-#: ../data/totem.ui.h:26
+#: ../data/totem.ui.h:23
 msgid "Resize to half the original video size"
 msgstr "વિડિઓને અડધા મૂળભૂત માપમાં ફેરવો"
 
-#: ../data/totem.ui.h:27
+#: ../data/totem.ui.h:24
 msgid "Resize _1:1"
 msgstr "_૧:૧ માપ બદલો"
 
-#: ../data/totem.ui.h:28
+#: ../data/totem.ui.h:25
 msgid "Resize to the original video size"
 msgstr "વિડિઓને મૂળભૂત માપમાં ફેરવો"
 
-#: ../data/totem.ui.h:29
+#: ../data/totem.ui.h:26
 msgid "Resize _2:1"
 msgstr "_૨:૧ માપ બદલો"
 
-#: ../data/totem.ui.h:30
+#: ../data/totem.ui.h:27
 msgid "Resize to double the original video size"
 msgstr "વિડિઓને મૂળભૂત બમણા માપમાં ફેરવો"
 
-#: ../data/totem.ui.h:31
+#: ../data/totem.ui.h:28
 msgid "_Aspect Ratio"
 msgstr "એસ્પેક્ટ રેશિયો (_A)"
 
-#: ../data/totem.ui.h:32
+#: ../data/totem.ui.h:29
 msgid "Switch An_gles"
 msgstr "કોણ બદલો (_g)"
 
-#: ../data/totem.ui.h:33
+#: ../data/totem.ui.h:30
 msgid "Switch camera angles"
 msgstr "કેમેરા કોણોને બદલો"
 
-#: ../data/totem.ui.h:34
+#: ../data/totem.ui.h:31
 msgid "_Go"
 msgstr "જાઓ (_G)"
 
-#: ../data/totem.ui.h:35
+#: ../data/totem.ui.h:32
 msgid "_DVD Menu"
 msgstr "_DVD મેનુ"
 
-#: ../data/totem.ui.h:36
+#: ../data/totem.ui.h:33
 msgid "Go to the DVD menu"
 msgstr "DVD મેનુમાં જાઓ"
 
-#: ../data/totem.ui.h:37
+#: ../data/totem.ui.h:34
 msgid "_Title Menu"
 msgstr "શીર્ષક મેનુ (_T)"
 
-#: ../data/totem.ui.h:38
+#: ../data/totem.ui.h:35
 msgid "Go to the title menu"
 msgstr "શીર્ષક મેનુમાં જાઓ"
 
-#: ../data/totem.ui.h:39
+#: ../data/totem.ui.h:36
 msgid "A_udio Menu"
 msgstr "ઓડિયો મેનુ (_u)"
 
-#: ../data/totem.ui.h:40
+#: ../data/totem.ui.h:37
 msgid "Go to the audio menu"
 msgstr "ઓડિયો મેનુમાં જાઓ"
 
-#: ../data/totem.ui.h:41
+#: ../data/totem.ui.h:38
 msgid "_Angle Menu"
 msgstr "કોણ મેનુ (_A)"
 
-#: ../data/totem.ui.h:42
+#: ../data/totem.ui.h:39
 msgid "Go to the angle menu"
 msgstr "કોણ મેનુમાં જાઓ"
 
-#: ../data/totem.ui.h:43
+#: ../data/totem.ui.h:40
 msgid "_Chapter Menu"
 msgstr "પ્રકરણ મેનુ (_C)"
 
-#: ../data/totem.ui.h:44
+#: ../data/totem.ui.h:41
 msgid "Go to the chapter menu"
 msgstr "પ્રકરણ મેનુમાં જાઓ"
 
-#: ../data/totem.ui.h:45
+#: ../data/totem.ui.h:42
 msgid "_Next Chapter/Movie"
 msgstr "આગળનું પ્રકરણ/ફિલ્મ (_N)"
 
-#: ../data/totem.ui.h:46
+#: ../data/totem.ui.h:43
 msgid "Next chapter or movie"
 msgstr "આગળનું પ્રકરણ અથવા ફિલ્મ"
 
-#: ../data/totem.ui.h:47
+#: ../data/totem.ui.h:44
 msgid "_Previous Chapter/Movie"
 msgstr "પહેલાનું પ્રકરણ/ફિલ્મ (_P)"
 
-#: ../data/totem.ui.h:48
+#: ../data/totem.ui.h:45
 msgid "Previous chapter or movie"
 msgstr "પહેલાનું પ્રકરણ અથવા ફિલ્મ"
 
-#: ../data/totem.ui.h:49
+#: ../data/totem.ui.h:46
 msgid "_Sound"
 msgstr "ધ્વનિ (_S)"
 
-#: ../data/totem.ui.h:50
+#: ../data/totem.ui.h:47
 msgid "Volume _Up"
 msgstr "અવાજ ઉપર (_U)"
 
-#: ../data/totem.ui.h:51
+#: ../data/totem.ui.h:48
 msgid "Increase volume"
 msgstr "વોલ્યુમ વધારો"
 
-#: ../data/totem.ui.h:52
+#: ../data/totem.ui.h:49
 msgid "Volume _Down"
 msgstr "અવાજ નીચો (_D)"
 
-#: ../data/totem.ui.h:53
+#: ../data/totem.ui.h:50
 msgid "Decrease volume"
 msgstr "વોલ્યુમને ઘટાડો"
 
-#: ../data/totem.ui.h:54
+#: ../data/totem.ui.h:51
 msgid "_Help"
 msgstr "મદદ (_H)"
 
-#: ../data/totem.ui.h:55
+#: ../data/totem.ui.h:52
 msgid "_Contents"
 msgstr "સમાવિષ્ટો (_C)"
 
-#: ../data/totem.ui.h:56
+#: ../data/totem.ui.h:53
 msgid "Help contents"
 msgstr "મદદના સમાવિષ્ટો"
 
-#: ../data/totem.ui.h:57
+#: ../data/totem.ui.h:54
 msgid "_About"
 msgstr "વિશે (_A)"
 
-#: ../data/totem.ui.h:58
+#: ../data/totem.ui.h:55
 msgid "About this application"
 msgstr "આ કાર્યક્રમ વિશે"
 
-#: ../data/totem.ui.h:59
-msgid "_Repeat Mode"
-msgstr "પુનરાવર્તિત સ્થિતિ (_R)"
-
-#: ../data/totem.ui.h:60
-msgid "Set the repeat mode"
-msgstr "પુનરાવર્તિત સ્થિતિ સુયોજિત કરો"
-
-#: ../data/totem.ui.h:61
-msgid "Shuff_le Mode"
-msgstr "રેન્ડમ સ્થિતિ (_l)"
-
-#: ../data/totem.ui.h:62
-msgid "Set the shuffle mode"
-msgstr "રેન્ડમ સ્થિતિ સુયોજિત કરો"
-
-#: ../data/totem.ui.h:63
+#: ../data/totem.ui.h:56
 msgid "Show _Controls"
 msgstr "નિયંત્રકો બતાવો (_C)"
 
-#: ../data/totem.ui.h:64
+#: ../data/totem.ui.h:57
 msgid "Show controls"
 msgstr "નિયંત્રકો બતાવો"
 
-#: ../data/totem.ui.h:65
+#: ../data/totem.ui.h:58
 msgid "S_idebar"
 msgstr "બાજુપટ્ટી (_i)"
 
-#: ../data/totem.ui.h:66
+#: ../data/totem.ui.h:59
 msgid "Show or hide the sidebar"
 msgstr "બાજુપટ્ટી બતાવો અથવા છુપાવો"
 
-#: ../data/totem.ui.h:67
+#: ../data/totem.ui.h:60
 msgctxt "Aspect ratio"
 msgid "Auto"
 msgstr "આપોઆપ"
 
-#: ../data/totem.ui.h:68
+#: ../data/totem.ui.h:61
 msgid "Sets automatic aspect ratio"
 msgstr "આપોઆપ એસ્પેક્ટ રેશિયો સુયોજિત કરે છે"
 
-#: ../data/totem.ui.h:69
+#: ../data/totem.ui.h:62
 msgid "Square"
-msgstr "ચોરસ"
-
-#: ../data/totem.ui.h:70
-msgid "Sets square aspect ratio"
-msgstr "ચોરસ એસ્પેક્ટ રેશિયો સુયોજિત કરે છે"
-
-#: ../data/totem.ui.h:71
-msgid "4:3 (TV)"
-msgstr "4:3 (TV)"
-
-#: ../data/totem.ui.h:72
-msgid "Sets 4:3 (TV) aspect ratio"
-msgstr "એસ્પેક્ટ રેશિયો ૪:૩ સુયોજિત કરે છે (TV)"
-
-#: ../data/totem.ui.h:73
-msgid "16:9 (Widescreen)"
-msgstr "16:9 (પહોળી સ્ક્રીન)"
-
-#: ../data/totem.ui.h:74
-msgid "Sets 16:9 (widescreen) aspect ratio"
-msgstr "એસ્પેક્ટ રેશિયો ૧૬:૯ સુયોજિત કરો"
-
-#: ../data/totem.ui.h:75
-msgid "2.11:1 (DVB)"
-msgstr "2.11:1 (DVB)"
-
-#: ../data/totem.ui.h:76
-msgid "Sets 2.11:1 (DVB) aspect ratio"
-msgstr "એસ્પેક્ટ રેશિયો ૨.૧૧:૧ સુયોજિત કરો (DVB)"
-
-#: ../data/totem.ui.h:77
-msgid "S_ubtitles"
-msgstr "ઉપશીર્ષકો (_u)"
-
-#: ../data/totem.ui.h:80
-msgid "_Languages"
-msgstr "ભાષાઓ (_L)"
-
-#: ../data/totem.ui.h:81
-msgid "Zoom In"
-msgstr "મોટું કરો"
-
-#: ../data/totem.ui.h:82
-msgid "Zoom in"
-msgstr "મોટું કરો"
-
-#: ../data/totem.ui.h:83
-msgid "Skip _Forward"
-msgstr "આગળ જવાનું રદ કરો (_F)"
-
-#: ../data/totem.ui.h:84
-msgid "Skip forward"
-msgstr "આગળ જવાનું રદ કરો"
-
-#: ../data/totem.ui.h:85
-msgid "Skip _Backwards"
-msgstr "પાછા જવાનું રદ કરો (_B)"
-
-#: ../data/totem.ui.h:86
-msgid "Skip backwards"
-msgstr "પાછા જવાનું રદ કરો"
-
-#: ../data/totem.ui.h:87
-msgid "14.4 Kbps Modem"
-msgstr "14.4 Kbps મોડેમ"
-
-#: ../data/totem.ui.h:88
-msgid "19.2 Kbps Modem"
-msgstr "19.2 Kbps મોડેમ"
-
-#: ../data/totem.ui.h:89
-msgid "28.8 Kbps Modem"
-msgstr "28.8 Kbps મોડેમ"
-
-#: ../data/totem.ui.h:90
-msgid "33.6 Kbps Modem"
-msgstr "33.6 Kbps મોડેમ"
-
-#: ../data/totem.ui.h:91
-msgid "34.4 Kbps Modem"
-msgstr "34.4 Kbps મોડેમ"
-
-#: ../data/totem.ui.h:92
-msgid "56 Kbps Modem/ISDN"
-msgstr "56 Kbps મોડેમ/ISDN"
-
-#: ../data/totem.ui.h:93
-msgid "112 Kbps Dual ISDN/DSL"
-msgstr "112 Kbps બમણું ISDN/DSL"
-
-#: ../data/totem.ui.h:94
-msgid "256 Kbps DSL/Cable"
-msgstr "256 Kbps DSL/કેબલ"
-
-#: ../data/totem.ui.h:95
-msgid "384 Kbps DSL/Cable"
-msgstr "384 Kbps DSL/કેબલ"
-
-#: ../data/totem.ui.h:96
-msgid "512 Kbps DSL/Cable"
-msgstr "512 Kbps DSL/કેબલ"
-
-#: ../data/totem.ui.h:97
-msgid "1.5 Mbps T1/Intranet/LAN"
-msgstr "1.5 Mbps T1/ઇન્ટ્રાનેટ/LAN"
-
-#: ../data/totem.ui.h:98
-msgid "Intranet/LAN"
-msgstr "ઇન્ટરનેટ/LAN"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:100
-msgid "Normal"
-msgstr "સામાન્ય"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:102
-msgid "Large"
-msgstr "વિશાળ"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:104
-msgid "Extra Large"
-msgstr "વધારાનું વિશાળ"
-
-#: ../data/totem.ui.h:105 ../src/totem-properties-view.c:228
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5593
-msgid "Stereo"
-msgstr "સ્ટીરીયો"
-
-#: ../data/totem.ui.h:106
-msgid "4-channel"
-msgstr "4-ચેનલ"
-
-#: ../data/totem.ui.h:107
-msgid "4.1-channel"
-msgstr "4.1-ચેનલ"
-
-#: ../data/totem.ui.h:108
-msgid "5.0-channel"
-msgstr "5.0-ચેનલ"
-
-#: ../data/totem.ui.h:109
-msgid "5.1-channel"
-msgstr "5.1-ચેનલ"
-
-#: ../data/totem.ui.h:110
-msgid "AC3 Passthrough"
-msgstr "AC3 માંથી પસાર થવુ"
-
-#: ../data/totem.ui.h:111
-msgid "Totem Preferences"
-msgstr "ટોટેમ પસંદગીઓ"
-
-#: ../data/totem.ui.h:112
-msgid "Playback"
-msgstr "વગાડો"
-
-#: ../data/totem.ui.h:113
-msgid "Start playing files from last position"
-msgstr "છેલ્લા સ્થાનમાંથી ફાઇલોને વગાડવાનું શરૂ કરો"
-
-#: ../data/totem.ui.h:114
-msgid "Networking"
-msgstr "નેટવર્કીંગ"
-
-#: ../data/totem.ui.h:115
-msgid "Connection _speed:"
-msgstr "જોડાણ ઝડપ (_s):"
-
-#: ../data/totem.ui.h:116
-msgid "Text Subtitles"
-msgstr "લખાણ ઉપશીર્ષકો"
-
-#: ../data/totem.ui.h:117
-msgid "_Load subtitle files when movie is loaded"
-msgstr "જ્યારે ફિલ્મ લોડ થાય છે ત્યારે ફાઇલોના ઉપશિર્ષકને લોડ કરો (_L)"
-
-#: ../data/totem.ui.h:118
-msgid "_Font:"
-msgstr "ફોન્ટ (_F):"
-
-#: ../data/totem.ui.h:119
-msgid "_Encoding:"
-msgstr "સંકેત લેખન (_E):"
-
-#: ../data/totem.ui.h:120
-msgid "External Chapters"
-msgstr "બાહ્ય પ્રકરણો"
-
-#: ../data/totem.ui.h:121
-msgid "Load _chapter files when movie is loaded"
-msgstr "જ્યારે ફિલ્મ લોડ થાય છે ત્યારે પ્રકરણ ફાઇલોને લાવો (_c)"
-
-#. Tab label in the Preferences dialogue
-#: ../data/totem.ui.h:124
-msgid "Display"
-msgstr "ડિસ્પ્લે"
-
-#: ../data/totem.ui.h:125
-msgid "_Resize the window when a new video is loaded"
-msgstr "જ્યારે નવો વિડિઓ લોડ થયેલ હોય છે ત્યારે વિન્ડોનુ માપ બદલો (_R)"
-
-#: ../data/totem.ui.h:126
-msgid "Disable _deinterlacing of interlaced videos"
-msgstr "અંતર્ગથિત વિડિયોને અંતર્ગથિત ન કરવાનું નિષ્ક્રિય કરો (_d)"
-
-#: ../data/totem.ui.h:127
-msgid "Disable screensaver when playing "
-msgstr "જ્યારે વગાડી રહ્યા હોય ત્યારે સ્ક્રીનસેવરને નિષ્ક્રિય કરો "
-
-#: ../data/totem.ui.h:129
-msgid "Video or Audio"
-msgstr "વિડિયો અથવા ઓડિયો"
-
-#: ../data/totem.ui.h:130
-msgid "Visual Effects"
-msgstr "દ્રશ્ય અસરો"
-
-#: ../data/totem.ui.h:131
-msgid "Show _visual effects when an audio file is played"
-msgstr "જ્યારે ઓડિયો ફાઇલ વગાડી રહ્યા હોય ત્યારે દ્રશ્ય અસરો બતાવો"
-
-#: ../data/totem.ui.h:132
-msgid "_Type of visualization:"
-msgstr "કલ્પના નો પ્રકાર (_T):"
-
-#: ../data/totem.ui.h:133
-msgid "Visualization _size:"
-msgstr "કાલ્પનિક માપ (_s):"
-
-#: ../data/totem.ui.h:134
-msgid "Color Balance"
-msgstr "રંગ સંતુલન"
-
-#: ../data/totem.ui.h:135
-msgid "_Brightness:"
-msgstr "તેજસ્વિતા (_B):"
-
-#: ../data/totem.ui.h:136
-msgid "Co_ntrast:"
-msgstr "વિરોધી (_n):"
-
-#: ../data/totem.ui.h:137
-msgid "Sat_uration:"
-msgstr "સંતૃપ્તિ:"
-
-#: ../data/totem.ui.h:138
-msgid "_Hue:"
-msgstr "રંગ (_H):"
-
-#: ../data/totem.ui.h:139
-msgid "Reset to _Defaults"
-msgstr "મૂળભૂતોને ફરીથી સુયોજિત કરો (_D)"
-
-#: ../data/totem.ui.h:140
-msgid "Audio Output"
-msgstr "ઓડિયો આઉટપુટ"
-
-#: ../data/totem.ui.h:141
-msgid "_Audio output type:"
-msgstr "ઓડિયો આઉટપુટનો પ્રકાર (_A):"
-
-#: ../data/totem.ui.h:145
-msgid "Time seek bar"
-msgstr "સમય સીક પટ્ટી"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
-msgid "Allow the screensaver to activate when playing audio"
-msgstr "જ્યારે ફક્ત ઓડિઓ વગાડી રહ્યા છે ત્યારે સક્રિય કરવા માટે સ્ક્રીનસેવર ને પરવાનગી આપો"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
-msgid ""
-"Allow the screensaver to activate when playing audio. Disable if you have "
-"monitor-powered speakers."
-msgstr ""
-"જ્યારે ફક્ત ઓડિયો વગાડી રહ્યા હોય ત્યારે સ્ક્રીનસેવર ને સક્રિય કરવાની પરવાનગી આપો. જો "
-"તમે મોનિટર પાવર થયેલ બોલનારાઓ છો તો નિષ્ક્રિય કરો."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
-msgid "Show visual effects when no video is displayed"
-msgstr "જ્યારે કોઈ વિડિઓ પ્રદર્શિત નહિં થાય ત્યાં સુધી દ્રશ્ય અસરો બતાવો"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
-msgid "Show visual effects when playing an audio only file."
-msgstr "જ્યારે માત્ર ઓડિયો ફાઈલ વગાડી રહ્યા હોય ત્યારે દ્રશ્ય અસરો બતાવો."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
-#| msgid "Name of the visual effects plugins"
-msgid "Name of the visual effects plugin"
-msgstr "દ્રશ્ય અસરો પ્લગઈનોનું નામ"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
-msgid "The brightness of the video"
-msgstr "વિડિઓની તેજસ્વીતા"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
-msgid "The contrast of the video"
-msgstr "વિડિઓનો વિરોધાભાસ"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
-msgid "The hue of the video"
-msgstr "વિડિઓનું હ્યુ"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
-msgid "The saturation of the video"
-msgstr "વિડિઓનું સેચ્યુરેશન"
+msgstr "ચોરસ"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
-msgid "Resize the canvas automatically on file load"
-msgstr "ફાઈલ લાવવા પર કેનવાસનું માપ આપોઆપ બદલો"
+#: ../data/totem.ui.h:63
+msgid "Sets square aspect ratio"
+msgstr "ચોરસ એસ્પેક્ટ રેશિયો સુયોજિત કરે છે"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
-msgid "Network connection speed"
-msgstr "નેટવર્ક જોડાણ ઝડપ"
+#: ../data/totem.ui.h:64
+msgid "4:3 (TV)"
+msgstr "4:3 (TV)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
-msgid ""
-"Approximate network connection speed, used to select quality on media over "
-"the network."
-msgstr "આશરે ઝડપ નેટવર્ક જોડાણ, નેટવર્ક પર મીડિયા પર ગુણવત્તાને પસંદ કરવા માટે વાપરેલ છે."
+#: ../data/totem.ui.h:65
+msgid "Sets 4:3 (TV) aspect ratio"
+msgstr "એસ્પેક્ટ રેશિયો ૪:૩ સુયોજિત કરે છે (TV)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
-msgid "Repeat mode"
-msgstr "પુનરાવર્તિત સ્થિતિ"
+#: ../data/totem.ui.h:66
+msgid "16:9 (Widescreen)"
+msgstr "16:9 (પહોળી સ્ક્રીન)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
-msgid "Shuffle mode"
-msgstr "રેન્ડમ સ્થિતિ"
+#: ../data/totem.ui.h:67
+msgid "Sets 16:9 (widescreen) aspect ratio"
+msgstr "એસ્પેક્ટ રેશિયો ૧૬:૯ સુયોજિત કરો"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
-msgid "Whether to disable deinterlacing for interlaced movies"
-msgstr "ક્યાંતો અંતર્ગથિત ચિત્રપટો માટે અંતર્ગથિત ન કરવાનું નિષ્ક્રિય કરો"
+#: ../data/totem.ui.h:68
+msgid "2.11:1 (DVB)"
+msgstr "2.11:1 (DVB)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
-msgid "Whether to enable debug for the playback engine"
-msgstr "વગાડતા એંજિન માટે શું ડિબગ સક્રિય કરવું"
+#: ../data/totem.ui.h:69
+msgid "Sets 2.11:1 (DVB) aspect ratio"
+msgstr "એસ્પેક્ટ રેશિયો ૨.૧૧:૧ સુયોજિત કરો (DVB)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
-msgid "Type of audio output to use"
-msgstr "વાપરવા માટેના ઓડિયો આઉટપુટનો પ્રકાર"
+#: ../data/totem.ui.h:70
+msgid "S_ubtitles"
+msgstr "ઉપશીર્ષકો (_u)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
-msgid "Visualization quality setting"
-msgstr "કાલ્પનિક ગુણવત્તા સુયોજન"
+#: ../data/totem.ui.h:73
+msgid "_Languages"
+msgstr "ભાષાઓ (_L)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
-msgid "Quality setting for the audio visualization."
-msgstr "ઓડિયો વિઝ્યુલાઇઝેશન માટે ગુણવત્તા સુયોજન."
+#: ../data/totem.ui.h:74
+msgid "Zoom In"
+msgstr "મોટું કરો"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
-msgid "Network buffering threshold"
-msgstr "નેટવર્ક બફરીંગ થ્રેશોલ્ડ"
+#: ../data/totem.ui.h:75
+msgid "Zoom in"
+msgstr "મોટું કરો"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
-#| msgid ""
-#| "Amount of data to buffer for network streams before starting to display "
-#| "the stream (in seconds)"
-msgid ""
-"Amount of data to buffer for network streams before starting to display the "
-"stream (in seconds)."
-msgstr ""
-"નેટવર્ક સ્ટ્રીમો માટે સ્ટ્રીમ દર્શાવવા પહેલાં બફર કરવાની માહિતીનો જથ્થો (સેકન્ડોમાં)."
+#: ../data/totem.ui.h:76
+msgid "Skip _Forward"
+msgstr "આગળ જવાનું રદ કરો (_F)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
-msgid "Subtitle font"
-msgstr "ઉપશીર્ષક ફોન્ટ"
+#: ../data/totem.ui.h:77
+msgid "Skip forward"
+msgstr "આગળ જવાનું રદ કરો"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
-#| msgid "Pango font description for subtitle rendering"
-msgid "Pango font description for subtitle rendering."
-msgstr "ઉપશીર્ષક રેન્ડરીંગ માટે પેન્ગો ફોન્ટ વર્ણન"
+#: ../data/totem.ui.h:78
+msgid "Skip _Backwards"
+msgstr "પાછા જવાનું રદ કરો (_B)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
-msgid "Subtitle encoding"
-msgstr "ઉપશીર્ષક સંગ્રહપદ્ધતિ"
+#: ../data/totem.ui.h:79
+msgid "Skip backwards"
+msgstr "પાછા જવાનું રદ કરો"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
-#| msgid "Encoding charset for subtitle"
-msgid "Encoding character set for subtitle."
-msgstr "ઉપશીર્ષક માટે સંગ્રહપદ્ધતિ અક્ષરસમૂહ"
+#: ../data/totem.ui.h:82
+msgid "Time seek bar"
+msgstr "સમય સીક પટ્ટી"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
-msgid "Default location for the \"Open...\" dialogs"
-msgstr "\"Open...\" સંવાદો માટેનું મૂળભૂત સ્થાન"
+#: ../data/uri.ui.h:1
+msgid "Enter the _address of the file you would like to open:"
+msgstr "તમને ખોલવા માટે ગમે હોય તેવી ફાઇલનાં સરનામાં ને દાખલ કરો (_a):"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
-#| msgid ""
-#| "Default location for the \"Open...\" dialogs, default is the current "
-#| "directory"
-msgid ""
-"Default location for the \"Open...\" dialogs. Default is the current "
-"directory."
-msgstr "\"ખોલો...\" સંવાદો માટેનું મૂળભૂત સ્થાન, વર્તમાન ડિરેક્ટરી મૂળભૂત છે."
+#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
+msgid "_Add to Playlist"
+msgstr "વગાડવા માટેની યાદીમાં ઉમેરો (_A)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
-msgid "Default location for the \"Take Screenshot\" dialogs"
-msgstr "\"Take Screenshot\" સંવાદો માટેનું મૂળભૂત સ્થાન"
+#: ../data/video-list.ui.h:2
+msgid "Add the video to the playlist"
+msgstr "વગાડવાની યાદી માં વિડિઓને ઉમેરો"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
-#| msgid ""
-#| "Default location for the \"Take Screenshot\" dialogs, default is the "
-#| "Pictures directory"
-msgid ""
-"Default location for the \"Take Screenshot\" dialogs. Default is the "
-"Pictures directory."
-msgstr "\"સ્ક્રીનશોટ લો\" સંવાદો માટેનું મૂળભૂત સ્થાન, મૂળભૂત ચિત્રો ડિરેક્ટરી છે."
+#: ../src/backend/bacon-video-widget.c:1643
+msgid "Password requested for RTSP server"
+msgstr "RTSP સર્વર માટે સૂચિત પાસવર્ડ"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
-msgid "Whether to disable the plugins in the user's home directory"
-msgstr "વપરાશકર્તાની ઘર ડિરેક્ટરીમાં શું પ્લગઈનો નિષ્ક્રિય કરવા છે"
+#: ../src/backend/bacon-video-widget.c:2944
+#, c-format
+msgid "Audio Track #%d"
+msgstr "ઓડિયો ટ્રેક #%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
-msgid "Whether to disable the keyboard shortcuts"
-msgstr "ક્યાંતો કિબોર્ડ ટૂકાણોને નિષ્ક્રિય કરવાનાં છે"
+#: ../src/backend/bacon-video-widget.c:2948
+#, c-format
+msgid "Subtitle #%d"
+msgstr "ઉપશીર્ષક #%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
-msgid "Whether to autoload text subtitle files when a movie is loaded"
-msgstr "જ્યારે મુવી લોડ થયેલ હોય ત્યારે ક્યાંતો લખાણ ઉપશિર્ષક ફાઇલો આપોઆપ લોડ થશે કે નહિં "
+#: ../src/backend/bacon-video-widget.c:3345
+msgid "The server you are trying to connect to is not known."
+msgstr "સર્વર કે જે તમે જોડાવા પ્રયત્ન કરી રહ્યા છો તે અજ્ઞાત નથી."
+
+#: ../src/backend/bacon-video-widget.c:3348
+msgid "The connection to this server was refused."
+msgstr "આ સર્વરનુ જોડાણ નામંજૂર થયેલ છે."
+
+#: ../src/backend/bacon-video-widget.c:3351
+#| msgid "The movie could not be recorded."
+msgid "The specified movie could not be found."
+msgstr "ખાસ ચિત્રપટ શોધી શક્યા નહિં."
+
+#: ../src/backend/bacon-video-widget.c:3358
+msgid "The server refused access to this file or stream."
+msgstr "સર્વર એ આ ફાઇલ અથવા સ્ટ્રીમને પ્રવેશવા અસ્વીકાર કર્યો."
+
+#: ../src/backend/bacon-video-widget.c:3364
+msgid "Authentication is required to access this file or stream."
+msgstr "આ ફાઇલ અથવા સ્ટ્રીમને પ્રવેશવા માટે સત્તાધિકરણની જરૂર છે."
+
+#: ../src/backend/bacon-video-widget.c:3371
+#| msgid "Totem was not able to play this disc."
+msgid "You are not allowed to open this file."
+msgstr "આ ફાઇલને ખોલવા માટે તમને પરવાનગી મળેલ નથી."
+
+#: ../src/backend/bacon-video-widget.c:3376
+#| msgid "File is not a valid .desktop file"
+msgid "This location is not a valid one."
+msgstr "આ સ્થાન માન્ય નથી"
+
+#: ../src/backend/bacon-video-widget.c:3384
+#| msgid "The movie could not be recorded."
+msgid "The movie could not be read."
+msgstr "ચિત્રપટને વાંચી શક્યા નહિં."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
-#| msgid "Whether to autoload text subtitle files when a movie is loaded"
-msgid "Whether to autoload external chapter files when a movie is loaded"
-msgstr "જ્યારે મુવી લોડ થયેલ હોય ત્યારે ક્યાંતો લખાણ ઉપશિર્ષક ફાઇલો આપોઆપ લોડ થશે કે નહિં "
+#. should be exactly one missing thing (source or converter)
+#: ../src/backend/bacon-video-widget.c:3407
+#: ../src/backend/bacon-video-widget.c:3415
+#, c-format
+msgid "The playback of this movie requires a %s plugin which is not installed."
+msgid_plural ""
+"The playback of this movie requires the following decoders which are not "
+"installed:\n"
+"\n"
+"%s"
+msgstr[0] "આ ફિલ્મના પ્લેબેકને %s પ્લગઈનની જરૂર છે કે જે સ્થાપિત થયેલ નથી."
+msgstr[1] ""
+"આ ફિલ્મના પ્લેબેકને નીચેનાં ડિકોડરની જરૂર છે કે જે સ્થાપિત થયેલ નથી:\n"
+"\n"
+"%s"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+#: ../src/backend/bacon-video-widget.c:3426
+msgid ""
+"An audio or video stream is not handled due to missing codecs. You might "
+"need to install additional plugins to be able to play some types of movies"
+msgstr ""
+"ઓડિયો અથવા વિડિયો સ્ટ્રીમ ગુમ થયેલ કોડેક દરમ્યાન સંચાલિત થયેલ નથી. ચિત્રપટનાં અમુક "
+"પ્રકારોને વગાડવાનું સક્ષમ કરવા વધારાનાં પ્લગઇનને સ્થાપિત કરવાની જરૂર પડી શકે છે"
+
+#: ../src/backend/bacon-video-widget.c:3436
 #| msgid ""
-#| "Whether to remember the position of played audio/video files when pausing "
-#| "or closing them."
+#| "Cannot play this file over the network. Try downloading it to disk first."
 msgid ""
-"Whether to remember the position of played audio/video files when pausing or "
-"closing them"
+"This file cannot be played over the network. Try downloading it locally "
+"first."
 msgstr ""
-"જ્યારે તેઓને અટકાવી અથવા બંધ કરી રહ્યા હોય ત્યારે વગાડેલ ઓડિયો/વિડીયો નાં સ્થાનને ક્યાંતો "
-"યાદ રાખો"
+"આ ફાઈલને નેટવર્ક ઉપર વગાડી શકતા નથી. પહેલાં તેને સ્થાનિક રીતે ડાઉનલોડ કરવાનો પ્રયત્ન કરો."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:35
-msgid "Active plugins list"
-msgstr "સક્રિય પ્લગઇન યાદી"
+#: ../src/backend/bacon-video-widget.c:5494 ../src/totem-properties-view.c:227
+msgid "Surround"
+msgstr "આસપાસ"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:36
-msgid ""
-"A list of the names of the plugins which are currently active (loaded and "
-"running)."
-msgstr "પ્લગઇનોનાં નામની યાદી કે જે હાલમાં સક્રિય છે (લાવેલ છે અને ચાલી રહ્યુ છે)."
+#: ../src/backend/bacon-video-widget.c:5496 ../src/totem-properties-view.c:229
+msgid "Mono"
+msgstr "મોનો"
 
-#: ../data/uri.ui.h:1
-msgid "Enter the _address of the file you would like to open:"
-msgstr "તમને ખોલવા માટે ગમે હોય તેવી ફાઇલનાં સરનામાં ને દાખલ કરો (_a):"
+#: ../src/backend/bacon-video-widget.c:5781
+msgid "Media contains no supported video streams."
+msgstr "મીડિયા કોઈ આધારભૂત વિડિઓ બંધારણો સમાવતું નથી."
+
+#: ../src/backend/bacon-video-widget.c:5963
+msgid ""
+"Some necessary plug-ins are missing. Make sure that the program is correctly "
+"installed."
+msgstr "અમુક જરૂરી પ્લગઇન ગુમ થયેલ છે. ખાતરી કરો કે કાર્યક્રમ યોગ્ય રીતે સ્થાપિત થયેલ છે."
 
 #: ../src/eggdesktopfile.c:165
 #, c-format
@@ -964,8 +1019,8 @@
 #: ../src/eggfileformatchooser.c:657
 #, c-format
 msgid ""
-"The program was not able to find out the file format you want to use for `%"
-"s'. Please make sure to use a known extension for that file or manually "
+"The program was not able to find out the file format you want to use for `"
+"%s'. Please make sure to use a known extension for that file or manually "
 "choose a file format from the list below."
 msgstr ""
 "તમે`%s' માટે વાપરવાનું ઇચ્છો છો તે ફાઇલ બંધારણ ને શોધવા માટે પ્રક્રિયા સક્ષમ ન હતી. "
@@ -1004,6 +1059,31 @@
 msgid "Show session management options"
 msgstr "સત્ર વ્યવસ્થાપન વિકલ્પો ને બતાવો"
 
+#. hour:minutes:seconds
+#. Translators: This is a time format, like "9:05:02" for 9
+#. * hours, 5 minutes, and 2 seconds. You may change ":" to
+#. * the separator that your locale uses or use "%Id" instead
+#. * of "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:56
+#: ../src/plugins/skipto/totem-time-entry.c:57
+#, c-format
+msgctxt "long time format"
+msgid "%d:%02d:%02d"
+msgstr "%d:%02d:%02d"
+
+#. minutes:seconds
+#. Translators: This is a time format, like "5:02" for 5
+#. * minutes and 2 seconds. You may change ":" to the
+#. * separator that your locale uses or use "%Id" instead of
+#. * "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:65
+#, c-format
+msgctxt "short time format"
+msgid "%d:%02d"
+msgstr "%d:%02d"
+
 #. Title
 #. Artist
 #. Album
@@ -1085,7 +1165,6 @@
 #. 5 hours 2 minutes 12 seconds
 #: ../src/properties/bacon-video-widget-properties.c:167
 #, c-format
-#| msgid "%s %s %s"
 msgctxt "time"
 msgid "%s %s %s"
 msgstr "%s %s %s"
@@ -1093,7 +1172,6 @@
 #. 2 minutes 12 seconds
 #: ../src/properties/bacon-video-widget-properties.c:170
 #, c-format
-#| msgid "%s %s"
 msgctxt "time"
 msgid "%s %s"
 msgstr "%s %s"
@@ -1105,16 +1183,19 @@
 
 #: ../src/properties/bacon-video-widget-properties.c:237
 #, c-format
-#| msgid "%d frames per second"
 msgid "%d frame per second"
 msgid_plural "%d frames per second"
 msgstr[0] "સેકન્ડ પ્રતિ %d ચોકઠા"
 msgstr[1] "સેકન્ડ પ્રતિ %d ચોકઠાઓ"
 
-#: ../src/totem-audio-preview.c:168
+#: ../src/totem-audio-preview.c:137
 msgid "Audio Preview"
 msgstr "ઓડિયો પૂર્વદર્શન"
 
+#: ../src/totem.c:240
+msgid "Verify your system installation. Totem will now exit."
+msgstr "તમારું સિસ્ટમ સ્થાપન ચકાસો. ટોટેમ હમણાં બંધ થઈ જશે."
+
 #: ../src/totem-cell-renderer-video.c:126
 msgid "Unknown video"
 msgstr "અજ્ઞાત વિડિઓ"
@@ -1127,7 +1208,7 @@
 msgid "Cancel"
 msgstr "રદ કરો"
 
-#: ../src/totem-fullscreen.c:616
+#: ../src/totem-fullscreen.c:573
 msgid "No File"
 msgstr "કોઈ ફાઈલ નથી"
 
@@ -1145,7 +1226,7 @@
 msgid "Make sure that Totem is properly installed."
 msgstr "ખાતરી કરો કે ટોટેમ યોગ્ય રીતે સ્થાપિત થયેલ છે."
 
-#: ../src/totem-interface.c:347
+#: ../src/totem-interface.c:357
 msgid ""
 "Totem 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 "
@@ -1157,7 +1238,7 @@
 "Foundation; either version 2 of the License, or (at your option) any later "
 "version."
 
-#: ../src/totem-interface.c:351
+#: ../src/totem-interface.c:361
 msgid ""
 "Totem is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -1169,7 +1250,7 @@
 "FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
 "details."
 
-#: ../src/totem-interface.c:355
+#: ../src/totem-interface.c:365
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Totem; if not, write to the Free Software Foundation, Inc., 59 Temple Place, "
@@ -1179,7 +1260,7 @@
 "Totem; if not, write to the Free Software Foundation, Inc., 59 Temple Place, "
 "Suite 330, Boston, MA  02111-1307  USA"
 
-#: ../src/totem-interface.c:358
+#: ../src/totem-interface.c:368
 msgid ""
 "Totem contains an exception to allow the use of proprietary GStreamer "
 "plugins."
@@ -1188,198 +1269,95 @@
 "plugins."
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:190
+#: ../src/totem-menu.c:291
 msgid "None"
 msgstr "કંઈ નહિં"
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:195
+#: ../src/totem-menu.c:296
 msgctxt "Language"
 msgid "Auto"
 msgstr "આપોઆપ"
 
-#. Translators:
-#. * This is not a JPEG image, but a disc image, for example,
-#. * an ISO file
-#: ../src/totem-menu.c:765
-#, c-format
-msgid "Play Image '%s'"
-msgstr "ઇમેજ '%s' ને વગાડો"
-
-#: ../src/totem-menu.c:768 ../src/totem-menu.c:851
-#, c-format
-msgid "device%d"
-msgstr "device%d"
-
-#: ../src/totem-menu.c:848
-#, c-format
-msgid "Play Disc '%s'"
-msgstr "ડિસ્ક '%s' વગાડો"
-
-#. This lists the back-end type and version, such as
-#. * Movie Player using GStreamer 0.10.1
-#: ../src/totem-menu.c:1189
-#, c-format
-msgid "Movie Player using %s"
-msgstr "%s ની મદદથી મુવી પ્લેયર"
-
-#: ../src/totem-menu.c:1193
+#: ../src/totem-menu.c:789
 msgid "Copyright © 2002-2009 Bastien Nocera"
 msgstr "Copyright © 2002-2009 Bastien Nocera"
 
-#: ../src/totem-menu.c:1198
+#: ../src/totem-menu.c:794
 msgid "translator-credits"
 msgstr "અંકિત પટેલ , શ્ર્વેતા કોઠારી "
 
-#: ../src/totem-menu.c:1202
-msgid "Totem Website"
-msgstr "ટોટેમ વેબસાઈટ"
-
-#: ../src/totem-menu.c:1236
-msgid "Configure Plugins"
-msgstr "પ્લગઈનો રૂપરેખાંકિત કરો"
-
-#. Translators: %s is the totem version number
-#: ../src/totem-object.c:471
-#, c-format
-msgid "Totem %s"
-msgstr "Totem %s"
-
-#: ../src/totem-object.c:1047 ../browser-plugin/totem-plugin-viewer.c:367
-msgid "Playing"
-msgstr "વગાડી રહ્યા છીએ"
-
-#: ../src/totem-object.c:1049 ../src/totem-options.c:52
-msgid "Pause"
-msgstr "અટકાવો"
-
-#: ../src/totem-object.c:1054 ../browser-plugin/totem-plugin-viewer.c:363
-msgid "Paused"
-msgstr "અટકાવાયેલ છે"
-
-#: ../src/totem-object.c:1056 ../src/totem-object.c:1066
-#: ../src/totem-options.c:51
-msgid "Play"
-msgstr "વગાડો"
-
-#: ../src/totem-object.c:1061 ../src/totem-object.c:1659
-#: ../src/totem-statusbar.c:115 ../browser-plugin/totem-plugin-viewer.c:351
-msgid "Stopped"
-msgstr "બંધ થયેલ છે"
-
-#: ../src/totem-object.c:1142 ../src/totem-object.c:1169
-#: ../src/totem-object.c:1799 ../src/totem-object.c:1963
-#, c-format
-msgid "Totem could not play '%s'."
-msgstr "ટોટેમ '%s' વગાડી શક્યું નહિં."
-
-#: ../src/totem-object.c:1246
-#, c-format
-msgid ""
-"Totem could not play this media (%s) although a plugin is present to handle "
-"it."
-msgstr ""
-"ટોટેમ આ મીડિયા (%s) ને વગાડી શકી નહિં તેને નિયંત્રિત કરવા માટે તેના પ્લગઈન હાજર હોવા "
-"છતાં."
-
-#: ../src/totem-object.c:1247
-msgid ""
-"You might want to check that a disc is present in the drive and that it is "
-"correctly configured."
-msgstr ""
-"તમારે ચકાસવાની જરૂર છે કે ડિસ્ક તેની ડ્રાઈવમાં હાજર છે ને અને તે યોગ્ય રીતે રૂપરેખાંકિત છે."
-
-#: ../src/totem-object.c:1255
-msgid "More information about media plugins"
-msgstr "મીડિયા પ્લગઈનો વિશે વધુ જાણકારી"
-
-#: ../src/totem-object.c:1256
-msgid ""
-"Please install the necessary plugins and restart Totem to be able to play "
-"this media."
-msgstr ""
-"મહેરબાની કરીને જરૂરી પ્લગઈનો સ્થાપિત કરો અને આ મીડિયાને વગાડી શકે એના માટે ટોટેમને "
-"ફરીથી શરૂ કરો."
-
-#: ../src/totem-object.c:1258
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because it does not have the "
-"appropriate plugins to be able to read from the disc."
-msgstr ""
-"ટોટેમ આ પ્રકારની મીડિયા (%s) વગાડી શકતી નથી કારણ કે તેની પાસે ડિસ્કમાંથી વાંચવા માટે "
-"સમર્થ હોય તેવા યોગ્ય પ્લગઈનો નથી."
+#: ../src/totem-menu.c:798
+msgid "Totem Website"
+msgstr "ટોટેમ વેબસાઈટ"
+
+#: ../src/totem-menu.c:829
+msgid "Configure Plugins"
+msgstr "પ્લગઈનો રૂપરેખાંકિત કરો"
 
-#: ../src/totem-object.c:1260
+#: ../src/totem-object.c:162
 #, c-format
 msgid ""
-"Totem cannot play this type of media (%s) because you do not have the "
-"appropriate plugins to handle it."
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
-"ટોટેમ આ પ્રકારની મીડિયા (%s) વગાડી શકતી નથી કારણ કે તમારી પાસે તેને નિયંત્રિત કરવા "
-"માટે યોગ્ય પ્લગઈનો નથી."
+"%s\n"
+"ઉપલ્બધ આદેશ વાક્ય વિકલ્પોની સંપૂર્ણ યાદી ને જોવા માટે '%s --help'ને ચલવો.\n"
 
-#: ../src/totem-object.c:1263
+#. Translators: %s is the totem version number
+#: ../src/totem-object.c:591
 #, c-format
-msgid "Totem cannot play this type of media (%s) because it is not supported."
-msgstr "ટોટેમ આ મિડીયા (%s) ના પ્રકાર વગાડી શકતુ નથી કારણ કે તે આધારભૂત નથી."
-
-#: ../src/totem-object.c:1264
-msgid "Please insert another disc to play back."
-msgstr "મહેરબાની કરીને પાછી વગાડવા માટે બીજી ડિસ્કને દાખલ કરો."
-
-#: ../src/totem-object.c:1300
-msgid "Totem was not able to play this disc."
-msgstr "ટોટેમ આ ડિસ્ક વગાડવા માટે સમર્થ હતું નહિં."
+msgid "Totem %s"
+msgstr "Totem %s"
 
-#: ../src/totem-object.c:1301 ../src/totem-object.c:4229
-msgid "No reason."
-msgstr "કોઈ કારણ નથી."
+#: ../src/totem-object.c:1168 ../src/totem-options.c:52
+msgid "Pause"
+msgstr "અટકાવો"
 
-#: ../src/totem-object.c:1315
-msgid "Totem does not support playback of Audio CDs"
-msgstr "ટોટેમ એ ઓડિયો CDs ને પાછુ વગાડવા માટે આધાર આપતુ નથી"
+#: ../src/totem-object.c:1175 ../src/totem-object.c:1185
+#: ../src/totem-options.c:51
+msgid "Play"
+msgstr "વગાડો"
 
-#: ../src/totem-object.c:1316
-msgid "Please consider using a music player or a CD extractor to play this CD"
-msgstr ""
-"મહેરબાની કરીને મ્યુઝિક પ્લેયરની મદદથી અથવા આ CD ને વગાડવા માટે CD એક્સટ્રેક્ટર ને નક્કી કરો"
+#: ../src/totem-object.c:1267 ../src/totem-object.c:1294
+#: ../src/totem-object.c:1787 ../src/totem-object.c:1942
+#, c-format
+msgid "Totem could not play '%s'."
+msgstr "ટોટેમ '%s' વગાડી શક્યું નહિં."
 
-#: ../src/totem-object.c:1805
+#: ../src/totem-object.c:1793
 msgid "No error message"
 msgstr "કોઈ ભૂલ સંદેશો નથી"
 
-#: ../src/totem-object.c:2154
+#: ../src/totem-object.c:2133
 msgid "Totem could not display the help contents."
 msgstr "ટોટેમ મદદ સમાવિષ્ટો પ્રદર્શિત કરી શક્યું નહિં."
 
-#: ../src/totem-object.c:2493 ../src/totem-object.c:2495
-#: ../browser-plugin/totem-plugin-viewer.c:1417
-msgid "An error occurred"
-msgstr "ભૂલ ઉદ્દભવી"
-
-#: ../src/totem-object.c:4064 ../src/totem-object.c:4066
+#: ../src/totem-object.c:4019 ../src/totem-object.c:4021
 msgid "Previous Chapter/Movie"
 msgstr "પહેલાનું પ્રકરણ/ફિલ્મ"
 
-#: ../src/totem-object.c:4073 ../src/totem-object.c:4075
+#: ../src/totem-object.c:4028 ../src/totem-object.c:4030
 msgid "Play / Pause"
 msgstr "વગાડો / અટકાવો"
 
-#: ../src/totem-object.c:4083 ../src/totem-object.c:4085
+#: ../src/totem-object.c:4038 ../src/totem-object.c:4040
 msgid "Next Chapter/Movie"
 msgstr "આગળનું પ્રકરણ/ફિલ્મ"
 
-#. Translators: this is the tooltip text for the fullscreen button in the controls box in Totem's main window.
 #. Translators: this is the accessibility text for the fullscreen button in the controls box in Totem's main window.
-#: ../src/totem-object.c:4097 ../src/totem-object.c:4099
+#: ../src/totem-object.c:4051 ../src/totem-object.c:4053
 msgid "Fullscreen"
 msgstr "પૂર્ણ સ્ક્રીન"
 
-#: ../src/totem-object.c:4229
+#: ../src/totem-object.c:4184
 msgid "Totem could not startup."
 msgstr "ટોટેમ શરુ થઈ શક્યું નહિં."
 
+#: ../src/totem-object.c:4184
+msgid "No reason."
+msgstr "કોઈ કારણ નથી."
+
 #: ../src/totem-open-location.c:182
 msgid "Open Location..."
 msgstr "જગ્યા ખોલો..."
@@ -1453,123 +1431,111 @@
 msgid "Movies to play"
 msgstr "વગાડવા માટેની ફિલ્મો"
 
-#: ../src/totem-options.c:117
+#: ../src/totem-options.c:79
+msgid "- Play movies and songs"
+msgstr "- ફિલ્મ અને ગીત ને ચલાવો"
+
+#: ../src/totem-options.c:142
 msgid "Can't enqueue and replace at the same time"
 msgstr "એકજ સમયે ક્રમમાં અને બદલી શકાતુ નથી"
 
 #. By extension entry
-#: ../src/totem-playlist.c:161
+#: ../src/totem-playlist.c:162
 msgid "MP3 ShoutCast playlist"
 msgstr "MP3 ShoutCast વગાડવાની યાદી"
 
-#: ../src/totem-playlist.c:162
+#: ../src/totem-playlist.c:163
 msgid "MP3 audio (streamed)"
 msgstr "MP3 ઓડિઓ (સ્ટ્રીમ થયેલ)"
 
-#: ../src/totem-playlist.c:163
+#: ../src/totem-playlist.c:164
 msgid "MP3 audio (streamed, DOS format)"
 msgstr "MP3 ઓડિઓ (સ્ટ્રીમ થયેલ, DOS બંધારણ)"
 
-#: ../src/totem-playlist.c:164
+#: ../src/totem-playlist.c:165
 msgid "XML Shareable Playlist"
 msgstr "XML વહેંચાય તેવી વગાડવાની યાદી"
 
 #. This is "Title 3", where title is a DVD title
 #. * Note: NOT a DVD chapter
-#: ../src/totem-playlist.c:347
+#: ../src/totem-playlist.c:348
 #, c-format
 msgid "Title %d"
 msgstr "શીર્ષક %d"
 
-#: ../src/totem-playlist.c:446
+#: ../src/totem-playlist.c:447
 msgid "Could not save the playlist"
 msgstr "વગાડવાની યાદી સંગ્રહી શક્યા નહિં"
 
-#: ../src/totem-playlist.c:1021
+#: ../src/totem-playlist.c:1022
 msgid "Save Playlist"
 msgstr "વગાડવાની યાદી સંગ્રહો"
 
 #. translators: Playlist is the default saved playlist filename,
 #. * without the suffix
-#: ../src/totem-playlist.c:1033 ../src/totem-playlist.c:1264
-#: ../src/totem-sidebar.c:142
+#: ../src/totem-playlist.c:1034 ../src/totem-playlist.c:1263
+#: ../src/totem-sidebar.c:145
 msgid "Playlist"
 msgstr "વગાડવા માટેની યાદી"
 
-#: ../src/totem-playlist.c:1857
+#: ../src/totem-playlist.c:1862
 #, c-format
 msgid "The playlist '%s' could not be parsed. It might be damaged."
 msgstr "વગાડવાની યાદી '%s' નું પદચ્છેદ કરી શક્યા નહિં, તે કદાચ બગડી ગયેલ છે."
 
-#: ../src/totem-playlist.c:1858
+#: ../src/totem-playlist.c:1863
 msgid "Playlist error"
 msgstr "વગાડવાની યાદીની ભૂલ"
 
-#: ../src/totem-preferences.c:295
+#: ../src/totem-preferences.c:297
 msgid "Preferences"
 msgstr "પસંદગીઓ"
 
-#: ../src/totem-preferences.c:451
+#: ../src/totem-preferences.c:445
 msgid "Select Subtitle Font"
 msgstr "ઉપશીર્ષક ફોન્ટ પસંદ કરો"
 
-#: ../src/totem-properties-main.c:115 ../src/totem-properties-view.c:266
+#: ../src/totem-properties-main.c:116 ../src/totem-properties-view.c:269
 msgid "Audio/Video"
 msgstr "ઓડિયો/વિડિઓ"
 
-#: ../src/totem-properties-view.c:128
-#| msgctxt "Audio codec"
-#| msgid "N/A"
+#: ../src/totem-properties-view.c:131
 msgid "N/A"
 msgstr "N/A"
 
-#: ../src/totem-properties-view.c:157
+#: ../src/totem-properties-view.c:160
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
-#| msgctxt "Audio codec"
-#| msgid "N/A"
 msgctxt "Stream bit rate"
 msgid "N/A"
 msgstr "N/A"
 
-#: ../src/totem-properties-view.c:160
+#: ../src/totem-properties-view.c:163
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: ../src/totem-properties-view.c:177
+#: ../src/totem-properties-view.c:180
 #: ../src/plugins/properties/totem-movie-properties.c:149
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../src/totem-properties-view.c:209
+#: ../src/totem-properties-view.c:212
 #: ../src/plugins/properties/totem-movie-properties.c:166
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: ../src/totem-properties-view.c:216
+#: ../src/totem-properties-view.c:219
 #: ../src/plugins/properties/totem-movie-properties.c:166
 msgctxt "Sample rate"
 msgid "N/A"
 msgstr "N/A"
 
-#: ../src/totem-properties-view.c:224
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5589
-msgid "Surround"
-msgstr "આસપાસ"
-
-#: ../src/totem-properties-view.c:226
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5591
-msgid "Mono"
-msgstr "મોનો"
-
-#: ../src/totem-properties-view.c:236
-#| msgctxt "Audio codec"
-#| msgid "N/A"
+#: ../src/totem-properties-view.c:239
 msgctxt "Number of audio channels"
 msgid "N/A"
 msgstr "N/A"
@@ -1602,8 +1568,8 @@
 #. eg: 75 %
 #: ../src/totem-statusbar.c:250
 #, c-format
-msgid "%d %%"
-msgstr "%d %%"
+msgid "%lf %%"
+msgstr "%lf %%"
 
 #. eg: Paused, 0:32 / 1:05
 #: ../src/totem-statusbar.c:325
@@ -1614,8 +1580,9 @@
 #. eg: Buffering, 75 %
 #: ../src/totem-statusbar.c:330
 #, c-format
-msgid "%s, %d %%"
-msgstr "%s, %d %%"
+#| msgid "%s, %d %%"
+msgid "%s, %f %%"
+msgstr "%s, %f %%"
 
 #: ../src/totem-subtitle-encoding.c:156
 msgid "Current Locale"
@@ -1758,219 +1725,93 @@
 msgid "Vietnamese"
 msgstr "વિયેટનામી"
 
-#: ../src/totem-video-list.c:330
-msgid "No video URI"
-msgstr "વિડિઓ URI નથી"
-
-#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
-#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
-#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
-#: ../src/totem-video-thumbnailer.c:872
-#, c-format
-msgid ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-msgstr ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-
-#: ../src/totem-video-thumbnailer.c:873
-msgid "Filename"
-msgstr "ફાઇલ નામ"
-
-#: ../src/totem-video-thumbnailer.c:875
-msgid "Resolution"
-msgstr "રિઝોલ્યુશન"
-
-#: ../src/totem-video-thumbnailer.c:878
-msgid "Duration"
-msgstr "સમયગાળો"
-
-#: ../src/totem-uri.c:506 ../src/plugins/chapters/totem-chapters.c:998
+#: ../src/totem-uri.c:343 ../src/plugins/chapters/totem-chapters.c:998
 msgid "All files"
 msgstr "બધી ફાઈલો"
 
-#: ../src/totem-uri.c:511 ../src/plugins/chapters/totem-chapters.c:995
+#: ../src/totem-uri.c:348 ../src/plugins/chapters/totem-chapters.c:995
 msgid "Supported files"
 msgstr "આધારભૂત ફાઈલો"
 
-#: ../src/totem-uri.c:523
+#: ../src/totem-uri.c:360
 msgid "Audio files"
 msgstr "ઓડિયો ફાઈલો"
 
-#: ../src/totem-uri.c:531
+#: ../src/totem-uri.c:368
 msgid "Video files"
 msgstr "વિડિઓ ફાઈલો"
 
-#: ../src/totem-uri.c:541
+#: ../src/totem-uri.c:378
 msgid "Subtitle files"
 msgstr "ઉપશીર્ષકો ફાઇલો"
 
-#: ../src/totem-uri.c:593
+#: ../src/totem-uri.c:430
 msgid "Select Text Subtitles"
 msgstr "ઉપશીર્ષક લખાણ પસંદ કરો"
 
-#: ../src/totem-uri.c:656
+#: ../src/totem-uri.c:495
 msgid "Select Movies or Playlists"
 msgstr "ફિલ્મો અને વગાડવાની યાદીઓ પસંદ કરો"
 
-#. Options parsing
-#: ../src/totem.c:201
-msgid "- Play movies and songs"
-msgstr "- ફિલ્મ અને ગીત ને ચલાવો"
-
-#: ../src/totem.c:212
-#, c-format
-msgid ""
-"%s\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"%s\n"
-"ઉપલ્બધ આદેશ વાક્ય વિકલ્પોની સંપૂર્ણ યાદી ને જોવા માટે '%s --help'ને ચલવો.\n"
-
-#: ../src/totem.c:254 ../src/totem.c:265
-#: ../browser-plugin/totem-plugin-viewer.c:663
-#: ../browser-plugin/totem-plugin-viewer.c:1793
-msgid "Totem Movie Player"
-msgstr "ટોટેમ ચિત્રપટ પ્લેયર"
-
-#: ../src/totem.c:255 ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Could not initialize the thread-safe libraries."
-msgstr "થ્રેડ-સુરક્ષા લાઈબ્રેરીઓનો પ્રારંભ કરી શક્યા નહિં."
-
-#: ../src/totem.c:255
-msgid "Verify your system installation. Totem will now exit."
-msgstr "તમારું સિસ્ટમ સ્થાપન ચકાસો. ટોટેમ હમણાં બંધ થઈ જશે."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:1589
-msgid "Password requested for RTSP server"
-msgstr "RTSP સર્વર માટે સૂચિત પાસવર્ડ"
+#: ../src/totem-uri.c:499
+msgid "Add Directory"
+msgstr "ડિરેક્ટરી ઉમેરો"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2858
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2862
-#, c-format
-msgid "Audio Track #%d"
-msgstr "ઓડિયો ટ્રેક #%d"
+#: ../src/totem-video-list.c:330
+msgid "No video URI"
+msgstr "વિડિઓ URI નથી"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2890
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2894
+#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
+#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
+#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
+#: ../src/totem-video-thumbnailer.c:841
 #, c-format
-msgid "Subtitle #%d"
-msgstr "ઉપશીર્ષક #%d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3298
-msgid ""
-"The requested audio output was not found. Please select another audio output "
-"in the Multimedia Systems Selector."
-msgstr ""
-"માંગણી થયેલ ઓડિયો આઉટપુટ મળ્યું નહિં. મહેરબાની કરીને મલ્ટીમીડિયા સિસ્ટમો પસંદગીકારકમાં "
-"અન્ય ઓડિયો આઉટપુટ પસંદ કરો."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3303
-msgid "Location not found."
-msgstr "સ્થાન મળ્યું નથી."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3307
-msgid "Could not open location; you might not have permission to open the file."
-msgstr "સ્થાન ખોલી શક્યા નહિં; કદાચ તમારી પાસે ફાઈલ ખોલવા માટે પરવાનગી નહિં હોય."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3318
-msgid ""
-"The video output is in use by another application. Please close other video "
-"applications, or select another video output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"વિડિઓ આઉટપુટ એ અન્ય કાર્યક્રમ દ્વારા વપરાશમાં છે. મહેરબાની કરીને અન્ય વીડિયો કાર્યક્રમ "
-"બંધ કરો, અથવા મલ્ટીમીડિયા સિસ્ટમ પસંદગીકારકમાં અન્ય વીડિયો આઉટપુટ પસંદ કરો."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3324
 msgid ""
-"The audio output is in use by another application. Please select another "
-"audio output in the Multimedia Systems Selector. You may want to consider "
-"using a sound server."
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 msgstr ""
-"ઓડિયો આઉટપુટ અન્ય કાર્યક્રમ દ્વારા વપરાશમાં છે. મહેરબાની કરીને મલ્ટીમીડિયા સિસ્ટમ "
-"પસંદગીકારકમાં અન્ય ઓડિયો આઉટપુટ પસંદ કરો. તમે અન્ય સાઉન્ડ સર્વર વાપરવાનું ધ્યાનમાં લેવું "
-"જોઈએ."
-
-#. should be exactly one missing thing (source or converter)
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3342
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3348
-#, c-format
-#| msgid ""
-#| "The playback of this movie requires a %s plugin which is not installed."
-msgid "The playback of this movie requires a %s plugin which is not installed."
-msgid_plural ""
-"The playback of this movie requires the following decoders which are not "
-"installed:\n"
-"\n"
-"%s"
-msgstr[0] "આ ફિલ્મના પ્લેબેકને %s પ્લગઈનની જરૂર છે કે જે સ્થાપિત થયેલ નથી."
-msgstr[1] ""
-"આ ફિલ્મના પ્લેબેકને નીચેનાં ડિકોડરની જરૂર છે કે જે સ્થાપિત થયેલ નથી:\n"
-"\n"
-"%s"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3374
-msgid "Cannot play this file over the network. Try downloading it to disk first."
-msgstr "આ ફાઈલને નેટવર્ક ઉપર વગાડી શકતા નથી. તેને ડિસ્કમાં પ્રથમ ચલાવવાનો પ્રયત્ન કરો."
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5878
-msgid "Media contains no supported video streams."
-msgstr "મીડિયા કોઈ આધારભૂત વિડિઓ બંધારણો સમાવતું નથી."
+#: ../src/totem-video-thumbnailer.c:842
+msgid "Filename"
+msgstr "ફાઇલ નામ"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6052
-msgid ""
-"Failed to create a GStreamer play object. Please check your GStreamer "
-"installation."
-msgstr ""
-"GStreamer વગાડો ઓબ્જેક્ટ બનાવવામાં નિષ્ફળ. મહેરબાની કીરને તમારું GStreamer સ્થાપન "
-"ચકાસો."
+#: ../src/totem-video-thumbnailer.c:844
+msgid "Resolution"
+msgstr "રિઝોલ્યુશન"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6172
-msgid ""
-"Failed to open audio output. You may not have permission to open the sound "
-"device, or the sound server may not be running. Please select another audio "
-"output in the Multimedia Systems Selector."
-msgstr ""
-"ઓડિયો આઉટપુટ ખોલવામાં નિષ્ફળ. તમારી પાસે સાઉન્ડ ઉપકરણ ખોલવામાં પરવાનગી નથી, અથવા "
-"સાઉન્ડ સર્વર ચાલી રહ્યું નથી. મહેરબાની કરીને મલ્ટીમીડિયા સિસ્ટમ પસંદગીકારકમાં અન્ય ઓડિયો "
-"આઉટપુટ પસંદ કરો."
+#: ../src/totem-video-thumbnailer.c:847
+msgid "Duration"
+msgstr "સમયગાળો"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6192
-msgid ""
-"Could not find the audio output. You may need to install additional "
-"GStreamer plugins, or select another audio output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"ઓડિયો આઉટપુટ શોધી શક્યા નહિં. તમને GStreamer પ્લગઈનો સ્થાપિત કરવાની જરૂર રહેશે, અથવા "
-"મલ્ટીમીડિયા સિસ્ટમો પસંદગીકારકમાં ઓડિયો આઉટપુટ પસંદ કરવાની જરૂર રહેશે."
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:1
+msgid "Apple Trailers"
+msgstr "ઍપલ ટ્રેલર"
+
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:2
+msgid "Sets the user agent for the Apple Trailers site"
+msgstr "ઍપલ ટ્રેલર સાઇટ માટે વપરાશકર્તા ઍજન્ટને સુયોજિત કરે છે"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:1
+#| msgid "Download Movie Subtitles"
+msgid "Autoload Subtitles"
+msgstr "ઉપશીર્ષકને સ્વયંલાવો"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:2
+#| msgid "Downloading the subtitles…"
+msgid "Autoloads text subtitles"
+msgstr "લખાણ ઉપશીર્ષકને સ્વયં લાવે છે"
 
-#. hour:minutes:seconds
-#. Translators: This is a time format, like "9:05:02" for 9
-#. * hours, 5 minutes, and 2 seconds. You may change ":" to
-#. * the separator that your locale uses or use "%Id" instead
-#. * of "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:83 ../src/plugins/skipto/totem-time-entry.c:57
-#, c-format
-msgctxt "long time format"
-msgid "%d:%02d:%02d"
-msgstr "%d:%02d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
+msgid "Video Disc Recorder"
+msgstr "વિડીયો ડિસ્ક રેકોર્ડર"
 
-#. minutes:seconds
-#. Translators: This is a time format, like "5:02" for 5
-#. * minutes and 2 seconds. You may change ":" to the
-#. * separator that your locale uses or use "%Id" instead of
-#. * "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:92
-#, c-format
-msgctxt "short time format"
-msgid "%d:%02d"
-msgstr "%d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
+msgid "Records (S)VCDs or video DVDs"
+msgstr "અહેવાલો (S)VCDs અથવા વિડિઓ DVDs"
 
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:65
 msgid "_Create Video Disc..."
@@ -1996,39 +1837,21 @@
 msgid "Copy the currently playing (S)VCD"
 msgstr "હાલમાં વાગતી (S)VCD ની નકલ કરો"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:129
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:136
 msgid "The video disc could not be duplicated."
 msgstr "વિડિઓ ડિસ્ક ની નકલ કરી શક્યા નહિં."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:131
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:276
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:138
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:283
 msgid "The movie could not be recorded."
 msgstr "ચિત્રપટ નો રેકોર્ડ કરી શક્યા નહિં."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:157
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:167
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:263
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:164
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:174
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:270
 msgid "Unable to write a project."
 msgstr "પ્રોજેક્ટ ને લખવામાં અસમર્થ."
 
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
-msgid "Video Disc Recorder"
-msgstr "વિડીયો ડિસ્ક રેકોર્ડર"
-
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
-msgid "Records (S)VCDs or video DVDs"
-msgstr "અહેવાલો (S)VCDs અથવા વિડિઓ DVDs"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:1
-#: ../src/plugins/chapters/totem-chapters.c:1139
-msgid "Chapters"
-msgstr "પ્રકરણો"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:2
-#| msgid "Next chapter or movie"
-msgid "Support chapter markers in movies."
-msgstr "ફિલ્મમાં પ્રકરણ માર્કર્સ આધાર."
-
 #: ../src/plugins/chapters/chapters-edit.ui.h:1
 msgid "Name for new chapter:"
 msgstr "નવાં પ્રકરણ માટે નામ:"
@@ -2085,6 +1908,16 @@
 msgid "Create a new chapter list for the movie"
 msgstr "ફિલ્મ માટે નવી પ્રકરણ યાદીને બનાવો"
 
+#: ../src/plugins/chapters/chapters.plugin.in.h:1
+#: ../src/plugins/chapters/totem-chapters.c:1139
+msgid "Chapters"
+msgstr "પ્રકરણો"
+
+#: ../src/plugins/chapters/chapters.plugin.in.h:2
+#| msgid "Support chapter markers in movies."
+msgid "Support chapter markers in movies"
+msgstr "ચિત્રમાં પ્રકરણ માર્કર આધાર"
+
 #: ../src/plugins/chapters/totem-chapters.c:56
 #, c-format
 msgid ""
@@ -2153,7 +1986,6 @@
 msgstr "CMML ફાઇલનું પદચ્છેદન કરવામાં નિષ્ફળતા"
 
 #: ../src/plugins/chapters/totem-edit-chapter.c:95
-#| msgid "Add Chapter..."
 msgid "Add Chapter"
 msgstr "પ્રકરણને ઉમેરો"
 
@@ -2188,13 +2020,38 @@
 msgid "The URI ‘%s’ is not supported."
 msgstr "URI ‘%s’ આધારભૂત નથી."
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
-msgid "Instant Messenger status"
-msgstr "તુરંત સંદેશાવાહક પરિસ્થિતિ"
+#: ../src/plugins/grilo/grilo.plugin.in.h:1
+msgid "Grilo Browser"
+msgstr "Grilo બ્રાઉઝર"
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
-msgid "Set your Instant Messenger status to away when a movie is playing"
-msgstr "તમારા તુરંત સંદેશાવાહક પરિસ્થિતિને દૂર સુયોજીત કરો જ્યારે મુવી વાગી રહી હોય"
+#: ../src/plugins/grilo/grilo.plugin.in.h:2
+#| msgid "A plugin to let you browse media content from various sources."
+msgid "A plugin to let you browse media content from various sources"
+msgstr "પ્લગઇન કે તમને વિવિધ સ્ત્રોતમાંથી મીડિયા સમાવિષ્ટને બ્રાઉઝ કરવા દે છે."
+
+#: ../src/plugins/grilo/grilo.ui.h:1
+msgid "Add to Playlist"
+msgstr "વગાડવા માટેની યાદીમાં ઉમેરો"
+
+#: ../src/plugins/grilo/grilo.ui.h:2
+msgid "Copy Location"
+msgstr "સ્થાનની નકલ કરો"
+
+#: ../src/plugins/grilo/grilo.ui.h:3 ../src/plugins/grilo/totem-grilo.c:1184
+msgid "Browse"
+msgstr "બ્રાઉઝ"
+
+#: ../src/plugins/grilo/grilo.ui.h:4 ../src/plugins/grilo/totem-grilo.c:1227
+msgid "Search"
+msgstr "શોધો"
+
+#: ../src/plugins/grilo/totem-grilo.c:454
+msgid "Browse Error"
+msgstr "ભૂલ બ્રાઉઝ કરો"
+
+#: ../src/plugins/grilo/totem-grilo.c:609
+msgid "Search Error"
+msgstr "ભૂલ શોધો"
 
 #: ../src/plugins/gromit/gromit.plugin.in.h:1
 msgid "Gromit Annotations"
@@ -2208,54 +2065,14 @@
 msgid "The gromit binary was not found."
 msgstr "gromit બાઈનરી મળી ન હતી."
 
-#. Add the interface to Totem's sidebar
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:1
-#: ../src/plugins/iplayer/iplayer.py:46
-msgid "BBC iPlayer"
-msgstr "BBC iPlayer"
-
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:2
-msgid "Stream BBC programs from the last 7 days from the BBC iPlayer service."
-msgstr "BBC iPlayer સેવા માંથી છેલ્લા ૭ દિવસો માંથી સ્ટ્રીમ BBC પ્રક્રિયાઓ."
-
-#: ../src/plugins/iplayer/iplayer.py:72
-msgid "Error listing channel categories"
-msgstr "ચેનલ વર્ગોની યાદી કરી રહ્યા હોય ત્યારે ભૂલ"
-
-#: ../src/plugins/iplayer/iplayer.py:73
-msgid ""
-"There was an unknown error getting the list of television channels available "
-"on BBC iPlayer."
-msgstr "BBC iPlayer પર ઉપલ્બધ ટેલિવીઝનની યાદીને મેળવી રહ્યા હોય ત્યારે અજ્ઞાત ભૂલ હતી."
-
-#. Append a dummy child row so that the expander's visible; we can
-#. then queue off the expander to load the programme listing for this
-#. category
-#: ../src/plugins/iplayer/iplayer.py:84
-msgid "Loading…"
-msgstr "લોડ કરી રહ્યા છે..."
-
-#. Translators: the "programme feed" is the list of TV shows
-#. available to watch online
-#: ../src/plugins/iplayer/iplayer.py:136
-msgid "Error getting programme feed"
-msgstr "પ્રક્રિયા ફીડને મેળવી રહ્યા હોય ત્યારે ભૂલ"
-
-#: ../src/plugins/iplayer/iplayer.py:137
-msgid ""
-"There was an error getting the list of programmes for this channel and "
-"category combination."
-msgstr ""
-"આ ચેનલ અને વર્ગ સંયોજન માટે પ્રક્રિયાઓની યાદીને મેળવી રહ્યા હોય ત્યારે અજ્ઞાત ભૂલ હતી."
-
-#: ../src/plugins/iplayer/iplayer2.py:298
-msgid ""
-msgstr "<કોઇ કારણ આપેલ નથી>"
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
+#| msgid "Instant Messenger status"
+msgid "Instant Messenger Status"
+msgstr "ઇન્સ્ટન્ટ મેસેન્જર સ્થિતિ"
 
-#: ../src/plugins/iplayer/iplayer2.py:299
-#, python-format
-msgid "Programme unavailable (\"%s\")"
-msgstr "પ્રક્રિયૈ બિનઉપલ્બધ (\"%s\")"
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
+msgid "Set your Instant Messenger status to away when a movie is playing"
+msgstr "તમારા તુરંત સંદેશાવાહક પરિસ્થિતિને દૂર સુયોજીત કરો જ્યારે મુવી વાગી રહી હોય"
 
 #: ../src/plugins/lirc/lirc.plugin.in.h:1
 msgid "Infrared Remote Control"
@@ -2273,33 +2090,37 @@
 msgid "Couldn't read lirc configuration."
 msgstr "lirc રૂપરેખાંકન વાંચી શક્યા નહિં."
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
-msgid "Download Movie Subtitles"
-msgstr "ચિત્રપટ ઉપશીર્ષકને ડાઉનલોડ કરો"
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:1
+#| msgid "Movie Player"
+msgid "Media Player Keys"
+msgstr "મીડિયા પ્લેયર કી"
+
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:2
+msgid "Support additional media player keys"
+msgstr "વધારાની મીડિયા પ્લેયર કીને આધાર આપે છે"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
-msgid "Subtitle _language:"
-msgstr "ઉપશીર્ષક ભાષા (_l):"
+#: ../src/plugins/ontop/ontop.plugin.in.h:1
+msgid "Always On Top"
+msgstr "હંમેશા ટોચ ઉપર"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
-msgid "_Play with Subtitle"
-msgstr "ઉપશીર્ષકો સાથે વગાડો (_P)"
+#: ../src/plugins/ontop/ontop.plugin.in.h:2
+msgid "Keep the main window on top when playing a movie"
+msgstr "મુખ્ય વિન્ડોને ટોચ ઉપર રાખો જ્યારે મુવી વગાડી રહ્યા હોય"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:1
 msgid "Subtitle Downloader"
 msgstr "ઉપશીર્ષક ડાઉનલોડર"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:2
-msgid "Look for subtitles for the currently playing movie."
+#| msgid "Look for subtitles for the currently playing movie."
+msgid "Look for subtitles for the currently playing movie"
 msgstr "હાલનાં ચિત્રપટને ચલાવવા ઉપશીર્ષકો માટે જુઓ."
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:42
-#| msgid "Brasilian Portuguese"
 msgid "Brazilian Portuguese"
 msgstr "બ્રાઝિલીયન પોર્ટુગીઝ"
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:177
-#| msgid "Searching subtitles…"
 msgid "Searching for subtitles…"
 msgstr "ઉપશીર્ષક ને શોધી રહ્યા છે..."
 
@@ -2314,12 +2135,10 @@
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:323
 #: ../src/plugins/opensubtitles/opensubtitles.py:341
-#| msgid "Could not contact the OpenSubtitles website"
 msgid "Could not contact the OpenSubtitles website."
 msgstr "OpenSubtitles વેબસાઇટને સંપર્ક કરી શકાયુ નહિં."
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:329
-#| msgid "No results found"
 msgid "No results found."
 msgstr "પરિણામો શોધાયા નથી."
 
@@ -2351,6 +2170,18 @@
 msgid "Searching subtitles…"
 msgstr "ઉપશીર્ષક ને શોધી રહ્યા છે..."
 
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
+msgid "Download Movie Subtitles"
+msgstr "ચિત્રપટ ઉપશીર્ષકને ડાઉનલોડ કરો"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
+msgid "Subtitle _language:"
+msgstr "ઉપશીર્ષક ભાષા (_l):"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
+msgid "_Play with Subtitle"
+msgstr "ઉપશીર્ષકો સાથે વગાડો (_P)"
+
 #: ../src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in.h:1
 msgid "Subtitle language"
 msgstr "ઉપશીર્ષક ભાષા"
@@ -2359,78 +2190,20 @@
 msgid "The language to search for subtitles for movies in."
 msgstr "તેમાં ફિલ્મો માટે ઉપશીર્ષક શોધવા માટે ભાષા."
 
-#: ../src/plugins/ontop/ontop.plugin.in.h:1
-msgid "Always On Top"
-msgstr "હંમેશા ટોચ ઉપર"
-
-#: ../src/plugins/ontop/ontop.plugin.in.h:2
-msgid "Keep the main window on top when playing a movie"
-msgstr "મુખ્ય વિન્ડોને ટોચ ઉપર રાખો જ્યારે મુવી વગાડી રહ્યા હોય"
+#: ../src/plugins/properties/movie-properties.plugin.in.h:1
+#| msgid "Properties"
+msgid "Movie Properties"
+msgstr "ચિત્રપટ ગુણધર્મો"
+
+#: ../src/plugins/properties/movie-properties.plugin.in.h:2
+#| msgid "Show or hide the sidebar"
+msgid "Adds movie properties to the sidebar"
+msgstr "બાજુપટ્ટીમાં ચિત્ર ગુણધર્મોને ઉમેરે છે"
 
 #: ../src/plugins/properties/totem-movie-properties.c:246
 msgid "Properties"
 msgstr "ગુણધર્મો"
 
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:1
-msgid "Publisher protocol to use"
-msgstr "વાપરવા માટે પ્રકાશક પ્રોટોકોલ"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:2
-msgid "The transport protocol to use when publishing playlists over the network."
-msgstr ""
-"વાપરવા માટે ટ્રાન્સપોર્ટ પ્રોટોકોલ જ્યારે નેટવર્ક પર પ્લેલીસ્ટને પ્રકાશિત કરી રહ્યા હોય."
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:3
-msgid "Format for network service name"
-msgstr "નેટવર્ક સેવા નામ માટે બંધારણ"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:5
-#, no-c-format
-msgid ""
-"A format string used to build the network service name used when publishing "
-"playlists over the network. The following format placeholders can be used: • "
-"%a: the program name as returned by g_get_application_name() • %h: the "
-"machine's host name in title case • %u: the user's login name in title case "
-"• %U: the user's real name • %%: the percent sign"
-msgstr ""
-"વાપરેલ નેટવર્ક સેવા નામને બનાવવા માટે વાપરેલ બંધારણ શબ્દમાળા જ્યારે નેટવર્ક પર પ્લેલીસ્ટને "
-"પ્રકાશિત કરી રહ્યા હોય. નીચેનું બંધારણ પ્લેસહોલ્ડરને વાપરી શકાય છે: • "
-"%a: g_get_application_name() દ્દારા પાછુ મળેલ કાર્યક્રમ નામ • %h: શીર્ષકમાં મશીનનું યજમાન "
-"નામ • %u: શીર્ષકમાં વપરાશકર્તાનું પ્રવેશ નામ "
-"• %U: વપરાશકર્તાનું સાચુ નામ • %%: ટકાવારી હસ્તાક્ષર"
-
-#. Translators: computers on the local network which are publishing their playlists over the network
-#: ../src/plugins/publish/totem-publish.c:552
-msgid "Neighbors"
-msgstr "પાડોશીઓ"
-
-#: ../src/plugins/publish/publish.plugin.in.h:1
-msgid "Publish Playlist"
-msgstr "જાહેર કરવા વગાડવા માટેની યાદી"
-
-#: ../src/plugins/publish/publish.plugin.in.h:2
-msgid "Share the current playlist via HTTP"
-msgstr "HTTP દ્દારા હાલના પ્લેલીસ્ટની વહેંચણી કરો"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:1
-msgid "Service _Name:"
-msgstr "સેવાનું નામ (_N):"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:3
-#, no-c-format
-msgid ""
-"The name used for announcing the playlist service on the network.\n"
-"All occurrences of the string %u will be replaced by your name,\n"
-"and %h will be replaced by your computer's host name."
-msgstr ""
-"નેટવર્ક પર પ્લેયાદી સેવાની રજૂઆત કરવા માટે વપરાયેલ નામ.\n"
-"શબ્દમાળા %u નાં બધા બનાવો એ તમારા નામ દ્દારા બદલાયેલ હશે,\n"
-"અને %h એ તમારા કૉમ્પ્યુટરનાં યજમાન નામ દ્દારા બદલાયેલ હશે."
-
-#: ../src/plugins/publish/publish-plugin.ui.h:6
-msgid "Use _encrypted transport protocol (HTTPS)"
-msgstr "એન્ક્રિપ્ટ થયેલ ટ્રાન્સપોર્ટ પ્રોટોકોલ (HTTPS) વાપરો (_e)"
-
 #: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:1
 msgid "rpdb2 password"
 msgstr "rpdb2 પાસવર્ડ"
@@ -2443,22 +2216,91 @@
 "બિનસત્તાધિકરણ દૂરસ્થ વપરાશ માંથી ડિબગીંગ Totem માટે rpdb2 સર્વરને સુરક્ષિત રાખવા માટે "
 "પાસવર્ડ. જો આ ખાલી હોય તો, 'totem' નાં મૂળભૂતને વાપરેલ હશે."
 
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
+msgid "Python Console"
+msgstr "પાયથોન કોન્સોલ"
+
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
+#| msgid "Interactive Python console."
+msgid "Interactive Python console"
+msgstr "અરસપરસ Python કન્સોલ"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:88
+msgid "Python Console Menu"
+msgstr "પાયથોન કોન્સોલ મેનુ"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:93
+msgid "_Python Console"
+msgstr "પાયથોન કોન્સોલ (_P)"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:94
+msgid "Show Totem's Python console"
+msgstr "Totem નું Python કોન્સોલ બતાવો"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:100
+msgid "Python Debugger"
+msgstr "પાયથોન ડિબગર"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:101
+msgid "Enable remote Python debugging with rpdb2"
+msgstr "rpdb2 સાથે ડિબગ કરી રહ્યા છે તે દૂરસ્ત Python ને સક્રિય કરો"
+
+#. pylint: disable-msg=E1101
+#: ../src/plugins/pythonconsole/pythonconsole.py:125
+#, python-format
+msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
+msgstr "'totem_object' મારફતે Totem.Object ઓબ્જેક્ટ નો તમે પ્રવેશ કરી શકો છો :\\n%s"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:129
+msgid "Totem Python Console"
+msgstr "ટોટેમ પાયથોન કોન્સોલ"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:139
+msgid ""
+"After you press OK, Totem will wait until you connect to it with winpdb or "
+"rpdb2. If you have not set a debugger password in DConf, it will use the "
+"default password ('totem')."
+msgstr ""
+"તમે બરાબર દબાવ્યા પછી, Totem એ રાહ જોશે ત્યાં સુધી તમે તેને winpdb અથવા rpdb2 જોડશો "
+"નહિં. જો DConf માં તમે ડિબગર પાસવર્ડ ને સુયોજિત કરેલ ન હોય તો, તે મૂળભૂત પાસવર્ડ "
+"('totem') ને વાપરશે."
+
+#: ../src/plugins/recent/recent.plugin.in.h:1
+#| msgid "Video files"
+msgid "Recent files"
+msgstr "તાજેતરની ફાઈલો"
+
+#: ../src/plugins/recent/recent.plugin.in.h:2
+msgid "Adds files that have been played to recent files"
+msgstr "ફાઇલોને ઉમેરો કે જે તાજેતરની ફાઇલોમાં વગાડી દેવામાં આવી છે"
+
 #: ../src/plugins/rotation/rotation.plugin.in.h:1
 msgid "Rotation Plugin"
 msgstr "પરિભ્રમણ પ્લગઇન"
 
 #: ../src/plugins/rotation/rotation.plugin.in.h:2
-msgid "Allows videos to be rotated if they're in the wrong orientation."
-msgstr "પરિભ્રમણ કરવા માટે વિડીયોને પરવાનગી આપે છે જો તેઓ ખોટી દિશામાં જાય."
+#| msgid "Allows videos to be rotated if they're in the wrong orientation."
+msgid "Allows videos to be rotated if they are in the wrong orientation"
+msgstr "પરિભ્રમણ કરવા માટે વિડિયોને પરવાનગી આપે છે જો તેઓ ખોટી દિશામાં જાય."
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:60
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:50
 msgid "_Rotate Clockwise"
 msgstr "સમઘડી દિશામાં ફેરવો (_R)"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:62
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:52
 msgid "Rotate Counterc_lockwise"
 msgstr "વિષમઘડી દિશામાં ફેરવો (_l)"
 
+#: ../src/plugins/save-file/save-file.plugin.in.h:1
+#| msgid "Save a Copy"
+msgid "Save Copy"
+msgstr "નકલને સંગ્રહો"
+
+#: ../src/plugins/save-file/save-file.plugin.in.h:2
+#| msgid "Copy the currently playing video DVD"
+msgid "Save a copy of the currently playing movie"
+msgstr "હાલમાં વગાડી રહ્યા હોય તેવા ચિત્રપટની નકલને સંગ્રહો"
+
 #: ../src/plugins/save-file/totem-save-file.c:63
 msgid "Save a Copy..."
 msgstr "નકલને સંગ્રહો..."
@@ -2478,14 +2320,17 @@
 msgstr "ફિલ્મ"
 
 #: ../src/plugins/save-file/totem-save-file.c:183
-#| msgid "Movies to play"
 msgid "Movie stream"
 msgstr "વગાડવા માટેની ફિલ્મો"
 
-#: ../src/plugins/screensaver/totem-screensaver.c:116
-#: ../browser-plugin/totem-plugin-viewer.c:1891
-msgid "Playing a movie"
-msgstr "ચિત્રપટ વગાડી રહ્યા છીએ"
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:1
+msgid "Screen Saver"
+msgstr "સ્ક્રીન સેવર"
+
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:2
+#| msgid "Disable screensaver when playing "
+msgid "Deactivates the screen saver when a movie is playing"
+msgstr "જ્યારે ચિત્રપટ વગાડી રહ્યા હોય ત્યારે સ્ક્રીનસેવરને નિષ્ક્રિય કરો "
 
 #: ../src/plugins/screenshot/gallery.ui.h:1
 msgid "Screenshot width (in pixels):"
@@ -2499,23 +2344,31 @@
 msgid "Number of screenshots:"
 msgstr "સ્ક્રીનશોટોની સંખ્યા:"
 
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:1
-msgid "_Name:"
-msgstr "નામ (_N):"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:2
-msgid "Save in _folder:"
-msgstr "ફોલ્ડરમાં સંગ્રહો (_f):"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:3
-msgid "Select a folder"
-msgstr "ફોલ્ડરને પસંદ કરો"
-
-#. Write the screenshot to the temporary file
-#: ../src/plugins/screenshot/gnome-screenshot-widget.c:385
-#: ../src/plugins/screenshot/totem-screenshot.c:64
-msgid "Screenshot.png"
-msgstr "ફોટો.png"
+#. translators: this is the name of the file that gets made up
+#. * with the screenshot if the entire screen is taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:147
+#, c-format
+#| msgid "Screenshot.png"
+msgid "Screenshot from %s.png"
+msgstr "%s.png માંથી સ્ક્રીનશોટ"
+
+#. translators: this is the name of the file that gets
+#. * made up with the screenshot if the entire screen is
+#. * taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:154
+#, c-format
+#| msgid "Screenshot-%s-%d.png"
+msgid "Screenshot from %s - %d.png"
+msgstr "%s માંથી સ્ક્રીનશોટ - %d.png"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:1
+#| msgid "Screenshot.png"
+msgid "Screenshot"
+msgstr "સ્ક્રીનશોટ"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:2
+msgid "Allows screenshots and galleries to be taken of videos"
+msgstr "વિડિયોને લેવા માટે સ્ક્રિનશોટ અમે ગૅલરિને પરવાનગી આપે છે"
 
 #: ../src/plugins/screenshot/totem-gallery.c:91
 msgid "Save Gallery"
@@ -2541,49 +2394,48 @@
 msgid "Saving gallery as \"%s\""
 msgstr "\"%s\" તરીકે ગેલેરી ને સંગ્રહ કરી રહ્યા છે"
 
-#: ../src/plugins/screenshot/totem-screenshot.c:113
-msgid "There was an error saving the screenshot."
-msgstr "ત્યાં સ્ક્રીનની છબી સંગ્રહવામાં ભૂલ છે."
-
-#: ../src/plugins/screenshot/totem-screenshot.c:139
-msgid "Save Screenshot"
-msgstr "સ્ક્રીનની છબી સંગ્રહો"
-
-#. Create the screenshot widget
-#. Translators: %s is the movie title and %d is an auto-incrementing number to make filename unique
-#: ../src/plugins/screenshot/totem-screenshot.c:160
-#, c-format
-msgid "Screenshot-%s-%d.png"
-msgstr "સ્ક્રીનશોટ-%s-%d.png"
-
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:88
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:220
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "Totem could not get a screenshot of the video."
 msgstr "Totem એ વિડીયોનાં સ્ક્રીનશોટ ને મેળવી શક્યા નહિં."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "This is not supposed to happen; please file a bug report."
 msgstr "આ બનવાનું હતું નહિં; મહેરબાની કરીને ભૂલનો અહેવાલ જમા કરો."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
-msgid "Take _Screenshot..."
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
+#| msgid "Take _Screenshot..."
+msgid "Take _Screenshot"
 msgstr "સ્ક્રીનશોટ લો (_S)..."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
 msgid "Take a screenshot"
 msgstr "સ્ક્રીનની છબી લો"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create Screenshot _Gallery..."
 msgstr "સ્ક્રીનશોટ ગેલેરી બનાવો (_G)..."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create a gallery of screenshots"
 msgstr "સ્ક્રીનશોટોની ગેલેરી બનાવો"
 
+#: ../src/plugins/skipto/skipto.plugin.in.h:1
+#: ../src/plugins/skipto/totem-skipto.c:196
+msgid "Skip To"
+msgstr "સુધી અવગણો"
+
+#: ../src/plugins/skipto/skipto.plugin.in.h:2
+msgid "Provides the \"Skip to\" dialog"
+msgstr "\"આને છોડો\" સંવાદને પૂરુ પાડે છે"
+
+#: ../src/plugins/skipto/skipto.ui.h:1
+msgid "_Skip to:"
+msgstr "સુધી અવગણો (_S):"
+
 #. Update the "seconds" label so that it always has the correct singular/plural form
 #. Translators: label for the seconds selector in the "Skip to" dialogue
-#: ../src/plugins/skipto/totem-skipto.c:160
+#: ../src/plugins/skipto/totem-skipto.c:159
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "સેકન્ડ"
@@ -2593,18 +2445,12 @@
 #. Translators: you should translate this string to a number (written in digits) which corresponds to the longer character length of the
 #. * translations for "second" and "seconds", as translated elsewhere in this file. For example, in English, "second" is 6 characters long and
 #. * "seconds" is 7 characters long, so this string should be translated to "7". See: bgo#639398
-#: ../src/plugins/skipto/totem-skipto.c:190
+#: ../src/plugins/skipto/totem-skipto.c:189
 msgctxt "Skip To label length"
 msgid "7"
 msgstr "7"
 
-#: ../src/plugins/skipto/totem-skipto.c:197
-#| msgid "Skip to"
-msgid "Skip To"
-msgstr "સુધી અવગણો"
-
 #: ../src/plugins/skipto/totem-skipto-plugin.c:182
-#| msgid "_Skip to..."
 msgid "_Skip To..."
 msgstr "ને છોડી દો (_S)..."
 
@@ -2612,122 +2458,301 @@
 msgid "Skip to a specific time"
 msgstr "ચોક્કસ સમયે રદ કરો"
 
-#: ../src/plugins/skipto/skipto.ui.h:1
-msgid "_Skip to:"
-msgstr "સુધી અવગણો (_S):"
+#~ msgid "Play movies and songs"
+#~ msgstr "ફિલ્મ અને ગીત ને ચલાવો"
 
-#: ../browser-plugin/totem-plugin-viewer.c:431
-msgid "No URI to play"
-msgstr "વગાડવા માટે કોઈ URI નથી"
+#~ msgid "Open a file"
+#~ msgstr "ફાઈલ ખોલો"
 
-#. translators: this is:
-#. * Open With ApplicationName
-#. * as in nautilus' right-click menu
-#: ../browser-plugin/totem-plugin-viewer.c:1107
-#, c-format
-msgid "_Open with \"%s\""
-msgstr "\"%s\" સાથે ખોલો (_O)"
+#~ msgid "Open a non-local file"
+#~ msgstr "બિન-સ્થાનીય ફાઈલ ખોલો"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2136
-msgid "No playlist or playlist empty"
-msgstr "વગાડવાની યાદી નથી અથવા વગાડવાની યાદી ખાલી છે"
+#~ msgid "Quit the program"
+#~ msgstr "કાર્યક્રમ બંધ કરો"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2235
-msgid "Movie browser plugin"
-msgstr "મુવી બ્રાઉઝર પ્લગઈન"
+#~ msgid "Configure the application"
+#~ msgstr "કાર્યક્રમને રૂપરેખાંકિત કરો"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Verify your system installation. The Totem plugin will now exit."
-msgstr "તમારા સિસ્ટમ સ્થાપનની ખાતરી કરો. ટોટેમ પ્લગઈન હવે બંધ થઈ જશે."
+#~ msgid "Switch to fullscreen"
+#~ msgstr "પૂર્ણ સ્ક્રીનમાં ફેરબદલી કરો"
 
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
-msgid "Python Console"
-msgstr "પાયથોન કોન્સોલ"
+#~ msgid "Set the repeat mode"
+#~ msgstr "પુનરાવર્તિત સ્થિતિ સુયોજિત કરો"
 
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
-msgid "Interactive Python console."
-msgstr "અરસપરસ Python કોન્સોલ."
+#~ msgid "Set the shuffle mode"
+#~ msgstr "રેન્ડમ સ્થિતિ સુયોજિત કરો"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:88
-msgid "Python Console Menu"
-msgstr "પાયથોન કોન્સોલ મેનુ"
+#~ msgid "14.4 Kbps Modem"
+#~ msgstr "14.4 Kbps મોડેમ"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:93
-msgid "_Python Console"
-msgstr "પાયથોન કોન્સોલ (_P)"
+#~ msgid "19.2 Kbps Modem"
+#~ msgstr "19.2 Kbps મોડેમ"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:94
-msgid "Show Totem's Python console"
-msgstr "Totem નું Python કોન્સોલ બતાવો"
+#~ msgid "28.8 Kbps Modem"
+#~ msgstr "28.8 Kbps મોડેમ"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:100
-msgid "Python Debugger"
-msgstr "પાયથોન ડિબગર"
+#~ msgid "33.6 Kbps Modem"
+#~ msgstr "33.6 Kbps મોડેમ"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:101
-msgid "Enable remote Python debugging with rpdb2"
-msgstr "rpdb2 સાથે ડિબગ કરી રહ્યા છે તે દૂરસ્ત Python ને સક્રિય કરો"
+#~ msgid "34.4 Kbps Modem"
+#~ msgstr "34.4 Kbps મોડેમ"
 
-#. pylint: disable-msg=E1101
-#: ../src/plugins/pythonconsole/pythonconsole.py:125
-#, python-format
-msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
-msgstr "'totem_object' મારફતે Totem.Object ઓબ્જેક્ટ નો તમે પ્રવેશ કરી શકો છો :\\n%s"
+#~ msgid "56 Kbps Modem/ISDN"
+#~ msgstr "56 Kbps મોડેમ/ISDN"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:129
-msgid "Totem Python Console"
-msgstr "ટોટેમ પાયથોન કોન્સોલ"
+#~ msgid "112 Kbps Dual ISDN/DSL"
+#~ msgstr "112 Kbps બમણું ISDN/DSL"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:139
-#| msgid ""
-#| "After you press OK, Totem will wait until you connect to it with winpdb "
-#| "or rpdb2. If you have not set a debugger password in GConf, it will use "
-#| "the default password ('totem')."
-msgid ""
-"After you press OK, Totem will wait until you connect to it with winpdb or "
-"rpdb2. If you have not set a debugger password in DConf, it will use the "
-"default password ('totem')."
-msgstr ""
-"તમે બરાબર દબાવ્યા પછી, Totem એ રાહ જોશે ત્યાં સુધી તમે તેને winpdb અથવા rpdb2 જોડશો "
-"નહિં. જો DConf માં તમે ડિબગર પાસવર્ડ ને સુયોજિત કરેલ ન હોય તો, તે મૂળભૂત પાસવર્ડ "
-"('totem') ને વાપરશે."
+#~ msgid "256 Kbps DSL/Cable"
+#~ msgstr "256 Kbps DSL/કેબલ"
 
-#: ../src/plugins/grilo/grilo.plugin.in.h:1
-#| msgid "YouTube Browser"
-msgid "Grilo Browser"
-msgstr "Grilo બ્રાઉઝર"
+#~ msgid "384 Kbps DSL/Cable"
+#~ msgstr "384 Kbps DSL/કેબલ"
 
-#: ../src/plugins/grilo/grilo.plugin.in.h:2
-#| msgid "A plugin to let you browse YouTube videos."
-msgid "A plugin to let you browse media content from various sources."
-msgstr "પ્લગઇન કે તમને વિવિધ સ્ત્રોતમાંથી મીડિયા સમાવિષ્ટને બ્રાઉઝ કરવા દે છે."
+#~ msgid "512 Kbps DSL/Cable"
+#~ msgstr "512 Kbps DSL/કેબલ"
 
-#: ../src/plugins/grilo/totem-grilo.c:452
-msgid "Browse Error"
-msgstr "ભૂલ બ્રાઉઝ કરો"
+#~ msgid "1.5 Mbps T1/Intranet/LAN"
+#~ msgstr "1.5 Mbps T1/ઇન્ટ્રાનેટ/LAN"
 
-#: ../src/plugins/grilo/totem-grilo.c:599
-msgid "Search Error"
-msgstr "ભૂલ શોધો"
+#~ msgid "Intranet/LAN"
+#~ msgstr "ઇન્ટરનેટ/LAN"
 
-#: ../src/plugins/grilo/totem-grilo.c:1219 ../src/plugins/grilo/grilo.ui.h:3
-msgid "Browse"
-msgstr "બ્રાઉઝ"
+#~ msgid "Networking"
+#~ msgstr "નેટવર્કીંગ"
 
-#: ../src/plugins/grilo/totem-grilo.c:1285 ../src/plugins/grilo/grilo.ui.h:4
-#| msgid "Local Search"
-msgid "Search"
-msgstr "શોધો"
+#~ msgid "Connection _speed:"
+#~ msgstr "જોડાણ ઝડપ (_s):"
 
-#: ../src/plugins/grilo/grilo.ui.h:1
-#| msgid "_Add to Playlist"
-msgid "Add to Playlist"
-msgstr "વગાડવા માટેની યાદીમાં ઉમેરો"
+#~ msgid "Network connection speed"
+#~ msgstr "નેટવર્ક જોડાણ ઝડપ"
 
-#: ../src/plugins/grilo/grilo.ui.h:2
-#| msgid "_Copy Location"
-msgid "Copy Location"
-msgstr "સ્થાનની નકલ કરો"
+#~ msgid ""
+#~ "Approximate network connection speed, used to select quality on media "
+#~ "over the network."
+#~ msgstr ""
+#~ "આશરે ઝડપ નેટવર્ક જોડાણ, નેટવર્ક પર મીડિયા પર ગુણવત્તાને પસંદ કરવા માટે વાપરેલ છે."
+
+#~ msgid "Play Image '%s'"
+#~ msgstr "ઇમેજ '%s' ને વગાડો"
+
+#~ msgid "device%d"
+#~ msgstr "device%d"
+
+#~ msgid "Play Disc '%s'"
+#~ msgstr "ડિસ્ક '%s' વગાડો"
+
+#~ msgid "Movie Player using %s"
+#~ msgstr "%s ની મદદથી મુવી પ્લેયર"
+
+#~ msgid ""
+#~ "Totem could not play this media (%s) although a plugin is present to "
+#~ "handle it."
+#~ msgstr ""
+#~ "ટોટેમ આ મીડિયા (%s) ને વગાડી શકી નહિં તેને નિયંત્રિત કરવા માટે તેના પ્લગઈન હાજર "
+#~ "હોવા છતાં."
+
+#~ msgid ""
+#~ "You might want to check that a disc is present in the drive and that it "
+#~ "is correctly configured."
+#~ msgstr ""
+#~ "તમારે ચકાસવાની જરૂર છે કે ડિસ્ક તેની ડ્રાઈવમાં હાજર છે ને અને તે યોગ્ય રીતે રૂપરેખાંકિત છે."
+
+#~ msgid "More information about media plugins"
+#~ msgstr "મીડિયા પ્લગઈનો વિશે વધુ જાણકારી"
+
+#~ msgid ""
+#~ "Please install the necessary plugins and restart Totem to be able to play "
+#~ "this media."
+#~ msgstr ""
+#~ "મહેરબાની કરીને જરૂરી પ્લગઈનો સ્થાપિત કરો અને આ મીડિયાને વગાડી શકે એના માટે ટોટેમને "
+#~ "ફરીથી શરૂ કરો."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it does not have the "
+#~ "appropriate plugins to be able to read from the disc."
+#~ msgstr ""
+#~ "ટોટેમ આ પ્રકારની મીડિયા (%s) વગાડી શકતી નથી કારણ કે તેની પાસે ડિસ્કમાંથી વાંચવા "
+#~ "માટે સમર્થ હોય તેવા યોગ્ય પ્લગઈનો નથી."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because you do not have the "
+#~ "appropriate plugins to handle it."
+#~ msgstr ""
+#~ "ટોટેમ આ પ્રકારની મીડિયા (%s) વગાડી શકતી નથી કારણ કે તમારી પાસે તેને નિયંત્રિત "
+#~ "કરવા માટે યોગ્ય પ્લગઈનો નથી."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it is not supported."
+#~ msgstr "ટોટેમ આ મિડીયા (%s) ના પ્રકાર વગાડી શકતુ નથી કારણ કે તે આધારભૂત નથી."
+
+#~ msgid "Please insert another disc to play back."
+#~ msgstr "મહેરબાની કરીને પાછી વગાડવા માટે બીજી ડિસ્કને દાખલ કરો."
+
+#~ msgid "Totem does not support playback of Audio CDs"
+#~ msgstr "ટોટેમ એ ઓડિયો CDs ને પાછુ વગાડવા માટે આધાર આપતુ નથી"
+
+#~ msgid ""
+#~ "Please consider using a music player or a CD extractor to play this CD"
+#~ msgstr ""
+#~ "મહેરબાની કરીને મ્યુઝિક પ્લેયરની મદદથી અથવા આ CD ને વગાડવા માટે CD એક્સટ્રેક્ટર ને નક્કી "
+#~ "કરો"
+
+#~ msgid "%d %%"
+#~ msgstr "%d %%"
+
+#~ msgid ""
+#~ "The requested audio output was not found. Please select another audio "
+#~ "output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "માંગણી થયેલ ઓડિયો આઉટપુટ મળ્યું નહિં. મહેરબાની કરીને મલ્ટીમીડિયા સિસ્ટમો પસંદગીકારકમાં "
+#~ "અન્ય ઓડિયો આઉટપુટ પસંદ કરો."
+
+#~ msgid "Location not found."
+#~ msgstr "સ્થાન મળ્યું નથી."
+
+#~ msgid ""
+#~ "Could not open location; you might not have permission to open the file."
+#~ msgstr "સ્થાન ખોલી શક્યા નહિં; કદાચ તમારી પાસે ફાઈલ ખોલવા માટે પરવાનગી નહિં હોય."
+
+#~ msgid ""
+#~ "The video output is in use by another application. Please close other "
+#~ "video applications, or select another video output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "વિડિઓ આઉટપુટ એ અન્ય કાર્યક્રમ દ્વારા વપરાશમાં છે. મહેરબાની કરીને અન્ય વીડિયો "
+#~ "કાર્યક્રમ બંધ કરો, અથવા મલ્ટીમીડિયા સિસ્ટમ પસંદગીકારકમાં અન્ય વીડિયો આઉટપુટ પસંદ "
+#~ "કરો."
+
+#~ msgid ""
+#~ "The audio output is in use by another application. Please select another "
+#~ "audio output in the Multimedia Systems Selector. You may want to consider "
+#~ "using a sound server."
+#~ msgstr ""
+#~ "ઓડિયો આઉટપુટ અન્ય કાર્યક્રમ દ્વારા વપરાશમાં છે. મહેરબાની કરીને મલ્ટીમીડિયા સિસ્ટમ "
+#~ "પસંદગીકારકમાં અન્ય ઓડિયો આઉટપુટ પસંદ કરો. તમે અન્ય સાઉન્ડ સર્વર વાપરવાનું ધ્યાનમાં લેવું "
+#~ "જોઈએ."
+
+#~ msgid ""
+#~ "Failed to create a GStreamer play object. Please check your GStreamer "
+#~ "installation."
+#~ msgstr ""
+#~ "GStreamer વગાડો ઓબ્જેક્ટ બનાવવામાં નિષ્ફળ. મહેરબાની કીરને તમારું GStreamer સ્થાપન "
+#~ "ચકાસો."
+
+#~ msgid ""
+#~ "Failed to open audio output. You may not have permission to open the "
+#~ "sound device, or the sound server may not be running. Please select "
+#~ "another audio output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "ઓડિયો આઉટપુટ ખોલવામાં નિષ્ફળ. તમારી પાસે સાઉન્ડ ઉપકરણ ખોલવામાં પરવાનગી નથી, "
+#~ "અથવા સાઉન્ડ સર્વર ચાલી રહ્યું નથી. મહેરબાની કરીને મલ્ટીમીડિયા સિસ્ટમ પસંદગીકારકમાં "
+#~ "અન્ય ઓડિયો આઉટપુટ પસંદ કરો."
+
+#~ msgid ""
+#~ "Could not find the audio output. You may need to install additional "
+#~ "GStreamer plugins, or select another audio output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "ઓડિયો આઉટપુટ શોધી શક્યા નહિં. તમને GStreamer પ્લગઈનો સ્થાપિત કરવાની જરૂર રહેશે, "
+#~ "અથવા મલ્ટીમીડિયા સિસ્ટમો પસંદગીકારકમાં ઓડિયો આઉટપુટ પસંદ કરવાની જરૂર રહેશે."
+
+#~ msgid "BBC iPlayer"
+#~ msgstr "BBC iPlayer"
+
+#~ msgid ""
+#~ "Stream BBC programs from the last 7 days from the BBC iPlayer service."
+#~ msgstr "BBC iPlayer સેવા માંથી છેલ્લા ૭ દિવસો માંથી સ્ટ્રીમ BBC પ્રક્રિયાઓ."
+
+#~ msgid "Error listing channel categories"
+#~ msgstr "ચેનલ વર્ગોની યાદી કરી રહ્યા હોય ત્યારે ભૂલ"
+
+#~ msgid ""
+#~ "There was an unknown error getting the list of television channels "
+#~ "available on BBC iPlayer."
+#~ msgstr ""
+#~ "BBC iPlayer પર ઉપલ્બધ ટેલિવીઝનની યાદીને મેળવી રહ્યા હોય ત્યારે અજ્ઞાત ભૂલ હતી."
+
+#~ msgid "Loading…"
+#~ msgstr "લોડ કરી રહ્યા છે..."
+
+#~ msgid "Error getting programme feed"
+#~ msgstr "પ્રક્રિયા ફીડને મેળવી રહ્યા હોય ત્યારે ભૂલ"
+
+#~ msgid ""
+#~ "There was an error getting the list of programmes for this channel and "
+#~ "category combination."
+#~ msgstr ""
+#~ "આ ચેનલ અને વર્ગ સંયોજન માટે પ્રક્રિયાઓની યાદીને મેળવી રહ્યા હોય ત્યારે અજ્ઞાત ભૂલ હતી."
+
+#~ msgid ""
+#~ msgstr "<કોઇ કારણ આપેલ નથી>"
+
+#~ msgid "Programme unavailable (\"%s\")"
+#~ msgstr "પ્રક્રિયૈ બિનઉપલ્બધ (\"%s\")"
+
+#~ msgid "Publisher protocol to use"
+#~ msgstr "વાપરવા માટે પ્રકાશક પ્રોટોકોલ"
+
+#~ msgid ""
+#~ "The transport protocol to use when publishing playlists over the network."
+#~ msgstr ""
+#~ "વાપરવા માટે ટ્રાન્સપોર્ટ પ્રોટોકોલ જ્યારે નેટવર્ક પર પ્લેલીસ્ટને પ્રકાશિત કરી રહ્યા હોય."
+
+#~ msgid "Format for network service name"
+#~ msgstr "નેટવર્ક સેવા નામ માટે બંધારણ"
+
+#~ msgid ""
+#~ "A format string used to build the network service name used when "
+#~ "publishing playlists over the network. The following format placeholders "
+#~ "can be used: • %a: the program name as returned by g_get_application_name"
+#~ "() • %h: the machine's host name in title case • %u: the user's login "
+#~ "name in title case • %U: the user's real name • %%: the percent sign"
+#~ msgstr ""
+#~ "વાપરેલ નેટવર્ક સેવા નામને બનાવવા માટે વાપરેલ બંધારણ શબ્દમાળા જ્યારે નેટવર્ક પર પ્લેલીસ્ટને "
+#~ "પ્રકાશિત કરી રહ્યા હોય. નીચેનું બંધારણ પ્લેસહોલ્ડરને વાપરી શકાય છે: • %a: "
+#~ "g_get_application_name() દ્દારા પાછુ મળેલ કાર્યક્રમ નામ • %h: શીર્ષકમાં મશીનનું "
+#~ "યજમાન નામ • %u: શીર્ષકમાં વપરાશકર્તાનું પ્રવેશ નામ • %U: વપરાશકર્તાનું સાચુ નામ • %"
+#~ "%: ટકાવારી હસ્તાક્ષર"
+
+#~ msgid "Neighbors"
+#~ msgstr "પાડોશીઓ"
+
+#~ msgid "Publish Playlist"
+#~ msgstr "જાહેર કરવા વગાડવા માટેની યાદી"
+
+#~ msgid "Share the current playlist via HTTP"
+#~ msgstr "HTTP દ્દારા હાલના પ્લેલીસ્ટની વહેંચણી કરો"
+
+#~ msgid "Service _Name:"
+#~ msgstr "સેવાનું નામ (_N):"
+
+#~ msgid ""
+#~ "The name used for announcing the playlist service on the network.\n"
+#~ "All occurrences of the string %u will be replaced by your name,\n"
+#~ "and %h will be replaced by your computer's host name."
+#~ msgstr ""
+#~ "નેટવર્ક પર પ્લેયાદી સેવાની રજૂઆત કરવા માટે વપરાયેલ નામ.\n"
+#~ "શબ્દમાળા %u નાં બધા બનાવો એ તમારા નામ દ્દારા બદલાયેલ હશે,\n"
+#~ "અને %h એ તમારા કૉમ્પ્યુટરનાં યજમાન નામ દ્દારા બદલાયેલ હશે."
+
+#~ msgid "Use _encrypted transport protocol (HTTPS)"
+#~ msgstr "એન્ક્રિપ્ટ થયેલ ટ્રાન્સપોર્ટ પ્રોટોકોલ (HTTPS) વાપરો (_e)"
+
+#~ msgid "_Name:"
+#~ msgstr "નામ (_N):"
+
+#~ msgid "Save in _folder:"
+#~ msgstr "ફોલ્ડરમાં સંગ્રહો (_f):"
+
+#~ msgid "Select a folder"
+#~ msgstr "ફોલ્ડરને પસંદ કરો"
+
+#~ msgid "There was an error saving the screenshot."
+#~ msgstr "ત્યાં સ્ક્રીનની છબી સંગ્રહવામાં ભૂલ છે."
+
+#~ msgid "Save Screenshot"
+#~ msgstr "સ્ક્રીનની છબી સંગ્રહો"
 
 #~ msgid "0 frames per second"
 #~ msgstr "સેકન્ડ પ્રતિ ૦ ચોકઠાઓ"
@@ -2949,9 +2974,6 @@
 #~ msgid "Related Videos"
 #~ msgstr "વિડીઓને સંબંધિત"
 
-#~ msgid "Videos"
-#~ msgstr "વિડીઓ"
-
 #~ msgid "_Open in Web Browser"
 #~ msgstr "વેબ બ્રાઉઝર માં ખોલો (_O)"
 
diff -Nru totem-3.4.3/po/he.po totem-3.6.2/po/he.po
--- totem-3.4.3/po/he.po	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/po/he.po	2012-08-29 23:07:45.000000000 +0000
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: totem.HEAD.he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-24 18:46+0200\n"
-"PO-Revision-Date: 2012-03-24 18:46+0200\n"
+"POT-Creation-Date: 2012-07-24 22:19+0300\n"
+"PO-Revision-Date: 2012-07-24 22:20+0200\n"
 "Last-Translator: Yaron Shahrabani \n"
 "Language-Team: Hebrew \n"
 "Language: he\n"
@@ -19,842 +19,905 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-Language: Hebrew\n"
 
-#: ../data/fullscreen.ui.h:1
-msgid "Leave Fullscreen"
-msgstr "יציאה ממסך מלא"
-
-#: ../data/fullscreen.ui.h:2
-#: ../data/totem.ui.h:102
-msgid "Time:"
-msgstr "זמן:"
-
-#: ../data/playlist.ui.h:1
-msgid "Add..."
-msgstr "הוספה..."
-
-#: ../data/playlist.ui.h:2
-#: ../data/video-list.ui.h:2
-msgid "Copy the location to the clipboard"
-msgstr "העתקת המיקום ללוח הגזירים"
-
-#: ../data/playlist.ui.h:3
-msgid "Move Down"
-msgstr "הזזה למטה"
-
-#: ../data/playlist.ui.h:4
-msgid "Move Up"
-msgstr "הזזה למעלה"
-
-#: ../data/playlist.ui.h:5
-msgid "Remove"
-msgstr "הסרה"
-
-#: ../data/playlist.ui.h:6
-msgid "Remove file from playlist"
-msgstr "הסרת קובץ מרשימת השמע"
+#: ../browser-plugin/totem-plugin-viewer.c:352
+#: ../src/totem-object.c:1180
+#: ../src/totem-object.c:1650
+#: ../src/totem-statusbar.c:115
+msgid "Stopped"
+msgstr "בעצירה"
 
-#: ../data/playlist.ui.h:7
-msgid "Save Playlist..."
-msgstr "שמירה ברשימת ההשמעה..."
+#: ../browser-plugin/totem-plugin-viewer.c:364
+#: ../src/totem-object.c:1173
+msgid "Paused"
+msgstr "מושהה"
 
-#: ../data/playlist.ui.h:8
-#: ../data/totem.ui.h:77
-msgid "Select a file to use for text subtitles"
-msgstr "בחירת קובץ כתוביות"
+#: ../browser-plugin/totem-plugin-viewer.c:368
+#: ../src/totem-object.c:1166
+msgid "Playing"
+msgstr "בנגינה"
 
-#: ../data/playlist.ui.h:9
-#: ../data/video-list.ui.h:4
-msgid "_Copy Location"
-msgstr "ה_עתקת מיקום"
+#: ../browser-plugin/totem-plugin-viewer.c:386
+#: ../src/plugins/screensaver/totem-screensaver.c:97
+msgid "Playing a movie"
+msgstr "סרט מתנגן"
 
-#: ../data/playlist.ui.h:10
-msgid "_Remove"
-msgstr "ה_סרה"
+#: ../browser-plugin/totem-plugin-viewer.c:443
+msgid "No URI to play"
+msgstr "אין כתובת לנגינה"
 
-#: ../data/playlist.ui.h:11
-#: ../data/totem.ui.h:141
-msgid "_Select Text Subtitles..."
-msgstr "בחירת _כתוביות..."
+#: ../browser-plugin/totem-plugin-viewer.c:676
+#: ../browser-plugin/totem-plugin-viewer.c:1700
+msgid "Totem Movie Player"
+msgstr "נגן הסרטים Totem"
 
-#: ../data/properties.ui.h:1
-msgid "Album:"
-msgstr "אלבום:"
+#. translators: this is:
+#. * Open With ApplicationName
+#. * as in nautilus' right-click menu
+#: ../browser-plugin/totem-plugin-viewer.c:1120
+#, c-format
+msgid "_Open with \"%s\""
+msgstr "_פתיחה באמצעות \"%s\""
 
-#: ../data/properties.ui.h:2
-msgid "Artist:"
-msgstr "אמן:"
+#: ../browser-plugin/totem-plugin-viewer.c:1341
+#: ../src/totem-object.c:2475
+msgid "An error occurred"
+msgstr "ארעה שגיאה"
 
-#: ../data/properties.ui.h:3
-#: ../data/totem.ui.h:23
-#: ../src/totem-properties-view.c:268
-msgid "Audio"
-msgstr "שמע"
+#: ../browser-plugin/totem-plugin-viewer.c:2033
+msgid "No playlist or playlist empty"
+msgstr "אין רשימת שמע או שרשימת ההשמעה ריקה"
 
-#: ../data/properties.ui.h:4
-msgid "Bitrate:"
-msgstr "קצב סיביות:"
+#: ../browser-plugin/totem-plugin-viewer.c:2128
+msgid "Movie browser plugin"
+msgstr "תוסף סרטים לדפדן"
 
-#: ../data/properties.ui.h:5
-msgid "Channels:"
-msgstr "ערוצים:"
+#: ../browser-plugin/totem-plugin-viewer.c:2144
+#: ../src/totem.c:239
+msgid "Could not initialize the thread-safe libraries."
+msgstr "לא ניתן לאתחל את ספריות ה־thread-safe."
 
-#: ../data/properties.ui.h:6
-msgid "Codec:"
-msgstr "מקודד:"
+#: ../browser-plugin/totem-plugin-viewer.c:2144
+msgid "Verify your system installation. The Totem plugin will now exit."
+msgstr "נא לבדוק את התקנת המערכת שלך. תוסף Totem ייסגר כעת."
 
-#: ../data/properties.ui.h:7
-msgid "Comment:"
-msgstr "הערה:"
+#: ../data/fullscreen.ui.h:1
+msgid "Leave Fullscreen"
+msgstr "יציאה ממסך מלא"
 
-#: ../data/properties.ui.h:8
-msgid "Container:"
-msgstr "מכל:"
+#: ../data/fullscreen.ui.h:2
+#: ../data/totem.ui.h:81
+msgid "Time:"
+msgstr "זמן:"
 
-#: ../data/properties.ui.h:9
-msgid "Dimensions:"
-msgstr "ממדים:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
+msgid "Allow the screensaver to activate when playing audio"
+msgstr "Allow the screensaver to activate when playing audio"
 
-#: ../data/properties.ui.h:10
-msgid "Duration:"
-msgstr "משך:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
+msgid "Allow the screensaver to activate when playing audio. Disable if you have monitor-powered speakers."
+msgstr "Allow the screensaver to activate when playing audio. Disable if you have monitor-powered speakers."
 
-#: ../data/properties.ui.h:11
-msgid "Framerate:"
-msgstr "קצב שקופיות:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
+msgid "Show visual effects when no video is displayed"
+msgstr "Show visual effects when no video is displayed"
 
-#: ../data/properties.ui.h:12
-#: ../data/totem.ui.h:41
-msgid "General"
-msgstr "כללי"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
+msgid "Show visual effects when playing an audio only file."
+msgstr "Show visual effects when playing an audio only file."
 
-#: ../data/properties.ui.h:13
-msgid "Sample rate:"
-msgstr "קצב דגימה:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
+msgid "Name of the visual effects plugin"
+msgstr "Name of the visual effects plugin"
 
-#: ../data/properties.ui.h:14
-msgid "Title:"
-msgstr "כותרת:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
+msgid "The brightness of the video"
+msgstr "The brightness of the video"
 
-#: ../data/properties.ui.h:15
-#: ../data/totem.ui.h:104
-#: ../src/totem-properties-view.c:270
-msgid "Video"
-msgstr "וידאו"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
+msgid "The contrast of the video"
+msgstr "The contrast of the video"
 
-#: ../data/properties.ui.h:16
-msgid "Year:"
-msgstr "שנה:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
+msgid "The hue of the video"
+msgstr "The hue of the video"
 
-#: ../data/video-list.ui.h:1
-msgid "Add the video to the playlist"
-msgstr "הוספת הווידאו לרשימת ההשמעה"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
+msgid "The saturation of the video"
+msgstr "The saturation of the video"
 
-#: ../data/video-list.ui.h:3
-#: ../src/totem-dnd-menu.c:97
-msgid "_Add to Playlist"
-msgstr "ה_וספה לרשימת השמעה"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
+msgid "Resize the canvas automatically on file load"
+msgstr "Resize the canvas automatically on file load"
 
-#. Title
-#: ../data/totem.desktop.in.in.in.h:1
-#: ../data/totem.ui.h:53
-#: ../src/totem-object.c:1667
-msgid "Movie Player"
-msgstr "נגן סרטים"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
+msgid "Repeat mode"
+msgstr "Repeat mode"
 
-#: ../data/totem.desktop.in.in.in.h:2
-msgid "Play movies and songs"
-msgstr "מנגן סרטים ושירים"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
+msgid "Shuffle mode"
+msgstr "Shuffle mode"
 
-#: ../data/totem.ui.h:1
-msgid "1.5 Mbps T1/Intranet/LAN"
-msgstr "1.5 מסל\"ש T1/אינטראנט/LAN"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
+msgid "Whether to disable deinterlacing for interlaced movies"
+msgstr "Whether to disable deinterlacing for interlaced movies"
 
-#: ../data/totem.ui.h:2
-msgid "112 Kbps Dual ISDN/DSL"
-msgstr "112 קסל\"ש ISDN כפול/DSL"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
+msgid "Whether to enable debug for the playback engine"
+msgstr "Whether to enable debug for the playback engine"
 
-#: ../data/totem.ui.h:3
-msgid "14.4 Kbps Modem"
-msgstr "14.4 קסל\"ש מודם"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
+msgid "Type of audio output to use"
+msgstr "Type of audio output to use"
 
-#: ../data/totem.ui.h:4
-msgid "16:9 (Widescreen)"
-msgstr "16:9 (מסך רחב)"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
+msgid "Visualization quality setting"
+msgstr "Visualisation quality setting"
 
-#: ../data/totem.ui.h:5
-msgid "19.2 Kbps Modem"
-msgstr "19.2 קסל\"ש מודם"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
+msgid "Quality setting for the audio visualization."
+msgstr "Quality setting for the audio visualization."
 
-#: ../data/totem.ui.h:6
-msgid "2.11:1 (DVB)"
-msgstr "‏2.11:1 (DVB)"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
+msgid "Network buffering threshold"
+msgstr "Network buffering threshold"
 
-#: ../data/totem.ui.h:7
-msgid "256 Kbps DSL/Cable"
-msgstr "256 קסל\"ש DSL/כבלים"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
+msgid "Amount of data to buffer for network streams before starting to display the stream (in seconds)."
+msgstr "Amount of data to buffer for network streams before starting to display the stream (in seconds)."
 
-#: ../data/totem.ui.h:8
-msgid "28.8 Kbps Modem"
-msgstr "28.8 קסל\"ש מודם"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
+msgid "Subtitle font"
+msgstr "Subtitle font"
 
-#: ../data/totem.ui.h:9
-msgid "33.6 Kbps Modem"
-msgstr "33.6 קסל\"ש מודם"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
+msgid "Pango font description for subtitle rendering."
+msgstr "Pango font description for subtitle rendering."
 
-#: ../data/totem.ui.h:10
-msgid "34.4 Kbps Modem"
-msgstr "34.4 קסל\"ש מודם"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
+msgid "Subtitle encoding"
+msgstr "Subtitle encoding"
 
-#: ../data/totem.ui.h:11
-msgid "384 Kbps DSL/Cable"
-msgstr "384 קסל\"ש DSL/כבלים"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
+msgid "Encoding character set for subtitle."
+msgstr "Encoding character set for subtitle."
 
-#: ../data/totem.ui.h:12
-msgid "4-channel"
-msgstr "4 ערוצים"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
+msgid "Default location for the \"Open...\" dialogs"
+msgstr "Default location for the \"Open...\" dialogs"
 
-#: ../data/totem.ui.h:13
-msgid "4.1-channel"
-msgstr "4.1 ערוצים"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
+msgid "Default location for the \"Open...\" dialogs. Default is the current directory."
+msgstr "Default location for the \"Open...\" dialogs. Default is the current directory."
 
-#: ../data/totem.ui.h:14
-msgid "4:3 (TV)"
-msgstr "4:3 (טלוויזיה)"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
+msgid "Default location for the \"Take Screenshot\" dialogs"
+msgstr "Default location for the \"Take Screenshot\" dialogs"
 
-#: ../data/totem.ui.h:15
-msgid "5.0-channel"
-msgstr "5.0 ערוצים"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
+msgid "Default location for the \"Take Screenshot\" dialogs. Default is the Pictures directory."
+msgstr "Default location for the \"Take Screenshot\" dialogs. Default is the Pictures directory."
 
-#: ../data/totem.ui.h:16
-msgid "5.1-channel"
-msgstr "5.1 ערוצים"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
+msgid "Whether to disable the plugins in the user's home directory"
+msgstr "Whether to disable the plugins in the user's home directory"
 
-#: ../data/totem.ui.h:17
-msgid "512 Kbps DSL/Cable"
-msgstr "512 קסל\"ש DSL/כבלים"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
+msgid "Whether to disable the keyboard shortcuts"
+msgstr "Whether to disable the keyboard shortcuts"
 
-#: ../data/totem.ui.h:18
-msgid "56 Kbps Modem/ISDN"
-msgstr "56 קסל\"ש מודם/ISDN"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
+msgid "Whether to autoload text subtitle files when a movie is loaded"
+msgstr "Whether to autoload text subtitle files when a movie is loaded"
 
-#: ../data/totem.ui.h:19
-msgid "AC3 Passthrough"
-msgstr "מעבר AC3"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
+msgid "Whether to autoload external chapter files when a movie is loaded"
+msgstr "Whether to autoload external chapter files when a movie is loaded"
 
-#: ../data/totem.ui.h:20
-msgid "A_udio Menu"
-msgstr "תפריט _שמע"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
+msgid "Whether to remember the position of played audio/video files when pausing or closing them"
+msgstr "Whether to remember the position of played audio/video files when pausing or closing them"
 
-#: ../data/totem.ui.h:21
-msgid "About this application"
-msgstr "על אודות יישום זה"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
+msgid "Active plugins list"
+msgstr "Active plugins list"
 
-#: ../data/totem.ui.h:22
-msgctxt "Aspect ratio"
-msgid "Auto"
-msgstr "אוטומטי"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+msgid "A list of the names of the plugins which are currently active (loaded and running)."
+msgstr "A list of the names of the plugins which are currently active (loaded and running)."
 
-#: ../data/totem.ui.h:24
-msgid "Audio Output"
-msgstr "‏פלט שמע"
+#: ../data/playlist.ui.h:1
+msgid "_Remove"
+msgstr "ה_סרה"
 
-#: ../data/totem.ui.h:25
-msgid "Clear the playlist"
-msgstr "פינוי רשימת ההשמעה"
+#: ../data/playlist.ui.h:2
+msgid "Remove file from playlist"
+msgstr "הסרת קובץ מרשימת השמע"
 
-#: ../data/totem.ui.h:26
-msgid "Co_ntrast:"
-msgstr "ני_גודיות:"
+#: ../data/playlist.ui.h:3
+#: ../data/video-list.ui.h:3
+msgid "_Copy Location"
+msgstr "ה_עתקת מיקום"
 
-#: ../data/totem.ui.h:27
-msgid "Color Balance"
-msgstr "‏איזון צבע"
+#: ../data/playlist.ui.h:4
+#: ../data/video-list.ui.h:4
+msgid "Copy the location to the clipboard"
+msgstr "העתקת המיקום ללוח הגזירים"
 
-#: ../data/totem.ui.h:28
-msgid "Configure plugins to extend the application"
-msgstr "הגדרת תוספים להרחבת היישום"
+#: ../data/playlist.ui.h:5
+#: ../data/totem.ui.h:71
+msgid "_Select Text Subtitles..."
+msgstr "בחירת _כתוביות..."
 
-#: ../data/totem.ui.h:29
-msgid "Configure the application"
-msgstr "עריכת הגדרות היישום"
+#: ../data/playlist.ui.h:6
+#: ../data/totem.ui.h:72
+msgid "Select a file to use for text subtitles"
+msgstr "בחירת קובץ כתוביות"
 
-#: ../data/totem.ui.h:30
-msgid "Connection _speed:"
-msgstr "_מהירות חיבור:"
+#: ../data/playlist.ui.h:7
+msgid "Add..."
+msgstr "הוספה..."
 
-#: ../data/totem.ui.h:31
-msgid "Decrease volume"
-msgstr "הפחתת עצמת השמע"
+#: ../data/playlist.ui.h:8
+msgid "Remove"
+msgstr "הסרה"
 
-#: ../data/totem.ui.h:32
-msgid "Disable _deinterlacing of interlaced videos"
-msgstr "ביטול פעולת ה־deinterlace על סרטונים שהם interlaced"
+#: ../data/playlist.ui.h:9
+msgid "Save Playlist..."
+msgstr "שמירה ברשימת ההשמעה..."
 
-#: ../data/totem.ui.h:33
-msgid "Disable screensaver when playing "
-msgstr "ביטול שומר המסך בעת נגינה"
+#: ../data/playlist.ui.h:10
+msgid "Move Up"
+msgstr "הזזה למעלה"
 
-#. Tab label in the Preferences dialogue
-#: ../data/totem.ui.h:35
-msgid "Display"
-msgstr "תצוגה"
+#: ../data/playlist.ui.h:11
+msgid "Move Down"
+msgstr "הזזה למטה"
 
-#: ../data/totem.ui.h:36
-msgid "Eject the current disc"
-msgstr "שליפת הדיסק הנוכחי"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:2
+msgid "Normal"
+msgstr "רגיל"
 
-#: ../data/totem.ui.h:37
-msgid "External Chapters"
-msgstr "פרקים חיצוניים"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:4
+msgid "Large"
+msgstr "גדול"
 
 #. Audio visualization dimensions
-#: ../data/totem.ui.h:39
+#: ../data/preferences.ui.h:6
 msgid "Extra Large"
 msgstr "גדול במיוחד"
 
-#: ../data/totem.ui.h:40
-msgid "Fit Window to Movie"
-msgstr "התאמת החלון לסרט"
+#: ../data/preferences.ui.h:7
+#: ../src/backend/bacon-video-widget.c:5498
+#: ../src/totem-properties-view.c:231
+msgid "Stereo"
+msgstr "סטריאו"
 
-#: ../data/totem.ui.h:42
-msgid "Go to the DVD menu"
-msgstr "מעבר אל תפריט ה־DVD"
+#: ../data/preferences.ui.h:8
+msgid "4-channel"
+msgstr "4 ערוצים"
 
-#: ../data/totem.ui.h:43
-msgid "Go to the angle menu"
-msgstr "מעבר אל תפריט הזוויות"
+#: ../data/preferences.ui.h:9
+msgid "4.1-channel"
+msgstr "4.1 ערוצים"
 
-#: ../data/totem.ui.h:44
-msgid "Go to the audio menu"
-msgstr "מעבר אל תפריט השמע"
+#: ../data/preferences.ui.h:10
+msgid "5.0-channel"
+msgstr "5.0 ערוצים"
 
-#: ../data/totem.ui.h:45
-msgid "Go to the chapter menu"
-msgstr "מעבר אל תפריט הפרקים"
+#: ../data/preferences.ui.h:11
+msgid "5.1-channel"
+msgstr "5.1 ערוצים"
 
-#: ../data/totem.ui.h:46
-msgid "Go to the title menu"
-msgstr "מעבר אל תפריט הכותרת"
+#: ../data/preferences.ui.h:12
+msgid "AC3 Passthrough"
+msgstr "מעבר AC3"
 
-#: ../data/totem.ui.h:47
-msgid "Help contents"
-msgstr "תוכן העזרה"
+#: ../data/preferences.ui.h:13
+msgid "Totem Preferences"
+msgstr "העדפות Totem"
+
+#: ../data/preferences.ui.h:14
+msgid "Playback"
+msgstr "ניגון"
+
+#: ../data/preferences.ui.h:15
+msgid "Start playing files from last position"
+msgstr "התחלת נגינת קבצים מהמיקום האחרון"
+
+#: ../data/preferences.ui.h:16
+msgid "Text Subtitles"
+msgstr "‏‏כתוביות"
 
-#: ../data/totem.ui.h:48
-msgid "Increase volume"
-msgstr "הגברת עוצמת קול"
+#: ../data/preferences.ui.h:17
+msgid "_Load subtitle files when movie is loaded"
+msgstr "_טעינת קובצי כתוביות אוטומטית עם טעינת הסרט"
 
-#: ../data/totem.ui.h:49
-msgid "Intranet/LAN"
-msgstr "אינטראנט/LAN"
+#: ../data/preferences.ui.h:18
+msgid "_Font:"
+msgstr "_גופן:"
 
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:51
-msgid "Large"
-msgstr "גדול"
+#: ../data/preferences.ui.h:19
+msgid "_Encoding:"
+msgstr "_קידוד:"
 
-#: ../data/totem.ui.h:52
+#: ../data/preferences.ui.h:20
+msgid "External Chapters"
+msgstr "פרקים חיצוניים"
+
+#: ../data/preferences.ui.h:21
 msgid "Load _chapter files when movie is loaded"
 msgstr "_טעינת קובצי פרקים אוטומטית עם טעינת הסרט"
 
-#: ../data/totem.ui.h:54
-msgid "Networking"
-msgstr "‏רשת"
+#: ../data/preferences.ui.h:22
+#: ../data/properties.ui.h:1
+msgid "General"
+msgstr "כללי"
 
-#: ../data/totem.ui.h:55
-msgid "Next chapter or movie"
-msgstr "הפרק או הסרט הבא"
+#. Tab label in the Preferences dialogue
+#: ../data/preferences.ui.h:24
+msgid "Display"
+msgstr "תצוגה"
 
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:57
-msgid "Normal"
-msgstr "רגיל"
+#: ../data/preferences.ui.h:25
+msgid "_Resize the window when a new video is loaded"
+msgstr "_שינוי גודל החלון באופן אוטומטי בעת טעינת סרט חדש"
 
-#: ../data/totem.ui.h:58
-msgid "Open _Location..."
-msgstr "פתיחת _מיקום..."
+#: ../data/preferences.ui.h:26
+msgid "Disable _deinterlacing of interlaced videos"
+msgstr "ביטול פעולת ה־deinterlace על סרטונים שהם interlaced"
 
-#: ../data/totem.ui.h:59
-msgid "Open a file"
-msgstr "פתיחת קובץ"
+#: ../data/preferences.ui.h:27
+msgid "Disable screensaver when playing "
+msgstr "ביטול שומר המסך בעת נגינה"
 
-#: ../data/totem.ui.h:60
-msgid "Open a non-local file"
-msgstr "פתיחת קובץ לא מקומי"
+#: ../data/preferences.ui.h:28
+#: ../data/properties.ui.h:9
+#: ../src/totem-properties-view.c:273
+msgid "Video"
+msgstr "וידאו"
 
-#: ../data/totem.ui.h:61
-msgid "Play / P_ause"
-msgstr "נגינה / _השהיה"
+#: ../data/preferences.ui.h:29
+msgid "Video or Audio"
+msgstr "וידאו או שמע"
 
-#: ../data/totem.ui.h:62
-msgid "Play or pause the movie"
-msgstr "נגינה או השהיה של הסרט"
+#: ../data/preferences.ui.h:30
+msgid "Visual Effects"
+msgstr "אפקטים חזותיים"
 
-#: ../data/totem.ui.h:63
-msgid "Playback"
-msgstr "ניגון"
+#: ../data/preferences.ui.h:31
+msgid "Show _visual effects when an audio file is played"
+msgstr "הצגת אפקטים _חזותיים כאשר קובץ שמע מתנגן"
 
-#: ../data/totem.ui.h:64
-msgid "Plugins..."
-msgstr "תוספים..."
+#: ../data/preferences.ui.h:32
+msgid "_Type of visualization:"
+msgstr "_סוג המחזה:"
 
-#: ../data/totem.ui.h:65
-msgid "Prefere_nces"
-msgstr "ה_עדפות"
+#: ../data/preferences.ui.h:33
+msgid "Visualization _size:"
+msgstr "_גודל המחזה:"
 
-#: ../data/totem.ui.h:66
-msgid "Previous chapter or movie"
-msgstr "הפרק או הסרט הקודמים"
+#: ../data/preferences.ui.h:34
+msgid "Color Balance"
+msgstr "‏איזון צבע"
 
-#: ../data/totem.ui.h:67
-msgid "Quit the program"
-msgstr "יציאה מהתכנית"
+#: ../data/preferences.ui.h:35
+msgid "_Brightness:"
+msgstr "_בהירות:"
 
-#: ../data/totem.ui.h:68
+#: ../data/preferences.ui.h:36
+msgid "Co_ntrast:"
+msgstr "ני_גודיות:"
+
+#: ../data/preferences.ui.h:37
+msgid "Sat_uration:"
+msgstr "_רוויה:"
+
+#: ../data/preferences.ui.h:38
+msgid "_Hue:"
+msgstr "_גוון:"
+
+#: ../data/preferences.ui.h:39
 msgid "Reset to _Defaults"
 msgstr "_איפוס לברירות המחדל"
 
-#: ../data/totem.ui.h:69
-msgid "Resize _1:1"
-msgstr "שינוי לגודל _1:1"
+#: ../data/preferences.ui.h:40
+msgid "Audio Output"
+msgstr "‏פלט שמע"
 
-#: ../data/totem.ui.h:70
-msgid "Resize _2:1"
-msgstr "שינוי לגודל _2:1"
+#: ../data/preferences.ui.h:41
+msgid "_Audio output type:"
+msgstr "סוג פלט _שמע:"
 
-#: ../data/totem.ui.h:71
-msgid "Resize to double the original video size"
-msgstr "שינוי לכפול מגודל הווידאו"
+#: ../data/preferences.ui.h:42
+#: ../data/properties.ui.h:14
+#: ../src/totem-properties-view.c:271
+msgid "Audio"
+msgstr "שמע"
 
-#: ../data/totem.ui.h:72
-msgid "Resize to half the original video size"
-msgstr "שינוי לחצי מגודל הווידאו"
+#: ../data/properties.ui.h:2
+msgid "Title:"
+msgstr "כותרת:"
 
-#: ../data/totem.ui.h:73
-msgid "Resize to the original video size"
-msgstr "שינוי לגודל הווידאו המקורי"
+#: ../data/properties.ui.h:3
+msgid "Artist:"
+msgstr "אמן:"
 
-#: ../data/totem.ui.h:74
-msgid "S_idebar"
-msgstr "_סרגל צד"
+#: ../data/properties.ui.h:4
+msgid "Duration:"
+msgstr "משך:"
 
-#: ../data/totem.ui.h:75
-msgid "S_ubtitles"
-msgstr "_כתוביות"
+#: ../data/properties.ui.h:5
+msgid "Year:"
+msgstr "שנה:"
 
-#: ../data/totem.ui.h:76
-msgid "Sat_uration:"
-msgstr "_רוויה:"
+#: ../data/properties.ui.h:6
+msgid "Album:"
+msgstr "אלבום:"
 
-#: ../data/totem.ui.h:78
-msgid "Set the repeat mode"
-msgstr "הגדרת מצב החזרה"
+#: ../data/properties.ui.h:7
+msgid "Comment:"
+msgstr "הערה:"
 
-#: ../data/totem.ui.h:79
-msgid "Set the shuffle mode"
-msgstr "הגדרת מצב הערבוב"
+#: ../data/properties.ui.h:8
+msgid "Container:"
+msgstr "מכל:"
 
-#: ../data/totem.ui.h:80
-msgid "Sets 16:9 (widescreen) aspect ratio"
-msgstr "הגדרת יחס ממדים 16:9 (מסך רחב)"
+#: ../data/properties.ui.h:10
+msgid "Dimensions:"
+msgstr "ממדים:"
 
-#: ../data/totem.ui.h:81
-msgid "Sets 2.11:1 (DVB) aspect ratio"
-msgstr "הגדרת יחס ממדים 2.11:1 (DVB)"
+#: ../data/properties.ui.h:11
+msgid "Codec:"
+msgstr "מקודד:"
 
-#: ../data/totem.ui.h:82
-msgid "Sets 4:3 (TV) aspect ratio"
-msgstr "הגדרת יחס ממדים 4:3 (טלוויזיה)"
+#: ../data/properties.ui.h:12
+msgid "Framerate:"
+msgstr "קצב שקופיות:"
 
-#: ../data/totem.ui.h:83
-msgid "Sets automatic aspect ratio"
-msgstr "הגדרת יחס ממדים אוטומטית"
+#: ../data/properties.ui.h:13
+msgid "Bitrate:"
+msgstr "קצב סיביות:"
 
-#: ../data/totem.ui.h:84
-msgid "Sets square aspect ratio"
-msgstr "הגדרת יחס ממדים ריבועי"
+#: ../data/properties.ui.h:15
+msgid "Sample rate:"
+msgstr "קצב דגימה:"
 
-#: ../data/totem.ui.h:85
-msgid "Show _Controls"
-msgstr "הצגת _פקדים"
+#: ../data/properties.ui.h:16
+msgid "Channels:"
+msgstr "ערוצים:"
 
-#: ../data/totem.ui.h:86
-msgid "Show _visual effects when an audio file is played"
-msgstr "הצגת אפקטים _חזותיים כאשר קובץ שמע מתנגן"
+#. Title
+#: ../data/totem.desktop.in.in.in.h:1
+#: ../data/totem.ui.h:80
+#: ../src/totem.c:238
+#: ../src/totem.c:247
+#: ../src/totem-menu.c:790
+#: ../src/totem-object.c:1658
+msgid "Videos"
+msgstr "סרטונים"
 
-#: ../data/totem.ui.h:87
-msgid "Show controls"
-msgstr "הצגת פקדים"
+#: ../data/totem.desktop.in.in.in.h:2
+msgid "Play movies"
+msgstr "נגינת סרטים"
 
-#: ../data/totem.ui.h:88
-msgid "Show or hide the sidebar"
-msgstr "הצגה או הסתרה של סרגל הצד"
+#: ../data/totem.desktop.in.in.in.h:3
+msgid "Video;Movie;Film;Clip;Series;Player;DVD;TV;Disc;"
+msgstr "וידאו;סרט;קולנוע;סרטון;קליפ;סדרה;נגן;DVD;טלוויזיה;דיסק;תקליטור;"
 
-#: ../data/totem.ui.h:89
-msgid "Shuff_le Mode"
-msgstr "מצב ע_רבוב"
+#: ../data/totem.ui.h:1
+msgid "_Open"
+msgstr "_פתיחה"
 
-#: ../data/totem.ui.h:90
-msgid "Skip _Backwards"
-msgstr "דילוג _אחורה"
+#: ../data/totem.ui.h:2
+msgid "Open _Location"
+msgstr "פתיחת _מיקום"
 
-#: ../data/totem.ui.h:91
-msgid "Skip _Forward"
-msgstr "דילוג _קדימה"
+#: ../data/totem.ui.h:3
+msgid "_Fullscreen"
+msgstr "_מסך מלא"
 
-#: ../data/totem.ui.h:92
-msgid "Skip backwards"
-msgstr "דילוג אחורה"
+#: ../data/totem.ui.h:4
+msgid "Prefere_nces"
+msgstr "ה_עדפות"
 
-#: ../data/totem.ui.h:93
-msgid "Skip forward"
-msgstr "דילוג קדימה"
+#: ../data/totem.ui.h:5
+msgid "Shuff_le"
+msgstr "מצב ע_רבוב"
 
-#: ../data/totem.ui.h:94
-msgid "Square"
-msgstr "ריבוע"
+#: ../data/totem.ui.h:6
+msgid "_Repeat"
+msgstr "מצב _חזרה"
 
-#: ../data/totem.ui.h:95
-msgid "Start playing files from last position"
-msgstr "התחלת נגינת קבצים מהמיקום האחרון"
+#: ../data/totem.ui.h:7
+msgid "_Quit"
+msgstr "_יציאה"
 
-#: ../data/totem.ui.h:96
-#: ../src/totem-properties-view.c:228
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5593
-msgid "Stereo"
-msgstr "סטריאו"
+#: ../data/totem.ui.h:8
+msgid "_Movie"
+msgstr "_סרט"
 
-#: ../data/totem.ui.h:97
-msgid "Switch An_gles"
-msgstr "ה_חלפת זוויות"
+#: ../data/totem.ui.h:9
+msgid "_Eject"
+msgstr "_שליפה"
 
-#: ../data/totem.ui.h:98
-msgid "Switch camera angles"
-msgstr "החלפת זוויות המצלמה"
+#: ../data/totem.ui.h:10
+msgid "Eject the current disc"
+msgstr "שליפת הדיסק הנוכחי"
 
-#: ../data/totem.ui.h:99
-msgid "Switch to fullscreen"
-msgstr "מעבר למסך מלא"
+#: ../data/totem.ui.h:11
+msgid "_Properties"
+msgstr "מ_אפיינים"
 
-#: ../data/totem.ui.h:100
-msgid "Text Subtitles"
-msgstr "‏‏כתוביות"
+#: ../data/totem.ui.h:12
+msgid "View the properties of the current stream"
+msgstr "צפייה במאפייני השידור הזורם הנוכחי"
 
-#: ../data/totem.ui.h:101
-msgid "Time seek bar"
-msgstr "סרגל הזמן"
+#: ../data/totem.ui.h:13
+msgid "Play / P_ause"
+msgstr "נגינה / _השהיה"
 
-#: ../data/totem.ui.h:103
-msgid "Totem Preferences"
-msgstr "העדפות Totem"
+#: ../data/totem.ui.h:14
+msgid "Play or pause the movie"
+msgstr "נגינה או השהיה של הסרט"
+
+#: ../data/totem.ui.h:15
+msgid "_Edit"
+msgstr "ע_ריכה"
+
+#: ../data/totem.ui.h:16
+msgid "_Clear Playlist"
+msgstr "_פינוי רשימת ההשמעה"
+
+#: ../data/totem.ui.h:17
+msgid "Clear the playlist"
+msgstr "פינוי רשימת ההשמעה"
 
-#: ../data/totem.ui.h:105
-msgid "Video or Audio"
-msgstr "וידאו או שמע"
+#: ../data/totem.ui.h:18
+msgid "Plugins..."
+msgstr "תוספים..."
 
-#: ../data/totem.ui.h:106
-msgid "View the properties of the current stream"
-msgstr "צפייה במאפייני השידור הזורם הנוכחי"
+#: ../data/totem.ui.h:19
+msgid "Configure plugins to extend the application"
+msgstr "הגדרת תוספים להרחבת היישום"
 
-#: ../data/totem.ui.h:107
-msgid "Visual Effects"
-msgstr "אפקטים חזותיים"
+#: ../data/totem.ui.h:20
+msgid "_View"
+msgstr "_תצוגה"
 
-#: ../data/totem.ui.h:108
-msgid "Visualization _size:"
-msgstr "_גודל המחזה:"
+#: ../data/totem.ui.h:21
+msgid "Fit Window to Movie"
+msgstr "התאמת החלון לסרט"
 
-#: ../data/totem.ui.h:109
-msgid "Volume _Down"
-msgstr "ה_נמכת העצמה"
+#: ../data/totem.ui.h:22
+msgid "_Resize 1:2"
+msgstr "_שינוי לגודל 1:2"
 
-#: ../data/totem.ui.h:110
-msgid "Volume _Up"
-msgstr "ה_גברת העצמה"
+#: ../data/totem.ui.h:23
+msgid "Resize to half the original video size"
+msgstr "שינוי לחצי מגודל הווידאו"
 
-#: ../data/totem.ui.h:111
-msgid "Zoom In"
-msgstr "התקרבות"
+#: ../data/totem.ui.h:24
+msgid "Resize _1:1"
+msgstr "שינוי לגודל _1:1"
 
-#: ../data/totem.ui.h:112
-msgid "Zoom in"
-msgstr "התקרבות"
+#: ../data/totem.ui.h:25
+msgid "Resize to the original video size"
+msgstr "שינוי לגודל הווידאו המקורי"
 
-#: ../data/totem.ui.h:113
-msgid "_About"
-msgstr "על _אודות"
+#: ../data/totem.ui.h:26
+msgid "Resize _2:1"
+msgstr "שינוי לגודל _2:1"
 
-#: ../data/totem.ui.h:114
-msgid "_Angle Menu"
-msgstr "תפריט _זווית"
+#: ../data/totem.ui.h:27
+msgid "Resize to double the original video size"
+msgstr "שינוי לכפול מגודל הווידאו"
 
-#: ../data/totem.ui.h:115
+#: ../data/totem.ui.h:28
 msgid "_Aspect Ratio"
 msgstr "יחס _ממדים"
 
-#: ../data/totem.ui.h:116
-msgid "_Audio output type:"
-msgstr "סוג פלט _שמע:"
-
-#: ../data/totem.ui.h:117
-msgid "_Brightness:"
-msgstr "_בהירות:"
-
-#: ../data/totem.ui.h:118
-msgid "_Chapter Menu"
-msgstr "תפריט _פרקים"
+#: ../data/totem.ui.h:29
+msgid "Switch An_gles"
+msgstr "ה_חלפת זוויות"
 
-#: ../data/totem.ui.h:119
-msgid "_Clear Playlist"
-msgstr "_פינוי רשימת ההשמעה"
+#: ../data/totem.ui.h:30
+msgid "Switch camera angles"
+msgstr "החלפת זוויות המצלמה"
 
-#: ../data/totem.ui.h:120
-msgid "_Contents"
-msgstr "_תוכן"
+#: ../data/totem.ui.h:31
+msgid "_Go"
+msgstr "מ_עבר"
 
-#: ../data/totem.ui.h:121
+#: ../data/totem.ui.h:32
 msgid "_DVD Menu"
 msgstr "תפריט _DVD"
 
-#: ../data/totem.ui.h:122
-msgid "_Edit"
-msgstr "ע_ריכה"
-
-#: ../data/totem.ui.h:123
-msgid "_Eject"
-msgstr "_שליפה"
-
-#: ../data/totem.ui.h:124
-msgid "_Encoding:"
-msgstr "_קידוד:"
+#: ../data/totem.ui.h:33
+msgid "Go to the DVD menu"
+msgstr "מעבר אל תפריט ה־DVD"
 
-#: ../data/totem.ui.h:125
-msgid "_Font:"
-msgstr "_גופן:"
+#: ../data/totem.ui.h:34
+msgid "_Title Menu"
+msgstr "תפריט _כותרת"
 
-#: ../data/totem.ui.h:126
-msgid "_Fullscreen"
-msgstr "_מסך מלא"
+#: ../data/totem.ui.h:35
+msgid "Go to the title menu"
+msgstr "מעבר אל תפריט הכותרת"
 
-#: ../data/totem.ui.h:127
-msgid "_Go"
-msgstr "מ_עבר"
+#: ../data/totem.ui.h:36
+msgid "A_udio Menu"
+msgstr "תפריט _שמע"
 
-#: ../data/totem.ui.h:128
-msgid "_Help"
-msgstr "ע_זרה"
+#: ../data/totem.ui.h:37
+msgid "Go to the audio menu"
+msgstr "מעבר אל תפריט השמע"
 
-#: ../data/totem.ui.h:129
-msgid "_Hue:"
-msgstr "_גוון:"
+#: ../data/totem.ui.h:38
+msgid "_Angle Menu"
+msgstr "תפריט _זווית"
 
-#: ../data/totem.ui.h:130
-msgid "_Languages"
-msgstr "_שפות"
+#: ../data/totem.ui.h:39
+msgid "Go to the angle menu"
+msgstr "מעבר אל תפריט הזוויות"
 
-#: ../data/totem.ui.h:131
-msgid "_Load subtitle files when movie is loaded"
-msgstr "_טעינת קובצי כתוביות אוטומטית עם טעינת הסרט"
+#: ../data/totem.ui.h:40
+msgid "_Chapter Menu"
+msgstr "תפריט _פרקים"
 
-#: ../data/totem.ui.h:132
-msgid "_Movie"
-msgstr "_סרט"
+#: ../data/totem.ui.h:41
+msgid "Go to the chapter menu"
+msgstr "מעבר אל תפריט הפרקים"
 
-#: ../data/totem.ui.h:133
+#: ../data/totem.ui.h:42
 msgid "_Next Chapter/Movie"
 msgstr "הפרק/סרט ה_בא"
 
-#: ../data/totem.ui.h:134
-msgid "_Open..."
-msgstr "_פתיחה..."
+#: ../data/totem.ui.h:43
+msgid "Next chapter or movie"
+msgstr "הפרק או הסרט הבא"
 
-#: ../data/totem.ui.h:135
+#: ../data/totem.ui.h:44
 msgid "_Previous Chapter/Movie"
 msgstr "הפרק/סרט ה_קודם"
 
-#: ../data/totem.ui.h:136
-msgid "_Properties"
-msgstr "מ_אפיינים"
+#: ../data/totem.ui.h:45
+msgid "Previous chapter or movie"
+msgstr "הפרק או הסרט הקודמים"
 
-#: ../data/totem.ui.h:137
-msgid "_Quit"
-msgstr "_יציאה"
+#: ../data/totem.ui.h:46
+msgid "_Sound"
+msgstr "_צליל"
 
-#: ../data/totem.ui.h:138
-msgid "_Repeat Mode"
-msgstr "מצב _חזרה"
+#: ../data/totem.ui.h:47
+msgid "Volume _Up"
+msgstr "ה_גברת העצמה"
 
-#: ../data/totem.ui.h:139
-msgid "_Resize 1:2"
-msgstr "_שינוי לגודל 1:2"
+#: ../data/totem.ui.h:48
+msgid "Increase volume"
+msgstr "הגברת עוצמת קול"
 
-#: ../data/totem.ui.h:140
-msgid "_Resize the window when a new video is loaded"
-msgstr "_שינוי גודל החלון באופן אוטומטי בעת טעינת סרט חדש"
+#: ../data/totem.ui.h:49
+msgid "Volume _Down"
+msgstr "ה_נמכת העצמה"
 
-#: ../data/totem.ui.h:142
-msgid "_Sound"
-msgstr "_צליל"
+#: ../data/totem.ui.h:50
+msgid "Decrease volume"
+msgstr "הפחתת עצמת השמע"
 
-#: ../data/totem.ui.h:143
-msgid "_Title Menu"
-msgstr "תפריט _כותרת"
+#: ../data/totem.ui.h:51
+msgid "_Help"
+msgstr "ע_זרה"
 
-#: ../data/totem.ui.h:144
-msgid "_Type of visualization:"
-msgstr "_סוג המחזה:"
+#: ../data/totem.ui.h:52
+msgid "_Contents"
+msgstr "_תוכן"
 
-#: ../data/totem.ui.h:145
-msgid "_View"
-msgstr "_תצוגה"
+#: ../data/totem.ui.h:53
+msgid "Help contents"
+msgstr "תוכן העזרה"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
-msgid "A list of the names of the plugins which are currently active (loaded and running)."
-msgstr "A list of the names of the plugins which are currently active (loaded and running)."
+#: ../data/totem.ui.h:54
+msgid "_About"
+msgstr "על _אודות"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
-msgid "Active plugins list"
-msgstr "Active plugins list"
+#: ../data/totem.ui.h:55
+msgid "About this application"
+msgstr "על אודות יישום זה"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
-msgid "Allow the screensaver to activate when playing audio"
-msgstr "Allow the screensaver to activate when playing audio"
+#: ../data/totem.ui.h:56
+msgid "Show _Controls"
+msgstr "הצגת _פקדים"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
-msgid "Allow the screensaver to activate when playing audio. Disable if you have monitor-powered speakers."
-msgstr "Allow the screensaver to activate when playing audio. Disable if you have monitor-powered speakers."
+#: ../data/totem.ui.h:57
+msgid "Show controls"
+msgstr "הצגת פקדים"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
-msgid "Amount of data to buffer for network streams before starting to display the stream (in seconds)."
-msgstr "Amount of data to buffer for network streams before starting to display the stream (in seconds)."
+#: ../data/totem.ui.h:58
+msgid "S_idebar"
+msgstr "_סרגל צד"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
-msgid "Approximate network connection speed, used to select quality on media over the network."
-msgstr "Approximate network connection speed, used to select quality on media over the network."
+#: ../data/totem.ui.h:59
+msgid "Show or hide the sidebar"
+msgstr "הצגה או הסתרה של סרגל הצד"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
-msgid "Default location for the \"Open...\" dialogs"
-msgstr "Default location for the \"Open...\" dialogs"
+#: ../data/totem.ui.h:60
+msgctxt "Aspect ratio"
+msgid "Auto"
+msgstr "אוטומטי"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
-msgid "Default location for the \"Open...\" dialogs. Default is the current directory."
-msgstr "Default location for the \"Open...\" dialogs. Default is the current directory."
+#: ../data/totem.ui.h:61
+msgid "Sets automatic aspect ratio"
+msgstr "הגדרת יחס ממדים אוטומטית"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
-msgid "Default location for the \"Take Screenshot\" dialogs"
-msgstr "Default location for the \"Take Screenshot\" dialogs"
+#: ../data/totem.ui.h:62
+msgid "Square"
+msgstr "ריבוע"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
-msgid "Default location for the \"Take Screenshot\" dialogs. Default is the Pictures directory."
-msgstr "Default location for the \"Take Screenshot\" dialogs. Default is the Pictures directory."
+#: ../data/totem.ui.h:63
+msgid "Sets square aspect ratio"
+msgstr "הגדרת יחס ממדים ריבועי"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
-msgid "Encoding character set for subtitle."
-msgstr "Encoding character set for subtitle."
+#: ../data/totem.ui.h:64
+msgid "4:3 (TV)"
+msgstr "4:3 (טלוויזיה)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
-msgid "Name of the visual effects plugin"
-msgstr "Name of the visual effects plugin"
+#: ../data/totem.ui.h:65
+msgid "Sets 4:3 (TV) aspect ratio"
+msgstr "הגדרת יחס ממדים 4:3 (טלוויזיה)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
-msgid "Network buffering threshold"
-msgstr "Network buffering threshold"
+#: ../data/totem.ui.h:66
+msgid "16:9 (Widescreen)"
+msgstr "16:9 (מסך רחב)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
-msgid "Network connection speed"
-msgstr "Network connection speed"
+#: ../data/totem.ui.h:67
+msgid "Sets 16:9 (widescreen) aspect ratio"
+msgstr "הגדרת יחס ממדים 16:9 (מסך רחב)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
-msgid "Pango font description for subtitle rendering."
-msgstr "Pango font description for subtitle rendering."
+#: ../data/totem.ui.h:68
+msgid "2.11:1 (DVB)"
+msgstr "‏2.11:1 (DVB)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
-msgid "Quality setting for the audio visualization."
-msgstr "Quality setting for the audio visualization."
+#: ../data/totem.ui.h:69
+msgid "Sets 2.11:1 (DVB) aspect ratio"
+msgstr "הגדרת יחס ממדים 2.11:1 (DVB)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
-msgid "Repeat mode"
-msgstr "Repeat mode"
+#: ../data/totem.ui.h:70
+msgid "S_ubtitles"
+msgstr "_כתוביות"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
-msgid "Resize the canvas automatically on file load"
-msgstr "Resize the canvas automatically on file load"
+#: ../data/totem.ui.h:73
+msgid "_Languages"
+msgstr "_שפות"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
-msgid "Show visual effects when no video is displayed"
-msgstr "Show visual effects when no video is displayed"
+#: ../data/totem.ui.h:74
+msgid "Zoom In"
+msgstr "התקרבות"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
-msgid "Show visual effects when playing an audio only file."
-msgstr "Show visual effects when playing an audio only file."
+#: ../data/totem.ui.h:75
+msgid "Zoom in"
+msgstr "התקרבות"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
-msgid "Shuffle mode"
-msgstr "Shuffle mode"
+#: ../data/totem.ui.h:76
+msgid "Skip _Forward"
+msgstr "דילוג _קדימה"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
-msgid "Subtitle encoding"
-msgstr "Subtitle encoding"
+#: ../data/totem.ui.h:77
+msgid "Skip forward"
+msgstr "דילוג קדימה"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
-msgid "Subtitle font"
-msgstr "Subtitle font"
+#: ../data/totem.ui.h:78
+msgid "Skip _Backwards"
+msgstr "דילוג _אחורה"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
-msgid "The brightness of the video"
-msgstr "The brightness of the video"
+#: ../data/totem.ui.h:79
+msgid "Skip backwards"
+msgstr "דילוג אחורה"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
-msgid "The contrast of the video"
-msgstr "The contrast of the video"
+#: ../data/totem.ui.h:82
+msgid "Time seek bar"
+msgstr "סרגל הזמן"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
-msgid "The hue of the video"
-msgstr "The hue of the video"
+#: ../data/uri.ui.h:1
+msgid "Enter the _address of the file you would like to open:"
+msgstr "נא להזין את _מיקום הקובץ שברצונך לפתוח:"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
-msgid "The saturation of the video"
-msgstr "The saturation of the video"
+#: ../data/video-list.ui.h:1
+#: ../src/totem-dnd-menu.c:97
+msgid "_Add to Playlist"
+msgstr "ה_וספה לרשימת השמעה"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
-msgid "Type of audio output to use"
-msgstr "Type of audio output to use"
+#: ../data/video-list.ui.h:2
+msgid "Add the video to the playlist"
+msgstr "הוספת הווידאו לרשימת ההשמעה"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
-msgid "Visualization quality setting"
-msgstr "Visualisation quality setting"
+#: ../src/backend/bacon-video-widget.c:1643
+msgid "Password requested for RTSP server"
+msgstr "נדרשת סיסמה עבור שרת ה־RTSP"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
-msgid "Whether to autoload external chapter files when a movie is loaded"
-msgstr "Whether to autoload external chapter files when a movie is loaded"
+#: ../src/backend/bacon-video-widget.c:2944
+#, c-format
+msgid "Audio Track #%d"
+msgstr "רצועת שמע מס' %d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
-msgid "Whether to autoload text subtitle files when a movie is loaded"
-msgstr "Whether to autoload text subtitle files when a movie is loaded"
+#: ../src/backend/bacon-video-widget.c:2948
+#, c-format
+msgid "Subtitle #%d"
+msgstr "כתובית מס' %d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
-msgid "Whether to disable deinterlacing for interlaced movies"
-msgstr "Whether to disable deinterlacing for interlaced movies"
+#: ../src/backend/bacon-video-widget.c:3345
+msgid "The server you are trying to connect to is not known."
+msgstr "השרת אליו אתה מנסה להתחבר אינו ידוע."
+
+#: ../src/backend/bacon-video-widget.c:3348
+msgid "The connection to this server was refused."
+msgstr "החיבור לשרת זה נדחה."
+
+#: ../src/backend/bacon-video-widget.c:3351
+msgid "The specified movie could not be found."
+msgstr "לא ניתן למצוא את הסרט שצוין."
+
+#: ../src/backend/bacon-video-widget.c:3358
+msgid "The server refused access to this file or stream."
+msgstr "השרת מונע גישה לקובץ או שידור זה."
+
+#: ../src/backend/bacon-video-widget.c:3364
+msgid "Authentication is required to access this file or stream."
+msgstr "נדרש אישור כדי לגשת לקובץ או שידור זה."
+
+#: ../src/backend/bacon-video-widget.c:3371
+msgid "You are not allowed to open this file."
+msgstr "אינך מורשה לפתוח קובץ זה."
+
+#: ../src/backend/bacon-video-widget.c:3376
+msgid "This location is not a valid one."
+msgstr "מיקום זה אינו תקני."
+
+#: ../src/backend/bacon-video-widget.c:3384
+msgid "The movie could not be read."
+msgstr "לא ניתן לקרוא את הסרט"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
-msgid "Whether to disable the keyboard shortcuts"
-msgstr "Whether to disable the keyboard shortcuts"
+#. should be exactly one missing thing (source or converter)
+#: ../src/backend/bacon-video-widget.c:3407
+#: ../src/backend/bacon-video-widget.c:3415
+#, c-format
+msgid "The playback of this movie requires a %s plugin which is not installed."
+msgid_plural ""
+"The playback of this movie requires the following decoders which are not installed:\n"
+"\n"
+"%s"
+msgstr[0] "על מנת לצפות בסרט זה דרוש התוסף %s שאינו מותקן."
+msgstr[1] ""
+"על מנת לצפות בסרט זה דרושים המפענחים הבאים שאינם מותקנים:\n"
+"\n"
+"%s"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
-msgid "Whether to disable the plugins in the user's home directory"
-msgstr "Whether to disable the plugins in the user's home directory"
+#: ../src/backend/bacon-video-widget.c:3426
+msgid "An audio or video stream is not handled due to missing codecs. You might need to install additional plugins to be able to play some types of movies"
+msgstr "תזרים שמע או וידאו לא מטופל כראוי עקב מפענחים חסרים. יתכן שיהיה עליך להתקין תוספים נוספים כדי לנגן סוגים מסוימים של סרטים"
+
+#: ../src/backend/bacon-video-widget.c:3436
+msgid "This file cannot be played over the network. Try downloading it locally first."
+msgstr "לא ניתן לנגן קובץ זה דרך הרשת. כדאי לנסות לשמור אותו על הכונן קודם."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:35
-msgid "Whether to enable debug for the playback engine"
-msgstr "Whether to enable debug for the playback engine"
+#: ../src/backend/bacon-video-widget.c:5494
+#: ../src/totem-properties-view.c:227
+msgid "Surround"
+msgstr "צליל היקפי"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:36
-msgid "Whether to remember the position of played audio/video files when pausing or closing them"
-msgstr "Whether to remember the position of played audio/video files when pausing or closing them"
+#: ../src/backend/bacon-video-widget.c:5496
+#: ../src/totem-properties-view.c:229
+msgid "Mono"
+msgstr "מונו"
 
-#: ../data/uri.ui.h:1
-msgid "Enter the _address of the file you would like to open:"
-msgstr "נא להזין את _מיקום הקובץ שברצונך לפתוח:"
+#: ../src/backend/bacon-video-widget.c:5781
+msgid "Media contains no supported video streams."
+msgstr "המדיה איננה כוללת זרמי וידאו נתמכים"
+
+#: ../src/backend/bacon-video-widget.c:5963
+msgid "Some necessary plug-ins are missing. Make sure that the program is correctly installed."
+msgstr "חלק מתוספי השמע הנחוצים חסרים. נא לוודא שהתכנית מותקנת כראוי."
 
 #: ../src/eggdesktopfile.c:165
 #, c-format
@@ -954,6 +1017,31 @@
 msgid "Show session management options"
 msgstr "Show session management options"
 
+#. hour:minutes:seconds
+#. Translators: This is a time format, like "9:05:02" for 9
+#. * hours, 5 minutes, and 2 seconds. You may change ":" to
+#. * the separator that your locale uses or use "%Id" instead
+#. * of "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:56
+#: ../src/plugins/skipto/totem-time-entry.c:57
+#, c-format
+msgctxt "long time format"
+msgid "%d:%02d:%02d"
+msgstr "%d:%02d:%02d"
+
+#. minutes:seconds
+#. Translators: This is a time format, like "5:02" for 5
+#. * minutes and 2 seconds. You may change ":" to the
+#. * separator that your locale uses or use "%Id" instead of
+#. * "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:65
+#, c-format
+msgctxt "short time format"
+msgid "%d:%02d"
+msgstr "%d:%02d"
+
 #. Title
 #. Artist
 #. Album
@@ -1058,10 +1146,14 @@
 msgstr[0] "שקופית אחת לשנייה"
 msgstr[1] "%d שקופיות לשנייה"
 
-#: ../src/totem-audio-preview.c:168
+#: ../src/totem-audio-preview.c:137
 msgid "Audio Preview"
 msgstr "השמעה מקדימה"
 
+#: ../src/totem.c:239
+msgid "Verify your system installation. Totem will now exit."
+msgstr "נא לוודא את התקנת המערכת שלך. Totem ייצא עכשיו."
+
 #: ../src/totem-cell-renderer-video.c:126
 msgid "Unknown video"
 msgstr "וידאו לא ידוע"
@@ -1074,7 +1166,7 @@
 msgid "Cancel"
 msgstr "ביטול"
 
-#: ../src/totem-fullscreen.c:616
+#: ../src/totem-fullscreen.c:573
 msgid "No File"
 msgstr "אין קובץ"
 
@@ -1095,64 +1187,38 @@
 msgid "Make sure that Totem is properly installed."
 msgstr "נא לוודא ש־Totem מותקן כראוי."
 
-#: ../src/totem-interface.c:347
+#: ../src/totem-interface.c:357
 msgid "Totem 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."
 msgstr "Totem 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."
 
-#: ../src/totem-interface.c:351
+#: ../src/totem-interface.c:361
 msgid "Totem 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 General Public License for more details."
 msgstr "Totem 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 General Public License for more details."
 
-#: ../src/totem-interface.c:355
+#: ../src/totem-interface.c:365
 msgid "You should have received a copy of the GNU General Public License along with Totem; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA"
 msgstr "You should have received a copy of the GNU General Public License along with Totem; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA"
 
-#: ../src/totem-interface.c:358
+#: ../src/totem-interface.c:368
 msgid "Totem contains an exception to allow the use of proprietary GStreamer plugins."
 msgstr "Totem contains an exception to allow the use of proprietary GStreamer plugins."
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:190
+#: ../src/totem-menu.c:291
 msgid "None"
 msgstr "ללא"
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:195
+#: ../src/totem-menu.c:296
 msgctxt "Language"
 msgid "Auto"
 msgstr "אוטומטי"
 
-#. Translators:
-#. * This is not a JPEG image, but a disc image, for example,
-#. * an ISO file
-#: ../src/totem-menu.c:765
-#, c-format
-msgid "Play Image '%s'"
-msgstr "נגינת התמונה '%s'"
-
-#: ../src/totem-menu.c:768
-#: ../src/totem-menu.c:851
-#, c-format
-msgid "device%d"
-msgstr "התקן%d"
-
-#: ../src/totem-menu.c:848
-#, c-format
-msgid "Play Disc '%s'"
-msgstr "נגינת הדיסק '%s'"
-
-#. This lists the back-end type and version, such as
-#. * Movie Player using GStreamer 0.10.1
-#: ../src/totem-menu.c:1189
-#, c-format
-msgid "Movie Player using %s"
-msgstr "נגן הסרטים משתמש ב־%s"
-
-#: ../src/totem-menu.c:1193
+#: ../src/totem-menu.c:789
 msgid "Copyright © 2002-2009 Bastien Nocera"
 msgstr "כל הזכויות שמורות © 2002-2009 Bastien Nocera"
 
-#: ../src/totem-menu.c:1198
+#: ../src/totem-menu.c:794
 msgid "translator-credits"
 msgstr ""
 "גיל אשר \n"
@@ -1165,149 +1231,85 @@
 "פרוייקט תרגום GNOME לעברית:\n"
 "‏http://gnome-il.berlios.de"
 
-#: ../src/totem-menu.c:1202
+#: ../src/totem-menu.c:798
 msgid "Totem Website"
 msgstr "אתר הבית של Totem"
 
-#: ../src/totem-menu.c:1236
+#: ../src/totem-menu.c:829
 msgid "Configure Plugins"
 msgstr "הגדרות תוספים"
 
+#: ../src/totem-object.c:162
+#, c-format
+msgid ""
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+
 #. Translators: %s is the totem version number
-#: ../src/totem-object.c:471
+#: ../src/totem-object.c:591
 #, c-format
 msgid "Totem %s"
 msgstr "Totem %s"
 
-#: ../src/totem-object.c:1047
-#: ../browser-plugin/totem-plugin-viewer.c:367
-msgid "Playing"
-msgstr "בנגינה"
-
-#: ../src/totem-object.c:1049
+#: ../src/totem-object.c:1168
 #: ../src/totem-options.c:52
 msgid "Pause"
 msgstr "השהיה"
 
-#: ../src/totem-object.c:1054
-#: ../browser-plugin/totem-plugin-viewer.c:363
-msgid "Paused"
-msgstr "מושהה"
-
-#: ../src/totem-object.c:1056
-#: ../src/totem-object.c:1066
+#: ../src/totem-object.c:1175
+#: ../src/totem-object.c:1185
 #: ../src/totem-options.c:51
 msgid "Play"
 msgstr "נגינה"
 
-#: ../src/totem-object.c:1061
-#: ../src/totem-object.c:1659
-#: ../src/totem-statusbar.c:115
-#: ../browser-plugin/totem-plugin-viewer.c:351
-msgid "Stopped"
-msgstr "בעצירה"
-
-#: ../src/totem-object.c:1142
-#: ../src/totem-object.c:1169
-#: ../src/totem-object.c:1799
-#: ../src/totem-object.c:1963
+#: ../src/totem-object.c:1267
+#: ../src/totem-object.c:1294
+#: ../src/totem-object.c:1787
+#: ../src/totem-object.c:1942
 #, c-format
 msgid "Totem could not play '%s'."
 msgstr "Totem אינו יכול לנגן את '%s'."
 
-#: ../src/totem-object.c:1246
-#, c-format
-msgid "Totem could not play this media (%s) although a plugin is present to handle it."
-msgstr "Totem לא יכול לנגן מדיה זו (%s) למרות שקיים תוסף לטיפול בו."
-
-#: ../src/totem-object.c:1247
-msgid "You might want to check that a disc is present in the drive and that it is correctly configured."
-msgstr "כדאי לבדוק את שהדיסק נמצא בכונן ושהוא מוגדר כראוי."
-
-#: ../src/totem-object.c:1255
-msgid "More information about media plugins"
-msgstr "מידע נוסף על תוספי מדיה"
-
-#: ../src/totem-object.c:1256
-msgid "Please install the necessary plugins and restart Totem to be able to play this media."
-msgstr "נא להתקין את התוספים הדרושים ולהפעיל מחדש את Totem כדי שניתן יהיה לנגן מדיה זו."
-
-#: ../src/totem-object.c:1258
-#, c-format
-msgid "Totem cannot play this type of media (%s) because it does not have the appropriate plugins to be able to read from the disc."
-msgstr "‏Totem אינו יכול לנגן סוג מדיה זה (%s) מכיוון שאין לך את התוספים המתאימים לקריאה מהדיסק."
-
-#: ../src/totem-object.c:1260
-#, c-format
-msgid "Totem cannot play this type of media (%s) because you do not have the appropriate plugins to handle it."
-msgstr "Totem אינו יכול לנגן סוג מדיה זה (%s) מכיוון שאין לך את התוספים המתאימים בכדי לטפל בו."
-
-#: ../src/totem-object.c:1263
-#, c-format
-msgid "Totem cannot play this type of media (%s) because it is not supported."
-msgstr "‏Totem אינו יכול לנגן סוג מדיה זה (%s) מכיוון שהוא לא נתמך"
-
-#: ../src/totem-object.c:1264
-msgid "Please insert another disc to play back."
-msgstr "נא להכניס דיסק אחר לניגון."
-
-#: ../src/totem-object.c:1300
-msgid "Totem was not able to play this disc."
-msgstr "‏Totem לא הצליח לנגן את דיסק זה."
-
-#: ../src/totem-object.c:1301
-#: ../src/totem-object.c:4229
-msgid "No reason."
-msgstr "אין סיבה."
-
-#: ../src/totem-object.c:1315
-msgid "Totem does not support playback of Audio CDs"
-msgstr "‏Totem לא תומך בהשמעת תקליטורי CD"
-
-#: ../src/totem-object.c:1316
-msgid "Please consider using a music player or a CD extractor to play this CD"
-msgstr "אפשר להשתמש בנגן מוזיקה או מחלץ CD כדי לנגן CD זה"
-
-#: ../src/totem-object.c:1805
+#: ../src/totem-object.c:1793
 msgid "No error message"
 msgstr "אין הודעת שגיאה"
 
-#: ../src/totem-object.c:2154
+#: ../src/totem-object.c:2133
 msgid "Totem could not display the help contents."
 msgstr "Totem אינו יכול להציג את תוכן העזרה."
 
-#: ../src/totem-object.c:2493
-#: ../src/totem-object.c:2495
-#: ../browser-plugin/totem-plugin-viewer.c:1417
-msgid "An error occurred"
-msgstr "ארעה שגיאה"
-
-#: ../src/totem-object.c:4064
-#: ../src/totem-object.c:4066
+#: ../src/totem-object.c:4019
+#: ../src/totem-object.c:4021
 msgid "Previous Chapter/Movie"
 msgstr "הפרק/סרט הקודם"
 
-#: ../src/totem-object.c:4073
-#: ../src/totem-object.c:4075
+#: ../src/totem-object.c:4028
+#: ../src/totem-object.c:4030
 msgid "Play / Pause"
 msgstr "נגינה / השהיה"
 
-#: ../src/totem-object.c:4083
-#: ../src/totem-object.c:4085
+#: ../src/totem-object.c:4038
+#: ../src/totem-object.c:4040
 msgid "Next Chapter/Movie"
 msgstr "הפרק/סרט הבא"
 
-#. Translators: this is the tooltip text for the fullscreen button in the controls box in Totem's main window.
 #. Translators: this is the accessibility text for the fullscreen button in the controls box in Totem's main window.
-#: ../src/totem-object.c:4097
-#: ../src/totem-object.c:4099
+#: ../src/totem-object.c:4051
+#: ../src/totem-object.c:4053
 msgid "Fullscreen"
 msgstr "מסך מלא"
 
-#: ../src/totem-object.c:4229
+#: ../src/totem-object.c:4184
 msgid "Totem could not startup."
 msgstr "Totem לא יכול לעלות."
 
+#: ../src/totem-object.c:4184
+msgid "No reason."
+msgstr "אין סיבה."
+
 #: ../src/totem-open-location.c:182
 msgid "Open Location..."
 msgstr "פתיחת מיקום..."
@@ -1381,119 +1383,113 @@
 msgid "Movies to play"
 msgstr "Movies to play"
 
-#: ../src/totem-options.c:117
+#: ../src/totem-options.c:79
+msgid "- Play movies and songs"
+msgstr "- Play movies and songs"
+
+#: ../src/totem-options.c:142
 msgid "Can't enqueue and replace at the same time"
 msgstr "לא ניתן להוסיף לתור ולהחליף באותו הזמן"
 
 #. By extension entry
-#: ../src/totem-playlist.c:161
+#: ../src/totem-playlist.c:162
 msgid "MP3 ShoutCast playlist"
 msgstr "רשימת השמעה MP3 - ‏ShoutCast"
 
-#: ../src/totem-playlist.c:162
+#: ../src/totem-playlist.c:163
 msgid "MP3 audio (streamed)"
 msgstr "שמע MP3 (מוזרם)"
 
-#: ../src/totem-playlist.c:163
+#: ../src/totem-playlist.c:164
 msgid "MP3 audio (streamed, DOS format)"
 msgstr "שמע MP3 (מוזרם, תצורת DOS)"
 
-#: ../src/totem-playlist.c:164
+#: ../src/totem-playlist.c:165
 msgid "XML Shareable Playlist"
 msgstr "רשימת השמעה XML משותפת"
 
 #. This is "Title 3", where title is a DVD title
 #. * Note: NOT a DVD chapter
-#: ../src/totem-playlist.c:347
+#: ../src/totem-playlist.c:348
 #, c-format
 msgid "Title %d"
 msgstr "שם %d"
 
-#: ../src/totem-playlist.c:446
+#: ../src/totem-playlist.c:447
 msgid "Could not save the playlist"
 msgstr "לא ניתן לשמור את רשימת ההשמעה"
 
-#: ../src/totem-playlist.c:1021
+#: ../src/totem-playlist.c:1022
 msgid "Save Playlist"
 msgstr "שמירת רשימת השמעה"
 
 #. translators: Playlist is the default saved playlist filename,
 #. * without the suffix
-#: ../src/totem-playlist.c:1033
-#: ../src/totem-playlist.c:1264
-#: ../src/totem-sidebar.c:142
+#: ../src/totem-playlist.c:1034
+#: ../src/totem-playlist.c:1263
+#: ../src/totem-sidebar.c:145
 msgid "Playlist"
 msgstr "רשימת השמעה"
 
-#: ../src/totem-playlist.c:1857
+#: ../src/totem-playlist.c:1862
 #, c-format
 msgid "The playlist '%s' could not be parsed. It might be damaged."
 msgstr "לא ניתן לנתח את רשימת ההשמעה '%s'. יתכן שהיא פגומה."
 
-#: ../src/totem-playlist.c:1858
+#: ../src/totem-playlist.c:1863
 msgid "Playlist error"
 msgstr "שגיאה ברשימת השמעה"
 
-#: ../src/totem-preferences.c:295
+#: ../src/totem-preferences.c:297
 msgid "Preferences"
 msgstr "העדפות"
 
-#: ../src/totem-preferences.c:451
+#: ../src/totem-preferences.c:445
 msgid "Select Subtitle Font"
 msgstr "בחירת גופן כתובית"
 
-#: ../src/totem-properties-main.c:115
-#: ../src/totem-properties-view.c:266
+#: ../src/totem-properties-main.c:116
+#: ../src/totem-properties-view.c:269
 msgid "Audio/Video"
 msgstr "שמע/וידאו"
 
-#: ../src/totem-properties-view.c:128
+#: ../src/totem-properties-view.c:131
 msgid "N/A"
 msgstr "לא זמין"
 
-#: ../src/totem-properties-view.c:157
+#: ../src/totem-properties-view.c:160
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 msgctxt "Stream bit rate"
 msgid "N/A"
 msgstr "לא זמין"
 
-#: ../src/totem-properties-view.c:160
+#: ../src/totem-properties-view.c:163
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 #, c-format
 msgid "%d kbps"
 msgstr "%d ק\"ב לשנייה"
 
-#: ../src/totem-properties-view.c:177
+#: ../src/totem-properties-view.c:180
 #: ../src/plugins/properties/totem-movie-properties.c:149
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../src/totem-properties-view.c:209
+#: ../src/totem-properties-view.c:212
 #: ../src/plugins/properties/totem-movie-properties.c:166
 #, c-format
 msgid "%d Hz"
 msgstr "%d הרץ"
 
-#: ../src/totem-properties-view.c:216
+#: ../src/totem-properties-view.c:219
 #: ../src/plugins/properties/totem-movie-properties.c:166
 msgctxt "Sample rate"
 msgid "N/A"
 msgstr "לא זמין"
 
-#: ../src/totem-properties-view.c:224
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5589
-msgid "Surround"
-msgstr "צליל היקפי"
-
-#: ../src/totem-properties-view.c:226
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5591
-msgid "Mono"
-msgstr "מונו"
-
-#: ../src/totem-properties-view.c:236
+#: ../src/totem-properties-view.c:239
 msgctxt "Number of audio channels"
 msgid "N/A"
 msgstr "לא זמין"
@@ -1528,8 +1524,8 @@
 #. eg: 75 %
 #: ../src/totem-statusbar.c:250
 #, c-format
-msgid "%d %%"
-msgstr "%d %%"
+msgid "%lf %%"
+msgstr "%lf %%"
 
 #. eg: Paused, 0:32 / 1:05
 #: ../src/totem-statusbar.c:325
@@ -1540,8 +1536,8 @@
 #. eg: Buffering, 75 %
 #: ../src/totem-statusbar.c:330
 #, c-format
-msgid "%s, %d %%"
-msgstr "%s, %d %%"
+msgid "%s, %f %%"
+msgstr "%s, %f %%"
 
 #: ../src/totem-subtitle-encoding.c:156
 msgid "Current Locale"
@@ -1704,197 +1700,99 @@
 msgid "Western"
 msgstr "מערבי"
 
-#: ../src/totem-subtitle-encoding.c:328
-#: ../src/totem-subtitle-encoding.c:330
-#: ../src/totem-subtitle-encoding.c:332
-msgid "Vietnamese"
-msgstr "ויאטנמי"
-
-#: ../src/totem-video-list.c:330
-msgid "No video URI"
-msgstr "אין כתובת לווידאו"
-
-#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
-#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
-#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
-#: ../src/totem-video-thumbnailer.c:872
-#, c-format
-msgid ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-msgstr ""
-"‏%s: ‏%s‏\n"
-"‏%s: ‏%d×%d‏\n"
-"‏%s: ‏%s"
-
-#: ../src/totem-video-thumbnailer.c:873
-msgid "Filename"
-msgstr "שם קובץ"
-
-#: ../src/totem-video-thumbnailer.c:875
-msgid "Resolution"
-msgstr "הפרדה"
-
-#: ../src/totem-video-thumbnailer.c:878
-msgid "Duration"
-msgstr "משך"
-
-#: ../src/totem-uri.c:506
+#: ../src/totem-subtitle-encoding.c:328
+#: ../src/totem-subtitle-encoding.c:330
+#: ../src/totem-subtitle-encoding.c:332
+msgid "Vietnamese"
+msgstr "ויאטנמי"
+
+#: ../src/totem-uri.c:343
 #: ../src/plugins/chapters/totem-chapters.c:998
 msgid "All files"
 msgstr "כל הקבצים"
 
-#: ../src/totem-uri.c:511
+#: ../src/totem-uri.c:348
 #: ../src/plugins/chapters/totem-chapters.c:995
 msgid "Supported files"
 msgstr "קבצים נתמכים"
 
-#: ../src/totem-uri.c:523
+#: ../src/totem-uri.c:360
 msgid "Audio files"
 msgstr "קובצי אודיו"
 
-#: ../src/totem-uri.c:531
+#: ../src/totem-uri.c:368
 msgid "Video files"
 msgstr "קובצי וידאו"
 
-#: ../src/totem-uri.c:541
+#: ../src/totem-uri.c:378
 msgid "Subtitle files"
 msgstr "קובצי כתוביות"
 
-#: ../src/totem-uri.c:593
+#: ../src/totem-uri.c:430
 msgid "Select Text Subtitles"
 msgstr "בחירת כתוביות"
 
-#: ../src/totem-uri.c:656
+#: ../src/totem-uri.c:495
 msgid "Select Movies or Playlists"
 msgstr "יש לבחור בסרטים או ברשימות השמעה"
 
-#. Options parsing
-#: ../src/totem.c:201
-msgid "- Play movies and songs"
-msgstr "- Play movies and songs"
+#: ../src/totem-uri.c:499
+msgid "Add Directory"
+msgstr "הוספת תיקייה"
 
-#: ../src/totem.c:212
+#: ../src/totem-video-list.c:330
+msgid "No video URI"
+msgstr "אין כתובת לווידאו"
+
+#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
+#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
+#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
+#: ../src/totem-video-thumbnailer.c:841
 #, c-format
 msgid ""
-"%s\n"
-"Run '%s --help' to see a full list of available command line options.\n"
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 msgstr ""
-"%s\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-
-#: ../src/totem.c:254
-#: ../src/totem.c:265
-#: ../browser-plugin/totem-plugin-viewer.c:663
-#: ../browser-plugin/totem-plugin-viewer.c:1793
-msgid "Totem Movie Player"
-msgstr "נגן הסרטים Totem"
-
-#: ../src/totem.c:255
-#: ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Could not initialize the thread-safe libraries."
-msgstr "לא ניתן לאתחל את ספריות ה־thread-safe."
-
-#: ../src/totem.c:255
-msgid "Verify your system installation. Totem will now exit."
-msgstr "נא לוודא את התקנת המערכת שלך. Totem ייצא עכשיו."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:1589
-msgid "Password requested for RTSP server"
-msgstr "נדרשת סיסמה עבור שרת ה־RTSP"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2858
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2862
-#, c-format
-msgid "Audio Track #%d"
-msgstr "רצועת שמע מס' %d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2890
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2894
-#, c-format
-msgid "Subtitle #%d"
-msgstr "כתובית מס' %d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3298
-msgid "The requested audio output was not found. Please select another audio output in the Multimedia Systems Selector."
-msgstr "פלט השמע המבוקש לא נמצא. נא לבחור בפלט שמע אחר בבורר מערכות המולטימדיה."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3303
-msgid "Location not found."
-msgstr "המיקום לא נמצא."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3307
-msgid "Could not open location; you might not have permission to open the file."
-msgstr "לא ניתן לפתוח את המיקום; כנראה שאין לך הרשאות לפתוח את הקובץ."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3318
-msgid "The video output is in use by another application. Please close other video applications, or select another video output in the Multimedia Systems Selector."
-msgstr "פלט הווידאו נמצא בשימוש יישום אחר. נא לסגור את היישום האחר או לבחור בפלט וידאו אחר בבורר מערכות המולטימדיה."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3324
-msgid "The audio output is in use by another application. Please select another audio output in the Multimedia Systems Selector. You may want to consider using a sound server."
-msgstr "פלט השמע נמצא בשימוש יישום אחר. נא לבחור בפלט שמע אחר בבורר מערכות המולטימדיה. עליך לשקול שימוש בשרת קול."
+"‏%s: ‏%s‏\n"
+"‏%s: ‏%d×%d‏\n"
+"‏%s: ‏%s"
 
-#. should be exactly one missing thing (source or converter)
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3342
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3348
-#, c-format
-msgid "The playback of this movie requires a %s plugin which is not installed."
-msgid_plural ""
-"The playback of this movie requires the following decoders which are not installed:\n"
-"\n"
-"%s"
-msgstr[0] "על מנת לצפות בסרט זה דרוש התוסף %s שאינו מותקן."
-msgstr[1] ""
-"על מנת לצפות בסרט זה דרושים המפענחים הבאים שאינם מותקנים:\n"
-"\n"
-"%s"
+#: ../src/totem-video-thumbnailer.c:842
+msgid "Filename"
+msgstr "שם קובץ"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3374
-msgid "Cannot play this file over the network. Try downloading it to disk first."
-msgstr "לא ניתן לנגן קובץ זה מעל הרשת. כדאי לנסות לשמור אותו על הדיסק קודם."
+#: ../src/totem-video-thumbnailer.c:844
+msgid "Resolution"
+msgstr "הפרדה"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5878
-msgid "Media contains no supported video streams."
-msgstr "המדיה איננה כוללת זרמי וידאו נתמכים"
+#: ../src/totem-video-thumbnailer.c:847
+msgid "Duration"
+msgstr "משך"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6052
-msgid "Failed to create a GStreamer play object. Please check your GStreamer installation."
-msgstr "ארע כשל ביצירת עצם GStreamer. נא לבדוק את התקנת ה־GStreamer שלך."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6172
-msgid "Failed to open audio output. You may not have permission to open the sound device, or the sound server may not be running. Please select another audio output in the Multimedia Systems Selector."
-msgstr "ארע כשל בפתיחת פלט השמע.  יתכן שאין לך הרשאות לפתוח את התקן השמע, או אולי שרת הקול לא מופעל. יש לבחור בפלט שמע אחר בבורר מערכות המולטימדיה."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6192
-msgid "Could not find the audio output. You may need to install additional GStreamer plugins, or select another audio output in the Multimedia Systems Selector."
-msgstr "פלט השמע לא נמצא. יש להתקין תוספי GStreamer נוספים, או לבחור בפלט שמע אחר בבורר מערכות המולטימדיה."
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:1
+msgid "Apple Trailers"
+msgstr "קדימונים של Apple"
+
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:2
+msgid "Sets the user agent for the Apple Trailers site"
+msgstr "הגדרת סוכן המשתמש לאתר הקדימונים של Apple"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:1
+msgid "Autoload Subtitles"
+msgstr "טעינת כתוביות אוטומטית"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:2
+msgid "Autoloads text subtitles"
+msgstr "טעינת כתוביות טקסטואליות אוטומטית"
 
-#. hour:minutes:seconds
-#. Translators: This is a time format, like "9:05:02" for 9
-#. * hours, 5 minutes, and 2 seconds. You may change ":" to
-#. * the separator that your locale uses or use "%Id" instead
-#. * of "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:83
-#: ../src/plugins/skipto/totem-time-entry.c:57
-#, c-format
-msgctxt "long time format"
-msgid "%d:%02d:%02d"
-msgstr "%d:%02d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
+msgid "Video Disc Recorder"
+msgstr "מקליט דיסק וידאו"
 
-#. minutes:seconds
-#. Translators: This is a time format, like "5:02" for 5
-#. * minutes and 2 seconds. You may change ":" to the
-#. * separator that your locale uses or use "%Id" instead of
-#. * "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:92
-#, c-format
-msgctxt "short time format"
-msgid "%d:%02d"
-msgstr "%d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
+msgid "Records (S)VCDs or video DVDs"
+msgstr "להקלטת וידאו ‎(S)VCD או DVD"
 
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:65
 msgid "_Create Video Disc..."
@@ -1920,93 +1818,85 @@
 msgid "Copy the currently playing (S)VCD"
 msgstr "העתקת הווידאו ‎(S)VCD המתנגן"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:129
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:136
 msgid "The video disc could not be duplicated."
 msgstr "לא ניתן לשכפל את דיסק הווידאו."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:131
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:276
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:138
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:283
 msgid "The movie could not be recorded."
 msgstr "לא ניתן להקליט את הסרט."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:157
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:167
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:263
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:164
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:174
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:270
 msgid "Unable to write a project."
 msgstr "לא ניתן לכתוב פרויקט."
 
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
-msgid "Records (S)VCDs or video DVDs"
-msgstr "להקלטת וידאו ‎(S)VCD או DVD"
-
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
-msgid "Video Disc Recorder"
-msgstr "מקליט דיסק וידאו"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:1
-#: ../src/plugins/chapters/totem-chapters.c:1139
-msgid "Chapters"
-msgstr "פרקים"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:2
-msgid "Support chapter markers in movies."
-msgstr "תמיכה בסמני פרקים בסרטים."
-
 #: ../src/plugins/chapters/chapters-edit.ui.h:1
 msgid "Name for new chapter:"
 msgstr "שם הפרק החדש:"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:1
-msgid "Add Chapter..."
-msgstr "הוספת פרק..."
+msgid "_Remove Chapter"
+msgstr "ה_סרת פרק"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:2
-msgid "Add New Chapters"
-msgstr "הוספת פרקים חדשים"
+msgid "Remove the chapter from the list"
+msgstr "הסרת הפרק מהרשימה"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:3
-msgid "Create a new chapter list for the movie"
-msgstr "יצירת רשימת פרקים חדשים עבור הסרט"
+msgid "_Go to Chapter"
+msgstr "מ_עבר לפרק"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:4
-msgid "Go to Chapter"
-msgstr "מעבר לפרק"
-
-#: ../src/plugins/chapters/chapters-list.ui.h:5
 msgid "Go to the chapter in the movie"
 msgstr "מעבר לפרק בסרט"
 
+#: ../src/plugins/chapters/chapters-list.ui.h:5
+msgid "Add Chapter..."
+msgstr "הוספת פרק..."
+
 #: ../src/plugins/chapters/chapters-list.ui.h:6
-msgid "Load Chapters..."
-msgstr "טעינת פרקים..."
+msgid "Remove Chapter"
+msgstr "הסרת פרק"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:7
-msgid "Load chapters from an external CMML file"
-msgstr "טעינת פרקים מקובץ CMML חיצוני"
+msgid "Go to Chapter"
+msgstr "מעבר לפרק"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:8
-msgid "No chapter data"
-msgstr "אין נתוני פרקים"
+msgid "Save Changes"
+msgstr "שמירת השינויים"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:9
-msgid "Remove Chapter"
-msgstr "הסרת פרק"
+msgid "No chapter data"
+msgstr "אין נתוני פרקים"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:10
-msgid "Remove the chapter from the list"
-msgstr "הסרת הפרק מהרשימה"
+msgid "Load Chapters..."
+msgstr "טעינת פרקים..."
 
 #: ../src/plugins/chapters/chapters-list.ui.h:11
-msgid "Save Changes"
-msgstr "שמירת השינויים"
+msgid "Load chapters from an external CMML file"
+msgstr "טעינת פרקים מקובץ CMML חיצוני"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:12
-msgid "_Go to Chapter"
-msgstr "מ_עבר לפרק"
+msgid "Add New Chapters"
+msgstr "הוספת פרקים חדשים"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:13
-msgid "_Remove Chapter"
-msgstr "ה_סרת פרק"
+msgid "Create a new chapter list for the movie"
+msgstr "יצירת רשימת פרקים חדשים עבור הסרט"
+
+#: ../src/plugins/chapters/chapters.plugin.in.h:1
+#: ../src/plugins/chapters/totem-chapters.c:1139
+msgid "Chapters"
+msgstr "פרקים"
+
+#: ../src/plugins/chapters/chapters.plugin.in.h:2
+msgid "Support chapter markers in movies"
+msgstr "תמיכה בסמני פרקים בסרטים"
 
 #: ../src/plugins/chapters/totem-chapters.c:56
 #, c-format
@@ -2108,13 +1998,39 @@
 msgid "The URI ‘%s’ is not supported."
 msgstr "הכתובת ‘%s’ אינה נתמכת."
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
-msgid "Instant Messenger status"
-msgstr "מצב לתוכנות מסרים מידיים"
+#: ../src/plugins/grilo/grilo.plugin.in.h:1
+msgid "Grilo Browser"
+msgstr "דפדפן Grilo"
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
-msgid "Set your Instant Messenger status to away when a movie is playing"
-msgstr "הגדרת מצב תכנת המסרים המידיים למרוחק בעת נגינה"
+#: ../src/plugins/grilo/grilo.plugin.in.h:2
+msgid "A plugin to let you browse media content from various sources"
+msgstr "תוסף המאפשר לעיין בתכני מדיה ממקורות שונים"
+
+#: ../src/plugins/grilo/grilo.ui.h:1
+msgid "Add to Playlist"
+msgstr "הוספה לרשימת השמעה"
+
+#: ../src/plugins/grilo/grilo.ui.h:2
+msgid "Copy Location"
+msgstr "העתקת מיקום"
+
+#: ../src/plugins/grilo/grilo.ui.h:3
+#: ../src/plugins/grilo/totem-grilo.c:1184
+msgid "Browse"
+msgstr "עיון"
+
+#: ../src/plugins/grilo/grilo.ui.h:4
+#: ../src/plugins/grilo/totem-grilo.c:1227
+msgid "Search"
+msgstr "חיפוש"
+
+#: ../src/plugins/grilo/totem-grilo.c:454
+msgid "Browse Error"
+msgstr "שגיאת עיון"
+
+#: ../src/plugins/grilo/totem-grilo.c:609
+msgid "Search Error"
+msgstr "שגיאה בחיפוש"
 
 #: ../src/plugins/gromit/gromit.plugin.in.h:1
 msgid "Gromit Annotations"
@@ -2128,49 +2044,13 @@
 msgid "The gromit binary was not found."
 msgstr "קובץ ההפעלה של gromit לא נמצא."
 
-#. Add the interface to Totem's sidebar
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:1
-#: ../src/plugins/iplayer/iplayer.py:46
-msgid "BBC iPlayer"
-msgstr "ה־iPlayer של ה־BBC"
-
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:2
-msgid "Stream BBC programs from the last 7 days from the BBC iPlayer service."
-msgstr "הזרמת תכניות מה־BBC משבעת הימים האחרונים משירות ה־iPlayer של ה־BBC."
-
-#: ../src/plugins/iplayer/iplayer.py:72
-msgid "Error listing channel categories"
-msgstr "שגיאה בהצגת קטגוריות הערוץ"
-
-#: ../src/plugins/iplayer/iplayer.py:73
-msgid "There was an unknown error getting the list of television channels available on BBC iPlayer."
-msgstr "ארעה שגיאה בעת קבלת רשימת ערוצי הטלוויזיה הזמינים ב־iPlayer של ה־BBC."
-
-#. Append a dummy child row so that the expander's visible; we can
-#. then queue off the expander to load the programme listing for this
-#. category
-#: ../src/plugins/iplayer/iplayer.py:84
-msgid "Loading…"
-msgstr "בטעינה..."
-
-#. Translators: the "programme feed" is the list of TV shows
-#. available to watch online
-#: ../src/plugins/iplayer/iplayer.py:136
-msgid "Error getting programme feed"
-msgstr "שגיאה בקבלת הזנת התכניות"
-
-#: ../src/plugins/iplayer/iplayer.py:137
-msgid "There was an error getting the list of programmes for this channel and category combination."
-msgstr "ארעה שגיאה בעת קבלת רשימת התכניות עבור צירוף הערוץ והקטגוריה האלו."
-
-#: ../src/plugins/iplayer/iplayer2.py:298
-msgid ""
-msgstr "<לא סופקה סיבה>"
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
+msgid "Instant Messenger Status"
+msgstr "מצב לתוכנות מסרים מידיים"
 
-#: ../src/plugins/iplayer/iplayer2.py:299
-#, python-format
-msgid "Programme unavailable (\"%s\")"
-msgstr "התכנית אינה זמינה (\"%s\")\""
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
+msgid "Set your Instant Messenger status to away when a movie is playing"
+msgstr "הגדרת מצב תכנת המסרים המידיים למרוחק בעת נגינה"
 
 #: ../src/plugins/lirc/lirc.plugin.in.h:1
 msgid "Infrared Remote Control"
@@ -2188,26 +2068,30 @@
 msgid "Couldn't read lirc configuration."
 msgstr "לא ניתן לקרוא את הגדרות lirc."
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
-msgid "Download Movie Subtitles"
-msgstr "הורדת כתוביות עבור הסרט"
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:1
+msgid "Media Player Keys"
+msgstr "מקשים של נגן המדיה"
+
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:2
+msgid "Support additional media player keys"
+msgstr "תמיכה בלחצנים נוספים של נגן המדיה"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
-msgid "Subtitle _language:"
-msgstr "שפת ה_כתוביות:"
+#: ../src/plugins/ontop/ontop.plugin.in.h:1
+msgid "Always On Top"
+msgstr "תמיד עליון"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
-msgid "_Play with Subtitle"
-msgstr "נגינה עם כ_תוביות"
+#: ../src/plugins/ontop/ontop.plugin.in.h:2
+msgid "Keep the main window on top when playing a movie"
+msgstr "קיבוע החלון הראשי מעל חלונות אחרים בזמן נגינת סרט"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:1
-msgid "Look for subtitles for the currently playing movie."
-msgstr "חיפוש אחר כתוביות של הסרט המתנגן כעת."
-
-#: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:2
 msgid "Subtitle Downloader"
 msgstr "מוריד הכתוביות"
 
+#: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:2
+msgid "Look for subtitles for the currently playing movie"
+msgstr "חיפוש אחר כתוביות של הסרט המתנגן כעת"
+
 #: ../src/plugins/opensubtitles/opensubtitles.py:42
 msgid "Brazilian Portuguese"
 msgstr "פורטוגזית ברזילאית"
@@ -2262,99 +2146,124 @@
 msgid "Searching subtitles…"
 msgstr "מתבצע חיפוש אחר כתוביות…"
 
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
+msgid "Download Movie Subtitles"
+msgstr "הורדת כתוביות עבור הסרט"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
+msgid "Subtitle _language:"
+msgstr "שפת ה_כתוביות:"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
+msgid "_Play with Subtitle"
+msgstr "נגינה עם כ_תוביות"
+
 #: ../src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in.h:1
 msgid "Subtitle language"
 msgstr "שפת הכתוביות"
 
-#: ../src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in.h:2
-msgid "The language to search for subtitles for movies in."
-msgstr "The language to search for subtitles for movies in."
+#: ../src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in.h:2
+msgid "The language to search for subtitles for movies in."
+msgstr "The language to search for subtitles for movies in."
+
+#: ../src/plugins/properties/movie-properties.plugin.in.h:1
+msgid "Movie Properties"
+msgstr "מאפייני הסרט"
+
+#: ../src/plugins/properties/movie-properties.plugin.in.h:2
+msgid "Adds movie properties to the sidebar"
+msgstr "הוספת פרטי הסרט אל סרגל הצד"
+
+#: ../src/plugins/properties/totem-movie-properties.c:246
+msgid "Properties"
+msgstr "מאפיינים"
+
+#: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:1
+msgid "rpdb2 password"
+msgstr "rpdb2 password"
+
+#: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:2
+msgid "A password to protect the rpdb2 server for debugging Totem from unauthorized remote access. If this is empty, a default of 'totem' will be used."
+msgstr "A password to protect the rpdb2 server for debugging Totem from unauthorized remote access. If this is empty, a default of 'totem' will be used."
+
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
+msgid "Python Console"
+msgstr "מסוף Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
+msgid "Interactive Python console"
+msgstr "מסוף Python אינטראקטיבי"
 
-#: ../src/plugins/ontop/ontop.plugin.in.h:1
-msgid "Always On Top"
-msgstr "תמיד עליון"
+#: ../src/plugins/pythonconsole/pythonconsole.py:88
+msgid "Python Console Menu"
+msgstr "תפריט מסוף Python"
 
-#: ../src/plugins/ontop/ontop.plugin.in.h:2
-msgid "Keep the main window on top when playing a movie"
-msgstr "קיבוע החלון הראשי מעל חלונות אחרים בזמן נגינת סרט"
+#: ../src/plugins/pythonconsole/pythonconsole.py:93
+msgid "_Python Console"
+msgstr "_מסוף Python"
 
-#: ../src/plugins/properties/totem-movie-properties.c:246
-msgid "Properties"
-msgstr "מאפיינים"
+#: ../src/plugins/pythonconsole/pythonconsole.py:94
+msgid "Show Totem's Python console"
+msgstr "הצגת מסוף ה־Python של Totem"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:100
+msgid "Python Debugger"
+msgstr "מנפה Python"
 
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:2
-#, no-c-format
-msgid "A format string used to build the network service name used when publishing playlists over the network. The following format placeholders can be used: • %a: the program name as returned by g_get_application_name() • %h: the machine's host name in title case • %u: the user's login name in title case • %U: the user's real name • %%: the percent sign"
-msgstr "A format string used to build the network service name used when publishing playlists over the network. The following format placeholders can be used: • %a: the program name as returned by g_get_application_name() • %h: the machine's host name in title case • %u: the user's login name in title case • %U: the user's real name • %%: the percent sign"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:3
-msgid "Format for network service name"
-msgstr "Format for network service name"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:4
-msgid "Publisher protocol to use"
-msgstr "Publisher protocol to use"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:5
-msgid "The transport protocol to use when publishing playlists over the network."
-msgstr "The transport protocol to use when publishing playlists over the network."
-
-#. Translators: computers on the local network which are publishing their playlists over the network
-#: ../src/plugins/publish/totem-publish.c:552
-msgid "Neighbors"
-msgstr "שכנים"
-
-#: ../src/plugins/publish/publish.plugin.in.h:1
-msgid "Publish Playlist"
-msgstr "פרסום רשימת השמעה"
-
-#: ../src/plugins/publish/publish.plugin.in.h:2
-msgid "Share the current playlist via HTTP"
-msgstr "שיתוף רשימת ההשמעה באמצעות HTTP"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:1
-msgid "Service _Name:"
-msgstr "_שם השירות:"
+#: ../src/plugins/pythonconsole/pythonconsole.py:101
+msgid "Enable remote Python debugging with rpdb2"
+msgstr "הפעלת ניפוי מרוחק בעזרת Python עם rpdb2"
 
-#: ../src/plugins/publish/publish-plugin.ui.h:3
-#, no-c-format
+#. pylint: disable-msg=E1101
+#: ../src/plugins/pythonconsole/pythonconsole.py:125
+#, python-format
 msgid ""
-"The name used for announcing the playlist service on the network.\n"
-"All occurrences of the string %u will be replaced by your name,\n"
-"and %h will be replaced by your computer's host name."
+"You can access the Totem.Object through 'totem_object' :\\n"
+"%s"
 msgstr ""
-"השם שבשימוש להכרזת שירות רשימת ההשמעה ברשת.\n"
-"כל המופעים של המחרוזת %u יוחלפו בשם זה, \n"
-"ו־%h יוחלף בשם המארח של המחשב שלך."
-
-#: ../src/plugins/publish/publish-plugin.ui.h:6
-msgid "Use _encrypted transport protocol (HTTPS)"
-msgstr "שימוש בפרוטוקול העברה מ_אובטחת (HTTPS)"
+"You can access the Totem.Object through 'totem_object' :\\n"
+"%s"
 
-#: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:1
-msgid "A password to protect the rpdb2 server for debugging Totem from unauthorized remote access. If this is empty, a default of 'totem' will be used."
-msgstr "A password to protect the rpdb2 server for debugging Totem from unauthorized remote access. If this is empty, a default of 'totem' will be used."
+#: ../src/plugins/pythonconsole/pythonconsole.py:129
+msgid "Totem Python Console"
+msgstr "מסוף Python של Totem"
 
-#: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:2
-msgid "rpdb2 password"
-msgstr "rpdb2 password"
+#: ../src/plugins/pythonconsole/pythonconsole.py:139
+msgid "After you press OK, Totem will wait until you connect to it with winpdb or rpdb2. If you have not set a debugger password in DConf, it will use the default password ('totem')."
+msgstr "לאחר לחיצה על אישור, Totem ימתין עד להתחברות אליו בעזרת winpdb או rpdb2. אם לא הוגדרה ססמת מנפה ב־DConf, ססמת ברירת המחדל ('totem') תהיה בשימוש."
 
-#: ../src/plugins/rotation/rotation.plugin.in.h:1
-msgid "Allows videos to be rotated if they're in the wrong orientation."
-msgstr "מתן האפשרות לסיבוב קטעי וידאו אם אינם מופיעים בכיוון הנכון."
+#: ../src/plugins/recent/recent.plugin.in.h:1
+msgid "Recent files"
+msgstr "קבצים אחרונים"
+
+#: ../src/plugins/recent/recent.plugin.in.h:2
+msgid "Adds files that have been played to recent files"
+msgstr "הוספת קבצים שהתנגנו לקבצים האחרונים"
 
-#: ../src/plugins/rotation/rotation.plugin.in.h:2
+#: ../src/plugins/rotation/rotation.plugin.in.h:1
 msgid "Rotation Plugin"
 msgstr "תוסף ההטיה"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:60
+#: ../src/plugins/rotation/rotation.plugin.in.h:2
+msgid "Allows videos to be rotated if they are in the wrong orientation"
+msgstr "מתן האפשרות לסיבוב קטעי וידאו אם אינם מופיעים בכיוון הנכון"
+
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:50
 msgid "_Rotate Clockwise"
 msgstr "הטיה _עם כיוון השעון"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:62
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:52
 msgid "Rotate Counterc_lockwise"
 msgstr "הטיה _נגד כיוון השעון"
 
+#: ../src/plugins/save-file/save-file.plugin.in.h:1
+msgid "Save Copy"
+msgstr "שמירת עותק"
+
+#: ../src/plugins/save-file/save-file.plugin.in.h:2
+msgid "Save a copy of the currently playing movie"
+msgstr "שמירת עותק של הסרט המתנגן כעת"
+
 #: ../src/plugins/save-file/totem-save-file.c:63
 msgid "Save a Copy..."
 msgstr "שמירת עותק..."
@@ -2377,40 +2286,48 @@
 msgid "Movie stream"
 msgstr "תזרים סרט"
 
-#: ../src/plugins/screensaver/totem-screensaver.c:116
-#: ../browser-plugin/totem-plugin-viewer.c:1891
-msgid "Playing a movie"
-msgstr "סרט מתנגן"
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:1
+msgid "Screen Saver"
+msgstr "שומר מסך"
+
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:2
+msgid "Deactivates the screen saver when a movie is playing"
+msgstr "ביטול שומר המסך בעת נגינה של סרט"
 
 #: ../src/plugins/screenshot/gallery.ui.h:1
+msgid "Screenshot width (in pixels):"
+msgstr "רוחב תצלום המסך (בפיקסלים):"
+
+#: ../src/plugins/screenshot/gallery.ui.h:2
 msgid "Calculate the number of screenshots"
 msgstr "חישוב מספר תצלומי המסך"
 
-#: ../src/plugins/screenshot/gallery.ui.h:2
+#: ../src/plugins/screenshot/gallery.ui.h:3
 msgid "Number of screenshots:"
 msgstr "מספר תצלומי המסך:"
 
-#: ../src/plugins/screenshot/gallery.ui.h:3
-msgid "Screenshot width (in pixels):"
-msgstr "רוחב תצלום המסך (בפיקסלים):"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:1
-msgid "Save in _folder:"
-msgstr "שמירה ב_תיקייה:"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:2
-msgid "Select a folder"
-msgstr "בחירת תיקייה"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:3
-msgid "_Name:"
-msgstr "_שם:"
-
-#. Write the screenshot to the temporary file
-#: ../src/plugins/screenshot/gnome-screenshot-widget.c:385
-#: ../src/plugins/screenshot/totem-screenshot.c:64
-msgid "Screenshot.png"
-msgstr "תצלום מסך.png"
+#. translators: this is the name of the file that gets made up
+#. * with the screenshot if the entire screen is taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:147
+#, c-format
+msgid "Screenshot from %s.png"
+msgstr "צילום מסך %s.png"
+
+#. translators: this is the name of the file that gets
+#. * made up with the screenshot if the entire screen is
+#. * taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:154
+#, c-format
+msgid "Screenshot from %s - %d.png"
+msgstr "צילום מסך מ־%s - %d.png"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:1
+msgid "Screenshot"
+msgstr "צילום מסך"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:2
+msgid "Allows screenshots and galleries to be taken of videos"
+msgstr "מתן האפשרות ליצור מצגות וגלריות מקטעי וידאו"
 
 #: ../src/plugins/screenshot/totem-gallery.c:91
 msgid "Save Gallery"
@@ -2436,49 +2353,47 @@
 msgid "Saving gallery as \"%s\""
 msgstr "הגלריה נשמרת כ־\"%s\""
 
-#: ../src/plugins/screenshot/totem-screenshot.c:113
-msgid "There was an error saving the screenshot."
-msgstr "ארעה שגיאה בשמירת תצלום המסך."
-
-#: ../src/plugins/screenshot/totem-screenshot.c:139
-msgid "Save Screenshot"
-msgstr "שמירת תצלום מסך"
-
-#. Create the screenshot widget
-#. Translators: %s is the movie title and %d is an auto-incrementing number to make filename unique
-#: ../src/plugins/screenshot/totem-screenshot.c:160
-#, c-format
-msgid "Screenshot-%s-%d.png"
-msgstr "צילום מסך-%s-%d.png"
-
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:88
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:220
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "Totem could not get a screenshot of the video."
 msgstr "Totem לא הצליח לקבל תצלום מסך של הסרט."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "This is not supposed to happen; please file a bug report."
 msgstr "שגיאה זו לא הייתה אמורה לקרות, נא לשלוח דיווח על באג."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
-msgid "Take _Screenshot..."
-msgstr "צילום _תמונת מסך..."
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
+msgid "Take _Screenshot"
+msgstr "צילום המ_סך"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
 msgid "Take a screenshot"
 msgstr "צילום תמונת מסך"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create Screenshot _Gallery..."
 msgstr "יצירת _גלריית תצלומי מסך..."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create a gallery of screenshots"
 msgstr "יצירת גלריית תצלומי מסך"
 
+#: ../src/plugins/skipto/skipto.plugin.in.h:1
+#: ../src/plugins/skipto/totem-skipto.c:196
+msgid "Skip To"
+msgstr "דילוג אל"
+
+#: ../src/plugins/skipto/skipto.plugin.in.h:2
+msgid "Provides the \"Skip to\" dialog"
+msgstr "לא ניתן לטעון את מנשק ה„דילוג אל“."
+
+#: ../src/plugins/skipto/skipto.ui.h:1
+msgid "_Skip to:"
+msgstr "_דילוג אל:"
+
 #. Update the "seconds" label so that it always has the correct singular/plural form
 #. Translators: label for the seconds selector in the "Skip to" dialogue
-#: ../src/plugins/skipto/totem-skipto.c:160
+#: ../src/plugins/skipto/totem-skipto.c:159
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "שנייה"
@@ -2488,15 +2403,11 @@
 #. Translators: you should translate this string to a number (written in digits) which corresponds to the longer character length of the
 #. * translations for "second" and "seconds", as translated elsewhere in this file. For example, in English, "second" is 6 characters long and
 #. * "seconds" is 7 characters long, so this string should be translated to "7". See: bgo#639398
-#: ../src/plugins/skipto/totem-skipto.c:190
+#: ../src/plugins/skipto/totem-skipto.c:189
 msgctxt "Skip To label length"
 msgid "7"
 msgstr "5"
 
-#: ../src/plugins/skipto/totem-skipto.c:197
-msgid "Skip To"
-msgstr "דילוג אל"
-
 #: ../src/plugins/skipto/totem-skipto-plugin.c:182
 msgid "_Skip To..."
 msgstr "_דילוג אל..."
@@ -2505,113 +2416,293 @@
 msgid "Skip to a specific time"
 msgstr "דילוג לזמן מסוים"
 
-#: ../src/plugins/skipto/skipto.ui.h:1
-msgid "_Skip to:"
-msgstr "_דילוג אל:"
+#~ msgid ""
+#~ msgstr "<לא סופקה סיבה>"
 
-#: ../browser-plugin/totem-plugin-viewer.c:431
-msgid "No URI to play"
-msgstr "אין כתובת לנגינה"
+#~ msgid "Programme unavailable (\"%s\")"
+#~ msgstr "התכנית אינה זמינה (\"%s\")\""
 
-#. translators: this is:
-#. * Open With ApplicationName
-#. * as in nautilus' right-click menu
-#: ../browser-plugin/totem-plugin-viewer.c:1107
-#, c-format
-msgid "_Open with \"%s\""
-msgstr "_פתיחה באמצעות \"%s\""
+#~ msgid "BBC iPlayer"
+#~ msgstr "ה־iPlayer של ה־BBC"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2136
-msgid "No playlist or playlist empty"
-msgstr "אין רשימת שמע או שרשימת ההשמעה ריקה"
+#~ msgid ""
+#~ "Stream BBC programs from the last 7 days from the BBC iPlayer service"
+#~ msgstr "הזרמת תכניות מה־BBC משבעת הימים האחרונים משירות ה־iPlayer של ה־BBC"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2235
-msgid "Movie browser plugin"
-msgstr "תוסף סרטים לדפדן"
+#~ msgid "Error listing channel categories"
+#~ msgstr "שגיאה בהצגת קטגוריות הערוץ"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Verify your system installation. The Totem plugin will now exit."
-msgstr "נא לבדוק את התקנת המערכת שלך. תוסף Totem ייסגר כעת."
+#~ msgid ""
+#~ "There was an unknown error getting the list of television channels "
+#~ "available on BBC iPlayer."
+#~ msgstr ""
+#~ "ארעה שגיאה בעת קבלת רשימת ערוצי הטלוויזיה הזמינים ב־iPlayer של ה־BBC."
 
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
-msgid "Interactive Python console."
-msgstr "מסוף Python אינטראקטיבי."
+#~ msgid "Loading…"
+#~ msgstr "בטעינה..."
 
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
-msgid "Python Console"
-msgstr "מסוף Python"
+#~ msgid "Error getting programme feed"
+#~ msgstr "שגיאה בקבלת הזנת התכניות"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:88
-msgid "Python Console Menu"
-msgstr "תפריט מסוף Python"
+#~ msgid ""
+#~ "There was an error getting the list of programmes for this channel and "
+#~ "category combination."
+#~ msgstr "ארעה שגיאה בעת קבלת רשימת התכניות עבור צירוף הערוץ והקטגוריה האלו."
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:93
-msgid "_Python Console"
-msgstr "_מסוף Python"
+#~ msgid "Location not found."
+#~ msgstr "המיקום לא נמצא."
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:94
-msgid "Show Totem's Python console"
-msgstr "הצגת מסוף ה־Python של Totem"
+#~ msgid ""
+#~ "Could not open location; you might not have permission to open the file."
+#~ msgstr "לא ניתן לפתוח את המיקום; כנראה שאין לך הרשאות לפתוח את הקובץ."
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:100
-msgid "Python Debugger"
-msgstr "מנפה Python"
+#~ msgid ""
+#~ "Failed to create a GStreamer play object. Please check your GStreamer "
+#~ "installation."
+#~ msgstr "ארע כשל ביצירת עצם GStreamer. נא לבדוק את התקנת ה־GStreamer שלך."
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:101
-msgid "Enable remote Python debugging with rpdb2"
-msgstr "הפעלת ניפוי מרוחק בעזרת Python עם rpdb2"
+#~ msgid "%d %%"
+#~ msgstr "%d %%"
 
-#. pylint: disable-msg=E1101
-#: ../src/plugins/pythonconsole/pythonconsole.py:125
-#, python-format
-msgid ""
-"You can access the Totem.Object through 'totem_object' :\\n"
-"%s"
-msgstr ""
-"You can access the Totem.Object through 'totem_object' :\\n"
-"%s"
+#~ msgid "_Name:"
+#~ msgstr "_שם:"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:129
-msgid "Totem Python Console"
-msgstr "מסוף Python של Totem"
+#~ msgid "Save in _folder:"
+#~ msgstr "שמירה ב_תיקייה:"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:139
-msgid "After you press OK, Totem will wait until you connect to it with winpdb or rpdb2. If you have not set a debugger password in DConf, it will use the default password ('totem')."
-msgstr "לאחר לחיצה על אישור, Totem ימתין עד להתחברות אליו בעזרת winpdb או rpdb2. אם לא הוגדרה ססמת מנפה ב־DConf, ססמת ברירת המחדל ('totem') תהיה בשימוש."
+#~ msgid "Select a folder"
+#~ msgstr "בחירת תיקייה"
 
-#: ../src/plugins/grilo/grilo.plugin.in.h:1
-msgid "A plugin to let you browse media content from various sources."
-msgstr "תוסף המאפשר לצפות בתכני מדיה ממקורות שונים."
+#~ msgid "There was an error saving the screenshot."
+#~ msgstr "ארעה שגיאה בשמירת תצלום המסך."
 
-#: ../src/plugins/grilo/grilo.plugin.in.h:2
-msgid "Grilo Browser"
-msgstr "דפדפן Grilo"
+#~ msgid "Save Screenshot"
+#~ msgstr "שמירת תצלום מסך"
 
-#: ../src/plugins/grilo/totem-grilo.c:452
-msgid "Browse Error"
-msgstr "שגיאת עיון"
+#~ msgid "14.4 Kbps Modem"
+#~ msgstr "14.4 קסל\"ש מודם"
 
-#: ../src/plugins/grilo/totem-grilo.c:599
-msgid "Search Error"
-msgstr "שגיאה בחיפוש"
+#~ msgid "19.2 Kbps Modem"
+#~ msgstr "19.2 קסל\"ש מודם"
 
-#: ../src/plugins/grilo/totem-grilo.c:1219
-#: ../src/plugins/grilo/grilo.ui.h:2
-msgid "Browse"
-msgstr "עיון"
+#~ msgid "28.8 Kbps Modem"
+#~ msgstr "28.8 קסל\"ש מודם"
 
-#: ../src/plugins/grilo/totem-grilo.c:1285
-#: ../src/plugins/grilo/grilo.ui.h:4
-msgid "Search"
-msgstr "חיפוש"
+#~ msgid "33.6 Kbps Modem"
+#~ msgstr "33.6 קסל\"ש מודם"
 
-#: ../src/plugins/grilo/grilo.ui.h:1
-msgid "Add to Playlist"
-msgstr "הוספה לרשימת השמעה"
+#~ msgid "34.4 Kbps Modem"
+#~ msgstr "34.4 קסל\"ש מודם"
 
-#: ../src/plugins/grilo/grilo.ui.h:3
-msgid "Copy Location"
-msgstr "העתקת מיקום"
+#~ msgid "56 Kbps Modem/ISDN"
+#~ msgstr "56 קסל\"ש מודם/ISDN"
+
+#~ msgid "112 Kbps Dual ISDN/DSL"
+#~ msgstr "112 קסל\"ש ISDN כפול/DSL"
+
+#~ msgid "256 Kbps DSL/Cable"
+#~ msgstr "256 קסל\"ש DSL/כבלים"
+
+#~ msgid "384 Kbps DSL/Cable"
+#~ msgstr "384 קסל\"ש DSL/כבלים"
+
+#~ msgid "512 Kbps DSL/Cable"
+#~ msgstr "512 קסל\"ש DSL/כבלים"
+
+#~ msgid "1.5 Mbps T1/Intranet/LAN"
+#~ msgstr "1.5 מסל\"ש T1/אינטראנט/LAN"
+
+#~ msgid "Intranet/LAN"
+#~ msgstr "אינטראנט/LAN"
+
+#~ msgid "Networking"
+#~ msgstr "‏רשת"
+
+#~ msgid "Connection _speed:"
+#~ msgstr "_מהירות חיבור:"
+
+#~ msgid "Network connection speed"
+#~ msgstr "Network connection speed"
+
+#~ msgid ""
+#~ "Approximate network connection speed, used to select quality on media "
+#~ "over the network."
+#~ msgstr ""
+#~ "Approximate network connection speed, used to select quality on media "
+#~ "over the network."
+
+#~ msgid "Play movies and songs"
+#~ msgstr "מנגן סרטים ושירים"
+
+#~ msgid "Movie Player using %s"
+#~ msgstr "נגן הסרטים משתמש ב־%s"
+
+#~ msgid ""
+#~ "A format string used to build the network service name used when "
+#~ "publishing playlists over the network. The following format placeholders "
+#~ "can be used: • %a: the program name as returned by g_get_application_name"
+#~ "() • %h: the machine's host name in title case • %u: the user's login "
+#~ "name in title case • %U: the user's real name • %%: the percent sign"
+#~ msgstr ""
+#~ "A format string used to build the network service name used when "
+#~ "publishing playlists over the network. The following format placeholders "
+#~ "can be used: • %a: the program name as returned by g_get_application_name"
+#~ "() • %h: the machine's host name in title case • %u: the user's login "
+#~ "name in title case • %U: the user's real name • %%: the percent sign"
+
+#~ msgid "Format for network service name"
+#~ msgstr "Format for network service name"
+
+#~ msgid "Publisher protocol to use"
+#~ msgstr "Publisher protocol to use"
+
+#~ msgid ""
+#~ "The transport protocol to use when publishing playlists over the network."
+#~ msgstr ""
+#~ "The transport protocol to use when publishing playlists over the network."
+
+#~ msgid "Neighbors"
+#~ msgstr "שכנים"
+
+#~ msgid "Publish Playlist"
+#~ msgstr "פרסום רשימת השמעה"
+
+#~ msgid "Share the current playlist via HTTP"
+#~ msgstr "שיתוף רשימת ההשמעה באמצעות HTTP"
+
+#~ msgid "Service _Name:"
+#~ msgstr "_שם השירות:"
+
+#~ msgid ""
+#~ "The name used for announcing the playlist service on the network.\n"
+#~ "All occurrences of the string %u will be replaced by your name,\n"
+#~ "and %h will be replaced by your computer's host name."
+#~ msgstr ""
+#~ "השם שבשימוש להכרזת שירות רשימת ההשמעה ברשת.\n"
+#~ "כל המופעים של המחרוזת %u יוחלפו בשם זה, \n"
+#~ "ו־%h יוחלף בשם המארח של המחשב שלך."
+
+#~ msgid "Use _encrypted transport protocol (HTTPS)"
+#~ msgstr "שימוש בפרוטוקול העברה מ_אובטחת (HTTPS)"
+
+#~ msgid "Configure the application"
+#~ msgstr "עריכת הגדרות היישום"
+
+#~ msgid "Open a file"
+#~ msgstr "פתיחת קובץ"
+
+#~ msgid "Open a non-local file"
+#~ msgstr "פתיחת קובץ לא מקומי"
+
+#~ msgid "Quit the program"
+#~ msgstr "יציאה מהתכנית"
+
+#~ msgid "Set the repeat mode"
+#~ msgstr "הגדרת מצב החזרה"
+
+#~ msgid "Set the shuffle mode"
+#~ msgstr "הגדרת מצב הערבוב"
+
+#~ msgid "Switch to fullscreen"
+#~ msgstr "מעבר למסך מלא"
+
+#~ msgid "Play Image '%s'"
+#~ msgstr "נגינת התמונה '%s'"
+
+#~ msgid "device%d"
+#~ msgstr "התקן%d"
+
+#~ msgid "Play Disc '%s'"
+#~ msgstr "נגינת הדיסק '%s'"
+
+#~ msgid ""
+#~ "Totem could not play this media (%s) although a plugin is present to "
+#~ "handle it."
+#~ msgstr "Totem לא יכול לנגן מדיה זו (%s) למרות שקיים תוסף לטיפול בו."
+
+#~ msgid ""
+#~ "You might want to check that a disc is present in the drive and that it "
+#~ "is correctly configured."
+#~ msgstr "כדאי לבדוק את שהדיסק נמצא בכונן ושהוא מוגדר כראוי."
+
+#~ msgid "More information about media plugins"
+#~ msgstr "מידע נוסף על תוספי מדיה"
+
+#~ msgid ""
+#~ "Please install the necessary plugins and restart Totem to be able to play "
+#~ "this media."
+#~ msgstr ""
+#~ "נא להתקין את התוספים הדרושים ולהפעיל מחדש את Totem כדי שניתן יהיה לנגן "
+#~ "מדיה זו."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it does not have the "
+#~ "appropriate plugins to be able to read from the disc."
+#~ msgstr ""
+#~ "‏Totem אינו יכול לנגן סוג מדיה זה (%s) מכיוון שאין לך את התוספים המתאימים "
+#~ "לקריאה מהדיסק."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because you do not have the "
+#~ "appropriate plugins to handle it."
+#~ msgstr ""
+#~ "Totem אינו יכול לנגן סוג מדיה זה (%s) מכיוון שאין לך את התוספים המתאימים "
+#~ "בכדי לטפל בו."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it is not supported."
+#~ msgstr "‏Totem אינו יכול לנגן סוג מדיה זה (%s) מכיוון שהוא לא נתמך"
+
+#~ msgid "Please insert another disc to play back."
+#~ msgstr "נא להכניס דיסק אחר לניגון."
+
+#~ msgid "Totem was not able to play this disc."
+#~ msgstr "‏Totem לא הצליח לנגן את דיסק זה."
+
+#~ msgid "Totem does not support playback of Audio CDs"
+#~ msgstr "‏Totem לא תומך בהשמעת תקליטורי CD"
+
+#~ msgid ""
+#~ "Please consider using a music player or a CD extractor to play this CD"
+#~ msgstr "אפשר להשתמש בנגן מוזיקה או מחלץ CD כדי לנגן CD זה"
+
+#~ msgid ""
+#~ "The requested audio output was not found. Please select another audio "
+#~ "output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "פלט השמע המבוקש לא נמצא. נא לבחור בפלט שמע אחר בבורר מערכות המולטימדיה."
+
+#~ msgid ""
+#~ "The video output is in use by another application. Please close other "
+#~ "video applications, or select another video output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "פלט הווידאו נמצא בשימוש יישום אחר. נא לסגור את היישום האחר או לבחור בפלט "
+#~ "וידאו אחר בבורר מערכות המולטימדיה."
+
+#~ msgid ""
+#~ "The audio output is in use by another application. Please select another "
+#~ "audio output in the Multimedia Systems Selector. You may want to consider "
+#~ "using a sound server."
+#~ msgstr ""
+#~ "פלט השמע נמצא בשימוש יישום אחר. נא לבחור בפלט שמע אחר בבורר מערכות "
+#~ "המולטימדיה. עליך לשקול שימוש בשרת קול."
+
+#~ msgid ""
+#~ "Failed to open audio output. You may not have permission to open the "
+#~ "sound device, or the sound server may not be running. Please select "
+#~ "another audio output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "ארע כשל בפתיחת פלט השמע.  יתכן שאין לך הרשאות לפתוח את התקן השמע, או אולי "
+#~ "שרת הקול לא מופעל. יש לבחור בפלט שמע אחר בבורר מערכות המולטימדיה."
+
+#~ msgid ""
+#~ "Could not find the audio output. You may need to install additional "
+#~ "GStreamer plugins, or select another audio output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "פלט השמע לא נמצא. יש להתקין תוספי GStreamer נוספים, או לבחור בפלט שמע אחר "
+#~ "בבורר מערכות המולטימדיה."
 
 #~ msgid "0 frames per second"
 #~ msgstr "0 שקופיות לשנייה"
@@ -2649,9 +2740,6 @@
 #~ msgid "Search Results"
 #~ msgstr "תוצאות חיפוש"
 
-#~ msgid "Videos"
-#~ msgstr "סרטונים"
-
 #~ msgid "_Open in Web Browser"
 #~ msgstr "פתיחה ב_דפדפן"
 
@@ -3037,9 +3125,6 @@
 #~ msgid "Plugin Error"
 #~ msgstr "שגיאת תוסף"
 
-#~ msgid "Could not load the \"Skip to\" dialog interface."
-#~ msgstr "לא ניתן לטעון את מנשק ה־\"דלג אל\"."
-
 #~ msgid "Deinterlace"
 #~ msgstr "פירוק"
 
@@ -3148,32 +3233,18 @@
 #~ "בדוק אם ההתקן לא עסוק."
 
 #~ msgid ""
-#~ "No video output is available. Make sure that the program is correctly "
-#~ "installed."
-#~ msgstr "אין יציאת ווידאו זמינה. וודא שהתוכנה מותקנת כראוי."
-
-#~ msgid ""
 #~ "The TV adapter could not tune into the channel. Please check your "
 #~ "hardware setup and channel configuration."
 #~ msgstr ""
 #~ "מתאם הטלויזיה לא הצליח להתכוון אל הערוץ. אנא בדוק את הגדרות החומרה שלך "
 #~ "ואת תצורת הערוצים."
 
-#~ msgid "The server you are trying to connect to is not known."
-#~ msgstr "השרת אליו אתה מנסה להתחבר אינו ידוע."
-
 #~ msgid "The device name you specified (%s) seems to be invalid."
 #~ msgstr "שם ההתקן שציינת (%s) נראה לא תקני."
 
 #~ msgid "The server you are trying to connect to (%s) is unreachable."
 #~ msgstr "השרת אליו אתה מנסה להתחבר (%s) אינו נגיש."
 
-#~ msgid "The connection to this server was refused."
-#~ msgstr "החיבור לשרת זה נדחה."
-
-#~ msgid "The specified movie could not be found."
-#~ msgstr "לא ניתן למצוא את הסרט שצוין."
-
 #~ msgid ""
 #~ "The source seems encrypted and can't be read. Are you trying to play an "
 #~ "encrypted DVD without libdvdcss?"
@@ -3181,9 +3252,6 @@
 #~ "המקור נראה מוצפן, ולא ניתן לקריאה. האם אתה מנסה לנגן DVD מוצפן ללא "
 #~ "libdvdcss?"
 
-#~ msgid "The movie could not be read."
-#~ msgstr "לא ניתן לקרוא את הסרט"
-
 #~ msgid "A problem occurred while loading a library or a decoder (%s)."
 #~ msgstr "ארעה שגיאה בזמן טעינת ספרייה או מקודד (%s)."
 
@@ -3199,15 +3267,6 @@
 #~ msgid "Authentication is required to access this file."
 #~ msgstr "נדרש אימות על מנת לגשת לקובץ זה."
 
-#~ msgid "Authentication is required to access this file or stream."
-#~ msgstr "נדרש אישור כדי לגשת לקובץ או שידור זה."
-
-#~ msgid "You are not allowed to open this file."
-#~ msgstr "אינך מורשה לפתוח קובץ זה."
-
-#~ msgid "The server refused access to this file or stream."
-#~ msgstr "השרת מונע גישה לקובץ או שידור זה."
-
 #~ msgid "The file you tried to play is an empty file."
 #~ msgstr "הקובץ שניסית לפתוח הוא קובץ ריק."
 
@@ -3220,9 +3279,6 @@
 #~ msgid "This movie is broken and can not be played further."
 #~ msgstr "סרט זה שבור ואינו יכול להתנגן הלאה."
 
-#~ msgid "This location is not a valid one."
-#~ msgstr "מיקום זה אינו תקני."
-
 #~ msgid "This movie could not be opened."
 #~ msgstr "לא ניתן לפתוח סרט זה."
 
@@ -3233,13 +3289,6 @@
 #~ "מקודד הווידאו '%s' לא מטופל. ייתכן ותרצה להתקין מקודדים נוספים כדי שתוכל "
 #~ "לנגן סוגים מסוימים של סרטים"
 
-#~ msgid ""
-#~ "Audio codec '%s' is not handled. You might need to install additional "
-#~ "plugins to be able to play some types of movies"
-#~ msgstr ""
-#~ "מקודד השמע '%s' לא מטופל. ייתכן ותרצה להתקין מקודדים נוספים כדי שתוכל "
-#~ "לנגן סוגים מסוימים של סרטים"
-
 #~ msgid "This is an audio-only file and there is no audio output available."
 #~ msgstr "זהו קובץ שמע בלבד, ואין פלט שמע זמין."
 
diff -Nru totem-3.4.3/po/hi.po totem-3.6.2/po/hi.po
--- totem-3.4.3/po/hi.po	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/po/hi.po	2012-10-25 13:15:32.000000000 +0000
@@ -10,10 +10,11 @@
 "Project-Id-Version: hi\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=totem&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-03-28 18:27+0000\n"
-"PO-Revision-Date: 2012-04-08 19:46+0530\n"
+"POT-Creation-Date: 2012-09-10 15:48+0000\n"
+"PO-Revision-Date: 2012-09-20 11:20+0530\n"
 "Last-Translator: chandankumar \n"
-"Language-Team: Hindi \n"
+"Language-Team: Hindi \n"
+"Language: hi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -31,17 +32,230 @@
 "\n"
 "\n"
 "\n"
-"X-Generator: Lokalize 1.2\n"
-"Language: hi\n"
+"X-Generator: Lokalize 1.4\n"
+
+#: ../browser-plugin/totem-plugin-viewer.c:352 ../src/totem-object.c:1180
+#: ../src/totem-object.c:1650 ../src/totem-statusbar.c:115
+msgid "Stopped"
+msgstr "रुक गया"
+
+#: ../browser-plugin/totem-plugin-viewer.c:364 ../src/totem-object.c:1173
+msgid "Paused"
+msgstr "ठहरा"
+
+#: ../browser-plugin/totem-plugin-viewer.c:368 ../src/totem-object.c:1166
+msgid "Playing"
+msgstr "बजा रहे"
+
+#: ../browser-plugin/totem-plugin-viewer.c:386
+#: ../src/plugins/screensaver/totem-screensaver.c:97
+msgid "Playing a movie"
+msgstr "मूवी चला रहा है"
+
+#: ../browser-plugin/totem-plugin-viewer.c:443
+msgid "No URI to play"
+msgstr "चलाने के लिए कोई URI नहीं"
+
+#: ../browser-plugin/totem-plugin-viewer.c:676
+#: ../browser-plugin/totem-plugin-viewer.c:1700
+msgid "Totem Movie Player"
+msgstr "टोटेम मूवी खिलाड़ी"
+
+#. translators: this is:
+#. * Open With ApplicationName
+#. * as in nautilus' right-click menu
+#: ../browser-plugin/totem-plugin-viewer.c:1120
+#, c-format
+msgid "_Open with \"%s\""
+msgstr "\"%s\" के साथ खोलें (_O)"
+
+#: ../browser-plugin/totem-plugin-viewer.c:1341 ../src/totem-object.c:2475
+msgid "An error occurred"
+msgstr "एक त्रुटि हुई"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2033
+msgid "No playlist or playlist empty"
+msgstr "कोई गीत-सूची नहीं या गीत सूची खाली"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2128
+msgid "Movie browser plugin"
+msgstr "मूवी ब्रॉउजर प्लगइन"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144 ../src/totem.c:240
+msgid "Could not initialize the thread-safe libraries."
+msgstr "थ्रेड सेफ लाइब्रेरी को आरंभीकृत नहीं कर पाया."
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144
+msgid "Verify your system installation. The Totem plugin will now exit."
+msgstr "अपने सिस्टम के अधिष्ठापन को जांचें. टोटेम प्लगिन निकल जायेगा."
 
 #: ../data/fullscreen.ui.h:1
 msgid "Leave Fullscreen"
 msgstr "फुलस्क्रीन छोड़ें"
 
-#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:144
+#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:81
 msgid "Time:"
 msgstr "समय:"
 
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
+msgid "Allow the screensaver to activate when playing audio"
+msgstr "ऑडियो बजाने के दौरान सक्रिय करने के लिए स्क्रीनसेवर को अनुमति दें"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
+msgid ""
+"Allow the screensaver to activate when playing audio. Disable if you have "
+"monitor-powered speakers."
+msgstr ""
+"ऑडियो बजाने के दौरान सक्रिय करने के लिए स्क्रीनसेवर को अनुमति दें. निष्क्रिय "
+"करें यदि आपके "
+"पास मॉनिटर उर्जस्वित स्पीकर है."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
+msgid "Show visual effects when no video is displayed"
+msgstr "जब कोई वीडियो प्रदर्शित नही हैं तो दृश्य प्रभाव दिखायें"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
+msgid "Show visual effects when playing an audio only file."
+msgstr "सिर्फ ऑडियो फाइल के खेलने के दौरान दृश्य प्रभाव दिखायें"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
+msgid "Name of the visual effects plugin"
+msgstr "दृश्य प्रभाव प्लगिन का नाम "
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
+msgid "The brightness of the video"
+msgstr "वीडियो का चमकीलापन"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
+msgid "The contrast of the video"
+msgstr "वीडियो का कंट्रास्ट"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
+msgid "The hue of the video"
+msgstr "वीडियो का रंग"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
+msgid "The saturation of the video"
+msgstr "वीडियो की संतृप्ति"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
+msgid "Resize the canvas automatically on file load"
+msgstr "फाइल लोड पर कैनवास को स्वतः पुनः आकार दें"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
+msgid "Repeat mode"
+msgstr "दोहराएँ मोड"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
+msgid "Shuffle mode"
+msgstr "फेंटें मोड"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
+msgid "Whether to disable deinterlacing for interlaced movies"
+msgstr "क्या अंतर्वयन फिल्मों के लिए deinterlacing को निष्क्रिय करना है"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
+msgid "Whether to enable debug for the playback engine"
+msgstr "क्या प्लेबैक इंजन के लिये डिबग को अक्षम करना है"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
+msgid "Type of audio output to use"
+msgstr "प्रयोग के लिये ऑडियो आउटपुट का प्रकार"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
+msgid "Visualization quality setting"
+msgstr "विज़ुअलाइज़ेशन गुणवत्ता सेटिंग"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
+msgid "Quality setting for the audio visualization."
+msgstr "श्रव्य दृश्यावलोकन के लिए गुणवत्ता सेटिंग."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
+msgid "Network buffering threshold"
+msgstr "संजाल बफरिंग थ्रेसहोल्ड"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
+msgid ""
+"Amount of data to buffer for network streams before starting to display the "
+"stream (in seconds)."
+msgstr ""
+"धारा के प्रदर्शन के आरंभ होने से पहले संजाल धारा बफर करने के लिये डाटा की "
+"मात्रा (सेकेंड में)."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
+msgid "Subtitle font"
+msgstr "उपशीर्षक फंट"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
+msgid "Pango font description for subtitle rendering."
+msgstr "उपशीर्षक रेंडरिंग के पैंगो फ़ॉन्ट वर्णन"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
+msgid "Subtitle encoding"
+msgstr "उपशीर्षक एनकोडिंग"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
+msgid "Encoding character set for subtitle."
+msgstr "उपशीर्षक के लिये एनकोडिंग कैरेक्टर"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
+msgid "Default location for the \"Open...\" dialogs"
+msgstr "\"खोलें...\" संवाद के लिए तयशुदा स्थान"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
+msgid ""
+"Default location for the \"Open...\" dialogs. Default is the current "
+"directory."
+msgstr ""
+"\"खोलें...\" संवाद के लिए तयशुदा स्थान, तयशुदा मौजूदा \n"
+"निर्देशिका है."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
+msgid "Default location for the \"Take Screenshot\" dialogs"
+msgstr "\"स्क्रीनशॉट लें\" संवाद के लिए तयशुदा स्थान"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
+msgid ""
+"Default location for the \"Take Screenshot\" dialogs. Default is the "
+"Pictures directory."
+msgstr ""
+"\"स्क्रीनशॉट लें\" संवाद के लिए तयशुदा स्थान, तयशुदा तस्वीर निर्देशिका है."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
+msgid "Whether to disable the plugins in the user's home directory"
+msgstr "क्या उपयोक्ता घर निर्देशिका में प्लगिन निष्क्रिय करना है"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
+msgid "Whether to disable the keyboard shortcuts"
+msgstr "क्या कुंजीपटल शॉर्टकट को निष्क्रिय करना है"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
+msgid "Whether to autoload text subtitle files when a movie is loaded"
+msgstr "जब कोई मूवी लोड की जाती है तो पाठ उपशीर्षक ऑटोलोड करना है"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
+msgid "Whether to autoload external chapter files when a movie is loaded"
+msgstr "जब कोई मूवी लोड की जाती है तो बाहरी अध्याय फ़ाइलों को ऑटोलोड करना है"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
+msgid ""
+"Whether to remember the position of played audio/video files when pausing or "
+"closing them"
+msgstr ""
+"बजाए गए श्रव्य / वीडियो फ़ाइलें  की स्थिति को ठहराने या बंद करने के दौरान याद "
+"रखें."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
+msgid "Active plugins list"
+msgstr "सक्रिय प्लगिन की सूची"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+msgid ""
+"A list of the names of the plugins which are currently active (loaded and "
+"running)."
+msgstr ""
+"प्लगिन जो फिलहाल सक्रिय (भरी हुई है और चल रहा है) है के नामों की एक सूची है."
+
 #: ../data/playlist.ui.h:1
 msgid "_Remove"
 msgstr "हटाएं (_R)"
@@ -58,11 +272,11 @@
 msgid "Copy the location to the clipboard"
 msgstr "क्लिपबोर्ड में स्थान कॉपी करें"
 
-#: ../data/playlist.ui.h:5 ../data/totem.ui.h:78
+#: ../data/playlist.ui.h:5 ../data/totem.ui.h:71
 msgid "_Select Text Subtitles..."
 msgstr "पाठ उपशीर्षक चुनें (_S)..."
 
-#: ../data/playlist.ui.h:6 ../data/totem.ui.h:79
+#: ../data/playlist.ui.h:6 ../data/totem.ui.h:72
 msgid "Select a file to use for text subtitles"
 msgstr "फाइल उपशीर्षक के लिए कोई फाइल चुनें"
 
@@ -86,10 +300,165 @@
 msgid "Move Down"
 msgstr "नीचे जायें"
 
-#: ../data/properties.ui.h:1 ../data/totem.ui.h:122
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:2
+msgid "Normal"
+msgstr "सामान्य"
+
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:4
+msgid "Large"
+msgstr "बड़ा"
+
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:6
+msgid "Extra Large"
+msgstr "अत्यधिक बड़ा"
+
+#: ../data/preferences.ui.h:7 ../src/backend/bacon-video-widget.c:5498
+#: ../src/totem-properties-view.c:231
+msgid "Stereo"
+msgstr "स्टीरियो"
+
+#: ../data/preferences.ui.h:8
+msgid "4-channel"
+msgstr "4-चैनल"
+
+#: ../data/preferences.ui.h:9
+msgid "4.1-channel"
+msgstr "4.1-चैनल"
+
+#: ../data/preferences.ui.h:10
+msgid "5.0-channel"
+msgstr "5.0-चैनल"
+
+#: ../data/preferences.ui.h:11
+msgid "5.1-channel"
+msgstr "5.1-चैनल"
+
+#: ../data/preferences.ui.h:12
+msgid "AC3 Passthrough"
+msgstr "AC3 Passthrough"
+
+#: ../data/preferences.ui.h:13
+msgid "Totem Preferences"
+msgstr "टोटेम प्राथमिकताएँ"
+
+#: ../data/preferences.ui.h:14
+msgid "Playback"
+msgstr "प्लेबैक"
+
+#: ../data/preferences.ui.h:15
+msgid "Start playing files from last position"
+msgstr "अंतिम स्थिति से फ़ाइल को बजाना आरंभ करें"
+
+#: ../data/preferences.ui.h:16
+msgid "Text Subtitles"
+msgstr "पाठ उपशीर्षक"
+
+#: ../data/preferences.ui.h:17
+msgid "_Load subtitle files when movie is loaded"
+msgstr "मूवी लोड होने पर उपशीर्षक फाइल को लोड करें (_L)"
+
+#: ../data/preferences.ui.h:18
+msgid "_Font:"
+msgstr "फ़ॉन्ट (_F):"
+
+#: ../data/preferences.ui.h:19
+msgid "_Encoding:"
+msgstr "एनकोडिंग (_E):"
+
+#: ../data/preferences.ui.h:20
+msgid "External Chapters"
+msgstr "बाहरी अध्याय"
+
+#: ../data/preferences.ui.h:21
+msgid "Load _chapter files when movie is loaded"
+msgstr "मूवी लोड होने पर अध्याय (_c) फाइल को लोड करें "
+
+#: ../data/preferences.ui.h:22 ../data/properties.ui.h:1
 msgid "General"
 msgstr "सामान्य"
 
+#. Tab label in the Preferences dialogue
+#: ../data/preferences.ui.h:24
+msgid "Display"
+msgstr "प्रदर्शक"
+
+#: ../data/preferences.ui.h:25
+msgid "_Resize the window when a new video is loaded"
+msgstr "नये वीडियो के लोड होने पर विंडो को नया आकार दें (_R)"
+
+#: ../data/preferences.ui.h:26
+msgid "Disable _deinterlacing of interlaced videos"
+msgstr "अंतर्वयन वीडियो की _deinterlacing अक्षम करें"
+
+#: ../data/preferences.ui.h:27
+msgid "Disable screensaver when playing "
+msgstr "बजाने के दौरान स्क्रीनसेवर निष्क्रिय करें"
+
+#: ../data/preferences.ui.h:28 ../data/properties.ui.h:9
+#: ../src/totem-properties-view.c:273
+msgid "Video"
+msgstr "वीडियो"
+
+#: ../data/preferences.ui.h:29
+msgid "Video or Audio"
+msgstr "विडियो या श्रव्य"
+
+#: ../data/preferences.ui.h:30
+msgid "Visual Effects"
+msgstr "दृष्य प्रभाव"
+
+#: ../data/preferences.ui.h:31
+msgid "Show _visual effects when an audio file is played"
+msgstr "दृश्य प्रभाव दिखायें जब एक ऑडियो फाइल चल रहा है (_v)"
+
+#: ../data/preferences.ui.h:32
+msgid "_Type of visualization:"
+msgstr "देखने का क़िस्म:"
+
+#: ../data/preferences.ui.h:33
+msgid "Visualization _size:"
+msgstr "विज़ुअलाइज़ेशन आकार :"
+
+#: ../data/preferences.ui.h:34
+msgid "Color Balance"
+msgstr "रंग संतुलन"
+
+#: ../data/preferences.ui.h:35
+msgid "_Brightness:"
+msgstr "चमकीलापन:"
+
+#: ../data/preferences.ui.h:36
+msgid "Co_ntrast:"
+msgstr "विरोध (_n):"
+
+#: ../data/preferences.ui.h:37
+msgid "Sat_uration:"
+msgstr "संतृप्त:"
+
+#: ../data/preferences.ui.h:38
+msgid "_Hue:"
+msgstr "रंगशेड (_H):"
+
+#: ../data/preferences.ui.h:39
+msgid "Reset to _Defaults"
+msgstr "तयशुदा में फिर सेट करें (_D)"
+
+#: ../data/preferences.ui.h:40
+msgid "Audio Output"
+msgstr "ऑडियो आउटपुट"
+
+#: ../data/preferences.ui.h:41
+msgid "_Audio output type:"
+msgstr "ऑडियो आउटपुट क़िस्म:"
+
+#: ../data/preferences.ui.h:42 ../data/properties.ui.h:14
+#: ../src/totem-properties-view.c:271
+msgid "Audio"
+msgstr "ऑडियो"
+
 #: ../data/properties.ui.h:2
 msgid "Title:"
 msgstr "शीर्षक:"
@@ -118,11 +487,6 @@
 msgid "Container:"
 msgstr "कन्टेनरः"
 
-#: ../data/properties.ui.h:9 ../data/totem.ui.h:128
-#: ../src/totem-properties-view.c:270
-msgid "Video"
-msgstr "वीडियो"
-
 #: ../data/properties.ui.h:10
 msgid "Dimensions:"
 msgstr "आयाम:"
@@ -139,11 +503,6 @@
 msgid "Bitrate:"
 msgstr "बिटरेटः"
 
-#: ../data/properties.ui.h:14 ../data/totem.ui.h:142
-#: ../src/totem-properties-view.c:268
-msgid "Audio"
-msgstr "ऑडियो"
-
 #: ../data/properties.ui.h:15
 msgid "Sample rate:"
 msgstr "नमूना दरः"
@@ -152,739 +511,455 @@
 msgid "Channels:"
 msgstr "चैनल:"
 
-#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
-msgid "_Add to Playlist"
-msgstr "गीत-सूची में जोड़ें (_A)"
-
-#: ../data/video-list.ui.h:2
-msgid "Add the video to the playlist"
-msgstr "गीत सूची में वीडियो जोड़ें"
-
 #. Title
-#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:143
-#: ../src/totem-object.c:1667
-msgid "Movie Player"
-msgstr "मूवी प्लेयर"
+#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:80 ../src/totem.c:239
+#: ../src/totem.c:248 ../src/totem-menu.c:790 ../src/totem-object.c:1658
+msgid "Videos"
+msgstr "वीडियो"
 
 #: ../data/totem.desktop.in.in.in.h:2
-msgid "Play movies and songs"
-msgstr "बजाएँ मूवी और गीत"
+#| msgid "Playing a movie"
+msgid "Play movies"
+msgstr "मूवी चला रहा है"
+
+#: ../data/totem.desktop.in.in.in.h:3
+msgid "Video;Movie;Film;Clip;Series;Player;DVD;TV;Disc;"
+msgstr "वीडियो;फिल्म;फिल्म;क्लिप;श्रृंखला;प्लेयर;डीवीडी;टीवी;डिस्क;"
 
 #: ../data/totem.ui.h:1
-msgid "_Movie"
-msgstr "मूवी (_M)"
+#| msgid "_Open..."
+msgid "_Open"
+msgstr "खोलें (_O)"
 
 #: ../data/totem.ui.h:2
-msgid "_Open..."
-msgstr "खोलें (_O)..."
+#| msgid "Open _Location..."
+msgid "Open _Location"
+msgstr "स्थान खोलें (_L)"
 
 #: ../data/totem.ui.h:3
-msgid "Open a file"
-msgstr "एक फ़ाइल खोलें"
+msgid "_Fullscreen"
+msgstr "फुलस्क्रीन (_F)"
 
 #: ../data/totem.ui.h:4
-msgid "Open _Location..."
-msgstr "स्थान खोलें... (_L)"
+msgid "Prefere_nces"
+msgstr "वरीयताएँ (_n)"
 
 #: ../data/totem.ui.h:5
-msgid "Open a non-local file"
-msgstr "खोलें एक गैर स्थानीय फाइल"
+#| msgid "Shuff_le Mode"
+msgid "Shuff_le"
+msgstr "शफल (_l)"
 
 #: ../data/totem.ui.h:6
+#| msgid "_Repeat Mode"
+msgid "_Repeat"
+msgstr "दोहराएँ (_R)"
+
+#: ../data/totem.ui.h:7
+msgid "_Quit"
+msgstr "बाहर (_Q)"
+
+#: ../data/totem.ui.h:8
+msgid "_Movie"
+msgstr "मूवी (_M)"
+
+#: ../data/totem.ui.h:9
 msgid "_Eject"
 msgstr "बाहर करें (_E)"
 
-#: ../data/totem.ui.h:7
+#: ../data/totem.ui.h:10
 msgid "Eject the current disc"
 msgstr "मौजूदा डिस्क बाहर निकालें"
 
-#: ../data/totem.ui.h:8
+#: ../data/totem.ui.h:11
 msgid "_Properties"
 msgstr "गुण (_P)"
 
-#: ../data/totem.ui.h:9
+#: ../data/totem.ui.h:12
 msgid "View the properties of the current stream"
 msgstr "मौजूदा स्ट्रीम के गुण देखें"
 
-#: ../data/totem.ui.h:10
+#: ../data/totem.ui.h:13
 msgid "Play / P_ause"
 msgstr "बजाएं / ठहराएं (_a)"
 
-#: ../data/totem.ui.h:11
+#: ../data/totem.ui.h:14
 msgid "Play or pause the movie"
 msgstr "बजाएँ या रोकें मूवी"
 
-#: ../data/totem.ui.h:12
-msgid "_Quit"
-msgstr "बाहर (_Q)"
-
-#: ../data/totem.ui.h:13
-msgid "Quit the program"
-msgstr "प्रोग्राम से बाहर जाएँ"
-
-#: ../data/totem.ui.h:14
+#: ../data/totem.ui.h:15
 msgid "_Edit"
 msgstr "संपादन (_E)"
 
-#: ../data/totem.ui.h:15
+#: ../data/totem.ui.h:16
 msgid "_Clear Playlist"
 msgstr "प्लेलिस्ट साफ करें (_C)"
 
-#: ../data/totem.ui.h:16
+#: ../data/totem.ui.h:17
 msgid "Clear the playlist"
 msgstr "गीत सूची साफ करें"
 
-#: ../data/totem.ui.h:17
-msgid "Prefere_nces"
-msgstr "वरीयताएँ (_n)"
-
 #: ../data/totem.ui.h:18
-msgid "Configure the application"
-msgstr "अनुप्रयोग विन्यस्त करें"
-
-#: ../data/totem.ui.h:19
 msgid "Plugins..."
 msgstr "प्लगिन..."
 
-#: ../data/totem.ui.h:20
+#: ../data/totem.ui.h:19
 msgid "Configure plugins to extend the application"
 msgstr "अनुप्रयोग फैलाने के दौरान प्लगिन विन्यस्त करें"
 
-#: ../data/totem.ui.h:21
+#: ../data/totem.ui.h:20
 msgid "_View"
 msgstr "देखें (_V)"
 
-#: ../data/totem.ui.h:22
-msgid "_Fullscreen"
-msgstr "फुलस्क्रीन (_F)"
-
-#: ../data/totem.ui.h:23
-msgid "Switch to fullscreen"
-msgstr "पूर्ण स्क्रीन में स्विच करें"
-
-#: ../data/totem.ui.h:24
+#: ../data/totem.ui.h:21
 msgid "Fit Window to Movie"
 msgstr "विंडो को मूवी में फिट करें"
 
-#: ../data/totem.ui.h:25
+#: ../data/totem.ui.h:22
 msgid "_Resize 1:2"
 msgstr "आकार बदलें १:२"
 
-#: ../data/totem.ui.h:26
+#: ../data/totem.ui.h:23
 msgid "Resize to half the original video size"
 msgstr "मूल वीडियो आकार से आधा करें"
 
-#: ../data/totem.ui.h:27
+#: ../data/totem.ui.h:24
 msgid "Resize _1:1"
 msgstr "आकार बदलें 1:1"
 
-#: ../data/totem.ui.h:28
+#: ../data/totem.ui.h:25
 msgid "Resize to the original video size"
 msgstr "मूल वीडियो आकार में फिर आकार दें"
 
-#: ../data/totem.ui.h:29
+#: ../data/totem.ui.h:26
 msgid "Resize _2:1"
 msgstr "आकार बदलें २:1"
 
-#: ../data/totem.ui.h:30
+#: ../data/totem.ui.h:27
 msgid "Resize to double the original video size"
 msgstr "मूल वीडियो आकार से दुगुना आकार दें"
 
-#: ../data/totem.ui.h:31
+#: ../data/totem.ui.h:28
 msgid "_Aspect Ratio"
 msgstr "पहलू अनुपात (_A)"
 
-#: ../data/totem.ui.h:32
+#: ../data/totem.ui.h:29
 msgid "Switch An_gles"
 msgstr "कोण बदलें (_g)"
 
-#: ../data/totem.ui.h:33
+#: ../data/totem.ui.h:30
 msgid "Switch camera angles"
 msgstr "कैमरा कोण बदलें"
 
-#: ../data/totem.ui.h:34
+#: ../data/totem.ui.h:31
 msgid "_Go"
 msgstr "जाएँ (_G)"
 
-#: ../data/totem.ui.h:35
+#: ../data/totem.ui.h:32
 msgid "_DVD Menu"
 msgstr "डीवीडी मेन्यू"
 
-#: ../data/totem.ui.h:36
+#: ../data/totem.ui.h:33
 msgid "Go to the DVD menu"
 msgstr "जाएँ को डीवीडी मेनू"
 
-#: ../data/totem.ui.h:37
+#: ../data/totem.ui.h:34
 msgid "_Title Menu"
 msgstr "शीर्षक मेन्यू"
 
-#: ../data/totem.ui.h:38
+#: ../data/totem.ui.h:35
 msgid "Go to the title menu"
 msgstr "जाएँ को शीर्षक मेनू"
 
-#: ../data/totem.ui.h:39
+#: ../data/totem.ui.h:36
 msgid "A_udio Menu"
 msgstr "ऑडियो मेन्यू (u)"
 
-#: ../data/totem.ui.h:40
+#: ../data/totem.ui.h:37
 msgid "Go to the audio menu"
 msgstr "जाएँ ऑडियो मेनू को"
 
-#: ../data/totem.ui.h:41
+#: ../data/totem.ui.h:38
 msgid "_Angle Menu"
 msgstr "कोण मेन्यू"
 
-#: ../data/totem.ui.h:42
+#: ../data/totem.ui.h:39
 msgid "Go to the angle menu"
 msgstr "ण"
 
-#: ../data/totem.ui.h:43
+#: ../data/totem.ui.h:40
 msgid "_Chapter Menu"
 msgstr "अध्याय मेन्यू ( C)"
 
-#: ../data/totem.ui.h:44
+#: ../data/totem.ui.h:41
 msgid "Go to the chapter menu"
 msgstr "जाएँ अध्याय मेनू में"
 
-#: ../data/totem.ui.h:45
+#: ../data/totem.ui.h:42
 msgid "_Next Chapter/Movie"
 msgstr "अगला अध्याय/मूवी (N)"
 
-#: ../data/totem.ui.h:46
+#: ../data/totem.ui.h:43
 msgid "Next chapter or movie"
 msgstr "अगला चैप्टर या मूवी"
 
-#: ../data/totem.ui.h:47
+#: ../data/totem.ui.h:44
 msgid "_Previous Chapter/Movie"
 msgstr "पिछला अध्याय / मूवी"
 
-#: ../data/totem.ui.h:48
+#: ../data/totem.ui.h:45
 msgid "Previous chapter or movie"
 msgstr "पिछला अध्याय या मूवी"
 
-#: ../data/totem.ui.h:49
+#: ../data/totem.ui.h:46
 msgid "_Sound"
 msgstr "ध्वनि (_S)"
 
-#: ../data/totem.ui.h:50
+#: ../data/totem.ui.h:47
 msgid "Volume _Up"
 msgstr "आवाज़ निर्धारक ऊपर"
 
-#: ../data/totem.ui.h:51
+#: ../data/totem.ui.h:48
 msgid "Increase volume"
 msgstr "आवाज बढ़ाएँ"
 
-#: ../data/totem.ui.h:52
+#: ../data/totem.ui.h:49
 msgid "Volume _Down"
 msgstr "आवाज़ निर्धारक नीचे"
 
-#: ../data/totem.ui.h:53
+#: ../data/totem.ui.h:50
 msgid "Decrease volume"
 msgstr "आवाज़ कम करें"
 
-#: ../data/totem.ui.h:54
+#: ../data/totem.ui.h:51
 msgid "_Help"
 msgstr "मदद (_H)"
 
-#: ../data/totem.ui.h:55
+#: ../data/totem.ui.h:52
 msgid "_Contents"
 msgstr "विषय सूची (_C)"
 
-#: ../data/totem.ui.h:56
+#: ../data/totem.ui.h:53
 msgid "Help contents"
 msgstr "मदद सामग्री"
 
-#: ../data/totem.ui.h:57
+#: ../data/totem.ui.h:54
 msgid "_About"
 msgstr "के बारे में (_A)"
 
-#: ../data/totem.ui.h:58
+#: ../data/totem.ui.h:55
 msgid "About this application"
 msgstr "इस अनुप्रयोग के बारे में"
 
-#: ../data/totem.ui.h:59
-msgid "_Repeat Mode"
-msgstr "दोहराएँ मोड"
-
-#: ../data/totem.ui.h:60
-msgid "Set the repeat mode"
-msgstr "रिपीट मोड को सेट करें"
-
-#: ../data/totem.ui.h:61
-msgid "Shuff_le Mode"
-msgstr "शफल मोड"
-
-#: ../data/totem.ui.h:62
-msgid "Set the shuffle mode"
-msgstr "शफल मोड को सेट करें"
-
-#: ../data/totem.ui.h:63
+#: ../data/totem.ui.h:56
 msgid "Show _Controls"
 msgstr "स्कॉल दिखाएँ (C)"
 
-#: ../data/totem.ui.h:64
+#: ../data/totem.ui.h:57
 msgid "Show controls"
 msgstr "नियंत्रण दिखाएँ"
 
-#: ../data/totem.ui.h:65
+#: ../data/totem.ui.h:58
 msgid "S_idebar"
 msgstr "बाजू पट्टी (_S)"
 
-#: ../data/totem.ui.h:66
+#: ../data/totem.ui.h:59
 msgid "Show or hide the sidebar"
 msgstr "किनारे की पट्टी दिखाएँ या छुपायें"
 
-#: ../data/totem.ui.h:67
+#: ../data/totem.ui.h:60
 msgctxt "Aspect ratio"
 msgid "Auto"
 msgstr "स्वतः"
 
-#: ../data/totem.ui.h:68
+#: ../data/totem.ui.h:61
 msgid "Sets automatic aspect ratio"
 msgstr "स्वचालित अनुपात पहलू सेट करें"
 
-#: ../data/totem.ui.h:69
+#: ../data/totem.ui.h:62
 msgid "Square"
 msgstr "वर्ग"
 
-#: ../data/totem.ui.h:70
+#: ../data/totem.ui.h:63
 msgid "Sets square aspect ratio"
 msgstr "वर्ग अनुपात पहलु सेट करें"
 
-#: ../data/totem.ui.h:71
+#: ../data/totem.ui.h:64
 msgid "4:3 (TV)"
 msgstr "4:3 (TV)"
 
-#: ../data/totem.ui.h:72
+#: ../data/totem.ui.h:65
 msgid "Sets 4:3 (TV) aspect ratio"
 msgstr "पहलू अनुपात 4:3 (TV) को सेट करता है"
 
-#: ../data/totem.ui.h:73
+#: ../data/totem.ui.h:66
 msgid "16:9 (Widescreen)"
 msgstr "16:9 (वाइडस्क्रीन)"
 
-#: ../data/totem.ui.h:74
+#: ../data/totem.ui.h:67
 msgid "Sets 16:9 (widescreen) aspect ratio"
 msgstr "सेट 16:9 (वाइडस्क्रीन) पहलू अनुपात"
 
-#: ../data/totem.ui.h:75
-msgid "2.11:1 (DVB)"
-msgstr "2.11:1 (DVB)"
-
-#: ../data/totem.ui.h:76
-msgid "Sets 2.11:1 (DVB) aspect ratio"
-msgstr "पहलू अनुपात 2.11:1 (DVB) को सेट करता है"
-
-#: ../data/totem.ui.h:77
-msgid "S_ubtitles"
-msgstr "उपशीर्षक (_u)"
-
-#: ../data/totem.ui.h:80
-msgid "_Languages"
-msgstr "भाषायें"
-
-#: ../data/totem.ui.h:81
-msgid "Zoom In"
-msgstr "ज़ूम इन"
-
-#: ../data/totem.ui.h:82
-msgid "Zoom in"
-msgstr "बडे रूप में दिखाएँ"
-
-#: ../data/totem.ui.h:83
-msgid "Skip _Forward"
-msgstr "छोड़ें आगे (F)"
-
-#: ../data/totem.ui.h:84
-msgid "Skip forward"
-msgstr "आगे छोडें"
-
-#: ../data/totem.ui.h:85
-msgid "Skip _Backwards"
-msgstr "छोड़ें पीछे से (B)"
-
-#: ../data/totem.ui.h:86
-msgid "Skip backwards"
-msgstr "छोड़ें पीछे"
-
-#: ../data/totem.ui.h:87
-msgid "14.4 Kbps Modem"
-msgstr "14.4 Kbps मोडेम"
-
-#: ../data/totem.ui.h:88
-msgid "19.2 Kbps Modem"
-msgstr "19.2 Kbps मोडेम"
-
-#: ../data/totem.ui.h:89
-msgid "28.8 Kbps Modem"
-msgstr "28.8 Kbps मोडेम"
-
-#: ../data/totem.ui.h:90
-msgid "33.6 Kbps Modem"
-msgstr "33.6 Kbps मोडेम"
-
-#: ../data/totem.ui.h:91
-msgid "34.4 Kbps Modem"
-msgstr "34.4 Kbps मोडेम"
-
-#: ../data/totem.ui.h:92
-msgid "56 Kbps Modem/ISDN"
-msgstr "56 Kbps मोडेम/ISDN"
-
-#: ../data/totem.ui.h:93
-msgid "112 Kbps Dual ISDN/DSL"
-msgstr "112 Kbps Dual ISDN/DSL"
-
-#: ../data/totem.ui.h:94
-msgid "256 Kbps DSL/Cable"
-msgstr "256 Kbps DSL/केबल"
-
-#: ../data/totem.ui.h:95
-msgid "384 Kbps DSL/Cable"
-msgstr "384 Kbps DSL/केबल"
-
-#: ../data/totem.ui.h:96
-msgid "512 Kbps DSL/Cable"
-msgstr "512 Kbps DSL/केबल"
-
-#: ../data/totem.ui.h:97
-msgid "1.5 Mbps T1/Intranet/LAN"
-msgstr "1.5 Mbps T1/Intranet/LAN"
-
-#: ../data/totem.ui.h:98
-msgid "Intranet/LAN"
-msgstr "Intranet/LAN"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:100
-msgid "Normal"
-msgstr "सामान्य"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:102
-msgid "Large"
-msgstr "बड़ा"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:104
-msgid "Extra Large"
-msgstr "अत्यधिक बड़ा"
-
-#: ../data/totem.ui.h:105 ../src/totem-properties-view.c:228
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5593
-msgid "Stereo"
-msgstr "स्टीरियो"
-
-#: ../data/totem.ui.h:106
-msgid "4-channel"
-msgstr "4-चैनल"
-
-#: ../data/totem.ui.h:107
-msgid "4.1-channel"
-msgstr "4.1-चैनल"
-
-#: ../data/totem.ui.h:108
-msgid "5.0-channel"
-msgstr "5.0-चैनल"
-
-#: ../data/totem.ui.h:109
-msgid "5.1-channel"
-msgstr "5.1-चैनल"
-
-#: ../data/totem.ui.h:110
-msgid "AC3 Passthrough"
-msgstr "AC3 Passthrough"
-
-#: ../data/totem.ui.h:111
-msgid "Totem Preferences"
-msgstr "टोटेम प्राथमिकताएँ"
-
-#: ../data/totem.ui.h:112
-msgid "Playback"
-msgstr "प्लेबैक"
-
-#: ../data/totem.ui.h:113
-msgid "Start playing files from last position"
-msgstr "अंतिम स्थिति से फ़ाइल को बजाना आरंभ करें"
-
-#: ../data/totem.ui.h:114
-msgid "Networking"
-msgstr "संजालन"
-
-#: ../data/totem.ui.h:115
-msgid "Connection _speed:"
-msgstr "कनेक्शन गति:"
-
-#: ../data/totem.ui.h:116
-msgid "Text Subtitles"
-msgstr "पाठ उपशीर्षक"
-
-#: ../data/totem.ui.h:117
-msgid "_Load subtitle files when movie is loaded"
-msgstr "मूवी लोड होने पर उपशीर्षक फाइल को लोड करें (_L)"
-
-#: ../data/totem.ui.h:118
-msgid "_Font:"
-msgstr "फ़ॉन्ट (_F):"
-
-#: ../data/totem.ui.h:119
-msgid "_Encoding:"
-msgstr "एनकोडिंग (_E):"
-
-#: ../data/totem.ui.h:120
-msgid "External Chapters"
-msgstr "बाहरी अध्याय"
-
-#: ../data/totem.ui.h:121
-msgid "Load _chapter files when movie is loaded"
-msgstr "मूवी लोड होने पर अध्याय (_c) फाइल को लोड करें "
-
-#. Tab label in the Preferences dialogue
-#: ../data/totem.ui.h:124
-msgid "Display"
-msgstr "प्रदर्शक"
-
-#: ../data/totem.ui.h:125
-msgid "_Resize the window when a new video is loaded"
-msgstr "नये वीडियो के लोड होने पर विंडो को नया आकार दें (_R)"
-
-#: ../data/totem.ui.h:126
-msgid "Disable _deinterlacing of interlaced videos"
-msgstr "अंतर्वयन वीडियो की _deinterlacing अक्षम करें"
-
-#: ../data/totem.ui.h:127
-msgid "Disable screensaver when playing "
-msgstr "बजाने के दौरान स्क्रीनसेवर निष्क्रिय करें"
-
-#: ../data/totem.ui.h:129
-msgid "Video or Audio"
-msgstr "विडियो या श्रव्य"
-
-#: ../data/totem.ui.h:130
-msgid "Visual Effects"
-msgstr "दृष्य प्रभाव"
-
-#: ../data/totem.ui.h:131
-msgid "Show _visual effects when an audio file is played"
-msgstr "दृश्य प्रभाव दिखायें जब एक ऑडियो फाइल चल रहा है (_v)"
-
-#: ../data/totem.ui.h:132
-msgid "_Type of visualization:"
-msgstr "देखने का क़िस्म:"
-
-#: ../data/totem.ui.h:133
-msgid "Visualization _size:"
-msgstr "विज़ुअलाइज़ेशन आकार :"
-
-#: ../data/totem.ui.h:134
-msgid "Color Balance"
-msgstr "रंग संतुलन"
-
-#: ../data/totem.ui.h:135
-msgid "_Brightness:"
-msgstr "चमकीलापन:"
-
-#: ../data/totem.ui.h:136
-msgid "Co_ntrast:"
-msgstr "विरोध (_n):"
-
-#: ../data/totem.ui.h:137
-msgid "Sat_uration:"
-msgstr "संतृप्त:"
-
-#: ../data/totem.ui.h:138
-msgid "_Hue:"
-msgstr "रंगशेड (_H):"
-
-#: ../data/totem.ui.h:139
-msgid "Reset to _Defaults"
-msgstr "तयशुदा में फिर सेट करें (_D)"
-
-#: ../data/totem.ui.h:140
-msgid "Audio Output"
-msgstr "ऑडियो आउटपुट"
-
-#: ../data/totem.ui.h:141
-msgid "_Audio output type:"
-msgstr "ऑडियो आउटपुट क़िस्म:"
-
-#: ../data/totem.ui.h:145
-msgid "Time seek bar"
-msgstr "समय प्राप्ति बार"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
-msgid "Allow the screensaver to activate when playing audio"
-msgstr "ऑडियो बजाने के दौरान सक्रिय करने के लिए स्क्रीनसेवर को अनुमति दें"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
-msgid ""
-"Allow the screensaver to activate when playing audio. Disable if you have "
-"monitor-powered speakers."
-msgstr ""
-"ऑडियो बजाने के दौरान सक्रिय करने के लिए स्क्रीनसेवर को अनुमति दें. निष्क्रिय "
-"करें यदि आपके "
-"पास मॉनिटर उर्जस्वित स्पीकर है."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
-msgid "Show visual effects when no video is displayed"
-msgstr "जब कोई वीडियो प्रदर्शित नही हैं तो दृश्य प्रभाव दिखायें"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
-msgid "Show visual effects when playing an audio only file."
-msgstr "सिर्फ ऑडियो फाइल के खेलने के दौरान दृश्य प्रभाव दिखायें"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
-msgid "Name of the visual effects plugin"
-msgstr "दृश्य प्रभाव प्लगिन का नाम "
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
-msgid "The brightness of the video"
-msgstr "वीडियो का चमकीलापन"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
-msgid "The contrast of the video"
-msgstr "वीडियो का कंट्रास्ट"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
-msgid "The hue of the video"
-msgstr "वीडियो का रंग"
+#: ../data/totem.ui.h:68
+msgid "2.11:1 (DVB)"
+msgstr "2.11:1 (DVB)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
-msgid "The saturation of the video"
-msgstr "वीडियो की संतृप्ति"
+#: ../data/totem.ui.h:69
+msgid "Sets 2.11:1 (DVB) aspect ratio"
+msgstr "पहलू अनुपात 2.11:1 (DVB) को सेट करता है"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
-msgid "Resize the canvas automatically on file load"
-msgstr "फाइल लोड पर कैनवास को स्वतः पुनः आकार दें"
+#: ../data/totem.ui.h:70
+msgid "S_ubtitles"
+msgstr "उपशीर्षक (_u)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
-msgid "Network connection speed"
-msgstr "संजाल कनेक्शन गति"
+#: ../data/totem.ui.h:73
+msgid "_Languages"
+msgstr "भाषायें"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
-msgid ""
-"Approximate network connection speed, used to select quality on media over "
-"the network."
-msgstr ""
-"अनुमानित संजाल कनेक्शन की गति, संजाल पर मीडिया की गुणवत्ता का चयन किया."
+#: ../data/totem.ui.h:74
+msgid "Zoom In"
+msgstr "ज़ूम इन"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
-msgid "Repeat mode"
-msgstr "दोहराएँ मोड"
+#: ../data/totem.ui.h:75
+msgid "Zoom in"
+msgstr "बडे रूप में दिखाएँ"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
-msgid "Shuffle mode"
-msgstr "फेंटें मोड"
+#: ../data/totem.ui.h:76
+msgid "Skip _Forward"
+msgstr "छोड़ें आगे (F)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
-msgid "Whether to disable deinterlacing for interlaced movies"
-msgstr "क्या अंतर्वयन फिल्मों के लिए deinterlacing को निष्क्रिय करना है"
+#: ../data/totem.ui.h:77
+msgid "Skip forward"
+msgstr "आगे छोडें"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
-msgid "Whether to enable debug for the playback engine"
-msgstr "क्या प्लेबैक इंजन के लिये डिबग को अक्षम करना है"
+#: ../data/totem.ui.h:78
+msgid "Skip _Backwards"
+msgstr "छोड़ें पीछे से (B)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
-msgid "Type of audio output to use"
-msgstr "प्रयोग के लिये ऑडियो आउटपुट का प्रकार"
+#: ../data/totem.ui.h:79
+msgid "Skip backwards"
+msgstr "छोड़ें पीछे"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
-msgid "Visualization quality setting"
-msgstr "विज़ुअलाइज़ेशन गुणवत्ता सेटिंग"
+#: ../data/totem.ui.h:82
+msgid "Time seek bar"
+msgstr "समय प्राप्ति बार"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
-msgid "Quality setting for the audio visualization."
-msgstr "श्रव्य दृश्यावलोकन के लिए गुणवत्ता सेटिंग."
+#: ../data/uri.ui.h:1
+msgid "Enter the _address of the file you would like to open:"
+msgstr "फ़ाइल का पता भरें जिसे आप खोलना चाहते हैं (_a):"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
-msgid "Network buffering threshold"
-msgstr "संजाल बफरिंग थ्रेसहोल्ड"
+#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
+msgid "_Add to Playlist"
+msgstr "गीत-सूची में जोड़ें (_A)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
-msgid ""
-"Amount of data to buffer for network streams before starting to display the "
-"stream (in seconds)."
-msgstr ""
-"धारा के प्रदर्शन के आरंभ होने से पहले संजाल धारा बफर करने के लिये डाटा की "
-"मात्रा (सेकेंड में)."
+#: ../data/video-list.ui.h:2
+msgid "Add the video to the playlist"
+msgstr "गीत सूची में वीडियो जोड़ें"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
-msgid "Subtitle font"
-msgstr "उपशीर्षक फंट"
+#: ../src/backend/bacon-video-widget.c:1643
+msgid "Password requested for RTSP server"
+msgstr "कूटशब्द RTSP सर्वर के लिए अनुरोधित"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
-msgid "Pango font description for subtitle rendering."
-msgstr "उपशीर्षक रेंडरिंग के पैंगो फ़ॉन्ट वर्णन"
+#: ../src/backend/bacon-video-widget.c:2944
+#, c-format
+msgid "Audio Track #%d"
+msgstr "ऑडियो ट्रैक #%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
-msgid "Subtitle encoding"
-msgstr "उपशीर्षक एनकोडिंग"
+#: ../src/backend/bacon-video-widget.c:2948
+#, c-format
+msgid "Subtitle #%d"
+msgstr "उपशीर्षक #%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
-msgid "Encoding character set for subtitle."
-msgstr "उपशीर्षक के लिये एनकोडिंग कैरेक्टर"
+#: ../src/backend/bacon-video-widget.c:3345
+msgid "The server you are trying to connect to is not known."
+msgstr "सर्वर जिससे आप कनेक्ट करने की कोशिश कर रहे हैं वो ज्ञात नहीं है."
+
+#: ../src/backend/bacon-video-widget.c:3348
+msgid "The connection to this server was refused."
+msgstr "इस सर्वर से संबंध अस्वीकृत कर दिया गया."
+
+#: ../src/backend/bacon-video-widget.c:3351
+#| msgid "The movie could not be recorded."
+msgid "The specified movie could not be found."
+msgstr "निर्दिष्ट फिल्म नहीं ढूँढा जा सका."
+
+#: ../src/backend/bacon-video-widget.c:3358
+msgid "The server refused access to this file or stream."
+msgstr "सर्वर इस फाइल या स्ट्रीम तक पहुँच से इनकार कर दिया."
+
+#: ../src/backend/bacon-video-widget.c:3364
+msgid "Authentication is required to access this file or stream."
+msgstr "इस फाइल या स्ट्रीम का उपयोग करने के लिए प्रमाणीकरण की आवश्यकता है."
+
+#: ../src/backend/bacon-video-widget.c:3371
+#| msgid "Totem was not able to play this disc."
+msgid "You are not allowed to open this file."
+msgstr "आपको इस फाइल को खोलने की अनुमति नहीं है."
+
+#: ../src/backend/bacon-video-widget.c:3376
+#| msgid "File is not a valid .desktop file"
+msgid "This location is not a valid one."
+msgstr "यह स्थान मान्य नहीं है."
+
+#: ../src/backend/bacon-video-widget.c:3384
+#| msgid "The movie could not be recorded."
+msgid "The movie could not be read."
+msgstr "मूवी पढ़ा नहीं जा सकता है."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
-msgid "Default location for the \"Open...\" dialogs"
-msgstr "\"खोलें...\" संवाद के लिए तयशुदा स्थान"
+#. should be exactly one missing thing (source or converter)
+#: ../src/backend/bacon-video-widget.c:3407
+#: ../src/backend/bacon-video-widget.c:3415
+#, c-format
+msgid "The playback of this movie requires a %s plugin which is not installed."
+msgid_plural ""
+"The playback of this movie requires the following decoders which are not "
+"installed:\n"
+"\n"
+"%s"
+msgstr[0] "इस मूवी के प्लेबैक के लिए %s प्लगिन जरूरी है जो संस्थापित नहीं है."
+msgstr[1] ""
+"इस मूवी के प्लैबैक के लिए निम्नलिखित डिकोडर्स जरूरी है जो कि संस्थापित नहीं "
+"है:\n"
+"\n"
+"%s"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
+#: ../src/backend/bacon-video-widget.c:3426
 msgid ""
-"Default location for the \"Open...\" dialogs. Default is the current "
-"directory."
+"An audio or video stream is not handled due to missing codecs. You might "
+"need to install additional plugins to be able to play some types of movies"
 msgstr ""
-"\"खोलें...\" संवाद के लिए तयशुदा स्थान, तयशुदा मौजूदा \n"
-"निर्देशिका है."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
-msgid "Default location for the \"Take Screenshot\" dialogs"
-msgstr "\"स्क्रीनशॉट लें\" संवाद के लिए तयशुदा स्थान"
+"गुम कोडेक की वजह से ऑडियो या वीडियो स्ट्रीम को चलाया नहीं जा सकता हैं.आपको इस "
+"प्रकार की फिल्मों को चलाने के लिए कुछ अतिरिक्त प्लगिन संस्थापित करने की जरुरत "
+"हैं."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
+#: ../src/backend/bacon-video-widget.c:3436
+#| msgid ""
+#| "Cannot play this file over the network. Try downloading it to disk first."
 msgid ""
-"Default location for the \"Take Screenshot\" dialogs. Default is the "
-"Pictures directory."
+"This file cannot be played over the network. Try downloading it locally "
+"first."
 msgstr ""
-"\"स्क्रीनशॉट लें\" संवाद के लिए तयशुदा स्थान, तयशुदा तस्वीर निर्देशिका है."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
-msgid "Whether to disable the plugins in the user's home directory"
-msgstr "क्या उपयोक्ता घर निर्देशिका में प्लगिन निष्क्रिय करना है"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
-msgid "Whether to disable the keyboard shortcuts"
-msgstr "क्या कुंजीपटल शॉर्टकट को निष्क्रिय करना है"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
-msgid "Whether to autoload text subtitle files when a movie is loaded"
-msgstr "जब कोई मूवी लोड की जाती है तो पाठ उपशीर्षक ऑटोलोड करना है"
+"संजाल पर फाइल नहीं चला सकता. इसे पहले स्थानीय रूप से डाउनलोड करने की कोशिश "
+"करें"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
-msgid "Whether to autoload external chapter files when a movie is loaded"
-msgstr "जब कोई मूवी लोड की जाती है तो बाहरी अध्याय फ़ाइलों को ऑटोलोड करना है"
+#: ../src/backend/bacon-video-widget.c:5494 ../src/totem-properties-view.c:227
+msgid "Surround"
+msgstr "चक्राकार ध्वनि"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
-msgid ""
-"Whether to remember the position of played audio/video files when pausing or "
-"closing them"
-msgstr ""
-"बजाए गए श्रव्य / वीडियो फ़ाइलें  की स्थिति को ठहराने या बंद करने के दौरान याद "
-"रखें."
+#: ../src/backend/bacon-video-widget.c:5496 ../src/totem-properties-view.c:229
+msgid "Mono"
+msgstr "मोनो"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:35
-msgid "Active plugins list"
-msgstr "सक्रिय प्लगिन की सूची"
+#: ../src/backend/bacon-video-widget.c:5781
+msgid "Media contains no supported video streams."
+msgstr "मीडिया में कोई समर्थित वीडियो धारा नहीं है."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:36
+#: ../src/backend/bacon-video-widget.c:5963
 msgid ""
-"A list of the names of the plugins which are currently active (loaded and "
-"running)."
+"Some necessary plug-ins are missing. Make sure that the program is correctly "
+"installed."
 msgstr ""
-"प्लगिन जो फिलहाल सक्रिय (भरी हुई है और चल रहा है) है के नामों की एक सूची है."
-
-#: ../data/uri.ui.h:1
-msgid "Enter the _address of the file you would like to open:"
-msgstr "फ़ाइल का पता भरें जिसे आप खोलना चाहते हैं (_a):"
+"कुछ आवश्यक प्लगिन लापता हैं.सुनिश्चित करें है कि "
+" इस कार्यक्रम को सही ढंग से स्थापित किया गया है."
 
 #: ../src/eggdesktopfile.c:165
 #, c-format
@@ -950,13 +1025,13 @@
 #: ../src/eggfileformatchooser.c:657
 #, c-format
 msgid ""
-"The program was not able to find out the file format you want to use for `%"
-"s'. Please make sure to use a known extension for that file or manually "
+"The program was not able to find out the file format you want to use for `"
+"%s'. Please make sure to use a known extension for that file or manually "
 "choose a file format from the list below."
 msgstr ""
-"The program was not able to find out the file format you want to use for `%"
-"s'. Please make sure to use a known extension for that file or manually "
-"choose a file format from the list below."
+"आप जिस `%s' के लिए का उपयोग करना चाहते हैं कार्यक्रम उसका फ़ाइल स्वरूप का पता "
+"नहीं लगा सका. कृपया सुनिश्चित करें कि स्वयं नीचे दी गई सूची में से एक फ़ाइल "
+"स्वरूप का चयन करके या उस फाइल के लिए एक ज्ञात एक्सटेंशन का उपयोग करें"
 
 #: ../src/eggfileformatchooser.c:664
 msgid "File format not recognized"
@@ -990,6 +1065,31 @@
 msgid "Show session management options"
 msgstr "दिखाएँ सत्र प्रबंधन विकल्प"
 
+#. hour:minutes:seconds
+#. Translators: This is a time format, like "9:05:02" for 9
+#. * hours, 5 minutes, and 2 seconds. You may change ":" to
+#. * the separator that your locale uses or use "%Id" instead
+#. * of "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:56
+#: ../src/plugins/skipto/totem-time-entry.c:57
+#, c-format
+msgctxt "long time format"
+msgid "%d:%02d:%02d"
+msgstr "%d:%02d:%02d"
+
+#. minutes:seconds
+#. Translators: This is a time format, like "5:02" for 5
+#. * minutes and 2 seconds. You may change ":" to the
+#. * separator that your locale uses or use "%Id" instead of
+#. * "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:65
+#, c-format
+msgctxt "short time format"
+msgid "%d:%02d"
+msgstr "%d:%02d"
+
 #. Title
 #. Artist
 #. Album
@@ -1094,10 +1194,14 @@
 msgstr[0] "%d फ्रेम प्रति सेकेंड"
 msgstr[1] "%d फ्रेम्स प्रति सेकेंड"
 
-#: ../src/totem-audio-preview.c:168
+#: ../src/totem-audio-preview.c:137
 msgid "Audio Preview"
 msgstr "ऑडियो पूर्वावलोकन"
 
+#: ../src/totem.c:240
+msgid "Verify your system installation. Totem will now exit."
+msgstr "अपने सिस्टम के अधिष्ठापन को जांचें. टोटेम निकल जायेगा."
+
 #: ../src/totem-cell-renderer-video.c:126
 msgid "Unknown video"
 msgstr "अज्ञात वीडियो"
@@ -1110,7 +1214,7 @@
 msgid "Cancel"
 msgstr "रद्द करें"
 
-#: ../src/totem-fullscreen.c:616
+#: ../src/totem-fullscreen.c:573
 msgid "No File"
 msgstr "कोई फ़ाइल नहीं"
 
@@ -1128,41 +1232,44 @@
 msgid "Make sure that Totem is properly installed."
 msgstr "सुनिश्चित करें कि टोटेम ठीक से अधिष्ठापित है."
 
-#: ../src/totem-interface.c:347
+#: ../src/totem-interface.c:357
 msgid ""
 "Totem 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."
 msgstr ""
-"Totem 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."
+"टोटेम मुफ़्त सॉफ़्टवेयर है; इसे आप मुफ़्त सॉफ़्टवेयर फाउण्डेशन द्वारा "
+"प्रकाशित ग्नू जनरल पब्लिक "
+"लाइसेंस के तहत वितरित कर सकते हैं या परिवर्धित कर सकते हैं; लाइसेंस के 2d "
+"संस्करण या इसके "
+"(अपने विकल्प अनुसार) बाद के संस्करण के तहत."
 
-#: ../src/totem-interface.c:351
+#: ../src/totem-interface.c:361
 msgid ""
 "Totem 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 General Public License for more "
 "details."
 msgstr ""
-"Totem 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 General Public License for more "
-"details."
+"टोटेम को इस आशा से वितरित किया गया है कि यह उपयोगी होगा, लेकिन बिना किसी "
+"वारंटी "
+"के; यहां तक कि बिना किसी खास उद्देश्य के लिए फिटनेस या व्यापारिकता की "
+"अप्रत्यक्ष वारंटी "
+"के बिना.  देखेंअधिक जानकारी के लिए GNU लेसर जनरल पब्लिक लाइसेंस"
 
-#: ../src/totem-interface.c:355
+#: ../src/totem-interface.c:365
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Totem; if not, write to the Free Software Foundation, Inc., 59 Temple Place, "
 "Suite 330, Boston, MA  02111-1307  USA"
 msgstr ""
-"You should have received a copy of the GNU General Public License along with "
-"Totem; if not, write to the Free Software Foundation, Inc., 59 Temple Place, "
-"Suite 330, Boston, MA  02111-1307  USA"
+"टोटेम के साथ साथ आपको GNU जनरल पब्लिक लाइसेंस"
+"की एक कॉपी मिलनी चाहिए;  यदि नहीं, Free "
+"Software Foundation, Inc., Franklin Street, Fifth Floor,"
+"Boston MA  02111-1307 USA को लिखें."
 
-#: ../src/totem-interface.c:358
+#: ../src/totem-interface.c:368
 msgid ""
 "Totem contains an exception to allow the use of proprietary GStreamer "
 "plugins."
@@ -1171,204 +1278,95 @@
 "अपवाद समाहित है."
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:190
+#: ../src/totem-menu.c:291
 msgid "None"
 msgstr "कुछ नहीं"
 
-#. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:195
-msgctxt "Language"
-msgid "Auto"
-msgstr "स्वतः"
-
-#. Translators:
-#. * This is not a JPEG image, but a disc image, for example,
-#. * an ISO file
-#: ../src/totem-menu.c:765
-#, c-format
-msgid "Play Image '%s'"
-msgstr "'%s' बिंब सहेजें"
-
-#: ../src/totem-menu.c:768 ../src/totem-menu.c:851
-#, c-format
-msgid "device%d"
-msgstr "डिवाइस%d"
-
-#: ../src/totem-menu.c:848
-#, c-format
-msgid "Play Disc '%s'"
-msgstr "बजाएँ डिस्क '%s'"
-
-#. This lists the back-end type and version, such as
-#. * Movie Player using GStreamer 0.10.1
-#: ../src/totem-menu.c:1189
-#, c-format
-msgid "Movie Player using %s"
-msgstr "मूवी प्लेयर %s का प्रयोग कर रहा है"
-
-#: ../src/totem-menu.c:1193
-msgid "Copyright © 2002-2009 Bastien Nocera"
-msgstr "Copyright © 2002-2009 Bastien Nocera"
-
-#: ../src/totem-menu.c:1198
-msgid "translator-credits"
-msgstr "राजेश रंजन "
-
-#: ../src/totem-menu.c:1202
-msgid "Totem Website"
-msgstr "टोटेम वेबसाइट"
-
-#: ../src/totem-menu.c:1236
-msgid "Configure Plugins"
-msgstr "प्लगिन विन्यस्त करें"
-
-#. Translators: %s is the totem version number
-#: ../src/totem-object.c:471
-#, c-format
-msgid "Totem %s"
-msgstr "टोटेम %s"
-
-#: ../src/totem-object.c:1047 ../browser-plugin/totem-plugin-viewer.c:367
-msgid "Playing"
-msgstr "बजा रहे"
-
-#: ../src/totem-object.c:1049 ../src/totem-options.c:52
-msgid "Pause"
-msgstr "ठहरें"
-
-#: ../src/totem-object.c:1054 ../browser-plugin/totem-plugin-viewer.c:363
-msgid "Paused"
-msgstr "ठहरा"
-
-#: ../src/totem-object.c:1056 ../src/totem-object.c:1066
-#: ../src/totem-options.c:51
-msgid "Play"
-msgstr "बजाएँ"
-
-#: ../src/totem-object.c:1061 ../src/totem-object.c:1659
-#: ../src/totem-statusbar.c:115 ../browser-plugin/totem-plugin-viewer.c:351
-msgid "Stopped"
-msgstr "रुक गया"
-
-#: ../src/totem-object.c:1142 ../src/totem-object.c:1169
-#: ../src/totem-object.c:1799 ../src/totem-object.c:1963
-#, c-format
-msgid "Totem could not play '%s'."
-msgstr "टोटेम '%s' को बजा नहीं सका."
-
-#: ../src/totem-object.c:1246
-#, c-format
-msgid ""
-"Totem could not play this media (%s) although a plugin is present to handle "
-"it."
-msgstr ""
-"Totem इस मीडिया (%s) को चला नहीं सका हालांकि एक प्लगिन इसे नियंत्रित करने के "
-"लिये "
-"मौजूद है."
+#. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
+#: ../src/totem-menu.c:296
+msgctxt "Language"
+msgid "Auto"
+msgstr "स्वतः"
 
-#: ../src/totem-object.c:1247
-msgid ""
-"You might want to check that a disc is present in the drive and that it is "
-"correctly configured."
-msgstr ""
-"आप जरूर जांचना चाहेंगे कि चालन में डिस्क मौजूद है और यह ठीक से विन्यस्त है."
+#: ../src/totem-menu.c:789
+msgid "Copyright © 2002-2009 Bastien Nocera"
+msgstr "सर्वाधिकार सुरक्षित © 2002-2009 Bastien Nocera"
 
-#: ../src/totem-object.c:1255
-msgid "More information about media plugins"
-msgstr "मीडिया प्लगिन के बारे में अधिक सूचना"
+#: ../src/totem-menu.c:794
+msgid "translator-credits"
+msgstr "चंदन कुमार (chandankumar.093047@gmail.com)"
 
-#: ../src/totem-object.c:1256
-msgid ""
-"Please install the necessary plugins and restart Totem to be able to play "
-"this media."
-msgstr ""
-"कृपया आवश्यक प्लगिन को अधिष्ठापित करें औऱ Totem को इस  मीडिया को चलाने के "
-"लिये आरंभ करें."
+#: ../src/totem-menu.c:798
+msgid "Totem Website"
+msgstr "टोटेम वेबसाइट"
 
-#: ../src/totem-object.c:1258
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because it does not have the "
-"appropriate plugins to be able to read from the disc."
-msgstr ""
-"टोटेम ऐसे मीडिया (%s) नहीं दिखा सकता है क्योंकि डिस्क से पढ़ने के लिए आपके "
-"पास उचित "
-"प्लगिन नहीं है."
+#: ../src/totem-menu.c:829
+msgid "Configure Plugins"
+msgstr "प्लगिन विन्यस्त करें"
 
-#: ../src/totem-object.c:1260
+#: ../src/totem-object.c:162
 #, c-format
 msgid ""
-"Totem cannot play this type of media (%s) because you do not have the "
-"appropriate plugins to handle it."
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
-"Totem मीडिया के इस प्रकार को (%s) नहीं दिखा सकता है क्योंकि आपके पास उचित "
-"प्लगिन नहीं "
-"है."
+"%s\n"
+"'%s --help' को उपलब्ध कमांड लाइन विकल्प की पूरी सूची दिखाने के लिए चलाएँ.\n"
 
-#: ../src/totem-object.c:1263
+#. Translators: %s is the totem version number
+#: ../src/totem-object.c:591
 #, c-format
-msgid "Totem cannot play this type of media (%s) because it is not supported."
-msgstr ""
-"टोटेम मीडिया के इस प्रकार को (%s) नहीं बजा सकता है क्योंकि यह समर्थित नहीं है."
-
-#: ../src/totem-object.c:1264
-msgid "Please insert another disc to play back."
-msgstr "कृपया बजाने के लिए कृपया दूसरा डिस्क घुसाएँ."
+msgid "Totem %s"
+msgstr "टोटेम %s"
 
-#: ../src/totem-object.c:1300
-msgid "Totem was not able to play this disc."
-msgstr "टोटेम को इस डिस्क को चलाने की अनुमति नहीं है."
+#: ../src/totem-object.c:1168 ../src/totem-options.c:52
+msgid "Pause"
+msgstr "ठहरें"
 
-#: ../src/totem-object.c:1301 ../src/totem-object.c:4229
-msgid "No reason."
-msgstr "कोई कारण नहीं."
+#: ../src/totem-object.c:1175 ../src/totem-object.c:1185
+#: ../src/totem-options.c:51
+msgid "Play"
+msgstr "बजाएँ"
 
-#: ../src/totem-object.c:1315
-msgid "Totem does not support playback of Audio CDs"
-msgstr "ऑडियो CD के बजाने को टोटम समर्थन नहीं करता है"
-
-#: ../src/totem-object.c:1316
-msgid "Please consider using a music player or a CD extractor to play this CD"
-msgstr ""
-"इस सीडी को चलाने के लिए कृपया किसी संगीत प्लेयर या सीडी एक्सट्रैक्टर का "
-"प्रयोग करने की "
-"सोचें"
+#: ../src/totem-object.c:1267 ../src/totem-object.c:1294
+#: ../src/totem-object.c:1787 ../src/totem-object.c:1942
+#, c-format
+msgid "Totem could not play '%s'."
+msgstr "टोटेम '%s' को बजा नहीं सका."
 
-#: ../src/totem-object.c:1805
+#: ../src/totem-object.c:1793
 msgid "No error message"
 msgstr "कोई त्रुटि संदेश नहीं"
 
-#: ../src/totem-object.c:2154
+#: ../src/totem-object.c:2133
 msgid "Totem could not display the help contents."
 msgstr "टोटेम सहायता सामग्री दिखा नहीं सका."
 
-#: ../src/totem-object.c:2493 ../src/totem-object.c:2495
-#: ../browser-plugin/totem-plugin-viewer.c:1417
-msgid "An error occurred"
-msgstr "एक त्रुटि हुई"
-
-#: ../src/totem-object.c:4064 ../src/totem-object.c:4066
+#: ../src/totem-object.c:4019 ../src/totem-object.c:4021
 msgid "Previous Chapter/Movie"
 msgstr "पिछला अध्याय/मूवी"
 
-#: ../src/totem-object.c:4073 ../src/totem-object.c:4075
+#: ../src/totem-object.c:4028 ../src/totem-object.c:4030
 msgid "Play / Pause"
 msgstr "बजाएँ/ठहरें"
 
-#: ../src/totem-object.c:4083 ../src/totem-object.c:4085
+#: ../src/totem-object.c:4038 ../src/totem-object.c:4040
 msgid "Next Chapter/Movie"
 msgstr "अगला अध्याय/मूवी"
 
-#. Translators: this is the tooltip text for the fullscreen button in the controls box in Totem's main window.
 #. Translators: this is the accessibility text for the fullscreen button in the controls box in Totem's main window.
-#: ../src/totem-object.c:4097 ../src/totem-object.c:4099
+#: ../src/totem-object.c:4051 ../src/totem-object.c:4053
 msgid "Fullscreen"
 msgstr "पूर्णस्क्रीन"
 
-#: ../src/totem-object.c:4229
+#: ../src/totem-object.c:4184
 msgid "Totem could not startup."
 msgstr "टोटेम शुरू नहीं हो पाया."
 
+#: ../src/totem-object.c:4184
+msgid "No reason."
+msgstr "कोई कारण नहीं."
+
 #: ../src/totem-open-location.c:182
 msgid "Open Location..."
 msgstr "स्थान खोलें..."
@@ -1442,117 +1440,111 @@
 msgid "Movies to play"
 msgstr "चलाने के लिए मूवी"
 
-#: ../src/totem-options.c:117
+#: ../src/totem-options.c:79
+msgid "- Play movies and songs"
+msgstr "- चलाएँ मूवी और गीत"
+
+#: ../src/totem-options.c:142
 msgid "Can't enqueue and replace at the same time"
 msgstr "एक साथ enqueue और नहीं बदल सकते है "
 
 #. By extension entry
-#: ../src/totem-playlist.c:161
+#: ../src/totem-playlist.c:162
 msgid "MP3 ShoutCast playlist"
 msgstr "MP3 ShoutCast प्लेलिस्ट"
 
-#: ../src/totem-playlist.c:162
+#: ../src/totem-playlist.c:163
 msgid "MP3 audio (streamed)"
 msgstr "MP3 ऑडियो (स्ट्रीम्ड)"
 
-#: ../src/totem-playlist.c:163
+#: ../src/totem-playlist.c:164
 msgid "MP3 audio (streamed, DOS format)"
 msgstr "MP3 ऑडियो (स्ट्रीम्ड, डीओएस प्रारूप)"
 
-#: ../src/totem-playlist.c:164
+#: ../src/totem-playlist.c:165
 msgid "XML Shareable Playlist"
 msgstr "XML साझा योग्य प्लेलिस्ट"
 
 #. This is "Title 3", where title is a DVD title
 #. * Note: NOT a DVD chapter
-#: ../src/totem-playlist.c:347
+#: ../src/totem-playlist.c:348
 #, c-format
 msgid "Title %d"
 msgstr "शीर्षक %d"
 
-#: ../src/totem-playlist.c:446
+#: ../src/totem-playlist.c:447
 msgid "Could not save the playlist"
 msgstr "गीत सूची सहेज नहीं सका"
 
-#: ../src/totem-playlist.c:1021
+#: ../src/totem-playlist.c:1022
 msgid "Save Playlist"
 msgstr "सहेजें प्लेलिस्ट"
 
 #. translators: Playlist is the default saved playlist filename,
 #. * without the suffix
-#: ../src/totem-playlist.c:1033 ../src/totem-playlist.c:1264
-#: ../src/totem-sidebar.c:142
+#: ../src/totem-playlist.c:1034 ../src/totem-playlist.c:1263
+#: ../src/totem-sidebar.c:145
 msgid "Playlist"
 msgstr "गीत-सूची"
 
-#: ../src/totem-playlist.c:1857
+#: ../src/totem-playlist.c:1862
 #, c-format
 msgid "The playlist '%s' could not be parsed. It might be damaged."
 msgstr "'%s' प्लेलिस्ट विश्लेषित नहीं कर सका.यह क्षति ग्रस्त हो सकता था."
 
-#: ../src/totem-playlist.c:1858
+#: ../src/totem-playlist.c:1863
 msgid "Playlist error"
 msgstr "गीत-सूची त्रुटि"
 
-#: ../src/totem-preferences.c:295
+#: ../src/totem-preferences.c:297
 msgid "Preferences"
 msgstr "वरीयताएं"
 
-#: ../src/totem-preferences.c:451
+#: ../src/totem-preferences.c:445
 msgid "Select Subtitle Font"
 msgstr "उपशीर्षक फंट चुनें"
 
-#: ../src/totem-properties-main.c:115 ../src/totem-properties-view.c:266
+#: ../src/totem-properties-main.c:116 ../src/totem-properties-view.c:269
 msgid "Audio/Video"
 msgstr "ऑडियो वीडियो"
 
-#: ../src/totem-properties-view.c:128
+#: ../src/totem-properties-view.c:131
 msgid "N/A"
 msgstr "लागू नहीं"
 
-#: ../src/totem-properties-view.c:157
+#: ../src/totem-properties-view.c:160
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 msgctxt "Stream bit rate"
 msgid "N/A"
 msgstr "N/A"
 
-#: ../src/totem-properties-view.c:160
+#: ../src/totem-properties-view.c:163
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: ../src/totem-properties-view.c:177
+#: ../src/totem-properties-view.c:180
 #: ../src/plugins/properties/totem-movie-properties.c:149
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../src/totem-properties-view.c:209
+#: ../src/totem-properties-view.c:212
 #: ../src/plugins/properties/totem-movie-properties.c:166
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: ../src/totem-properties-view.c:216
+#: ../src/totem-properties-view.c:219
 #: ../src/plugins/properties/totem-movie-properties.c:166
 msgctxt "Sample rate"
 msgid "N/A"
 msgstr "N/A"
 
-#: ../src/totem-properties-view.c:224
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5589
-msgid "Surround"
-msgstr "चक्राकार ध्वनि"
-
-#: ../src/totem-properties-view.c:226
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5591
-msgid "Mono"
-msgstr "मोनो"
-
-#: ../src/totem-properties-view.c:236
+#: ../src/totem-properties-view.c:239
 msgctxt "Number of audio channels"
 msgid "N/A"
 msgstr "N/A"
@@ -1585,8 +1577,8 @@
 #. eg: 75 %
 #: ../src/totem-statusbar.c:250
 #, c-format
-msgid "%d %%"
-msgstr "%d %%"
+msgid "%lf %%"
+msgstr "%lf %%"
 
 #. eg: Paused, 0:32 / 1:05
 #: ../src/totem-statusbar.c:325
@@ -1597,8 +1589,9 @@
 #. eg: Buffering, 75 %
 #: ../src/totem-statusbar.c:330
 #, c-format
-msgid "%s, %d %%"
-msgstr "%s, %d %%"
+#| msgid "%s, %d %%"
+msgid "%s, %f %%"
+msgstr "%s, %f %%"
 
 #: ../src/totem-subtitle-encoding.c:156
 msgid "Current Locale"
@@ -1741,224 +1734,93 @@
 msgid "Vietnamese"
 msgstr "विएतनामी"
 
-#: ../src/totem-video-list.c:330
-msgid "No video URI"
-msgstr "कोई विडियो यूआरआई नहीं"
-
-#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
-#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
-#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
-#: ../src/totem-video-thumbnailer.c:872
-#, c-format
-msgid ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-msgstr ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-
-#: ../src/totem-video-thumbnailer.c:873
-msgid "Filename"
-msgstr "फ़ाइलनाम"
-
-#: ../src/totem-video-thumbnailer.c:875
-msgid "Resolution"
-msgstr "रिसॉल्यूशन"
-
-#: ../src/totem-video-thumbnailer.c:878
-msgid "Duration"
-msgstr "अवधि"
-
-#: ../src/totem-uri.c:506 ../src/plugins/chapters/totem-chapters.c:998
+#: ../src/totem-uri.c:343 ../src/plugins/chapters/totem-chapters.c:998
 msgid "All files"
 msgstr "सभी फ़ाइलें"
 
-#: ../src/totem-uri.c:511 ../src/plugins/chapters/totem-chapters.c:995
+#: ../src/totem-uri.c:348 ../src/plugins/chapters/totem-chapters.c:995
 msgid "Supported files"
 msgstr "समर्थित फाइल"
 
-#: ../src/totem-uri.c:523
+#: ../src/totem-uri.c:360
 msgid "Audio files"
 msgstr "ऑडियो फाइल"
 
-#: ../src/totem-uri.c:531
+#: ../src/totem-uri.c:368
 msgid "Video files"
 msgstr "वीडियो फ़ाइल"
 
-#: ../src/totem-uri.c:541
+#: ../src/totem-uri.c:378
 msgid "Subtitle files"
 msgstr "उपशीर्षक फाइल"
 
-#: ../src/totem-uri.c:593
+#: ../src/totem-uri.c:430
 msgid "Select Text Subtitles"
 msgstr "पाठ उपशीर्षक चुनें"
 
-#: ../src/totem-uri.c:656
+#: ../src/totem-uri.c:495
 msgid "Select Movies or Playlists"
 msgstr "मूवी या गीत-सूची चुनें"
 
-#. Options parsing
-#: ../src/totem.c:204
-msgid "- Play movies and songs"
-msgstr "- चलाएँ मूवी और गीत"
-
-#: ../src/totem.c:220
-#, c-format
-msgid ""
-"%s\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"%s\n"
-"'%s --help' को उपलब्ध कमांड लाइन विकल्प की पूरी सूची दिखाने के लिए चलाएँ.\n"
-
-#: ../src/totem.c:262 ../src/totem.c:273
-#: ../browser-plugin/totem-plugin-viewer.c:663
-#: ../browser-plugin/totem-plugin-viewer.c:1793
-msgid "Totem Movie Player"
-msgstr "टोटेम मूवी खिलाड़ी"
-
-#: ../src/totem.c:263 ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Could not initialize the thread-safe libraries."
-msgstr "थ्रेड सेफ लाइब्रेरी को आरंभीकृत नहीं कर पाया."
-
-#: ../src/totem.c:263
-msgid "Verify your system installation. Totem will now exit."
-msgstr "अपने सिस्टम के अधिष्ठापन को जांचें. टोटेम निकल जायेगा."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:1589
-msgid "Password requested for RTSP server"
-msgstr "कूटशब्द RTSP सर्वर के लिए अनुरोधित"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2858
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2862
-#, c-format
-msgid "Audio Track #%d"
-msgstr "ऑडियो ट्रैक #%d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2890
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2894
-#, c-format
-msgid "Subtitle #%d"
-msgstr "उपशीर्षक #%d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3298
-msgid ""
-"The requested audio output was not found. Please select another audio output "
-"in the Multimedia Systems Selector."
-msgstr ""
-"निवेदित ऑडियो आउटपुट नहीं मिला. कृपया अन्य ऑडियो आगत मल्टी मीडिया चयनक में "
-"चुनें."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3303
-msgid "Location not found."
-msgstr "स्थान नहीं मिला."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3307
-msgid ""
-"Could not open location; you might not have permission to open the file."
-msgstr "स्थान नहीं खोल सका; उस स्थान को खोलने को आपको अनुमति नहीं है."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3318
-msgid ""
-"The video output is in use by another application. Please close other video "
-"applications, or select another video output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"वीडियो आगत अन्य अनुप्रयोग द्वारा प्रयुक्त होता है. कृपया अन्य वीडियो "
-"अनुप्रयोग बंद करें, या "
-"अन्य वीडियो आगत को मल्टी मीडिया सिस्टम चयनक में चुनें."
+#: ../src/totem-uri.c:499
+msgid "Add Directory"
+msgstr "डिरेक्ट्री जोड़ें"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3324
-msgid ""
-"The audio output is in use by another application. Please select another "
-"audio output in the Multimedia Systems Selector. You may want to consider "
-"using a sound server."
-msgstr ""
-"ऑडियो आगत अन्य अनुप्रयोग के द्वारा प्रयोग में है. कृपया मल्टी मीडिया चयनक में "
-"अन्य ऑडियो "
-"आगत को चुनें. आप एक ध्वनि सर्वर का प्रयोग करने का विचार कर सकते हैं."
+#: ../src/totem-video-list.c:330
+msgid "No video URI"
+msgstr "कोई विडियो यूआरआई नहीं"
 
-#. should be exactly one missing thing (source or converter)
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3342
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3348
+#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
+#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
+#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
+#: ../src/totem-video-thumbnailer.c:841
 #, c-format
-msgid "The playback of this movie requires a %s plugin which is not installed."
-msgid_plural ""
-"The playback of this movie requires the following decoders which are not "
-"installed:\n"
-"\n"
-"%s"
-msgstr[0] "इस मूवी के प्लेबैक के लिए %s प्लगिन जरूरी है जो संस्थापित नहीं है."
-msgstr[1] ""
-"इस मूवी के प्लैबैक के लिए निम्नलिखित डिकोडर्स जरूरी है जो कि संस्थापित नहीं "
-"है:\n"
-"\n"
-"%s"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3374
 msgid ""
-"Cannot play this file over the network. Try downloading it to disk first."
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 msgstr ""
-"संजाल पर फाइल नहीं चला सकता. इसे पहले डिस्क में डाउनलोड करने की कोशिश करें"
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5878
-msgid "Media contains no supported video streams."
-msgstr "मीडिया में कोई समर्थित वीडियो धारा नहीं है."
+#: ../src/totem-video-thumbnailer.c:842
+msgid "Filename"
+msgstr "फ़ाइलनाम"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6053
-msgid ""
-"Failed to create a GStreamer play object. Please check your GStreamer "
-"installation."
-msgstr ""
-"GStreamer प्ले ऑब्जेक्ट को बनाने में विफल. कृपया अपने GStreamer अधिष्ठापन को "
-"जांचें."
+#: ../src/totem-video-thumbnailer.c:844
+msgid "Resolution"
+msgstr "रिसॉल्यूशन"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6173
-msgid ""
-"Failed to open audio output. You may not have permission to open the sound "
-"device, or the sound server may not be running. Please select another audio "
-"output in the Multimedia Systems Selector."
-msgstr ""
-"ऑडियो आगत खोलने में विफल. आपको ध्वनि युक्ति खोलने की अनुमति नहीं हो सकती है, "
-"या ध्वनि "
-"सर्वर नहीं भी तल सकता है. कृपया मल्टीमीडिया सिस्टम चयनक में अन्य आगत फाइल "
-"खोलें."
+#: ../src/totem-video-thumbnailer.c:847
+msgid "Duration"
+msgstr "अवधि"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6193
-msgid ""
-"Could not find the audio output. You may need to install additional "
-"GStreamer plugins, or select another audio output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"आडियो आगत को पाने में विफल. आपको GStreamer प्लगिन अतिरिक्त रूप से अधिष्ठापित "
-"करने की "
-"जरूरत हो सकती है य मल्टी मीडिया सिस्टम चयनक में कृपया अन्य आडियो आगत चुनें."
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:1
+msgid "Apple Trailers"
+msgstr "एप्पल ट्रेलर"
+
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:2
+msgid "Sets the user agent for the Apple Trailers site"
+msgstr "एप्पल ट्रेलर साइट के लिए उपयोगकर्ता एजेंट सेट करें"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:1
+#| msgid "Download Movie Subtitles"
+msgid "Autoload Subtitles"
+msgstr "उपशीर्षक स्वतः लोड करें"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:2
+#| msgid "Downloading the subtitles…"
+msgid "Autoloads text subtitles"
+msgstr "पाठ उपशीर्षक स्वतः लोड करें"
 
-#. hour:minutes:seconds
-#. Translators: This is a time format, like "9:05:02" for 9
-#. * hours, 5 minutes, and 2 seconds. You may change ":" to
-#. * the separator that your locale uses or use "%Id" instead
-#. * of "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:83 ../src/plugins/skipto/totem-time-entry.c:57
-#, c-format
-msgctxt "long time format"
-msgid "%d:%02d:%02d"
-msgstr "%d:%02d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
+msgid "Video Disc Recorder"
+msgstr "वीडियो डिस्क रिकार्डर"
 
-#. minutes:seconds
-#. Translators: This is a time format, like "5:02" for 5
-#. * minutes and 2 seconds. You may change ":" to the
-#. * separator that your locale uses or use "%Id" instead of
-#. * "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:92
-#, c-format
-msgctxt "short time format"
-msgid "%d:%02d"
-msgstr "%d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
+msgid "Records (S)VCDs or video DVDs"
+msgstr "(S)VCDs को या वीडियो DVD को रिकार्ड करता है"
 
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:65
 msgid "_Create Video Disc..."
@@ -1978,44 +1840,27 @@
 
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:71
 msgid "Copy (S)VCD..."
-msgstr "Copy (S)VCD..."
+msgstr " (S)VCD की प्रतिलिपि बनाएँ..."
 
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:72
 msgid "Copy the currently playing (S)VCD"
 msgstr "मौजूदा चल रहे (S)VCD की नक़ल लें"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:129
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:136
 msgid "The video disc could not be duplicated."
 msgstr "वीडियो डिस्क की अनुकृति नहीं की जा सकी."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:131
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:276
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:138
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:283
 msgid "The movie could not be recorded."
 msgstr "मूवी रिकार्ड नहीं किया जा सका."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:157
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:167
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:263
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:164
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:174
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:270
 msgid "Unable to write a project."
 msgstr "किसी प्रोजेक्ट में लिखने में असमर्थ."
 
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
-msgid "Video Disc Recorder"
-msgstr "वीडियो डिस्क रिकार्डर"
-
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
-msgid "Records (S)VCDs or video DVDs"
-msgstr "(S)VCDs को या वीडियो DVD को रिकार्ड करता है"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:1
-#: ../src/plugins/chapters/totem-chapters.c:1139
-msgid "Chapters"
-msgstr "अध्याय "
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:2
-msgid "Support chapter markers in movies."
-msgstr "फिल्मों में अध्याय मार्करों का समर्थन."
-
 #: ../src/plugins/chapters/chapters-edit.ui.h:1
 msgid "Name for new chapter:"
 msgstr "नया अध्याय  के लिए नाम"
@@ -2072,6 +1917,16 @@
 msgid "Create a new chapter list for the movie"
 msgstr "मूवी के लिए एक नया अध्याय सूची बनाएँ"
 
+#: ../src/plugins/chapters/chapters.plugin.in.h:1
+#: ../src/plugins/chapters/totem-chapters.c:1139
+msgid "Chapters"
+msgstr "अध्याय "
+
+#: ../src/plugins/chapters/chapters.plugin.in.h:2
+#| msgid "Support chapter markers in movies."
+msgid "Support chapter markers in movies"
+msgstr "फिल्मों में अध्याय मार्करों का समर्थन"
+
 #: ../src/plugins/chapters/totem-chapters.c:56
 #, c-format
 msgid ""
@@ -2178,13 +2033,40 @@
 msgid "The URI ‘%s’ is not supported."
 msgstr "यूआरआइ '%s' समर्थित नहीं है."
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
-msgid "Instant Messenger status"
-msgstr "इस्टैंट मैसेंजर स्थिति"
+#: ../src/plugins/grilo/grilo.plugin.in.h:1
+msgid "Grilo Browser"
+msgstr "Grilo ब्राउज़र"
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
-msgid "Set your Instant Messenger status to away when a movie is playing"
-msgstr "अपनी इस्टैंट मैसेंजर स्थिति को दूर पर सेट करें जब मूवी चल रहा हो"
+#: ../src/plugins/grilo/grilo.plugin.in.h:2
+#| msgid "A plugin to let you browse media content from various sources."
+msgid "A plugin to let you browse media content from various sources"
+msgstr "विभिन्न स्रोतों से मीडिया सामग्री को ब्राउज़ करने के लिए एक प्लगइन."
+
+#: ../src/plugins/grilo/grilo.ui.h:1
+#| msgid "_Add to Playlist"
+msgid "Add to Playlist"
+msgstr "गीत-सूची में जोड़ें "
+
+#: ../src/plugins/grilo/grilo.ui.h:2
+#| msgid "_Copy Location"
+msgid "Copy Location"
+msgstr "नक़ल स्थान"
+
+#: ../src/plugins/grilo/grilo.ui.h:3 ../src/plugins/grilo/totem-grilo.c:1184
+msgid "Browse"
+msgstr "ब्राउज़"
+
+#: ../src/plugins/grilo/grilo.ui.h:4 ../src/plugins/grilo/totem-grilo.c:1227
+msgid "Search"
+msgstr "ढूंढें"
+
+#: ../src/plugins/grilo/totem-grilo.c:454
+msgid "Browse Error"
+msgstr "त्रुटि ब्राउज़ करें"
+
+#: ../src/plugins/grilo/totem-grilo.c:609
+msgid "Search Error"
+msgstr "त्रुटि खोजें"
 
 #: ../src/plugins/gromit/gromit.plugin.in.h:1
 msgid "Gromit Annotations"
@@ -2198,53 +2080,14 @@
 msgid "The gromit binary was not found."
 msgstr "ग्रोमिट द्विपदीय नहीं मिला था."
 
-#. Add the interface to Totem's sidebar
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:1
-#: ../src/plugins/iplayer/iplayer.py:46
-msgid "BBC iPlayer"
-msgstr "BBC iPlayer"
-
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:2
-msgid "Stream BBC programs from the last 7 days from the BBC iPlayer service."
-msgstr "BBC प्रोग्राम को अंतिम 7 दिनों से BBC iPlayer सेवा से स्ट्रीम करें."
-
-#: ../src/plugins/iplayer/iplayer.py:72
-msgid "Error listing channel categories"
-msgstr "चैनल श्रेणियाँ के सूचीकरण में त्रुटि"
-
-#: ../src/plugins/iplayer/iplayer.py:73
-msgid ""
-"There was an unknown error getting the list of television channels available "
-"on BBC iPlayer."
-msgstr "BBC iPlayer पर उपलब्ध टेलिविजन टैनल की सूची पाने में अज्ञात त्रुटि आई."
-
-#. Append a dummy child row so that the expander's visible; we can
-#. then queue off the expander to load the programme listing for this
-#. category
-#: ../src/plugins/iplayer/iplayer.py:84
-msgid "Loading…"
-msgstr "लोड किया जा रहा है..."
-
-#. Translators: the "programme feed" is the list of TV shows
-#. available to watch online
-#: ../src/plugins/iplayer/iplayer.py:136
-msgid "Error getting programme feed"
-msgstr "प्रोग्राम फीड पाने में त्रुटि"
-
-#: ../src/plugins/iplayer/iplayer.py:137
-msgid ""
-"There was an error getting the list of programmes for this channel and "
-"category combination."
-msgstr "इस चैनल और श्रेमी संयुग्म के लिए प्रोग्राम की सूची पाने में त्रुटि आई."
-
-#: ../src/plugins/iplayer/iplayer2.py:298
-msgid ""
-msgstr ""
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
+#| msgid "Instant Messenger status"
+msgid "Instant Messenger Status"
+msgstr "इस्टैंट मैसेंजर स्थिति"
 
-#: ../src/plugins/iplayer/iplayer2.py:299
-#, python-format
-msgid "Programme unavailable (\"%s\")"
-msgstr "प्रोग्राम अनुपलब्ध (\"%s\")"
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
+msgid "Set your Instant Messenger status to away when a movie is playing"
+msgstr "अपनी इस्टैंट मैसेंजर स्थिति को दूर पर सेट करें जब मूवी चल रहा हो"
 
 #: ../src/plugins/lirc/lirc.plugin.in.h:1
 msgid "Infrared Remote Control"
@@ -2262,25 +2105,31 @@
 msgid "Couldn't read lirc configuration."
 msgstr "lirc पठन विन्यास नहीं कर सका."
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
-msgid "Download Movie Subtitles"
-msgstr "मूवी उपशीर्षक डाउनलोड करें"
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:1
+#| msgid "Movie Player"
+msgid "Media Player Keys"
+msgstr "मीडिया प्लेयर कुंजी"
+
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:2
+msgid "Support additional media player keys"
+msgstr "अतिरिक्त मीडिया प्लेयर कुंजी का समर्थन करें"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
-msgid "Subtitle _language:"
-msgstr "उपशीर्षक भाषा (_l):"
+#: ../src/plugins/ontop/ontop.plugin.in.h:1
+msgid "Always On Top"
+msgstr "हमेशा ऊपर"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
-msgid "_Play with Subtitle"
-msgstr "उपशीर्षक के साथ बजाएँ (_P)"
+#: ../src/plugins/ontop/ontop.plugin.in.h:2
+msgid "Keep the main window on top when playing a movie"
+msgstr "क्या मुख्य विंडो को शीर्ष पर रहना चाहिए जब मूवी चला रहा हो"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:1
 msgid "Subtitle Downloader"
 msgstr "उपशीर्षक डाउनलोडर"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:2
-msgid "Look for subtitles for the currently playing movie."
-msgstr "मौजूदा प्लेयिंग मूवी के लिए उपशीर्षक देखें."
+#| msgid "Look for subtitles for the currently playing movie."
+msgid "Look for subtitles for the currently playing movie"
+msgstr "मौजूदा चल रहे मूवी के लिए उपशीर्षक देखें."
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:42
 msgid "Brazilian Portuguese"
@@ -2302,7 +2151,7 @@
 #: ../src/plugins/opensubtitles/opensubtitles.py:323
 #: ../src/plugins/opensubtitles/opensubtitles.py:341
 msgid "Could not contact the OpenSubtitles website."
-msgstr "Could not contact the OpenSubtitles website."
+msgstr "ओपनसबटाइटल वेबसाइट से संपर्क नहीं हो सका."
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:329
 msgid "No results found."
@@ -2336,6 +2185,18 @@
 msgid "Searching subtitles…"
 msgstr "उपशीर्षक खोज रहा है ..."
 
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
+msgid "Download Movie Subtitles"
+msgstr "मूवी उपशीर्षक डाउनलोड करें"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
+msgid "Subtitle _language:"
+msgstr "उपशीर्षक भाषा (_l):"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
+msgid "_Play with Subtitle"
+msgstr "उपशीर्षक के साथ बजाएँ (_P)"
+
 #: ../src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in.h:1
 msgid "Subtitle language"
 msgstr "उपशीर्षक भाषा"
@@ -2344,84 +2205,20 @@
 msgid "The language to search for subtitles for movies in."
 msgstr "अंदर की मूवी के लिये उपशीर्षक के लिए खोज की भाषा."
 
-#: ../src/plugins/ontop/ontop.plugin.in.h:1
-msgid "Always On Top"
-msgstr "हमेशा ऊपर"
-
-#: ../src/plugins/ontop/ontop.plugin.in.h:2
-msgid "Keep the main window on top when playing a movie"
-msgstr "क्या मुख्य विंडो को शीर्ष पर रहना चाहिए जब मूवी चला रहा हो"
+#: ../src/plugins/properties/movie-properties.plugin.in.h:1
+#| msgid "Properties"
+msgid "Movie Properties"
+msgstr "मूवी गुण"
+
+#: ../src/plugins/properties/movie-properties.plugin.in.h:2
+#| msgid "Show or hide the sidebar"
+msgid "Adds movie properties to the sidebar"
+msgstr "किनारे की पट्टी में मूवी गुण जोड़े"
 
 #: ../src/plugins/properties/totem-movie-properties.c:246
 msgid "Properties"
 msgstr "गुण"
 
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:1
-msgid "Publisher protocol to use"
-msgstr "प्रकाशक प्रोटोकॉल जिसे इस्तेमाल में लेना है"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:2
-msgid ""
-"The transport protocol to use when publishing playlists over the network."
-msgstr ""
-"संजाल के ऊपर प्लेलिस्ट को प्रकाशित करते समय प्रकाशक प्रोटोकॉल जिसे इस्तेमाल "
-"में लेना है."
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:3
-msgid "Format for network service name"
-msgstr "संजाल सेवा नाम के लिए प्रारूप"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:5
-#, no-c-format
-msgid ""
-"A format string used to build the network service name used when publishing "
-"playlists over the network. The following format placeholders can be used: • "
-"%a: the program name as returned by g_get_application_name() • %h: the "
-"machine's host name in title case • %u: the user's login name in title case "
-"• %U: the user's real name • %%: the percent sign"
-msgstr ""
-"नेटवर्क के ऊपर प्लेलिस्ट को प्रकाशित करते समय प्रारूप स्ट्रिंग संजाल सेवा "
-"उपयोग किया गया "
-"नाम का निर्माण करने के लिए प्रयोग किया जाता है.  निम्नलिखित प्रारूप "
-"प्लेसहोल्डर इस्तेमाल "
-"किया जा सकता है: • %a:प्रोग्राम नाम के रूप में g_get_application_name() "
-"द्वारा लौटे • "
-"%h: शीर्षक मामले में मशीन का होस्टनाम • %u: उपयोगकर्ता शीर्षक मामले में लॉगिन "
-"नाम • %"
-"U: उपयोगकर्ता का वास्तविक नाम • %%: प्रतिशत चिह्न"
-
-#. Translators: computers on the local network which are publishing their playlists over the network
-#: ../src/plugins/publish/totem-publish.c:552
-msgid "Neighbors"
-msgstr "पड़ोसी"
-
-#: ../src/plugins/publish/publish.plugin.in.h:1
-msgid "Publish Playlist"
-msgstr "गीत-सूची प्रकाशित करें"
-
-#: ../src/plugins/publish/publish.plugin.in.h:2
-msgid "Share the current playlist via HTTP"
-msgstr "मौजूदा प्लेलिस्ट HTTP से साझा करें"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:1
-msgid "Service _Name:"
-msgstr "सेवा नाम (_N):"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:3
-#, no-c-format
-msgid ""
-"The name used for announcing the playlist service on the network.\n"
-"All occurrences of the string %u will be replaced by your name,\n"
-"and %h will be replaced by your computer's host name."
-msgstr ""
-"संजाल पर प्लेलिस्ट सेवा घोषणा के लिए नाम का इस्तेमाल किया.\n"
-"स्ट्रिंग %u के सभी आवृत्तियों को आपके नाम से बदल दिया जाएगा, \n"
-"और आपकी कंप्यूटर के होस्ट नाम से %h बदल दिया जाएगा."
-
-#: ../src/plugins/publish/publish-plugin.ui.h:6
-msgid "Use _encrypted transport protocol (HTTPS)"
-msgstr "गोपित परिवहन प्रोटोकॉल (HTTPS) का प्रयोग करें (_e)"
-
 #: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:1
 msgid "rpdb2 password"
 msgstr "rpdb2 पासवर्ड "
@@ -2435,22 +2232,94 @@
 "कूटशब्द. यदि यह "
 "खाली है, 'टोटेम 'के मूलभूत प्रयोग किया जायेगा."
 
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
+msgid "Python Console"
+msgstr "पाइथन कंसोल"
+
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
+#| msgid "Interactive Python console."
+msgid "Interactive Python console"
+msgstr "अंतःक्रियात्मक पाइथन कंसोल."
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:88
+msgid "Python Console Menu"
+msgstr "पाइथन कंसोल मेन्यू"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:93
+msgid "_Python Console"
+msgstr "पाइथन कंसोल (_P)"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:94
+msgid "Show Totem's Python console"
+msgstr "टोटेम पाइथन कंसोल दिखाएँ"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:100
+msgid "Python Debugger"
+msgstr "पाइथन डिबगर"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:101
+msgid "Enable remote Python debugging with rpdb2"
+msgstr "rpdb2 से दूरस्थ पाइथन डिबगिंग सक्रिय करें"
+
+#. pylint: disable-msg=E1101
+#: ../src/plugins/pythonconsole/pythonconsole.py:125
+#, python-format
+msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
+msgstr ""
+"आप 'totem_object' के माध्यम से Totem.Object का उपयोग कर सकते हैं::\\n%s"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:129
+msgid "Totem Python Console"
+msgstr "टोटेम पाइथन कंसोल"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:139
+msgid ""
+"After you press OK, Totem will wait until you connect to it with winpdb or "
+"rpdb2. If you have not set a debugger password in DConf, it will use the "
+"default password ('totem')."
+msgstr ""
+"उसके बाद आप ठीक दबाएँ, टोटेम प्रतीक्षा करेगा जब तक आप winpdb या rpdb2से इसे "
+"जोड देते है."
+"यदि आपने DConf में डिबगर कूटशब्द सेट नहीं किया है, यहडिफ़ॉल्ट कूटशब्द "
+"('totem') का उपयोग "
+"करेगा ."
+
+#: ../src/plugins/recent/recent.plugin.in.h:1
+#| msgid "Video files"
+msgid "Recent files"
+msgstr "हालिया फ़ाइलें"
+
+#: ../src/plugins/recent/recent.plugin.in.h:2
+msgid "Adds files that have been played to recent files"
+msgstr "फ़ाइलों को जोड़ें जो हाल ही में फ़ाइलों को चलाया गया है"
+
 #: ../src/plugins/rotation/rotation.plugin.in.h:1
 msgid "Rotation Plugin"
 msgstr "परिक्रमण प्लगइन"
 
 #: ../src/plugins/rotation/rotation.plugin.in.h:2
-msgid "Allows videos to be rotated if they're in the wrong orientation."
+#| msgid "Allows videos to be rotated if they're in the wrong orientation."
+msgid "Allows videos to be rotated if they are in the wrong orientation"
 msgstr "वीडियो को घुमाने की अनुमति है अगर वे गलत अभिविन्यास में हैं. "
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:60
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:50
 msgid "_Rotate Clockwise"
 msgstr "घड़ी की दिशा में घुमाएँ (_R)"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:62
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:52
 msgid "Rotate Counterc_lockwise"
 msgstr "वामावर्त घुमाएँ (_l)"
 
+#: ../src/plugins/save-file/save-file.plugin.in.h:1
+#| msgid "Save a Copy"
+msgid "Save Copy"
+msgstr "प्रतिलिपि सहेजें"
+
+#: ../src/plugins/save-file/save-file.plugin.in.h:2
+#| msgid "Copy the currently playing video DVD"
+msgid "Save a copy of the currently playing movie"
+msgstr "मौजूदा चल रहे मूवी की नक़ल को सहेजें"
+
 #: ../src/plugins/save-file/totem-save-file.c:63
 msgid "Save a Copy..."
 msgstr "प्रतिलिपि सहेजें..."
@@ -2473,10 +2342,14 @@
 msgid "Movie stream"
 msgstr "मूवी स्ट्रीम"
 
-#: ../src/plugins/screensaver/totem-screensaver.c:116
-#: ../browser-plugin/totem-plugin-viewer.c:1891
-msgid "Playing a movie"
-msgstr "मूवी चला रहा है"
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:1
+msgid "Screen Saver"
+msgstr "स्क्रीन सेवर"
+
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:2
+#| msgid "Disable screensaver when playing "
+msgid "Deactivates the screen saver when a movie is playing"
+msgstr "मूवी को चलाने के दौरान स्क्रीनसेवर निष्क्रिय करें"
 
 #: ../src/plugins/screenshot/gallery.ui.h:1
 msgid "Screenshot width (in pixels):"
@@ -2490,23 +2363,31 @@
 msgid "Number of screenshots:"
 msgstr "स्क्रीनशॉट की संख्या:"
 
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:1
-msgid "_Name:"
-msgstr "नाम (_N):"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:2
-msgid "Save in _folder:"
-msgstr "फ़ोल्डर में सहेजें (_f):"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:3
-msgid "Select a folder"
-msgstr "फोल्डर चुनें"
-
-#. Write the screenshot to the temporary file
-#: ../src/plugins/screenshot/gnome-screenshot-widget.c:385
-#: ../src/plugins/screenshot/totem-screenshot.c:64
-msgid "Screenshot.png"
-msgstr "Screenshot.png"
+#. translators: this is the name of the file that gets made up
+#. * with the screenshot if the entire screen is taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:147
+#, c-format
+#| msgid "Screenshot.png"
+msgid "Screenshot from %s.png"
+msgstr " %s.png से स्क्रीनशॉट"
+
+#. translators: this is the name of the file that gets
+#. * made up with the screenshot if the entire screen is
+#. * taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:154
+#, c-format
+#| msgid "Screenshot-%s-%d.png"
+msgid "Screenshot from %s - %d.png"
+msgstr "%s - %d.png से स्क्रीनशॉट"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:1
+#| msgid "Screenshot.png"
+msgid "Screenshot"
+msgstr "स्क्रीन चित्र"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:2
+msgid "Allows screenshots and galleries to be taken of videos"
+msgstr "स्क्रीनशॉट और दीर्घाओं को वीडियो से लेने की अनुमति दें."
 
 #: ../src/plugins/screenshot/totem-gallery.c:91
 msgid "Save Gallery"
@@ -2532,49 +2413,48 @@
 msgid "Saving gallery as \"%s\""
 msgstr "दीर्घा बतौर \"%s\" सहेज रहा है"
 
-#: ../src/plugins/screenshot/totem-screenshot.c:113
-msgid "There was an error saving the screenshot."
-msgstr "स्क्रीनशॉट सहेजने में त्रुटि था."
-
-#: ../src/plugins/screenshot/totem-screenshot.c:139
-msgid "Save Screenshot"
-msgstr "सहेजें स्क्रीनशॉट"
-
-#. Create the screenshot widget
-#. Translators: %s is the movie title and %d is an auto-incrementing number to make filename unique
-#: ../src/plugins/screenshot/totem-screenshot.c:160
-#, c-format
-msgid "Screenshot-%s-%d.png"
-msgstr "स्क्रीनशॉट-%s-%d.png"
-
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:88
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:220
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "Totem could not get a screenshot of the video."
 msgstr "टोटेम उस वीडियो का स्क्रीनशॉट नहीं ले सका."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "This is not supposed to happen; please file a bug report."
 msgstr "ऐसा नहीं होना चाहिये, कृपया एक बग रिपोर्ट डालें."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
-msgid "Take _Screenshot..."
-msgstr "स्क्रीनशॉट लें (_S)..."
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
+#| msgid "Take _Screenshot..."
+msgid "Take _Screenshot"
+msgstr "स्क्रीनशॉट लें (_S)"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
 msgid "Take a screenshot"
 msgstr "स्क्रीन का चित्र लें"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create Screenshot _Gallery..."
 msgstr "स्क्रीनशॉट दीर्घा बनाएँ (_G)..."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create a gallery of screenshots"
 msgstr "स्क्रीनशॉट की दीर्घा बनाएँ"
 
+#: ../src/plugins/skipto/skipto.plugin.in.h:1
+#: ../src/plugins/skipto/totem-skipto.c:196
+msgid "Skip To"
+msgstr "छोड़ें  को"
+
+#: ../src/plugins/skipto/skipto.plugin.in.h:2
+msgid "Provides the \"Skip to\" dialog"
+msgstr "\"छोड़ें\" संवाद उपलब्ध कराता है"
+
+#: ../src/plugins/skipto/skipto.ui.h:1
+msgid "_Skip to:"
+msgstr "छोड़ें इसको:"
+
 #. Update the "seconds" label so that it always has the correct singular/plural form
 #. Translators: label for the seconds selector in the "Skip to" dialogue
-#: ../src/plugins/skipto/totem-skipto.c:160
+#: ../src/plugins/skipto/totem-skipto.c:159
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "दूसरा"
@@ -2584,15 +2464,11 @@
 #. Translators: you should translate this string to a number (written in digits) which corresponds to the longer character length of the
 #. * translations for "second" and "seconds", as translated elsewhere in this file. For example, in English, "second" is 6 characters long and
 #. * "seconds" is 7 characters long, so this string should be translated to "7". See: bgo#639398
-#: ../src/plugins/skipto/totem-skipto.c:190
+#: ../src/plugins/skipto/totem-skipto.c:189
 msgctxt "Skip To label length"
 msgid "7"
 msgstr "7"
 
-#: ../src/plugins/skipto/totem-skipto.c:197
-msgid "Skip To"
-msgstr "छोड़ें  को"
-
 #: ../src/plugins/skipto/totem-skipto-plugin.c:182
 msgid "_Skip To..."
 msgstr "छोड़ें (_S) को..."
@@ -2601,118 +2477,303 @@
 msgid "Skip to a specific time"
 msgstr "छोड़ें निर्दिष्ट समय को"
 
-#: ../src/plugins/skipto/skipto.ui.h:1
-msgid "_Skip to:"
-msgstr "छोड़ें इसको:"
+#~ msgid "Play movies and songs"
+#~ msgstr "बजाएँ मूवी और गीत"
 
-#: ../browser-plugin/totem-plugin-viewer.c:431
-msgid "No URI to play"
-msgstr "चलाने के लिए कोई URI नहीं"
+#~ msgid "1.5 Mbps T1/Intranet/LAN"
+#~ msgstr "1.5 Mbps T1/Intranet/LAN"
 
-#. translators: this is:
-#. * Open With ApplicationName
-#. * as in nautilus' right-click menu
-#: ../browser-plugin/totem-plugin-viewer.c:1107
-#, c-format
-msgid "_Open with \"%s\""
-msgstr "\"%s\" के साथ खोलें (_O)"
+#~ msgid "112 Kbps Dual ISDN/DSL"
+#~ msgstr "112 Kbps Dual ISDN/DSL"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2136
-msgid "No playlist or playlist empty"
-msgstr "कोई गीत-सूची नहीं या गीत सूची खाली"
+#~ msgid "14.4 Kbps Modem"
+#~ msgstr "14.4 Kbps मोडेम"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2235
-msgid "Movie browser plugin"
-msgstr "मूवी ब्रॉउजर प्लगइन"
+#~ msgid "19.2 Kbps Modem"
+#~ msgstr "19.2 Kbps मोडेम"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Verify your system installation. The Totem plugin will now exit."
-msgstr "अपने सिस्टम के अधिष्ठापन को जांचें. टोटेम प्लगिन निकल जायेगा."
+#~ msgid "256 Kbps DSL/Cable"
+#~ msgstr "256 Kbps DSL/केबल"
 
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
-msgid "Python Console"
-msgstr "पाइथन कंसोल"
+#~ msgid "28.8 Kbps Modem"
+#~ msgstr "28.8 Kbps मोडेम"
 
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
-msgid "Interactive Python console."
-msgstr "अंतःक्रियात्मक पाइथन कंसोल."
+#~ msgid "33.6 Kbps Modem"
+#~ msgstr "33.6 Kbps मोडेम"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:88
-msgid "Python Console Menu"
-msgstr "पाइथन कंसोल मेन्यू"
+#~ msgid "34.4 Kbps Modem"
+#~ msgstr "34.4 Kbps मोडेम"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:93
-msgid "_Python Console"
-msgstr "पाइथन कंसोल (_P)"
+#~ msgid "384 Kbps DSL/Cable"
+#~ msgstr "384 Kbps DSL/केबल"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:94
-msgid "Show Totem's Python console"
-msgstr "टोटेम पाइथन कंसोल दिखाएँ"
+#~ msgid "512 Kbps DSL/Cable"
+#~ msgstr "512 Kbps DSL/केबल"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:100
-msgid "Python Debugger"
-msgstr "पाइथन डिबगर"
+#~ msgid "56 Kbps Modem/ISDN"
+#~ msgstr "56 Kbps मोडेम/ISDN"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:101
-msgid "Enable remote Python debugging with rpdb2"
-msgstr "rpdb2 से दूरस्थ पाइथन डिबगिंग सक्रिय करें"
+#~ msgid "Configure the application"
+#~ msgstr "अनुप्रयोग विन्यस्त करें"
 
-#. pylint: disable-msg=E1101
-#: ../src/plugins/pythonconsole/pythonconsole.py:125
-#, python-format
-msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
-msgstr ""
-"आप 'totem_object' के माध्यम से Totem.Object का उपयोग कर सकते हैं::\\n%s"
+#~ msgid "Connection _speed:"
+#~ msgstr "कनेक्शन गति:"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:129
-msgid "Totem Python Console"
-msgstr "टोटेम पाइथन कंसोल"
+#~ msgid "Intranet/LAN"
+#~ msgstr "Intranet/LAN"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:139
-msgid ""
-"After you press OK, Totem will wait until you connect to it with winpdb or "
-"rpdb2. If you have not set a debugger password in DConf, it will use the "
-"default password ('totem')."
-msgstr ""
-"उसके बाद आप ठीक दबाएँ, टोटेम प्रतीक्षा करेगा जब तक आप winpdb या rpdb2से इसे "
-"जोड देते है."
-"यदि आपने DConf में डिबगर कूटशब्द सेट नहीं किया है, यहडिफ़ॉल्ट कूटशब्द "
-"('totem') का उपयोग "
-"करेगा ."
+#~ msgid "Networking"
+#~ msgstr "संजालन"
 
-#: ../src/plugins/grilo/grilo.plugin.in.h:1
-msgid "Grilo Browser"
-msgstr "Grilo ब्राउज़र"
+#~ msgid "Open a file"
+#~ msgstr "एक फ़ाइल खोलें"
 
-#: ../src/plugins/grilo/grilo.plugin.in.h:2
-msgid "A plugin to let you browse media content from various sources."
-msgstr "विभिन्न स्रोतों से मीडिया सामग्री को ब्राउज़ करने के लिए एक प्लगइन."
+#~ msgid "Open a non-local file"
+#~ msgstr "खोलें एक गैर स्थानीय फाइल"
 
-#: ../src/plugins/grilo/totem-grilo.c:452
-msgid "Browse Error"
-msgstr "त्रुटि ब्राउज़ करें"
+#~ msgid "Quit the program"
+#~ msgstr "प्रोग्राम से बाहर जाएँ"
 
-#: ../src/plugins/grilo/totem-grilo.c:599
-msgid "Search Error"
-msgstr "त्रुटि खोजें"
+#~ msgid "Set the repeat mode"
+#~ msgstr "रिपीट मोड को सेट करें"
 
-#: ../src/plugins/grilo/totem-grilo.c:1219 ../src/plugins/grilo/grilo.ui.h:3
-msgid "Browse"
-msgstr "ब्राउज़"
+#~ msgid "Set the shuffle mode"
+#~ msgstr "शफल मोड को सेट करें"
 
-#: ../src/plugins/grilo/totem-grilo.c:1285 ../src/plugins/grilo/grilo.ui.h:4
-msgid "Search"
-msgstr "ढूंढें"
+#~ msgid "Switch to fullscreen"
+#~ msgstr "पूर्ण स्क्रीन में स्विच करें"
 
-#: ../src/plugins/grilo/grilo.ui.h:1
-#| msgid "_Add to Playlist"
-msgid "Add to Playlist"
-msgstr "गीत-सूची में जोड़ें"
+#~ msgid ""
+#~ "Approximate network connection speed, used to select quality on media "
+#~ "over the network."
+#~ msgstr "अनुमानित संजाल कनेक्शन की गति, संजाल पर मीडिया की गुणवत्ता का चयन किया."
 
-#: ../src/plugins/grilo/grilo.ui.h:2
-#| msgid "_Copy Location"
-msgid "Copy Location"
-msgstr "स्थान नकल करें"
+#~ msgid "Network connection speed"
+#~ msgstr "संजाल कनेक्शन गति"
+
+#~| msgid "Play Disc '%s'"
+#~ msgid "Play Image '%s'"
+#~ msgstr "'%s' बिंब सहेजें"
+
+#~ msgid "device%d"
+#~ msgstr "डिवाइस%d"
+
+#~ msgid "Play Disc '%s'"
+#~ msgstr "बजाएँ डिस्क '%s'"
+
+#~ msgid "Movie Player using %s"
+#~ msgstr "मूवी प्लेयर %s का प्रयोग कर रहा है"
+
+#~ msgid ""
+#~ "Totem could not play this media (%s) although a plugin is present to "
+#~ "handle it."
+#~ msgstr ""
+#~ "Totem इस मीडिया (%s) को चला नहीं सका हालांकि एक प्लगिन इसे नियंत्रित करने के लिये "
+#~ "मौजूद है."
+
+#~ msgid ""
+#~ "You might want to check that a disc is present in the drive and that it "
+#~ "is correctly configured."
+#~ msgstr "आप जरूर जांचना चाहेंगे कि चालन में डिस्क मौजूद है और यह ठीक से विन्यस्त है."
+
+#~ msgid "More information about media plugins"
+#~ msgstr "मीडिया प्लगिन के बारे में अधिक सूचना"
+
+#~ msgid ""
+#~ "Please install the necessary plugins and restart Totem to be able to play "
+#~ "this media."
+#~ msgstr ""
+#~ "कृपया आवश्यक प्लगिन को अधिष्ठापित करें औऱ Totem को इस  मीडिया को चलाने के लिये आरंभ "
+#~ "करें."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it does not have the "
+#~ "appropriate plugins to be able to read from the disc."
+#~ msgstr ""
+#~ "टोटेम ऐसे मीडिया (%s) नहीं दिखा सकता है क्योंकि डिस्क से पढ़ने के लिए आपके पास उचित "
+#~ "प्लगिन नहीं है."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because you do not have the "
+#~ "appropriate plugins to handle it."
+#~ msgstr ""
+#~ "Totem मीडिया के इस प्रकार को (%s) नहीं दिखा सकता है क्योंकि आपके पास उचित प्लगिन "
+#~ "नहीं है."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it is not supported."
+#~ msgstr ""
+#~ "टोटेम मीडिया के इस प्रकार को (%s) नहीं बजा सकता है क्योंकि यह समर्थित नहीं है."
+
+#~ msgid "Please insert another disc to play back."
+#~ msgstr "कृपया बजाने के लिए कृपया दूसरा डिस्क घुसाएँ."
+
+#~ msgid "Totem does not support playback of Audio CDs"
+#~ msgstr "ऑडियो CD के बजाने को टोटम समर्थन नहीं करता है"
+
+#~ msgid ""
+#~ "Please consider using a music player or a CD extractor to play this CD"
+#~ msgstr ""
+#~ "इस सीडी को चलाने के लिए कृपया किसी संगीत प्लेयर या सीडी एक्सट्रैक्टर का प्रयोग करने "
+#~ "की सोचें"
+
+#~ msgid "%d %%"
+#~ msgstr "%d %%"
+
+#~ msgid ""
+#~ "The requested audio output was not found. Please select another audio "
+#~ "output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "निवेदित ऑडियो आउटपुट नहीं मिला. कृपया अन्य ऑडियो आगत मल्टी मीडिया चयनक में चुनें."
+
+#~ msgid "Location not found."
+#~ msgstr "स्थान नहीं मिला."
+
+#~ msgid ""
+#~ "Could not open location; you might not have permission to open the file."
+#~ msgstr "स्थान नहीं खोल सका; उस स्थान को खोलने को आपको अनुमति नहीं है."
+
+#~ msgid ""
+#~ "The video output is in use by another application. Please close other "
+#~ "video applications, or select another video output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "वीडियो आगत अन्य अनुप्रयोग द्वारा प्रयुक्त होता है. कृपया अन्य वीडियो अनुप्रयोग बंद करें, "
+#~ "या अन्य वीडियो आगत को मल्टी मीडिया सिस्टम चयनक में चुनें."
+
+#~ msgid ""
+#~ "The audio output is in use by another application. Please select another "
+#~ "audio output in the Multimedia Systems Selector. You may want to consider "
+#~ "using a sound server."
+#~ msgstr ""
+#~ "ऑडियो आगत अन्य अनुप्रयोग के द्वारा प्रयोग में है. कृपया मल्टी मीडिया चयनक में अन्य "
+#~ "ऑडियो आगत को चुनें. आप एक ध्वनि सर्वर का प्रयोग करने का विचार कर सकते हैं."
+
+#~ msgid ""
+#~ "Failed to create a GStreamer play object. Please check your GStreamer "
+#~ "installation."
+#~ msgstr ""
+#~ "GStreamer प्ले ऑब्जेक्ट को बनाने में विफल. कृपया अपने GStreamer अधिष्ठापन को जांचें."
+
+#~ msgid ""
+#~ "Failed to open audio output. You may not have permission to open the "
+#~ "sound device, or the sound server may not be running. Please select "
+#~ "another audio output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "ऑडियो आगत खोलने में विफल. आपको ध्वनि युक्ति खोलने की अनुमति नहीं हो सकती है, या "
+#~ "ध्वनि सर्वर नहीं भी तल सकता है. कृपया मल्टीमीडिया सिस्टम चयनक में अन्य आगत फाइल खोलें."
+
+#~ msgid ""
+#~ "Could not find the audio output. You may need to install additional "
+#~ "GStreamer plugins, or select another audio output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "आडियो आगत को पाने में विफल. आपको GStreamer प्लगिन अतिरिक्त रूप से अधिष्ठापित करने "
+#~ "की जरूरत हो सकती है य मल्टी मीडिया सिस्टम चयनक में कृपया अन्य आडियो आगत चुनें."
+
+#~ msgid "BBC iPlayer"
+#~ msgstr "BBC iPlayer"
+
+#~ msgid ""
+#~ "Stream BBC programs from the last 7 days from the BBC iPlayer service."
+#~ msgstr "BBC प्रोग्राम को अंतिम 7 दिनों से BBC iPlayer सेवा से स्ट्रीम करें."
+
+#~| msgid "Error Listing Channel Categories"
+#~ msgid "Error listing channel categories"
+#~ msgstr "चैनल श्रेणियाँ के सूचीकरण में त्रुटि"
+
+#~ msgid ""
+#~ "There was an unknown error getting the list of television channels "
+#~ "available on BBC iPlayer."
+#~ msgstr "BBC iPlayer पर उपलब्ध टेलिविजन टैनल की सूची पाने में अज्ञात त्रुटि आई."
+
+#~ msgid "Loading…"
+#~ msgstr "लोड किया जा रहा है..."
+
+#~ msgid "Error getting programme feed"
+#~ msgstr "प्रोग्राम फीड पाने में त्रुटि"
+
+#~| msgid ""
+#~| "There was an unknown error getting the list of programmes for this "
+#~| "channel and category combination."
+#~ msgid ""
+#~ "There was an error getting the list of programmes for this channel and "
+#~ "category combination."
+#~ msgstr "इस चैनल और श्रेमी संयुग्म के लिए प्रोग्राम की सूची पाने में त्रुटि आई."
+
+#~ msgid ""
+#~ msgstr ""
+
+#~ msgid "Programme unavailable (\"%s\")"
+#~ msgstr "प्रोग्राम अनुपलब्ध (\"%s\")"
+
+#~ msgid ""
+#~ "A format string used to build the network service name used when "
+#~ "publishing playlists over the network. The following format placeholders "
+#~ "can be used: • %a: the program name as returned by g_get_application_name"
+#~ "() • %h: the machine's host name in title case • %u: the user's login "
+#~ "name in title case • %U: the user's real name • %%: the percent sign"
+#~ msgstr ""
+#~ "नेटवर्क के ऊपर प्लेलिस्ट को प्रकाशित करते समय प्रारूप स्ट्रिंग संजाल सेवा उपयोग किया गया "
+#~ "नाम का निर्माण करने के लिए प्रयोग किया जाता है.  निम्नलिखित प्रारूप प्लेसहोल्डर "
+#~ "इस्तेमाल किया जा सकता है: • %a:प्रोग्राम नाम के रूप में g_get_application_name() "
+#~ "द्वारा लौटे • %h: शीर्षक मामले में मशीन का होस्टनाम • %u: उपयोगकर्ता शीर्षक मामले में "
+#~ "लॉगिन नाम • %U: उपयोगकर्ता का वास्तविक नाम • %%: प्रतिशत चिह्न"
+
+#~ msgid "Format for network service name"
+#~ msgstr "संजाल सेवा नाम के लिए प्रारूप"
+
+#~ msgid "Publisher protocol to use"
+#~ msgstr "प्रकाशक प्रोटोकॉल जिसे इस्तेमाल में लेना है"
+
+#~ msgid ""
+#~ "The transport protocol to use when publishing playlists over the network."
+#~ msgstr ""
+#~ "संजाल के ऊपर प्लेलिस्ट को प्रकाशित करते समय प्रकाशक प्रोटोकॉल जिसे इस्तेमाल में लेना है."
+
+#~ msgid "Neighbors"
+#~ msgstr "पड़ोसी"
+
+#~ msgid "Publish Playlist"
+#~ msgstr "गीत-सूची प्रकाशित करें"
+
+#~ msgid "Share the current playlist via HTTP"
+#~ msgstr "मौजूदा प्लेलिस्ट HTTP से साझा करें"
+
+#~ msgid "Service _Name:"
+#~ msgstr "सेवा नाम (_N):"
+
+#~| msgid ""
+#~| "The name used for announcing the playlist service on the "
+#~| "network.\n"
+#~| "All occurrences of the string %u will be replaced by your name,\n"
+#~| "and %h will be replaced by your computer's host name."
+#~ msgid ""
+#~ "The name used for announcing the playlist service on the network.\n"
+#~ "All occurrences of the string %u will be replaced by your name,\n"
+#~ "and %h will be replaced by your computer's host name."
+#~ msgstr ""
+#~ "संजाल पर प्लेलिस्ट सेवा घोषणा के लिए नाम का इस्तेमाल किया.\n"
+#~ "स्ट्रिंग %u के सभी आवृत्तियों को आपके नाम से बदल दिया जाएगा, \n"
+#~ "और आपकी कंप्यूटर के होस्ट नाम से %h बदल दिया जाएगा."
+
+#~ msgid "Use _encrypted transport protocol (HTTPS)"
+#~ msgstr "गोपित परिवहन प्रोटोकॉल (HTTPS) का प्रयोग करें (_e)"
+
+#~ msgid "Save in _folder:"
+#~ msgstr "फ़ोल्डर में सहेजें (_f):"
+
+#~ msgid "Select a folder"
+#~ msgstr "फोल्डर चुनें"
+
+#~ msgid "_Name:"
+#~ msgstr "नाम (_N):"
+
+#~ msgid "There was an error saving the screenshot."
+#~ msgstr "स्क्रीनशॉट सहेजने में त्रुटि था."
+
+#~ msgid "Save Screenshot"
+#~ msgstr "सहेजें स्क्रीनशॉट"
 
 #~ msgid "Author:"
 #~ msgstr "लेखकः"
@@ -2754,16 +2815,16 @@
 #~ "Approximate network connection speed, used to select quality on media "
 #~ "over the network: \"0\" for 14.4 Kbps Modem, \"1\" for 19.2 Kbps Modem, "
 #~ "\"2\" for 28.8 Kbps Modem, \"3\" for 33.6 Kbps Modem, \"4\" for 34.4 Kbps "
-#~ "Modem, \"5\" for 56 Kbps Modem/ISDN, \"6\" for 112 Kbps Dual ISDN/DSL, \"7"
-#~ "\" for 256 Kbps DSL/Cable, \"8\" for 384 Kbps DSL/Cable, \"9\" for 512 "
+#~ "Modem, \"5\" for 56 Kbps Modem/ISDN, \"6\" for 112 Kbps Dual ISDN/DSL, "
+#~ "\"7\" for 256 Kbps DSL/Cable, \"8\" for 384 Kbps DSL/Cable, \"9\" for 512 "
 #~ "Kbps DSL/Cable, \"10\" for 1.5 Mbps T1/Intranet/LAN, \"11\" for Intranet/"
 #~ "LAN."
 #~ msgstr ""
 #~ "Approximate network connection speed, used to select quality on media "
 #~ "over the network: \"0\" for 14.4 Kbps Modem, \"1\" for 19.2 Kbps Modem, "
 #~ "\"2\" for 28.8 Kbps Modem, \"3\" for 33.6 Kbps Modem, \"4\" for 34.4 Kbps "
-#~ "Modem, \"5\" for 56 Kbps Modem/ISDN, \"6\" for 112 Kbps Dual ISDN/DSL, \"7"
-#~ "\" for 256 Kbps DSL/Cable, \"8\" for 384 Kbps DSL/Cable, \"9\" for 512 "
+#~ "Modem, \"5\" for 56 Kbps Modem/ISDN, \"6\" for 112 Kbps Dual ISDN/DSL, "
+#~ "\"7\" for 256 Kbps DSL/Cable, \"8\" for 384 Kbps DSL/Cable, \"9\" for 512 "
 #~ "Kbps DSL/Cable, \"10\" for 1.5 Mbps T1/Intranet/LAN, \"11\" for Intranet/"
 #~ "LAN."
 
@@ -3019,9 +3080,6 @@
 #~ msgid "Related Videos"
 #~ msgstr "संबंधित वीडियो"
 
-#~ msgid "Videos"
-#~ msgstr "वीडियो"
-
 #~ msgid "_Open in Web Browser"
 #~ msgstr "वेब ब्राउजर में खोलें (_O)"
 
diff -Nru totem-3.4.3/po/hu.po totem-3.6.2/po/hu.po
--- totem-3.4.3/po/hu.po	2012-04-12 16:13:29.000000000 +0000
+++ totem-3.6.2/po/hu.po	2012-08-29 23:07:45.000000000 +0000
@@ -4,872 +4,943 @@
 #
 # Laszlo Dvornik , 2004, 2005.
 # Gabor Kelemen , 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012.
+# Lukács Bence , 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: totem master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-04 17:03+0200\n"
-"PO-Revision-Date: 2012-04-04 17:03+0200\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
+"cgi?product=totem&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2012-07-19 15:25+0000\n"
+"PO-Revision-Date: 2012-07-29 12:48+0200\n"
 "Last-Translator: Gabor Kelemen \n"
-"Language-Team: Hungarian \n"
-"Language: \n"
+"Language-Team: Magyar \n"
+"Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 1.0\n"
 
-#: ../data/fullscreen.ui.h:1
-msgid "Leave Fullscreen"
-msgstr "Teljes képernyő elhagyása"
-
-#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:102
-msgid "Time:"
-msgstr "Idő:"
-
-#: ../data/playlist.ui.h:1
-msgid "Add..."
-msgstr "Hozzáadás…"
-
-#: ../data/playlist.ui.h:2 ../data/video-list.ui.h:2
-msgid "Copy the location to the clipboard"
-msgstr "A hely másolása a vágólapra"
+#: ../browser-plugin/totem-plugin-viewer.c:352 ../src/totem-object.c:1180
+#: ../src/totem-object.c:1650 ../src/totem-statusbar.c:115
+msgid "Stopped"
+msgstr "Leállítva"
 
-#: ../data/playlist.ui.h:3
-msgid "Move Down"
-msgstr "Lefelé mozgatás"
+#: ../browser-plugin/totem-plugin-viewer.c:364 ../src/totem-object.c:1173
+msgid "Paused"
+msgstr "Szüneteltetve"
 
-#: ../data/playlist.ui.h:4
-msgid "Move Up"
-msgstr "Felfelé mozgatás"
+#: ../browser-plugin/totem-plugin-viewer.c:368 ../src/totem-object.c:1166
+msgid "Playing"
+msgstr "Lejátszás"
 
-#: ../data/playlist.ui.h:5
-msgid "Remove"
-msgstr "Eltávolítás"
+#: ../browser-plugin/totem-plugin-viewer.c:386
+#: ../src/plugins/screensaver/totem-screensaver.c:97
+msgid "Playing a movie"
+msgstr "Film lejátszása"
 
-#: ../data/playlist.ui.h:6
-msgid "Remove file from playlist"
-msgstr "Fájl eltávolítása a lejátszólistáról"
+#: ../browser-plugin/totem-plugin-viewer.c:443
+msgid "No URI to play"
+msgstr "Nincs lejátszandó URI cím"
 
-#: ../data/playlist.ui.h:7
-msgid "Save Playlist..."
-msgstr "Lejátszólista mentése…"
+#: ../browser-plugin/totem-plugin-viewer.c:676
+#: ../browser-plugin/totem-plugin-viewer.c:1700
+msgid "Totem Movie Player"
+msgstr "Totem médialejátszó"
 
-#: ../data/playlist.ui.h:8 ../data/totem.ui.h:77
-msgid "Select a file to use for text subtitles"
-msgstr "Válassza ki a feliratfájlt"
+#. translators: this is:
+#. * Open With ApplicationName
+#. * as in nautilus' right-click menu
+#: ../browser-plugin/totem-plugin-viewer.c:1120
+#, c-format
+msgid "_Open with \"%s\""
+msgstr "Megnyitás e_zzel: „%s”"
 
-#: ../data/playlist.ui.h:9 ../data/video-list.ui.h:4
-msgid "_Copy Location"
-msgstr "Hely _másolása"
+#: ../browser-plugin/totem-plugin-viewer.c:1341 ../src/totem-object.c:2475
+msgid "An error occurred"
+msgstr "Hiba történt"
 
-#: ../data/playlist.ui.h:10
-msgid "_Remove"
-msgstr "_Eltávolítás"
+#: ../browser-plugin/totem-plugin-viewer.c:2033
+msgid "No playlist or playlist empty"
+msgstr "Nem létező vagy üres lejátszólista"
 
-#: ../data/playlist.ui.h:11 ../data/totem.ui.h:141
-msgid "_Select Text Subtitles..."
-msgstr "_Felirat kiválasztása…"
+#: ../browser-plugin/totem-plugin-viewer.c:2128
+msgid "Movie browser plugin"
+msgstr "Médialejátszó böngészőbővítmény"
 
-#: ../data/properties.ui.h:1
-msgid "Album:"
-msgstr "Album:"
+#: ../browser-plugin/totem-plugin-viewer.c:2144 ../src/totem.c:239
+msgid "Could not initialize the thread-safe libraries."
+msgstr "A szálbiztos programkönyvtárak nem készíthetők elő."
 
-#: ../data/properties.ui.h:2
-msgid "Artist:"
-msgstr "Előadó:"
+#: ../browser-plugin/totem-plugin-viewer.c:2144
+msgid "Verify your system installation. The Totem plugin will now exit."
+msgstr "Ellenőrizze a rendszer telepítését. A Totem bővítmény most kilép."
 
-#: ../data/properties.ui.h:3 ../data/totem.ui.h:23
-#: ../src/totem-properties-view.c:268
-msgid "Audio"
-msgstr "Hang"
+#: ../data/fullscreen.ui.h:1
+msgid "Leave Fullscreen"
+msgstr "Teljes képernyő elhagyása"
 
-#: ../data/properties.ui.h:4
-msgid "Bitrate:"
-msgstr "Bitsebesség:"
+#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:81
+msgid "Time:"
+msgstr "Idő:"
 
-#: ../data/properties.ui.h:5
-msgid "Channels:"
-msgstr "Csatornák:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
+msgid "Allow the screensaver to activate when playing audio"
+msgstr "A képernyővédő aktivizálódhat hang lejátszása esetén"
 
-#: ../data/properties.ui.h:6
-msgid "Codec:"
-msgstr "Kodek:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
+msgid ""
+"Allow the screensaver to activate when playing audio. Disable if you have "
+"monitor-powered speakers."
+msgstr ""
+"A képernyővédő aktivizálódhat hang lejátszása esetén. Tiltsa le, ha "
+"monitorról működtetett hangszórókat használ."
 
-#: ../data/properties.ui.h:7
-msgid "Comment:"
-msgstr "Megjegyzés:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
+msgid "Show visual effects when no video is displayed"
+msgstr "Vizuális effektusok megjelenítése, amikor nincs videólejátszás"
 
-#: ../data/properties.ui.h:8
-msgid "Container:"
-msgstr "Tároló:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
+msgid "Show visual effects when playing an audio only file."
+msgstr "Vizuális effektusok megjelenítése hangfájl lejátszásánál."
 
-#: ../data/properties.ui.h:9
-msgid "Dimensions:"
-msgstr "Dimenziók:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
+msgid "Name of the visual effects plugin"
+msgstr "A vizuáliseffektus-bővítmény neve"
 
-#: ../data/properties.ui.h:10
-msgid "Duration:"
-msgstr "Időtartam:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
+msgid "The brightness of the video"
+msgstr "A videó fényerőssége"
 
-#: ../data/properties.ui.h:11
-msgid "Framerate:"
-msgstr "Képkockasebesség:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
+msgid "The contrast of the video"
+msgstr "A videó kontrasztja"
 
-#: ../data/properties.ui.h:12 ../data/totem.ui.h:41
-msgid "General"
-msgstr "Általános"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
+msgid "The hue of the video"
+msgstr "A videó árnyalata"
 
-#: ../data/properties.ui.h:13
-msgid "Sample rate:"
-msgstr "Mintavételezés:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
+msgid "The saturation of the video"
+msgstr "A videó telítettsége"
 
-#: ../data/properties.ui.h:14
-msgid "Title:"
-msgstr "Cím:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
+msgid "Resize the canvas automatically on file load"
+msgstr "Vászon automatikus átméretezése fájl betöltésekor"
 
-#: ../data/properties.ui.h:15 ../data/totem.ui.h:104
-#: ../src/totem-properties-view.c:270
-msgid "Video"
-msgstr "Videó"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
+msgid "Repeat mode"
+msgstr "Ismétlés mód"
 
-#: ../data/properties.ui.h:16
-msgid "Year:"
-msgstr "Év:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
+msgid "Shuffle mode"
+msgstr "Véletlenszerű lejátszás mód"
 
-#: ../data/video-list.ui.h:1
-msgid "Add the video to the playlist"
-msgstr "A videó hozzáadása a lejátszólistához"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
+msgid "Whether to disable deinterlacing for interlaced movies"
+msgstr "A váltottsoros videók váltottsorosság-mentesítése letiltandó-e"
 
-#: ../data/video-list.ui.h:3 ../src/totem-dnd-menu.c:97
-msgid "_Add to Playlist"
-msgstr "_Hozzáadás a lejátszólistához"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
+msgid "Whether to enable debug for the playback engine"
+msgstr "A hibakeresés engedélyezve legyen-e a lejátszómotornál"
 
-#. Title
-#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:53
-#: ../src/totem-object.c:1667
-msgid "Movie Player"
-msgstr "Médialejátszó"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
+msgid "Type of audio output to use"
+msgstr "A használandó hangkimenet típusa"
 
-#: ../data/totem.desktop.in.in.in.h:2
-msgid "Play movies and songs"
-msgstr "Filmek és dalok lejátszása"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
+msgid "Visualization quality setting"
+msgstr "Vizualizáció minőségbeállítása"
 
-#: ../data/totem.ui.h:1
-msgid "1.5 Mbps T1/Intranet/LAN"
-msgstr "1.5 Mbps T1/Intranet/LAN"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
+msgid "Quality setting for the audio visualization."
+msgstr "Minőségbeállítás a hangvizualizációhoz."
 
-#: ../data/totem.ui.h:2
-msgid "112 Kbps Dual ISDN/DSL"
-msgstr "112 Kbps duál ISDN/DSL"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
+msgid "Network buffering threshold"
+msgstr "Hálózati pufferelés küszöbszintje"
 
-#: ../data/totem.ui.h:3
-msgid "14.4 Kbps Modem"
-msgstr "14.4 Kbps modem"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
+msgid ""
+"Amount of data to buffer for network streams before starting to display the "
+"stream (in seconds)."
+msgstr ""
+"Pufferelendő adat mennyisége hálózati folyamok esetén a folyam "
+"megjelenítésének megkezdése előtt (másodpercekben)."
 
-#: ../data/totem.ui.h:4
-msgid "16:9 (Widescreen)"
-msgstr "16:9 (szélesvásznú)"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
+msgid "Subtitle font"
+msgstr "Feliratok betűkészlete"
 
-#: ../data/totem.ui.h:5
-msgid "19.2 Kbps Modem"
-msgstr "19.2 Kbps modem"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
+msgid "Pango font description for subtitle rendering."
+msgstr "A feliratok megjelenítéséhez használt Pango betűkészlet neve."
 
-#: ../data/totem.ui.h:6
-msgid "2.11:1 (DVB)"
-msgstr "2.11:1 (DVB)"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
+msgid "Subtitle encoding"
+msgstr "Felirat betűkészlete"
 
-#: ../data/totem.ui.h:7
-msgid "256 Kbps DSL/Cable"
-msgstr "256 Kbps DSL/kábel"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
+msgid "Encoding character set for subtitle."
+msgstr "Felirat kódolása."
 
-#: ../data/totem.ui.h:8
-msgid "28.8 Kbps Modem"
-msgstr "28.8 Kbps modem"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
+msgid "Default location for the \"Open...\" dialogs"
+msgstr "Az alapértelmezett hely a „Megnyitás…” ablakokban"
 
-#: ../data/totem.ui.h:9
-msgid "33.6 Kbps Modem"
-msgstr "33.6 Kbps modem"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
+msgid ""
+"Default location for the \"Open...\" dialogs. Default is the current "
+"directory."
+msgstr ""
+"A „Megnyitás…” ablakokban az alapértelmezett hely, az alapértelmezés az "
+"aktuális könyvtár."
 
-#: ../data/totem.ui.h:10
-msgid "34.4 Kbps Modem"
-msgstr "34.4 Kbps modem"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
+msgid "Default location for the \"Take Screenshot\" dialogs"
+msgstr "Az alapértelmezett hely a „Képernyőkép készítése” ablakokban"
 
-#: ../data/totem.ui.h:11
-msgid "384 Kbps DSL/Cable"
-msgstr "384 Kbps DSL/kábel"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
+msgid ""
+"Default location for the \"Take Screenshot\" dialogs. Default is the "
+"Pictures directory."
+msgstr ""
+"A „Képernyőkép készítése” ablakokban az alapértelmezett hely, az "
+"alapértelmezés a Képek könyvtár."
 
-#: ../data/totem.ui.h:12
-msgid "4-channel"
-msgstr "4 csatorna"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
+msgid "Whether to disable the plugins in the user's home directory"
+msgstr "A felhasználó saját könyvtárában található bővítmények letiltandók-e"
 
-#: ../data/totem.ui.h:13
-msgid "4.1-channel"
-msgstr "4.1 csatorna"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
+msgid "Whether to disable the keyboard shortcuts"
+msgstr "A gyorsbillentyűk letiltandók-e"
 
-#: ../data/totem.ui.h:14
-msgid "4:3 (TV)"
-msgstr "4:3 (TV)"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
+msgid "Whether to autoload text subtitle files when a movie is loaded"
+msgstr "A feliratfájlok automatikusan betöltendők-e film betöltésekor"
 
-#: ../data/totem.ui.h:15
-msgid "5.0-channel"
-msgstr "5.0 csatorna"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
+msgid "Whether to autoload external chapter files when a movie is loaded"
+msgstr "A külső fejezetfájlok automatikusan betöltendők-e film betöltésekor"
 
-#: ../data/totem.ui.h:16
-msgid "5.1-channel"
-msgstr "5.1 csatorna"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
+msgid ""
+"Whether to remember the position of played audio/video files when pausing or "
+"closing them"
+msgstr ""
+"A lejátszott hang/videófájlok pozíciója megjegyzendő-e szüneteltetéskor vagy "
+"bezárásukkor"
 
-#: ../data/totem.ui.h:17
-msgid "512 Kbps DSL/Cable"
-msgstr "512 Kbps DSL/kábel"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
+msgid "Active plugins list"
+msgstr "Aktív bővítmények listája"
 
-#: ../data/totem.ui.h:18
-msgid "56 Kbps Modem/ISDN"
-msgstr "56 Kbps modem/ISDN"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+msgid ""
+"A list of the names of the plugins which are currently active (loaded and "
+"running)."
+msgstr "A jelenleg aktív (betöltött és futó) bővítmények neveinek listája."
 
-#: ../data/totem.ui.h:19
-msgid "AC3 Passthrough"
-msgstr "AC3 Passthrough"
+#: ../data/playlist.ui.h:1
+msgid "_Remove"
+msgstr "_Eltávolítás"
 
-#: ../data/totem.ui.h:20
-msgid "A_udio Menu"
-msgstr "_Hang menü"
+#: ../data/playlist.ui.h:2
+msgid "Remove file from playlist"
+msgstr "Fájl eltávolítása a lejátszólistáról"
 
-#: ../data/totem.ui.h:21
-msgid "About this application"
-msgstr "Az alkalmazás névjegye"
+#: ../data/playlist.ui.h:3 ../data/video-list.ui.h:3
+msgid "_Copy Location"
+msgstr "Hely _másolása"
 
-#: ../data/totem.ui.h:22
-msgctxt "Aspect ratio"
-msgid "Auto"
-msgstr "Auto"
+#: ../data/playlist.ui.h:4 ../data/video-list.ui.h:4
+msgid "Copy the location to the clipboard"
+msgstr "A hely másolása a vágólapra"
 
-#: ../data/totem.ui.h:24
-msgid "Audio Output"
-msgstr "Hangkimenet"
+#: ../data/playlist.ui.h:5 ../data/totem.ui.h:71
+msgid "_Select Text Subtitles..."
+msgstr "_Felirat kiválasztása…"
 
-#: ../data/totem.ui.h:25
-msgid "Clear the playlist"
-msgstr "Lejátszólista törlése"
+#: ../data/playlist.ui.h:6 ../data/totem.ui.h:72
+msgid "Select a file to use for text subtitles"
+msgstr "Válassza ki a feliratfájlt"
 
-#: ../data/totem.ui.h:26
-msgid "Co_ntrast:"
-msgstr "Ko_ntraszt:"
+#: ../data/playlist.ui.h:7
+msgid "Add..."
+msgstr "Hozzáadás…"
 
-#: ../data/totem.ui.h:27
-msgid "Color Balance"
-msgstr "Színegyensúly"
+#: ../data/playlist.ui.h:8
+msgid "Remove"
+msgstr "Eltávolítás"
 
-#: ../data/totem.ui.h:28
-msgid "Configure plugins to extend the application"
-msgstr "Az alkalmazás bővítményeinek beállítása"
+#: ../data/playlist.ui.h:9
+msgid "Save Playlist..."
+msgstr "Lejátszólista mentése…"
 
-#: ../data/totem.ui.h:29
-msgid "Configure the application"
-msgstr "Az alkalmazás beállítása"
+#: ../data/playlist.ui.h:10
+msgid "Move Up"
+msgstr "Felfelé mozgatás"
 
-#: ../data/totem.ui.h:30
-msgid "Connection _speed:"
-msgstr "Csatlakozási _sebesség:"
+#: ../data/playlist.ui.h:11
+msgid "Move Down"
+msgstr "Lefelé mozgatás"
 
-#: ../data/totem.ui.h:31
-msgid "Decrease volume"
-msgstr "Hangerő csökkentése"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:2
+msgid "Normal"
+msgstr "Normál"
 
-#: ../data/totem.ui.h:32
-msgid "Disable _deinterlacing of interlaced videos"
-msgstr "_Váltottsoros videók váltottsorosság-mentesítésének letiltása"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:4
+msgid "Large"
+msgstr "Nagy"
 
-#: ../data/totem.ui.h:33
-msgid "Disable screensaver when playing "
-msgstr "Képernyővédő letiltása ennek lejátszásakor:"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:6
+msgid "Extra Large"
+msgstr "Nagyon nagy"
 
-#. Tab label in the Preferences dialogue
-#: ../data/totem.ui.h:35
-msgid "Display"
-msgstr "Megjelenítés"
+#: ../data/preferences.ui.h:7 ../src/backend/bacon-video-widget.c:5498
+#: ../src/totem-properties-view.c:231
+msgid "Stereo"
+msgstr "Sztereó"
 
-#: ../data/totem.ui.h:36
-msgid "Eject the current disc"
-msgstr "Az aktuális lemez kiadása"
+#: ../data/preferences.ui.h:8
+msgid "4-channel"
+msgstr "4 csatorna"
 
-#: ../data/totem.ui.h:37
-msgid "External Chapters"
-msgstr "Külső fejezetek"
+#: ../data/preferences.ui.h:9
+msgid "4.1-channel"
+msgstr "4.1 csatorna"
 
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:39
-msgid "Extra Large"
-msgstr "Nagyon nagy"
+#: ../data/preferences.ui.h:10
+msgid "5.0-channel"
+msgstr "5.0 csatorna"
 
-#: ../data/totem.ui.h:40
-msgid "Fit Window to Movie"
-msgstr "Ablak igazítása a filmhez"
+#: ../data/preferences.ui.h:11
+msgid "5.1-channel"
+msgstr "5.1 csatorna"
 
-#: ../data/totem.ui.h:42
-msgid "Go to the DVD menu"
-msgstr "Ugrás a DVD menüre"
+#: ../data/preferences.ui.h:12
+msgid "AC3 Passthrough"
+msgstr "AC3 Passthrough"
 
-#: ../data/totem.ui.h:43
-msgid "Go to the angle menu"
-msgstr "Ugrás a szög menüre"
+#: ../data/preferences.ui.h:13
+msgid "Totem Preferences"
+msgstr "Totem beállításai"
 
-#: ../data/totem.ui.h:44
-msgid "Go to the audio menu"
-msgstr "Ugrás a hang menüre"
+#: ../data/preferences.ui.h:14
+msgid "Playback"
+msgstr "Lejátszás"
 
-#: ../data/totem.ui.h:45
-msgid "Go to the chapter menu"
-msgstr "Ugrás a fejezet menüre"
+#: ../data/preferences.ui.h:15
+msgid "Start playing files from last position"
+msgstr "Fájlok lejátszásának indítása az utolsó pozícióból"
 
-#: ../data/totem.ui.h:46
-msgid "Go to the title menu"
-msgstr "Ugrás a cím menüre"
+#: ../data/preferences.ui.h:16
+msgid "Text Subtitles"
+msgstr "Feliratok"
 
-#: ../data/totem.ui.h:47
-msgid "Help contents"
-msgstr "Súgótartalom"
+#: ../data/preferences.ui.h:17
+msgid "_Load subtitle files when movie is loaded"
+msgstr "Feliratfájlok be_töltése a film betöltésekor"
 
-#: ../data/totem.ui.h:48
-msgid "Increase volume"
-msgstr "Hangerő növelése"
+#: ../data/preferences.ui.h:18
+msgid "_Font:"
+msgstr "_Betűkészlet:"
 
-#: ../data/totem.ui.h:49
-msgid "Intranet/LAN"
-msgstr "Intranet/LAN"
+#: ../data/preferences.ui.h:19
+msgid "_Encoding:"
+msgstr "Kó_dolás:"
 
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:51
-msgid "Large"
-msgstr "Nagy"
+#: ../data/preferences.ui.h:20
+msgid "External Chapters"
+msgstr "Külső fejezetek"
 
-#: ../data/totem.ui.h:52
+#: ../data/preferences.ui.h:21
 msgid "Load _chapter files when movie is loaded"
 msgstr "_Fejezetfájlok betöltése a film betöltésekor"
 
-#: ../data/totem.ui.h:54
-msgid "Networking"
-msgstr "Hálózatkezelés"
+#: ../data/preferences.ui.h:22 ../data/properties.ui.h:1
+msgid "General"
+msgstr "Általános"
 
-#: ../data/totem.ui.h:55
-msgid "Next chapter or movie"
-msgstr "Következő fejezet vagy film"
+#. Tab label in the Preferences dialogue
+#: ../data/preferences.ui.h:24
+msgid "Display"
+msgstr "Megjelenítés"
 
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:57
-msgid "Normal"
-msgstr "Normál"
+#: ../data/preferences.ui.h:25
+msgid "_Resize the window when a new video is loaded"
+msgstr "Ablak átmé_retezése új videó betöltésekor"
 
-#: ../data/totem.ui.h:58
-msgid "Open _Location..."
-msgstr "He_ly megnyitása…"
+#: ../data/preferences.ui.h:26
+msgid "Disable _deinterlacing of interlaced videos"
+msgstr "_Váltottsoros videók váltottsorosság-mentesítésének letiltása"
 
-#: ../data/totem.ui.h:59
-msgid "Open a file"
-msgstr "Fájl megnyitása"
+#: ../data/preferences.ui.h:27
+msgid "Disable screensaver when playing "
+msgstr "Képernyővédő letiltása ennek lejátszásakor:"
 
-#: ../data/totem.ui.h:60
-msgid "Open a non-local file"
-msgstr "Nem helyi fájl megnyitása"
+#: ../data/preferences.ui.h:28 ../data/properties.ui.h:9
+#: ../src/totem-properties-view.c:273
+msgid "Video"
+msgstr "Videó"
 
-#: ../data/totem.ui.h:61
-msgid "Play / P_ause"
-msgstr "Lejátszás/Szü_net"
+#: ../data/preferences.ui.h:29
+msgid "Video or Audio"
+msgstr "Videó vagy hang"
 
-#: ../data/totem.ui.h:62
-msgid "Play or pause the movie"
-msgstr "A film lejátszása vagy szüneteltetése"
+#: ../data/preferences.ui.h:30
+msgid "Visual Effects"
+msgstr "Vizuális effektusok"
 
-#: ../data/totem.ui.h:63
-msgid "Playback"
-msgstr "Lejátszás"
+#: ../data/preferences.ui.h:31
+msgid "Show _visual effects when an audio file is played"
+msgstr "_Vizuális effektusok megjelenítése hangfájl lejátszásánál"
 
-#: ../data/totem.ui.h:64
-msgid "Plugins..."
-msgstr "Bővítmények…"
+#: ../data/preferences.ui.h:32
+msgid "_Type of visualization:"
+msgstr "Vizualizáció _típusa:"
 
-#: ../data/totem.ui.h:65
-msgid "Prefere_nces"
-msgstr "_Beállítások"
+#: ../data/preferences.ui.h:33
+msgid "Visualization _size:"
+msgstr "Vizualizáció _mérete:"
 
-#: ../data/totem.ui.h:66
-msgid "Previous chapter or movie"
-msgstr "Előző fejezet vagy film"
+#: ../data/preferences.ui.h:34
+msgid "Color Balance"
+msgstr "Színegyensúly"
 
-#: ../data/totem.ui.h:67
-msgid "Quit the program"
-msgstr "Kilépés a programból"
+#: ../data/preferences.ui.h:35
+msgid "_Brightness:"
+msgstr "_Fényerősség:"
 
-#: ../data/totem.ui.h:68
+#: ../data/preferences.ui.h:36
+msgid "Co_ntrast:"
+msgstr "Ko_ntraszt:"
+
+#: ../data/preferences.ui.h:37
+msgid "Sat_uration:"
+msgstr "_Telítettség:"
+
+#: ../data/preferences.ui.h:38
+msgid "_Hue:"
+msgstr "Á_rnyalat:"
+
+#: ../data/preferences.ui.h:39
 msgid "Reset to _Defaults"
 msgstr "Alapértelmezések _visszaállítása"
 
-#: ../data/totem.ui.h:69
-msgid "Resize _1:1"
-msgstr "Átméretezés _1:1"
+#: ../data/preferences.ui.h:40
+msgid "Audio Output"
+msgstr "Hangkimenet"
 
-#: ../data/totem.ui.h:70
-msgid "Resize _2:1"
-msgstr "Átméretezés _2:1"
+#: ../data/preferences.ui.h:41
+msgid "_Audio output type:"
+msgstr "_Hangkimenet típusa:"
 
-#: ../data/totem.ui.h:71
-msgid "Resize to double the original video size"
-msgstr "Átméretezés a videóméret duplájára"
+#: ../data/preferences.ui.h:42 ../data/properties.ui.h:14
+#: ../src/totem-properties-view.c:271
+msgid "Audio"
+msgstr "Hang"
 
-#: ../data/totem.ui.h:72
-msgid "Resize to half the original video size"
-msgstr "Átméretezés a videóméret felére"
+#: ../data/properties.ui.h:2
+msgid "Title:"
+msgstr "Cím:"
 
-#: ../data/totem.ui.h:73
-msgid "Resize to the original video size"
-msgstr "Átméretezés az eredeti videóméretre"
+#: ../data/properties.ui.h:3
+msgid "Artist:"
+msgstr "Előadó:"
 
-#: ../data/totem.ui.h:74
-msgid "S_idebar"
-msgstr "_Oldalsáv"
+#: ../data/properties.ui.h:4
+msgid "Duration:"
+msgstr "Időtartam:"
 
-#: ../data/totem.ui.h:75
-msgid "S_ubtitles"
-msgstr "_Feliratok"
+#: ../data/properties.ui.h:5
+msgid "Year:"
+msgstr "Év:"
 
-#: ../data/totem.ui.h:76
-msgid "Sat_uration:"
-msgstr "_Telítettség:"
+#: ../data/properties.ui.h:6
+msgid "Album:"
+msgstr "Album:"
 
-#: ../data/totem.ui.h:78
-msgid "Set the repeat mode"
-msgstr "Ismétlés mód beállítása"
+#: ../data/properties.ui.h:7
+msgid "Comment:"
+msgstr "Megjegyzés:"
 
-#: ../data/totem.ui.h:79
-msgid "Set the shuffle mode"
-msgstr "Véletlenszerű lejátszás mód beállítása"
+#: ../data/properties.ui.h:8
+msgid "Container:"
+msgstr "Tároló:"
 
-#: ../data/totem.ui.h:80
-msgid "Sets 16:9 (widescreen) aspect ratio"
-msgstr "16:9-es (szélesvásznú) méretarány beállítása"
+#: ../data/properties.ui.h:10
+msgid "Dimensions:"
+msgstr "Dimenziók:"
 
-#: ../data/totem.ui.h:81
-msgid "Sets 2.11:1 (DVB) aspect ratio"
-msgstr "2.11:1-es (DVB) méretarány beállítása"
+#: ../data/properties.ui.h:11
+msgid "Codec:"
+msgstr "Kodek:"
 
-#: ../data/totem.ui.h:82
-msgid "Sets 4:3 (TV) aspect ratio"
-msgstr "4:3-as (tévé) méretarány beállítása"
+#: ../data/properties.ui.h:12
+msgid "Framerate:"
+msgstr "Képkockasebesség:"
 
-#: ../data/totem.ui.h:83
-msgid "Sets automatic aspect ratio"
-msgstr "Automatikus méretarány beállítása"
+#: ../data/properties.ui.h:13
+msgid "Bitrate:"
+msgstr "Bitsebesség:"
 
-#: ../data/totem.ui.h:84
-msgid "Sets square aspect ratio"
-msgstr "Négyzetes méretarány beállítása"
+#: ../data/properties.ui.h:15
+msgid "Sample rate:"
+msgstr "Mintavételezés:"
 
-#: ../data/totem.ui.h:85
-msgid "Show _Controls"
-msgstr "_Vezérlés megjelenítése"
+#: ../data/properties.ui.h:16
+msgid "Channels:"
+msgstr "Csatornák:"
 
-#: ../data/totem.ui.h:86
-msgid "Show _visual effects when an audio file is played"
-msgstr "_Vizuális effektusok megjelenítése hangfájl lejátszásánál"
+#. Title
+#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:80 ../src/totem.c:238
+#: ../src/totem.c:247 ../src/totem-menu.c:790 ../src/totem-object.c:1658
+msgid "Videos"
+msgstr "Videók"
 
-#: ../data/totem.ui.h:87
-msgid "Show controls"
-msgstr "Vezérlés megjelenítése"
+#: ../data/totem.desktop.in.in.in.h:2
+msgid "Play movies"
+msgstr "Filmek lejátszása"
 
-#: ../data/totem.ui.h:88
-msgid "Show or hide the sidebar"
-msgstr "Az oldalsáv mutatása vagy elrejtése"
+#: ../data/totem.desktop.in.in.in.h:3
+msgid "Video;Movie;Film;Clip;Series;Player;DVD;TV;Disc;"
+msgstr "Videó;Film;Klip;Sorozat;Lejátszó;Lejátszás;DVD;TV;Lemez;"
 
-#: ../data/totem.ui.h:89
-msgid "Shuff_le Mode"
-msgstr "_Véletlenszerű lejátszás mód"
+#: ../data/totem.ui.h:1
+msgid "_Open"
+msgstr "_Megnyitás"
 
-#: ../data/totem.ui.h:90
-msgid "Skip _Backwards"
-msgstr "Ugrás _vissza"
+#: ../data/totem.ui.h:2
+msgid "Open _Location"
+msgstr "He_ly megnyitása"
 
-#: ../data/totem.ui.h:91
-msgid "Skip _Forward"
-msgstr "Ugrás _előre"
+#: ../data/totem.ui.h:3
+msgid "_Fullscreen"
+msgstr "_Teljes képernyő"
 
-#: ../data/totem.ui.h:92
-msgid "Skip backwards"
-msgstr "Ugrás vissza"
+#: ../data/totem.ui.h:4
+msgid "Prefere_nces"
+msgstr "_Beállítások"
 
-#: ../data/totem.ui.h:93
-msgid "Skip forward"
-msgstr "Ugrás előre"
+#: ../data/totem.ui.h:5
+msgid "Shuff_le"
+msgstr "_Véletlenszerű"
 
-#: ../data/totem.ui.h:94
-msgid "Square"
-msgstr "Négyzet"
+#: ../data/totem.ui.h:6
+msgid "_Repeat"
+msgstr "_Ismétlés mód"
 
-#: ../data/totem.ui.h:95
-msgid "Start playing files from last position"
-msgstr "Fájlok lejátszásának indítása az utolsó pozícióból"
+#: ../data/totem.ui.h:7
+msgid "_Quit"
+msgstr "_Kilépés"
 
-#: ../data/totem.ui.h:96 ../src/totem-properties-view.c:228
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5593
-msgid "Stereo"
-msgstr "Sztereó"
+#: ../data/totem.ui.h:8
+msgid "_Movie"
+msgstr "_Film"
 
-#: ../data/totem.ui.h:97
-msgid "Switch An_gles"
-msgstr "Szögek _váltása"
+#: ../data/totem.ui.h:9
+msgid "_Eject"
+msgstr "_Kiadás"
 
-#: ../data/totem.ui.h:98
-msgid "Switch camera angles"
-msgstr "Kameraszögek váltása"
+#: ../data/totem.ui.h:10
+msgid "Eject the current disc"
+msgstr "Az aktuális lemez kiadása"
 
-#: ../data/totem.ui.h:99
-msgid "Switch to fullscreen"
-msgstr "Átváltás teljes képernyőre"
+#: ../data/totem.ui.h:11
+msgid "_Properties"
+msgstr "_Tulajdonságok"
 
-#: ../data/totem.ui.h:100
-msgid "Text Subtitles"
-msgstr "Feliratok"
+#: ../data/totem.ui.h:12
+msgid "View the properties of the current stream"
+msgstr "A jelenlegi műsor tulajdonságainak megjelenítése"
 
-#: ../data/totem.ui.h:101
-msgid "Time seek bar"
-msgstr "Keresősáv"
+#: ../data/totem.ui.h:13
+msgid "Play / P_ause"
+msgstr "Lejátszás/Szü_net"
 
-#: ../data/totem.ui.h:103
-msgid "Totem Preferences"
-msgstr "Totem beállításai"
+#: ../data/totem.ui.h:14
+msgid "Play or pause the movie"
+msgstr "A film lejátszása vagy szüneteltetése"
 
-#: ../data/totem.ui.h:105
-msgid "Video or Audio"
-msgstr "Videó vagy hang"
+#: ../data/totem.ui.h:15
+msgid "_Edit"
+msgstr "S_zerkesztés"
 
-#: ../data/totem.ui.h:106
-msgid "View the properties of the current stream"
-msgstr "A jelenlegi műsor tulajdonságainak megjelenítése"
+#: ../data/totem.ui.h:16
+msgid "_Clear Playlist"
+msgstr "Lejátszólista _törlése"
 
-#: ../data/totem.ui.h:107
-msgid "Visual Effects"
-msgstr "Vizuális effektusok"
+#: ../data/totem.ui.h:17
+msgid "Clear the playlist"
+msgstr "Lejátszólista törlése"
 
-#: ../data/totem.ui.h:108
-msgid "Visualization _size:"
-msgstr "Vizualizáció _mérete:"
+#: ../data/totem.ui.h:18
+msgid "Plugins..."
+msgstr "Bővítmények…"
 
-#: ../data/totem.ui.h:109
-msgid "Volume _Down"
-msgstr "Hangerő _le"
+#: ../data/totem.ui.h:19
+msgid "Configure plugins to extend the application"
+msgstr "Az alkalmazás bővítményeinek beállítása"
 
-#: ../data/totem.ui.h:110
-msgid "Volume _Up"
-msgstr "Hangerő _fel"
+#: ../data/totem.ui.h:20
+msgid "_View"
+msgstr "_Nézet"
+
+#: ../data/totem.ui.h:21
+msgid "Fit Window to Movie"
+msgstr "Ablak igazítása a filmhez"
+
+#: ../data/totem.ui.h:22
+msgid "_Resize 1:2"
+msgstr "Át_méretezés 1:2"
+
+#: ../data/totem.ui.h:23
+msgid "Resize to half the original video size"
+msgstr "Átméretezés a videóméret felére"
 
-#: ../data/totem.ui.h:111
-msgid "Zoom In"
-msgstr "Nagyítás"
+#: ../data/totem.ui.h:24
+msgid "Resize _1:1"
+msgstr "Átméretezés _1:1"
 
-#: ../data/totem.ui.h:112
-msgid "Zoom in"
-msgstr "Nagyítás"
+#: ../data/totem.ui.h:25
+msgid "Resize to the original video size"
+msgstr "Átméretezés az eredeti videóméretre"
 
-#: ../data/totem.ui.h:113
-msgid "_About"
-msgstr "_Névjegy"
+#: ../data/totem.ui.h:26
+msgid "Resize _2:1"
+msgstr "Átméretezés _2:1"
 
-#: ../data/totem.ui.h:114
-msgid "_Angle Menu"
-msgstr "_Szög menü"
+#: ../data/totem.ui.h:27
+msgid "Resize to double the original video size"
+msgstr "Átméretezés a videóméret duplájára"
 
-#: ../data/totem.ui.h:115
+#: ../data/totem.ui.h:28
 msgid "_Aspect Ratio"
 msgstr "Méret_arány"
 
-#: ../data/totem.ui.h:116
-msgid "_Audio output type:"
-msgstr "_Hangkimenet típusa:"
-
-#: ../data/totem.ui.h:117
-msgid "_Brightness:"
-msgstr "_Fényerősség:"
-
-#: ../data/totem.ui.h:118
-msgid "_Chapter Menu"
-msgstr "_Fejezet menü"
+#: ../data/totem.ui.h:29
+msgid "Switch An_gles"
+msgstr "Szögek _váltása"
 
-#: ../data/totem.ui.h:119
-msgid "_Clear Playlist"
-msgstr "Lejátszólista _törlése"
+#: ../data/totem.ui.h:30
+msgid "Switch camera angles"
+msgstr "Kameraszögek váltása"
 
-#: ../data/totem.ui.h:120
-msgid "_Contents"
-msgstr "_Tartalom"
+#: ../data/totem.ui.h:31
+msgid "_Go"
+msgstr "_Ugrás"
 
-#: ../data/totem.ui.h:121
+#: ../data/totem.ui.h:32
 msgid "_DVD Menu"
 msgstr "_DVD menü"
 
-#: ../data/totem.ui.h:122
-msgid "_Edit"
-msgstr "S_zerkesztés"
-
-#: ../data/totem.ui.h:123
-msgid "_Eject"
-msgstr "_Kiadás"
-
-#: ../data/totem.ui.h:124
-msgid "_Encoding:"
-msgstr "Kó_dolás:"
+#: ../data/totem.ui.h:33
+msgid "Go to the DVD menu"
+msgstr "Ugrás a DVD menüre"
 
-#: ../data/totem.ui.h:125
-msgid "_Font:"
-msgstr "_Betűkészlet:"
+#: ../data/totem.ui.h:34
+msgid "_Title Menu"
+msgstr "_Cím menü"
 
-#: ../data/totem.ui.h:126
-msgid "_Fullscreen"
-msgstr "_Teljes képernyő"
+#: ../data/totem.ui.h:35
+msgid "Go to the title menu"
+msgstr "Ugrás a cím menüre"
 
-#: ../data/totem.ui.h:127
-msgid "_Go"
-msgstr "_Ugrás"
+#: ../data/totem.ui.h:36
+msgid "A_udio Menu"
+msgstr "_Hang menü"
 
-#: ../data/totem.ui.h:128
-msgid "_Help"
-msgstr "_Súgó"
+#: ../data/totem.ui.h:37
+msgid "Go to the audio menu"
+msgstr "Ugrás a hang menüre"
 
-#: ../data/totem.ui.h:129
-msgid "_Hue:"
-msgstr "Á_rnyalat:"
+#: ../data/totem.ui.h:38
+msgid "_Angle Menu"
+msgstr "_Szög menü"
 
-#: ../data/totem.ui.h:130
-msgid "_Languages"
-msgstr "Nye_lvek"
+#: ../data/totem.ui.h:39
+msgid "Go to the angle menu"
+msgstr "Ugrás a szög menüre"
 
-#: ../data/totem.ui.h:131
-msgid "_Load subtitle files when movie is loaded"
-msgstr "Feliratfájlok be_töltése a film betöltésekor"
+#: ../data/totem.ui.h:40
+msgid "_Chapter Menu"
+msgstr "_Fejezet menü"
 
-#: ../data/totem.ui.h:132
-msgid "_Movie"
-msgstr "_Film"
+#: ../data/totem.ui.h:41
+msgid "Go to the chapter menu"
+msgstr "Ugrás a fejezet menüre"
 
-#: ../data/totem.ui.h:133
+#: ../data/totem.ui.h:42
 msgid "_Next Chapter/Movie"
 msgstr "_Következő fejezet/film"
 
-#: ../data/totem.ui.h:134
-msgid "_Open..."
-msgstr "_Megnyitás…"
+#: ../data/totem.ui.h:43
+msgid "Next chapter or movie"
+msgstr "Következő fejezet vagy film"
 
-#: ../data/totem.ui.h:135
+#: ../data/totem.ui.h:44
 msgid "_Previous Chapter/Movie"
 msgstr "_Előző fejezet/film"
 
-#: ../data/totem.ui.h:136
-msgid "_Properties"
-msgstr "_Tulajdonságok"
+#: ../data/totem.ui.h:45
+msgid "Previous chapter or movie"
+msgstr "Előző fejezet vagy film"
 
-#: ../data/totem.ui.h:137
-msgid "_Quit"
-msgstr "_Kilépés"
+#: ../data/totem.ui.h:46
+msgid "_Sound"
+msgstr "_Hang"
 
-#: ../data/totem.ui.h:138
-msgid "_Repeat Mode"
-msgstr "_Ismétlés mód"
+#: ../data/totem.ui.h:47
+msgid "Volume _Up"
+msgstr "Hangerő _fel"
 
-#: ../data/totem.ui.h:139
-msgid "_Resize 1:2"
-msgstr "Át_méretezés 1:2"
+#: ../data/totem.ui.h:48
+msgid "Increase volume"
+msgstr "Hangerő növelése"
 
-#: ../data/totem.ui.h:140
-msgid "_Resize the window when a new video is loaded"
-msgstr "Ablak átmé_retezése új videó betöltésekor"
+#: ../data/totem.ui.h:49
+msgid "Volume _Down"
+msgstr "Hangerő _le"
 
-#: ../data/totem.ui.h:142
-msgid "_Sound"
-msgstr "_Hang"
+#: ../data/totem.ui.h:50
+msgid "Decrease volume"
+msgstr "Hangerő csökkentése"
 
-#: ../data/totem.ui.h:143
-msgid "_Title Menu"
-msgstr "_Cím menü"
+#: ../data/totem.ui.h:51
+msgid "_Help"
+msgstr "_Súgó"
 
-#: ../data/totem.ui.h:144
-msgid "_Type of visualization:"
-msgstr "Vizualizáció _típusa:"
+#: ../data/totem.ui.h:52
+msgid "_Contents"
+msgstr "_Tartalom"
 
-#: ../data/totem.ui.h:145
-msgid "_View"
-msgstr "_Nézet"
+#: ../data/totem.ui.h:53
+msgid "Help contents"
+msgstr "Súgótartalom"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
-msgid ""
-"A list of the names of the plugins which are currently active (loaded and "
-"running)."
-msgstr "A jelenleg aktív (betöltött és futó) bővítmények neveinek listája."
+#: ../data/totem.ui.h:54
+msgid "_About"
+msgstr "_Névjegy"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
-msgid "Active plugins list"
-msgstr "Aktív bővítmények listája"
+#: ../data/totem.ui.h:55
+msgid "About this application"
+msgstr "Az alkalmazás névjegye"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
-msgid "Allow the screensaver to activate when playing audio"
-msgstr "A képernyővédő aktivizálódhat hang lejátszása esetén"
+#: ../data/totem.ui.h:56
+msgid "Show _Controls"
+msgstr "_Vezérlés megjelenítése"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
-msgid ""
-"Allow the screensaver to activate when playing audio. Disable if you have "
-"monitor-powered speakers."
-msgstr ""
-"A képernyővédő aktivizálódhat hang lejátszása esetén. Tiltsa le, ha "
-"monitorról működtetett hangszórókat használ."
+#: ../data/totem.ui.h:57
+msgid "Show controls"
+msgstr "Vezérlés megjelenítése"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
-msgid ""
-"Amount of data to buffer for network streams before starting to display the "
-"stream (in seconds)."
-msgstr ""
-"Pufferelendő adat mennyisége hálózati folyamok esetén a folyam "
-"megjelenítésének megkezdése előtt (másodpercekben)."
+#: ../data/totem.ui.h:58
+msgid "S_idebar"
+msgstr "_Oldalsáv"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
-msgid ""
-"Approximate network connection speed, used to select quality on media over "
-"the network."
-msgstr ""
-"Hálózati kapcsolat becsült sebessége, a hálózati média minőségének "
-"kiválasztásához."
+#: ../data/totem.ui.h:59
+msgid "Show or hide the sidebar"
+msgstr "Az oldalsáv mutatása vagy elrejtése"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
-msgid "Default location for the \"Open...\" dialogs"
-msgstr "Az alapértelmezett hely a „Megnyitás…” ablakokban"
+#: ../data/totem.ui.h:60
+msgctxt "Aspect ratio"
+msgid "Auto"
+msgstr "Auto"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
-msgid ""
-"Default location for the \"Open...\" dialogs. Default is the current "
-"directory."
-msgstr ""
-"A „Megnyitás…” ablakokban az alapértelmezett hely, az alapértelmezés az "
-"aktuális könyvtár."
+#: ../data/totem.ui.h:61
+msgid "Sets automatic aspect ratio"
+msgstr "Automatikus méretarány beállítása"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
-msgid "Default location for the \"Take Screenshot\" dialogs"
-msgstr "Az alapértelmezett hely a „Képernyőkép készítése” ablakokban"
+#: ../data/totem.ui.h:62
+msgid "Square"
+msgstr "Négyzet"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
-msgid ""
-"Default location for the \"Take Screenshot\" dialogs. Default is the "
-"Pictures directory."
-msgstr ""
-"A „Képernyőkép készítése” ablakokban az alapértelmezett hely, az "
-"alapértelmezés a Képek könyvtár."
+#: ../data/totem.ui.h:63
+msgid "Sets square aspect ratio"
+msgstr "Négyzetes méretarány beállítása"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
-msgid "Encoding character set for subtitle."
-msgstr "Felirat kódolása."
+#: ../data/totem.ui.h:64
+msgid "4:3 (TV)"
+msgstr "4:3 (TV)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
-msgid "Name of the visual effects plugin"
-msgstr "A vizuáliseffektus-bővítmény neve"
+#: ../data/totem.ui.h:65
+msgid "Sets 4:3 (TV) aspect ratio"
+msgstr "4:3-as (tévé) méretarány beállítása"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
-msgid "Network buffering threshold"
-msgstr "Hálózati pufferelés küszöbszintje"
+#: ../data/totem.ui.h:66
+msgid "16:9 (Widescreen)"
+msgstr "16:9 (szélesvásznú)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
-msgid "Network connection speed"
-msgstr "Hálózati kapcsolat sebessége"
+#: ../data/totem.ui.h:67
+msgid "Sets 16:9 (widescreen) aspect ratio"
+msgstr "16:9-es (szélesvásznú) méretarány beállítása"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
-msgid "Pango font description for subtitle rendering."
-msgstr "A feliratok megjelenítéséhez használt Pango betűkészlet neve."
+#: ../data/totem.ui.h:68
+msgid "2.11:1 (DVB)"
+msgstr "2.11:1 (DVB)"
+
+#: ../data/totem.ui.h:69
+msgid "Sets 2.11:1 (DVB) aspect ratio"
+msgstr "2.11:1-es (DVB) méretarány beállítása"
+
+#: ../data/totem.ui.h:70
+msgid "S_ubtitles"
+msgstr "_Feliratok"
+
+#: ../data/totem.ui.h:73
+msgid "_Languages"
+msgstr "Nye_lvek"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
-msgid "Quality setting for the audio visualization."
-msgstr "Minőségbeállítás a hangvizualizációhoz."
+#: ../data/totem.ui.h:74
+msgid "Zoom In"
+msgstr "Nagyítás"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
-msgid "Repeat mode"
-msgstr "Ismétlés mód"
+#: ../data/totem.ui.h:75
+msgid "Zoom in"
+msgstr "Nagyítás"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
-msgid "Resize the canvas automatically on file load"
-msgstr "Vászon automatikus átméretezése fájl betöltésekor"
+#: ../data/totem.ui.h:76
+msgid "Skip _Forward"
+msgstr "Ugrás _előre"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
-msgid "Show visual effects when no video is displayed"
-msgstr "Vizuális effektusok megjelenítése, amikor nincs videólejátszás"
+#: ../data/totem.ui.h:77
+msgid "Skip forward"
+msgstr "Ugrás előre"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
-msgid "Show visual effects when playing an audio only file."
-msgstr "Vizuális effektusok megjelenítése hangfájl lejátszásánál."
+#: ../data/totem.ui.h:78
+msgid "Skip _Backwards"
+msgstr "Ugrás _vissza"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
-msgid "Shuffle mode"
-msgstr "Véletlenszerű lejátszás mód"
+#: ../data/totem.ui.h:79
+msgid "Skip backwards"
+msgstr "Ugrás vissza"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
-msgid "Subtitle encoding"
-msgstr "Felirat betűkészlete"
+#: ../data/totem.ui.h:82
+msgid "Time seek bar"
+msgstr "Keresősáv"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
-msgid "Subtitle font"
-msgstr "Feliratok betűkészlete"
+#: ../data/uri.ui.h:1
+msgid "Enter the _address of the file you would like to open:"
+msgstr "Írja be a megnyitandó fájl _címét:"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
-msgid "The brightness of the video"
-msgstr "A videó fényerőssége"
+#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
+msgid "_Add to Playlist"
+msgstr "_Hozzáadás a lejátszólistához"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
-msgid "The contrast of the video"
-msgstr "A videó kontrasztja"
+#: ../data/video-list.ui.h:2
+msgid "Add the video to the playlist"
+msgstr "A videó hozzáadása a lejátszólistához"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
-msgid "The hue of the video"
-msgstr "A videó árnyalata"
+#: ../src/backend/bacon-video-widget.c:1643
+msgid "Password requested for RTSP server"
+msgstr "Az RTSP-kiszolgáló jelszót kér"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
-msgid "The saturation of the video"
-msgstr "A videó telítettsége"
+#: ../src/backend/bacon-video-widget.c:2944
+#, c-format
+msgid "Audio Track #%d"
+msgstr "%d. hangsáv"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
-msgid "Type of audio output to use"
-msgstr "A használandó hangkimenet típusa"
+#: ../src/backend/bacon-video-widget.c:2948
+#, c-format
+msgid "Subtitle #%d"
+msgstr "%d. felirat"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
-msgid "Visualization quality setting"
-msgstr "Vizualizáció minőségbeállítása"
+#: ../src/backend/bacon-video-widget.c:3345
+msgid "The server you are trying to connect to is not known."
+msgstr "Az elérni kívánt kiszolgáló ismeretlen."
+
+#: ../src/backend/bacon-video-widget.c:3348
+msgid "The connection to this server was refused."
+msgstr "A kapcsolódás a kiszolgálóhoz visszautasítva."
+
+#: ../src/backend/bacon-video-widget.c:3351
+#| msgid "The movie could not be recorded."
+msgid "The specified movie could not be found."
+msgstr "A megadott film nem található."
+
+#: ../src/backend/bacon-video-widget.c:3358
+msgid "The server refused access to this file or stream."
+msgstr "A kiszolgáló elutasította a fájl vagy műsor elérését."
+
+#: ../src/backend/bacon-video-widget.c:3364
+msgid "Authentication is required to access this file or stream."
+msgstr "Hitelesítés szükséges a fájl vagy műsor eléréséhez."
+
+#: ../src/backend/bacon-video-widget.c:3371
+#| msgid "Totem was not able to play this disc."
+msgid "You are not allowed to open this file."
+msgstr "A fájl megnyitása nem engedélyezett."
+
+#: ../src/backend/bacon-video-widget.c:3376
+#| msgid "File is not a valid .desktop file"
+msgid "This location is not a valid one."
+msgstr "A hely nem érvényes."
+
+#: ../src/backend/bacon-video-widget.c:3384
+#| msgid "The movie could not be recorded."
+msgid "The movie could not be read."
+msgstr "A film nem olvasható."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
-msgid "Whether to autoload external chapter files when a movie is loaded"
-msgstr "A külső fejezetfájlok automatikusan betöltendők-e film betöltésekor"
+#. should be exactly one missing thing (source or converter)
+#: ../src/backend/bacon-video-widget.c:3407
+#: ../src/backend/bacon-video-widget.c:3415
+#, c-format
+msgid "The playback of this movie requires a %s plugin which is not installed."
+msgid_plural ""
+"The playback of this movie requires the following decoders which are not "
+"installed:\n"
+"\n"
+"%s"
+msgstr[0] ""
+"Ezen film lejátszása egy %s bővítményt igényel, amely nincs telepítve."
+msgstr[1] ""
+"Ezen film lejátszása egy a következő dekódolókat igényli, amelyek nincsenek "
+"telepítve:\n"
+"\n"
+"%s"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
-msgid "Whether to autoload text subtitle files when a movie is loaded"
-msgstr "A feliratfájlok automatikusan betöltendők-e film betöltésekor"
+#: ../src/backend/bacon-video-widget.c:3426
+msgid ""
+"An audio or video stream is not handled due to missing codecs. You might "
+"need to install additional plugins to be able to play some types of movies"
+msgstr ""
+"A hang- vagy videoműsor hiányzó kodekek miatt nincs kezelve. További "
+"bővítmények telepítésére lehet szükség egyes filmtípusok lejátszásához."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
-msgid "Whether to disable deinterlacing for interlaced movies"
-msgstr "A váltottsoros videók váltottsorosság-mentesítése letiltandó-e"
+#: ../src/backend/bacon-video-widget.c:3436
+#| msgid ""
+#| "Cannot play this file over the network. Try downloading it to disk first."
+msgid ""
+"This file cannot be played over the network. Try downloading it locally "
+"first."
+msgstr ""
+"Ez a fájl nem játszható le a hálózaton keresztül. Próbálja előbb letölteni a "
+"gépére."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
-msgid "Whether to disable the keyboard shortcuts"
-msgstr "A gyorsbillentyűk letiltandók-e"
+#: ../src/backend/bacon-video-widget.c:5494 ../src/totem-properties-view.c:227
+msgid "Surround"
+msgstr "Térhatású"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
-msgid "Whether to disable the plugins in the user's home directory"
-msgstr "A felhasználó saját könyvtárában található bővítmények letiltandók-e"
+#: ../src/backend/bacon-video-widget.c:5496 ../src/totem-properties-view.c:229
+msgid "Mono"
+msgstr "Mono"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:35
-msgid "Whether to enable debug for the playback engine"
-msgstr "A hibakeresés engedélyezve legyen-e a lejátszómotornál"
+#: ../src/backend/bacon-video-widget.c:5781
+msgid "Media contains no supported video streams."
+msgstr "A média nem tartalmaz támogatott videofolyamot."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:36
+#: ../src/backend/bacon-video-widget.c:5963
 msgid ""
-"Whether to remember the position of played audio/video files when pausing or "
-"closing them"
+"Some necessary plug-ins are missing. Make sure that the program is correctly "
+"installed."
 msgstr ""
-"A lejátszott hang/videófájlok pozíciója megjegyzendő-e szüneteltetéskor vagy "
-"bezárásukkor"
-
-#: ../data/uri.ui.h:1
-msgid "Enter the _address of the file you would like to open:"
-msgstr "Írja be a megnyitandó fájl _címét:"
+"Egyes szükséges bővítmények hiányoznak. Győződjön meg róla, hogy a program "
+"megfelelően van telepítve."
 
 #: ../src/eggdesktopfile.c:165
 #, c-format
@@ -975,6 +1046,31 @@
 msgid "Show session management options"
 msgstr "Munkamenet-kezelési kapcsolók megjelenítése"
 
+#. hour:minutes:seconds
+#. Translators: This is a time format, like "9:05:02" for 9
+#. * hours, 5 minutes, and 2 seconds. You may change ":" to
+#. * the separator that your locale uses or use "%Id" instead
+#. * of "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:56
+#: ../src/plugins/skipto/totem-time-entry.c:57
+#, c-format
+msgctxt "long time format"
+msgid "%d:%02d:%02d"
+msgstr "%d.%02d.%02d"
+
+#. minutes:seconds
+#. Translators: This is a time format, like "5:02" for 5
+#. * minutes and 2 seconds. You may change ":" to the
+#. * separator that your locale uses or use "%Id" instead of
+#. * "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:65
+#, c-format
+msgctxt "short time format"
+msgid "%d:%02d"
+msgstr "%d.%02d"
+
 #. Title
 #. Artist
 #. Album
@@ -1079,10 +1175,14 @@
 msgstr[0] "%d képkocka másodpercenként"
 msgstr[1] "%d képkocka másodpercenként"
 
-#: ../src/totem-audio-preview.c:168
+#: ../src/totem-audio-preview.c:137
 msgid "Audio Preview"
 msgstr "Hangelőnézet"
 
+#: ../src/totem.c:239
+msgid "Verify your system installation. Totem will now exit."
+msgstr "Ellenőrizze a rendszer telepítését. A Totem most kilép."
+
 #: ../src/totem-cell-renderer-video.c:126
 msgid "Unknown video"
 msgstr "Ismeretlen videó"
@@ -1095,7 +1195,7 @@
 msgid "Cancel"
 msgstr "Mégse"
 
-#: ../src/totem-fullscreen.c:616
+#: ../src/totem-fullscreen.c:573
 msgid "No File"
 msgstr "Nincs fájl"
 
@@ -1113,7 +1213,7 @@
 msgid "Make sure that Totem is properly installed."
 msgstr "Győződjön meg róla, hogy a Totem megfelelően van telepítve."
 
-#: ../src/totem-interface.c:347
+#: ../src/totem-interface.c:357
 msgid ""
 "Totem 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 "
@@ -1124,7 +1224,7 @@
 "Foundation által kiadott GNU General Public License második (vagy bármely "
 "későbbi) változatában foglaltak alapján."
 
-#: ../src/totem-interface.c:351
+#: ../src/totem-interface.c:361
 msgid ""
 "Totem is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -1136,7 +1236,7 @@
 "alkalmas-e a KÖZREADÁSRA vagy EGY BIZONYOS FELADAT ELVÉGZÉSÉRE. További "
 "részletekért tanulmányozza a GNU GPL licencet."
 
-#: ../src/totem-interface.c:355
+#: ../src/totem-interface.c:365
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Totem; if not, write to the Free Software Foundation, Inc., 59 Temple Place, "
@@ -1146,7 +1246,7 @@
 "kapta meg, írjon a Free Software Foundation Inc.-nek. Levélcímük: 51 "
 "Franklin St, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: ../src/totem-interface.c:358
+#: ../src/totem-interface.c:368
 msgid ""
 "Totem contains an exception to allow the use of proprietary GStreamer "
 "plugins."
@@ -1155,200 +1255,99 @@
 "bővítmények használatának lehetővé tételéhez."
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:190
+#: ../src/totem-menu.c:291
 msgid "None"
 msgstr "Nincs"
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:195
+#: ../src/totem-menu.c:296
 msgctxt "Language"
 msgid "Auto"
 msgstr "Auto"
 
-#. Translators:
-#. * This is not a JPEG image, but a disc image, for example,
-#. * an ISO file
-#: ../src/totem-menu.c:765
-#, c-format
-msgid "Play Image '%s'"
-msgstr "„%s” lemezkép lejátszása"
-
-#: ../src/totem-menu.c:768 ../src/totem-menu.c:851
-#, c-format
-msgid "device%d"
-msgstr "%d. eszköz"
-
-#: ../src/totem-menu.c:848
-#, c-format
-msgid "Play Disc '%s'"
-msgstr "„%s” lemez lejátszása"
-
-#. This lists the back-end type and version, such as
-#. * Movie Player using GStreamer 0.10.1
-#: ../src/totem-menu.c:1189
-#, c-format
-msgid "Movie Player using %s"
-msgstr "Médialejátszó %s alapokon"
-
-#: ../src/totem-menu.c:1193
+#: ../src/totem-menu.c:789
 msgid "Copyright © 2002-2009 Bastien Nocera"
 msgstr "Copyright © 2002-2009 Bastien Nocera"
 
-#: ../src/totem-menu.c:1198
+#: ../src/totem-menu.c:794
 msgid "translator-credits"
 msgstr ""
 "Dvornik László \n"
-"Kelemen Gábor "
+"Kelemen Gábor \n"
+"Lukács Bence "
 
-#: ../src/totem-menu.c:1202
+#: ../src/totem-menu.c:798
 msgid "Totem Website"
 msgstr "A Totem weboldala"
 
-#: ../src/totem-menu.c:1236
+#: ../src/totem-menu.c:829
 msgid "Configure Plugins"
 msgstr "Bővítmények beállítása"
 
+#: ../src/totem-object.c:162
+#, c-format
+msgid ""
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"%s\n"
+"Az elérhető parancssori kapcsolók teljes listájáért adja ki a „%s --help” "
+"parancsot.\n"
+
 #. Translators: %s is the totem version number
-#: ../src/totem-object.c:471
+#: ../src/totem-object.c:591
 #, c-format
 msgid "Totem %s"
 msgstr "Totem %s"
 
-#: ../src/totem-object.c:1047 ../browser-plugin/totem-plugin-viewer.c:367
-msgid "Playing"
-msgstr "Lejátszás"
-
-#: ../src/totem-object.c:1049 ../src/totem-options.c:52
+#: ../src/totem-object.c:1168 ../src/totem-options.c:52
 msgid "Pause"
 msgstr "Szünet"
 
-#: ../src/totem-object.c:1054 ../browser-plugin/totem-plugin-viewer.c:363
-msgid "Paused"
-msgstr "Szüneteltetve"
-
-#: ../src/totem-object.c:1056 ../src/totem-object.c:1066
+#: ../src/totem-object.c:1175 ../src/totem-object.c:1185
 #: ../src/totem-options.c:51
 msgid "Play"
 msgstr "Lejátszás"
 
-#: ../src/totem-object.c:1061 ../src/totem-object.c:1659
-#: ../src/totem-statusbar.c:115 ../browser-plugin/totem-plugin-viewer.c:351
-msgid "Stopped"
-msgstr "Leállítva"
-
-#: ../src/totem-object.c:1142 ../src/totem-object.c:1169
-#: ../src/totem-object.c:1799 ../src/totem-object.c:1963
+#: ../src/totem-object.c:1267 ../src/totem-object.c:1294
+#: ../src/totem-object.c:1787 ../src/totem-object.c:1942
 #, c-format
 msgid "Totem could not play '%s'."
 msgstr "A Totem nem tudja lejátszani a következőt: „%s”."
 
-#: ../src/totem-object.c:1246
-#, c-format
-msgid ""
-"Totem could not play this media (%s) although a plugin is present to handle "
-"it."
-msgstr ""
-"A Totem nem tudja lejátszani ezen médiát (%s), habár van bővítmény a "
-"kezeléséhez."
-
-#: ../src/totem-object.c:1247
-msgid ""
-"You might want to check that a disc is present in the drive and that it is "
-"correctly configured."
-msgstr ""
-"Ellenőrizze, hogy a lemez a meghajtóban van-e és megfelelően be van-e "
-"állítva."
-
-#: ../src/totem-object.c:1255
-msgid "More information about media plugins"
-msgstr "További információk a médiabővítményekről"
-
-#: ../src/totem-object.c:1256
-msgid ""
-"Please install the necessary plugins and restart Totem to be able to play "
-"this media."
-msgstr ""
-"Telepítse a szükséges bővítményeket és indítsa újra a Totemet ezen média "
-"lejátszásához."
-
-#: ../src/totem-object.c:1258
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because it does not have the "
-"appropriate plugins to be able to read from the disc."
-msgstr ""
-"A Totem nem tudja lejátszani ezt a típusú médiát (%s), mert nincsenek "
-"megfelelő bővítmények a lemezről történő olvasáshoz."
-
-#: ../src/totem-object.c:1260
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because you do not have the "
-"appropriate plugins to handle it."
-msgstr ""
-"A Totem nem tudja lejátszani ezt a típusú médiát (%s), mert nincs megfelelő "
-"bővítmény a kezeléséhez."
-
-#: ../src/totem-object.c:1263
-#, c-format
-msgid "Totem cannot play this type of media (%s) because it is not supported."
-msgstr "A Totem nem tudja lejátszani ezt a médiatípust (%s), mert nem támogatott."
-
-#: ../src/totem-object.c:1264
-msgid "Please insert another disc to play back."
-msgstr "Helyezzen be egy másik lemezt a lejátszáshoz."
-
-#: ../src/totem-object.c:1300
-msgid "Totem was not able to play this disc."
-msgstr "A Totem nem volt képes lejátszani ezt a lemezt."
-
-#: ../src/totem-object.c:1301 ../src/totem-object.c:4228
-msgid "No reason."
-msgstr "Nincs ok."
-
-#: ../src/totem-object.c:1315
-msgid "Totem does not support playback of Audio CDs"
-msgstr "A Totem nem támogatja a hang CD-k lejátszását"
-
-#: ../src/totem-object.c:1316
-msgid "Please consider using a music player or a CD extractor to play this CD"
-msgstr "A CD lejátszásához használjon zenelejátszót vagy CD-beolvasót"
-
-#: ../src/totem-object.c:1805
+#: ../src/totem-object.c:1793
 msgid "No error message"
 msgstr "Nincs hibaüzenet"
 
-#: ../src/totem-object.c:2154
+#: ../src/totem-object.c:2133
 msgid "Totem could not display the help contents."
 msgstr "A Totem nem tudja megjeleníteni a súgótartalmat."
 
-#: ../src/totem-object.c:2493 ../src/totem-object.c:2495
-#: ../browser-plugin/totem-plugin-viewer.c:1417
-msgid "An error occurred"
-msgstr "Hiba történt"
-
-#: ../src/totem-object.c:4063 ../src/totem-object.c:4065
+#: ../src/totem-object.c:4019 ../src/totem-object.c:4021
 msgid "Previous Chapter/Movie"
 msgstr "Előző fejezet/film"
 
-#: ../src/totem-object.c:4072 ../src/totem-object.c:4074
+#: ../src/totem-object.c:4028 ../src/totem-object.c:4030
 msgid "Play / Pause"
 msgstr "Lejátszás / Szünet"
 
-#: ../src/totem-object.c:4082 ../src/totem-object.c:4084
+#: ../src/totem-object.c:4038 ../src/totem-object.c:4040
 msgid "Next Chapter/Movie"
 msgstr "Következő fejezet/film"
 
-#. Translators: this is the tooltip text for the fullscreen button in the controls box in Totem's main window.
 #. Translators: this is the accessibility text for the fullscreen button in the controls box in Totem's main window.
-#: ../src/totem-object.c:4096 ../src/totem-object.c:4098
+#: ../src/totem-object.c:4051 ../src/totem-object.c:4053
 msgid "Fullscreen"
 msgstr "Teljes képernyő"
 
-#: ../src/totem-object.c:4228
+#: ../src/totem-object.c:4184
 msgid "Totem could not startup."
 msgstr "A Totem nem tud elindulni."
 
+#: ../src/totem-object.c:4184
+msgid "No reason."
+msgstr "Nincs ok."
+
 #: ../src/totem-open-location.c:182
 msgid "Open Location..."
 msgstr "Hely megnyitása…"
@@ -1422,117 +1421,111 @@
 msgid "Movies to play"
 msgstr "Lejátszandó filmek"
 
-#: ../src/totem-options.c:117
+#: ../src/totem-options.c:79
+msgid "- Play movies and songs"
+msgstr "– Filmek és dalok lejátszása"
+
+#: ../src/totem-options.c:142
 msgid "Can't enqueue and replace at the same time"
 msgstr "Nem lehet egyszerre sorba állítani és helyettesíteni"
 
 #. By extension entry
-#: ../src/totem-playlist.c:161
+#: ../src/totem-playlist.c:162
 msgid "MP3 ShoutCast playlist"
 msgstr "MP3 ShoutCast lejátszólista"
 
-#: ../src/totem-playlist.c:162
+#: ../src/totem-playlist.c:163
 msgid "MP3 audio (streamed)"
 msgstr "MP3 hang (szórt)"
 
-#: ../src/totem-playlist.c:163
+#: ../src/totem-playlist.c:164
 msgid "MP3 audio (streamed, DOS format)"
 msgstr "MP3 hang (szórt, DOS formátum)"
 
-#: ../src/totem-playlist.c:164
+#: ../src/totem-playlist.c:165
 msgid "XML Shareable Playlist"
 msgstr "XML megosztható lejátszólista"
 
 #. This is "Title 3", where title is a DVD title
 #. * Note: NOT a DVD chapter
-#: ../src/totem-playlist.c:347
+#: ../src/totem-playlist.c:348
 #, c-format
 msgid "Title %d"
 msgstr "%d. cím"
 
-#: ../src/totem-playlist.c:446
+#: ../src/totem-playlist.c:447
 msgid "Could not save the playlist"
 msgstr "A lejátszólista nem menthető"
 
-#: ../src/totem-playlist.c:1021
+#: ../src/totem-playlist.c:1022
 msgid "Save Playlist"
 msgstr "Lejátszólista mentése"
 
 #. translators: Playlist is the default saved playlist filename,
 #. * without the suffix
-#: ../src/totem-playlist.c:1033 ../src/totem-playlist.c:1264
-#: ../src/totem-sidebar.c:142
+#: ../src/totem-playlist.c:1034 ../src/totem-playlist.c:1263
+#: ../src/totem-sidebar.c:145
 msgid "Playlist"
 msgstr "Lejátszólista"
 
-#: ../src/totem-playlist.c:1857
+#: ../src/totem-playlist.c:1862
 #, c-format
 msgid "The playlist '%s' could not be parsed. It might be damaged."
 msgstr "A(z) „%s” lejátszólista nem dolgozható fel, lehet, hogy sérült."
 
-#: ../src/totem-playlist.c:1858
+#: ../src/totem-playlist.c:1863
 msgid "Playlist error"
 msgstr "Lejátszólista hiba"
 
-#: ../src/totem-preferences.c:295
+#: ../src/totem-preferences.c:297
 msgid "Preferences"
 msgstr "Beállítások"
 
-#: ../src/totem-preferences.c:451
+#: ../src/totem-preferences.c:445
 msgid "Select Subtitle Font"
 msgstr "Válassza ki a felirat betűtípusát"
 
-#: ../src/totem-properties-main.c:115 ../src/totem-properties-view.c:266
+#: ../src/totem-properties-main.c:116 ../src/totem-properties-view.c:269
 msgid "Audio/Video"
 msgstr "Hang/videó"
 
-#: ../src/totem-properties-view.c:128
+#: ../src/totem-properties-view.c:131
 msgid "N/A"
 msgstr "---"
 
-#: ../src/totem-properties-view.c:157
+#: ../src/totem-properties-view.c:160
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 msgctxt "Stream bit rate"
 msgid "N/A"
 msgstr "---"
 
-#: ../src/totem-properties-view.c:160
+#: ../src/totem-properties-view.c:163
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 #, c-format
 msgid "%d kbps"
 msgstr "%d kb/s"
 
-#: ../src/totem-properties-view.c:177
+#: ../src/totem-properties-view.c:180
 #: ../src/plugins/properties/totem-movie-properties.c:149
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../src/totem-properties-view.c:209
+#: ../src/totem-properties-view.c:212
 #: ../src/plugins/properties/totem-movie-properties.c:166
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: ../src/totem-properties-view.c:216
+#: ../src/totem-properties-view.c:219
 #: ../src/plugins/properties/totem-movie-properties.c:166
 msgctxt "Sample rate"
 msgid "N/A"
 msgstr "N/A"
 
-#: ../src/totem-properties-view.c:224
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5589
-msgid "Surround"
-msgstr "Térhatású"
-
-#: ../src/totem-properties-view.c:226
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5591
-msgid "Mono"
-msgstr "Mono"
-
-#: ../src/totem-properties-view.c:236
+#: ../src/totem-properties-view.c:239
 msgctxt "Number of audio channels"
 msgid "N/A"
 msgstr "---"
@@ -1565,8 +1558,8 @@
 #. eg: 75 %
 #: ../src/totem-statusbar.c:250
 #, c-format
-msgid "%d %%"
-msgstr "%d%%"
+msgid "%lf %%"
+msgstr "%lf %%"
 
 #. eg: Paused, 0:32 / 1:05
 #: ../src/totem-statusbar.c:325
@@ -1577,8 +1570,9 @@
 #. eg: Buffering, 75 %
 #: ../src/totem-statusbar.c:330
 #, c-format
-msgid "%s, %d %%"
-msgstr "%s, %d %%"
+#| msgid "%s, %d %%"
+msgid "%s, %f %%"
+msgstr "%s, %f %%"
 
 #: ../src/totem-subtitle-encoding.c:156
 msgid "Current Locale"
@@ -1718,226 +1712,94 @@
 
 #: ../src/totem-subtitle-encoding.c:328 ../src/totem-subtitle-encoding.c:330
 #: ../src/totem-subtitle-encoding.c:332
-msgid "Vietnamese"
-msgstr "Vietnami"
-
-#: ../src/totem-video-list.c:330
-msgid "No video URI"
-msgstr "Nincs videó URI"
-
-#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
-#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
-#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
-#: ../src/totem-video-thumbnailer.c:872
-#, c-format
-msgid ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-msgstr ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-
-#: ../src/totem-video-thumbnailer.c:873
-msgid "Filename"
-msgstr "Fájlnév"
-
-#: ../src/totem-video-thumbnailer.c:875
-msgid "Resolution"
-msgstr "Felbontás"
-
-#: ../src/totem-video-thumbnailer.c:878
-msgid "Duration"
-msgstr "Időtartam"
+msgid "Vietnamese"
+msgstr "Vietnami"
 
-#: ../src/totem-uri.c:506 ../src/plugins/chapters/totem-chapters.c:998
+#: ../src/totem-uri.c:343 ../src/plugins/chapters/totem-chapters.c:998
 msgid "All files"
 msgstr "Minden fájl"
 
-#: ../src/totem-uri.c:511 ../src/plugins/chapters/totem-chapters.c:995
+#: ../src/totem-uri.c:348 ../src/plugins/chapters/totem-chapters.c:995
 msgid "Supported files"
 msgstr "Támogatott fájlok"
 
-#: ../src/totem-uri.c:523
+#: ../src/totem-uri.c:360
 msgid "Audio files"
 msgstr "Hangfájlok"
 
-#: ../src/totem-uri.c:531
+#: ../src/totem-uri.c:368
 msgid "Video files"
 msgstr "Videofájlok"
 
-#: ../src/totem-uri.c:541
+#: ../src/totem-uri.c:378
 msgid "Subtitle files"
 msgstr "Feliratfájlok"
 
-#: ../src/totem-uri.c:593
+#: ../src/totem-uri.c:430
 msgid "Select Text Subtitles"
 msgstr "Válassza ki a feliratokat"
 
-#: ../src/totem-uri.c:656
+#: ../src/totem-uri.c:495
 msgid "Select Movies or Playlists"
 msgstr "Válasszon ki filmeket vagy lejátszólistákat"
 
-#. Options parsing
-#: ../src/totem.c:204
-msgid "- Play movies and songs"
-msgstr "– Filmek és dalok lejátszása"
-
-#: ../src/totem.c:220
-#, c-format
-msgid ""
-"%s\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"%s\n"
-"Az elérhető parancssori kapcsolók teljes listájáért adja ki a „%s --help” "
-"parancsot.\n"
-
-#: ../src/totem.c:262 ../src/totem.c:273
-#: ../browser-plugin/totem-plugin-viewer.c:663
-#: ../browser-plugin/totem-plugin-viewer.c:1793
-msgid "Totem Movie Player"
-msgstr "Totem médialejátszó"
-
-#: ../src/totem.c:263 ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Could not initialize the thread-safe libraries."
-msgstr "A szálbiztos programkönyvtárak nem készíthetők elő."
-
-#: ../src/totem.c:263
-msgid "Verify your system installation. Totem will now exit."
-msgstr "Ellenőrizze a rendszer telepítését. A Totem most kilép."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:1589
-msgid "Password requested for RTSP server"
-msgstr "Az RTSP-kiszolgáló jelszót kér"
+#: ../src/totem-uri.c:499
+msgid "Add Directory"
+msgstr "Könyvtár hozzáadása"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2858
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2862
-#, c-format
-msgid "Audio Track #%d"
-msgstr "%d. hangsáv"
+#: ../src/totem-video-list.c:330
+msgid "No video URI"
+msgstr "Nincs videó URI"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2890
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2894
+#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
+#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
+#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
+#: ../src/totem-video-thumbnailer.c:841
 #, c-format
-msgid "Subtitle #%d"
-msgstr "%d. felirat"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3298
-msgid ""
-"The requested audio output was not found. Please select another audio output "
-"in the Multimedia Systems Selector."
-msgstr ""
-"A kért hangkimenet nem található. Kérem válasszon másik hangkimenetet a "
-"Multimédia rendszer választóban."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3303
-msgid "Location not found."
-msgstr "A hely nem található."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3307
-msgid "Could not open location; you might not have permission to open the file."
-msgstr "A hely nem nyitható meg; lehet, hogy nincs jogosultsága megnyitni a fájlt."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3318
-msgid ""
-"The video output is in use by another application. Please close other video "
-"applications, or select another video output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"A videokimenetet egy másik alkalmazás használja. Kérem zárja be a többi "
-"videoalkalmazást vagy válasszon másik videokimenetet a Multimédia rendszer "
-"választóban."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3324
 msgid ""
-"The audio output is in use by another application. Please select another "
-"audio output in the Multimedia Systems Selector. You may want to consider "
-"using a sound server."
-msgstr ""
-"A hangkimenetet egy másik alkalmazás használja. Kérem válasszon másik "
-"hangkimenetet a Multimédia rendszer választóban. Fontolja meg egy "
-"hangkiszolgáló használatát."
-
-#. should be exactly one missing thing (source or converter)
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3342
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3348
-#, c-format
-msgid "The playback of this movie requires a %s plugin which is not installed."
-msgid_plural ""
-"The playback of this movie requires the following decoders which are not "
-"installed:\n"
-"\n"
-"%s"
-msgstr[0] "Ezen film lejátszása egy %s bővítményt igényel, amely nincs telepítve."
-msgstr[1] ""
-"Ezen film lejátszása egy a következő dekódolókat igényli, amelyek nincsenek "
-"telepítve:\n"
-"\n"
-"%s"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3374
-msgid "Cannot play this file over the network. Try downloading it to disk first."
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 msgstr ""
-"Ez a fájl nem játszható le a hálózaton keresztül. Próbálja előbb letölteni a "
-"lemezre."
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5878
-msgid "Media contains no supported video streams."
-msgstr "A média nem tartalmaz támogatott videofolyamot."
+#: ../src/totem-video-thumbnailer.c:842
+msgid "Filename"
+msgstr "Fájlnév"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6053
-msgid ""
-"Failed to create a GStreamer play object. Please check your GStreamer "
-"installation."
-msgstr ""
-"Nem sikerült GStreamer-lejátszóobjektumot létrehozni. Kérem ellenőrizze a "
-"GStreamer telepítését."
+#: ../src/totem-video-thumbnailer.c:844
+msgid "Resolution"
+msgstr "Felbontás"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6173
-msgid ""
-"Failed to open audio output. You may not have permission to open the sound "
-"device, or the sound server may not be running. Please select another audio "
-"output in the Multimedia Systems Selector."
-msgstr ""
-"A hangkimenet megnyitása sikertelen. Lehet, hogy nincs jogosultsága a "
-"hangeszköz megnyitásához vagy a hangkiszolgáló nem fut. Kérem válasszon "
-"másik hangkimenetet a Multimédia rendszer választóban. "
+#: ../src/totem-video-thumbnailer.c:847
+msgid "Duration"
+msgstr "Időtartam"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6193
-msgid ""
-"Could not find the audio output. You may need to install additional "
-"GStreamer plugins, or select another audio output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"A hangkimenet nem található. Lehet, hogy további GStreamer bővítményeket "
-"kell telepítenie, vagy válasszon másik hangkimenetet a Multimédia rendszer "
-"választóban."
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:1
+msgid "Apple Trailers"
+msgstr "Apple előzetesek"
+
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:2
+msgid "Sets the user agent for the Apple Trailers site"
+msgstr "Felhasználóügynök beállítása az Apple előzetesek oldalához"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:1
+msgid "Autoload Subtitles"
+msgstr "Feliratok automatikus betöltése"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:2
+msgid "Autoloads text subtitles"
+msgstr "Szöveges feliratok automatikus betöltése"
 
-#. hour:minutes:seconds
-#. Translators: This is a time format, like "9:05:02" for 9
-#. * hours, 5 minutes, and 2 seconds. You may change ":" to
-#. * the separator that your locale uses or use "%Id" instead
-#. * of "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:83 ../src/plugins/skipto/totem-time-entry.c:57
-#, c-format
-msgctxt "long time format"
-msgid "%d:%02d:%02d"
-msgstr "%d.%02d.%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
+msgid "Video Disc Recorder"
+msgstr "Videolemez-rögzítő"
 
-#. minutes:seconds
-#. Translators: This is a time format, like "5:02" for 5
-#. * minutes and 2 seconds. You may change ":" to the
-#. * separator that your locale uses or use "%Id" instead of
-#. * "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:92
-#, c-format
-msgctxt "short time format"
-msgid "%d:%02d"
-msgstr "%d.%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
+msgid "Records (S)VCDs or video DVDs"
+msgstr "(S)VCD-k vagy video DVD-k írása"
 
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:65
 msgid "_Create Video Disc..."
@@ -1963,93 +1825,85 @@
 msgid "Copy the currently playing (S)VCD"
 msgstr "A jelenleg lejátszott (S)VCD másolása"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:129
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:136
 msgid "The video disc could not be duplicated."
 msgstr "A videolemez nem másolható."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:131
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:276
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:138
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:283
 msgid "The movie could not be recorded."
 msgstr "A film nem rögzíthető."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:157
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:167
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:263
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:164
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:174
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:270
 msgid "Unable to write a project."
 msgstr "A projekt nem írható."
 
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
-msgid "Records (S)VCDs or video DVDs"
-msgstr "(S)VCD-k vagy video DVD-k írása"
-
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
-msgid "Video Disc Recorder"
-msgstr "Videolemez-rögzítő"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:1
-#: ../src/plugins/chapters/totem-chapters.c:1139
-msgid "Chapters"
-msgstr "Fejezetek"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:2
-msgid "Support chapter markers in movies."
-msgstr "Fejezetjelzők támogatása filmekben."
-
 #: ../src/plugins/chapters/chapters-edit.ui.h:1
 msgid "Name for new chapter:"
 msgstr "Az új fejezet neve:"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:1
-msgid "Add Chapter..."
-msgstr "Fejezet hozzáadása…"
+msgid "_Remove Chapter"
+msgstr "Fejezet _eltávolítása"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:2
-msgid "Add New Chapters"
-msgstr "Új fejezetek hozzáadása"
+msgid "Remove the chapter from the list"
+msgstr "A fejezet eltávolítása a listáról"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:3
-msgid "Create a new chapter list for the movie"
-msgstr "Új fejezetlista létrehozása a filmhez"
+msgid "_Go to Chapter"
+msgstr "_Ugrás fejezetre"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:4
-msgid "Go to Chapter"
-msgstr "Ugrás fejezetre"
-
-#: ../src/plugins/chapters/chapters-list.ui.h:5
 msgid "Go to the chapter in the movie"
 msgstr "Ugrás a film egy fejezetére"
 
+#: ../src/plugins/chapters/chapters-list.ui.h:5
+msgid "Add Chapter..."
+msgstr "Fejezet hozzáadása…"
+
 #: ../src/plugins/chapters/chapters-list.ui.h:6
-msgid "Load Chapters..."
-msgstr "Fejezetek betöltése…"
+msgid "Remove Chapter"
+msgstr "Fejezet eltávolítása"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:7
-msgid "Load chapters from an external CMML file"
-msgstr "Fejezetek betöltése külső CMML fájlból"
+msgid "Go to Chapter"
+msgstr "Ugrás fejezetre"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:8
-msgid "No chapter data"
-msgstr "Nincsenek fejezetadatok"
+msgid "Save Changes"
+msgstr "Változtatások mentése"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:9
-msgid "Remove Chapter"
-msgstr "Fejezet eltávolítása"
+msgid "No chapter data"
+msgstr "Nincsenek fejezetadatok"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:10
-msgid "Remove the chapter from the list"
-msgstr "A fejezet eltávolítása a listáról"
+msgid "Load Chapters..."
+msgstr "Fejezetek betöltése…"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:11
-msgid "Save Changes"
-msgstr "Változtatások mentése"
+msgid "Load chapters from an external CMML file"
+msgstr "Fejezetek betöltése külső CMML fájlból"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:12
-msgid "_Go to Chapter"
-msgstr "_Ugrás fejezetre"
+msgid "Add New Chapters"
+msgstr "Új fejezetek hozzáadása"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:13
-msgid "_Remove Chapter"
-msgstr "Fejezet _eltávolítása"
+msgid "Create a new chapter list for the movie"
+msgstr "Új fejezetlista létrehozása a filmhez"
+
+#: ../src/plugins/chapters/chapters.plugin.in.h:1
+#: ../src/plugins/chapters/totem-chapters.c:1139
+msgid "Chapters"
+msgstr "Fejezetek"
+
+#: ../src/plugins/chapters/chapters.plugin.in.h:2
+msgid "Support chapter markers in movies"
+msgstr "Fejezetjelzők támogatása filmekben"
 
 #: ../src/plugins/chapters/totem-chapters.c:56
 #, c-format
@@ -2081,8 +1935,10 @@
 msgstr "Hiba történt a fejezetek mentése közben"
 
 #: ../src/plugins/chapters/totem-chapters.c:843
-msgid "Please check you have permission to write to the folder containing the movie."
-msgstr "Ellenőrizze, hogy van-e jogosultsága a filmet tartalmazó mappa írására."
+msgid ""
+"Please check you have permission to write to the folder containing the movie."
+msgstr ""
+"Ellenőrizze, hogy van-e jogosultsága a filmet tartalmazó mappa írására."
 
 #: ../src/plugins/chapters/totem-chapters.c:976
 msgid "Open Chapter File"
@@ -2130,7 +1986,8 @@
 msgid ""
 "Plugin for sending notifications of currently playing movies to the D-Bus "
 "subsystem."
-msgstr "Értesítések küldése a jelenleg lejátszott filmekről a D-Bus alrendszernek."
+msgstr ""
+"Értesítések küldése a jelenleg lejátszott filmekről a D-Bus alrendszernek."
 
 #: ../src/plugins/dbusservice/dbusservice.py:213
 #: ../src/plugins/dbusservice/dbusservice.py:243
@@ -2153,13 +2010,37 @@
 msgid "The URI ‘%s’ is not supported."
 msgstr "A(z) „%s” URI nem támogatott."
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
-msgid "Instant Messenger status"
-msgstr "Azonnali üzenő állapota"
+#: ../src/plugins/grilo/grilo.plugin.in.h:1
+msgid "Grilo Browser"
+msgstr "Grilo böngésző"
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
-msgid "Set your Instant Messenger status to away when a movie is playing"
-msgstr "Az azonnali üzenő állapotának beállítása „távolra” film lejátszásakor"
+#: ../src/plugins/grilo/grilo.plugin.in.h:2
+msgid "A plugin to let you browse media content from various sources"
+msgstr "Különböző forrásokból származó médiatartalmakat böngésző bővítmény"
+
+#: ../src/plugins/grilo/grilo.ui.h:1
+msgid "Add to Playlist"
+msgstr "Hozzáadás a lejátszólistához"
+
+#: ../src/plugins/grilo/grilo.ui.h:2
+msgid "Copy Location"
+msgstr "Hely másolása"
+
+#: ../src/plugins/grilo/grilo.ui.h:3 ../src/plugins/grilo/totem-grilo.c:1184
+msgid "Browse"
+msgstr "Tallózás"
+
+#: ../src/plugins/grilo/grilo.ui.h:4 ../src/plugins/grilo/totem-grilo.c:1227
+msgid "Search"
+msgstr "Keresés"
+
+#: ../src/plugins/grilo/totem-grilo.c:454
+msgid "Browse Error"
+msgstr "Böngészési hiba"
+
+#: ../src/plugins/grilo/totem-grilo.c:609
+msgid "Search Error"
+msgstr "Keresési hiba"
 
 #: ../src/plugins/gromit/gromit.plugin.in.h:1
 msgid "Gromit Annotations"
@@ -2173,55 +2054,13 @@
 msgid "The gromit binary was not found."
 msgstr "A gromit bináris nem található."
 
-#. Add the interface to Totem's sidebar
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:1
-#: ../src/plugins/iplayer/iplayer.py:46
-msgid "BBC iPlayer"
-msgstr "BBC iPlayer"
-
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:2
-msgid "Stream BBC programs from the last 7 days from the BBC iPlayer service."
-msgstr "Az elmúlt 7 nap BBC műsorainak lejátszása a BBC iPlayer szolgáltatással"
-
-#: ../src/plugins/iplayer/iplayer.py:72
-msgid "Error listing channel categories"
-msgstr "Hiba a csatornakategóriák felsorolásakor"
-
-#: ../src/plugins/iplayer/iplayer.py:73
-msgid ""
-"There was an unknown error getting the list of television channels available "
-"on BBC iPlayer."
-msgstr ""
-"Ismeretlen hiba történt a BBC iPlayeren elérhető tévécsatornák listájának "
-"lekérésekor."
-
-#. Append a dummy child row so that the expander's visible; we can
-#. then queue off the expander to load the programme listing for this
-#. category
-#: ../src/plugins/iplayer/iplayer.py:84
-msgid "Loading…"
-msgstr "Betöltés…"
-
-#. Translators: the "programme feed" is the list of TV shows
-#. available to watch online
-#: ../src/plugins/iplayer/iplayer.py:136
-msgid "Error getting programme feed"
-msgstr "Hiba a műsorforrás lekérésekor"
-
-#: ../src/plugins/iplayer/iplayer.py:137
-msgid ""
-"There was an error getting the list of programmes for this channel and "
-"category combination."
-msgstr "Hiba történt a csatorna- és kategóriakombináció műsorlistájának lekérésekor."
-
-#: ../src/plugins/iplayer/iplayer2.py:298
-msgid ""
-msgstr ""
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
+msgid "Instant Messenger Status"
+msgstr "Azonnali üzenő állapota"
 
-#: ../src/plugins/iplayer/iplayer2.py:299
-#, python-format
-msgid "Programme unavailable (\"%s\")"
-msgstr "A műsor nem érhető el („%s”)"
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
+msgid "Set your Instant Messenger status to away when a movie is playing"
+msgstr "Az azonnali üzenő állapotának beállítása „távolra” film lejátszásakor"
 
 #: ../src/plugins/lirc/lirc.plugin.in.h:1
 msgid "Infrared Remote Control"
@@ -2239,26 +2078,30 @@
 msgid "Couldn't read lirc configuration."
 msgstr "A lirc konfigurációja nem olvasható."
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
-msgid "Download Movie Subtitles"
-msgstr "Filmfeliratok letöltése"
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:1
+msgid "Media Player Keys"
+msgstr "Médialejátszó billentyűk"
+
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:2
+msgid "Support additional media player keys"
+msgstr "További médialejátszó billentyűk engedélyezése"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
-msgid "Subtitle _language:"
-msgstr "Felirat _nyelve:"
+#: ../src/plugins/ontop/ontop.plugin.in.h:1
+msgid "Always On Top"
+msgstr "Mindig legfelül"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
-msgid "_Play with Subtitle"
-msgstr "_Lejátszás felirattal"
+#: ../src/plugins/ontop/ontop.plugin.in.h:2
+msgid "Keep the main window on top when playing a movie"
+msgstr "A főablak legfelül tartása film lejátszásakor"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:1
-msgid "Look for subtitles for the currently playing movie."
-msgstr "Feliratok keresése a jelenleg lejátszott filmhez."
-
-#: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:2
 msgid "Subtitle Downloader"
 msgstr "Feliratletöltő"
 
+#: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:2
+msgid "Look for subtitles for the currently playing movie"
+msgstr "Feliratok keresése a jelenleg lejátszott filmhez"
+
 #: ../src/plugins/opensubtitles/opensubtitles.py:42
 msgid "Brazilian Portuguese"
 msgstr "Brazíliai portugál"
@@ -2313,87 +2156,43 @@
 msgid "Searching subtitles…"
 msgstr "Feliratok keresése…"
 
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
+msgid "Download Movie Subtitles"
+msgstr "Filmfeliratok letöltése"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
+msgid "Subtitle _language:"
+msgstr "Felirat _nyelve:"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
+msgid "_Play with Subtitle"
+msgstr "_Lejátszás felirattal"
+
 #: ../src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in.h:1
 msgid "Subtitle language"
 msgstr "Felirat nyelve"
 
 #: ../src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in.h:2
-msgid "The language to search for subtitles for movies in."
-msgstr "Filmek feliratának keresése ezen a nyelven."
-
-#: ../src/plugins/ontop/ontop.plugin.in.h:1
-msgid "Always On Top"
-msgstr "Mindig legfelül"
+msgid "The language to search for subtitles for movies in."
+msgstr "Filmek feliratának keresése ezen a nyelven."
 
-#: ../src/plugins/ontop/ontop.plugin.in.h:2
-msgid "Keep the main window on top when playing a movie"
-msgstr "A főablak legfelül tartása film lejátszásakor"
+#: ../src/plugins/properties/movie-properties.plugin.in.h:1
+msgid "Movie Properties"
+msgstr "Videobeállítások"
+
+#: ../src/plugins/properties/movie-properties.plugin.in.h:2
+msgid "Adds movie properties to the sidebar"
+msgstr "Videobeállítások hozzáadása az oldalsávhoz"
 
 #: ../src/plugins/properties/totem-movie-properties.c:246
 msgid "Properties"
 msgstr "Tulajdonságok"
 
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:2
-#, no-c-format
-msgid ""
-"A format string used to build the network service name used when publishing "
-"playlists over the network. The following format placeholders can be used: • "
-"%a: the program name as returned by g_get_application_name() • %h: the "
-"machine's host name in title case • %u: the user's login name in title case "
-"• %U: the user's real name • %%: the percent sign"
-msgstr ""
-"A hálózati szolgáltatás nevének felépítéséhez használt formátum-karakterlánc "
-"a lejátszólisták hálózaton való közzétételekor. A következő formátum-"
-"helykitöltők használhatók: • %a: a program neve, a g_get_application_name() "
-"által visszaadott formában • %h: a gépnév nagybetűvel • %u: a felhasználó "
-"bejelentkezési neve nagybetűvel • %U: a felhasználó valódi neve • %%: "
-"százalékjel"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:3
-msgid "Format for network service name"
-msgstr "Formátum a hálózati szolgáltatásnévhez"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:4
-msgid "Publisher protocol to use"
-msgstr "Használandó közzétételi protokoll"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:5
-msgid "The transport protocol to use when publishing playlists over the network."
-msgstr "A lejátszólisták hálózati közzétételéhez használandó szállítási protokoll."
-
-#. Translators: computers on the local network which are publishing their playlists over the network
-#: ../src/plugins/publish/totem-publish.c:552
-msgid "Neighbors"
-msgstr "Szomszédok"
-
-#: ../src/plugins/publish/publish.plugin.in.h:1
-msgid "Publish Playlist"
-msgstr "Lejátszólista közzététele"
-
-#: ../src/plugins/publish/publish.plugin.in.h:2
-msgid "Share the current playlist via HTTP"
-msgstr "A lejátszólista megosztása HTTP használatával"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:1
-msgid "Service _Name:"
-msgstr "Szolgáltatás _neve:"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:3
-#, no-c-format
-msgid ""
-"The name used for announcing the playlist service on the network.\n"
-"All occurrences of the string %u will be replaced by your name,\n"
-"and %h will be replaced by your computer's host name."
-msgstr ""
-"A lejátszólista-szolgáltatás hálózaton való bejelentéséhez használt név.\n"
-"A %u minden előfordulása az Ön nevével, a %h minden\n"
-"előfordulása pedig a számítógép nevével lesz helyettesítve."
-
-#: ../src/plugins/publish/publish-plugin.ui.h:6
-msgid "Use _encrypted transport protocol (HTTPS)"
-msgstr "_Titkosított átviteli protokoll (HTTPS) használata"
-
 #: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:1
+msgid "rpdb2 password"
+msgstr "rpdb2 jelszó"
+
+#: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:2
 msgid ""
 "A password to protect the rpdb2 server for debugging Totem from unauthorized "
 "remote access. If this is empty, a default of 'totem' will be used."
@@ -2402,26 +2201,87 @@
 "jogosultság nélküli távoli hozzáférés ellen. Ha üres, akkor a „totem” kerül "
 "felhasználásra."
 
-#: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:2
-msgid "rpdb2 password"
-msgstr "rpdb2 jelszó"
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
+msgid "Python Console"
+msgstr "Python konzol"
 
-#: ../src/plugins/rotation/rotation.plugin.in.h:1
-msgid "Allows videos to be rotated if they're in the wrong orientation."
-msgstr "Lehetővé teszi a videók forgatását, ha tájolásuk nem megfelelő."
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
+msgid "Interactive Python console"
+msgstr "Interaktív Python konzol"
 
-#: ../src/plugins/rotation/rotation.plugin.in.h:2
+#: ../src/plugins/pythonconsole/pythonconsole.py:88
+msgid "Python Console Menu"
+msgstr "Python konzol menüje"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:93
+msgid "_Python Console"
+msgstr "_Python konzol"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:94
+msgid "Show Totem's Python console"
+msgstr "A Totem Python konzoljának megjelenítése"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:100
+msgid "Python Debugger"
+msgstr "Python hibakereső"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:101
+msgid "Enable remote Python debugging with rpdb2"
+msgstr "Távoli Python hibakeresés engedélyezése rpdb2 segítségével"
+
+#. pylint: disable-msg=E1101
+#: ../src/plugins/pythonconsole/pythonconsole.py:125
+#, python-format
+msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
+msgstr "A Totem.Object a következő „totem_object” segítségével érhető el:\\n%s"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:129
+msgid "Totem Python Console"
+msgstr "Totem Python konzol"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:139
+msgid ""
+"After you press OK, Totem will wait until you connect to it with winpdb or "
+"rpdb2. If you have not set a debugger password in DConf, it will use the "
+"default password ('totem')."
+msgstr ""
+"Az OK gomb megnyomása után a Totem megvárja, amíg winpdb vagy rpdb2 "
+"segítségével csatlakozik hozzá. Ha nem állított be hibakeresési jelszót a "
+"DConf-ban, akkor az alapértelmezett („totem”) kerül felhasználásra."
+
+#: ../src/plugins/recent/recent.plugin.in.h:1
+#| msgid "Video files"
+msgid "Recent files"
+msgstr "Legutóbbi fájlok"
+
+#: ../src/plugins/recent/recent.plugin.in.h:2
+msgid "Adds files that have been played to recent files"
+msgstr "A lejátszott fájlok hozzáadása a legutóbbi fájlokhoz"
+
+#: ../src/plugins/rotation/rotation.plugin.in.h:1
 msgid "Rotation Plugin"
 msgstr "Forgatás bővítmény"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:60
+#: ../src/plugins/rotation/rotation.plugin.in.h:2
+msgid "Allows videos to be rotated if they are in the wrong orientation"
+msgstr "Lehetővé teszi a videók forgatását, ha tájolásuk nem megfelelő"
+
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:50
 msgid "_Rotate Clockwise"
 msgstr "Forgatás az ó_ramutató irányába"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:62
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:52
 msgid "Rotate Counterc_lockwise"
 msgstr "Forgatás az óramutatóval _ellentétesen"
 
+#: ../src/plugins/save-file/save-file.plugin.in.h:1
+msgid "Save Copy"
+msgstr "Másolat mentése"
+
+#: ../src/plugins/save-file/save-file.plugin.in.h:2
+msgid "Save a copy of the currently playing movie"
+msgstr "A jelenleg lejátszott videó másolása"
+
 #: ../src/plugins/save-file/totem-save-file.c:63
 msgid "Save a Copy..."
 msgstr "Másolat mentése…"
@@ -2444,40 +2304,50 @@
 msgid "Movie stream"
 msgstr "Film adatfolyam"
 
-#: ../src/plugins/screensaver/totem-screensaver.c:116
-#: ../browser-plugin/totem-plugin-viewer.c:1891
-msgid "Playing a movie"
-msgstr "Film lejátszása"
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:1
+msgid "Screen Saver"
+msgstr "Képernyővédő"
+
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:2
+msgid "Deactivates the screen saver when a movie is playing"
+msgstr "Képernyővédő letiltása videó lejátszásakor"
 
 #: ../src/plugins/screenshot/gallery.ui.h:1
+msgid "Screenshot width (in pixels):"
+msgstr "Képernyőkép szélessége (képpont):"
+
+#: ../src/plugins/screenshot/gallery.ui.h:2
 msgid "Calculate the number of screenshots"
 msgstr "Képernyőképek számának kiszámolása"
 
-#: ../src/plugins/screenshot/gallery.ui.h:2
+#: ../src/plugins/screenshot/gallery.ui.h:3
 msgid "Number of screenshots:"
 msgstr "Képernyőképek száma:"
 
-#: ../src/plugins/screenshot/gallery.ui.h:3
-msgid "Screenshot width (in pixels):"
-msgstr "Képernyőkép szélessége (képpont):"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:1
-msgid "Save in _folder:"
-msgstr "_Mentés ebbe a mappába:"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:2
-msgid "Select a folder"
-msgstr "Válasszon egy mappát"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:3
-msgid "_Name:"
-msgstr "_Név:"
-
-#. Write the screenshot to the temporary file
-#: ../src/plugins/screenshot/gnome-screenshot-widget.c:385
-#: ../src/plugins/screenshot/totem-screenshot.c:64
-msgid "Screenshot.png"
-msgstr "Képernyőkép.png"
+#. translators: this is the name of the file that gets made up
+#. * with the screenshot if the entire screen is taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:147
+#, c-format
+#| msgid "Screenshot.png"
+msgid "Screenshot from %s.png"
+msgstr "Képernyőkép erről: %s.png"
+
+#. translators: this is the name of the file that gets
+#. * made up with the screenshot if the entire screen is
+#. * taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:154
+#, c-format
+#| msgid "Screenshot-%s-%d.png"
+msgid "Screenshot from %s - %d.png"
+msgstr "Képernyőkép erről: %s - %d.png"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:1
+msgid "Screenshot"
+msgstr "Képernyőkép"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:2
+msgid "Allows screenshots and galleries to be taken of videos"
+msgstr "Képernyőképek és galériák készítése videókról"
 
 #: ../src/plugins/screenshot/totem-gallery.c:91
 msgid "Save Gallery"
@@ -2503,51 +2373,50 @@
 msgid "Saving gallery as \"%s\""
 msgstr "Galéria mentése mint „%s”"
 
-#: ../src/plugins/screenshot/totem-screenshot.c:113
-msgid "There was an error saving the screenshot."
-msgstr "Hiba történt a képernyőkép mentése közben."
-
-#: ../src/plugins/screenshot/totem-screenshot.c:139
-msgid "Save Screenshot"
-msgstr "Képernyőkép mentése"
-
-#. Create the screenshot widget
-#. Translators: %s is the movie title and %d is an auto-incrementing number to make filename unique
-#: ../src/plugins/screenshot/totem-screenshot.c:160
-#, c-format
-msgid "Screenshot-%s-%d.png"
-msgstr "Képernyőkép-%s-%d.png"
-
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:88
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:220
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "Totem could not get a screenshot of the video."
 msgstr "A Totem nem tud képernyőképet készíteni a videóról."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "This is not supposed to happen; please file a bug report."
 msgstr ""
 "Ennek a bekövetkezését nem tételeztük fel, kérjük küldjön be egy "
 "hibajelentést."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
-msgid "Take _Screenshot..."
-msgstr "_Képernyőkép készítése…"
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
+#| msgid "Take _Screenshot..."
+msgid "Take _Screenshot"
+msgstr "_Képernyőkép készítése"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
 msgid "Take a screenshot"
 msgstr "Képernyőkép készítése"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create Screenshot _Gallery..."
 msgstr "Képernyőkép-g_aléria készítése…"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create a gallery of screenshots"
 msgstr "Képernyőképekből álló galéria készítése"
 
+#: ../src/plugins/skipto/skipto.plugin.in.h:1
+#: ../src/plugins/skipto/totem-skipto.c:196
+msgid "Skip To"
+msgstr "Ugrás"
+
+#: ../src/plugins/skipto/skipto.plugin.in.h:2
+msgid "Provides the \"Skip to\" dialog"
+msgstr "Az „Ugrás” ablak"
+
+#: ../src/plugins/skipto/skipto.ui.h:1
+msgid "_Skip to:"
+msgstr "_Ugrás ide:"
+
 #. Update the "seconds" label so that it always has the correct singular/plural form
 #. Translators: label for the seconds selector in the "Skip to" dialogue
-#: ../src/plugins/skipto/totem-skipto.c:160
+#: ../src/plugins/skipto/totem-skipto.c:159
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "másodperc"
@@ -2557,15 +2426,11 @@
 #. Translators: you should translate this string to a number (written in digits) which corresponds to the longer character length of the
 #. * translations for "second" and "seconds", as translated elsewhere in this file. For example, in English, "second" is 6 characters long and
 #. * "seconds" is 7 characters long, so this string should be translated to "7". See: bgo#639398
-#: ../src/plugins/skipto/totem-skipto.c:190
+#: ../src/plugins/skipto/totem-skipto.c:189
 msgctxt "Skip To label length"
 msgid "7"
 msgstr "9"
 
-#: ../src/plugins/skipto/totem-skipto.c:197
-msgid "Skip To"
-msgstr "Ugrás"
-
 #: ../src/plugins/skipto/totem-skipto-plugin.c:182
 msgid "_Skip To..."
 msgstr "_Ugrás…"
@@ -2574,113 +2439,310 @@
 msgid "Skip to a specific time"
 msgstr "Ugrás egy adott időpontra"
 
-#: ../src/plugins/skipto/skipto.ui.h:1
-msgid "_Skip to:"
-msgstr "_Ugrás ide:"
+#~ msgid "Location not found."
+#~ msgstr "A hely nem található."
 
-#: ../browser-plugin/totem-plugin-viewer.c:431
-msgid "No URI to play"
-msgstr "Nincs lejátszandó URI cím"
+#~ msgid ""
+#~ "Could not open location; you might not have permission to open the file."
+#~ msgstr ""
+#~ "A hely nem nyitható meg; lehet, hogy nincs jogosultsága megnyitni a fájlt."
 
-#. translators: this is:
-#. * Open With ApplicationName
-#. * as in nautilus' right-click menu
-#: ../browser-plugin/totem-plugin-viewer.c:1107
-#, c-format
-msgid "_Open with \"%s\""
-msgstr "Megnyitás e_zzel: „%s”"
+#~ msgid ""
+#~ "Failed to create a GStreamer play object. Please check your GStreamer "
+#~ "installation."
+#~ msgstr ""
+#~ "Nem sikerült GStreamer-lejátszóobjektumot létrehozni. Kérem ellenőrizze a "
+#~ "GStreamer telepítését."
 
-#: ../browser-plugin/totem-plugin-viewer.c:2136
-msgid "No playlist or playlist empty"
-msgstr "Nem létező vagy üres lejátszólista"
+#~ msgid "%d %%"
+#~ msgstr "%d%%"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2235
-msgid "Movie browser plugin"
-msgstr "Médialejátszó böngészőbővítmény"
+#~ msgid ""
+#~ msgstr ""
 
-#: ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Verify your system installation. The Totem plugin will now exit."
-msgstr "Ellenőrizze a rendszer telepítését. A Totem bővítmény most kilép."
+#~ msgid "Programme unavailable (\"%s\")"
+#~ msgstr "A műsor nem érhető el („%s”)"
 
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
-msgid "Interactive Python console."
-msgstr "Interaktív Python konzol."
+#~ msgid "BBC iPlayer"
+#~ msgstr "BBC iPlayer"
 
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
-msgid "Python Console"
-msgstr "Python konzol"
+#~| msgid ""
+#~| "Stream BBC programs from the last 7 days from the BBC iPlayer service."
+#~ msgid ""
+#~ "Stream BBC programs from the last 7 days from the BBC iPlayer service"
+#~ msgstr ""
+#~ "Az elmúlt 7 nap BBC műsorainak lejátszása a BBC iPlayer szolgáltatással"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:88
-msgid "Python Console Menu"
-msgstr "Python konzol menüje"
+#~ msgid "Error listing channel categories"
+#~ msgstr "Hiba a csatornakategóriák felsorolásakor"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:93
-msgid "_Python Console"
-msgstr "_Python konzol"
+#~ msgid ""
+#~ "There was an unknown error getting the list of television channels "
+#~ "available on BBC iPlayer."
+#~ msgstr ""
+#~ "Ismeretlen hiba történt a BBC iPlayeren elérhető tévécsatornák listájának "
+#~ "lekérésekor."
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:94
-msgid "Show Totem's Python console"
-msgstr "A Totem Python konzoljának megjelenítése"
+#~ msgid "Loading…"
+#~ msgstr "Betöltés…"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:100
-msgid "Python Debugger"
-msgstr "Python hibakereső"
+#~ msgid "Error getting programme feed"
+#~ msgstr "Hiba a műsorforrás lekérésekor"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:101
-msgid "Enable remote Python debugging with rpdb2"
-msgstr "Távoli Python hibakeresés engedélyezése rpdb2 segítségével"
+#~ msgid ""
+#~ "There was an error getting the list of programmes for this channel and "
+#~ "category combination."
+#~ msgstr ""
+#~ "Hiba történt a csatorna- és kategóriakombináció műsorlistájának "
+#~ "lekérésekor."
 
-#. pylint: disable-msg=E1101
-#: ../src/plugins/pythonconsole/pythonconsole.py:125
-#, python-format
-msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
-msgstr "A Totem.Object a következő „totem_object” segítségével érhető el:\\n%s"
+#~ msgid "_Name:"
+#~ msgstr "_Név:"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:129
-msgid "Totem Python Console"
-msgstr "Totem Python konzol"
+#~ msgid "Save in _folder:"
+#~ msgstr "_Mentés ebbe a mappába:"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:139
-msgid ""
-"After you press OK, Totem will wait until you connect to it with winpdb or "
-"rpdb2. If you have not set a debugger password in DConf, it will use the "
-"default password ('totem')."
-msgstr ""
-"Az OK gomb megnyomása után a Totem megvárja, amíg winpdb vagy rpdb2 "
-"segítségével csatlakozik hozzá. Ha nem állított be hibakeresési jelszót a "
-"DConf-ban, akkor az alapértelmezett („totem”) kerül felhasználásra."
+#~ msgid "Select a folder"
+#~ msgstr "Válasszon egy mappát"
 
-#: ../src/plugins/grilo/grilo.plugin.in.h:1
-msgid "A plugin to let you browse media content from various sources."
-msgstr "Különböző forrásokból származó médiatartalom böngészése."
+#~ msgid "There was an error saving the screenshot."
+#~ msgstr "Hiba történt a képernyőkép mentése közben."
 
-#: ../src/plugins/grilo/grilo.plugin.in.h:2
-msgid "Grilo Browser"
-msgstr "Grilo böngésző"
+#~ msgid "Save Screenshot"
+#~ msgstr "Képernyőkép mentése"
 
-#: ../src/plugins/grilo/totem-grilo.c:452
-msgid "Browse Error"
-msgstr "Böngészési hiba"
+#~ msgid "Play movies and songs"
+#~ msgstr "Filmek és dalok lejátszása"
 
-#: ../src/plugins/grilo/totem-grilo.c:599
-msgid "Search Error"
-msgstr "Keresési hiba"
+#~ msgid "1.5 Mbps T1/Intranet/LAN"
+#~ msgstr "1.5 Mbps T1/Intranet/LAN"
 
-#: ../src/plugins/grilo/totem-grilo.c:1219 ../src/plugins/grilo/grilo.ui.h:2
-msgid "Browse"
-msgstr "Tallózás"
+#~ msgid "112 Kbps Dual ISDN/DSL"
+#~ msgstr "112 Kbps duál ISDN/DSL"
 
-#: ../src/plugins/grilo/totem-grilo.c:1285 ../src/plugins/grilo/grilo.ui.h:4
-msgid "Search"
-msgstr "Keresés"
+#~ msgid "14.4 Kbps Modem"
+#~ msgstr "14.4 Kbps modem"
 
-#: ../src/plugins/grilo/grilo.ui.h:1
-msgid "Add to Playlist"
-msgstr "Hozzáadás a lejátszólistához"
+#~ msgid "19.2 Kbps Modem"
+#~ msgstr "19.2 Kbps modem"
 
-#: ../src/plugins/grilo/grilo.ui.h:3
-msgid "Copy Location"
-msgstr "Hely másolása"
+#~ msgid "256 Kbps DSL/Cable"
+#~ msgstr "256 Kbps DSL/kábel"
+
+#~ msgid "28.8 Kbps Modem"
+#~ msgstr "28.8 Kbps modem"
+
+#~ msgid "33.6 Kbps Modem"
+#~ msgstr "33.6 Kbps modem"
+
+#~ msgid "34.4 Kbps Modem"
+#~ msgstr "34.4 Kbps modem"
+
+#~ msgid "384 Kbps DSL/Cable"
+#~ msgstr "384 Kbps DSL/kábel"
+
+#~ msgid "512 Kbps DSL/Cable"
+#~ msgstr "512 Kbps DSL/kábel"
+
+#~ msgid "56 Kbps Modem/ISDN"
+#~ msgstr "56 Kbps modem/ISDN"
+
+#~ msgid "Configure the application"
+#~ msgstr "Az alkalmazás beállítása"
+
+#~ msgid "Connection _speed:"
+#~ msgstr "Csatlakozási _sebesség:"
+
+#~ msgid "Intranet/LAN"
+#~ msgstr "Intranet/LAN"
+
+#~ msgid "Networking"
+#~ msgstr "Hálózatkezelés"
+
+#~ msgid "Open a file"
+#~ msgstr "Fájl megnyitása"
+
+#~ msgid "Open a non-local file"
+#~ msgstr "Nem helyi fájl megnyitása"
+
+#~ msgid "Quit the program"
+#~ msgstr "Kilépés a programból"
+
+#~ msgid "Set the repeat mode"
+#~ msgstr "Ismétlés mód beállítása"
+
+#~ msgid "Set the shuffle mode"
+#~ msgstr "Véletlenszerű lejátszás mód beállítása"
+
+#~ msgid "Switch to fullscreen"
+#~ msgstr "Átváltás teljes képernyőre"
+
+#~ msgid ""
+#~ "Approximate network connection speed, used to select quality on media "
+#~ "over the network."
+#~ msgstr ""
+#~ "Hálózati kapcsolat becsült sebessége, a hálózati média minőségének "
+#~ "kiválasztásához."
+
+#~ msgid "Network connection speed"
+#~ msgstr "Hálózati kapcsolat sebessége"
+
+#~ msgid "Play Image '%s'"
+#~ msgstr "„%s” lemezkép lejátszása"
+
+#~ msgid "device%d"
+#~ msgstr "%d. eszköz"
+
+#~ msgid "Play Disc '%s'"
+#~ msgstr "„%s” lemez lejátszása"
+
+#~ msgid "Movie Player using %s"
+#~ msgstr "Médialejátszó %s alapokon"
+
+#~ msgid ""
+#~ "Totem could not play this media (%s) although a plugin is present to "
+#~ "handle it."
+#~ msgstr ""
+#~ "A Totem nem tudja lejátszani ezen médiát (%s), habár van bővítmény a "
+#~ "kezeléséhez."
+
+#~ msgid ""
+#~ "You might want to check that a disc is present in the drive and that it "
+#~ "is correctly configured."
+#~ msgstr ""
+#~ "Ellenőrizze, hogy a lemez a meghajtóban van-e és megfelelően be van-e "
+#~ "állítva."
+
+#~ msgid "More information about media plugins"
+#~ msgstr "További információk a médiabővítményekről"
+
+#~ msgid ""
+#~ "Please install the necessary plugins and restart Totem to be able to play "
+#~ "this media."
+#~ msgstr ""
+#~ "Telepítse a szükséges bővítményeket és indítsa újra a Totemet ezen média "
+#~ "lejátszásához."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it does not have the "
+#~ "appropriate plugins to be able to read from the disc."
+#~ msgstr ""
+#~ "A Totem nem tudja lejátszani ezt a típusú médiát (%s), mert nincsenek "
+#~ "megfelelő bővítmények a lemezről történő olvasáshoz."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because you do not have the "
+#~ "appropriate plugins to handle it."
+#~ msgstr ""
+#~ "A Totem nem tudja lejátszani ezt a típusú médiát (%s), mert nincs "
+#~ "megfelelő bővítmény a kezeléséhez."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it is not supported."
+#~ msgstr ""
+#~ "A Totem nem tudja lejátszani ezt a médiatípust (%s), mert nem támogatott."
+
+#~ msgid "Please insert another disc to play back."
+#~ msgstr "Helyezzen be egy másik lemezt a lejátszáshoz."
+
+#~ msgid "Totem does not support playback of Audio CDs"
+#~ msgstr "A Totem nem támogatja a hang CD-k lejátszását"
+
+#~ msgid ""
+#~ "Please consider using a music player or a CD extractor to play this CD"
+#~ msgstr "A CD lejátszásához használjon zenelejátszót vagy CD-beolvasót"
+
+#~ msgid ""
+#~ "The requested audio output was not found. Please select another audio "
+#~ "output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "A kért hangkimenet nem található. Kérem válasszon másik hangkimenetet a "
+#~ "Multimédia rendszer választóban."
+
+#~ msgid ""
+#~ "The video output is in use by another application. Please close other "
+#~ "video applications, or select another video output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "A videokimenetet egy másik alkalmazás használja. Kérem zárja be a többi "
+#~ "videoalkalmazást vagy válasszon másik videokimenetet a Multimédia "
+#~ "rendszer választóban."
+
+#~ msgid ""
+#~ "The audio output is in use by another application. Please select another "
+#~ "audio output in the Multimedia Systems Selector. You may want to consider "
+#~ "using a sound server."
+#~ msgstr ""
+#~ "A hangkimenetet egy másik alkalmazás használja. Kérem válasszon másik "
+#~ "hangkimenetet a Multimédia rendszer választóban. Fontolja meg egy "
+#~ "hangkiszolgáló használatát."
+
+#~ msgid ""
+#~ "Failed to open audio output. You may not have permission to open the "
+#~ "sound device, or the sound server may not be running. Please select "
+#~ "another audio output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "A hangkimenet megnyitása sikertelen. Lehet, hogy nincs jogosultsága a "
+#~ "hangeszköz megnyitásához vagy a hangkiszolgáló nem fut. Kérem válasszon "
+#~ "másik hangkimenetet a Multimédia rendszer választóban. "
+
+#~ msgid ""
+#~ "Could not find the audio output. You may need to install additional "
+#~ "GStreamer plugins, or select another audio output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "A hangkimenet nem található. Lehet, hogy további GStreamer bővítményeket "
+#~ "kell telepítenie, vagy válasszon másik hangkimenetet a Multimédia "
+#~ "rendszer választóban."
+
+#~ msgid ""
+#~ "A format string used to build the network service name used when "
+#~ "publishing playlists over the network. The following format placeholders "
+#~ "can be used: • %a: the program name as returned by g_get_application_name"
+#~ "() • %h: the machine's host name in title case • %u: the user's login "
+#~ "name in title case • %U: the user's real name • %%: the percent sign"
+#~ msgstr ""
+#~ "A hálózati szolgáltatás nevének felépítéséhez használt formátum-"
+#~ "karakterlánc a lejátszólisták hálózaton való közzétételekor. A következő "
+#~ "formátum-helykitöltők használhatók: • %a: a program neve, a "
+#~ "g_get_application_name() által visszaadott formában • %h: a gépnév "
+#~ "nagybetűvel • %u: a felhasználó bejelentkezési neve nagybetűvel • %U: a "
+#~ "felhasználó valódi neve • %%: százalékjel"
+
+#~ msgid "Format for network service name"
+#~ msgstr "Formátum a hálózati szolgáltatásnévhez"
+
+#~ msgid "Publisher protocol to use"
+#~ msgstr "Használandó közzétételi protokoll"
+
+#~ msgid ""
+#~ "The transport protocol to use when publishing playlists over the network."
+#~ msgstr ""
+#~ "A lejátszólisták hálózati közzétételéhez használandó szállítási protokoll."
+
+#~ msgid "Neighbors"
+#~ msgstr "Szomszédok"
+
+#~ msgid "Publish Playlist"
+#~ msgstr "Lejátszólista közzététele"
+
+#~ msgid "Share the current playlist via HTTP"
+#~ msgstr "A lejátszólista megosztása HTTP használatával"
+
+#~ msgid "Service _Name:"
+#~ msgstr "Szolgáltatás _neve:"
+
+#~ msgid ""
+#~ "The name used for announcing the playlist service on the network.\n"
+#~ "All occurrences of the string %u will be replaced by your name,\n"
+#~ "and %h will be replaced by your computer's host name."
+#~ msgstr ""
+#~ "A lejátszólista-szolgáltatás hálózaton való bejelentéséhez használt név.\n"
+#~ "A %u minden előfordulása az Ön nevével, a %h minden\n"
+#~ "előfordulása pedig a számítógép nevével lesz helyettesítve."
+
+#~ msgid "Use _encrypted transport protocol (HTTPS)"
+#~ msgstr "_Titkosított átviteli protokoll (HTTPS) használata"
 
 #~ msgid "Bemused"
 #~ msgstr "Bemused"
@@ -2709,9 +2771,6 @@
 #~ msgid "Search Results"
 #~ msgstr "Keresési eredmények"
 
-#~ msgid "Videos"
-#~ msgstr "Videók"
-
 #~ msgid "_Open in Web Browser"
 #~ msgstr "Megnyitás _webböngészőben"
 
@@ -2955,4 +3014,3 @@
 
 #~ msgid "Totem Browser Plugin"
 #~ msgstr "Totem böngészőbővítmény"
-
diff -Nru totem-3.4.3/po/id.po totem-3.6.2/po/id.po
--- totem-3.4.3/po/id.po	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/po/id.po	2012-10-25 13:15:32.000000000 +0000
@@ -1,4 +1,4 @@
-# Translation of totem master to Indonesian
+# Translation of totem to Indonesian
 # Copyright (C) 2004 THE totem's COPYRIGHT HOLDER
 # This file is distributed under the same license as the totem package.
 #
@@ -10,29 +10,241 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: totem.master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=totem&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-03-28 18:27+0000\n"
-"PO-Revision-Date: 2012-03-29 21:47+0700\n"
+"Project-Id-Version: totem gnome-3-6\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=totem&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2012-09-11 12:55+0000\n"
+"PO-Revision-Date: 2012-09-11 23:42+0700\n"
 "Last-Translator: Andika Triwidada \n"
 "Language-Team: GNOME Indonesian Translation Team \n"
+"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Lokalize 1.1\n"
-"X-Poedit-Language: Indonesian\n"
-"X-Poedit-Country: INDONESIA\n"
+
+#: ../browser-plugin/totem-plugin-viewer.c:352 ../src/totem-object.c:1180
+#: ../src/totem-object.c:1650 ../src/totem-statusbar.c:115
+msgid "Stopped"
+msgstr "Berhenti"
+
+#: ../browser-plugin/totem-plugin-viewer.c:364 ../src/totem-object.c:1173
+msgid "Paused"
+msgstr "Ditahan"
+
+#: ../browser-plugin/totem-plugin-viewer.c:368 ../src/totem-object.c:1166
+msgid "Playing"
+msgstr "Memutar"
+
+#: ../browser-plugin/totem-plugin-viewer.c:386
+#: ../src/plugins/screensaver/totem-screensaver.c:97
+msgid "Playing a movie"
+msgstr "Memutar film"
+
+#: ../browser-plugin/totem-plugin-viewer.c:443
+msgid "No URI to play"
+msgstr "Tidak ada URI untuk dimainkan"
+
+#: ../browser-plugin/totem-plugin-viewer.c:676
+#: ../browser-plugin/totem-plugin-viewer.c:1700
+msgid "Totem Movie Player"
+msgstr "Totem Pemutar Film"
+
+#. translators: this is:
+#. * Open With ApplicationName
+#. * as in nautilus' right-click menu
+#: ../browser-plugin/totem-plugin-viewer.c:1120
+#, c-format
+msgid "_Open with \"%s\""
+msgstr "_Buka dengan \"%s\""
+
+#: ../browser-plugin/totem-plugin-viewer.c:1341 ../src/totem-object.c:2475
+msgid "An error occurred"
+msgstr "Terjadi galat"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2033
+msgid "No playlist or playlist empty"
+msgstr "Tidak ada daftar main atau daftar main kosong"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2128
+msgid "Movie browser plugin"
+msgstr "Pengaya peramban film"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144 ../src/totem.c:240
+msgid "Could not initialize the thread-safe libraries."
+msgstr "Tidak dapat menjalankan pustaka thread-safe."
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144
+msgid "Verify your system installation. The Totem plugin will now exit."
+msgstr "Periksa instalasi sistem Anda. Pengaya Totem akan keluar sekarang."
 
 #: ../data/fullscreen.ui.h:1
 msgid "Leave Fullscreen"
 msgstr "Keluar dari Layar Penuh"
 
-#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:144
+#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:81
 msgid "Time:"
 msgstr "Waktu:"
 
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
+msgid "Allow the screensaver to activate when playing audio"
+msgstr "Perbolehkan pengaman layar untuk aktif saat memutar audio"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
+msgid ""
+"Allow the screensaver to activate when playing audio. Disable if you have "
+"monitor-powered speakers."
+msgstr ""
+"Memperbolehkan pengaman layar untuk aktif saat memutar audio. Nonaktifkan "
+"apabila Anda memiliki pengeras suara dengan sumber daya yang disediakan oleh "
+"monitor."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
+msgid "Show visual effects when no video is displayed"
+msgstr "Menampilkan efek visual saat tidak ada video yang diputar"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
+msgid "Show visual effects when playing an audio only file."
+msgstr "Menampilkan efek visual saat memutar audio."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
+msgid "Name of the visual effects plugin"
+msgstr "Nama dari pengaya efek visual"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
+msgid "The brightness of the video"
+msgstr "Kecerahan video"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
+msgid "The contrast of the video"
+msgstr "Kekontrasan video"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
+msgid "The hue of the video"
+msgstr "Kualitas warna video"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
+msgid "The saturation of the video"
+msgstr "Saturasi video"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
+msgid "Resize the canvas automatically on file load"
+msgstr "Otomatis mengubah ukuran kanvas saat membuka berkas"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
+msgid "Repeat mode"
+msgstr "Modus berulang"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
+msgid "Shuffle mode"
+msgstr "Modus acak"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
+msgid "Whether to disable deinterlacing for interlaced movies"
+msgstr "Apakah menonaktifkan deinterlasi terhadap film yang memiliki interlasi"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
+msgid "Whether to enable debug for the playback engine"
+msgstr "Apakah debuh diaktifkan untuk aplikasi pemutar"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
+msgid "Type of audio output to use"
+msgstr "Jenis keluaran audio yang ingin digunakan"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
+msgid "Visualization quality setting"
+msgstr "Setelan kualitas visualisasi"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
+msgid "Quality setting for the audio visualization."
+msgstr "Pengaturan kualitas bagi visualisasi suara."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
+msgid "Network buffering threshold"
+msgstr "Ambang sangga jaringan"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
+msgid ""
+"Amount of data to buffer for network streams before starting to display the "
+"stream (in seconds)."
+msgstr ""
+"Banyaknya data yang disangga untuk stream jaringan sebelum menampilkan "
+"stream (dalam detik)."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
+msgid "Subtitle font"
+msgstr "Fonta subtitel"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
+msgid "Pango font description for subtitle rendering."
+msgstr "Deskripsi fonta Pango untuk merender teks subtitel."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
+msgid "Subtitle encoding"
+msgstr "Enkode subtitel"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
+msgid "Encoding character set for subtitle."
+msgstr "Pengkodean set karakter untuk subtitel."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
+msgid "Default location for the \"Open...\" dialogs"
+msgstr "Lokasi utama untuk dialog \"Buka...\""
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
+msgid ""
+"Default location for the \"Open...\" dialogs. Default is the current "
+"directory."
+msgstr ""
+"Lokasi bawaan untuk dialog \"Buka...\". Lokasi bawaan adalah direktori kini."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
+msgid "Default location for the \"Take Screenshot\" dialogs"
+msgstr "Lokasi utama untuk dialog \"Ambil Cuplikan\""
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
+msgid ""
+"Default location for the \"Take Screenshot\" dialogs. Default is the "
+"Pictures directory."
+msgstr ""
+"Lokasi bawaan untuk dialog \"Ambil Cuplikan\". Lokasi bawaan adalah "
+"direktori Gambar."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
+msgid "Whether to disable the plugins in the user's home directory"
+msgstr "Apakah pengaya dinonaktifkan untuk direktori rumah pengguna"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
+msgid "Whether to disable the keyboard shortcuts"
+msgstr "Apakah tombol pintas papan ketik dinonaktifkan"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
+msgid "Whether to autoload text subtitle files when a movie is loaded"
+msgstr "Apakah teks subtitel dimuat otomatis saat film dibuka"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
+msgid "Whether to autoload external chapter files when a movie is loaded"
+msgstr "Apakah bab eksternal dimuat otomatis saat film dibuka"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
+msgid ""
+"Whether to remember the position of played audio/video files when pausing or "
+"closing them"
+msgstr ""
+"Apakah posisi audio/video yang diputar tetap diingat saat audio/video "
+"tersebut ditahan atau ditutup"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
+msgid "Active plugins list"
+msgstr "Daftar pengaya aktif"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+msgid ""
+"A list of the names of the plugins which are currently active (loaded and "
+"running)."
+msgstr "Daftar nama pengaya yang kini aktif (dimuat dan sedang berjalan)."
+
 #: ../data/playlist.ui.h:1
 msgid "_Remove"
 msgstr "_Hapus"
@@ -49,11 +261,11 @@
 msgid "Copy the location to the clipboard"
 msgstr "Salin lokasi ke papan klip"
 
-#: ../data/playlist.ui.h:5 ../data/totem.ui.h:78
+#: ../data/playlist.ui.h:5 ../data/totem.ui.h:71
 msgid "_Select Text Subtitles..."
 msgstr "Pilih Tek_s Subtitel..."
 
-#: ../data/playlist.ui.h:6 ../data/totem.ui.h:79
+#: ../data/playlist.ui.h:6 ../data/totem.ui.h:72
 msgid "Select a file to use for text subtitles"
 msgstr "Memilih berkas untuk teks subtitel"
 
@@ -77,10 +289,165 @@
 msgid "Move Down"
 msgstr "Turun"
 
-#: ../data/properties.ui.h:1 ../data/totem.ui.h:122
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:2
+msgid "Normal"
+msgstr "Normal"
+
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:4
+msgid "Large"
+msgstr "Besar"
+
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:6
+msgid "Extra Large"
+msgstr "Sangat Besar"
+
+#: ../data/preferences.ui.h:7 ../src/backend/bacon-video-widget.c:5498
+#: ../src/totem-properties-view.c:231
+msgid "Stereo"
+msgstr "Stereo"
+
+#: ../data/preferences.ui.h:8
+msgid "4-channel"
+msgstr "4 kanal"
+
+#: ../data/preferences.ui.h:9
+msgid "4.1-channel"
+msgstr "4.1 kanal"
+
+#: ../data/preferences.ui.h:10
+msgid "5.0-channel"
+msgstr "5.0 kanal"
+
+#: ../data/preferences.ui.h:11
+msgid "5.1-channel"
+msgstr "5.1 kanal"
+
+#: ../data/preferences.ui.h:12
+msgid "AC3 Passthrough"
+msgstr "Lewatan AC3"
+
+#: ../data/preferences.ui.h:13
+msgid "Totem Preferences"
+msgstr "Preferensi Totem"
+
+#: ../data/preferences.ui.h:14
+msgid "Playback"
+msgstr "Putar"
+
+#: ../data/preferences.ui.h:15
+msgid "Start playing files from last position"
+msgstr "Mulai memutar berkas dari posisi terakhir"
+
+#: ../data/preferences.ui.h:16
+msgid "Text Subtitles"
+msgstr "Teks Subtitel"
+
+#: ../data/preferences.ui.h:17
+msgid "_Load subtitle files when movie is loaded"
+msgstr "Memuat berkas subtite_l saat film dibuka"
+
+#: ../data/preferences.ui.h:18
+msgid "_Font:"
+msgstr "_Fonta:"
+
+#: ../data/preferences.ui.h:19
+msgid "_Encoding:"
+msgstr "_Enkoding:"
+
+#: ../data/preferences.ui.h:20
+msgid "External Chapters"
+msgstr "Bab Eksternal"
+
+#: ../data/preferences.ui.h:21
+msgid "Load _chapter files when movie is loaded"
+msgstr "Memuat berkas _bab saat film dibuka"
+
+#: ../data/preferences.ui.h:22 ../data/properties.ui.h:1
 msgid "General"
 msgstr "Umum"
 
+#. Tab label in the Preferences dialogue
+#: ../data/preferences.ui.h:24
+msgid "Display"
+msgstr "Tampilan"
+
+#: ../data/preferences.ui.h:25
+msgid "_Resize the window when a new video is loaded"
+msgstr "Mengubah uku_ran jendela saat video baru dibuka"
+
+#: ../data/preferences.ui.h:26
+msgid "Disable _deinterlacing of interlaced videos"
+msgstr "Nonaktifkan _deinterlasi video yang berinterlasi"
+
+#: ../data/preferences.ui.h:27
+msgid "Disable screensaver when playing "
+msgstr "Nonaktifkan pengaman layar saat memainkan media"
+
+#: ../data/preferences.ui.h:28 ../data/properties.ui.h:9
+#: ../src/totem-properties-view.c:273
+msgid "Video"
+msgstr "Video"
+
+#: ../data/preferences.ui.h:29
+msgid "Video or Audio"
+msgstr "Video atau Audio"
+
+#: ../data/preferences.ui.h:30
+msgid "Visual Effects"
+msgstr "Efek Visual"
+
+#: ../data/preferences.ui.h:31
+msgid "Show _visual effects when an audio file is played"
+msgstr "Tampilkan efek _visual saat memutar audio"
+
+#: ../data/preferences.ui.h:32
+msgid "_Type of visualization:"
+msgstr "_Jenis visualisasi:"
+
+#: ../data/preferences.ui.h:33
+msgid "Visualization _size:"
+msgstr "Ukuran vi_sualisasi:"
+
+#: ../data/preferences.ui.h:34
+msgid "Color Balance"
+msgstr "Keseimbangan Warna"
+
+#: ../data/preferences.ui.h:35
+msgid "_Brightness:"
+msgstr "_Kecerahan:"
+
+#: ../data/preferences.ui.h:36
+msgid "Co_ntrast:"
+msgstr "Ko_ntras:"
+
+#: ../data/preferences.ui.h:37
+msgid "Sat_uration:"
+msgstr "Sat_urasi:"
+
+#: ../data/preferences.ui.h:38
+msgid "_Hue:"
+msgstr "_Corak:"
+
+#: ../data/preferences.ui.h:39
+msgid "Reset to _Defaults"
+msgstr "Kembali ke _Pengaturan Awal"
+
+#: ../data/preferences.ui.h:40
+msgid "Audio Output"
+msgstr "Keluaran Audio"
+
+#: ../data/preferences.ui.h:41
+msgid "_Audio output type:"
+msgstr "Jenis keluaran _audio:"
+
+#: ../data/preferences.ui.h:42 ../data/properties.ui.h:14
+#: ../src/totem-properties-view.c:271
+msgid "Audio"
+msgstr "Audio"
+
 #: ../data/properties.ui.h:2
 msgid "Title:"
 msgstr "Judul:"
@@ -109,11 +476,6 @@
 msgid "Container:"
 msgstr "Wadah:"
 
-#: ../data/properties.ui.h:9 ../data/totem.ui.h:128
-#: ../src/totem-properties-view.c:270
-msgid "Video"
-msgstr "Video"
-
 #: ../data/properties.ui.h:10
 msgid "Dimensions:"
 msgstr "Dimensi:"
@@ -130,11 +492,6 @@
 msgid "Bitrate:"
 msgstr "Laju bit:"
 
-#: ../data/properties.ui.h:14 ../data/totem.ui.h:142
-#: ../src/totem-properties-view.c:268
-msgid "Audio"
-msgstr "Audio"
-
 #: ../data/properties.ui.h:15
 msgid "Sample rate:"
 msgstr "Laju sampel:"
@@ -143,713 +500,444 @@
 msgid "Channels:"
 msgstr "Kanal:"
 
-#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
-msgid "_Add to Playlist"
-msgstr "T_ambah ke Daftar Main"
-
-#: ../data/video-list.ui.h:2
-msgid "Add the video to the playlist"
-msgstr "Menambahkan video ke daftar main"
-
 #. Title
-#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:143
-#: ../src/totem-object.c:1667
-msgid "Movie Player"
-msgstr "Pemutar Film"
+#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:80 ../src/totem.c:239
+#: ../src/totem.c:248 ../src/totem-menu.c:790 ../src/totem-object.c:1658
+msgid "Videos"
+msgstr "Video"
 
 #: ../data/totem.desktop.in.in.in.h:2
-msgid "Play movies and songs"
-msgstr "Memutar film dan lagu"
+msgid "Play movies"
+msgstr "Memutar film"
+
+#: ../data/totem.desktop.in.in.in.h:3
+msgid "Video;Movie;Film;Clip;Series;Player;DVD;TV;Disc;"
+msgstr "Video;Film;Klip;Seri;Pemutar;DVD;TV;Disc;"
 
 #: ../data/totem.ui.h:1
-msgid "_Movie"
-msgstr "Fil_m"
+msgid "_Open"
+msgstr "_Buka"
 
 #: ../data/totem.ui.h:2
-msgid "_Open..."
-msgstr "_Buka..."
+msgid "Open _Location"
+msgstr "Buka _Lokasi"
 
 #: ../data/totem.ui.h:3
-msgid "Open a file"
-msgstr "Membuka berkas"
+msgid "_Fullscreen"
+msgstr "Layar _Penuh"
 
 #: ../data/totem.ui.h:4
-msgid "Open _Location..."
-msgstr "Buka _Lokasi..."
+msgid "Prefere_nces"
+msgstr "Prefere_nsi"
 
 #: ../data/totem.ui.h:5
-msgid "Open a non-local file"
-msgstr "Membuka berkas nonlokal"
+msgid "Shuff_le"
+msgstr "A_cak"
 
 #: ../data/totem.ui.h:6
+msgid "_Repeat"
+msgstr "Be_rulang"
+
+#: ../data/totem.ui.h:7
+msgid "_Quit"
+msgstr "_Keluar"
+
+#: ../data/totem.ui.h:8
+msgid "_Movie"
+msgstr "Fil_m"
+
+#: ../data/totem.ui.h:9
 msgid "_Eject"
 msgstr "K_eluarkan"
 
-#: ../data/totem.ui.h:7
+#: ../data/totem.ui.h:10
 msgid "Eject the current disc"
 msgstr "Keluarkan diska"
 
-#: ../data/totem.ui.h:8
+#: ../data/totem.ui.h:11
 msgid "_Properties"
 msgstr "_Properti"
 
-#: ../data/totem.ui.h:9
+#: ../data/totem.ui.h:12
 msgid "View the properties of the current stream"
 msgstr "Melihat properti dari media yang bersangkutan"
 
-#: ../data/totem.ui.h:10
+#: ../data/totem.ui.h:13
 msgid "Play / P_ause"
 msgstr "Putar / T_ahan"
 
-#: ../data/totem.ui.h:11
+#: ../data/totem.ui.h:14
 msgid "Play or pause the movie"
 msgstr "Memutar atau menahan putaran film"
 
-#: ../data/totem.ui.h:12
-msgid "_Quit"
-msgstr "_Keluar"
-
-#: ../data/totem.ui.h:13
-msgid "Quit the program"
-msgstr "Keluar dari program"
-
-#: ../data/totem.ui.h:14
+#: ../data/totem.ui.h:15
 msgid "_Edit"
 msgstr "_Sunting"
 
-#: ../data/totem.ui.h:15
+#: ../data/totem.ui.h:16
 msgid "_Clear Playlist"
 msgstr "_Bersihkan Daftar Main"
 
-#: ../data/totem.ui.h:16
+#: ../data/totem.ui.h:17
 msgid "Clear the playlist"
 msgstr "Membersihkan daftar main"
 
-#: ../data/totem.ui.h:17
-msgid "Prefere_nces"
-msgstr "Prefere_nsi"
-
 #: ../data/totem.ui.h:18
-msgid "Configure the application"
-msgstr "Mengonfigurasi aplikasi"
-
-#: ../data/totem.ui.h:19
 msgid "Plugins..."
 msgstr "Pengaya..."
 
-#: ../data/totem.ui.h:20
+#: ../data/totem.ui.h:19
 msgid "Configure plugins to extend the application"
 msgstr "Megonfigurasi pengaya untuk menambah kelengkapan aplikasi"
 
-#: ../data/totem.ui.h:21
+#: ../data/totem.ui.h:20
 msgid "_View"
 msgstr "_Tampilan"
 
-#: ../data/totem.ui.h:22
-msgid "_Fullscreen"
-msgstr "Layar _Penuh"
-
-#: ../data/totem.ui.h:23
-msgid "Switch to fullscreen"
-msgstr "Berpindah ke layar penuh"
-
-#: ../data/totem.ui.h:24
+#: ../data/totem.ui.h:21
 msgid "Fit Window to Movie"
 msgstr "Paskan Jendela ke Film"
 
-#: ../data/totem.ui.h:25
+#: ../data/totem.ui.h:22
 msgid "_Resize 1:2"
 msgstr "Ubah Uku_ran 1:2"
 
-#: ../data/totem.ui.h:26
+#: ../data/totem.ui.h:23
 msgid "Resize to half the original video size"
 msgstr "Setengah ukuran asli"
 
-#: ../data/totem.ui.h:27
+#: ../data/totem.ui.h:24
 msgid "Resize _1:1"
 msgstr "Ubah ukuran _1:1"
 
-#: ../data/totem.ui.h:28
+#: ../data/totem.ui.h:25
 msgid "Resize to the original video size"
 msgstr "Ukuran asli"
 
-#: ../data/totem.ui.h:29
+#: ../data/totem.ui.h:26
 msgid "Resize _2:1"
 msgstr "Ubah Ukuran _2:1"
 
-#: ../data/totem.ui.h:30
+#: ../data/totem.ui.h:27
 msgid "Resize to double the original video size"
 msgstr "Dua kali ukuran asli"
 
-#: ../data/totem.ui.h:31
+#: ../data/totem.ui.h:28
 msgid "_Aspect Ratio"
 msgstr "Perbandingan _Aspek"
 
-#: ../data/totem.ui.h:32
+#: ../data/totem.ui.h:29
 msgid "Switch An_gles"
 msgstr "Pindah Su_dut"
 
-#: ../data/totem.ui.h:33
+#: ../data/totem.ui.h:30
 msgid "Switch camera angles"
 msgstr "Berpindah sudut kamera"
 
-#: ../data/totem.ui.h:34
+#: ../data/totem.ui.h:31
 msgid "_Go"
 msgstr "_Buka"
 
-#: ../data/totem.ui.h:35
+#: ../data/totem.ui.h:32
 msgid "_DVD Menu"
 msgstr "Menu _DVD"
 
-#: ../data/totem.ui.h:36
+#: ../data/totem.ui.h:33
 msgid "Go to the DVD menu"
 msgstr "Membuka menu DVD"
 
-#: ../data/totem.ui.h:37
+#: ../data/totem.ui.h:34
 msgid "_Title Menu"
 msgstr "Menu _Judul"
 
-#: ../data/totem.ui.h:38
+#: ../data/totem.ui.h:35
 msgid "Go to the title menu"
 msgstr "Membuka menu judul"
 
-#: ../data/totem.ui.h:39
+#: ../data/totem.ui.h:36
 msgid "A_udio Menu"
 msgstr "Menu A_udio"
 
-#: ../data/totem.ui.h:40
+#: ../data/totem.ui.h:37
 msgid "Go to the audio menu"
 msgstr "Membuka menu audio"
 
-#: ../data/totem.ui.h:41
+#: ../data/totem.ui.h:38
 msgid "_Angle Menu"
 msgstr "Menu S_udut Kamera"
 
-#: ../data/totem.ui.h:42
+#: ../data/totem.ui.h:39
 msgid "Go to the angle menu"
 msgstr "Membuka menu sudut kamera"
 
-#: ../data/totem.ui.h:43
+#: ../data/totem.ui.h:40
 msgid "_Chapter Menu"
 msgstr "Menu _Bab"
 
-#: ../data/totem.ui.h:44
+#: ../data/totem.ui.h:41
 msgid "Go to the chapter menu"
 msgstr "Membuka menu bab"
 
-#: ../data/totem.ui.h:45
+#: ../data/totem.ui.h:42
 msgid "_Next Chapter/Movie"
 msgstr "Bab/Film Sela_njutnya"
 
-#: ../data/totem.ui.h:46
+#: ../data/totem.ui.h:43
 msgid "Next chapter or movie"
 msgstr "Bab atau film selanjutnya"
 
-#: ../data/totem.ui.h:47
+#: ../data/totem.ui.h:44
 msgid "_Previous Chapter/Movie"
 msgstr "Bab/Film _Sebelumnya"
 
-#: ../data/totem.ui.h:48
+#: ../data/totem.ui.h:45
 msgid "Previous chapter or movie"
 msgstr "Bab atau film sebelumnya"
 
-#: ../data/totem.ui.h:49
+#: ../data/totem.ui.h:46
 msgid "_Sound"
 msgstr "_Suara"
 
-#: ../data/totem.ui.h:50
+#: ../data/totem.ui.h:47
 msgid "Volume _Up"
 msgstr "Besarkan S_uara"
 
-#: ../data/totem.ui.h:51
+#: ../data/totem.ui.h:48
 msgid "Increase volume"
 msgstr "Memperbesar suara"
 
-#: ../data/totem.ui.h:52
+#: ../data/totem.ui.h:49
 msgid "Volume _Down"
 msgstr "_Pelankan Suara"
 
-#: ../data/totem.ui.h:53
+#: ../data/totem.ui.h:50
 msgid "Decrease volume"
 msgstr "Memelankan suara"
 
-#: ../data/totem.ui.h:54
+#: ../data/totem.ui.h:51
 msgid "_Help"
 msgstr "Ba_ntuan"
 
-#: ../data/totem.ui.h:55
+#: ../data/totem.ui.h:52
 msgid "_Contents"
 msgstr "_Isi"
 
-#: ../data/totem.ui.h:56
+#: ../data/totem.ui.h:53
 msgid "Help contents"
 msgstr "Membuka bantuan"
 
-#: ../data/totem.ui.h:57
+#: ../data/totem.ui.h:54
 msgid "_About"
 msgstr "Tent_ang"
 
-#: ../data/totem.ui.h:58
+#: ../data/totem.ui.h:55
 msgid "About this application"
 msgstr "Tentang aplikasi ini"
 
-#: ../data/totem.ui.h:59
-msgid "_Repeat Mode"
-msgstr "Modus Be_rulang"
-
-#: ../data/totem.ui.h:60
-msgid "Set the repeat mode"
-msgstr "Menggunakan modus berulang"
-
-#: ../data/totem.ui.h:61
-msgid "Shuff_le Mode"
-msgstr "Modus A_cak"
-
-#: ../data/totem.ui.h:62
-msgid "Set the shuffle mode"
-msgstr "Menggunakan modus acak"
-
-#: ../data/totem.ui.h:63
+#: ../data/totem.ui.h:56
 msgid "Show _Controls"
 msgstr "Tampilkan _Kendali"
 
-#: ../data/totem.ui.h:64
+#: ../data/totem.ui.h:57
 msgid "Show controls"
 msgstr "Menampilkan panel kendali"
 
-#: ../data/totem.ui.h:65
+#: ../data/totem.ui.h:58
 msgid "S_idebar"
 msgstr "Panel Samp_ing"
 
-#: ../data/totem.ui.h:66
+#: ../data/totem.ui.h:59
 msgid "Show or hide the sidebar"
 msgstr "Menampilkan atau menyembunyikan panel samping"
 
-#: ../data/totem.ui.h:67
+#: ../data/totem.ui.h:60
 msgctxt "Aspect ratio"
 msgid "Auto"
 msgstr "Otomatis"
 
-#: ../data/totem.ui.h:68
+#: ../data/totem.ui.h:61
 msgid "Sets automatic aspect ratio"
 msgstr "Menggunakan rasio aspek otomatis"
 
-#: ../data/totem.ui.h:69
+#: ../data/totem.ui.h:62
 msgid "Square"
 msgstr "Bujur Sangkar"
 
-#: ../data/totem.ui.h:70
+#: ../data/totem.ui.h:63
 msgid "Sets square aspect ratio"
 msgstr "Menggunakan rasio aspek bujur sangkar"
 
-#: ../data/totem.ui.h:71
+#: ../data/totem.ui.h:64
 msgid "4:3 (TV)"
 msgstr "4:3 (TV)"
 
-#: ../data/totem.ui.h:72
+#: ../data/totem.ui.h:65
 msgid "Sets 4:3 (TV) aspect ratio"
 msgstr "Menggunakan rasio aspek 4:3 (TV)"
 
-#: ../data/totem.ui.h:73
+#: ../data/totem.ui.h:66
 msgid "16:9 (Widescreen)"
 msgstr "16:9 (Layar Lebar)"
 
-#: ../data/totem.ui.h:74
+#: ../data/totem.ui.h:67
 msgid "Sets 16:9 (widescreen) aspect ratio"
 msgstr "Menggunakan rasio aspek 16:9 (layar lebar)"
 
-#: ../data/totem.ui.h:75
+#: ../data/totem.ui.h:68
 msgid "2.11:1 (DVB)"
 msgstr "2.11:1 (DVB)"
 
-#: ../data/totem.ui.h:76
+#: ../data/totem.ui.h:69
 msgid "Sets 2.11:1 (DVB) aspect ratio"
 msgstr "Menggunakan rasio aspek 2,11:1 (DVB)"
 
-#: ../data/totem.ui.h:77
+#: ../data/totem.ui.h:70
 msgid "S_ubtitles"
 msgstr "S_ubtitel"
 
-#: ../data/totem.ui.h:80
+#: ../data/totem.ui.h:73
 msgid "_Languages"
 msgstr "_Bahasa"
 
-#: ../data/totem.ui.h:81
+#: ../data/totem.ui.h:74
 msgid "Zoom In"
 msgstr "Perbesar"
 
-#: ../data/totem.ui.h:82
+#: ../data/totem.ui.h:75
 msgid "Zoom in"
 msgstr "Perbesar tampilan"
 
-#: ../data/totem.ui.h:83
+#: ../data/totem.ui.h:76
 msgid "Skip _Forward"
 msgstr "_Maju"
 
-#: ../data/totem.ui.h:84
+#: ../data/totem.ui.h:77
 msgid "Skip forward"
 msgstr "Maju"
 
-#: ../data/totem.ui.h:85
+#: ../data/totem.ui.h:78
 msgid "Skip _Backwards"
 msgstr "M_undur"
 
-#: ../data/totem.ui.h:86
+#: ../data/totem.ui.h:79
 msgid "Skip backwards"
 msgstr "Mundur"
 
-#: ../data/totem.ui.h:87
-msgid "14.4 Kbps Modem"
-msgstr "Modem 14,4 Kbps"
-
-#: ../data/totem.ui.h:88
-msgid "19.2 Kbps Modem"
-msgstr "Modem 19,2 Kbps"
-
-#: ../data/totem.ui.h:89
-msgid "28.8 Kbps Modem"
-msgstr "Modem 28,8 Kbps"
-
-#: ../data/totem.ui.h:90
-msgid "33.6 Kbps Modem"
-msgstr "Modem 33,6 Kbps"
-
-#: ../data/totem.ui.h:91
-msgid "34.4 Kbps Modem"
-msgstr "Modem 34,4 Kbps"
-
-#: ../data/totem.ui.h:92
-msgid "56 Kbps Modem/ISDN"
-msgstr "Modem/ISDN 56 Kbps"
-
-#: ../data/totem.ui.h:93
-msgid "112 Kbps Dual ISDN/DSL"
-msgstr "Dual ISDN/DSL 112 Kbps"
-
-#: ../data/totem.ui.h:94
-msgid "256 Kbps DSL/Cable"
-msgstr "DSL/Kabel 256 Kbps "
-
-#: ../data/totem.ui.h:95
-msgid "384 Kbps DSL/Cable"
-msgstr "DSL/Kabel 384 Kbps"
-
-#: ../data/totem.ui.h:96
-msgid "512 Kbps DSL/Cable"
-msgstr "DSL/Kabel 512 Kbps"
-
-#: ../data/totem.ui.h:97
-msgid "1.5 Mbps T1/Intranet/LAN"
-msgstr "T1/Intranet/LAN 1,5 Mbps"
-
-#: ../data/totem.ui.h:98
-msgid "Intranet/LAN"
-msgstr "Intranet/LAN"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:100
-msgid "Normal"
-msgstr "Normal"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:102
-msgid "Large"
-msgstr "Besar"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:104
-msgid "Extra Large"
-msgstr "Sangat Besar"
-
-#: ../data/totem.ui.h:105 ../src/totem-properties-view.c:228
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5593
-msgid "Stereo"
-msgstr "Stereo"
-
-#: ../data/totem.ui.h:106
-msgid "4-channel"
-msgstr "4 kanal"
-
-#: ../data/totem.ui.h:107
-msgid "4.1-channel"
-msgstr "4.1 kanal"
-
-#: ../data/totem.ui.h:108
-msgid "5.0-channel"
-msgstr "5.0 kanal"
-
-#: ../data/totem.ui.h:109
-msgid "5.1-channel"
-msgstr "5.1 kanal"
-
-#: ../data/totem.ui.h:110
-msgid "AC3 Passthrough"
-msgstr "Lewatan AC3"
-
-#: ../data/totem.ui.h:111
-msgid "Totem Preferences"
-msgstr "Preferensi Totem"
-
-#: ../data/totem.ui.h:112
-msgid "Playback"
-msgstr "Putar"
-
-#: ../data/totem.ui.h:113
-msgid "Start playing files from last position"
-msgstr "Mulai memutar berkas dari posisi terakhir"
-
-#: ../data/totem.ui.h:114
-msgid "Networking"
-msgstr "Jaringan"
-
-#: ../data/totem.ui.h:115
-msgid "Connection _speed:"
-msgstr "Kecepatan konek_si:"
-
-#: ../data/totem.ui.h:116
-msgid "Text Subtitles"
-msgstr "Teks Subtitel"
-
-#: ../data/totem.ui.h:117
-msgid "_Load subtitle files when movie is loaded"
-msgstr "Memuat berkas subtite_l saat film dibuka"
-
-#: ../data/totem.ui.h:118
-msgid "_Font:"
-msgstr "_Fonta:"
-
-#: ../data/totem.ui.h:119
-msgid "_Encoding:"
-msgstr "_Enkoding:"
-
-#: ../data/totem.ui.h:120
-msgid "External Chapters"
-msgstr "Bab Eksternal"
-
-#: ../data/totem.ui.h:121
-msgid "Load _chapter files when movie is loaded"
-msgstr "Memuat berkas _bab saat film dibuka"
-
-#. Tab label in the Preferences dialogue
-#: ../data/totem.ui.h:124
-msgid "Display"
-msgstr "Tampilan"
-
-#: ../data/totem.ui.h:125
-msgid "_Resize the window when a new video is loaded"
-msgstr "Mengubah uku_ran jendela saat video baru dibuka"
-
-#: ../data/totem.ui.h:126
-msgid "Disable _deinterlacing of interlaced videos"
-msgstr "Nonaktifkan _deinterlasi video yang berinterlasi"
-
-#: ../data/totem.ui.h:127
-msgid "Disable screensaver when playing "
-msgstr "Nonaktifkan pengaman layar saat memainkan media"
-
-#: ../data/totem.ui.h:129
-msgid "Video or Audio"
-msgstr "Video atau Audio"
-
-#: ../data/totem.ui.h:130
-msgid "Visual Effects"
-msgstr "Efek Visual"
-
-#: ../data/totem.ui.h:131
-msgid "Show _visual effects when an audio file is played"
-msgstr "Tampilkan efek _visual saat memutar audio"
-
-#: ../data/totem.ui.h:132
-msgid "_Type of visualization:"
-msgstr "_Jenis visualisasi:"
-
-#: ../data/totem.ui.h:133
-msgid "Visualization _size:"
-msgstr "Ukuran vi_sualisasi:"
-
-#: ../data/totem.ui.h:134
-msgid "Color Balance"
-msgstr "Keseimbangan Warna"
-
-#: ../data/totem.ui.h:135
-msgid "_Brightness:"
-msgstr "_Kecerahan:"
-
-#: ../data/totem.ui.h:136
-msgid "Co_ntrast:"
-msgstr "Ko_ntras:"
-
-#: ../data/totem.ui.h:137
-msgid "Sat_uration:"
-msgstr "Sat_urasi:"
-
-#: ../data/totem.ui.h:138
-msgid "_Hue:"
-msgstr "_Corak:"
-
-#: ../data/totem.ui.h:139
-msgid "Reset to _Defaults"
-msgstr "Kembali ke _Pengaturan Awal"
-
-#: ../data/totem.ui.h:140
-msgid "Audio Output"
-msgstr "Keluaran Audio"
-
-#: ../data/totem.ui.h:141
-msgid "_Audio output type:"
-msgstr "Jenis keluaran _audio:"
-
-#: ../data/totem.ui.h:145
+#: ../data/totem.ui.h:82
 msgid "Time seek bar"
 msgstr "Bilah waktu"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
-msgid "Allow the screensaver to activate when playing audio"
-msgstr "Perbolehkan pengaman layar untuk aktif saat memutar audio"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
-msgid "Allow the screensaver to activate when playing audio. Disable if you have monitor-powered speakers."
-msgstr "Memperbolehkan pengaman layar untuk aktif saat memutar audio. Nonaktifkan apabila Anda memiliki pengeras suara dengan sumber daya yang disediakan oleh monitor."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
-msgid "Show visual effects when no video is displayed"
-msgstr "Menampilkan efek visual saat tidak ada video yang diputar"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
-msgid "Show visual effects when playing an audio only file."
-msgstr "Menampilkan efek visual saat memutar audio."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
-msgid "Name of the visual effects plugin"
-msgstr "Nama dari pengaya efek visual"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
-msgid "The brightness of the video"
-msgstr "Kecerahan video"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
-msgid "The contrast of the video"
-msgstr "Kekontrasan video"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
-msgid "The hue of the video"
-msgstr "Kualitas warna video"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
-msgid "The saturation of the video"
-msgstr "Saturasi video"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
-msgid "Resize the canvas automatically on file load"
-msgstr "Otomatis mengubah ukuran kanvas saat membuka berkas"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
-msgid "Network connection speed"
-msgstr "Kecepatan koneksi jaringan"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
-msgid "Approximate network connection speed, used to select quality on media over the network."
-msgstr "Kecepatan koneksi jaringan kira-kira, dipakai untuk memilih kualitas media melalui jaringan."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
-msgid "Repeat mode"
-msgstr "Modus berulang"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
-msgid "Shuffle mode"
-msgstr "Modus acak"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
-msgid "Whether to disable deinterlacing for interlaced movies"
-msgstr "Apakah menonaktifkan deinterlasi terhadap film yang memiliki interlasi"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
-msgid "Whether to enable debug for the playback engine"
-msgstr "Apakah debuh diaktifkan untuk aplikasi pemutar"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
-msgid "Type of audio output to use"
-msgstr "Jenis keluaran audio yang ingin digunakan"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
-msgid "Visualization quality setting"
-msgstr "Setelan kualitas visualisasi"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
-msgid "Quality setting for the audio visualization."
-msgstr "Pengaturan kualitas bagi visualisasi suara."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
-msgid "Network buffering threshold"
-msgstr "Ambang sangga jaringan"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
-msgid "Amount of data to buffer for network streams before starting to display the stream (in seconds)."
-msgstr "Banyaknya data yang disangga untuk stream jaringan sebelum menampilkan stream (dalam detik)."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
-msgid "Subtitle font"
-msgstr "Fonta subtitel"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
-msgid "Pango font description for subtitle rendering."
-msgstr "Deskripsi fonta Pango untuk merender teks subtitel."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
-msgid "Subtitle encoding"
-msgstr "Enkode subtitel"
+#: ../data/uri.ui.h:1
+msgid "Enter the _address of the file you would like to open:"
+msgstr "Masukkan alamat berkas yang ingin Anda buka:"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
-msgid "Encoding character set for subtitle."
-msgstr "Pengkodean set karakter untuk subtitel."
+#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
+msgid "_Add to Playlist"
+msgstr "T_ambah ke Daftar Main"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
-msgid "Default location for the \"Open...\" dialogs"
-msgstr "Lokasi utama untuk dialog \"Buka...\""
+#: ../data/video-list.ui.h:2
+msgid "Add the video to the playlist"
+msgstr "Menambahkan video ke daftar main"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
-msgid "Default location for the \"Open...\" dialogs. Default is the current directory."
-msgstr "Lokasi bawaan untuk dialog \"Buka...\". Lokasi bawaan adalah direktori kini."
+#: ../src/backend/bacon-video-widget.c:1643
+msgid "Password requested for RTSP server"
+msgstr "Diperlukan sandi untuk server RTSP"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
-msgid "Default location for the \"Take Screenshot\" dialogs"
-msgstr "Lokasi utama untuk dialog \"Ambil Cuplikan\""
+#: ../src/backend/bacon-video-widget.c:2944
+#, c-format
+msgid "Audio Track #%d"
+msgstr "Jalur Audio #%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
-msgid "Default location for the \"Take Screenshot\" dialogs. Default is the Pictures directory."
-msgstr "Lokasi bawaan untuk dialog \"Ambil Cuplikan\". Lokasi bawaan adalah direktori Gambar."
+#: ../src/backend/bacon-video-widget.c:2948
+#, c-format
+msgid "Subtitle #%d"
+msgstr "Subtitel #%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
-msgid "Whether to disable the plugins in the user's home directory"
-msgstr "Apakah pengaya dinonaktifkan untuk direktori rumah pengguna"
+#: ../src/backend/bacon-video-widget.c:3345
+msgid "The server you are trying to connect to is not known."
+msgstr "Server yang Anda coba hubungi tak diketahui."
+
+#: ../src/backend/bacon-video-widget.c:3348
+msgid "The connection to this server was refused."
+msgstr "Koneksi ke server ini ditolak."
+
+#: ../src/backend/bacon-video-widget.c:3351
+#| msgid "The movie could not be recorded."
+msgid "The specified movie could not be found."
+msgstr "Film yang dinyatakan tak dapat ditemukan."
+
+#: ../src/backend/bacon-video-widget.c:3358
+msgid "The server refused access to this file or stream."
+msgstr "Server menolak akses ke berkas atau stream ini."
+
+#: ../src/backend/bacon-video-widget.c:3364
+msgid "Authentication is required to access this file or stream."
+msgstr "Otentikasi diperlukan untuk mengakses berkas atau stream ini."
+
+#: ../src/backend/bacon-video-widget.c:3371
+msgid "You are not allowed to open this file."
+msgstr "Anda tak diijinkan untuk membuka berkas ini."
+
+#: ../src/backend/bacon-video-widget.c:3376
+#| msgid "File is not a valid .desktop file"
+msgid "This location is not a valid one."
+msgstr "Lokasi ini bukan yang valid."
+
+#: ../src/backend/bacon-video-widget.c:3384
+#| msgid "The movie could not be recorded."
+msgid "The movie could not be read."
+msgstr "Film tidak dapat dibaca."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
-msgid "Whether to disable the keyboard shortcuts"
-msgstr "Apakah tombol pintas papan ketik dinonaktifkan"
+#. should be exactly one missing thing (source or converter)
+#: ../src/backend/bacon-video-widget.c:3407
+#: ../src/backend/bacon-video-widget.c:3415
+#, c-format
+msgid "The playback of this movie requires a %s plugin which is not installed."
+msgid_plural ""
+"The playback of this movie requires the following decoders which are not "
+"installed:\n"
+"\n"
+"%s"
+msgstr[0] ""
+"Untuk memutar film ini, diperlukan pengaya %s yang saat ini belum terpasang."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
-msgid "Whether to autoload text subtitle files when a movie is loaded"
-msgstr "Apakah teks subtitel dimuat otomatis saat film dibuka"
+#: ../src/backend/bacon-video-widget.c:3426
+msgid ""
+"An audio or video stream is not handled due to missing codecs. You might "
+"need to install additional plugins to be able to play some types of movies"
+msgstr ""
+"Stream audio atau video tak ditangani karena kurang kodek. Anda mungkin "
+"perlu memasang plugin tambahan agar dapat memutar beberapa tipe film"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
-msgid "Whether to autoload external chapter files when a movie is loaded"
-msgstr "Apakah bab eksternal dimuat otomatis saat film dibuka"
+#: ../src/backend/bacon-video-widget.c:3436
+#| msgid ""
+#| "Cannot play this file over the network. Try downloading it to disk first."
+msgid ""
+"This file cannot be played over the network. Try downloading it locally "
+"first."
+msgstr ""
+"Berkas ini tak bisa diputar melalui jaringan. Cobalah untuk mengunduhnya "
+"lebih dulu."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
-msgid "Whether to remember the position of played audio/video files when pausing or closing them"
-msgstr "Apakah posisi audio/video yang diputar tetap diingat saat audio/video tersebut ditahan atau ditutup"
+#: ../src/backend/bacon-video-widget.c:5494 ../src/totem-properties-view.c:227
+msgid "Surround"
+msgstr "Stereo"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:35
-msgid "Active plugins list"
-msgstr "Daftar pengaya aktif"
+#: ../src/backend/bacon-video-widget.c:5496 ../src/totem-properties-view.c:229
+msgid "Mono"
+msgstr "Mono"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:36
-msgid "A list of the names of the plugins which are currently active (loaded and running)."
-msgstr "Daftar nama pengaya yang kini aktif (dimuat dan sedang berjalan)."
+#: ../src/backend/bacon-video-widget.c:5781
+msgid "Media contains no supported video streams."
+msgstr "Media mengandung siaran video yang tidak didukung."
 
-#: ../data/uri.ui.h:1
-msgid "Enter the _address of the file you would like to open:"
-msgstr "Masukkan alamat berkas yang ingin Anda buka:"
+#: ../src/backend/bacon-video-widget.c:5963
+msgid ""
+"Some necessary plug-ins are missing. Make sure that the program is correctly "
+"installed."
+msgstr ""
+"Kurang beberapa plugin yang diperlukan. Pastikan bahwa program terpasang "
+"dengan benar."
 
 #: ../src/eggdesktopfile.c:165
 #, c-format
@@ -914,8 +1002,14 @@
 #. Translators: the parameter is a filename
 #: ../src/eggfileformatchooser.c:657
 #, c-format
-msgid "The program was not able to find out the file format you want to use for `%s'. Please make sure to use a known extension for that file or manually choose a file format from the list below."
-msgstr "Program tidak dapat menentukan format berkas yang ingin Anda pakai untuk `%s'. Pastikan untuk memakai ekstensi yang dikenali untuk berkas tersebut atau pilih sendiri format berkasnya dari daftar berikut."
+msgid ""
+"The program was not able to find out the file format you want to use for `"
+"%s'. Please make sure to use a known extension for that file or manually "
+"choose a file format from the list below."
+msgstr ""
+"Program tidak dapat menentukan format berkas yang ingin Anda pakai untuk `"
+"%s'. Pastikan untuk memakai ekstensi yang dikenali untuk berkas tersebut "
+"atau pilih sendiri format berkasnya dari daftar berikut."
 
 #: ../src/eggfileformatchooser.c:664
 msgid "File format not recognized"
@@ -949,6 +1043,31 @@
 msgid "Show session management options"
 msgstr "Menampilkan opsi manajemen sesi"
 
+#. hour:minutes:seconds
+#. Translators: This is a time format, like "9:05:02" for 9
+#. * hours, 5 minutes, and 2 seconds. You may change ":" to
+#. * the separator that your locale uses or use "%Id" instead
+#. * of "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:56
+#: ../src/plugins/skipto/totem-time-entry.c:57
+#, c-format
+msgctxt "long time format"
+msgid "%d:%02d:%02d"
+msgstr "%d:%02d:%02d"
+
+#. minutes:seconds
+#. Translators: This is a time format, like "5:02" for 5
+#. * minutes and 2 seconds. You may change ":" to the
+#. * separator that your locale uses or use "%Id" instead of
+#. * "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:65
+#, c-format
+msgctxt "short time format"
+msgid "%d:%02d"
+msgstr "%d:%02d"
+
 #. Title
 #. Artist
 #. Album
@@ -1049,10 +1168,14 @@
 msgid_plural "%d frames per second"
 msgstr[0] "%d gambar per detik"
 
-#: ../src/totem-audio-preview.c:168
+#: ../src/totem-audio-preview.c:137
 msgid "Audio Preview"
 msgstr "Pratampil Audio"
 
+#: ../src/totem.c:240
+msgid "Verify your system installation. Totem will now exit."
+msgstr "Periksa instalasi sistem Anda. Totem akan segera keluar."
+
 #: ../src/totem-cell-renderer-video.c:126
 msgid "Unknown video"
 msgstr "Video tak dikenal"
@@ -1065,7 +1188,7 @@
 msgid "Cancel"
 msgstr "Batal"
 
-#: ../src/totem-fullscreen.c:616
+#: ../src/totem-fullscreen.c:573
 msgid "No File"
 msgstr "Tidak Ada Berkas"
 
@@ -1083,63 +1206,63 @@
 msgid "Make sure that Totem is properly installed."
 msgstr "Pastikan Totem telah terpasang dengan baik."
 
-#: ../src/totem-interface.c:347
-msgid "Totem 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."
-msgstr "Totem adalah perangkat lunak bebas; Anda dapat mendistribusikan ulang dan/atau mengubahnya di bawah ketentuan GNU General Public License sebagaimana dipublikasikan oleh Free Software Foundation; Lisensi versi 2, atau (sesuai pilihan Anda) menggunakan versi selanjutnya."
-
-#: ../src/totem-interface.c:351
-msgid "Totem 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 General Public License for more details."
-msgstr "Totem didistribusikan dengan harapan dapat berguna, tetapi TANPA ADANYA JAMINAN; termasuk tanpa jaminan DAYA JUAL atau KELAIKAN UNTUK TUJUAN TERTENTU. Lihat GNU General Public License untuk rincian lebih lanjut."
-
-#: ../src/totem-interface.c:355
-msgid "You should have received a copy of the GNU General Public License along with Totem; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA"
-msgstr "Anda seharusnya menerima salinan GNU General Public License yang disertakan bersama Totem; jika tidak, layangkan surat Anda ke Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA"
-
-#: ../src/totem-interface.c:358
-msgid "Totem contains an exception to allow the use of proprietary GStreamer plugins."
-msgstr "Ada pengecualian pada Totem yang mengizinkan Anda menggunakan pengaya propritari GStreamer.\""
+#: ../src/totem-interface.c:357
+msgid ""
+"Totem 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."
+msgstr ""
+"Totem adalah perangkat lunak bebas; Anda dapat mendistribusikan ulang dan/"
+"atau mengubahnya di bawah ketentuan GNU General Public License sebagaimana "
+"dipublikasikan oleh Free Software Foundation; Lisensi versi 2, atau (sesuai "
+"pilihan Anda) menggunakan versi selanjutnya."
+
+#: ../src/totem-interface.c:361
+msgid ""
+"Totem 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 General Public License for more "
+"details."
+msgstr ""
+"Totem didistribusikan dengan harapan dapat berguna, tetapi TANPA ADANYA "
+"JAMINAN; termasuk tanpa jaminan DAYA JUAL atau KELAIKAN UNTUK TUJUAN "
+"TERTENTU. Lihat GNU General Public License untuk rincian lebih lanjut."
+
+#: ../src/totem-interface.c:365
+msgid ""
+"You should have received a copy of the GNU General Public License along with "
+"Totem; if not, write to the Free Software Foundation, Inc., 59 Temple Place, "
+"Suite 330, Boston, MA  02111-1307  USA"
+msgstr ""
+"Anda seharusnya menerima salinan GNU General Public License yang disertakan "
+"bersama Totem; jika tidak, layangkan surat Anda ke Free Software Foundation, "
+"Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA"
+
+#: ../src/totem-interface.c:368
+msgid ""
+"Totem contains an exception to allow the use of proprietary GStreamer "
+"plugins."
+msgstr ""
+"Ada pengecualian pada Totem yang mengizinkan Anda menggunakan pengaya "
+"propritari GStreamer.\""
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:190
+#: ../src/totem-menu.c:291
 msgid "None"
 msgstr "Nihil"
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:195
+#: ../src/totem-menu.c:296
 msgctxt "Language"
 msgid "Auto"
 msgstr "Otomatis"
 
-#. Translators:
-#. * This is not a JPEG image, but a disc image, for example,
-#. * an ISO file
-#: ../src/totem-menu.c:765
-#, c-format
-msgid "Play Image '%s'"
-msgstr "Memutar Berkas Citra '%s'"
-
-#: ../src/totem-menu.c:768 ../src/totem-menu.c:851
-#, c-format
-msgid "device%d"
-msgstr "perangkat%d"
-
-#: ../src/totem-menu.c:848
-#, c-format
-msgid "Play Disc '%s'"
-msgstr "Putar Diska '%s'"
-
-#. This lists the back-end type and version, such as
-#. * Movie Player using GStreamer 0.10.1
-#: ../src/totem-menu.c:1189
-#, c-format
-msgid "Movie Player using %s"
-msgstr "Pemutar Film dengan %s"
-
-#: ../src/totem-menu.c:1193
+#: ../src/totem-menu.c:789
 msgid "Copyright © 2002-2009 Bastien Nocera"
 msgstr "Hak Cipta © 2002-2009 Bastien Nocera"
 
-#: ../src/totem-menu.c:1198
+#: ../src/totem-menu.c:794
 msgid "translator-credits"
 msgstr ""
 "Dicky Wahyu Purnomo , 2004.\n"
@@ -1148,135 +1271,77 @@
 "Dirgita , 2010.\n"
 "Andika Triwidada , 2011, 2012."
 
-#: ../src/totem-menu.c:1202
+#: ../src/totem-menu.c:798
 msgid "Totem Website"
 msgstr "Situs Web Totem"
 
-#: ../src/totem-menu.c:1236
+#: ../src/totem-menu.c:829
 msgid "Configure Plugins"
 msgstr "Konfigurasi Pengaya"
 
+#: ../src/totem-object.c:162
+#, c-format
+msgid ""
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"%s\n"
+"Jalankan '%s --help' untuk daftar lengkap opsi yang tersedia.\n"
+
 #. Translators: %s is the totem version number
-#: ../src/totem-object.c:471
+#: ../src/totem-object.c:591
 #, c-format
 msgid "Totem %s"
 msgstr "Totem %s"
 
-#: ../src/totem-object.c:1047 ../browser-plugin/totem-plugin-viewer.c:367
-msgid "Playing"
-msgstr "Memutar"
-
-#: ../src/totem-object.c:1049 ../src/totem-options.c:52
+#: ../src/totem-object.c:1168 ../src/totem-options.c:52
 msgid "Pause"
 msgstr "Tahan"
 
-#: ../src/totem-object.c:1054 ../browser-plugin/totem-plugin-viewer.c:363
-msgid "Paused"
-msgstr "Ditahan"
-
-#: ../src/totem-object.c:1056 ../src/totem-object.c:1066
+#: ../src/totem-object.c:1175 ../src/totem-object.c:1185
 #: ../src/totem-options.c:51
 msgid "Play"
 msgstr "Putar"
 
-#: ../src/totem-object.c:1061 ../src/totem-object.c:1659
-#: ../src/totem-statusbar.c:115 ../browser-plugin/totem-plugin-viewer.c:351
-msgid "Stopped"
-msgstr "Berhenti"
-
-#: ../src/totem-object.c:1142 ../src/totem-object.c:1169
-#: ../src/totem-object.c:1799 ../src/totem-object.c:1963
+#: ../src/totem-object.c:1267 ../src/totem-object.c:1294
+#: ../src/totem-object.c:1787 ../src/totem-object.c:1942
 #, c-format
 msgid "Totem could not play '%s'."
 msgstr "Totem tidak dapat memutar '%s'."
 
-#: ../src/totem-object.c:1246
-#, c-format
-msgid "Totem could not play this media (%s) although a plugin is present to handle it."
-msgstr "Totem tidak dapat memutar media ini (%s) meskipun pengayanya tersedia."
-
-#: ../src/totem-object.c:1247
-msgid "You might want to check that a disc is present in the drive and that it is correctly configured."
-msgstr "Anda sebaiknya memeriksa apakah diska telah dimasukkan ke dalam pemutarnya (player/driver) dan dikonfigurasi dengan baik."
-
-#: ../src/totem-object.c:1255
-msgid "More information about media plugins"
-msgstr "Informasi lebih lanjut mengenai pengaya media"
-
-#: ../src/totem-object.c:1256
-msgid "Please install the necessary plugins and restart Totem to be able to play this media."
-msgstr "Pasang pengaya yang diperlukan dan jalankan ulang Totem untuk bisa memutar media ini."
-
-#: ../src/totem-object.c:1258
-#, c-format
-msgid "Totem cannot play this type of media (%s) because it does not have the appropriate plugins to be able to read from the disc."
-msgstr "Totem tidak dapat memutar media jenis ini (%s), karena tidak memiliki pengaya yang cocok untuk membaca media dari diska."
-
-#: ../src/totem-object.c:1260
-#, c-format
-msgid "Totem cannot play this type of media (%s) because you do not have the appropriate plugins to handle it."
-msgstr "Totem tidak dapat memutar media jenis ini (%s), karena Anda tidak memiliki pengaya yang cocok."
-
-#: ../src/totem-object.c:1263
-#, c-format
-msgid "Totem cannot play this type of media (%s) because it is not supported."
-msgstr "Totem tidak dapat memutar media jenis ini (%s), karena tidak didukung."
-
-#: ../src/totem-object.c:1264
-msgid "Please insert another disc to play back."
-msgstr "masukkan diska yang lain untuk diputar."
-
-#: ../src/totem-object.c:1300
-msgid "Totem was not able to play this disc."
-msgstr "Totem tidak dapat memutar diska ini."
-
-#: ../src/totem-object.c:1301 ../src/totem-object.c:4229
-msgid "No reason."
-msgstr "Tanpa alasan."
-
-#: ../src/totem-object.c:1315
-msgid "Totem does not support playback of Audio CDs"
-msgstr "Totem tidak dapat memutar CD Audio"
-
-#: ../src/totem-object.c:1316
-msgid "Please consider using a music player or a CD extractor to play this CD"
-msgstr "Cobalah pemutar musik atau ekstraktor CD untuk memutar CD ini"
-
-#: ../src/totem-object.c:1805
+#: ../src/totem-object.c:1793
 msgid "No error message"
 msgstr "Tidak ada pesan galat"
 
-#: ../src/totem-object.c:2154
+#: ../src/totem-object.c:2133
 msgid "Totem could not display the help contents."
 msgstr "Totem tidak dapat menampilkan bantuan."
 
-#: ../src/totem-object.c:2493 ../src/totem-object.c:2495
-#: ../browser-plugin/totem-plugin-viewer.c:1417
-msgid "An error occurred"
-msgstr "Terjadi galat"
-
-#: ../src/totem-object.c:4064 ../src/totem-object.c:4066
+#: ../src/totem-object.c:4019 ../src/totem-object.c:4021
 msgid "Previous Chapter/Movie"
 msgstr "Bab/Film Sebelumnya"
 
-#: ../src/totem-object.c:4073 ../src/totem-object.c:4075
+#: ../src/totem-object.c:4028 ../src/totem-object.c:4030
 msgid "Play / Pause"
 msgstr "Putar / Tahan"
 
-#: ../src/totem-object.c:4083 ../src/totem-object.c:4085
+#: ../src/totem-object.c:4038 ../src/totem-object.c:4040
 msgid "Next Chapter/Movie"
 msgstr "Bab/Film Selanjutnya"
 
-#. Translators: this is the tooltip text for the fullscreen button in the controls box in Totem's main window.
 #. Translators: this is the accessibility text for the fullscreen button in the controls box in Totem's main window.
-#: ../src/totem-object.c:4097 ../src/totem-object.c:4099
+#: ../src/totem-object.c:4051 ../src/totem-object.c:4053
 msgid "Fullscreen"
 msgstr "Layar Penuh"
 
-#: ../src/totem-object.c:4229
+#: ../src/totem-object.c:4184
 msgid "Totem could not startup."
 msgstr "Totem tidak dapat dijalankan."
 
+#: ../src/totem-object.c:4184
+msgid "No reason."
+msgstr "Tanpa alasan."
+
 #: ../src/totem-open-location.c:182
 msgid "Open Location..."
 msgstr "Buka Lokasi..."
@@ -1350,117 +1415,111 @@
 msgid "Movies to play"
 msgstr "Film untuk diputar"
 
-#: ../src/totem-options.c:117
+#: ../src/totem-options.c:79
+msgid "- Play movies and songs"
+msgstr "- Memutar film dan lagu"
+
+#: ../src/totem-options.c:142
 msgid "Can't enqueue and replace at the same time"
 msgstr "Tak bisa mengantrikan dan menggantikan secara bersamaan"
 
 #. By extension entry
-#: ../src/totem-playlist.c:161
+#: ../src/totem-playlist.c:162
 msgid "MP3 ShoutCast playlist"
 msgstr "Daftar main MP3 ShoutCast"
 
-#: ../src/totem-playlist.c:162
+#: ../src/totem-playlist.c:163
 msgid "MP3 audio (streamed)"
 msgstr "Audio MP3 (siar jaringan)"
 
-#: ../src/totem-playlist.c:163
+#: ../src/totem-playlist.c:164
 msgid "MP3 audio (streamed, DOS format)"
 msgstr "Audio MP3 (siar jaringan, format DOS)"
 
-#: ../src/totem-playlist.c:164
+#: ../src/totem-playlist.c:165
 msgid "XML Shareable Playlist"
 msgstr "Daftar Main XML Dapat-Berbagi"
 
 #. This is "Title 3", where title is a DVD title
 #. * Note: NOT a DVD chapter
-#: ../src/totem-playlist.c:347
+#: ../src/totem-playlist.c:348
 #, c-format
 msgid "Title %d"
 msgstr "Judul %d"
 
-#: ../src/totem-playlist.c:446
+#: ../src/totem-playlist.c:447
 msgid "Could not save the playlist"
 msgstr "Tidak dapat menyimpan daftar main"
 
-#: ../src/totem-playlist.c:1021
+#: ../src/totem-playlist.c:1022
 msgid "Save Playlist"
 msgstr "Simpan Daftar Main"
 
 #. translators: Playlist is the default saved playlist filename,
 #. * without the suffix
-#: ../src/totem-playlist.c:1033 ../src/totem-playlist.c:1264
-#: ../src/totem-sidebar.c:142
+#: ../src/totem-playlist.c:1034 ../src/totem-playlist.c:1263
+#: ../src/totem-sidebar.c:145
 msgid "Playlist"
 msgstr "Daftar Main"
 
-#: ../src/totem-playlist.c:1857
+#: ../src/totem-playlist.c:1862
 #, c-format
 msgid "The playlist '%s' could not be parsed. It might be damaged."
 msgstr "Daftar main '%s' tidak dapat dibaca. Sepertinya rusak."
 
-#: ../src/totem-playlist.c:1858
+#: ../src/totem-playlist.c:1863
 msgid "Playlist error"
 msgstr "Galat pada daftar main"
 
-#: ../src/totem-preferences.c:295
+#: ../src/totem-preferences.c:297
 msgid "Preferences"
 msgstr "Preferensi"
 
-#: ../src/totem-preferences.c:451
+#: ../src/totem-preferences.c:445
 msgid "Select Subtitle Font"
 msgstr "Pilih Fonta Subtitel"
 
-#: ../src/totem-properties-main.c:115 ../src/totem-properties-view.c:266
+#: ../src/totem-properties-main.c:116 ../src/totem-properties-view.c:269
 msgid "Audio/Video"
 msgstr "Audio/Video"
 
-#: ../src/totem-properties-view.c:128
+#: ../src/totem-properties-view.c:131
 msgid "N/A"
 msgstr "T/A"
 
-#: ../src/totem-properties-view.c:157
+#: ../src/totem-properties-view.c:160
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 msgctxt "Stream bit rate"
 msgid "N/A"
 msgstr "T/A"
 
-#: ../src/totem-properties-view.c:160
+#: ../src/totem-properties-view.c:163
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: ../src/totem-properties-view.c:177
+#: ../src/totem-properties-view.c:180
 #: ../src/plugins/properties/totem-movie-properties.c:149
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../src/totem-properties-view.c:209
+#: ../src/totem-properties-view.c:212
 #: ../src/plugins/properties/totem-movie-properties.c:166
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: ../src/totem-properties-view.c:216
+#: ../src/totem-properties-view.c:219
 #: ../src/plugins/properties/totem-movie-properties.c:166
 msgctxt "Sample rate"
 msgid "N/A"
 msgstr "T/A"
 
-#: ../src/totem-properties-view.c:224
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5589
-msgid "Surround"
-msgstr "Stereo"
-
-#: ../src/totem-properties-view.c:226
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5591
-msgid "Mono"
-msgstr "Mono"
-
-#: ../src/totem-properties-view.c:236
+#: ../src/totem-properties-view.c:239
 msgctxt "Number of audio channels"
 msgid "N/A"
 msgstr "T/A"
@@ -1493,8 +1552,8 @@
 #. eg: 75 %
 #: ../src/totem-statusbar.c:250
 #, c-format
-msgid "%d %%"
-msgstr "%d %%"
+msgid "%lf %%"
+msgstr "%lf %%"
 
 #. eg: Paused, 0:32 / 1:05
 #: ../src/totem-statusbar.c:325
@@ -1505,8 +1564,9 @@
 #. eg: Buffering, 75 %
 #: ../src/totem-statusbar.c:330
 #, c-format
-msgid "%s, %d %%"
-msgstr "%s, %d %%"
+#| msgid "%s, %d %%"
+msgid "%s, %f %%"
+msgstr "%s, %f %%"
 
 #: ../src/totem-subtitle-encoding.c:156
 msgid "Current Locale"
@@ -1649,182 +1709,91 @@
 msgid "Vietnamese"
 msgstr "Vietnam"
 
-#: ../src/totem-video-list.c:330
-msgid "No video URI"
-msgstr "Tidak ada URI video"
-
-#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
-#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
-#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
-#: ../src/totem-video-thumbnailer.c:872
-#, c-format
-msgid ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-msgstr ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-
-#: ../src/totem-video-thumbnailer.c:873
-msgid "Filename"
-msgstr "Nama berkas"
-
-#: ../src/totem-video-thumbnailer.c:875
-msgid "Resolution"
-msgstr "Resolusi"
-
-#: ../src/totem-video-thumbnailer.c:878
-msgid "Duration"
-msgstr "Durasi"
-
-#: ../src/totem-uri.c:506 ../src/plugins/chapters/totem-chapters.c:998
+#: ../src/totem-uri.c:343 ../src/plugins/chapters/totem-chapters.c:998
 msgid "All files"
 msgstr "Semua berkas"
 
-#: ../src/totem-uri.c:511 ../src/plugins/chapters/totem-chapters.c:995
+#: ../src/totem-uri.c:348 ../src/plugins/chapters/totem-chapters.c:995
 msgid "Supported files"
 msgstr "Berkas didukung"
 
-#: ../src/totem-uri.c:523
+#: ../src/totem-uri.c:360
 msgid "Audio files"
 msgstr "Berkas audio"
 
-#: ../src/totem-uri.c:531
+#: ../src/totem-uri.c:368
 msgid "Video files"
 msgstr "Berkas video"
 
-#: ../src/totem-uri.c:541
+#: ../src/totem-uri.c:378
 msgid "Subtitle files"
 msgstr "Berkas subtitel"
 
-#: ../src/totem-uri.c:593
+#: ../src/totem-uri.c:430
 msgid "Select Text Subtitles"
 msgstr "Pilih Teks Subtitel"
 
-#: ../src/totem-uri.c:656
+#: ../src/totem-uri.c:495
 msgid "Select Movies or Playlists"
 msgstr "Pilih Film atau Daftar Main"
 
-#. Options parsing
-#: ../src/totem.c:204
-msgid "- Play movies and songs"
-msgstr "- Memutar film dan lagu"
+#: ../src/totem-uri.c:499
+msgid "Add Directory"
+msgstr "Tambah Direktori"
+
+#: ../src/totem-video-list.c:330
+msgid "No video URI"
+msgstr "Tidak ada URI video"
 
-#: ../src/totem.c:220
+#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
+#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
+#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
+#: ../src/totem-video-thumbnailer.c:841
 #, c-format
 msgid ""
-"%s\n"
-"Run '%s --help' to see a full list of available command line options.\n"
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 msgstr ""
-"%s\n"
-"Jalankan '%s --help' untuk daftar lengkap opsi yang tersedia.\n"
-
-#: ../src/totem.c:262 ../src/totem.c:273
-#: ../browser-plugin/totem-plugin-viewer.c:663
-#: ../browser-plugin/totem-plugin-viewer.c:1793
-msgid "Totem Movie Player"
-msgstr "Totem Pemutar Film"
-
-#: ../src/totem.c:263 ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Could not initialize the thread-safe libraries."
-msgstr "Tidak dapat menjalankan pustaka thread-safe."
-
-#: ../src/totem.c:263
-msgid "Verify your system installation. Totem will now exit."
-msgstr "Periksa instalasi sistem Anda. Totem akan segera keluar."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:1589
-msgid "Password requested for RTSP server"
-msgstr "Diperlukan sandi untuk server RTSP"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2858
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2862
-#, c-format
-msgid "Audio Track #%d"
-msgstr "Jalur Audio #%d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2890
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2894
-#, c-format
-msgid "Subtitle #%d"
-msgstr "Subtitel #%d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3298
-msgid "The requested audio output was not found. Please select another audio output in the Multimedia Systems Selector."
-msgstr "Keluaran audio yang dipinta tidak ditemukan. Silakan pilih keluaran audio yang lain pada Selektor Sistem Multimedia."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3303
-msgid "Location not found."
-msgstr "Lokasi tidak ditemukan."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3307
-msgid "Could not open location; you might not have permission to open the file."
-msgstr "Tidak dapat membuka lokasi; Anda mungkin tidak memiliki hak untuk membuka berkas tersebut."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3318
-msgid "The video output is in use by another application. Please close other video applications, or select another video output in the Multimedia Systems Selector."
-msgstr "Keluaran video sedang dipakai aplikasi lain. Silakan pilih aplikasi video lainnya, atau pilih keluaran video yang lain pada Selektor Sistem Multimedia."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3324
-msgid "The audio output is in use by another application. Please select another audio output in the Multimedia Systems Selector. You may want to consider using a sound server."
-msgstr "Keluaran audio sedang dipakai aplikasi lain. Silakan pilih keluaran audio lainnya pada Selektor Sistem Multimedia. Pertimbangkan juga untuk memakai server suara."
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 
-#. should be exactly one missing thing (source or converter)
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3342
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3348
-#, c-format
-msgid "The playback of this movie requires a %s plugin which is not installed."
-msgid_plural ""
-"The playback of this movie requires the following decoders which are not installed:\n"
-"\n"
-"%s"
-msgstr[0] "Untuk memutar film ini, diperlukan pengaya %s yang saat ini belum terpasang."
+#: ../src/totem-video-thumbnailer.c:842
+msgid "Filename"
+msgstr "Nama berkas"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3374
-msgid "Cannot play this file over the network. Try downloading it to disk first."
-msgstr "Tidak dapat memutar berkas ini melalui jaringan. Cobalah untuk mengunduhnya lebih dulu."
+#: ../src/totem-video-thumbnailer.c:844
+msgid "Resolution"
+msgstr "Resolusi"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5878
-msgid "Media contains no supported video streams."
-msgstr "Media mengandung siaran video yang tidak didukung."
+#: ../src/totem-video-thumbnailer.c:847
+msgid "Duration"
+msgstr "Durasi"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6053
-msgid "Failed to create a GStreamer play object. Please check your GStreamer installation."
-msgstr "Gagal membuat objek putar GStreamer. Periksalah instalasi GStreamer Anda."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6173
-msgid "Failed to open audio output. You may not have permission to open the sound device, or the sound server may not be running. Please select another audio output in the Multimedia Systems Selector."
-msgstr "Gagal membuka keluaran audio. Anda mungkin tidak memiliki hak untuk membuka perangkat suara, atau server suara tidak berjalan. Silakan pilih keluaran audio lainnya pada Selektor Sistem Multimedia."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6193
-msgid "Could not find the audio output. You may need to install additional GStreamer plugins, or select another audio output in the Multimedia Systems Selector."
-msgstr "Keluaran audio tidak ditemukan. Anda mungkin perlu memasang pengaya GStreamer, atau memilih keluaran audio lain pada Selektor Sistem Multimedia."
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:1
+msgid "Apple Trailers"
+msgstr "Apple Trailers"
+
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:2
+msgid "Sets the user agent for the Apple Trailers site"
+msgstr "Atur user agent bagi situs Apple Trailers"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:1
+msgid "Autoload Subtitles"
+msgstr "Unduh Otomatis Subtitel"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:2
+msgid "Autoloads text subtitles"
+msgstr "Mengunduh otomatis subtitel teks"
 
-#. hour:minutes:seconds
-#. Translators: This is a time format, like "9:05:02" for 9
-#. * hours, 5 minutes, and 2 seconds. You may change ":" to
-#. * the separator that your locale uses or use "%Id" instead
-#. * of "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:83 ../src/plugins/skipto/totem-time-entry.c:57
-#, c-format
-msgctxt "long time format"
-msgid "%d:%02d:%02d"
-msgstr "%d:%02d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
+msgid "Video Disc Recorder"
+msgstr "Perekam Diska Video"
 
-#. minutes:seconds
-#. Translators: This is a time format, like "5:02" for 5
-#. * minutes and 2 seconds. You may change ":" to the
-#. * separator that your locale uses or use "%Id" instead of
-#. * "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:92
-#, c-format
-msgctxt "short time format"
-msgid "%d:%02d"
-msgstr "%d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
+msgid "Records (S)VCDs or video DVDs"
+msgstr "Merekam (S)VCD atau DVD video"
 
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:65
 msgid "_Create Video Disc..."
@@ -1850,38 +1819,21 @@
 msgid "Copy the currently playing (S)VCD"
 msgstr "Menyalin (S)VCD yang sedang diputar"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:129
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:136
 msgid "The video disc could not be duplicated."
 msgstr "Diska video tidak dapat digandakan."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:131
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:276
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:138
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:283
 msgid "The movie could not be recorded."
 msgstr "Filmnya tidak dapat direkam."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:157
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:167
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:263
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:164
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:174
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:270
 msgid "Unable to write a project."
 msgstr "Tidak dapat menulis proyek."
 
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
-msgid "Video Disc Recorder"
-msgstr "Perekam Diska Video"
-
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
-msgid "Records (S)VCDs or video DVDs"
-msgstr "Merekam (S)VCD atau DVD video"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:1
-#: ../src/plugins/chapters/totem-chapters.c:1139
-msgid "Chapters"
-msgstr "Bab"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:2
-msgid "Support chapter markers in movies."
-msgstr "Mendukung penanda bab di film."
-
 #: ../src/plugins/chapters/chapters-edit.ui.h:1
 msgid "Name for new chapter:"
 msgstr "Nama untuk bab baru:"
@@ -1938,6 +1890,15 @@
 msgid "Create a new chapter list for the movie"
 msgstr "Buat daftar bab baru bagi film"
 
+#: ../src/plugins/chapters/chapters.plugin.in.h:1
+#: ../src/plugins/chapters/totem-chapters.c:1139
+msgid "Chapters"
+msgstr "Bab"
+
+#: ../src/plugins/chapters/chapters.plugin.in.h:2
+msgid "Support chapter markers in movies"
+msgstr "Mendukung penanda bab di film"
+
 #: ../src/plugins/chapters/totem-chapters.c:56
 #, c-format
 msgid ""
@@ -1968,8 +1929,10 @@
 msgstr "Terjadi galat ketika menyimpan bab"
 
 #: ../src/plugins/chapters/totem-chapters.c:843
-msgid "Please check you have permission to write to the folder containing the movie."
-msgstr "Silakan periksa apakah Anda memiliki hak menulis ke folder yang memuat film."
+msgid ""
+"Please check you have permission to write to the folder containing the movie."
+msgstr ""
+"Silakan periksa apakah Anda memiliki hak menulis ke folder yang memuat film."
 
 #: ../src/plugins/chapters/totem-chapters.c:976
 msgid "Open Chapter File"
@@ -2006,7 +1969,6 @@
 msgstr "Gagal menguraikan berkas CMML"
 
 #: ../src/plugins/chapters/totem-edit-chapter.c:95
-#| msgid "Add Chapter..."
 msgid "Add Chapter"
 msgstr "Tambah Bab"
 
@@ -2015,8 +1977,12 @@
 msgstr "Layanan D-Bus"
 
 #: ../src/plugins/dbusservice/dbusservice.plugin.in.h:2
-msgid "Plugin for sending notifications of currently playing movies to the D-Bus subsystem."
-msgstr "Plugin untuk mengirim pemberitahuan tentang film yang kini diputar ke subsistem D-Bus."
+msgid ""
+"Plugin for sending notifications of currently playing movies to the D-Bus "
+"subsystem."
+msgstr ""
+"Plugin untuk mengirim pemberitahuan tentang film yang kini diputar ke "
+"subsistem D-Bus."
 
 #: ../src/plugins/dbusservice/dbusservice.py:213
 #: ../src/plugins/dbusservice/dbusservice.py:243
@@ -2039,13 +2005,38 @@
 msgid "The URI ‘%s’ is not supported."
 msgstr "URI '%s' tak didukung."
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
-msgid "Instant Messenger status"
-msgstr "Status Pesan Instan"
+#: ../src/plugins/grilo/grilo.plugin.in.h:1
+msgid "Grilo Browser"
+msgstr "Peramban Grilo"
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
-msgid "Set your Instant Messenger status to away when a movie is playing"
-msgstr "Menetapkan status Pesan Instan Anda sebagai \"menjauh\" saat film diputar"
+#: ../src/plugins/grilo/grilo.plugin.in.h:2
+msgid "A plugin to let you browse media content from various sources"
+msgstr ""
+"Dengan pengaya ini, Anda dapat menelusuri isi media dari berbagai sumber"
+
+#: ../src/plugins/grilo/grilo.ui.h:1
+msgid "Add to Playlist"
+msgstr "Tambah ke Daftar Putar"
+
+#: ../src/plugins/grilo/grilo.ui.h:2
+msgid "Copy Location"
+msgstr "Salin Lokasi"
+
+#: ../src/plugins/grilo/grilo.ui.h:3 ../src/plugins/grilo/totem-grilo.c:1184
+msgid "Browse"
+msgstr "Ramban"
+
+#: ../src/plugins/grilo/grilo.ui.h:4 ../src/plugins/grilo/totem-grilo.c:1227
+msgid "Search"
+msgstr "Cari"
+
+#: ../src/plugins/grilo/totem-grilo.c:454
+msgid "Browse Error"
+msgstr "Galat Meramban"
+
+#: ../src/plugins/grilo/totem-grilo.c:609
+msgid "Search Error"
+msgstr "Galat Mencari"
 
 #: ../src/plugins/gromit/gromit.plugin.in.h:1
 msgid "Gromit Annotations"
@@ -2059,49 +2050,14 @@
 msgid "The gromit binary was not found."
 msgstr "Berkas biner gromit tidak ditemukan."
 
-#. Add the interface to Totem's sidebar
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:1
-#: ../src/plugins/iplayer/iplayer.py:46
-msgid "BBC iPlayer"
-msgstr "iPlayer BBC"
-
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:2
-msgid "Stream BBC programs from the last 7 days from the BBC iPlayer service."
-msgstr "Menonton program BBC yang disiarkan 7 hari terakhir dari layanan iPlayer BBC."
-
-#: ../src/plugins/iplayer/iplayer.py:72
-msgid "Error listing channel categories"
-msgstr "Galat ketika memperoleh daftar kategori kanal"
-
-#: ../src/plugins/iplayer/iplayer.py:73
-msgid "There was an unknown error getting the list of television channels available on BBC iPlayer."
-msgstr "Terjadi galat yang tidak dikenal saat memperoleh daftar kanal televisi yang tersedia di iPlayer BBC."
-
-#. Append a dummy child row so that the expander's visible; we can
-#. then queue off the expander to load the programme listing for this
-#. category
-#: ../src/plugins/iplayer/iplayer.py:84
-msgid "Loading…"
-msgstr "Memuat..."
-
-#. Translators: the "programme feed" is the list of TV shows
-#. available to watch online
-#: ../src/plugins/iplayer/iplayer.py:136
-msgid "Error getting programme feed"
-msgstr "Galat ketika memperoleh umpanan program"
-
-#: ../src/plugins/iplayer/iplayer.py:137
-msgid "There was an error getting the list of programmes for this channel and category combination."
-msgstr "Terjadi Galat ketika memperoleh daftar program untuk kanal ini beserta kombinasi kategorinya."
-
-#: ../src/plugins/iplayer/iplayer2.py:298
-msgid ""
-msgstr ""
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
+msgid "Instant Messenger Status"
+msgstr "Status Pesan Instan"
 
-#: ../src/plugins/iplayer/iplayer2.py:299
-#, python-format
-msgid "Programme unavailable (\"%s\")"
-msgstr "Program tidak tersedia (\"%s\")"
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
+msgid "Set your Instant Messenger status to away when a movie is playing"
+msgstr ""
+"Menetapkan status Pesan Instan Anda sebagai \"menjauh\" saat film diputar"
 
 #: ../src/plugins/lirc/lirc.plugin.in.h:1
 msgid "Infrared Remote Control"
@@ -2119,25 +2075,29 @@
 msgid "Couldn't read lirc configuration."
 msgstr "Tidak dapat membaca konfigurasi lirc."
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
-msgid "Download Movie Subtitles"
-msgstr "Unduh Subtitel Film"
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:1
+msgid "Media Player Keys"
+msgstr "Kunci Pemutar Media"
+
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:2
+msgid "Support additional media player keys"
+msgstr "Mendukung tambahan kunci pemutar media"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
-msgid "Subtitle _language:"
-msgstr "Bahasa subtite_l:"
+#: ../src/plugins/ontop/ontop.plugin.in.h:1
+msgid "Always On Top"
+msgstr "Selalu Di Atas"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
-msgid "_Play with Subtitle"
-msgstr "_Putar dengan Subtitel"
+#: ../src/plugins/ontop/ontop.plugin.in.h:2
+msgid "Keep the main window on top when playing a movie"
+msgstr "Mempertahankan jendela utama selalu berada di atas saat memutar film"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:1
 msgid "Subtitle Downloader"
 msgstr "Pengunduh Subtitel"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:2
-msgid "Look for subtitles for the currently playing movie."
-msgstr "Mencari teks subtitel untuk film yang sedang diputar."
+msgid "Look for subtitles for the currently playing movie"
+msgstr "Mencari teks subtitel untuk film yang sedang diputar"
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:42
 msgid "Brazilian Portuguese"
@@ -2193,6 +2153,18 @@
 msgid "Searching subtitles…"
 msgstr "Mencari subtitel..."
 
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
+msgid "Download Movie Subtitles"
+msgstr "Unduh Subtitel Film"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
+msgid "Subtitle _language:"
+msgstr "Bahasa subtite_l:"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
+msgid "_Play with Subtitle"
+msgstr "_Putar dengan Subtitel"
+
 #: ../src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in.h:1
 msgid "Subtitle language"
 msgstr "Bahasa subtitel"
@@ -2201,91 +2173,111 @@
 msgid "The language to search for subtitles for movies in."
 msgstr "Bahasa subtitel film yang ingin dicari."
 
-#: ../src/plugins/ontop/ontop.plugin.in.h:1
-msgid "Always On Top"
-msgstr "Selalu Di Atas"
-
-#: ../src/plugins/ontop/ontop.plugin.in.h:2
-msgid "Keep the main window on top when playing a movie"
-msgstr "Mempertahankan jendela utama selalu berada di atas saat memutar film"
+#: ../src/plugins/properties/movie-properties.plugin.in.h:1
+msgid "Movie Properties"
+msgstr "Properti Film"
+
+#: ../src/plugins/properties/movie-properties.plugin.in.h:2
+msgid "Adds movie properties to the sidebar"
+msgstr "Tambahkan properti film ke panel samping"
 
 #: ../src/plugins/properties/totem-movie-properties.c:246
 msgid "Properties"
 msgstr "Properti"
 
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:1
-msgid "Publisher protocol to use"
-msgstr "Protokol penerbit yang akan dipakai"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:2
-msgid "The transport protocol to use when publishing playlists over the network."
-msgstr "Protokol transpor yang akan dipakai ketika menerbitkan daftar putar melalui jaringan."
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:3
-msgid "Format for network service name"
-msgstr "Format bagi nama layanan jaringan"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:5
-#, no-c-format
-msgid "A format string used to build the network service name used when publishing playlists over the network. The following format placeholders can be used: • %a: the program name as returned by g_get_application_name() • %h: the machine's host name in title case • %u: the user's login name in title case • %U: the user's real name • %%: the percent sign"
-msgstr "String format yang dipakai untuk membentuk nama layanan jaringan yang dipakai untuk menerbitkan daftar putar lewat jaringan. Format placeholder berikut dapat dipakai: • %a: nama program yang dikembalikan oleh g_get_application_name() • %h: nama host mesin dalam bentuk title case • %u: nama login pengguna dalam bentuk title case • %U: nama lengkap pengguna • %%: tanda persen"
-
-#. Translators: computers on the local network which are publishing their playlists over the network
-#: ../src/plugins/publish/totem-publish.c:552
-msgid "Neighbors"
-msgstr "Tetangga"
-
-#: ../src/plugins/publish/publish.plugin.in.h:1
-msgid "Publish Playlist"
-msgstr "Publikasikan Daftar Main"
-
-#: ../src/plugins/publish/publish.plugin.in.h:2
-msgid "Share the current playlist via HTTP"
-msgstr "Membagikan daftar main yang sekarang via HTTP"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:1
-msgid "Service _Name:"
-msgstr "_Nama Layanan:"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:3
-#, no-c-format
-msgid ""
-"The name used for announcing the playlist service on the network.\n"
-"All occurrences of the string %u will be replaced by your name,\n"
-"and %h will be replaced by your computer's host name."
-msgstr ""
-"Nama yang dipakai untuk mempublikasikan daftar main melalui jaringan.\n"
-"Semua string %u akan diganti dengan nama Anda,\n"
-"sementara string %h akan diganti dengan nama komputer Anda."
-
-#: ../src/plugins/publish/publish-plugin.ui.h:6
-msgid "Use _encrypted transport protocol (HTTPS)"
-msgstr "Gunakan protokol transf_er berenkripsi (HTTPS)"
-
 #: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:1
 msgid "rpdb2 password"
 msgstr "sandi rdb2"
 
 #: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:2
-msgid "A password to protect the rpdb2 server for debugging Totem from unauthorized remote access. If this is empty, a default of 'totem' will be used."
-msgstr "Sandi untuk melindungi server rpdb2 untuk mendebug Totem dari akses jarak jauh tanpa ijin. Bila ini kosong, nilai bawaan 'totem' akan dipakai."
+msgid ""
+"A password to protect the rpdb2 server for debugging Totem from unauthorized "
+"remote access. If this is empty, a default of 'totem' will be used."
+msgstr ""
+"Sandi untuk melindungi server rpdb2 untuk mendebug Totem dari akses jarak "
+"jauh tanpa ijin. Bila ini kosong, nilai bawaan 'totem' akan dipakai."
+
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
+msgid "Python Console"
+msgstr "Konsol Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
+msgid "Interactive Python console"
+msgstr "Konsol interaktif Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:88
+msgid "Python Console Menu"
+msgstr "Menu Konsol Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:93
+msgid "_Python Console"
+msgstr "Konsol _Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:94
+msgid "Show Totem's Python console"
+msgstr "Menampilkan konsol Python pada Totem"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:100
+msgid "Python Debugger"
+msgstr "Pendebug Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:101
+msgid "Enable remote Python debugging with rpdb2"
+msgstr "Mengaktifkan debug jarak jauh Python dengan rpdb2"
+
+#. pylint: disable-msg=E1101
+#: ../src/plugins/pythonconsole/pythonconsole.py:125
+#, python-format
+msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
+msgstr "Anda dapat mengakses Totem.Object melalui 'totem_object' :\\n%s"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:129
+msgid "Totem Python Console"
+msgstr "Konsol Python Totem"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:139
+msgid ""
+"After you press OK, Totem will wait until you connect to it with winpdb or "
+"rpdb2. If you have not set a debugger password in DConf, it will use the "
+"default password ('totem')."
+msgstr ""
+"Setelah Anda mengklik OK, Totem akan menunggu hingga Anda terhubung melalui "
+"winpdb atau rpdb2. Apabila Anda belum menyetel sandi debuger pada DConf, "
+"maka akan dipakai sandi baku ('totem')."
+
+#: ../src/plugins/recent/recent.plugin.in.h:1
+#| msgid "Video files"
+msgid "Recent files"
+msgstr "Berkas baru-baru ini"
+
+#: ../src/plugins/recent/recent.plugin.in.h:2
+msgid "Adds files that have been played to recent files"
+msgstr "Tambahkan berkas yang telah diputar ke berkas terkini"
 
 #: ../src/plugins/rotation/rotation.plugin.in.h:1
 msgid "Rotation Plugin"
 msgstr "Plugin Rotasi"
 
 #: ../src/plugins/rotation/rotation.plugin.in.h:2
-msgid "Allows videos to be rotated if they're in the wrong orientation."
-msgstr "Perbolehkan video diputar bila orientasinya salah."
+msgid "Allows videos to be rotated if they are in the wrong orientation"
+msgstr "Perbolehkan video diputar arahnya bila orientasinya salah"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:60
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:50
 msgid "_Rotate Clockwise"
 msgstr "Puta_r Searah Jarum Jam"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:62
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:52
 msgid "Rotate Counterc_lockwise"
 msgstr "Putar Me_lawan Arah Jarum Jam"
 
+#: ../src/plugins/save-file/save-file.plugin.in.h:1
+msgid "Save Copy"
+msgstr "Simpan Salinan"
+
+#: ../src/plugins/save-file/save-file.plugin.in.h:2
+msgid "Save a copy of the currently playing movie"
+msgstr "Menyimpan salinan dari film yang sedang diputar"
+
 #: ../src/plugins/save-file/totem-save-file.c:63
 msgid "Save a Copy..."
 msgstr "Simpan Salinan..."
@@ -2308,10 +2300,13 @@
 msgid "Movie stream"
 msgstr "Stream film"
 
-#: ../src/plugins/screensaver/totem-screensaver.c:116
-#: ../browser-plugin/totem-plugin-viewer.c:1891
-msgid "Playing a movie"
-msgstr "Memutar film"
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:1
+msgid "Screen Saver"
+msgstr "Pengaman Layar"
+
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:2
+msgid "Deactivates the screen saver when a movie is playing"
+msgstr "Nonaktifkan pengaman layar ketika suatu film sedang diputar"
 
 #: ../src/plugins/screenshot/gallery.ui.h:1
 msgid "Screenshot width (in pixels):"
@@ -2326,23 +2321,30 @@
 msgid "Number of screenshots:"
 msgstr "Jumlah cuplikan:"
 
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:1
-msgid "_Name:"
-msgstr "_Nama:"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:2
-msgid "Save in _folder:"
-msgstr "Simpan dalam _folder:"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:3
-msgid "Select a folder"
-msgstr "Pilih folder"
-
-#. Write the screenshot to the temporary file
-#: ../src/plugins/screenshot/gnome-screenshot-widget.c:385
-#: ../src/plugins/screenshot/totem-screenshot.c:64
-msgid "Screenshot.png"
-msgstr "Cuplikan.png"
+#. translators: this is the name of the file that gets made up
+#. * with the screenshot if the entire screen is taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:147
+#, c-format
+#| msgid "Screenshot.png"
+msgid "Screenshot from %s.png"
+msgstr "Cuplikan layar %s.png"
+
+#. translators: this is the name of the file that gets
+#. * made up with the screenshot if the entire screen is
+#. * taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:154
+#, c-format
+#| msgid "Screenshot-%s-%d.png"
+msgid "Screenshot from %s - %d.png"
+msgstr "Cuplikan layar %s - %d.png"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:1
+msgid "Screenshot"
+msgstr "Cuplikan"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:2
+msgid "Allows screenshots and galleries to be taken of videos"
+msgstr "Mengijinkan cuplikan layar dan galeri atas video diambil"
 
 #: ../src/plugins/screenshot/totem-gallery.c:91
 msgid "Save Gallery"
@@ -2368,49 +2370,48 @@
 msgid "Saving gallery as \"%s\""
 msgstr "Menyimpan galeri sebagai \"%s\""
 
-#: ../src/plugins/screenshot/totem-screenshot.c:113
-msgid "There was an error saving the screenshot."
-msgstr "Terjadi Galat ketika menyimpan cuplikan."
-
-#: ../src/plugins/screenshot/totem-screenshot.c:139
-msgid "Save Screenshot"
-msgstr "Simpan Cuplikan"
-
-#. Create the screenshot widget
-#. Translators: %s is the movie title and %d is an auto-incrementing number to make filename unique
-#: ../src/plugins/screenshot/totem-screenshot.c:160
-#, c-format
-msgid "Screenshot-%s-%d.png"
-msgstr "Cuplikan-%s-%d.png"
-
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:88
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:220
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "Totem could not get a screenshot of the video."
 msgstr "Totem tidak dapat mengambil cuplikan video."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "This is not supposed to happen; please file a bug report."
 msgstr "Ini tidak seharusnya terjadi, laporkanlah sebagai hama kode."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
-msgid "Take _Screenshot..."
-msgstr "Ambil _Cuplikan..."
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
+#| msgid "Take _Screenshot..."
+msgid "Take _Screenshot"
+msgstr "Ambil _Cuplikan Layar"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
 msgid "Take a screenshot"
 msgstr "Mengambil cuplikan"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create Screenshot _Gallery..."
 msgstr "Buat _Galeri Cuplikan..."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create a gallery of screenshots"
 msgstr "Membuat galeri dari sejumlah cuplikan"
 
+#: ../src/plugins/skipto/skipto.plugin.in.h:1
+#: ../src/plugins/skipto/totem-skipto.c:196
+msgid "Skip To"
+msgstr "Lompat ke"
+
+#: ../src/plugins/skipto/skipto.plugin.in.h:2
+msgid "Provides the \"Skip to\" dialog"
+msgstr "Menyediakan dialog \"Lompat ke\""
+
+#: ../src/plugins/skipto/skipto.ui.h:1
+msgid "_Skip to:"
+msgstr "_Melompat ke:"
+
 #. Update the "seconds" label so that it always has the correct singular/plural form
 #. Translators: label for the seconds selector in the "Skip to" dialogue
-#: ../src/plugins/skipto/totem-skipto.c:160
+#: ../src/plugins/skipto/totem-skipto.c:159
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "detik"
@@ -2419,15 +2420,11 @@
 #. Translators: you should translate this string to a number (written in digits) which corresponds to the longer character length of the
 #. * translations for "second" and "seconds", as translated elsewhere in this file. For example, in English, "second" is 6 characters long and
 #. * "seconds" is 7 characters long, so this string should be translated to "7". See: bgo#639398
-#: ../src/plugins/skipto/totem-skipto.c:190
+#: ../src/plugins/skipto/totem-skipto.c:189
 msgctxt "Skip To label length"
 msgid "7"
 msgstr "7"
 
-#: ../src/plugins/skipto/totem-skipto.c:197
-msgid "Skip To"
-msgstr "Lompat ke"
-
 #: ../src/plugins/skipto/totem-skipto-plugin.c:182
 msgid "_Skip To..."
 msgstr "_Lompat ke..."
@@ -2435,111 +2432,3 @@
 #: ../src/plugins/skipto/totem-skipto-plugin.c:182
 msgid "Skip to a specific time"
 msgstr "Melompat ke waktu tertentu"
-
-#: ../src/plugins/skipto/skipto.ui.h:1
-msgid "_Skip to:"
-msgstr "_Melompat ke:"
-
-#: ../browser-plugin/totem-plugin-viewer.c:431
-msgid "No URI to play"
-msgstr "Tidak ada URI untuk dimainkan"
-
-#. translators: this is:
-#. * Open With ApplicationName
-#. * as in nautilus' right-click menu
-#: ../browser-plugin/totem-plugin-viewer.c:1107
-#, c-format
-msgid "_Open with \"%s\""
-msgstr "_Buka dengan \"%s\""
-
-#: ../browser-plugin/totem-plugin-viewer.c:2136
-msgid "No playlist or playlist empty"
-msgstr "Tidak ada daftar main atau daftar main kosong"
-
-#: ../browser-plugin/totem-plugin-viewer.c:2235
-msgid "Movie browser plugin"
-msgstr "Pengaya peramban film"
-
-#: ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Verify your system installation. The Totem plugin will now exit."
-msgstr "Periksa instalasi sistem Anda. Pengaya Totem akan keluar sekarang."
-
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
-msgid "Python Console"
-msgstr "Konsol Python"
-
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
-msgid "Interactive Python console."
-msgstr "Konsol interaktif Python."
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:88
-msgid "Python Console Menu"
-msgstr "Menu Konsol Python"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:93
-msgid "_Python Console"
-msgstr "Konsol _Python"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:94
-msgid "Show Totem's Python console"
-msgstr "Menampilkan konsol Python pada Totem"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:100
-msgid "Python Debugger"
-msgstr "Pendebug Python"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:101
-msgid "Enable remote Python debugging with rpdb2"
-msgstr "Mengaktifkan debug jarak jauh Python dengan rpdb2"
-
-#. pylint: disable-msg=E1101
-#: ../src/plugins/pythonconsole/pythonconsole.py:125
-#, python-format
-msgid ""
-"You can access the Totem.Object through 'totem_object' :\\n"
-"%s"
-msgstr ""
-"Anda dapat mengakses Totem.Object melalui 'totem_object' :\\n"
-"%s"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:129
-msgid "Totem Python Console"
-msgstr "Konsol Python Totem"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:139
-msgid "After you press OK, Totem will wait until you connect to it with winpdb or rpdb2. If you have not set a debugger password in DConf, it will use the default password ('totem')."
-msgstr "Setelah Anda mengklik OK, Totem akan menunggu hingga Anda terhubung melalui winpdb atau rpdb2. Apabila Anda belum menyetel sandi debuger pada DConf, maka akan dipakai sandi baku ('totem')."
-
-#: ../src/plugins/grilo/grilo.plugin.in.h:1
-msgid "Grilo Browser"
-msgstr "Peramban Grilo"
-
-#: ../src/plugins/grilo/grilo.plugin.in.h:2
-msgid "A plugin to let you browse media content from various sources."
-msgstr "Dengan pengaya ini, Anda dapat menelusuri isi media dari berbagai sumber."
-
-#: ../src/plugins/grilo/totem-grilo.c:452
-msgid "Browse Error"
-msgstr "Galat Meramban"
-
-#: ../src/plugins/grilo/totem-grilo.c:599
-msgid "Search Error"
-msgstr "Galat Mencari"
-
-#: ../src/plugins/grilo/totem-grilo.c:1219 ../src/plugins/grilo/grilo.ui.h:3
-msgid "Browse"
-msgstr "Ramban"
-
-#: ../src/plugins/grilo/totem-grilo.c:1285 ../src/plugins/grilo/grilo.ui.h:4
-msgid "Search"
-msgstr "Cari"
-
-#: ../src/plugins/grilo/grilo.ui.h:1
-#| msgid "_Add to Playlist"
-msgid "Add to Playlist"
-msgstr "Tambah ke Daftar Main"
-
-#: ../src/plugins/grilo/grilo.ui.h:2
-#| msgid "_Copy Location"
-msgid "Copy Location"
-msgstr "Salin Lokasi"
diff -Nru totem-3.4.3/po/it.po totem-3.6.2/po/it.po
--- totem-3.4.3/po/it.po	2012-04-02 14:15:40.000000000 +0000
+++ totem-3.6.2/po/it.po	2012-10-09 15:42:00.000000000 +0000
@@ -9,24 +9,244 @@
 "Project-Id-Version: totem 3.2\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=totem&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-03-22 23:18+0000\n"
-"PO-Revision-Date: 2012-03-23 00:29+0100\n"
+"POT-Creation-Date: 2012-09-20 05:12+0000\n"
+"PO-Revision-Date: 2012-09-20 10:35+0200\n"
 "Last-Translator: Gianvito Cavasoli \n"
 "Language-Team: Italiano \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
+#: ../browser-plugin/totem-plugin-viewer.c:352 ../src/totem-object.c:1180
+#: ../src/totem-object.c:1650 ../src/totem-statusbar.c:115
+msgid "Stopped"
+msgstr "Interrotto"
+
+#: ../browser-plugin/totem-plugin-viewer.c:364 ../src/totem-object.c:1173
+msgid "Paused"
+msgstr "In pausa"
+
+#: ../browser-plugin/totem-plugin-viewer.c:368 ../src/totem-object.c:1166
+msgid "Playing"
+msgstr "Riproduzione in corso"
+
+#: ../browser-plugin/totem-plugin-viewer.c:386
+#: ../src/plugins/screensaver/totem-screensaver.c:97
+msgid "Playing a movie"
+msgstr "Riproduzione in corso di un filmato"
+
+#: ../browser-plugin/totem-plugin-viewer.c:443
+msgid "No URI to play"
+msgstr "Nessun URI da riprodurre"
+
+#: ../browser-plugin/totem-plugin-viewer.c:676
+#: ../browser-plugin/totem-plugin-viewer.c:1700
+msgid "Totem Movie Player"
+msgstr "Riproduttore filmati Totem"
+
+#. translators: this is:
+#. * Open With ApplicationName
+#. * as in nautilus' right-click menu
+#: ../browser-plugin/totem-plugin-viewer.c:1120
+#, c-format
+msgid "_Open with \"%s\""
+msgstr "A_pri con «%s»"
+
+#: ../browser-plugin/totem-plugin-viewer.c:1341 ../src/totem-object.c:2475
+msgid "An error occurred"
+msgstr "Si è verificato un errore"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2033
+msgid "No playlist or playlist empty"
+msgstr "Nessuna scaletta o scaletta vuota"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2128
+msgid "Movie browser plugin"
+msgstr "Plugin esploratore di filmati"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144 ../src/totem.c:241
+msgid "Could not initialize the thread-safe libraries."
+msgstr "Impossibile inizializzare le librerie thread-safe."
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144
+msgid "Verify your system installation. The Totem plugin will now exit."
+msgstr "Verificare l'installazione del sistema. Il plugin verrà arrestato."
+
 #: ../data/fullscreen.ui.h:1
 msgid "Leave Fullscreen"
 msgstr "Finestra normale"
 
-#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:144
+#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:81
 msgid "Time:"
 msgstr "Tempo:"
 
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
+msgid "Allow the screensaver to activate when playing audio"
+msgstr "Consente al salvaschermo di attivarsi durante la riproduzione audio"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
+msgid ""
+"Allow the screensaver to activate when playing audio. Disable if you have "
+"monitor-powered speakers."
+msgstr ""
+"Consente al salvaschermo di attivarsi durante la riproduzione audio. "
+"Disabilitare se si hanno altoparlanti alimentati dal monitor."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
+msgid "Show visual effects when no video is displayed"
+msgstr "Mostra gli effetti visivi in assenza di video"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
+msgid "Show visual effects when playing an audio only file."
+msgstr "Mostra gli effetti visivi quando si riproduce un file audio."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
+msgid "Name of the visual effects plugin"
+msgstr "Nome del plugin degli effetti visivi"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
+msgid "The brightness of the video"
+msgstr "Il livello di luminosità del video"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
+msgid "The contrast of the video"
+msgstr "Il livello di contrasto del video"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
+msgid "The hue of the video"
+msgstr "La tonalità del video"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
+msgid "The saturation of the video"
+msgstr "Il livello di saturazione del video"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
+msgid "Resize the canvas automatically on file load"
+msgstr "Ridimensiona automaticamente finestra all'apertura di un file"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
+msgid "Repeat mode"
+msgstr "Riproduzione continua"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
+msgid "Shuffle mode"
+msgstr "Riproduzione casuale"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
+msgid "Whether to disable deinterlacing for interlaced movies"
+msgstr ""
+"Indica se disabilitare il deinterlacciamento per i filmati interlacciati"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
+msgid "Whether to enable debug for the playback engine"
+msgstr "Indica se abilitare il debug per il motore di riproduzione"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
+msgid "Type of audio output to use"
+msgstr "Il tipo di uscita audio da usare"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
+msgid "Visualization quality setting"
+msgstr "Impostazione della qualità di visualizzazione"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
+msgid "Quality setting for the audio visualization."
+msgstr "Impostazione qualità per la visualizzazione audio."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
+msgid "Network buffering threshold"
+msgstr "Soglia per la bufferizzazione di rete"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
+msgid ""
+"Amount of data to buffer for network streams before starting to display the "
+"stream (in seconds)."
+msgstr ""
+"Quantità di dati da memorizzare per i flussi di rete prima di iniziare la "
+"visualizzazione del flusso (in secondi)."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
+msgid "Subtitle font"
+msgstr "Carattere dei sottotitoli"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
+msgid "Pango font description for subtitle rendering."
+msgstr "Descrizione dei caratteri Pango per il rendering dei sottotitoli."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
+msgid "Subtitle encoding"
+msgstr "Codifica dei sottotitoli"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
+msgid "Encoding character set for subtitle."
+msgstr "Set di caratteri per la codifica dei sottotitoli."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
+msgid "Default location for the \"Open...\" dialogs"
+msgstr "Posizione predefinita per i dialoghi \"Apri...\""
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
+msgid ""
+"Default location for the \"Open...\" dialogs. Default is the current "
+"directory."
+msgstr ""
+"La posizione predefinita per i dialoghi \"Apri...\". La directory attuale è "
+"quella predefinita."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
+msgid "Default location for the \"Take Screenshot\" dialogs"
+msgstr "Posizione predefinita per i dialoghi \"Cattura schermata\""
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
+msgid ""
+"Default location for the \"Take Screenshot\" dialogs. Default is the "
+"Pictures directory."
+msgstr ""
+"La posizione predefinita per i dialoghi \"Cattura schermata\". La cartella "
+"Immagini è quella predefinita."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
+msgid "Whether to disable the plugins in the user's home directory"
+msgstr "Indica se disabilitare i plugin nella cartella home dell'utente"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
+msgid "Whether to disable the keyboard shortcuts"
+msgstr "Indica se disabilitare le scorciatoie da tastiera"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
+msgid "Whether to autoload text subtitle files when a movie is loaded"
+msgstr ""
+"Indica se caricare automaticamente i file dei sottotitoli all'apertura di un "
+"filmato"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
+msgid "Whether to autoload external chapter files when a movie is loaded"
+msgstr ""
+"Indica se caricare automaticamente file di capitoli esterni all'apertura di "
+"un filmato"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
+msgid ""
+"Whether to remember the position of played audio/video files when pausing or "
+"closing them"
+msgstr ""
+"Indica se ricordare la posizione dei file audio/video riprodotti quando "
+"messi in pausa o chiusi"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
+msgid "Active plugins list"
+msgstr "Elenco plugin attivi"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+msgid ""
+"A list of the names of the plugins which are currently active (loaded and "
+"running)."
+msgstr ""
+"Un elenco dei nomi dei plugin che sono attualmente attivi (caricati e in "
+"esecuzione)."
+
 #: ../data/playlist.ui.h:1
 msgid "_Remove"
 msgstr "_Rimuovi"
@@ -43,11 +263,11 @@
 msgid "Copy the location to the clipboard"
 msgstr "Copia la posizione negli appunti"
 
-#: ../data/playlist.ui.h:5 ../data/totem.ui.h:78
+#: ../data/playlist.ui.h:5 ../data/totem.ui.h:71
 msgid "_Select Text Subtitles..."
 msgstr "_Seleziona testo sottotitoli..."
 
-#: ../data/playlist.ui.h:6 ../data/totem.ui.h:79
+#: ../data/playlist.ui.h:6 ../data/totem.ui.h:72
 msgid "Select a file to use for text subtitles"
 msgstr "Seleziona un file da usare per il testo dei sottotitoli"
 
@@ -57,7 +277,7 @@
 
 #: ../data/playlist.ui.h:8
 msgid "Remove"
-msgstr "Rimuove"
+msgstr "Rimuovi"
 
 #: ../data/playlist.ui.h:9
 msgid "Save Playlist..."
@@ -71,43 +291,209 @@
 msgid "Move Down"
 msgstr "Sposta in basso"
 
-#: ../data/properties.ui.h:1 ../data/totem.ui.h:122
-msgid "General"
-msgstr "Generale"
+# LF - GNOME-2-22-2
+# ripresa da totem 2.18
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:2
+msgid "Normal"
+msgstr "Normale"
 
-#: ../data/properties.ui.h:2
-msgid "Title:"
-msgstr "Titolo:"
+# LF - GNOME-2-22-2
+# ripresa da totem 2.18
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:4
+msgid "Large"
+msgstr "Grande"
 
-#: ../data/properties.ui.h:3
-msgid "Artist:"
-msgstr "Artista:"
+# LF - GNOME-2-22-2
+# ripresa da totem 2.18
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:6
+msgid "Extra Large"
+msgstr "Molto grande"
 
-#: ../data/properties.ui.h:4
-msgid "Duration:"
-msgstr "Durata:"
+#: ../data/preferences.ui.h:7 ../src/backend/bacon-video-widget.c:5522
+#: ../src/totem-properties-view.c:232
+msgid "Stereo"
+msgstr "Stereo"
 
-#: ../data/properties.ui.h:5
-msgid "Year:"
-msgstr "Anno:"
+# LF - GNOME-2-22-2
+# ripresa da totem 2.18
+#: ../data/preferences.ui.h:8
+msgid "4-channel"
+msgstr "4 canali"
 
-#: ../data/properties.ui.h:6
-msgid "Album:"
-msgstr "Album:"
+# LF - GNOME-2-22-2
+# ripresa da totem 2.18
+#: ../data/preferences.ui.h:9
+msgid "4.1-channel"
+msgstr "4.1 canali"
 
-#: ../data/properties.ui.h:7
-msgid "Comment:"
-msgstr "Commento:"
+# LF - GNOME-2-22-2
+# ripresa da totem 2.18
+#: ../data/preferences.ui.h:10
+msgid "5.0-channel"
+msgstr "5.0 canali"
 
-#: ../data/properties.ui.h:8
-msgid "Container:"
-msgstr "Contenitore:"
+# LF - GNOME-2-22-2
+# ripresa da totem 2.18
+#: ../data/preferences.ui.h:11
+msgid "5.1-channel"
+msgstr "5.1 canali"
+
+# LF - GNOME-2-22-2
+# ripresa da totem 2.18
+#: ../data/preferences.ui.h:12
+msgid "AC3 Passthrough"
+msgstr "Segnale AC3"
+
+#: ../data/preferences.ui.h:13
+msgid "Totem Preferences"
+msgstr "Preferenze di Totem"
+
+#: ../data/preferences.ui.h:14
+msgid "Playback"
+msgstr "Riproduzione"
+
+#: ../data/preferences.ui.h:15
+msgid "Start playing files from last position"
+msgstr "Avviare la riproduzione dei file dall'ultima posizione"
+
+#: ../data/preferences.ui.h:16
+msgid "Text Subtitles"
+msgstr "Testo dei sottotitoli"
+
+#: ../data/preferences.ui.h:17
+msgid "_Load subtitle files when movie is loaded"
+msgstr "C_aricare i file dei sottotitoli all'apertura di un filmato"
+
+#: ../data/preferences.ui.h:18
+msgid "_Font:"
+msgstr "_Tipo di carattere:"
+
+#: ../data/preferences.ui.h:19
+msgid "_Encoding:"
+msgstr "Co_difica:"
+
+#: ../data/preferences.ui.h:20
+msgid "External Chapters"
+msgstr "Capitoli esterni"
+
+#: ../data/preferences.ui.h:21
+msgid "Load _chapter files when movie is loaded"
+msgstr "Caricare i file dei ca_pitoli all'apertura di un filmato"
+
+#: ../data/preferences.ui.h:22 ../data/properties.ui.h:1
+msgid "General"
+msgstr "Generale"
+
+#. Tab label in the Preferences dialogue
+#: ../data/preferences.ui.h:24
+msgid "Display"
+msgstr "Visualizzazione"
+
+#: ../data/preferences.ui.h:25
+msgid "_Resize the window when a new video is loaded"
+msgstr "_Ridimensionare la finestra all'apertura di un nuovo filmato"
+
+#: ../data/preferences.ui.h:26
+msgid "Disable _deinterlacing of interlaced videos"
+msgstr "Disabilitare _deinterlacciamento di video interlacciati"
 
-#: ../data/properties.ui.h:9 ../data/totem.ui.h:128
-#: ../src/totem-properties-view.c:270
+#: ../data/preferences.ui.h:27
+msgid "Disable screensaver when playing "
+msgstr "Disabilitare il salvaschermo quando si riproduce"
+
+#: ../data/preferences.ui.h:28 ../data/properties.ui.h:9
+#: ../src/totem-properties-view.c:275
 msgid "Video"
 msgstr "Video"
 
+#: ../data/preferences.ui.h:29
+msgid "Video or Audio"
+msgstr "Video o audio"
+
+#: ../data/preferences.ui.h:30
+msgid "Visual Effects"
+msgstr "Effetti visivi"
+
+#: ../data/preferences.ui.h:31
+msgid "Show _visual effects when an audio file is played"
+msgstr "Mostrare gli effetti _visivi quando si riproduce un file audio"
+
+#: ../data/preferences.ui.h:32
+msgid "_Type of visualization:"
+msgstr "_Tipo di visualizzazione:"
+
+#: ../data/preferences.ui.h:33
+msgid "Visualization _size:"
+msgstr "Dimensione di vi_sualizzazione:"
+
+#: ../data/preferences.ui.h:34
+msgid "Color Balance"
+msgstr "Bilanciamento colore"
+
+#: ../data/preferences.ui.h:35
+msgid "_Brightness:"
+msgstr "_Luminosità:"
+
+#: ../data/preferences.ui.h:36
+msgid "Co_ntrast:"
+msgstr "Co_ntrasto:"
+
+#: ../data/preferences.ui.h:37
+msgid "Sat_uration:"
+msgstr "Sat_urazione:"
+
+#: ../data/preferences.ui.h:38
+msgid "_Hue:"
+msgstr "_Tonalità:"
+
+#: ../data/preferences.ui.h:39
+msgid "Reset to _Defaults"
+msgstr "Ripristina valori pre_definiti"
+
+#: ../data/preferences.ui.h:40
+msgid "Audio Output"
+msgstr "Uscita audio"
+
+#: ../data/preferences.ui.h:41
+msgid "_Audio output type:"
+msgstr "Tipo di uscita _audio:"
+
+#: ../data/preferences.ui.h:42 ../data/properties.ui.h:14
+#: ../src/totem-properties-view.c:273
+msgid "Audio"
+msgstr "Audio"
+
+#: ../data/properties.ui.h:2
+msgid "Title:"
+msgstr "Titolo:"
+
+#: ../data/properties.ui.h:3
+msgid "Artist:"
+msgstr "Artista:"
+
+#: ../data/properties.ui.h:4
+msgid "Duration:"
+msgstr "Durata:"
+
+#: ../data/properties.ui.h:5
+msgid "Year:"
+msgstr "Anno:"
+
+#: ../data/properties.ui.h:6
+msgid "Album:"
+msgstr "Album:"
+
+#: ../data/properties.ui.h:7
+msgid "Comment:"
+msgstr "Commento:"
+
+#: ../data/properties.ui.h:8
+msgid "Container:"
+msgstr "Contenitore:"
+
 #: ../data/properties.ui.h:10
 msgid "Dimensions:"
 msgstr "Dimensioni:"
@@ -124,11 +510,6 @@
 msgid "Bitrate:"
 msgstr "Bitrate:"
 
-#: ../data/properties.ui.h:14 ../data/totem.ui.h:142
-#: ../src/totem-properties-view.c:268
-msgid "Audio"
-msgstr "Audio"
-
 #: ../data/properties.ui.h:15
 msgid "Sample rate:"
 msgstr "Campionatura:"
@@ -137,786 +518,445 @@
 msgid "Channels:"
 msgstr "Canali:"
 
-#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
-msgid "_Add to Playlist"
-msgstr "A_ggiungi alla scaletta"
-
-#: ../data/video-list.ui.h:2
-msgid "Add the video to the playlist"
-msgstr "Aggiunge il video alla scaletta"
-
 #. Title
-#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:143
-#: ../src/totem-object.c:1667
-msgid "Movie Player"
-msgstr "Riproduttore filmati"
+#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:80 ../src/totem.c:240
+#: ../src/totem.c:249 ../src/totem-menu.c:789 ../src/totem-object.c:1658
+msgid "Videos"
+msgstr "Video"
 
 #: ../data/totem.desktop.in.in.in.h:2
-msgid "Play movies and songs"
-msgstr "Riproduce filmati e musica"
+msgid "Play movies"
+msgstr "Riproduce filmati"
+
+#: ../data/totem.desktop.in.in.in.h:3
+msgid "Video;Movie;Film;Clip;Series;Player;DVD;TV;Disc;"
+msgstr "Video;Filmato;Film;Clip;Serie;Riproduttore;DVD;TV;Disco;"
 
 #: ../data/totem.ui.h:1
-msgid "_Movie"
-msgstr "_Filmato"
+msgid "_Open"
+msgstr "_Apri"
 
 #: ../data/totem.ui.h:2
-msgid "_Open..."
-msgstr "_Apri..."
+msgid "Open _Location"
+msgstr "Apri posi_zione"
 
 #: ../data/totem.ui.h:3
-msgid "Open a file"
-msgstr "Apre un file"
+msgid "_Fullscreen"
+msgstr "_Schermo intero"
 
 #: ../data/totem.ui.h:4
-msgid "Open _Location..."
-msgstr "Apri posi_zione..."
+msgid "Prefere_nces"
+msgstr "Preferen_ze"
 
 #: ../data/totem.ui.h:5
-msgid "Open a non-local file"
-msgstr "Apre un file remoto"
+msgid "Shuff_le"
+msgstr "_Mischia"
 
 #: ../data/totem.ui.h:6
+msgid "_Repeat"
+msgstr "_Ripeti"
+
+#: ../data/totem.ui.h:7
+msgid "_Quit"
+msgstr "_Esci"
+
+#: ../data/totem.ui.h:8
+msgid "_Movie"
+msgstr "_Filmato"
+
+#: ../data/totem.ui.h:9
 msgid "_Eject"
 msgstr "E_spelli"
 
-#: ../data/totem.ui.h:7
+#: ../data/totem.ui.h:10
 msgid "Eject the current disc"
 msgstr "Espelle il disco attuale"
 
-#: ../data/totem.ui.h:8
+#: ../data/totem.ui.h:11
 msgid "_Properties"
 msgstr "Pr_oprietà"
 
-#: ../data/totem.ui.h:9
+#: ../data/totem.ui.h:12
 msgid "View the properties of the current stream"
 msgstr "Visualizza le proprietà dell'attuale flusso"
 
-#: ../data/totem.ui.h:10
+#: ../data/totem.ui.h:13
 msgid "Play / P_ause"
 msgstr "Riproduci / P_ausa"
 
-#: ../data/totem.ui.h:11
+#: ../data/totem.ui.h:14
 msgid "Play or pause the movie"
 msgstr "Riproduce o mette in pausa il filmato"
 
-#: ../data/totem.ui.h:12
-msgid "_Quit"
-msgstr "_Esci"
-
-#: ../data/totem.ui.h:13
-msgid "Quit the program"
-msgstr "Esce dal programma"
-
-#: ../data/totem.ui.h:14
+#: ../data/totem.ui.h:15
 msgid "_Edit"
 msgstr "_Modifica"
 
-#: ../data/totem.ui.h:15
+#: ../data/totem.ui.h:16
 msgid "_Clear Playlist"
 msgstr "Sv_uota scaletta"
 
-#: ../data/totem.ui.h:16
+#: ../data/totem.ui.h:17
 msgid "Clear the playlist"
 msgstr "Svuota la scaletta"
 
-#: ../data/totem.ui.h:17
-msgid "Prefere_nces"
-msgstr "Preferen_ze"
-
 #: ../data/totem.ui.h:18
-msgid "Configure the application"
-msgstr "Configura l'applicazione"
-
-#: ../data/totem.ui.h:19
 msgid "Plugins..."
 msgstr "Plugin..."
 
-#: ../data/totem.ui.h:20
+#: ../data/totem.ui.h:19
 msgid "Configure plugins to extend the application"
 msgstr "Configura i plugin per estendere l'applicazione"
 
-#: ../data/totem.ui.h:21
+#: ../data/totem.ui.h:20
 msgid "_View"
 msgstr "_Visualizza"
 
-#: ../data/totem.ui.h:22
-msgid "_Fullscreen"
-msgstr "_Schermo intero"
-
-#: ../data/totem.ui.h:23
-msgid "Switch to fullscreen"
-msgstr "Visualizza a schermo intero"
-
-#: ../data/totem.ui.h:24
+#: ../data/totem.ui.h:21
 msgid "Fit Window to Movie"
 msgstr "Adatta finestra al filmato"
 
-#: ../data/totem.ui.h:25
+#: ../data/totem.ui.h:22
 msgid "_Resize 1:2"
 msgstr "_Ridimensiona 1:2"
 
-#: ../data/totem.ui.h:26
+#: ../data/totem.ui.h:23
 msgid "Resize to half the original video size"
 msgstr "Dimensioni del video dimezzate"
 
-#: ../data/totem.ui.h:27
+#: ../data/totem.ui.h:24
 msgid "Resize _1:1"
 msgstr "Ridimensiona _1:1"
 
-#: ../data/totem.ui.h:28
+#: ../data/totem.ui.h:25
 msgid "Resize to the original video size"
 msgstr "Dimensioni del video originali"
 
-#: ../data/totem.ui.h:29
+#: ../data/totem.ui.h:26
 msgid "Resize _2:1"
 msgstr "Ridimensiona _2:1"
 
-#: ../data/totem.ui.h:30
+#: ../data/totem.ui.h:27
 msgid "Resize to double the original video size"
 msgstr "Dimensioni del video raddoppiate"
 
-#: ../data/totem.ui.h:31
+#: ../data/totem.ui.h:28
 msgid "_Aspect Ratio"
 msgstr "Rapporto d'_aspetto"
 
-#: ../data/totem.ui.h:32
+#: ../data/totem.ui.h:29
 msgid "Switch An_gles"
 msgstr "Cambia an_golazioni"
 
-#: ../data/totem.ui.h:33
+#: ../data/totem.ui.h:30
 msgid "Switch camera angles"
 msgstr "Cambia angolazioni dell'inquadratura"
 
-#: ../data/totem.ui.h:34
+#: ../data/totem.ui.h:31
 msgid "_Go"
 msgstr "V_ai"
 
-#: ../data/totem.ui.h:35
+#: ../data/totem.ui.h:32
 msgid "_DVD Menu"
 msgstr "Menù _DVD"
 
-#: ../data/totem.ui.h:36
+#: ../data/totem.ui.h:33
 msgid "Go to the DVD menu"
 msgstr "Va al menù DVD"
 
-#: ../data/totem.ui.h:37
+#: ../data/totem.ui.h:34
 msgid "_Title Menu"
 msgstr "Menù _titoli"
 
-#: ../data/totem.ui.h:38
+#: ../data/totem.ui.h:35
 msgid "Go to the title menu"
 msgstr "Va al menù titoli"
 
-#: ../data/totem.ui.h:39
+#: ../data/totem.ui.h:36
 msgid "A_udio Menu"
 msgstr "Menù a_udio"
 
-#: ../data/totem.ui.h:40
+#: ../data/totem.ui.h:37
 msgid "Go to the audio menu"
 msgstr "Va al menù audio"
 
-#: ../data/totem.ui.h:41
+#: ../data/totem.ui.h:38
 msgid "_Angle Menu"
 msgstr "Menù _angolazioni"
 
-#: ../data/totem.ui.h:42
+#: ../data/totem.ui.h:39
 msgid "Go to the angle menu"
 msgstr "Va al menù angolazioni"
 
-#: ../data/totem.ui.h:43
+#: ../data/totem.ui.h:40
 msgid "_Chapter Menu"
 msgstr "Menù _capitoli"
 
-#: ../data/totem.ui.h:44
+#: ../data/totem.ui.h:41
 msgid "Go to the chapter menu"
 msgstr "Va al menù capitoli"
 
-#: ../data/totem.ui.h:45
+#: ../data/totem.ui.h:42
 msgid "_Next Chapter/Movie"
 msgstr "Capitolo/Filmato _successivo"
 
-#: ../data/totem.ui.h:46
+#: ../data/totem.ui.h:43
 msgid "Next chapter or movie"
-msgstr "Passa al prossimo capitolo o filmato"
+msgstr "Passa al capitolo o filmato successivo"
 
-#: ../data/totem.ui.h:47
+#: ../data/totem.ui.h:44
 msgid "_Previous Chapter/Movie"
 msgstr "Capitolo/Filmato _precedente"
 
-#: ../data/totem.ui.h:48
+#: ../data/totem.ui.h:45
 msgid "Previous chapter or movie"
 msgstr "Passa al capitolo o filmato precedente"
 
-#: ../data/totem.ui.h:49
+#: ../data/totem.ui.h:46
 msgid "_Sound"
 msgstr "_Audio"
 
-#: ../data/totem.ui.h:50
+#: ../data/totem.ui.h:47
 msgid "Volume _Up"
 msgstr "Al_za volume"
 
-#: ../data/totem.ui.h:51
+#: ../data/totem.ui.h:48
 msgid "Increase volume"
 msgstr "Aumenta il volume"
 
-#: ../data/totem.ui.h:52
+#: ../data/totem.ui.h:49
 msgid "Volume _Down"
 msgstr "A_bbassa volume"
 
-#: ../data/totem.ui.h:53
+#: ../data/totem.ui.h:50
 msgid "Decrease volume"
 msgstr "Diminuisce il volume"
 
-#: ../data/totem.ui.h:54
+#: ../data/totem.ui.h:51
 msgid "_Help"
 msgstr "A_iuto"
 
-#: ../data/totem.ui.h:55
+#: ../data/totem.ui.h:52
 msgid "_Contents"
 msgstr "_Sommario"
 
-#: ../data/totem.ui.h:56
+#: ../data/totem.ui.h:53
 msgid "Help contents"
 msgstr "Sommario della guida"
 
-#: ../data/totem.ui.h:57
+#: ../data/totem.ui.h:54
 msgid "_About"
 msgstr "I_nformazioni"
 
-#: ../data/totem.ui.h:58
+#: ../data/totem.ui.h:55
 msgid "About this application"
 msgstr "Informazioni su questa applicazione"
 
-#: ../data/totem.ui.h:59
-msgid "_Repeat Mode"
-msgstr "Modalità _ripetizione"
-
-#: ../data/totem.ui.h:60
-msgid "Set the repeat mode"
-msgstr "Imposta la modalità riproduzione continua"
-
-#: ../data/totem.ui.h:61
-msgid "Shuff_le Mode"
-msgstr "Modalità casua_le"
-
-#: ../data/totem.ui.h:62
-msgid "Set the shuffle mode"
-msgstr "Imposta la modalità riproduzione casuale"
-
-#: ../data/totem.ui.h:63
-msgid "Show _Controls"
-msgstr "Mostra _controlli"
-
-#: ../data/totem.ui.h:64
-msgid "Show controls"
-msgstr "Mostra i controlli"
-
-#: ../data/totem.ui.h:65
-msgid "S_idebar"
-msgstr "_Riquadro laterale"
-
-#: ../data/totem.ui.h:66
-msgid "Show or hide the sidebar"
-msgstr "Mostra o nasconde il riquadro laterale"
-
-#: ../data/totem.ui.h:67
-msgctxt "Aspect ratio"
-msgid "Auto"
-msgstr "Automatico"
-
-#: ../data/totem.ui.h:68
-msgid "Sets automatic aspect ratio"
-msgstr "Imposta automaticamente il rapporto d'aspetto"
-
-#: ../data/totem.ui.h:69
-msgid "Square"
-msgstr "Quadrato"
-
-#: ../data/totem.ui.h:70
-msgid "Sets square aspect ratio"
-msgstr "Imposta il rapporto d'aspetto a quadrato"
-
-#: ../data/totem.ui.h:71
-msgid "4:3 (TV)"
-msgstr "4:3 (TV)"
-
-#: ../data/totem.ui.h:72
-msgid "Sets 4:3 (TV) aspect ratio"
-msgstr "Imposta il rapporto d'aspetto a 4:3 (TV)"
-
-#: ../data/totem.ui.h:73
-msgid "16:9 (Widescreen)"
-msgstr "16:9 (Widescreen)"
-
-#: ../data/totem.ui.h:74
-msgid "Sets 16:9 (widescreen) aspect ratio"
-msgstr "Imposta il rapporto d'aspetto a 16:9 (widescreen)"
-
-#: ../data/totem.ui.h:75
-msgid "2.11:1 (DVB)"
-msgstr "2.11:1 (DVB)"
-
-#: ../data/totem.ui.h:76
-msgid "Sets 2.11:1 (DVB) aspect ratio"
-msgstr "Imposta il rapporto d'aspetto a 2.11:1 (DVB)"
-
-#: ../data/totem.ui.h:77
-msgid "S_ubtitles"
-msgstr "S_ottotitoli"
-
-#: ../data/totem.ui.h:80
-msgid "_Languages"
-msgstr "_Lingue"
-
-#: ../data/totem.ui.h:81
-msgid "Zoom In"
-msgstr "Aumenta ingrandimento"
-
-#: ../data/totem.ui.h:82
-msgid "Zoom in"
-msgstr "Aumenta l'ingrandimento"
-
-#: ../data/totem.ui.h:83
-msgid "Skip _Forward"
-msgstr "Salta _avanti"
-
-#: ../data/totem.ui.h:84
-msgid "Skip forward"
-msgstr "Salta avanti"
-
-#: ../data/totem.ui.h:85
-msgid "Skip _Backwards"
-msgstr "Salta _indietro"
-
-#: ../data/totem.ui.h:86
-msgid "Skip backwards"
-msgstr "Salta indietro"
-
-# LF - GNOME-2-22-2
-# ripresa da totem 2.18
-#: ../data/totem.ui.h:87
-msgid "14.4 Kbps Modem"
-msgstr "Modem a 14.4 kbps"
-
-# LF - GNOME-2-22-2
-# ripresa da totem 2.18
-#: ../data/totem.ui.h:88
-msgid "19.2 Kbps Modem"
-msgstr "Modem a 19.2 kbps"
-
-# LF - GNOME-2-22-2
-# ripresa da totem 2.18
-#: ../data/totem.ui.h:89
-msgid "28.8 Kbps Modem"
-msgstr "Modem a 28.8 kbps"
-
-# LF - GNOME-2-22-2
-# ripresa da totem 2.18
-#: ../data/totem.ui.h:90
-msgid "33.6 Kbps Modem"
-msgstr "Modem a 33.6 kbps"
-
-# LF - GNOME-2-22-2
-# ripresa da totem 2.18
-#: ../data/totem.ui.h:91
-msgid "34.4 Kbps Modem"
-msgstr "Modem a 34.4 kbps"
-
-# LF - GNOME-2-22-2
-# ripresa da totem 2.18
-#: ../data/totem.ui.h:92
-msgid "56 Kbps Modem/ISDN"
-msgstr "ISDN/Modem a 56 kbps"
-
-# LF - GNOME-2-22-2
-# ripresa da totem 2.18
-#: ../data/totem.ui.h:93
-msgid "112 Kbps Dual ISDN/DSL"
-msgstr "Doppia ISDN/DSL a 112 kbps"
-
-# LF - GNOME-2-22-2
-# ripresa da totem 2.18
-#: ../data/totem.ui.h:94
-msgid "256 Kbps DSL/Cable"
-msgstr "DSL/Cavo a 256 kbps"
-
-# LF - GNOME-2-22-2
-# ripresa da totem 2.18
-#: ../data/totem.ui.h:95
-msgid "384 Kbps DSL/Cable"
-msgstr "DSL/Cavo a 384 kbps"
-
-# LF - GNOME-2-22-2
-# ripresa da totem 2.18
-#: ../data/totem.ui.h:96
-msgid "512 Kbps DSL/Cable"
-msgstr "DSL/Cavo a 512 kbps"
-
-# LF - GNOME-2-22-2
-# ripresa da totem 2.18
-#: ../data/totem.ui.h:97
-msgid "1.5 Mbps T1/Intranet/LAN"
-msgstr "T1/Intranet/LAN a 1.5 mbps"
-
-# LF - GNOME-2-22-2
-# ripresa da totem 2.18
-#: ../data/totem.ui.h:98
-msgid "Intranet/LAN"
-msgstr "Intranet/LAN"
-
-# LF - GNOME-2-22-2
-# ripresa da totem 2.18
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:100
-msgid "Normal"
-msgstr "Normale"
-
-# LF - GNOME-2-22-2
-# ripresa da totem 2.18
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:102
-msgid "Large"
-msgstr "Grande"
-
-# LF - GNOME-2-22-2
-# ripresa da totem 2.18
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:104
-msgid "Extra Large"
-msgstr "Molto grande"
-
-#: ../data/totem.ui.h:105 ../src/totem-properties-view.c:228
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5593
-msgid "Stereo"
-msgstr "Stereo"
-
-# LF - GNOME-2-22-2
-# ripresa da totem 2.18
-#: ../data/totem.ui.h:106
-msgid "4-channel"
-msgstr "4 canali"
-
-# LF - GNOME-2-22-2
-# ripresa da totem 2.18
-#: ../data/totem.ui.h:107
-msgid "4.1-channel"
-msgstr "4.1 canali"
-
-# LF - GNOME-2-22-2
-# ripresa da totem 2.18
-#: ../data/totem.ui.h:108
-msgid "5.0-channel"
-msgstr "5.0 canali"
-
-# LF - GNOME-2-22-2
-# ripresa da totem 2.18
-#: ../data/totem.ui.h:109
-msgid "5.1-channel"
-msgstr "5.1 canali"
-
-# LF - GNOME-2-22-2
-# ripresa da totem 2.18
-#: ../data/totem.ui.h:110
-msgid "AC3 Passthrough"
-msgstr "Segnale AC3"
-
-#: ../data/totem.ui.h:111
-msgid "Totem Preferences"
-msgstr "Preferenze di Totem"
-
-#: ../data/totem.ui.h:112
-msgid "Playback"
-msgstr "Riproduzione"
-
-#: ../data/totem.ui.h:113
-msgid "Start playing files from last position"
-msgstr "Avviare la riproduzione dei file dall'ultima posizione"
-
-#: ../data/totem.ui.h:114
-msgid "Networking"
-msgstr "Rete"
-
-#: ../data/totem.ui.h:115
-msgid "Connection _speed:"
-msgstr "Velocità di conne_ssione:"
-
-#: ../data/totem.ui.h:116
-msgid "Text Subtitles"
-msgstr "Testo dei sottotitoli"
-
-#: ../data/totem.ui.h:117
-msgid "_Load subtitle files when movie is loaded"
-msgstr "C_aricare i file dei sottotitoli all'apertura di un filmato"
-
-#: ../data/totem.ui.h:118
-msgid "_Font:"
-msgstr "_Tipo di carattere:"
-
-#: ../data/totem.ui.h:119
-msgid "_Encoding:"
-msgstr "Co_difica:"
-
-#: ../data/totem.ui.h:120
-msgid "External Chapters"
-msgstr "Capitoli esterni"
-
-#: ../data/totem.ui.h:121
-msgid "Load _chapter files when movie is loaded"
-msgstr "Caricare i file dei ca_pitoli all'apertura di un filmato"
-
-#. Tab label in the Preferences dialogue
-#: ../data/totem.ui.h:124
-msgid "Display"
-msgstr "Visualizzazione"
-
-#: ../data/totem.ui.h:125
-msgid "_Resize the window when a new video is loaded"
-msgstr "_Ridimensionare la finestra all'apertura di un nuovo filmato"
-
-#: ../data/totem.ui.h:126
-msgid "Disable _deinterlacing of interlaced videos"
-msgstr "Disabilitare _deinterlacciamento di video interlacciati"
-
-#: ../data/totem.ui.h:127
-msgid "Disable screensaver when playing "
-msgstr "Disabilitare il salvaschermo quando si riproduce"
-
-#: ../data/totem.ui.h:129
-msgid "Video or Audio"
-msgstr "Video o audio"
-
-#: ../data/totem.ui.h:130
-msgid "Visual Effects"
-msgstr "Effetti visivi"
-
-#: ../data/totem.ui.h:131
-msgid "Show _visual effects when an audio file is played"
-msgstr "Mostrare gli effetti _visivi quando si riproduce un file audio"
-
-#: ../data/totem.ui.h:132
-msgid "_Type of visualization:"
-msgstr "_Tipo di visualizzazione:"
-
-#: ../data/totem.ui.h:133
-msgid "Visualization _size:"
-msgstr "Dimensione di vi_sualizzazione:"
-
-#: ../data/totem.ui.h:134
-msgid "Color Balance"
-msgstr "Bilanciamento colore"
-
-#: ../data/totem.ui.h:135
-msgid "_Brightness:"
-msgstr "_Luminosità:"
-
-#: ../data/totem.ui.h:136
-msgid "Co_ntrast:"
-msgstr "Co_ntrasto:"
-
-#: ../data/totem.ui.h:137
-msgid "Sat_uration:"
-msgstr "Sat_urazione:"
-
-#: ../data/totem.ui.h:138
-msgid "_Hue:"
-msgstr "_Tonalità:"
-
-#: ../data/totem.ui.h:139
-msgid "Reset to _Defaults"
-msgstr "Ripristina valori pre_definiti"
-
-#: ../data/totem.ui.h:140
-msgid "Audio Output"
-msgstr "Uscita audio"
-
-#: ../data/totem.ui.h:141
-msgid "_Audio output type:"
-msgstr "Tipo di uscita _audio:"
-
-#: ../data/totem.ui.h:145
-msgid "Time seek bar"
-msgstr "Barra di scorrimento temporale"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
-msgid "Allow the screensaver to activate when playing audio"
-msgstr "Consente al salvaschermo di attivarsi durante la riproduzione audio"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
-msgid ""
-"Allow the screensaver to activate when playing audio. Disable if you have "
-"monitor-powered speakers."
-msgstr ""
-"Consente al salvaschermo di attivarsi durante la riproduzione audio. "
-"Disabilitare se si hanno altoparlanti alimentati dal monitor."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
-msgid "Show visual effects when no video is displayed"
-msgstr "Mostra gli effetti visivi in assenza di video"
+#: ../data/totem.ui.h:56
+msgid "Show _Controls"
+msgstr "Mostra _controlli"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
-msgid "Show visual effects when playing an audio only file."
-msgstr "Mostra gli effetti visivi quando si riproduce un file audio."
+#: ../data/totem.ui.h:57
+msgid "Show controls"
+msgstr "Mostra i controlli"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
-msgid "Name of the visual effects plugin"
-msgstr "Nome del plugin degli effetti visivi"
+#: ../data/totem.ui.h:58
+msgid "S_idebar"
+msgstr "_Riquadro laterale"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
-msgid "The brightness of the video"
-msgstr "Il livello di luminosità del video"
+#: ../data/totem.ui.h:59
+msgid "Show or hide the sidebar"
+msgstr "Mostra o nasconde il riquadro laterale"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
-msgid "The contrast of the video"
-msgstr "Il livello di contrasto del video"
+#: ../data/totem.ui.h:60
+msgctxt "Aspect ratio"
+msgid "Auto"
+msgstr "Automatico"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
-msgid "The hue of the video"
-msgstr "La tonalità del video"
+#: ../data/totem.ui.h:61
+msgid "Sets automatic aspect ratio"
+msgstr "Imposta automaticamente il rapporto d'aspetto"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
-msgid "The saturation of the video"
-msgstr "Il livello di saturazione del video"
+#: ../data/totem.ui.h:62
+msgid "Square"
+msgstr "Quadrato"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
-msgid "Resize the canvas automatically on file load"
-msgstr "Ridimensiona automaticamente finestra all'apertura di un file"
+#: ../data/totem.ui.h:63
+msgid "Sets square aspect ratio"
+msgstr "Imposta il rapporto d'aspetto a quadrato"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
-msgid "Network connection speed"
-msgstr "Velocità connessione di rete"
+#: ../data/totem.ui.h:64
+msgid "4:3 (TV)"
+msgstr "4:3 (TV)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
-msgid ""
-"Approximate network connection speed, used to select quality on media over "
-"the network."
-msgstr ""
-"Velocità approssimativa della connessione di rete, usata per selezionare la "
-"qualità dei file multimediali sulla rete."
+#: ../data/totem.ui.h:65
+msgid "Sets 4:3 (TV) aspect ratio"
+msgstr "Imposta il rapporto d'aspetto a 4:3 (TV)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
-msgid "Repeat mode"
-msgstr "Riproduzione continua"
+#: ../data/totem.ui.h:66
+msgid "16:9 (Widescreen)"
+msgstr "16:9 (Widescreen)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
-msgid "Shuffle mode"
-msgstr "Riproduzione casuale"
+#: ../data/totem.ui.h:67
+msgid "Sets 16:9 (widescreen) aspect ratio"
+msgstr "Imposta il rapporto d'aspetto a 16:9 (widescreen)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
-msgid "Whether to disable deinterlacing for interlaced movies"
-msgstr ""
-"Indica se disabilitare il deinterlacciamento per i filmati interlacciati"
+#: ../data/totem.ui.h:68
+msgid "2.11:1 (DVB)"
+msgstr "2.11:1 (DVB)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
-msgid "Whether to enable debug for the playback engine"
-msgstr "Indica se abilitare il debug per il motore di riproduzione"
+#: ../data/totem.ui.h:69
+msgid "Sets 2.11:1 (DVB) aspect ratio"
+msgstr "Imposta il rapporto d'aspetto a 2.11:1 (DVB)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
-msgid "Type of audio output to use"
-msgstr "Il tipo di uscita audio da usare"
+#: ../data/totem.ui.h:70
+msgid "S_ubtitles"
+msgstr "S_ottotitoli"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
-msgid "Visualization quality setting"
-msgstr "Impostazione della qualità di visualizzazione"
+#: ../data/totem.ui.h:73
+msgid "_Languages"
+msgstr "_Lingue"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
-msgid "Quality setting for the audio visualization."
-msgstr "Impostazione qualità per la visualizzazione audio."
+#: ../data/totem.ui.h:74
+msgid "Zoom In"
+msgstr "Aumenta ingrandimento"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
-msgid "Network buffering threshold"
-msgstr "Soglia per la bufferizzazione di rete"
+#: ../data/totem.ui.h:75
+msgid "Zoom in"
+msgstr "Aumenta l'ingrandimento"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
-msgid ""
-"Amount of data to buffer for network streams before starting to display the "
-"stream (in seconds)."
-msgstr ""
-"Quantità di dati da memorizzare per i flussi di rete prima di iniziare la "
-"visualizzazione del flusso (in secondi)."
+#: ../data/totem.ui.h:76
+msgid "Skip _Forward"
+msgstr "Salta _avanti"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
-msgid "Subtitle font"
-msgstr "Carattere dei sottotitoli"
+#: ../data/totem.ui.h:77
+msgid "Skip forward"
+msgstr "Salta avanti"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
-msgid "Pango font description for subtitle rendering."
-msgstr "Descrizione dei caratteri Pango per il rendering dei sottotitoli."
+#: ../data/totem.ui.h:78
+msgid "Skip _Backwards"
+msgstr "Salta _indietro"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
-msgid "Subtitle encoding"
-msgstr "Codifica dei sottotitoli"
+#: ../data/totem.ui.h:79
+msgid "Skip backwards"
+msgstr "Salta indietro"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
-msgid "Encoding character set for subtitle."
-msgstr "Set di caratteri per la codifica dei sottotitoli."
+#: ../data/totem.ui.h:82
+msgid "Time seek bar"
+msgstr "Barra di scorrimento temporale"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
-msgid "Default location for the \"Open...\" dialogs"
-msgstr "Posizione predefinita per i dialoghi \"Apri...\""
+#: ../data/uri.ui.h:1
+msgid "Enter the _address of the file you would like to open:"
+msgstr "Inserire l'_indirizzo del file da aprire:"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
-msgid ""
-"Default location for the \"Open...\" dialogs. Default is the current "
-"directory."
-msgstr ""
-"La posizione predefinita per i dialoghi \"Apri...\". La directory attuale è "
-"quella predefinita."
+#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
+msgid "_Add to Playlist"
+msgstr "A_ggiungi alla scaletta"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
-msgid "Default location for the \"Take Screenshot\" dialogs"
-msgstr "Posizione predefinita per i dialoghi \"Cattura schermata\""
+#: ../data/video-list.ui.h:2
+msgid "Add the video to the playlist"
+msgstr "Aggiunge il video alla scaletta"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
-msgid ""
-"Default location for the \"Take Screenshot\" dialogs. Default is the "
-"Pictures directory."
-msgstr ""
-"La posizione predefinita per i dialoghi \"Cattura schermata\". La cartella "
-"Immagini è quella predefinita."
+#: ../src/backend/bacon-video-widget.c:1643
+msgid "Password requested for RTSP server"
+msgstr "Richiesta la password per il server RTSP"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
-msgid "Whether to disable the plugins in the user's home directory"
-msgstr "Indica se disabilitare i plugin nella cartella home dell'utente"
+#: ../src/backend/bacon-video-widget.c:2944
+#, c-format
+msgid "Audio Track #%d"
+msgstr "Traccia audio n° %d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
-msgid "Whether to disable the keyboard shortcuts"
-msgstr "Indica se disabilitare le scorciatoie da tastiera"
+#: ../src/backend/bacon-video-widget.c:2948
+#, c-format
+msgid "Subtitle #%d"
+msgstr "Sottotitolo n° %d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
-msgid "Whether to autoload text subtitle files when a movie is loaded"
-msgstr ""
-"Indica se caricare automaticamente i file dei sottotitoli all'apertura di un "
-"filmato"
+#: ../src/backend/bacon-video-widget.c:3345
+msgid "The server you are trying to connect to is not known."
+msgstr "Il server a cui si sta tentando di connettersi non è conosciuto."
+
+#: ../src/backend/bacon-video-widget.c:3348
+msgid "The connection to this server was refused."
+msgstr "La connessione a questo server è stata rifiutata."
+
+#: ../src/backend/bacon-video-widget.c:3351
+msgid "The specified movie could not be found."
+msgstr "Impossibile trovare il filmato specificato."
+
+#: ../src/backend/bacon-video-widget.c:3358
+msgid "The server refused access to this file or stream."
+msgstr "Il server ha rifiutato l'accesso a questo file o flusso."
+
+#: ../src/backend/bacon-video-widget.c:3364
+msgid "Authentication is required to access this file or stream."
+msgstr "È richiesta l'autenticazione per accedere a questo file o flusso."
+
+#: ../src/backend/bacon-video-widget.c:3371
+msgid "You are not allowed to open this file."
+msgstr "Non è consentito aprire questo file."
+
+#: ../src/backend/bacon-video-widget.c:3376
+msgid "This location is not a valid one."
+msgstr "Questa posizione non è valida."
+
+#: ../src/backend/bacon-video-widget.c:3384
+msgid "The movie could not be read."
+msgstr "Impossibile leggere il filmato."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
-msgid "Whether to autoload external chapter files when a movie is loaded"
+#. should be exactly one missing thing (source or converter)
+#: ../src/backend/bacon-video-widget.c:3407
+#: ../src/backend/bacon-video-widget.c:3415
+#, c-format
+msgid "The playback of this movie requires a %s plugin which is not installed."
+msgid_plural ""
+"The playback of this movie requires the following decoders which are not "
+"installed:\n"
+"\n"
+"%s"
+msgstr[0] ""
+"Il plugin %s non è installato ed è richiesto per riprodurre questo filmato."
+msgstr[1] ""
+"I seguenti decodificatori non sono installati e sono richiesti per "
+"riprodurre questo filmato:\n"
+"\n"
+"%s"
+
+#: ../src/backend/bacon-video-widget.c:3426
+msgid ""
+"An audio or video stream is not handled due to missing codecs. You might "
+"need to install additional plugins to be able to play some types of movies"
 msgstr ""
-"Indica se caricare automaticamente file di capitoli esterni all'apertura di "
-"un filmato"
+"Un flusso audio o video non è gestito per mancanza di codec. Potrebbe essere "
+"necessario installare ulteriori plugin per poter riprodurre alcuni tipi di "
+"filmati"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+#: ../src/backend/bacon-video-widget.c:3436
 msgid ""
-"Whether to remember the position of played audio/video files when pausing or "
-"closing them"
+"This file cannot be played over the network. Try downloading it locally "
+"first."
 msgstr ""
-"Indica se ricordare la posizione dei file audio/video riprodotti quando "
-"messi in pausa o chiusi"
+"Impossibile riprodurre questo file tramite la rete. Provare prima a "
+"scaricarlo localmente."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:35
-msgid "Active plugins list"
-msgstr "Elenco plugin attivi"
+#: ../src/backend/bacon-video-widget.c:5518 ../src/totem-properties-view.c:228
+msgid "Surround"
+msgstr "Surround"
+
+#: ../src/backend/bacon-video-widget.c:5520 ../src/totem-properties-view.c:230
+msgid "Mono"
+msgstr "Mono"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:36
+#: ../src/backend/bacon-video-widget.c:5805
+msgid "Media contains no supported video streams."
+msgstr "Il file multimediale non contiene alcun flusso video supportato."
+
+#: ../src/backend/bacon-video-widget.c:5987
 msgid ""
-"A list of the names of the plugins which are currently active (loaded and "
-"running)."
+"Some necessary plug-ins are missing. Make sure that the program is correctly "
+"installed."
 msgstr ""
-"Un elenco dei nomi dei plugin che sono attualmente attivi (caricati e in "
-"esecuzione)."
-
-#: ../data/uri.ui.h:1
-msgid "Enter the _address of the file you would like to open:"
-msgstr "Inserire l'_indirizzo del file da aprire:"
+"Mancano alcuni plugin necessari. Assicurarsi che il programma sia "
+"correttamente installato."
 
 #: ../src/eggdesktopfile.c:165
 #, c-format
@@ -983,8 +1023,8 @@
 #: ../src/eggfileformatchooser.c:657
 #, c-format
 msgid ""
-"The program was not able to find out the file format you want to use for `%"
-"s'. Please make sure to use a known extension for that file or manually "
+"The program was not able to find out the file format you want to use for `"
+"%s'. Please make sure to use a known extension for that file or manually "
 "choose a file format from the list below."
 msgstr ""
 "Il programma non è stato in grado di rilevare il formato del file da "
@@ -1024,6 +1064,31 @@
 msgid "Show session management options"
 msgstr "Mostra le opzioni di gestione sessione"
 
+#. hour:minutes:seconds
+#. Translators: This is a time format, like "9:05:02" for 9
+#. * hours, 5 minutes, and 2 seconds. You may change ":" to
+#. * the separator that your locale uses or use "%Id" instead
+#. * of "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:56
+#: ../src/plugins/skipto/totem-time-entry.c:57
+#, c-format
+msgctxt "long time format"
+msgid "%d:%02d:%02d"
+msgstr "%d.%02d.%02d"
+
+#. minutes:seconds
+#. Translators: This is a time format, like "5:02" for 5
+#. * minutes and 2 seconds. You may change ":" to the
+#. * separator that your locale uses or use "%Id" instead of
+#. * "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:65
+#, c-format
+msgctxt "short time format"
+msgid "%d:%02d"
+msgstr "%d.%02d"
+
 #. Title
 #. Artist
 #. Album
@@ -1128,10 +1193,14 @@
 msgstr[0] "%d fotogramma al secondo"
 msgstr[1] "%d fotogrammi al secondo"
 
-#: ../src/totem-audio-preview.c:168
+#: ../src/totem-audio-preview.c:137
 msgid "Audio Preview"
 msgstr "Anteprima audio"
 
+#: ../src/totem.c:241
+msgid "Verify your system installation. Totem will now exit."
+msgstr "Verificare l'installazione del sistema. Totem verrà chiuso."
+
 #: ../src/totem-cell-renderer-video.c:126
 msgid "Unknown video"
 msgstr "Video sconosciuto"
@@ -1144,7 +1213,7 @@
 msgid "Cancel"
 msgstr "Annulla"
 
-#: ../src/totem-fullscreen.c:616
+#: ../src/totem-fullscreen.c:573
 msgid "No File"
 msgstr "Nessun file"
 
@@ -1162,7 +1231,7 @@
 msgid "Make sure that Totem is properly installed."
 msgstr "Assicurarsi che Totem sia correttamente installato."
 
-#: ../src/totem-interface.c:347
+#: ../src/totem-interface.c:357
 msgid ""
 "Totem 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 "
@@ -1174,7 +1243,7 @@
 "Software Foundation; sia utilizzando la versione 2 della Licenza oppure (a "
 "propria scelta) una qualunque versione successiva."
 
-#: ../src/totem-interface.c:351
+#: ../src/totem-interface.c:361
 msgid ""
 "Totem is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -1186,7 +1255,7 @@
 "APPROPRIATEZZA PER UN PARTICOLARE SCOPO. Si veda la GNU General Public "
 "License per avere ulteriori dettagli."
 
-#: ../src/totem-interface.c:355
+#: ../src/totem-interface.c:365
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Totem; if not, write to the Free Software Foundation, Inc., 59 Temple Place, "
@@ -1196,7 +1265,7 @@
 "a Totem; in caso contrario, si scriva a Free Software Foundation, Inc., 59 "
 "Temple Place,Suite 330, Boston, MA  02111-1307  USA"
 
-#: ../src/totem-interface.c:358
+#: ../src/totem-interface.c:368
 msgid ""
 "Totem contains an exception to allow the use of proprietary GStreamer "
 "plugins."
@@ -1205,205 +1274,99 @@
 "proprietari."
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:190
+#: ../src/totem-menu.c:291
 msgid "None"
 msgstr "Nessuno"
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:195
+#: ../src/totem-menu.c:296
 msgctxt "Language"
 msgid "Auto"
 msgstr "Automatico"
 
-#. Translators:
-#. * This is not a JPEG image, but a disc image, for example,
-#. * an ISO file
-#: ../src/totem-menu.c:765
-#, c-format
-msgid "Play Image '%s'"
-msgstr "Riproduci immagine disco «%s»"
-
-#: ../src/totem-menu.c:768 ../src/totem-menu.c:851
-#, c-format
-msgid "device%d"
-msgstr "dispositivo%d"
-
-#: ../src/totem-menu.c:848
-#, c-format
-msgid "Play Disc '%s'"
-msgstr "Riproduci disco «%s»"
-
-#. This lists the back-end type and version, such as
-#. * Movie Player using GStreamer 0.10.1
-#: ../src/totem-menu.c:1189
-#, c-format
-msgid "Movie Player using %s"
-msgstr "Il riproduttore filmati utilizza %s"
-
-#: ../src/totem-menu.c:1193
+#: ../src/totem-menu.c:788
 msgid "Copyright © 2002-2009 Bastien Nocera"
 msgstr "Copyright © 2002-2009 Bastien Nocera"
 
-#: ../src/totem-menu.c:1198
+#: ../src/totem-menu.c:792
 msgid "translator-credits"
 msgstr ""
 "Pier Luigi Fiorini \n"
 "Davide Patti \n"
 "Gianvito Cavasoli "
 
-#: ../src/totem-menu.c:1202
+#: ../src/totem-menu.c:796
 msgid "Totem Website"
 msgstr "Sito web di Totem"
 
-#: ../src/totem-menu.c:1236
+#: ../src/totem-menu.c:827
 msgid "Configure Plugins"
 msgstr "Configura i plugin"
 
+#: ../src/totem-object.c:162
+#, c-format
+msgid ""
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"%s\n"
+"Usare «%s --help» per vedere un elenco completo delle opzioni disponibili "
+"dalla riga di comando.\n"
+
 #. Translators: %s is the totem version number
-#: ../src/totem-object.c:471
+#: ../src/totem-object.c:591
 #, c-format
 msgid "Totem %s"
 msgstr "Totem %s"
 
-#: ../src/totem-object.c:1047 ../browser-plugin/totem-plugin-viewer.c:367
-msgid "Playing"
-msgstr "Riproduzione in corso"
-
-#: ../src/totem-object.c:1049 ../src/totem-options.c:52
+#: ../src/totem-object.c:1168 ../src/totem-options.c:52
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../src/totem-object.c:1054 ../browser-plugin/totem-plugin-viewer.c:363
-msgid "Paused"
-msgstr "In pausa"
-
-#: ../src/totem-object.c:1056 ../src/totem-object.c:1066
+#: ../src/totem-object.c:1175 ../src/totem-object.c:1185
 #: ../src/totem-options.c:51
 msgid "Play"
 msgstr "Riproduci"
 
-#: ../src/totem-object.c:1061 ../src/totem-object.c:1659
-#: ../src/totem-statusbar.c:115 ../browser-plugin/totem-plugin-viewer.c:351
-msgid "Stopped"
-msgstr "Interrotto"
-
-#: ../src/totem-object.c:1142 ../src/totem-object.c:1169
-#: ../src/totem-object.c:1799 ../src/totem-object.c:1963
+#: ../src/totem-object.c:1267 ../src/totem-object.c:1294
+#: ../src/totem-object.c:1787 ../src/totem-object.c:1942
 #, c-format
 msgid "Totem could not play '%s'."
 msgstr "Impossibile riprodurre il file «%s»."
 
-#: ../src/totem-object.c:1246
-#, c-format
-msgid ""
-"Totem could not play this media (%s) although a plugin is present to handle "
-"it."
-msgstr ""
-"Impossibile riprodurre questo tipo di file multimediale (%s) sebbene sia "
-"presente un plugin che gestisce tale formato."
-
-#: ../src/totem-object.c:1247
-msgid ""
-"You might want to check that a disc is present in the drive and that it is "
-"correctly configured."
-msgstr ""
-"Verificare che un disco sia presente nell'unità e che essa sia correttamente "
-"configurata."
-
-#: ../src/totem-object.c:1255
-msgid "More information about media plugins"
-msgstr "Ulteriori informazioni sui plugin multimediali"
-
-#: ../src/totem-object.c:1256
-msgid ""
-"Please install the necessary plugins and restart Totem to be able to play "
-"this media."
-msgstr ""
-"Per poter riprodurre questo file multimediale si consiglia di installare i "
-"plugin necessari e riavviare Totem."
-
-#: ../src/totem-object.c:1258
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because it does not have the "
-"appropriate plugins to be able to read from the disc."
-msgstr ""
-"Impossibile riprodurre questo tipo di file multimediale (%s) perché manca un "
-"plugin appropriato per leggere dal disco."
-
-#: ../src/totem-object.c:1260
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because you do not have the "
-"appropriate plugins to handle it."
-msgstr ""
-"Impossibile riprodurre questo tipo di file multimediale (%s) perché manca un "
-"plugin appropriato per gestirlo."
-
-#: ../src/totem-object.c:1263
-#, c-format
-msgid "Totem cannot play this type of media (%s) because it is not supported."
-msgstr ""
-"Impossibile riprodurre questo tipo di file multimediale (%s) perché non "
-"supportato."
-
-#: ../src/totem-object.c:1264
-msgid "Please insert another disc to play back."
-msgstr "Inserire un altro disco da riprodurre."
-
-#: ../src/totem-object.c:1300
-msgid "Totem was not able to play this disc."
-msgstr "Impossibile riuscire a riprodurre il disco."
-
-#: ../src/totem-object.c:1301 ../src/totem-object.c:4229
-msgid "No reason."
-msgstr "Motivo sconosciuto."
-
-#: ../src/totem-object.c:1315
-msgid "Totem does not support playback of Audio CDs"
-msgstr "Non è supportata la riproduzione dei CD audio"
-
-#: ../src/totem-object.c:1316
-msgid "Please consider using a music player or a CD extractor to play this CD"
-msgstr ""
-"Utilizzare un riproduttore musicale o un estrattore di tracce audio per "
-"riprodurre questo CD"
-
-#: ../src/totem-object.c:1805
+#: ../src/totem-object.c:1793
 msgid "No error message"
 msgstr "Nessun messaggio di errore"
 
-#: ../src/totem-object.c:2154
+#: ../src/totem-object.c:2133
 msgid "Totem could not display the help contents."
 msgstr "Impossibile visualizzare il sommario della guida."
 
-#: ../src/totem-object.c:2493 ../src/totem-object.c:2495
-#: ../browser-plugin/totem-plugin-viewer.c:1417
-msgid "An error occurred"
-msgstr "Si è verificato un errore"
-
-#: ../src/totem-object.c:4064 ../src/totem-object.c:4066
+#: ../src/totem-object.c:4019 ../src/totem-object.c:4021
 msgid "Previous Chapter/Movie"
 msgstr "Capitolo/Filmato precedente"
 
-#: ../src/totem-object.c:4073 ../src/totem-object.c:4075
+#: ../src/totem-object.c:4028 ../src/totem-object.c:4030
 msgid "Play / Pause"
 msgstr "Riproduci / Pausa"
 
-#: ../src/totem-object.c:4083 ../src/totem-object.c:4085
+#: ../src/totem-object.c:4038 ../src/totem-object.c:4040
 msgid "Next Chapter/Movie"
 msgstr "Capitolo/Filmato successivo"
 
-#. Translators: this is the tooltip text for the fullscreen button in the controls box in Totem's main window.
 #. Translators: this is the accessibility text for the fullscreen button in the controls box in Totem's main window.
-#: ../src/totem-object.c:4097 ../src/totem-object.c:4099
+#: ../src/totem-object.c:4051 ../src/totem-object.c:4053
 msgid "Fullscreen"
 msgstr "Schermo intero"
 
-#: ../src/totem-object.c:4229
+#: ../src/totem-object.c:4184
 msgid "Totem could not startup."
 msgstr "Impossibile avviare Totem."
 
+#: ../src/totem-object.c:4184
+msgid "No reason."
+msgstr "Motivo sconosciuto."
+
 #: ../src/totem-open-location.c:182
 msgid "Open Location..."
 msgstr "Apri posizione..."
@@ -1442,7 +1405,7 @@
 
 #: ../src/totem-options.c:59
 msgid "Mute sound"
-msgstr "Esclude audio"
+msgstr "Esclude l'audio"
 
 #: ../src/totem-options.c:60
 msgid "Toggle Fullscreen"
@@ -1477,117 +1440,111 @@
 msgid "Movies to play"
 msgstr "Filmati da riprodurre"
 
-#: ../src/totem-options.c:117
+#: ../src/totem-options.c:79
+msgid "- Play movies and songs"
+msgstr "- Riproduce filmati e musica"
+
+#: ../src/totem-options.c:142
 msgid "Can't enqueue and replace at the same time"
 msgstr "Non è possibile accodare e rimpiazzare nello stesso momento"
 
 #. By extension entry
-#: ../src/totem-playlist.c:161
+#: ../src/totem-playlist.c:162
 msgid "MP3 ShoutCast playlist"
 msgstr "Scaletta MP3 ShoutCast"
 
-#: ../src/totem-playlist.c:162
+#: ../src/totem-playlist.c:163
 msgid "MP3 audio (streamed)"
 msgstr "Audio MP3 (flusso)"
 
-#: ../src/totem-playlist.c:163
+#: ../src/totem-playlist.c:164
 msgid "MP3 audio (streamed, DOS format)"
 msgstr "Audio MP3 (flusso, formato DOS)"
 
-#: ../src/totem-playlist.c:164
+#: ../src/totem-playlist.c:165
 msgid "XML Shareable Playlist"
 msgstr "Scaletta XML condivisibile"
 
 #. This is "Title 3", where title is a DVD title
 #. * Note: NOT a DVD chapter
-#: ../src/totem-playlist.c:347
+#: ../src/totem-playlist.c:348
 #, c-format
 msgid "Title %d"
 msgstr "Titolo %d"
 
-#: ../src/totem-playlist.c:446
+#: ../src/totem-playlist.c:447
 msgid "Could not save the playlist"
 msgstr "Impossibile salvare la scaletta"
 
-#: ../src/totem-playlist.c:1021
+#: ../src/totem-playlist.c:1022
 msgid "Save Playlist"
 msgstr "Salva scaletta"
 
 #. translators: Playlist is the default saved playlist filename,
 #. * without the suffix
-#: ../src/totem-playlist.c:1033 ../src/totem-playlist.c:1264
-#: ../src/totem-sidebar.c:142
+#: ../src/totem-playlist.c:1034 ../src/totem-playlist.c:1263
+#: ../src/totem-sidebar.c:145
 msgid "Playlist"
 msgstr "Scaletta"
 
-#: ../src/totem-playlist.c:1857
+#: ../src/totem-playlist.c:1862
 #, c-format
 msgid "The playlist '%s' could not be parsed. It might be damaged."
 msgstr "Impossibile analizzare la scaletta «%s». Potrebbe essere danneggiata."
 
-#: ../src/totem-playlist.c:1858
+#: ../src/totem-playlist.c:1863
 msgid "Playlist error"
 msgstr "Errore nella scaletta"
 
-#: ../src/totem-preferences.c:295
+#: ../src/totem-preferences.c:297
 msgid "Preferences"
 msgstr "Preferenze"
 
-#: ../src/totem-preferences.c:451
+#: ../src/totem-preferences.c:445
 msgid "Select Subtitle Font"
 msgstr "Seleziona il carattere per i sottotitoli"
 
-#: ../src/totem-properties-main.c:115 ../src/totem-properties-view.c:266
+#: ../src/totem-properties-main.c:116 ../src/totem-properties-view.c:271
 msgid "Audio/Video"
 msgstr "Audio/Video"
 
-#: ../src/totem-properties-view.c:128
+#: ../src/totem-properties-view.c:131
 msgid "N/A"
 msgstr "N/D"
 
-#: ../src/totem-properties-view.c:157
+#: ../src/totem-properties-view.c:160
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 msgctxt "Stream bit rate"
 msgid "N/A"
 msgstr "N/D"
 
-#: ../src/totem-properties-view.c:160
+#: ../src/totem-properties-view.c:163
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: ../src/totem-properties-view.c:177
+#: ../src/totem-properties-view.c:180
 #: ../src/plugins/properties/totem-movie-properties.c:149
 #, c-format
 msgid "%d x %d"
 msgstr "%d × %d"
 
-#: ../src/totem-properties-view.c:209
+#: ../src/totem-properties-view.c:212
 #: ../src/plugins/properties/totem-movie-properties.c:166
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: ../src/totem-properties-view.c:216
+#: ../src/totem-properties-view.c:220
 #: ../src/plugins/properties/totem-movie-properties.c:166
 msgctxt "Sample rate"
 msgid "N/A"
 msgstr "N/D"
 
-#: ../src/totem-properties-view.c:224
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5589
-msgid "Surround"
-msgstr "Surround"
-
-#: ../src/totem-properties-view.c:226
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5591
-msgid "Mono"
-msgstr "Mono"
-
-#: ../src/totem-properties-view.c:236
+#: ../src/totem-properties-view.c:241
 msgctxt "Number of audio channels"
 msgid "N/A"
 msgstr "N/D"
@@ -1620,8 +1577,8 @@
 #. eg: 75 %
 #: ../src/totem-statusbar.c:250
 #, c-format
-msgid "%d %%"
-msgstr "%d%%"
+msgid "%lf %%"
+msgstr "%lf %%"
 
 #. eg: Paused, 0:32 / 1:05
 #: ../src/totem-statusbar.c:325
@@ -1632,8 +1589,8 @@
 #. eg: Buffering, 75 %
 #: ../src/totem-statusbar.c:330
 #, c-format
-msgid "%s, %d %%"
-msgstr "%s, %d%%"
+msgid "%s, %f %%"
+msgstr "%s, %f %%"
 
 #: ../src/totem-subtitle-encoding.c:156
 msgid "Current Locale"
@@ -1776,229 +1733,91 @@
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
-#: ../src/totem-video-list.c:330
-msgid "No video URI"
-msgstr "Nessun URI video"
-
-#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
-#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
-#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
-#: ../src/totem-video-thumbnailer.c:872
-#, c-format
-msgid ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-msgstr ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-
-#: ../src/totem-video-thumbnailer.c:873
-msgid "Filename"
-msgstr "Nome file"
-
-#: ../src/totem-video-thumbnailer.c:875
-msgid "Resolution"
-msgstr "Risoluzione"
-
-#: ../src/totem-video-thumbnailer.c:878
-msgid "Duration"
-msgstr "Durata"
-
-#: ../src/totem-uri.c:506 ../src/plugins/chapters/totem-chapters.c:998
+#: ../src/totem-uri.c:343 ../src/plugins/chapters/totem-chapters.c:998
 msgid "All files"
 msgstr "Tutti i file"
 
-#: ../src/totem-uri.c:511 ../src/plugins/chapters/totem-chapters.c:995
+#: ../src/totem-uri.c:348 ../src/plugins/chapters/totem-chapters.c:995
 msgid "Supported files"
 msgstr "File supportati"
 
-#: ../src/totem-uri.c:523
+#: ../src/totem-uri.c:360
 msgid "Audio files"
 msgstr "File audio"
 
-#: ../src/totem-uri.c:531
+#: ../src/totem-uri.c:368
 msgid "Video files"
 msgstr "File video"
 
-#: ../src/totem-uri.c:541
+#: ../src/totem-uri.c:378
 msgid "Subtitle files"
 msgstr "File per i sottotitoli"
 
-#: ../src/totem-uri.c:593
+#: ../src/totem-uri.c:430
 msgid "Select Text Subtitles"
 msgstr "Seleziona testo dei sottotitoli"
 
-#: ../src/totem-uri.c:656
+#: ../src/totem-uri.c:495
 msgid "Select Movies or Playlists"
 msgstr "Seleziona filmati o scalette"
 
-#. Options parsing
-#: ../src/totem.c:201
-msgid "- Play movies and songs"
-msgstr "- Riproduce filmati e musica"
-
-#: ../src/totem.c:212
-#, c-format
-msgid ""
-"%s\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"%s\n"
-"Usare «%s --help» per vedere un elenco completo delle opzioni disponibili "
-"dalla riga di comando.\n"
-
-#: ../src/totem.c:254 ../src/totem.c:265
-#: ../browser-plugin/totem-plugin-viewer.c:663
-#: ../browser-plugin/totem-plugin-viewer.c:1793
-msgid "Totem Movie Player"
-msgstr "Riproduttore filmati Totem"
-
-#: ../src/totem.c:255 ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Could not initialize the thread-safe libraries."
-msgstr "Impossibile inizializzare le librerie thread-safe."
-
-#: ../src/totem.c:255
-msgid "Verify your system installation. Totem will now exit."
-msgstr "Verificare l'installazione del sistema. Totem verrà chiuso."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:1589
-msgid "Password requested for RTSP server"
-msgstr "Richiesta la password per il server RTSP"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2858
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2862
-#, c-format
-msgid "Audio Track #%d"
-msgstr "Traccia audio n°%d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2890
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2894
-#, c-format
-msgid "Subtitle #%d"
-msgstr "Sottotitolo n° %d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3298
-msgid ""
-"The requested audio output was not found. Please select another audio output "
-"in the Multimedia Systems Selector."
-msgstr ""
-"L'uscita audio richiesta non è disponibile. Selezionarne un'altra nel "
-"Selettore di sistemi multimediali di GNOME."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3303
-msgid "Location not found."
-msgstr "Posizione non trovata."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3307
-msgid ""
-"Could not open location; you might not have permission to open the file."
-msgstr ""
-"Impossibile aprire la posizione; controllare di avere i permessi necessari "
-"per aprire il file."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3318
-msgid ""
-"The video output is in use by another application. Please close other video "
-"applications, or select another video output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"L'uscita video è attualmente usata da un'altra applicazione. Chiudere le "
-"altre applicazioni video oppure selezionarne un'altra dal Selettore dei "
-"sistemi multimediali di GNOME."
+#: ../src/totem-uri.c:499
+msgid "Add Directory"
+msgstr "Aggiungi directory"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3324
-msgid ""
-"The audio output is in use by another application. Please select another "
-"audio output in the Multimedia Systems Selector. You may want to consider "
-"using a sound server."
-msgstr ""
-"L'uscita audio è attualmente usata da un'altra applicazione. Selezionare "
-"un'altra dal Selettore di sistemi multimediali di GNOME. È consigliabile "
-"l'utilizzo di un server sonoro."
+#: ../src/totem-video-list.c:330
+msgid "No video URI"
+msgstr "Nessun URI video"
 
-#. should be exactly one missing thing (source or converter)
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3342
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3348
+#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
+#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
+#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
+#: ../src/totem-video-thumbnailer.c:841
 #, c-format
-msgid "The playback of this movie requires a %s plugin which is not installed."
-msgid_plural ""
-"The playback of this movie requires the following decoders which are not "
-"installed:\n"
-"\n"
-"%s"
-msgstr[0] ""
-"Il plugin %s non è installato ed è richiesto per riprodurre questo filmato."
-msgstr[1] ""
-"I seguenti decodificatori non sono installati e sono richiesti per "
-"riprodurre questo filmato:\n"
-"\n"
-"%s"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3374
 msgid ""
-"Cannot play this file over the network. Try downloading it to disk first."
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 msgstr ""
-"Impossibile riprodurre il filmato da remoto. Provare prima a scaricarlo su "
-"disco."
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5878
-msgid "Media contains no supported video streams."
-msgstr "Il file multimediale non contiene alcun flusso video supportato."
+#: ../src/totem-video-thumbnailer.c:842
+msgid "Filename"
+msgstr "Nome file"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6052
-msgid ""
-"Failed to create a GStreamer play object. Please check your GStreamer "
-"installation."
-msgstr ""
-"Creazione di un oggetto play di GStreamer non riuscita. Controllare "
-"l'installazione di GStreamer."
+#: ../src/totem-video-thumbnailer.c:844
+msgid "Resolution"
+msgstr "Risoluzione"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6172
-msgid ""
-"Failed to open audio output. You may not have permission to open the sound "
-"device, or the sound server may not be running. Please select another audio "
-"output in the Multimedia Systems Selector."
-msgstr ""
-"Apertura dell'uscita audio non riuscita. Controllare di avere i permessi "
-"necessari per l'apertura del dispositivo sonoro e che il server sonoro sia "
-"in esecuzione. Selezionarne un'altra dal Selettore di sistemi multimediali "
-"di GNOME."
+#: ../src/totem-video-thumbnailer.c:847
+msgid "Duration"
+msgstr "Durata"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6192
-msgid ""
-"Could not find the audio output. You may need to install additional "
-"GStreamer plugins, or select another audio output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"Impossibile trovare l'uscita audio. Provare a installare plugin aggiuntivi "
-"per GStreamer oppure selezionarne un'altra dal Selettore di sistemi "
-"multimediali di GNOME"
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:1
+msgid "Apple Trailers"
+msgstr "Trailer Apple"
+
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:2
+msgid "Sets the user agent for the Apple Trailers site"
+msgstr "Imposta lo user agent per il sito dei trailer Apple"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:1
+msgid "Autoload Subtitles"
+msgstr "Caricamento automatico sottotitoli"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:2
+msgid "Autoloads text subtitles"
+msgstr "Carica automaticamente i sottotitoli"
 
-#. hour:minutes:seconds
-#. Translators: This is a time format, like "9:05:02" for 9
-#. * hours, 5 minutes, and 2 seconds. You may change ":" to
-#. * the separator that your locale uses or use "%Id" instead
-#. * of "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:83 ../src/plugins/skipto/totem-time-entry.c:57
-#, c-format
-msgctxt "long time format"
-msgid "%d:%02d:%02d"
-msgstr "%d.%02d.%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
+msgid "Video Disc Recorder"
+msgstr "Registratore disco video"
 
-#. minutes:seconds
-#. Translators: This is a time format, like "5:02" for 5
-#. * minutes and 2 seconds. You may change ":" to the
-#. * separator that your locale uses or use "%Id" instead of
-#. * "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:92
-#, c-format
-msgctxt "short time format"
-msgid "%d:%02d"
-msgstr "%d.%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
+msgid "Records (S)VCDs or video DVDs"
+msgstr "Registra (S)VCD oppure DVD video"
 
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:65
 msgid "_Create Video Disc..."
@@ -2024,38 +1843,21 @@
 msgid "Copy the currently playing (S)VCD"
 msgstr "Copia il (S)VCD in riproduzione"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:129
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:136
 msgid "The video disc could not be duplicated."
 msgstr "Impossibile duplicare il disco video."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:131
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:276
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:138
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:283
 msgid "The movie could not be recorded."
 msgstr "Impossibile registrare il filmato."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:157
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:167
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:263
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:164
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:174
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:270
 msgid "Unable to write a project."
 msgstr "Impossibile scrivere un progetto."
 
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
-msgid "Video Disc Recorder"
-msgstr "Registratore disco video"
-
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
-msgid "Records (S)VCDs or video DVDs"
-msgstr "Registra (S)VCD oppure DVD video"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:1
-#: ../src/plugins/chapters/totem-chapters.c:1139
-msgid "Chapters"
-msgstr "Capitoli"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:2
-msgid "Support chapter markers in movies."
-msgstr "Supporto ai marcatori dei capitoli nei filmati."
-
 #: ../src/plugins/chapters/chapters-edit.ui.h:1
 msgid "Name for new chapter:"
 msgstr "Nome per il nuovo capitolo:"
@@ -2112,6 +1914,15 @@
 msgid "Create a new chapter list for the movie"
 msgstr "Crea un nuovo elenco di capitoli per il filmato"
 
+#: ../src/plugins/chapters/chapters.plugin.in.h:1
+#: ../src/plugins/chapters/totem-chapters.c:1139
+msgid "Chapters"
+msgstr "Capitoli"
+
+#: ../src/plugins/chapters/chapters.plugin.in.h:2
+msgid "Support chapter markers in movies"
+msgstr "Supporto ai marcatori dei capitoli nei filmati"
+
 #: ../src/plugins/chapters/totem-chapters.c:56
 #, c-format
 msgid ""
@@ -2212,22 +2023,45 @@
 #: ../src/plugins/dbusservice/dbusservice.py:238
 #, python-format
 msgid "Unknown property ‘%s’ requested of a MediaPlayer 2 object"
-msgstr "La proprietà sconosciuta «%s» richiesta da un oggetto MediaPlayer2"
+msgstr "Proprietà sconosciuta «%s» richiesta da un oggetto MediaPlayer2"
+
+#: ../src/plugins/dbusservice/dbusservice.py:341
+#, python-format
+msgid "The URI ‘%s’ is not supported."
+msgstr "L'URI «%s» non è supportato."
+
+#: ../src/plugins/grilo/grilo.plugin.in.h:1
+msgid "Grilo Browser"
+msgstr "Esploratore Grilo"
+
+#: ../src/plugins/grilo/grilo.plugin.in.h:2
+msgid "A plugin to let you browse media content from various sources"
+msgstr ""
+"Un plugin che consente di esplorare contenuti multimediali da varie fonti"
+
+#: ../src/plugins/grilo/grilo.ui.h:1
+msgid "Add to Playlist"
+msgstr "Aggiungi alla scaletta"
+
+#: ../src/plugins/grilo/grilo.ui.h:2
+msgid "Copy Location"
+msgstr "Copia posizione"
 
-#: ../src/plugins/dbusservice/dbusservice.py:341
-#, python-format
-msgid "The URI ‘%s’ is not supported."
-msgstr "L'URI «%s» non è supportato."
+#: ../src/plugins/grilo/grilo.ui.h:3 ../src/plugins/grilo/totem-grilo.c:1186
+msgid "Browse"
+msgstr "Esplora"
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
-msgid "Instant Messenger status"
-msgstr "Stato del programma per i messaggi istantanei"
+#: ../src/plugins/grilo/grilo.ui.h:4 ../src/plugins/grilo/totem-grilo.c:1229
+msgid "Search"
+msgstr "Ricerca"
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
-msgid "Set your Instant Messenger status to away when a movie is playing"
-msgstr ""
-"Impostare lo stato del programma per i messaggi istantanei come \"assente\" "
-"durante la riproduzione di un filmato"
+#: ../src/plugins/grilo/totem-grilo.c:454
+msgid "Browse Error"
+msgstr "Errore durante l'esplorazione"
+
+#: ../src/plugins/grilo/totem-grilo.c:609
+msgid "Search Error"
+msgstr "Errore durante la ricerca"
 
 #: ../src/plugins/gromit/gromit.plugin.in.h:1
 msgid "Gromit Annotations"
@@ -2243,58 +2077,15 @@
 msgid "The gromit binary was not found."
 msgstr "Impossibile trovare l'eseguibile \"gromit\"."
 
-#. Add the interface to Totem's sidebar
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:1
-#: ../src/plugins/iplayer/iplayer.py:46
-msgid "BBC iPlayer"
-msgstr "BBC iPlayer"
-
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:2
-msgid "Stream BBC programs from the last 7 days from the BBC iPlayer service."
-msgstr ""
-"Scarica i programmi BBC degli ultimi 7 giorni dal servizio BBC iPlayer."
-
-#: ../src/plugins/iplayer/iplayer.py:72
-msgid "Error listing channel categories"
-msgstr "Errore nell'elencare le categorie dei canali"
-
-#: ../src/plugins/iplayer/iplayer.py:73
-msgid ""
-"There was an unknown error getting the list of television channels available "
-"on BBC iPlayer."
-msgstr ""
-"Si è verificato un errore sconosciuto nel recuperare l'elenco dei canali "
-"televisivi disponibili su BBC iPlayer."
-
-#. Append a dummy child row so that the expander's visible; we can
-#. then queue off the expander to load the programme listing for this
-#. category
-#: ../src/plugins/iplayer/iplayer.py:84
-msgid "Loading…"
-msgstr "Caricamento..."
-
-#. Translators: the "programme feed" is the list of TV shows
-#. available to watch online
-#: ../src/plugins/iplayer/iplayer.py:136
-msgid "Error getting programme feed"
-msgstr "Errore nel recuperare il palinsesto dei programmi"
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
+msgid "Instant Messenger Status"
+msgstr "Stato per la messaggistica istantanea"
 
-#: ../src/plugins/iplayer/iplayer.py:137
-msgid ""
-"There was an error getting the list of programmes for this channel and "
-"category combination."
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
+msgid "Set your Instant Messenger status to away when a movie is playing"
 msgstr ""
-"Si è verificato un errore nel recuperare l'elenco dei programmi per questa "
-"combinazione di canale e categoria."
-
-#: ../src/plugins/iplayer/iplayer2.py:298
-msgid ""
-msgstr ""
-
-#: ../src/plugins/iplayer/iplayer2.py:299
-#, python-format
-msgid "Programme unavailable (\"%s\")"
-msgstr "Programma non disponibile («%s»)"
+"Impostare lo stato del programma per i messaggi istantanei come \"assente\" "
+"durante la riproduzione di un filmato"
 
 #: ../src/plugins/lirc/lirc.plugin.in.h:1
 msgid "Infrared Remote Control"
@@ -2312,25 +2103,31 @@
 msgid "Couldn't read lirc configuration."
 msgstr "Impossibile leggere la configurazione di lirc."
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
-msgid "Download Movie Subtitles"
-msgstr "Scarica sottotitoli del filmato"
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:1
+msgid "Media Player Keys"
+msgstr "Tasti riproduttore multimediale"
+
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:2
+msgid "Support additional media player keys"
+msgstr "Supporta ulteriori tasti di un riproduttore multimediale"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
-msgid "Subtitle _language:"
-msgstr "_Lingua sottotitoli:"
+#: ../src/plugins/ontop/ontop.plugin.in.h:1
+msgid "Always On Top"
+msgstr "Sempre in primo piano"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
-msgid "_Play with Subtitle"
-msgstr "_Riproduci con sottotitoli"
+#: ../src/plugins/ontop/ontop.plugin.in.h:2
+msgid "Keep the main window on top when playing a movie"
+msgstr ""
+"Mantiene la finestra principale in primo piano durante la riproduzione di un "
+"filmato"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:1
 msgid "Subtitle Downloader"
 msgstr "Scaricatore sottotitoli"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:2
-msgid "Look for subtitles for the currently playing movie."
-msgstr "Cerca dei sottotitoli per il filmato in riproduzione."
+msgid "Look for subtitles for the currently playing movie"
+msgstr "Cerca dei sottotitoli per il filmato in riproduzione"
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:42
 msgid "Brazilian Portuguese"
@@ -2388,6 +2185,18 @@
 msgid "Searching subtitles…"
 msgstr "Ricerca sottotitoli..."
 
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
+msgid "Download Movie Subtitles"
+msgstr "Scarica sottotitoli del filmato"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
+msgid "Subtitle _language:"
+msgstr "_Lingua sottotitoli:"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
+msgid "_Play with Subtitle"
+msgstr "_Riproduci con sottotitoli"
+
 #: ../src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in.h:1
 msgid "Subtitle language"
 msgstr "Lingua sottotitoli"
@@ -2396,83 +2205,18 @@
 msgid "The language to search for subtitles for movies in."
 msgstr "La lingua da cercare per i sottotitoli del filmato."
 
-#: ../src/plugins/ontop/ontop.plugin.in.h:1
-msgid "Always On Top"
-msgstr "Sempre in primo piano"
-
-#: ../src/plugins/ontop/ontop.plugin.in.h:2
-msgid "Keep the main window on top when playing a movie"
-msgstr ""
-"Mantiene la finestra principale in primo piano durante la riproduzione di un "
-"filmato"
+#: ../src/plugins/properties/movie-properties.plugin.in.h:1
+msgid "Movie Properties"
+msgstr "Proprietà filmato"
+
+#: ../src/plugins/properties/movie-properties.plugin.in.h:2
+msgid "Adds movie properties to the sidebar"
+msgstr "Aggiunge le proprietà del filmato alla barra laterale"
 
 #: ../src/plugins/properties/totem-movie-properties.c:246
 msgid "Properties"
 msgstr "Proprietà"
 
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:1
-msgid "Publisher protocol to use"
-msgstr "Protocollo da usare per la pubblicazione"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:2
-msgid ""
-"The transport protocol to use when publishing playlists over the network."
-msgstr ""
-"Il protocollo di trasporto da usare quando si pubblicano scalette sulla rete."
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:3
-msgid "Format for network service name"
-msgstr "Formato del nome per il servizio di rete"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:5
-#, no-c-format
-msgid ""
-"A format string used to build the network service name used when publishing "
-"playlists over the network. The following format placeholders can be used: • "
-"%a: the program name as returned by g_get_application_name() • %h: the "
-"machine's host name in title case • %u: the user's login name in title case "
-"• %U: the user's real name • %%: the percent sign"
-msgstr ""
-"Una stringa di formato usata per creare il nome del servizio di rete quando "
-"si pubblicano scalette sulla rete. È possibile usare i seguenti segnaposto "
-"di formati: • %a: il nome del programma restituito da «g_get_application_name"
-"()» • %h: il nome host della macchina in maiuscolo/minuscolo • %u: il nome "
-"utente di accesso in maiuscolo/minuscolo • %U: il vero nome dell'utente • %"
-"%: il segno di percentuale"
-
-#. Translators: computers on the local network which are publishing their playlists over the network
-#: ../src/plugins/publish/totem-publish.c:552
-msgid "Neighbors"
-msgstr "Vicini"
-
-#: ../src/plugins/publish/publish.plugin.in.h:1
-msgid "Publish Playlist"
-msgstr "Pubblica scaletta"
-
-#: ../src/plugins/publish/publish.plugin.in.h:2
-msgid "Share the current playlist via HTTP"
-msgstr "Condivide la scaletta attuale via HTTP"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:1
-msgid "Service _Name:"
-msgstr "_Nome del servizio:"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:3
-#, no-c-format
-msgid ""
-"The name used for announcing the playlist service on the network.\n"
-"All occurrences of the string %u will be replaced by your name,\n"
-"and %h will be replaced by your computer's host name."
-msgstr ""
-"Il nome usato per annunciare il servizio di scaletta sulla rete.\n"
-"Tutte le occorrenze della stringa %u verranno sostituite col proprio "
-"nome,\n"
-"e %h verranno sostituite dal nome dell'host del proprio computer."
-
-#: ../src/plugins/publish/publish-plugin.ui.h:6
-msgid "Use _encrypted transport protocol (HTTPS)"
-msgstr "Usare il protocollo di trasporto _cifrato (HTTPS)"
-
 #: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:1
 msgid "rpdb2 password"
 msgstr "Password rpdb2"
@@ -2486,22 +2230,86 @@
 "da accessi remoti non autorizzati. Se lasciata vuota, verrà usata \"totem\" "
 "come predefinita."
 
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
+msgid "Python Console"
+msgstr "Console Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
+msgid "Interactive Python console"
+msgstr "Console interattiva di Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:88
+msgid "Python Console Menu"
+msgstr "Menù console Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:93
+msgid "_Python Console"
+msgstr "Console _Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:94
+msgid "Show Totem's Python console"
+msgstr "Mostra la console Python di Totem"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:100
+msgid "Python Debugger"
+msgstr "Debugger Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:101
+msgid "Enable remote Python debugging with rpdb2"
+msgstr "Abilita il debug remoto di Python con rpdb2"
+
+#. pylint: disable-msg=E1101
+#: ../src/plugins/pythonconsole/pythonconsole.py:125
+#, python-format
+msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
+msgstr "È possibile accedere a Totem.Object tramite «totem_object» :\\n%s"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:129
+msgid "Totem Python Console"
+msgstr "Console Python di Totem"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:139
+msgid ""
+"After you press OK, Totem will wait until you connect to it with winpdb or "
+"rpdb2. If you have not set a debugger password in DConf, it will use the "
+"default password ('totem')."
+msgstr ""
+"Dopo aver premuto OK, l'applicazione attenderà di connettersi con winpdb "
+"oppure rpdb2. Se non è stata impostata una password per il debugger in "
+"DConf, verrà usata quella predefinita («totem»)."
+
+#: ../src/plugins/recent/recent.plugin.in.h:1
+msgid "Recent files"
+msgstr "File recenti"
+
+#: ../src/plugins/recent/recent.plugin.in.h:2
+msgid "Adds files that have been played to recent files"
+msgstr "Aggiunge i file che sono stati riprodotti a quelli recenti"
+
 #: ../src/plugins/rotation/rotation.plugin.in.h:1
 msgid "Rotation Plugin"
 msgstr "Plugin di rotazione"
 
 #: ../src/plugins/rotation/rotation.plugin.in.h:2
-msgid "Allows videos to be rotated if they're in the wrong orientation."
-msgstr "Consente al video di essere ruotato se ha un orientamento sbagliato."
+msgid "Allows videos to be rotated if they are in the wrong orientation"
+msgstr "Consente al video di essere ruotato se ha un orientamento errato"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:60
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:50
 msgid "_Rotate Clockwise"
 msgstr "_Ruota in senso orario"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:62
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:52
 msgid "Rotate Counterc_lockwise"
 msgstr "Ruota in senso an_tiorario"
 
+#: ../src/plugins/save-file/save-file.plugin.in.h:1
+msgid "Save Copy"
+msgstr "Salva copia"
+
+#: ../src/plugins/save-file/save-file.plugin.in.h:2
+msgid "Save a copy of the currently playing movie"
+msgstr "Salva una copra del filmato attualmente in riproduzione"
+
 #: ../src/plugins/save-file/totem-save-file.c:63
 msgid "Save a Copy..."
 msgstr "Salva una copia..."
@@ -2524,10 +2332,13 @@
 msgid "Movie stream"
 msgstr "Flusso del filmato"
 
-#: ../src/plugins/screensaver/totem-screensaver.c:116
-#: ../browser-plugin/totem-plugin-viewer.c:1891
-msgid "Playing a movie"
-msgstr "Riproduzione in corso di un filmato"
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:1
+msgid "Screen Saver"
+msgstr "Salvaschermo"
+
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:2
+msgid "Deactivates the screen saver when a movie is playing"
+msgstr "Disattiva il salvaschermo quando è in riproduzione un filmato"
 
 #: ../src/plugins/screenshot/gallery.ui.h:1
 msgid "Screenshot width (in pixels):"
@@ -2541,23 +2352,28 @@
 msgid "Number of screenshots:"
 msgstr "Numero di schermate:"
 
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:1
-msgid "_Name:"
-msgstr "_Nome:"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:2
-msgid "Save in _folder:"
-msgstr "Salvare nella car_tella:"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:3
-msgid "Select a folder"
-msgstr "Seleziona una cartella"
-
-#. Write the screenshot to the temporary file
-#: ../src/plugins/screenshot/gnome-screenshot-widget.c:385
-#: ../src/plugins/screenshot/totem-screenshot.c:64
-msgid "Screenshot.png"
-msgstr "Schermata.png"
+#. translators: this is the name of the file that gets made up
+#. * with the screenshot if the entire screen is taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:147
+#, c-format
+msgid "Screenshot from %s.png"
+msgstr "Schermata da %s.png"
+
+#. translators: this is the name of the file that gets
+#. * made up with the screenshot if the entire screen is
+#. * taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:154
+#, c-format
+msgid "Screenshot from %s - %d.png"
+msgstr "Schermata da %s - %d.png"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:1
+msgid "Screenshot"
+msgstr "Schermata"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:2
+msgid "Allows screenshots and galleries to be taken of videos"
+msgstr "Consente di acquisire schermate e gallerie dai video"
 
 #: ../src/plugins/screenshot/totem-gallery.c:91
 msgid "Save Gallery"
@@ -2583,49 +2399,47 @@
 msgid "Saving gallery as \"%s\""
 msgstr "Salvataggio galleria come «%s»"
 
-#: ../src/plugins/screenshot/totem-screenshot.c:113
-msgid "There was an error saving the screenshot."
-msgstr "Si è verificato un errore nel salvataggio della schermata."
-
-#: ../src/plugins/screenshot/totem-screenshot.c:139
-msgid "Save Screenshot"
-msgstr "Salva schermata"
-
-#. Create the screenshot widget
-#. Translators: %s is the movie title and %d is an auto-incrementing number to make filename unique
-#: ../src/plugins/screenshot/totem-screenshot.c:160
-#, c-format
-msgid "Screenshot-%s-%d.png"
-msgstr "Schermata-%s-%d.png"
-
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:88
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:220
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "Totem could not get a screenshot of the video."
 msgstr "Impossibile catturare una schermata dal filmato."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "This is not supposed to happen; please file a bug report."
 msgstr "Si è verificata una condizione non prevista; segnalare un bug."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
-msgid "Take _Screenshot..."
-msgstr "Cattura _schermata..."
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
+msgid "Take _Screenshot"
+msgstr "Cattura _schermata"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
 msgid "Take a screenshot"
 msgstr "Cattura una schermata"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create Screenshot _Gallery..."
 msgstr "Crea _galleria schermate..."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create a gallery of screenshots"
 msgstr "Crea una galleria di schermate"
 
+#: ../src/plugins/skipto/skipto.plugin.in.h:1
+#: ../src/plugins/skipto/totem-skipto.c:196
+msgid "Skip To"
+msgstr "Salta a"
+
+#: ../src/plugins/skipto/skipto.plugin.in.h:2
+msgid "Provides the \"Skip to\" dialog"
+msgstr "Fornisce il dialogo «Salta a»"
+
+#: ../src/plugins/skipto/skipto.ui.h:1
+msgid "_Skip to:"
+msgstr "_Salta a:"
+
 #. Update the "seconds" label so that it always has the correct singular/plural form
 #. Translators: label for the seconds selector in the "Skip to" dialogue
-#: ../src/plugins/skipto/totem-skipto.c:160
+#: ../src/plugins/skipto/totem-skipto.c:159
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "secondo"
@@ -2635,15 +2449,11 @@
 #. Translators: you should translate this string to a number (written in digits) which corresponds to the longer character length of the
 #. * translations for "second" and "seconds", as translated elsewhere in this file. For example, in English, "second" is 6 characters long and
 #. * "seconds" is 7 characters long, so this string should be translated to "7". See: bgo#639398
-#: ../src/plugins/skipto/totem-skipto.c:190
+#: ../src/plugins/skipto/totem-skipto.c:189
 msgctxt "Skip To label length"
 msgid "7"
 msgstr "7"
 
-#: ../src/plugins/skipto/totem-skipto.c:197
-msgid "Skip To"
-msgstr "Salta a"
-
 #: ../src/plugins/skipto/totem-skipto-plugin.c:182
 msgid "_Skip To..."
 msgstr "_Salta a..."
@@ -2651,188 +2461,3 @@
 #: ../src/plugins/skipto/totem-skipto-plugin.c:182
 msgid "Skip to a specific time"
 msgstr "Salta a uno specifico istante"
-
-#: ../src/plugins/skipto/skipto.ui.h:1
-msgid "_Skip to:"
-msgstr "_Salta a:"
-
-#: ../browser-plugin/totem-plugin-viewer.c:431
-msgid "No URI to play"
-msgstr "Nessun URI da riprodurre"
-
-#. translators: this is:
-#. * Open With ApplicationName
-#. * as in nautilus' right-click menu
-#: ../browser-plugin/totem-plugin-viewer.c:1107
-#, c-format
-msgid "_Open with \"%s\""
-msgstr "A_pri con «%s»"
-
-#: ../browser-plugin/totem-plugin-viewer.c:2136
-msgid "No playlist or playlist empty"
-msgstr "Nessuna scaletta o scaletta vuota"
-
-#: ../browser-plugin/totem-plugin-viewer.c:2235
-msgid "Movie browser plugin"
-msgstr "Plugin esploratore di filmati"
-
-#: ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Verify your system installation. The Totem plugin will now exit."
-msgstr "Verificare l'installazione del sistema. Il plugin verrà arrestato."
-
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
-msgid "Python Console"
-msgstr "Console Python"
-
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
-msgid "Interactive Python console."
-msgstr "Console interattiva di Python."
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:88
-msgid "Python Console Menu"
-msgstr "Menù console Python"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:93
-msgid "_Python Console"
-msgstr "Console _Python"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:94
-msgid "Show Totem's Python console"
-msgstr "Mostra la console Python di Totem"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:100
-msgid "Python Debugger"
-msgstr "Debugger Python"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:101
-msgid "Enable remote Python debugging with rpdb2"
-msgstr "Abilita il debug remoto di Python con rpdb2"
-
-#. pylint: disable-msg=E1101
-#: ../src/plugins/pythonconsole/pythonconsole.py:125
-#, python-format
-msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
-msgstr "È possibile accedere a Totem.Object tramite «totem_object» :\\n%s"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:129
-msgid "Totem Python Console"
-msgstr "Console Python di Totem"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:139
-msgid ""
-"After you press OK, Totem will wait until you connect to it with winpdb or "
-"rpdb2. If you have not set a debugger password in DConf, it will use the "
-"default password ('totem')."
-msgstr ""
-"Dopo aver premuto OK, l'applicazione attenderà di connettersi con winpdb "
-"oppure rpdb2. Se non è stata impostata una password per il debugger in "
-"DConf, verrà usata quella predefinita («totem»)."
-
-#: ../src/plugins/grilo/grilo.plugin.in.h:1
-msgid "Grilo Browser"
-msgstr "Esploratore Grilo"
-
-#: ../src/plugins/grilo/grilo.plugin.in.h:2
-msgid "A plugin to let you browse media content from various sources."
-msgstr ""
-"Un plugin che consente di esplorare contenuti multimediali da varie fonti."
-
-#: ../src/plugins/grilo/totem-grilo.c:452
-msgid "Browse Error"
-msgstr "Errore durante l'esplorazione"
-
-#: ../src/plugins/grilo/totem-grilo.c:599
-msgid "Search Error"
-msgstr "Errore durante la ricerca"
-
-#: ../src/plugins/grilo/totem-grilo.c:1219 ../src/plugins/grilo/grilo.ui.h:3
-msgid "Browse"
-msgstr "Esplora"
-
-#: ../src/plugins/grilo/totem-grilo.c:1285 ../src/plugins/grilo/grilo.ui.h:4
-msgid "Search"
-msgstr "Ricerca"
-
-#: ../src/plugins/grilo/grilo.ui.h:1
-msgid "Add to Playlist"
-msgstr "Aggiungi alla scaletta"
-
-#: ../src/plugins/grilo/grilo.ui.h:2
-msgid "Copy Location"
-msgstr "Copia posizione"
-
-#~ msgid "Bemused"
-#~ msgstr "Bemused"
-
-#~ msgid "Control Totem through a mobile phone with a Bemused client"
-#~ msgstr ""
-#~ "Controlla Totem attraverso un telefono cellulare provvisto di un client "
-#~ "Bemused"
-
-#~ msgid "Untitled %d"
-#~ msgstr "Senza titolo %d"
-
-#~ msgid "Totem Bemused Server"
-#~ msgstr "Server Bemused per Totem"
-
-#~ msgid "Totem Bemused Server version 1.0"
-#~ msgstr "Server Bemused versione 1.0 per Totem"
-
-#~ msgid "A plugin to let you browse YouTube videos."
-#~ msgstr "Un plugin che consente di esplorare i video di YouTube."
-
-#~ msgid "YouTube Browser"
-#~ msgstr "Esploratore YouTube"
-
-#~ msgid "Related Videos"
-#~ msgstr "Video correlati"
-
-#~ msgid "Search Results"
-#~ msgstr "Risultati della ricerca"
-
-#~ msgid "Videos"
-#~ msgstr "Video"
-
-#~ msgid "_Open in Web Browser"
-#~ msgstr "_Apri nel browser web"
-
-#~ msgid "Open the video in your web browser"
-#~ msgstr "Apre i video nel browser web"
-
-#~ msgid "YouTube"
-#~ msgstr "YouTube"
-
-#~ msgid "Cancelling query…"
-#~ msgstr "Annullamento della richiesta..."
-
-#~ msgid "Error Searching for Videos"
-#~ msgstr "Errore nel cercare i video"
-
-#~ msgid ""
-#~ "The response from the server could not be understood. Please check you "
-#~ "are running the latest version of libgdata."
-#~ msgstr ""
-#~ "Impossibile comprendere la risposta dal server. Verificare se è in "
-#~ "esecuzione l'ultima versione di libgdata."
-
-#~ msgid "Fetching search results…"
-#~ msgstr "Recupero risultati della ricerca..."
-
-#~ msgid "Fetching related videos…"
-#~ msgstr "Recupero video correlati..."
-
-#~ msgid "Error Opening Video in Web Browser"
-#~ msgstr "Errore nell'aprire il video nel browser web"
-
-#~ msgid "Fetching more videos…"
-#~ msgstr "Recupero video aggiuntivi..."
-
-#~ msgid "Video Format Not Supported"
-#~ msgstr "Formato video non supportato"
-
-#~ msgid ""
-#~ "This video is not available in any formats which Totem supports. Would "
-#~ "you like to open it in your web browser instead?"
-#~ msgstr ""
-#~ "Questo video non è disponibile in qualsiasi formato supportato "
-#~ "dall'applicazione. Aprirlo invece nel browser web?"
diff -Nru totem-3.4.3/po/ja.po totem-3.6.2/po/ja.po
--- totem-3.4.3/po/ja.po	2012-04-02 14:15:40.000000000 +0000
+++ totem-3.6.2/po/ja.po	2012-10-25 13:15:32.000000000 +0000
@@ -15,24 +15,237 @@
 "Project-Id-Version: totem master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=totem&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-03-24 18:17+0000\n"
-"PO-Revision-Date: 2012-03-25 12:56+0900\n"
-"Last-Translator: Kentaro KAZUHAMA \n"
+"POT-Creation-Date: 2012-09-22 23:17+0000\n"
+"PO-Revision-Date: 2012-09-22 23:18+0900\n"
+"Last-Translator: Jiro Matsuzawa \n"
 "Language-Team: Japanese \n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ../browser-plugin/totem-plugin-viewer.c:352 ../src/totem-object.c:1180
+#: ../src/totem-object.c:1650 ../src/totem-statusbar.c:115
+msgid "Stopped"
+msgstr "停止中"
+
+#: ../browser-plugin/totem-plugin-viewer.c:364 ../src/totem-object.c:1173
+msgid "Paused"
+msgstr "一時停止中"
+
+#: ../browser-plugin/totem-plugin-viewer.c:368 ../src/totem-object.c:1166
+msgid "Playing"
+msgstr "再生中"
+
+#: ../browser-plugin/totem-plugin-viewer.c:386
+#: ../src/plugins/screensaver/totem-screensaver.c:97
+msgid "Playing a movie"
+msgstr "動画を再生する"
+
+#: ../browser-plugin/totem-plugin-viewer.c:443
+msgid "No URI to play"
+msgstr "再生する URI を指定してください"
+
+#: ../browser-plugin/totem-plugin-viewer.c:676
+#: ../browser-plugin/totem-plugin-viewer.c:1700
+msgid "Totem Movie Player"
+msgstr "Totem 動画プレイヤー"
+
+#. translators: this is:
+#. * Open With ApplicationName
+#. * as in nautilus' right-click menu
+#: ../browser-plugin/totem-plugin-viewer.c:1120
+#, c-format
+msgid "_Open with \"%s\""
+msgstr "\"%s\" で開く(_O)"
+
+#: ../browser-plugin/totem-plugin-viewer.c:1341 ../src/totem-object.c:2475
+msgid "An error occurred"
+msgstr "エラーが発生しました"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2033
+msgid "No playlist or playlist empty"
+msgstr "プレイリストが存在しないか空です"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2128
+msgid "Movie browser plugin"
+msgstr "動画ブラウザー プラグイン"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144 ../src/totem.c:240
+msgid "Could not initialize the thread-safe libraries."
+msgstr "スレッドセーフなライブラリを初期化できませんでした。"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144
+msgid "Verify your system installation. The Totem plugin will now exit."
+msgstr ""
+"システムのインストールを確認してください。Totem のプラグインを終了します。"
+
 #: ../data/fullscreen.ui.h:1
 msgid "Leave Fullscreen"
 msgstr "フルスクリーンの解除"
 
-#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:144
+#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:81
 msgid "Time:"
 msgstr "時間:"
 
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
+msgid "Allow the screensaver to activate when playing audio"
+msgstr "音声を再生している時もスクリーンセーバーを有効にする"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
+msgid ""
+"Allow the screensaver to activate when playing audio. Disable if you have "
+"monitor-powered speakers."
+msgstr ""
+"音声を再生している場合でもスクリーンセーバーを有効にします。モニターで動作す"
+"るスピーカーを使用している際には無効にします。"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
+msgid "Show visual effects when no video is displayed"
+msgstr "視覚効果を表示するかどうか"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
+msgid "Show visual effects when playing an audio only file."
+msgstr "楽曲ファイルの演奏時にのみ視覚効果を表示します。"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
+msgid "Name of the visual effects plugin"
+msgstr "視覚効果プラグインの名前"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
+msgid "The brightness of the video"
+msgstr "映像の明るさ"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
+msgid "The contrast of the video"
+msgstr "映像のコントラスト"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
+msgid "The hue of the video"
+msgstr "映像の色相"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
+msgid "The saturation of the video"
+msgstr "映像の彩度"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
+msgid "Resize the canvas automatically on file load"
+msgstr "キャンバスの大きさを自動的に変更するかどうか"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
+msgid "Repeat mode"
+msgstr "リピート・モードにするかどうか"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
+msgid "Shuffle mode"
+msgstr "シャッフル・モードにするかどうか"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
+msgid "Whether to disable deinterlacing for interlaced movies"
+msgstr "インターレースの動画のインターレース解除を無効にするかどうか"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
+msgid "Whether to enable debug for the playback engine"
+msgstr "再生エンジンのデバッグを有効にするかどうか"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
+msgid "Type of audio output to use"
+msgstr "音声出力の種類"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
+msgid "Visualization quality setting"
+msgstr "視覚効果の大きさ"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
+msgid "Quality setting for the audio visualization."
+msgstr "音楽の視覚効果の品質設定です。"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
+msgid "Network buffering threshold"
+msgstr "ネットワーク・バッファリングのしきい値"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
+msgid ""
+"Amount of data to buffer for network streams before starting to display the "
+"stream (in seconds)."
+msgstr ""
+"ストリームの表示を開始する前にネットワークストリーム用にバッファーするデータ"
+"量です (秒単位)。"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
+msgid "Subtitle font"
+msgstr "字幕のフォント"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
+msgid "Pango font description for subtitle rendering."
+msgstr "字幕を描画する際に使用するPango形式記述のフォントです。"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
+msgid "Subtitle encoding"
+msgstr "字幕のエンコーディング"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
+msgid "Encoding character set for subtitle."
+msgstr "字幕をエンコーディングする際の文字集合です。"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
+msgid "Default location for the \"Open...\" dialogs"
+msgstr "\"開く...\" ダイアログで表示するデフォルトのフォルダー"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
+msgid ""
+"Default location for the \"Open...\" dialogs. Default is the current "
+"directory."
+msgstr ""
+"\"開く...\" ダイアログで表示するデフォルトの場所です。デフォルトは現在のフォ"
+"ルダーです。"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
+msgid "Default location for the \"Take Screenshot\" dialogs"
+msgstr ""
+"\"スクリーンショットの取得\" ダイアログで表示するデフォルトのフォルダー"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
+msgid ""
+"Default location for the \"Take Screenshot\" dialogs. Default is the "
+"Pictures directory."
+msgstr ""
+"\"スクリーンショットの取得\" ダイアログで表示するデフォルトの場所です。デフォ"
+"ルトは画像フォルダーです。"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
+msgid "Whether to disable the plugins in the user's home directory"
+msgstr "ユーザーのホーム・フォルダーにあるプラグインを無効にするかどうか"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
+msgid "Whether to disable the keyboard shortcuts"
+msgstr "キーボードショートカットを無効にするかどうか"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
+msgid "Whether to autoload text subtitle files when a movie is loaded"
+msgstr "ビデオを読み込んだら字幕のファイルを自動的に読み込むかどうか"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
+msgid "Whether to autoload external chapter files when a movie is loaded"
+msgstr "ビデオを読み込んだらチャプター・ファイルを自動的に読み込むかどうか"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
+msgid ""
+"Whether to remember the position of played audio/video files when pausing or "
+"closing them"
+msgstr "音声やビデオの再生を一時停止したり、閉じた時の位置を覚えておくかどうか"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
+msgid "Active plugins list"
+msgstr "有効なプラグイン一覧"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+msgid ""
+"A list of the names of the plugins which are currently active (loaded and "
+"running)."
+msgstr "現在有効(読み込み済みで実行中)であるプラグインの名前の一覧です。"
+
 #: ../data/playlist.ui.h:1
 msgid "_Remove"
 msgstr "削除(_R)"
@@ -49,11 +262,11 @@
 msgid "Copy the location to the clipboard"
 msgstr "場所をクリップボードへコピーします"
 
-#: ../data/playlist.ui.h:5 ../data/totem.ui.h:78
+#: ../data/playlist.ui.h:5 ../data/totem.ui.h:71
 msgid "_Select Text Subtitles..."
 msgstr "字幕の選択(_S)..."
 
-#: ../data/playlist.ui.h:6 ../data/totem.ui.h:79
+#: ../data/playlist.ui.h:6 ../data/totem.ui.h:72
 msgid "Select a file to use for text subtitles"
 msgstr "字幕で使用するファイルを選択してください"
 
@@ -77,10 +290,165 @@
 msgid "Move Down"
 msgstr "下へ移動します"
 
-#: ../data/properties.ui.h:1 ../data/totem.ui.h:122
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:2
+msgid "Normal"
+msgstr "通常"
+
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:4
+msgid "Large"
+msgstr "大きい"
+
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:6
+msgid "Extra Large"
+msgstr "巨大"
+
+#: ../data/preferences.ui.h:7 ../src/backend/bacon-video-widget.c:5518
+#: ../src/totem-properties-view.c:232
+msgid "Stereo"
+msgstr "ステレオ"
+
+#: ../data/preferences.ui.h:8
+msgid "4-channel"
+msgstr "4 チャンネル"
+
+#: ../data/preferences.ui.h:9
+msgid "4.1-channel"
+msgstr "4.1 チャンネル"
+
+#: ../data/preferences.ui.h:10
+msgid "5.0-channel"
+msgstr "5.0 チャンネル"
+
+#: ../data/preferences.ui.h:11
+msgid "5.1-channel"
+msgstr "5.1 チャンネル"
+
+#: ../data/preferences.ui.h:12
+msgid "AC3 Passthrough"
+msgstr "AC3 PassThrough"
+
+#: ../data/preferences.ui.h:13
+msgid "Totem Preferences"
+msgstr "Totem の設定"
+
+#: ../data/preferences.ui.h:14
+msgid "Playback"
+msgstr "再生"
+
+#: ../data/preferences.ui.h:15
+msgid "Start playing files from last position"
+msgstr "ファイルを最後の位置から再生開始"
+
+#: ../data/preferences.ui.h:16
+msgid "Text Subtitles"
+msgstr "字幕"
+
+#: ../data/preferences.ui.h:17
+msgid "_Load subtitle files when movie is loaded"
+msgstr "ビデオを読み込んだら字幕ファイルも読み込む(_L)"
+
+#: ../data/preferences.ui.h:18
+msgid "_Font:"
+msgstr "フォント(_F):"
+
+#: ../data/preferences.ui.h:19
+msgid "_Encoding:"
+msgstr "エンコーディング(_E):"
+
+#: ../data/preferences.ui.h:20
+msgid "External Chapters"
+msgstr "チャプター・ファイル"
+
+#: ../data/preferences.ui.h:21
+msgid "Load _chapter files when movie is loaded"
+msgstr "ビデオを読み込んだらチャプター・ファイルも読み込む(_C)"
+
+#: ../data/preferences.ui.h:22 ../data/properties.ui.h:1
 msgid "General"
 msgstr "全般"
 
+#. Tab label in the Preferences dialogue
+#: ../data/preferences.ui.h:24
+msgid "Display"
+msgstr "表示"
+
+#: ../data/preferences.ui.h:25
+msgid "_Resize the window when a new video is loaded"
+msgstr "新しいビデオを読み込む際にウィンドウの大きさを変更する(_R)"
+
+#: ../data/preferences.ui.h:26
+msgid "Disable _deinterlacing of interlaced videos"
+msgstr "インターレースのビデオのインターレース解除を無効にする(_D)"
+
+#: ../data/preferences.ui.h:27
+msgid "Disable screensaver when playing "
+msgstr "以下の再生中にスクリーンセーバーを無効にする: "
+
+#: ../data/preferences.ui.h:28 ../data/properties.ui.h:9
+#: ../src/totem-properties-view.c:275
+msgid "Video"
+msgstr "ビデオ"
+
+#: ../data/preferences.ui.h:29
+msgid "Video or Audio"
+msgstr "ビデオまたは音声"
+
+#: ../data/preferences.ui.h:30
+msgid "Visual Effects"
+msgstr "視覚効果"
+
+#: ../data/preferences.ui.h:31
+msgid "Show _visual effects when an audio file is played"
+msgstr "楽曲ファイルを演奏する時に視覚効果を表示する(_V)"
+
+#: ../data/preferences.ui.h:32
+msgid "_Type of visualization:"
+msgstr "視覚効果の種類(_T):"
+
+#: ../data/preferences.ui.h:33
+msgid "Visualization _size:"
+msgstr "視覚効果の大きさ(_S):"
+
+#: ../data/preferences.ui.h:34
+msgid "Color Balance"
+msgstr "色のバランス"
+
+#: ../data/preferences.ui.h:35
+msgid "_Brightness:"
+msgstr "明るさ(_B):"
+
+#: ../data/preferences.ui.h:36
+msgid "Co_ntrast:"
+msgstr "コントラスト(_N):"
+
+#: ../data/preferences.ui.h:37
+msgid "Sat_uration:"
+msgstr "彩度(_U):"
+
+#: ../data/preferences.ui.h:38
+msgid "_Hue:"
+msgstr "色相(_H):"
+
+#: ../data/preferences.ui.h:39
+msgid "Reset to _Defaults"
+msgstr "デフォルトに戻す(_D)"
+
+#: ../data/preferences.ui.h:40
+msgid "Audio Output"
+msgstr "音声の出力"
+
+#: ../data/preferences.ui.h:41
+msgid "_Audio output type:"
+msgstr "音声出力の種類(_A):"
+
+#: ../data/preferences.ui.h:42 ../data/properties.ui.h:14
+#: ../src/totem-properties-view.c:273
+msgid "Audio"
+msgstr "音声"
+
 #: ../data/properties.ui.h:2
 msgid "Title:"
 msgstr "タイトル:"
@@ -109,11 +477,6 @@
 msgid "Container:"
 msgstr "コンテナー:"
 
-#: ../data/properties.ui.h:9 ../data/totem.ui.h:128
-#: ../src/totem-properties-view.c:270
-msgid "Video"
-msgstr "動画"
-
 #: ../data/properties.ui.h:10
 msgid "Dimensions:"
 msgstr "大きさ:"
@@ -130,11 +493,6 @@
 msgid "Bitrate:"
 msgstr "ビットレート:"
 
-#: ../data/properties.ui.h:14 ../data/totem.ui.h:142
-#: ../src/totem-properties-view.c:268
-msgid "Audio"
-msgstr "音声"
-
 #: ../data/properties.ui.h:15
 msgid "Sample rate:"
 msgstr "サンプリング:"
@@ -143,738 +501,445 @@
 msgid "Channels:"
 msgstr "チャンネル数:"
 
-#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
-msgid "_Add to Playlist"
-msgstr "プレイリストに追加する(_A)"
-
-#: ../data/video-list.ui.h:2
-msgid "Add the video to the playlist"
-msgstr "動画をプレイリストに追加します"
-
 #. Title
-#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:143
-#: ../src/totem-object.c:1667
-msgid "Movie Player"
-msgstr "動画プレイヤー"
+#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:80 ../src/totem.c:239
+#: ../src/totem.c:248 ../src/totem-menu.c:789 ../src/totem-object.c:1658
+msgid "Videos"
+msgstr "ビデオ"
 
 #: ../data/totem.desktop.in.in.in.h:2
-msgid "Play movies and songs"
-msgstr "動画や楽曲を再生します"
+msgid "Play movies"
+msgstr "動画を再生します"
+
+#: ../data/totem.desktop.in.in.in.h:3
+msgid "Video;Movie;Film;Clip;Series;Player;DVD;TV;Disc;"
+msgstr ""
+"Video;Movie;Film;Clip;Series;Player;DVD;TV;Disc;ビデオ;映像;動画;フィルム;ク"
+"リップ;シリーズ;プレイヤー;テレビ;ディスク;"
 
 #: ../data/totem.ui.h:1
-msgid "_Movie"
-msgstr "動画(_M)"
+msgid "_Open"
+msgstr "開く(_O)"
 
 #: ../data/totem.ui.h:2
-msgid "_Open..."
-msgstr "開く(_O)..."
+msgid "Open _Location"
+msgstr "場所を開く(_L)"
 
 #: ../data/totem.ui.h:3
-msgid "Open a file"
-msgstr "ファイルを開きます"
+msgid "_Fullscreen"
+msgstr "フルスクリーン(_F)"
 
 #: ../data/totem.ui.h:4
-msgid "Open _Location..."
-msgstr "場所を開く(_L)..."
+msgid "Prefere_nces"
+msgstr "設定(_N)"
 
 #: ../data/totem.ui.h:5
-msgid "Open a non-local file"
-msgstr "リモート・サイトにあるファイルを開きます"
+msgid "Shuff_le"
+msgstr "シャッフル(_L)"
 
 #: ../data/totem.ui.h:6
+msgid "_Repeat"
+msgstr "リピート(_R)"
+
+#: ../data/totem.ui.h:7
+msgid "_Quit"
+msgstr "終了(_Q)"
+
+#: ../data/totem.ui.h:8
+msgid "_Movie"
+msgstr "動画(_M)"
+
+#: ../data/totem.ui.h:9
 msgid "_Eject"
 msgstr "取り出し(_E)"
 
-#: ../data/totem.ui.h:7
+#: ../data/totem.ui.h:10
 msgid "Eject the current disc"
 msgstr "ディスクを取り出す"
 
-#: ../data/totem.ui.h:8
+#: ../data/totem.ui.h:11
 msgid "_Properties"
 msgstr "プロパティ(_P)"
 
-#: ../data/totem.ui.h:9
+#: ../data/totem.ui.h:12
 msgid "View the properties of the current stream"
 msgstr "このストリームのプロパティを表示"
 
-#: ../data/totem.ui.h:10
+#: ../data/totem.ui.h:13
 msgid "Play / P_ause"
 msgstr "再生/一時停止(_A)"
 
-#: ../data/totem.ui.h:11
+#: ../data/totem.ui.h:14
 msgid "Play or pause the movie"
 msgstr "動画を再生したり停止します"
 
-#: ../data/totem.ui.h:12
-msgid "_Quit"
-msgstr "終了(_Q)"
-
-#: ../data/totem.ui.h:13
-msgid "Quit the program"
-msgstr "Totem を終了します"
-
-#: ../data/totem.ui.h:14
+#: ../data/totem.ui.h:15
 msgid "_Edit"
 msgstr "編集(_E)"
 
-#: ../data/totem.ui.h:15
+#: ../data/totem.ui.h:16
 msgid "_Clear Playlist"
 msgstr "プレイリストのクリア(_C)"
 
-#: ../data/totem.ui.h:16
+#: ../data/totem.ui.h:17
 msgid "Clear the playlist"
 msgstr "プレイリストをクリアします"
 
-#: ../data/totem.ui.h:17
-msgid "Prefere_nces"
-msgstr "設定(_N)"
-
 #: ../data/totem.ui.h:18
-msgid "Configure the application"
-msgstr "アプリケーションの設定"
-
-#: ../data/totem.ui.h:19
 msgid "Plugins..."
 msgstr "プラグイン..."
 
-#: ../data/totem.ui.h:20
+#: ../data/totem.ui.h:19
 msgid "Configure plugins to extend the application"
 msgstr "アプリケーションを拡張するプラグインの設定"
 
-#: ../data/totem.ui.h:21
+#: ../data/totem.ui.h:20
 msgid "_View"
 msgstr "表示(_V)"
 
-#: ../data/totem.ui.h:22
-msgid "_Fullscreen"
-msgstr "フルスクリーン(_F)"
-
-#: ../data/totem.ui.h:23
-msgid "Switch to fullscreen"
-msgstr "フルスクリーンに切り替えます"
-
-#: ../data/totem.ui.h:24
+#: ../data/totem.ui.h:21
 msgid "Fit Window to Movie"
 msgstr "ウィンドウを合わせる"
 
-#: ../data/totem.ui.h:25
+#: ../data/totem.ui.h:22
 msgid "_Resize 1:2"
 msgstr "1:2 サイズ(_R)"
 
-#: ../data/totem.ui.h:26
+#: ../data/totem.ui.h:23
 msgid "Resize to half the original video size"
-msgstr "映像のサイズを半分にします"
+msgstr "ビデオのサイズを半分にします"
 
-#: ../data/totem.ui.h:27
+#: ../data/totem.ui.h:24
 msgid "Resize _1:1"
 msgstr "1:1 サイズ(_1)"
 
-#: ../data/totem.ui.h:28
+#: ../data/totem.ui.h:25
 msgid "Resize to the original video size"
-msgstr "映像のサイズをオリジナルのサイズにします"
+msgstr "ビデオのサイズをオリジナルのサイズにします"
 
-#: ../data/totem.ui.h:29
+#: ../data/totem.ui.h:26
 msgid "Resize _2:1"
 msgstr "2:1 サイズ(_2)"
 
-#: ../data/totem.ui.h:30
+#: ../data/totem.ui.h:27
 msgid "Resize to double the original video size"
-msgstr "映像のサイズを2倍にします"
+msgstr "ビデオのサイズを2倍にします"
 
-#: ../data/totem.ui.h:31
+#: ../data/totem.ui.h:28
 msgid "_Aspect Ratio"
 msgstr "アスペクト比(_A)"
 
-#: ../data/totem.ui.h:32
+#: ../data/totem.ui.h:29
 msgid "Switch An_gles"
 msgstr "角度の切り替え(_G)"
 
-#: ../data/totem.ui.h:33
+#: ../data/totem.ui.h:30
 msgid "Switch camera angles"
 msgstr "カメラの角度を切り替えます"
 
-#: ../data/totem.ui.h:34
+#: ../data/totem.ui.h:31
 msgid "_Go"
 msgstr "移動(_G)"
 
-#: ../data/totem.ui.h:35
+#: ../data/totem.ui.h:32
 msgid "_DVD Menu"
 msgstr "DVD メニュー(_D)"
 
-#: ../data/totem.ui.h:36
+#: ../data/totem.ui.h:33
 msgid "Go to the DVD menu"
 msgstr "DVD メニューへ移動します"
 
-#: ../data/totem.ui.h:37
+#: ../data/totem.ui.h:34
 msgid "_Title Menu"
 msgstr "タイトル・メニュー(_T)"
 
-#: ../data/totem.ui.h:38
+#: ../data/totem.ui.h:35
 msgid "Go to the title menu"
 msgstr "タイトル・メニューへ移動します"
 
-#: ../data/totem.ui.h:39
+#: ../data/totem.ui.h:36
 msgid "A_udio Menu"
 msgstr "音声メニュー(_U)"
 
-#: ../data/totem.ui.h:40
+#: ../data/totem.ui.h:37
 msgid "Go to the audio menu"
 msgstr "音声メニューへ移動します"
 
-#: ../data/totem.ui.h:41
+#: ../data/totem.ui.h:38
 msgid "_Angle Menu"
 msgstr "アングル・メニュー(_A)"
 
-#: ../data/totem.ui.h:42
+#: ../data/totem.ui.h:39
 msgid "Go to the angle menu"
 msgstr "カメラのアングル・メニューへ移動します"
 
-#: ../data/totem.ui.h:43
+#: ../data/totem.ui.h:40
 msgid "_Chapter Menu"
 msgstr "チャプター・メニュー(_C)"
 
-#: ../data/totem.ui.h:44
+#: ../data/totem.ui.h:41
 msgid "Go to the chapter menu"
 msgstr "チャプター・メニューへ移動します"
 
-#: ../data/totem.ui.h:45
+#: ../data/totem.ui.h:42
 msgid "_Next Chapter/Movie"
 msgstr "次のチャプター/動画(_N)"
 
-#: ../data/totem.ui.h:46
+#: ../data/totem.ui.h:43
 msgid "Next chapter or movie"
 msgstr "次のチャプターまたは動画に進みます"
 
-#: ../data/totem.ui.h:47
+#: ../data/totem.ui.h:44
 msgid "_Previous Chapter/Movie"
 msgstr "前のチャプター/動画(_P)"
 
-#: ../data/totem.ui.h:48
+#: ../data/totem.ui.h:45
 msgid "Previous chapter or movie"
 msgstr "前のチャプターまたは動画に戻ります"
 
-#: ../data/totem.ui.h:49
+#: ../data/totem.ui.h:46
 msgid "_Sound"
 msgstr "サウンド(_S)"
 
-#: ../data/totem.ui.h:50
+#: ../data/totem.ui.h:47
 msgid "Volume _Up"
 msgstr "音量を上げる(_U)"
 
-#: ../data/totem.ui.h:51
+#: ../data/totem.ui.h:48
 msgid "Increase volume"
 msgstr "音量を上げます"
 
-#: ../data/totem.ui.h:52
+#: ../data/totem.ui.h:49
 msgid "Volume _Down"
 msgstr "音量を下げる(_D)"
 
-#: ../data/totem.ui.h:53
+#: ../data/totem.ui.h:50
 msgid "Decrease volume"
 msgstr "音量を下げます"
 
-#: ../data/totem.ui.h:54
+#: ../data/totem.ui.h:51
 msgid "_Help"
 msgstr "ヘルプ(_H)"
 
-#: ../data/totem.ui.h:55
+#: ../data/totem.ui.h:52
 msgid "_Contents"
 msgstr "目次(_C)"
 
-#: ../data/totem.ui.h:56
+#: ../data/totem.ui.h:53
 msgid "Help contents"
 msgstr "ヘルプの目次です"
 
-#: ../data/totem.ui.h:57
+#: ../data/totem.ui.h:54
 msgid "_About"
-msgstr "情報(_A)"
+msgstr "このアプリケーションについて(_A)"
 
-#: ../data/totem.ui.h:58
+#: ../data/totem.ui.h:55
 msgid "About this application"
-msgstr "このアプリケーションについて"
-
-#: ../data/totem.ui.h:59
-msgid "_Repeat Mode"
-msgstr "リピート・モード(_R)"
-
-#: ../data/totem.ui.h:60
-msgid "Set the repeat mode"
-msgstr "繰り返し再生モードにします"
+msgstr "このアプリケーションの情報を表示します"
 
-#: ../data/totem.ui.h:61
-msgid "Shuff_le Mode"
-msgstr "シャッフル・モード(_L)"
-
-#: ../data/totem.ui.h:62
-msgid "Set the shuffle mode"
-msgstr "シャッフル・モードにします"
-
-#: ../data/totem.ui.h:63
+#: ../data/totem.ui.h:56
 msgid "Show _Controls"
 msgstr "コントロールの表示(_C)"
 
-#: ../data/totem.ui.h:64
+#: ../data/totem.ui.h:57
 msgid "Show controls"
 msgstr "コントロールを表示します"
 
-#: ../data/totem.ui.h:65
+#: ../data/totem.ui.h:58
 msgid "S_idebar"
 msgstr "サイドバー(_I)"
 
-#: ../data/totem.ui.h:66
+#: ../data/totem.ui.h:59
 msgid "Show or hide the sidebar"
 msgstr "サイドバーの表示/非表示を切り替えます"
 
-#: ../data/totem.ui.h:67
+#: ../data/totem.ui.h:60
 msgctxt "Aspect ratio"
 msgid "Auto"
 msgstr "自動"
 
-#: ../data/totem.ui.h:68
+#: ../data/totem.ui.h:61
 msgid "Sets automatic aspect ratio"
 msgstr "アスペクト比を自動調節します"
 
-#: ../data/totem.ui.h:69
+#: ../data/totem.ui.h:62
 msgid "Square"
 msgstr "正方形"
 
-#: ../data/totem.ui.h:70
+#: ../data/totem.ui.h:63
 msgid "Sets square aspect ratio"
 msgstr "アスペクト比を正方形にします"
 
-#: ../data/totem.ui.h:71
+#: ../data/totem.ui.h:64
 msgid "4:3 (TV)"
 msgstr "4:3 (TV)"
 
-#: ../data/totem.ui.h:72
+#: ../data/totem.ui.h:65
 msgid "Sets 4:3 (TV) aspect ratio"
 msgstr "アスペクト比を 4:3 (TV) にします"
 
-#: ../data/totem.ui.h:73
+#: ../data/totem.ui.h:66
 msgid "16:9 (Widescreen)"
 msgstr "16:9 (ワイドスクリーン)"
 
-#: ../data/totem.ui.h:74
+#: ../data/totem.ui.h:67
 msgid "Sets 16:9 (widescreen) aspect ratio"
 msgstr "アスペクト比を 16:9 (ワイド画面) にします"
 
-#: ../data/totem.ui.h:75
+#: ../data/totem.ui.h:68
 msgid "2.11:1 (DVB)"
 msgstr "2.11:1 (DVB)"
 
-#: ../data/totem.ui.h:76
+#: ../data/totem.ui.h:69
 msgid "Sets 2.11:1 (DVB) aspect ratio"
 msgstr "アスペクト比を 2.11:1 (DVB) にします"
 
-#: ../data/totem.ui.h:77
+#: ../data/totem.ui.h:70
 msgid "S_ubtitles"
 msgstr "字幕(_U)"
 
-#: ../data/totem.ui.h:80
+#: ../data/totem.ui.h:73
 msgid "_Languages"
 msgstr "言語(_L)"
 
-#: ../data/totem.ui.h:81
+#: ../data/totem.ui.h:74
 msgid "Zoom In"
 msgstr "拡大する"
 
-#: ../data/totem.ui.h:82
-msgid "Zoom in"
-msgstr "拡大します"
-
-#: ../data/totem.ui.h:83
-msgid "Skip _Forward"
-msgstr "前方へスキップ(_F)"
-
-#: ../data/totem.ui.h:84
-msgid "Skip forward"
-msgstr "前方へスキップ"
-
-#: ../data/totem.ui.h:85
-msgid "Skip _Backwards"
-msgstr "後方へスキップ(_B)"
-
-#: ../data/totem.ui.h:86
-msgid "Skip backwards"
-msgstr "後方へスキップ"
-
-#: ../data/totem.ui.h:87
-msgid "14.4 Kbps Modem"
-msgstr "14.4 Kbps モデム"
-
-#: ../data/totem.ui.h:88
-msgid "19.2 Kbps Modem"
-msgstr "19.2 Kbps モデム"
-
-#: ../data/totem.ui.h:89
-msgid "28.8 Kbps Modem"
-msgstr "28.8 Kbps モデム"
-
-#: ../data/totem.ui.h:90
-msgid "33.6 Kbps Modem"
-msgstr "33.6 Kbps モデム"
-
-#: ../data/totem.ui.h:91
-msgid "34.4 Kbps Modem"
-msgstr "34.4 Kbps モデム"
-
-#: ../data/totem.ui.h:92
-msgid "56 Kbps Modem/ISDN"
-msgstr "56 Kbps モデム/ISDN"
-
-#: ../data/totem.ui.h:93
-msgid "112 Kbps Dual ISDN/DSL"
-msgstr "112 Kbps デュアル ISDN/DSL"
-
-#: ../data/totem.ui.h:94
-msgid "256 Kbps DSL/Cable"
-msgstr "256 Kbps DSL/ケーブル"
-
-#: ../data/totem.ui.h:95
-msgid "384 Kbps DSL/Cable"
-msgstr "384 Kbps DSL/ケーブル"
-
-#: ../data/totem.ui.h:96
-msgid "512 Kbps DSL/Cable"
-msgstr "512 Kbps DSL/ケーブル"
-
-#: ../data/totem.ui.h:97
-msgid "1.5 Mbps T1/Intranet/LAN"
-msgstr "1.5 Mbps T1/インターネット/LAN"
-
-#: ../data/totem.ui.h:98
-msgid "Intranet/LAN"
-msgstr "イントラネット/LAN"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:100
-msgid "Normal"
-msgstr "通常"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:102
-msgid "Large"
-msgstr "大きい"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:104
-msgid "Extra Large"
-msgstr "巨大"
-
-#: ../data/totem.ui.h:105 ../src/totem-properties-view.c:228
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5593
-msgid "Stereo"
-msgstr "ステレオ"
-
-#: ../data/totem.ui.h:106
-msgid "4-channel"
-msgstr "4 チャンネル"
-
-#: ../data/totem.ui.h:107
-msgid "4.1-channel"
-msgstr "4.1 チャンネル"
-
-#: ../data/totem.ui.h:108
-msgid "5.0-channel"
-msgstr "5.0 チャンネル"
-
-#: ../data/totem.ui.h:109
-msgid "5.1-channel"
-msgstr "5.1 チャンネル"
-
-#: ../data/totem.ui.h:110
-msgid "AC3 Passthrough"
-msgstr "AC3 PassThrough"
-
-#: ../data/totem.ui.h:111
-msgid "Totem Preferences"
-msgstr "Totem の設定"
-
-#: ../data/totem.ui.h:112
-msgid "Playback"
-msgstr "再生"
-
-#: ../data/totem.ui.h:113
-msgid "Start playing files from last position"
-msgstr "ファイルを最後の位置から再生開始"
-
-#: ../data/totem.ui.h:114
-msgid "Networking"
-msgstr "ネットワーク"
-
-#: ../data/totem.ui.h:115
-msgid "Connection _speed:"
-msgstr "接続スピード(_S):"
-
-#: ../data/totem.ui.h:116
-msgid "Text Subtitles"
-msgstr "字幕"
-
-#: ../data/totem.ui.h:117
-msgid "_Load subtitle files when movie is loaded"
-msgstr "動画を読み込んだら字幕ファイルも読み込む(_L)"
-
-#: ../data/totem.ui.h:118
-msgid "_Font:"
-msgstr "フォント(_F):"
-
-#: ../data/totem.ui.h:119
-msgid "_Encoding:"
-msgstr "エンコーディング(_E):"
-
-#: ../data/totem.ui.h:120
-msgid "External Chapters"
-msgstr "チャプター・ファイル"
-
-#: ../data/totem.ui.h:121
-msgid "Load _chapter files when movie is loaded"
-msgstr "動画を読み込んだらチャプター・ファイルも読み込む(_C)"
-
-#. Tab label in the Preferences dialogue
-#: ../data/totem.ui.h:124
-msgid "Display"
-msgstr "表示"
-
-#: ../data/totem.ui.h:125
-msgid "_Resize the window when a new video is loaded"
-msgstr "新しい動画を読み込む際にウィンドウの大きさを変更する(_R)"
-
-#: ../data/totem.ui.h:126
-msgid "Disable _deinterlacing of interlaced videos"
-msgstr "インターレースのビデオのインターレース解除を無効にする(_D)"
-
-#: ../data/totem.ui.h:127
-msgid "Disable screensaver when playing "
-msgstr "以下の再生中にスクリーンセーバーを無効にする: "
-
-#: ../data/totem.ui.h:129
-msgid "Video or Audio"
-msgstr "動画または音声"
-
-#: ../data/totem.ui.h:130
-msgid "Visual Effects"
-msgstr "視覚効果"
-
-#: ../data/totem.ui.h:131
-msgid "Show _visual effects when an audio file is played"
-msgstr "楽曲ファイルを演奏する時に視覚効果を表示する(_V)"
-
-#: ../data/totem.ui.h:132
-msgid "_Type of visualization:"
-msgstr "視覚効果の種類(_T):"
-
-#: ../data/totem.ui.h:133
-msgid "Visualization _size:"
-msgstr "視覚効果の大きさ(_S):"
-
-#: ../data/totem.ui.h:134
-msgid "Color Balance"
-msgstr "色のバランス"
-
-#: ../data/totem.ui.h:135
-msgid "_Brightness:"
-msgstr "明るさ(_B):"
-
-#: ../data/totem.ui.h:136
-msgid "Co_ntrast:"
-msgstr "コントラスト(_N):"
-
-#: ../data/totem.ui.h:137
-msgid "Sat_uration:"
-msgstr "彩度(_U):"
-
-#: ../data/totem.ui.h:138
-msgid "_Hue:"
-msgstr "色相(_H):"
-
-#: ../data/totem.ui.h:139
-msgid "Reset to _Defaults"
-msgstr "デフォルトに戻す(_D)"
-
-#: ../data/totem.ui.h:140
-msgid "Audio Output"
-msgstr "音声の出力"
-
-#: ../data/totem.ui.h:141
-msgid "_Audio output type:"
-msgstr "音声出力の種類(_A):"
-
-#: ../data/totem.ui.h:145
-msgid "Time seek bar"
-msgstr "再生時間バー"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
-msgid "Allow the screensaver to activate when playing audio"
-msgstr "音声を再生している時もスクリーンセーバーを有効にする"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
-msgid ""
-"Allow the screensaver to activate when playing audio. Disable if you have "
-"monitor-powered speakers."
-msgstr ""
-"音声を再生している場合でもスクリーンセーバーを有効にします。モニターで動作す"
-"るスピーカーを使用している際には無効にします。"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
-msgid "Show visual effects when no video is displayed"
-msgstr "視覚効果を表示するかどうか"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
-msgid "Show visual effects when playing an audio only file."
-msgstr "楽曲ファイルの演奏時にのみ視覚効果を表示します。"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
-msgid "Name of the visual effects plugin"
-msgstr "視覚効果プラグインの名前"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
-msgid "The brightness of the video"
-msgstr "映像の明るさ"
+#: ../data/totem.ui.h:75
+msgid "Zoom in"
+msgstr "拡大します"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
-msgid "The contrast of the video"
-msgstr "映像のコントラスト"
+#: ../data/totem.ui.h:76
+msgid "Skip _Forward"
+msgstr "前方へスキップ(_F)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
-msgid "The hue of the video"
-msgstr "映像の色相"
+#: ../data/totem.ui.h:77
+msgid "Skip forward"
+msgstr "前方へスキップ"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
-msgid "The saturation of the video"
-msgstr "映像の彩度"
+#: ../data/totem.ui.h:78
+msgid "Skip _Backwards"
+msgstr "後方へスキップ(_B)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
-msgid "Resize the canvas automatically on file load"
-msgstr "キャンバスの大きさを自動的に変更するかどうか"
+#: ../data/totem.ui.h:79
+msgid "Skip backwards"
+msgstr "後方へスキップ"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
-msgid "Network connection speed"
-msgstr "ネットワークの接続スピード"
+#: ../data/totem.ui.h:82
+msgid "Time seek bar"
+msgstr "再生時間バー"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
-msgid ""
-"Approximate network connection speed, used to select quality on media over "
-"the network."
-msgstr ""
-"おおよそのネットワーク接続速度、ネットワーク越しのメディアの品質を選択しま"
-"す。"
+#: ../data/uri.ui.h:1
+msgid "Enter the _address of the file you would like to open:"
+msgstr "オープンするファイルのアドレスを入力してください(_A):"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
-msgid "Repeat mode"
-msgstr "リピート・モードにするかどうか"
+#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
+msgid "_Add to Playlist"
+msgstr "プレイリストに追加する(_A)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
-msgid "Shuffle mode"
-msgstr "シャッフル・モードにするかどうか"
+#: ../data/video-list.ui.h:2
+msgid "Add the video to the playlist"
+msgstr "ビデオをプレイリストに追加します"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
-msgid "Whether to disable deinterlacing for interlaced movies"
-msgstr "インターレースの動画のインターレース解除を無効にするかどうか"
+# FIXME: 画面が見たい
+#: ../src/backend/bacon-video-widget.c:1643
+msgid "Password requested for RTSP server"
+msgstr "RTSP サーバーから要求されたパスワード"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
-msgid "Whether to enable debug for the playback engine"
-msgstr "再生エンジンのデバッグを有効にするかどうか"
+#: ../src/backend/bacon-video-widget.c:2940
+#, c-format
+msgid "Audio Track #%d"
+msgstr "音声トラック #%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
-msgid "Type of audio output to use"
-msgstr "音声出力の種類"
+#: ../src/backend/bacon-video-widget.c:2944
+#, c-format
+msgid "Subtitle #%d"
+msgstr "サブタイトル #%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
-msgid "Visualization quality setting"
-msgstr "視覚効果の大きさ"
+#: ../src/backend/bacon-video-widget.c:3341
+msgid "The server you are trying to connect to is not known."
+msgstr ""
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
-msgid "Quality setting for the audio visualization."
-msgstr "音楽の視覚効果の品質設定です。"
+#: ../src/backend/bacon-video-widget.c:3344
+msgid "The connection to this server was refused."
+msgstr ""
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
-msgid "Network buffering threshold"
-msgstr "ネットワーク・バッファリングのしきい値"
+#: ../src/backend/bacon-video-widget.c:3347
+#, fuzzy
+msgid "The specified movie could not be found."
+msgstr "動画を保存できませんでした"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
-msgid ""
-"Amount of data to buffer for network streams before starting to display the "
-"stream (in seconds)."
+#: ../src/backend/bacon-video-widget.c:3354
+msgid "The server refused access to this file or stream."
 msgstr ""
-"ストリームの表示を開始する前にネットワークストリーム用にバッファーするデータ"
-"量です (秒単位)。"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
-msgid "Subtitle font"
-msgstr "字幕のフォント"
+#: ../src/backend/bacon-video-widget.c:3360
+msgid "Authentication is required to access this file or stream."
+msgstr ""
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
-msgid "Pango font description for subtitle rendering."
-msgstr "字幕を描画する際に使用するPango形式記述のフォントです。"
+#: ../src/backend/bacon-video-widget.c:3367
+#, fuzzy
+msgid "You are not allowed to open this file."
+msgstr "このディスクを再生できませんでした。"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
-msgid "Subtitle encoding"
-msgstr "字幕のエンコーディング"
+#: ../src/backend/bacon-video-widget.c:3372
+#, fuzzy
+msgid "This location is not a valid one."
+msgstr "妥当な .desktop ファイルではありません"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
-msgid "Encoding character set for subtitle."
-msgstr "字幕をエンコーディングする際の文字集合です。"
+#: ../src/backend/bacon-video-widget.c:3380
+#, fuzzy
+msgid "The movie could not be read."
+msgstr "動画を保存できませんでした"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
-msgid "Default location for the \"Open...\" dialogs"
-msgstr "\"開く...\" ダイアログで表示するデフォルトのフォルダー"
+#. should be exactly one missing thing (source or converter)
+#: ../src/backend/bacon-video-widget.c:3403
+#: ../src/backend/bacon-video-widget.c:3411
+#, c-format
+msgid "The playback of this movie requires a %s plugin which is not installed."
+msgid_plural ""
+"The playback of this movie requires the following decoders which are not "
+"installed:\n"
+"\n"
+"%s"
+msgstr[0] ""
+"この動画の再生にはインストールされていない以下のデコーダーが必要です:\n"
+"\n"
+"%s"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
+#: ../src/backend/bacon-video-widget.c:3422
 msgid ""
-"Default location for the \"Open...\" dialogs. Default is the current "
-"directory."
-msgstr ""
-"\"開く...\" ダイアログで表示するデフォルトの場所です。デフォルトは現在のフォ"
-"ルダーです。"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
-msgid "Default location for the \"Take Screenshot\" dialogs"
+"An audio or video stream is not handled due to missing codecs. You might "
+"need to install additional plugins to be able to play some types of movies"
 msgstr ""
-"\"スクリーンショットの取得\" ダイアログで表示するデフォルトのフォルダー"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
+#: ../src/backend/bacon-video-widget.c:3432
+#, fuzzy
 msgid ""
-"Default location for the \"Take Screenshot\" dialogs. Default is the "
-"Pictures directory."
+"This file cannot be played over the network. Try downloading it locally "
+"first."
 msgstr ""
-"\"スクリーンショットの取得\" ダイアログで表示するデフォルトの場所です。デフォ"
-"ルトは画像フォルダーです。"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
-msgid "Whether to disable the plugins in the user's home directory"
-msgstr "ユーザーのホーム・フォルダーにあるプラグインを無効にするかどうか"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
-msgid "Whether to disable the keyboard shortcuts"
-msgstr "キーボードショートカットを無効にするかどうか"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
-msgid "Whether to autoload text subtitle files when a movie is loaded"
-msgstr "動画を読み込んだら字幕のファイルを自動的に読み込むかどうか"
+"このファイルをネットワーク越しに再生することはできません。ダウンロードして直"
+"接再生してみてください。"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
-msgid "Whether to autoload external chapter files when a movie is loaded"
-msgstr "動画を読み込んだらチャプター・ファイルを自動的に読み込むかどうか"
+#: ../src/backend/bacon-video-widget.c:5514 ../src/totem-properties-view.c:228
+msgid "Surround"
+msgstr "サラウンド"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
-msgid ""
-"Whether to remember the position of played audio/video files when pausing or "
-"closing them"
-msgstr "音声や動画の再生を一時停止したり、閉じた時の位置を覚えておくかどうか"
+#: ../src/backend/bacon-video-widget.c:5516 ../src/totem-properties-view.c:230
+msgid "Mono"
+msgstr "モノラル"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:35
-msgid "Active plugins list"
-msgstr "有効なプラグイン一覧"
+#: ../src/backend/bacon-video-widget.c:5801
+msgid "Media contains no supported video streams."
+msgstr "このメディアにはビデオストリームが含まれていません。"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:36
+#: ../src/backend/bacon-video-widget.c:5983
 msgid ""
-"A list of the names of the plugins which are currently active (loaded and "
-"running)."
-msgstr "現在有効(読み込み済みで実行中)であるプラグインの名前の一覧です。"
-
-#: ../data/uri.ui.h:1
-msgid "Enter the _address of the file you would like to open:"
-msgstr "オープンするファイルのアドレスを入力してください(_A):"
+"Some necessary plug-ins are missing. Make sure that the program is correctly "
+"installed."
+msgstr ""
 
 #: ../src/eggdesktopfile.c:165
 #, c-format
@@ -940,8 +1005,8 @@
 #: ../src/eggfileformatchooser.c:657
 #, c-format
 msgid ""
-"The program was not able to find out the file format you want to use for `%"
-"s'. Please make sure to use a known extension for that file or manually "
+"The program was not able to find out the file format you want to use for `"
+"%s'. Please make sure to use a known extension for that file or manually "
 "choose a file format from the list below."
 msgstr ""
 "`%s' のファイル形式がわかりませんでした。良く知られている拡張子を使うようにす"
@@ -979,6 +1044,31 @@
 msgid "Show session management options"
 msgstr "セッション管理のオプションを表示する"
 
+#. hour:minutes:seconds
+#. Translators: This is a time format, like "9:05:02" for 9
+#. * hours, 5 minutes, and 2 seconds. You may change ":" to
+#. * the separator that your locale uses or use "%Id" instead
+#. * of "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:56
+#: ../src/plugins/skipto/totem-time-entry.c:57
+#, c-format
+msgctxt "long time format"
+msgid "%d:%02d:%02d"
+msgstr "%d:%02d:%02d"
+
+#. minutes:seconds
+#. Translators: This is a time format, like "5:02" for 5
+#. * minutes and 2 seconds. You may change ":" to the
+#. * separator that your locale uses or use "%Id" instead of
+#. * "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:65
+#, c-format
+msgctxt "short time format"
+msgid "%d:%02d"
+msgstr "%d:%02d"
+
 #. Title
 #. Artist
 #. Album
@@ -1079,13 +1169,17 @@
 msgid_plural "%d frames per second"
 msgstr[0] "%d フレーム/秒"
 
-#: ../src/totem-audio-preview.c:168
+#: ../src/totem-audio-preview.c:137
 msgid "Audio Preview"
 msgstr "音声プレビュー"
 
+#: ../src/totem.c:240
+msgid "Verify your system installation. Totem will now exit."
+msgstr "システムのインストールを確認してください。Totem を終了します。"
+
 #: ../src/totem-cell-renderer-video.c:126
 msgid "Unknown video"
-msgstr "不明な種類の動画"
+msgstr "不明な種類のビデオ"
 
 #: ../src/totem-dnd-menu.c:94
 msgid "_Play Now"
@@ -1095,7 +1189,7 @@
 msgid "Cancel"
 msgstr "キャンセル"
 
-#: ../src/totem-fullscreen.c:616
+#: ../src/totem-fullscreen.c:573
 msgid "No File"
 msgstr "ファイルなし"
 
@@ -1113,7 +1207,7 @@
 msgid "Make sure that Totem is properly installed."
 msgstr "Totem が正しくインストールされているか確認してください。"
 
-#: ../src/totem-interface.c:347
+#: ../src/totem-interface.c:357
 msgid ""
 "Totem 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 "
@@ -1124,7 +1218,7 @@
 "利用許諾契約書の第二版、あるいはそれ以降の版が定める条項の下で本プログラムを"
 "再頒布または変更することができます。"
 
-#: ../src/totem-interface.c:351
+#: ../src/totem-interface.c:361
 msgid ""
 "Totem is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -1135,7 +1229,7 @@
 "合性についての暗黙の保証を含めて、いかなる保証も行ないません。詳細には GNU 一"
 "般公衆利用許諾契約書をご覧ください。"
 
-#: ../src/totem-interface.c:355
+#: ../src/totem-interface.c:365
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Totem; if not, write to the Free Software Foundation, Inc., 59 Temple Place, "
@@ -1145,7 +1239,7 @@
 "はずです。そうでない場合は、Free Software Foundation, Inc., 59 Temple Place, "
 "Suite 330, Boston, MA  02111-1307  USA まで連絡してください。"
 
-#: ../src/totem-interface.c:358
+#: ../src/totem-interface.c:368
 msgid ""
 "Totem contains an exception to allow the use of proprietary GStreamer "
 "plugins."
@@ -1154,46 +1248,21 @@
 "まれています。"
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:190
+#: ../src/totem-menu.c:291
 msgid "None"
 msgstr "なし"
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:195
+#: ../src/totem-menu.c:296
 msgctxt "Language"
 msgid "Auto"
 msgstr "自動"
 
-#. Translators:
-#. * This is not a JPEG image, but a disc image, for example,
-#. * an ISO file
-#: ../src/totem-menu.c:765
-#, c-format
-msgid "Play Image '%s'"
-msgstr "イメージファイル '%s' の再生"
-
-#: ../src/totem-menu.c:768 ../src/totem-menu.c:851
-#, c-format
-msgid "device%d"
-msgstr "デバイス %d"
-
-#: ../src/totem-menu.c:848
-#, c-format
-msgid "Play Disc '%s'"
-msgstr "ディスク '%s' の再生"
-
-#. This lists the back-end type and version, such as
-#. * Movie Player using GStreamer 0.10.1
-#: ../src/totem-menu.c:1189
-#, c-format
-msgid "Movie Player using %s"
-msgstr "%s を使った動画プレイヤーです。"
-
-#: ../src/totem-menu.c:1193
+#: ../src/totem-menu.c:788
 msgid "Copyright © 2002-2009 Bastien Nocera"
 msgstr "Copyright © 2002-2009 Bastien Nocera"
 
-#: ../src/totem-menu.c:1198
+#: ../src/totem-menu.c:792
 msgid "translator-credits"
 msgstr ""
 "草野 貴之 \n"
@@ -1206,159 +1275,78 @@
 "松澤 二郎 \n"
 "日本GNOMEユーザー会 http://www.gnome.gr.jp/"
 
-#: ../src/totem-menu.c:1202
+#: ../src/totem-menu.c:796
 msgid "Totem Website"
 msgstr "Totem のウェブサイト"
 
-#: ../src/totem-menu.c:1236
+#: ../src/totem-menu.c:827
 msgid "Configure Plugins"
 msgstr "プラグインの設定"
 
+#: ../src/totem-object.c:162
+#, c-format
+msgid ""
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"%s\n"
+"コマンドライン・オプションの一覧を表示する場合は '%s --help' を実行してくださ"
+"い\n"
+
 #. Translators: %s is the totem version number
-#: ../src/totem-object.c:471
+#: ../src/totem-object.c:591
 #, c-format
 msgid "Totem %s"
 msgstr "Totem %s"
 
-#: ../src/totem-object.c:1047 ../browser-plugin/totem-plugin-viewer.c:367
-msgid "Playing"
-msgstr "再生中"
-
-#: ../src/totem-object.c:1049 ../src/totem-options.c:52
+#: ../src/totem-object.c:1168 ../src/totem-options.c:52
 msgid "Pause"
 msgstr "一時停止する"
 
-#: ../src/totem-object.c:1054 ../browser-plugin/totem-plugin-viewer.c:363
-msgid "Paused"
-msgstr "一時停止中"
-
-#: ../src/totem-object.c:1056 ../src/totem-object.c:1066
+#: ../src/totem-object.c:1175 ../src/totem-object.c:1185
 #: ../src/totem-options.c:51
 msgid "Play"
 msgstr "再生する"
 
-#: ../src/totem-object.c:1061 ../src/totem-object.c:1659
-#: ../src/totem-statusbar.c:115 ../browser-plugin/totem-plugin-viewer.c:351
-msgid "Stopped"
-msgstr "停止中"
-
-#: ../src/totem-object.c:1142 ../src/totem-object.c:1169
-#: ../src/totem-object.c:1799 ../src/totem-object.c:1963
+#: ../src/totem-object.c:1267 ../src/totem-object.c:1294
+#: ../src/totem-object.c:1787 ../src/totem-object.c:1942
 #, c-format
 msgid "Totem could not play '%s'."
 msgstr "Totem は '%s' を再生できませんでした。"
 
-#: ../src/totem-object.c:1246
-#, c-format
-msgid ""
-"Totem could not play this media (%s) although a plugin is present to handle "
-"it."
-msgstr ""
-"このメディア (%s) を操作するプラグインはありますが、Totem はそのメディアを再"
-"生できませんでした。"
-
-#: ../src/totem-object.c:1247
-msgid ""
-"You might want to check that a disc is present in the drive and that it is "
-"correctly configured."
-msgstr ""
-"ドライブの中にディスクがあるか確認して、そのドライブが正しく設定されているこ"
-"とを確認してください。"
-
-#: ../src/totem-object.c:1255
-msgid "More information about media plugins"
-msgstr "メディア・プラグインの詳細情報"
-
-#: ../src/totem-object.c:1256
-msgid ""
-"Please install the necessary plugins and restart Totem to be able to play "
-"this media."
-msgstr ""
-"必要なプラグインをインストールして Totem を再起動すると、このメディアを再生で"
-"きます。"
-
-#: ../src/totem-object.c:1258
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because it does not have the "
-"appropriate plugins to be able to read from the disc."
-msgstr ""
-"この種類のメディア (%s) を読み取るプラグインがないため、そのメディアを再生で"
-"きません。"
-
-#: ../src/totem-object.c:1260
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because you do not have the "
-"appropriate plugins to handle it."
-msgstr ""
-"この種類のメディア (%s) を操作する適切なプラグインがないため、そのメディアを"
-"再生できません。"
-
-#: ../src/totem-object.c:1263
-#, c-format
-msgid "Totem cannot play this type of media (%s) because it is not supported."
-msgstr ""
-"この種類のメディア (%s) はサポートしていないため、そのメディアを再生できませ"
-"ん。"
-
-#: ../src/totem-object.c:1264
-msgid "Please insert another disc to play back."
-msgstr "他のディスクを挿入してください。"
-
-#: ../src/totem-object.c:1300
-msgid "Totem was not able to play this disc."
-msgstr "このディスクを再生できませんでした。"
-
-#: ../src/totem-object.c:1301 ../src/totem-object.c:4229
-msgid "No reason."
-msgstr "原因は不明です。"
-
-#: ../src/totem-object.c:1315
-msgid "Totem does not support playback of Audio CDs"
-msgstr "Totem では音楽 CD の再生をサポートしていません"
-
-#: ../src/totem-object.c:1316
-msgid "Please consider using a music player or a CD extractor to play this CD"
-msgstr ""
-"この CD を再生できる楽曲プレイヤーまたは CD 取り込みツールを利用してみてくだ"
-"さい。"
-
-#: ../src/totem-object.c:1805
+#: ../src/totem-object.c:1793
 msgid "No error message"
 msgstr "エラー・メッセージなし"
 
-#: ../src/totem-object.c:2154
+#: ../src/totem-object.c:2133
 msgid "Totem could not display the help contents."
 msgstr "Totem はヘルプの目次を表示できませんでした。"
 
-#: ../src/totem-object.c:2493 ../src/totem-object.c:2495
-#: ../browser-plugin/totem-plugin-viewer.c:1417
-msgid "An error occurred"
-msgstr "エラーが発生しました"
-
-#: ../src/totem-object.c:4064 ../src/totem-object.c:4066
+#: ../src/totem-object.c:4019 ../src/totem-object.c:4021
 msgid "Previous Chapter/Movie"
 msgstr "前のチャプター/動画に移動します"
 
-#: ../src/totem-object.c:4073 ../src/totem-object.c:4075
+#: ../src/totem-object.c:4028 ../src/totem-object.c:4030
 msgid "Play / Pause"
 msgstr "再生/一時停止します"
 
-#: ../src/totem-object.c:4083 ../src/totem-object.c:4085
+#: ../src/totem-object.c:4038 ../src/totem-object.c:4040
 msgid "Next Chapter/Movie"
 msgstr "次のチャプター/動画に移動します"
 
-#. Translators: this is the tooltip text for the fullscreen button in the controls box in Totem's main window.
 #. Translators: this is the accessibility text for the fullscreen button in the controls box in Totem's main window.
-#: ../src/totem-object.c:4097 ../src/totem-object.c:4099
+#: ../src/totem-object.c:4051 ../src/totem-object.c:4053
 msgid "Fullscreen"
 msgstr "フルスクリーン"
 
-#: ../src/totem-object.c:4229
+#: ../src/totem-object.c:4184
 msgid "Totem could not startup."
 msgstr "Totem を起動できませんでした。"
 
+#: ../src/totem-object.c:4184
+msgid "No reason."
+msgstr "原因は不明です。"
+
 #: ../src/totem-open-location.c:182
 msgid "Open Location..."
 msgstr "場所を開く..."
@@ -1432,117 +1420,111 @@
 msgid "Movies to play"
 msgstr "再生する動画"
 
-#: ../src/totem-options.c:117
+#: ../src/totem-options.c:79
+msgid "- Play movies and songs"
+msgstr "- 動画や楽曲を再生/演奏します"
+
+#: ../src/totem-options.c:142
 msgid "Can't enqueue and replace at the same time"
 msgstr "キューへの追加と置き換えは同時にできません"
 
 #. By extension entry
-#: ../src/totem-playlist.c:161
+#: ../src/totem-playlist.c:162
 msgid "MP3 ShoutCast playlist"
 msgstr "MP3 ShoutCast 形式の演奏一覧"
 
-#: ../src/totem-playlist.c:162
+#: ../src/totem-playlist.c:163
 msgid "MP3 audio (streamed)"
 msgstr "MP3 オーディオ (ストリーム)"
 
-#: ../src/totem-playlist.c:163
+#: ../src/totem-playlist.c:164
 msgid "MP3 audio (streamed, DOS format)"
 msgstr "MP3 オーディオ (ストリーム、DOS 形式)"
 
-#: ../src/totem-playlist.c:164
+#: ../src/totem-playlist.c:165
 msgid "XML Shareable Playlist"
 msgstr "XML Shareable 形式のプレイリスト"
 
 #. This is "Title 3", where title is a DVD title
 #. * Note: NOT a DVD chapter
-#: ../src/totem-playlist.c:347
+#: ../src/totem-playlist.c:348
 #, c-format
 msgid "Title %d"
 msgstr "タイトル %d"
 
-#: ../src/totem-playlist.c:446
+#: ../src/totem-playlist.c:447
 msgid "Could not save the playlist"
 msgstr "プレイリストを保存できませんでした"
 
-#: ../src/totem-playlist.c:1021
+#: ../src/totem-playlist.c:1022
 msgid "Save Playlist"
 msgstr "プレイリストの保存"
 
 #. translators: Playlist is the default saved playlist filename,
 #. * without the suffix
-#: ../src/totem-playlist.c:1033 ../src/totem-playlist.c:1264
-#: ../src/totem-sidebar.c:142
+#: ../src/totem-playlist.c:1034 ../src/totem-playlist.c:1263
+#: ../src/totem-sidebar.c:145
 msgid "Playlist"
 msgstr "プレイリスト"
 
-#: ../src/totem-playlist.c:1857
+#: ../src/totem-playlist.c:1862
 #, c-format
 msgid "The playlist '%s' could not be parsed. It might be damaged."
 msgstr "プレイリスト '%s' を解析できませんでした。おそらく壊れています。"
 
-#: ../src/totem-playlist.c:1858
+#: ../src/totem-playlist.c:1863
 msgid "Playlist error"
 msgstr "プレイリストのエラー"
 
-#: ../src/totem-preferences.c:295
+#: ../src/totem-preferences.c:297
 msgid "Preferences"
 msgstr "設定"
 
-#: ../src/totem-preferences.c:451
+#: ../src/totem-preferences.c:445
 msgid "Select Subtitle Font"
 msgstr "字幕で使用するフォントの選択"
 
-#: ../src/totem-properties-main.c:115 ../src/totem-properties-view.c:266
+#: ../src/totem-properties-main.c:116 ../src/totem-properties-view.c:271
 msgid "Audio/Video"
-msgstr "音声/動画"
+msgstr "音声/ビデオ"
 
-#: ../src/totem-properties-view.c:128
+#: ../src/totem-properties-view.c:131
 msgid "N/A"
 msgstr "N/A"
 
-#: ../src/totem-properties-view.c:157
+#: ../src/totem-properties-view.c:160
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 msgctxt "Stream bit rate"
 msgid "N/A"
 msgstr "N/A"
 
-#: ../src/totem-properties-view.c:160
+#: ../src/totem-properties-view.c:163
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: ../src/totem-properties-view.c:177
+#: ../src/totem-properties-view.c:180
 #: ../src/plugins/properties/totem-movie-properties.c:149
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../src/totem-properties-view.c:209
+#: ../src/totem-properties-view.c:212
 #: ../src/plugins/properties/totem-movie-properties.c:166
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: ../src/totem-properties-view.c:216
+#: ../src/totem-properties-view.c:220
 #: ../src/plugins/properties/totem-movie-properties.c:166
 msgctxt "Sample rate"
 msgid "N/A"
 msgstr "N/A"
 
-#: ../src/totem-properties-view.c:224
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5589
-msgid "Surround"
-msgstr "サラウンド"
-
-#: ../src/totem-properties-view.c:226
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5591
-msgid "Mono"
-msgstr "モノラル"
-
-#: ../src/totem-properties-view.c:236
+#: ../src/totem-properties-view.c:241
 msgctxt "Number of audio channels"
 msgid "N/A"
 msgstr "N/A"
@@ -1575,8 +1557,8 @@
 #. eg: 75 %
 #: ../src/totem-statusbar.c:250
 #, c-format
-msgid "%d %%"
-msgstr "%d %%"
+msgid "%lf %%"
+msgstr ""
 
 #. eg: Paused, 0:32 / 1:05
 #: ../src/totem-statusbar.c:325
@@ -1586,8 +1568,8 @@
 
 #. eg: Buffering, 75 %
 #: ../src/totem-statusbar.c:330
-#, c-format
-msgid "%s, %d %%"
+#, fuzzy, c-format
+msgid "%s, %f %%"
 msgstr "%s, %d %%"
 
 #: ../src/totem-subtitle-encoding.c:156
@@ -1731,228 +1713,97 @@
 msgid "Vietnamese"
 msgstr "ベトナム語"
 
-#: ../src/totem-video-list.c:330
-msgid "No video URI"
-msgstr "ビデオのURI無し"
-
-#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
-#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
-#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
-#: ../src/totem-video-thumbnailer.c:872
-#, c-format
-msgid ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-msgstr ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-
-#: ../src/totem-video-thumbnailer.c:873
-msgid "Filename"
-msgstr "ファイル名"
-
-#: ../src/totem-video-thumbnailer.c:875
-msgid "Resolution"
-msgstr "解像度"
-
-#: ../src/totem-video-thumbnailer.c:878
-msgid "Duration"
-msgstr "再生時間"
-
-#: ../src/totem-uri.c:506 ../src/plugins/chapters/totem-chapters.c:998
+#: ../src/totem-uri.c:343 ../src/plugins/chapters/totem-chapters.c:998
 msgid "All files"
 msgstr "すべてのファイル"
 
-#: ../src/totem-uri.c:511 ../src/plugins/chapters/totem-chapters.c:995
+#: ../src/totem-uri.c:348 ../src/plugins/chapters/totem-chapters.c:995
 msgid "Supported files"
 msgstr "サポートしているファイル"
 
-#: ../src/totem-uri.c:523
+#: ../src/totem-uri.c:360
 msgid "Audio files"
 msgstr "楽曲ファイル"
 
-#: ../src/totem-uri.c:531
+#: ../src/totem-uri.c:368
 msgid "Video files"
 msgstr "動画ファイル"
 
-#: ../src/totem-uri.c:541
+#: ../src/totem-uri.c:378
 msgid "Subtitle files"
 msgstr "字幕のファイル"
 
-#: ../src/totem-uri.c:593
+#: ../src/totem-uri.c:430
 msgid "Select Text Subtitles"
 msgstr "字幕の選択"
 
-#: ../src/totem-uri.c:656
+#: ../src/totem-uri.c:495
 msgid "Select Movies or Playlists"
 msgstr "動画またはプレイリストの選択"
 
-#. Options parsing
-#: ../src/totem.c:201
-msgid "- Play movies and songs"
-msgstr "- 動画や楽曲を再生/演奏します"
-
-#: ../src/totem.c:212
-#, c-format
-msgid ""
-"%s\n"
-"Run '%s --help' to see a full list of available command line options.\n"
+#: ../src/totem-uri.c:499
+msgid "Add Directory"
 msgstr ""
-"%s\n"
-"コマンドライン・オプションの一覧を表示する場合は '%s --help' を実行してくださ"
-"い\n"
-
-#: ../src/totem.c:254 ../src/totem.c:265
-#: ../browser-plugin/totem-plugin-viewer.c:663
-#: ../browser-plugin/totem-plugin-viewer.c:1793
-msgid "Totem Movie Player"
-msgstr "Totem 動画プレイヤー"
-
-#: ../src/totem.c:255 ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Could not initialize the thread-safe libraries."
-msgstr "スレッドセーフなライブラリを初期化できませんでした。"
-
-#: ../src/totem.c:255
-msgid "Verify your system installation. Totem will now exit."
-msgstr "システムのインストールを確認してください。Totem を終了します。"
-
-# FIXME: 画面が見たい
-#: ../src/backend/bacon-video-widget-gst-0.10.c:1589
-msgid "Password requested for RTSP server"
-msgstr "RTSP サーバーから要求されたパスワード"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2858
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2862
-#, c-format
-msgid "Audio Track #%d"
-msgstr "音声トラック #%d"
+#: ../src/totem-video-list.c:330
+msgid "No video URI"
+msgstr "ビデオのURI無し"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2890
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2894
+#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
+#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
+#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
+#: ../src/totem-video-thumbnailer.c:841
 #, c-format
-msgid "Subtitle #%d"
-msgstr "サブタイトル #%d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3298
 msgid ""
-"The requested audio output was not found. Please select another audio output "
-"in the Multimedia Systems Selector."
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 msgstr ""
-"指定した音声出力デバイスが見つかりませんでした。[マルチメディア・システム・セ"
-"レクター] から別のデバイスを選択してみてください。"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3303
-msgid "Location not found."
-msgstr "指定した場所が見つかりません。"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3307
-msgid ""
-"Could not open location; you might not have permission to open the file."
-msgstr "場所を開けませんでした (そのファイルを開く権限がありません)。"
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3318
-msgid ""
-"The video output is in use by another application. Please close other video "
-"applications, or select another video output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"他のアプリケーションが映像出力デバイスを使用しています。そのアプリケーション"
-"を終了するか、[マルチメディア・システム・セレクター] から別のデバイスを選択し"
-"てみてください。"
+#: ../src/totem-video-thumbnailer.c:842
+msgid "Filename"
+msgstr "ファイル名"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3324
-msgid ""
-"The audio output is in use by another application. Please select another "
-"audio output in the Multimedia Systems Selector. You may want to consider "
-"using a sound server."
-msgstr ""
-"他のアプリケーションが音声出力デバイスを使用しています。[マルチメディア・シス"
-"テム・セレクター] から別のデバイスを選択してみてください (サウンド・サーバー"
-"の利用を考慮した方が良いかもしれません)。"
+#: ../src/totem-video-thumbnailer.c:844
+msgid "Resolution"
+msgstr "解像度"
 
-#. should be exactly one missing thing (source or converter)
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3342
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3348
-#, c-format
-msgid "The playback of this movie requires a %s plugin which is not installed."
-msgid_plural ""
-"The playback of this movie requires the following decoders which are not "
-"installed:\n"
-"\n"
-"%s"
-msgstr[0] ""
-"この動画の再生にはインストールされていない以下のデコーダーが必要です:\n"
-"\n"
-"%s"
+#: ../src/totem-video-thumbnailer.c:847
+msgid "Duration"
+msgstr "再生時間"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3374
-msgid ""
-"Cannot play this file over the network. Try downloading it to disk first."
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:1
+msgid "Apple Trailers"
 msgstr ""
-"このファイルをネットワーク越しに再生することはできません。ダウンロードして直"
-"接再生してみてください。"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5878
-msgid "Media contains no supported video streams."
-msgstr "このメディアには映像ストリームが含まれていません。"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6052
-msgid ""
-"Failed to create a GStreamer play object. Please check your GStreamer "
-"installation."
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:2
+msgid "Sets the user agent for the Apple Trailers site"
 msgstr ""
-"GStreamer 演奏オブジェクトの生成に失敗しました。GStreamer が正しくインストー"
-"ルされているか確認してください。"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6172
-msgid ""
-"Failed to open audio output. You may not have permission to open the sound "
-"device, or the sound server may not be running. Please select another audio "
-"output in the Multimedia Systems Selector."
-msgstr ""
-"音声出力デバイスを開けませんでした。サウンド・デバイスを開く権限がないか、あ"
-"るいはサウンド・サーバーが起動されていないかもしれません。[マルチメディア・シ"
-"ステム・セレクター] から別のデバイスを選択してみてください。"
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:1
+#, fuzzy
+msgid "Autoload Subtitles"
+msgstr "動画の字幕のダウンロード"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6192
-msgid ""
-"Could not find the audio output. You may need to install additional "
-"GStreamer plugins, or select another audio output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"音声出力デバイスが見つかりませんでした。GStreamer のプラグインを追加でインス"
-"トールするか、あるいは [マルチメディア・システム・セレクター] から別の音声出"
-"力デバイスを選択してみてください。"
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:2
+#, fuzzy
+msgid "Autoloads text subtitles"
+msgstr "字幕をダウンロード中..."
 
-#. hour:minutes:seconds
-#. Translators: This is a time format, like "9:05:02" for 9
-#. * hours, 5 minutes, and 2 seconds. You may change ":" to
-#. * the separator that your locale uses or use "%Id" instead
-#. * of "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:83 ../src/plugins/skipto/totem-time-entry.c:57
-#, c-format
-msgctxt "long time format"
-msgid "%d:%02d:%02d"
-msgstr "%d:%02d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
+msgid "Video Disc Recorder"
+msgstr "ビデオディスクレコーダー"
 
-#. minutes:seconds
-#. Translators: This is a time format, like "5:02" for 5
-#. * minutes and 2 seconds. You may change ":" to the
-#. * separator that your locale uses or use "%Id" instead of
-#. * "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:92
-#, c-format
-msgctxt "short time format"
-msgid "%d:%02d"
-msgstr "%d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
+msgid "Records (S)VCDs or video DVDs"
+msgstr "(S)VCD または VIDEO-DVD を作成します"
 
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:65
 msgid "_Create Video Disc..."
-msgstr "ビデオ・ディスクの作成(_C)..."
+msgstr "ビデオディスクの作成(_C)..."
 
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:66
 msgid "Create a video DVD or a (S)VCD from the currently opened movie"
@@ -1974,38 +1825,21 @@
 msgid "Copy the currently playing (S)VCD"
 msgstr "現在再生中の (S)VCD の複製を作成します"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:129
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:136
 msgid "The video disc could not be duplicated."
-msgstr "動画ディスクの複製を作成できませんでした"
+msgstr "ビデオディスクの複製を作成できませんでした"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:131
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:276
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:138
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:283
 msgid "The movie could not be recorded."
 msgstr "動画を保存できませんでした"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:157
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:167
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:263
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:164
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:174
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:270
 msgid "Unable to write a project."
 msgstr "プロジェクトを書き込めません"
 
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
-msgid "Video Disc Recorder"
-msgstr "動画ディスク・レコーダー"
-
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
-msgid "Records (S)VCDs or video DVDs"
-msgstr "(S)VCDs または VIDEO-DVD を作成します"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:1
-#: ../src/plugins/chapters/totem-chapters.c:1139
-msgid "Chapters"
-msgstr "チャプター"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:2
-msgid "Support chapter markers in movies."
-msgstr "動画のチャプター作成をサポートします。"
-
 #: ../src/plugins/chapters/chapters-edit.ui.h:1
 msgid "Name for new chapter:"
 msgstr "新しいチャプターの名前:"
@@ -2062,6 +1896,16 @@
 msgid "Create a new chapter list for the movie"
 msgstr "新規にこの動画のチャプターリストを作成"
 
+#: ../src/plugins/chapters/chapters.plugin.in.h:1
+#: ../src/plugins/chapters/totem-chapters.c:1139
+msgid "Chapters"
+msgstr "チャプター"
+
+#: ../src/plugins/chapters/chapters.plugin.in.h:2
+#, fuzzy
+msgid "Support chapter markers in movies"
+msgstr "動画のチャプター作成をサポートします。"
+
 #: ../src/plugins/chapters/totem-chapters.c:56
 #, c-format
 msgid ""
@@ -2077,7 +1921,7 @@
 
 #: ../src/plugins/chapters/totem-chapters.c:543
 msgid "Chapter with the same time already exists"
-msgstr "同じ時間のチャプターが既に存在します"
+msgstr "同じ時間のチャプターがすでに存在します"
 
 #: ../src/plugins/chapters/totem-chapters.c:544
 msgid "Try another name or remove an existing chapter."
@@ -2165,15 +2009,39 @@
 msgid "The URI ‘%s’ is not supported."
 msgstr "URI‘%s’はサポートされていません。"
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
-msgid "Instant Messenger status"
-msgstr "インスタント・メッセンジャーの状態"
+#: ../src/plugins/grilo/grilo.plugin.in.h:1
+msgid "Grilo Browser"
+msgstr "Griloブラウザー"
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
-msgid "Set your Instant Messenger status to away when a movie is playing"
+#: ../src/plugins/grilo/grilo.plugin.in.h:2
+#, fuzzy
+msgid "A plugin to let you browse media content from various sources"
 msgstr ""
-"動画を再生している時は、お使いのインスタント・メッセンジャーを離席状態にセッ"
-"トします"
+"さまざまなソースからメディアコンテンツを見ることができるプラグインです。"
+
+#: ../src/plugins/grilo/grilo.ui.h:1
+msgid "Add to Playlist"
+msgstr "プレイリストに追加"
+
+#: ../src/plugins/grilo/grilo.ui.h:2
+msgid "Copy Location"
+msgstr "場所のコピー"
+
+#: ../src/plugins/grilo/grilo.ui.h:3 ../src/plugins/grilo/totem-grilo.c:1186
+msgid "Browse"
+msgstr "表示"
+
+#: ../src/plugins/grilo/grilo.ui.h:4 ../src/plugins/grilo/totem-grilo.c:1229
+msgid "Search"
+msgstr "検索"
+
+#: ../src/plugins/grilo/totem-grilo.c:454
+msgid "Browse Error"
+msgstr "表示エラー"
+
+#: ../src/plugins/grilo/totem-grilo.c:609
+msgid "Search Error"
+msgstr "検索エラー"
 
 #: ../src/plugins/gromit/gromit.plugin.in.h:1
 msgid "Gromit Annotations"
@@ -2187,57 +2055,16 @@
 msgid "The gromit binary was not found."
 msgstr "Gromit のバイナリが見つかりませんでした。"
 
-#. Add the interface to Totem's sidebar
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:1
-#: ../src/plugins/iplayer/iplayer.py:46
-msgid "BBC iPlayer"
-msgstr "BBC iPlayer"
-
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:2
-msgid "Stream BBC programs from the last 7 days from the BBC iPlayer service."
-msgstr "BBC iPlayer サービスの最新7日分から BBC の番組をストリーミング"
-
-#: ../src/plugins/iplayer/iplayer.py:72
-msgid "Error listing channel categories"
-msgstr "チャンネルのカテゴリの一覧の表示中にエラー"
-
-#: ../src/plugins/iplayer/iplayer.py:73
-msgid ""
-"There was an unknown error getting the list of television channels available "
-"on BBC iPlayer."
-msgstr ""
-"BBC iPlayer で利用可能なテレビ・チャンネルの一覧の取得中に不明なエラーが発生"
-"しました"
-
-#. Append a dummy child row so that the expander's visible; we can
-#. then queue off the expander to load the programme listing for this
-#. category
-#: ../src/plugins/iplayer/iplayer.py:84
-msgid "Loading…"
-msgstr "読み込み中..."
-
-#. Translators: the "programme feed" is the list of TV shows
-#. available to watch online
-#: ../src/plugins/iplayer/iplayer.py:136
-msgid "Error getting programme feed"
-msgstr "番組フィードの取得中にエラー"
-
-#: ../src/plugins/iplayer/iplayer.py:137
-msgid ""
-"There was an error getting the list of programmes for this channel and "
-"category combination."
-msgstr ""
-"このチャンネルとカテゴリの組み合わせの番組の一覧の取得中にエラーが発生しまし"
-"た。"
-
-#: ../src/plugins/iplayer/iplayer2.py:298
-msgid ""
-msgstr "<理由はありません>"
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
+#, fuzzy
+msgid "Instant Messenger Status"
+msgstr "インスタント・メッセンジャーの状態"
 
-#: ../src/plugins/iplayer/iplayer2.py:299
-#, python-format
-msgid "Programme unavailable (\"%s\")"
-msgstr "番組が利用できません (\"%s\")"
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
+msgid "Set your Instant Messenger status to away when a movie is playing"
+msgstr ""
+"動画を再生している時は、お使いのインスタント・メッセンジャーを離席状態にセッ"
+"トします"
 
 #: ../src/plugins/lirc/lirc.plugin.in.h:1
 msgid "Infrared Remote Control"
@@ -2255,24 +2082,30 @@
 msgid "Couldn't read lirc configuration."
 msgstr "lirc の設定を読み込めませんでした。"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
-msgid "Download Movie Subtitles"
-msgstr "動画の字幕のダウンロード"
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:1
+#, fuzzy
+msgid "Media Player Keys"
+msgstr "動画プレイヤー"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
-msgid "Subtitle _language:"
-msgstr "字幕の言語(_L):"
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:2
+msgid "Support additional media player keys"
+msgstr ""
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
-msgid "_Play with Subtitle"
-msgstr "字幕付きで再生する(_P)"
+#: ../src/plugins/ontop/ontop.plugin.in.h:1
+msgid "Always On Top"
+msgstr "常に手前に表示する"
+
+#: ../src/plugins/ontop/ontop.plugin.in.h:2
+msgid "Keep the main window on top when playing a movie"
+msgstr "動画を再生している時はメイン・ウィンドウを常に前面に出しておきます"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:1
 msgid "Subtitle Downloader"
 msgstr "字幕ダウンローダー"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:2
-msgid "Look for subtitles for the currently playing movie."
+#, fuzzy
+msgid "Look for subtitles for the currently playing movie"
 msgstr "現在再生している動画の字幕を探します。"
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:42
@@ -2329,6 +2162,18 @@
 msgid "Searching subtitles…"
 msgstr "字幕を検索中..."
 
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
+msgid "Download Movie Subtitles"
+msgstr "動画の字幕のダウンロード"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
+msgid "Subtitle _language:"
+msgstr "字幕の言語(_L):"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
+msgid "_Play with Subtitle"
+msgstr "字幕付きで再生する(_P)"
+
 #: ../src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in.h:1
 msgid "Subtitle language"
 msgstr "字幕の言語"
@@ -2337,79 +2182,20 @@
 msgid "The language to search for subtitles for movies in."
 msgstr "動画にある字幕を検索するための言語です。"
 
-#: ../src/plugins/ontop/ontop.plugin.in.h:1
-msgid "Always On Top"
-msgstr "常に手前に表示する"
+#: ../src/plugins/properties/movie-properties.plugin.in.h:1
+#, fuzzy
+msgid "Movie Properties"
+msgstr "プロパティ"
 
-#: ../src/plugins/ontop/ontop.plugin.in.h:2
-msgid "Keep the main window on top when playing a movie"
-msgstr "動画を再生している時はメイン・ウィンドウを常に前面に出しておきます"
+#: ../src/plugins/properties/movie-properties.plugin.in.h:2
+#, fuzzy
+msgid "Adds movie properties to the sidebar"
+msgstr "サイドバーの表示/非表示を切り替えます"
 
 #: ../src/plugins/properties/totem-movie-properties.c:246
 msgid "Properties"
 msgstr "プロパティ"
 
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:1
-msgid "Publisher protocol to use"
-msgstr "利用するプロトコルの発行元"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:2
-msgid ""
-"The transport protocol to use when publishing playlists over the network."
-msgstr ""
-"ネットワーク越しでプレイリストを発行する際に利用する転送プロトコルです。"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:3
-msgid "Format for network service name"
-msgstr "ネットワークサービス名のフォーマット"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:5
-#, no-c-format
-msgid ""
-"A format string used to build the network service name used when publishing "
-"playlists over the network. The following format placeholders can be used: • "
-"%a: the program name as returned by g_get_application_name() • %h: the "
-"machine's host name in title case • %u: the user's login name in title case "
-"• %U: the user's real name • %%: the percent sign"
-msgstr ""
-"ネットワーク越しにプレイリストを発行する際に、使われているネットワークサービ"
-"ス名を構築するために使うフォーマット文字列。以下のフォーマットプレースホル"
-"ダーが利用できます: • %a:  g_get_application_name()で返されるプログラム名 • %"
-"h: タイトルにマシンのホスト名 • %u: タイトルにユーザーログイン名 • %U: ユー"
-"ザーの本名 • %%: パーセント文字"
-
-#. Translators: computers on the local network which are publishing their playlists over the network
-#: ../src/plugins/publish/totem-publish.c:552
-msgid "Neighbors"
-msgstr "近隣"
-
-#: ../src/plugins/publish/publish.plugin.in.h:1
-msgid "Publish Playlist"
-msgstr "プレイリストの公開"
-
-#: ../src/plugins/publish/publish.plugin.in.h:2
-msgid "Share the current playlist via HTTP"
-msgstr "HTTP 経由でプレイリストを共有します"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:1
-msgid "Service _Name:"
-msgstr "サービス名(_N):"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:3
-#, no-c-format
-msgid ""
-"The name used for announcing the playlist service on the network.\n"
-"All occurrences of the string %u will be replaced by your name,\n"
-"and %h will be replaced by your computer's host name."
-msgstr ""
-"ネットワーク上でプレイリストを公開するサービスに使用する名称です。\n"
-"%u という文字はあなたの名前に置き換えられ、%h という\n"
-"文字はお使いのコンピューターのホスト名で置き換えられます。"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:6
-msgid "Use _encrypted transport protocol (HTTPS)"
-msgstr "HTTPS (暗号化転送プロトコル) を使って公開する(_E)"
-
 #: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:1
 msgid "rpdb2 password"
 msgstr "rpdb2パスワード"
@@ -2419,24 +2205,94 @@
 "A password to protect the rpdb2 server for debugging Totem from unauthorized "
 "remote access. If this is empty, a default of 'totem' will be used."
 msgstr ""
-"権限のないリモートアクセスからTotemをデバッグ用rpdb2サーバーを保護するためのパスワード。空の場合は、デフォルトで'totem'を使います。"
+"権限のないリモートアクセスからTotemをデバッグ用rpdb2サーバーを保護するための"
+"パスワード。空の場合は、デフォルトで'totem'を使います。"
+
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
+msgid "Python Console"
+msgstr "Python 端末"
+
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
+#, fuzzy
+msgid "Interactive Python console"
+msgstr "対話式の Python 端末です"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:88
+msgid "Python Console Menu"
+msgstr "Python 端末のメニュー"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:93
+msgid "_Python Console"
+msgstr "Python 端末(_P)"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:94
+msgid "Show Totem's Python console"
+msgstr "Totem 用の Python 端末を開きます"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:100
+msgid "Python Debugger"
+msgstr "Python デバッガー"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:101
+msgid "Enable remote Python debugging with rpdb2"
+msgstr "rpdb2 を使ったリモートの Python デバッグを利用できるようにします"
+
+#. pylint: disable-msg=E1101
+#: ../src/plugins/pythonconsole/pythonconsole.py:125
+#, python-format
+msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
+msgstr "'totem_object' を使ってTotem.Objectにアクセスできます:\\n%s"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:129
+msgid "Totem Python Console"
+msgstr "Totem の Python 端末"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:139
+msgid ""
+"After you press OK, Totem will wait until you connect to it with winpdb or "
+"rpdb2. If you have not set a debugger password in DConf, it will use the "
+"default password ('totem')."
+msgstr ""
+"OK をクリックした後、winpdb または rpdb2 に接続するまで Totem は待機状態に入"
+"ります。DConf の設定でデバッガーのパスワードを指定していない場合、デフォルト"
+"のパスワード ('totem') を使用してください。"
+
+#: ../src/plugins/recent/recent.plugin.in.h:1
+#, fuzzy
+msgid "Recent files"
+msgstr "動画ファイル"
+
+#: ../src/plugins/recent/recent.plugin.in.h:2
+msgid "Adds files that have been played to recent files"
+msgstr ""
 
 #: ../src/plugins/rotation/rotation.plugin.in.h:1
 msgid "Rotation Plugin"
 msgstr "回転プラグイン"
 
 #: ../src/plugins/rotation/rotation.plugin.in.h:2
-msgid "Allows videos to be rotated if they're in the wrong orientation."
+#, fuzzy
+msgid "Allows videos to be rotated if they are in the wrong orientation"
 msgstr "動画を誤った向きの場合に回転できます。"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:60
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:50
 msgid "_Rotate Clockwise"
 msgstr "時計回りに回転(_R)"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:62
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:52
 msgid "Rotate Counterc_lockwise"
 msgstr "反時計回りに回転(_L)"
 
+#: ../src/plugins/save-file/save-file.plugin.in.h:1
+#, fuzzy
+msgid "Save Copy"
+msgstr "コピーを保存"
+
+#: ../src/plugins/save-file/save-file.plugin.in.h:2
+#, fuzzy
+msgid "Save a copy of the currently playing movie"
+msgstr "現在再生中の VIDEO-DVD の複製を作成します"
+
 #: ../src/plugins/save-file/totem-save-file.c:63
 msgid "Save a Copy..."
 msgstr "コピーを保存..."
@@ -2459,10 +2315,14 @@
 msgid "Movie stream"
 msgstr "動画ストリーム"
 
-#: ../src/plugins/screensaver/totem-screensaver.c:116
-#: ../browser-plugin/totem-plugin-viewer.c:1891
-msgid "Playing a movie"
-msgstr "動画を再生する"
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:1
+msgid "Screen Saver"
+msgstr ""
+
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:2
+#, fuzzy
+msgid "Deactivates the screen saver when a movie is playing"
+msgstr "以下の再生中にスクリーンセーバーを無効にする: "
 
 #: ../src/plugins/screenshot/gallery.ui.h:1
 msgid "Screenshot width (in pixels):"
@@ -2476,24 +2336,30 @@
 msgid "Number of screenshots:"
 msgstr "スクリーンショットの総数:"
 
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:1
-msgid "_Name:"
-msgstr "名前(_N):"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:2
-msgid "Save in _folder:"
-msgstr "フォルダーに保存(_F):"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:3
-msgid "Select a folder"
-msgstr "フォルダーの選択"
-
-#. Write the screenshot to the temporary file
-#: ../src/plugins/screenshot/gnome-screenshot-widget.c:385
-#: ../src/plugins/screenshot/totem-screenshot.c:64
-msgid "Screenshot.png"
+#. translators: this is the name of the file that gets made up
+#. * with the screenshot if the entire screen is taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:147
+#, fuzzy, c-format
+msgid "Screenshot from %s.png"
+msgstr "Screenshot.png"
+
+#. translators: this is the name of the file that gets
+#. * made up with the screenshot if the entire screen is
+#. * taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:154
+#, fuzzy, c-format
+msgid "Screenshot from %s - %d.png"
+msgstr "Screenshot-%s-%d.png"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:1
+#, fuzzy
+msgid "Screenshot"
 msgstr "Screenshot.png"
 
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:2
+msgid "Allows screenshots and galleries to be taken of videos"
+msgstr ""
+
 #: ../src/plugins/screenshot/totem-gallery.c:91
 msgid "Save Gallery"
 msgstr "ギャラリーの保存"
@@ -2518,49 +2384,48 @@
 msgid "Saving gallery as \"%s\""
 msgstr "ギャラリー (\"%s\") の保存中"
 
-#: ../src/plugins/screenshot/totem-screenshot.c:113
-msgid "There was an error saving the screenshot."
-msgstr "スクリーンショットを保存する際にエラーが発生しました。"
-
-#: ../src/plugins/screenshot/totem-screenshot.c:139
-msgid "Save Screenshot"
-msgstr "スクリーンショットの保存"
-
-#. Create the screenshot widget
-#. Translators: %s is the movie title and %d is an auto-incrementing number to make filename unique
-#: ../src/plugins/screenshot/totem-screenshot.c:160
-#, c-format
-msgid "Screenshot-%s-%d.png"
-msgstr "Screenshot-%s-%d.png"
-
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:88
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:220
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "Totem could not get a screenshot of the video."
-msgstr "Totem はこの動画のスクリーンショットを撮れませんでした。"
+msgstr "Totem はこのビデオのスクリーンショットを撮れませんでした。"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "This is not supposed to happen; please file a bug report."
 msgstr "これは発生してはいけない現象です; バグとして報告してください。"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
-msgid "Take _Screenshot..."
-msgstr "スクリーンショットの取得(_S)..."
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
+msgid "Take _Screenshot"
+msgstr "スクリーンショットを撮る(_S)"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
 msgid "Take a screenshot"
 msgstr "再生中のスクリーンショットを撮ります"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create Screenshot _Gallery..."
 msgstr "ギャラリーの作成(_G)..."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create a gallery of screenshots"
 msgstr "いろいろなスクリーンショットを集めたギャラリーを作成します"
 
+#: ../src/plugins/skipto/skipto.plugin.in.h:1
+#: ../src/plugins/skipto/totem-skipto.c:196
+msgid "Skip To"
+msgstr "スキップ先"
+
+#: ../src/plugins/skipto/skipto.plugin.in.h:2
+#, fuzzy
+msgid "Provides the \"Skip to\" dialog"
+msgstr "\"スキップ\" ダイアログのインターフェースを読み込めませんでした。"
+
+#: ../src/plugins/skipto/skipto.ui.h:1
+msgid "_Skip to:"
+msgstr "スキップ先(_S):"
+
 #. Update the "seconds" label so that it always has the correct singular/plural form
 #. Translators: label for the seconds selector in the "Skip to" dialogue
-#: ../src/plugins/skipto/totem-skipto.c:160
+#: ../src/plugins/skipto/totem-skipto.c:159
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "秒"
@@ -2569,15 +2434,11 @@
 #. Translators: you should translate this string to a number (written in digits) which corresponds to the longer character length of the
 #. * translations for "second" and "seconds", as translated elsewhere in this file. For example, in English, "second" is 6 characters long and
 #. * "seconds" is 7 characters long, so this string should be translated to "7". See: bgo#639398
-#: ../src/plugins/skipto/totem-skipto.c:190
+#: ../src/plugins/skipto/totem-skipto.c:189
 msgctxt "Skip To label length"
 msgid "7"
 msgstr "7"
 
-#: ../src/plugins/skipto/totem-skipto.c:197
-msgid "Skip To"
-msgstr "スキップ先"
-
 #: ../src/plugins/skipto/totem-skipto-plugin.c:182
 msgid "_Skip To..."
 msgstr "指定先へスキップ(_S)..."
@@ -2586,115 +2447,308 @@
 msgid "Skip to a specific time"
 msgstr "指定した時間までスキップします"
 
-#: ../src/plugins/skipto/skipto.ui.h:1
-msgid "_Skip to:"
-msgstr "スキップ先(_S):"
+#~ msgid "Play movies and songs"
+#~ msgstr "動画や楽曲を再生します"
 
-#: ../browser-plugin/totem-plugin-viewer.c:431
-msgid "No URI to play"
-msgstr "再生する URI を指定してください"
+#~ msgid "Open a file"
+#~ msgstr "ファイルを開きます"
 
-#. translators: this is:
-#. * Open With ApplicationName
-#. * as in nautilus' right-click menu
-#: ../browser-plugin/totem-plugin-viewer.c:1107
-#, c-format
-msgid "_Open with \"%s\""
-msgstr "\"%s\" で開く(_O)"
+#~ msgid "Open a non-local file"
+#~ msgstr "リモート・サイトにあるファイルを開きます"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2136
-msgid "No playlist or playlist empty"
-msgstr "プレイリストが存在しないか空です"
+#~ msgid "Quit the program"
+#~ msgstr "Totem を終了します"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2235
-msgid "Movie browser plugin"
-msgstr "動画ブラウザー プラグイン"
+#~ msgid "Configure the application"
+#~ msgstr "アプリケーションの設定"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Verify your system installation. The Totem plugin will now exit."
-msgstr ""
-"システムのインストールを確認してください。Totem のプラグインを終了します。"
+#~ msgid "Switch to fullscreen"
+#~ msgstr "フルスクリーンに切り替えます"
 
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
-msgid "Python Console"
-msgstr "Python 端末"
+#~ msgid "Set the repeat mode"
+#~ msgstr "繰り返し再生モードにします"
 
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
-msgid "Interactive Python console."
-msgstr "対話式の Python 端末です"
+#~ msgid "Set the shuffle mode"
+#~ msgstr "シャッフル・モードにします"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:88
-msgid "Python Console Menu"
-msgstr "Python 端末のメニュー"
+#~ msgid "14.4 Kbps Modem"
+#~ msgstr "14.4 Kbps モデム"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:93
-msgid "_Python Console"
-msgstr "Python 端末(_P)"
+#~ msgid "19.2 Kbps Modem"
+#~ msgstr "19.2 Kbps モデム"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:94
-msgid "Show Totem's Python console"
-msgstr "Totem 用の Python 端末を開きます"
+#~ msgid "28.8 Kbps Modem"
+#~ msgstr "28.8 Kbps モデム"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:100
-msgid "Python Debugger"
-msgstr "Python デバッガー"
+#~ msgid "33.6 Kbps Modem"
+#~ msgstr "33.6 Kbps モデム"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:101
-msgid "Enable remote Python debugging with rpdb2"
-msgstr "rpdb2 を使ったリモートの Python デバッグを利用できるようにします"
+#~ msgid "34.4 Kbps Modem"
+#~ msgstr "34.4 Kbps モデム"
 
-#. pylint: disable-msg=E1101
-#: ../src/plugins/pythonconsole/pythonconsole.py:125
-#, python-format
-msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
-msgstr "'totem_object' を使ってTotem.Objectにアクセスできます:\\n%s"
+#~ msgid "56 Kbps Modem/ISDN"
+#~ msgstr "56 Kbps モデム/ISDN"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:129
-msgid "Totem Python Console"
-msgstr "Totem の Python 端末"
+#~ msgid "112 Kbps Dual ISDN/DSL"
+#~ msgstr "112 Kbps デュアル ISDN/DSL"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:139
-msgid ""
-"After you press OK, Totem will wait until you connect to it with winpdb or "
-"rpdb2. If you have not set a debugger password in DConf, it will use the "
-"default password ('totem')."
-msgstr ""
-"OK をクリックした後、winpdb または rpdb2 に接続するまで Totem は待機状態に入"
-"ります。DConf の設定でデバッガーのパスワードを指定していない場合、デフォルト"
-"のパスワード ('totem') を使用してください。"
+#~ msgid "256 Kbps DSL/Cable"
+#~ msgstr "256 Kbps DSL/ケーブル"
 
-#: ../src/plugins/grilo/grilo.plugin.in.h:1
-msgid "Grilo Browser"
-msgstr "Griloブラウザー"
+#~ msgid "384 Kbps DSL/Cable"
+#~ msgstr "384 Kbps DSL/ケーブル"
 
-#: ../src/plugins/grilo/grilo.plugin.in.h:2
-msgid "A plugin to let you browse media content from various sources."
-msgstr ""
-"さまざまなソースからメディアコンテンツを見ることができるプラグインです。"
+#~ msgid "512 Kbps DSL/Cable"
+#~ msgstr "512 Kbps DSL/ケーブル"
 
-#: ../src/plugins/grilo/totem-grilo.c:452
-msgid "Browse Error"
-msgstr "表示エラー"
+#~ msgid "1.5 Mbps T1/Intranet/LAN"
+#~ msgstr "1.5 Mbps T1/インターネット/LAN"
 
-#: ../src/plugins/grilo/totem-grilo.c:599
-msgid "Search Error"
-msgstr "検索エラー"
+#~ msgid "Intranet/LAN"
+#~ msgstr "イントラネット/LAN"
 
-#: ../src/plugins/grilo/totem-grilo.c:1219 ../src/plugins/grilo/grilo.ui.h:3
-msgid "Browse"
-msgstr "表示"
+#~ msgid "Networking"
+#~ msgstr "ネットワーク"
 
-#: ../src/plugins/grilo/totem-grilo.c:1285 ../src/plugins/grilo/grilo.ui.h:4
-msgid "Search"
-msgstr "検索"
+#~ msgid "Connection _speed:"
+#~ msgstr "接続スピード(_S):"
 
-#: ../src/plugins/grilo/grilo.ui.h:1
-msgid "Add to Playlist"
-msgstr "プレイリストに追加"
+#~ msgid "Network connection speed"
+#~ msgstr "ネットワークの接続スピード"
 
-#: ../src/plugins/grilo/grilo.ui.h:2
-msgid "Copy Location"
-msgstr "場所のコピー"
+#~ msgid ""
+#~ "Approximate network connection speed, used to select quality on media "
+#~ "over the network."
+#~ msgstr ""
+#~ "おおよそのネットワーク接続速度、ネットワーク越しのメディアの品質を選択しま"
+#~ "す。"
+
+#~ msgid "Play Image '%s'"
+#~ msgstr "イメージファイル '%s' の再生"
+
+#~ msgid "device%d"
+#~ msgstr "デバイス %d"
+
+#~ msgid "Play Disc '%s'"
+#~ msgstr "ディスク '%s' の再生"
+
+#~ msgid "Movie Player using %s"
+#~ msgstr "%s を使った動画プレイヤーです。"
+
+#~ msgid ""
+#~ "Totem could not play this media (%s) although a plugin is present to "
+#~ "handle it."
+#~ msgstr ""
+#~ "このメディア (%s) を操作するプラグインはありますが、Totem はそのメディアを"
+#~ "再生できませんでした。"
+
+#~ msgid ""
+#~ "You might want to check that a disc is present in the drive and that it "
+#~ "is correctly configured."
+#~ msgstr ""
+#~ "ドライブの中にディスクがあるか確認して、そのドライブが正しく設定されている"
+#~ "ことを確認してください。"
+
+#~ msgid "More information about media plugins"
+#~ msgstr "メディア・プラグインの詳細情報"
+
+#~ msgid ""
+#~ "Please install the necessary plugins and restart Totem to be able to play "
+#~ "this media."
+#~ msgstr ""
+#~ "必要なプラグインをインストールして Totem を再起動すると、このメディアを再"
+#~ "生できます。"
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it does not have the "
+#~ "appropriate plugins to be able to read from the disc."
+#~ msgstr ""
+#~ "この種類のメディア (%s) を読み取るプラグインがないため、そのメディアを再生"
+#~ "できません。"
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because you do not have the "
+#~ "appropriate plugins to handle it."
+#~ msgstr ""
+#~ "この種類のメディア (%s) を操作する適切なプラグインがないため、そのメディア"
+#~ "を再生できません。"
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it is not supported."
+#~ msgstr ""
+#~ "この種類のメディア (%s) はサポートしていないため、そのメディアを再生できま"
+#~ "せん。"
+
+#~ msgid "Please insert another disc to play back."
+#~ msgstr "他のディスクを挿入してください。"
+
+#~ msgid "Totem does not support playback of Audio CDs"
+#~ msgstr "Totem では音楽 CD の再生をサポートしていません"
+
+#~ msgid ""
+#~ "Please consider using a music player or a CD extractor to play this CD"
+#~ msgstr ""
+#~ "この CD を再生できる楽曲プレイヤーまたは CD 取り込みツールを利用してみてく"
+#~ "ださい。"
+
+#~ msgid "%d %%"
+#~ msgstr "%d %%"
+
+#~ msgid ""
+#~ "The requested audio output was not found. Please select another audio "
+#~ "output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "指定した音声出力デバイスが見つかりませんでした。[マルチメディア・システ"
+#~ "ム・セレクター] から別のデバイスを選択してみてください。"
+
+#~ msgid "Location not found."
+#~ msgstr "指定した場所が見つかりません。"
+
+#~ msgid ""
+#~ "Could not open location; you might not have permission to open the file."
+#~ msgstr "場所を開けませんでした (そのファイルを開く権限がありません)。"
+
+#~ msgid ""
+#~ "The video output is in use by another application. Please close other "
+#~ "video applications, or select another video output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "他のアプリケーションが映像出力デバイスを使用しています。そのアプリケーショ"
+#~ "ンを終了するか、[マルチメディア・システム・セレクター] から別のデバイスを"
+#~ "選択してみてください。"
+
+#~ msgid ""
+#~ "The audio output is in use by another application. Please select another "
+#~ "audio output in the Multimedia Systems Selector. You may want to consider "
+#~ "using a sound server."
+#~ msgstr ""
+#~ "他のアプリケーションが音声出力デバイスを使用しています。[マルチメディア・"
+#~ "システム・セレクター] から別のデバイスを選択してみてください (サウンド・"
+#~ "サーバーの利用を考慮した方が良いかもしれません)。"
+
+#~ msgid ""
+#~ "Failed to create a GStreamer play object. Please check your GStreamer "
+#~ "installation."
+#~ msgstr ""
+#~ "GStreamer 演奏オブジェクトの生成に失敗しました。GStreamer が正しくインス"
+#~ "トールされているか確認してください。"
+
+#~ msgid ""
+#~ "Failed to open audio output. You may not have permission to open the "
+#~ "sound device, or the sound server may not be running. Please select "
+#~ "another audio output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "音声出力デバイスを開けませんでした。サウンド・デバイスを開く権限がないか、"
+#~ "あるいはサウンド・サーバーが起動されていないかもしれません。[マルチメディ"
+#~ "ア・システム・セレクター] から別のデバイスを選択してみてください。"
+
+#~ msgid ""
+#~ "Could not find the audio output. You may need to install additional "
+#~ "GStreamer plugins, or select another audio output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "音声出力デバイスが見つかりませんでした。GStreamer のプラグインを追加でイン"
+#~ "ストールするか、あるいは [マルチメディア・システム・セレクター] から別の音"
+#~ "声出力デバイスを選択してみてください。"
+
+#~ msgid "BBC iPlayer"
+#~ msgstr "BBC iPlayer"
+
+#~ msgid ""
+#~ "Stream BBC programs from the last 7 days from the BBC iPlayer service."
+#~ msgstr "BBC iPlayer サービスの最新7日分から BBC の番組をストリーミング"
+
+#~ msgid "Error listing channel categories"
+#~ msgstr "チャンネルのカテゴリの一覧の表示中にエラー"
+
+#~ msgid ""
+#~ "There was an unknown error getting the list of television channels "
+#~ "available on BBC iPlayer."
+#~ msgstr ""
+#~ "BBC iPlayer で利用可能なテレビ・チャンネルの一覧の取得中に不明なエラーが発"
+#~ "生しました"
+
+#~ msgid "Loading…"
+#~ msgstr "読み込み中..."
+
+#~ msgid "Error getting programme feed"
+#~ msgstr "番組フィードの取得中にエラー"
+
+#~ msgid ""
+#~ "There was an error getting the list of programmes for this channel and "
+#~ "category combination."
+#~ msgstr ""
+#~ "このチャンネルとカテゴリの組み合わせの番組の一覧の取得中にエラーが発生しま"
+#~ "した。"
+
+#~ msgid ""
+#~ msgstr "<理由はありません>"
+
+#~ msgid "Programme unavailable (\"%s\")"
+#~ msgstr "番組が利用できません (\"%s\")"
+
+#~ msgid "Publisher protocol to use"
+#~ msgstr "利用するプロトコルの発行元"
+
+#~ msgid ""
+#~ "The transport protocol to use when publishing playlists over the network."
+#~ msgstr ""
+#~ "ネットワーク越しでプレイリストを発行する際に利用する転送プロトコルです。"
+
+#~ msgid "Format for network service name"
+#~ msgstr "ネットワークサービス名のフォーマット"
+
+#~ msgid ""
+#~ "A format string used to build the network service name used when "
+#~ "publishing playlists over the network. The following format placeholders "
+#~ "can be used: • %a: the program name as returned by g_get_application_name"
+#~ "() • %h: the machine's host name in title case • %u: the user's login "
+#~ "name in title case • %U: the user's real name • %%: the percent sign"
+#~ msgstr ""
+#~ "ネットワーク越しにプレイリストを発行する際に、使われているネットワークサー"
+#~ "ビス名を構築するために使うフォーマット文字列。以下のフォーマットプレースホ"
+#~ "ルダーが利用できます: • %a:  g_get_application_name()で返されるプログラム"
+#~ "名 • %h: タイトルにマシンのホスト名 • %u: タイトルにユーザーログイン名 • "
+#~ "%U: ユーザーの本名 • %%: パーセント文字"
+
+#~ msgid "Neighbors"
+#~ msgstr "近隣"
+
+#~ msgid "Publish Playlist"
+#~ msgstr "プレイリストの公開"
+
+#~ msgid "Share the current playlist via HTTP"
+#~ msgstr "HTTP 経由でプレイリストを共有します"
+
+#~ msgid "Service _Name:"
+#~ msgstr "サービス名(_N):"
+
+#~ msgid ""
+#~ "The name used for announcing the playlist service on the network.\n"
+#~ "All occurrences of the string %u will be replaced by your name,\n"
+#~ "and %h will be replaced by your computer's host name."
+#~ msgstr ""
+#~ "ネットワーク上でプレイリストを公開するサービスに使用する名称です。\n"
+#~ "%u という文字はあなたの名前に置き換えられ、%h という\n"
+#~ "文字はお使いのコンピューターのホスト名で置き換えられます。"
+
+#~ msgid "Use _encrypted transport protocol (HTTPS)"
+#~ msgstr "HTTPS (暗号化転送プロトコル) を使って公開する(_E)"
+
+#~ msgid "_Name:"
+#~ msgstr "名前(_N):"
+
+#~ msgid "Save in _folder:"
+#~ msgstr "フォルダーに保存(_F):"
+
+#~ msgid "Select a folder"
+#~ msgstr "フォルダーの選択"
+
+#~ msgid "There was an error saving the screenshot."
+#~ msgstr "スクリーンショットを保存する際にエラーが発生しました。"
+
+#~ msgid "Save Screenshot"
+#~ msgstr "スクリーンショットの保存"
 
 #~ msgid "Bemused"
 #~ msgstr "Bemused"
@@ -2723,9 +2777,6 @@
 #~ msgid "Search Results"
 #~ msgstr "検索結果"
 
-#~ msgid "Videos"
-#~ msgstr "動画"
-
 #~ msgid "_Open in Web Browser"
 #~ msgstr "ブラウザーで開く(_O)"
 
@@ -3022,25 +3073,25 @@
 #~ "Approximate network connection speed, used to select quality on media "
 #~ "over the network: \"0\" for 14.4 Kbps Modem, \"1\" for 19.2 Kbps Modem, "
 #~ "\"2\" for 28.8 Kbps Modem, \"3\" for 33.6 Kbps Modem, \"4\" for 34.4 Kbps "
-#~ "Modem, \"5\" for 56 Kbps Modem/ISDN, \"6\" for 112 Kbps Dual ISDN/DSL, \"7"
-#~ "\" for 256 Kbps DSL/Cable, \"8\" for 384 Kbps DSL/Cable, \"9\" for 512 "
+#~ "Modem, \"5\" for 56 Kbps Modem/ISDN, \"6\" for 112 Kbps Dual ISDN/DSL, "
+#~ "\"7\" for 256 Kbps DSL/Cable, \"8\" for 384 Kbps DSL/Cable, \"9\" for 512 "
 #~ "Kbps DSL/Cable, \"10\" for 1.5 Mbps T1/Intranet/LAN, \"11\" for Intranet/"
 #~ "LAN."
 #~ msgstr ""
 #~ "ネットワークのおおよその接続スピードです。ネットワーク越しのメディアの品質"
-#~ "を決定する際に使用する情報です。指定可能な値: \"0\" (14.4 Kbps のモデム)、"
-#~ "\"1\" (19.2 Kbps のモデム)、\"2\" (28.8 Kbps のモデム)、\"3\" (33.6 Kbps "
-#~ "のモデム)、\"4\" (34.4 Kbps のモデム)、\"5\" (56 Kbps のモデム/ISDN)、\"6"
-#~ "\" (112 Kbps の Dual ISDN/DSL)、\"7\" (256 Kbps DSL/Cable)、\"8\" (384 "
-#~ "Kbps DSL/Cable)、\"9\" (512 Kbps DSL/Cable)、\"10\" (1.5 Mbps T1/Intranet/"
-#~ "LAN)、\"11\" (イントラネット/LAN)"
+#~ "を決定する際に使用する情報です。指定可能な値: \"0\" (14.4 Kbps のモデ"
+#~ "ム)、\"1\" (19.2 Kbps のモデム)、\"2\" (28.8 Kbps のモデム)、\"3\" (33.6 "
+#~ "Kbps のモデム)、\"4\" (34.4 Kbps のモデム)、\"5\" (56 Kbps のモデム/"
+#~ "ISDN)、\"6\" (112 Kbps の Dual ISDN/DSL)、\"7\" (256 Kbps DSL/"
+#~ "Cable)、\"8\" (384 Kbps DSL/Cable)、\"9\" (512 Kbps DSL/"
+#~ "Cable)、\"10\" (1.5 Mbps T1/Intranet/LAN)、\"11\" (イントラネット/LAN)"
 
 #~ msgid ""
 #~ "Quality settings for the audio visualization: \"0\" for small, \"1\" for "
 #~ "normal, \"2\" for large, \"3\" for extra large."
 #~ msgstr ""
-#~ "視覚効果の大きさです。指定可能な値: \"0\" (小さい)、\"1\" (標準)、\"2"
-#~ "\" (大きい)、\"3\" (巨大)"
+#~ "視覚効果の大きさです。指定可能な値: \"0\" (小さい)、\"1\" (標"
+#~ "準)、\"2\" (大きい)、\"3\" (巨大)"
 
 #~ msgid ""
 #~ "Type of audio output to use: \"0\" for stereo, \"1\" for 4-channel "
@@ -3048,8 +3099,8 @@
 #~ "for AC3 Passthrough."
 #~ msgstr ""
 #~ "使用する音声出力の種類です。使用可能な値: \"0\" (ステレオ)、\"1\" (4 チャ"
-#~ "ンネル出力)、\"2\" (5.0 チャンネル出力)、\"3\" (5.1 チャンネル出力)、\"4"
-#~ "\" (AC3 Pasthrough)"
+#~ "ンネル出力)、\"2\" (5.0 チャンネル出力)、\"3\" (5.1 チャンネル出"
+#~ "力)、\"4\" (AC3 Pasthrough)"
 
 #~ msgid "UTF-8"
 #~ msgstr "UTF-8"
@@ -3102,9 +3153,6 @@
 #~ msgid "Jamendo Plugin Configuration"
 #~ msgstr "Jamendo プラグインの設定"
 
-#~ msgid "Could not load the \"Skip to\" dialog interface."
-#~ msgstr "\"スキップ\" ダイアログのインターフェースを読み込めませんでした。"
-
 #~ msgid "Deinterlace"
 #~ msgstr "インタレース除去"
 
diff -Nru totem-3.4.3/po/km.po totem-3.6.2/po/km.po
--- totem-3.4.3/po/km.po	1970-01-01 00:00:00.000000000 +0000
+++ totem-3.6.2/po/km.po	2012-10-09 15:42:00.000000000 +0000
@@ -0,0 +1,2961 @@
+# translation of po_totem-km.po to Khmer
+# Khmer translation for totem
+# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
+# This file is distributed under the same license as the totem package.
+# FIRST AUTHOR , 2008.
+# Khoem Sokhem , 2012.
+# Sok Sophea , 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: po_totem-km\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=totem&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2012-09-27 05:53+0000\n"
+"PO-Revision-Date: 2012-09-26 15:28+0700\n"
+"Last-Translator: Sok Sophea \n"
+"Language-Team: Khmer <>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: WordForge 0.8 RC1\n"
+"X-Language: km-KH\n"
+
+#: ../browser-plugin/totem-plugin-viewer.c:352 ../src/totem-object.c:1180
+#: ../src/totem-object.c:1650 ../src/totem-statusbar.c:115
+msgid "Stopped"
+msgstr "បាន​បញ្ឈប់"
+
+#: ../browser-plugin/totem-plugin-viewer.c:364 ../src/totem-object.c:1173
+msgid "Paused"
+msgstr "បាន​ផ្អាក"
+
+#: ../browser-plugin/totem-plugin-viewer.c:368 ../src/totem-object.c:1166
+msgid "Playing"
+msgstr "កំពុង​ចាក់"
+
+#: ../browser-plugin/totem-plugin-viewer.c:386
+#: ../src/plugins/screensaver/totem-screensaver.c:97
+msgid "Playing a movie"
+msgstr "ចាក់​តន្ត្រី"
+
+#: ../browser-plugin/totem-plugin-viewer.c:443
+msgid "No URI to play"
+msgstr "គ្មាន URI ត្រូវ​ចាក់"
+
+#: ../browser-plugin/totem-plugin-viewer.c:676
+#: ../browser-plugin/totem-plugin-viewer.c:1700
+msgid "Totem Movie Player"
+msgstr "កម្មវិធី​ចាក់​ភាពយន្ត Totem"
+
+#. translators: this is:
+#. * Open With ApplicationName
+#. * as in nautilus' right-click menu
+#: ../browser-plugin/totem-plugin-viewer.c:1120
+#, c-format
+msgid "_Open with \"%s\""
+msgstr "បើក​ជា​មួយ \"%s\""
+
+#: ../browser-plugin/totem-plugin-viewer.c:1341 ../src/totem-object.c:2475
+msgid "An error occurred"
+msgstr "កំហុស​មួយ​បាន​កើត​ឡើង"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2033
+msgid "No playlist or playlist empty"
+msgstr "គ្មាន​បញ្ជីចាក់ ឬ​បញ្ជី​ចាក់ទទេ"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2128
+msgid "Movie browser plugin"
+msgstr "កម្មវិធី​ជំនួយ​របស់​កម្មវិធី​រុករក​ភាពយន្ត"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144 ../src/totem.c:241
+msgid "Could not initialize the thread-safe libraries."
+msgstr "មិន​អាច​ចាប់​ផ្ដើម​បណ្ណាល័យ​ខ្សែស្រឡាយ​ដែល​មាន​​សវុត្ថិភាព​បាន​ទេ ។"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144
+msgid "Verify your system installation. The Totem plugin will now exit."
+msgstr "ផ្ទៀងផ្ទាត់​ការ​ដំឡើង​ប្រព័ន្ធ​របស់​អ្នក ។ កម្មវិធី​ជំនួយ Totem នឹង​ចាកចេញ​ឥឡូវ ។"
+
+#: ../data/fullscreen.ui.h:1
+msgid "Leave Fullscreen"
+msgstr "ចេញ​ពី​ពេញ​អេក្រង់"
+
+#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:81
+msgid "Time:"
+msgstr "ពេលវេលា ៖"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
+msgid "Allow the screensaver to activate when playing audio"
+msgstr "អនុញ្ញាត​ឲ្យធាតុ​រក្សាអេក្រង់​សកម្ម​នៅ​ពេល​ចាក់​អូឌីយ៉ូ"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
+msgid ""
+"Allow the screensaver to activate when playing audio. Disable if you have "
+"monitor-powered speakers."
+msgstr "អនុញ្ញាត​​ឲ្យ​ធាតុ​រក្សា​អេក្រង់​សកម្មភាព នៅ​ពេល​ចាក់​អូឌីយ៉ូ​​​។ បិទ​ប្រសិនបើ​អ្នក​មាន​ធុង​បាស​។"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
+msgid "Show visual effects when no video is displayed"
+msgstr "បង្ហាញ​បែបផែន​វីដេអូ​នៅ​ពេល​គ្មាន​វីដេអូ​បង្ហាញ"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
+msgid "Show visual effects when playing an audio only file."
+msgstr "បង្ហាញ​បែបផែន​វីដេអូ​នៅ​ពេល​ចាក់​តែ​ឯកសារ​អូឌីយ៉ូ"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
+msgid "Name of the visual effects plugin"
+msgstr "ឈ្មោះ​កម្មវិធី​ជំនួយ​បែបផែន​ដែល​មើល​ឃើញ"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
+msgid "The brightness of the video"
+msgstr "ពន្លឺ​វីដេអូ"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
+msgid "The contrast of the video"
+msgstr "កម្រិត​ពន្លឺ​វីដេអូ"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
+msgid "The hue of the video"
+msgstr "ពណ៌​លាំ​របស់​វីដេអូ"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
+msgid "The saturation of the video"
+msgstr "តិត្ថិភាព​របស់​វីដែអូ"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
+msgid "Resize the canvas automatically on file load"
+msgstr "ផ្លាស់ប្ដូរ​ទំហំ​ផ្ទាំង​កំណាត់​ដោយ​ស្វ័យ​ប្រវត្តិ​នៅ​លើ​ឯកសារ​ដែល​ផ្ទុក"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
+msgid "Repeat mode"
+msgstr "របៀប​ធ្វើ​ម្ដង​ទៀត"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
+msgid "Shuffle mode"
+msgstr "របៀប​ច្របល់"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
+msgid "Whether to disable deinterlacing for interlaced movies"
+msgstr "ថា​តើ​ត្រូវ​បិទ​ការ​មិន​ត្របាញ់​សម្រាប់​ភាព​យន្ត​ដែល​ត្របាញ់​ដែរ​ឬទេ"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
+msgid "Whether to enable debug for the playback engine"
+msgstr "ថា​តើ​ត្រូវ​បើក​ការ​បំបាត់​កំហុស​សម្រាប់​ម៉ាស៊ីន​ចាក់ឡើង​វិញ​ដែរឬទេ"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
+msgid "Type of audio output to use"
+msgstr "ប្រភេទ​លទ្ធផល​អូឌីយ៉ូ​ត្រូវ​ប្រើ"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
+msgid "Visualization quality setting"
+msgstr "ការ​កំណត់​គុណភាព​មើល​ឃើញ"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
+msgid "Quality setting for the audio visualization."
+msgstr "ការ​កំណត់​គុណភាព​មើល​ឃើញ​សម្រាប់​ការ​មើលឃើញ​អូឌីយ៉ូ ។"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
+msgid "Network buffering threshold"
+msgstr "កម្រិត​ពន្លឺ​​នៃ​អង្គ​ចងចាំ​បណ្ដោះ​អាសន្ន​បណ្ដាញ"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
+msgid ""
+"Amount of data to buffer for network streams before starting to display the "
+"stream (in seconds)."
+msgstr ""
+"ចំនួន​ទិន្នន័យ​សរុប​ត្រូវ​បង្កើត​ជា​អង្គ​ចងចាំ​បណ្ដោះ​អាសន្ន​សម្រាប់​ស្ទ្រីម​បណ្ដាញ មុន​នឹង​ចាប់ផ្ដើម​បង្ហាញ​ស្ទ្រីម​ (គិត​"
+"ជា​វិនាទី)"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
+msgid "Subtitle font"
+msgstr "ពុម្ពអក្សរ​ចំណង​ជើង​រង"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
+msgid "Pango font description for subtitle rendering."
+msgstr "ការ​ពណ៌នា​ពុម្ពអក្សរ Pango សម្រាប់​ការ​បង្ហាញ​ចំណង​ជើង​រង ។"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
+msgid "Subtitle encoding"
+msgstr "ការ​អ៊ិនកូដ​ចំណង​ជើង​រង"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
+msgid "Encoding character set for subtitle."
+msgstr "ការ​អ៊ិនកូដ​សំណុំ​តួអក្សរ​សម្រាប់​ចំណង​ជើង​រង ។"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
+msgid "Default location for the \"Open...\" dialogs"
+msgstr "ទីតាំង​លំនាំដើម​សម្រាប់​ប្រអប់ \"បើក...\""
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
+msgid ""
+"Default location for the \"Open...\" dialogs. Default is the current "
+"directory."
+msgstr "ទីតាំង​លំនាំដើម​សម្រាប់​ប្រអប់ \"បើក...\" ។ លំនាំដើម​គឺ​ថត​​បច្ចុប្បន្ន ។"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
+msgid "Default location for the \"Take Screenshot\" dialogs"
+msgstr "ទីតាំង​លំនាំដើម​សម្រាប់​ប្រអប់ \"ថត​អេក្រង់\""
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
+msgid ""
+"Default location for the \"Take Screenshot\" dialogs. Default is the "
+"Pictures directory."
+msgstr "ទីតាំង​លំនាំដើម​សម្រាប់​ប្រអប់ \"ថត​អេក្រង់\" ។ លំនាំដើម​គឺ​ថត​រូបភាព ។"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
+msgid "Whether to disable the plugins in the user's home directory"
+msgstr "ថា​តើ​ត្រូវ​បិទ​កម្មវិធី​ជំនួយ​នៅ​ក្នុង​ថត​ផ្ទះ​របស់​អ្នក​ប្រើ​ដែរ​ឬទេ"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
+msgid "Whether to disable the keyboard shortcuts"
+msgstr "ថា​តើ​ត្រូវ​បិទ​ផ្លូវកាត់​ក្ដារចុច​ដែរឬទេ"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
+msgid "Whether to autoload text subtitle files when a movie is loaded"
+msgstr "ថា​តើ​ត្រូវ​ផ្ទុក​ឯកសារ​ចំណង​ជើង​ដោយ​ស្វ័យ​ប្រវត្តិ​ដែរ​ឬទេ នៅ​ពេល​ផ្ទុក​ភាព​យន្ត"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
+msgid "Whether to autoload external chapter files when a movie is loaded"
+msgstr "ថា​តើ​ត្រូវ​ផ្ទុក​ឯកសារ​ជំពូក​ខាង​ក្រៅ​ដោយ​ស្វ័យប្រវត្តិ​ដែរ​ឬទេ​នៅ​ពេល​ផ្ទុក​វីដេអូ"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
+msgid ""
+"Whether to remember the position of played audio/video files when pausing or "
+"closing them"
+msgstr "ថា​តើ​ត្រូវ​ចងចាំ​ទីតាំង​របស់​ឯកសារ​អូឌីយ៉ូ/វីដេអូ​ នៅ​ពេល​ផ្អាក ឬ​បិទ​ពួកវា​ដែរឬទេ"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
+msgid "Active plugins list"
+msgstr "បញ្ជី​​កម្មវិធី​ជំនួយ​សកម្ម"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+msgid ""
+"A list of the names of the plugins which are currently active (loaded and "
+"running)."
+msgstr "បញ្ជី​ឈ្មោះ​របស់​កម្មវិធី​ជំនួយ ដែល​បច្ចុប្បន្ន​សកម្ម (បាន​ផ្ទុក ហើយ​ដំណើរការ) ។"
+
+#: ../data/playlist.ui.h:1
+msgid "_Remove"
+msgstr "យកចេញ"
+
+#: ../data/playlist.ui.h:2
+msgid "Remove file from playlist"
+msgstr "យក​ឯកសារ​ចេញ​ពី​បញ្ជី​ចាក់"
+
+#: ../data/playlist.ui.h:3 ../data/video-list.ui.h:3
+msgid "_Copy Location"
+msgstr "ចម្លង​ទីតាំង"
+
+#: ../data/playlist.ui.h:4 ../data/video-list.ui.h:4
+msgid "Copy the location to the clipboard"
+msgstr "ចម្លង​ទីតាំង​ទៅ​ក្ដារ​តម្បៀត​ខ្ទាស់"
+
+#: ../data/playlist.ui.h:5 ../data/totem.ui.h:71
+msgid "_Select Text Subtitles..."
+msgstr "ជ្រើសរើស​​អត្ថបទ​ចំណង​ជើង​រង..."
+
+#: ../data/playlist.ui.h:6 ../data/totem.ui.h:72
+msgid "Select a file to use for text subtitles"
+msgstr "ជ្រើសរើស​ឯកសារ​ត្រូវ​ប្រើ​សម្រាប់​អត្ថបទ​ចំណង​ជើង​រង"
+
+#: ../data/playlist.ui.h:7
+msgid "Add..."
+msgstr "បន្ថែម..."
+
+#: ../data/playlist.ui.h:8
+msgid "Remove"
+msgstr "យកចេញ"
+
+#: ../data/playlist.ui.h:9
+msgid "Save Playlist..."
+msgstr "រក្សាទុក​បញ្ជី​ចាក់​​..."
+
+#: ../data/playlist.ui.h:10
+msgid "Move Up"
+msgstr "ផ្លាស់​ទី​ឡើង​លើ"
+
+#: ../data/playlist.ui.h:11
+msgid "Move Down"
+msgstr "ផ្លាស់​ទី​ចុះ​ក្រោម"
+
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:2
+msgid "Normal"
+msgstr "ធម្មតា"
+
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:4
+msgid "Large"
+msgstr "ធំ"
+
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:6
+msgid "Extra Large"
+msgstr "ធំ​សម្បើម"
+
+#: ../data/preferences.ui.h:7 ../src/backend/bacon-video-widget.c:5522
+#: ../src/totem-properties-view.c:232
+msgid "Stereo"
+msgstr "ស្តេរេអូ"
+
+#: ../data/preferences.ui.h:8
+msgid "4-channel"
+msgstr "ឆានែល ៤"
+
+#: ../data/preferences.ui.h:9
+msgid "4.1-channel"
+msgstr "ឆានែល ៤.១"
+
+#: ../data/preferences.ui.h:10
+msgid "5.0-channel"
+msgstr "ឆានែល ៥.០"
+
+#: ../data/preferences.ui.h:11
+msgid "5.1-channel"
+msgstr "ឆានែល ៥.១"
+
+#: ../data/preferences.ui.h:12
+msgid "AC3 Passthrough"
+msgstr "ឆ្លងកាត់​ AC3"
+
+#: ../data/preferences.ui.h:13
+msgid "Totem Preferences"
+msgstr "ចំណូល​ចិត្ត​របស់ Totem"
+
+#: ../data/preferences.ui.h:14
+msgid "Playback"
+msgstr "ចាក់​ឡើងវិញ"
+
+#: ../data/preferences.ui.h:15
+msgid "Start playing files from last position"
+msgstr "ចាប់ផ្ដើម​ចាក់​ឯកសារ​ពី​ទីតាំង​ចុងក្រោយ"
+
+#: ../data/preferences.ui.h:16
+msgid "Text Subtitles"
+msgstr "អត្ថបទ​ចំណង​ជើង​រង"
+
+#: ../data/preferences.ui.h:17
+msgid "_Load subtitle files when movie is loaded"
+msgstr "ផ្ទុក​ឯកសារ​ចំណងជើង​រង​ នៅពេល​បាន​ផ្ទុក​ភាពយន្ត"
+
+#: ../data/preferences.ui.h:18
+msgid "_Font:"
+msgstr "ពុម្ពអក្សរ ៖"
+
+#: ../data/preferences.ui.h:19
+msgid "_Encoding:"
+msgstr "ការ​អ៊ីនកូដ ៖"
+
+#: ../data/preferences.ui.h:20
+msgid "External Chapters"
+msgstr "ជំពួក​ខាង​ក្រៅ"
+
+#: ../data/preferences.ui.h:21
+msgid "Load _chapter files when movie is loaded"
+msgstr "ផ្ទុក​​ឯកសារ​ជំពូក​ នៅ​ពេល​ផ្ទុក​ភាព​យន្ត"
+
+#: ../data/preferences.ui.h:22 ../data/properties.ui.h:1
+msgid "General"
+msgstr "ទូទៅ"
+
+#. Tab label in the Preferences dialogue
+#: ../data/preferences.ui.h:24
+msgid "Display"
+msgstr "បង្ហាញ"
+
+#: ../data/preferences.ui.h:25
+msgid "_Resize the window when a new video is loaded"
+msgstr "ផ្លាស់ប្ដូរ​ទំហំ​បង្អួច នៅ​ពេល​វីដេអូ​បាន​ផ្ទុក"
+
+#: ../data/preferences.ui.h:26
+msgid "Disable _deinterlacing of interlaced videos"
+msgstr "បិទ​ការ​មិន​ត្របាញ់​នៃ​វិដេអូ​ដែល​បាន​ត្របាញ់"
+
+#: ../data/preferences.ui.h:27
+msgid "Disable screensaver when playing "
+msgstr "បិទ​ធាតុ​រក្សាអេក្រង់​នៅ​ពេល​ចាក់ "
+
+#: ../data/preferences.ui.h:28 ../data/properties.ui.h:9
+#: ../src/totem-properties-view.c:275
+msgid "Video"
+msgstr "វីដេអូ ៖"
+
+#: ../data/preferences.ui.h:29
+msgid "Video or Audio"
+msgstr "វីដែអូ ឬ​អូឌីយ៉ូ"
+
+#: ../data/preferences.ui.h:30
+msgid "Visual Effects"
+msgstr "បែបផែន​ដែល​មើល​ឃើញ"
+
+#: ../data/preferences.ui.h:31
+msgid "Show _visual effects when an audio file is played"
+msgstr "បង្ហាញបែបផែន​ដែល​មើល​ឃើញ នៅ​ពេល​ចាក់​ឯកសារ​អូឌីយ៉ូ"
+
+#: ../data/preferences.ui.h:32
+msgid "_Type of visualization:"
+msgstr "ប្រភេទ​នៃ​ការ​មើល​ឃើញ ៖"
+
+#: ../data/preferences.ui.h:33
+msgid "Visualization _size:"
+msgstr "ទំហំ​នៃ​ការមើល​ឃើញ ៖"
+
+#: ../data/preferences.ui.h:34
+msgid "Color Balance"
+msgstr "តុល្យភាព​ពណ៌"
+
+#: ../data/preferences.ui.h:35
+msgid "_Brightness:"
+msgstr "ពន្លឺ ៖"
+
+#: ../data/preferences.ui.h:36
+msgid "Co_ntrast:"
+msgstr "កម្រិត​ពន្លឺ ៖"
+
+#: ../data/preferences.ui.h:37
+msgid "Sat_uration:"
+msgstr "តិត្ថិភាព ៖"
+
+#: ../data/preferences.ui.h:38
+msgid "_Hue:"
+msgstr "ពណ៌​លាំៗ ៖"
+
+#: ../data/preferences.ui.h:39
+msgid "Reset to _Defaults"
+msgstr "កំណត់​ទៅ​លំនាំដើម"
+
+#: ../data/preferences.ui.h:40
+msgid "Audio Output"
+msgstr "លទ្ធផល​អូឌីយ៉ូ"
+
+#: ../data/preferences.ui.h:41
+msgid "_Audio output type:"
+msgstr "ប្រភេទ​លទ្ធផល​អូឌីយ៉ូ ៖"
+
+#: ../data/preferences.ui.h:42 ../data/properties.ui.h:14
+#: ../src/totem-properties-view.c:273
+msgid "Audio"
+msgstr "អូឌីយ៉ូ"
+
+#: ../data/properties.ui.h:2
+msgid "Title:"
+msgstr "ចំណង​ជើង ៖"
+
+#: ../data/properties.ui.h:3
+msgid "Artist:"
+msgstr "សិល្បករ ៖"
+
+#: ../data/properties.ui.h:4
+msgid "Duration:"
+msgstr "ថិរវេលា ៖"
+
+#: ../data/properties.ui.h:5
+msgid "Year:"
+msgstr "ឆ្នាំ ៖"
+
+#: ../data/properties.ui.h:6
+msgid "Album:"
+msgstr "អាល់ប៊ុម ៖"
+
+#: ../data/properties.ui.h:7
+msgid "Comment:"
+msgstr "មតិយោបល់ ៖"
+
+#: ../data/properties.ui.h:8
+msgid "Container:"
+msgstr "ឧបករណ៍​ផ្ទុក ៖"
+
+#: ../data/properties.ui.h:10
+msgid "Dimensions:"
+msgstr "វិមាត្រ"
+
+#: ../data/properties.ui.h:11
+msgid "Codec:"
+msgstr "កូឌិក ៖"
+
+#: ../data/properties.ui.h:12
+msgid "Framerate:"
+msgstr "Framerate:"
+
+#: ../data/properties.ui.h:13
+msgid "Bitrate:"
+msgstr "អត្រាប៊ីត ៖"
+
+#: ../data/properties.ui.h:15
+msgid "Sample rate:"
+msgstr "អត្រាគំរូ ៖"
+
+#: ../data/properties.ui.h:16
+msgid "Channels:"
+msgstr "ឆានែល ៖"
+
+#. Title
+#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:80 ../src/totem.c:240
+#: ../src/totem.c:249 ../src/totem-menu.c:789 ../src/totem-object.c:1658
+msgid "Videos"
+msgstr "វីដេអូ"
+
+#: ../data/totem.desktop.in.in.in.h:2
+msgid "Play movies"
+msgstr "ចាក់​ភាពយន្ត"
+
+#: ../data/totem.desktop.in.in.in.h:3
+msgid "Video;Movie;Film;Clip;Series;Player;DVD;TV;Disc;"
+msgstr "Video;Movie;Film;Clip;Series;Player;DVD;TV;Disc;"
+
+#: ../data/totem.ui.h:1
+msgid "_Open"
+msgstr "បើក"
+
+#: ../data/totem.ui.h:2
+msgid "Open _Location"
+msgstr "បើក​ទីតាំង"
+
+#: ../data/totem.ui.h:3
+msgid "_Fullscreen"
+msgstr "ពេញអេក្រង់"
+
+#: ../data/totem.ui.h:4
+msgid "Prefere_nces"
+msgstr "ចំណូល​ចិត្ត"
+
+#: ../data/totem.ui.h:5
+msgid "Shuff_le"
+msgstr "ចៃដន្យ"
+
+#: ../data/totem.ui.h:6
+msgid "_Repeat"
+msgstr "ធ្វើ​ម្ដងទៀត"
+
+#: ../data/totem.ui.h:7
+msgid "_Quit"
+msgstr "ចេញ"
+
+#: ../data/totem.ui.h:8
+msgid "_Movie"
+msgstr "ភាព​យន្ត"
+
+#: ../data/totem.ui.h:9
+msgid "_Eject"
+msgstr "ច្រាន​ចេញ"
+
+#: ../data/totem.ui.h:10
+msgid "Eject the current disc"
+msgstr "ច្រាន​ថាស​បច្ចុប្បន្ន​ចេញ"
+
+#: ../data/totem.ui.h:11
+msgid "_Properties"
+msgstr "លក្ខណសម្បត្តិ"
+
+#: ../data/totem.ui.h:12
+msgid "View the properties of the current stream"
+msgstr "មើល​លក្ខណស​ម្បត្តិ​របស់​ស្ទ្រីម​បច្ចុប្បន្ន"
+
+#: ../data/totem.ui.h:13
+msgid "Play / P_ause"
+msgstr "ចាក់/ផ្អាក"
+
+#: ../data/totem.ui.h:14
+msgid "Play or pause the movie"
+msgstr "ចាក់ ឬ​ផ្អាក​ភាពយន្ត"
+
+#: ../data/totem.ui.h:15
+msgid "_Edit"
+msgstr "កែសម្រួល"
+
+#: ../data/totem.ui.h:16
+msgid "_Clear Playlist"
+msgstr "សម្អាត​បញ្ជី​ចាក់"
+
+#: ../data/totem.ui.h:17
+msgid "Clear the playlist"
+msgstr "សម្អាត​បញ្ជី​ចាក់"
+
+#: ../data/totem.ui.h:18
+msgid "Plugins..."
+msgstr "កម្មវិធី​ជំនួយ..."
+
+#: ../data/totem.ui.h:19
+msgid "Configure plugins to extend the application"
+msgstr "កំណត់​រចនាសម្ព័ន្ធ​កម្មវិធី ដើម្បី​ពង្រីក​កម្មវិធី"
+
+#: ../data/totem.ui.h:20
+msgid "_View"
+msgstr "មើល"
+
+#: ../data/totem.ui.h:21
+msgid "Fit Window to Movie"
+msgstr "ធ្វើ​ឲ្យ​បង្អួច​សម​នឹង​ភាពយន្ត"
+
+#: ../data/totem.ui.h:22
+msgid "_Resize 1:2"
+msgstr "ផ្លាស់ប្ដូរ​ទំហំ ១ ៖ ២"
+
+#: ../data/totem.ui.h:23
+msgid "Resize to half the original video size"
+msgstr "ផ្លាស់ប្ដូរ​ទំហំ​ពាក់កណ្ដាល​ទំហំ​វីដេអូ​ដើម"
+
+#: ../data/totem.ui.h:24
+msgid "Resize _1:1"
+msgstr "ផ្លាស់ប្ដូរ​ទំហំ ១ ៖ ១"
+
+#: ../data/totem.ui.h:25
+msgid "Resize to the original video size"
+msgstr "ផ្លាស់ប្ដូរ​ទំហំ​វីដេអូ​ដើម"
+
+#: ../data/totem.ui.h:26
+msgid "Resize _2:1"
+msgstr "ផ្លាស់ប្ដូ​រ​ទំហំ ២ ៖ ១"
+
+#: ../data/totem.ui.h:27
+msgid "Resize to double the original video size"
+msgstr "ផ្លាស់ប្ដូរ​ទំហំ​ទ្វេ​ដង​​នឹង​ទំហំ​វីដេអូ​ដើម"
+
+#: ../data/totem.ui.h:28
+msgid "_Aspect Ratio"
+msgstr "សមាមាត្រ"
+
+#: ../data/totem.ui.h:29
+msgid "Switch An_gles"
+msgstr "ប្ដូរ​មុំ"
+
+#: ../data/totem.ui.h:30
+msgid "Switch camera angles"
+msgstr "ប្ដូរ​មុំ​ម៉ាស៊ីន​ថត"
+
+#: ../data/totem.ui.h:31
+msgid "_Go"
+msgstr "ទៅ"
+
+#: ../data/totem.ui.h:32
+msgid "_DVD Menu"
+msgstr "ម៉ឺនុយ​ឌីវីឌី"
+
+#: ../data/totem.ui.h:33
+msgid "Go to the DVD menu"
+msgstr "ទៅ​កាន់​ម៉ឺនុយ​ឌីវីឌី"
+
+#: ../data/totem.ui.h:34
+msgid "_Title Menu"
+msgstr "ម៉ឺនុយ​ចំណង​ជើង"
+
+#: ../data/totem.ui.h:35
+msgid "Go to the title menu"
+msgstr "ទៅកាន់​ម៉ឺនុយ​ចំណង​ជើង"
+
+#: ../data/totem.ui.h:36
+msgid "A_udio Menu"
+msgstr "ម៉ឺនុយ​អូឌីយ៉ូ"
+
+#: ../data/totem.ui.h:37
+msgid "Go to the audio menu"
+msgstr "ទៅ​កាន់​ម៉ឺនុយ​អូឌីយ៉ូ"
+
+#: ../data/totem.ui.h:38
+msgid "_Angle Menu"
+msgstr "ម៉ឺនុយ​មុំ"
+
+#: ../data/totem.ui.h:39
+msgid "Go to the angle menu"
+msgstr "ទៅ​កាន់​ម៉ឺនុយ​មុំ"
+
+#: ../data/totem.ui.h:40
+msgid "_Chapter Menu"
+msgstr "ម៉ឺនុយ​ជំពូក"
+
+#: ../data/totem.ui.h:41
+msgid "Go to the chapter menu"
+msgstr "ទៅ​កាន់​ម៉ឺនុយ​ជំពូក"
+
+#: ../data/totem.ui.h:42
+msgid "_Next Chapter/Movie"
+msgstr "ជំពូក/ភាពយន្ត​បន្ទាប់"
+
+#: ../data/totem.ui.h:43
+msgid "Next chapter or movie"
+msgstr "ជំពួក ឬ​ភាព​យន្ត​បន្ទាប់"
+
+#: ../data/totem.ui.h:44
+msgid "_Previous Chapter/Movie"
+msgstr "ជំពូក/ភាពយន្ត​មុន"
+
+#: ../data/totem.ui.h:45
+msgid "Previous chapter or movie"
+msgstr "ជំពូក/ភាពយន្ត​មុន"
+
+#: ../data/totem.ui.h:46
+msgid "_Sound"
+msgstr "សំឡេង"
+
+#: ../data/totem.ui.h:47
+msgid "Volume _Up"
+msgstr "បង្កើន​សំឡេង"
+
+#: ../data/totem.ui.h:48
+msgid "Increase volume"
+msgstr "បង្កើន​សំឡេង"
+
+#: ../data/totem.ui.h:49
+msgid "Volume _Down"
+msgstr "បន្ថយ​សំឡេង"
+
+#: ../data/totem.ui.h:50
+msgid "Decrease volume"
+msgstr "បន្ថយ​សំឡេង"
+
+#: ../data/totem.ui.h:51
+msgid "_Help"
+msgstr "ជំនួយ"
+
+#: ../data/totem.ui.h:52
+msgid "_Contents"
+msgstr "មាតិកា"
+
+#: ../data/totem.ui.h:53
+msgid "Help contents"
+msgstr "មាតិកា​ជំនួយ"
+
+#: ../data/totem.ui.h:54
+msgid "_About"
+msgstr "អំពី"
+
+#: ../data/totem.ui.h:55
+msgid "About this application"
+msgstr "អំពី​កម្មវិធី​នេះ"
+
+#: ../data/totem.ui.h:56
+msgid "Show _Controls"
+msgstr "បង្ហាញ​វត្ថុ​បញ្ជា"
+
+#: ../data/totem.ui.h:57
+msgid "Show controls"
+msgstr "បង្ហាញ​វត្ថុ​បញ្ជា"
+
+#: ../data/totem.ui.h:58
+msgid "S_idebar"
+msgstr "របារ​ចំហៀង"
+
+#: ../data/totem.ui.h:59
+msgid "Show or hide the sidebar"
+msgstr "បង្ហាញ ឬ​លាក់​របារ​ចំហៀង"
+
+#: ../data/totem.ui.h:60
+msgctxt "Aspect ratio"
+msgid "Auto"
+msgstr "ស្វ័យ​ប្រវត្តិ"
+
+#: ../data/totem.ui.h:61
+msgid "Sets automatic aspect ratio"
+msgstr "កំណត់​សមាមាត្រ​ស្វ័យ​ប្រវត្តិ"
+
+#: ../data/totem.ui.h:62
+msgid "Square"
+msgstr "ការេ"
+
+#: ../data/totem.ui.h:63
+msgid "Sets square aspect ratio"
+msgstr "កំណត់​សមាមាត្រ​ការេ"
+
+#: ../data/totem.ui.h:64
+msgid "4:3 (TV)"
+msgstr "4:3 (TV)"
+
+#: ../data/totem.ui.h:65
+msgid "Sets 4:3 (TV) aspect ratio"
+msgstr "កំណត់​សមាមាត្រ  4:3 (TV)"
+
+#: ../data/totem.ui.h:66
+msgid "16:9 (Widescreen)"
+msgstr "16:9 (អេក្រង់​ធំ)"
+
+#: ../data/totem.ui.h:67
+msgid "Sets 16:9 (widescreen) aspect ratio"
+msgstr "កំណត់​សមាមាត្រ 16:9 (អេក្រង់​ធំ)"
+
+#: ../data/totem.ui.h:68
+msgid "2.11:1 (DVB)"
+msgstr "2.11:1 (DVB)"
+
+#: ../data/totem.ui.h:69
+msgid "Sets 2.11:1 (DVB) aspect ratio"
+msgstr "កំណត់​សមាមាត្រ  2.11:1 (DVB)"
+
+#: ../data/totem.ui.h:70
+msgid "S_ubtitles"
+msgstr "ចំណង​ជើង​រង"
+
+#: ../data/totem.ui.h:73
+msgid "_Languages"
+msgstr "ភាសា"
+
+#: ../data/totem.ui.h:74
+msgid "Zoom In"
+msgstr "ពង្រីក"
+
+#: ../data/totem.ui.h:75
+msgid "Zoom in"
+msgstr "ពង្រីក"
+
+#: ../data/totem.ui.h:76
+msgid "Skip _Forward"
+msgstr "រំលង​ទៅ​មុខ"
+
+#: ../data/totem.ui.h:77
+msgid "Skip forward"
+msgstr "រំលង​ទៅ​មុខ"
+
+#: ../data/totem.ui.h:78
+msgid "Skip _Backwards"
+msgstr "រំលង​ថយក្រោយ"
+
+#: ../data/totem.ui.h:79
+msgid "Skip backwards"
+msgstr "រំលង​ថយក្រោយ"
+
+#: ../data/totem.ui.h:82
+msgid "Time seek bar"
+msgstr "របារ​ស្វែងរក​ពេលវេលា"
+
+#: ../data/uri.ui.h:1
+msgid "Enter the _address of the file you would like to open:"
+msgstr "បញ្ចូល​អាសយដ្ឋាន​ចំណង​ជើង​ ដែល​អ្នក​ចង់​បើក ៖"
+
+#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
+msgid "_Add to Playlist"
+msgstr "បន្ថែម​ទៅ​បញ្ជី​ចាក់"
+
+#: ../data/video-list.ui.h:2
+msgid "Add the video to the playlist"
+msgstr "បន្ថែម​វីដេអូ​ទៅ​បញ្ជី​ចាក់"
+
+#: ../src/backend/bacon-video-widget.c:1643
+msgid "Password requested for RTSP server"
+msgstr "បាន​ស្នើ​ពាក្យ​សម្ងាត់​សម្រាប់​ម៉ាស៊ីន​បម្រើ RTSP"
+
+#: ../src/backend/bacon-video-widget.c:2944
+#, c-format
+msgid "Audio Track #%d"
+msgstr "បទ​អូឌីយ៉ូ #%d"
+
+#: ../src/backend/bacon-video-widget.c:2948
+#, c-format
+msgid "Subtitle #%d"
+msgstr "ចំណង​ជើង​រង #%d"
+
+#: ../src/backend/bacon-video-widget.c:3345
+msgid "The server you are trying to connect to is not known."
+msgstr "មិន​ស្គាល់​ម៉ាស៊ីន​បម្រើ​ដែល​អ្នក​កំពុង​ព្យាយាម​តភ្ជាប់​ទៅកាន់​ទេ ។"
+
+#: ../src/backend/bacon-video-widget.c:3348
+msgid "The connection to this server was refused."
+msgstr "ការ​តភ្ជាប់​ទៅកាន់​ម៉ាស៊ីន​បម្រើ​នេះ​ត្រូវ​បាន​បដិសេធ ។"
+
+#: ../src/backend/bacon-video-widget.c:3351
+msgid "The specified movie could not be found."
+msgstr "រក​មិន​ឃើញ​ភាពយន្ត​ដែល​បាន​បញ្ជាក់​ទេ ។"
+
+#: ../src/backend/bacon-video-widget.c:3358
+msgid "The server refused access to this file or stream."
+msgstr "ម៉ាស៊ីន​បម្រើ​បាន​បដិសេធ​ការ​ចូល​ដំណើរការ​ទៅកាន់​ស្ទ្រីម ឬ​ឯកសារ​នេះ ។"
+
+#: ../src/backend/bacon-video-widget.c:3364
+msgid "Authentication is required to access this file or stream."
+msgstr "បាន​ទាមទារ​ការ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ​ដើម្បី​ចូល​ដំណើរការ​ស្ទ្រីម ឬ​ឯកសារ​នេះ ។"
+
+#: ../src/backend/bacon-video-widget.c:3371
+msgid "You are not allowed to open this file."
+msgstr "អ្នក​មិន​ត្រូវ​បាន​អនុញ្ញាត​ឲ្យ​បើក​ឯកសារ​នេះ​ទេ ។"
+
+#: ../src/backend/bacon-video-widget.c:3376
+msgid "This location is not a valid one."
+msgstr "ទីតាំង​នេះ​មិន​ត្រឹមត្រូវ​ទេ ។"
+
+#: ../src/backend/bacon-video-widget.c:3384
+msgid "The movie could not be read."
+msgstr "មិន​អាច​អាន​ភាពយន្ត​បាន​ទេ ។"
+
+#. should be exactly one missing thing (source or converter)
+#: ../src/backend/bacon-video-widget.c:3407
+#: ../src/backend/bacon-video-widget.c:3415
+#, c-format
+msgid "The playback of this movie requires a %s plugin which is not installed."
+msgid_plural ""
+"The playback of this movie requires the following decoders which are not "
+"installed:\n"
+"\n"
+"%s"
+msgstr[0] ""
+"ការ​ចាក់ភាពយន្ត​សារថ្មី​ទាមទារ​កម្មវិធី​ឌិកូដ​ដែល​មិន​បាន​ដំឡើង​ដូច​ខាងក្រោម ៖ \n"
+"\n"
+"%s"
+
+#: ../src/backend/bacon-video-widget.c:3426
+msgid ""
+"An audio or video stream is not handled due to missing codecs. You might "
+"need to install additional plugins to be able to play some types of movies"
+msgstr ""
+"ស្ទ្រីម​វីដេអូ ឬ​ស្ទ្រីម​អូឌីយ៉ូ​មិន​ត្រូវ​បាន​ដោះស្រាយ​ទេ ដោយសារតែ​បាត់​កូដិក​មួយ​ចំនួន ។ អ្នក​ចាំបាច់​ត្រូវ​ដំឡើង​កម្មវិធី​"
+"ជំនួយ​បន្ថែម​ដើម្បី​អាច​ចាក់​ភាពយន្ត​ប្រភេទ​ខ្លះ​បាន"
+
+#: ../src/backend/bacon-video-widget.c:3436
+msgid ""
+"This file cannot be played over the network. Try downloading it locally "
+"first."
+msgstr "មិន​អាច​ចាក់​ឯកសារ​នេះ​លើ​បណ្ដាញ​បាន​ទេ ។ ព្យាយាម​ទាញ​យក​វា​ដាក់​ក្នុង​ថាស​ជាមុន​សិន ។"
+
+#: ../src/backend/bacon-video-widget.c:5518 ../src/totem-properties-view.c:228
+msgid "Surround"
+msgstr "ជុំវិញ"
+
+#: ../src/backend/bacon-video-widget.c:5520 ../src/totem-properties-view.c:230
+msgid "Mono"
+msgstr "ម៉ូណូ"
+
+#: ../src/backend/bacon-video-widget.c:5805
+msgid "Media contains no supported video streams."
+msgstr "មេឌៀ​​មិន​មាន​ស្ទ្រីម​វីដេអូ​ដែល​បាន​គាំទ្រ​ទេ ។"
+
+#: ../src/backend/bacon-video-widget.c:5987
+msgid ""
+"Some necessary plug-ins are missing. Make sure that the program is correctly "
+"installed."
+msgstr "មាន​កម្មវិធី​ជំនួយ​ខ្លះ​ត្រូវ​បាន​បាត់ ។ សូម​ប្រាកដ​ថា​កម្មវិធី​របស់​អ្នក​ត្រូវ​បាន​ដំឡើង​យ៉ាង​ត្រឹមត្រូវ ។"
+
+#: ../src/eggdesktopfile.c:165
+#, c-format
+msgid "File is not a valid .desktop file"
+msgstr "ឯកសារ desktop file ​មិន​ត្រឹមត្រូវ​ទេ"
+
+#: ../src/eggdesktopfile.c:188
+#, c-format
+msgid "Unrecognized desktop file Version '%s'"
+msgstr "កំណែ​ឯកសារ​ផ្ទៃតុ​ដែល​មិន​ស្គាល់ '%s'"
+
+#: ../src/eggdesktopfile.c:968
+#, c-format
+msgid "Starting %s"
+msgstr "ចាប់ផ្ដើម %s"
+
+#: ../src/eggdesktopfile.c:1110
+#, c-format
+msgid "Application does not accept documents on command line"
+msgstr "កម្មវិធី​មិន​ទទួល​យក​ឯកសារ​នៅ​លើ​បន្ទាត់​ពាក្យ​បញ្ជា"
+
+#: ../src/eggdesktopfile.c:1178
+#, c-format
+msgid "Unrecognized launch option: %d"
+msgstr "ជម្រើស​ចាប់ផ្ដើម​​ដែល​មិន​​ទទួល​ស្គាល់ ៖ %d"
+
+#: ../src/eggdesktopfile.c:1383
+#, c-format
+msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
+msgstr "មិន​អាច​ចម្លង URIs របស់​ឯកសារ​ទៅ​ធាតុ​ផ្ទៃតុ 'Type=Link'"
+
+#: ../src/eggdesktopfile.c:1404
+#, c-format
+msgid "Not a launchable item"
+msgstr "មិនមែន​ជា​ធាតុ​ដែល​អាច​ចាប់ផ្ដើម​បាន​ទេ"
+
+#: ../src/eggfileformatchooser.c:240
+#, c-format
+msgid "File _Format: %s"
+msgstr "ទ្រង់ទ្រាយ​ឯកសារ ៖ %s"
+
+#: ../src/eggfileformatchooser.c:379
+msgid "All Files"
+msgstr "ឯកសារ​ទាំង​អស់"
+
+#: ../src/eggfileformatchooser.c:380
+msgid "All Supported Files"
+msgstr "ឯកសារ​ដែល​គាំទ្រ​ទាំងអស់"
+
+#: ../src/eggfileformatchooser.c:389
+msgid "By Extension"
+msgstr "តាម​កន្ទុយ​ឯកសារ"
+
+#: ../src/eggfileformatchooser.c:404
+msgid "File Format"
+msgstr "ទ្រង់ទ្រាយ​ឯកសារ"
+
+#: ../src/eggfileformatchooser.c:422
+msgid "Extension(s)"
+msgstr "កន្ទុយ"
+
+#. Translators: the parameter is a filename
+#: ../src/eggfileformatchooser.c:657
+#, c-format
+msgid ""
+"The program was not able to find out the file format you want to use for `"
+"%s'. Please make sure to use a known extension for that file or manually "
+"choose a file format from the list below."
+msgstr ""
+"កម្មវិធី​មិន​អាច​ស្វែងយល់​ទ្រង់ទ្រាយ​ឯកសារ​ដែល​អ្នក​ចង់​ប្រើ​សម្រាប់ `%s' ទេ​ ។ សូម​ប្រាកដ​ថា ដើម្បី​ប្រើ​កន្ទុយ​"
+"ឯកសារ​ដែល​បាន​ស្គាល់​សម្រាប់​ឯកសារ​នោះ ឬ​ជ្រើស​ទ្រង់ទ្រាយ​ឯកសារ​ដៃ​ពី​បញ្ជី​ខាង​ក្រោម ។"
+
+#: ../src/eggfileformatchooser.c:664
+msgid "File format not recognized"
+msgstr "មិន​ស្គាល់​ទ្រង់ទ្រាយ​ឯកសារ"
+
+#: ../src/eggsmclient.c:226
+msgid "Disable connection to session manager"
+msgstr "បិទ​ការ​តភ្ជាប់​ទៅ​កម្មវិធី​គ្រប់គ្រង​សម័យ"
+
+#: ../src/eggsmclient.c:229
+msgid "Specify file containing saved configuration"
+msgstr "បញ្ជាក់​ឯកសារ​ថា​មាន​ការ​កំណត់​រចនាសម្ព័ន្ធ​ដែល​បាន​រក្សាទុក"
+
+#: ../src/eggsmclient.c:229
+msgid "FILE"
+msgstr "ឯកសារ"
+
+#: ../src/eggsmclient.c:232
+msgid "Specify session management ID"
+msgstr "បញ្ជាក់​លេខ​សម្គាល់​គ្រប់គ្រង​សម័យ"
+
+#: ../src/eggsmclient.c:232
+msgid "ID"
+msgstr "លេខ​សម្គាល់"
+
+#: ../src/eggsmclient.c:253
+msgid "Session management options:"
+msgstr "ជម្រើស​គ្រប់គ្រង​សម័យ ៖"
+
+#: ../src/eggsmclient.c:254
+msgid "Show session management options"
+msgstr "បង្ហាញ​ជម្រើស​គ្រប់គ្រង​សម័យ"
+
+#. hour:minutes:seconds
+#. Translators: This is a time format, like "9:05:02" for 9
+#. * hours, 5 minutes, and 2 seconds. You may change ":" to
+#. * the separator that your locale uses or use "%Id" instead
+#. * of "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:56
+#: ../src/plugins/skipto/totem-time-entry.c:57
+#, c-format
+msgctxt "long time format"
+msgid "%d:%02d:%02d"
+msgstr "%d:%02d:%02d"
+
+#. minutes:seconds
+#. Translators: This is a time format, like "5:02" for 5
+#. * minutes and 2 seconds. You may change ":" to the
+#. * separator that your locale uses or use "%Id" instead of
+#. * "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:65
+#, c-format
+msgctxt "short time format"
+msgid "%d:%02d"
+msgstr "%d:%02d"
+
+#. Title
+#. Artist
+#. Album
+#. Year
+#. Container
+#: ../src/properties/bacon-video-widget-properties.c:107
+#: ../src/properties/bacon-video-widget-properties.c:109
+#: ../src/properties/bacon-video-widget-properties.c:111
+#: ../src/properties/bacon-video-widget-properties.c:113
+#: ../src/properties/bacon-video-widget-properties.c:119
+msgid "Unknown"
+msgstr "មិន​ស្គាល់"
+
+#. Dimensions
+#: ../src/properties/bacon-video-widget-properties.c:122
+msgctxt "Dimensions"
+msgid "N/A"
+msgstr "មិនមាន"
+
+#. Video Codec
+#: ../src/properties/bacon-video-widget-properties.c:124
+msgctxt "Video codec"
+msgid "N/A"
+msgstr "មិនមាន"
+
+#: ../src/properties/bacon-video-widget-properties.c:127
+msgctxt "Video bit rate"
+msgid "N/A"
+msgstr "មិនមាន"
+
+#: ../src/properties/bacon-video-widget-properties.c:130
+#: ../src/properties/bacon-video-widget-properties.c:240
+msgctxt "Frame rate"
+msgid "N/A"
+msgstr "មិនមាន"
+
+#: ../src/properties/bacon-video-widget-properties.c:134
+msgctxt "Audio bit rate"
+msgid "N/A"
+msgstr "មិនមាន"
+
+#. Audio Codec
+#: ../src/properties/bacon-video-widget-properties.c:136
+msgctxt "Audio codec"
+msgid "N/A"
+msgstr "មិនមាន"
+
+#. Sample rate
+#: ../src/properties/bacon-video-widget-properties.c:138
+msgid "0 Hz"
+msgstr "0 Hz"
+
+#. Channels
+#: ../src/properties/bacon-video-widget-properties.c:140
+msgid "0 Channels"
+msgstr "ឆានែល ០"
+
+#: ../src/properties/bacon-video-widget-properties.c:156
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d ម៉ោង"
+
+#: ../src/properties/bacon-video-widget-properties.c:158
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d នាទី"
+
+#: ../src/properties/bacon-video-widget-properties.c:161
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d វិនាទី"
+
+#. 5 hours 2 minutes 12 seconds
+#: ../src/properties/bacon-video-widget-properties.c:167
+#, c-format
+msgctxt "time"
+msgid "%s %s %s"
+msgstr "%s %s %s"
+
+#. 2 minutes 12 seconds
+#: ../src/properties/bacon-video-widget-properties.c:170
+#, c-format
+msgctxt "time"
+msgid "%s %s"
+msgstr "%s %s"
+
+#. 0 seconds
+#: ../src/properties/bacon-video-widget-properties.c:176
+msgid "0 seconds"
+msgstr "០ វិនាទី"
+
+#: ../src/properties/bacon-video-widget-properties.c:237
+#, c-format
+msgid "%d frame per second"
+msgid_plural "%d frames per second"
+msgstr[0] "%d ស៊ុម/វិនាទី"
+
+#: ../src/totem-audio-preview.c:137
+msgid "Audio Preview"
+msgstr "មើល​អូឌីយ៉ូ​ជាមុន"
+
+#: ../src/totem.c:241
+msgid "Verify your system installation. Totem will now exit."
+msgstr "ផ្ទៀងផ្ទាត់​ការ​ដំឡើង​ប្រព័ន្ធ​របស់​អ្នក ។ Totem នឹង​ចាកចេញ​ឥឡូវ ។"
+
+#: ../src/totem-cell-renderer-video.c:126
+msgid "Unknown video"
+msgstr "មិន​ស្គាល់​វីដេអូ"
+
+#: ../src/totem-dnd-menu.c:94
+msgid "_Play Now"
+msgstr "ចាក់​ឥឡូវ"
+
+#: ../src/totem-dnd-menu.c:103
+msgid "Cancel"
+msgstr "បោះបង់"
+
+#: ../src/totem-fullscreen.c:573
+msgid "No File"
+msgstr "គ្មាន​ឯកសារ"
+
+#: ../src/totem-interface.c:181 ../src/totem-interface.c:224
+#, c-format
+msgid "Couldn't load the '%s' interface. %s"
+msgstr "មិន​អាច​ផ្ទុក​ចំណុច​ប្រទាក់ '%s' បាន​ទេ ។ %s"
+
+#: ../src/totem-interface.c:181
+msgid "The file does not exist."
+msgstr "មិន​មាន​ឯកសារទេ ។"
+
+#: ../src/totem-interface.c:183 ../src/totem-interface.c:185
+#: ../src/totem-interface.c:226 ../src/totem-interface.c:228
+msgid "Make sure that Totem is properly installed."
+msgstr "សូម​ប្រាកដ​ថា បាន​ដំឡើង Totem ត្រឹមត្រូវ ។"
+
+#: ../src/totem-interface.c:357
+msgid ""
+"Totem 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."
+msgstr ""
+"Totem គឺ​ជា​កម្មវិធី​ឥត​គិត​ថ្លៃ អ្នក​អាច​ចែកចាយ​វា និង/ឬ​កែប្រែ​វា​ក្រោម​លក្ខខណ្ឌ GNU General "
+"Public License ដូច​ដែល​បាន​​បោះពុម្ព​ដោយ​មូលនិធិ​កម្មវិធី​ឥត​គិត​ថ្លៃ កំណែ ២ នៃ​អាជ្ញាប័ណ្ណ ឬ (ជម្រើស​របស់​"
+"អ្នក) នៅ​កំណែ​ក្រោយ​ណាមួយ ។"
+
+#: ../src/totem-interface.c:361
+msgid ""
+"Totem 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 General Public License for more "
+"details."
+msgstr ""
+"Totem ត្រូវ​បាន​ចែកចាយ​ដោយ​សង្ឃឹម​ថា​នឹង​មាន​ប្រយោជន៍ ប៉ុន្តែ​គ្មាន​ករ​ធានា​ទេ ដោយ​មិន​អនុវត្ត​នូវ​ការ​ធានា​នៃ​"
+"ការ​ពាណិជ្ជកម្ម សមស្រប​សម្រាប់​គោលបំណង​ជាក់លាក់ ។ សូម​មើល​អាជ្ញាប័ណ្ណ​ GNU សម្រាប់​សេចក្ដី​លម្អិត ។"
+
+#: ../src/totem-interface.c:365
+msgid ""
+"You should have received a copy of the GNU General Public License along with "
+"Totem; if not, write to the Free Software Foundation, Inc., 59 Temple Place, "
+"Suite 330, Boston, MA  02111-1307  USA"
+msgstr ""
+"អ្នក​គួរ​តែ​បាន​ទទួល​ច្បាប់​ចម្លង​អាជ្ញាប័ណ្ណ GNU General Public រួម​ជា​មួយ​នឹង Totem ប្រសិនបើ​មិន​បាន​"
+"ទទួល​ទេ​ សរសេរ​ទៅកាន់​មូលនិធិ​កម្មវិធី​ឥត​គិត​ថ្លៃ តាម​អាសយដ្ឋាន ៖ Inc., 59 Temple Place, Suite "
+"330, Boston, MA  02111-1307  USA"
+
+#: ../src/totem-interface.c:368
+msgid ""
+"Totem contains an exception to allow the use of proprietary GStreamer "
+"plugins."
+msgstr "Totem មាន​ករណី​លើកលែង​ ដើម្បី​អនុញ្ញាត​ឲ្យ​ប្រើ​កម្មវិធី​ជំនួយ GStreamer មាន​កម្មសិទ្ធិ ។"
+
+#. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
+#: ../src/totem-menu.c:291
+msgid "None"
+msgstr "គ្មាន"
+
+#. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
+#: ../src/totem-menu.c:296
+msgctxt "Language"
+msgid "Auto"
+msgstr "ស្វ័យ​ប្រវត្តិ"
+
+#: ../src/totem-menu.c:788
+msgid "Copyright © 2002-2009 Bastien Nocera"
+msgstr "រក្សាសិទ្ធិ​ឆ្នាំ © 2002-2009 ដោយ Bastien Nocera"
+
+#: ../src/totem-menu.c:792
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Chanrithy Thim https://launchpad.net/~12rithy\n"
+"  Khoem Sokhem https://launchpad.net/~khoemsokhem"
+
+#: ../src/totem-menu.c:796
+msgid "Totem Website"
+msgstr "តំបន់​បណ្ដាញ Totem"
+
+#: ../src/totem-menu.c:827
+msgid "Configure Plugins"
+msgstr "កំណត់​រចនាសម្ព័ន្ធ​កម្មវិធី​ជំនួយ"
+
+#: ../src/totem-object.c:162
+#, c-format
+msgid ""
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"%s\n"
+"ដំណើរការ '%s --help' ដើម្បី​មើល​​ជម្រើស​បញ្ជី​ពាក្យ​បញ្ជា​ពេញលេញ ។\n"
+
+#. Translators: %s is the totem version number
+#: ../src/totem-object.c:591
+#, c-format
+msgid "Totem %s"
+msgstr "Totem %s"
+
+#: ../src/totem-object.c:1168 ../src/totem-options.c:52
+msgid "Pause"
+msgstr "ផ្អាក"
+
+#: ../src/totem-object.c:1175 ../src/totem-object.c:1185
+#: ../src/totem-options.c:51
+msgid "Play"
+msgstr "ចាក់"
+
+#: ../src/totem-object.c:1267 ../src/totem-object.c:1294
+#: ../src/totem-object.c:1787 ../src/totem-object.c:1942
+#, c-format
+msgid "Totem could not play '%s'."
+msgstr "Totem មិន​អាច​ចាក់ '%s' បាន​ទេ ។"
+
+#: ../src/totem-object.c:1793
+msgid "No error message"
+msgstr "គ្មាន​សារ​កំហុស"
+
+#: ../src/totem-object.c:2133
+msgid "Totem could not display the help contents."
+msgstr "Totem មិន​អាច​បង្ហាញ​ខ្លឹមសារ​ជំនួយ​បាន​ទេ ។"
+
+#: ../src/totem-object.c:4019 ../src/totem-object.c:4021
+msgid "Previous Chapter/Movie"
+msgstr "ជំពូក/ភាពយន្ត​មុន"
+
+#: ../src/totem-object.c:4028 ../src/totem-object.c:4030
+msgid "Play / Pause"
+msgstr "ចាក់/ផ្អាក"
+
+#: ../src/totem-object.c:4038 ../src/totem-object.c:4040
+msgid "Next Chapter/Movie"
+msgstr "ជំពូក/ភាពយន្ត​បន្ទាប់"
+
+#. Translators: this is the accessibility text for the fullscreen button in the controls box in Totem's main window.
+#: ../src/totem-object.c:4051 ../src/totem-object.c:4053
+msgid "Fullscreen"
+msgstr "ពេញ​អេក្រង់"
+
+#: ../src/totem-object.c:4184
+msgid "Totem could not startup."
+msgstr "Totem មិន​អាច​ចាប់ផ្ដើម​បាន​ទេ ។"
+
+#: ../src/totem-object.c:4184
+msgid "No reason."
+msgstr "គ្មាន​ហេតុផល"
+
+#: ../src/totem-open-location.c:182
+msgid "Open Location..."
+msgstr "បើក​ទីតាំង..."
+
+#: ../src/totem-options.c:49
+msgid "Enable debug"
+msgstr "បើក​ការ​បំបាត់​កំហុស"
+
+#: ../src/totem-options.c:50
+msgid "Play/Pause"
+msgstr "ចាក់​/ផ្អាក"
+
+#: ../src/totem-options.c:53
+msgid "Next"
+msgstr "បន្ទាប់"
+
+#: ../src/totem-options.c:54
+msgid "Previous"
+msgstr "មុន"
+
+#: ../src/totem-options.c:55
+msgid "Seek Forwards"
+msgstr "មើល​ទៅ​មុខ"
+
+#: ../src/totem-options.c:56
+msgid "Seek Backwards"
+msgstr "មើល​ថយក្រោយ"
+
+#: ../src/totem-options.c:57
+msgid "Volume Up"
+msgstr "បង្កើន​កម្រិត​សំឡេង"
+
+#: ../src/totem-options.c:58
+msgid "Volume Down"
+msgstr "បន្ថយ​កម្រិត​សំឡេង"
+
+#: ../src/totem-options.c:59
+msgid "Mute sound"
+msgstr "បិទ​សំឡេង"
+
+#: ../src/totem-options.c:60
+msgid "Toggle Fullscreen"
+msgstr "បិទ​បើក ពេញ​អេក្រង់"
+
+#: ../src/totem-options.c:61
+msgid "Show/Hide Controls"
+msgstr "បង្ហាញ​/លាក់​វត្ថុ​បញ្ជា"
+
+#: ../src/totem-options.c:62
+msgid "Quit"
+msgstr "ចេញ"
+
+#: ../src/totem-options.c:63
+msgid "Enqueue"
+msgstr "ដាក់​ជាជួរ"
+
+#: ../src/totem-options.c:64
+msgid "Replace"
+msgstr "ជំនួស"
+
+#: ../src/totem-options.c:65
+msgid "Seek"
+msgstr "ស្វែង​រក"
+
+#. Translators: help for a (hidden) command line option to specify (the zero-based index of) a playlist entry to start playing once Totem's finished loading
+#: ../src/totem-options.c:67
+msgid "Playlist index"
+msgstr "លិបិក្រម​បញ្ជី​ចាក់"
+
+#: ../src/totem-options.c:69
+msgid "Movies to play"
+msgstr "ភាពយន្ត​ត្រូវ​ចាក់"
+
+#: ../src/totem-options.c:79
+msgid "- Play movies and songs"
+msgstr "- ចាក់​ភាពយន្ត និង​បទ​ចម្រៀង"
+
+#: ../src/totem-options.c:142
+msgid "Can't enqueue and replace at the same time"
+msgstr "មិន​អាច​ដាក់​ជា​ជួយ និង​ជំនួស​នៅ​ពេល​តែ​មួយ​បាន​ទេ"
+
+#. By extension entry
+#: ../src/totem-playlist.c:162
+msgid "MP3 ShoutCast playlist"
+msgstr "បញ្ជី​ចាក់ MP3 ShoutCast"
+
+#: ../src/totem-playlist.c:163
+msgid "MP3 audio (streamed)"
+msgstr "អូឌីយ៉ូ MP3 (បាន​ស្ទ្រីម)"
+
+#: ../src/totem-playlist.c:164
+msgid "MP3 audio (streamed, DOS format)"
+msgstr "អូឌីយ៉ូ MP3 (បាន​ស្ទ្រីម ទ្រង់ទ្រាយ DOS)"
+
+#: ../src/totem-playlist.c:165
+msgid "XML Shareable Playlist"
+msgstr "បញ្ជី​ចាក់​ដែល​អាច​ចែករំលែក​បាន XML"
+
+#. This is "Title 3", where title is a DVD title
+#. * Note: NOT a DVD chapter
+#: ../src/totem-playlist.c:348
+#, c-format
+msgid "Title %d"
+msgstr "ចំណង​ជើង %d"
+
+#: ../src/totem-playlist.c:447
+msgid "Could not save the playlist"
+msgstr "មិន​អាច​រក្សាទុក​បញ្ជី​ចាក់​បាន​ទេ"
+
+#: ../src/totem-playlist.c:1022
+msgid "Save Playlist"
+msgstr "រក្សាទុក​បញ្ជី​ចាក់"
+
+#. translators: Playlist is the default saved playlist filename,
+#. * without the suffix
+#: ../src/totem-playlist.c:1034 ../src/totem-playlist.c:1263
+#: ../src/totem-sidebar.c:145
+msgid "Playlist"
+msgstr "បញ្ជី​ចាក់"
+
+#: ../src/totem-playlist.c:1862
+#, c-format
+msgid "The playlist '%s' could not be parsed. It might be damaged."
+msgstr "បញ្ជី​ចាក់ '%s' មិន​អាច​ត្រូវ​បាន​ញែក​ទេ ។ វា​អាច​ត្រូវ​បាន​បង្ខូច ។"
+
+#: ../src/totem-playlist.c:1863
+msgid "Playlist error"
+msgstr "កំហុស​បញ្ជីចាក់"
+
+#: ../src/totem-preferences.c:297
+msgid "Preferences"
+msgstr "ចំណូល​ចិត្ត"
+
+#: ../src/totem-preferences.c:445
+msgid "Select Subtitle Font"
+msgstr "ជ្រើស​ពុម្ពអក្សរ​ចំណងជើង​រង"
+
+#: ../src/totem-properties-main.c:116 ../src/totem-properties-view.c:271
+msgid "Audio/Video"
+msgstr "អូឌីយ៉ូ/វីដេអូ"
+
+#: ../src/totem-properties-view.c:131
+msgid "N/A"
+msgstr "N/A"
+
+#: ../src/totem-properties-view.c:160
+#: ../src/plugins/properties/totem-movie-properties.c:152
+#: ../src/plugins/properties/totem-movie-properties.c:163
+msgctxt "Stream bit rate"
+msgid "N/A"
+msgstr "N/A"
+
+#: ../src/totem-properties-view.c:163
+#: ../src/plugins/properties/totem-movie-properties.c:152
+#: ../src/plugins/properties/totem-movie-properties.c:163
+#, c-format
+msgid "%d kbps"
+msgstr "%d kbps"
+
+#: ../src/totem-properties-view.c:180
+#: ../src/plugins/properties/totem-movie-properties.c:149
+#, c-format
+msgid "%d x %d"
+msgstr "%d x %d"
+
+#: ../src/totem-properties-view.c:212
+#: ../src/plugins/properties/totem-movie-properties.c:166
+#, c-format
+msgid "%d Hz"
+msgstr "%d Hz"
+
+#: ../src/totem-properties-view.c:220
+#: ../src/plugins/properties/totem-movie-properties.c:166
+msgctxt "Sample rate"
+msgid "N/A"
+msgstr "មិន​មាន"
+
+#: ../src/totem-properties-view.c:241
+msgctxt "Number of audio channels"
+msgid "N/A"
+msgstr "N/A"
+
+#: ../src/totem-statusbar.c:110
+msgid "0:00 / 0:00"
+msgstr "0:00 / 0:00"
+
+#: ../src/totem-statusbar.c:133
+#, c-format
+msgid "%s (Streaming)"
+msgstr "%s (Streaming)"
+
+#. Elapsed / Total Length
+#: ../src/totem-statusbar.c:140 ../src/totem-time-label.c:64
+#, c-format
+msgid "%s / %s"
+msgstr "%s / %s"
+
+#. Seeking to Time / Total Length
+#: ../src/totem-statusbar.c:143 ../src/totem-time-label.c:67
+#, c-format
+msgid "Seek to %s / %s"
+msgstr "ស្វែងរក​ទៅ %s / %s"
+
+#: ../src/totem-statusbar.c:239
+msgid "Buffering"
+msgstr "កំពុង​យក​បណ្ដោះអាសន្ន"
+
+#. eg: 75 %
+#: ../src/totem-statusbar.c:250
+#, c-format
+msgid "%lf %%"
+msgstr "%lf %%"
+
+#. eg: Paused, 0:32 / 1:05
+#: ../src/totem-statusbar.c:325
+#, c-format
+msgid "%s, %s"
+msgstr "%s, %s"
+
+#. eg: Buffering, 75 %
+#: ../src/totem-statusbar.c:330
+#, c-format
+msgid "%s, %f %%"
+msgstr "%s, %f %%"
+
+#: ../src/totem-subtitle-encoding.c:156
+msgid "Current Locale"
+msgstr "មូលដ្ឋាន (Locale) បច្ចុប្បន្ន"
+
+#: ../src/totem-subtitle-encoding.c:159 ../src/totem-subtitle-encoding.c:161
+#: ../src/totem-subtitle-encoding.c:163 ../src/totem-subtitle-encoding.c:165
+msgid "Arabic"
+msgstr "អារ៉ាប់"
+
+#: ../src/totem-subtitle-encoding.c:168
+msgid "Armenian"
+msgstr "អារមេនី"
+
+#: ../src/totem-subtitle-encoding.c:171 ../src/totem-subtitle-encoding.c:173
+#: ../src/totem-subtitle-encoding.c:175
+msgid "Baltic"
+msgstr "បាល់ទិក"
+
+#: ../src/totem-subtitle-encoding.c:178
+msgid "Celtic"
+msgstr "សែលតិក"
+
+#: ../src/totem-subtitle-encoding.c:181 ../src/totem-subtitle-encoding.c:183
+#: ../src/totem-subtitle-encoding.c:185 ../src/totem-subtitle-encoding.c:187
+msgid "Central European"
+msgstr "អឺរ៉ុប​កណ្ដាល"
+
+#: ../src/totem-subtitle-encoding.c:190 ../src/totem-subtitle-encoding.c:192
+#: ../src/totem-subtitle-encoding.c:194 ../src/totem-subtitle-encoding.c:196
+msgid "Chinese Simplified"
+msgstr "ចិន​សាមញ្ញ"
+
+#: ../src/totem-subtitle-encoding.c:199 ../src/totem-subtitle-encoding.c:201
+#: ../src/totem-subtitle-encoding.c:203
+msgid "Chinese Traditional"
+msgstr "ចិន​បុរាណ"
+
+#: ../src/totem-subtitle-encoding.c:206
+msgid "Croatian"
+msgstr "ក្រូអាត"
+
+#: ../src/totem-subtitle-encoding.c:209 ../src/totem-subtitle-encoding.c:211
+#: ../src/totem-subtitle-encoding.c:213 ../src/totem-subtitle-encoding.c:215
+#: ../src/totem-subtitle-encoding.c:217 ../src/totem-subtitle-encoding.c:219
+msgid "Cyrillic"
+msgstr "ស៊ីរីលីក"
+
+#: ../src/totem-subtitle-encoding.c:222
+msgid "Cyrillic/Russian"
+msgstr "ស៊ីរីលីក/រុស្ស៊ី"
+
+#: ../src/totem-subtitle-encoding.c:225 ../src/totem-subtitle-encoding.c:227
+msgid "Cyrillic/Ukrainian"
+msgstr "ស៊ីរីលីក/អ៊ុយក្រែន"
+
+#: ../src/totem-subtitle-encoding.c:230
+msgid "Georgian"
+msgstr "ហ្សកហ្ស៊ី"
+
+#: ../src/totem-subtitle-encoding.c:233 ../src/totem-subtitle-encoding.c:235
+#: ../src/totem-subtitle-encoding.c:237
+msgid "Greek"
+msgstr "ក្រិក"
+
+#: ../src/totem-subtitle-encoding.c:240
+msgid "Gujarati"
+msgstr "ហ្កុយ៉ារាទី"
+
+#: ../src/totem-subtitle-encoding.c:243
+msgid "Gurmukhi"
+msgstr "គួរ​មុកឃី"
+
+#: ../src/totem-subtitle-encoding.c:246 ../src/totem-subtitle-encoding.c:248
+#: ../src/totem-subtitle-encoding.c:250 ../src/totem-subtitle-encoding.c:252
+msgid "Hebrew"
+msgstr "ហេប្រូ"
+
+#: ../src/totem-subtitle-encoding.c:255
+msgid "Hebrew Visual"
+msgstr "ហេប្រួ​វីសូល"
+
+#: ../src/totem-subtitle-encoding.c:258
+msgid "Hindi"
+msgstr "ហិណ្ឌូ"
+
+#: ../src/totem-subtitle-encoding.c:261
+msgid "Icelandic"
+msgstr "អ៊ីស្លង់"
+
+#: ../src/totem-subtitle-encoding.c:264 ../src/totem-subtitle-encoding.c:266
+#: ../src/totem-subtitle-encoding.c:268
+msgid "Japanese"
+msgstr "ជប៉ុន"
+
+#: ../src/totem-subtitle-encoding.c:271 ../src/totem-subtitle-encoding.c:273
+#: ../src/totem-subtitle-encoding.c:275 ../src/totem-subtitle-encoding.c:277
+msgid "Korean"
+msgstr "កូរ៉េ"
+
+#: ../src/totem-subtitle-encoding.c:280
+msgid "Nordic"
+msgstr "ន័រឌីក"
+
+#: ../src/totem-subtitle-encoding.c:283
+msgid "Persian"
+msgstr "ពែសៀន"
+
+#: ../src/totem-subtitle-encoding.c:286 ../src/totem-subtitle-encoding.c:288
+msgid "Romanian"
+msgstr "រូម៉ានី"
+
+#: ../src/totem-subtitle-encoding.c:291
+msgid "South European"
+msgstr "អឺរ៉ុប​ខាង​ត្បូង"
+
+#: ../src/totem-subtitle-encoding.c:294
+msgid "Thai"
+msgstr "ថៃ"
+
+#: ../src/totem-subtitle-encoding.c:297 ../src/totem-subtitle-encoding.c:299
+#: ../src/totem-subtitle-encoding.c:301 ../src/totem-subtitle-encoding.c:303
+msgid "Turkish"
+msgstr "ទួរគី"
+
+#: ../src/totem-subtitle-encoding.c:306 ../src/totem-subtitle-encoding.c:308
+#: ../src/totem-subtitle-encoding.c:310 ../src/totem-subtitle-encoding.c:312
+#: ../src/totem-subtitle-encoding.c:314
+msgid "Unicode"
+msgstr "យូនីកូដ"
+
+#: ../src/totem-subtitle-encoding.c:317 ../src/totem-subtitle-encoding.c:319
+#: ../src/totem-subtitle-encoding.c:321 ../src/totem-subtitle-encoding.c:323
+#: ../src/totem-subtitle-encoding.c:325
+msgid "Western"
+msgstr "ភាគ​ខាង​លិច"
+
+#: ../src/totem-subtitle-encoding.c:328 ../src/totem-subtitle-encoding.c:330
+#: ../src/totem-subtitle-encoding.c:332
+msgid "Vietnamese"
+msgstr "វៀតណាម"
+
+#: ../src/totem-uri.c:343 ../src/plugins/chapters/totem-chapters.c:998
+msgid "All files"
+msgstr "ឯកសារ​ទាំងអស់"
+
+#: ../src/totem-uri.c:348 ../src/plugins/chapters/totem-chapters.c:995
+msgid "Supported files"
+msgstr "ឯកសារ​ដែល​បានគាំទ្រ"
+
+#: ../src/totem-uri.c:360
+msgid "Audio files"
+msgstr "ឯកសារ​អូឌីយ៉ូ"
+
+#: ../src/totem-uri.c:368
+msgid "Video files"
+msgstr "ឯកសារ​វីដេអូ"
+
+#: ../src/totem-uri.c:378
+msgid "Subtitle files"
+msgstr "ឯកសារ​ចំណង​ជើងរង"
+
+#: ../src/totem-uri.c:430
+msgid "Select Text Subtitles"
+msgstr "ជ្រើស​អត្ថបទ​ចំណង​ជើង​រង"
+
+#: ../src/totem-uri.c:495
+msgid "Select Movies or Playlists"
+msgstr "ជ្រើស​ភាពយន្ត ឬ​បញ្ជី​ចាក់"
+
+#: ../src/totem-uri.c:499
+msgid "Add Directory"
+msgstr "បន្ថែម​ថត"
+
+#: ../src/totem-video-list.c:330
+msgid "No video URI"
+msgstr "គ្មាន URI វីដេអូ"
+
+#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
+#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
+#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
+#: ../src/totem-video-thumbnailer.c:848
+#, c-format
+msgid ""
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
+msgstr ""
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
+
+#: ../src/totem-video-thumbnailer.c:849
+msgid "Filename"
+msgstr "ឈ្មោះ​ឯកសារ"
+
+#: ../src/totem-video-thumbnailer.c:851
+msgid "Resolution"
+msgstr "គុណភាព​បង្ហាញ"
+
+#: ../src/totem-video-thumbnailer.c:854
+msgid "Duration"
+msgstr "ថិរវេលា"
+
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:1
+msgid "Apple Trailers"
+msgstr "Apple Trailers"
+
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:2
+msgid "Sets the user agent for the Apple Trailers site"
+msgstr "កំណត់​ភ្នាក់ងារ​អ្នកប្រើ​សម្រាប់​តំបន់បណ្ដាញ Apple Trailers"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:1
+msgid "Autoload Subtitles"
+msgstr "ផ្ទុក​ចំណង​ជើង​រង​ដោយ​ស្វ័យប្រវត្តិ"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:2
+msgid "Autoloads text subtitles"
+msgstr "ផ្ទុកអត្ថបទ​​ចំណង​ជើង​រង​ដោយ​ស្វ័យប្រវត្តិ"
+
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
+msgid "Video Disc Recorder"
+msgstr "កម្មវិធី​ថត​ថាស​វីដេអូ"
+
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
+msgid "Records (S)VCDs or video DVDs"
+msgstr "ថត (S)VCDs ឬ​ឌីវីឌី​វីដេអូ"
+
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:65
+msgid "_Create Video Disc..."
+msgstr "បង្កើត​ថាស​វីដេអូ..."
+
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:66
+msgid "Create a video DVD or a (S)VCD from the currently opened movie"
+msgstr "បង្កើត​ឌីវីឌី​វីដេអូ (S)VCD ពី​ភាពយន្ត​ដែល​បាន​បើក​បច្ចុប្បន្ន"
+
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:68
+msgid "Copy Vide_o DVD..."
+msgstr "ចម្លង​ឌីវីឌី​វីដេអូ..."
+
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:69
+msgid "Copy the currently playing video DVD"
+msgstr "ចម្លង​ឌីវីឌី​វីដេអូ​ដែល​កំពុង​ចាក់​បច្ចុប្បន្ន"
+
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:71
+msgid "Copy (S)VCD..."
+msgstr "ចម្លង (S)VCD..."
+
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:72
+msgid "Copy the currently playing (S)VCD"
+msgstr "ចម្លង​ (S)VCD ដែល​កំពុង​ចាក់​បច្ចុប្បន្ន"
+
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:136
+msgid "The video disc could not be duplicated."
+msgstr "មិន​អាច​ចម្លង​ថាស​វីដេអូ​បាន​ទេ ។"
+
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:138
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:283
+msgid "The movie could not be recorded."
+msgstr "មិន​អាច​ថត​ភាពយន្ត​បាន​ទេ ។"
+
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:164
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:174
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:270
+msgid "Unable to write a project."
+msgstr "មិន​អាច​សរសេរ​គម្រោង​បាន​ទេ ។"
+
+#: ../src/plugins/chapters/chapters-edit.ui.h:1
+msgid "Name for new chapter:"
+msgstr "ឈ្មោះ​សម្រាប់​ជំពូក​ថ្មី ៖"
+
+#: ../src/plugins/chapters/chapters-list.ui.h:1
+msgid "_Remove Chapter"
+msgstr "យក​ជំពូក​ចេញ"
+
+#: ../src/plugins/chapters/chapters-list.ui.h:2
+msgid "Remove the chapter from the list"
+msgstr "យក​ជំពូក​ចេញ​ពី​បញ្ជី"
+
+#: ../src/plugins/chapters/chapters-list.ui.h:3
+msgid "_Go to Chapter"
+msgstr "ទៅ​កាន់​ជំពូក"
+
+#: ../src/plugins/chapters/chapters-list.ui.h:4
+msgid "Go to the chapter in the movie"
+msgstr "ទៅកាន់​ជំពូក​នៅ​ក្នុង​ភាព​យន្ត"
+
+#: ../src/plugins/chapters/chapters-list.ui.h:5
+msgid "Add Chapter..."
+msgstr "បន្ថែម​ជំពូក..."
+
+#: ../src/plugins/chapters/chapters-list.ui.h:6
+msgid "Remove Chapter"
+msgstr "យក​ជំពូក​ចេញ"
+
+#: ../src/plugins/chapters/chapters-list.ui.h:7
+msgid "Go to Chapter"
+msgstr "ទៅកាន់​ជំពូក"
+
+#: ../src/plugins/chapters/chapters-list.ui.h:8
+msgid "Save Changes"
+msgstr "រក្សាទុក​ការ​ផ្លាស់ប្ដូរ"
+
+#: ../src/plugins/chapters/chapters-list.ui.h:9
+msgid "No chapter data"
+msgstr "គ្មាន​ទិន្នន័យ​ជំពូក"
+
+#: ../src/plugins/chapters/chapters-list.ui.h:10
+msgid "Load Chapters..."
+msgstr "ផ្ទុក​ជំពូក..."
+
+#: ../src/plugins/chapters/chapters-list.ui.h:11
+msgid "Load chapters from an external CMML file"
+msgstr "ផ្ទុក​ជំពូក​ពី​ឯកសារ CMML ខាង​ក្រៅ"
+
+#: ../src/plugins/chapters/chapters-list.ui.h:12
+msgid "Add New Chapters"
+msgstr "បន្ថែម​ជំពូក​ថ្មី"
+
+#: ../src/plugins/chapters/chapters-list.ui.h:13
+msgid "Create a new chapter list for the movie"
+msgstr "បង្កើត​បញ្ជី​ជំពូក​ថ្មី​សម្រាប់​ភាពយន្ត"
+
+#: ../src/plugins/chapters/chapters.plugin.in.h:1
+#: ../src/plugins/chapters/totem-chapters.c:1139
+msgid "Chapters"
+msgstr "ជំពូក"
+
+#: ../src/plugins/chapters/chapters.plugin.in.h:2
+msgid "Support chapter markers in movies"
+msgstr "គាំទ្រ​សញ្ញា​សម្គាល់​ជំពូក​នៅ​ក្នុង​ភាពយន្ត"
+
+#: ../src/plugins/chapters/totem-chapters.c:56
+#, c-format
+msgid ""
+"Title: %s\n"
+"Start time: %s"
+msgstr ""
+"ចំណង​ជើង ៖ %s\n"
+"ពេល​វេលា​ចាប់ផ្ដើម ៖ %s"
+
+#: ../src/plugins/chapters/totem-chapters.c:328
+msgid "Error while reading file with chapters"
+msgstr "កំហុស​ក្នុង​ការ​អាន​ឯកសារ​ដែល​មាន​ជំពូក"
+
+#: ../src/plugins/chapters/totem-chapters.c:543
+msgid "Chapter with the same time already exists"
+msgstr "ជំពូក​មាន​ពេលវេលា​ដូច​គ្នា"
+
+#: ../src/plugins/chapters/totem-chapters.c:544
+msgid "Try another name or remove an existing chapter."
+msgstr "ព្យាយាម​ឈ្មោះ​ផ្សេង ឬ​យក​ជំពូក​ដែល​មាន​ស្រាប់​ចេញ ។"
+
+#: ../src/plugins/chapters/totem-chapters.c:717
+msgid "Error while writing file with chapters"
+msgstr "កំហុស​ក្នុង​ការ​សរសេរ​ឯកសារ​ជា​មួយ​ជំពូក"
+
+#: ../src/plugins/chapters/totem-chapters.c:842
+msgid "Error occurred while saving chapters"
+msgstr "កំហុស​បាន​កើត​ឡើង​​នៅ​ពេល​រក្សាទុក​ជំពូក"
+
+#: ../src/plugins/chapters/totem-chapters.c:843
+msgid ""
+"Please check you have permission to write to the folder containing the movie."
+msgstr "សូម​ពិនិត្យ​មើល​ ថា​តើ​អ្នក​មាន​សិទ្ធិ ដើម្បី​សរសេរ​ទៅ​ថត​ដែល​មាន​ភាព​យន្ត​ដែរឬទេ ។"
+
+#: ../src/plugins/chapters/totem-chapters.c:976
+msgid "Open Chapter File"
+msgstr "បើក​ឯកសារ​ជំពូក"
+
+#: ../src/plugins/chapters/totem-chapters.c:1093
+msgid "Chapter Screenshot"
+msgstr "រូបថត​អេក្រង់​ជំពូក"
+
+#: ../src/plugins/chapters/totem-chapters.c:1104
+msgid "Chapter Title"
+msgstr "ចំណង​ជើង​ជំពូក"
+
+#: ../src/plugins/chapters/totem-chapters.c:1184
+msgid "Save changes to chapter list before closing?"
+msgstr "រក្សាទុក​ការ​ផ្លាស់ប្ដូរ​ទៅ​បញ្ជី​ជំពូក​មុន​នឹង​បិទ ?"
+
+#. Translators: close Totem without saving changes to the chapter list of the current movie.
+#: ../src/plugins/chapters/totem-chapters.c:1189
+msgid "Close without Saving"
+msgstr "បិទ​ដោយ​មិន​រក្សាទុក"
+
+#. Translators: save changes to the chapter list of the current movie before closing Totem.
+#: ../src/plugins/chapters/totem-chapters.c:1191
+msgid "Save"
+msgstr "រក្សាទុក"
+
+#: ../src/plugins/chapters/totem-chapters.c:1194
+msgid "If you don't save, changes to the chapter list will be lost."
+msgstr "ប្រសិន​បើ​អ្នក​មិន​រក្សាទុក ការ​ផ្លាស់ប្ដូរ​ក្នុង​បញ្ជី​ជំពូក​នឹង​បាត់បង់ ។"
+
+#: ../src/plugins/chapters/totem-cmml-parser.c:651
+msgid "Failed to parse CMML file"
+msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ញែក​ឯកសារ CMML"
+
+#: ../src/plugins/chapters/totem-edit-chapter.c:95
+msgid "Add Chapter"
+msgstr "បន្ថែម​ជំពូក"
+
+#: ../src/plugins/dbusservice/dbusservice.plugin.in.h:1
+msgid "D-Bus Service"
+msgstr "សេវាកម្ម D-Bus"
+
+#: ../src/plugins/dbusservice/dbusservice.plugin.in.h:2
+msgid ""
+"Plugin for sending notifications of currently playing movies to the D-Bus "
+"subsystem."
+msgstr "កម្មវិធី​ជំនួយ​សម្រាប់​ផ្ញើ​ការ​ជូន​ដំណឹង​នៃ​ភាពយន្ត​បច្ចុប្បន្ន​ទៅ​កាន់​ប្រព័ន្ធ​រង D-Bus ។"
+
+#: ../src/plugins/dbusservice/dbusservice.py:213
+#: ../src/plugins/dbusservice/dbusservice.py:243
+#, python-format
+msgid "The MediaPlayer2 object does not implement the ‘%s’ interface"
+msgstr "កម្មវិធី MediaPlayer2 មិន​មាន​ចំណុច​ប្រទាក់ ‘%s’"
+
+#: ../src/plugins/dbusservice/dbusservice.py:222
+#, python-format
+msgid "The property ‘%s’ is not writeable."
+msgstr "លក្ខណៈ​របស់ ‘%s’ គឺ​មិន​អាច​សរសេរ​បាន​ទេ ។"
+
+#: ../src/plugins/dbusservice/dbusservice.py:238
+#, python-format
+msgid "Unknown property ‘%s’ requested of a MediaPlayer 2 object"
+msgstr "មិន​ស្គាល់​លក្ខណៈ ‘%s’ ដែល​បាន​ស្នើសុំ​ដោយ​កម្មវិធី MediaPlayer 2"
+
+#: ../src/plugins/dbusservice/dbusservice.py:341
+#, python-format
+msgid "The URI ‘%s’ is not supported."
+msgstr "មិន​បាន​គាំទ្រ URI របស់ ‘%s’ ។"
+
+#: ../src/plugins/grilo/grilo.plugin.in.h:1
+msgid "Grilo Browser"
+msgstr "កម្មវិធី​រុករក Grilo"
+
+#: ../src/plugins/grilo/grilo.plugin.in.h:2
+msgid "A plugin to let you browse media content from various sources"
+msgstr "កម្មវិធី​ជំនួយ​ដែល​អនុញ្ញាត​ឲ្យ​អ្នក​រកមើល​មាតិកា​មេឌៀ​ចេញពី​ប្រភព​ផ្សេងៗ"
+
+#: ../src/plugins/grilo/grilo.ui.h:1
+msgid "Add to Playlist"
+msgstr "បន្ថែម​ទៅ​កម្មវិធី​ចាក់"
+
+#: ../src/plugins/grilo/grilo.ui.h:2
+msgid "Copy Location"
+msgstr "ចម្លង​ទីតាំង"
+
+#: ../src/plugins/grilo/grilo.ui.h:3 ../src/plugins/grilo/totem-grilo.c:1186
+msgid "Browse"
+msgstr "រកមើល"
+
+#: ../src/plugins/grilo/grilo.ui.h:4 ../src/plugins/grilo/totem-grilo.c:1229
+msgid "Search"
+msgstr "ស្វែងរក"
+
+#: ../src/plugins/grilo/totem-grilo.c:454
+msgid "Browse Error"
+msgstr "រកមើល​កំហុស"
+
+#: ../src/plugins/grilo/totem-grilo.c:609
+msgid "Search Error"
+msgstr "ស្វែងរក​កំហុស"
+
+#: ../src/plugins/gromit/gromit.plugin.in.h:1
+msgid "Gromit Annotations"
+msgstr "ការ​អធិប្បាយ Gromit"
+
+#: ../src/plugins/gromit/gromit.plugin.in.h:2
+msgid "Presentation helper to make annotations on screen"
+msgstr "កម្មវិធី​ជំនួយ​នៃ​ការ​បង្ហាញ ដើម្បី​បង្កើត​ការ​អធិប្បាយ​នៅ​លើ​អេក្រង់"
+
+#: ../src/plugins/gromit/totem-gromit.c:231
+msgid "The gromit binary was not found."
+msgstr "រក​មិន​ឃើញ​ឯកសារ​គោល​ពីរ​របស់ gromit ។"
+
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
+msgid "Instant Messenger Status"
+msgstr "ស្ថានភាព​កម្មវិធី​ផ្ញើ​សារ​បន្ទាន់"
+
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
+msgid "Set your Instant Messenger status to away when a movie is playing"
+msgstr "កំណត់​ស្ថានភាព​​កម្មវិធី​ផ្ញើ​សារ​បន្ទាន់​របស់​ ថា​ចាក​ឆ្ងាយ​នៅ​ពេល​កំពុង​ចាក់​ភាពយន្ត"
+
+#: ../src/plugins/lirc/lirc.plugin.in.h:1
+msgid "Infrared Remote Control"
+msgstr "ការ​គ្រប់គ្រង​ពី​ចម្ងាយ​របស់​អ៊ីនហ្វ្រារ៉េដ"
+
+#: ../src/plugins/lirc/lirc.plugin.in.h:2
+msgid "Support infrared remote control"
+msgstr "គាំទ្រ​ការ​គ្រប់គ្រង​ពី​ចម្ងាយ​របស់​អ៊ីនហ្វ្រារ៉េដ"
+
+#: ../src/plugins/lirc/totem-lirc.c:242
+msgid "Couldn't initialize lirc."
+msgstr "មិន​អាច​ចាប់ផ្ដើម lirc បាន​ទេ ។"
+
+#: ../src/plugins/lirc/totem-lirc.c:254
+msgid "Couldn't read lirc configuration."
+msgstr "មិន​អាច​អានការ​កំណត់​រចនាសម្ព័ន្ធ lirc បាន​ទេ ។"
+
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:1
+msgid "Media Player Keys"
+msgstr "ពាក្យ​គន្លឹះ​កម្មវិធី​ចាក់​ភាពយន្ត"
+
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:2
+msgid "Support additional media player keys"
+msgstr "គាំទ្រ​ពាក្យ​គន្លឹះ​កម្មវិធី​ចាក់​មេឌៀ​បន្ថែម"
+
+#: ../src/plugins/ontop/ontop.plugin.in.h:1
+msgid "Always On Top"
+msgstr "តែងតែ​នៅ​ខាង​លើ​ជានិច្ច"
+
+#: ../src/plugins/ontop/ontop.plugin.in.h:2
+msgid "Keep the main window on top when playing a movie"
+msgstr "ដាក់​បង្អួច​មេ​នៅ​ខាង​លើ នៅ​ពេល​ចាក់​ភាពយន្ត"
+
+#: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:1
+msgid "Subtitle Downloader"
+msgstr "កម្មវិធី​ទាញយក​ចំណង​ជើង​រង"
+
+#: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:2
+msgid "Look for subtitles for the currently playing movie"
+msgstr "រកមើល​ចំណង​ជើង​រង​សម្រាប់​ភាពយន្ត​ដែល​កំពុង​ចាក់​បច្ចុប្បន្ន"
+
+#: ../src/plugins/opensubtitles/opensubtitles.py:42
+msgid "Brazilian Portuguese"
+msgstr "ប្រេស៊ីល ព័រទុយហ្គាល់"
+
+#: ../src/plugins/opensubtitles/opensubtitles.py:177
+msgid "Searching for subtitles…"
+msgstr "កំពុង​ស្វែងរក​ចំណងជើង​រង..."
+
+#: ../src/plugins/opensubtitles/opensubtitles.py:225
+#: ../src/plugins/opensubtitles/opensubtitles.py:645
+msgid "Downloading the subtitles…"
+msgstr "កំពុងទាញយក​ចំណង​ជើង​រង..."
+
+#: ../src/plugins/opensubtitles/opensubtitles.py:290
+msgid "Could not contact the OpenSubtitles website"
+msgstr "មិនអាច​ទាក់ទង​តំបន់​បណ្ដាញ OpenSubtitles បាន​ទេ"
+
+#: ../src/plugins/opensubtitles/opensubtitles.py:323
+#: ../src/plugins/opensubtitles/opensubtitles.py:341
+msgid "Could not contact the OpenSubtitles website."
+msgstr "មិន​អាច​ទាក់ទង​តំបន់បណ្ដាញ OpenSubtitles បាន​ទេ ។"
+
+#: ../src/plugins/opensubtitles/opensubtitles.py:329
+msgid "No results found."
+msgstr "រក​មិន​ឃើញ​លទ្ធផល ។"
+
+#: ../src/plugins/opensubtitles/opensubtitles.py:478
+msgid "Subtitles"
+msgstr "ចំណង​ជើង​រង"
+
+#. translators comment:
+#. This is the file-type of the subtitle file detected
+#: ../src/plugins/opensubtitles/opensubtitles.py:484
+msgid "Format"
+msgstr "ទ្រង់ទ្រាយ"
+
+#. translators comment:
+#. This is a rating of the quality of the subtitle
+#: ../src/plugins/opensubtitles/opensubtitles.py:489
+msgid "Rating"
+msgstr "ការ​វាយតម្លៃ"
+
+#: ../src/plugins/opensubtitles/opensubtitles.py:525
+msgid "Download movie subtitles from OpenSubtitles"
+msgstr "ទាញយក​ចំណង​ជើង​រង​ភាពយន្ត​ពី OpenSubtitles"
+
+#: ../src/plugins/opensubtitles/opensubtitles.py:527
+msgid "_Download Movie Subtitles…"
+msgstr "កំពុង​ទាញយក​ចំណង​ជើង​រង​ភាពយន្ត..."
+
+#: ../src/plugins/opensubtitles/opensubtitles.py:589
+msgid "Searching subtitles…"
+msgstr "កំពុង​ស្វែងរក​ចំណង​ជើង​រង..."
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
+msgid "Download Movie Subtitles"
+msgstr "ទាញយក​ចំណង​ជើង​រង​របស់​ភាពយន្ត"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
+msgid "Subtitle _language:"
+msgstr "ភាសា​ចំណង​ជើង​រង ៖"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
+msgid "_Play with Subtitle"
+msgstr "ចាក់​ដោយ​មាន​ចំណង​ជើង​រង"
+
+#: ../src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in.h:1
+msgid "Subtitle language"
+msgstr "ភាសា​ចំណង​ជើង​រង"
+
+#: ../src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in.h:2
+msgid "The language to search for subtitles for movies in."
+msgstr "ភាសា​ត្រូវ​ស្វែងរក​ចំណងជើង​រង​សម្រាប់​ភាពយន្ត ។"
+
+#: ../src/plugins/properties/movie-properties.plugin.in.h:1
+msgid "Movie Properties"
+msgstr "លក្ខណសម្បត្តិ​របស់​ភាពយន្ត"
+
+#: ../src/plugins/properties/movie-properties.plugin.in.h:2
+msgid "Adds movie properties to the sidebar"
+msgstr "បន្ថែម​លក្ខណសម្បត្តិ​ទៅ​​របារ​ចំហៀង"
+
+#: ../src/plugins/properties/totem-movie-properties.c:246
+msgid "Properties"
+msgstr "លក្ខណសម្បត្តិ"
+
+#: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:1
+msgid "rpdb2 password"
+msgstr "ពាក្យ​សម្ងាត់ rpdb2"
+
+#: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:2
+msgid ""
+"A password to protect the rpdb2 server for debugging Totem from unauthorized "
+"remote access. If this is empty, a default of 'totem' will be used."
+msgstr ""
+"ពាក្យ​សម្ងាត់ ដើម្បី​ការពារ​ម៉ាស៊ីន​បម្រើ rpdb2 សម្រាប់បំបាត់​កំហុស Totem ពី​ការ​ចូល​ប្រើ​ពី​ចម្ងាយ​ដែល​មិន​បាន​"
+"អនុញ្ញាត ។ ប្រសិន​បើ​វា​ទទេ លំនាំដើម​របស់ 'totem' នឹង​ត្រូវ​បានប្រើ ។"
+
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
+msgid "Python Console"
+msgstr "កុងសូល Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
+msgid "Interactive Python console"
+msgstr "កុងសូល​ Python អន្តរសកម្ម"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:88
+msgid "Python Console Menu"
+msgstr "ម៉ឺនុយ​កុងសូល Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:93
+msgid "_Python Console"
+msgstr "កុង​សូល Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:94
+msgid "Show Totem's Python console"
+msgstr "បង្ហាញ​កុងសូល​ Python របស់ Totem"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:100
+msgid "Python Debugger"
+msgstr "កម្មវិធី​បំបាត់​កំហុស Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:101
+msgid "Enable remote Python debugging with rpdb2"
+msgstr "បើក​កា​របំបាត់​កំហុស Python ពី​ចម្ងាយ​ដែល​មាន rpdb2"
+
+#. pylint: disable-msg=E1101
+#: ../src/plugins/pythonconsole/pythonconsole.py:125
+#, python-format
+msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
+msgstr "អ្នក​អាច​ចូល​ប្រើ Totem.Object តាមរយៈ 'totem_object' :\\n%s"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:129
+msgid "Totem Python Console"
+msgstr "កុងសូល Python របស់ Totem"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:139
+msgid ""
+"After you press OK, Totem will wait until you connect to it with winpdb or "
+"rpdb2. If you have not set a debugger password in DConf, it will use the "
+"default password ('totem')."
+msgstr ""
+"បន្ទាប់​ពី​អ្នក​ចុច​ យល់ព្រម Totem នឹង​រង់ចាំ​រហូត​ដល់​អ្នក​តភ្ជាប់​វា​ជា​មួយ winpdb ឬ rpdb2 ។ ប្រសិន​បើ​អ្នក​"
+"មិន​បាន​កំណត់​​ពាក្យ​សម្ងាត់​កម្មវិធី​បំបាត់​កំហុស​នៅ​ក្នុង DConf វា​នឹង​ប្រើ​ពាក្យ​សម្ងាត់​លំនាំដើម (របស់ "
+"'totem') ។"
+
+#: ../src/plugins/recent/recent.plugin.in.h:1
+msgid "Recent files"
+msgstr "ឯកសារ​ថ្មីៗ"
+
+#: ../src/plugins/recent/recent.plugin.in.h:2
+msgid "Adds files that have been played to recent files"
+msgstr "បន្ថែម​ឯកសារ​ដែល​បាន​ចាក់​ទៅកាន់​ឯកសារ​ថ្មីៗ"
+
+#: ../src/plugins/rotation/rotation.plugin.in.h:1
+msgid "Rotation Plugin"
+msgstr "កម្មវិធី​ជំនួយ​ការ​បង្វិល"
+
+#: ../src/plugins/rotation/rotation.plugin.in.h:2
+msgid "Allows videos to be rotated if they are in the wrong orientation"
+msgstr "អនុញ្ញាត​ឲ្យ​បង្វិល​វីដេអូ ប្រសិនបើ​វា​នៅ​ក្នុង​ទិស​មិន​ត្រឹមត្រូវ"
+
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:50
+msgid "_Rotate Clockwise"
+msgstr "បង្វិល​ស្រប​ទិស​ទ្រនិច​នាឡិកា"
+
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:52
+msgid "Rotate Counterc_lockwise"
+msgstr "បង្វិល​ច្រាស​ទិស​ទ្រនិច​នាឡិកា"
+
+#: ../src/plugins/save-file/save-file.plugin.in.h:1
+msgid "Save Copy"
+msgstr "រក្សាទុក​ច្បាប់​ចម្លង"
+
+#: ../src/plugins/save-file/save-file.plugin.in.h:2
+msgid "Save a copy of the currently playing movie"
+msgstr "រក្សាទុក​ច្បាប់​ចម្លង​របស់​ភាពយន្ត​​ដែល​កំពុង​ចាក់​បច្ចុប្បន្ន"
+
+#: ../src/plugins/save-file/totem-save-file.c:63
+msgid "Save a Copy..."
+msgstr "រក្សាទុក​ជា​ច្បាប់ចម្លង..."
+
+#: ../src/plugins/save-file/totem-save-file.c:64
+msgid "Save a copy of the movie"
+msgstr "រក្សាទុក​ភាពយន្ត​ជា​ច្បាប់ចម្លង"
+
+#: ../src/plugins/save-file/totem-save-file.c:129
+msgid "Save a Copy"
+msgstr "រក្សាទុក​ជា​ច្បាប់​ចម្លង"
+
+#. translators: Movie is the default saved movie filename,
+#. * without the suffix
+#: ../src/plugins/save-file/totem-save-file.c:161
+msgid "Movie"
+msgstr "ភាព​យន្ដ"
+
+#: ../src/plugins/save-file/totem-save-file.c:183
+msgid "Movie stream"
+msgstr "ស្ទ្រីម​ភាពយន្ត"
+
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:1
+msgid "Screen Saver"
+msgstr "ធាតុ​រក្សា​អេក្រង់"
+
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:2
+msgid "Deactivates the screen saver when a movie is playing"
+msgstr "បិទ​ធាតុ​រក្សា​អេក្រង់​នៅ​ពេល​កំពុង​ចាក់​ភាពយន្ត"
+
+#: ../src/plugins/screenshot/gallery.ui.h:1
+msgid "Screenshot width (in pixels):"
+msgstr "ទទឹង​រូបថត​អេក្រង់ (គិតជា​ភីកសែល) ៖"
+
+#: ../src/plugins/screenshot/gallery.ui.h:2
+msgid "Calculate the number of screenshots"
+msgstr "គណនា​ចំនួន​រូបថត​អេក្រង់"
+
+#: ../src/plugins/screenshot/gallery.ui.h:3
+msgid "Number of screenshots:"
+msgstr "ចំនួ​ន​រូបថត​អេក្រង់"
+
+#. translators: this is the name of the file that gets made up
+#. * with the screenshot if the entire screen is taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:147
+#, c-format
+msgid "Screenshot from %s.png"
+msgstr "រូបថត​អេក្រង់​ពី %s.png"
+
+#. translators: this is the name of the file that gets
+#. * made up with the screenshot if the entire screen is
+#. * taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:154
+#, c-format
+msgid "Screenshot from %s - %d.png"
+msgstr "រូបថត​អេក្រង់​ពី %s - %d.png"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:1
+msgid "Screenshot"
+msgstr "រូបថត​អេក្រង់"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:2
+msgid "Allows screenshots and galleries to be taken of videos"
+msgstr "អនុញ្ញាត​ការ​ថតរូប​អេក្រង់ និង​វិចិត្រសាល​ដើម្បី​ថត​វីដេអូ"
+
+#: ../src/plugins/screenshot/totem-gallery.c:91
+msgid "Save Gallery"
+msgstr "រក្សាទុក​វិចិត្រសាល"
+
+#. Translators: The first argument is the movie title. The second
+#. * argument is a number which is used to prevent overwriting files.
+#. * Just translate "Gallery", and not the ".jpg". Example:
+#. * "Galerie-%s-%d.jpg".
+#: ../src/plugins/screenshot/totem-gallery.c:115
+#, c-format
+msgid "Gallery-%s-%d.jpg"
+msgstr "Gallery-%s-%d.jpg"
+
+#. Set up the window
+#: ../src/plugins/screenshot/totem-gallery-progress.c:101
+msgid "Creating Gallery..."
+msgstr "កំពុង​បង្កើត​វិចិត្រសាល..."
+
+#. Set the progress label
+#: ../src/plugins/screenshot/totem-gallery-progress.c:107
+#, c-format
+msgid "Saving gallery as \"%s\""
+msgstr "រក្សាទុក​វិចិត្រសាល​ជា \"%s\""
+
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:220
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
+msgid "Totem could not get a screenshot of the video."
+msgstr "Totem មិន​អាច​ថតរូប​អេក្រង់​​វីដេអូ ។"
+
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
+msgid "This is not supposed to happen; please file a bug report."
+msgstr "សង្ឃឹម​ថា​មិន​កើត​ឡើង​ទេ សូម​​ចងក្រង​របាយការណ៍​កំហុស ។"
+
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
+msgid "Take _Screenshot"
+msgstr "ថតរូប​អេក្រង់"
+
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
+msgid "Take a screenshot"
+msgstr "ថតរូប​អេក្រង់"
+
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
+msgid "Create Screenshot _Gallery..."
+msgstr "កំពុង​បង្កើត​វិចិត្រ​សាល​រូបថត​អេក្រង់..."
+
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
+msgid "Create a gallery of screenshots"
+msgstr "បង្កើត​វិចិត្រសាល​រូបថត​អេក្រង់"
+
+#: ../src/plugins/skipto/skipto.plugin.in.h:1
+#: ../src/plugins/skipto/totem-skipto.c:196
+msgid "Skip To"
+msgstr "រំលង​ទៅ"
+
+#: ../src/plugins/skipto/skipto.plugin.in.h:2
+msgid "Provides the \"Skip to\" dialog"
+msgstr "ផ្ដល់​ប្រអប់ \"រំលង\""
+
+#: ../src/plugins/skipto/skipto.ui.h:1
+msgid "_Skip to:"
+msgstr "រំលង​ទៅ"
+
+#. Update the "seconds" label so that it always has the correct singular/plural form
+#. Translators: label for the seconds selector in the "Skip to" dialogue
+#: ../src/plugins/skipto/totem-skipto.c:159
+msgid "second"
+msgid_plural "seconds"
+msgstr[0] "វិនាទី"
+
+#. Fix the label width at the maximum necessary for the plural labels, to prevent it changing size when we change the spinner value
+#. Translators: you should translate this string to a number (written in digits) which corresponds to the longer character length of the
+#. * translations for "second" and "seconds", as translated elsewhere in this file. For example, in English, "second" is 6 characters long and
+#. * "seconds" is 7 characters long, so this string should be translated to "7". See: bgo#639398
+#: ../src/plugins/skipto/totem-skipto.c:189
+msgctxt "Skip To label length"
+msgid "7"
+msgstr "៧"
+
+#: ../src/plugins/skipto/totem-skipto-plugin.c:182
+msgid "_Skip To..."
+msgstr "រំលង​ទៅ..."
+
+#: ../src/plugins/skipto/totem-skipto-plugin.c:182
+msgid "Skip to a specific time"
+msgstr "រំលង​ទៅ​ពេលវេលា​ជាក់លាក់"
+
+#~ msgid "Play movies and songs"
+#~ msgstr "ចាក់​ភាពយន្ត និងបទ​​ចម្រៀង"
+
+#~ msgid "Mute"
+#~ msgstr "ស្ងាត់"
+
+#~ msgid "Open a file"
+#~ msgstr "បើក​ឯកសារ"
+
+#~ msgid "Open a non-local file"
+#~ msgstr "បើក​ឯកសារ​មិន​នៅ​ក្នុង​មូលដ្ឋាន"
+
+#~ msgid "Quit the program"
+#~ msgstr "ចេញ​ពី​កម្មវិធី"
+
+#~ msgid "Configure the application"
+#~ msgstr "កំណត់​រចនាសម្ព័ន្ធ​កម្មវិធី"
+
+#~ msgid "Switch to fullscreen"
+#~ msgstr "ប្ដូរ​ទៅ​ពេញ​អេក្រង់"
+
+#~ msgid "Set the repeat mode"
+#~ msgstr "កំណត់​របៀប​ធ្វើ​ឡើងវិញ"
+
+#~ msgid "Set the shuffle mode"
+#~ msgstr "កំណត់​របៀប​ច្របល់"
+
+#~ msgid "14.4 Kbps Modem"
+#~ msgstr "ម៉ូដឹម 14.4 Kbps"
+
+#~ msgid "19.2 Kbps Modem"
+#~ msgstr "ម៉ូដឹម 19.2 Kbps"
+
+#~ msgid "28.8 Kbps Modem"
+#~ msgstr "ម៉ូដឹម 28.8 Kbps"
+
+#~ msgid "33.6 Kbps Modem"
+#~ msgstr "ម៉ូដឹម 33.6 Kbps"
+
+#~ msgid "34.4 Kbps Modem"
+#~ msgstr "ម៉ូដឹម 34.4 Kbps"
+
+#~ msgid "56 Kbps Modem/ISDN"
+#~ msgstr "ម៉ូដឹម/ISDN 56 Kbps"
+
+#~ msgid "112 Kbps Dual ISDN/DSL"
+#~ msgstr "112 Kbps Dual ISDN/DSL"
+
+#~ msgid "256 Kbps DSL/Cable"
+#~ msgstr "256 Kbps DSL/Cable"
+
+#~ msgid "384 Kbps DSL/Cable"
+#~ msgstr "384 Kbps DSL/Cable"
+
+#~ msgid "512 Kbps DSL/Cable"
+#~ msgstr "512 Kbps DSL/Cable"
+
+#~ msgid "1.5 Mbps T1/Intranet/LAN"
+#~ msgstr "1.5 Mbps T1/Intranet/LAN"
+
+#~ msgid "Intranet/LAN"
+#~ msgstr "Intranet/LAN"
+
+#~ msgid "Networking"
+#~ msgstr "ការ​តបណ្ដាញ"
+
+#~ msgid "Connection _speed:"
+#~ msgstr "ល្បឿន​តភ្ជាប់ ៖"
+
+#~ msgid "Network connection speed"
+#~ msgstr "ល្បឿន​ការ​តភ្ជាប់បណ្ដាញ"
+
+#~ msgid ""
+#~ "Approximate network connection speed, used to select quality on media "
+#~ "over the network."
+#~ msgstr "ល្បឿន​កា​តភ្ជាប់​បណ្ដាញ​សមរម្យ បាន​ប្រើ​ដើម្បី​ជ្រើស​គុណភាព​មេឌៀ​នៅ​លើ​​បណ្ដាញ ។"
+
+#~ msgid "Play Image '%s'"
+#~ msgstr "ដំណើរការ​រូបភាព '%s'"
+
+#~ msgid "device%d"
+#~ msgstr "ឧបករណ៍ %d"
+
+#~ msgid "Play Disc '%s'"
+#~ msgstr "ចាក់​ថាស '%s'"
+
+#~ msgid "Movie Player using %s"
+#~ msgstr "កម្មវិធី​ចាក់​តន្ត្រី​ដោយ​ប្រើ​កម្មវិធី %s"
+
+#~ msgid ""
+#~ "Totem could not play this media (%s) although a plugin is present to "
+#~ "handle it."
+#~ msgstr "Totem មិន​អាច​ចាក់​មេឌៀ​នេះ (%s) ទោះ​បី​ជា​កម្មវិធី​ជំនួយ​មាន​ដើម្បី​គ្រប់គ្រង​វា​ក៏​ដោយ ។"
+
+#~ msgid ""
+#~ "You might want to check that a disc is present in the drive and that it "
+#~ "is correctly configured."
+#~ msgstr ""
+#~ "អ្នក​ចង់​ពិនិត្យ​មើល​ថា​តើ​បច្ចុប្បន្ន​​មាន​ថាស​នៅ​ក្នុង​ដ្រាយ​ ហើយ​ត្រូវ​បាន​កំណត់​រចនាសម្ព័ន្ធ​ត្រឹមត្រូវ​ដែរ​ឬទេ ។"
+
+#~ msgid "More information about media plugins"
+#~ msgstr "ព័ត៌មាន​បន្ថែម​អំពី​កម្មវិធី​ជំនួយ​មេឌៀ"
+
+#~ msgid ""
+#~ "Please install the necessary plugins and restart Totem to be able to play "
+#~ "this media."
+#~ msgstr ""
+#~ "សូម​ដំឡើង​កម្មវិធី​ជំនួយ​ដែល​ចាំបាច់ ហើយ​ចាប់ផ្ដើម Totem ឡើង​វិញ ដើម្បី​អាច​ចាក់​មេឌៀ​នេះ​បាន ។"
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it does not have the "
+#~ "appropriate plugins to be able to read from the disc."
+#~ msgstr ""
+#~ "Totem មិន​អាច​ចាក់​មេឌៀ​ប្រភេទ​នេះ​បាន​ទេ (%s) ពីព្រោះ​វា​មិន​មាន​កម្មវិធី​សមស្រប​ដើម្បី​អាច​អាន​ពី​ថាស​"
+#~ "បាន ។"
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because you do not have the "
+#~ "appropriate plugins to handle it."
+#~ msgstr ""
+#~ "Totem មិន​អាច​ចាក់​មេឌៀ​ប្រភេទ​នេះ​បាន​ទេ (%s) ពីព្រោះ​អ្នក​មិន​មាន​កម្មវិធី​ជំនួយ​សមស្រប​ ដើម្បី​គ្រប់គ្រង​"
+#~ "វា ។"
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it is not supported."
+#~ msgstr "Totem មិន​អាច​ចាក់​មេឌៀ​ប្រភេទ​នេះ​បាន​ទេ (%s) ពីព្រោះ​វា​មិន​ត្រូវ​បានគាំទ្រ ។"
+
+#~ msgid "Please insert another disc to play back."
+#~ msgstr "សូម​បញ្ចូល​ថាស​ផ្សេង ដើម្បី​ចាក់​ម្ដងទៀត ។"
+
+#~ msgid "Totem does not support playback of Audio CDs"
+#~ msgstr "Totem មិន​គាំទ្រ​ការ​ចាក់​ស៊ីឌី​អូឌីយ៉ូ​ឡើង​វិញ​បាន​ទេ"
+
+#~ msgid ""
+#~ "Please consider using a music player or a CD extractor to play this CD"
+#~ msgstr "សូម​គិត​អំពី​ការ​ប្រើ​កម្មវិធី​ចាក់​តន្ត្រី ឬ​កម្មវិធី​យក​ទិន្នន័យ​ចេញ​ពី​ស៊ីឌី ដើម្បី​ចាក់​ស៊ីឌី​នេះ"
+
+#~ msgid "%d %%"
+#~ msgstr "%d %%"
+
+#~ msgid ""
+#~ "The requested audio output was not found. Please select another audio "
+#~ "output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "រក​មិន​ឃើញ​លទ្ធផល​អូឌីយ៉ូ​ដែល​បាន​ស្នើ​ទេ ។ សូម​ជ្រើស​លទ្ធផល​អូឌីយ៉ូ​ផ្សេង​នៅ​ក្នុង​កម្មវិធី​ជ្រើស​ប្រព័ន្ធ​ពហុមេឌៀ ។"
+
+#~ msgid "Location not found."
+#~ msgstr "រក​មិន​ឃើញ​ទីតាំង​ទេ ។"
+
+#~ msgid ""
+#~ "Could not open location; you might not have permission to open the file."
+#~ msgstr "មិន​អាច​បើក​ទីតាំង អ្នក​ប្រហែល​ជា​មិន​មាន​សិទ្ធិ​ពេញលេញ ដើម្បី​បើក​ឯកសារ​ទេ ។"
+
+#~ msgid ""
+#~ "The video output is in use by another application. Please close other "
+#~ "video applications, or select another video output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "លទ្ធផល​វីដេអូ​​កំពុង​ប្រើ​ដោយ​កម្មវិធី​ផ្សេង ។ សូម​បិទ​កម្មវិធី​ចាក់​វីដេអូ​ផ្សេង ឬ​ជ្រើស​លទ្ធផល​វីដេអូ​ផ្សេង​នៅ​ក្នុង​"
+#~ "កម្មវិធី​ជ្រើស​ប្រព័ន្ធ​ពហុមេឌៀ ។"
+
+#~ msgid ""
+#~ "The audio output is in use by another application. Please select another "
+#~ "audio output in the Multimedia Systems Selector. You may want to consider "
+#~ "using a sound server."
+#~ msgstr ""
+#~ "លទ្ធផល​អូឌីយ៉ូ​កំពុង​ប្រើ​កម្មវិធី​ផ្សេង ។ សូម​ជ្រើស​លទ្ធផល​អូឌីយ៉ូ​ផ្សេង​នៅ​ក្នុង​កម្មវិធី​ជ្រើស​ប្រព័ន្ធ​ពហុមេឌៀ ។ "
+#~ "អ្នក​ចង់​ពិចារណា​ប្រើ​ម៉ាស៊ីន​បម្រើ​សំឡេង"
+
+#~ msgid ""
+#~ "Failed to create a GStreamer play object. Please check your GStreamer "
+#~ "installation."
+#~ msgstr ""
+#~ "បាន​បរាជ័យ​ក្នុង​ការ​បង្កើត​វត្ថុ​ចាក់ GStreamer ។ សូម​ពិនិត្យ​មើល​ការ​ដំឡើង GStreamer របស់​អ្នក ។"
+
+#~ msgid ""
+#~ "Failed to open audio output. You may not have permission to open the "
+#~ "sound device, or the sound server may not be running. Please select "
+#~ "another audio output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "បាន​បរាជ័យ​ក្នុងកា​របើក​លទ្ធផល​អូឌីយ៉ូ ។ អ្នក​មិន​មាន​សិទ្ធិ​ដើម្បី​បើក​ឧបករណ៍​សំឡេង ឬ​ម៉ាស៊ីន​បម្រើ​សំឡេង​មិន​កំពុង​"
+#~ "ដំណើរការ ។ សូម​ជ្រើស​លទ្ធផល​អូឌីយ៉ូ​ផ្សេង​នៅ​ក្នុង​កម្មវិធី​ជ្រើស​ប្រព័ន្ធ​ពហុមេឌៀ ។"
+
+#~ msgid ""
+#~ "Could not find the audio output. You may need to install additional "
+#~ "GStreamer plugins, or select another audio output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "រក​មិន​ឃើញ​លទ្ធផល​អូឌីយ៉ូ ។ អ្នក​ត្រូវ​ដំឡើង​កម្មវិធី​ជំនួយ GStreamer ឬ​​ជ្រើស​លទ្ធផល​អូឌីយ៉ុ​ផ្សេង​នៅ​ក្នុងកម្មវិធី​"
+#~ "ជ្រើស​ប្រព័ន្ធ​ពហុមេឌៀ ។"
+
+#~ msgid "BBC iPlayer"
+#~ msgstr "BBC iPlayer"
+
+#~ msgid ""
+#~ "Stream BBC programs from the last 7 days from the BBC iPlayer service."
+#~ msgstr "ស្ទ្រីម​កម្មវិធី BBC ក្នុង​​រយៈពេល​ ៧ ថ្ងៃ​ចុងក្រោយ​​ពី​សេវា​កម្ម BBC ។"
+
+#~ msgid "Error listing channel categories"
+#~ msgstr "កំហុស​ក្នុង​ការ​រាយ​ឆានែល​បញ្ជី"
+
+#~ msgid ""
+#~ "There was an unknown error getting the list of television channels "
+#~ "available on BBC iPlayer."
+#~ msgstr "មាន​កំហុស​មិន​ស្គាល់​មួយ​ក្នុង​ការ​ទទួល​យកបញ្ជី​ប៉ុស្តិ៍​ទូរទស្សន៍​ដែល​មាន​នៅ​លើ BBC iPlayer ។"
+
+#~ msgid "Loading…"
+#~ msgstr "កំពុង​ផ្ទុក..."
+
+#~ msgid "Error getting programme feed"
+#~ msgstr "កំហុស​ក្នុង​ការ​ទៅយក​មតិ​ព័ត៌មាន​កម្មវិធី"
+
+#~ msgid ""
+#~ "There was an error getting the list of programmes for this channel and "
+#~ "category combination."
+#~ msgstr "មាន​កំហុស​ក្នុង​ការ​យក​​បញ្ជី​កម្មវិធី​សម្រាប់​ប៉ុស្តិ៍ និង​បន្សំ​ប្រភេទ ។"
+
+#~ msgid ""
+#~ msgstr "<គ្មាន​ហេតុ​បាន​ផ្ដល់>"
+
+#~ msgid "Programme unavailable (\"%s\")"
+#~ msgstr "កម្មវិធី​មិន​អាច​ប្រើ​បាន (\"%s\")"
+
+#~ msgid "Publisher protocol to use"
+#~ msgstr "ពិធីការ​របស់​អ្នក​បោះពុម្ព​ផ្សាយ​ត្រូវ​ប្រើ"
+
+#~ msgid ""
+#~ "The transport protocol to use when publishing playlists over the network."
+#~ msgstr "ពិធីការ​បញ្ជូន​ ត្រូវ​ប្រើ​នៅ​ពេល​បោះពុម្ពផ្សាយ​បញ្ជី​ចាក់​លើ​បណ្ដាញ ។"
+
+#~ msgid "Format for network service name"
+#~ msgstr "ឈ្មោះ​​ទ្រង់ទ្រាយ​សេវា​កម្ម​បណ្ដាញ"
+
+#~ msgid ""
+#~ "A format string used to build the network service name used when "
+#~ "publishing playlists over the network. The following format placeholders "
+#~ "can be used: • %a: the program name as returned by g_get_application_name"
+#~ "() • %h: the machine's host name in title case • %u: the user's login "
+#~ "name in title case • %U: the user's real name • %%: the percent sign"
+#~ msgstr ""
+#~ "ទ្រង់ទ្រាយ​ឃ្លា​ដែល​បាន​ប្រើ ដើម្បី​បង្កើត​ឈ្មោះ​សេវា​កម្ម​បណ្ដាញ​នៅ​ពេល​បោះពុម្ព​ផ្សាយ​បញ្ជី​ចាក់​លើ​បណ្ដាញ "
+#~ "។ កន្លែង​ជំនួស​ទ្រង់ទ្រាយ​ដូចខាង​ក្រោម​អាច​ត្រូវ​បាន​ប្រើ ៖ • %a: ឈ្មោះ​កម្មវិធី​ដូច​ដែល​បាន​ត្រឡប់​ដោយ "
+#~ "g_get_application_name() • %h: ឈ្មោះ​ម៉ាស៊ីន​នៅ​ក្នុង​ចំណង​ជើង • %u: ឈ្មោះ​ចូល​របស់​អ្នក​ប្រើ​នៅ​"
+#~ "ក្នុង​ចំណង​ជើង • %U: ឈ្មោះ​ពិត​របស់​អ្នក​ប្រើ • %%: សញ្ញា​ភាគរយ"
+
+#~ msgid "Neighbors"
+#~ msgstr "ក្បែរ"
+
+#~ msgid "Publish Playlist"
+#~ msgstr "បោះពុម្ព​បញ្ជី​ចាក់"
+
+#~ msgid "Share the current playlist via HTTP"
+#~ msgstr "ចែករំលែក​បញ្ជី​ចាក់​បច្ចុប្បន្ន​តាមរយៈ HTTP"
+
+#~ msgid "Service _Name:"
+#~ msgstr "ឈ្មោះ​សេវា​កម្ម ៖"
+
+#~ msgid ""
+#~ "The name used for announcing the playlist service on the network.\n"
+#~ "All occurrences of the string %u will be replaced by your name,\n"
+#~ "and %h will be replaced by your computer's host name."
+#~ msgstr ""
+#~ "ឈ្មោះ​បាន​ប្រើ​សម្រាប់​ប្រកាស​សេវា​កម្ម​បញ្ជី​ចាក់​នៅ​លើ​បណ្ដាញ ។\n"
+#~ "ការ​កើតឡើង​ទាំងអស់​នៃ​ឃ្លា %u នឹង​ត្រូវ​បាន​ជំនួស​ដោយ​ឈ្មោះ​របស់​អ្នក\n"
+#~ "ហើយ %h នឹង​ត្រូវ​បាន​ជំនួស​ឲ្យ​ឈ្មោះ​កុំព្យូទ័រ​របស់​អ្នក ។"
+
+#~ msgid "Use _encrypted transport protocol (HTTPS)"
+#~ msgstr "ប្រើ​ពិធីការ​បញ្ជូន​ដែលបាន​អ៊ីនគ្រិប (HTTPS)"
+
+#~ msgid "_Name:"
+#~ msgstr "ឈ្មោះ ៖"
+
+#~ msgid "Save in _folder:"
+#~ msgstr "រក្សាទុក​ក្នុង​ថត ៖"
+
+#~ msgid "Select a folder"
+#~ msgstr "ជ្រើស​ថត"
+
+#~ msgid "There was an error saving the screenshot."
+#~ msgstr "មាន​កំហុស​ក្នុង​ការ​ក្សាទុក​រូបថត​អេក្រង់ ។"
+
+#~ msgid "Save Screenshot"
+#~ msgstr "រក្សាទុក​រូបថត​អេក្រង់"
+
+#~ msgid "0 x 0"
+#~ msgstr "0 x 0"
+
+#~ msgid "0 frames per second"
+#~ msgstr "០ ស៊ុម/វិនាទី"
+
+#~ msgid "0 kbps"
+#~ msgstr "0 kbps"
+
+#~ msgid "Zoom Reset"
+#~ msgstr "កំណត់​ការ​ពង្រីក​ឡើងវិញ"
+
+#~ msgid "Zoom reset"
+#~ msgstr "កំណត់​ការ​ពង្រីក​ឡើង​វិញ"
+
+#~ msgid "Zoom Out"
+#~ msgstr "បង្រួម"
+
+#~ msgid "Zoom out"
+#~ msgstr "បង្រួម"
+
+#~ msgid ""
+#~ "The playback of this movie requires the following decoders which are not "
+#~ "installed:\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "ការ​ចាក់​ភាពយន្ត​នេះ​ឡើង​វិញ​ទាមទារ​កម្មវិធី​ឌិកូដ​ដូច​ខាង​ក្រោម ដែល​មិន​ត្រូវ​បាន​ដំឡើង ៖\n"
+#~ "\n"
+#~ "%s"
+
+#~ msgid "Media file could not be played."
+#~ msgstr "មិន​អាច​ចាក់​ឯកសារ​មេឌៀ​បាន​ទេ ។"
+
+#~ msgid "Too old version of GStreamer installed."
+#~ msgstr "បាន​ដំឡើង​កំណែ GStreamer ចាស់​ពេក ។"
+
+#~ msgid "%s %s %s"
+#~ msgstr "%s %s %s"
+
+#~ msgid "%s %s"
+#~ msgstr "%s %s"
+
+#~ msgid "%s"
+#~ msgstr "%s"
+
+#~ msgid "Bemused"
+#~ msgstr "Bemused"
+
+#~ msgid "Control Totem through a mobile phone with a Bemused client"
+#~ msgstr "ត្រួតពិនិត្យ Totem តាមរយៈ​ទូរស័ព្ទ​ចល័ត​ដោយ​ប្រើ​ម៉ាស៊ីន​ភ្ញៀវ Bemused"
+
+#~ msgid "Untitled %d"
+#~ msgstr "គ្មាន​ចំណង​ជើង %d"
+
+#~ msgid "Totem Bemused Server"
+#~ msgstr "ម៉ាស៊ីន​បម្រើ Totem Bemused"
+
+#~ msgid "Totem Bemused Server version 1.0"
+#~ msgstr "ម៉ាស៊ីន​បម្រើ Totem Bemused កំណែ ១.០"
+
+#~ msgid "Delete"
+#~ msgstr "លុប"
+
+#~ msgid "Coherence DLNA/UPnP Client"
+#~ msgstr "ម៉ាស៊ីន​ភ្ញៀវ DLNA/UPnP  Coherence"
+
+#~ msgid "A DLNA/UPnP client for Totem powered by Coherence"
+#~ msgstr "ម៉ាស៊ីន​ភ្ញៀវ DLNA/UPnP សម្រាប់ Totem គាំទ្រ​ដោយ Coherence"
+
+#~ msgid "By artist"
+#~ msgstr "តាម​អ្នក​និពន្ធ"
+
+#~ msgid "By tag"
+#~ msgstr "តាម​ស្លាក"
+
+#~ msgid "_Open Jamendo Album Page in Browser"
+#~ msgstr "បើក​ទំព័រ​អាល់ប៊ុម Jamedo នៅ​ក្នុង​កម្មវិធី​រុករក"
+
+#~ msgid "Search Results"
+#~ msgstr "លទ្ធផល​ស្វែងរក"
+
+#~ msgid "Popular"
+#~ msgstr "ប្រជាប្រិយ"
+
+#~ msgid "Latest Releases"
+#~ msgstr "ចេញ​ផ្សាយ​ចុងក្រោយ​បំផុត"
+
+#~ msgid "Jamendo Album Page"
+#~ msgstr "ទំព័រ​អាល់ប៊ុម Jamendo"
+
+#~ msgid "Number of albums to _retrieve:"
+#~ msgstr "ចំនួន​អាល់ប៊ុម​ត្រូវ​ទៅ​យក ៖"
+
+#~ msgid "Preferred audio _format:"
+#~ msgstr "ទ្រង់ទ្រាយ​អូឌីយ៉ូ​ដែល​ពេញ​ចិត្ត ៖"
+
+#~ msgid "Jamendo"
+#~ msgstr "Jamendo"
+
+#~ msgid "Language"
+#~ msgstr "ភាសា"
+
+#~ msgid "No results found"
+#~ msgstr "រក​មិន​ឃើញ​លទ្ធផល​ឡើយ"
+
+#~ msgid "Page"
+#~ msgstr "ទំព័រ"
+
+#~ msgid "Thumbnail"
+#~ msgstr "រូបភាព​តូច"
+
+#~ msgid "YouTube"
+#~ msgstr "YouTube"
+
+#~ msgid ""
+#~ "Failed to open video output. It may not be available. Please select "
+#~ "another video output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "បាន​បរាជ័យ​ក្នុងការ​បើ​ក​លទ្ធផល​វីដេអូ ។ វា​អាច​ប្រើ​មិន​បាន ។ សូម​ជ្រើស​លទ្ធផល​វីដេអូ​ផ្សេង​នៅ​ក្នុង​កម្មវិធី​"
+#~ "ជ្រើស​ប្រព័ន្ធ​ពហុមេឌៀ ។"
+
+#~ msgid ""
+#~ "Could not find the video output. You may need to install additional "
+#~ "GStreamer plugins, or select another video output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "រក​មិន​ឃើញ​លទ្ធផល​វីដេអូ ។ អ្នក​ត្រូវ​ដំឡើង​កម្មវិធី​ជំនួយ GStreamer បន្ថែម ឬ​ជ្រើស​លទ្ធផល​វីដេអូ​ផ្សេង​នៅ​"
+#~ "ក្នុង​កម្មវិធី​ជ្រើស​ប្រព័ន្ធ​ពហុមេឌៀ ។"
+
+#~ msgid ""
+#~ "Listen to the large collection of Creative Commons licensed music on "
+#~ "Jamendo."
+#~ msgstr "ស្ដាប់​ការ​សម្រាំង​ធំ​​នៃ​តន្ត្រី​ដែល​មាន​អាជ្ញាប័ណ្ណ Creative Commons នៅ​លើ Jamendo ។"
+
+#~ msgid "You need to install the Python simplejson module."
+#~ msgstr "អ្នក​ត្រូវ​ដំឡើង​ម៉ូឌុល Python simplejson ។"
+
+#~ msgid "Artist: %s"
+#~ msgstr "សិល្បករ ៖ %s"
+
+#~ msgid "%Y-%m-%d"
+#~ msgstr "%Y-%m-%d"
+
+#~ msgid "%x"
+#~ msgstr "%x"
+
+#~ msgid "Genre: %s"
+#~ msgstr "ចង្វាក់ ៖ %s"
+
+#~ msgid "Released on: %s"
+#~ msgstr "បាន​ចេញ​ផ្សាយ​នៅ ៖ %s"
+
+#~ msgid "License: %s"
+#~ msgstr "អាជ្ញាប័ណ្ណ ៖ %s"
+
+#~ msgid "%02d. %s"
+#~ msgstr "%02d. %s"
+
+#~ msgid "Album: %s"
+#~ msgstr "អាល់ប៊ុ​ម ៖ %s"
+
+#~ msgid "Duration: %s"
+#~ msgstr "ថិរវេលា ៖ %s"
+
+#~ msgid "Fetching albums, please wait…"
+#~ msgstr "កំពុង​ទៅ​យក​អាល់ប៊ុម សូម​រង់ចាំ..."
+
+#~ msgid ""
+#~ "Failed to connect to Jamendo server.\n"
+#~ "%s."
+#~ msgstr ""
+#~ "បាន​បរាជ័យ​ក្នុង​ការ​តភ្ចាប់​ទៅ​ម៉ាស៊ីន​បម្រើ Jamendo ។ \n"
+#~ "%s ។"
+
+#~ msgid "The Jamendo server returned code %s."
+#~ msgstr "ម៉ាស៊ីន​បម្រើ Jamendo បាន​ត្រឡប់​កូដ %s ។"
+
+#~ msgid "An error occurred while fetching albums."
+#~ msgstr "កំហុស​មួយ​បាន​កើត​ឡើង​នៅ​ពេល​ទៅយក​អាល់ប៊ុម ។"
+
+#~ msgid "%H:%M:%S"
+#~ msgstr "%H:%M:%S"
+
+#~ msgid "%M:%S"
+#~ msgstr "%M:%S"
+
+#~ msgid "en"
+#~ msgstr "en"
+
+#~ msgid "Number of results per page"
+#~ msgstr "ចំនួន​លទ្ធផល​ក្នុង​មួយ​ទំព័រ"
+
+#~ msgid ""
+#~ "The number of Jamendo search results to display in each page of results."
+#~ msgstr "ចំនួន​លទ្ធផល​ស្វែងរក Jamendo search ដើម្បី​បង្ហាញ​លទ្ធផល​ទំព័រ​នីមួយៗ ។"
+
+#~ msgid "Audio format to download from Jamendo"
+#~ msgstr "ទ្រង់ទ្រាយ​អូឌីយ៉ូ​ត្រូវ​ទាញយក​ពី Jamendo"
+
+#~ msgid "The preferred audio format to download tracks from Jamendo in."
+#~ msgstr "ទ្រង់ទ្រាយ​អូឌីយ៉ូ​ដែល​ពេញ​ចិត្ត​ ដើម្បី​ទាញយក​បទ​ចម្រៀង​ពី Jamendo ។"
+
+#~ msgid "Brasilian Portuguese"
+#~ msgstr "ព័រទុយហ្គាល់ ប្រេស៊ីល"
+
+#~ msgid "Could not connect to Tracker"
+#~ msgstr "មិន​អាច​តភ្ជាប់​ទៅ​កម្មវិធី​តាមដាន​បាន​ទេ"
+
+#~ msgid "No results"
+#~ msgstr "គ្មាន​លទ្ធផល"
+
+#~ msgid "Showing %i - %i of %i match"
+#~ msgid_plural "Showing %i - %i of %i matches"
+#~ msgstr[0] "បង្ហាញ​ការ​ផ្គូផ្គង %i - %i នៃ %i"
+
+#~ msgid "Local Search"
+#~ msgstr "ស្វែងរក​ក្នុង​មូលដ្ឋាន"
+
+#~ msgid "Set the window icon to the thumbnail of the playing movie"
+#~ msgstr "កំណត់​រូបតំណាង​បង្អួច​​ជា​រូបភាព​តូច​របស់​ភាពយន្ត​ដែល​កំពុង​ចាក់"
+
+#~ msgid "Search for local videos using Tracker"
+#~ msgstr "ស្វែងរក​វីដេអូ​ក្នុង​មូលដ្ឋាន​ដោយ​ប្រើ​កម្មវិធី​តាមដាន"
+
+#~ msgid "YouTube Browser"
+#~ msgstr "កម្មវិធី​រុករក YouTube"
+
+#~ msgid "Related Videos"
+#~ msgstr "វីដេអូ​ដែល​ទាក់ទង"
+
+#~ msgid "_Open in Web Browser"
+#~ msgstr "បើក​ក្នុង​កម្មវិធី​រុករក​បណ្ដាញ"
+
+#~ msgid "Open the video in your web browser"
+#~ msgstr "បើក​វីដេអូ​ក្នុង​កម្មវិធី​រុករក​បណ្ដាញ​របស់​អ្នក"
+
+#~ msgid "Cancelling query…"
+#~ msgstr "កំពុង​បោះបង់​សំណួរ…"
+
+#~ msgid "Error Searching for Videos"
+#~ msgstr "កំហុស​ក្នុង​ការ​ស្វែងរក​វីដេអូ"
+
+#~ msgid ""
+#~ "The response from the server could not be understood. Please check you "
+#~ "are running the latest version of libgdata."
+#~ msgstr ""
+#~ "ការ​ឆ្លើយ​តប​ពី​ម៉ាស៊ីន​បម្រើ​មិន​អាច​យល់​បាន​ទេ ។ សូម​ពិនិត្យ​មើល​ថាតើ​អ្នក​កំពុង​ដំណើរការ​កំណែ​ចុងក្រោយ​របស់ "
+#~ "libgdata ដែរ​ឬទេ ។"
+
+#~ msgid "Fetching search results…"
+#~ msgstr "កំពុង​ទៅ​យក​លទ្ធផល​ស្វែងរក..."
+
+#~ msgid "Fetching related videos…"
+#~ msgstr "ទៅ​កំពុងទៅ​យក​វីដេអូ​ដែល​ទាក់ទង..."
+
+#~ msgid "Error Opening Video in Web Browser"
+#~ msgstr "កំហុស​ក្នុង​ការ​បើក​វីដេអូ​ក្នុង​កម្មវិធីរុករក​បណ្ដាញ"
+
+#~ msgid "Fetching more videos…"
+#~ msgstr "កំពុង​ទៅ​យក​វីដេអូ​បន្ថែម​ទៀត..."
+
+#~ msgid "Video Format Not Supported"
+#~ msgstr "មិន​បាន​គាំទ្រ​ទ្រង់ទ្រាយ​វីដេអូ​ទេ"
+
+#~ msgid ""
+#~ "This video is not available in any formats which Totem supports. Would "
+#~ "you like to open it in your web browser instead?"
+#~ msgstr ""
+#~ "វីដេអូ​នេះ​មិន​អាច​ប្រើ​បាន​ទេ នៅ​កនុង​ទ្រង់ទ្រាយ​ដែល Totem គាំទ្រ ។ តើ​អ្នក​ចង់​បើក​វា​ក្នុង​កម្មវិធីរុករក​"
+#~ "បណ្ដាញ​ជំនួស​វិញ​ឬ ?"
+
+#~ msgid "Browser Plugin using %s"
+#~ msgstr "កម្មវិធី​ជំនួយ​របស់​កម្មវិធីរុករក​ ដោយ​ប្រើ %s"
+
+#~ msgid "Totem Browser Plugin"
+#~ msgstr "កម្មវិធី​ជំនួយ​របស់​កម្មវិធី​រុករក Totem"
diff -Nru totem-3.4.3/po/ko.po totem-3.6.2/po/ko.po
--- totem-3.4.3/po/ko.po	2012-04-02 14:15:40.000000000 +0000
+++ totem-3.6.2/po/ko.po	2012-10-09 15:42:00.000000000 +0000
@@ -19,24 +19,230 @@
 "Project-Id-Version: totem\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=totem&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-03-23 06:16+0000\n"
-"PO-Revision-Date: 2012-03-27 01:27+0900\n"
+"POT-Creation-Date: 2012-07-17 09:30+0000\n"
+"PO-Revision-Date: 2012-09-09 07:46+0900\n"
 "Last-Translator: Changwoo Ryu \n"
 "Language-Team: GNOME Korea \n"
+"Language: Korean\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: Korean\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ../browser-plugin/totem-plugin-viewer.c:352 ../src/totem-object.c:1180
+#: ../src/totem-object.c:1650 ../src/totem-statusbar.c:115
+msgid "Stopped"
+msgstr "멈춤"
+
+#: ../browser-plugin/totem-plugin-viewer.c:364 ../src/totem-object.c:1173
+msgid "Paused"
+msgstr "일시 정지"
+
+#: ../browser-plugin/totem-plugin-viewer.c:368 ../src/totem-object.c:1166
+msgid "Playing"
+msgstr "재생중"
+
+#: ../browser-plugin/totem-plugin-viewer.c:386
+#: ../src/plugins/screensaver/totem-screensaver.c:97
+msgid "Playing a movie"
+msgstr "영상을 재생하는 중"
+
+#: ../browser-plugin/totem-plugin-viewer.c:443
+msgid "No URI to play"
+msgstr "재생할 URI가 없습니다"
+
+#: ../browser-plugin/totem-plugin-viewer.c:676
+#: ../browser-plugin/totem-plugin-viewer.c:1700
+msgid "Totem Movie Player"
+msgstr "토템 동영상 플레이어"
+
+#. translators: this is:
+#. * Open With ApplicationName
+#. * as in nautilus' right-click menu
+#: ../browser-plugin/totem-plugin-viewer.c:1120
+#, c-format
+msgid "_Open with \"%s\""
+msgstr "\"%s\"(으)로 열기(_O)"
+
+#: ../browser-plugin/totem-plugin-viewer.c:1341 ../src/totem-object.c:2475
+msgid "An error occurred"
+msgstr "오류가 발생했습니다"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2033
+msgid "No playlist or playlist empty"
+msgstr "재생 목록이 없거나 목록이 비어 있습니다"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2128
+msgid "Movie browser plugin"
+msgstr "동영상 브라우저 플러그인"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144 ../src/totem.c:239
+msgid "Could not initialize the thread-safe libraries."
+msgstr "스레드에 안전한 라이브러리를 초기화할 수 없습니다."
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144
+msgid "Verify your system installation. The Totem plugin will now exit."
+msgstr "시스템 설치가 올바른지 확인하십시오. 토템 플러그인을 끝냅니다."
+
 #: ../data/fullscreen.ui.h:1
 msgid "Leave Fullscreen"
 msgstr "전체 화면 나가기"
 
-#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:144
+#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:81
 msgid "Time:"
 msgstr "시간:"
 
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
+msgid "Allow the screensaver to activate when playing audio"
+msgstr "오디오를 플레이할 경우에도 화면 보호기 활성화"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
+msgid ""
+"Allow the screensaver to activate when playing audio. Disable if you have "
+"monitor-powered speakers."
+msgstr ""
+"오디오를 플레이할 경우에도 화면 보호기 시작을 허용합니다. 모니터에서 스피커 "
+"기능을 하는 경우 이 기능이 필요합니다."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
+msgid "Show visual effects when no video is displayed"
+msgstr "오디오 파일 재생시 시각 효과 보여주기"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
+msgid "Show visual effects when playing an audio only file."
+msgstr "오디오 파일 재생시 시각 효과 보여주기."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
+msgid "Name of the visual effects plugin"
+msgstr "시각 효과 플러그인의 이름"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
+msgid "The brightness of the video"
+msgstr "비디오의 밝기"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
+msgid "The contrast of the video"
+msgstr "비디오의 대비"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
+msgid "The hue of the video"
+msgstr "비디오의 색상"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
+msgid "The saturation of the video"
+msgstr "비디오의 채도"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
+msgid "Resize the canvas automatically on file load"
+msgstr "파일을 읽어들일 때 자동으로 캔버스 사이즈 재조정"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
+msgid "Repeat mode"
+msgstr "반복 모드"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
+msgid "Shuffle mode"
+msgstr "임의 재생 모드"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
+msgid "Whether to disable deinterlacing for interlaced movies"
+msgstr "비디오의 인터레이스 없애기 사용하지 않을지 여부"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
+msgid "Whether to enable debug for the playback engine"
+msgstr "재생 엔진에 디버깅 기능을 사용할지 여부"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
+msgid "Type of audio output to use"
+msgstr "사용할 오디오 출력 형식"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
+msgid "Visualization quality setting"
+msgstr "시각 효과 품질 설정"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
+msgid "Quality setting for the audio visualization."
+msgstr "오디오 시각 효과 화질 설정."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
+msgid "Network buffering threshold"
+msgstr "네트워크 버퍼링 임계점"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
+msgid ""
+"Amount of data to buffer for network streams before starting to display the "
+"stream (in seconds)."
+msgstr "네트워크 스트림을 표시하기 전에 버퍼링할 양(초 단위)."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
+msgid "Subtitle font"
+msgstr "자막 글꼴"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
+msgid "Pango font description for subtitle rendering."
+msgstr "자막을 그릴 때 쓰일 판고 글꼴 지정."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
+msgid "Subtitle encoding"
+msgstr "자막 인코딩"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
+msgid "Encoding character set for subtitle."
+msgstr "자막에 사용할 인코딩 문자셋."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
+msgid "Default location for the \"Open...\" dialogs"
+msgstr "\"열기...\" 창의 기본 위치"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
+msgid ""
+"Default location for the \"Open...\" dialogs. Default is the current "
+"directory."
+msgstr "\"열기...\" 창의 기본 위치, 기본값은 현재 디렉터리입니다."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
+msgid "Default location for the \"Take Screenshot\" dialogs"
+msgstr "\"스크린샷 찍기\" 창의 기본 위치"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
+msgid ""
+"Default location for the \"Take Screenshot\" dialogs. Default is the "
+"Pictures directory."
+msgstr "\"스크린샷 찍기\" 창의 기본 위치, 기본값은 사진 디렉터리입니다."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
+msgid "Whether to disable the plugins in the user's home directory"
+msgstr "사용자 디렉터리의 플러그인을 사용하지 않을지 여부"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
+msgid "Whether to disable the keyboard shortcuts"
+msgstr "키보드 바로 가기를 사용하지 않을지 여부"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
+msgid "Whether to autoload text subtitle files when a movie is loaded"
+msgstr "동영상을 읽어들였을 때 자막 파일을 자동으로 읽어들일지 여부"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
+msgid "Whether to autoload external chapter files when a movie is loaded"
+msgstr "동영상을 읽어들였을 때 외부 챕터 파일을 자동으로 읽어들일지 여부"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
+msgid ""
+"Whether to remember the position of played audio/video files when pausing or "
+"closing them"
+msgstr ""
+"재생 중인 오디오/비디오 파일을 일시 중지하거나 닫을 때 위치를 저장할지 여부."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
+msgid "Active plugins list"
+msgstr "활성화된 플러그인 목록"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+msgid ""
+"A list of the names of the plugins which are currently active (loaded and "
+"running)."
+msgstr "현재 활성화된(읽어들이고 실행 중인) 플러그인 이름의 목록."
+
 #: ../data/playlist.ui.h:1
 msgid "_Remove"
 msgstr "제거(_R)"
@@ -53,11 +259,11 @@
 msgid "Copy the location to the clipboard"
 msgstr "위치를 클립보드에 복사합니다"
 
-#: ../data/playlist.ui.h:5 ../data/totem.ui.h:78
+#: ../data/playlist.ui.h:5 ../data/totem.ui.h:71
 msgid "_Select Text Subtitles..."
 msgstr "자막 선택(_S)..."
 
-#: ../data/playlist.ui.h:6 ../data/totem.ui.h:79
+#: ../data/playlist.ui.h:6 ../data/totem.ui.h:72
 msgid "Select a file to use for text subtitles"
 msgstr "자막으로 이용할 파일을 고릅니다"
 
@@ -81,10 +287,165 @@
 msgid "Move Down"
 msgstr "내리기"
 
-#: ../data/properties.ui.h:1 ../data/totem.ui.h:122
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:2
+msgid "Normal"
+msgstr "보통"
+
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:4
+msgid "Large"
+msgstr "크게"
+
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:6
+msgid "Extra Large"
+msgstr "아주 크게"
+
+#: ../data/preferences.ui.h:7 ../src/backend/bacon-video-widget.c:5479
+#: ../src/totem-properties-view.c:231
+msgid "Stereo"
+msgstr "스테레오"
+
+#: ../data/preferences.ui.h:8
+msgid "4-channel"
+msgstr "4채널"
+
+#: ../data/preferences.ui.h:9
+msgid "4.1-channel"
+msgstr "4.1채널"
+
+#: ../data/preferences.ui.h:10
+msgid "5.0-channel"
+msgstr "5.0채널"
+
+#: ../data/preferences.ui.h:11
+msgid "5.1-channel"
+msgstr "5.1채널"
+
+#: ../data/preferences.ui.h:12
+msgid "AC3 Passthrough"
+msgstr "AC3 Passthrough"
+
+#: ../data/preferences.ui.h:13
+msgid "Totem Preferences"
+msgstr "토템 기본 설정"
+
+#: ../data/preferences.ui.h:14
+msgid "Playback"
+msgstr "재생"
+
+#: ../data/preferences.ui.h:15
+msgid "Start playing files from last position"
+msgstr "최근 위치에서 파일 플레이를 시작"
+
+#: ../data/preferences.ui.h:16
+msgid "Text Subtitles"
+msgstr "자막"
+
+#: ../data/preferences.ui.h:17
+msgid "_Load subtitle files when movie is loaded"
+msgstr "동영상을 읽어들일 때 자막 파일도 읽어들이기(_L)"
+
+#: ../data/preferences.ui.h:18
+msgid "_Font:"
+msgstr "글꼴(_F):"
+
+#: ../data/preferences.ui.h:19
+msgid "_Encoding:"
+msgstr "인코딩(_E):"
+
+#: ../data/preferences.ui.h:20
+msgid "External Chapters"
+msgstr "외부 챕터"
+
+#: ../data/preferences.ui.h:21
+msgid "Load _chapter files when movie is loaded"
+msgstr "동영상을 읽어들일 때 챕터 파일도 읽어들이기(_C)"
+
+#: ../data/preferences.ui.h:22 ../data/properties.ui.h:1
 msgid "General"
 msgstr "일반"
 
+#. Tab label in the Preferences dialogue
+#: ../data/preferences.ui.h:24
+msgid "Display"
+msgstr "표시"
+
+#: ../data/preferences.ui.h:25
+msgid "_Resize the window when a new video is loaded"
+msgstr "새 비디오를 읽어들였을 때 자동으로 창 크기 조정(_R)"
+
+#: ../data/preferences.ui.h:26
+msgid "Disable _deinterlacing of interlaced videos"
+msgstr "비디오의 인터레이스 없애기 사용하지 않기(_D)"
+
+#: ../data/preferences.ui.h:27
+msgid "Disable screensaver when playing "
+msgstr "다음 재생시 화면 보호기를 사용하지 않음: "
+
+#: ../data/preferences.ui.h:28 ../data/properties.ui.h:9
+#: ../src/totem-properties-view.c:273
+msgid "Video"
+msgstr "비디오"
+
+#: ../data/preferences.ui.h:29
+msgid "Video or Audio"
+msgstr "비디오 또는 오디오"
+
+#: ../data/preferences.ui.h:30
+msgid "Visual Effects"
+msgstr "시각 효과"
+
+#: ../data/preferences.ui.h:31
+msgid "Show _visual effects when an audio file is played"
+msgstr "오디오 파일 재생시 시각 효과 표시(_V)"
+
+#: ../data/preferences.ui.h:32
+msgid "_Type of visualization:"
+msgstr "시각 효과 종류(_T):"
+
+#: ../data/preferences.ui.h:33
+msgid "Visualization _size:"
+msgstr "시각 효과 크기(_S):"
+
+#: ../data/preferences.ui.h:34
+msgid "Color Balance"
+msgstr "색 밸런스"
+
+#: ../data/preferences.ui.h:35
+msgid "_Brightness:"
+msgstr "밝기(_B):"
+
+#: ../data/preferences.ui.h:36
+msgid "Co_ntrast:"
+msgstr "대비(_N):"
+
+#: ../data/preferences.ui.h:37
+msgid "Sat_uration:"
+msgstr "채도(_U):"
+
+#: ../data/preferences.ui.h:38
+msgid "_Hue:"
+msgstr "색상(_H):"
+
+#: ../data/preferences.ui.h:39
+msgid "Reset to _Defaults"
+msgstr "기본값으로 초기화(_D)"
+
+#: ../data/preferences.ui.h:40
+msgid "Audio Output"
+msgstr "오디오 출력"
+
+#: ../data/preferences.ui.h:41
+msgid "_Audio output type:"
+msgstr "오디오 출력 형식(_A):"
+
+#: ../data/preferences.ui.h:42 ../data/properties.ui.h:14
+#: ../src/totem-properties-view.c:271
+msgid "Audio"
+msgstr "오디오"
+
 #: ../data/properties.ui.h:2
 msgid "Title:"
 msgstr "제목:"
@@ -113,11 +474,6 @@
 msgid "Container:"
 msgstr "컨테이너:"
 
-#: ../data/properties.ui.h:9 ../data/totem.ui.h:128
-#: ../src/totem-properties-view.c:270
-msgid "Video"
-msgstr "비디오"
-
 #: ../data/properties.ui.h:10
 msgid "Dimensions:"
 msgstr "크기:"
@@ -134,11 +490,6 @@
 msgid "Bitrate:"
 msgstr "비트 전송률:"
 
-#: ../data/properties.ui.h:14 ../data/totem.ui.h:142
-#: ../src/totem-properties-view.c:268
-msgid "Audio"
-msgstr "오디오"
-
 #: ../data/properties.ui.h:15
 msgid "Sample rate:"
 msgstr "샘플 레이트:"
@@ -147,733 +498,437 @@
 msgid "Channels:"
 msgstr "채널:"
 
-#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
-msgid "_Add to Playlist"
-msgstr "재생 목록에 추가(_A)"
-
-#: ../data/video-list.ui.h:2
-msgid "Add the video to the playlist"
-msgstr "재생 목록에 영상을 추가할 수 없습니다"
-
 #. Title
-#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:143
-#: ../src/totem-object.c:1667
-msgid "Movie Player"
-msgstr "동영상 플레이어"
+#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:80 ../src/totem.c:238
+#: ../src/totem.c:247 ../src/totem-menu.c:790 ../src/totem-object.c:1658
+msgid "Videos"
+msgstr "동영상"
 
 #: ../data/totem.desktop.in.in.in.h:2
-msgid "Play movies and songs"
-msgstr "동영상과 음악 재생"
+msgid "Play movies"
+msgstr "동영상을 재생합니다"
+
+#: ../data/totem.desktop.in.in.in.h:3
+msgid "Video;Movie;Film;Clip;Series;Player;DVD;TV;Disc;"
+msgstr "Video;비디오;Movie;영상;Film;영화;Clip;동영상;Series;시리즈;Player;플레이어;DVD;TV;텔레비젼;티비;Disc;디스크;"
 
 #: ../data/totem.ui.h:1
-msgid "_Movie"
-msgstr "동영상(_M)"
+msgid "_Open"
+msgstr "열기(_O)"
 
 #: ../data/totem.ui.h:2
-msgid "_Open..."
-msgstr "열기(_O)..."
+msgid "Open _Location"
+msgstr "위치 열기(_L)"
 
 #: ../data/totem.ui.h:3
-msgid "Open a file"
-msgstr "파일을 엽니다"
+msgid "_Fullscreen"
+msgstr "전체 화면(_F)"
 
 #: ../data/totem.ui.h:4
-msgid "Open _Location..."
-msgstr "위치 열기(_L)..."
+msgid "Prefere_nces"
+msgstr "기본 설정(_N)"
 
 #: ../data/totem.ui.h:5
-msgid "Open a non-local file"
-msgstr "로컬이 아닌 파일을 엽니다"
+msgid "Shuff_le"
+msgstr "임의 재생(_L)"
 
 #: ../data/totem.ui.h:6
+msgid "_Repeat"
+msgstr "반복(_R)"
+
+#: ../data/totem.ui.h:7
+msgid "_Quit"
+msgstr "끝내기(_Q)"
+
+#: ../data/totem.ui.h:8
+msgid "_Movie"
+msgstr "동영상(_M)"
+
+#: ../data/totem.ui.h:9
 msgid "_Eject"
 msgstr "꺼내기(_E)"
 
-#: ../data/totem.ui.h:7
+#: ../data/totem.ui.h:10
 msgid "Eject the current disc"
 msgstr "현재 디스크 빼기"
 
-#: ../data/totem.ui.h:8
+#: ../data/totem.ui.h:11
 msgid "_Properties"
 msgstr "속성(_P)"
 
 # tooltip - 문장으로 번역
-#: ../data/totem.ui.h:9
+#: ../data/totem.ui.h:12
 msgid "View the properties of the current stream"
 msgstr "현재 스트림의 속성을 봅니다"
 
-#: ../data/totem.ui.h:10
+#: ../data/totem.ui.h:13
 msgid "Play / P_ause"
 msgstr "재생 / 일시 정지(_A)"
 
-#: ../data/totem.ui.h:11
+#: ../data/totem.ui.h:14
 msgid "Play or pause the movie"
 msgstr "동영상을 재생하거나 일시 정지합니다"
 
-#: ../data/totem.ui.h:12
-msgid "_Quit"
-msgstr "끝내기(_Q)"
-
-#: ../data/totem.ui.h:13
-msgid "Quit the program"
-msgstr "프로그램을 끝냅니다"
-
-#: ../data/totem.ui.h:14
+#: ../data/totem.ui.h:15
 msgid "_Edit"
 msgstr "편집(_E)"
 
-#: ../data/totem.ui.h:15
+#: ../data/totem.ui.h:16
 msgid "_Clear Playlist"
 msgstr "재생 목록 지우기(_C)"
 
-#: ../data/totem.ui.h:16
+#: ../data/totem.ui.h:17
 msgid "Clear the playlist"
 msgstr "재생 목록 지우기"
 
-#: ../data/totem.ui.h:17
-msgid "Prefere_nces"
-msgstr "기본 설정(_N)"
-
-# tooltip - 문장으로 번역
 #: ../data/totem.ui.h:18
-msgid "Configure the application"
-msgstr "프로그램을 설정합니다"
-
-#: ../data/totem.ui.h:19
 msgid "Plugins..."
 msgstr "플러그인..."
 
 # tooltip - 문장으로 번역
-#: ../data/totem.ui.h:20
+#: ../data/totem.ui.h:19
 msgid "Configure plugins to extend the application"
 msgstr "프로그램을 확장하는 플러그인을 설정합니다"
 
-#: ../data/totem.ui.h:21
+#: ../data/totem.ui.h:20
 msgid "_View"
 msgstr "보기(_V)"
 
-#: ../data/totem.ui.h:22
-msgid "_Fullscreen"
-msgstr "전체 화면(_F)"
-
-#: ../data/totem.ui.h:23
-msgid "Switch to fullscreen"
-msgstr "전체 화면"
-
-#: ../data/totem.ui.h:24
+#: ../data/totem.ui.h:21
 msgid "Fit Window to Movie"
 msgstr "창 크기를 영상 크기에 맞추기"
 
-#: ../data/totem.ui.h:25
+#: ../data/totem.ui.h:22
 msgid "_Resize 1:2"
 msgstr "1:2 크기(_R)"
 
-#: ../data/totem.ui.h:26
+#: ../data/totem.ui.h:23
 msgid "Resize to half the original video size"
 msgstr "원래 영상 크기의 절반 크기로"
 
-#: ../data/totem.ui.h:27
+#: ../data/totem.ui.h:24
 msgid "Resize _1:1"
 msgstr "_1:1 크기"
 
-#: ../data/totem.ui.h:28
+#: ../data/totem.ui.h:25
 msgid "Resize to the original video size"
 msgstr "원래 영상 크기와 같은 크기로"
 
-#: ../data/totem.ui.h:29
+#: ../data/totem.ui.h:26
 msgid "Resize _2:1"
 msgstr "_2:1 크기"
 
-#: ../data/totem.ui.h:30
+#: ../data/totem.ui.h:27
 msgid "Resize to double the original video size"
 msgstr "원래 영상 크기의 두 배 크기로"
 
-#: ../data/totem.ui.h:31
+#: ../data/totem.ui.h:28
 msgid "_Aspect Ratio"
 msgstr "화면 비율(_A)"
 
-#: ../data/totem.ui.h:32
+#: ../data/totem.ui.h:29
 msgid "Switch An_gles"
 msgstr "각도 바꾸기(_G)"
 
-#: ../data/totem.ui.h:33
+#: ../data/totem.ui.h:30
 msgid "Switch camera angles"
 msgstr "카메라 각도 바꾸기"
 
-#: ../data/totem.ui.h:34
+#: ../data/totem.ui.h:31
 msgid "_Go"
 msgstr "이동(_G)"
 
-#: ../data/totem.ui.h:35
+#: ../data/totem.ui.h:32
 msgid "_DVD Menu"
 msgstr "DVD 메뉴(_D)"
 
-#: ../data/totem.ui.h:36
+#: ../data/totem.ui.h:33
 msgid "Go to the DVD menu"
 msgstr "DVD 메뉴로 이동"
 
-#: ../data/totem.ui.h:37
+#: ../data/totem.ui.h:34
 msgid "_Title Menu"
 msgstr "제목 메뉴(_T)"
 
-#: ../data/totem.ui.h:38
+#: ../data/totem.ui.h:35
 msgid "Go to the title menu"
 msgstr "제목 메뉴로 이동"
 
-#: ../data/totem.ui.h:39
+#: ../data/totem.ui.h:36
 msgid "A_udio Menu"
 msgstr "오디오 메뉴(_U)"
 
-#: ../data/totem.ui.h:40
+#: ../data/totem.ui.h:37
 msgid "Go to the audio menu"
 msgstr "오디오 메뉴로 이동"
 
-#: ../data/totem.ui.h:41
+#: ../data/totem.ui.h:38
 msgid "_Angle Menu"
 msgstr "각도 메뉴(_A)"
 
-#: ../data/totem.ui.h:42
+#: ../data/totem.ui.h:39
 msgid "Go to the angle menu"
 msgstr "원형 메뉴로 이동"
 
-#: ../data/totem.ui.h:43
+#: ../data/totem.ui.h:40
 msgid "_Chapter Menu"
 msgstr "챕터 메뉴(_C)"
 
-#: ../data/totem.ui.h:44
+#: ../data/totem.ui.h:41
 msgid "Go to the chapter menu"
 msgstr "챕터 메뉴로 이동"
 
-#: ../data/totem.ui.h:45
+#: ../data/totem.ui.h:42
 msgid "_Next Chapter/Movie"
 msgstr "다음 챕터로/동영상으로(_N)"
 
-#: ../data/totem.ui.h:46
+#: ../data/totem.ui.h:43
 msgid "Next chapter or movie"
 msgstr "다음 챕터로 혹은 동영상으로"
 
-#: ../data/totem.ui.h:47
+#: ../data/totem.ui.h:44
 msgid "_Previous Chapter/Movie"
 msgstr "이전 챕터로/동영상으로(_P)"
 
-#: ../data/totem.ui.h:48
+#: ../data/totem.ui.h:45
 msgid "Previous chapter or movie"
 msgstr "이전 챕터로 혹은 동영상으로"
 
-#: ../data/totem.ui.h:49
+#: ../data/totem.ui.h:46
 msgid "_Sound"
 msgstr "사운드(_S)"
 
-#: ../data/totem.ui.h:50
+#: ../data/totem.ui.h:47
 msgid "Volume _Up"
 msgstr "소리 높임(_U)"
 
-#: ../data/totem.ui.h:51
+#: ../data/totem.ui.h:48
 msgid "Increase volume"
 msgstr "볼륨 높이기"
 
-#: ../data/totem.ui.h:52
+#: ../data/totem.ui.h:49
 msgid "Volume _Down"
 msgstr "소리 낮춤(_D)"
 
-#: ../data/totem.ui.h:53
+#: ../data/totem.ui.h:50
 msgid "Decrease volume"
 msgstr "볼륨 낮추기"
 
-#: ../data/totem.ui.h:54
+#: ../data/totem.ui.h:51
 msgid "_Help"
 msgstr "도움말(_H)"
 
-#: ../data/totem.ui.h:55
+#: ../data/totem.ui.h:52
 msgid "_Contents"
 msgstr "차례(_C)"
 
-#: ../data/totem.ui.h:56
+#: ../data/totem.ui.h:53
 msgid "Help contents"
 msgstr "도움말 차례"
 
-#: ../data/totem.ui.h:57
+#: ../data/totem.ui.h:54
 msgid "_About"
 msgstr "정보(_A)"
 
-#: ../data/totem.ui.h:58
+#: ../data/totem.ui.h:55
 msgid "About this application"
 msgstr "이 프로그램 정보"
 
-#: ../data/totem.ui.h:59
-msgid "_Repeat Mode"
-msgstr "반복 모드(_R)"
-
-#: ../data/totem.ui.h:60
-msgid "Set the repeat mode"
-msgstr "반복 모드 설정"
-
-#: ../data/totem.ui.h:61
-msgid "Shuff_le Mode"
-msgstr "임의 재생 모드(_L)"
-
-#: ../data/totem.ui.h:62
-msgid "Set the shuffle mode"
-msgstr "임의 재생 모드 설정"
-
-#: ../data/totem.ui.h:63
+#: ../data/totem.ui.h:56
 msgid "Show _Controls"
 msgstr "컨트롤 보이기(_C)"
 
-#: ../data/totem.ui.h:64
+#: ../data/totem.ui.h:57
 msgid "Show controls"
 msgstr "컨트롤을 보입니다"
 
-#: ../data/totem.ui.h:65
+#: ../data/totem.ui.h:58
 msgid "S_idebar"
 msgstr "가장자리 창(_I)"
 
-#: ../data/totem.ui.h:66
+#: ../data/totem.ui.h:59
 msgid "Show or hide the sidebar"
 msgstr "가장자리 창을 보여주거나 감춥니다"
 
-#: ../data/totem.ui.h:67
+#: ../data/totem.ui.h:60
 msgctxt "Aspect ratio"
 msgid "Auto"
 msgstr "자동"
 
-#: ../data/totem.ui.h:68
+#: ../data/totem.ui.h:61
 msgid "Sets automatic aspect ratio"
 msgstr "화면 비율을 자동으로 설정합니다"
 
-#: ../data/totem.ui.h:69
-msgid "Square"
-msgstr "정사각형"
-
-#: ../data/totem.ui.h:70
-msgid "Sets square aspect ratio"
-msgstr "화면 비율을 정사각형으로 설정합니다"
-
-#: ../data/totem.ui.h:71
-msgid "4:3 (TV)"
-msgstr "4:3 (TV)"
-
-#: ../data/totem.ui.h:72
-msgid "Sets 4:3 (TV) aspect ratio"
-msgstr "4:3 (TV) 화면 비율"
-
-#: ../data/totem.ui.h:73
-msgid "16:9 (Widescreen)"
-msgstr "16:9 (와이드스크린)"
-
-#: ../data/totem.ui.h:74
-msgid "Sets 16:9 (widescreen) aspect ratio"
-msgstr "16:9 (와이드) 화면 비율"
-
-#: ../data/totem.ui.h:75
-msgid "2.11:1 (DVB)"
-msgstr "2.11:1 (DVB)"
-
-#: ../data/totem.ui.h:76
-msgid "Sets 2.11:1 (DVB) aspect ratio"
-msgstr "2.11:1 (DVB) 화면 비율"
-
-#: ../data/totem.ui.h:77
-msgid "S_ubtitles"
-msgstr "자막(_U)"
-
-#: ../data/totem.ui.h:80
-msgid "_Languages"
-msgstr "언어(_L)"
-
-#: ../data/totem.ui.h:81
-msgid "Zoom In"
-msgstr "확대"
-
-#: ../data/totem.ui.h:82
-msgid "Zoom in"
-msgstr "확대"
-
-#: ../data/totem.ui.h:83
-msgid "Skip _Forward"
-msgstr "앞으로 건너뛰기(_F)"
-
-#: ../data/totem.ui.h:84
-msgid "Skip forward"
-msgstr "앞으로 건너뛰기"
-
-#: ../data/totem.ui.h:85
-msgid "Skip _Backwards"
-msgstr "뒤로 건너뛰기(_B)"
-
-#: ../data/totem.ui.h:86
-msgid "Skip backwards"
-msgstr "뒤로 건너뛰기"
-
-#: ../data/totem.ui.h:87
-msgid "14.4 Kbps Modem"
-msgstr "14.4 Kbps 모뎀"
-
-#: ../data/totem.ui.h:88
-msgid "19.2 Kbps Modem"
-msgstr "19.2 Kbps 모뎀"
-
-#: ../data/totem.ui.h:89
-msgid "28.8 Kbps Modem"
-msgstr "28.8 Kbps 모뎀"
-
-#: ../data/totem.ui.h:90
-msgid "33.6 Kbps Modem"
-msgstr "33.6 Kbps 모뎀"
-
-#: ../data/totem.ui.h:91
-msgid "34.4 Kbps Modem"
-msgstr "34.4 Kbps 모뎀"
-
-#: ../data/totem.ui.h:92
-msgid "56 Kbps Modem/ISDN"
-msgstr "56 Kbps 모뎀/ISDN"
-
-#: ../data/totem.ui.h:93
-msgid "112 Kbps Dual ISDN/DSL"
-msgstr "112 Kbps Dual ISDN/DSL"
-
-#: ../data/totem.ui.h:94
-msgid "256 Kbps DSL/Cable"
-msgstr "256 Kbps DSL/케이블"
-
-#: ../data/totem.ui.h:95
-msgid "384 Kbps DSL/Cable"
-msgstr "384 Kbps DSL/케이블"
-
-#: ../data/totem.ui.h:96
-msgid "512 Kbps DSL/Cable"
-msgstr "512 Kbps DSL/케이블"
-
-#: ../data/totem.ui.h:97
-msgid "1.5 Mbps T1/Intranet/LAN"
-msgstr "1.5 Mbps T1/Intranet/LAN"
-
-#: ../data/totem.ui.h:98
-msgid "Intranet/LAN"
-msgstr "인트라넷/LAN"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:100
-msgid "Normal"
-msgstr "보통"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:102
-msgid "Large"
-msgstr "크게"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:104
-msgid "Extra Large"
-msgstr "아주 크게"
-
-#: ../data/totem.ui.h:105 ../src/totem-properties-view.c:228
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5593
-msgid "Stereo"
-msgstr "스테레오"
-
-#: ../data/totem.ui.h:106
-msgid "4-channel"
-msgstr "4채널"
-
-#: ../data/totem.ui.h:107
-msgid "4.1-channel"
-msgstr "4.1채널"
-
-#: ../data/totem.ui.h:108
-msgid "5.0-channel"
-msgstr "5.0채널"
-
-#: ../data/totem.ui.h:109
-msgid "5.1-channel"
-msgstr "5.1채널"
-
-#: ../data/totem.ui.h:110
-msgid "AC3 Passthrough"
-msgstr "AC3 Passthrough"
-
-#: ../data/totem.ui.h:111
-msgid "Totem Preferences"
-msgstr "토템 기본 설정"
-
-#: ../data/totem.ui.h:112
-msgid "Playback"
-msgstr "재생"
-
-#: ../data/totem.ui.h:113
-msgid "Start playing files from last position"
-msgstr "최근 위치에서 파일 플레이를 시작"
-
-#: ../data/totem.ui.h:114
-msgid "Networking"
-msgstr "네트워킹"
-
-#: ../data/totem.ui.h:115
-msgid "Connection _speed:"
-msgstr "접속 속도(_S):"
-
-#: ../data/totem.ui.h:116
-msgid "Text Subtitles"
-msgstr "자막"
-
-#: ../data/totem.ui.h:117
-msgid "_Load subtitle files when movie is loaded"
-msgstr "동영상을 읽어들일 때 자막 파일도 읽어들이기(_L)"
-
-#: ../data/totem.ui.h:118
-msgid "_Font:"
-msgstr "글꼴(_F):"
-
-#: ../data/totem.ui.h:119
-msgid "_Encoding:"
-msgstr "인코딩(_E):"
-
-#: ../data/totem.ui.h:120
-msgid "External Chapters"
-msgstr "외부 챕터"
-
-#: ../data/totem.ui.h:121
-msgid "Load _chapter files when movie is loaded"
-msgstr "동영상을 읽어들일 때 챕터 파일도 읽어들이기(_C)"
-
-#. Tab label in the Preferences dialogue
-#: ../data/totem.ui.h:124
-msgid "Display"
-msgstr "표시"
-
-#: ../data/totem.ui.h:125
-msgid "_Resize the window when a new video is loaded"
-msgstr "새 비디오를 읽어들였을 때 자동으로 창 크기 조정(_R)"
-
-#: ../data/totem.ui.h:126
-msgid "Disable _deinterlacing of interlaced videos"
-msgstr "비디오의 인터레이스 없애기 사용하지 않기(_D)"
-
-#: ../data/totem.ui.h:127
-msgid "Disable screensaver when playing "
-msgstr "다음 재생시 화면 보호기를 사용하지 않음: "
-
-#: ../data/totem.ui.h:129
-msgid "Video or Audio"
-msgstr "비디오 또는 오디오"
-
-#: ../data/totem.ui.h:130
-msgid "Visual Effects"
-msgstr "시각 효과"
-
-#: ../data/totem.ui.h:131
-msgid "Show _visual effects when an audio file is played"
-msgstr "오디오 파일 재생시 시각 효과 표시(_V)"
-
-#: ../data/totem.ui.h:132
-msgid "_Type of visualization:"
-msgstr "시각 효과 종류(_T):"
-
-#: ../data/totem.ui.h:133
-msgid "Visualization _size:"
-msgstr "시각 효과 크기(_S):"
-
-#: ../data/totem.ui.h:134
-msgid "Color Balance"
-msgstr "색 밸런스"
-
-#: ../data/totem.ui.h:135
-msgid "_Brightness:"
-msgstr "밝기(_B):"
-
-#: ../data/totem.ui.h:136
-msgid "Co_ntrast:"
-msgstr "대비(_N):"
-
-#: ../data/totem.ui.h:137
-msgid "Sat_uration:"
-msgstr "채도(_U):"
-
-#: ../data/totem.ui.h:138
-msgid "_Hue:"
-msgstr "색상(_H):"
-
-#: ../data/totem.ui.h:139
-msgid "Reset to _Defaults"
-msgstr "기본값으로 초기화(_D)"
-
-#: ../data/totem.ui.h:140
-msgid "Audio Output"
-msgstr "오디오 출력"
-
-#: ../data/totem.ui.h:141
-msgid "_Audio output type:"
-msgstr "오디오 출력 형식(_A):"
-
-#: ../data/totem.ui.h:145
-msgid "Time seek bar"
-msgstr "재생 시간 표시줄"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
-msgid "Allow the screensaver to activate when playing audio"
-msgstr "오디오를 플레이할 경우에도 화면 보호기 활성화"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
-msgid ""
-"Allow the screensaver to activate when playing audio. Disable if you have "
-"monitor-powered speakers."
-msgstr ""
-"오디오를 플레이할 경우에도 화면 보호기 시작을 허용합니다. 모니터에서 스피커 "
-"기능을 하는 경우 이 기능이 필요합니다."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
-msgid "Show visual effects when no video is displayed"
-msgstr "오디오 파일 재생시 시각 효과 보여주기"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
-msgid "Show visual effects when playing an audio only file."
-msgstr "오디오 파일 재생시 시각 효과 보여주기."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
-msgid "Name of the visual effects plugin"
-msgstr "시각 효과 플러그인의 이름"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
-msgid "The brightness of the video"
-msgstr "비디오의 밝기"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
-msgid "The contrast of the video"
-msgstr "비디오의 대비"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
-msgid "The hue of the video"
-msgstr "비디오의 색상"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
-msgid "The saturation of the video"
-msgstr "비디오의 채도"
+#: ../data/totem.ui.h:62
+msgid "Square"
+msgstr "정사각형"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
-msgid "Resize the canvas automatically on file load"
-msgstr "파일을 읽어들일 때 자동으로 캔버스 사이즈 재조정"
+#: ../data/totem.ui.h:63
+msgid "Sets square aspect ratio"
+msgstr "화면 비율을 정사각형으로 설정합니다"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
-msgid "Network connection speed"
-msgstr "네트워크 연결 속도"
+#: ../data/totem.ui.h:64
+msgid "4:3 (TV)"
+msgstr "4:3 (TV)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
-msgid ""
-"Approximate network connection speed, used to select quality on media over "
-"the network."
-msgstr "예상 네트워크 연결 속도. 네트워크를 통해 전달할 화질을 결정할 때 사용."
+#: ../data/totem.ui.h:65
+msgid "Sets 4:3 (TV) aspect ratio"
+msgstr "4:3 (TV) 화면 비율"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
-msgid "Repeat mode"
-msgstr "반복 모드"
+#: ../data/totem.ui.h:66
+msgid "16:9 (Widescreen)"
+msgstr "16:9 (와이드스크린)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
-msgid "Shuffle mode"
-msgstr "임의 재생 모드"
+#: ../data/totem.ui.h:67
+msgid "Sets 16:9 (widescreen) aspect ratio"
+msgstr "16:9 (와이드) 화면 비율"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
-msgid "Whether to disable deinterlacing for interlaced movies"
-msgstr "비디오의 인터레이스 없애기 사용하지 않을지 여부"
+#: ../data/totem.ui.h:68
+msgid "2.11:1 (DVB)"
+msgstr "2.11:1 (DVB)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
-msgid "Whether to enable debug for the playback engine"
-msgstr "재생 엔진에 디버깅 기능을 사용할지 여부"
+#: ../data/totem.ui.h:69
+msgid "Sets 2.11:1 (DVB) aspect ratio"
+msgstr "2.11:1 (DVB) 화면 비율"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
-msgid "Type of audio output to use"
-msgstr "사용할 오디오 출력 형식"
+#: ../data/totem.ui.h:70
+msgid "S_ubtitles"
+msgstr "자막(_U)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
-msgid "Visualization quality setting"
-msgstr "시각 효과 품질 설정"
+#: ../data/totem.ui.h:73
+msgid "_Languages"
+msgstr "언어(_L)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
-msgid "Quality setting for the audio visualization."
-msgstr "오디오 시각 효과 화질 설정."
+#: ../data/totem.ui.h:74
+msgid "Zoom In"
+msgstr "확대"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
-msgid "Network buffering threshold"
-msgstr "네트워크 버퍼링 임계점"
+#: ../data/totem.ui.h:75
+msgid "Zoom in"
+msgstr "확대"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
-msgid ""
-"Amount of data to buffer for network streams before starting to display the "
-"stream (in seconds)."
-msgstr "네트워크 스트림을 표시하기 전에 버퍼링할 양 (초 단위)."
+#: ../data/totem.ui.h:76
+msgid "Skip _Forward"
+msgstr "앞으로 건너뛰기(_F)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
-msgid "Subtitle font"
-msgstr "자막 글꼴"
+#: ../data/totem.ui.h:77
+msgid "Skip forward"
+msgstr "앞으로 건너뛰기"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
-msgid "Pango font description for subtitle rendering."
-msgstr "자막을 그릴 때 쓰일 판고 글꼴 지정."
+#: ../data/totem.ui.h:78
+msgid "Skip _Backwards"
+msgstr "뒤로 건너뛰기(_B)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
-msgid "Subtitle encoding"
-msgstr "자막 인코딩"
+#: ../data/totem.ui.h:79
+msgid "Skip backwards"
+msgstr "뒤로 건너뛰기"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
-msgid "Encoding character set for subtitle."
-msgstr "자막에 사용할 인코딩 문자셋."
+#: ../data/totem.ui.h:82
+msgid "Time seek bar"
+msgstr "재생 시간 표시줄"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
-msgid "Default location for the \"Open...\" dialogs"
-msgstr "\"열기...\" 창의 기본 위치"
+#: ../data/uri.ui.h:1
+msgid "Enter the _address of the file you would like to open:"
+msgstr "열려는 파일의 주소를 입력하십시오(_A):"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
-msgid ""
-"Default location for the \"Open...\" dialogs. Default is the current "
-"directory."
-msgstr "\"열기...\" 창의 기본 위치, 기본값은 현재 디렉터리입니다."
+#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
+msgid "_Add to Playlist"
+msgstr "재생 목록에 추가(_A)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
-msgid "Default location for the \"Take Screenshot\" dialogs"
-msgstr "\"스크린샷 찍기\" 창의 기본 위치"
+#: ../data/video-list.ui.h:2
+msgid "Add the video to the playlist"
+msgstr "재생 목록에 영상을 추가할 수 없습니다"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
-msgid ""
-"Default location for the \"Take Screenshot\" dialogs. Default is the "
-"Pictures directory."
-msgstr "\"스크린샷 찍기\" 창의 기본 위치, 기본값은 사진 디렉터리입니다."
+#: ../src/backend/bacon-video-widget.c:1641
+msgid "Password requested for RTSP server"
+msgstr "RTSP 서버에서 암호를 요청했습니다"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
-msgid "Whether to disable the plugins in the user's home directory"
-msgstr "사용자 디렉터리의 플러그인을 사용하지 않을지 여부"
+#: ../src/backend/bacon-video-widget.c:2927
+#, c-format
+msgid "Audio Track #%d"
+msgstr "오디오 트랙 #%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
-msgid "Whether to disable the keyboard shortcuts"
-msgstr "키보드 바로 가기를 사용하지 않을지 여부"
+#: ../src/backend/bacon-video-widget.c:2931
+#, c-format
+msgid "Subtitle #%d"
+msgstr "자막 #%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
-msgid "Whether to autoload text subtitle files when a movie is loaded"
-msgstr "동영상을 읽어들였을 때 자막 파일을 자동으로 읽어들일지 여부"
+#: ../src/backend/bacon-video-widget.c:3328
+msgid "The server you are trying to connect to is not known."
+msgstr "연결하려는 서버를 알 수 없습니다."
+
+#: ../src/backend/bacon-video-widget.c:3331
+msgid "The connection to this server was refused."
+msgstr "이 서버에 대한 연결이 거부되었습니다."
+
+#: ../src/backend/bacon-video-widget.c:3334
+msgid "The specified movie could not be found."
+msgstr "지정한 동영상을 찾을 수 없습니다."
+
+#: ../src/backend/bacon-video-widget.c:3341
+msgid "The server refused access to this file or stream."
+msgstr "서버에서 이 파일이나 스트림에 대한 접근을 거부햇습니다."
+
+#: ../src/backend/bacon-video-widget.c:3347
+msgid "Authentication is required to access this file or stream."
+msgstr "이 파일이나 스트림에 접근하려면 인증이 필요합니다."
+
+#: ../src/backend/bacon-video-widget.c:3354
+msgid "You are not allowed to open this file."
+msgstr "이 파일을 열 권한이 없습니다."
+
+#: ../src/backend/bacon-video-widget.c:3359
+msgid "This location is not a valid one."
+msgstr "올바른 위치가 아닙니다."
+
+#: ../src/backend/bacon-video-widget.c:3367
+msgid "The movie could not be read."
+msgstr "동영상을 읽을 수 없습니다."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
-msgid "Whether to autoload external chapter files when a movie is loaded"
-msgstr "동영상을 읽어들였을 때 외부 챕터 파일을 자동으로 읽어들일지 여부"
+#. should be exactly one missing thing (source or converter)
+#: ../src/backend/bacon-video-widget.c:3390
+#: ../src/backend/bacon-video-widget.c:3398
+#, c-format
+msgid "The playback of this movie requires a %s plugin which is not installed."
+msgid_plural ""
+"The playback of this movie requires the following decoders which are not "
+"installed:\n"
+"\n"
+"%s"
+msgstr[0] ""
+"이 동영상을 재생하려면 다음 디코더가 필요하지만 설치하지 않았습니다:\n"
+"\n"
+"%s"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+#: ../src/backend/bacon-video-widget.c:3409
 msgid ""
-"Whether to remember the position of played audio/video files when pausing or "
-"closing them"
-msgstr ""
-"재생 중인 오디오/비디오 파일을 일시 중지하거나 닫을 때 위치를 저장할지 여부."
+"An audio or video stream is not handled due to missing codecs. You might "
+"need to install additional plugins to be able to play some types of movies"
+msgstr "코덱이 없어서 오디오 또는 비디오 스트림을 처리할 수 없습니다. 동영상 파일의 종류에 따라 추가 플러그인을 설치해야 할 수도 있습니다."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:35
-msgid "Active plugins list"
-msgstr "활성화된 플러그인 목록"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:36
+#: ../src/backend/bacon-video-widget.c:3419
 msgid ""
-"A list of the names of the plugins which are currently active (loaded and "
-"running)."
-msgstr "현재 활성화된 (읽어들이고 실행 중인) 플러그인 이름의 목록."
+"This file cannot be played over the network. Try downloading it locally "
+"first."
+msgstr "이 파일은 네트워크를 통해 재생할 수 없습니다. 먼저 로컬 위치에 다운로드하십시오."
 
-#: ../data/uri.ui.h:1
-msgid "Enter the _address of the file you would like to open:"
-msgstr "열려는 파일의 주소를 입력하십시오(_A):"
+#: ../src/backend/bacon-video-widget.c:5475 ../src/totem-properties-view.c:227
+msgid "Surround"
+msgstr "서라운드"
+
+#: ../src/backend/bacon-video-widget.c:5477 ../src/totem-properties-view.c:229
+msgid "Mono"
+msgstr "모노"
+
+#: ../src/backend/bacon-video-widget.c:5762
+msgid "Media contains no supported video streams."
+msgstr "지원하지 않는 비디오 스트림이 미디어에 포함되어 있습니다."
+
+#: ../src/backend/bacon-video-widget.c:5944
+msgid ""
+"Some necessary plug-ins are missing. Make sure that the program is correctly "
+"installed."
+msgstr "필요한 플러그인이 없습니다. 프로그램을 올바르게 설치했는지 확인하십시오."
 
 #: ../src/eggdesktopfile.c:165
 #, c-format
@@ -939,8 +994,8 @@
 #: ../src/eggfileformatchooser.c:657
 #, c-format
 msgid ""
-"The program was not able to find out the file format you want to use for `%"
-"s'. Please make sure to use a known extension for that file or manually "
+"The program was not able to find out the file format you want to use for `"
+"%s'. Please make sure to use a known extension for that file or manually "
 "choose a file format from the list below."
 msgstr ""
 "'%s'에 대해 사용할 파일 형식을 찾을 수 없습니다. 이 파일에 대한 확장 기능을 "
@@ -978,6 +1033,31 @@
 msgid "Show session management options"
 msgstr "세션 관리 옵션을 표시합니다"
 
+#. hour:minutes:seconds
+#. Translators: This is a time format, like "9:05:02" for 9
+#. * hours, 5 minutes, and 2 seconds. You may change ":" to
+#. * the separator that your locale uses or use "%Id" instead
+#. * of "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:56
+#: ../src/plugins/skipto/totem-time-entry.c:57
+#, c-format
+msgctxt "long time format"
+msgid "%d:%02d:%02d"
+msgstr "%d:%02d:%02d"
+
+#. minutes:seconds
+#. Translators: This is a time format, like "5:02" for 5
+#. * minutes and 2 seconds. You may change ":" to the
+#. * separator that your locale uses or use "%Id" instead of
+#. * "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:65
+#, c-format
+msgctxt "short time format"
+msgid "%d:%02d"
+msgstr "%d:%02d"
+
 #. Title
 #. Artist
 #. Album
@@ -1078,10 +1158,14 @@
 msgid_plural "%d frames per second"
 msgstr[0] "초당 %d 프레임"
 
-#: ../src/totem-audio-preview.c:168
+#: ../src/totem-audio-preview.c:137
 msgid "Audio Preview"
 msgstr "오디오 미리 보기"
 
+#: ../src/totem.c:239
+msgid "Verify your system installation. Totem will now exit."
+msgstr "시스템 설치가 올바른지 확인하십시오. 토템을 끝냅니다."
+
 #: ../src/totem-cell-renderer-video.c:126
 msgid "Unknown video"
 msgstr "알 수 없는 영상"
@@ -1094,7 +1178,7 @@
 msgid "Cancel"
 msgstr "취소"
 
-#: ../src/totem-fullscreen.c:616
+#: ../src/totem-fullscreen.c:573
 msgid "No File"
 msgstr "파일 없음"
 
@@ -1112,7 +1196,7 @@
 msgid "Make sure that Totem is properly installed."
 msgstr "토템을 올바르게 설치했는지 확인하십시오."
 
-#: ../src/totem-interface.c:347
+#: ../src/totem-interface.c:357
 msgid ""
 "Totem 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 "
@@ -1124,7 +1208,7 @@
 "Foundation; either version 2 of the License, or (at your option) any later "
 "version."
 
-#: ../src/totem-interface.c:351
+#: ../src/totem-interface.c:361
 msgid ""
 "Totem is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -1136,7 +1220,7 @@
 "FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
 "details."
 
-#: ../src/totem-interface.c:355
+#: ../src/totem-interface.c:365
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Totem; if not, write to the Free Software Foundation, Inc., 59 Temple Place, "
@@ -1146,7 +1230,7 @@
 "Totem; if not, write to the Free Software Foundation, Inc., 59 Temple Place, "
 "Suite 330, Boston, MA  02111-1307  USA"
 
-#: ../src/totem-interface.c:358
+#: ../src/totem-interface.c:368
 msgid ""
 "Totem contains an exception to allow the use of proprietary GStreamer "
 "plugins."
@@ -1154,203 +1238,98 @@
 "토템에는 독점적인 GStreamer 플러그인을 사용할 수 있는 예외 조항이 있습니다."
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:190
+#: ../src/totem-menu.c:291
 msgid "None"
 msgstr "없음"
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:195
+#: ../src/totem-menu.c:296
 msgctxt "Language"
 msgid "Auto"
 msgstr "자동"
 
-#. Translators:
-#. * This is not a JPEG image, but a disc image, for example,
-#. * an ISO file
-#: ../src/totem-menu.c:765
-#, c-format
-msgid "Play Image '%s'"
-msgstr "'%s' 이미지 재생"
-
-#: ../src/totem-menu.c:768 ../src/totem-menu.c:851
-#, c-format
-msgid "device%d"
-msgstr "장치%d"
-
-#: ../src/totem-menu.c:848
-#, c-format
-msgid "Play Disc '%s'"
-msgstr "'%s' 디스크 재생"
-
-#. This lists the back-end type and version, such as
-#. * Movie Player using GStreamer 0.10.1
-#: ../src/totem-menu.c:1189
-#, c-format
-msgid "Movie Player using %s"
-msgstr "동영상 플레이어, %s 사용"
-
-#: ../src/totem-menu.c:1193
+#: ../src/totem-menu.c:789
 msgid "Copyright © 2002-2009 Bastien Nocera"
-msgstr "Copyright © 2002-2009 Bastien Nocera"
-
-#: ../src/totem-menu.c:1198
-msgid "translator-credits"
-msgstr ""
-"장재만 \n"
-"류창우 \n"
-"차영호 "
-
-#: ../src/totem-menu.c:1202
-msgid "Totem Website"
-msgstr "토템 홈페이지"
-
-#: ../src/totem-menu.c:1236
-msgid "Configure Plugins"
-msgstr "플러그인 설정"
-
-#. Translators: %s is the totem version number
-#: ../src/totem-object.c:471
-#, c-format
-msgid "Totem %s"
-msgstr "토템 %s"
-
-#: ../src/totem-object.c:1047 ../browser-plugin/totem-plugin-viewer.c:367
-msgid "Playing"
-msgstr "재생중"
-
-#: ../src/totem-object.c:1049 ../src/totem-options.c:52
-msgid "Pause"
-msgstr "일시 정지"
-
-#: ../src/totem-object.c:1054 ../browser-plugin/totem-plugin-viewer.c:363
-msgid "Paused"
-msgstr "일시 정지"
-
-#: ../src/totem-object.c:1056 ../src/totem-object.c:1066
-#: ../src/totem-options.c:51
-msgid "Play"
-msgstr "재생"
-
-#: ../src/totem-object.c:1061 ../src/totem-object.c:1659
-#: ../src/totem-statusbar.c:115 ../browser-plugin/totem-plugin-viewer.c:351
-msgid "Stopped"
-msgstr "멈춤"
-
-#: ../src/totem-object.c:1142 ../src/totem-object.c:1169
-#: ../src/totem-object.c:1799 ../src/totem-object.c:1963
-#, c-format
-msgid "Totem could not play '%s'."
-msgstr "토템이 '%s'을(를) 재생할 수 없습니다."
-
-#: ../src/totem-object.c:1246
-#, c-format
-msgid ""
-"Totem could not play this media (%s) although a plugin is present to handle "
-"it."
-msgstr ""
-"이 형태의 미디어를 처리할 수 있는 플러그인이 있지만 이 미디어를 (%s) 재생할 "
-"수 없습니다."
-
-#: ../src/totem-object.c:1247
-msgid ""
-"You might want to check that a disc is present in the drive and that it is "
-"correctly configured."
-msgstr ""
-"디스크가 드라이브 안에 들어 있고 올바르게 설정되어 있는지 확인하십시오."
-
-#: ../src/totem-object.c:1255
-msgid "More information about media plugins"
-msgstr "미디어 플러그인에 대한 자세한 정보"
+msgstr "Copyright © 2002-2009 Bastien Nocera"
 
-#: ../src/totem-object.c:1256
-msgid ""
-"Please install the necessary plugins and restart Totem to be able to play "
-"this media."
+#: ../src/totem-menu.c:794
+msgid "translator-credits"
 msgstr ""
-"필요한 플러그인을 설치하고 토템을 다시 시작하면 이 미디어를 재생할 수 있습니"
-"다."
+"장재만 \n"
+"류창우 \n"
+"차영호 "
 
-#: ../src/totem-object.c:1258
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because it does not have the "
-"appropriate plugins to be able to read from the disc."
-msgstr ""
-"이 형태의 미디어를 (%s) 디스크에서 읽을 수 있는 적절한 플러그인이 없기 때문"
-"에 토템에서 이 형태의 미디어를 재생할 수 없습니다."
+#: ../src/totem-menu.c:798
+msgid "Totem Website"
+msgstr "토템 홈페이지"
+
+#: ../src/totem-menu.c:829
+msgid "Configure Plugins"
+msgstr "플러그인 설정"
 
-#: ../src/totem-object.c:1260
+#: ../src/totem-object.c:162
 #, c-format
 msgid ""
-"Totem cannot play this type of media (%s) because you do not have the "
-"appropriate plugins to handle it."
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
-"이 형태의 미디어를 (%s) 처리할 수 있는 적절한 플러그인이 없기 때문에 토템에"
-"서 이 형태의 미디어를 재생할 수 없습니다."
+"%s\n"
+"사용 가능한 명령행 옵션 목록을 보려면 '%s --help' 명령을 실행하십시오.\n"
 
-#: ../src/totem-object.c:1263
+#. Translators: %s is the totem version number
+#: ../src/totem-object.c:591
 #, c-format
-msgid "Totem cannot play this type of media (%s) because it is not supported."
-msgstr ""
-"이 형태의 미디어를 (%s) 지원하지 않으므로 토템에서 이 형태의 미디어를 재생할 "
-"수 없습니다."
-
-#: ../src/totem-object.c:1264
-msgid "Please insert another disc to play back."
-msgstr "플레이할 다른 디스크를 넣으십시오."
-
-#: ../src/totem-object.c:1300
-msgid "Totem was not able to play this disc."
-msgstr "이 디스크를 플레이할 수 없습니다."
+msgid "Totem %s"
+msgstr "토템 %s"
 
-#: ../src/totem-object.c:1301 ../src/totem-object.c:4229
-msgid "No reason."
-msgstr "이유 없음."
+#: ../src/totem-object.c:1168 ../src/totem-options.c:52
+msgid "Pause"
+msgstr "일시 정지"
 
-#: ../src/totem-object.c:1315
-msgid "Totem does not support playback of Audio CDs"
-msgstr "토템은 오디오 CD 재생을 지원하지 않습니다"
+#: ../src/totem-object.c:1175 ../src/totem-object.c:1185
+#: ../src/totem-options.c:51
+msgid "Play"
+msgstr "재생"
 
-#: ../src/totem-object.c:1316
-msgid "Please consider using a music player or a CD extractor to play this CD"
-msgstr ""
-"이 CD를 재생하려면 음악 플레이어나 CD 음악 추출 프로그램을 이용해 보십시오"
+#: ../src/totem-object.c:1267 ../src/totem-object.c:1294
+#: ../src/totem-object.c:1787 ../src/totem-object.c:1942
+#, c-format
+msgid "Totem could not play '%s'."
+msgstr "토템이 '%s'을(를) 재생할 수 없습니다."
 
-#: ../src/totem-object.c:1805
+#: ../src/totem-object.c:1793
 msgid "No error message"
 msgstr "오류 메시지가 없습니다"
 
-#: ../src/totem-object.c:2154
+#: ../src/totem-object.c:2133
 msgid "Totem could not display the help contents."
 msgstr "토템 도움말 차례를 표시할 수 없습니다."
 
-#: ../src/totem-object.c:2493 ../src/totem-object.c:2495
-#: ../browser-plugin/totem-plugin-viewer.c:1417
-msgid "An error occurred"
-msgstr "오류가 발생했습니다"
-
-#: ../src/totem-object.c:4064 ../src/totem-object.c:4066
+#: ../src/totem-object.c:4019 ../src/totem-object.c:4021
 msgid "Previous Chapter/Movie"
 msgstr "이전 장으로/동영상으로"
 
-#: ../src/totem-object.c:4073 ../src/totem-object.c:4075
+#: ../src/totem-object.c:4028 ../src/totem-object.c:4030
 msgid "Play / Pause"
 msgstr "재생 / 일시 정지"
 
-#: ../src/totem-object.c:4083 ../src/totem-object.c:4085
+#: ../src/totem-object.c:4038 ../src/totem-object.c:4040
 msgid "Next Chapter/Movie"
 msgstr "다음 장으로/동영상으로"
 
-#. Translators: this is the tooltip text for the fullscreen button in the controls box in Totem's main window.
 #. Translators: this is the accessibility text for the fullscreen button in the controls box in Totem's main window.
-#: ../src/totem-object.c:4097 ../src/totem-object.c:4099
+#: ../src/totem-object.c:4051 ../src/totem-object.c:4053
 msgid "Fullscreen"
 msgstr "전체 화면"
 
-#: ../src/totem-object.c:4229
+#: ../src/totem-object.c:4184
 msgid "Totem could not startup."
 msgstr "토템이 시작할 수 없습니다."
 
+#: ../src/totem-object.c:4184
+msgid "No reason."
+msgstr "이유 없음."
+
 #: ../src/totem-open-location.c:182
 msgid "Open Location..."
 msgstr "위치 열기..."
@@ -1424,117 +1403,111 @@
 msgid "Movies to play"
 msgstr "재생할 동영상"
 
-#: ../src/totem-options.c:117
+#: ../src/totem-options.c:79
+msgid "- Play movies and songs"
+msgstr "- 동영상과 음악 재생"
+
+#: ../src/totem-options.c:142
 msgid "Can't enqueue and replace at the same time"
 msgstr "동시에 대기열에 넣고 바꿀 수 없습니다"
 
 #. By extension entry
-#: ../src/totem-playlist.c:161
+#: ../src/totem-playlist.c:162
 msgid "MP3 ShoutCast playlist"
 msgstr "MP3 ShoutCast 재생 목록"
 
-#: ../src/totem-playlist.c:162
+#: ../src/totem-playlist.c:163
 msgid "MP3 audio (streamed)"
-msgstr "MP3 오디오 (스트림)"
+msgstr "MP3 오디오(스트림)"
 
-#: ../src/totem-playlist.c:163
+#: ../src/totem-playlist.c:164
 msgid "MP3 audio (streamed, DOS format)"
-msgstr "MP3 오디오 (스트림, DOS 형식)"
+msgstr "MP3 오디오(스트림, DOS 형식)"
 
-#: ../src/totem-playlist.c:164
+#: ../src/totem-playlist.c:165
 msgid "XML Shareable Playlist"
-msgstr "XML 공유 재생 목록 (XSPF)"
+msgstr "XML 공유 재생 목록(XSPF)"
 
 #. This is "Title 3", where title is a DVD title
 #. * Note: NOT a DVD chapter
-#: ../src/totem-playlist.c:347
+#: ../src/totem-playlist.c:348
 #, c-format
 msgid "Title %d"
 msgstr "타이틀 %d"
 
-#: ../src/totem-playlist.c:446
+#: ../src/totem-playlist.c:447
 msgid "Could not save the playlist"
 msgstr "재생 목록을 저장할 수 없습니다"
 
-#: ../src/totem-playlist.c:1021
+#: ../src/totem-playlist.c:1022
 msgid "Save Playlist"
 msgstr "재생 목록 저장"
 
 #. translators: Playlist is the default saved playlist filename,
 #. * without the suffix
-#: ../src/totem-playlist.c:1033 ../src/totem-playlist.c:1264
-#: ../src/totem-sidebar.c:142
+#: ../src/totem-playlist.c:1034 ../src/totem-playlist.c:1263
+#: ../src/totem-sidebar.c:145
 msgid "Playlist"
 msgstr "재생 목록"
 
-#: ../src/totem-playlist.c:1857
+#: ../src/totem-playlist.c:1862
 #, c-format
 msgid "The playlist '%s' could not be parsed. It might be damaged."
 msgstr "'%s' 재생 목록을 파싱할 수 없습니다. 손상된 것 같습니다."
 
-#: ../src/totem-playlist.c:1858
+#: ../src/totem-playlist.c:1863
 msgid "Playlist error"
 msgstr "재생 목록 오류"
 
-#: ../src/totem-preferences.c:295
+#: ../src/totem-preferences.c:297
 msgid "Preferences"
 msgstr "기본 설정"
 
-#: ../src/totem-preferences.c:451
+#: ../src/totem-preferences.c:445
 msgid "Select Subtitle Font"
 msgstr "자막 글꼴 선택"
 
-#: ../src/totem-properties-main.c:115 ../src/totem-properties-view.c:266
+#: ../src/totem-properties-main.c:116 ../src/totem-properties-view.c:269
 msgid "Audio/Video"
 msgstr "오디오/비디오"
 
-#: ../src/totem-properties-view.c:128
+#: ../src/totem-properties-view.c:131
 msgid "N/A"
 msgstr "해당 없음"
 
-#: ../src/totem-properties-view.c:157
+#: ../src/totem-properties-view.c:160
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 msgctxt "Stream bit rate"
 msgid "N/A"
 msgstr "해당 없음"
 
-#: ../src/totem-properties-view.c:160
+#: ../src/totem-properties-view.c:163
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: ../src/totem-properties-view.c:177
+#: ../src/totem-properties-view.c:180
 #: ../src/plugins/properties/totem-movie-properties.c:149
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../src/totem-properties-view.c:209
+#: ../src/totem-properties-view.c:212
 #: ../src/plugins/properties/totem-movie-properties.c:166
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: ../src/totem-properties-view.c:216
+#: ../src/totem-properties-view.c:219
 #: ../src/plugins/properties/totem-movie-properties.c:166
 msgctxt "Sample rate"
 msgid "N/A"
 msgstr "해당 없음"
 
-#: ../src/totem-properties-view.c:224
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5589
-msgid "Surround"
-msgstr "써라운드"
-
-#: ../src/totem-properties-view.c:226
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5591
-msgid "Mono"
-msgstr "모노"
-
-#: ../src/totem-properties-view.c:236
+#: ../src/totem-properties-view.c:239
 msgctxt "Number of audio channels"
 msgid "N/A"
 msgstr "해당 없음"
@@ -1567,8 +1540,8 @@
 #. eg: 75 %
 #: ../src/totem-statusbar.c:250
 #, c-format
-msgid "%d %%"
-msgstr "%d %%"
+msgid "%lf %%"
+msgstr "%lf %%"
 
 #. eg: Paused, 0:32 / 1:05
 #: ../src/totem-statusbar.c:325
@@ -1579,8 +1552,8 @@
 #. eg: Buffering, 75 %
 #: ../src/totem-statusbar.c:330
 #, c-format
-msgid "%s, %d %%"
-msgstr "%s, %d %%"
+msgid "%s, %f %%"
+msgstr "%s, %f %%"
 
 #: ../src/totem-subtitle-encoding.c:156
 msgid "Current Locale"
@@ -1723,219 +1696,91 @@
 msgid "Vietnamese"
 msgstr "베트남어"
 
-#: ../src/totem-video-list.c:330
-msgid "No video URI"
-msgstr "비디오 URI가 없습니다"
-
-#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
-#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
-#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
-#: ../src/totem-video-thumbnailer.c:872
-#, c-format
-msgid ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-msgstr ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-
-#: ../src/totem-video-thumbnailer.c:873
-msgid "Filename"
-msgstr "파일 이름"
-
-#: ../src/totem-video-thumbnailer.c:875
-msgid "Resolution"
-msgstr "해상도"
-
-#: ../src/totem-video-thumbnailer.c:878
-msgid "Duration"
-msgstr "재생 시간"
-
-#: ../src/totem-uri.c:506 ../src/plugins/chapters/totem-chapters.c:998
+#: ../src/totem-uri.c:343 ../src/plugins/chapters/totem-chapters.c:998
 msgid "All files"
 msgstr "모든 파일"
 
-#: ../src/totem-uri.c:511 ../src/plugins/chapters/totem-chapters.c:995
+#: ../src/totem-uri.c:348 ../src/plugins/chapters/totem-chapters.c:995
 msgid "Supported files"
 msgstr "지원하는 파일"
 
-#: ../src/totem-uri.c:523
+#: ../src/totem-uri.c:360
 msgid "Audio files"
 msgstr "오디오 파일"
 
-#: ../src/totem-uri.c:531
+#: ../src/totem-uri.c:368
 msgid "Video files"
 msgstr "비디오 파일"
 
-#: ../src/totem-uri.c:541
+#: ../src/totem-uri.c:378
 msgid "Subtitle files"
 msgstr "자막 파일"
 
-#: ../src/totem-uri.c:593
+#: ../src/totem-uri.c:430
 msgid "Select Text Subtitles"
 msgstr "자막 선택"
 
-#: ../src/totem-uri.c:656
+#: ../src/totem-uri.c:495
 msgid "Select Movies or Playlists"
 msgstr "동영상 혹은 재생 목록 선택"
 
-#. Options parsing
-#: ../src/totem.c:201
-msgid "- Play movies and songs"
-msgstr "- 동영상과 음악 재생"
-
-#: ../src/totem.c:212
-#, c-format
-msgid ""
-"%s\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"%s\n"
-"사용 가능한 명령행 옵션 목록을 보려면 '%s --help' 명령을 실행하십시오.\n"
-
-#: ../src/totem.c:254 ../src/totem.c:265
-#: ../browser-plugin/totem-plugin-viewer.c:663
-#: ../browser-plugin/totem-plugin-viewer.c:1793
-msgid "Totem Movie Player"
-msgstr "토템 동영상 플레이어"
-
-#: ../src/totem.c:255 ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Could not initialize the thread-safe libraries."
-msgstr "스레드에 안전한 라이브러리를 초기화할 수 없습니다."
-
-#: ../src/totem.c:255
-msgid "Verify your system installation. Totem will now exit."
-msgstr "시스템 설치가 올바른지 확인하십시오. 토템을 끝냅니다."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:1589
-msgid "Password requested for RTSP server"
-msgstr "RTSP 서버에서 암호를 요청했습니다"
+#: ../src/totem-uri.c:499
+msgid "Add Directory"
+msgstr "디렉터리 추가"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2858
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2862
-#, c-format
-msgid "Audio Track #%d"
-msgstr "오디오 트랙 #%d"
+#: ../src/totem-video-list.c:330
+msgid "No video URI"
+msgstr "비디오 URI가 없습니다"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2890
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2894
+#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
+#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
+#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
+#: ../src/totem-video-thumbnailer.c:841
 #, c-format
-msgid "Subtitle #%d"
-msgstr "자막 #%d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3298
-msgid ""
-"The requested audio output was not found. Please select another audio output "
-"in the Multimedia Systems Selector."
-msgstr ""
-"요청한 오디오 출력을 찾을 수 없습니다. 멀티미디어 시스템 선택에서 다른 오디"
-"오 출력을 선택하십시오."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3303
-msgid "Location not found."
-msgstr "위치를 찾을 수 없습니다."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3307
 msgid ""
-"Could not open location; you might not have permission to open the file."
-msgstr "위치를 열 수 없습니다. 파일을 열 수 있는 권한이 없는 것 같습니다."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3318
-msgid ""
-"The video output is in use by another application. Please close other video "
-"applications, or select another video output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"비디오 출력이 다른 프로그램에서 쓰이고 있는 것 같습니다. 다른 비디오 프로그램"
-"을 닫던지, 멀티미디어 시스템 선택에서 다른 비디오 출력을 선택하십시오."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3324
-msgid ""
-"The audio output is in use by another application. Please select another "
-"audio output in the Multimedia Systems Selector. You may want to consider "
-"using a sound server."
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 msgstr ""
-"오디오 출력이 다른 프로그램에서 쓰이고 있는 것 같습니다. 다른 오디오프로그램"
-"을 닫던지, 멀티미디어 시스템 선택에서 다른 오디오 출력을 선택하십시오."
-
-#. should be exactly one missing thing (source or converter)
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3342
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3348
-#, c-format
-msgid "The playback of this movie requires a %s plugin which is not installed."
-msgid_plural ""
-"The playback of this movie requires the following decoders which are not "
-"installed:\n"
-"\n"
-"%s"
-msgstr[0] ""
-"이 동영상을 재생하려면 다음 디코더가 필요하지만 설치하지 않았습니다:\n"
-"\n"
-"%s"
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3374
-msgid ""
-"Cannot play this file over the network. Try downloading it to disk first."
-msgstr ""
-"네트워크로 파일을 플레이할 수 없습니다. 디스크에 다운로드한 후 플레이하십시"
-"오."
+#: ../src/totem-video-thumbnailer.c:842
+msgid "Filename"
+msgstr "파일 이름"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5878
-msgid "Media contains no supported video streams."
-msgstr "지원하지 않는 비디오 스트림이 미디어에 포함되어 있습니다."
+#: ../src/totem-video-thumbnailer.c:844
+msgid "Resolution"
+msgstr "해상도"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6052
-msgid ""
-"Failed to create a GStreamer play object. Please check your GStreamer "
-"installation."
-msgstr ""
-"GStreamer 재생 오브젝트를 만드는데 실패했습니다. GStreamer 설치가 제대로 되었"
-"는지 확인하십시오."
+#: ../src/totem-video-thumbnailer.c:847
+msgid "Duration"
+msgstr "재생 시간"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6172
-msgid ""
-"Failed to open audio output. You may not have permission to open the sound "
-"device, or the sound server may not be running. Please select another audio "
-"output in the Multimedia Systems Selector."
-msgstr ""
-"오디오 출력을 열 수 없습니다. 사운드 장치를 열 수 있는 허가권이 없거나, 사운"
-"드 서버가 실행되고 있지 않는 것 같습니다. 멀티미디어 시스템 선택에서 다른 오"
-"디오 출력을 선택하십시오."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6192
-msgid ""
-"Could not find the audio output. You may need to install additional "
-"GStreamer plugins, or select another audio output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"오디오 출력을 찾을 수 없습니다. 다른 GStreamer 플러그인을 설치하거나, 멀티미"
-"디어 시스템 선택에서 다른 비디오 출력을 선택하십시오."
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:1
+msgid "Apple Trailers"
+msgstr "애플 트레일러"
+
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:2
+msgid "Sets the user agent for the Apple Trailers site"
+msgstr "애플 트레일러 사이트에 대해 사용자 에이전트 값을 설정합니다"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:1
+msgid "Autoload Subtitles"
+msgstr "자막 자동 읽어들이기"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:2
+msgid "Autoloads text subtitles"
+msgstr "텍스트 자막을 자동으로 읽어들입니다"
 
-#. hour:minutes:seconds
-#. Translators: This is a time format, like "9:05:02" for 9
-#. * hours, 5 minutes, and 2 seconds. You may change ":" to
-#. * the separator that your locale uses or use "%Id" instead
-#. * of "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:83 ../src/plugins/skipto/totem-time-entry.c:57
-#, c-format
-msgctxt "long time format"
-msgid "%d:%02d:%02d"
-msgstr "%d:%02d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
+msgid "Video Disc Recorder"
+msgstr "비디오 디스크 녹화"
 
-#. minutes:seconds
-#. Translators: This is a time format, like "5:02" for 5
-#. * minutes and 2 seconds. You may change ":" to the
-#. * separator that your locale uses or use "%Id" instead of
-#. * "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:92
-#, c-format
-msgctxt "short time format"
-msgid "%d:%02d"
-msgstr "%d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
+msgid "Records (S)VCDs or video DVDs"
+msgstr "VCD/SVCD나 비디오 DVD를 녹화합니다"
 
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:65
 msgid "_Create Video Disc..."
@@ -1961,38 +1806,21 @@
 msgid "Copy the currently playing (S)VCD"
 msgstr "현재 재생 중인 VCD/SVCD를 복사합니다"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:129
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:136
 msgid "The video disc could not be duplicated."
 msgstr "비디오 디스크를 복사할 수 없습니다."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:131
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:276
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:138
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:283
 msgid "The movie could not be recorded."
 msgstr "동영상을 녹화할 수 없습니다."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:157
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:167
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:263
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:164
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:174
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:270
 msgid "Unable to write a project."
 msgstr "프로젝트를 쓸 수 없습니다."
 
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
-msgid "Video Disc Recorder"
-msgstr "비디오 디스크 녹화"
-
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
-msgid "Records (S)VCDs or video DVDs"
-msgstr "VCD/SVCD나 비디오 DVD를 녹화합니다"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:1
-#: ../src/plugins/chapters/totem-chapters.c:1139
-msgid "Chapters"
-msgstr "챕터"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:2
-msgid "Support chapter markers in movies."
-msgstr "동영상의 챕터 마커 지원."
-
 #: ../src/plugins/chapters/chapters-edit.ui.h:1
 msgid "Name for new chapter:"
 msgstr "새 쳅터의 이름:"
@@ -2049,6 +1877,15 @@
 msgid "Create a new chapter list for the movie"
 msgstr "동영상에 대한 새 챕터 목록을 만듭니다"
 
+#: ../src/plugins/chapters/chapters.plugin.in.h:1
+#: ../src/plugins/chapters/totem-chapters.c:1139
+msgid "Chapters"
+msgstr "챕터"
+
+#: ../src/plugins/chapters/chapters.plugin.in.h:2
+msgid "Support chapter markers in movies"
+msgstr "동영상의 챕터 마커 지원"
+
 #: ../src/plugins/chapters/totem-chapters.c:56
 #, c-format
 msgid ""
@@ -2152,13 +1989,37 @@
 msgid "The URI ‘%s’ is not supported."
 msgstr "‘%s’ URI를 지원하지 않습니다."
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
-msgid "Instant Messenger status"
-msgstr "메신저 상태"
+#: ../src/plugins/grilo/grilo.plugin.in.h:1
+msgid "Grilo Browser"
+msgstr "그릴로 브라우저"
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
-msgid "Set your Instant Messenger status to away when a movie is playing"
-msgstr "동영상을 플레이하는 중에 메신저 상태를 자리없음으로 설정합니다"
+#: ../src/plugins/grilo/grilo.plugin.in.h:2
+msgid "A plugin to let you browse media content from various sources"
+msgstr "여러가지 경로의 미디어를 둘러보는 플러그인"
+
+#: ../src/plugins/grilo/grilo.ui.h:1
+msgid "Add to Playlist"
+msgstr "재생 목록에 추가"
+
+#: ../src/plugins/grilo/grilo.ui.h:2
+msgid "Copy Location"
+msgstr "위치 복사"
+
+#: ../src/plugins/grilo/grilo.ui.h:3 ../src/plugins/grilo/totem-grilo.c:1184
+msgid "Browse"
+msgstr "찾아보기"
+
+#: ../src/plugins/grilo/grilo.ui.h:4 ../src/plugins/grilo/totem-grilo.c:1227
+msgid "Search"
+msgstr "검색"
+
+#: ../src/plugins/grilo/totem-grilo.c:454
+msgid "Browse Error"
+msgstr "찾아보기 오류"
+
+#: ../src/plugins/grilo/totem-grilo.c:609
+msgid "Search Error"
+msgstr "검색 오류"
 
 #: ../src/plugins/gromit/gromit.plugin.in.h:1
 msgid "Gromit Annotations"
@@ -2172,56 +2033,13 @@
 msgid "The gromit binary was not found."
 msgstr "gromit 바이너리를 찾을 수 없습니다."
 
-#. Add the interface to Totem's sidebar
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:1
-#: ../src/plugins/iplayer/iplayer.py:46
-msgid "BBC iPlayer"
-msgstr "BBC iPlayer"
-
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:2
-msgid "Stream BBC programs from the last 7 days from the BBC iPlayer service."
-msgstr ""
-"BBC iPlayer 서비스에서 최근 7일 사이의 BBC 프로그램 스트림을 재생합니다."
-
-#: ../src/plugins/iplayer/iplayer.py:72
-msgid "Error listing channel categories"
-msgstr "채널 분류 목록을 표시하는데 오류"
-
-#: ../src/plugins/iplayer/iplayer.py:73
-msgid ""
-"There was an unknown error getting the list of television channels available "
-"on BBC iPlayer."
-msgstr ""
-"BBC iPlayer에 사용 가능한 TV 채널 목록을 받는데 알 수 없는 오류가 발생했습니"
-"다."
-
-#. Append a dummy child row so that the expander's visible; we can
-#. then queue off the expander to load the programme listing for this
-#. category
-#: ../src/plugins/iplayer/iplayer.py:84
-msgid "Loading…"
-msgstr "읽어들이는 중…"
-
-#. Translators: the "programme feed" is the list of TV shows
-#. available to watch online
-#: ../src/plugins/iplayer/iplayer.py:136
-msgid "Error getting programme feed"
-msgstr "프로그램 피드를 받는데 오류"
-
-#: ../src/plugins/iplayer/iplayer.py:137
-msgid ""
-"There was an error getting the list of programmes for this channel and "
-"category combination."
-msgstr "이 채널과 분류에 대해 프로그램 목록을 받는데 오류가 발생했습니다."
-
-#: ../src/plugins/iplayer/iplayer2.py:298
-msgid ""
-msgstr "<이유 없음>"
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
+msgid "Instant Messenger Status"
+msgstr "메신저 상태"
 
-#: ../src/plugins/iplayer/iplayer2.py:299
-#, python-format
-msgid "Programme unavailable (\"%s\")"
-msgstr "프로그램이 없습니다 (\"%s\")"
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
+msgid "Set your Instant Messenger status to away when a movie is playing"
+msgstr "동영상을 플레이하는 중에 메신저 상태를 자리없음으로 설정합니다"
 
 #: ../src/plugins/lirc/lirc.plugin.in.h:1
 msgid "Infrared Remote Control"
@@ -2239,25 +2057,29 @@
 msgid "Couldn't read lirc configuration."
 msgstr "lirc 설정을 읽을 수 없습니다."
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
-msgid "Download Movie Subtitles"
-msgstr "동영상 자막 다운로드"
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:1
+msgid "Media Player Keys"
+msgstr "미디어 플레이어 키"
+
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:2
+msgid "Support additional media player keys"
+msgstr "미디어 플레이어 키를 추가로 지원합니다"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
-msgid "Subtitle _language:"
-msgstr "자막 언어(_L):"
+#: ../src/plugins/ontop/ontop.plugin.in.h:1
+msgid "Always On Top"
+msgstr "항상 위"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
-msgid "_Play with Subtitle"
-msgstr "자막과 같이 재생(_P)"
+#: ../src/plugins/ontop/ontop.plugin.in.h:2
+msgid "Keep the main window on top when playing a movie"
+msgstr "동영상을 플레이하는 동안에는 창을 맨 위에 두도록 합니다."
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:1
 msgid "Subtitle Downloader"
 msgstr "자막 다운로드"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:2
-msgid "Look for subtitles for the currently playing movie."
-msgstr "현재 재생 중인 동영상의 자막을 찾습니다."
+msgid "Look for subtitles for the currently playing movie"
+msgstr "현재 재생 중인 동영상의 자막을 찾습니다"
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:42
 msgid "Brazilian Portuguese"
@@ -2313,6 +2135,18 @@
 msgid "Searching subtitles…"
 msgstr "자막을 검색하는 중입니다…"
 
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
+msgid "Download Movie Subtitles"
+msgstr "동영상 자막 다운로드"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
+msgid "Subtitle _language:"
+msgstr "자막 언어(_L):"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
+msgid "_Play with Subtitle"
+msgstr "자막과 같이 재생(_P)"
+
 #: ../src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in.h:1
 msgid "Subtitle language"
 msgstr "자막 언어"
@@ -2321,78 +2155,18 @@
 msgid "The language to search for subtitles for movies in."
 msgstr "동영상에 대한 자막을 검색할 언어."
 
-#: ../src/plugins/ontop/ontop.plugin.in.h:1
-msgid "Always On Top"
-msgstr "항상 위"
-
-#: ../src/plugins/ontop/ontop.plugin.in.h:2
-msgid "Keep the main window on top when playing a movie"
-msgstr "동영상을 플레이하는 동안에는 창을 맨 위에 두도록 합니다."
+#: ../src/plugins/properties/movie-properties.plugin.in.h:1
+msgid "Movie Properties"
+msgstr "동영상 속성"
+
+#: ../src/plugins/properties/movie-properties.plugin.in.h:2
+msgid "Adds movie properties to the sidebar"
+msgstr "가장자리 창에 동영상 속성을 추가합니다"
 
 #: ../src/plugins/properties/totem-movie-properties.c:246
 msgid "Properties"
 msgstr "속성"
 
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:1
-msgid "Publisher protocol to use"
-msgstr "사용할 공개 프로토콜"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:2
-msgid ""
-"The transport protocol to use when publishing playlists over the network."
-msgstr "네트워크를 통해 재생목록을 발표할 때 사용할 프로토콜."
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:3
-msgid "Format for network service name"
-msgstr "네트워크 서비스 이름의 형식"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:5
-#, no-c-format
-msgid ""
-"A format string used to build the network service name used when publishing "
-"playlists over the network. The following format placeholders can be used: • "
-"%a: the program name as returned by g_get_application_name() • %h: the "
-"machine's host name in title case • %u: the user's login name in title case "
-"• %U: the user's real name • %%: the percent sign"
-msgstr ""
-"네트워크를 통해 재생 목록을 공개할 때 사용할 네트워크 서비스 이름을 만들 포"
-"맷 문자열. 다음 포맷 지정 표기를 사용합니다. • %a: g_get_application_name()에"
-"서 리턴한 프로그램 이름 • %h: 컴퓨터의 호스트 이름, 제목에 맞는 대소문자로 • "
-"%u: 사용자의 로그인 이름, 제목에 맞는 대소문자로 • %U: 사용자의 실제 이름 • %"
-"%: 퍼센트 기호"
-
-#. Translators: computers on the local network which are publishing their playlists over the network
-#: ../src/plugins/publish/totem-publish.c:552
-msgid "Neighbors"
-msgstr "이웃"
-
-#: ../src/plugins/publish/publish.plugin.in.h:1
-msgid "Publish Playlist"
-msgstr "재생 목록 게시"
-
-#: ../src/plugins/publish/publish.plugin.in.h:2
-msgid "Share the current playlist via HTTP"
-msgstr "현재 재생 목록을 HTTP로 공유합니다"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:1
-msgid "Service _Name:"
-msgstr "서비스 이름(_N):"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:3
-#, no-c-format
-msgid ""
-"The name used for announcing the playlist service on the network.\n"
-"All occurrences of the string %u will be replaced by your name,\n"
-"and %h will be replaced by your computer's host name."
-msgstr ""
-"네트워크의 재생 목록 서비스를 알리는데 사용할 이름.\n"
-"%u 스트링은 자기 이름으로 바뀌고, %h 스트링은\n"
-"컴퓨터의 호스트 이름으로 바뀝니다."
-
-#: ../src/plugins/publish/publish-plugin.ui.h:6
-msgid "Use _encrypted transport protocol (HTTPS)"
-msgstr "암호화 전송 프로토콜 사용(_E) (HTTPS)"
-
 #: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:1
 msgid "rpdb2 password"
 msgstr "RPDB2 암호"
@@ -2405,22 +2179,85 @@
 "권한이 없이 토템에 원격으로 접근하지 않도록 RPDB2 서버를 보호할 암호. 빈 값이"
 "면, 'totem' 기본값을 사용합니다."
 
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
+msgid "Python Console"
+msgstr "파이썬 콘솔"
+
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
+msgid "Interactive Python console"
+msgstr "인터랙티브 파이썬 콘솔"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:88
+msgid "Python Console Menu"
+msgstr "파이썬 콘솔 메뉴"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:93
+msgid "_Python Console"
+msgstr "파이썬 콘솔(_P)"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:94
+msgid "Show Totem's Python console"
+msgstr "토템의 파이썬 콘솔을 표시합니다"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:100
+msgid "Python Debugger"
+msgstr "파이썬 디버거"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:101
+msgid "Enable remote Python debugging with rpdb2"
+msgstr "rpdb2를 이용해 원격 파이썬 디버깅 사용"
+
+#. pylint: disable-msg=E1101
+#: ../src/plugins/pythonconsole/pythonconsole.py:125
+#, python-format
+msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
+msgstr "Totem.Object는 'totem_object'를 통해 접근할 수 있습니다 :\\n%s"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:129
+msgid "Totem Python Console"
+msgstr "토템 파이썬 콘솔"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:139
+msgid ""
+"After you press OK, Totem will wait until you connect to it with winpdb or "
+"rpdb2. If you have not set a debugger password in DConf, it will use the "
+"default password ('totem')."
+msgstr ""
+"확인을 누르면 WINPDB나 RPDB2를 이용해 연결할 때까지 토템이 대기합니다. DConf"
+"에서 디버거 암호를 설정하지 않았다면 기본 암호를 ('totem') 사용합니다."
+
+#: ../src/plugins/recent/recent.plugin.in.h:1
+msgid "Recent files"
+msgstr "최근 파일"
+
+#: ../src/plugins/recent/recent.plugin.in.h:2
+msgid "Adds files that have been played to recent files"
+msgstr "재생한 파일을 최근 파일 목록에 추가합니다"
+
 #: ../src/plugins/rotation/rotation.plugin.in.h:1
 msgid "Rotation Plugin"
 msgstr "회전 플러그인"
 
 #: ../src/plugins/rotation/rotation.plugin.in.h:2
-msgid "Allows videos to be rotated if they're in the wrong orientation."
-msgstr "영상 방향이 잘못되었을 때 회전합니다."
+msgid "Allows videos to be rotated if they are in the wrong orientation"
+msgstr "영상 방향이 잘못되었을 때 회전합니다"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:60
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:50
 msgid "_Rotate Clockwise"
 msgstr "시계 방향 회전(_R)"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:62
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:52
 msgid "Rotate Counterc_lockwise"
 msgstr "시계 반대 방향 회전(_L)"
 
+#: ../src/plugins/save-file/save-file.plugin.in.h:1
+msgid "Save Copy"
+msgstr "복사본 저장"
+
+#: ../src/plugins/save-file/save-file.plugin.in.h:2
+msgid "Save a copy of the currently playing movie"
+msgstr "현재 재생 중인 동영상의 복사본을 저장합니다"
+
 #: ../src/plugins/save-file/totem-save-file.c:63
 msgid "Save a Copy..."
 msgstr "복사본 저장..."
@@ -2443,14 +2280,17 @@
 msgid "Movie stream"
 msgstr "동영상 스트림"
 
-#: ../src/plugins/screensaver/totem-screensaver.c:116
-#: ../browser-plugin/totem-plugin-viewer.c:1891
-msgid "Playing a movie"
-msgstr "영상을 재생하는 중"
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:1
+msgid "Screen Saver"
+msgstr "화면 보호기"
+
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:2
+msgid "Deactivates the screen saver when a movie is playing"
+msgstr "동영상을 플레이할 때 화면 보호기를 사용하지 않습니다"
 
 #: ../src/plugins/screenshot/gallery.ui.h:1
 msgid "Screenshot width (in pixels):"
-msgstr "스크린샷 너비 (픽셀 수):"
+msgstr "스크린샷 너비(픽셀 수):"
 
 #: ../src/plugins/screenshot/gallery.ui.h:2
 msgid "Calculate the number of screenshots"
@@ -2460,23 +2300,28 @@
 msgid "Number of screenshots:"
 msgstr "스크린샷 수:"
 
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:1
-msgid "_Name:"
-msgstr "이름(_N):"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:2
-msgid "Save in _folder:"
-msgstr "폴더에 저장(_F):"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:3
-msgid "Select a folder"
-msgstr "폴더 선택"
-
-#. Write the screenshot to the temporary file
-#: ../src/plugins/screenshot/gnome-screenshot-widget.c:385
-#: ../src/plugins/screenshot/totem-screenshot.c:64
-msgid "Screenshot.png"
-msgstr "스크린샷.png"
+#. translators: this is the name of the file that gets made up
+#. * with the screenshot if the entire screen is taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:147
+#, c-format
+msgid "Screenshot from %s.png"
+msgstr "스크린샷, %s.png"
+
+#. translators: this is the name of the file that gets
+#. * made up with the screenshot if the entire screen is
+#. * taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:154
+#, c-format
+msgid "Screenshot from %s - %d.png"
+msgstr "스크린샷, %s - %d.png"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:1
+msgid "Screenshot"
+msgstr "스크린샷"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:2
+msgid "Allows screenshots and galleries to be taken of videos"
+msgstr "동영상에서 스크린샷을 찍을 수 있게 합니다"
 
 #: ../src/plugins/screenshot/totem-gallery.c:91
 msgid "Save Gallery"
@@ -2502,49 +2347,47 @@
 msgid "Saving gallery as \"%s\""
 msgstr "갤러리를 \"%s\" 파일로 저장하는 중입니다"
 
-#: ../src/plugins/screenshot/totem-screenshot.c:113
-msgid "There was an error saving the screenshot."
-msgstr "스크린샷을 저장하는 중에 오류가 발생했습니다."
-
-#: ../src/plugins/screenshot/totem-screenshot.c:139
-msgid "Save Screenshot"
-msgstr "스크린샷 저장"
-
-#. Create the screenshot widget
-#. Translators: %s is the movie title and %d is an auto-incrementing number to make filename unique
-#: ../src/plugins/screenshot/totem-screenshot.c:160
-#, c-format
-msgid "Screenshot-%s-%d.png"
-msgstr "스크린샷-%s-%d.png"
-
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:88
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:220
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "Totem could not get a screenshot of the video."
 msgstr "토템이 이 비디오의 스크린샷을 찍을 수 없습니다."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "This is not supposed to happen; please file a bug report."
 msgstr "이런 일이 일어날 수 없습니다. 버그 보고서를 제출하십시오."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
-msgid "Take _Screenshot..."
-msgstr "스크린샷 찍기(_S)..."
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
+msgid "Take _Screenshot"
+msgstr "스크린샷 찍기(_S)"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
 msgid "Take a screenshot"
 msgstr "스크린샷을 찍습니다"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create Screenshot _Gallery..."
 msgstr "스크린샷 갤러리 만들기(_G)..."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create a gallery of screenshots"
 msgstr "스크린샷 갤러리를 만듭니다"
 
+#: ../src/plugins/skipto/skipto.plugin.in.h:1
+#: ../src/plugins/skipto/totem-skipto.c:196
+msgid "Skip To"
+msgstr "건너뛰기"
+
+#: ../src/plugins/skipto/skipto.plugin.in.h:2
+msgid "Provides the \"Skip to\" dialog"
+msgstr "\"건너뛰기\" 대화상자 기능을 제공합니다"
+
+#: ../src/plugins/skipto/skipto.ui.h:1
+msgid "_Skip to:"
+msgstr "건너뛰기(_S):"
+
 #. Update the "seconds" label so that it always has the correct singular/plural form
 #. Translators: label for the seconds selector in the "Skip to" dialogue
-#: ../src/plugins/skipto/totem-skipto.c:160
+#: ../src/plugins/skipto/totem-skipto.c:159
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "초"
@@ -2553,15 +2396,11 @@
 #. Translators: you should translate this string to a number (written in digits) which corresponds to the longer character length of the
 #. * translations for "second" and "seconds", as translated elsewhere in this file. For example, in English, "second" is 6 characters long and
 #. * "seconds" is 7 characters long, so this string should be translated to "7". See: bgo#639398
-#: ../src/plugins/skipto/totem-skipto.c:190
+#: ../src/plugins/skipto/totem-skipto.c:189
 msgctxt "Skip To label length"
 msgid "7"
 msgstr "7"
 
-#: ../src/plugins/skipto/totem-skipto.c:197
-msgid "Skip To"
-msgstr "건너뛰기"
-
 #: ../src/plugins/skipto/totem-skipto-plugin.c:182
 msgid "_Skip To..."
 msgstr "건너뛰기(_S)..."
@@ -2570,112 +2409,301 @@
 msgid "Skip to a specific time"
 msgstr "특정 시간으로 이동"
 
-#: ../src/plugins/skipto/skipto.ui.h:1
-msgid "_Skip to:"
-msgstr "건너뛰기(_S):"
+#~ msgid "Play movies and songs"
+#~ msgstr "동영상과 음악 재생"
 
-#: ../browser-plugin/totem-plugin-viewer.c:431
-msgid "No URI to play"
-msgstr "재생할 URI가 없습니다"
+#~ msgid "Open a file"
+#~ msgstr "파일을 엽니다"
 
-#. translators: this is:
-#. * Open With ApplicationName
-#. * as in nautilus' right-click menu
-#: ../browser-plugin/totem-plugin-viewer.c:1107
-#, c-format
-msgid "_Open with \"%s\""
-msgstr "\"%s\"(으)로 열기(_O)"
+#~ msgid "Open a non-local file"
+#~ msgstr "로컬이 아닌 파일을 엽니다"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2136
-msgid "No playlist or playlist empty"
-msgstr "재생 목록이 없거나 목록이 비어 있습니다"
+#~ msgid "Quit the program"
+#~ msgstr "프로그램을 끝냅니다"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2235
-msgid "Movie browser plugin"
-msgstr "동영상 브라우저 플러그인"
+# tooltip - 문장으로 번역
+#~ msgid "Configure the application"
+#~ msgstr "프로그램을 설정합니다"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Verify your system installation. The Totem plugin will now exit."
-msgstr "시스템 설치가 올바른지 확인하십시오. 토템 플러그인을 끝냅니다."
+#~ msgid "Switch to fullscreen"
+#~ msgstr "전체 화면"
 
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
-msgid "Python Console"
-msgstr "파이썬 콘솔"
+#~ msgid "Set the repeat mode"
+#~ msgstr "반복 모드 설정"
 
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
-msgid "Interactive Python console."
-msgstr "인터랙티브 파이썬 콘솔."
+#~ msgid "Set the shuffle mode"
+#~ msgstr "임의 재생 모드 설정"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:88
-msgid "Python Console Menu"
-msgstr "파이썬 콘솔 메뉴"
+#~ msgid "14.4 Kbps Modem"
+#~ msgstr "14.4 Kbps 모뎀"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:93
-msgid "_Python Console"
-msgstr "파이썬 콘솔(_P)"
+#~ msgid "19.2 Kbps Modem"
+#~ msgstr "19.2 Kbps 모뎀"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:94
-msgid "Show Totem's Python console"
-msgstr "토템의 파이썬 콘솔을 표시합니다"
+#~ msgid "28.8 Kbps Modem"
+#~ msgstr "28.8 Kbps 모뎀"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:100
-msgid "Python Debugger"
-msgstr "파이썬 디버거"
+#~ msgid "33.6 Kbps Modem"
+#~ msgstr "33.6 Kbps 모뎀"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:101
-msgid "Enable remote Python debugging with rpdb2"
-msgstr "rpdb2를 이용해 원격 파이썬 디버깅 사용"
+#~ msgid "34.4 Kbps Modem"
+#~ msgstr "34.4 Kbps 모뎀"
 
-#. pylint: disable-msg=E1101
-#: ../src/plugins/pythonconsole/pythonconsole.py:125
-#, python-format
-msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
-msgstr "Totem.Object는 'totem_object'를 통해 접근할 수 있습니다 :\\n%s"
+#~ msgid "56 Kbps Modem/ISDN"
+#~ msgstr "56 Kbps 모뎀/ISDN"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:129
-msgid "Totem Python Console"
-msgstr "토템 파이썬 콘솔"
+#~ msgid "112 Kbps Dual ISDN/DSL"
+#~ msgstr "112 Kbps Dual ISDN/DSL"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:139
-msgid ""
-"After you press OK, Totem will wait until you connect to it with winpdb or "
-"rpdb2. If you have not set a debugger password in DConf, it will use the "
-"default password ('totem')."
-msgstr ""
-"확인을 누르면 WINPDB나 RPDB2를 이용해 연결할 때까지 토템이 대기합니다. DConf"
-"에서 디버거 암호를 설정하지 않았다면 기본 암호를 ('totem') 사용합니다."
+#~ msgid "256 Kbps DSL/Cable"
+#~ msgstr "256 Kbps DSL/케이블"
 
-#: ../src/plugins/grilo/grilo.plugin.in.h:1
-msgid "Grilo Browser"
-msgstr "그릴로 브라우저"
+#~ msgid "384 Kbps DSL/Cable"
+#~ msgstr "384 Kbps DSL/케이블"
 
-#: ../src/plugins/grilo/grilo.plugin.in.h:2
-msgid "A plugin to let you browse media content from various sources."
-msgstr "여러가지 경로의 미디어를 둘러보는 플러그인."
+#~ msgid "512 Kbps DSL/Cable"
+#~ msgstr "512 Kbps DSL/케이블"
 
-#: ../src/plugins/grilo/totem-grilo.c:452
-msgid "Browse Error"
-msgstr "찾아보기 오류"
+#~ msgid "1.5 Mbps T1/Intranet/LAN"
+#~ msgstr "1.5 Mbps T1/Intranet/LAN"
 
-#: ../src/plugins/grilo/totem-grilo.c:599
-msgid "Search Error"
-msgstr "검색 오류"
+#~ msgid "Intranet/LAN"
+#~ msgstr "인트라넷/LAN"
 
-#: ../src/plugins/grilo/totem-grilo.c:1219 ../src/plugins/grilo/grilo.ui.h:3
-msgid "Browse"
-msgstr "찾아보기"
+#~ msgid "Networking"
+#~ msgstr "네트워킹"
 
-#: ../src/plugins/grilo/totem-grilo.c:1285 ../src/plugins/grilo/grilo.ui.h:4
-msgid "Search"
-msgstr "검색"
+#~ msgid "Connection _speed:"
+#~ msgstr "접속 속도(_S):"
 
-#: ../src/plugins/grilo/grilo.ui.h:1
-msgid "Add to Playlist"
-msgstr "재생 목록에 추가"
+#~ msgid "Network connection speed"
+#~ msgstr "네트워크 연결 속도"
 
-#: ../src/plugins/grilo/grilo.ui.h:2
-msgid "Copy Location"
-msgstr "위치 복사"
+#~ msgid ""
+#~ "Approximate network connection speed, used to select quality on media "
+#~ "over the network."
+#~ msgstr ""
+#~ "예상 네트워크 연결 속도. 네트워크를 통해 전달할 화질을 결정할 때 사용."
+
+#~ msgid "Play Image '%s'"
+#~ msgstr "'%s' 이미지 재생"
+
+#~ msgid "device%d"
+#~ msgstr "장치%d"
+
+#~ msgid "Play Disc '%s'"
+#~ msgstr "'%s' 디스크 재생"
+
+#~ msgid "Movie Player using %s"
+#~ msgstr "동영상 플레이어, %s 사용"
+
+#~ msgid ""
+#~ "Totem could not play this media (%s) although a plugin is present to "
+#~ "handle it."
+#~ msgstr ""
+#~ "이 형태의 미디어를 처리할 수 있는 플러그인이 있지만 이 미디어를 (%s) 재생"
+#~ "할 수 없습니다."
+
+#~ msgid ""
+#~ "You might want to check that a disc is present in the drive and that it "
+#~ "is correctly configured."
+#~ msgstr ""
+#~ "디스크가 드라이브 안에 들어 있고 올바르게 설정되어 있는지 확인하십시오."
+
+#~ msgid "More information about media plugins"
+#~ msgstr "미디어 플러그인에 대한 자세한 정보"
+
+#~ msgid ""
+#~ "Please install the necessary plugins and restart Totem to be able to play "
+#~ "this media."
+#~ msgstr ""
+#~ "필요한 플러그인을 설치하고 토템을 다시 시작하면 이 미디어를 재생할 수 있습"
+#~ "니다."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it does not have the "
+#~ "appropriate plugins to be able to read from the disc."
+#~ msgstr ""
+#~ "이 형태의 미디어를 (%s) 디스크에서 읽을 수 있는 적절한 플러그인이 없기 때"
+#~ "문에 토템에서 이 형태의 미디어를 재생할 수 없습니다."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because you do not have the "
+#~ "appropriate plugins to handle it."
+#~ msgstr ""
+#~ "이 형태의 미디어를 (%s) 처리할 수 있는 적절한 플러그인이 없기 때문에 토템"
+#~ "에서 이 형태의 미디어를 재생할 수 없습니다."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it is not supported."
+#~ msgstr ""
+#~ "이 형태의 미디어를 (%s) 지원하지 않으므로 토템에서 이 형태의 미디어를 재생"
+#~ "할 수 없습니다."
+
+#~ msgid "Please insert another disc to play back."
+#~ msgstr "플레이할 다른 디스크를 넣으십시오."
+
+#~ msgid "Totem does not support playback of Audio CDs"
+#~ msgstr "토템은 오디오 CD 재생을 지원하지 않습니다"
+
+#~ msgid ""
+#~ "Please consider using a music player or a CD extractor to play this CD"
+#~ msgstr ""
+#~ "이 CD를 재생하려면 음악 플레이어나 CD 음악 추출 프로그램을 이용해 보십시오"
+
+#~ msgid "%d %%"
+#~ msgstr "%d %%"
+
+#~ msgid ""
+#~ "The requested audio output was not found. Please select another audio "
+#~ "output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "요청한 오디오 출력을 찾을 수 없습니다. 멀티미디어 시스템 선택에서 다른 오"
+#~ "디오 출력을 선택하십시오."
+
+#~ msgid "Location not found."
+#~ msgstr "위치를 찾을 수 없습니다."
+
+#~ msgid ""
+#~ "Could not open location; you might not have permission to open the file."
+#~ msgstr "위치를 열 수 없습니다. 파일을 열 수 있는 권한이 없는 것 같습니다."
+
+#~ msgid ""
+#~ "The video output is in use by another application. Please close other "
+#~ "video applications, or select another video output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "비디오 출력이 다른 프로그램에서 쓰이고 있는 것 같습니다. 다른 비디오 프로"
+#~ "그램을 닫던지, 멀티미디어 시스템 선택에서 다른 비디오 출력을 선택하십시오."
+
+#~ msgid ""
+#~ "The audio output is in use by another application. Please select another "
+#~ "audio output in the Multimedia Systems Selector. You may want to consider "
+#~ "using a sound server."
+#~ msgstr ""
+#~ "오디오 출력이 다른 프로그램에서 쓰이고 있는 것 같습니다. 다른 오디오프로그"
+#~ "램을 닫던지, 멀티미디어 시스템 선택에서 다른 오디오 출력을 선택하십시오."
+
+#~ msgid ""
+#~ "Failed to create a GStreamer play object. Please check your GStreamer "
+#~ "installation."
+#~ msgstr ""
+#~ "GStreamer 재생 오브젝트를 만드는데 실패했습니다. GStreamer 설치가 제대로 "
+#~ "되었는지 확인하십시오."
+
+#~ msgid ""
+#~ "Failed to open audio output. You may not have permission to open the "
+#~ "sound device, or the sound server may not be running. Please select "
+#~ "another audio output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "오디오 출력을 열 수 없습니다. 사운드 장치를 열 수 있는 허가권이 없거나, 사"
+#~ "운드 서버가 실행되고 있지 않는 것 같습니다. 멀티미디어 시스템 선택에서 다"
+#~ "른 오디오 출력을 선택하십시오."
+
+#~ msgid ""
+#~ "Could not find the audio output. You may need to install additional "
+#~ "GStreamer plugins, or select another audio output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "오디오 출력을 찾을 수 없습니다. 다른 GStreamer 플러그인을 설치하거나, 멀티"
+#~ "미디어 시스템 선택에서 다른 비디오 출력을 선택하십시오."
+
+#~ msgid "BBC iPlayer"
+#~ msgstr "BBC iPlayer"
+
+#~ msgid ""
+#~ "Stream BBC programs from the last 7 days from the BBC iPlayer service."
+#~ msgstr ""
+#~ "BBC iPlayer 서비스에서 최근 7일 사이의 BBC 프로그램 스트림을 재생합니다."
+
+#~ msgid "Error listing channel categories"
+#~ msgstr "채널 분류 목록을 표시하는데 오류"
+
+#~ msgid ""
+#~ "There was an unknown error getting the list of television channels "
+#~ "available on BBC iPlayer."
+#~ msgstr ""
+#~ "BBC iPlayer에 사용 가능한 TV 채널 목록을 받는데 알 수 없는 오류가 발생했습"
+#~ "니다."
+
+#~ msgid "Loading…"
+#~ msgstr "읽어들이는 중…"
+
+#~ msgid "Error getting programme feed"
+#~ msgstr "프로그램 피드를 받는데 오류"
+
+#~ msgid ""
+#~ "There was an error getting the list of programmes for this channel and "
+#~ "category combination."
+#~ msgstr "이 채널과 분류에 대해 프로그램 목록을 받는데 오류가 발생했습니다."
+
+#~ msgid ""
+#~ msgstr "<이유 없음>"
+
+#~ msgid "Programme unavailable (\"%s\")"
+#~ msgstr "프로그램이 없습니다 (\"%s\")"
+
+#~ msgid "Publisher protocol to use"
+#~ msgstr "사용할 공개 프로토콜"
+
+#~ msgid ""
+#~ "The transport protocol to use when publishing playlists over the network."
+#~ msgstr "네트워크를 통해 재생목록을 발표할 때 사용할 프로토콜."
+
+#~ msgid "Format for network service name"
+#~ msgstr "네트워크 서비스 이름의 형식"
+
+#~ msgid ""
+#~ "A format string used to build the network service name used when "
+#~ "publishing playlists over the network. The following format placeholders "
+#~ "can be used: • %a: the program name as returned by g_get_application_name"
+#~ "() • %h: the machine's host name in title case • %u: the user's login "
+#~ "name in title case • %U: the user's real name • %%: the percent sign"
+#~ msgstr ""
+#~ "네트워크를 통해 재생 목록을 공개할 때 사용할 네트워크 서비스 이름을 만들 "
+#~ "포맷 문자열. 다음 포맷 지정 표기를 사용합니다. • %a: "
+#~ "g_get_application_name()에서 리턴한 프로그램 이름 • %h: 컴퓨터의 호스트 이"
+#~ "름, 제목에 맞는 대소문자로 • %u: 사용자의 로그인 이름, 제목에 맞는 대소문"
+#~ "자로 • %U: 사용자의 실제 이름 • %%: 퍼센트 기호"
+
+#~ msgid "Neighbors"
+#~ msgstr "이웃"
+
+#~ msgid "Publish Playlist"
+#~ msgstr "재생 목록 게시"
+
+#~ msgid "Share the current playlist via HTTP"
+#~ msgstr "현재 재생 목록을 HTTP로 공유합니다"
+
+#~ msgid "Service _Name:"
+#~ msgstr "서비스 이름(_N):"
+
+#~ msgid ""
+#~ "The name used for announcing the playlist service on the network.\n"
+#~ "All occurrences of the string %u will be replaced by your name,\n"
+#~ "and %h will be replaced by your computer's host name."
+#~ msgstr ""
+#~ "네트워크의 재생 목록 서비스를 알리는데 사용할 이름.\n"
+#~ "%u 스트링은 자기 이름으로 바뀌고, %h 스트링은\n"
+#~ "컴퓨터의 호스트 이름으로 바뀝니다."
+
+#~ msgid "Use _encrypted transport protocol (HTTPS)"
+#~ msgstr "암호화 전송 프로토콜 사용(_E) (HTTPS)"
+
+#~ msgid "_Name:"
+#~ msgstr "이름(_N):"
+
+#~ msgid "Save in _folder:"
+#~ msgstr "폴더에 저장(_F):"
+
+#~ msgid "Select a folder"
+#~ msgstr "폴더 선택"
+
+#~ msgid "There was an error saving the screenshot."
+#~ msgstr "스크린샷을 저장하는 중에 오류가 발생했습니다."
+
+#~ msgid "Save Screenshot"
+#~ msgstr "스크린샷 저장"
 
 #~ msgid "Bemused"
 #~ msgstr "Bemused"
@@ -2704,9 +2732,6 @@
 #~ msgid "Search Results"
 #~ msgstr "검색 결과"
 
-#~ msgid "Videos"
-#~ msgstr "동영상"
-
 #~ msgid "_Open in Web Browser"
 #~ msgstr "웹 브라우저에서 열기(_O)"
 
@@ -2978,24 +3003,24 @@
 #~ "Approximate network connection speed, used to select quality on media "
 #~ "over the network: \"0\" for 14.4 Kbps Modem, \"1\" for 19.2 Kbps Modem, "
 #~ "\"2\" for 28.8 Kbps Modem, \"3\" for 33.6 Kbps Modem, \"4\" for 34.4 Kbps "
-#~ "Modem, \"5\" for 56 Kbps Modem/ISDN, \"6\" for 112 Kbps Dual ISDN/DSL, \"7"
-#~ "\" for 256 Kbps DSL/Cable, \"8\" for 384 Kbps DSL/Cable, \"9\" for 512 "
+#~ "Modem, \"5\" for 56 Kbps Modem/ISDN, \"6\" for 112 Kbps Dual ISDN/DSL, "
+#~ "\"7\" for 256 Kbps DSL/Cable, \"8\" for 384 Kbps DSL/Cable, \"9\" for 512 "
 #~ "Kbps DSL/Cable, \"10\" for 1.5 Mbps T1/Intranet/LAN, \"11\" for Intranet/"
 #~ "LAN."
 #~ msgstr ""
-#~ "네트워크 연결 속도. 네트워크의 미디오 품질을 선택하는데 사용합니다. \"0"
-#~ "\"은 14.4 Kbps 모뎀, \"1\"은 19.2 Kbps 모뎀, \"2\"는 28.8 Kbps 모뎀, \"3"
-#~ "\"은 33.6 Kbps 모뎀, \"4\"는 34.4 Kbps 모뎀, \"5\"는 56 Kbps 모뎀/ISDN, "
-#~ "\"6\"은 112 Kbps Dual ISDN/DSL, \"7\"은 256 Kbps DSL/케이블, \"8\"은 384 "
-#~ "Kbps DSL/케이블, \"9\"는 512 Kbps DSL/케이블, \"10\"은 1.5 Mbps T1/인트라"
-#~ "넷/LAN, \"11\"은 인트라넷/LAN."
+#~ "네트워크 연결 속도. 네트워크의 미디오 품질을 선택하는데 사용합니다. "
+#~ "\"0\"은 14.4 Kbps 모뎀, \"1\"은 19.2 Kbps 모뎀, \"2\"는 28.8 Kbps 모뎀, "
+#~ "\"3\"은 33.6 Kbps 모뎀, \"4\"는 34.4 Kbps 모뎀, \"5\"는 56 Kbps 모뎀/"
+#~ "ISDN, \"6\"은 112 Kbps Dual ISDN/DSL, \"7\"은 256 Kbps DSL/케이블, "
+#~ "\"8\"은 384 Kbps DSL/케이블, \"9\"는 512 Kbps DSL/케이블, \"10\"은 1.5 "
+#~ "Mbps T1/인트라넷/LAN, \"11\"은 인트라넷/LAN."
 
 #~ msgid ""
 #~ "Quality settings for the audio visualization: \"0\" for small, \"1\" for "
 #~ "normal, \"2\" for large, \"3\" for extra large."
 #~ msgstr ""
-#~ "오디오 시각화의 품질 설정: \"0\"은 작게, \"1\"은 보통, \"2\"는 크게, \"3"
-#~ "\"는 아주 크게."
+#~ "오디오 시각화의 품질 설정: \"0\"은 작게, \"1\"은 보통, \"2\"는 크게, "
+#~ "\"3\"는 아주 크게."
 
 #~ msgid ""
 #~ "Type of audio output to use: \"0\" for stereo, \"1\" for 4-channel "
@@ -3081,9 +3106,6 @@
 #~ msgid "seconds"
 #~ msgstr "초"
 
-#~ msgid "Could not load the \"Skip to\" dialog interface."
-#~ msgstr "\"건너뛰기\" 대화상자 인터페이스를 읽어들일 수 없습니다."
-
 #~ msgid "Could not get name and thumbnail for %s: %s"
 #~ msgstr "%s 파일의 이름과 섬네일을 읽을 수 없습니다: %s"
 
diff -Nru totem-3.4.3/po/lt.po totem-3.6.2/po/lt.po
--- totem-3.4.3/po/lt.po	2012-04-02 14:15:40.000000000 +0000
+++ totem-3.6.2/po/lt.po	2012-10-25 13:15:32.000000000 +0000
@@ -13,26 +13,225 @@
 msgstr ""
 "Project-Id-Version: lt\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=totem&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-03-23 06:16+0000\n"
-"PO-Revision-Date: 2012-03-28 00:13+0300\n"
+"POT-Creation-Date: 2012-09-13 16:58+0000\n"
+"PO-Revision-Date: 2012-09-13 22:12+0300\n"
 "Last-Translator: Aurimas Černius \n"
 "Language-Team: Lietuvių \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: KBabel 1.11.4\n"
 
+#: ../browser-plugin/totem-plugin-viewer.c:352
+#: ../src/totem-object.c:1180
+#: ../src/totem-object.c:1650
+#: ../src/totem-statusbar.c:115
+msgid "Stopped"
+msgstr "Sustabdytas"
+
+#: ../browser-plugin/totem-plugin-viewer.c:364
+#: ../src/totem-object.c:1173
+msgid "Paused"
+msgstr "Pristabdyta"
+
+#: ../browser-plugin/totem-plugin-viewer.c:368
+#: ../src/totem-object.c:1166
+msgid "Playing"
+msgstr "Grojama"
+
+#: ../browser-plugin/totem-plugin-viewer.c:386
+#: ../src/plugins/screensaver/totem-screensaver.c:97
+msgid "Playing a movie"
+msgstr "Rodomas filmas"
+
+#: ../browser-plugin/totem-plugin-viewer.c:443
+msgid "No URI to play"
+msgstr "Nėra leistino URI"
+
+#  Title
+#: ../browser-plugin/totem-plugin-viewer.c:676
+#: ../browser-plugin/totem-plugin-viewer.c:1700
+msgid "Totem Movie Player"
+msgstr "Totem filmų leistuvas"
+
+#. translators: this is:
+#. * Open With ApplicationName
+#. * as in nautilus' right-click menu
+#: ../browser-plugin/totem-plugin-viewer.c:1120
+#, c-format
+msgid "_Open with \"%s\""
+msgstr "_Atverti su „%s“"
+
+#: ../browser-plugin/totem-plugin-viewer.c:1341
+#: ../src/totem-object.c:2475
+msgid "An error occurred"
+msgstr "Įvyko klaida"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2033
+msgid "No playlist or playlist empty"
+msgstr "Nėra grojaraščio arba grojaraštis tuščias"
+
+#  Title
+#: ../browser-plugin/totem-plugin-viewer.c:2128
+msgid "Movie browser plugin"
+msgstr "Filmų naršyklės įskiepis"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144
+#: ../src/totem.c:240
+msgid "Could not initialize the thread-safe libraries."
+msgstr "Nepavyko inicializuoti saugių gijų bibliotekų."
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144
+msgid "Verify your system installation. The Totem plugin will now exit."
+msgstr "Patikrinkite savo sistemos įdiegimą. Totem įskiepis dabar užsidarys."
+
 #: ../data/fullscreen.ui.h:1
 msgid "Leave Fullscreen"
 msgstr "Išjungti viso ekrano veikseną"
 
 #: ../data/fullscreen.ui.h:2
-#: ../data/totem.ui.h:144
+#: ../data/totem.ui.h:81
 msgid "Time:"
 msgstr "Laikas:"
 
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
+msgid "Allow the screensaver to activate when playing audio"
+msgstr "Leisti ekrano užsklandą, kai groja audio įrašas"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
+msgid "Allow the screensaver to activate when playing audio. Disable if you have monitor-powered speakers."
+msgstr "Leisti ekrano užsklandą, kai groja audio įrašas. Naudinga garsiakalbiams, integruotiems į monitorių."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
+msgid "Show visual effects when no video is displayed"
+msgstr "Kai nerodomas vaizdas rodyti vaizdo efektus"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
+msgid "Show visual effects when playing an audio only file."
+msgstr "Rodyti vaizdo efektus, kai leidžiamas tik garso failas."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
+msgid "Name of the visual effects plugin"
+msgstr "Vaizdo efektų įskiepio pavadinimas"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
+msgid "The brightness of the video"
+msgstr "Vaizdo šviesumas"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
+msgid "The contrast of the video"
+msgstr "Vaizdo kontrastas"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
+msgid "The hue of the video"
+msgstr "Vaizdo atspalvis"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
+msgid "The saturation of the video"
+msgstr "Vaizdo spalvų sotumas"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
+msgid "Resize the canvas automatically on file load"
+msgstr "Įkeliant failą automatiškai pakeisti ekrano dydį"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
+msgid "Repeat mode"
+msgstr "Kartojimo veiksena"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
+msgid "Shuffle mode"
+msgstr "Maišymo veiksena"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
+msgid "Whether to disable deinterlacing for interlaced movies"
+msgstr "Ar išjungti išlyginimą pakaitiniams (interlaced) filmams"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
+msgid "Whether to enable debug for the playback engine"
+msgstr "Ar įjungti rodymo posistemės derinimą"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
+msgid "Type of audio output to use"
+msgstr "Garso išvesties tipas"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
+msgid "Visualization quality setting"
+msgstr "Vizualizacijos kokybė"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
+msgid "Quality setting for the audio visualization."
+msgstr "Kokybės nustatymas audio vizualizacijai."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
+msgid "Network buffering threshold"
+msgstr "Tinklo buferizavimo riba"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
+msgid "Amount of data to buffer for network streams before starting to display the stream (in seconds)."
+msgstr "Buferizuojamų tinklo srauto duomenų kiekis prieš pradedant rodyti srautą (sekundėmis)."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
+msgid "Subtitle font"
+msgstr "Subtitrų šriftas"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
+msgid "Pango font description for subtitle rendering."
+msgstr "Pango šrifto aprašymas subtitrų vaizdavimui."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
+msgid "Subtitle encoding"
+msgstr "Subtitrų koduotė"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
+msgid "Encoding character set for subtitle."
+msgstr "Subtitrų simbolių rinkinio koduotė."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
+msgid "Default location for the \"Open...\" dialogs"
+msgstr "Numatytoji „Atverti...“ dialogų vieta"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
+msgid "Default location for the \"Open...\" dialogs. Default is the current directory."
+msgstr "Numatytoji dialogų „Atverti...“ vieta. Standartinė – esamas aplankas."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
+msgid "Default location for the \"Take Screenshot\" dialogs"
+msgstr "Numatytoji dialogų „Padaryti nuotrauką“ vieta"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
+msgid "Default location for the \"Take Screenshot\" dialogs. Default is the Pictures directory."
+msgstr "Numatytoji dialogų „Padaryti nuotrauką“ vieta. Standartinė – aplankas „Paveikslėliai“."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
+msgid "Whether to disable the plugins in the user's home directory"
+msgstr "Ar išjungti įskiepius, esančius naudotojo namų aplanke"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
+msgid "Whether to disable the keyboard shortcuts"
+msgstr "Ar išjungti klaviatūros greituosius klavišus"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
+msgid "Whether to autoload text subtitle files when a movie is loaded"
+msgstr "Ar automatiškai įkelti titrus įkėlus filmą"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
+msgid "Whether to autoload external chapter files when a movie is loaded"
+msgstr "Ar automatiškai įkelti išorinius takelius įkėlus filmą"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
+msgid "Whether to remember the position of played audio/video files when pausing or closing them"
+msgstr "Ar prisiminti grotų audio/video failų poziciją juos sustabdant ar uždarant"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
+msgid "Active plugins list"
+msgstr "Aktyvių įskiepių sąrašas"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+msgid "A list of the names of the plugins which are currently active (loaded and running)."
+msgstr "Aktyvių (įkeltų ir veikiančių) įskiepių pavadinimų sąrašas."
+
 #: ../data/playlist.ui.h:1
 msgid "_Remove"
 msgstr "_Pašalinti"
@@ -52,12 +251,12 @@
 msgstr "Perkelti vietą į iškarpinę"
 
 #: ../data/playlist.ui.h:5
-#: ../data/totem.ui.h:78
+#: ../data/totem.ui.h:71
 msgid "_Select Text Subtitles..."
 msgstr "Pasirinkite _titrus..."
 
 #: ../data/playlist.ui.h:6
-#: ../data/totem.ui.h:79
+#: ../data/totem.ui.h:72
 msgid "Select a file to use for text subtitles"
 msgstr "Pasirinkite titrų failą"
 
@@ -81,66 +280,212 @@
 msgid "Move Down"
 msgstr "Mažinti garsumą"
 
-#: ../data/properties.ui.h:1
-#: ../data/totem.ui.h:122
-msgid "General"
-msgstr "Bendri"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:2
+msgid "Normal"
+msgstr "Vidutinis"
 
-#: ../data/properties.ui.h:2
-msgid "Title:"
-msgstr "Pavadinimas:"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:4
+msgid "Large"
+msgstr "Didelis"
 
-#: ../data/properties.ui.h:3
-msgid "Artist:"
-msgstr "Atlikėjas:"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:6
+msgid "Extra Large"
+msgstr "Ypač didelis"
 
-#: ../data/properties.ui.h:4
-msgid "Duration:"
-msgstr "Trukmė:"
+#: ../data/preferences.ui.h:7
+#: ../src/backend/bacon-video-widget.c:5498
+#: ../src/totem-properties-view.c:231
+msgid "Stereo"
+msgstr "Stereo"
 
-#: ../data/properties.ui.h:5
-msgid "Year:"
-msgstr "Metai:"
+#: ../data/preferences.ui.h:8
+msgid "4-channel"
+msgstr "4 kanalų"
 
-#: ../data/properties.ui.h:6
-msgid "Album:"
-msgstr "Albumas:"
+#: ../data/preferences.ui.h:9
+msgid "4.1-channel"
+msgstr "4.1 kanalų"
 
-#: ../data/properties.ui.h:7
-msgid "Comment:"
-msgstr "Komentaras:"
+#: ../data/preferences.ui.h:10
+msgid "5.0-channel"
+msgstr "5.0 kanalų"
 
-#: ../data/properties.ui.h:8
-msgid "Container:"
-msgstr "Konteineris:"
+#: ../data/preferences.ui.h:11
+msgid "5.1-channel"
+msgstr "5.1 kanalų"
 
-#: ../data/properties.ui.h:9
-#: ../data/totem.ui.h:128
-#: ../src/totem-properties-view.c:270
-msgid "Video"
-msgstr "Vaizdas"
+#: ../data/preferences.ui.h:12
+msgid "AC3 Passthrough"
+msgstr "AC3 Passthrough"
 
-#: ../data/properties.ui.h:10
-msgid "Dimensions:"
-msgstr "Matmenys:"
+#: ../data/preferences.ui.h:13
+msgid "Totem Preferences"
+msgstr "Totem nustatymai"
 
-#: ../data/properties.ui.h:11
-msgid "Codec:"
-msgstr "Kodavimas:"
+#: ../data/preferences.ui.h:14
+msgid "Playback"
+msgstr "Grojimas"
 
-#: ../data/properties.ui.h:12
-msgid "Framerate:"
-msgstr "Kadrų dažnis:"
+#: ../data/preferences.ui.h:15
+msgid "Start playing files from last position"
+msgstr "Pradėti groti failus nuo paskutinės vietos"
 
-#: ../data/properties.ui.h:13
-msgid "Bitrate:"
-msgstr "Bitų dažnis:"
+#: ../data/preferences.ui.h:16
+msgid "Text Subtitles"
+msgstr "Teksto subtitrai"
 
-#: ../data/properties.ui.h:14
-#: ../data/totem.ui.h:142
-#: ../src/totem-properties-view.c:268
-msgid "Audio"
-msgstr "Garsas"
+#: ../data/preferences.ui.h:17
+msgid "_Load subtitle files when movie is loaded"
+msgstr "Įkelti _titrus, kai įkeliamas filmas"
+
+#: ../data/preferences.ui.h:18
+msgid "_Font:"
+msgstr "Šri_ftas:"
+
+#: ../data/preferences.ui.h:19
+msgid "_Encoding:"
+msgstr "_Koduotė:"
+
+#: ../data/preferences.ui.h:20
+msgid "External Chapters"
+msgstr "Išoriniai takeliai"
+
+#: ../data/preferences.ui.h:21
+msgid "Load _chapter files when movie is loaded"
+msgstr "Įkelti _takelių failus, kai įkeliamas filmas"
+
+#: ../data/preferences.ui.h:22
+#: ../data/properties.ui.h:1
+msgid "General"
+msgstr "Bendri"
+
+#. Tab label in the Preferences dialogue
+#: ../data/preferences.ui.h:24
+msgid "Display"
+msgstr "Ekranas"
+
+#: ../data/preferences.ui.h:25
+msgid "_Resize the window when a new video is loaded"
+msgstr "Automatiškai _pakeisti lango dydį, kai įkeliamas naujas filmas"
+
+#: ../data/preferences.ui.h:26
+msgid "Disable _deinterlacing of interlaced videos"
+msgstr "Neleisti _išlyginti įrašų su pakaitiniu (interlaced) vaizdu"
+
+#: ../data/preferences.ui.h:27
+msgid "Disable screensaver when playing "
+msgstr "Išjungti ekrano užsklandą grojant "
+
+#: ../data/preferences.ui.h:28
+#: ../data/properties.ui.h:9
+#: ../src/totem-properties-view.c:273
+msgid "Video"
+msgstr "Vaizdas"
+
+#: ../data/preferences.ui.h:29
+msgid "Video or Audio"
+msgstr "Vaizdas arba garsas"
+
+#: ../data/preferences.ui.h:30
+msgid "Visual Effects"
+msgstr "Vaizdo efektai"
+
+#: ../data/preferences.ui.h:31
+msgid "Show _visual effects when an audio file is played"
+msgstr "Kai leidžiamas garso failas, rodyti _vaizdo efektus"
+
+#: ../data/preferences.ui.h:32
+msgid "_Type of visualization:"
+msgstr "Vaizdo efektų _tipas:"
+
+#: ../data/preferences.ui.h:33
+msgid "Visualization _size:"
+msgstr "Vaizdo efektų dydi_s:"
+
+#: ../data/preferences.ui.h:34
+msgid "Color Balance"
+msgstr "Spalvų balansas"
+
+#: ../data/preferences.ui.h:35
+msgid "_Brightness:"
+msgstr "_Skaistis:"
+
+#: ../data/preferences.ui.h:36
+msgid "Co_ntrast:"
+msgstr "Ko_ntrastas:"
+
+#: ../data/preferences.ui.h:37
+msgid "Sat_uration:"
+msgstr "Spalvų gr_ynis:"
+
+#: ../data/preferences.ui.h:38
+msgid "_Hue:"
+msgstr "_Atspalvis:"
+
+#: ../data/preferences.ui.h:39
+msgid "Reset to _Defaults"
+msgstr "Atkurti _numatytuosius"
+
+#: ../data/preferences.ui.h:40
+msgid "Audio Output"
+msgstr "Garso išvestis"
+
+#: ../data/preferences.ui.h:41
+msgid "_Audio output type:"
+msgstr "_Audio išvesties tipas:"
+
+#: ../data/preferences.ui.h:42
+#: ../data/properties.ui.h:14
+#: ../src/totem-properties-view.c:271
+msgid "Audio"
+msgstr "Garsas"
+
+#: ../data/properties.ui.h:2
+msgid "Title:"
+msgstr "Pavadinimas:"
+
+#: ../data/properties.ui.h:3
+msgid "Artist:"
+msgstr "Atlikėjas:"
+
+#: ../data/properties.ui.h:4
+msgid "Duration:"
+msgstr "Trukmė:"
+
+#: ../data/properties.ui.h:5
+msgid "Year:"
+msgstr "Metai:"
+
+#: ../data/properties.ui.h:6
+msgid "Album:"
+msgstr "Albumas:"
+
+#: ../data/properties.ui.h:7
+msgid "Comment:"
+msgstr "Komentaras:"
+
+#: ../data/properties.ui.h:8
+msgid "Container:"
+msgstr "Konteineris:"
+
+#: ../data/properties.ui.h:10
+msgid "Dimensions:"
+msgstr "Matmenys:"
+
+#: ../data/properties.ui.h:11
+msgid "Codec:"
+msgstr "Kodavimas:"
+
+#: ../data/properties.ui.h:12
+msgid "Framerate:"
+msgstr "Kadrų dažnis:"
+
+#: ../data/properties.ui.h:13
+msgid "Bitrate:"
+msgstr "Bitų dažnis:"
 
 #: ../data/properties.ui.h:15
 msgid "Sample rate:"
@@ -150,717 +495,451 @@
 msgid "Channels:"
 msgstr "Kanalai:"
 
-#: ../data/video-list.ui.h:1
-#: ../src/totem-dnd-menu.c:97
-msgid "_Add to Playlist"
-msgstr "_Pridėti į grojaraštį"
-
-#: ../data/video-list.ui.h:2
-msgid "Add the video to the playlist"
-msgstr "Pridėti video į grojaraštį"
-
-#  Title
 #. Title
 #: ../data/totem.desktop.in.in.in.h:1
-#: ../data/totem.ui.h:143
-#: ../src/totem-object.c:1667
-msgid "Movie Player"
-msgstr "Filmų leistuvas"
+#: ../data/totem.ui.h:80
+#: ../src/totem.c:239
+#: ../src/totem.c:248
+#: ../src/totem-menu.c:790
+#: ../src/totem-object.c:1658
+msgid "Videos"
+msgstr "Vaizdai"
 
 #: ../data/totem.desktop.in.in.in.h:2
-msgid "Play movies and songs"
-msgstr "Žiūrėkite filmus ir klausykitės muzikos"
+#| msgid "Playing a movie"
+msgid "Play movies"
+msgstr "Groti filmus"
+
+#: ../data/totem.desktop.in.in.in.h:3
+msgid "Video;Movie;Film;Clip;Series;Player;DVD;TV;Disc;"
+msgstr "Vaizdas;Filmas;Klipas;Serialas;Grotuvas;DVD;TV;Televizija;Diskas;"
 
 #: ../data/totem.ui.h:1
-msgid "_Movie"
-msgstr "_Filmas"
+#| msgid "_Open..."
+msgid "_Open"
+msgstr "_Atverti"
 
 #: ../data/totem.ui.h:2
-msgid "_Open..."
-msgstr "_Atverti..."
+#| msgid "Open _Location..."
+msgid "Open _Location"
+msgstr "Atverti _vietą"
 
 #: ../data/totem.ui.h:3
-msgid "Open a file"
-msgstr "Atverti failą"
+msgid "_Fullscreen"
+msgstr "_Visame ekrane"
 
 #: ../data/totem.ui.h:4
-msgid "Open _Location..."
-msgstr "Atverti _vietą..."
+msgid "Prefere_nces"
+msgstr "_Nustatymai"
 
 #: ../data/totem.ui.h:5
-msgid "Open a non-local file"
-msgstr "Atverti nevietinį failą"
+#| msgid "Shuff_le Mode"
+msgid "Shuff_le"
+msgstr "_Maišyti"
 
 #: ../data/totem.ui.h:6
+#| msgid "_Repeat Mode"
+msgid "_Repeat"
+msgstr "Ka_rtoti"
+
+#: ../data/totem.ui.h:7
+msgid "_Quit"
+msgstr "Iš_eiti"
+
+#: ../data/totem.ui.h:8
+msgid "_Movie"
+msgstr "_Filmas"
+
+#: ../data/totem.ui.h:9
 msgid "_Eject"
 msgstr "_Išmesti"
 
-#: ../data/totem.ui.h:7
+#: ../data/totem.ui.h:10
 msgid "Eject the current disc"
 msgstr "Išstumti diską"
 
-#: ../data/totem.ui.h:8
+#: ../data/totem.ui.h:11
 msgid "_Properties"
 msgstr "_Savybės"
 
-#: ../data/totem.ui.h:9
+#: ../data/totem.ui.h:12
 msgid "View the properties of the current stream"
 msgstr "Rodyti srauto savybes"
 
-#: ../data/totem.ui.h:10
+#: ../data/totem.ui.h:13
 msgid "Play / P_ause"
 msgstr "Groti / P_auzė"
 
-#: ../data/totem.ui.h:11
+#: ../data/totem.ui.h:14
 msgid "Play or pause the movie"
 msgstr "Leisti arba pristabdyti filmą"
 
-#: ../data/totem.ui.h:12
-msgid "_Quit"
-msgstr "Iš_eiti"
-
-#: ../data/totem.ui.h:13
-msgid "Quit the program"
-msgstr "Išeiti iš programos"
-
-#: ../data/totem.ui.h:14
+#: ../data/totem.ui.h:15
 msgid "_Edit"
 msgstr "_Keisti"
 
-#: ../data/totem.ui.h:15
+#: ../data/totem.ui.h:16
 msgid "_Clear Playlist"
 msgstr "Iš_valyti grojaraštį"
 
-#: ../data/totem.ui.h:16
+#: ../data/totem.ui.h:17
 msgid "Clear the playlist"
 msgstr "Išvalyti grojaraštį"
 
-#: ../data/totem.ui.h:17
-msgid "Prefere_nces"
-msgstr "_Nustatymai"
-
 #: ../data/totem.ui.h:18
-msgid "Configure the application"
-msgstr "Konfigūruoti programą"
-
-#: ../data/totem.ui.h:19
 msgid "Plugins..."
 msgstr "Įskiepiai..."
 
-#: ../data/totem.ui.h:20
+#: ../data/totem.ui.h:19
 msgid "Configure plugins to extend the application"
 msgstr "Konfigūruoti įskiepius programos išplėtimui"
 
-#: ../data/totem.ui.h:21
+#: ../data/totem.ui.h:20
 msgid "_View"
 msgstr "R_odymas"
 
-#: ../data/totem.ui.h:22
-msgid "_Fullscreen"
-msgstr "_Visame ekrane"
-
-#: ../data/totem.ui.h:23
-msgid "Switch to fullscreen"
-msgstr "Rodyti visame ekrane"
-
-#: ../data/totem.ui.h:24
+#: ../data/totem.ui.h:21
 msgid "Fit Window to Movie"
 msgstr "Pritaikyti lango dydį prie filmo"
 
-#: ../data/totem.ui.h:25
+#: ../data/totem.ui.h:22
 msgid "_Resize 1:2"
 msgstr "_Keisti mastelį į 1:2"
 
-#: ../data/totem.ui.h:26
+#: ../data/totem.ui.h:23
 msgid "Resize to half the original video size"
 msgstr "Perpus sumažinti vaizdą"
 
-#: ../data/totem.ui.h:27
+#: ../data/totem.ui.h:24
 msgid "Resize _1:1"
 msgstr "Keisti mastelį į _1:1"
 
-#: ../data/totem.ui.h:28
+#: ../data/totem.ui.h:25
 msgid "Resize to the original video size"
 msgstr "Nustatyti originalų vaizdo dydį"
 
-#: ../data/totem.ui.h:29
+#: ../data/totem.ui.h:26
 msgid "Resize _2:1"
 msgstr "Keisti mastelį į _2:1"
 
-#: ../data/totem.ui.h:30
+#: ../data/totem.ui.h:27
 msgid "Resize to double the original video size"
 msgstr "Dvigubai padidinti vaizdą"
 
-#: ../data/totem.ui.h:31
+#: ../data/totem.ui.h:28
 msgid "_Aspect Ratio"
 msgstr "V_aizdo proporcija"
 
-#: ../data/totem.ui.h:32
+#: ../data/totem.ui.h:29
 msgid "Switch An_gles"
 msgstr "Pakeisti kamp_us"
 
-#: ../data/totem.ui.h:33
+#: ../data/totem.ui.h:30
 msgid "Switch camera angles"
 msgstr "Pakeisti kameros kampą"
 
-#: ../data/totem.ui.h:34
+#: ../data/totem.ui.h:31
 msgid "_Go"
 msgstr "_Eiti"
 
-#: ../data/totem.ui.h:35
+#: ../data/totem.ui.h:32
 msgid "_DVD Menu"
 msgstr "_DVD meniu"
 
-#: ../data/totem.ui.h:36
+#: ../data/totem.ui.h:33
 msgid "Go to the DVD menu"
 msgstr "Eiti į DVD meniu"
 
-#: ../data/totem.ui.h:37
+#: ../data/totem.ui.h:34
 msgid "_Title Menu"
 msgstr "_Pavadinimo meniu"
 
-#: ../data/totem.ui.h:38
+#: ../data/totem.ui.h:35
 msgid "Go to the title menu"
 msgstr "Eiti į pavadinimo meniu"
 
-#: ../data/totem.ui.h:39
+#: ../data/totem.ui.h:36
 msgid "A_udio Menu"
 msgstr "Garso meni_u"
 
-#: ../data/totem.ui.h:40
+#: ../data/totem.ui.h:37
 msgid "Go to the audio menu"
 msgstr "Eiti į garso meniu"
 
-#: ../data/totem.ui.h:41
+#: ../data/totem.ui.h:38
 msgid "_Angle Menu"
 msgstr "K_ampo meniu"
 
-#: ../data/totem.ui.h:42
+#: ../data/totem.ui.h:39
 msgid "Go to the angle menu"
 msgstr "Eiti į kampo meniu"
 
-#: ../data/totem.ui.h:43
+#: ../data/totem.ui.h:40
 msgid "_Chapter Menu"
 msgstr "_Takelio meniu"
 
-#: ../data/totem.ui.h:44
+#: ../data/totem.ui.h:41
 msgid "Go to the chapter menu"
 msgstr "Eiti į takelio menu"
 
-#: ../data/totem.ui.h:45
+#: ../data/totem.ui.h:42
 msgid "_Next Chapter/Movie"
 msgstr "_Kitas takelis/filmas"
 
-#: ../data/totem.ui.h:46
+#: ../data/totem.ui.h:43
 msgid "Next chapter or movie"
 msgstr "Kitas takelis arba filmas"
 
-#: ../data/totem.ui.h:47
+#: ../data/totem.ui.h:44
 msgid "_Previous Chapter/Movie"
 msgstr "_Ankstesnis takelis/filmas"
 
-#: ../data/totem.ui.h:48
+#: ../data/totem.ui.h:45
 msgid "Previous chapter or movie"
 msgstr "Ankstesnis takelis arba filmas"
 
-#: ../data/totem.ui.h:49
+#: ../data/totem.ui.h:46
 msgid "_Sound"
 msgstr "Gar_sas"
 
-#: ../data/totem.ui.h:50
+#: ../data/totem.ui.h:47
 msgid "Volume _Up"
 msgstr "_Didinti garsumą"
 
-#: ../data/totem.ui.h:51
+#: ../data/totem.ui.h:48
 msgid "Increase volume"
 msgstr "Padidinti garsumą"
 
-#: ../data/totem.ui.h:52
+#: ../data/totem.ui.h:49
 msgid "Volume _Down"
 msgstr "_Mažinti garsumą"
 
-#: ../data/totem.ui.h:53
+#: ../data/totem.ui.h:50
 msgid "Decrease volume"
 msgstr "Sumažinti garsumą"
 
-#: ../data/totem.ui.h:54
+#: ../data/totem.ui.h:51
 msgid "_Help"
 msgstr "_Žinynas"
 
-#: ../data/totem.ui.h:55
+#: ../data/totem.ui.h:52
 msgid "_Contents"
 msgstr "_Turinys"
 
-#: ../data/totem.ui.h:56
+#: ../data/totem.ui.h:53
 msgid "Help contents"
 msgstr "Žinynas turinys"
 
-#: ../data/totem.ui.h:57
+#: ../data/totem.ui.h:54
 msgid "_About"
 msgstr "_Apie"
 
-#: ../data/totem.ui.h:58
+#: ../data/totem.ui.h:55
 msgid "About this application"
 msgstr "Apie šią programą"
 
-#: ../data/totem.ui.h:59
-msgid "_Repeat Mode"
-msgstr "Ka_rtojimo veiksena"
-
-#: ../data/totem.ui.h:60
-msgid "Set the repeat mode"
-msgstr "Nustatyti kartojimo veikseną"
-
-#: ../data/totem.ui.h:61
-msgid "Shuff_le Mode"
-msgstr "_Maišymo veiksena"
-
-#: ../data/totem.ui.h:62
-msgid "Set the shuffle mode"
-msgstr "Nustatyti maišymo veikseną"
-
-#: ../data/totem.ui.h:63
+#: ../data/totem.ui.h:56
 msgid "Show _Controls"
 msgstr "Rodyti _valdiklius"
 
-#: ../data/totem.ui.h:64
+#: ../data/totem.ui.h:57
 msgid "Show controls"
 msgstr "Rodyti valdymo elementus"
 
-#: ../data/totem.ui.h:65
+#: ../data/totem.ui.h:58
 msgid "S_idebar"
 msgstr "Šoninė _juosta"
 
-#: ../data/totem.ui.h:66
+#: ../data/totem.ui.h:59
 msgid "Show or hide the sidebar"
 msgstr "Rodyti arba slėpti šoninę juostą"
 
-#: ../data/totem.ui.h:67
+#: ../data/totem.ui.h:60
 msgctxt "Aspect ratio"
 msgid "Auto"
 msgstr "Automatinis"
 
-#: ../data/totem.ui.h:68
+#: ../data/totem.ui.h:61
 msgid "Sets automatic aspect ratio"
 msgstr "Automatiškai nustato vaizdo proporciją"
 
-#: ../data/totem.ui.h:69
+#: ../data/totem.ui.h:62
 msgid "Square"
 msgstr "Kvadratas"
 
-#: ../data/totem.ui.h:70
+#: ../data/totem.ui.h:63
 msgid "Sets square aspect ratio"
 msgstr "Nustato kvadratinę vaizdo proporciją"
 
-#: ../data/totem.ui.h:71
+#: ../data/totem.ui.h:64
 msgid "4:3 (TV)"
 msgstr "4:3 (TV)"
 
-#: ../data/totem.ui.h:72
+#: ../data/totem.ui.h:65
 msgid "Sets 4:3 (TV) aspect ratio"
 msgstr "Nustato 4:3 (TV) vaizdo proporciją"
 
-#: ../data/totem.ui.h:73
+#: ../data/totem.ui.h:66
 msgid "16:9 (Widescreen)"
 msgstr "16:9 (Plačiaekranis)"
 
-#: ../data/totem.ui.h:74
+#: ../data/totem.ui.h:67
 msgid "Sets 16:9 (widescreen) aspect ratio"
 msgstr "Nustato 16:9 (plačiaekranę) vaizdo proporciją"
 
-#: ../data/totem.ui.h:75
+#: ../data/totem.ui.h:68
 msgid "2.11:1 (DVB)"
 msgstr "2.11:1 (DVB)"
 
-#: ../data/totem.ui.h:76
+#: ../data/totem.ui.h:69
 msgid "Sets 2.11:1 (DVB) aspect ratio"
 msgstr "Nustato 2.11:1 (DVB) vaizdo proporciją"
 
-#: ../data/totem.ui.h:77
+#: ../data/totem.ui.h:70
 msgid "S_ubtitles"
 msgstr "S_ubtitrai"
 
-#: ../data/totem.ui.h:80
+#: ../data/totem.ui.h:73
 msgid "_Languages"
 msgstr "Ka_lbos"
 
-#: ../data/totem.ui.h:81
+#: ../data/totem.ui.h:74
 msgid "Zoom In"
 msgstr "Pritraukti"
 
-#: ../data/totem.ui.h:82
+#: ../data/totem.ui.h:75
 msgid "Zoom in"
 msgstr "Pritraukti"
 
-#: ../data/totem.ui.h:83
+#: ../data/totem.ui.h:76
 msgid "Skip _Forward"
 msgstr "Persukti į _priekį"
 
-#: ../data/totem.ui.h:84
+#: ../data/totem.ui.h:77
 msgid "Skip forward"
 msgstr "Persukti į priekį"
 
-#: ../data/totem.ui.h:85
+#: ../data/totem.ui.h:78
 msgid "Skip _Backwards"
 msgstr "Persukti _atgal"
 
-#: ../data/totem.ui.h:86
+#: ../data/totem.ui.h:79
 msgid "Skip backwards"
 msgstr "Persukti atgal"
 
-#: ../data/totem.ui.h:87
-msgid "14.4 Kbps Modem"
-msgstr "14.4 Kbps modemas"
-
-#: ../data/totem.ui.h:88
-msgid "19.2 Kbps Modem"
-msgstr "19.2 Kbps modemas"
-
-#: ../data/totem.ui.h:89
-msgid "28.8 Kbps Modem"
-msgstr "28.8 Kbps modemas"
-
-#: ../data/totem.ui.h:90
-msgid "33.6 Kbps Modem"
-msgstr "33.6 Kbps modemas"
-
-#: ../data/totem.ui.h:91
-msgid "34.4 Kbps Modem"
-msgstr "34.4 Kbps modemas"
-
-#: ../data/totem.ui.h:92
-msgid "56 Kbps Modem/ISDN"
-msgstr "56 Kbps modemas/ISDN"
-
-#: ../data/totem.ui.h:93
-msgid "112 Kbps Dual ISDN/DSL"
-msgstr "112 Kbps ISDN/DSL"
-
-#: ../data/totem.ui.h:94
-msgid "256 Kbps DSL/Cable"
-msgstr "256 Kbps DSL/kabelinis internetas"
-
-#: ../data/totem.ui.h:95
-msgid "384 Kbps DSL/Cable"
-msgstr "384 Kbps DSL/kabelinis internetas"
-
-#: ../data/totem.ui.h:96
-msgid "512 Kbps DSL/Cable"
-msgstr "512 Kbps DSL/kabelinis internetas"
-
-#: ../data/totem.ui.h:97
-msgid "1.5 Mbps T1/Intranet/LAN"
-msgstr "1.5 Mbps T1/Intranet/LAN"
-
-#: ../data/totem.ui.h:98
-msgid "Intranet/LAN"
-msgstr "Intranet/LAN"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:100
-msgid "Normal"
-msgstr "Vidutinis"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:102
-msgid "Large"
-msgstr "Didelis"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:104
-msgid "Extra Large"
-msgstr "Ypač didelis"
-
-#: ../data/totem.ui.h:105
-#: ../src/totem-properties-view.c:228
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5593
-msgid "Stereo"
-msgstr "Stereo"
-
-#: ../data/totem.ui.h:106
-msgid "4-channel"
-msgstr "4 kanalų"
-
-#: ../data/totem.ui.h:107
-msgid "4.1-channel"
-msgstr "4.1 kanalų"
-
-#: ../data/totem.ui.h:108
-msgid "5.0-channel"
-msgstr "5.0 kanalų"
-
-#: ../data/totem.ui.h:109
-msgid "5.1-channel"
-msgstr "5.1 kanalų"
-
-#: ../data/totem.ui.h:110
-msgid "AC3 Passthrough"
-msgstr "AC3 Passthrough"
-
-#: ../data/totem.ui.h:111
-msgid "Totem Preferences"
-msgstr "Totem nustatymai"
-
-#: ../data/totem.ui.h:112
-msgid "Playback"
-msgstr "Grojimas"
-
-#: ../data/totem.ui.h:113
-msgid "Start playing files from last position"
-msgstr "Pradėti groti failus nuo paskutinės vietos"
-
-#: ../data/totem.ui.h:114
-msgid "Networking"
-msgstr "Tinklas"
-
-#: ../data/totem.ui.h:115
-msgid "Connection _speed:"
-msgstr "_Ryšio sparta:"
-
-#: ../data/totem.ui.h:116
-msgid "Text Subtitles"
-msgstr "Teksto subtitrai"
-
-#: ../data/totem.ui.h:117
-msgid "_Load subtitle files when movie is loaded"
-msgstr "Įkelti _titrus, kai įkeliamas filmas"
-
-#: ../data/totem.ui.h:118
-msgid "_Font:"
-msgstr "Šri_ftas:"
-
-#: ../data/totem.ui.h:119
-msgid "_Encoding:"
-msgstr "_Koduotė:"
-
-#: ../data/totem.ui.h:120
-msgid "External Chapters"
-msgstr "Išoriniai takeliai"
-
-#: ../data/totem.ui.h:121
-msgid "Load _chapter files when movie is loaded"
-msgstr "Įkelti _takelių failus, kai įkeliamas filmas"
-
-#. Tab label in the Preferences dialogue
-#: ../data/totem.ui.h:124
-msgid "Display"
-msgstr "Ekranas"
-
-#: ../data/totem.ui.h:125
-msgid "_Resize the window when a new video is loaded"
-msgstr "Automatiškai _pakeisti lango dydį, kai įkeliamas naujas filmas"
-
-#: ../data/totem.ui.h:126
-msgid "Disable _deinterlacing of interlaced videos"
-msgstr "Neleisti _išlyginti įrašų su pakaitiniu (interlaced) vaizdu"
-
-#: ../data/totem.ui.h:127
-msgid "Disable screensaver when playing "
-msgstr "Išjungti ekrano užsklandą grojant "
-
-#: ../data/totem.ui.h:129
-msgid "Video or Audio"
-msgstr "Vaizdas arba garsas"
-
-#: ../data/totem.ui.h:130
-msgid "Visual Effects"
-msgstr "Vaizdo efektai"
-
-#: ../data/totem.ui.h:131
-msgid "Show _visual effects when an audio file is played"
-msgstr "Kai leidžiamas garso failas, rodyti _vaizdo efektus"
-
-#: ../data/totem.ui.h:132
-msgid "_Type of visualization:"
-msgstr "Vaizdo efektų _tipas:"
-
-#: ../data/totem.ui.h:133
-msgid "Visualization _size:"
-msgstr "Vaizdo efektų dydi_s:"
-
-#: ../data/totem.ui.h:134
-msgid "Color Balance"
-msgstr "Spalvų balansas"
-
-#: ../data/totem.ui.h:135
-msgid "_Brightness:"
-msgstr "_Skaistis:"
-
-#: ../data/totem.ui.h:136
-msgid "Co_ntrast:"
-msgstr "Ko_ntrastas:"
-
-#: ../data/totem.ui.h:137
-msgid "Sat_uration:"
-msgstr "Spalvų gr_ynis:"
-
-#: ../data/totem.ui.h:138
-msgid "_Hue:"
-msgstr "_Atspalvis:"
-
-#: ../data/totem.ui.h:139
-msgid "Reset to _Defaults"
-msgstr "Atkurti _numatytuosius"
-
-#: ../data/totem.ui.h:140
-msgid "Audio Output"
-msgstr "Garso išvestis"
-
-#: ../data/totem.ui.h:141
-msgid "_Audio output type:"
-msgstr "_Audio išvesties tipas:"
-
-#: ../data/totem.ui.h:145
+#: ../data/totem.ui.h:82
 msgid "Time seek bar"
 msgstr "Laiko slankiklis"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
-msgid "Allow the screensaver to activate when playing audio"
-msgstr "Leisti ekrano užsklandą, kai groja audio įrašas"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
-msgid "Allow the screensaver to activate when playing audio. Disable if you have monitor-powered speakers."
-msgstr "Leisti ekrano užsklandą, kai groja audio įrašas. Naudinga garsiakalbiams, integruotiems į monitorių."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
-msgid "Show visual effects when no video is displayed"
-msgstr "Kai nerodomas vaizdas rodyti vaizdo efektus"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
-msgid "Show visual effects when playing an audio only file."
-msgstr "Rodyti vaizdo efektus, kai leidžiamas tik garso failas."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
-msgid "Name of the visual effects plugin"
-msgstr "Vaizdo efektų įskiepio pavadinimas"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
-msgid "The brightness of the video"
-msgstr "Vaizdo šviesumas"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
-msgid "The contrast of the video"
-msgstr "Vaizdo kontrastas"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
-msgid "The hue of the video"
-msgstr "Vaizdo atspalvis"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
-msgid "The saturation of the video"
-msgstr "Vaizdo spalvų sotumas"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
-msgid "Resize the canvas automatically on file load"
-msgstr "Įkeliant failą automatiškai pakeisti ekrano dydį"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
-msgid "Network connection speed"
-msgstr "Ryšio sparta"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
-msgid "Approximate network connection speed, used to select quality on media over the network."
-msgstr "Apytikslis tinklo greitis, naudojamas pasirinkti tinklinės medijos kokybei."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
-msgid "Repeat mode"
-msgstr "Kartojimo veiksena"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
-msgid "Shuffle mode"
-msgstr "Maišymo veiksena"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
-msgid "Whether to disable deinterlacing for interlaced movies"
-msgstr "Ar išjungti išlyginimą pakaitiniams (interlaced) filmams"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
-msgid "Whether to enable debug for the playback engine"
-msgstr "Ar įjungti rodymo posistemės derinimą"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
-msgid "Type of audio output to use"
-msgstr "Garso išvesties tipas"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
-msgid "Visualization quality setting"
-msgstr "Vizualizacijos kokybė"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
-msgid "Quality setting for the audio visualization."
-msgstr "Kokybės nustatymas audio vizualizacijai."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
-msgid "Network buffering threshold"
-msgstr "Tinklo buferizavimo riba"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
-msgid "Amount of data to buffer for network streams before starting to display the stream (in seconds)."
-msgstr "Buferizuojamų tinklo srauto duomenų kiekis prieš pradedant rodyti srautą (sekundėmis)."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
-msgid "Subtitle font"
-msgstr "Subtitrų šriftas"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
-msgid "Pango font description for subtitle rendering."
-msgstr "Pango šrifto aprašymas subtitrų vaizdavimui."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
-msgid "Subtitle encoding"
-msgstr "Subtitrų koduotė"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
-msgid "Encoding character set for subtitle."
-msgstr "Subtitrų simbolių rinkinio koduotė."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
-msgid "Default location for the \"Open...\" dialogs"
-msgstr "Numatytoji „Atverti...“ dialogų vieta"
+#: ../data/uri.ui.h:1
+msgid "Enter the _address of the file you would like to open:"
+msgstr "Įveskite norimo atverti failo _adresą:"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
-msgid "Default location for the \"Open...\" dialogs. Default is the current directory."
-msgstr "Numatytoji dialogų „Atverti...“ vieta. Standartinė – esamas aplankas."
+#: ../data/video-list.ui.h:1
+#: ../src/totem-dnd-menu.c:97
+msgid "_Add to Playlist"
+msgstr "_Pridėti į grojaraštį"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
-msgid "Default location for the \"Take Screenshot\" dialogs"
-msgstr "Numatytoji dialogų „Padaryti nuotrauką“ vieta"
+#: ../data/video-list.ui.h:2
+msgid "Add the video to the playlist"
+msgstr "Pridėti video į grojaraštį"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
-msgid "Default location for the \"Take Screenshot\" dialogs. Default is the Pictures directory."
-msgstr "Numatytoji dialogų „Padaryti nuotrauką“ vieta. Standartinė – aplankas „Paveikslėliai“."
+#: ../src/backend/bacon-video-widget.c:1643
+msgid "Password requested for RTSP server"
+msgstr "RTSP serverio slaptažodis"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
-msgid "Whether to disable the plugins in the user's home directory"
-msgstr "Ar išjungti įskiepius, esančis naudotojo namų aplanke"
+#: ../src/backend/bacon-video-widget.c:2944
+#, c-format
+msgid "Audio Track #%d"
+msgstr "Audio takelis #%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
-msgid "Whether to disable the keyboard shortcuts"
-msgstr "Ar išjungti klaviatūros greituosius klavišus"
+#: ../src/backend/bacon-video-widget.c:2948
+#, c-format
+msgid "Subtitle #%d"
+msgstr "Titrai #%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
-msgid "Whether to autoload text subtitle files when a movie is loaded"
-msgstr "Ar automatiškai įkelti titrus įkėlus filmą"
+#: ../src/backend/bacon-video-widget.c:3345
+msgid "The server you are trying to connect to is not known."
+msgstr "Bandote prisijungti prie nežinomo serverio."
+
+#: ../src/backend/bacon-video-widget.c:3348
+msgid "The connection to this server was refused."
+msgstr "Neleista prisijungti prie šio serverio."
+
+#: ../src/backend/bacon-video-widget.c:3351
+#| msgid "The movie could not be recorded."
+msgid "The specified movie could not be found."
+msgstr "Nepavyko rasti nurodyto filmo."
+
+#: ../src/backend/bacon-video-widget.c:3358
+msgid "The server refused access to this file or stream."
+msgstr "Serveris neleido prieiti prie šio failo ar srauto."
+
+#: ../src/backend/bacon-video-widget.c:3364
+msgid "Authentication is required to access this file or stream."
+msgstr "Šiam failui ar srautui pasiekti reikia patvirtinti tapatybę."
+
+#: ../src/backend/bacon-video-widget.c:3371
+#| msgid "Totem was not able to play this disc."
+msgid "You are not allowed to open this file."
+msgstr "Jums neleidžiama atverti šio failo."
+
+#: ../src/backend/bacon-video-widget.c:3376
+#| msgid "File is not a valid .desktop file"
+msgid "This location is not a valid one."
+msgstr "Ši vieta nėra tinkama."
+
+#: ../src/backend/bacon-video-widget.c:3384
+#| msgid "The movie could not be recorded."
+msgid "The movie could not be read."
+msgstr "Nepavyko perskaityti filmo."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
-msgid "Whether to autoload external chapter files when a movie is loaded"
-msgstr "Ar automatiškai įkelti išorinius takelius įkėlus filmą"
+#. should be exactly one missing thing (source or converter)
+#: ../src/backend/bacon-video-widget.c:3407
+#: ../src/backend/bacon-video-widget.c:3415
+#, c-format
+msgid "The playback of this movie requires a %s plugin which is not installed."
+msgid_plural ""
+"The playback of this movie requires the following decoders which are not installed:\n"
+"\n"
+"%s"
+msgstr[0] "Šiam filmui rodyti reikia %s įskiepio, kuris nėra įdiegtas."
+msgstr[1] ""
+"Šiam filmui rodyti reikia šių įskiepių, kuris nėra įdiegti:\n"
+"\n"
+"%s"
+msgstr[2] ""
+"Šiam filmui rodyti reikia šių įskiepių, kuris nėra įdiegti:\n"
+"\n"
+"%s"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
-msgid "Whether to remember the position of played audio/video files when pausing or closing them"
-msgstr "Ar prisiminti grotų audio/video failų poziciją juos sustabdant ar uždarant"
+#: ../src/backend/bacon-video-widget.c:3426
+msgid "An audio or video stream is not handled due to missing codecs. You might need to install additional plugins to be able to play some types of movies"
+msgstr "Garso ar vaizdo srautas neapdorojamas dėl trūkstamų kodekų. Jums gali reikėti įdiegti papildomus įskiepius, kad galėtumėt groti kai kurių tipų filmus"
+
+#: ../src/backend/bacon-video-widget.c:3436
+#| msgid ""
+#| "Cannot play this file over the network. Try downloading it to disk first."
+msgid "This file cannot be played over the network. Try downloading it locally first."
+msgstr "Šio failo negalima groti per tinklą. Pabandykite pirma jį atsisiųsti į diską."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:35
-msgid "Active plugins list"
-msgstr "Aktyvių įskiepių sąrašas"
+#: ../src/backend/bacon-video-widget.c:5494
+#: ../src/totem-properties-view.c:227
+msgid "Surround"
+msgstr "Apsupimas"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:36
-msgid "A list of the names of the plugins which are currently active (loaded and running)."
-msgstr "Aktyvių (įkeltų ir veikiančių) įskiepių pavadinimų sąrašas."
+#: ../src/backend/bacon-video-widget.c:5496
+#: ../src/totem-properties-view.c:229
+msgid "Mono"
+msgstr "Mono"
 
-#: ../data/uri.ui.h:1
-msgid "Enter the _address of the file you would like to open:"
-msgstr "Įveskite norimo atverti failo _adresą:"
+#: ../src/backend/bacon-video-widget.c:5781
+msgid "Media contains no supported video streams."
+msgstr "Laikmenoje nėra palaikomų video srautų."
+
+#: ../src/backend/bacon-video-widget.c:5963
+msgid "Some necessary plug-ins are missing. Make sure that the program is correctly installed."
+msgstr "Trūksta kai kurių būtinų įskiepių. Įsitikinkite, kad programa yra teisingai įdiegta."
 
 #: ../src/eggdesktopfile.c:165
 #, c-format
@@ -960,6 +1039,31 @@
 msgid "Show session management options"
 msgstr "Rodyti sesijos valdymo nustatymus"
 
+#. hour:minutes:seconds
+#. Translators: This is a time format, like "9:05:02" for 9
+#. * hours, 5 minutes, and 2 seconds. You may change ":" to
+#. * the separator that your locale uses or use "%Id" instead
+#. * of "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:56
+#: ../src/plugins/skipto/totem-time-entry.c:57
+#, c-format
+msgctxt "long time format"
+msgid "%d:%02d:%02d"
+msgstr "%d:%02d:%02d"
+
+#. minutes:seconds
+#. Translators: This is a time format, like "5:02" for 5
+#. * minutes and 2 seconds. You may change ":" to the
+#. * separator that your locale uses or use "%Id" instead of
+#. * "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:65
+#, c-format
+msgctxt "short time format"
+msgid "%d:%02d"
+msgstr "%d:%02d"
+
 #  Title
 #  Artist
 #  Year
@@ -1087,10 +1191,14 @@
 msgstr[1] "%d kadrai per sekundę"
 msgstr[2] "%d kadrų per sekundę"
 
-#: ../src/totem-audio-preview.c:168
+#: ../src/totem-audio-preview.c:137
 msgid "Audio Preview"
 msgstr "Audio peržiūra"
 
+#: ../src/totem.c:240
+msgid "Verify your system installation. Totem will now exit."
+msgstr "Patikrinkite savo sistemos įdiegimą. Totem dabar užsidarys."
+
 #  Title
 #  Artist
 #  Year
@@ -1106,7 +1214,7 @@
 msgid "Cancel"
 msgstr "Atsisakyti"
 
-#: ../src/totem-fullscreen.c:616
+#: ../src/totem-fullscreen.c:573
 msgid "No File"
 msgstr "Nėra failo"
 
@@ -1127,217 +1235,129 @@
 msgid "Make sure that Totem is properly installed."
 msgstr "Įsitikinkite, jog Totem įdiegta tinkamai."
 
-#: ../src/totem-interface.c:347
+#: ../src/totem-interface.c:357
 msgid "Totem 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."
 msgstr "Totem yra laisvoji programinė įranga; galite ją platinti ir / arba modifikuoti GNU Bendrosios Viešosios Licencijos sąlygomis, paskelbtomis Laisvosios Programinės Įrangos Fondo; 2-osios arba (jūsų pasirinkimu) bet kurios vėlesnės licencijos versijos sąlygomis."
 
-#: ../src/totem-interface.c:351
+#: ../src/totem-interface.c:361
 msgid "Totem 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 General Public License for more details."
 msgstr "Totem yra platinama tikintis, kad ji bus naudingas, tačiau nesuteikiant JOKIŲ GARANTIJŲ; netgi numanomų PARDAVIMO arba TINKAMUMO TAM TIKRAM TIKSLUI garantijų. Daugiau informacijos rasite GNU Bendrojoje Viešojoje Licencijoje."
 
-#: ../src/totem-interface.c:355
+#: ../src/totem-interface.c:365
 msgid "You should have received a copy of the GNU General Public License along with Totem; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA"
 msgstr "Turėjote gauti GNU Bendrosios Viešosios Licencijos kopiją kartu su Totem. Jeigu negavote, rašykite Laisvosios Programinės Įrangos Fondui, 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA"
 
-#: ../src/totem-interface.c:358
+#: ../src/totem-interface.c:368
 msgid "Totem contains an exception to allow the use of proprietary GStreamer plugins."
 msgstr "Totem yra licencijos išimtis, leidžianti naudoti nuosavybinius GStreamer įskiepius."
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:190
+#: ../src/totem-menu.c:291
 msgid "None"
 msgstr "Nėra"
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:195
+#: ../src/totem-menu.c:296
 msgctxt "Language"
 msgid "Auto"
 msgstr "Automatinis"
 
-#. Translators:
-#. * This is not a JPEG image, but a disc image, for example,
-#. * an ISO file
-#: ../src/totem-menu.c:765
-#, c-format
-msgid "Play Image '%s'"
-msgstr "Leisti atvaizdį „%s“"
-
-#: ../src/totem-menu.c:768
-#: ../src/totem-menu.c:851
-#, c-format
-msgid "device%d"
-msgstr "įrenginys%d"
-
-#: ../src/totem-menu.c:848
-#, c-format
-msgid "Play Disc '%s'"
-msgstr "Leisti diską „%s“"
-
-#. This lists the back-end type and version, such as
-#. * Movie Player using GStreamer 0.10.1
-#: ../src/totem-menu.c:1189
-#, c-format
-msgid "Movie Player using %s"
-msgstr "Filmų leistuvas, naudojantis %s"
-
-#: ../src/totem-menu.c:1193
+#: ../src/totem-menu.c:789
 msgid "Copyright © 2002-2009 Bastien Nocera"
 msgstr "Autorinės teisės © 2002-2009 Bastien Nocera"
 
-#: ../src/totem-menu.c:1198
+#: ../src/totem-menu.c:794
 msgid "translator-credits"
 msgstr ""
 "Paskutinysis vertėjas:\n"
-"Žygimantas Beručka ,\n"
+"Aurimas Černius ,\n"
 "\n"
 "Vertėjai:\n"
-"Gintautas Miliauskas \n"
-"Justina Klingaitė \n"
+"Žygimantas Beručka ,\n"
+"Gintautas Miliauskas ,\n"
+"Justina Klingaitė ,\n"
 "Artūras Šlajus "
 
-#: ../src/totem-menu.c:1202
+#: ../src/totem-menu.c:798
 msgid "Totem Website"
 msgstr "Totem žiniatinklio svetainė"
 
-#: ../src/totem-menu.c:1236
+#: ../src/totem-menu.c:829
 msgid "Configure Plugins"
 msgstr "Konfigūruoti įskiepius"
 
+#: ../src/totem-object.c:162
+#, c-format
+msgid ""
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"%s\n"
+"Paleiskite „%s --help“, jei norite pamatyti pilną galimų komandinės\n"
+"eilutės parametrų sąrašą.\n"
+
 #. Translators: %s is the totem version number
-#: ../src/totem-object.c:471
+#: ../src/totem-object.c:591
 #, c-format
 msgid "Totem %s"
 msgstr "Totem %s"
 
-#: ../src/totem-object.c:1047
-#: ../browser-plugin/totem-plugin-viewer.c:367
-msgid "Playing"
-msgstr "Grojama"
-
-#: ../src/totem-object.c:1049
+#: ../src/totem-object.c:1168
 #: ../src/totem-options.c:52
 msgid "Pause"
 msgstr "Pristabdyti"
 
-#: ../src/totem-object.c:1054
-#: ../browser-plugin/totem-plugin-viewer.c:363
-msgid "Paused"
-msgstr "Pristabdyta"
-
-#: ../src/totem-object.c:1056
-#: ../src/totem-object.c:1066
+#: ../src/totem-object.c:1175
+#: ../src/totem-object.c:1185
 #: ../src/totem-options.c:51
 msgid "Play"
 msgstr "Leisti"
 
-#: ../src/totem-object.c:1061
-#: ../src/totem-object.c:1659
-#: ../src/totem-statusbar.c:115
-#: ../browser-plugin/totem-plugin-viewer.c:351
-msgid "Stopped"
-msgstr "Sustabdytas"
-
-#: ../src/totem-object.c:1142
-#: ../src/totem-object.c:1169
-#: ../src/totem-object.c:1799
-#: ../src/totem-object.c:1963
+#: ../src/totem-object.c:1267
+#: ../src/totem-object.c:1294
+#: ../src/totem-object.c:1787
+#: ../src/totem-object.c:1942
 #, c-format
 msgid "Totem could not play '%s'."
 msgstr "Totem nepavyko paleisti „%s“."
 
-#: ../src/totem-object.c:1246
-#, c-format
-msgid "Totem could not play this media (%s) although a plugin is present to handle it."
-msgstr "Totem nepavyko paleisti šios medijos (%s), nors jai apdoroti reikalingas įskiepis ir yra įdiegtas."
-
-#: ../src/totem-object.c:1247
-msgid "You might want to check that a disc is present in the drive and that it is correctly configured."
-msgstr "Patikrinkite, ar diskas įdėtas į įrenginį ir, ar įrenginys teisingai sukonfigūruotas."
-
-#: ../src/totem-object.c:1255
-msgid "More information about media plugins"
-msgstr "Daugiau informacijos apie medijos įskiepius"
-
-#: ../src/totem-object.c:1256
-msgid "Please install the necessary plugins and restart Totem to be able to play this media."
-msgstr "Norėdami paleisti šią mediją, įdiekite reikiamus įskiepius ir iš naujo paleiskite Totem."
-
-#: ../src/totem-object.c:1258
-#, c-format
-msgid "Totem cannot play this type of media (%s) because it does not have the appropriate plugins to be able to read from the disc."
-msgstr "Totem nepavyko paleisti šio tipo medijos (%s), nes programoje nėra įskiepių, leidžiančių skaityti informaciją iš šio disko."
-
-#: ../src/totem-object.c:1260
-#, c-format
-msgid "Totem cannot play this type of media (%s) because you do not have the appropriate plugins to handle it."
-msgstr "Totem nepavyko paleisti šio tipo medijos (%s), nes neturite įskiepių, galinčių ją apdoroti."
-
-#: ../src/totem-object.c:1263
-#, c-format
-msgid "Totem cannot play this type of media (%s) because it is not supported."
-msgstr "Totem nepavyko paleisti šio tipo medijos (%s), nes ji nepalaikoma."
-
-#: ../src/totem-object.c:1264
-msgid "Please insert another disc to play back."
-msgstr "Įdėkite kitą diską, kurį norite perklausyti ar peržiūrėti."
-
-#: ../src/totem-object.c:1300
-msgid "Totem was not able to play this disc."
-msgstr "Totem nepavyko paleisti šio disko."
-
-#: ../src/totem-object.c:1301
-#: ../src/totem-object.c:4229
-msgid "No reason."
-msgstr "Jokios priežasties."
-
-#: ../src/totem-object.c:1315
-msgid "Totem does not support playback of Audio CDs"
-msgstr "Totem nepalaiko garso CD"
-
-#: ../src/totem-object.c:1316
-msgid "Please consider using a music player or a CD extractor to play this CD"
-msgstr "Šiam diskui klausytis naudokite muzikos grotuvą arba CD išskleidiklį"
-
-#: ../src/totem-object.c:1805
+#: ../src/totem-object.c:1793
 msgid "No error message"
 msgstr "Nėra klaidos pranešimo"
 
-#: ../src/totem-object.c:2154
+#: ../src/totem-object.c:2133
 msgid "Totem could not display the help contents."
 msgstr "Totem nepavyko parodyti pagalbos turinio."
 
-#: ../src/totem-object.c:2493
-#: ../src/totem-object.c:2495
-#: ../browser-plugin/totem-plugin-viewer.c:1417
-msgid "An error occurred"
-msgstr "Įvyko klaida"
-
-#: ../src/totem-object.c:4064
-#: ../src/totem-object.c:4066
+#: ../src/totem-object.c:4019
+#: ../src/totem-object.c:4021
 msgid "Previous Chapter/Movie"
 msgstr "Ankstesnis takelis/filmas"
 
-#: ../src/totem-object.c:4073
-#: ../src/totem-object.c:4075
+#: ../src/totem-object.c:4028
+#: ../src/totem-object.c:4030
 msgid "Play / Pause"
 msgstr "Groti / Pauzė"
 
-#: ../src/totem-object.c:4083
-#: ../src/totem-object.c:4085
+#: ../src/totem-object.c:4038
+#: ../src/totem-object.c:4040
 msgid "Next Chapter/Movie"
 msgstr "Kitas takelis/filmas"
 
-#. Translators: this is the tooltip text for the fullscreen button in the controls box in Totem's main window.
 #. Translators: this is the accessibility text for the fullscreen button in the controls box in Totem's main window.
-#: ../src/totem-object.c:4097
-#: ../src/totem-object.c:4099
+#: ../src/totem-object.c:4051
+#: ../src/totem-object.c:4053
 msgid "Fullscreen"
 msgstr "Visame ekrane"
 
-#: ../src/totem-object.c:4229
+#: ../src/totem-object.c:4184
 msgid "Totem could not startup."
 msgstr "Totem negalėjo startuoti."
 
+#: ../src/totem-object.c:4184
+msgid "No reason."
+msgstr "Jokios priežasties."
+
 #: ../src/totem-open-location.c:182
 msgid "Open Location..."
 msgstr "Atverti vietą..."
@@ -1411,88 +1431,92 @@
 msgid "Movies to play"
 msgstr "Rodytini filmai"
 
-#: ../src/totem-options.c:117
+#: ../src/totem-options.c:79
+msgid "- Play movies and songs"
+msgstr "- Žiūrėti filmus ir klausytis muzikos"
+
+#: ../src/totem-options.c:142
 msgid "Can't enqueue and replace at the same time"
 msgstr "Negalima įdėti į eilę ir pakeisti tuo pačiu metu"
 
 #. By extension entry
-#: ../src/totem-playlist.c:161
+#: ../src/totem-playlist.c:162
 msgid "MP3 ShoutCast playlist"
 msgstr "MP3 ShoutCast grojaraštis"
 
-#: ../src/totem-playlist.c:162
+#: ../src/totem-playlist.c:163
 msgid "MP3 audio (streamed)"
 msgstr "MP3 audio (srautas)"
 
-#: ../src/totem-playlist.c:163
+#: ../src/totem-playlist.c:164
 msgid "MP3 audio (streamed, DOS format)"
 msgstr "MP3 audio (srautas, DOS formatas)"
 
-#: ../src/totem-playlist.c:164
+#: ../src/totem-playlist.c:165
 msgid "XML Shareable Playlist"
 msgstr "XML viešintinas grojaraštis"
 
 #. This is "Title 3", where title is a DVD title
 #. * Note: NOT a DVD chapter
-#: ../src/totem-playlist.c:347
+#: ../src/totem-playlist.c:348
 #, c-format
 msgid "Title %d"
 msgstr "%d įrašas"
 
-#: ../src/totem-playlist.c:446
+#: ../src/totem-playlist.c:447
 msgid "Could not save the playlist"
 msgstr "Nepavyko išsaugoti grojaraščio"
 
-#: ../src/totem-playlist.c:1021
+#: ../src/totem-playlist.c:1022
 msgid "Save Playlist"
 msgstr "Išsaugoti grojaraštį"
 
 #. translators: Playlist is the default saved playlist filename,
 #. * without the suffix
-#: ../src/totem-playlist.c:1033
-#: ../src/totem-playlist.c:1264
-#: ../src/totem-sidebar.c:142
+#: ../src/totem-playlist.c:1034
+#: ../src/totem-playlist.c:1263
+#: ../src/totem-sidebar.c:145
 msgid "Playlist"
 msgstr "Grojaraštis"
 
-#: ../src/totem-playlist.c:1857
+#: ../src/totem-playlist.c:1862
 #, c-format
 msgid "The playlist '%s' could not be parsed. It might be damaged."
 msgstr "Nepavyko perskaityti grojaraščio „%s“. Jis gali būti sugadintas."
 
-#: ../src/totem-playlist.c:1858
+#: ../src/totem-playlist.c:1863
 msgid "Playlist error"
 msgstr "Grojaraščio klaida"
 
-#: ../src/totem-preferences.c:295
+#: ../src/totem-preferences.c:297
 msgid "Preferences"
 msgstr "Nustatymai"
 
-#: ../src/totem-preferences.c:451
+#: ../src/totem-preferences.c:445
 msgid "Select Subtitle Font"
 msgstr "Pasirinkite subtitrų šriftą"
 
-#: ../src/totem-properties-main.c:115
-#: ../src/totem-properties-view.c:266
+#: ../src/totem-properties-main.c:116
+#: ../src/totem-properties-view.c:269
 msgid "Audio/Video"
 msgstr "Garsas / vaizdas"
 
 #  Video Codec
 #  Audio Codec
-#: ../src/totem-properties-view.c:128
+#: ../src/totem-properties-view.c:131
 msgid "N/A"
 msgstr "Nėra"
 
 #  Video Codec
 #  Audio Codec
-#: ../src/totem-properties-view.c:157
+#: ../src/totem-properties-view.c:160
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 msgctxt "Stream bit rate"
 msgid "N/A"
 msgstr "Nėra"
 
-#: ../src/totem-properties-view.c:160
+#: ../src/totem-properties-view.c:163
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 #, c-format
@@ -1500,14 +1524,14 @@
 msgstr "%d kbps"
 
 #  eg: 75 %
-#: ../src/totem-properties-view.c:177
+#: ../src/totem-properties-view.c:180
 #: ../src/plugins/properties/totem-movie-properties.c:149
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
 #  eg: 75 %
-#: ../src/totem-properties-view.c:209
+#: ../src/totem-properties-view.c:212
 #: ../src/plugins/properties/totem-movie-properties.c:166
 #, c-format
 msgid "%d Hz"
@@ -1515,25 +1539,15 @@
 
 #  Video Codec
 #  Audio Codec
-#: ../src/totem-properties-view.c:216
+#: ../src/totem-properties-view.c:219
 #: ../src/plugins/properties/totem-movie-properties.c:166
 msgctxt "Sample rate"
 msgid "N/A"
 msgstr "N/A"
 
-#: ../src/totem-properties-view.c:224
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5589
-msgid "Surround"
-msgstr "Apsupimas"
-
-#: ../src/totem-properties-view.c:226
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5591
-msgid "Mono"
-msgstr "Mono"
-
 #  Video Codec
 #  Audio Codec
-#: ../src/totem-properties-view.c:236
+#: ../src/totem-properties-view.c:239
 msgctxt "Number of audio channels"
 msgid "N/A"
 msgstr "Nėra"
@@ -1566,12 +1580,11 @@
 msgid "Buffering"
 msgstr "Kuriamas buferis"
 
-#  eg: 75 %
 #. eg: 75 %
 #: ../src/totem-statusbar.c:250
 #, c-format
-msgid "%d %%"
-msgstr "%d %%"
+msgid "%lf %%"
+msgstr "%lf %%"
 
 #  minutes:seconds
 #. eg: Paused, 0:32 / 1:05
@@ -1584,8 +1597,9 @@
 #. eg: Buffering, 75 %
 #: ../src/totem-statusbar.c:330
 #, c-format
-msgid "%s, %d %%"
-msgstr "%s, %d %%"
+#| msgid "%s, %d %%"
+msgid "%s, %f %%"
+msgstr "%s, %f %%"
 
 #: ../src/totem-subtitle-encoding.c:156
 msgid "Current Locale"
@@ -1754,197 +1768,95 @@
 msgid "Vietnamese"
 msgstr "Vietnamiečių"
 
-#: ../src/totem-video-list.c:330
-msgid "No video URI"
-msgstr "Nenurodytas video URI"
-
-#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
-#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
-#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
-#: ../src/totem-video-thumbnailer.c:872
-#, c-format
-msgid ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-msgstr ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-
-#: ../src/totem-video-thumbnailer.c:873
-msgid "Filename"
-msgstr "Failo vardas"
-
-#: ../src/totem-video-thumbnailer.c:875
-msgid "Resolution"
-msgstr "Raiška"
-
-#: ../src/totem-video-thumbnailer.c:878
-msgid "Duration"
-msgstr "Trukmė"
-
-#: ../src/totem-uri.c:506
+#: ../src/totem-uri.c:343
 #: ../src/plugins/chapters/totem-chapters.c:998
 msgid "All files"
 msgstr "Visi failai"
 
-#: ../src/totem-uri.c:511
+#: ../src/totem-uri.c:348
 #: ../src/plugins/chapters/totem-chapters.c:995
 msgid "Supported files"
 msgstr "Palaikomi failai"
 
-#: ../src/totem-uri.c:523
+#: ../src/totem-uri.c:360
 msgid "Audio files"
 msgstr "Audio failai"
 
-#: ../src/totem-uri.c:531
+#: ../src/totem-uri.c:368
 msgid "Video files"
 msgstr "Video failai"
 
-#: ../src/totem-uri.c:541
+#: ../src/totem-uri.c:378
 msgid "Subtitle files"
 msgstr "Titrų failai"
 
-#: ../src/totem-uri.c:593
+#: ../src/totem-uri.c:430
 msgid "Select Text Subtitles"
 msgstr "Pasirinkite titrus"
 
-#: ../src/totem-uri.c:656
+#: ../src/totem-uri.c:495
 msgid "Select Movies or Playlists"
 msgstr "Pasirinkite filmus arba grojaraščius"
 
-#. Options parsing
-#: ../src/totem.c:201
-msgid "- Play movies and songs"
-msgstr "- Žiūrėti filmus ir klausytis muzikos"
+#: ../src/totem-uri.c:499
+msgid "Add Directory"
+msgstr "Pridėti katalogą"
+
+#: ../src/totem-video-list.c:330
+msgid "No video URI"
+msgstr "Nenurodytas video URI"
 
-#: ../src/totem.c:212
+#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
+#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
+#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
+#: ../src/totem-video-thumbnailer.c:841
 #, c-format
 msgid ""
-"%s\n"
-"Run '%s --help' to see a full list of available command line options.\n"
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 msgstr ""
-"%s\n"
-"Paleiskite „%s --help“, jei norite pamatyti pilną galimų komandinės\n"
-"eilutės parametrų sąrašą.\n"
-
-#  Title
-#: ../src/totem.c:254
-#: ../src/totem.c:265
-#: ../browser-plugin/totem-plugin-viewer.c:663
-#: ../browser-plugin/totem-plugin-viewer.c:1793
-msgid "Totem Movie Player"
-msgstr "Totem filmų leistuvas"
-
-#: ../src/totem.c:255
-#: ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Could not initialize the thread-safe libraries."
-msgstr "Nepavyko inicializuoti saugių gijų bibliotekų."
-
-#: ../src/totem.c:255
-msgid "Verify your system installation. Totem will now exit."
-msgstr "Patikrinkite savo sistemos įdiegimą. Totem dabar užsidarys."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:1589
-msgid "Password requested for RTSP server"
-msgstr "RTSP serverio slaptažodis"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2858
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2862
-#, c-format
-msgid "Audio Track #%d"
-msgstr "Audio takelis #%d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2890
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2894
-#, c-format
-msgid "Subtitle #%d"
-msgstr "Titrai #%d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3298
-msgid "The requested audio output was not found. Please select another audio output in the Multimedia Systems Selector."
-msgstr "Užklausta audio išvestis nerasta. Pasirinkite kitą audio išvestį daugialypės terpės sistemų parinkiklyje."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3303
-msgid "Location not found."
-msgstr "Vieta nerasta."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3307
-msgid "Could not open location; you might not have permission to open the file."
-msgstr "Nepavyko atverti vietos; galbūt neturite leidimo atverti šį failą."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3318
-msgid "The video output is in use by another application. Please close other video applications, or select another video output in the Multimedia Systems Selector."
-msgstr "Video išvestis yra naudojama kitos programos. Užverkite kitas video programas arba pasirinkite kitą video išvestį daugialypės terpės sistemų parinkiklyje."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3324
-msgid "The audio output is in use by another application. Please select another audio output in the Multimedia Systems Selector. You may want to consider using a sound server."
-msgstr "Audio išvestis yra naudojama kitos programos. Pasirinkite kitą audio išvestį daugialypės terpės sistemų parinkyklyje. Jūs galite norėti naudoti garso serverį."
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 
-#. should be exactly one missing thing (source or converter)
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3342
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3348
-#, c-format
-msgid "The playback of this movie requires a %s plugin which is not installed."
-msgid_plural ""
-"The playback of this movie requires the following decoders which are not installed:\n"
-"\n"
-"%s"
-msgstr[0] "Šiam filmui rodyti reikia %s įskiepio, kuris nėra įdiegtas."
-msgstr[1] ""
-"Šiam filmui rodyti reikia šių įskiepių, kuris nėra įdiegti:\n"
-"\n"
-"%s"
-msgstr[2] ""
-"Šiam filmui rodyti reikia šių įskiepių, kuris nėra įdiegti:\n"
-"\n"
-"%s"
+#: ../src/totem-video-thumbnailer.c:842
+msgid "Filename"
+msgstr "Failo vardas"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3374
-msgid "Cannot play this file over the network. Try downloading it to disk first."
-msgstr "Nepavyko parodyti šio failo per tinklą. Pabandykite pirma jį atsisiųsti į diską."
+#: ../src/totem-video-thumbnailer.c:844
+msgid "Resolution"
+msgstr "Raiška"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5878
-msgid "Media contains no supported video streams."
-msgstr "Laikmenoje nėra palaikomų video srautų."
+#: ../src/totem-video-thumbnailer.c:847
+msgid "Duration"
+msgstr "Trukmė"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6052
-msgid "Failed to create a GStreamer play object. Please check your GStreamer installation."
-msgstr "Nepavyko sukurti GStreamer paleidimo objekto. Patikrinkite GStreamer įdiegimą."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6172
-msgid "Failed to open audio output. You may not have permission to open the sound device, or the sound server may not be running. Please select another audio output in the Multimedia Systems Selector."
-msgstr "Nepavyko atverti audio išvesties. Jūs galite neturėti leidimo atverti garso įrenginį arba Jūsų garso serveris gali neveikti. Pasirinkite kitą audio išvestį daugialypės terpės sistemų parinkiklyje."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6192
-msgid "Could not find the audio output. You may need to install additional GStreamer plugins, or select another audio output in the Multimedia Systems Selector."
-msgstr "Nepavyko rasti audio išvesties. Jums gali reikti įdiegti papildomus gstreamer įskiepius, arba pasirinkti kitą audio išvestį daugialypės terpės sistemų parinkiklyje."
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:1
+msgid "Apple Trailers"
+msgstr "Apple Trailers"
+
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:2
+msgid "Sets the user agent for the Apple Trailers site"
+msgstr "Nustato naudotoją agentą Apple Trailers tinklapiui"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:1
+#| msgid "Download Movie Subtitles"
+msgid "Autoload Subtitles"
+msgstr "Automatiškai įkelti subtitrus"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:2
+#| msgid "Downloading the subtitles…"
+msgid "Autoloads text subtitles"
+msgstr "Automatiškai įkelti tekstinius subtitrus"
 
-#. hour:minutes:seconds
-#. Translators: This is a time format, like "9:05:02" for 9
-#. * hours, 5 minutes, and 2 seconds. You may change ":" to
-#. * the separator that your locale uses or use "%Id" instead
-#. * of "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:83
-#: ../src/plugins/skipto/totem-time-entry.c:57
-#, c-format
-msgctxt "long time format"
-msgid "%d:%02d:%02d"
-msgstr "%d:%02d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
+msgid "Video Disc Recorder"
+msgstr "Video diskų įrašymas"
 
-#. minutes:seconds
-#. Translators: This is a time format, like "5:02" for 5
-#. * minutes and 2 seconds. You may change ":" to the
-#. * separator that your locale uses or use "%Id" instead of
-#. * "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:92
-#, c-format
-msgctxt "short time format"
-msgid "%d:%02d"
-msgstr "%d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
+msgid "Records (S)VCDs or video DVDs"
+msgstr "Įrašo (S)VCD ir video DVD"
 
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:65
 msgid "_Create Video Disc..."
@@ -1970,38 +1882,21 @@
 msgid "Copy the currently playing (S)VCD"
 msgstr "Kopijuoti rodomą (S)VCD"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:129
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:136
 msgid "The video disc could not be duplicated."
 msgstr "Nepavyko nukopijuoti video disko."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:131
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:276
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:138
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:283
 msgid "The movie could not be recorded."
 msgstr "Nepavyko įrašyti filmo."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:157
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:167
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:263
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:164
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:174
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:270
 msgid "Unable to write a project."
 msgstr "Nepavyko įrašyti projekto."
 
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
-msgid "Video Disc Recorder"
-msgstr "Video diskų įrašymas"
-
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
-msgid "Records (S)VCDs or video DVDs"
-msgstr "Įrašo (S)VCD ir video DVD"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:1
-#: ../src/plugins/chapters/totem-chapters.c:1139
-msgid "Chapters"
-msgstr "Takeliai"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:2
-msgid "Support chapter markers in movies."
-msgstr "Skyrių palaikymas filmuose."
-
 #: ../src/plugins/chapters/chapters-edit.ui.h:1
 msgid "Name for new chapter:"
 msgstr "Naujo skyriaus pavadinimas:"
@@ -2058,6 +1953,16 @@
 msgid "Create a new chapter list for the movie"
 msgstr "Sukurti skyrių sąrašą filmui"
 
+#: ../src/plugins/chapters/chapters.plugin.in.h:1
+#: ../src/plugins/chapters/totem-chapters.c:1139
+msgid "Chapters"
+msgstr "Takeliai"
+
+#: ../src/plugins/chapters/chapters.plugin.in.h:2
+#| msgid "Support chapter markers in movies."
+msgid "Support chapter markers in movies"
+msgstr "Palaikyti skyrių žymeklius filmuose"
+
 #: ../src/plugins/chapters/totem-chapters.c:56
 #, c-format
 msgid ""
@@ -2126,7 +2031,6 @@
 msgstr "Nepavyko perskaityti CMML failo"
 
 #: ../src/plugins/chapters/totem-edit-chapter.c:95
-#| msgid "Add Chapter..."
 msgid "Add Chapter"
 msgstr "Pridėti skyrių"
 
@@ -2149,23 +2053,50 @@
 msgid "The property ‘%s’ is not writeable."
 msgstr "Savybė „%s“ nėra rašoma."
 
-#: ../src/plugins/dbusservice/dbusservice.py:238
-#, python-format
-msgid "Unknown property ‘%s’ requested of a MediaPlayer 2 object"
-msgstr "Prašoma nežinoma MediaPlayer 2 objekto savybė „%s“"
+#: ../src/plugins/dbusservice/dbusservice.py:238
+#, python-format
+msgid "Unknown property ‘%s’ requested of a MediaPlayer 2 object"
+msgstr "Prašoma nežinoma MediaPlayer 2 objekto savybė „%s“"
+
+#: ../src/plugins/dbusservice/dbusservice.py:341
+#, python-format
+msgid "The URI ‘%s’ is not supported."
+msgstr "Nepalaikomas URI „%s“."
+
+#: ../src/plugins/grilo/grilo.plugin.in.h:1
+msgid "Grilo Browser"
+msgstr "Grilo naršyklė"
+
+#: ../src/plugins/grilo/grilo.plugin.in.h:2
+#| msgid "A plugin to let you browse media content from various sources."
+msgid "A plugin to let you browse media content from various sources"
+msgstr "Įskiepis, leidžiantis naršyti daugialypės terpės turinį įvairuose šaltiniuose"
+
+#: ../src/plugins/grilo/grilo.ui.h:1
+msgid "Add to Playlist"
+msgstr "Pridėti į grojaraštį"
+
+#: ../src/plugins/grilo/grilo.ui.h:2
+msgid "Copy Location"
+msgstr "Kopijuoti vietą"
 
-#: ../src/plugins/dbusservice/dbusservice.py:341
-#, python-format
-msgid "The URI ‘%s’ is not supported."
-msgstr "Nepalaikomas URI „%s“."
+#: ../src/plugins/grilo/grilo.ui.h:3
+#: ../src/plugins/grilo/totem-grilo.c:1184
+msgid "Browse"
+msgstr "Naršyti"
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
-msgid "Instant Messenger status"
-msgstr "Greitų žinučių programos būsena"
+#: ../src/plugins/grilo/grilo.ui.h:4
+#: ../src/plugins/grilo/totem-grilo.c:1227
+msgid "Search"
+msgstr "Ieškoti"
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
-msgid "Set your Instant Messenger status to away when a movie is playing"
-msgstr "Paleidus filmą, nustato jūsų greitų žinučių programos būseną į „Manęs nėra“"
+#: ../src/plugins/grilo/totem-grilo.c:454
+msgid "Browse Error"
+msgstr "Naršymo klaida"
+
+#: ../src/plugins/grilo/totem-grilo.c:609
+msgid "Search Error"
+msgstr "Paieškos klaida"
 
 #: ../src/plugins/gromit/gromit.plugin.in.h:1
 msgid "Gromit Annotations"
@@ -2179,50 +2110,14 @@
 msgid "The gromit binary was not found."
 msgstr "Nerastas gromit dvejetainis failas."
 
-#  Title
-#. Add the interface to Totem's sidebar
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:1
-#: ../src/plugins/iplayer/iplayer.py:46
-msgid "BBC iPlayer"
-msgstr "BBC iPlayer"
-
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:2
-msgid "Stream BBC programs from the last 7 days from the BBC iPlayer service."
-msgstr "Rodyti paskutiniųjų 7 dienų BBC programas iš BBC iPlayer paslaugos."
-
-#: ../src/plugins/iplayer/iplayer.py:72
-msgid "Error listing channel categories"
-msgstr "Klaida rodant kanalų kategorijas"
-
-#: ../src/plugins/iplayer/iplayer.py:73
-msgid "There was an unknown error getting the list of television channels available on BBC iPlayer."
-msgstr "Klaida gaunant televizijos kanalų sąrašą iš BBC iPlayer."
-
-#. Append a dummy child row so that the expander's visible; we can
-#. then queue off the expander to load the programme listing for this
-#. category
-#: ../src/plugins/iplayer/iplayer.py:84
-msgid "Loading…"
-msgstr "Įkeliama..."
-
-#. Translators: the "programme feed" is the list of TV shows
-#. available to watch online
-#: ../src/plugins/iplayer/iplayer.py:136
-msgid "Error getting programme feed"
-msgstr "Klaida gaunant programos srautą"
-
-#: ../src/plugins/iplayer/iplayer.py:137
-msgid "There was an error getting the list of programmes for this channel and category combination."
-msgstr "Klaida gaunant programų sąrašą nurodytam kanalui ir kategorijai."
-
-#: ../src/plugins/iplayer/iplayer2.py:298
-msgid ""
-msgstr ""
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
+#| msgid "Instant Messenger status"
+msgid "Instant Messenger Status"
+msgstr "Greitų žinučių programos būsena"
 
-#: ../src/plugins/iplayer/iplayer2.py:299
-#, python-format
-msgid "Programme unavailable (\"%s\")"
-msgstr "Programa neprieinama („%s“)"
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
+msgid "Set your Instant Messenger status to away when a movie is playing"
+msgstr "Paleidus filmą, nustato jūsų greitų žinučių programos būseną į „Manęs nėra“"
 
 #: ../src/plugins/lirc/lirc.plugin.in.h:1
 msgid "Infrared Remote Control"
@@ -2240,25 +2135,32 @@
 msgid "Couldn't read lirc configuration."
 msgstr "Nepavyko perskaityti lirc konfigūracijos."
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
-msgid "Download Movie Subtitles"
-msgstr "Parsisiųsti filmo titrus"
+#  Title
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:1
+#| msgid "Movie Player"
+msgid "Media Player Keys"
+msgstr "Daugialypės terpės grotuvo klavišai"
+
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:2
+msgid "Support additional media player keys"
+msgstr "Palaikyti papildomų daugialypės terpės grotuvo klavišus"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
-msgid "Subtitle _language:"
-msgstr "Titrų _kalba:"
+#: ../src/plugins/ontop/ontop.plugin.in.h:1
+msgid "Always On Top"
+msgstr "Visada viršuje"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
-msgid "_Play with Subtitle"
-msgstr "_Rodyti su titrais"
+#: ../src/plugins/ontop/ontop.plugin.in.h:2
+msgid "Keep the main window on top when playing a movie"
+msgstr "Rodant filmą, pagrindinis langas turėtų būti virš kitų"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:1
 msgid "Subtitle Downloader"
 msgstr "Titrų parsiuntiklis"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:2
-msgid "Look for subtitles for the currently playing movie."
-msgstr "Ieškoti titrų rodomam filmui."
+#| msgid "Look for subtitles for the currently playing movie."
+msgid "Look for subtitles for the currently playing movie"
+msgstr "Ieškoti titrų rodomam filmui"
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:42
 msgid "Brazilian Portuguese"
@@ -2314,6 +2216,18 @@
 msgid "Searching subtitles…"
 msgstr "Ieškoma titrų..."
 
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
+msgid "Download Movie Subtitles"
+msgstr "Parsisiųsti filmo titrus"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
+msgid "Subtitle _language:"
+msgstr "Titrų _kalba:"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
+msgid "_Play with Subtitle"
+msgstr "_Rodyti su titrais"
+
 #: ../src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in.h:1
 msgid "Subtitle language"
 msgstr "Titrų kalba"
@@ -2322,67 +2236,20 @@
 msgid "The language to search for subtitles for movies in."
 msgstr "Kalba, kuria ieškoti subtitrų"
 
-#: ../src/plugins/ontop/ontop.plugin.in.h:1
-msgid "Always On Top"
-msgstr "Visada viršuje"
-
-#: ../src/plugins/ontop/ontop.plugin.in.h:2
-msgid "Keep the main window on top when playing a movie"
-msgstr "Rodant filmą, pagrindinis langas turėtų būti virš kitų"
+#: ../src/plugins/properties/movie-properties.plugin.in.h:1
+#| msgid "Properties"
+msgid "Movie Properties"
+msgstr "Filmo savybės"
+
+#: ../src/plugins/properties/movie-properties.plugin.in.h:2
+#| msgid "Show or hide the sidebar"
+msgid "Adds movie properties to the sidebar"
+msgstr "Prideda filmo savybes į šoninę juostą"
 
 #: ../src/plugins/properties/totem-movie-properties.c:246
 msgid "Properties"
 msgstr "Savybės"
 
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:1
-msgid "Publisher protocol to use"
-msgstr "Naudotinas publikavimo protokolas"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:2
-msgid "The transport protocol to use when publishing playlists over the network."
-msgstr "Transporto protokolas, naudojamas publikuojant grojaraščius tinkle."
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:3
-msgid "Format for network service name"
-msgstr "Tinklo tarnybos pavadinimo formatas"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:5
-#, no-c-format
-msgid "A format string used to build the network service name used when publishing playlists over the network. The following format placeholders can be used: • %a: the program name as returned by g_get_application_name() • %h: the machine's host name in title case • %u: the user's login name in title case • %U: the user's real name • %%: the percent sign"
-msgstr "Formato eilutė, naudojama tinklo tarnybos vardui sudaryti, kai grojaraščiai yra publikuojami tinkle. Gali būti naudojami šie žymėjimai: • %a: programos pavadinimas, kaip jį grąžina g_get_application_name() • %h: mašinos vardas pavadinimo registru • %u: naudotojo prisijungimo vardas pavadinimo registru • %U: naudotojo tikrasis vardas • %%: procento simbolis"
-
-#. Translators: computers on the local network which are publishing their playlists over the network
-#: ../src/plugins/publish/totem-publish.c:552
-msgid "Neighbors"
-msgstr "Kaimynai"
-
-#: ../src/plugins/publish/publish.plugin.in.h:1
-msgid "Publish Playlist"
-msgstr "Viešinti grojaraštį"
-
-#: ../src/plugins/publish/publish.plugin.in.h:2
-msgid "Share the current playlist via HTTP"
-msgstr "Viešinti esamą grojaraštį per HTTP"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:1
-msgid "Service _Name:"
-msgstr "Tarnybos _pavadinimas:"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:3
-#, no-c-format
-msgid ""
-"The name used for announcing the playlist service on the network.\n"
-"All occurrences of the string %u will be replaced by your name,\n"
-"and %h will be replaced by your computer's host name."
-msgstr ""
-"Pavadinimas, kuriuo tinkle skelbiamas grojaraštis.\n"
-"Visos simbolių sekos %u bus pakeistos Jūsų vardu,\n"
-"o %h bus pakeistos Jūsų kompiuterio vardu."
-
-#: ../src/plugins/publish/publish-plugin.ui.h:6
-msgid "Use _encrypted transport protocol (HTTPS)"
-msgstr "Naudoti _šifruotą transporto protokolą (HTTPS)"
-
 #: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:1
 msgid "rpdb2 password"
 msgstr "rpdb2 slaptažodis"
@@ -2391,22 +2258,89 @@
 msgid "A password to protect the rpdb2 server for debugging Totem from unauthorized remote access. If this is empty, a default of 'totem' will be used."
 msgstr "Slaptažodis rpdb2 serverio apsaugojimui Totem derinimui nuo neleistino prisijungimo. Jei tuščias, bus naudojamas numatytasis „totem“."
 
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
+msgid "Python Console"
+msgstr "Python konsolė"
+
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
+#| msgid "Interactive Python console."
+msgid "Interactive Python console"
+msgstr "Interaktyvi Python konsolė"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:88
+msgid "Python Console Menu"
+msgstr "Python konsolės meniu"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:93
+msgid "_Python Console"
+msgstr "_Python konsolė"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:94
+msgid "Show Totem's Python console"
+msgstr "Rodyti Totemo Python konsolę"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:100
+msgid "Python Debugger"
+msgstr "Python derintuvė"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:101
+msgid "Enable remote Python debugging with rpdb2"
+msgstr "Įjungti nuotolinį Python derinimą su rpdb2"
+
+#. pylint: disable-msg=E1101
+#: ../src/plugins/pythonconsole/pythonconsole.py:125
+#, python-format
+msgid ""
+"You can access the Totem.Object through 'totem_object' :\\n"
+"%s"
+msgstr ""
+"Galite pasiekti totem objektą per „totem_object“ :\\n"
+"%s"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:129
+msgid "Totem Python Console"
+msgstr "Totem Pythono konsolė"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:139
+msgid "After you press OK, Totem will wait until you connect to it with winpdb or rpdb2. If you have not set a debugger password in DConf, it will use the default password ('totem')."
+msgstr "Kai paspausite OK, Totem lauks, kol prisijungsite prie jo su winpdb arba rpdb2. Jei nenustatėte derintuvės slaptažodžio su GConf, bus naudojamas numatytasis slaptažodis („totem“)."
+
+#: ../src/plugins/recent/recent.plugin.in.h:1
+#| msgid "Video files"
+msgid "Recent files"
+msgstr "Neseniai naudoti failai"
+
+#: ../src/plugins/recent/recent.plugin.in.h:2
+msgid "Adds files that have been played to recent files"
+msgstr "Prideda grotus failus prie neseniai naudotų"
+
 #: ../src/plugins/rotation/rotation.plugin.in.h:1
 msgid "Rotation Plugin"
 msgstr "Posūkio įskiepis"
 
 #: ../src/plugins/rotation/rotation.plugin.in.h:2
-msgid "Allows videos to be rotated if they're in the wrong orientation."
-msgstr "Visi vaizdai turi būti pasukti, jei jų padėtis yra neteisinga."
+#| msgid "Allows videos to be rotated if they're in the wrong orientation."
+msgid "Allows videos to be rotated if they are in the wrong orientation"
+msgstr "Leidžia pasukti vaizdus, jei jų padėtis yra neteisinga"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:60
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:50
 msgid "_Rotate Clockwise"
 msgstr "Pasukti pagal laikrodžio _rodyklę"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:62
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:52
 msgid "Rotate Counterc_lockwise"
 msgstr "Pasukti prieš _laikrodžio rodyklę"
 
+#: ../src/plugins/save-file/save-file.plugin.in.h:1
+#| msgid "Save a Copy"
+msgid "Save Copy"
+msgstr "Įrašyti kopiją"
+
+#: ../src/plugins/save-file/save-file.plugin.in.h:2
+#| msgid "Copy the currently playing video DVD"
+msgid "Save a copy of the currently playing movie"
+msgstr "Įrašyti rodomo filmo kopiją"
+
 #: ../src/plugins/save-file/totem-save-file.c:63
 msgid "Save a Copy..."
 msgstr "Įrašyti kopiją..."
@@ -2429,10 +2363,14 @@
 msgid "Movie stream"
 msgstr "Filmo srautas"
 
-#: ../src/plugins/screensaver/totem-screensaver.c:116
-#: ../browser-plugin/totem-plugin-viewer.c:1891
-msgid "Playing a movie"
-msgstr "Rodomas filmas"
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:1
+msgid "Screen Saver"
+msgstr "Ekrano užsklanda"
+
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:2
+#| msgid "Disable screensaver when playing "
+msgid "Deactivates the screen saver when a movie is playing"
+msgstr "Išjungti ekrano užsklandą grojant filmą"
 
 #: ../src/plugins/screenshot/gallery.ui.h:1
 msgid "Screenshot width (in pixels):"
@@ -2446,23 +2384,31 @@
 msgid "Number of screenshots:"
 msgstr "Ekrano nuotraukų skaičius:"
 
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:1
-msgid "_Name:"
-msgstr "_Pavadinimas:"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:2
-msgid "Save in _folder:"
-msgstr "Įrašyti į _aplanką:"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:3
-msgid "Select a folder"
-msgstr "Pasirinkite aplanką"
-
-#. Write the screenshot to the temporary file
-#: ../src/plugins/screenshot/gnome-screenshot-widget.c:385
-#: ../src/plugins/screenshot/totem-screenshot.c:64
-msgid "Screenshot.png"
-msgstr "Nuotrauka.png"
+#. translators: this is the name of the file that gets made up
+#. * with the screenshot if the entire screen is taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:147
+#, c-format
+#| msgid "Screenshot.png"
+msgid "Screenshot from %s.png"
+msgstr "Ekrano nuotrauka iš %s.png"
+
+#. translators: this is the name of the file that gets
+#. * made up with the screenshot if the entire screen is
+#. * taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:154
+#, c-format
+#| msgid "Screenshot-%s-%d.png"
+msgid "Screenshot from %s - %d.png"
+msgstr "Ekrano nuotrauka iš %s - %d.png"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:1
+#| msgid "Screenshot.png"
+msgid "Screenshot"
+msgstr "Ekrano nuotrauka"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:2
+msgid "Allows screenshots and galleries to be taken of videos"
+msgstr "Leidžia daryti galerijų ir vaizdų ekrano nuotraukas"
 
 #: ../src/plugins/screenshot/totem-gallery.c:91
 msgid "Save Gallery"
@@ -2488,49 +2434,48 @@
 msgid "Saving gallery as \"%s\""
 msgstr "Įrašoma galerija kaip „%s“"
 
-#: ../src/plugins/screenshot/totem-screenshot.c:113
-msgid "There was an error saving the screenshot."
-msgstr "Išsaugant ekrano nuotrauką įvyko klaida."
-
-#: ../src/plugins/screenshot/totem-screenshot.c:139
-msgid "Save Screenshot"
-msgstr "Išsaugoti ekrano nuotrauką"
-
-#. Create the screenshot widget
-#. Translators: %s is the movie title and %d is an auto-incrementing number to make filename unique
-#: ../src/plugins/screenshot/totem-screenshot.c:160
-#, c-format
-msgid "Screenshot-%s-%d.png"
-msgstr "Nuotrauka-%s-%d.png"
-
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:88
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:220
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "Totem could not get a screenshot of the video."
 msgstr "Totem nepavyko padaryti filmo vaizdo nuotraukos."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "This is not supposed to happen; please file a bug report."
 msgstr "Tai neturėjo nutikti; prašau praneškite apie klaidą."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
-msgid "Take _Screenshot..."
-msgstr "Padaryti ekrano _nuotrauką..."
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
+#| msgid "Take _Screenshot..."
+msgid "Take _Screenshot"
+msgstr "Padaryti ekrano _nuotrauką"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
 msgid "Take a screenshot"
 msgstr "Padaryti ekrano nuotrauką"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create Screenshot _Gallery..."
 msgstr "Sukurti ekrano nuotraukų galeriją..."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create a gallery of screenshots"
 msgstr "Sukurti ekrano nuotraukų galeriją"
 
+#: ../src/plugins/skipto/skipto.plugin.in.h:1
+#: ../src/plugins/skipto/totem-skipto.c:196
+msgid "Skip To"
+msgstr "Peršokti iki"
+
+#: ../src/plugins/skipto/skipto.plugin.in.h:2
+msgid "Provides the \"Skip to\" dialog"
+msgstr "Suteikia „praleisti iki“ dialogą"
+
+#: ../src/plugins/skipto/skipto.ui.h:1
+msgid "_Skip to:"
+msgstr "Per_sukti iki:"
+
 #. Update the "seconds" label so that it always has the correct singular/plural form
 #. Translators: label for the seconds selector in the "Skip to" dialogue
-#: ../src/plugins/skipto/totem-skipto.c:160
+#: ../src/plugins/skipto/totem-skipto.c:159
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "sekundė"
@@ -2541,15 +2486,11 @@
 #. Translators: you should translate this string to a number (written in digits) which corresponds to the longer character length of the
 #. * translations for "second" and "seconds", as translated elsewhere in this file. For example, in English, "second" is 6 characters long and
 #. * "seconds" is 7 characters long, so this string should be translated to "7". See: bgo#639398
-#: ../src/plugins/skipto/totem-skipto.c:190
+#: ../src/plugins/skipto/totem-skipto.c:189
 msgctxt "Skip To label length"
 msgid "7"
 msgstr "7"
 
-#: ../src/plugins/skipto/totem-skipto.c:197
-msgid "Skip To"
-msgstr "Peršokti iki"
-
 #: ../src/plugins/skipto/totem-skipto-plugin.c:182
 msgid "_Skip To..."
 msgstr "Perš_okti iki..."
@@ -2558,190 +2499,3 @@
 msgid "Skip to a specific time"
 msgstr "Persukti iki tam tikro laiko"
 
-#: ../src/plugins/skipto/skipto.ui.h:1
-msgid "_Skip to:"
-msgstr "Per_sukti iki:"
-
-#: ../browser-plugin/totem-plugin-viewer.c:431
-msgid "No URI to play"
-msgstr "Nėra leistino URI"
-
-#. translators: this is:
-#. * Open With ApplicationName
-#. * as in nautilus' right-click menu
-#: ../browser-plugin/totem-plugin-viewer.c:1107
-#, c-format
-msgid "_Open with \"%s\""
-msgstr "_Atverti su „%s“"
-
-#: ../browser-plugin/totem-plugin-viewer.c:2136
-msgid "No playlist or playlist empty"
-msgstr "Nėra grojaraščio arba grojaraštis tuščias"
-
-#  Title
-#: ../browser-plugin/totem-plugin-viewer.c:2235
-msgid "Movie browser plugin"
-msgstr "Filmų naršyklės įskiepis"
-
-#: ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Verify your system installation. The Totem plugin will now exit."
-msgstr "Patikrinkite savo sistemos įdiegimą. Totem įskiepis dabar užsidarys."
-
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
-msgid "Python Console"
-msgstr "Python konsolė"
-
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
-msgid "Interactive Python console."
-msgstr "Interaktyvi Python konsolė."
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:88
-msgid "Python Console Menu"
-msgstr "Python konsolės meniu"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:93
-msgid "_Python Console"
-msgstr "_Python konsolė"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:94
-msgid "Show Totem's Python console"
-msgstr "Rodyti Totemo Python konsolę"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:100
-msgid "Python Debugger"
-msgstr "Python derintuvė"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:101
-msgid "Enable remote Python debugging with rpdb2"
-msgstr "Įjungti nuotolinį Python derinimą su rpdb2"
-
-#. pylint: disable-msg=E1101
-#: ../src/plugins/pythonconsole/pythonconsole.py:125
-#, python-format
-msgid ""
-"You can access the Totem.Object through 'totem_object' :\\n"
-"%s"
-msgstr ""
-"Galite pasiekti totem objektą per „totem_object“ :\\n"
-"%s"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:129
-msgid "Totem Python Console"
-msgstr "Totem Pythono konsolė"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:139
-msgid "After you press OK, Totem will wait until you connect to it with winpdb or rpdb2. If you have not set a debugger password in DConf, it will use the default password ('totem')."
-msgstr "Kai paspausite OK, Totem lauks, kol prisijungsite prie jo su winpdb arba rpdb2. Jei nenustatėte derintuvės slaptažodžio su GConf, bus naudojamas numatytasis slaptažodis („totem“)."
-
-#: ../src/plugins/grilo/grilo.plugin.in.h:1
-msgid "Grilo Browser"
-msgstr "Grilo naršyklė"
-
-#: ../src/plugins/grilo/grilo.plugin.in.h:2
-msgid "A plugin to let you browse media content from various sources."
-msgstr "Įskiepis, leidžiantis naršyti daugialypės terpės turinį įvairuose šaltiniuose."
-
-#: ../src/plugins/grilo/totem-grilo.c:452
-msgid "Browse Error"
-msgstr "Naršymo klaida"
-
-#: ../src/plugins/grilo/totem-grilo.c:599
-msgid "Search Error"
-msgstr "Paieškos klaida"
-
-#: ../src/plugins/grilo/totem-grilo.c:1219
-#: ../src/plugins/grilo/grilo.ui.h:3
-msgid "Browse"
-msgstr "Naršyti"
-
-#: ../src/plugins/grilo/totem-grilo.c:1285
-#: ../src/plugins/grilo/grilo.ui.h:4
-msgid "Search"
-msgstr "Ieškoti"
-
-#: ../src/plugins/grilo/grilo.ui.h:1
-#| msgid "_Add to Playlist"
-msgid "Add to Playlist"
-msgstr "Pridėti į grojaraštį"
-
-#: ../src/plugins/grilo/grilo.ui.h:2
-#| msgid "_Copy Location"
-msgid "Copy Location"
-msgstr "Kopijuoti vietą"
-
-#~ msgid "Bemused"
-#~ msgstr "Bemused"
-
-#~ msgid "Control Totem through a mobile phone with a Bemused client"
-#~ msgstr "Valdykite Totem naudodami mobilųjį telefoną su Bemused klientu"
-
-#~ msgid "Untitled %d"
-#~ msgstr "Bevardis %d"
-
-#~ msgid "Totem Bemused Server"
-#~ msgstr "Totem Bemused serveris"
-
-#~ msgid "Totem Bemused Server version 1.0"
-#~ msgstr "Totem Bemused serveris v. 1.0"
-
-#~ msgid "A plugin to let you browse YouTube videos."
-#~ msgstr "Įskiepis, leidžiantis naršyti YouTube video klipus."
-
-#~ msgid "YouTube Browser"
-#~ msgstr "YouTube naršyklė"
-
-#~ msgid "Related Videos"
-#~ msgstr "Susiję video klipai"
-
-#~ msgid "Search Results"
-#~ msgstr "Paieškos rezultatai"
-
-#~ msgid "Videos"
-#~ msgstr "Videoįrašai"
-
-#~ msgid "_Open in Web Browser"
-#~ msgstr "_Atverti žiniatinklio naršyklėje"
-
-#~ msgid "Open the video in your web browser"
-#~ msgstr "Atverti videoįrašą žiniatinklio naršyklėje"
-
-#~ msgid "YouTube"
-#~ msgstr "YouTube"
-
-#~ msgid "Cancelling query…"
-#~ msgstr "Nutraukiama užklausa..."
-
-#~ msgid "Error Searching for Videos"
-#~ msgstr "Klaida ieškant klipų"
-
-#~ msgid ""
-#~ "The response from the server could not be understood. Please check you "
-#~ "are running the latest version of libgdata."
-#~ msgstr ""
-#~ "Atsakymas iš serverio nesuprastas. Įsitikinkite, kad turite paskutinę "
-#~ "libgdata versiją."
-
-#~ msgid "Fetching search results…"
-#~ msgstr "Parsiunčiami paieškos rezultatai..."
-
-#~ msgid "Fetching related videos…"
-#~ msgstr "Parsiunčiami susiję klipai..."
-
-#~ msgid "Error Opening Video in Web Browser"
-#~ msgstr "Klaida atveriant video įrašą naršyklėje"
-
-#~ msgid "Fetching more videos…"
-#~ msgstr "Parsiunčiama daugiau klipų..."
-
-#~ msgid "Video Format Not Supported"
-#~ msgstr "Video formatas nepalaikomas"
-
-#~ msgid ""
-#~ "This video is not available in any formats which Totem supports. Would "
-#~ "you like to open it in your web browser instead?"
-#~ msgstr ""
-#~ "Šis video įrašas neprieinamas jokiu Totem palaikomu formatu. Ar "
-#~ "norėtumėte jį atidaryti naršyklėje?"
-
-#~ msgid "0 frames per second"
-#~ msgstr "0 kadrų per sekundę"
diff -Nru totem-3.4.3/po/lv.po totem-3.6.2/po/lv.po
--- totem-3.4.3/po/lv.po	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/po/lv.po	2012-10-25 13:15:32.000000000 +0000
@@ -3,38 +3,249 @@
 # Copyright (C) 2002
 # This file is distributed under the same license as the PACKAGE package.
 #
-# Peteris Krisjanis , 2002.
 # Linux Centrs , 2006.
 # Aigars , 2007.
 # Raivis Dejus , 2006, 2007, 2009.
-# Peteris Krisjanis , 2010.
 # Rudolfs , 2011.
 # Rūdofls Mazurs , 2011, 2012.
+# Peteris Krisjanis , 2002, 2010, 2012.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: lv\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=totem&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-03-23 06:16+0000\n"
-"PO-Revision-Date: 2012-03-24 18:45+0200\n"
-"Last-Translator: Rūdolfs Mazurs \n"
-"Language-Team: Latvian \n"
+"POT-Creation-Date: 2012-09-10 15:48+0000\n"
+"PO-Revision-Date: 2012-09-24 10:21+0300\n"
+"Last-Translator: Peteris Krisjanis \n"
+"Language-Team: Latviešu \n"
+"Language: lv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
+"2);\n"
 "X-Launchpad-Export-Date: 2009-01-04 12:56+0000\n"
-"X-Generator: Lokalize 1.2\n"
-"Language: lv\n"
+"X-Generator: Gtranslator 2.91.5\n"
+
+#: ../browser-plugin/totem-plugin-viewer.c:352 ../src/totem-object.c:1180
+#: ../src/totem-object.c:1650 ../src/totem-statusbar.c:115
+msgid "Stopped"
+msgstr "Apturēts"
+
+#: ../browser-plugin/totem-plugin-viewer.c:364 ../src/totem-object.c:1173
+msgid "Paused"
+msgstr "Pauzēts"
+
+#: ../browser-plugin/totem-plugin-viewer.c:368 ../src/totem-object.c:1166
+msgid "Playing"
+msgstr "Atskaņo"
+
+#: ../browser-plugin/totem-plugin-viewer.c:386
+#: ../src/plugins/screensaver/totem-screensaver.c:97
+msgid "Playing a movie"
+msgstr "Atskaņo filmu"
+
+#: ../browser-plugin/totem-plugin-viewer.c:443
+msgid "No URI to play"
+msgstr "Nav URI, ko atskaņot"
+
+#: ../browser-plugin/totem-plugin-viewer.c:676
+#: ../browser-plugin/totem-plugin-viewer.c:1700
+msgid "Totem Movie Player"
+msgstr "Totem filmu atskaņotājs"
+
+#. translators: this is:
+#. * Open With ApplicationName
+#. * as in nautilus' right-click menu
+#: ../browser-plugin/totem-plugin-viewer.c:1120
+#, c-format
+msgid "_Open with \"%s\""
+msgstr "_Atvērt ar “%s”"
+
+#: ../browser-plugin/totem-plugin-viewer.c:1341 ../src/totem-object.c:2475
+msgid "An error occurred"
+msgstr "Gadījās kļūda"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2033
+msgid "No playlist or playlist empty"
+msgstr "Nav repertuāra vai arī repertuārs ir tukšs"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2128
+msgid "Movie browser plugin"
+msgstr "Filmu pārlūka spraudnis"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144 ../src/totem.c:240
+msgid "Could not initialize the thread-safe libraries."
+msgstr "Nevarēja inicializēt pavediendrošās bibliotēkas."
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144
+msgid "Verify your system installation. The Totem plugin will now exit."
+msgstr "Pārbaudiet savas sistēmas instalāciju. Totem tagad aizvērsies."
 
 #: ../data/fullscreen.ui.h:1
 msgid "Leave Fullscreen"
 msgstr "Iziet no pilnekrāna režīma"
 
-#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:144
+#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:81
 msgid "Time:"
 msgstr "Laiks:"
 
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
+msgid "Allow the screensaver to activate when playing audio"
+msgstr "Atļaut aktivizēties ekrānsaudzētājam, kad skan tikai audio"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
+msgid ""
+"Allow the screensaver to activate when playing audio. Disable if you have "
+"monitor-powered speakers."
+msgstr ""
+"Atļaut aktivizēties ekrānsaudzētājam, kad skan tikai audio. Atslēdziet, ja "
+"skaļruņu darbību nodrošina monitors."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
+msgid "Show visual effects when no video is displayed"
+msgstr "Rādīt vizuālos efektus, kad video netiek attēlots"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
+msgid "Show visual effects when playing an audio only file."
+msgstr "Rādīt vizuālos efektus, kad tiek atskaņota tikai audio datne."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
+msgid "Name of the visual effects plugin"
+msgstr "Vizuālā efekta spraudņa nosaukums"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
+msgid "The brightness of the video"
+msgstr "Video spilgtums"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
+msgid "The contrast of the video"
+msgstr "Video kontrasts"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
+msgid "The hue of the video"
+msgstr "Video nokrāsa"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
+msgid "The saturation of the video"
+msgstr "Video piesātinājums"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
+msgid "Resize the canvas automatically on file load"
+msgstr "Automātiski mainīt audekla izmēru pie datnes ielādes"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
+msgid "Repeat mode"
+msgstr "Atkārtošanās režīms"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
+msgid "Shuffle mode"
+msgstr "Jaukšanas režīms"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
+msgid "Whether to disable deinterlacing for interlaced movies"
+msgstr "Vai atslēgt savērsi video ar rindpārlēces izvērsi (interlacing)"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
+msgid "Whether to enable debug for the playback engine"
+msgstr "Vai aktivēt atskaņošanas dzinēja atkļūdošanu"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
+msgid "Type of audio output to use"
+msgstr "Audio izvada tips, ko lietot"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
+msgid "Visualization quality setting"
+msgstr "Vizualizācijas kvalitātes iestatījumi"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
+msgid "Quality setting for the audio visualization."
+msgstr "Skaņas vizualizācijas kvalitātes iestatījumi."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
+msgid "Network buffering threshold"
+msgstr "Tīkla buferēšanas slieksnis"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
+msgid ""
+"Amount of data to buffer for network streams before starting to display the "
+"stream (in seconds)."
+msgstr ""
+"Datu daudzums tīkla straumēm, ko buferēt, pirms sākt tās rādīt (sekundēs)."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
+msgid "Subtitle font"
+msgstr "Subtitru fonts"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
+msgid "Pango font description for subtitle rendering."
+msgstr "Pango fonta apraksts subtitru renderēšanai"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
+msgid "Subtitle encoding"
+msgstr "Subtitru kodējums"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
+msgid "Encoding character set for subtitle."
+msgstr "Subtitru kodējuma rakstzīmju kopa."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
+msgid "Default location for the \"Open...\" dialogs"
+msgstr "Dialoglodziņu “Atvērt” noklusējuma atrašanās vieta"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
+msgid ""
+"Default location for the \"Open...\" dialogs. Default is the current "
+"directory."
+msgstr ""
+"Dialoglodziņu “Atvērt” noklusējuma atrašanās vieta, šobrīd noklusējuma mape "
+"ir pašreizējā mape."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
+msgid "Default location for the \"Take Screenshot\" dialogs"
+msgstr "Dialoglodziņu “Uzņemt ekrānattēlu” noklusējuma atrašanās vieta"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
+msgid ""
+"Default location for the \"Take Screenshot\" dialogs. Default is the "
+"Pictures directory."
+msgstr ""
+"Dialoglodziņu “Uzņemt ekrānattēlu” noklusējuma atrašanās vieta. Šobrīd "
+"noklusējuma mape ir “Attēli”."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
+msgid "Whether to disable the plugins in the user's home directory"
+msgstr "Vai deaktivēt spraudņus, kuri atrodas lietotāja mājas direktorijā"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
+msgid "Whether to disable the keyboard shortcuts"
+msgstr "Vai deaktivēt tastatūras saīsnes"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
+msgid "Whether to autoload text subtitle files when a movie is loaded"
+msgstr "Vai automātiski ielādēt subtitru datni, kad ir ielādēta filma"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
+msgid "Whether to autoload external chapter files when a movie is loaded"
+msgstr "Vai automātiski ielādēt ārējās nodaļas, kad ir ielādēta filma"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
+msgid ""
+"Whether to remember the position of played audio/video files when pausing or "
+"closing them"
+msgstr "Vai iegaumēt pēdējo datnes atskaņošanas vietu, pauzējot vai aizverot"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
+msgid "Active plugins list"
+msgstr "Aktīvo spraudņu saraksts"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+msgid ""
+"A list of the names of the plugins which are currently active (loaded and "
+"running)."
+msgstr "Saraksts ar spraudņiem, kuri tagad ir aktīvi (ielādēt un palaisti)."
+
 #: ../data/playlist.ui.h:1
 msgid "_Remove"
 msgstr "_Izņemt"
@@ -51,13 +262,13 @@
 msgid "Copy the location to the clipboard"
 msgstr "Kopēt atrašanās vietu uz starpliktuvi"
 
-#: ../data/playlist.ui.h:5 ../data/totem.ui.h:78
+#: ../data/playlist.ui.h:5 ../data/totem.ui.h:71
 msgid "_Select Text Subtitles..."
-msgstr "_Izvēlieties subtitrus"
+msgstr "_Izvēlieties subtitrus..."
 
-#: ../data/playlist.ui.h:6 ../data/totem.ui.h:79
+#: ../data/playlist.ui.h:6 ../data/totem.ui.h:72
 msgid "Select a file to use for text subtitles"
-msgstr "Izvēlieties failu no kura ielasīt subtitrus"
+msgstr "Izvēlieties datni, no kuras ielasīt subtitrus"
 
 #: ../data/playlist.ui.h:7
 msgid "Add..."
@@ -79,17 +290,172 @@
 msgid "Move Down"
 msgstr "Pārvietot lejup"
 
-#: ../data/properties.ui.h:1 ../data/totem.ui.h:122
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:2
+msgid "Normal"
+msgstr "Normāls"
+
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:4
+msgid "Large"
+msgstr "Liels"
+
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:6
+msgid "Extra Large"
+msgstr "Īpaši liels"
+
+#: ../data/preferences.ui.h:7 ../src/backend/bacon-video-widget.c:5498
+#: ../src/totem-properties-view.c:231
+msgid "Stereo"
+msgstr "Stereo"
+
+#: ../data/preferences.ui.h:8
+msgid "4-channel"
+msgstr "4 kanālu"
+
+#: ../data/preferences.ui.h:9
+msgid "4.1-channel"
+msgstr "4.1 kanālu"
+
+#: ../data/preferences.ui.h:10
+msgid "5.0-channel"
+msgstr "5.0 kanālu"
+
+#: ../data/preferences.ui.h:11
+msgid "5.1-channel"
+msgstr "5.1 kanālu"
+
+#: ../data/preferences.ui.h:12
+msgid "AC3 Passthrough"
+msgstr "AC3 tranzīts"
+
+#: ../data/preferences.ui.h:13
+msgid "Totem Preferences"
+msgstr "Totem iestatījumi"
+
+#: ../data/preferences.ui.h:14
+msgid "Playback"
+msgstr "Atskaņošana"
+
+#: ../data/preferences.ui.h:15
+msgid "Start playing files from last position"
+msgstr "Sākt atskaņot no pēdējās atskaņošanas vietas"
+
+#: ../data/preferences.ui.h:16
+msgid "Text Subtitles"
+msgstr "Teksta subtitri"
+
+#: ../data/preferences.ui.h:17
+msgid "_Load subtitle files when movie is loaded"
+msgstr "Ie_lādēt subtitrus, kad filma ir ielādējusies"
+
+#: ../data/preferences.ui.h:18
+msgid "_Font:"
+msgstr "_Fonts:"
+
+#: ../data/preferences.ui.h:19
+msgid "_Encoding:"
+msgstr "Kodē_jums:"
+
+#: ../data/preferences.ui.h:20
+msgid "External Chapters"
+msgstr "Ārējās nodaļas"
+
+#: ../data/preferences.ui.h:21
+msgid "Load _chapter files when movie is loaded"
+msgstr "Ielā_dēt nodaļu datnes, kad filma ir ielādējusies"
+
+#: ../data/preferences.ui.h:22 ../data/properties.ui.h:1
 msgid "General"
 msgstr "Vispārīgi"
 
+#. Tab label in the Preferences dialogue
+#: ../data/preferences.ui.h:24
+msgid "Display"
+msgstr "Attēlot"
+
+#: ../data/preferences.ui.h:25
+msgid "_Resize the window when a new video is loaded"
+msgstr "Mainīt loga izmē_ru, kad tiek ielādēts jauns video"
+
+#: ../data/preferences.ui.h:26
+msgid "Disable _deinterlacing of interlaced videos"
+msgstr "Atslēgt savērsi video ar rindpārlēces izvērsi (interlacing)"
+
+#: ../data/preferences.ui.h:27
+msgid "Disable screensaver when playing "
+msgstr "Atslēgt ekrānsaudzētāju atskaņošanas laikā "
+
+#: ../data/preferences.ui.h:28 ../data/properties.ui.h:9
+#: ../src/totem-properties-view.c:273
+msgid "Video"
+msgstr "Video"
+
+#: ../data/preferences.ui.h:29
+msgid "Video or Audio"
+msgstr "Video vai audio"
+
+#: ../data/preferences.ui.h:30
+msgid "Visual Effects"
+msgstr "Vizuālie efekti"
+
+#: ../data/preferences.ui.h:31
+msgid "Show _visual effects when an audio file is played"
+msgstr "Rādīt _vizuālos efektus, kad tiek atskaņota audio datne"
+
+#: ../data/preferences.ui.h:32
+msgid "_Type of visualization:"
+msgstr "Vizualizācijas _tips:"
+
+#: ../data/preferences.ui.h:33
+msgid "Visualization _size:"
+msgstr "Vizualizācija_s izmērs:"
+
+#: ../data/preferences.ui.h:34
+msgid "Color Balance"
+msgstr "Krāsu līdzsvars"
+
+#: ../data/preferences.ui.h:35
+msgid "_Brightness:"
+msgstr "Spil_gtums:"
+
+#: ../data/preferences.ui.h:36
+msgid "Co_ntrast:"
+msgstr "Ko_ntrasts:"
+
+#: ../data/preferences.ui.h:37
+msgid "Sat_uration:"
+msgstr "Piesātināj_ums:"
+
+#: ../data/preferences.ui.h:38
+msgid "_Hue:"
+msgstr "_Nokrāsa:"
+
+#: ../data/preferences.ui.h:39
+msgid "Reset to _Defaults"
+msgstr "Atstatīt uz _noklusējuma parametriem"
+
+#: ../data/preferences.ui.h:40
+msgid "Audio Output"
+msgstr "Audio izvade"
+
+#: ../data/preferences.ui.h:41
+msgid "_Audio output type:"
+msgstr "_Audio izvades tips:"
+
+#: ../data/preferences.ui.h:42 ../data/properties.ui.h:14
+#: ../src/totem-properties-view.c:271
+msgid "Audio"
+msgstr "Audio"
+
 #: ../data/properties.ui.h:2
 msgid "Title:"
 msgstr "Nosaukums:"
 
 #: ../data/properties.ui.h:3
 msgid "Artist:"
-msgstr "Mākslinieks:"
+msgstr "Izpildītājs:"
 
 #: ../data/properties.ui.h:4
 msgid "Duration:"
@@ -111,14 +477,9 @@
 msgid "Container:"
 msgstr "Konteineris:"
 
-#: ../data/properties.ui.h:9 ../data/totem.ui.h:128
-#: ../src/totem-properties-view.c:270
-msgid "Video"
-msgstr "Video"
-
 #: ../data/properties.ui.h:10
 msgid "Dimensions:"
-msgstr "Izmērs:"
+msgstr "Izmēri:"
 
 #: ../data/properties.ui.h:11
 msgid "Codec:"
@@ -126,772 +487,488 @@
 
 #: ../data/properties.ui.h:12
 msgid "Framerate:"
-msgstr "Kadrātrums:"
+msgstr "Kadru ātrums:"
 
 #: ../data/properties.ui.h:13
 msgid "Bitrate:"
 msgstr "Bitātrums:"
 
-#: ../data/properties.ui.h:14 ../data/totem.ui.h:142
-#: ../src/totem-properties-view.c:268
-msgid "Audio"
-msgstr "Audio"
-
 #: ../data/properties.ui.h:15
 msgid "Sample rate:"
-msgstr "Nolases kvalitāte:"
+msgstr "Nolases biežums:"
 
 #: ../data/properties.ui.h:16
 msgid "Channels:"
 msgstr "Kanāli:"
 
-#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
-msgid "_Add to Playlist"
-msgstr "_Pievienot repertuāram"
-
-#: ../data/video-list.ui.h:2
-msgid "Add the video to the playlist"
-msgstr "Pievienot video repertuāram"
-
 #. Title
-#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:143
-#: ../src/totem-object.c:1667
-msgid "Movie Player"
-msgstr "Filmu atskaņotājs"
+#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:80 ../src/totem.c:239
+#: ../src/totem.c:248 ../src/totem-menu.c:790 ../src/totem-object.c:1658
+msgid "Videos"
+msgstr "Video"
 
 #: ../data/totem.desktop.in.in.in.h:2
-msgid "Play movies and songs"
-msgstr "Atskaņot filmas un dziesmas"
+msgid "Play movies"
+msgstr "Atskaņot filmas"
+
+#: ../data/totem.desktop.in.in.in.h:3
+msgid "Video;Movie;Film;Clip;Series;Player;DVD;TV;Disc;"
+msgstr "Video;Filmas;Filma;Klips;Sērijas;Atskaņotājs;DVD;TV;Disks;"
 
 #: ../data/totem.ui.h:1
-msgid "_Movie"
-msgstr "Fil_ma"
+msgid "_Open"
+msgstr "_Atvērt"
 
 #: ../data/totem.ui.h:2
-msgid "_Open..."
-msgstr "_Atvērt..."
+msgid "Open _Location"
+msgstr "Atvērt _vietu"
 
 #: ../data/totem.ui.h:3
-msgid "Open a file"
-msgstr "Atvērt failu"
+msgid "_Fullscreen"
+msgstr "_Pilnekrāns"
 
 #: ../data/totem.ui.h:4
-msgid "Open _Location..."
-msgstr "Atvērt _vietu..."
+msgid "Prefere_nces"
+msgstr "Iestatīju_mi"
 
 #: ../data/totem.ui.h:5
-msgid "Open a non-local file"
-msgstr "Atvērt nevietējo failu"
+msgid "Shuff_le"
+msgstr "Sa_jaukt"
 
 #: ../data/totem.ui.h:6
-msgid "_Eject"
-msgstr "_Izgrūst"
+msgid "_Repeat"
+msgstr "Atkā_rtot"
 
 #: ../data/totem.ui.h:7
-msgid "Eject the current disc"
-msgstr "Izgrūst pašreizējo disku"
+msgid "_Quit"
+msgstr "_Iziet"
 
 #: ../data/totem.ui.h:8
-msgid "_Properties"
-msgstr "_Parametri"
+msgid "_Movie"
+msgstr "Fil_ma"
 
 #: ../data/totem.ui.h:9
-msgid "View the properties of the current stream"
-msgstr "Apskatīt pašreizējās plūsmas īpašības"
+msgid "_Eject"
+msgstr "_Izgrūst"
 
 #: ../data/totem.ui.h:10
-msgid "Play / P_ause"
-msgstr "Atskaņot / _Apturēt"
+msgid "Eject the current disc"
+msgstr "Izgrūst pašreizējo disku"
 
 #: ../data/totem.ui.h:11
-msgid "Play or pause the movie"
-msgstr "Spēlēt vai apturēt filmu"
+msgid "_Properties"
+msgstr "Ī_pašības"
 
 #: ../data/totem.ui.h:12
-msgid "_Quit"
-msgstr "_Iziet"
+msgid "View the properties of the current stream"
+msgstr "Apskatīt pašreizējās straumes īpašības"
 
 #: ../data/totem.ui.h:13
-msgid "Quit the program"
-msgstr "Iziet no programmas"
+msgid "Play / P_ause"
+msgstr "Atskaņot / p_auzēt"
 
 #: ../data/totem.ui.h:14
+msgid "Play or pause the movie"
+msgstr "Spēlēt vai pauzēt filmu"
+
+#: ../data/totem.ui.h:15
 msgid "_Edit"
 msgstr "R_ediģēt"
 
-#: ../data/totem.ui.h:15
+#: ../data/totem.ui.h:16
 msgid "_Clear Playlist"
-msgstr "_Notīrīt repertuāru"
+msgstr "_Attīrīt repertuāru"
 
-#: ../data/totem.ui.h:16
+#: ../data/totem.ui.h:17
 msgid "Clear the playlist"
 msgstr "Attīrīt repertuāru"
 
-#: ../data/totem.ui.h:17
-msgid "Prefere_nces"
-msgstr "Iestatīju_mi"
-
 #: ../data/totem.ui.h:18
-msgid "Configure the application"
-msgstr "Konfigurēt lietotni"
-
-#: ../data/totem.ui.h:19
 msgid "Plugins..."
 msgstr "Spraudņi..."
 
-#: ../data/totem.ui.h:20
+#: ../data/totem.ui.h:19
 msgid "Configure plugins to extend the application"
-msgstr "Konfigurēt spraudņus lai paplašinātu lietotni"
+msgstr "Konfigurēt spraudņus, lai paplašinātu lietotni"
 
-#: ../data/totem.ui.h:21
+#: ../data/totem.ui.h:20
 msgid "_View"
 msgstr "_Skats"
 
-#: ../data/totem.ui.h:22
-msgid "_Fullscreen"
-msgstr "_Pilnekrāns"
-
-#: ../data/totem.ui.h:23
-msgid "Switch to fullscreen"
-msgstr "Pārslēgties uz pilnekrānu"
-
-#: ../data/totem.ui.h:24
+#: ../data/totem.ui.h:21
 msgid "Fit Window to Movie"
 msgstr "Pielāgot loga izmēru filmai"
 
-#: ../data/totem.ui.h:25
+#: ../data/totem.ui.h:22
 msgid "_Resize 1:2"
-msgstr "Izmainīt u_z 1:2"
+msgstr "Mainīt u_z 1:2"
 
-#: ../data/totem.ui.h:26
+#: ../data/totem.ui.h:23
 msgid "Resize to half the original video size"
-msgstr "Izmainīt sākotnējā video izmēru uz divreiz mazāku"
+msgstr "Mainīt sākotnējā video izmēru uz divreiz mazāku"
 
-#: ../data/totem.ui.h:27
+#: ../data/totem.ui.h:24
 msgid "Resize _1:1"
 msgstr "Mainīt izmēru _1:1"
 
-#: ../data/totem.ui.h:28
+#: ../data/totem.ui.h:25
 msgid "Resize to the original video size"
-msgstr "Izmainīt video izmēru uz sākotnējo"
+msgstr "Mainīt video izmēru uz sākotnējo"
 
-#: ../data/totem.ui.h:29
+#: ../data/totem.ui.h:26
 msgid "Resize _2:1"
 msgstr "Mainīt izmēru _2:1"
 
-#: ../data/totem.ui.h:30
+#: ../data/totem.ui.h:27
 msgid "Resize to double the original video size"
-msgstr "Izmainīt oriģinālā video izmēru uz divreiz lielāku"
+msgstr "Mainīt oriģinālā video izmēru uz divreiz lielāku"
 
-#: ../data/totem.ui.h:31
+#: ../data/totem.ui.h:28
 msgid "_Aspect Ratio"
-msgstr "Izskata _attiecība"
+msgstr "Izmēru _attiecība"
 
-#: ../data/totem.ui.h:32
+#: ../data/totem.ui.h:29
 msgid "Switch An_gles"
-msgstr "Pārslē_gt stūrus"
+msgstr "Pārslē_gt leņķus"
 
-#: ../data/totem.ui.h:33
+#: ../data/totem.ui.h:30
 msgid "Switch camera angles"
 msgstr "Mainīt kameras leņķus"
 
-#: ../data/totem.ui.h:34
+#: ../data/totem.ui.h:31
 msgid "_Go"
 msgstr "_Iet"
 
-#: ../data/totem.ui.h:35
+#: ../data/totem.ui.h:32
 msgid "_DVD Menu"
 msgstr "_DVD izvēlne"
 
-#: ../data/totem.ui.h:36
+#: ../data/totem.ui.h:33
 msgid "Go to the DVD menu"
 msgstr "Iet uz DVD izvēlni"
 
-#: ../data/totem.ui.h:37
+#: ../data/totem.ui.h:34
 msgid "_Title Menu"
 msgstr "_Nosaukumu izvēlne"
 
-#: ../data/totem.ui.h:38
+#: ../data/totem.ui.h:35
 msgid "Go to the title menu"
 msgstr "Iet uz nosaukumu izvēlni"
 
-#: ../data/totem.ui.h:39
+#: ../data/totem.ui.h:36
 msgid "A_udio Menu"
 msgstr "A_udio izvēlne"
 
-#: ../data/totem.ui.h:40
+#: ../data/totem.ui.h:37
 msgid "Go to the audio menu"
 msgstr "Iet uz audio izvēlni"
 
-#: ../data/totem.ui.h:41
+#: ../data/totem.ui.h:38
 msgid "_Angle Menu"
 msgstr "Leņķ_a izvēlne"
 
-#: ../data/totem.ui.h:42
+#: ../data/totem.ui.h:39
 msgid "Go to the angle menu"
 msgstr "Iet uz leņķu izvēlni"
 
-#: ../data/totem.ui.h:43
+#: ../data/totem.ui.h:40
 msgid "_Chapter Menu"
-msgstr "_Nodaļas izvēlne"
+msgstr "_Nodaļu izvēlne"
 
-#: ../data/totem.ui.h:44
+#: ../data/totem.ui.h:41
 msgid "Go to the chapter menu"
-msgstr "Iet uz nodaļas izvēlni"
+msgstr "Iet uz nodaļu izvēlni"
 
-#: ../data/totem.ui.h:45
+#: ../data/totem.ui.h:42
 msgid "_Next Chapter/Movie"
 msgstr "_Nākošā nodaļa/filma"
 
-#: ../data/totem.ui.h:46
+#: ../data/totem.ui.h:43
 msgid "Next chapter or movie"
 msgstr "Nākošā nodaļa vai filma"
 
-#: ../data/totem.ui.h:47
+#: ../data/totem.ui.h:44
 msgid "_Previous Chapter/Movie"
 msgstr "Ie_priekšējā nodaļa/filma"
 
-#: ../data/totem.ui.h:48
+#: ../data/totem.ui.h:45
 msgid "Previous chapter or movie"
 msgstr "Iepriekšējā nodaļa vai filma"
 
-#: ../data/totem.ui.h:49
+#: ../data/totem.ui.h:46
 msgid "_Sound"
 msgstr "_Skaņa"
 
-#: ../data/totem.ui.h:50
+#: ../data/totem.ui.h:47
 msgid "Volume _Up"
-msgstr "Skaņ_u skaļāk"
+msgstr "Palielināt skaļ_umu"
 
-#: ../data/totem.ui.h:51
+#: ../data/totem.ui.h:48
 msgid "Increase volume"
 msgstr "Palielināt skaļumu"
 
-#: ../data/totem.ui.h:52
+#: ../data/totem.ui.h:49
 msgid "Volume _Down"
-msgstr "Skaņu k_lusāk"
+msgstr "_Samazināt skaļumu"
 
-#: ../data/totem.ui.h:53
+#: ../data/totem.ui.h:50
 msgid "Decrease volume"
 msgstr "Samazināt skaļumu"
 
-#: ../data/totem.ui.h:54
+#: ../data/totem.ui.h:51
 msgid "_Help"
 msgstr "_Palīdzība"
 
-#: ../data/totem.ui.h:55
+#: ../data/totem.ui.h:52
 msgid "_Contents"
 msgstr "_Saturs"
 
-#: ../data/totem.ui.h:56
+#: ../data/totem.ui.h:53
 msgid "Help contents"
 msgstr "Palīdzības saturs"
 
-#: ../data/totem.ui.h:57
+#: ../data/totem.ui.h:54
 msgid "_About"
 msgstr "P_ar"
 
-#: ../data/totem.ui.h:58
+#: ../data/totem.ui.h:55
 msgid "About this application"
 msgstr "Par šo lietotni"
 
-#: ../data/totem.ui.h:59
-msgid "_Repeat Mode"
-msgstr "Atkārtošanās _režīms"
-
-#: ../data/totem.ui.h:60
-msgid "Set the repeat mode"
-msgstr "Iestatīt atkārtošanas režīmu"
-
-#: ../data/totem.ui.h:61
-msgid "Shuff_le Mode"
-msgstr "Jau_kšanas režīms"
-
-#: ../data/totem.ui.h:62
-msgid "Set the shuffle mode"
-msgstr "Iestatīt jaukšanas režīmu"
-
-#: ../data/totem.ui.h:63
+#: ../data/totem.ui.h:56
 msgid "Show _Controls"
-msgstr "Parādīt _vadības paneli"
+msgstr "Rādīt _vadīklas"
 
-#: ../data/totem.ui.h:64
+#: ../data/totem.ui.h:57
 msgid "Show controls"
-msgstr "Parādīt vadības paneli"
+msgstr "Rādīt vadības paneli"
 
-#: ../data/totem.ui.h:65
+#: ../data/totem.ui.h:58
 msgid "S_idebar"
 msgstr "Sānu _josla"
 
-#: ../data/totem.ui.h:66
+#: ../data/totem.ui.h:59
 msgid "Show or hide the sidebar"
-msgstr "Rādīt vai slēpt blakusjoslu"
+msgstr "Rādīt vai slēpt sānu joslu"
 
-#: ../data/totem.ui.h:67
+#: ../data/totem.ui.h:60
 msgctxt "Aspect ratio"
 msgid "Auto"
 msgstr "Auto"
 
-#: ../data/totem.ui.h:68
-msgid "Sets automatic aspect ratio"
-msgstr "Iestata automātisko izskata attiecību"
-
-#: ../data/totem.ui.h:69
-msgid "Square"
-msgstr "Kvadrāts"
-
-#: ../data/totem.ui.h:70
-msgid "Sets square aspect ratio"
-msgstr "Iestata kvadrātveida izskata attiecību"
-
-#: ../data/totem.ui.h:71
-msgid "4:3 (TV)"
-msgstr "4:3 (TV)"
-
-#: ../data/totem.ui.h:72
-msgid "Sets 4:3 (TV) aspect ratio"
-msgstr "Iestata 4:3 (TV) izskata attiecību"
-
-#: ../data/totem.ui.h:73
-msgid "16:9 (Widescreen)"
-msgstr "16:9 (Platekrāns)"
-
-#: ../data/totem.ui.h:74
-msgid "Sets 16:9 (widescreen) aspect ratio"
-msgstr "Iestata 16:9 (platekrāna) attiecību"
-
-#: ../data/totem.ui.h:75
-msgid "2.11:1 (DVB)"
-msgstr "2.11:1 (DVB)"
-
-#: ../data/totem.ui.h:76
-msgid "Sets 2.11:1 (DVB) aspect ratio"
-msgstr "Iestata 2.11:1 (DVB) izskata attiecību"
-
-#: ../data/totem.ui.h:77
-msgid "S_ubtitles"
-msgstr "S_ubtitri"
-
-#: ../data/totem.ui.h:80
-msgid "_Languages"
-msgstr "Va_lodas"
-
-#: ../data/totem.ui.h:81
-msgid "Zoom In"
-msgstr "Tuvināt"
-
-#: ../data/totem.ui.h:82
-msgid "Zoom in"
-msgstr "Tuvināt"
-
-#: ../data/totem.ui.h:83
-msgid "Skip _Forward"
-msgstr "Pārlekt _uz priekšu"
-
-#: ../data/totem.ui.h:84
-msgid "Skip forward"
-msgstr "Pārlekt uz priekšu"
-
-#: ../data/totem.ui.h:85
-msgid "Skip _Backwards"
-msgstr "Pārlek_t atpakaļ"
-
-#: ../data/totem.ui.h:86
-msgid "Skip backwards"
-msgstr "Pārlekt atpakaļ"
-
-#: ../data/totem.ui.h:87
-msgid "14.4 Kbps Modem"
-msgstr "14.4 Kbps modems"
-
-#: ../data/totem.ui.h:88
-msgid "19.2 Kbps Modem"
-msgstr "19.2 Kbps modems"
-
-#: ../data/totem.ui.h:89
-msgid "28.8 Kbps Modem"
-msgstr "28.8 Kbps modems"
-
-#: ../data/totem.ui.h:90
-msgid "33.6 Kbps Modem"
-msgstr "33.6 Kbps modems"
-
-#: ../data/totem.ui.h:91
-msgid "34.4 Kbps Modem"
-msgstr "34.4 Kbps modems"
-
-#: ../data/totem.ui.h:92
-msgid "56 Kbps Modem/ISDN"
-msgstr "56 Kbps modems/ISDN"
-
-#: ../data/totem.ui.h:93
-msgid "112 Kbps Dual ISDN/DSL"
-msgstr "112 Kbps duālais ISDN/DSL"
-
-#: ../data/totem.ui.h:94
-msgid "256 Kbps DSL/Cable"
-msgstr "256 Kbps DSL/kabelis"
-
-#: ../data/totem.ui.h:95
-msgid "384 Kbps DSL/Cable"
-msgstr "384 Kbps DSL/kabelis"
-
-#: ../data/totem.ui.h:96
-msgid "512 Kbps DSL/Cable"
-msgstr "512 Kbps DSL/kabelis"
-
-#: ../data/totem.ui.h:97
-msgid "1.5 Mbps T1/Intranet/LAN"
-msgstr "1.5 Mbps T1/Intranet/LAN"
-
-#: ../data/totem.ui.h:98
-msgid "Intranet/LAN"
-msgstr "Intranet/LAN"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:100
-msgid "Normal"
-msgstr "Normāls"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:102
-msgid "Large"
-msgstr "Liels"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:104
-msgid "Extra Large"
-msgstr "Īpaši liels"
-
-#: ../data/totem.ui.h:105 ../src/totem-properties-view.c:228
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5593
-msgid "Stereo"
-msgstr "Stereo"
-
-#: ../data/totem.ui.h:106
-msgid "4-channel"
-msgstr "4 kanālu"
-
-#: ../data/totem.ui.h:107
-msgid "4.1-channel"
-msgstr "4.1 kanālu"
-
-#: ../data/totem.ui.h:108
-msgid "5.0-channel"
-msgstr "5.0 kanālu"
-
-#: ../data/totem.ui.h:109
-msgid "5.1-channel"
-msgstr "5.1 kanālu"
-
-#: ../data/totem.ui.h:110
-msgid "AC3 Passthrough"
-msgstr "AC3 Passthrough"
-
-#: ../data/totem.ui.h:111
-msgid "Totem Preferences"
-msgstr "Totem Iestatījumi"
-
-#: ../data/totem.ui.h:112
-msgid "Playback"
-msgstr "Atskaņot"
-
-#: ../data/totem.ui.h:113
-msgid "Start playing files from last position"
-msgstr "Sākt atskaņot no pēdējās atskaņošanas vietas"
-
-#: ../data/totem.ui.h:114
-msgid "Networking"
-msgstr "Tīkls"
-
-#: ../data/totem.ui.h:115
-msgid "Connection _speed:"
-msgstr "_Savienojuma ātrums:"
-
-#: ../data/totem.ui.h:116
-msgid "Text Subtitles"
-msgstr "Teksta subtitri"
-
-#: ../data/totem.ui.h:117
-msgid "_Load subtitle files when movie is loaded"
-msgstr "Ie_lādēt subtitrus, kad filma ir ielādējusies"
-
-#: ../data/totem.ui.h:118
-msgid "_Font:"
-msgstr "_Fonts:"
-
-#: ../data/totem.ui.h:119
-msgid "_Encoding:"
-msgstr "Kod_ējums:"
-
-#: ../data/totem.ui.h:120
-msgid "External Chapters"
-msgstr "Ārējās nodaļas"
-
-#: ../data/totem.ui.h:121
-msgid "Load _chapter files when movie is loaded"
-msgstr "Ielā_dēt nodaļu failus, kad filma ir ielādējusies"
-
-#. Tab label in the Preferences dialogue
-#: ../data/totem.ui.h:124
-msgid "Display"
-msgstr "Attēlot"
-
-#: ../data/totem.ui.h:125
-msgid "_Resize the window when a new video is loaded"
-msgstr "Mainīt loga izmē_ru, kad tiek ielādēts jauns video"
-
-#: ../data/totem.ui.h:126
-msgid "Disable _deinterlacing of interlaced videos"
-msgstr "Atslēgt savērsi video ar rindpārlēces izvērsi (interlacing)"
-
-#: ../data/totem.ui.h:127
-msgid "Disable screensaver when playing "
-msgstr "Atslēgt ekrānsaudzētāju atskaņošanas laikā "
-
-#: ../data/totem.ui.h:129
-msgid "Video or Audio"
-msgstr "Video vai audio"
-
-#: ../data/totem.ui.h:130
-msgid "Visual Effects"
-msgstr "Vizuālie efekti"
-
-#: ../data/totem.ui.h:131
-msgid "Show _visual effects when an audio file is played"
-msgstr "Parādīt _vizuālos efektus, kad tiek atskaņots audio fails"
-
-#: ../data/totem.ui.h:132
-msgid "_Type of visualization:"
-msgstr "Vizualizācijas _tips:"
-
-#: ../data/totem.ui.h:133
-msgid "Visualization _size:"
-msgstr "Vizualizācija_s izmērs:"
-
-#: ../data/totem.ui.h:134
-msgid "Color Balance"
-msgstr "Krāsu balanss"
-
-#: ../data/totem.ui.h:135
-msgid "_Brightness:"
-msgstr "Spil_gtums:"
-
-#: ../data/totem.ui.h:136
-msgid "Co_ntrast:"
-msgstr "Ko_ntrasts:"
-
-#: ../data/totem.ui.h:137
-msgid "Sat_uration:"
-msgstr "Piesātināj_ums:"
-
-#: ../data/totem.ui.h:138
-msgid "_Hue:"
-msgstr "_Nokrāsa:"
-
-#: ../data/totem.ui.h:139
-msgid "Reset to _Defaults"
-msgstr "Pārstatīt uz _noklusētajiem parametriem"
-
-#: ../data/totem.ui.h:140
-msgid "Audio Output"
-msgstr "Audio izvade"
-
-#: ../data/totem.ui.h:141
-msgid "_Audio output type:"
-msgstr "_Audio izvada tips:"
-
-#: ../data/totem.ui.h:145
-msgid "Time seek bar"
-msgstr "Laika meklēšanas josla"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
-msgid "Allow the screensaver to activate when playing audio"
-msgstr "Atļaut aktivizēties ekrānsaudzētājam kad skan tikai audio"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
-msgid ""
-"Allow the screensaver to activate when playing audio. Disable if you have "
-"monitor-powered speakers."
-msgstr ""
-"Atļaut aktivizēties ekrānsaudzētājam kad skan tikai audio. Atslēdziet, ja "
-"skaļruņu darbību nodrošina monitors."
+#: ../data/totem.ui.h:61
+msgid "Sets automatic aspect ratio"
+msgstr "Iestata automātisko izmēru attiecību"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
-msgid "Show visual effects when no video is displayed"
-msgstr "Parādīt vizuālos efektus, kad video netiek rādīts"
+#: ../data/totem.ui.h:62
+msgid "Square"
+msgstr "Kvadrāts"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
-msgid "Show visual effects when playing an audio only file."
-msgstr "Parādīt vizuālos efektus, kad tiek atskaņots tikai audio fails."
+#: ../data/totem.ui.h:63
+msgid "Sets square aspect ratio"
+msgstr "Iestata kvadrātveida izmēru attiecību"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
-msgid "Name of the visual effects plugin"
-msgstr "Vizuālā efekta spraudņa nosaukums"
+#: ../data/totem.ui.h:64
+msgid "4:3 (TV)"
+msgstr "4:3 (TV)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
-msgid "The brightness of the video"
-msgstr "Video spilgtums"
+#: ../data/totem.ui.h:65
+msgid "Sets 4:3 (TV) aspect ratio"
+msgstr "Iestata 4:3 (TV) izmēru attiecību"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
-msgid "The contrast of the video"
-msgstr "Video kontrasts"
+#: ../data/totem.ui.h:66
+msgid "16:9 (Widescreen)"
+msgstr "16:9 (platekrāns)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
-msgid "The hue of the video"
-msgstr "Video nokrāsa"
+#: ../data/totem.ui.h:67
+msgid "Sets 16:9 (widescreen) aspect ratio"
+msgstr "Iestata 16:9 (platekrāna) izmēru attiecību"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
-msgid "The saturation of the video"
-msgstr "Video piesātinājums"
+#: ../data/totem.ui.h:68
+msgid "2.11:1 (DVB)"
+msgstr "2.11:1 (DVB)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
-msgid "Resize the canvas automatically on file load"
-msgstr "Mainīt audekla izmēru automātiski pie faila ielādes"
+#: ../data/totem.ui.h:69
+msgid "Sets 2.11:1 (DVB) aspect ratio"
+msgstr "Iestata 2.11:1 (DVB) izmēru attiecību"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
-msgid "Network connection speed"
-msgstr "Tīkla _savienojuma ātrums:"
+#: ../data/totem.ui.h:70
+msgid "S_ubtitles"
+msgstr "S_ubtitri"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
-msgid ""
-"Approximate network connection speed, used to select quality on media over "
-"the network."
-msgstr ""
-"Aptuvenais tīkla savienojuma ātrums, ko izmanto, lai izvēlētos kvalitāti "
-"datiem, kurus sūta caur tīklu."
+#: ../data/totem.ui.h:73
+msgid "_Languages"
+msgstr "Va_lodas"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
-msgid "Repeat mode"
-msgstr "Atkārtošanās režīms"
+#: ../data/totem.ui.h:74
+msgid "Zoom In"
+msgstr "Tuvināt"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
-msgid "Shuffle mode"
-msgstr "Jaukšanas režīms"
+#: ../data/totem.ui.h:75
+msgid "Zoom in"
+msgstr "Tuvināt"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
-msgid "Whether to disable deinterlacing for interlaced movies"
-msgstr "Vai atslēgt savērsi video ar rindpārlēces izvērsi (interlacing)"
+#: ../data/totem.ui.h:76
+msgid "Skip _Forward"
+msgstr "Pārlekt _uz priekšu"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
-msgid "Whether to enable debug for the playback engine"
-msgstr "Vai ieslēgt atskaņošanas dzinēja lāgošanu"
+#: ../data/totem.ui.h:77
+msgid "Skip forward"
+msgstr "Pārlekt uz priekšu"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
-msgid "Type of audio output to use"
-msgstr "Audio izvada tips, ko lietos"
+#: ../data/totem.ui.h:78
+msgid "Skip _Backwards"
+msgstr "Pārlek_t atpakaļ"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
-msgid "Visualization quality setting"
-msgstr "Vizualizācijas kvalitātes iestatījumi"
+#: ../data/totem.ui.h:79
+msgid "Skip backwards"
+msgstr "Pārlekt atpakaļ"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
-msgid "Quality setting for the audio visualization."
-msgstr "Skaņas vizualizācijas kvalitātes iestatījumi."
+#: ../data/totem.ui.h:82
+msgid "Time seek bar"
+msgstr "Laika meklēšanas josla"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
-msgid "Network buffering threshold"
-msgstr "Tīkla buferēšanas slieksnis"
+#: ../data/uri.ui.h:1
+msgid "Enter the _address of the file you would like to open:"
+msgstr "Ievadiet _adresi (URI) datnei, ko vēlaties atvērt:"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
-msgid ""
-"Amount of data to buffer for network streams before starting to display the "
-"stream (in seconds)."
-msgstr ""
-"Datu daudzums tīkla plūsmām, ko buferēt, pirms sākt tās rādīt (sekundēs)."
+#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
+msgid "_Add to Playlist"
+msgstr "Pievienot repertuār_am"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
-msgid "Subtitle font"
-msgstr "Subtitru fonts"
+#: ../data/video-list.ui.h:2
+msgid "Add the video to the playlist"
+msgstr "Pievienot video repertuāram"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
-msgid "Pango font description for subtitle rendering."
-msgstr "Pango fonta apraksts subtitru renderēšanai"
+#: ../src/backend/bacon-video-widget.c:1643
+msgid "Password requested for RTSP server"
+msgstr "RTSP serveris pieprasa paroli"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
-msgid "Subtitle encoding"
-msgstr "Subtitru kodējums"
+#: ../src/backend/bacon-video-widget.c:2944
+#, c-format
+msgid "Audio Track #%d"
+msgstr "Audio celiņš #%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
-msgid "Encoding character set for subtitle."
-msgstr "Subtitru kodējums."
+#: ../src/backend/bacon-video-widget.c:2948
+#, c-format
+msgid "Subtitle #%d"
+msgstr "Subtitri #%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
-msgid "Default location for the \"Open...\" dialogs"
-msgstr "Noklusētā \"Atvērt...\" loga atrašanās vieta"
+#: ../src/backend/bacon-video-widget.c:3345
+msgid "The server you are trying to connect to is not known."
+msgstr "Serveris, kuram jūs mēģinat piekļūt, nav atrodams."
+
+#: ../src/backend/bacon-video-widget.c:3348
+msgid "The connection to this server was refused."
+msgstr "Piekļuve serverim tika aizliegta."
+
+#: ../src/backend/bacon-video-widget.c:3351
+msgid "The specified movie could not be found."
+msgstr "Norādītā filma nav atrasta."
+
+#: ../src/backend/bacon-video-widget.c:3358
+msgid "The server refused access to this file or stream."
+msgstr "Serveris aizliedza pieeju šai datnei vai straumei."
+
+#: ../src/backend/bacon-video-widget.c:3364
+msgid "Authentication is required to access this file or stream."
+msgstr "Lai piekļūtu šai datnei vai straumei, nepieciešama autentifikācija."
+
+#: ../src/backend/bacon-video-widget.c:3371
+msgid "You are not allowed to open this file."
+msgstr "Jums nav atļaujas atvērt šo datni."
+
+#: ../src/backend/bacon-video-widget.c:3376
+#| msgid "File is not a valid .desktop file"
+msgid "This location is not a valid one."
+msgstr "Atrašanās vieta nav derīga."
+
+#: ../src/backend/bacon-video-widget.c:3384
+#| msgid "The movie could not be recorded."
+msgid "The movie could not be read."
+msgstr "Filmu nevarēja nolasīt."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
+#. should be exactly one missing thing (source or converter)
+#: ../src/backend/bacon-video-widget.c:3407
+#: ../src/backend/bacon-video-widget.c:3415
+#, c-format
+msgid "The playback of this movie requires a %s plugin which is not installed."
+msgid_plural ""
+"The playback of this movie requires the following decoders which are not "
+"installed:\n"
+"\n"
+"%s"
+msgstr[0] ""
+"Šīs filmas atskaņošanai ir nepieciešams %s spraudnis, kurš nav uzinstalēts."
+msgstr[1] ""
+"Šīs filmas atskaņošanai ir nepieciešami sekojoši kodeki, kas nav "
+"uzinstalēti:\n"
+"\n"
+"%s"
+msgstr[2] ""
+"Šīs filmas atskaņošanai ir nepieciešami sekojoši kodeki, kas nav "
+"uzinstalēti:\n"
+"\n"
+"%s"
+
+#: ../src/backend/bacon-video-widget.c:3426
+#| msgid ""
+#| "Audio codec '%s' is not handled. You might need to install additional "
+#| "plugins to be able to play some types of movies"
 msgid ""
-"Default location for the \"Open...\" dialogs. Default is the current "
-"directory."
+"An audio or video stream is not handled due to missing codecs. You might "
+"need to install additional plugins to be able to play some types of movies"
 msgstr ""
-"Noklusētā \"Atvērt...\" loga atrašanās vieta, šobrīd noklusētā ir pašreizējā "
-"mape."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
-msgid "Default location for the \"Take Screenshot\" dialogs"
-msgstr "Noklusētā \"Uzņemt ekrānattēlu...\" loga atrašanās vieta"
+"Audio vai video straume nav apstrādāta trūkstošo kodeku dēļ. Jums vajadzētu "
+"uzinstalēt papildus spraudņus, lai spētu atskaņot dažu formātu filmas."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
+#: ../src/backend/bacon-video-widget.c:3436
+#| msgid ""
+#| "Cannot play this file over the network. Try downloading it to disk first."
 msgid ""
-"Default location for the \"Take Screenshot\" dialogs. Default is the "
-"Pictures directory."
+"This file cannot be played over the network. Try downloading it locally "
+"first."
 msgstr ""
-"Noklusētā \"Uzņemt ekrānattēlu...\" loga atrašanās vieta. Šobrīd noklusētā "
-"ir  mape \"Pictures\"."
+"Nevar atskaņot šo datni caur tīklu. Pamēģiniet to vispirms lejupielādēt uz "
+"diska."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
-msgid "Whether to disable the plugins in the user's home directory"
-msgstr "Vai atslēgt spraudņus, kuri atrodas lietotāja mājas direktorijā"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
-msgid "Whether to disable the keyboard shortcuts"
-msgstr "Vai atslēgt tastatūras saīsnes"
+#: ../src/backend/bacon-video-widget.c:5494 ../src/totem-properties-view.c:227
+msgid "Surround"
+msgstr "Surround"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
-msgid "Whether to autoload text subtitle files when a movie is loaded"
-msgstr "Vai automātiski ielādēt subtitru failu, kad ir ielādēta filma"
+#: ../src/backend/bacon-video-widget.c:5496 ../src/totem-properties-view.c:229
+msgid "Mono"
+msgstr "Mono"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
-msgid "Whether to autoload external chapter files when a movie is loaded"
-msgstr "Vai automātiski ielādēt ārējās nodaļas, kad ir ielādēta filma"
+#: ../src/backend/bacon-video-widget.c:5781
+msgid "Media contains no supported video streams."
+msgstr "Datu nesējs nesatur atbalstītas video straumes."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+#: ../src/backend/bacon-video-widget.c:5963
+#| msgid ""
+#| "No video output is available. Make sure that the program is correctly "
+#| "installed."
 msgid ""
-"Whether to remember the position of played audio/video files when pausing or "
-"closing them"
+"Some necessary plug-ins are missing. Make sure that the program is correctly "
+"installed."
 msgstr ""
-"Vai iegaumēt pēdējo faila atskaņošanas vietu pauzēšanas vai aizvēršanas "
-"gadījumā"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:35
-msgid "Active plugins list"
-msgstr "Aktīvo spraudņu saraksts"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:36
-msgid ""
-"A list of the names of the plugins which are currently active (loaded and "
-"running)."
-msgstr "Saraksts ar spraudņiem, kuri tagad ir aktīvi (ielādēt un palaisti)."
-
-#: ../data/uri.ui.h:1
-msgid "Enter the _address of the file you would like to open:"
-msgstr "Ievadiet _adresi (URI) failam, ko vēlaties atvērt:"
+"Daži nepieciešamie spraudņi nav atrodami. Pārliecinieties, ka programma ir "
+"pareizi uzinstalēta."
 
 #: ../src/eggdesktopfile.c:165
 #, c-format
 msgid "File is not a valid .desktop file"
-msgstr "Fails nav derīgs .desktop fails"
+msgstr "Datne nav derīga .desktop datne"
 
 #: ../src/eggdesktopfile.c:188
 #, c-format
 msgid "Unrecognized desktop file Version '%s'"
-msgstr "Nav atpazīta faila versija '%s'"
+msgstr "Neatpazīta darbvirsmas datnes versija “%s”"
 
 #: ../src/eggdesktopfile.c:968
 #, c-format
 msgid "Starting %s"
-msgstr "Palaižu %s"
+msgstr "Palaiž %s"
 
 #: ../src/eggdesktopfile.c:1110
 #, c-format
@@ -901,30 +978,30 @@
 #: ../src/eggdesktopfile.c:1178
 #, c-format
 msgid "Unrecognized launch option: %d"
-msgstr "Nav atpazīta palaišanas opcija: %d"
+msgstr "Neatpazīta palaišanas opcija: %d"
 
 #: ../src/eggdesktopfile.c:1383
 #, c-format
 msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
-msgstr "Nevar padot dokumenta URI darba virsmas ierakstam 'Type=Link'"
+msgstr "Nevar padot dokumenta URI darbvirsmas ierakstam 'Type=Link'"
 
 #: ../src/eggdesktopfile.c:1404
 #, c-format
 msgid "Not a launchable item"
-msgstr "Šī nav palaižama vienība"
+msgstr "Nav palaižams vienums"
 
 #: ../src/eggfileformatchooser.c:240
 #, c-format
 msgid "File _Format: %s"
-msgstr "Faila _formāts %s"
+msgstr "Datnes _formāts — %s"
 
 #: ../src/eggfileformatchooser.c:379
 msgid "All Files"
-msgstr "Visi faili"
+msgstr "Visas datnes"
 
 #: ../src/eggfileformatchooser.c:380
 msgid "All Supported Files"
-msgstr "Atbalstītie faili"
+msgstr "Visas atbalstītās datnes"
 
 #: ../src/eggfileformatchooser.c:389
 msgid "By Extension"
@@ -932,43 +1009,43 @@
 
 #: ../src/eggfileformatchooser.c:404
 msgid "File Format"
-msgstr "Faila formāts"
+msgstr "Datnes formāts"
 
 #: ../src/eggfileformatchooser.c:422
 msgid "Extension(s)"
-msgstr "Pēc paplašinājuma(-iem)"
+msgstr "Paplašinājums(-i)"
 
 #. Translators: the parameter is a filename
 #: ../src/eggfileformatchooser.c:657
 #, c-format
 msgid ""
-"The program was not able to find out the file format you want to use for `%"
-"s'. Please make sure to use a known extension for that file or manually "
+"The program was not able to find out the file format you want to use for `"
+"%s'. Please make sure to use a known extension for that file or manually "
 "choose a file format from the list below."
 msgstr ""
-"Aplikācijai nespēja noteikt kuru faila faila formātu izmantot`%s'. "
-"Pārliecinieties, ka izmantojat pareizu faila paplašinājumu vai arī pašrocīgi "
-"izvēlieties faila formātu no apakšā esošā saraksta."
+"Lietotne nespēja noteikt, kuru datnes formātu jūs vēlaties izmantot datnei "
+"“%s”. Pārliecinieties, ka izmantojat pareizu datnes paplašinājumu, vai arī "
+"pašrocīgi izvēlieties datnes formātu no apakšā esošā saraksta."
 
 #: ../src/eggfileformatchooser.c:664
 msgid "File format not recognized"
-msgstr "Faila formāts nav atpazīts"
+msgstr "Datnes formāts nav atpazīts"
 
 #: ../src/eggsmclient.c:226
 msgid "Disable connection to session manager"
-msgstr "Atslēgt savienojumu ar sesijas pārvaldnieku"
+msgstr "Deaktivēt savienojumu ar sesijas pārvaldnieku"
 
 #: ../src/eggsmclient.c:229
 msgid "Specify file containing saved configuration"
-msgstr "Norādiet saglabātās konfigurācijas saturošo failu"
+msgstr "Norādīt datni, kas satur saglabāto konfigurāciju"
 
 #: ../src/eggsmclient.c:229
 msgid "FILE"
-msgstr "Fails"
+msgstr "DATNE"
 
 #: ../src/eggsmclient.c:232
 msgid "Specify session management ID"
-msgstr "Norādīt sesijas pārvaldnieka ID"
+msgstr "Norādiet sesiju pārvaldības ID"
 
 #: ../src/eggsmclient.c:232
 msgid "ID"
@@ -976,11 +1053,36 @@
 
 #: ../src/eggsmclient.c:253
 msgid "Session management options:"
-msgstr "Sesijas pārvaldnieka opcijas:"
+msgstr "Sesiju pārvaldības opcijas:"
 
 #: ../src/eggsmclient.c:254
 msgid "Show session management options"
-msgstr "Parādīt sesijas pārvaldnieka opcijas:"
+msgstr "Rādīt sesiju pārvaldības opcijas"
+
+#. hour:minutes:seconds
+#. Translators: This is a time format, like "9:05:02" for 9
+#. * hours, 5 minutes, and 2 seconds. You may change ":" to
+#. * the separator that your locale uses or use "%Id" instead
+#. * of "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:56
+#: ../src/plugins/skipto/totem-time-entry.c:57
+#, c-format
+msgctxt "long time format"
+msgid "%d:%02d:%02d"
+msgstr "%d:%02d:%02d"
+
+#. minutes:seconds
+#. Translators: This is a time format, like "5:02" for 5
+#. * minutes and 2 seconds. You may change ":" to the
+#. * separator that your locale uses or use "%Id" instead of
+#. * "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:65
+#, c-format
+msgctxt "short time format"
+msgid "%d:%02d"
+msgstr "%d:%02d"
 
 #. Title
 #. Artist
@@ -1045,7 +1147,7 @@
 msgid_plural "%d hours"
 msgstr[0] "%d stunda"
 msgstr[1] "%d stundas"
-msgstr[2] "%d stundas"
+msgstr[2] "%d stundu"
 
 #: ../src/properties/bacon-video-widget-properties.c:158
 #, c-format
@@ -1053,7 +1155,7 @@
 msgid_plural "%d minutes"
 msgstr[0] "%d minūte"
 msgstr[1] "%d minūtes"
-msgstr[2] "%d minūtes"
+msgstr[2] "%d minūšu"
 
 #: ../src/properties/bacon-video-widget-properties.c:161
 #, c-format
@@ -1061,7 +1163,7 @@
 msgid_plural "%d seconds"
 msgstr[0] "%d sekunde"
 msgstr[1] "%d sekundes"
-msgstr[2] "%d sekundes"
+msgstr[2] "%d sekunžu"
 
 #. 5 hours 2 minutes 12 seconds
 #: ../src/properties/bacon-video-widget-properties.c:167
@@ -1088,12 +1190,16 @@
 msgid_plural "%d frames per second"
 msgstr[0] "%d kadrs sekundē"
 msgstr[1] "%d kadri sekundē"
-msgstr[2] "%d kadri sekundē"
+msgstr[2] "%d kadru sekundē"
 
-#: ../src/totem-audio-preview.c:168
+#: ../src/totem-audio-preview.c:137
 msgid "Audio Preview"
 msgstr "Audio priekšskatījums"
 
+#: ../src/totem.c:240
+msgid "Verify your system installation. Totem will now exit."
+msgstr "Pārbaudiet savu sistēmas instalāciju. Totem tūlīt beigs darbu."
+
 #: ../src/totem-cell-renderer-video.c:126
 msgid "Unknown video"
 msgstr "Nezināms video"
@@ -1106,36 +1212,36 @@
 msgid "Cancel"
 msgstr "Atcelt"
 
-#: ../src/totem-fullscreen.c:616
+#: ../src/totem-fullscreen.c:573
 msgid "No File"
-msgstr "Nav faila"
+msgstr "Nav datnes"
 
 #: ../src/totem-interface.c:181 ../src/totem-interface.c:224
 #, c-format
 msgid "Couldn't load the '%s' interface. %s"
-msgstr "Neizdevās ielādēt '%s' saskarni. %s"
+msgstr "Neizdevās ielādēt “%s” saskarni. %s"
 
 #: ../src/totem-interface.c:181
 msgid "The file does not exist."
-msgstr "Fails neeksistē."
+msgstr "Datne neeksistē."
 
 #: ../src/totem-interface.c:183 ../src/totem-interface.c:185
 #: ../src/totem-interface.c:226 ../src/totem-interface.c:228
 msgid "Make sure that Totem is properly installed."
 msgstr "Pārliecinieties, ka Totem ir kārtīgi uzinstalēts."
 
-#: ../src/totem-interface.c:347
+#: ../src/totem-interface.c:357
 msgid ""
 "Totem 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."
 msgstr ""
-"Totem ir brīvās programmatūras produkts; jūs varat izplatīt un/vai modificēt "
-"to saskaņā ar GNU Vispārējās Publiskās Licences 2. vai kādas vēlākas "
-"versijas noteikumiem."
+"Totem ir brīvā programmatūra; jūs varat izplatīt un/vai modificēt to saskaņā "
+"ar Free Software Foundation publicētās GNU Vispārējās Publiskās Licences 2, "
+"vai kādas vēlākas versijas noteikumiem."
 
-#: ../src/totem-interface.c:351
+#: ../src/totem-interface.c:361
 msgid ""
 "Totem is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -1146,251 +1252,147 @@
 "jebkādas garantijas vai iekļautas ražotāja atbildības par šo produktu. "
 "Sīkāku informāciju meklējiet GNU Vispārējās Publiskās Licences tekstā."
 
-#: ../src/totem-interface.c:355
+#: ../src/totem-interface.c:365
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Totem; if not, write to the Free Software Foundation, Inc., 59 Temple Place, "
 "Suite 330, Boston, MA  02111-1307  USA"
 msgstr ""
-"GNU Vispārējās Publiskās Licence ir pieejama kopā ar šīs programmatūra "
-"instalāciju. Ja tā jums nav pieejama, jūs to varat iegūt no Free Software "
-"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA"
+"GNU Vispārējās Publiskās Licence ir pieejama kopā ar Totem. Ja tā jums nav "
+"pieejama, jūs to varat iegūt no Free Software Foundation, Inc., 59 Temple "
+"Place, Suite 330, Boston, MA  02111-1307  USA"
 
-#: ../src/totem-interface.c:358
+#: ../src/totem-interface.c:368
 msgid ""
 "Totem contains an exception to allow the use of proprietary GStreamer "
 "plugins."
 msgstr ""
-"Totēm ir pieejams izņēmums, kas ļauj izmantot īpašnieciskos GStreamer "
-"spraudņus."
+"Totēm ir pieejams izņēmums, kas ļauj izmantot īpašnieka GStreamer spraudņus."
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:190
+#: ../src/totem-menu.c:291
 msgid "None"
 msgstr "Nekas"
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:195
+#: ../src/totem-menu.c:296
 msgctxt "Language"
 msgid "Auto"
 msgstr "Auto"
 
-#. Translators:
-#. * This is not a JPEG image, but a disc image, for example,
-#. * an ISO file
-#: ../src/totem-menu.c:765
-#, c-format
-msgid "Play Image '%s'"
-msgstr "Spēlēt diska attēlu '%s'"
-
-#: ../src/totem-menu.c:768 ../src/totem-menu.c:851
-#, c-format
-msgid "device%d"
-msgstr "ierīce%d"
-
-#: ../src/totem-menu.c:848
-#, c-format
-msgid "Play Disc '%s'"
-msgstr "Spēlēt disku '%s'"
-
-#. This lists the back-end type and version, such as
-#. * Movie Player using GStreamer 0.10.1
-#: ../src/totem-menu.c:1189
-#, c-format
-msgid "Movie Player using %s"
-msgstr "Filmu Atskaņotājs lieto %s"
-
-#: ../src/totem-menu.c:1193
+#: ../src/totem-menu.c:789
 msgid "Copyright © 2002-2009 Bastien Nocera"
 msgstr "Autortiesības © 2002-2009 Bastien Nocera"
 
-#: ../src/totem-menu.c:1198
+#: ../src/totem-menu.c:794
 msgid "translator-credits"
 msgstr ""
 "Raivis Dejus \n"
 "Pēteris Krišjānis \n"
 "Artis Trops \n"
-"Lauma Pretkalninja  Aigars Krūmiņš \n"
+"Lauma Pretkalninja  \n"
+"Aigars Krūmiņš \n"
 "\n"
 "Launchpad Contributions:\n"
 "  Agris Bombiza https://launchpad.net/~gris\n"
 "  Aigars Mahinovs https://launchpad.net/~aigarius\n"
 "  Artis Trops https://launchpad.net/~hornet-navigator\n"
 "  Mārtiņš Bruņenieks https://launchpad.net/~papuass\n"
-"  Pēteris Caune https://launchpad.net/~cuu508\n"
-"  Raivis Dejus https://launchpad.net/~orvils\n"
-"  Viesturs Zariņš https://launchpad.net/~viesturs-zarins\n"
-"  ZXpower https://launchpad.net/~nfoworm"
-
-#: ../src/totem-menu.c:1202
-msgid "Totem Website"
-msgstr "Totem mājas lapa"
-
-#: ../src/totem-menu.c:1236
-msgid "Configure Plugins"
-msgstr "Konfigurēt spraudņus"
-
-#. Translators: %s is the totem version number
-#: ../src/totem-object.c:471
-#, c-format
-msgid "Totem %s"
-msgstr "Totem %s"
-
-#: ../src/totem-object.c:1047 ../browser-plugin/totem-plugin-viewer.c:367
-msgid "Playing"
-msgstr "Atskaņoju"
-
-#: ../src/totem-object.c:1049 ../src/totem-options.c:52
-msgid "Pause"
-msgstr "Pauze"
-
-#: ../src/totem-object.c:1054 ../browser-plugin/totem-plugin-viewer.c:363
-msgid "Paused"
-msgstr "Pauzēts"
-
-#: ../src/totem-object.c:1056 ../src/totem-object.c:1066
-#: ../src/totem-options.c:51
-msgid "Play"
-msgstr "Atskaņot"
-
-#: ../src/totem-object.c:1061 ../src/totem-object.c:1659
-#: ../src/totem-statusbar.c:115 ../browser-plugin/totem-plugin-viewer.c:351
-msgid "Stopped"
-msgstr "Apturēts"
-
-#: ../src/totem-object.c:1142 ../src/totem-object.c:1169
-#: ../src/totem-object.c:1799 ../src/totem-object.c:1963
-#, c-format
-msgid "Totem could not play '%s'."
-msgstr "Totem nevar atskaņot '%s'."
-
-#: ../src/totem-object.c:1246
-#, c-format
-msgid ""
-"Totem could not play this media (%s) although a plugin is present to handle "
-"it."
-msgstr ""
-"Totem nevar atskaņot šī tipa (%s) saturu, lai arī vajadzīgais spraudnis ir "
-"instalēts."
-
-#: ../src/totem-object.c:1247
-msgid ""
-"You might want to check that a disc is present in the drive and that it is "
-"correctly configured."
-msgstr ""
-"Jūs varētu gribēt pārliecināties, vai disks ir iekārtā un ka tā ir pareizi "
-"nokonfigurēta."
-
-#: ../src/totem-object.c:1255
-msgid "More information about media plugins"
-msgstr "Vairāk informācijas par failu veidu spraudņiem"
+"  Pēteris Caune https://launchpad.net/~cuu508\n"
+"  Raivis Dejus https://launchpad.net/~orvils\n"
+"  Viesturs Zariņš https://launchpad.net/~viesturs-zarins\n"
+"  ZXpower https://launchpad.net/~nfoworm"
 
-#: ../src/totem-object.c:1256
-msgid ""
-"Please install the necessary plugins and restart Totem to be able to play "
-"this media."
-msgstr ""
-"Uzinstalējiet nepieciešamos spraudņus un pārstartējiet Totem, lai varētu "
-"spēlēt šī tipa saturu."
+#: ../src/totem-menu.c:798
+msgid "Totem Website"
+msgstr "Totem tīmekļa vietne"
 
-#: ../src/totem-object.c:1258
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because it does not have the "
-"appropriate plugins to be able to read from the disc."
-msgstr ""
-"Totem nevar atskaņot šo failu veidu (%s), jo nav pieejams atbilstošs "
-"spraudnis tā nolasīšanai no diska."
+#: ../src/totem-menu.c:829
+msgid "Configure Plugins"
+msgstr "Konfigurēt spraudņus"
 
-#: ../src/totem-object.c:1260
+#: ../src/totem-object.c:162
 #, c-format
 msgid ""
-"Totem cannot play this type of media (%s) because you do not have the "
-"appropriate plugins to handle it."
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
-"Totem nevar atskaņot šī tipa (%s) saturu, jo nav nepieciešamo spraudņu, lai "
-"to paveiktu."
+"%s\n"
+"Palaidiet '%s --help', lai redzētu pilnu komandrindas opciju sarakstu.\n"
 
-#: ../src/totem-object.c:1263
+#. Translators: %s is the totem version number
+#: ../src/totem-object.c:591
 #, c-format
-msgid "Totem cannot play this type of media (%s) because it is not supported."
-msgstr "Totem nevar atskaņot šī tipa failus (%s), jo tas nav atbalstīts."
-
-#: ../src/totem-object.c:1264
-msgid "Please insert another disc to play back."
-msgstr "Lūdzu ievietojiet citu disku, lai turpinātu atskaņot."
-
-#: ../src/totem-object.c:1300
-msgid "Totem was not able to play this disc."
-msgstr "Totem nevarēja atskaņot šo disku."
+msgid "Totem %s"
+msgstr "Totem %s"
 
-#: ../src/totem-object.c:1301 ../src/totem-object.c:4229
-msgid "No reason."
-msgstr "Nav iemesla."
+#: ../src/totem-object.c:1168 ../src/totem-options.c:52
+msgid "Pause"
+msgstr "Pauzēt"
 
-#: ../src/totem-object.c:1315
-msgid "Totem does not support playback of Audio CDs"
-msgstr "Totem neatbalsta Audio CD atskaņošanu"
+#: ../src/totem-object.c:1175 ../src/totem-object.c:1185
+#: ../src/totem-options.c:51
+msgid "Play"
+msgstr "Atskaņot"
 
-#: ../src/totem-object.c:1316
-msgid "Please consider using a music player or a CD extractor to play this CD"
-msgstr ""
-"Lūdzu izmantojiet audio atskaņotāju vai CD ekstraktoru, lai atskaņotu šo CD"
+#: ../src/totem-object.c:1267 ../src/totem-object.c:1294
+#: ../src/totem-object.c:1787 ../src/totem-object.c:1942
+#, c-format
+msgid "Totem could not play '%s'."
+msgstr "Totem nevarēja atskaņot “%s”."
 
-#: ../src/totem-object.c:1805
+#: ../src/totem-object.c:1793
 msgid "No error message"
-msgstr "Nav kļūdu paziņojuma"
+msgstr "Nav kļūdu paziņojumu"
 
-#: ../src/totem-object.c:2154
+#: ../src/totem-object.c:2133
 msgid "Totem could not display the help contents."
 msgstr "Totem nevarēja parādīt palīdzības saturu."
 
-#: ../src/totem-object.c:2493 ../src/totem-object.c:2495
-#: ../browser-plugin/totem-plugin-viewer.c:1417
-msgid "An error occurred"
-msgstr "Radusies kļūda"
-
-#: ../src/totem-object.c:4064 ../src/totem-object.c:4066
+#: ../src/totem-object.c:4019 ../src/totem-object.c:4021
 msgid "Previous Chapter/Movie"
 msgstr "Iepriekšējā nodaļa / filma"
 
-#: ../src/totem-object.c:4073 ../src/totem-object.c:4075
+#: ../src/totem-object.c:4028 ../src/totem-object.c:4030
 msgid "Play / Pause"
-msgstr "Atskaņot / Apturēt"
+msgstr "Atskaņot / pauzēt"
 
-#: ../src/totem-object.c:4083 ../src/totem-object.c:4085
+#: ../src/totem-object.c:4038 ../src/totem-object.c:4040
 msgid "Next Chapter/Movie"
-msgstr "Nākamā nodaļa / filma"
+msgstr "Nākošā nodaļa / filma"
 
-#. Translators: this is the tooltip text for the fullscreen button in the controls box in Totem's main window.
 #. Translators: this is the accessibility text for the fullscreen button in the controls box in Totem's main window.
-#: ../src/totem-object.c:4097 ../src/totem-object.c:4099
+#: ../src/totem-object.c:4051 ../src/totem-object.c:4053
 msgid "Fullscreen"
 msgstr "Pilnekrāns"
 
-#: ../src/totem-object.c:4229
+#: ../src/totem-object.c:4184
 msgid "Totem could not startup."
-msgstr "Totem nevar uzsākt darbu."
+msgstr "Totem nevarēja uzsākt darbu."
+
+#: ../src/totem-object.c:4184
+msgid "No reason."
+msgstr "Nav iemesla."
 
 #: ../src/totem-open-location.c:182
 msgid "Open Location..."
-msgstr "Atvērt lokāciju..."
+msgstr "Atvērt vietu..."
 
 #: ../src/totem-options.c:49
 msgid "Enable debug"
-msgstr "Ieslēgt lāgošanu"
+msgstr "Aktivēt atkļūdošanu"
 
 #: ../src/totem-options.c:50
 msgid "Play/Pause"
-msgstr "Atskaņot/Pauze"
+msgstr "Atskaņot / pauzēt"
 
 #: ../src/totem-options.c:53
 msgid "Next"
-msgstr "Nākošais"
+msgstr "Nākošā"
 
 #: ../src/totem-options.c:54
 msgid "Previous"
-msgstr "Iepriekšējais"
+msgstr "Iepriekšējā"
 
 #: ../src/totem-options.c:55
 msgid "Seek Forwards"
@@ -1418,7 +1420,7 @@
 
 #: ../src/totem-options.c:61
 msgid "Show/Hide Controls"
-msgstr "Parādīt/Paslēpt vadības paneli"
+msgstr "Rādīt / slēpt vadības paneli"
 
 #: ../src/totem-options.c:62
 msgid "Quit"
@@ -1426,7 +1428,7 @@
 
 #: ../src/totem-options.c:63
 msgid "Enqueue"
-msgstr "Pievienot"
+msgstr "Ierindot"
 
 #: ../src/totem-options.c:64
 msgid "Replace"
@@ -1439,123 +1441,117 @@
 #. Translators: help for a (hidden) command line option to specify (the zero-based index of) a playlist entry to start playing once Totem's finished loading
 #: ../src/totem-options.c:67
 msgid "Playlist index"
-msgstr "Repertuārs"
+msgstr "Repertuāra indeks"
 
 #: ../src/totem-options.c:69
 msgid "Movies to play"
 msgstr "Atskaņojamās filmas"
 
-#: ../src/totem-options.c:117
+#: ../src/totem-options.c:79
+msgid "- Play movies and songs"
+msgstr "- Atskaņot filmas un dziesmas"
+
+#: ../src/totem-options.c:142
 msgid "Can't enqueue and replace at the same time"
 msgstr "Nevar ievietot rindā un aizvietot vienlaicīgi"
 
 #. By extension entry
-#: ../src/totem-playlist.c:161
+#: ../src/totem-playlist.c:162
 msgid "MP3 ShoutCast playlist"
 msgstr "MP3 ShoutCast repertuārs"
 
-#: ../src/totem-playlist.c:162
+#: ../src/totem-playlist.c:163
 msgid "MP3 audio (streamed)"
-msgstr "MP3 audio (plūsmots)"
+msgstr "MP3 audio (straumēts)"
 
-#: ../src/totem-playlist.c:163
+#: ../src/totem-playlist.c:164
 msgid "MP3 audio (streamed, DOS format)"
-msgstr "MP3 audio (plūsmots, DOS formāts)"
+msgstr "MP3 audio (straumēts, DOS formāts)"
 
-#: ../src/totem-playlist.c:164
+#: ../src/totem-playlist.c:165
 msgid "XML Shareable Playlist"
 msgstr "XML koplietojamais repertuārs"
 
 #. This is "Title 3", where title is a DVD title
 #. * Note: NOT a DVD chapter
-#: ../src/totem-playlist.c:347
+#: ../src/totem-playlist.c:348
 #, c-format
 msgid "Title %d"
 msgstr "Nosaukums %d"
 
-#: ../src/totem-playlist.c:446
+#: ../src/totem-playlist.c:447
 msgid "Could not save the playlist"
 msgstr "Nevarēja saglabāt repertuāru"
 
-#: ../src/totem-playlist.c:1021
+#: ../src/totem-playlist.c:1022
 msgid "Save Playlist"
-msgstr "Saglabāt sarakstu"
+msgstr "Saglabāt repertuāru"
 
 #. translators: Playlist is the default saved playlist filename,
 #. * without the suffix
-#: ../src/totem-playlist.c:1033 ../src/totem-playlist.c:1264
-#: ../src/totem-sidebar.c:142
+#: ../src/totem-playlist.c:1034 ../src/totem-playlist.c:1263
+#: ../src/totem-sidebar.c:145
 msgid "Playlist"
 msgstr "Repertuārs"
 
-#: ../src/totem-playlist.c:1857
+#: ../src/totem-playlist.c:1862
 #, c-format
 msgid "The playlist '%s' could not be parsed. It might be damaged."
-msgstr "Repertuārs '%s' nevar tikt apstrādāts. Iespējams, ka tas ir bojāts."
+msgstr "Nevarēja apstrādāt repertuāru “%s” . Iespējams, ka tas ir bojāts."
 
-#: ../src/totem-playlist.c:1858
+#: ../src/totem-playlist.c:1863
 msgid "Playlist error"
 msgstr "Repertuāra kļūda"
 
-#: ../src/totem-preferences.c:295
+#: ../src/totem-preferences.c:297
 msgid "Preferences"
 msgstr "Iestatījumi"
 
-#: ../src/totem-preferences.c:451
+#: ../src/totem-preferences.c:445
 msgid "Select Subtitle Font"
-msgstr "Izvēlēties subtitru fontu"
+msgstr "Izvēlieties subtitru fontu"
 
-#: ../src/totem-properties-main.c:115 ../src/totem-properties-view.c:266
+#: ../src/totem-properties-main.c:116 ../src/totem-properties-view.c:269
 msgid "Audio/Video"
-msgstr "Audio/Video"
+msgstr "Audio / video"
 
-#: ../src/totem-properties-view.c:128
+#: ../src/totem-properties-view.c:131
 msgid "N/A"
 msgstr "N/P"
 
-#: ../src/totem-properties-view.c:157
+#: ../src/totem-properties-view.c:160
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 msgctxt "Stream bit rate"
 msgid "N/A"
 msgstr "N/P"
 
-#: ../src/totem-properties-view.c:160
+#: ../src/totem-properties-view.c:163
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: ../src/totem-properties-view.c:177
+#: ../src/totem-properties-view.c:180
 #: ../src/plugins/properties/totem-movie-properties.c:149
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../src/totem-properties-view.c:209
+#: ../src/totem-properties-view.c:212
 #: ../src/plugins/properties/totem-movie-properties.c:166
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: ../src/totem-properties-view.c:216
+#: ../src/totem-properties-view.c:219
 #: ../src/plugins/properties/totem-movie-properties.c:166
 msgctxt "Sample rate"
 msgid "N/A"
 msgstr "N/P"
 
-#: ../src/totem-properties-view.c:224
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5589
-msgid "Surround"
-msgstr "Surround"
-
-#: ../src/totem-properties-view.c:226
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5591
-msgid "Mono"
-msgstr "Mono"
-
-#: ../src/totem-properties-view.c:236
+#: ../src/totem-properties-view.c:239
 msgctxt "Number of audio channels"
 msgid "N/A"
 msgstr "N/P"
@@ -1567,7 +1563,7 @@
 #: ../src/totem-statusbar.c:133
 #, c-format
 msgid "%s (Streaming)"
-msgstr "%s (Plūsmo)"
+msgstr "%s (straumē)"
 
 #. Elapsed / Total Length
 #: ../src/totem-statusbar.c:140 ../src/totem-time-label.c:64
@@ -1588,8 +1584,8 @@
 #. eg: 75 %
 #: ../src/totem-statusbar.c:250
 #, c-format
-msgid "%d %%"
-msgstr "%d %%"
+msgid "%lf %%"
+msgstr "%lf %%"
 
 #. eg: Paused, 0:32 / 1:05
 #: ../src/totem-statusbar.c:325
@@ -1600,12 +1596,13 @@
 #. eg: Buffering, 75 %
 #: ../src/totem-statusbar.c:330
 #, c-format
-msgid "%s, %d %%"
-msgstr "%s, %d %%"
+#| msgid "%s, %d %%"
+msgid "%s, %f %%"
+msgstr "%s, %f %%"
 
 #: ../src/totem-subtitle-encoding.c:156
 msgid "Current Locale"
-msgstr "Pašreizējā Lokāle"
+msgstr "Pašreizējā lokāle"
 
 #: ../src/totem-subtitle-encoding.c:159 ../src/totem-subtitle-encoding.c:161
 #: ../src/totem-subtitle-encoding.c:163 ../src/totem-subtitle-encoding.c:165
@@ -1633,12 +1630,12 @@
 #: ../src/totem-subtitle-encoding.c:190 ../src/totem-subtitle-encoding.c:192
 #: ../src/totem-subtitle-encoding.c:194 ../src/totem-subtitle-encoding.c:196
 msgid "Chinese Simplified"
-msgstr "Ķīniešu Vienkāršotā"
+msgstr "Ķīniešu vienkāršotā"
 
 #: ../src/totem-subtitle-encoding.c:199 ../src/totem-subtitle-encoding.c:201
 #: ../src/totem-subtitle-encoding.c:203
 msgid "Chinese Traditional"
-msgstr "Ķīniešu Tradicionālā"
+msgstr "Ķīniešu tradicionālā"
 
 #: ../src/totem-subtitle-encoding.c:206
 msgid "Croatian"
@@ -1652,15 +1649,15 @@
 
 #: ../src/totem-subtitle-encoding.c:222
 msgid "Cyrillic/Russian"
-msgstr "Kirilica/Krievu"
+msgstr "Kirilica / krievu"
 
 #: ../src/totem-subtitle-encoding.c:225 ../src/totem-subtitle-encoding.c:227
 msgid "Cyrillic/Ukrainian"
-msgstr "Kirilica/Ukraiņu"
+msgstr "Kirilica / ukraiņu"
 
 #: ../src/totem-subtitle-encoding.c:230
 msgid "Georgian"
-msgstr "Gruzīņu"
+msgstr "Gruzīnu"
 
 #: ../src/totem-subtitle-encoding.c:233 ../src/totem-subtitle-encoding.c:235
 #: ../src/totem-subtitle-encoding.c:237
@@ -1669,24 +1666,24 @@
 
 #: ../src/totem-subtitle-encoding.c:240
 msgid "Gujarati"
-msgstr "Gudžarati"
+msgstr "Gudžaratu"
 
 #: ../src/totem-subtitle-encoding.c:243
 msgid "Gurmukhi"
-msgstr "Gurmukhi"
+msgstr "Gurmuku"
 
 #: ../src/totem-subtitle-encoding.c:246 ../src/totem-subtitle-encoding.c:248
 #: ../src/totem-subtitle-encoding.c:250 ../src/totem-subtitle-encoding.c:252
 msgid "Hebrew"
-msgstr "Ebreju"
+msgstr "Ivrits"
 
 #: ../src/totem-subtitle-encoding.c:255
 msgid "Hebrew Visual"
-msgstr "Ebreju Vizuāls"
+msgstr "Ivrita vizuālais"
 
 #: ../src/totem-subtitle-encoding.c:258
 msgid "Hindi"
-msgstr "Hindu"
+msgstr "Hindi"
 
 #: ../src/totem-subtitle-encoding.c:261
 msgid "Icelandic"
@@ -1720,7 +1717,7 @@
 
 #: ../src/totem-subtitle-encoding.c:294
 msgid "Thai"
-msgstr "Taizemiešu"
+msgstr "Taju"
 
 #: ../src/totem-subtitle-encoding.c:297 ../src/totem-subtitle-encoding.c:299
 #: ../src/totem-subtitle-encoding.c:301 ../src/totem-subtitle-encoding.c:303
@@ -1744,228 +1741,91 @@
 msgid "Vietnamese"
 msgstr "Vjetnamiešu"
 
-#: ../src/totem-video-list.c:330
-msgid "No video URI"
-msgstr "Nav video URI"
-
-#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
-#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
-#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
-#: ../src/totem-video-thumbnailer.c:872
-#, c-format
-msgid ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-msgstr ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-
-#: ../src/totem-video-thumbnailer.c:873
-msgid "Filename"
-msgstr "Faila nosaukums"
-
-#: ../src/totem-video-thumbnailer.c:875
-msgid "Resolution"
-msgstr "Izšķirtspēja"
-
-#: ../src/totem-video-thumbnailer.c:878
-msgid "Duration"
-msgstr "Ilgums"
-
-#: ../src/totem-uri.c:506 ../src/plugins/chapters/totem-chapters.c:998
+#: ../src/totem-uri.c:343 ../src/plugins/chapters/totem-chapters.c:998
 msgid "All files"
-msgstr "Visi faili"
+msgstr "Visas datnes"
 
-#: ../src/totem-uri.c:511 ../src/plugins/chapters/totem-chapters.c:995
+#: ../src/totem-uri.c:348 ../src/plugins/chapters/totem-chapters.c:995
 msgid "Supported files"
-msgstr "Atbalstītie faili"
+msgstr "Atbalstītās datnes"
 
-#: ../src/totem-uri.c:523
+#: ../src/totem-uri.c:360
 msgid "Audio files"
-msgstr "Audio faili"
+msgstr "Audio datnes"
 
-#: ../src/totem-uri.c:531
+#: ../src/totem-uri.c:368
 msgid "Video files"
-msgstr "Video faili"
+msgstr "Video datnes"
 
-#: ../src/totem-uri.c:541
+#: ../src/totem-uri.c:378
 msgid "Subtitle files"
-msgstr "Subtitru fails"
+msgstr "Subtitru datne"
 
-#: ../src/totem-uri.c:593
+#: ../src/totem-uri.c:430
 msgid "Select Text Subtitles"
 msgstr "Izvēlieties subtitrus"
 
-#: ../src/totem-uri.c:656
+#: ../src/totem-uri.c:495
 msgid "Select Movies or Playlists"
 msgstr "Izvēlieties filmas vai repertuārus"
 
-#. Options parsing
-#: ../src/totem.c:201
-msgid "- Play movies and songs"
-msgstr "- Atskaņot filmas un dziesmas"
-
-#: ../src/totem.c:212
-#, c-format
-msgid ""
-"%s\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"%s\n"
-"Palaidiet '%s --help' lai redzētu pilnu komandrindas opciju sarakstu.\n"
-
-#: ../src/totem.c:254 ../src/totem.c:265
-#: ../browser-plugin/totem-plugin-viewer.c:663
-#: ../browser-plugin/totem-plugin-viewer.c:1793
-msgid "Totem Movie Player"
-msgstr "Totem Filmu Atskaņotājs"
-
-#: ../src/totem.c:255 ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Could not initialize the thread-safe libraries."
-msgstr "Nevar inicializēt pavediendrošās bibliotēkas."
-
-#: ../src/totem.c:255
-msgid "Verify your system installation. Totem will now exit."
-msgstr "Pārbaudiet jūsu sistēmas instalāciju. Totem tūlīt beigs darbu."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:1589
-msgid "Password requested for RTSP server"
-msgstr "RTSP serveris pieprasa paroli"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2858
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2862
-#, c-format
-msgid "Audio Track #%d"
-msgstr "Audio celiņš #%d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2890
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2894
-#, c-format
-msgid "Subtitle #%d"
-msgstr "Subtitri #%d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3298
-msgid ""
-"The requested audio output was not found. Please select another audio output "
-"in the Multimedia Systems Selector."
-msgstr ""
-"Pieprasītā audio izeja netika atrasta. Lūdzu izvēlieties citu audio izeju "
-"Multimediju sistēmas izvēlētājs."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3303
-msgid "Location not found."
-msgstr "Norādītā vieta nav atrasta."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3307
-msgid ""
-"Could not open location; you might not have permission to open the file."
-msgstr "Neizdevās atvērt vietu; iespējams, jums nav tiesību atvērt failu."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3318
-msgid ""
-"The video output is in use by another application. Please close other video "
-"applications, or select another video output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"Video izvadu lieto kāda cita programma. Lūdzu aizveriet citas video "
-"programmas vai izvēlēties citu video izvadu iekš Multimedia Systems Selector."
+#: ../src/totem-uri.c:499
+msgid "Add Directory"
+msgstr "Pievienot direktoriju"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3324
-msgid ""
-"The audio output is in use by another application. Please select another "
-"audio output in the Multimedia Systems Selector. You may want to consider "
-"using a sound server."
-msgstr ""
-"Audio izvadu lieto kāda cita programma. Lūdzu izvēlēties citu video izvadu "
-"iekš Multimedia Systems Selector. Jūs varētu arī apsvērt audio servera "
-"izmantošanu."
+#: ../src/totem-video-list.c:330
+msgid "No video URI"
+msgstr "Nav video URI"
 
-#. should be exactly one missing thing (source or converter)
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3342
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3348
+#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
+#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
+#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
+#: ../src/totem-video-thumbnailer.c:841
 #, c-format
-msgid "The playback of this movie requires a %s plugin which is not installed."
-msgid_plural ""
-"The playback of this movie requires the following decoders which are not "
-"installed:\n"
-"\n"
-"%s"
-msgstr[0] ""
-"Šīs filmas atskaņošanai ir nepieciešams %s spraudnis, kurš nav uzinstalēts."
-msgstr[1] ""
-"Šīs filmas atskaņošanai ir nepieciešami sekojoši kodeki, kas nav "
-"uzinstalēti:\n"
-"\n"
-"%s"
-msgstr[2] ""
-"Šīs filmas atskaņošanai ir nepieciešami sekojoši kodeki, kas nav "
-"uzinstalēti:\n"
-"\n"
-"%s"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3374
 msgid ""
-"Cannot play this file over the network. Try downloading it to disk first."
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 msgstr ""
-"Nevar spēlēt šo failu caur tīklu. Pamēģiniet to vispirms lejuplādēt uz diska."
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5878
-msgid "Media contains no supported video streams."
-msgstr "Mēdijs nesatur atbalstītas video plūsmas."
+#: ../src/totem-video-thumbnailer.c:842
+msgid "Filename"
+msgstr "Datnes nosaukums"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6052
-msgid ""
-"Failed to create a GStreamer play object. Please check your GStreamer "
-"installation."
-msgstr ""
-"Kļūda veidojot GStreamer atskaņošanas objektu. Lūdzu pārbaudiet savu "
-"GStreamer instalāciju."
+#: ../src/totem-video-thumbnailer.c:844
+msgid "Resolution"
+msgstr "Izšķirtspēja"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6172
-msgid ""
-"Failed to open audio output. You may not have permission to open the sound "
-"device, or the sound server may not be running. Please select another audio "
-"output in the Multimedia Systems Selector."
-msgstr ""
-"Kļūda atverot audio izvadu. Jums varētu nebūt pilnvaru, lai atvērtu skaņas "
-"iekārtu vai arī skaņas serveris varētu būt aktīvs. Lūdzu izvēlieties citu "
-"audio izvadu ar Multimedia Systems Selector palīdzību."
+#: ../src/totem-video-thumbnailer.c:847
+msgid "Duration"
+msgstr "Ilgums"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6192
-msgid ""
-"Could not find the audio output. You may need to install additional "
-"GStreamer plugins, or select another audio output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"Neizdevās atrast audio izeju. Jums, iespējams, nepieciešams uzinstalēt "
-"papildus Gstreamer spraudņus vai arī izvēlēties citu audio izeju Multimedia "
-"Systems Selector."
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:1
+msgid "Apple Trailers"
+msgstr "Apple reklāmkadri"
+
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:2
+msgid "Sets the user agent for the Apple Trailers site"
+msgstr "Iestatīt lietotāja aģentu Apple reklāmkadru vietnei"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:1
+msgid "Autoload Subtitles"
+msgstr "Automātiski ielādēt subtitrus"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:2
+msgid "Autoloads text subtitles"
+msgstr "Automātiski ielādēt subtitrus"
 
-#. hour:minutes:seconds
-#. Translators: This is a time format, like "9:05:02" for 9
-#. * hours, 5 minutes, and 2 seconds. You may change ":" to
-#. * the separator that your locale uses or use "%Id" instead
-#. * of "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:83 ../src/plugins/skipto/totem-time-entry.c:57
-#, c-format
-msgctxt "long time format"
-msgid "%d:%02d:%02d"
-msgstr "%d:%02d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
+msgid "Video Disc Recorder"
+msgstr "Video disku ierakstītājs"
 
-#. minutes:seconds
-#. Translators: This is a time format, like "5:02" for 5
-#. * minutes and 2 seconds. You may change ":" to the
-#. * separator that your locale uses or use "%Id" instead of
-#. * "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:92
-#, c-format
-msgctxt "short time format"
-msgid "%d:%02d"
-msgstr "%d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
+msgid "Records (S)VCDs or video DVDs"
+msgstr "Ieraksta (S)VCD vai video DVD"
 
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:65
 msgid "_Create Video Disc..."
@@ -1977,7 +1837,7 @@
 
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:68
 msgid "Copy Vide_o DVD..."
-msgstr "Kopēt Vide_o DVD"
+msgstr "Kopēt vide_o DVD"
 
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:69
 msgid "Copy the currently playing video DVD"
@@ -1985,44 +1845,27 @@
 
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:71
 msgid "Copy (S)VCD..."
-msgstr "Kopēt (S)VCD"
+msgstr "Kopēt (S)VCD..."
 
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:72
 msgid "Copy the currently playing (S)VCD"
 msgstr "Kopēt pašlaik atskaņoto (S)VCD"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:129
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:136
 msgid "The video disc could not be duplicated."
-msgstr "Video diskam nevar izveidot kopiju."
+msgstr "Video diskam nevarēja izveidot kopiju."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:131
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:276
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:138
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:283
 msgid "The movie could not be recorded."
-msgstr "Filma nevar tikt ierakstīta."
+msgstr "Filmu nevarēja ierakstīt."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:157
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:167
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:263
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:164
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:174
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:270
 msgid "Unable to write a project."
 msgstr "Nevar ierakstīt projektu."
 
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
-msgid "Video Disc Recorder"
-msgstr "Video disku ierakstītājs"
-
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
-msgid "Records (S)VCDs or video DVDs"
-msgstr "Ieraksta (S)VCD vai video DVD"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:1
-#: ../src/plugins/chapters/totem-chapters.c:1139
-msgid "Chapters"
-msgstr "Nodaļas"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:2
-msgid "Support chapter markers in movies."
-msgstr "Atbalstīt nodaļu veidotājus filmās."
-
 #: ../src/plugins/chapters/chapters-edit.ui.h:1
 msgid "Name for new chapter:"
 msgstr "Jaunās nodaļas nosaukums:"
@@ -2069,7 +1912,7 @@
 
 #: ../src/plugins/chapters/chapters-list.ui.h:11
 msgid "Load chapters from an external CMML file"
-msgstr "Ielādēt nodaļas no CMML faila"
+msgstr "Ielādēt nodaļas no ārējas CMML datnes"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:12
 msgid "Add New Chapters"
@@ -2079,6 +1922,15 @@
 msgid "Create a new chapter list for the movie"
 msgstr "Izveidot jaunu nodaļu sarakstu filmai"
 
+#: ../src/plugins/chapters/chapters.plugin.in.h:1
+#: ../src/plugins/chapters/totem-chapters.c:1139
+msgid "Chapters"
+msgstr "Nodaļas"
+
+#: ../src/plugins/chapters/chapters.plugin.in.h:2
+msgid "Support chapter markers in movies"
+msgstr "Atbalstīt nodaļu veidotājus filmās"
+
 #: ../src/plugins/chapters/totem-chapters.c:56
 #, c-format
 msgid ""
@@ -2090,7 +1942,7 @@
 
 #: ../src/plugins/chapters/totem-chapters.c:328
 msgid "Error while reading file with chapters"
-msgstr "Kļūda, lasot failu ar nodaļām"
+msgstr "Kļūda, lasot datni ar nodaļām"
 
 #: ../src/plugins/chapters/totem-chapters.c:543
 msgid "Chapter with the same time already exists"
@@ -2102,7 +1954,7 @@
 
 #: ../src/plugins/chapters/totem-chapters.c:717
 msgid "Error while writing file with chapters"
-msgstr "Kļūda, rakstot failā ar nodaļām"
+msgstr "Gadījās kļūda, rakstot datnē ar nodaļām"
 
 #: ../src/plugins/chapters/totem-chapters.c:842
 msgid "Error occurred while saving chapters"
@@ -2116,7 +1968,7 @@
 
 #: ../src/plugins/chapters/totem-chapters.c:976
 msgid "Open Chapter File"
-msgstr "Atvērt nodaļu failu"
+msgstr "Atvērt nodaļu datni"
 
 #: ../src/plugins/chapters/totem-chapters.c:1093
 msgid "Chapter Screenshot"
@@ -2146,16 +1998,15 @@
 
 #: ../src/plugins/chapters/totem-cmml-parser.c:651
 msgid "Failed to parse CMML file"
-msgstr "Neizdevās parsēt CMML failu"
+msgstr "Neizdevās parsēt CMML datni"
 
 #: ../src/plugins/chapters/totem-edit-chapter.c:95
-#| msgid "Add Chapter..."
 msgid "Add Chapter"
 msgstr "Pievienot nodaļu"
 
 #: ../src/plugins/dbusservice/dbusservice.plugin.in.h:1
 msgid "D-Bus Service"
-msgstr "D-Bus pakalpojums"
+msgstr "D-Bus serviss"
 
 #: ../src/plugins/dbusservice/dbusservice.plugin.in.h:2
 msgid ""
@@ -2169,135 +2020,118 @@
 #: ../src/plugins/dbusservice/dbusservice.py:243
 #, python-format
 msgid "The MediaPlayer2 object does not implement the ‘%s’ interface"
-msgstr "MediaPlayer2 objekts neimplementē ‘%s’ saskarni"
+msgstr "MediaPlayer2 objekts neimplementē “%s” saskarni"
 
 #: ../src/plugins/dbusservice/dbusservice.py:222
 #, python-format
 msgid "The property ‘%s’ is not writeable."
-msgstr "Īpašība ‘%s’ nav rakstāma."
+msgstr "Īpašība “%s” nav rakstāma."
 
 #: ../src/plugins/dbusservice/dbusservice.py:238
 #, python-format
 msgid "Unknown property ‘%s’ requested of a MediaPlayer 2 object"
-msgstr "Nezināma īpašība ‘%s’, ko pieprasa MediaPlayer 2 objekts"
+msgstr "Nezināma īpašība “%s”, ko pieprasa MediaPlayer 2 objekts"
 
 #: ../src/plugins/dbusservice/dbusservice.py:341
 #, python-format
 msgid "The URI ‘%s’ is not supported."
-msgstr "URI ‘%s’ nav atbalstīts."
-
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
-msgid "Instant Messenger status"
-msgstr "Pašreizējais ziņotāja statuss"
+msgstr "URI “%s” nav atbalstīts."
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
-msgid "Set your Instant Messenger status to away when a movie is playing"
-msgstr "Iestatīt ziņotāja statusu uz \"Prom\" kad tiek rādīta filma"
+#: ../src/plugins/grilo/grilo.plugin.in.h:1
+msgid "Grilo Browser"
+msgstr "Grilo pārlūks"
 
-#: ../src/plugins/gromit/gromit.plugin.in.h:1
-msgid "Gromit Annotations"
-msgstr "Gromit Anotācijas"
+#: ../src/plugins/grilo/grilo.plugin.in.h:2
+msgid "A plugin to let you browse media content from various sources"
+msgstr "Spraudnis, lai pārlūkotu audio un video no dažādiem avotiem"
 
-#: ../src/plugins/gromit/gromit.plugin.in.h:2
-msgid "Presentation helper to make annotations on screen"
-msgstr "Prezentāciju palīgs lai izveidotu anotācijas uz ekrāna"
+#: ../src/plugins/grilo/grilo.ui.h:1
+msgid "Add to Playlist"
+msgstr "Pievienot repertuāram"
 
-#: ../src/plugins/gromit/totem-gromit.c:231
-msgid "The gromit binary was not found."
-msgstr "Gromit binārais fails nav atrasts."
+#: ../src/plugins/grilo/grilo.ui.h:2
+msgid "Copy Location"
+msgstr "Kopēt atrašanās vietu"
 
-#. Add the interface to Totem's sidebar
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:1
-#: ../src/plugins/iplayer/iplayer.py:46
-msgid "BBC iPlayer"
-msgstr "BBC iPlayer"
+#: ../src/plugins/grilo/grilo.ui.h:3 ../src/plugins/grilo/totem-grilo.c:1184
+msgid "Browse"
+msgstr "Pārlūkot"
 
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:2
-msgid "Stream BBC programs from the last 7 days from the BBC iPlayer service."
-msgstr ""
-"Plūsmot pēdējo septiņu dienu BBC raidījumus no BBC iPlayer pakalpojuma."
+#: ../src/plugins/grilo/grilo.ui.h:4 ../src/plugins/grilo/totem-grilo.c:1227
+msgid "Search"
+msgstr "Meklēt"
 
-#: ../src/plugins/iplayer/iplayer.py:72
-msgid "Error listing channel categories"
-msgstr "Kļūda, izdrukājot kanālu kategorijas"
+#: ../src/plugins/grilo/totem-grilo.c:454
+msgid "Browse Error"
+msgstr "Pārlūka kļūda"
 
-#: ../src/plugins/iplayer/iplayer.py:73
-msgid ""
-"There was an unknown error getting the list of television channels available "
-"on BBC iPlayer."
-msgstr ""
-"Notika negaidīta kļūda saņemot pieejamo televīzijas kanālu sarakstu uz BBC "
-"iPlayer."
+#: ../src/plugins/grilo/totem-grilo.c:609
+msgid "Search Error"
+msgstr "Meklēšanas kļūda"
 
-#. Append a dummy child row so that the expander's visible; we can
-#. then queue off the expander to load the programme listing for this
-#. category
-#: ../src/plugins/iplayer/iplayer.py:84
-msgid "Loading…"
-msgstr "Ielādē..."
+#: ../src/plugins/gromit/gromit.plugin.in.h:1
+msgid "Gromit Annotations"
+msgstr "Gromit anotācijas"
 
-#. Translators: the "programme feed" is the list of TV shows
-#. available to watch online
-#: ../src/plugins/iplayer/iplayer.py:136
-msgid "Error getting programme feed"
-msgstr "Kļūda saņemot raidījumu barotni"
+#: ../src/plugins/gromit/gromit.plugin.in.h:2
+msgid "Presentation helper to make annotations on screen"
+msgstr "Prezentāciju palīgs, lai izveidotu anotācijas uz ekrāna"
 
-#: ../src/plugins/iplayer/iplayer.py:137
-msgid ""
-"There was an error getting the list of programmes for this channel and "
-"category combination."
-msgstr ""
-"Notika nezināma kļūda, saņemot raidījumu sarakstu šai kanālu un kategoriju "
-"kombinācijai."
+#: ../src/plugins/gromit/totem-gromit.c:231
+msgid "The gromit binary was not found."
+msgstr "Gromit binārā datne nav atrasta."
 
-#: ../src/plugins/iplayer/iplayer2.py:298
-msgid ""
-msgstr ""
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
+msgid "Instant Messenger Status"
+msgstr "Tūlītējās ziņojumapmaiņas status"
 
-#: ../src/plugins/iplayer/iplayer2.py:299
-#, python-format
-msgid "Programme unavailable (\"%s\")"
-msgstr "Raidījums nav pieejams (\"%s\")"
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
+msgid "Set your Instant Messenger status to away when a movie is playing"
+msgstr "Iestatīt ziņotāja statusu uz “Prom”, kad tiek rādīta filma"
 
 #: ../src/plugins/lirc/lirc.plugin.in.h:1
 msgid "Infrared Remote Control"
-msgstr "Attālinātā kontrole"
+msgstr "Infrasarkanā pults"
 
 #: ../src/plugins/lirc/lirc.plugin.in.h:2
 msgid "Support infrared remote control"
-msgstr "Atbalsta attālināto kontroli"
+msgstr "Atbalsta infrasarkano pulti"
 
 #: ../src/plugins/lirc/totem-lirc.c:242
 msgid "Couldn't initialize lirc."
-msgstr "Neizdevās inicializēt lirc."
+msgstr "Nevarēja inicializēt lirc."
 
 #: ../src/plugins/lirc/totem-lirc.c:254
 msgid "Couldn't read lirc configuration."
-msgstr "Nevar nolasīt lirc konfigurāciju."
-
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
-msgid "Download Movie Subtitles"
-msgstr "Lejupielādēt filmas subtitrus"
+msgstr "Nevarēja nolasīt lirc konfigurāciju."
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
-msgid "Subtitle _language:"
-msgstr "Subtitru _valoda:"
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:1
+msgid "Media Player Keys"
+msgstr "Mediju atskaņotāja taustiņi"
+
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:2
+msgid "Support additional media player keys"
+msgstr "Atbalsta papildu multimediju atskaņotāja atslēgas"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
-msgid "_Play with Subtitle"
-msgstr "_Atskaņot ar subtitriem"
+#: ../src/plugins/ontop/ontop.plugin.in.h:1
+msgid "Always On Top"
+msgstr "Vienmēr virspusē"
+
+#: ../src/plugins/ontop/ontop.plugin.in.h:2
+msgid "Keep the main window on top when playing a movie"
+msgstr "Atskaņojot filmu, turēt galveno logu virspusē"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:1
 msgid "Subtitle Downloader"
 msgstr "Subtitru lejupielādētājs"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:2
-msgid "Look for subtitles for the currently playing movie."
-msgstr "Meklēt pašlaik atskaņotās filmas subtitrus."
+msgid "Look for subtitles for the currently playing movie"
+msgstr "Meklēt pašlaik atskaņotās filmas subtitrus"
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:42
 msgid "Brazilian Portuguese"
-msgstr "Brazīlijas Portugāļu"
+msgstr "Brazīlijas portugāļu"
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:177
 msgid "Searching for subtitles…"
@@ -2310,12 +2144,12 @@
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:290
 msgid "Could not contact the OpenSubtitles website"
-msgstr "Nevaru sazināties ar OpenSubtitles web vietu"
+msgstr "Nevarēja sazināties ar OpenSubtitles tīmekļa vietni"
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:323
 #: ../src/plugins/opensubtitles/opensubtitles.py:341
 msgid "Could not contact the OpenSubtitles website."
-msgstr "Nevaru sazināties ar OpenSubtitles tīmekļa vietni."
+msgstr "Nevarēja sazināties ar OpenSubtitles tīmekļa vietni."
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:329
 msgid "No results found."
@@ -2349,6 +2183,18 @@
 msgid "Searching subtitles…"
 msgstr "Meklē subtitrus..."
 
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
+msgid "Download Movie Subtitles"
+msgstr "Lejupielādēt filmas subtitrus"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
+msgid "Subtitle _language:"
+msgstr "Subtitru _valoda:"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
+msgid "_Play with Subtitle"
+msgstr "_Atskaņot ar subtitriem"
+
 #: ../src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in.h:1
 msgid "Subtitle language"
 msgstr "Subtitru valoda"
@@ -2357,79 +2203,18 @@
 msgid "The language to search for subtitles for movies in."
 msgstr "Valoda, kurā meklēt filmas subtitrus."
 
-#: ../src/plugins/ontop/ontop.plugin.in.h:1
-msgid "Always On Top"
-msgstr "Vienmēr virspusē"
-
-#: ../src/plugins/ontop/ontop.plugin.in.h:2
-msgid "Keep the main window on top when playing a movie"
-msgstr "Galveno logu turēt virspusē kad tiek atskaņota filma"
+#: ../src/plugins/properties/movie-properties.plugin.in.h:1
+msgid "Movie Properties"
+msgstr "Filmas parametri"
+
+#: ../src/plugins/properties/movie-properties.plugin.in.h:2
+msgid "Adds movie properties to the sidebar"
+msgstr "Pievieno filmas parametrus sānu joslai"
 
 #: ../src/plugins/properties/totem-movie-properties.c:246
 msgid "Properties"
 msgstr "Īpašības"
 
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:1
-msgid "Publisher protocol to use"
-msgstr "Izmantojamais publicēšanas protokols"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:2
-msgid ""
-"The transport protocol to use when publishing playlists over the network."
-msgstr "Transporta protokols, ko izmantot, kad publicē repertuāru tīklā."
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:3
-msgid "Format for network service name"
-msgstr "Tīkla servisa nosaukuma formāts"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:5
-#, no-c-format
-msgid ""
-"A format string used to build the network service name used when publishing "
-"playlists over the network. The following format placeholders can be used: • "
-"%a: the program name as returned by g_get_application_name() • %h: the "
-"machine's host name in title case • %u: the user's login name in title case "
-"• %U: the user's real name • %%: the percent sign"
-msgstr ""
-"Formatēšanas virkne, kuru izmanto, lai veidotu tīkla pakalpojuma nosaukumu, "
-"kuru izmanto publicējot repertuāru tīklā. Sekojošie formātu vietturi var "
-"tikt izmantoti: • %a: programmas nosaukums, kādu atgriež "
-"g_get_application_name() • %h: datora nosaukums virsraksta reģistrā • %u: "
-"lietotāja vārds virsraksta reģistrā • %U: lietotāja īstais vārds • %%: "
-"procentu zīme"
-
-#. Translators: computers on the local network which are publishing their playlists over the network
-#: ../src/plugins/publish/totem-publish.c:552
-msgid "Neighbors"
-msgstr "Kaimiņi"
-
-#: ../src/plugins/publish/publish.plugin.in.h:1
-msgid "Publish Playlist"
-msgstr "Publicēt repertuāru"
-
-#: ../src/plugins/publish/publish.plugin.in.h:2
-msgid "Share the current playlist via HTTP"
-msgstr "Koplietot izvēlēto repertuāru izmantojot HTTP"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:1
-msgid "Service _Name:"
-msgstr "Pakalpojuma _nosaukums:"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:3
-#, no-c-format
-msgid ""
-"The name used for announcing the playlist service on the network.\n"
-"All occurrences of the string %u will be replaced by your name,\n"
-"and %h will be replaced by your computer's host name."
-msgstr ""
-"Nosaukums, kurš tiks izmantots paziņojot repertuāra servisu tīklā.\n"
-"Visās vietās, kur parādās virkne %u, tiks ierakstīts jūsu vārds,\n"
-"un %h vietā tiks ierakstīts datora vārds."
-
-#: ../src/plugins/publish/publish-plugin.ui.h:6
-msgid "Use _encrypted transport protocol (HTTPS)"
-msgstr "Izmantot šifrētu _transporta protokolu (HTTPS)"
-
 #: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:1
 msgid "rpdb2 password"
 msgstr "rpdb2 parole"
@@ -2441,24 +2226,89 @@
 msgstr ""
 "Parole, ar kuru aizsargāt rpdb2 serveri Totem atkļūdošanas laikā, lai "
 "aizsargātu to no neautorizētas piekļuves. Ja atstāts tukšs, tiks lietota "
-"noklusētā parole 'totem'."
+"noklusējuma parole 'totem'."
+
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
+msgid "Python Console"
+msgstr "Python konsole"
+
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
+msgid "Interactive Python console"
+msgstr "Interaktīvā Python konsole"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:88
+msgid "Python Console Menu"
+msgstr "Python konsoles izvēlne"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:93
+msgid "_Python Console"
+msgstr "_Python konsole"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:94
+msgid "Show Totem's Python console"
+msgstr "Rādīt Totem Python konsoli"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:100
+msgid "Python Debugger"
+msgstr "Python atkļūdotājs"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:101
+msgid "Enable remote Python debugging with rpdb2"
+msgstr "Aktivēt attālināto Python atkļūdošanu ar rpdb2"
+
+#. pylint: disable-msg=E1101
+#: ../src/plugins/pythonconsole/pythonconsole.py:125
+#, python-format
+msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
+msgstr "Jūs varat piekļūt Totem.Object ar “totem_object” :\\n%s"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:129
+msgid "Totem Python Console"
+msgstr "Totem Python konsole"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:139
+msgid ""
+"After you press OK, Totem will wait until you connect to it with winpdb or "
+"rpdb2. If you have not set a debugger password in DConf, it will use the "
+"default password ('totem')."
+msgstr ""
+"Pēc “Labi” nospiešanas, Totem gaidīs kamēr pieslēgsities winpdb vai rpdb2. "
+"Ja neesat iestatījis atkļūdotāja paroli DConf, tiks izmantota noklusējuma "
+"parole ('totem')."
+
+#: ../src/plugins/recent/recent.plugin.in.h:1
+#| msgid "Video files"
+msgid "Recent files"
+msgstr "Nesenās datnes"
+
+#: ../src/plugins/recent/recent.plugin.in.h:2
+msgid "Adds files that have been played to recent files"
+msgstr "Pievieno atskaņotās datnes neseno datņu sarakstam"
 
 #: ../src/plugins/rotation/rotation.plugin.in.h:1
 msgid "Rotation Plugin"
 msgstr "Pagriešanas spraudnis"
 
 #: ../src/plugins/rotation/rotation.plugin.in.h:2
-msgid "Allows videos to be rotated if they're in the wrong orientation."
-msgstr "Ļauj pagriezt video, ja tie ir nepareizi pagriezti."
+msgid "Allows videos to be rotated if they are in the wrong orientation"
+msgstr "Ļauj pagriezt video, ja tie ir nepareizi pagriezti"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:60
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:50
 msgid "_Rotate Clockwise"
 msgstr "Pag_riezt pulksteņrādītāja virzienā"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:62
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:52
 msgid "Rotate Counterc_lockwise"
 msgstr "Pagriezt pretēji pu_lksteņrādītāja virzienam"
 
+#: ../src/plugins/save-file/save-file.plugin.in.h:1
+msgid "Save Copy"
+msgstr "Saglabāt kopiju"
+
+#: ../src/plugins/save-file/save-file.plugin.in.h:2
+msgid "Save a copy of the currently playing movie"
+msgstr "Saglabāt pašlaik atskaņotās filmas kopiju"
+
 #: ../src/plugins/save-file/totem-save-file.c:63
 msgid "Save a Copy..."
 msgstr "Saglabāt kopiju..."
@@ -2481,10 +2331,13 @@
 msgid "Movie stream"
 msgstr "Filmas straume"
 
-#: ../src/plugins/screensaver/totem-screensaver.c:116
-#: ../browser-plugin/totem-plugin-viewer.c:1891
-msgid "Playing a movie"
-msgstr "Filmas atskaņošana"
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:1
+msgid "Screen Saver"
+msgstr "Ekrānsaudzētājs"
+
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:2
+msgid "Deactivates the screen saver when a movie is playing"
+msgstr "Deaktivizē ekrānsaudzētāju filmas atskaņošanas laikā "
 
 #: ../src/plugins/screenshot/gallery.ui.h:1
 msgid "Screenshot width (in pixels):"
@@ -2498,23 +2351,30 @@
 msgid "Number of screenshots:"
 msgstr "Ekrānattēlu skaits:"
 
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:1
-msgid "_Name:"
-msgstr "_Nosaukums:"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:2
-msgid "Save in _folder:"
-msgstr "Saglabāt _mapē:"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:3
-msgid "Select a folder"
-msgstr "Izvēlēties mapi"
-
-#. Write the screenshot to the temporary file
-#: ../src/plugins/screenshot/gnome-screenshot-widget.c:385
-#: ../src/plugins/screenshot/totem-screenshot.c:64
-msgid "Screenshot.png"
-msgstr "Ekranattels.png"
+#. translators: this is the name of the file that gets made up
+#. * with the screenshot if the entire screen is taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:147
+#, c-format
+#| msgid "Screenshot.png"
+msgid "Screenshot from %s.png"
+msgstr "Ekrānattēls no %s.png"
+
+#. translators: this is the name of the file that gets
+#. * made up with the screenshot if the entire screen is
+#. * taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:154
+#, c-format
+#| msgid "Screenshot-%s-%d.png"
+msgid "Screenshot from %s - %d.png"
+msgstr "Ekrānattēls no %s - %d.png"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:1
+msgid "Screenshot"
+msgstr "Ekrānattēls"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:2
+msgid "Allows screenshots and galleries to be taken of videos"
+msgstr "Ļauj no video uzņemt ekrānattēlus un galerijas"
 
 #: ../src/plugins/screenshot/totem-gallery.c:91
 msgid "Save Gallery"
@@ -2538,69 +2398,64 @@
 #: ../src/plugins/screenshot/totem-gallery-progress.c:107
 #, c-format
 msgid "Saving gallery as \"%s\""
-msgstr "Saglabā galeriju kā \"%s\""
-
-#: ../src/plugins/screenshot/totem-screenshot.c:113
-msgid "There was an error saving the screenshot."
-msgstr "Atgadījās kļūda, saglabājot ekrānattēlu."
-
-#: ../src/plugins/screenshot/totem-screenshot.c:139
-msgid "Save Screenshot"
-msgstr "Saglabāt ekrānattēlu"
+msgstr "Saglabā galeriju kā “%s”"
 
-#. Create the screenshot widget
-#. Translators: %s is the movie title and %d is an auto-incrementing number to make filename unique
-#: ../src/plugins/screenshot/totem-screenshot.c:160
-#, c-format
-msgid "Screenshot-%s-%d.png"
-msgstr "Ekranattels-%s-%d.png"
-
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:88
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:220
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "Totem could not get a screenshot of the video."
-msgstr "Totem nevarēja iegūt šī video ekrānattēlu."
+msgstr "Totem nevarēja saņemt šī video ekrānattēlu."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "This is not supposed to happen; please file a bug report."
-msgstr "Tam nebūtu jānotiek; lūdzu, ziņojiet par kļūdu izstrādātājiem."
+msgstr "Tam nebūtu jānotiek. Lūdzu, ziņojiet par kļūdu izstrādātājiem."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
-msgid "Take _Screenshot..."
-msgstr "Izveidot _ekrānattēlu"
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
+#| msgid "Take _Screenshot..."
+msgid "Take _Screenshot"
+msgstr "Uzņemt _ekrānattēlu"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
 msgid "Take a screenshot"
 msgstr "Uzņemt ekrānattēlu"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create Screenshot _Gallery..."
-msgstr "Izveidot ekrānattēlu _galeriju"
+msgstr "Izveidot ekrānattēlu _galeriju..."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create a gallery of screenshots"
 msgstr "Izveidot ekrānattēlu galeriju"
 
+#: ../src/plugins/skipto/skipto.plugin.in.h:1
+#: ../src/plugins/skipto/totem-skipto.c:196
+msgid "Skip To"
+msgstr "Pārlekt uz"
+
+#: ../src/plugins/skipto/skipto.plugin.in.h:2
+msgid "Provides the \"Skip to\" dialog"
+msgstr "Nodrošina \"Pārlēkt uz\" dialoglodziņu"
+
+#: ../src/plugins/skipto/skipto.ui.h:1
+msgid "_Skip to:"
+msgstr "Pā_rlekt uz:"
+
 #. Update the "seconds" label so that it always has the correct singular/plural form
 #. Translators: label for the seconds selector in the "Skip to" dialogue
-#: ../src/plugins/skipto/totem-skipto.c:160
+#: ../src/plugins/skipto/totem-skipto.c:159
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "sekunde"
 msgstr[1] "sekundes"
-msgstr[2] "sekundes"
+msgstr[2] "sekunžu"
 
 #. Fix the label width at the maximum necessary for the plural labels, to prevent it changing size when we change the spinner value
 #. Translators: you should translate this string to a number (written in digits) which corresponds to the longer character length of the
 #. * translations for "second" and "seconds", as translated elsewhere in this file. For example, in English, "second" is 6 characters long and
 #. * "seconds" is 7 characters long, so this string should be translated to "7". See: bgo#639398
-#: ../src/plugins/skipto/totem-skipto.c:190
+#: ../src/plugins/skipto/totem-skipto.c:189
 msgctxt "Skip To label length"
 msgid "7"
-msgstr "7"
-
-#: ../src/plugins/skipto/totem-skipto.c:197
-msgid "Skip To"
-msgstr "Pārlekt uz"
+msgstr "8"
 
 #: ../src/plugins/skipto/totem-skipto-plugin.c:182
 msgid "_Skip To..."
@@ -2608,117 +2463,317 @@
 
 #: ../src/plugins/skipto/totem-skipto-plugin.c:182
 msgid "Skip to a specific time"
-msgstr "Pārlekt uz konkrētu laiku"
+msgstr "Pārlekt uz norādīto laiku"
 
-#: ../src/plugins/skipto/skipto.ui.h:1
-msgid "_Skip to:"
-msgstr "Pā_rlekt uz:"
+#~ msgid "Location not found."
+#~ msgstr "Norādītā vieta nav atrasta."
 
-#: ../browser-plugin/totem-plugin-viewer.c:431
-msgid "No URI to play"
-msgstr "Nav atskaņojamās URI"
+#~ msgid ""
+#~ "Could not open location; you might not have permission to open the file."
+#~ msgstr "Nevarēja atvērt vietu. Iespējams, jums nav tiesību atvērt failu."
 
-#. translators: this is:
-#. * Open With ApplicationName
-#. * as in nautilus' right-click menu
-#: ../browser-plugin/totem-plugin-viewer.c:1107
-#, c-format
-msgid "_Open with \"%s\""
-msgstr "_Atvērt ar \"%s\""
+#~ msgid ""
+#~ "Failed to create a GStreamer play object. Please check your GStreamer "
+#~ "installation."
+#~ msgstr ""
+#~ "Kļūda, veidojot GStreamer atskaņošanas objektu. Lūdzu, pārbaudiet savu "
+#~ "GStreamer instalāciju."
 
-#: ../browser-plugin/totem-plugin-viewer.c:2136
-msgid "No playlist or playlist empty"
-msgstr "Nav repertuāra vai arī repertuārs ir tukšs"
+#~ msgid "%d %%"
+#~ msgstr "%d %%"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2235
-msgid "Movie browser plugin"
-msgstr "FIlmu pārlūka spraudnis"
+#~ msgid ""
+#~ msgstr ""
 
-#: ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Verify your system installation. The Totem plugin will now exit."
-msgstr "Pārbaudiet jūsu sistēmas instalāciju. Totem tagad aizvērsies."
+#~ msgid "Programme unavailable (\"%s\")"
+#~ msgstr "Raidījums nav pieejams (“%s”)"
 
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
-msgid "Python Console"
-msgstr "Python konsole."
+#~ msgid "BBC iPlayer"
+#~ msgstr "BBC iPlayer"
 
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
-msgid "Interactive Python console."
-msgstr "Interaktīvā Python konsole."
+#~| msgid ""
+#~| "Stream BBC programs from the last 7 days from the BBC iPlayer service."
+#~ msgid ""
+#~ "Stream BBC programs from the last 7 days from the BBC iPlayer service"
+#~ msgstr ""
+#~ "Straumēt pēdējo septiņu dienu BBC raidījumus no BBC iPlayer pakalpojuma."
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:88
-msgid "Python Console Menu"
-msgstr "Python konsoles izvēlne."
+#~ msgid "Error listing channel categories"
+#~ msgstr "Kļūda, izdrukājot kanālu kategorijas"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:93
-msgid "_Python Console"
-msgstr "_Python konsole."
+#~ msgid ""
+#~ "There was an unknown error getting the list of television channels "
+#~ "available on BBC iPlayer."
+#~ msgstr ""
+#~ "Gadījās negaidīta kļūda, saņemot pieejamo televīzijas kanālu sarakstu uz "
+#~ "BBC iPlayer."
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:94
-msgid "Show Totem's Python console"
-msgstr "Parādīt Totem Python konsoli."
+#~ msgid "Loading…"
+#~ msgstr "Ielādē..."
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:100
-msgid "Python Debugger"
-msgstr "Python atkļūdotājs."
+#~ msgid "Error getting programme feed"
+#~ msgstr "Kļūda, saņemot raidījumu plūsmu"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:101
-msgid "Enable remote Python debugging with rpdb2"
-msgstr "Ieslēgt attālināto Python atkļūdošanu ar rpdb2"
+#~ msgid ""
+#~ "There was an error getting the list of programmes for this channel and "
+#~ "category combination."
+#~ msgstr ""
+#~ "Gadījās nezināma kļūda, saņemot raidījumu sarakstu šai kanālu un "
+#~ "kategoriju kombinācijai."
 
-#. pylint: disable-msg=E1101
-#: ../src/plugins/pythonconsole/pythonconsole.py:125
-#, python-format
-msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
-msgstr "Jūs varat piekļūt Totem.Object ar 'totem_object' :\\n%s"
+#~ msgid "_Name:"
+#~ msgstr "_Nosaukums:"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:129
-msgid "Totem Python Console"
-msgstr "Totem Python konsole"
+#~ msgid "Save in _folder:"
+#~ msgstr "Saglabāt _mapē:"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:139
-msgid ""
-"After you press OK, Totem will wait until you connect to it with winpdb or "
-"rpdb2. If you have not set a debugger password in DConf, it will use the "
-"default password ('totem')."
-msgstr ""
-"Pēc 'Labi' nospiešanas Totem gaidīs kamēr jūs pieslēgties winpdb vai rpdb2. "
-"Ja jūs neesat iestatījis atkļūdotāja paroli DConf, tiks izmantota noklusētā "
-"parole ('totem')."
+#~ msgid "Select a folder"
+#~ msgstr "Izvēlieties mapi"
 
-#: ../src/plugins/grilo/grilo.plugin.in.h:1
-msgid "Grilo Browser"
-msgstr "Grilo pārlūks"
+#~ msgid "There was an error saving the screenshot."
+#~ msgstr "Gadījās kļūda, saglabājot ekrānattēlu."
 
-#: ../src/plugins/grilo/grilo.plugin.in.h:2
-msgid "A plugin to let you browse media content from various sources."
-msgstr "Spraudnis, lai pārlūkotu multimedijus no dažādiem avotiem."
+#~ msgid "Save Screenshot"
+#~ msgstr "Saglabāt ekrānattēlu"
 
-#: ../src/plugins/grilo/totem-grilo.c:452
-msgid "Browse Error"
-msgstr "Pārlūka kļūda"
+#~ msgid "Movie Player"
+#~ msgstr "Filmu atskaņotājs"
 
-#: ../src/plugins/grilo/totem-grilo.c:599
-msgid "Search Error"
-msgstr "Meklēšanas kļūda"
+#~ msgid "Play movies and songs"
+#~ msgstr "Atskaņot filmas un dziesmas"
 
-#: ../src/plugins/grilo/totem-grilo.c:1219 ../src/plugins/grilo/grilo.ui.h:3
-msgid "Browse"
-msgstr "Pārlūkot"
+#~ msgid "Open a file"
+#~ msgstr "Atvērt failu"
 
-#: ../src/plugins/grilo/totem-grilo.c:1285 ../src/plugins/grilo/grilo.ui.h:4
-msgid "Search"
-msgstr "Meklēt"
+#~ msgid "Open a non-local file"
+#~ msgstr "Atvērt nevietējo failu"
 
-#: ../src/plugins/grilo/grilo.ui.h:1
-#| msgid "_Add to Playlist"
-msgid "Add to Playlist"
-msgstr "Pievienot repertuāram"
+#~ msgid "Quit the program"
+#~ msgstr "Iziet no programmas"
 
-#: ../src/plugins/grilo/grilo.ui.h:2
-#| msgid "_Copy Location"
-msgid "Copy Location"
-msgstr "Kopēt atrašanās vietu"
+#~ msgid "Configure the application"
+#~ msgstr "Konfigurēt lietotni"
+
+#~ msgid "Switch to fullscreen"
+#~ msgstr "Pārslēgties uz pilnekrānu"
+
+#~ msgid "Set the repeat mode"
+#~ msgstr "Iestatīt atkārtošanas režīmu"
+
+#~ msgid "Set the shuffle mode"
+#~ msgstr "Iestatīt jaukšanas režīmu"
+
+#~ msgid "14.4 Kbps Modem"
+#~ msgstr "14.4 Kbps modems"
+
+#~ msgid "19.2 Kbps Modem"
+#~ msgstr "19.2 Kbps modems"
+
+#~ msgid "28.8 Kbps Modem"
+#~ msgstr "28.8 Kbps modems"
+
+#~ msgid "33.6 Kbps Modem"
+#~ msgstr "33.6 Kbps modems"
+
+#~ msgid "34.4 Kbps Modem"
+#~ msgstr "34.4 Kbps modems"
+
+#~ msgid "56 Kbps Modem/ISDN"
+#~ msgstr "56 Kbps modems/ISDN"
+
+#~ msgid "112 Kbps Dual ISDN/DSL"
+#~ msgstr "112 Kbps duālais ISDN/DSL"
+
+#~ msgid "256 Kbps DSL/Cable"
+#~ msgstr "256 Kbps DSL/kabelis"
+
+#~ msgid "384 Kbps DSL/Cable"
+#~ msgstr "384 Kbps DSL/kabelis"
+
+#~ msgid "512 Kbps DSL/Cable"
+#~ msgstr "512 Kbps DSL/kabelis"
+
+#~ msgid "1.5 Mbps T1/Intranet/LAN"
+#~ msgstr "1.5 Mbps T1/Intranet/LAN"
+
+#~ msgid "Intranet/LAN"
+#~ msgstr "Intranet/LAN"
+
+#~ msgid "Networking"
+#~ msgstr "Tīkls"
+
+#~ msgid "Connection _speed:"
+#~ msgstr "_Savienojuma ātrums:"
+
+#~ msgid "Network connection speed"
+#~ msgstr "Tīkla _savienojuma ātrums:"
+
+#~ msgid ""
+#~ "Approximate network connection speed, used to select quality on media "
+#~ "over the network."
+#~ msgstr ""
+#~ "Aptuvenais tīkla savienojuma ātrums, ko izmanto, lai izvēlētos kvalitāti "
+#~ "datiem, kurus sūta caur tīklu."
+
+#~ msgid "Play Image '%s'"
+#~ msgstr "Spēlēt diska attēlu '%s'"
+
+#~ msgid "device%d"
+#~ msgstr "ierīce%d"
+
+#~ msgid "Play Disc '%s'"
+#~ msgstr "Spēlēt disku '%s'"
+
+#~ msgid "Movie Player using %s"
+#~ msgstr "Filmu Atskaņotājs lieto %s"
+
+#~ msgid ""
+#~ "Totem could not play this media (%s) although a plugin is present to "
+#~ "handle it."
+#~ msgstr ""
+#~ "Totem nevar atskaņot šī tipa (%s) saturu, lai arī vajadzīgais spraudnis "
+#~ "ir instalēts."
+
+#~ msgid ""
+#~ "You might want to check that a disc is present in the drive and that it "
+#~ "is correctly configured."
+#~ msgstr ""
+#~ "Jūs varētu gribēt pārliecināties, vai disks ir iekārtā un ka tā ir "
+#~ "pareizi nokonfigurēta."
+
+#~ msgid "More information about media plugins"
+#~ msgstr "Vairāk informācijas par failu veidu spraudņiem"
+
+#~ msgid ""
+#~ "Please install the necessary plugins and restart Totem to be able to play "
+#~ "this media."
+#~ msgstr ""
+#~ "Uzinstalējiet nepieciešamos spraudņus un pārstartējiet Totem, lai varētu "
+#~ "spēlēt šī tipa saturu."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it does not have the "
+#~ "appropriate plugins to be able to read from the disc."
+#~ msgstr ""
+#~ "Totem nevar atskaņot šo failu veidu (%s), jo nav pieejams atbilstošs "
+#~ "spraudnis tā nolasīšanai no diska."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because you do not have the "
+#~ "appropriate plugins to handle it."
+#~ msgstr ""
+#~ "Totem nevar atskaņot šī tipa (%s) saturu, jo nav nepieciešamo spraudņu, "
+#~ "lai to paveiktu."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it is not supported."
+#~ msgstr "Totem nevar atskaņot šī tipa failus (%s), jo tas nav atbalstīts."
+
+#~ msgid "Please insert another disc to play back."
+#~ msgstr "Lūdzu ievietojiet citu disku, lai turpinātu atskaņot."
+
+#~ msgid "Totem was not able to play this disc."
+#~ msgstr "Totem nevarēja atskaņot šo disku."
+
+#~ msgid "Totem does not support playback of Audio CDs"
+#~ msgstr "Totem neatbalsta Audio CD atskaņošanu"
+
+#~ msgid ""
+#~ "Please consider using a music player or a CD extractor to play this CD"
+#~ msgstr ""
+#~ "Lūdzu izmantojiet audio atskaņotāju vai CD ekstraktoru, lai atskaņotu šo "
+#~ "CD"
+
+#~ msgid ""
+#~ "The requested audio output was not found. Please select another audio "
+#~ "output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "Pieprasītā audio izeja netika atrasta. Lūdzu izvēlieties citu audio izeju "
+#~ "Multimediju sistēmas izvēlētājs."
+
+#~ msgid ""
+#~ "The video output is in use by another application. Please close other "
+#~ "video applications, or select another video output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "Video izvadu lieto kāda cita programma. Lūdzu aizveriet citas video "
+#~ "programmas vai izvēlēties citu video izvadu iekš Multimedia Systems "
+#~ "Selector."
+
+#~ msgid ""
+#~ "The audio output is in use by another application. Please select another "
+#~ "audio output in the Multimedia Systems Selector. You may want to consider "
+#~ "using a sound server."
+#~ msgstr ""
+#~ "Audio izvadu lieto kāda cita programma. Lūdzu izvēlēties citu video "
+#~ "izvadu iekš Multimedia Systems Selector. Jūs varētu arī apsvērt audio "
+#~ "servera izmantošanu."
+
+#~ msgid ""
+#~ "Failed to open audio output. You may not have permission to open the "
+#~ "sound device, or the sound server may not be running. Please select "
+#~ "another audio output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "Kļūda atverot audio izvadu. Jums varētu nebūt pilnvaru, lai atvērtu "
+#~ "skaņas iekārtu vai arī skaņas serveris varētu būt aktīvs. Lūdzu "
+#~ "izvēlieties citu audio izvadu ar Multimedia Systems Selector palīdzību."
+
+#~ msgid ""
+#~ "Could not find the audio output. You may need to install additional "
+#~ "GStreamer plugins, or select another audio output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "Neizdevās atrast audio izeju. Jums, iespējams, nepieciešams uzinstalēt "
+#~ "papildus Gstreamer spraudņus vai arī izvēlēties citu audio izeju "
+#~ "Multimedia Systems Selector."
+
+#~ msgid "Publisher protocol to use"
+#~ msgstr "Izmantojamais publicēšanas protokols"
+
+#~ msgid ""
+#~ "The transport protocol to use when publishing playlists over the network."
+#~ msgstr "Transporta protokols, ko izmantot, kad publicē repertuāru tīklā."
+
+#~ msgid "Format for network service name"
+#~ msgstr "Tīkla servisa nosaukuma formāts"
+
+#~ msgid ""
+#~ "A format string used to build the network service name used when "
+#~ "publishing playlists over the network. The following format placeholders "
+#~ "can be used: • %a: the program name as returned by g_get_application_name"
+#~ "() • %h: the machine's host name in title case • %u: the user's login "
+#~ "name in title case • %U: the user's real name • %%: the percent sign"
+#~ msgstr ""
+#~ "Formatēšanas virkne, kuru izmanto, lai veidotu tīkla pakalpojuma "
+#~ "nosaukumu, kuru izmanto publicējot repertuāru tīklā. Sekojošie formātu "
+#~ "vietturi var tikt izmantoti: • %a: programmas nosaukums, kādu atgriež "
+#~ "g_get_application_name() • %h: datora nosaukums virsraksta reģistrā • %u: "
+#~ "lietotāja vārds virsraksta reģistrā • %U: lietotāja īstais vārds • %%: "
+#~ "procentu zīme"
+
+#~ msgid "Neighbors"
+#~ msgstr "Kaimiņi"
+
+#~ msgid "Publish Playlist"
+#~ msgstr "Publicēt repertuāru"
+
+#~ msgid "Share the current playlist via HTTP"
+#~ msgstr "Koplietot izvēlēto repertuāru izmantojot HTTP"
+
+#~ msgid "Service _Name:"
+#~ msgstr "Pakalpojuma _nosaukums:"
+
+#~ msgid ""
+#~ "The name used for announcing the playlist service on the network.\n"
+#~ "All occurrences of the string %u will be replaced by your name,\n"
+#~ "and %h will be replaced by your computer's host name."
+#~ msgstr ""
+#~ "Nosaukums, kurš tiks izmantots paziņojot repertuāra servisu tīklā.\n"
+#~ "Visās vietās, kur parādās virkne %u, tiks ierakstīts jūsu vārds,\n"
+#~ "un %h vietā tiks ierakstīts datora vārds."
+
+#~ msgid "Use _encrypted transport protocol (HTTPS)"
+#~ msgstr "Izmantot šifrētu _transporta protokolu (HTTPS)"
 
 #~ msgid "Bemused"
 #~ msgstr "Bemused"
@@ -2747,9 +2802,6 @@
 #~ msgid "Search Results"
 #~ msgstr "Meklēšanas rezultāti"
 
-#~ msgid "Videos"
-#~ msgstr "Video"
-
 #~ msgid "_Open in Web Browser"
 #~ msgstr "_Atvērt tīmekļa pārlūkā"
 
@@ -3041,18 +3093,18 @@
 #~ "Approximate network connection speed, used to select quality on media "
 #~ "over the network: \"0\" for 14.4 Kbps Modem, \"1\" for 19.2 Kbps Modem, "
 #~ "\"2\" for 28.8 Kbps Modem, \"3\" for 33.6 Kbps Modem, \"4\" for 34.4 Kbps "
-#~ "Modem, \"5\" for 56 Kbps Modem/ISDN, \"6\" for 112 Kbps Dual ISDN/DSL, \"7"
-#~ "\" for 256 Kbps DSL/Cable, \"8\" for 384 Kbps DSL/Cable, \"9\" for 512 "
+#~ "Modem, \"5\" for 56 Kbps Modem/ISDN, \"6\" for 112 Kbps Dual ISDN/DSL, "
+#~ "\"7\" for 256 Kbps DSL/Cable, \"8\" for 384 Kbps DSL/Cable, \"9\" for 512 "
 #~ "Kbps DSL/Cable, \"10\" for 1.5 Mbps T1/Intranet/LAN, \"11\" for Intranet/"
 #~ "LAN."
 #~ msgstr ""
 #~ "Aptuvenais tīkla pieslēguma ātrums, tiek izmantots lai izvēlētos "
 #~ "kvalitāti caur tīklu sūtītajam saturam: \"0\" - 14.4 Kbps Modēms, \"1\" - "
-#~ "19.2 Kbps Modēms, \"2\" - 28.8 Kbps Modēms, \"3\" - 33.6 Kbps Modēms, \"4"
-#~ "\" - 34.4 Kbps Modēms, \"5\" - 56 Kbps Modēms/ISDN, \"6\" - 112 Kbps Dual "
-#~ "ISDN/DSL, \"7\" - 256 Kbps DSL/Cable, \"8\" for 384 Kbps DSL/Cable, \"9\" "
-#~ "for 512 Kbps DSL/Cable, \"10\" for 1.5 Mbps T1/Intranet/LAN, \"11\" for "
-#~ "Intranet/LAN."
+#~ "19.2 Kbps Modēms, \"2\" - 28.8 Kbps Modēms, \"3\" - 33.6 Kbps Modēms, "
+#~ "\"4\" - 34.4 Kbps Modēms, \"5\" - 56 Kbps Modēms/ISDN, \"6\" - 112 Kbps "
+#~ "Dual ISDN/DSL, \"7\" - 256 Kbps DSL/Cable, \"8\" for 384 Kbps DSL/Cable, "
+#~ "\"9\" for 512 Kbps DSL/Cable, \"10\" for 1.5 Mbps T1/Intranet/LAN, \"11\" "
+#~ "for Intranet/LAN."
 
 #~ msgid "Buffer size"
 #~ msgstr "Bufera izmērs"
@@ -3075,8 +3127,8 @@
 #~ "output, \"2\" for 5.0 channel output, \"3\" for 5.1 channel output, \"4\" "
 #~ "for AC3 Passthrough."
 #~ msgstr ""
-#~ "Audio izvada tips ko lietos: \"0\" - stereo, \"1\" - 4 kanālu izvadam, \"2"
-#~ "\" - 5.0 kanālu izvadam, \"3\" - 5.1 kanālu izvadam, \"4\" - AC3 "
+#~ "Audio izvada tips ko lietos: \"0\" - stereo, \"1\" - 4 kanālu izvadam, "
+#~ "\"2\" - 5.0 kanālu izvadam, \"3\" - 5.1 kanālu izvadam, \"4\" - AC3 "
 #~ "Passthrough."
 
 #~ msgid "UTF-8"
@@ -3305,28 +3357,12 @@
 #~ "\n"
 #~ "Pārbaudiet, vai iekārta nav aizņemta."
 
-#~ msgid ""
-#~ "No video output is available. Make sure that the program is correctly "
-#~ "installed."
-#~ msgstr ""
-#~ "Video izvade nav pieejama. Pārliecinieties, ka programma ir pareizi "
-#~ "uzstādīta."
-
-#~ msgid "The server you are trying to connect to is not known."
-#~ msgstr "Serveris, kuram jūs mēģinat piekļūt, nav atrodams."
-
 #~ msgid "The device name you specified (%s) seems to be invalid."
 #~ msgstr "Iekārtas vārds, ko jūs norādījāt (%s), izskatās, ka nav pareizs."
 
 #~ msgid "The server you are trying to connect to (%s) is unreachable."
 #~ msgstr "Serveris, kuram jūs mēģinat piekļūt (%s), ir nesasniedzams."
 
-#~ msgid "The connection to this server was refused."
-#~ msgstr "Piekļuve serverim tika aizliegta."
-
-#~ msgid "The specified movie could not be found."
-#~ msgstr "Norādītā filma nav atrasta."
-
 #~ msgid ""
 #~ "The source seems encrypted, and can't be read. Are you trying to play an "
 #~ "encrypted DVD without libdvdcss?"
@@ -3346,12 +3382,6 @@
 #~ msgid "The audio device is busy. Is another application using it?"
 #~ msgstr "Audio ierīce ir aizņemta. Varbūt to izmanto cita programma?"
 
-#~ msgid "You are not allowed to open this file."
-#~ msgstr "Jums nav atļaujas atvērt šo failu."
-
-#~ msgid "The server refused access to this file or stream."
-#~ msgstr "Server aizliedza pieeju šim failam vai plūsmaim."
-
 #~ msgid "The file you tried to play is an empty file."
 #~ msgstr "Fails, ko jūs meģinat atskaņot, ir tukšs."
 
@@ -3374,13 +3404,6 @@
 #~ "Video kodekss '%s' netiek apstrādāts. Jums būtu nepieciešams uzstādīt "
 #~ "papildus spraudņus, lai varētu atskaņot dažu tipu filmas"
 
-#~ msgid ""
-#~ "Audio codec '%s' is not handled. You might need to install additional "
-#~ "plugins to be able to play some types of movies"
-#~ msgstr ""
-#~ "Audio kodekss '%s' netiek apstrādāts. Jums būtu nepieciešams uzstādīt "
-#~ "papildus spraudņus, lai varētu atskaņot dažu tipu filmas"
-
 #~ msgid "This is an audio-only file, and there is no audio output available."
 #~ msgstr "Šis ir tikai audio fails un turklāt tajā nav nekāda audio izvada."
 
@@ -3423,24 +3446,6 @@
 #~ msgid "Couldn't write parser: %s"
 #~ msgstr "Neizdevās ierakstīt parsētāju: %s"
 
-#~ msgid "Media Player Keys"
-#~ msgstr "Mēdju atskaņotāja taustiņi"
-
-#~ msgid "Support additional media player keys"
-#~ msgstr "Atbalsta papildu  datu nesēja atskaņotāja atslēgas"
-
-#~ msgid "Adds movie properties to the sidebar"
-#~ msgstr "Pievieno filmas parametrus sānu jolsai"
-
-#~ msgid "Movie Properties"
-#~ msgstr "Filmas parametri"
-
-#~ msgid "Screensaver"
-#~ msgstr "Ekrānsaudzētājs"
-
-#~ msgid "Provides the \"Skip to\" dialog."
-#~ msgstr "Nodrošina \"Pārlēkt uz\" logu."
-
 #~ msgid "Skipto"
 #~ msgstr "Pārlēkt uz"
 
@@ -3470,6 +3475,3 @@
 
 #~ msgid "Authentication is required to access this file."
 #~ msgstr "Lai piekļūtu šim failam nepieciešama autentifikācija."
-
-#~ msgid "Authentication is required to access this file or stream."
-#~ msgstr "Lai piekļūtu šim failam vai straumei nepieciešama autentifikācija."
diff -Nru totem-3.4.3/po/ml.po totem-3.6.2/po/ml.po
--- totem-3.4.3/po/ml.po	2012-04-02 14:15:40.000000000 +0000
+++ totem-3.6.2/po/ml.po	2012-10-25 13:15:32.000000000 +0000
@@ -2,7 +2,7 @@
 # This file is distributed under the same license as the totem package.
 # Copyright (C) 2003-2008 totem'S COPYRIGHT HOLDER.
 # FSF-India , 2003.
-# Ani Peter , 2006.
+# Ani Peter , 2006, 2012.
 # Hari Vishnu , 2008.
 # Reviewed by Manilal K M , 2008.
 # Reviewed by Praveen Arimbrathodiyil , 2008.
@@ -11,876 +11,940 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: totem.master.ml\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-20 15:26+0530\n"
-"PO-Revision-Date: 2010-12-18 23:55+0530\n"
-"Last-Translator: Anish A \n"
-"Language-Team: Swathantra Malayalam Computing \n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
+"cgi?product=totem&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2012-09-10 15:48+0000\n"
+"PO-Revision-Date: 2012-09-20 20:23+0000\n"
+"Last-Translator: Ani Peter \n"
+"Language-Team: Malayalam \n"
 "Language: ml\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Virtaal 0.5.2\n"
+"X-Generator: Lokalize 1.0\n"
 
-#: ../data/fullscreen.ui.h:1
-msgid "Leave Fullscreen"
-msgstr "സ്ക്രീന്‍ മുഴുവനും എടുക്കേണ്ട"
+#: ../browser-plugin/totem-plugin-viewer.c:352 ../src/totem-object.c:1180
+#: ../src/totem-object.c:1650 ../src/totem-statusbar.c:115
+msgid "Stopped"
+msgstr "നിര്‍ത്തിയിരിക്കുന്നു"
 
-#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:102
-msgid "Time:"
-msgstr "സമയം:"
+#: ../browser-plugin/totem-plugin-viewer.c:364 ../src/totem-object.c:1173
+msgid "Paused"
+msgstr "താല്‍ക്കാലികമായി നിര്‍ത്തിയിരിക്കുന്നു"
 
-#: ../data/playlist.ui.h:1
-msgid "Add..."
-msgstr "ചേര്‍ക്കുക..."
+#: ../browser-plugin/totem-plugin-viewer.c:368 ../src/totem-object.c:1166
+msgid "Playing"
+msgstr "പ്രവര്‍ത്തിക്കുന്നു"
 
-#: ../data/playlist.ui.h:2 ../data/video-list.ui.h:2
-msgid "Copy the location to the clipboard"
-msgstr "സ്ഥാനം ഓര്‍മ്മച്ചെപ്പിലേയ്ക്കു് പകര്‍ത്തുക"
+#: ../browser-plugin/totem-plugin-viewer.c:386
+#: ../src/plugins/screensaver/totem-screensaver.c:97
+msgid "Playing a movie"
+msgstr "ഒരു ചലച്ചിത്രം പ്രവര്‍ത്തിപ്പിക്കുന്നു"
 
-#: ../data/playlist.ui.h:3
-msgid "Move Down"
-msgstr "താഴേയ്ക്കു് മാറ്റുക"
+#: ../browser-plugin/totem-plugin-viewer.c:443
+msgid "No URI to play"
+msgstr "പ്ലേ ചെയ്യാന്‍ യു.ആര്‍.എല്‍ ഇല്ല"
 
-#: ../data/playlist.ui.h:4
-msgid "Move Up"
-msgstr "മുകളിലേയ്ക്കു് മാറ്റുക"
+#: ../browser-plugin/totem-plugin-viewer.c:676
+#: ../browser-plugin/totem-plugin-viewer.c:1700
+msgid "Totem Movie Player"
+msgstr "ടോട്ടം മൂവി പ്ലേയര്‍"
 
-#: ../data/playlist.ui.h:5
-msgid "Remove"
-msgstr "നീക്കം ചെയ്യുക"
+#. translators: this is:
+#. * Open With ApplicationName
+#. * as in nautilus' right-click menu
+#: ../browser-plugin/totem-plugin-viewer.c:1120
+#, c-format
+msgid "_Open with \"%s\""
+msgstr "(_O)തുറക്കുക \"%s\" ഉപയോഗിച്ച്"
 
-#: ../data/playlist.ui.h:6
-msgid "Remove file from playlist"
-msgstr "ഫയല്‍ പ്ലേലിസ്റ്റില്‍ നിന്നും കളയുക"
+#: ../browser-plugin/totem-plugin-viewer.c:1341 ../src/totem-object.c:2475
+msgid "An error occurred"
+msgstr "ഒരു പിശക് സംഭവിച്ചിരിക്കുന്നു"
 
-#: ../data/playlist.ui.h:7
-msgid "Save Playlist..."
-msgstr "പ്ലേലിസ്റ്റ് സൂക്ഷിയ്ക്കുക..."
+#: ../browser-plugin/totem-plugin-viewer.c:2033
+msgid "No playlist or playlist empty"
+msgstr "പ്ലേലിസ്റ്റില്ല അല്ലെങ്കില്‍ പ്ലേലിസ്റ്റ് ഖാലിയാണു"
 
-#: ../data/playlist.ui.h:8 ../data/totem.ui.h:77
-msgid "Select a file to use for text subtitles"
-msgstr "അടിക്കുറിപ്പുകള്‍ക്കായി ഉപയോഗിയ്ക്കേണ്ട ഫയല്‍ തെരഞ്ഞെടുക്കുക"
+#: ../browser-plugin/totem-plugin-viewer.c:2128
+msgid "Movie browser plugin"
+msgstr "ചലചിത്രം ബ്രൌസര്‍ സംയോജകം"
 
-#: ../data/playlist.ui.h:9 ../data/video-list.ui.h:4
-msgid "_Copy Location"
-msgstr "വിലാസം _പകര്‍ത്തുക..."
+#: ../browser-plugin/totem-plugin-viewer.c:2144 ../src/totem.c:240
+msgid "Could not initialize the thread-safe libraries."
+msgstr "ത്രെഡ്-സെയിഫ് ലൈബ്രറികള്‍ ആരംഭിക്കുവാന്‍ സാധ്യമായില്ല"
 
-#: ../data/playlist.ui.h:10
-msgid "_Remove"
-msgstr "_നീക്കം ചെയ്യുക"
+#: ../browser-plugin/totem-plugin-viewer.c:2144
+msgid "Verify your system installation. The Totem plugin will now exit."
+msgstr "നിങ്ങളുടെ സിസ്റ്റം ഇന്‍സ്റ്റലേഷന്‍ പരിശോധിക്കുക. Totem സംയോജകം ഇപ്പോള്‍ നില്‍ക്കുന്നതാണ്."
 
-#: ../data/playlist.ui.h:11 ../data/totem.ui.h:141
-msgid "_Select Text Subtitles..."
-msgstr "_അടിക്കുറിപ്പു് പദാവലി തെരഞ്ഞെടുക്കുക..."
+#: ../data/fullscreen.ui.h:1
+msgid "Leave Fullscreen"
+msgstr "സ്ക്രീന്‍ മുഴുവനും എടുക്കേണ്ട"
 
-#: ../data/properties.ui.h:1
-msgid "Album:"
-msgstr "ആല്‍ബം:"
+#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:81
+msgid "Time:"
+msgstr "സമയം:"
 
-#: ../data/properties.ui.h:2
-msgid "Artist:"
-msgstr "കലാകാരന്‍/കലാകാരി:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
+msgid "Allow the screensaver to activate when playing audio"
+msgstr "ശബ്ദം വരുമ്പോള്‍ സ്ക്രീന്‍സേവര്‍ പ്രവര്‍ത്തിയ്ക്കാന്‍ അനുവദിക്കുക"
 
-#: ../data/properties.ui.h:3 ../data/totem.ui.h:23
-#: ../src/totem-properties-view.c:268
-msgid "Audio"
-msgstr "ശബ്ദം"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
+msgid ""
+"Allow the screensaver to activate when playing audio. Disable if you have "
+"monitor-powered speakers."
+msgstr ""
+"ശബ്ദം വരുമ്പോള്‍ സ്ക്രീന്‍സേവര്‍ പ്രവര്‍ത്തിയ്ക്കാന്‍ അനുവദിക്കുക. മോണിറ്റര്‍ വഴി ഊര്‍ജം കിട്ടുന്ന "
+"സ്പീക്കറുകള്‍ക്കുണ്ടെങ്കില്‍, ഇതു് പ്രവര്‍ത്തന രഹിതമാക്കുക."
 
-#: ../data/properties.ui.h:4
-msgid "Bitrate:"
-msgstr "ബിറ്റ് റെയിറ്റ്:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
+msgid "Show visual effects when no video is displayed"
+msgstr "വീഡിയോ പ്രദര്‍ശിപ്പിക്കാത്തപ്പോള്‍ വിഷ്വല്‍ ഇഫക്റ്റുകള്‍ കാണിയ്ക്കുക"
 
-#: ../data/properties.ui.h:5
-msgid "Channels:"
-msgstr "ചാനലുകള്‍:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
+msgid "Show visual effects when playing an audio only file."
+msgstr "ഓഡിയോ ഫയല്‍ പ്രദര്‍ശിപ്പിക്കുമ്പോള്‍ മാത്രം വിഷ്വല്‍ ഇഫക്റ്റുകള്‍ കാണിയ്ക്കുക"
 
-#: ../data/properties.ui.h:6
-msgid "Codec:"
-msgstr "കോഡെക്ക്:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
+msgid "Name of the visual effects plugin"
+msgstr "വിഷ്വല്‍ ഇഫക്റ്റ്സ് സംയോജകങ്ങളുടെ പേരു്"
 
-#: ../data/properties.ui.h:7
-msgid "Comment:"
-msgstr "അഭിപ്രായം:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
+msgid "The brightness of the video"
+msgstr "ചലച്ചിത്രത്തിന്റെ പ്രകാശം"
 
-#: ../data/properties.ui.h:8
-msgid "Container:"
-msgstr ""
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
+msgid "The contrast of the video"
+msgstr "ചലച്ചിത്രത്തിന്റെ തെളിച്ചം"
 
-#: ../data/properties.ui.h:9
-msgid "Dimensions:"
-msgstr "അളവുകള്‍:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
+msgid "The hue of the video"
+msgstr "ചലച്ചിത്രത്തിന്റെ വര്‍ണ്ണം"
 
-#: ../data/properties.ui.h:10
-msgid "Duration:"
-msgstr "സമയ പരിധി:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
+msgid "The saturation of the video"
+msgstr "ചലച്ചിത്രത്തിന്റെ സാച്ചുറേഷന്‍"
 
-#: ../data/properties.ui.h:11
-msgid "Framerate:"
-msgstr "ഫ്രെയിംറേറ്റ്:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
+msgid "Resize the canvas automatically on file load"
+msgstr "ഫയല്‍ ലോഡ് ചെയ്യുമ്പോള്‍ കാന്വാസ് തനിയെ വലിപ്പം മാറ്റുക"
 
-#: ../data/properties.ui.h:12 ../data/totem.ui.h:41
-msgid "General"
-msgstr "പൊതുവായ"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
+msgid "Repeat mode"
+msgstr "ആവര്‍ത്തന മോഡ്"
 
-#: ../data/properties.ui.h:13
-msgid "Sample rate:"
-msgstr "സാമ്പിള്‍ റേറ്റ്:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
+msgid "Shuffle mode"
+msgstr "ഷഫിള്‍ മോഡ്"
 
-#: ../data/properties.ui.h:14
-msgid "Title:"
-msgstr "തലക്കെട്ട്:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
+msgid "Whether to disable deinterlacing for interlaced movies"
+msgstr "ഇന്റര്‍ലെയിസ്ഡ് ചലചിത്രങ്ങള്‍ക്കുള്ള ഡീഇന്റര്‍ലെയിസിങ് പ്രവര്‍ത്തന രഹിതമാക്കണമോ എന്നു്"
 
-#: ../data/properties.ui.h:15 ../data/totem.ui.h:104
-#: ../src/totem-properties-view.c:270
-msgid "Video"
-msgstr "വീഡിയോ"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
+msgid "Whether to enable debug for the playback engine"
+msgstr "പ്ലേബാക്ക് എഞ്ചിന് ഡീബഗ് സജ്ജമാക്കണമോ"
 
-#: ../data/properties.ui.h:16
-msgid "Year:"
-msgstr "വര്‍ഷം‌:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
+msgid "Type of audio output to use"
+msgstr "ഉപയോഗിക്കുന്നതിനുളള ഏതു് തരം ഓഡിയോ ഔട്ട്പുട്ട്"
 
-#: ../data/video-list.ui.h:1
-msgid "Add the video to the playlist"
-msgstr "പ്ലേലിസ്റ്റിലേയ്ക്കു് വീഡിയോ ചേര്‍ക്കുക"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
+msgid "Visualization quality setting"
+msgstr "വിഷ്യലൈസേഷന്റെ ഗുണ സജ്ജീകരണം"
 
-#: ../data/video-list.ui.h:3 ../src/totem-dnd-menu.c:97
-msgid "_Add to Playlist"
-msgstr "_പ്ലേലിസ്റ്റിലേയ്ക്കു് ചേര്‍ക്കുക"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
+msgid "Quality setting for the audio visualization."
+msgstr "ശബ്ദ വിഷ്വലൈസേഷന്റെ ഗുണനിലവാര സജ്ജീകരണം."
 
-#. Title
-#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:53
-#: ../src/totem-object.c:1667
-msgid "Movie Player"
-msgstr "മൂവി പ്ലേയര്‍"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
+msgid "Network buffering threshold"
+msgstr "ശൃംഖല ബഫറിങ് ത്രെഷോള്‍ഡ്"
 
-#: ../data/totem.desktop.in.in.in.h:2
-msgid "Play movies and songs"
-msgstr "സിനിമയും പാട്ടുകളും പ്രവര്‍ത്തിപ്പിക്കുന്നു"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
+msgid ""
+"Amount of data to buffer for network streams before starting to display the "
+"stream (in seconds)."
+msgstr ""
+"ശ്രംഖലയിലുള്ള സ്ട്രീമുകള്‍ കാണിയ്ക്കാന്‍ തുടങ്ങുന്നതിനു മുമ്പു് ബഫര്‍ ചെയ്യേണ്ട ഡേറ്റയുടെ അളവ് "
+"(സെക്കന്റുകളില്‍)"
 
-#: ../data/totem.ui.h:1
-msgid "1.5 Mbps T1/Intranet/LAN"
-msgstr "1.5 എം.ബി.പി.എസ് ടി-1/ഇന്‍ട്രാനെറ്റ്/ലാന്‍"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
+msgid "Subtitle font"
+msgstr "അടിക്കുറിപ്പിന്റെ അക്ഷരസഞ്ചയം"
 
-#: ../data/totem.ui.h:2
-msgid "112 Kbps Dual ISDN/DSL"
-msgstr "112 കെ.ബി.പി.എസ് ഡുഅല്‍ ഐ.എസ്.ഡി.എന്‍/ഡി.എസ്.എല്‍"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
+msgid "Pango font description for subtitle rendering."
+msgstr "അടിക്കുറിപ്പു് ചിത്രീകരിയ്ക്കാനുളള പാംഗോ അക്ഷരസഞ്ചയത്തിന്റെ വിവരണം"
 
-#: ../data/totem.ui.h:3
-msgid "14.4 Kbps Modem"
-msgstr "14.4 കെ.ബി.പി.എസ് മോഡെം"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
+msgid "Subtitle encoding"
+msgstr "അടിക്കുറിപ്പു് എന്‍കോഡിങ്ങ്"
 
-#: ../data/totem.ui.h:4
-msgid "16:9 (Widescreen)"
-msgstr "16:9 (Widescreen)"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
+msgid "Encoding character set for subtitle."
+msgstr "അടിക്കുറിപ്പിനു് വേണ്ട എന്‍കോഡ് ചെയ്ത ക്യാരക്ടര്‍ സെറ്റ്."
 
-#: ../data/totem.ui.h:5
-msgid "19.2 Kbps Modem"
-msgstr "19.2 കെ.ബി.പി.എസ് മോഡെം"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
+msgid "Default location for the \"Open...\" dialogs"
+msgstr "\"തുറക്കുക...\" എന്ന സംഭാഷണങ്ങള്‍ക്കുള്ള സഹജമായ സ്ഥാനം"
 
-#: ../data/totem.ui.h:6
-msgid "2.11:1 (DVB)"
-msgstr "2.11:1 (DVB)"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
+msgid ""
+"Default location for the \"Open...\" dialogs. Default is the current "
+"directory."
+msgstr "\"തുറക്കുക...\" എന്ന സംഭാഷണങ്ങള്‍ക്കുള്ള സഹജമായ സ്ഥാനം, സഹജമായിട്ടുള്ളതു് നിലവിലുള്ള ഡയറക്ടറിയാണു്"
 
-#: ../data/totem.ui.h:7
-msgid "256 Kbps DSL/Cable"
-msgstr "256 കെ.ബി.പി.എസ് ഡി.എസ്.എല്‍ കേബിള്‍"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
+msgid "Default location for the \"Take Screenshot\" dialogs"
+msgstr "\"തിരച്ചിത്രം എടുക്കുക\" എന്ന സംഭാഷണങ്ങള്‍ക്കുള്ള സഹജമായ സ്ഥാനം"
 
-#: ../data/totem.ui.h:8
-msgid "28.8 Kbps Modem"
-msgstr "28.8 കെ.ബി.പി.എസ് മോഡെം"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
+msgid ""
+"Default location for the \"Take Screenshot\" dialogs. Default is the "
+"Pictures directory."
+msgstr ""
+"\"തിരച്ചിത്രം എടുക്കുക\" എന്ന സംഭാഷണങ്ങള്‍ക്കുള്ള സഹജമായ സ്ഥാനം, സഹജമായിട്ടുള്ളതു് ചിത്രങ്ങളുടെ "
+"ഡയറക്ടറിയാണു്"
 
-#: ../data/totem.ui.h:9
-msgid "33.6 Kbps Modem"
-msgstr "33.6 കെ.ബി.പി.എസ് മോഡെം"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
+msgid "Whether to disable the plugins in the user's home directory"
+msgstr "ഉപയോക്താവിന്റെ 'വീട്' തട്ടത്തില്‍ സംയോജകങ്ങള്‍ അപ്രാവര്‍ത്തികമാക്കണോ എന്നു്"
 
-#: ../data/totem.ui.h:10
-msgid "34.4 Kbps Modem"
-msgstr "34.4 കെ.ബി.പി.എസ് മോഡെം"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
+msgid "Whether to disable the keyboard shortcuts"
+msgstr "കീബോര്‍ഡിനുള്ള എളുപ്പവഴികള്‍ പ്രവര്‍ത്തന രഹിതമാക്കണമോ എന്നു്"
 
-#: ../data/totem.ui.h:11
-msgid "384 Kbps DSL/Cable"
-msgstr "384 കെ.ബി.പി.എസ് ഡി.എസ്.എല്‍ കേബിള്‍"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
+msgid "Whether to autoload text subtitle files when a movie is loaded"
+msgstr "ചലച്ചിത്രം ലോഡ് ചെയ്യുമ്പോള്‍ അടിക്കുറിപ്പു് തനിയെ ലോഡ് ചെയ്യണോ എന്ന്"
 
-#: ../data/totem.ui.h:12
-msgid "4-channel"
-msgstr "4-ചാനല്‍"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
+msgid "Whether to autoload external chapter files when a movie is loaded"
+msgstr "ചലച്ചിത്രം ലഭ്യമാക്കുമ്പോള്‍ അടിക്കുറിപ്പു് തനിയെ ലോഡ് ചെയ്യണോ എന്ന്"
 
-#: ../data/totem.ui.h:13
-msgid "4.1-channel"
-msgstr "4.1-ചാനല്‍"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
+msgid ""
+"Whether to remember the position of played audio/video files when pausing or "
+"closing them"
+msgstr ""
+"തല്‍ക്കാലത്തേക്ക് നിര്‍ത്തുമ്പോള്‍ അല്ലെങ്കില്‍ പുറത്തു് കടക്കുമ്പോള്‍ പ്രവര്‍ത്തനത്തിലുള്ള ഓഡിയോ/വീഡിയോ "
+"ഫയലുകളുടെ സ്ഥാനം സൂക്ഷിക്കണമോ എന്നു്"
 
-#: ../data/totem.ui.h:14
-msgid "4:3 (TV)"
-msgstr "4:3 (TV)"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
+msgid "Active plugins list"
+msgstr "സജീവമായ സംയോജക പട്ടിക"
 
-#: ../data/totem.ui.h:15
-msgid "5.0-channel"
-msgstr "5.0-ചാനല്‍"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+msgid ""
+"A list of the names of the plugins which are currently active (loaded and "
+"running)."
+msgstr "നിലവില്‍ സജീവമായ പ്ലഗിനുകളുടെ പട്ടിക (ലഭ്യമാക്കി പ്രവര്‍ത്തിയ്ക്കുന്നു)."
 
-#: ../data/totem.ui.h:16
-msgid "5.1-channel"
-msgstr "5.1-ചാനല്‍"
+#: ../data/playlist.ui.h:1
+msgid "_Remove"
+msgstr "_നീക്കം ചെയ്യുക"
 
-#: ../data/totem.ui.h:17
-msgid "512 Kbps DSL/Cable"
-msgstr "512 കെ.ബി.പി.എസ് ഡി.എസ്.എല്‍/കേബിള്‍"
+#: ../data/playlist.ui.h:2
+msgid "Remove file from playlist"
+msgstr "ഫയല്‍ പ്ലേലിസ്റ്റില്‍ നിന്നും കളയുക"
 
-#: ../data/totem.ui.h:18
-msgid "56 Kbps Modem/ISDN"
-msgstr "56 കെ.ബി.പി.എസ് മോഡം/ഐ.എസ്.ഡി.എന്‍"
+#: ../data/playlist.ui.h:3 ../data/video-list.ui.h:3
+msgid "_Copy Location"
+msgstr "വിലാസം _പകര്‍ത്തുക..."
 
-#: ../data/totem.ui.h:19
-msgid "AC3 Passthrough"
-msgstr "എ.സി.3 പാസ്ത്രൂ (അകത്തൂടെ കടക്കല്‍)"
+#: ../data/playlist.ui.h:4 ../data/video-list.ui.h:4
+msgid "Copy the location to the clipboard"
+msgstr "സ്ഥാനം ഓര്‍മ്മച്ചെപ്പിലേയ്ക്കു് പകര്‍ത്തുക"
 
-#: ../data/totem.ui.h:20
-msgid "A_udio Menu"
-msgstr "_ഓഡിയോ മെനു"
+#: ../data/playlist.ui.h:5 ../data/totem.ui.h:71
+msgid "_Select Text Subtitles..."
+msgstr "_അടിക്കുറിപ്പു് പദാവലി തെരഞ്ഞെടുക്കുക..."
 
-#: ../data/totem.ui.h:21
-msgid "About this application"
-msgstr "ഈ പ്രയോഗത്തെക്കുറിച്ചു്"
+#: ../data/playlist.ui.h:6 ../data/totem.ui.h:72
+msgid "Select a file to use for text subtitles"
+msgstr "അടിക്കുറിപ്പുകള്‍ക്കായി ഉപയോഗിയ്ക്കേണ്ട ഫയല്‍ തെരഞ്ഞെടുക്കുക"
 
-#: ../data/totem.ui.h:22
-msgctxt "Aspect ratio"
-msgid "Auto"
-msgstr "സ്വതേ"
+#: ../data/playlist.ui.h:7
+msgid "Add..."
+msgstr "ചേര്‍ക്കുക..."
 
-#: ../data/totem.ui.h:24
-msgid "Audio Output"
-msgstr "ഓഡിയോ ഔട്ട്പുട്ട്"
+#: ../data/playlist.ui.h:8
+msgid "Remove"
+msgstr "നീക്കം ചെയ്യുക"
 
-#: ../data/totem.ui.h:25
-msgid "Clear the playlist"
-msgstr "പ്ലേലിസ്റ്റ് മായ്ക്കുക"
+#: ../data/playlist.ui.h:9
+msgid "Save Playlist..."
+msgstr "പ്ലേലിസ്റ്റ് സൂക്ഷിയ്ക്കുക..."
 
-#: ../data/totem.ui.h:26
-msgid "Co_ntrast:"
-msgstr "_തെളിച്ചം: "
+#: ../data/playlist.ui.h:10
+msgid "Move Up"
+msgstr "മുകളിലേയ്ക്കു് മാറ്റുക"
 
-#: ../data/totem.ui.h:27
-msgid "Color Balance"
-msgstr "നിറത്തിന്റെ നില"
+#: ../data/playlist.ui.h:11
+msgid "Move Down"
+msgstr "താഴേയ്ക്കു് മാറ്റുക"
 
-#: ../data/totem.ui.h:28
-msgid "Configure plugins to extend the application"
-msgstr "പ്രയോഗം വികസിപ്പിക്കുന്നതിനായി പ്ലഗിനുകള്‍ ക്രമീകരിക്കുക"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:2
+msgid "Normal"
+msgstr "സാധാരണ"
 
-#: ../data/totem.ui.h:29
-msgid "Configure the application"
-msgstr "പ്രയോഗം ക്രമീകരിയ്ക്കുക"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:4
+msgid "Large"
+msgstr "വലുത്"
 
-#: ../data/totem.ui.h:30
-msgid "Connection _speed:"
-msgstr "കണക്ഷന്‍ _വേഗത:"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:6
+msgid "Extra Large"
+msgstr "വളരെ വലുതു്"
 
-#: ../data/totem.ui.h:31
-msgid "Decrease volume"
-msgstr "ശബ്ദം കുറയ്ക്കുക"
+#: ../data/preferences.ui.h:7 ../src/backend/bacon-video-widget.c:5498
+#: ../src/totem-properties-view.c:231
+msgid "Stereo"
+msgstr "സ്റ്റീരിയോ"
 
-#: ../data/totem.ui.h:32
-msgid "Disable _deinterlacing of interlaced videos"
-msgstr ""
+#: ../data/preferences.ui.h:8
+msgid "4-channel"
+msgstr "4-ചാനല്‍"
 
-#: ../data/totem.ui.h:33
-msgid "Disable screensaver when playing "
-msgstr "ഓഡിയോ പ്രവര്‍ത്തിക്കുമ്പോള്‍ സ്ക്രീന്‍സേവര്‍ പ്രവര്‍ത്തന രഹിതമാക്കുക"
+#: ../data/preferences.ui.h:9
+msgid "4.1-channel"
+msgstr "4.1-ചാനല്‍"
 
-#. Tab label in the Preferences dialogue
-#: ../data/totem.ui.h:35
-msgid "Display"
-msgstr "പ്രദര്‍ശനം"
+#: ../data/preferences.ui.h:10
+msgid "5.0-channel"
+msgstr "5.0-ചാനല്‍"
 
-#: ../data/totem.ui.h:36
-msgid "Eject the current disc"
-msgstr "നിലവിലുള്ള ഡിസ്ക് പുറത്തെടുക്കുക"
+#: ../data/preferences.ui.h:11
+msgid "5.1-channel"
+msgstr "5.1-ചാനല്‍"
 
-#: ../data/totem.ui.h:37
-msgid "External Chapters"
-msgstr ""
+#: ../data/preferences.ui.h:12
+msgid "AC3 Passthrough"
+msgstr "എ.സി.3 പാസ്ത്രൂ (അകത്തൂടെ കടക്കല്‍)"
 
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:39
-msgid "Extra Large"
-msgstr "വളരെ വലുതു്"
+#: ../data/preferences.ui.h:13
+msgid "Totem Preferences"
+msgstr "ടോട്ടത്തിനുള്ള മുന്‍ഗണനകള്‍"
 
-#: ../data/totem.ui.h:40
-msgid "Fit Window to Movie"
-msgstr "സിനിമയുടെ വലിപ്പത്തിലേയ്ക്കു് ജാലകം ക്രമീകരിയ്ക്കുക"
+#: ../data/preferences.ui.h:14
+msgid "Playback"
+msgstr "പ്ലേബാക്ക്"
 
-#: ../data/totem.ui.h:42
-msgid "Go to the DVD menu"
-msgstr "ഡി.വി.ഡി മെനുവിലേയ്ക്കു് പോവുക"
+#: ../data/preferences.ui.h:15
+msgid "Start playing files from last position"
+msgstr "അവസാന സ്ഥാനത്തു് നിന്നും ഫയലുകള്‍ പ്രവര്‍ത്തിപ്പിക്കുവാന്‍ ആരംഭിക്കുക"
 
-#: ../data/totem.ui.h:43
-msgid "Go to the angle menu"
-msgstr "ആങ്കിള്‍ മെനുവിലേയ്ക്കു് പോവുക"
+#: ../data/preferences.ui.h:16
+msgid "Text Subtitles"
+msgstr "അടിക്കുറിപ്പുകള്‍"
 
-#: ../data/totem.ui.h:44
-msgid "Go to the audio menu"
-msgstr "ഓഡിയോ മെനുവിലേയ്ക്കു് പോവുക"
+#: ../data/preferences.ui.h:17
+msgid "_Load subtitle files when movie is loaded"
+msgstr "ചിത്രം ലഭ്യമാക്കുമ്പോള്‍ സ്വയമേ അടിക്കുറിപ്പു് ഫയലുകള്‍  _ചേര്‍ക്കുക"
 
-#: ../data/totem.ui.h:45
-msgid "Go to the chapter menu"
-msgstr "ഭാഗങ്ങളുടെ മെനുവിലേയ്ക്കു് പോവുക"
+#: ../data/preferences.ui.h:18
+msgid "_Font:"
+msgstr "_അക്ഷരസഞ്ചയം:"
 
-#: ../data/totem.ui.h:46
-msgid "Go to the title menu"
-msgstr "തലക്കെട്ടുകളുടെ മെനുവിലേയ്ക്കു് പോവുക"
+#: ../data/preferences.ui.h:19
+msgid "_Encoding:"
+msgstr "_എന്‍കോഡിങ്ങ്:"
 
-#: ../data/totem.ui.h:47
-msgid "Help contents"
-msgstr "സഹായത്തിന്റെ ഉളളടക്കം"
+#: ../data/preferences.ui.h:20
+msgid "External Chapters"
+msgstr "ആന്തരിക പാഠങ്ങള്‍"
 
-#: ../data/totem.ui.h:48
-msgid "Increase volume"
-msgstr "ശബ്ദം വര്‍ദ്ധിപ്പിക്കുക"
+#: ../data/preferences.ui.h:21
+msgid "Load _chapter files when movie is loaded"
+msgstr "ഒരു പുതിയ ചിത്രം ലഭ്യമാക്കുമ്പോള്‍ സ്വയമേ അടിക്കുറിപ്പു് ഫയലുകള്‍  _ചേര്‍ക്കുക"
 
-#: ../data/totem.ui.h:49
-msgid "Intranet/LAN"
-msgstr "ഇന്‍ട്രാനെറ്റ്/ലാന്‍"
+#: ../data/preferences.ui.h:22 ../data/properties.ui.h:1
+msgid "General"
+msgstr "പൊതുവായ"
 
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:51
-msgid "Large"
-msgstr "വലുത്"
+#. Tab label in the Preferences dialogue
+#: ../data/preferences.ui.h:24
+msgid "Display"
+msgstr "പ്രദര്‍ശനം"
 
-#: ../data/totem.ui.h:52
-msgid "Load _chapter files when movie is loaded"
-msgstr "ഒരു പുതിയ ചിത്രം ലഭ്യമാക്കുമ്പോള്‍ സ്വയമേ അടിക്കുറിപ്പു് ഫയലുകള്‍  _ചേര്‍ക്കുക"
+#: ../data/preferences.ui.h:25
+msgid "_Resize the window when a new video is loaded"
+msgstr "ഒരു പുതിയ ചലചിത്രം ലഭ്യമാക്കുമ്പോള്‍ സ്വയമേ ജാലകത്തിന്റെ വലിപ്പം _ക്രമീകരിയ്ക്കുക"
 
-#: ../data/totem.ui.h:54
-msgid "Networking"
-msgstr "നെറ്റ്‌വര്‍ക്കിങ്ങ്"
+#: ../data/preferences.ui.h:26
+msgid "Disable _deinterlacing of interlaced videos"
+msgstr "ഇന്റര്‍ലെയിസ്ഡ് വീഡിയോകളുടെ ഡീ_ഇന്റര്‍ലേയിസിങ് പ്രവര്‍ത്തന രഹിതമാക്കുക"
 
-#: ../data/totem.ui.h:55
-msgid "Next chapter or movie"
-msgstr "അടുത്ത ഭാഗം അല്ലെങ്കില്‍ സിനിമ"
+#: ../data/preferences.ui.h:27
+msgid "Disable screensaver when playing "
+msgstr "ഓഡിയോ പ്രവര്‍ത്തിക്കുമ്പോള്‍ സ്ക്രീന്‍സേവര്‍ പ്രവര്‍ത്തന രഹിതമാക്കുക"
 
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:57
-msgid "Normal"
-msgstr "സാധാരണ"
+#: ../data/preferences.ui.h:28 ../data/properties.ui.h:9
+#: ../src/totem-properties-view.c:273
+msgid "Video"
+msgstr "വീഡിയോ"
 
-#: ../data/totem.ui.h:58
-msgid "Open _Location..."
-msgstr "_വിലാസം തുറക്കുക..."
+#: ../data/preferences.ui.h:29
+msgid "Video or Audio"
+msgstr "ശബദമോ ചലചിത്രമോ"
 
-#: ../data/totem.ui.h:59
-msgid "Open a file"
-msgstr "ഒരു ഫയല്‍ തുറക്കുക"
+#: ../data/preferences.ui.h:30
+msgid "Visual Effects"
+msgstr "കണ്ണിന് കുളിര്‍മയേകുന്ന കാഴ്ചകള്‍"
 
-#: ../data/totem.ui.h:60
-msgid "Open a non-local file"
-msgstr "ഒരു നോണ്‍-ലോക്കല്‍ ഫയല്‍ തുറക്കുക"
+#: ../data/preferences.ui.h:31
+msgid "Show _visual effects when an audio file is played"
+msgstr "ഓഡിയോ ഫയല്‍ പ്രവര്‍ത്തിക്കുമ്പോള്‍ _വിഷ്വല്‍ ഇഫക്റ്റുകള്‍ കാണിയ്ക്കുക"
 
-#: ../data/totem.ui.h:61
-msgid "Play / P_ause"
-msgstr "പ്രവര്‍ത്തിപ്പിക്കുക / _താല്‍കാലത്തേക്ക് നിര്‍ത്തുക"
+#: ../data/preferences.ui.h:32
+msgid "_Type of visualization:"
+msgstr "ഏതു് _തരം വിഷ്വലൈസേഷന്‍:"
 
-#: ../data/totem.ui.h:62
-msgid "Play or pause the movie"
-msgstr "ചലച്ചിത്രം പ്രവര്‍ത്തിപ്പിക്കുക അല്ലെങ്കില്‍ താല്‍കാലത്തേക്ക് നിര്‍ത്തുക"
+#: ../data/preferences.ui.h:33
+msgid "Visualization _size:"
+msgstr "വിഷ്യലൈസേഷന്‍ _വലിപ്പം:"
 
-#: ../data/totem.ui.h:63
-msgid "Playback"
-msgstr "പ്ലേബാക്ക്"
+#: ../data/preferences.ui.h:34
+msgid "Color Balance"
+msgstr "നിറത്തിന്റെ നില"
 
-#: ../data/totem.ui.h:64
-msgid "Plugins..."
-msgstr "സംയോജകം..."
+#: ../data/preferences.ui.h:35
+msgid "_Brightness:"
+msgstr "_പ്രകാശം:"
 
-#: ../data/totem.ui.h:65
-msgid "Prefere_nces"
-msgstr "മുന്‍ഗണ_നകള്‍"
+#: ../data/preferences.ui.h:36
+msgid "Co_ntrast:"
+msgstr "_തെളിച്ചം: "
 
-#: ../data/totem.ui.h:66
-msgid "Previous chapter or movie"
-msgstr "മുമ്പുളള ഭാഗം"
+#: ../data/preferences.ui.h:37
+msgid "Sat_uration:"
+msgstr "സാ_ച്ചുറേഷന്‍:"
 
-#: ../data/totem.ui.h:67
-msgid "Quit the program"
-msgstr "പ്രയോഗം നിര്‍ത്തുക"
+#: ../data/preferences.ui.h:38
+msgid "_Hue:"
+msgstr "_വര്‍ണ്ണം:"
 
-#: ../data/totem.ui.h:68
+#: ../data/preferences.ui.h:39
 msgid "Reset to _Defaults"
 msgstr "_സഹജമായവയിലേയ്ക്കു് വീണ്ടും സജ്ജീകരിയ്ക്കുക"
 
-#: ../data/totem.ui.h:69
-msgid "Resize _1:1"
-msgstr "വലിപ്പം _1:1 ആയി ക്രമീകരിയ്ക്കുക"
+#: ../data/preferences.ui.h:40
+msgid "Audio Output"
+msgstr "ഓഡിയോ ഔട്ട്പുട്ട്"
 
-#: ../data/totem.ui.h:70
-msgid "Resize _2:1"
-msgstr "വലിപ്പം _2:1 ആയി ക്രമീകരിയ്ക്കുക"
+#: ../data/preferences.ui.h:41
+msgid "_Audio output type:"
+msgstr "_ഓഡിയോ ഔട്ട്പുട്ട് രീതി:"
 
-#: ../data/totem.ui.h:71
-msgid "Resize to double the original video size"
-msgstr "ചലച്ചിത്രത്തിന്റെ ഇരട്ടി വലിപ്പത്തിലാക്കുക"
+#: ../data/preferences.ui.h:42 ../data/properties.ui.h:14
+#: ../src/totem-properties-view.c:271
+msgid "Audio"
+msgstr "ശബ്ദം"
 
-#: ../data/totem.ui.h:72
-msgid "Resize to half the original video size"
-msgstr "ചലച്ചിത്രത്തിന്റെ പകുതി വലിപ്പത്തിലാക്കുക"
+#: ../data/properties.ui.h:2
+msgid "Title:"
+msgstr "തലക്കെട്ട്:"
 
-#: ../data/totem.ui.h:73
-msgid "Resize to the original video size"
-msgstr "ചലച്ചിത്രത്തിന്റെ സ്വാഭാവിക വലിപ്പത്തിലാക്കുക"
+#: ../data/properties.ui.h:3
+msgid "Artist:"
+msgstr "കലാകാരന്‍/കലാകാരി:"
 
-#: ../data/totem.ui.h:74
-msgid "S_idebar"
-msgstr "വശത്തുള്ള _പട്ട"
+#: ../data/properties.ui.h:4
+msgid "Duration:"
+msgstr "സമയ പരിധി:"
 
-#: ../data/totem.ui.h:75
-msgid "S_ubtitles"
-msgstr "അ_ടിക്കുറിപ്പുകള്‍"
+#: ../data/properties.ui.h:5
+msgid "Year:"
+msgstr "വര്‍ഷം‌:"
 
-#: ../data/totem.ui.h:76
-msgid "Sat_uration:"
-msgstr "സാ_ച്ചുറേഷന്‍:"
+#: ../data/properties.ui.h:6
+msgid "Album:"
+msgstr "ആല്‍ബം:"
 
-#: ../data/totem.ui.h:78
-msgid "Set the repeat mode"
-msgstr "റിപ്പീറ്റ് മോഡ് സജ്ജമാക്കുക"
+#: ../data/properties.ui.h:7
+msgid "Comment:"
+msgstr "അഭിപ്രായം:"
 
-#: ../data/totem.ui.h:79
-msgid "Set the shuffle mode"
-msgstr "ഷഫിള്‍ മോഡ് സജ്ജമാക്കുക"
+#: ../data/properties.ui.h:8
+msgid "Container:"
+msgstr "കണ്ടെയിനര്‍:"
 
-#: ../data/totem.ui.h:80
-msgid "Sets 16:9 (widescreen) aspect ratio"
-msgstr "16:9 (വൈഡ്-സ്ക്രീന്‍) ആസ്പക്റ്റ് റേഷ്യോ സജ്ജമാക്കുക"
+#: ../data/properties.ui.h:10
+msgid "Dimensions:"
+msgstr "അളവുകള്‍:"
 
-#: ../data/totem.ui.h:81
-msgid "Sets 2.11:1 (DVB) aspect ratio"
-msgstr "2.11:1 (DVB) ആസ്പക്റ്റ് റേഷ്യോ സജ്ജമാക്കുക"
+#: ../data/properties.ui.h:11
+msgid "Codec:"
+msgstr "കോഡെക്ക്:"
 
-#: ../data/totem.ui.h:82
-msgid "Sets 4:3 (TV) aspect ratio"
-msgstr "4:3 (TV) ആസ്പക്റ്റ് റേഷ്യോ സജ്ജമാക്കുക"
+#: ../data/properties.ui.h:12
+msgid "Framerate:"
+msgstr "ഫ്രെയിംറേറ്റ്:"
 
-#: ../data/totem.ui.h:83
-msgid "Sets automatic aspect ratio"
-msgstr "ഓട്ടോമാറ്റിക്ക് ആസ്പക്റ്റ് റേഷ്യോ സജ്ജമാക്കുക"
+#: ../data/properties.ui.h:13
+msgid "Bitrate:"
+msgstr "ബിറ്റ് റെയിറ്റ്:"
 
-#: ../data/totem.ui.h:84
-msgid "Sets square aspect ratio"
-msgstr "സ്ക്വയര്‍ ആസ്പക്റ്റ് റേഷ്യോ സജ്ജമാക്കുക"
+#: ../data/properties.ui.h:15
+msgid "Sample rate:"
+msgstr "സാമ്പിള്‍ റേറ്റ്:"
 
-#: ../data/totem.ui.h:85
-msgid "Show _Controls"
-msgstr "_നിയന്ത്രണങ്ങള്‍ കാണിയ്ക്കുക"
+#: ../data/properties.ui.h:16
+msgid "Channels:"
+msgstr "ചാനലുകള്‍:"
 
-#: ../data/totem.ui.h:86
-msgid "Show _visual effects when an audio file is played"
-msgstr "ഓഡിയോ ഫയല്‍ പ്രവര്‍ത്തിക്കുമ്പോള്‍ _വിഷ്വല്‍ ഇഫക്റ്റുകള്‍ കാണിയ്ക്കുക"
+#. Title
+#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:80 ../src/totem.c:239
+#: ../src/totem.c:248 ../src/totem-menu.c:790 ../src/totem-object.c:1658
+msgid "Videos"
+msgstr "വീഡിയോകള്‍"
 
-#: ../data/totem.ui.h:87
-msgid "Show controls"
-msgstr "നിയന്ത്രണങ്ങള്‍ കാണിയ്ക്കുക"
+#: ../data/totem.desktop.in.in.in.h:2
+#| msgid "Playing a movie"
+msgid "Play movies"
+msgstr "ചലച്ചിത്രങ്ങള്‍ പ്രവര്‍ത്തിപ്പിക്കുന്നു"
+
+#: ../data/totem.desktop.in.in.in.h:3
+msgid "Video;Movie;Film;Clip;Series;Player;DVD;TV;Disc;"
+msgstr "Video;Movie;Film;Clip;Series;Player;DVD;TV;Disc;"
 
-#: ../data/totem.ui.h:88
-msgid "Show or hide the sidebar"
-msgstr "സൈഡ് ബാര്‍ കാണിയ്ക്കുകയോ അദൃശ്യമാക്കുകയോ ചെയ്യുക"
+#: ../data/totem.ui.h:1
+#| msgid "_Open..."
+msgid "_Open"
+msgstr "_തുറക്കുക"
 
-#: ../data/totem.ui.h:89
-msgid "Shuff_le Mode"
-msgstr "ഷ_ഫിള്‍ മോഡ്"
+#: ../data/totem.ui.h:2
+#| msgid "Open _Location..."
+msgid "Open _Location"
+msgstr "_വിലാസം തുറക്കുക"
 
-#: ../data/totem.ui.h:90
-msgid "Skip _Backwards"
-msgstr "_പുറകോട്ട് ഒരു പടി പോവുക"
+#: ../data/totem.ui.h:3
+msgid "_Fullscreen"
+msgstr "_മുഴുവന്‍ തിരശ്ശീല"
 
-#: ../data/totem.ui.h:91
-msgid "Skip _Forward"
-msgstr "_മുന്നോട്ട് ഒരു പടി പോവുക"
+#: ../data/totem.ui.h:4
+msgid "Prefere_nces"
+msgstr "മുന്‍ഗണ_നകള്‍"
 
-#: ../data/totem.ui.h:92
-msgid "Skip backwards"
-msgstr "പുറകോട്ട് ഒരു പടി പോവുക"
+#: ../data/totem.ui.h:5
+#| msgid "Shuff_le Mode"
+msgid "Shuff_le"
+msgstr "ഷ_ഫിള്‍"
 
-#: ../data/totem.ui.h:93
-msgid "Skip forward"
-msgstr "മുന്നോട്ട് ഒരു പടി പോവുക"
+#: ../data/totem.ui.h:6
+#| msgid "_Repeat Mode"
+msgid "_Repeat"
+msgstr "_ആവര്‍ത്തിയ്ക്കുക"
 
-#: ../data/totem.ui.h:94
-msgid "Square"
-msgstr "ചതുരം"
+#: ../data/totem.ui.h:7
+msgid "_Quit"
+msgstr "_പുറത്തു് കടക്കുക"
 
-#: ../data/totem.ui.h:95
-msgid "Start playing files from last position"
-msgstr "അവസാന സ്ഥാനത്തു് നിന്നും ഫയലുകള്‍ പ്രവര്‍ത്തിപ്പിക്കുവാന്‍ ആരംഭിക്കുക"
+#: ../data/totem.ui.h:8
+msgid "_Movie"
+msgstr "_ചലച്ചിത്രം"
 
-#: ../data/totem.ui.h:96 ../src/totem-properties-view.c:228
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5593
-msgid "Stereo"
-msgstr "സ്റ്റീരിയോ"
+#: ../data/totem.ui.h:9
+msgid "_Eject"
+msgstr "_പുറത്തെടുക്കുക"
 
-#: ../data/totem.ui.h:97
-msgid "Switch An_gles"
-msgstr "_ആങ്കിളുകള്‍ സ്വിച്ച് ചെയ്യുക"
+#: ../data/totem.ui.h:10
+msgid "Eject the current disc"
+msgstr "നിലവിലുള്ള ഡിസ്ക് പുറത്തെടുക്കുക"
 
-#: ../data/totem.ui.h:98
-msgid "Switch camera angles"
-msgstr "ക്യാമറ ആങ്കിളുകള്‍ സ്വിച്ച് ചെയ്യുക"
+#: ../data/totem.ui.h:11
+msgid "_Properties"
+msgstr "_ഗുണഗണങ്ങള്‍"
 
-#: ../data/totem.ui.h:99
-msgid "Switch to fullscreen"
-msgstr "സ്ക്രീനിന്റെ പരാമാവധി വലിപ്പത്തിലേയ്ക്കു് മാറുക"
+#: ../data/totem.ui.h:12
+msgid "View the properties of the current stream"
+msgstr "നിലവിലുള്ള സ്ട്രീമില്‍ നിന്നും ഗുണഗണങ്ങള്‍ കാണുക"
 
-#: ../data/totem.ui.h:100
-msgid "Text Subtitles"
-msgstr "അടിക്കുറിപ്പുകള്‍"
+#: ../data/totem.ui.h:13
+msgid "Play / P_ause"
+msgstr "പ്രവര്‍ത്തിപ്പിക്കുക / _താല്‍കാലത്തേക്ക് നിര്‍ത്തുക"
 
-#: ../data/totem.ui.h:101
-msgid "Time seek bar"
-msgstr "പ്രത്യേക സമയത്തേയ്ക്കു് കൊണ്ടുപോകാനുള്ള ബാറ്"
+#: ../data/totem.ui.h:14
+msgid "Play or pause the movie"
+msgstr "ചലച്ചിത്രം പ്രവര്‍ത്തിപ്പിക്കുക അല്ലെങ്കില്‍ താല്‍കാലത്തേക്ക് നിര്‍ത്തുക"
 
-#: ../data/totem.ui.h:103
-msgid "Totem Preferences"
-msgstr "ടോട്ടത്തിനുള്ള മുന്‍ഗണനകള്‍"
+#: ../data/totem.ui.h:15
+msgid "_Edit"
+msgstr "_മാറ്റം വരുത്തുക"
 
-#: ../data/totem.ui.h:105
-msgid "Video or Audio"
-msgstr "ശബദമോ ചലചിത്രമോ"
+#: ../data/totem.ui.h:16
+msgid "_Clear Playlist"
+msgstr "_പ്ലേലിസ്റ്റ് മായ്ക്കുക"
 
-#: ../data/totem.ui.h:106
-msgid "View the properties of the current stream"
-msgstr "നിലവിലുള്ള സ്ട്രീമില്‍ നിന്നും ഗുണഗണങ്ങള്‍ കാണുക"
+#: ../data/totem.ui.h:17
+msgid "Clear the playlist"
+msgstr "പ്ലേലിസ്റ്റ് മായ്ക്കുക"
 
-#: ../data/totem.ui.h:107
-msgid "Visual Effects"
-msgstr "കണ്ണിന് കുളിര്‍മയേകുന്ന കാഴ്ചകള്‍"
+#: ../data/totem.ui.h:18
+msgid "Plugins..."
+msgstr "സംയോജകം..."
 
-#: ../data/totem.ui.h:108
-msgid "Visualization _size:"
-msgstr "വിഷ്യലൈസേഷന്‍ _വലിപ്പം:"
+#: ../data/totem.ui.h:19
+msgid "Configure plugins to extend the application"
+msgstr "പ്രയോഗം വികസിപ്പിക്കുന്നതിനായി പ്ലഗിനുകള്‍ ക്രമീകരിക്കുക"
 
-#: ../data/totem.ui.h:109
-msgid "Volume _Down"
-msgstr "ശബ്ദം _കുറയ്ക്കുക"
+#: ../data/totem.ui.h:20
+msgid "_View"
+msgstr "_കാഴ്ച"
 
-#: ../data/totem.ui.h:110
-msgid "Volume _Up"
-msgstr "ശബ്ദം _വര്‍ദ്ധിപ്പിക്കുക"
+#: ../data/totem.ui.h:21
+msgid "Fit Window to Movie"
+msgstr "സിനിമയുടെ വലിപ്പത്തിലേയ്ക്കു് ജാലകം ക്രമീകരിയ്ക്കുക"
 
-#: ../data/totem.ui.h:111
-msgid "Zoom In"
-msgstr "വലുതാക്കുക"
+#: ../data/totem.ui.h:22
+msgid "_Resize 1:2"
+msgstr "1:2 _വലിപ്പത്തിലേയ്ക്കാക്കുക"
 
-#: ../data/totem.ui.h:112
-msgid "Zoom in"
-msgstr "വലുതാക്കുക"
+#: ../data/totem.ui.h:23
+msgid "Resize to half the original video size"
+msgstr "ചലച്ചിത്രത്തിന്റെ പകുതി വലിപ്പത്തിലാക്കുക"
 
-#: ../data/totem.ui.h:113
-msgid "_About"
-msgstr "_സംബന്ധിച്ച്"
+#: ../data/totem.ui.h:24
+msgid "Resize _1:1"
+msgstr "വലിപ്പം _1:1 ആയി ക്രമീകരിയ്ക്കുക"
 
-#: ../data/totem.ui.h:114
-msgid "_Angle Menu"
-msgstr "_ആങ്കിള്‍ മെനു"
+#: ../data/totem.ui.h:25
+msgid "Resize to the original video size"
+msgstr "ചലച്ചിത്രത്തിന്റെ സ്വാഭാവിക വലിപ്പത്തിലാക്കുക"
 
-#: ../data/totem.ui.h:115
-msgid "_Aspect Ratio"
-msgstr "_ആസ്പെക്റ്റ് റേഷ്യോ"
+#: ../data/totem.ui.h:26
+msgid "Resize _2:1"
+msgstr "വലിപ്പം _2:1 ആയി ക്രമീകരിയ്ക്കുക"
 
-#: ../data/totem.ui.h:116
-msgid "_Audio output type:"
-msgstr "_ഓഡിയോ ഔട്ട്പുട്ട് രീതി:"
+#: ../data/totem.ui.h:27
+msgid "Resize to double the original video size"
+msgstr "ചലച്ചിത്രത്തിന്റെ ഇരട്ടി വലിപ്പത്തിലാക്കുക"
 
-#: ../data/totem.ui.h:117
-msgid "_Brightness:"
-msgstr "_പ്രകാശം:"
+#: ../data/totem.ui.h:28
+msgid "_Aspect Ratio"
+msgstr "_ആസ്പെക്റ്റ് റേഷ്യോ"
 
-#: ../data/totem.ui.h:118
-msgid "_Chapter Menu"
-msgstr "_ഭാഗങ്ങളുടെ മെനു"
+#: ../data/totem.ui.h:29
+msgid "Switch An_gles"
+msgstr "_ആങ്കിളുകള്‍ സ്വിച്ച് ചെയ്യുക"
 
-#: ../data/totem.ui.h:119
-msgid "_Clear Playlist"
-msgstr "_പ്ലേലിസ്റ്റ് മായ്ക്കുക"
+#: ../data/totem.ui.h:30
+msgid "Switch camera angles"
+msgstr "ക്യാമറ ആങ്കിളുകള്‍ സ്വിച്ച് ചെയ്യുക"
 
-#: ../data/totem.ui.h:120
-msgid "_Contents"
-msgstr "_ഉളളടക്കം"
+#: ../data/totem.ui.h:31
+msgid "_Go"
+msgstr "_പോകുക"
 
-#: ../data/totem.ui.h:121
+#: ../data/totem.ui.h:32
 msgid "_DVD Menu"
 msgstr "_ഡി.വി.ഡി മെനു"
 
-#: ../data/totem.ui.h:122
-msgid "_Edit"
-msgstr "_മാറ്റം വരുത്തുക"
-
-#: ../data/totem.ui.h:123
-msgid "_Eject"
-msgstr "_പുറത്തെടുക്കുക"
-
-#: ../data/totem.ui.h:124
-msgid "_Encoding:"
-msgstr "_എന്‍കോഡിങ്ങ്:"
+#: ../data/totem.ui.h:33
+msgid "Go to the DVD menu"
+msgstr "ഡി.വി.ഡി മെനുവിലേയ്ക്കു് പോവുക"
 
-#: ../data/totem.ui.h:125
-msgid "_Font:"
-msgstr "_അക്ഷരസഞ്ചയം:"
+#: ../data/totem.ui.h:34
+msgid "_Title Menu"
+msgstr "_തലക്കെട്ടു് മെനു"
 
-#: ../data/totem.ui.h:126
-msgid "_Fullscreen"
-msgstr "_മുഴുവന്‍ തിരശ്ശീല"
+#: ../data/totem.ui.h:35
+msgid "Go to the title menu"
+msgstr "തലക്കെട്ടുകളുടെ മെനുവിലേയ്ക്കു് പോവുക"
 
-#: ../data/totem.ui.h:127
-msgid "_Go"
-msgstr "_പോകുക"
+#: ../data/totem.ui.h:36
+msgid "A_udio Menu"
+msgstr "_ഓഡിയോ മെനു"
 
-#: ../data/totem.ui.h:128
-msgid "_Help"
-msgstr "_സഹായം"
+#: ../data/totem.ui.h:37
+msgid "Go to the audio menu"
+msgstr "ഓഡിയോ മെനുവിലേയ്ക്കു് പോവുക"
 
-#: ../data/totem.ui.h:129
-msgid "_Hue:"
-msgstr "_വര്‍ണ്ണം:"
+#: ../data/totem.ui.h:38
+msgid "_Angle Menu"
+msgstr "_ആങ്കിള്‍ മെനു"
 
-#: ../data/totem.ui.h:130
-msgid "_Languages"
-msgstr "_ഭാഷകള്‍"
+#: ../data/totem.ui.h:39
+msgid "Go to the angle menu"
+msgstr "ആങ്കിള്‍ മെനുവിലേയ്ക്കു് പോവുക"
 
-#: ../data/totem.ui.h:131
-#, fuzzy
-msgid "_Load subtitle files when movie is loaded"
-msgstr "ഒരു പുതിയ ചിത്രം ലഭ്യമാക്കുമ്പോള്‍ സ്വയമേ അടിക്കുറിപ്പു് ഫയലുകള്‍  _ചേര്‍ക്കുക"
+#: ../data/totem.ui.h:40
+msgid "_Chapter Menu"
+msgstr "_ഭാഗങ്ങളുടെ മെനു"
 
-#: ../data/totem.ui.h:132
-msgid "_Movie"
-msgstr "_ചലച്ചിത്രം"
+#: ../data/totem.ui.h:41
+msgid "Go to the chapter menu"
+msgstr "ഭാഗങ്ങളുടെ മെനുവിലേയ്ക്കു് പോവുക"
 
-#: ../data/totem.ui.h:133
+#: ../data/totem.ui.h:42
 msgid "_Next Chapter/Movie"
 msgstr "_അടുത്ത ഭാഗം/സിനിമാ"
 
-#: ../data/totem.ui.h:134
-msgid "_Open..."
-msgstr "_തുറക്കുക..."
+#: ../data/totem.ui.h:43
+msgid "Next chapter or movie"
+msgstr "അടുത്ത ഭാഗം അല്ലെങ്കില്‍ സിനിമ"
 
-#: ../data/totem.ui.h:135
+#: ../data/totem.ui.h:44
 msgid "_Previous Chapter/Movie"
 msgstr "തൊട്ടു് _മുമ്പുള്ള ഭാഗം/സിനിമ"
 
-#: ../data/totem.ui.h:136
-msgid "_Properties"
-msgstr "_ഗുണഗണങ്ങള്‍"
-
-#: ../data/totem.ui.h:137
-msgid "_Quit"
-msgstr "_പുറത്തു് കടക്കുക"
+#: ../data/totem.ui.h:45
+msgid "Previous chapter or movie"
+msgstr "മുമ്പുളള ഭാഗം"
 
-#: ../data/totem.ui.h:138
-msgid "_Repeat Mode"
-msgstr "_റിപ്പീറ്റ് മോഡ്"
+#: ../data/totem.ui.h:46
+msgid "_Sound"
+msgstr "_ശബ്ദം"
 
-#: ../data/totem.ui.h:139
-msgid "_Resize 1:2"
-msgstr "1:2 _വലിപ്പത്തിലേയ്ക്കാക്കുക"
+#: ../data/totem.ui.h:47
+msgid "Volume _Up"
+msgstr "ശബ്ദം _വര്‍ദ്ധിപ്പിക്കുക"
 
-#: ../data/totem.ui.h:140
-msgid "_Resize the window when a new video is loaded"
-msgstr "ഒരു പുതിയ ചലചിത്രം ലഭ്യമാക്കുമ്പോള്‍ സ്വയമേ ജാലകത്തിന്റെ വലിപ്പം _ക്രമീകരിയ്ക്കുക"
+#: ../data/totem.ui.h:48
+msgid "Increase volume"
+msgstr "ശബ്ദം വര്‍ദ്ധിപ്പിക്കുക"
 
-#: ../data/totem.ui.h:142
-msgid "_Sound"
-msgstr "_ശബ്ദം"
+#: ../data/totem.ui.h:49
+msgid "Volume _Down"
+msgstr "ശബ്ദം _കുറയ്ക്കുക"
 
-#: ../data/totem.ui.h:143
-msgid "_Title Menu"
-msgstr "_തലക്കെട്ടു് മെനു"
+#: ../data/totem.ui.h:50
+msgid "Decrease volume"
+msgstr "ശബ്ദം കുറയ്ക്കുക"
 
-#: ../data/totem.ui.h:144
-msgid "_Type of visualization:"
-msgstr "ഏതു് _തരം വിഷ്വലൈസേഷന്‍:"
+#: ../data/totem.ui.h:51
+msgid "_Help"
+msgstr "_സഹായം"
 
-#: ../data/totem.ui.h:145
-msgid "_View"
-msgstr "_കാഴ്ച"
+#: ../data/totem.ui.h:52
+msgid "_Contents"
+msgstr "_ഉളളടക്കം"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
-msgid ""
-"A list of the names of the plugins which are currently active (loaded and "
-"running)."
-msgstr ""
+#: ../data/totem.ui.h:53
+msgid "Help contents"
+msgstr "സഹായത്തിന്റെ ഉളളടക്കം"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
-msgid "Active plugins list"
-msgstr "സജീവമായ സംയോജക പട്ടിക"
+#: ../data/totem.ui.h:54
+msgid "_About"
+msgstr "_സംബന്ധിച്ച്"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
-msgid "Allow the screensaver to activate when playing audio"
-msgstr "ശബ്ദം വരുമ്പോള്‍ സ്ക്രീന്‍സേവര്‍ പ്രവര്‍ത്തിയ്ക്കാന്‍ അനുവദിക്കുക"
+#: ../data/totem.ui.h:55
+msgid "About this application"
+msgstr "ഈ പ്രയോഗത്തെക്കുറിച്ചു്"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
-msgid ""
-"Allow the screensaver to activate when playing audio. Disable if you have "
-"monitor-powered speakers."
-msgstr ""
-"ശബ്ദം വരുമ്പോള്‍ സ്ക്രീന്‍സേവര്‍ പ്രവര്‍ത്തിയ്ക്കാന്‍ അനുവദിക്കുക. മോണിറ്റര്‍ വഴി ഊര്‍ജം കിട്ടുന്ന "
-"സ്പീക്കറുകള്‍ക്കുണ്ടെങ്കില്‍, ഇതു് പ്രവര്‍ത്തന രഹിതമാക്കുക."
+#: ../data/totem.ui.h:56
+msgid "Show _Controls"
+msgstr "_നിയന്ത്രണങ്ങള്‍ കാണിയ്ക്കുക"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
-#, fuzzy
-msgid ""
-"Amount of data to buffer for network streams before starting to display the "
-"stream (in seconds)."
-msgstr ""
-"ശ്രംഖലയിലുള്ള സ്ട്രീമുകള്‍ക്ക് കാണിയ്ക്കാന്‍ തുടങ്ങുന്നതിനു മുമ്പു് ബഫര്‍ ചെയ്യേണ്ട ഡാറ്റയുടെ അളവ് "
-"(സെക്കന്റുകളില്‍)"
+#: ../data/totem.ui.h:57
+msgid "Show controls"
+msgstr "നിയന്ത്രണങ്ങള്‍ കാണിയ്ക്കുക"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
-msgid ""
-"Approximate network connection speed, used to select quality on media over "
-"the network."
-msgstr ""
+#: ../data/totem.ui.h:58
+msgid "S_idebar"
+msgstr "വശത്തുള്ള _പട്ട"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
-msgid "Default location for the \"Open...\" dialogs"
-msgstr "\"തുറക്കുക...\" എന്ന സംഭാഷണങ്ങള്‍ക്കുള്ള സഹജമായ സ്ഥാനം"
+#: ../data/totem.ui.h:59
+msgid "Show or hide the sidebar"
+msgstr "സൈഡ് ബാര്‍ കാണിയ്ക്കുകയോ അദൃശ്യമാക്കുകയോ ചെയ്യുക"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
-#, fuzzy
-msgid ""
-"Default location for the \"Open...\" dialogs. Default is the current "
-"directory."
-msgstr ""
-"\"തുറക്കുക...\" എന്ന സംഭാഷണങ്ങള്‍ക്കുള്ള സഹജമായ സ്ഥാനം, സഹജമായിട്ടുള്ളതു് നിലവിലുള്ള ഡയറക്ടറിയാണു്"
+#: ../data/totem.ui.h:60
+msgctxt "Aspect ratio"
+msgid "Auto"
+msgstr "സ്വതേ"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
-msgid "Default location for the \"Take Screenshot\" dialogs"
-msgstr "\"തിരച്ചിത്രം എടുക്കുക\" എന്ന സംഭാഷണങ്ങള്‍ക്കുള്ള സഹജമായ സ്ഥാനം"
+#: ../data/totem.ui.h:61
+msgid "Sets automatic aspect ratio"
+msgstr "ഓട്ടോമാറ്റിക്ക് ആസ്പക്റ്റ് റേഷ്യോ സജ്ജമാക്കുക"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
-#, fuzzy
-msgid ""
-"Default location for the \"Take Screenshot\" dialogs. Default is the "
-"Pictures directory."
-msgstr ""
-"\"തിരച്ചിത്രം എടുക്കുക\" എന്ന സംഭാഷണങ്ങള്‍ക്കുള്ള സഹജമായ സ്ഥാനം, സഹജമായിട്ടുള്ളതു് ചിത്രങ്ങളുടെ "
-"ഡയറക്ടറിയാണു്"
+#: ../data/totem.ui.h:62
+msgid "Square"
+msgstr "ചതുരം"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
-#, fuzzy
-msgid "Encoding character set for subtitle."
-msgstr "അടിക്കുറിപ്പിനു് വേണ്ട എന്‍കോഡിങ്ങ്"
+#: ../data/totem.ui.h:63
+msgid "Sets square aspect ratio"
+msgstr "സ്ക്വയര്‍ ആസ്പക്റ്റ് റേഷ്യോ സജ്ജമാക്കുക"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
-#, fuzzy
-msgid "Name of the visual effects plugin"
-msgstr "വിഷ്വല്‍ ഇഫക്റ്റ്സ് സംയോജകങ്ങളുടെ പേരു്"
+#: ../data/totem.ui.h:64
+msgid "4:3 (TV)"
+msgstr "4:3 (TV)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
-msgid "Network buffering threshold"
-msgstr "ശൃംഖല ബഫറിങ് ത്രെഷോള്‍ഡ്"
+#: ../data/totem.ui.h:65
+msgid "Sets 4:3 (TV) aspect ratio"
+msgstr "4:3 (TV) ആസ്പക്റ്റ് റേഷ്യോ സജ്ജമാക്കുക"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
-msgid "Network connection speed"
-msgstr "നെറ്റ്‌വര്‍ക്ക് കണക്ഷന്‍ വേഗത"
+#: ../data/totem.ui.h:66
+msgid "16:9 (Widescreen)"
+msgstr "16:9 (Widescreen)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
-#, fuzzy
-msgid "Pango font description for subtitle rendering."
-msgstr "അടിക്കുറിപ്പു് ചിത്രീകരിയ്ക്കാനുളള പാംഗോ അക്ഷരസഞ്ചയത്തിന്റെ വിവരണം"
+#: ../data/totem.ui.h:67
+msgid "Sets 16:9 (widescreen) aspect ratio"
+msgstr "16:9 (വൈഡ്-സ്ക്രീന്‍) ആസ്പക്റ്റ് റേഷ്യോ സജ്ജമാക്കുക"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
-msgid "Quality setting for the audio visualization."
-msgstr "ശബ്ദ വിഷ്വലൈസേഷന്റെ ഗുണനിലവാര സജ്ജീകരണം."
+#: ../data/totem.ui.h:68
+msgid "2.11:1 (DVB)"
+msgstr "2.11:1 (DVB)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
-msgid "Repeat mode"
-msgstr "ആവര്‍ത്തന മോഡ്"
+#: ../data/totem.ui.h:69
+msgid "Sets 2.11:1 (DVB) aspect ratio"
+msgstr "2.11:1 (DVB) ആസ്പക്റ്റ് റേഷ്യോ സജ്ജമാക്കുക"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
-msgid "Resize the canvas automatically on file load"
-msgstr "ഫയല്‍ ലോഡ് ചെയ്യുമ്പോള്‍ കാന്വാസ് തനിയെ വലിപ്പം മാറ്റുക"
+#: ../data/totem.ui.h:70
+msgid "S_ubtitles"
+msgstr "അ_ടിക്കുറിപ്പുകള്‍"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
-msgid "Show visual effects when no video is displayed"
-msgstr "വീഡിയോ പ്രദര്‍ശിപ്പിക്കാത്തപ്പോള്‍ വിഷ്വല്‍ ഇഫക്റ്റുകള്‍ കാണിയ്ക്കുക"
+#: ../data/totem.ui.h:73
+msgid "_Languages"
+msgstr "_ഭാഷകള്‍"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
-msgid "Show visual effects when playing an audio only file."
-msgstr "ഓഡിയോ ഫയല്‍ പ്രദര്‍ശിപ്പിക്കുമ്പോള്‍ മാത്രം വിഷ്വല്‍ ഇഫക്റ്റുകള്‍ കാണിയ്ക്കുക"
+#: ../data/totem.ui.h:74
+msgid "Zoom In"
+msgstr "വലുതാക്കുക"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
-msgid "Shuffle mode"
-msgstr "ഷഫിള്‍ മോഡ്"
+#: ../data/totem.ui.h:75
+msgid "Zoom in"
+msgstr "വലുതാക്കുക"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
-msgid "Subtitle encoding"
-msgstr "അടിക്കുറിപ്പു് എന്‍കോഡിങ്ങ്"
+#: ../data/totem.ui.h:76
+msgid "Skip _Forward"
+msgstr "_മുന്നോട്ട് ഒരു പടി പോവുക"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
-msgid "Subtitle font"
-msgstr "അടിക്കുറിപ്പിന്റെ അക്ഷരസഞ്ചയം"
+#: ../data/totem.ui.h:77
+msgid "Skip forward"
+msgstr "മുന്നോട്ട് ഒരു പടി പോവുക"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
-msgid "The brightness of the video"
-msgstr "ചലച്ചിത്രത്തിന്റെ പ്രകാശം"
+#: ../data/totem.ui.h:78
+msgid "Skip _Backwards"
+msgstr "_പുറകോട്ട് ഒരു പടി പോവുക"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
-msgid "The contrast of the video"
-msgstr "ചലച്ചിത്രത്തിന്റെ തെളിച്ചം"
+#: ../data/totem.ui.h:79
+msgid "Skip backwards"
+msgstr "പുറകോട്ട് ഒരു പടി പോവുക"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
-msgid "The hue of the video"
-msgstr "ചലച്ചിത്രത്തിന്റെ വര്‍ണ്ണം"
+#: ../data/totem.ui.h:82
+msgid "Time seek bar"
+msgstr "പ്രത്യേക സമയത്തേയ്ക്കു് കൊണ്ടുപോകാനുള്ള ബാറ്"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
-msgid "The saturation of the video"
-msgstr "ചലച്ചിത്രത്തിന്റെ സാച്ചുറേഷന്‍"
+#: ../data/uri.ui.h:1
+msgid "Enter the _address of the file you would like to open:"
+msgstr "നിങ്ങള്‍ തുറക്കുവാന്‍ ആഗ്രഹിക്കുന്ന ഫയലിന്റെ _വിലാസം നല്‍കുക:"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
-msgid "Type of audio output to use"
-msgstr "ഉപയോഗിക്കുന്നതിനുളള ഏതു് തരം ഓഡിയോ ഔട്ട്പുട്ട്"
+#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
+msgid "_Add to Playlist"
+msgstr "_പ്ലേലിസ്റ്റിലേയ്ക്കു് ചേര്‍ക്കുക"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
-msgid "Visualization quality setting"
-msgstr "വിഷ്യലൈസേഷന്റെ ഗുണ സജ്ജീകരണം"
+#: ../data/video-list.ui.h:2
+msgid "Add the video to the playlist"
+msgstr "പ്ലേലിസ്റ്റിലേയ്ക്കു് വീഡിയോ ചേര്‍ക്കുക"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
-#, fuzzy
-msgid "Whether to autoload external chapter files when a movie is loaded"
-msgstr "ചലച്ചിത്രം ലോഡ് ചെയ്യുമ്പോള്‍ അടിക്കുറിപ്പു് തനിയെ ലോഡ് ചെയ്യണോ എന്ന്"
+#: ../src/backend/bacon-video-widget.c:1643
+msgid "Password requested for RTSP server"
+msgstr "RTSP സേവകന്റെ അടയാളവാക്ക്"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
-msgid "Whether to autoload text subtitle files when a movie is loaded"
-msgstr "ചലച്ചിത്രം ലോഡ് ചെയ്യുമ്പോള്‍ അടിക്കുറിപ്പു് തനിയെ ലോഡ് ചെയ്യണോ എന്ന്"
+#: ../src/backend/bacon-video-widget.c:2944
+#, c-format
+msgid "Audio Track #%d"
+msgstr "ശബ്ദ ട്രാക്ക് #%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
-#, fuzzy
-msgid "Whether to disable deinterlacing for interlaced movies"
-msgstr "പ്ലേബാക്ക് എഞ്ചിന് ഡീബഗ് സജ്ജമാക്കണമോ"
+#: ../src/backend/bacon-video-widget.c:2948
+#, c-format
+msgid "Subtitle #%d"
+msgstr "അടിക്കുറിപ്പു് #%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
-#, fuzzy
-msgid "Whether to disable the keyboard shortcuts"
-msgstr "ഉപയോക്താവിന്റെ 'വീട്' തട്ടത്തില്‍ സംയോജകങ്ങള്‍ അപ്രാവര്‍ത്തികമാക്കണോ എന്നു്"
+#: ../src/backend/bacon-video-widget.c:3345
+msgid "The server you are trying to connect to is not known."
+msgstr "നിങ്ങള്‍ കണക്ട് ചെയ്യുവാന്‍ ശ്രമിയക്കുന്ന സര്‍വര്‍ അ‍ജ്ഞാതം."
+
+#: ../src/backend/bacon-video-widget.c:3348
+msgid "The connection to this server was refused."
+msgstr "ഈ സര്‍വറിലേക്കുള്ള കണക്ഷന്‍ നിഷേധിച്ചിരിയ്ക്കുന്നു."
+
+#: ../src/backend/bacon-video-widget.c:3351
+#| msgid "The movie could not be recorded."
+msgid "The specified movie could not be found."
+msgstr "വ്യക്തമാക്കിയ ചിലചിത്രം ലഭ്യമാക്കുവാനായില്ല."
+
+#: ../src/backend/bacon-video-widget.c:3358
+msgid "The server refused access to this file or stream."
+msgstr "ഈ ഫയല്‍ അല്ലെങ്കില്‍ സ്ട്രീമിലേക്കുള്ള പ്രവേശനം സര്‍വര്‍ നിഷേധിച്ചിരിയ്ക്കുന്നു."
+
+#: ../src/backend/bacon-video-widget.c:3364
+msgid "Authentication is required to access this file or stream."
+msgstr "ഈ ഫയല്‍ അല്ലെങ്കില്‍ സ്ട്രീമിലേക്കുള്ള പ്രവേശനത്തിനു് ആധികാരികത ഉറപ്പാക്കല്‍ ആവശ്യമുണ്ടു്."
+
+#: ../src/backend/bacon-video-widget.c:3371
+#| msgid "Totem was not able to play this disc."
+msgid "You are not allowed to open this file."
+msgstr "ഈ ഫയല്‍ തുറക്കുവാന്‍ നിങ്ങള്‍ക്കു് അനുവാദമില്ല."
+
+#: ../src/backend/bacon-video-widget.c:3376
+#| msgid "File is not a valid .desktop file"
+msgid "This location is not a valid one."
+msgstr "ഈ സ്ഥാനം ശരിയായൊന്നല്ല."
+
+#: ../src/backend/bacon-video-widget.c:3384
+#| msgid "The movie could not be recorded."
+msgid "The movie could not be read."
+msgstr "ചലച്ചിത്രം ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
-msgid "Whether to disable the plugins in the user's home directory"
-msgstr "ഉപയോക്താവിന്റെ 'വീട്' തട്ടത്തില്‍ സംയോജകങ്ങള്‍ അപ്രാവര്‍ത്തികമാക്കണോ എന്നു്"
+#. should be exactly one missing thing (source or converter)
+#: ../src/backend/bacon-video-widget.c:3407
+#: ../src/backend/bacon-video-widget.c:3415
+#, c-format
+msgid "The playback of this movie requires a %s plugin which is not installed."
+msgid_plural ""
+"The playback of this movie requires the following decoders which are not "
+"installed:\n"
+"\n"
+"%s"
+msgstr[0] "ഈ ചലച്ചിത്രം പ്ലേ-ബാക്ക് ചെയ്യാന്‍ ഒരു %s സംയോജകം ആവശ്യമുണ്ട്, അത് ഇന്‍സ്റ്റാള്‍ ചെയ്തിട്ടില്ല."
+msgstr[1] ""
+"ഈ ചലച്ചിത്രം പ്ലേ-ബാക്ക് ചെയ്യാന്‍ ഈ ഡീകോഡറുകള്‍ ആവശ്യമുണ്ടു്, പക്ഷേ അവ "
+"ഇന്‍സ്റ്റാള്‍ ചെയ്തിട്ടില്ല:\n"
+"\n"
+"%s"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:35
-msgid "Whether to enable debug for the playback engine"
-msgstr "പ്ലേബാക്ക് എഞ്ചിന് ഡീബഗ് സജ്ജമാക്കണമോ"
+#: ../src/backend/bacon-video-widget.c:3426
+msgid ""
+"An audio or video stream is not handled due to missing codecs. You might "
+"need to install additional plugins to be able to play some types of movies"
+msgstr ""
+"ലഭ്യമല്ലാത്ത കോഡക്കുകള്‍ ഇല്ലാത്തതിനാല്‍ ഒരു ഓഡിയോ അല്ലെങ്കില്‍ വീഡിയോ സ്ട്രീം കൈകാര്യം "
+"ചെയ്യുന്നില്ല. ചില ചലചിത്രങ്ങള്‍ കാണുന്നതിനായി ഒരു പക്ഷേ നിങ്ങള്‍ക്കു് അധികമായ പ്ലഗിനുകള്‍ "
+"ഇന്‍സ്റ്റോള്‍ ചെയ്യേണ്ടതുണ്ടു്."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:36
+#: ../src/backend/bacon-video-widget.c:3436
+#| msgid ""
+#| "Cannot play this file over the network. Try downloading it to disk first."
 msgid ""
-"Whether to remember the position of played audio/video files when pausing or "
-"closing them"
+"This file cannot be played over the network. Try downloading it locally "
+"first."
 msgstr ""
-"തല്‍ക്കാലത്തേക്ക് നിര്‍ത്തുമ്പോള്‍ അല്ലെങ്കില്‍ പുറത്തു് കടക്കുമ്പോള്‍ പ്രവര്‍ത്തനത്തിലുള്ള ഓഡിയോ/വീഡിയോ "
-"ഫയലുകളുടെ സ്ഥാനം സൂക്ഷിക്കണമോ എന്നു്"
+"നെറ്റ്‌വര്‍ക്കില്‍ ഈ ഫയല്‍ പ്രവര്‍ത്തിപ്പിക്കുവാന്‍ സാധ്യമായില്ല. ആദ്യം അത് ഡിസ്ക്കില്‍ നിന്നും ഡൌണ്‍ലോഡ്"
+"ചെയ്യുന്നതിന് ശ്രമിക്കുക."
 
-#: ../data/uri.ui.h:1
-msgid "Enter the _address of the file you would like to open:"
-msgstr "നിങ്ങള്‍ തുറക്കുവാന്‍ ആഗ്രഹിക്കുന്ന ഫയലിന്റെ _വിലാസം നല്‍കുക:"
+#: ../src/backend/bacon-video-widget.c:5494 ../src/totem-properties-view.c:227
+msgid "Surround"
+msgstr "സറൌണ്ട് (എല്ലാ ദിശയില്‍ നിന്നും ശബ്ദം)"
+
+#: ../src/backend/bacon-video-widget.c:5496 ../src/totem-properties-view.c:229
+msgid "Mono"
+msgstr "മോണോ"
+
+#: ../src/backend/bacon-video-widget.c:5781
+msgid "Media contains no supported video streams."
+msgstr "മീഡിയ്ക് പിന്തുണയുളള വീഡിയോ പ്രവാഹങ്ങള്‍ ലഭ്യമല്ല"
+
+#: ../src/backend/bacon-video-widget.c:5963
+msgid ""
+"Some necessary plug-ins are missing. Make sure that the program is correctly "
+"installed."
+msgstr "ചില അത്യാവശ്യ പ്ലഗിനുകള്‍ ലഭ്യമല്ല. പ്രോഗ്രാം ശരിയായി ഇന്‍സ്റ്റോള്‍ ചെയ്തെന്നുറപ്പാക്കുക."
 
 #: ../src/eggdesktopfile.c:165
 #, c-format
@@ -986,6 +1050,31 @@
 msgid "Show session management options"
 msgstr "സെഷന്‍ മാനേജ്മെന്റ് ഐച്ഛികങ്ങള്‍ കാണിക്കുക"
 
+#. hour:minutes:seconds
+#. Translators: This is a time format, like "9:05:02" for 9
+#. * hours, 5 minutes, and 2 seconds. You may change ":" to
+#. * the separator that your locale uses or use "%Id" instead
+#. * of "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:56
+#: ../src/plugins/skipto/totem-time-entry.c:57
+#, c-format
+msgctxt "long time format"
+msgid "%d:%02d:%02d"
+msgstr "%d:%02d:%02d"
+
+#. minutes:seconds
+#. Translators: This is a time format, like "5:02" for 5
+#. * minutes and 2 seconds. You may change ":" to the
+#. * separator that your locale uses or use "%Id" instead of
+#. * "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:65
+#, c-format
+msgctxt "short time format"
+msgid "%d:%02d"
+msgstr "%d:%02d"
+
 #. Title
 #. Artist
 #. Album
@@ -1001,7 +1090,6 @@
 
 #. Dimensions
 #: ../src/properties/bacon-video-widget-properties.c:122
-#, fuzzy
 msgctxt "Dimensions"
 msgid "N/A"
 msgstr "N/A"
@@ -1013,20 +1101,17 @@
 msgstr "ബാധകമല്ല"
 
 #: ../src/properties/bacon-video-widget-properties.c:127
-#, fuzzy
 msgctxt "Video bit rate"
 msgid "N/A"
 msgstr "N/A"
 
 #: ../src/properties/bacon-video-widget-properties.c:130
 #: ../src/properties/bacon-video-widget-properties.c:240
-#, fuzzy
 msgctxt "Frame rate"
 msgid "N/A"
 msgstr "N/A"
 
 #: ../src/properties/bacon-video-widget-properties.c:134
-#, fuzzy
 msgctxt "Audio bit rate"
 msgid "N/A"
 msgstr "N/A"
@@ -1070,14 +1155,14 @@
 
 #. 5 hours 2 minutes 12 seconds
 #: ../src/properties/bacon-video-widget-properties.c:167
-#, fuzzy, c-format
+#, c-format
 msgctxt "time"
 msgid "%s %s %s"
 msgstr "%s %s %s"
 
 #. 2 minutes 12 seconds
 #: ../src/properties/bacon-video-widget-properties.c:170
-#, fuzzy, c-format
+#, c-format
 msgctxt "time"
 msgid "%s %s"
 msgstr "%s %s"
@@ -1088,16 +1173,20 @@
 msgstr "0 സെക്കന്റുകള്‍"
 
 #: ../src/properties/bacon-video-widget-properties.c:237
-#, fuzzy, c-format
+#, c-format
 msgid "%d frame per second"
 msgid_plural "%d frames per second"
-msgstr[0] "ഒരു സെക്കന്‍ഡില്‍ %d ഫ്രെയിമുകള്‍"
+msgstr[0] "ഒരു സെക്കന്‍ഡില്‍ %d ഫ്രെയിം"
 msgstr[1] "ഒരു സെക്കന്‍ഡില്‍ %d ഫ്രെയിമുകള്‍"
 
-#: ../src/totem-audio-preview.c:168
+#: ../src/totem-audio-preview.c:137
 msgid "Audio Preview"
 msgstr "ഓഡിയോ തിരനോട്ടം"
 
+#: ../src/totem.c:240
+msgid "Verify your system installation. Totem will now exit."
+msgstr "നിങ്ങളുടെ സിസ്റ്റം ഇന്‍സ്റ്റലേഷന്‍ പരിശോധിക്കുക. Totem ഇപ്പോള്‍ പുറത്ത് കടക്കുന്നതാണ്."
+
 #: ../src/totem-cell-renderer-video.c:126
 msgid "Unknown video"
 msgstr "അറിയപ്പെടാത്ത വീഡിയോ"
@@ -1110,7 +1199,7 @@
 msgid "Cancel"
 msgstr "റദ്ദാക്കുക"
 
-#: ../src/totem-fullscreen.c:616
+#: ../src/totem-fullscreen.c:573
 msgid "No File"
 msgstr "ഫയല്‍ ഇല്ല"
 
@@ -1128,7 +1217,7 @@
 msgid "Make sure that Totem is properly installed."
 msgstr "ടോട്ടം ശരിയായി ഇന്‍സ്റ്റോള്‍ ചെയ്തിരിക്കുന്നു എന്നുറപ്പുവരുത്തുക."
 
-#: ../src/totem-interface.c:347
+#: ../src/totem-interface.c:357
 msgid ""
 "Totem 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 "
@@ -1140,7 +1229,7 @@
 "ലൈസന്‍സിന്റെ ലക്കം 2 അല്ലെങ്കില്‍ (നിങ്ങള്‍ തിരഞ്ഞെടുക്കുന്ന) അതിനു് ശേഷമുള്ളഏതെങ്കിലും ലക്കമോ "
 "ഉപയോഗിക്കാം."
 
-#: ../src/totem-interface.c:351
+#: ../src/totem-interface.c:361
 msgid ""
 "Totem is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -1151,7 +1240,7 @@
 "വാറണ്ടിയും ലഭ്യമല്ല; വ്യാപാരയോഗ്യതയോ ഒരു പ്രത്യേക കാര്യത്തിനു്ചേരുന്നതാണെന്നോ പരോക്ഷമായി "
 "ഉള്‍‌ക്കൊള്ളുന്ന വാറണ്ടി പോലും ഇല്ല. കൂടുതല്‍ വിവരങ്ങള്‍ക്കു്ഗ്നു ജനറല്‍ പബ്ലിക് ലൈസന്‍സ് കാണുക."
 
-#: ../src/totem-interface.c:355
+#: ../src/totem-interface.c:365
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Totem; if not, write to the Free Software Foundation, Inc., 59 Temple Place, "
@@ -1161,7 +1250,7 @@
 "ഇല്ലെങ്കില്‍, ഈ വിലാസത്തിലേയ്ക്കെഴുതുക: Free SoftwareFoundation, Inc., 51 Franklin "
 "Street, Fifth Floor, Boston, MA02110-1301, USA."
 
-#: ../src/totem-interface.c:358
+#: ../src/totem-interface.c:368
 msgid ""
 "Totem contains an exception to allow the use of proprietary GStreamer "
 "plugins."
@@ -1170,46 +1259,21 @@
 "ഒഴിവാക്കലുണ്ട്."
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:190
+#: ../src/totem-menu.c:291
 msgid "None"
 msgstr "ഒന്നുമില്ല"
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:195
+#: ../src/totem-menu.c:296
 msgctxt "Language"
 msgid "Auto"
 msgstr "സ്വതേ"
 
-#. Translators:
-#. * This is not a JPEG image, but a disc image, for example,
-#. * an ISO file
-#: ../src/totem-menu.c:765
-#, c-format
-msgid "Play Image '%s'"
-msgstr "'%s ഡിസ്ക് ഇമേജ് പ്രവര്‍ത്തിപ്പിക്കുക"
-
-#: ../src/totem-menu.c:768 ../src/totem-menu.c:851
-#, c-format
-msgid "device%d"
-msgstr "ഉപകരണം%d"
-
-#: ../src/totem-menu.c:848
-#, c-format
-msgid "Play Disc '%s'"
-msgstr "'%s' ഡിസ്ക് പ്രവര്‍ത്തിപ്പിക്കുക"
-
-#. This lists the back-end type and version, such as
-#. * Movie Player using GStreamer 0.10.1
-#: ../src/totem-menu.c:1189
-#, c-format
-msgid "Movie Player using %s"
-msgstr "%s ഉപയോഗിക്കുന്ന മൂവി പ്ലേയര്‍"
-
-#: ../src/totem-menu.c:1193
+#: ../src/totem-menu.c:789
 msgid "Copyright © 2002-2009 Bastien Nocera"
 msgstr "പകര്‍പ്പവകാശം © 2002-2009 ബാസ്‌റ്റ്യന്‍ നോസെറാ"
 
-#: ../src/totem-menu.c:1198
+#: ../src/totem-menu.c:794
 msgid "translator-credits"
 msgstr ""
 "എഫ്എസ്എഫ്-ഇന്ത്യ \n"
@@ -1217,153 +1281,77 @@
 "ഹരി വിഷ്ണു \n"
 "അനീഷ് എ(Anish)"
 
-#: ../src/totem-menu.c:1202
+#: ../src/totem-menu.c:798
 msgid "Totem Website"
 msgstr "ടോട്ടം വെബ്സൈറ്റ്"
 
-#: ../src/totem-menu.c:1236
+#: ../src/totem-menu.c:829
 msgid "Configure Plugins"
 msgstr "സംയോജകങ്ങള്‍ ക്രമീകരിയ്ക്കുക"
 
+#: ../src/totem-object.c:162
+#, c-format
+msgid ""
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"%s\n"
+" '%s --help' രണ്‍ ചെയ്യുക ലഭ്യമായ ആജ്ഞ-വരി ഐച്ഛികങ്ങളുടെ പട്ടിക കാണാന്‍..\n"
+
 #. Translators: %s is the totem version number
-#: ../src/totem-object.c:471
+#: ../src/totem-object.c:591
 #, c-format
 msgid "Totem %s"
 msgstr "ടോട്ടം %s"
 
-#: ../src/totem-object.c:1047 ../browser-plugin/totem-plugin-viewer.c:367
-msgid "Playing"
-msgstr "പ്രവര്‍ത്തിക്കുന്നു"
-
-#: ../src/totem-object.c:1049 ../src/totem-options.c:52
+#: ../src/totem-object.c:1168 ../src/totem-options.c:52
 msgid "Pause"
 msgstr "താല്‍കാലികമായി നിര്‍ത്തുക"
 
-#: ../src/totem-object.c:1054 ../browser-plugin/totem-plugin-viewer.c:363
-msgid "Paused"
-msgstr "താല്‍ക്കാലികമായി നിര്‍ത്തിയിരിക്കുന്നു"
-
-#: ../src/totem-object.c:1056 ../src/totem-object.c:1066
+#: ../src/totem-object.c:1175 ../src/totem-object.c:1185
 #: ../src/totem-options.c:51
 msgid "Play"
 msgstr "പ്രവര്‍ത്തിപ്പിക്കുക"
 
-#: ../src/totem-object.c:1061 ../src/totem-object.c:1659
-#: ../src/totem-statusbar.c:115 ../browser-plugin/totem-plugin-viewer.c:351
-msgid "Stopped"
-msgstr "നിര്‍ത്തിയിരിക്കുന്നു"
-
-#: ../src/totem-object.c:1142 ../src/totem-object.c:1169
-#: ../src/totem-object.c:1799 ../src/totem-object.c:1963
+#: ../src/totem-object.c:1267 ../src/totem-object.c:1294
+#: ../src/totem-object.c:1787 ../src/totem-object.c:1942
 #, c-format
 msgid "Totem could not play '%s'."
 msgstr "ടോട്ടത്തിനു് '%s' പ്രവര്‍ത്തിപ്പിക്കുവാന്‍‍ സാധ്യമായില്ല."
 
-#: ../src/totem-object.c:1246
-#, c-format
-msgid ""
-"Totem could not play this media (%s) although a plugin is present to handle "
-"it."
-msgstr ""
-"ടോട്ടമിനു ഈ മധ്യമം പ്ലേ ചെയ്യാന്‍ കഴിഞ്ഞില്ല (%s), ഇത് കയ്കാര്യം ചെയ്യാന്‍ സംയോജകം "
-"ഉണ്ടെങ്കിലും."
-
-#: ../src/totem-object.c:1247
-msgid ""
-"You might want to check that a disc is present in the drive and that it is "
-"correctly configured."
-msgstr "ഡിസ്ക് ഡ്രൈവില്‍ ഉണ്ടെന്നും അതു ശരിയായി ക്രമീകരിച്ചിട്ടുണ്ടെന്നും തീര്‍ച്ചപ്പെടുത്തുക"
-
-#: ../src/totem-object.c:1255
-msgid "More information about media plugins"
-msgstr "മാധ്യമ സം യോജകങ്ങളെ കുറിച്ച് കൂടുതല്‍ വിവരങ്ങള്‍"
-
-#: ../src/totem-object.c:1256
-msgid ""
-"Please install the necessary plugins and restart Totem to be able to play "
-"this media."
-msgstr "ആവശ്യമുളള സംയോജകങ്ങള്‍ ഇന്‍സ്റ്റോള്‍ ചെയ്ത് ടോട്ടം വീണ്ടും ആരംഭിക്കുക"
-
-#: ../src/totem-object.c:1258
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because it does not have the "
-"appropriate plugins to be able to read from the disc."
-msgstr ""
-"ടോട്ടമിനു ഇത്തരം മാധ്യമം പ്ലേ ചെയ്യാന്‍ കഴിയില്ല (%s), കാരണം അതിനു ഡിസ്കില്‍ നിന്നു "
-"വായിക്കാനുള്ള ശരിയായ സംയോജകങ്ങളില്ല"
-
-#: ../src/totem-object.c:1260
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because you do not have the "
-"appropriate plugins to handle it."
-msgstr ""
-"ടോട്ടമിനു ഇത്തരം മാധ്യമം പ്ലേ ചെയ്യാന്‍ കഴിയില്ല (%s), കാരണം അതിനു കയ്കാര്യം ചെയ്യാനുള്ള "
-"ശരിയായ സംയോജകങ്ങളില്ല"
-
-#: ../src/totem-object.c:1263
-#, c-format
-msgid "Totem cannot play this type of media (%s) because it is not supported."
-msgstr "ടോട്ടമിനു ഇത്തരം മാധ്യമം പ്ലേ ചെയ്യാന്‍ കഴിയില്ല (%s), കാരണം അത് പിന്തുണയ്ക്കുന്നില്ല"
-
-#: ../src/totem-object.c:1264
-msgid "Please insert another disc to play back."
-msgstr "ദയവായി പ്ലേ-ബാക്ക് ചെയ്യാന്‍ വേറെ ഒരു ഡിസ്ക് ഇടുക"
-
-#: ../src/totem-object.c:1300
-msgid "Totem was not able to play this disc."
-msgstr "ടോട്ടത്തിനു് ഈ ഡിസ്ക് പ്രവര്‍ത്തിപ്പിക്കുവാന്‍ സാധ്യമല്ല."
-
-#: ../src/totem-object.c:1301 ../src/totem-object.c:4229
-msgid "No reason."
-msgstr "കാരണം ഇല്ല."
-
-#: ../src/totem-object.c:1315
-msgid "Totem does not support playback of Audio CDs"
-msgstr "ടോട്ടം ശബ്ദ സി.ഡികളൂടെ പ്ലേ.ബാക്ക് പിന്തുണയ്ക്കുന്നില്ല"
-
-#: ../src/totem-object.c:1316
-msgid "Please consider using a music player or a CD extractor to play this CD"
-msgstr ""
-"ദയവായി ഈ സി.ഡി പ്ലേ ചെയ്യാന്‍ ഒരു ശബ്ദ-പ്ലേയറോ സി.ഡി എക്സ്റ്റ്രാക്റ്ററോ ഉപയോഗിക്കുന്നതിനെ "
-"കുറിച്ച് ആലോചിക്കുക."
-
-#: ../src/totem-object.c:1805
+#: ../src/totem-object.c:1793
 msgid "No error message"
 msgstr "പിശക് സന്ദേശങ്ങള്‍ ഒന്നും ഇല്ല"
 
-#: ../src/totem-object.c:2154
+#: ../src/totem-object.c:2133
 msgid "Totem could not display the help contents."
 msgstr "ടോട്ടത്തിനു് സഹായത്തിന്റെ ഉളളടക്കം പ്രദര്‍ശിപ്പിക്കുവാന്‍ സാധ്യമായില്ല"
 
-#: ../src/totem-object.c:2493 ../src/totem-object.c:2495
-#: ../browser-plugin/totem-plugin-viewer.c:1417
-msgid "An error occurred"
-msgstr "ഒരു പിശക് സംഭവിച്ചിരിക്കുന്നു"
-
-#: ../src/totem-object.c:4064 ../src/totem-object.c:4066
+#: ../src/totem-object.c:4019 ../src/totem-object.c:4021
 msgid "Previous Chapter/Movie"
 msgstr "തൊട്ട് മുമ്പുള്ള ഭാഗം/സിനിമ"
 
-#: ../src/totem-object.c:4073 ../src/totem-object.c:4075
+#: ../src/totem-object.c:4028 ../src/totem-object.c:4030
 msgid "Play / Pause"
 msgstr "പ്രവര്‍ത്തിപ്പിക്കുക / താല്‍കാലത്തേക്ക് നിര്‍ത്തുക"
 
-#: ../src/totem-object.c:4083 ../src/totem-object.c:4085
+#: ../src/totem-object.c:4038 ../src/totem-object.c:4040
 msgid "Next Chapter/Movie"
 msgstr "അടുത്ത ഭാഗം/സിനിമ"
 
-#. Translators: this is the tooltip text for the fullscreen button in the controls box in Totem's main window.
 #. Translators: this is the accessibility text for the fullscreen button in the controls box in Totem's main window.
-#: ../src/totem-object.c:4097 ../src/totem-object.c:4099
+#: ../src/totem-object.c:4051 ../src/totem-object.c:4053
 msgid "Fullscreen"
 msgstr "മുഴുവന്‍ തിരശ്ശീല"
 
-#: ../src/totem-object.c:4229
+#: ../src/totem-object.c:4184
 msgid "Totem could not startup."
 msgstr "ടോട്ടത്തിനു് ആരംഭിക്കുവാന്‍ സാധ്യമായില്ല."
 
+#: ../src/totem-object.c:4184
+msgid "No reason."
+msgstr "കാരണം ഇല്ല."
+
 #: ../src/totem-open-location.c:182
 msgid "Open Location..."
 msgstr "വിലാസം തുറക്കുക..."
@@ -1437,124 +1425,114 @@
 msgid "Movies to play"
 msgstr "ഓടിക്കേണ്ട ചലച്ചിത്രങ്ങള്‍"
 
-#: ../src/totem-options.c:117
+#: ../src/totem-options.c:79
+msgid "- Play movies and songs"
+msgstr "- സിനിമയും പാട്ടുകളും പ്രവര്‍ത്തിപ്പിക്കുന്നു"
+
+#: ../src/totem-options.c:142
 msgid "Can't enqueue and replace at the same time"
-msgstr ""
+msgstr "ഒരേ സമയത്തു് ക്യൂ ചെയ്തു് മാറ്റി സ്ഥാപിയ്ക്കുവാന്‍ സാധ്യമല്ല"
 
 #. By extension entry
-#: ../src/totem-playlist.c:161
+#: ../src/totem-playlist.c:162
 msgid "MP3 ShoutCast playlist"
 msgstr "എംപിത്രി ഷൌട്ട്കാസ്റ്റ് പ്ലേലിസ്റ്റ്"
 
-#: ../src/totem-playlist.c:162
+#: ../src/totem-playlist.c:163
 msgid "MP3 audio (streamed)"
 msgstr "എംപിത്രി ഓ‍ഡിയോ (സ്ട്രീമ്ഡ്)"
 
-#: ../src/totem-playlist.c:163
+#: ../src/totem-playlist.c:164
 msgid "MP3 audio (streamed, DOS format)"
 msgstr "എംപിത്രി ഓ‍ഡിയോ (സ്ട്രീമ്ഡ്, ഡോസ് ശൈലി)"
 
-#: ../src/totem-playlist.c:164
+#: ../src/totem-playlist.c:165
 msgid "XML Shareable Playlist"
 msgstr "XML പങ്കിടുന്ന പ്ലേലിസ്റ്റ്"
 
 #. This is "Title 3", where title is a DVD title
 #. * Note: NOT a DVD chapter
-#: ../src/totem-playlist.c:347
+#: ../src/totem-playlist.c:348
 #, c-format
 msgid "Title %d"
 msgstr "തലക്കെട്ടു് %d"
 
-#: ../src/totem-playlist.c:446
+#: ../src/totem-playlist.c:447
 msgid "Could not save the playlist"
 msgstr "പ്ലേലിസ്റ്റ് സംരക്ഷിക്കുവാന്‍ സാധ്യമായില്ല"
 
-#: ../src/totem-playlist.c:1021
+#: ../src/totem-playlist.c:1022
 msgid "Save Playlist"
 msgstr "പ്ലേലിസ്റ്റ് സൂക്ഷിക്കുക"
 
 #. translators: Playlist is the default saved playlist filename,
 #. * without the suffix
-#: ../src/totem-playlist.c:1033 ../src/totem-playlist.c:1264
-#: ../src/totem-sidebar.c:142
+#: ../src/totem-playlist.c:1034 ../src/totem-playlist.c:1263
+#: ../src/totem-sidebar.c:145
 msgid "Playlist"
 msgstr "പ്ലേലിസ്റ്റ്"
 
-#: ../src/totem-playlist.c:1857
+#: ../src/totem-playlist.c:1862
 #, c-format
 msgid "The playlist '%s' could not be parsed. It might be damaged."
 msgstr "പ്ലേലിസ്റ്റ് '%s' തുറക്കാന്‍ കഴിഞ്ഞില്ല. ഇതിനു കേടു വന്നിരിക്കാം"
 
-#: ../src/totem-playlist.c:1858
+#: ../src/totem-playlist.c:1863
 msgid "Playlist error"
 msgstr "പ്ലേലിസ്റ്റ് പിശക്"
 
-#: ../src/totem-preferences.c:295
+#: ../src/totem-preferences.c:297
 msgid "Preferences"
 msgstr "മുന്‍ഗണനകള്‍"
 
-#: ../src/totem-preferences.c:451
+#: ../src/totem-preferences.c:445
 msgid "Select Subtitle Font"
 msgstr "അടിക്കുറിപ്പിനുള്ള അക്ഷരസഞ്ചയം തെരഞ്ഞെടുക്കുക"
 
-#: ../src/totem-properties-main.c:115 ../src/totem-properties-view.c:266
+#: ../src/totem-properties-main.c:116 ../src/totem-properties-view.c:269
 msgid "Audio/Video"
 msgstr "ഓഡിയോ/വീഡിയോ"
 
-#: ../src/totem-properties-view.c:128
-#, fuzzy
+#: ../src/totem-properties-view.c:131
 msgid "N/A"
-msgstr "ബാധകമല്ല"
+msgstr "N/A"
 
-#: ../src/totem-properties-view.c:157
+#: ../src/totem-properties-view.c:160
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
-#, fuzzy
 msgctxt "Stream bit rate"
 msgid "N/A"
-msgstr "ബാധകമല്ല"
+msgstr "N/A"
 
-#: ../src/totem-properties-view.c:160
+#: ../src/totem-properties-view.c:163
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: ../src/totem-properties-view.c:177
+#: ../src/totem-properties-view.c:180
 #: ../src/plugins/properties/totem-movie-properties.c:149
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../src/totem-properties-view.c:209
+#: ../src/totem-properties-view.c:212
 #: ../src/plugins/properties/totem-movie-properties.c:166
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: ../src/totem-properties-view.c:216
+#: ../src/totem-properties-view.c:219
 #: ../src/plugins/properties/totem-movie-properties.c:166
-#, fuzzy
 msgctxt "Sample rate"
 msgid "N/A"
 msgstr "N/A"
 
-#: ../src/totem-properties-view.c:224
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5589
-msgid "Surround"
-msgstr "സറൌണ്ട് (എല്ലാ ദിശയില്‍ നിന്നും ശബ്ദം)"
-
-#: ../src/totem-properties-view.c:226
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5591
-msgid "Mono"
-msgstr "മോണോ"
-
-#: ../src/totem-properties-view.c:236
-#, fuzzy
+#: ../src/totem-properties-view.c:239
 msgctxt "Number of audio channels"
 msgid "N/A"
-msgstr "ബാധകമല്ല"
+msgstr "ലഭ്യമല്ല"
 
 #: ../src/totem-statusbar.c:110
 msgid "0:00 / 0:00"
@@ -1584,8 +1562,8 @@
 #. eg: 75 %
 #: ../src/totem-statusbar.c:250
 #, c-format
-msgid "%d %%"
-msgstr "%d %%"
+msgid "%lf %%"
+msgstr "%lf %%"
 
 #. eg: Paused, 0:32 / 1:05
 #: ../src/totem-statusbar.c:325
@@ -1596,8 +1574,9 @@
 #. eg: Buffering, 75 %
 #: ../src/totem-statusbar.c:330
 #, c-format
-msgid "%s, %d %%"
-msgstr "%s, %d %%"
+#| msgid "%s, %d %%"
+msgid "%s, %f %%"
+msgstr "%s, %f %%"
 
 #: ../src/totem-subtitle-encoding.c:156
 msgid "Current Locale"
@@ -1740,221 +1719,93 @@
 msgid "Vietnamese"
 msgstr "വിയറ്റ്നാമീസ്"
 
-#: ../src/totem-video-list.c:330
-msgid "No video URI"
-msgstr "വീഡിയോ യുആര്‍ഐ ലഭ്യമല്ല"
-
-#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
-#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
-#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
-#: ../src/totem-video-thumbnailer.c:872
-#, c-format
-msgid ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-msgstr ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-
-#: ../src/totem-video-thumbnailer.c:873
-msgid "Filename"
-msgstr "ഫയല്‍നാമം"
-
-#: ../src/totem-video-thumbnailer.c:875
-msgid "Resolution"
-msgstr "റിസല്യൂഷന്‍"
-
-#: ../src/totem-video-thumbnailer.c:878
-msgid "Duration"
-msgstr "സമയ പരിധി"
-
-#: ../src/totem-uri.c:506 ../src/plugins/chapters/totem-chapters.c:998
+#: ../src/totem-uri.c:343 ../src/plugins/chapters/totem-chapters.c:998
 msgid "All files"
 msgstr "എല്ലാ ഫയലുകളും"
 
-#: ../src/totem-uri.c:511 ../src/plugins/chapters/totem-chapters.c:995
+#: ../src/totem-uri.c:348 ../src/plugins/chapters/totem-chapters.c:995
 msgid "Supported files"
 msgstr "പിന്തുണയുളള ഫയലുകള്‍"
 
-#: ../src/totem-uri.c:523
-msgid "Audio files"
-msgstr "ശബ്ദ ഫയലുകള്‍"
-
-#: ../src/totem-uri.c:531
-msgid "Video files"
-msgstr "ചലചിത്ര ഫയലുകള്‍"
-
-#: ../src/totem-uri.c:541
-msgid "Subtitle files"
-msgstr "അടിക്കുറിപ്പു് ഫയലുകള്‍"
-
-#: ../src/totem-uri.c:593
-msgid "Select Text Subtitles"
-msgstr "അടിക്കുറിപ്പു് തെരഞ്ഞെടുക്കുക"
-
-#: ../src/totem-uri.c:656
-msgid "Select Movies or Playlists"
-msgstr "ചലച്ചിത്രങ്ങള്‍ അല്ലെങ്കില്‍ പ്ലേലിസ്റ്റുകള്‍ തെരഞ്ഞെടുക്കുക"
-
-#. Options parsing
-#: ../src/totem.c:201
-msgid "- Play movies and songs"
-msgstr "- സിനിമയും പാട്ടുകളും പ്രവര്‍ത്തിപ്പിക്കുന്നു"
-
-#: ../src/totem.c:212
-#, c-format
-msgid ""
-"%s\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"%s\n"
-" '%s --help' രണ്‍ ചെയ്യുക ലഭ്യമായ ആജ്ഞ-വരി ഐച്ഛികങ്ങളുടെ പട്ടിക കാണാന്‍..\n"
-
-#: ../src/totem.c:254 ../src/totem.c:265
-#: ../browser-plugin/totem-plugin-viewer.c:663
-#: ../browser-plugin/totem-plugin-viewer.c:1793
-msgid "Totem Movie Player"
-msgstr "ടോട്ടം മൂവി പ്ലേയര്‍"
-
-#: ../src/totem.c:255 ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Could not initialize the thread-safe libraries."
-msgstr "ത്രെഡ്-സെയിഫ് ലൈബ്രറികള്‍ ആരംഭിക്കുവാന്‍ സാധ്യമായില്ല"
-
-#: ../src/totem.c:255
-msgid "Verify your system installation. Totem will now exit."
-msgstr "നിങ്ങളുടെ സിസ്റ്റം ഇന്‍സ്റ്റലേഷന്‍ പരിശോധിക്കുക. Totem ഇപ്പോള്‍ പുറത്ത് കടക്കുന്നതാണ്."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:1589
-msgid "Password requested for RTSP server"
-msgstr "RTSP സേവകന്റെ അടയാളവാക്ക്"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2858
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2862
-#, c-format
-msgid "Audio Track #%d"
-msgstr "ശബ്ദ ട്രാക്ക് #%d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2890
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2894
-#, c-format
-msgid "Subtitle #%d"
-msgstr "അടിക്കുറിപ്പു് #%d"
+#: ../src/totem-uri.c:360
+msgid "Audio files"
+msgstr "ശബ്ദ ഫയലുകള്‍"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3298
-msgid ""
-"The requested audio output was not found. Please select another audio output "
-"in the Multimedia Systems Selector."
-msgstr ""
-"അഭ്യര്‍ഥിച്ച ശബ്ദ ഔട്പുട്ട് കണ്ടുപിടിച്ചില്ല. ദയവായി വേറൊരു ശബ്ദ-ഔട്പുട് തെരഞ്ഞെടുക്കുക മള്‍ടി-മീഡിയ "
-"സിസ്റ്റംസ് സെലക്റ്ററില്‍."
+#: ../src/totem-uri.c:368
+msgid "Video files"
+msgstr "ചലചിത്ര ഫയലുകള്‍"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3303
-msgid "Location not found."
-msgstr "സ്ഥാനം കണ്ടുകിട്ടിയില്ല."
+#: ../src/totem-uri.c:378
+msgid "Subtitle files"
+msgstr "അടിക്കുറിപ്പു് ഫയലുകള്‍"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3307
-msgid ""
-"Could not open location; you might not have permission to open the file."
-msgstr "സ്ഥാനം തുറക്കുവാന്‍ സാധ്യമായില്ല; നിങ്ങള്‍ക്ക് അതിനുളള അനുവാദം ഇല്ലായിരിക്കാം."
+#: ../src/totem-uri.c:430
+msgid "Select Text Subtitles"
+msgstr "അടിക്കുറിപ്പു് തെരഞ്ഞെടുക്കുക"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3318
-msgid ""
-"The video output is in use by another application. Please close other video "
-"applications, or select another video output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"വീഡിയോ ഔട്പുട്ട് വേറെ ഒരു പ്രയോഗം ഉപയോഗിക്കുന്നു. ദയവായി മറ്റു വീഡിയോ പ്രയോഗങ്ങള്‍ നിര്‍ത്തുക, "
-"അല്ലെങ്കില്‍ വേറൊരു വീഡിയോ ഔട്പുട് തെരഞ്ഞെടുക്കുക മള്‍ടി-മീഡിയ സിസ്റ്റംസ് സെലക്റ്ററില്‍."
+#: ../src/totem-uri.c:495
+msgid "Select Movies or Playlists"
+msgstr "ചലച്ചിത്രങ്ങള്‍ അല്ലെങ്കില്‍ പ്ലേലിസ്റ്റുകള്‍ തെരഞ്ഞെടുക്കുക"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3324
-msgid ""
-"The audio output is in use by another application. Please select another "
-"audio output in the Multimedia Systems Selector. You may want to consider "
-"using a sound server."
-msgstr ""
-"ശബ്ദ ഔട്പുട്ട് വേറെ ഒരു പ്രയോഗം ഉപയോഗിക്കുന്നു. ദയവായി വേറൊരു ശബ്ദ ഔട്പുട് തെരഞ്ഞെടുക്കുക മള്‍ടി-"
-"മീഡിയ സിസ്റ്റംസ് സെലക്റ്ററില്‍. നിങ്ങള്‍ക്കൊരു ശബ്ദ സെര്‍വര്‍ ഉപയോഗിക്കുന്നതിനെ കുറിച്ച് "
-"ആലോചിക്കാവുന്നതാണു."
+#: ../src/totem-uri.c:499
+msgid "Add Directory"
+msgstr "ഡയറക്ടറി ചേര്‍ക്കുക"
 
-#. should be exactly one missing thing (source or converter)
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3342
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3348
-#, fuzzy, c-format
-msgid "The playback of this movie requires a %s plugin which is not installed."
-msgid_plural ""
-"The playback of this movie requires the following decoders which are not "
-"installed:\n"
-"\n"
-"%s"
-msgstr[0] ""
-"ഈ ചലച്ചിത്രം പ്ലേ-ബാക്ക് ചെയ്യാന്‍ ഒരു %s സംയോജകം ആവശ്യമുണ്ട്, അത് ഇന്‍സ്റ്റാള്‍ ചെയ്തിട്ടില്ല."
-msgstr[1] ""
-"ഈ ചലച്ചിത്രം പ്ലേ-ബാക്ക് ചെയ്യാന്‍ ഒരു %s സംയോജകം ആവശ്യമുണ്ട്, അത് ഇന്‍സ്റ്റാള്‍ ചെയ്തിട്ടില്ല."
+#: ../src/totem-video-list.c:330
+msgid "No video URI"
+msgstr "വീഡിയോ യുആര്‍ഐ ലഭ്യമല്ല"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3374
+#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
+#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
+#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
+#: ../src/totem-video-thumbnailer.c:841
+#, c-format
 msgid ""
-"Cannot play this file over the network. Try downloading it to disk first."
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 msgstr ""
-"നെറ്റ്‍വര്‍ക്കില്‍ ഈ ഫയല്‍ പ്രവര്‍ത്തിപ്പിക്കുവാന്‍ സാധ്യമായില്ല. ആദ്യം അത് ഡിസ്ക്കില്‍ നിന്നും ഡൌണ്‍ ലോഡ് "
-"ചെയ്യുന്നതിന് ശ്രമിക്കുക."
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5878
-msgid "Media contains no supported video streams."
-msgstr "മീഡിയ്ക് പിന്തുണയുളള വീഡിയോ പ്രവാഹങ്ങള്‍ ലഭ്യമല്ല"
+#: ../src/totem-video-thumbnailer.c:842
+msgid "Filename"
+msgstr "ഫയല്‍നാമം"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6052
-msgid ""
-"Failed to create a GStreamer play object. Please check your GStreamer "
-"installation."
-msgstr ""
-"ജി-സ്ട്രീമര്‍ പ്ലേ ഓബ്ജെക്റ്റ് ഉണ്ടാക്കുന്നതില്‍ പരാജയപെട്ടു. ദയവായി നിങ്ങളുടെ ജി-സ്ട്രീമര്‍ "
-"ഇന്‍സ്റ്റൊളേഷന്‍ പരിശോധിക്കുക."
+#: ../src/totem-video-thumbnailer.c:844
+msgid "Resolution"
+msgstr "റിസല്യൂഷന്‍"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6172
-msgid ""
-"Failed to open audio output. You may not have permission to open the sound "
-"device, or the sound server may not be running. Please select another audio "
-"output in the Multimedia Systems Selector."
-msgstr ""
-"ശബ്ദ ഔട്പുട്ട് തുറക്കുന്നതില്‍ പരാജയപെട്ടു. നിങ്ങള്‍ക്ക് ശബ്ദ ഉപകരണം തുറക്കാന്‍ അനുവാദം "
-"ഇല്ലായിരിക്കാം, അല്ലെങ്കില്‍ ശബ്ദ സെര്‍വര്‍ പ്രവര്‍ത്തിക്കുന്നില്ലായിരിക്കാം. ദയവായി വേറൊരു ശബ്ദയോ "
-"ഔട്പുട്ട് തെരഞ്ഞെടുക്കുക മള്‍ടി-മീഡിയ സിസ്റ്റംസ് സെലക്റ്ററില്‍"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6192
-msgid ""
-"Could not find the audio output. You may need to install additional "
-"GStreamer plugins, or select another audio output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"ശബ്ദ ഔട്പുട്ട് കണ്ടു പിടിക്കാന്‍ സാധിച്ചില്ല. നിങ്ങള്‍ക്ക് വേറെ ജി-സ്ട്രീമര്‍ സംയോജകങ്ങള്‍ ഇന്‍സ്റ്റാള്‍ "
-"ചെയ്യേണ്ടി വരും, അല്ലെങ്കില്‍ വേറൊരു ശബ്ദ ഔട്പുട് തെരഞ്ഞെടുക്കേണ്ടി വരും മള്‍ടി-മീഡിയ സിസ്റ്റംസ് "
-"സെലക്റ്ററില്‍."
+#: ../src/totem-video-thumbnailer.c:847
+msgid "Duration"
+msgstr "സമയ പരിധി"
 
-#. hour:minutes:seconds
-#. Translators: This is a time format, like "9:05:02" for 9
-#. * hours, 5 minutes, and 2 seconds. You may change ":" to
-#. * the separator that your locale uses or use "%Id" instead
-#. * of "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:83 ../src/plugins/skipto/totem-time-entry.c:57
-#, c-format
-msgctxt "long time format"
-msgid "%d:%02d:%02d"
-msgstr "%d:%02d:%02d"
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:1
+msgid "Apple Trailers"
+msgstr "ആപ്പിള്‍ ട്രെയിലറുകള്‍"
+
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:2
+msgid "Sets the user agent for the Apple Trailers site"
+msgstr "ആപ്പിള്‍ ട്രെയിലറിനുള്ള സൈറ്റിനുള്ള യൂസര്‍ ഏജന്റ് സജ്ജമാക്കുന്നു"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:1
+#| msgid "Download Movie Subtitles"
+msgid "Autoload Subtitles"
+msgstr "അടിക്കുറിപ്പുകള്‍ ഓട്ടോമാറ്റിയ്ക്കായി ലഭ്യമാക്കുക"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:2
+#| msgid "Downloading the subtitles…"
+msgid "Autoloads text subtitles"
+msgstr "അടിക്കുറിപ്പു് സ്വയമായി ലഭ്യമാക്കുന്നു"
 
-#. minutes:seconds
-#. Translators: This is a time format, like "5:02" for 5
-#. * minutes and 2 seconds. You may change ":" to the
-#. * separator that your locale uses or use "%Id" instead of
-#. * "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:92
-#, c-format
-msgctxt "short time format"
-msgid "%d:%02d"
-msgstr "%d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
+msgid "Video Disc Recorder"
+msgstr "വീഡിയോ ഡിസ്ക് റിക്കോര്‍ഡര്‍"
+
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
+msgid "Records (S)VCDs or video DVDs"
+msgstr "വിസിഡി അല്ലെങ്കില്‍ ഡിവിഡികള്‍ റിക്കോര്‍ഡ് ചെയ്യുക"
 
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:65
 msgid "_Create Video Disc..."
@@ -1980,107 +1831,85 @@
 msgid "Copy the currently playing (S)VCD"
 msgstr "നിലവില്‍ പ്രവര്‍ത്തിക്കുന്ന വീഡിയോ (S)VCD പകര്‍ത്തുക"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:129
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:136
 msgid "The video disc could not be duplicated."
 msgstr "വീഡിയോ ഡിസ്കിന്റെ ഡൂപ്ലിക്കേറ്റുണ്ടാക്കുവാന്‍ സാധ്യമല്ല."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:131
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:276
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:138
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:283
 msgid "The movie could not be recorded."
 msgstr "ചലച്ചിത്രം റിക്കോര്‍ഡ് ചെയ്യുവാന്‍ സാധ്യമായില്ല."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:157
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:167
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:263
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:164
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:174
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:270
 msgid "Unable to write a project."
 msgstr "ഒരു സംരംഭം സിഡിയിലേക്കു് സൂക്ഷിക്കുവാന്‍ സാധ്യമല്ല."
 
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
-msgid "Records (S)VCDs or video DVDs"
-msgstr "വിസിഡി അല്ലെങ്കില്‍ ഡിവിഡികള്‍ റിക്കോര്‍ഡ് ചെയ്യുക"
-
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
-msgid "Video Disc Recorder"
-msgstr "വീഡിയോ ഡിസ്ക് റിക്കോര്‍ഡര്‍"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:1
-#: ../src/plugins/chapters/totem-chapters.c:1139
-#, fuzzy
-msgid "Chapters"
-msgstr "ഭാഗങ്ങള്‍"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:2
-#, fuzzy
-msgid "Support chapter markers in movies."
-msgstr "അടുത്ത ഭാഗം അല്ലെങ്കില്‍ സിനിമ"
-
 #: ../src/plugins/chapters/chapters-edit.ui.h:1
 msgid "Name for new chapter:"
-msgstr ""
+msgstr "പുതിയ പാഠത്തിന്റെ പേരു്:"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:1
-#, fuzzy
-msgid "Add Chapter..."
-msgstr "ഭാഗങ്ങള്‍ ലഭ്യമാക്കുക..."
+msgid "_Remove Chapter"
+msgstr "പാഠം _നീക്കം ചെയ്യുക"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:2
-#, fuzzy
-msgid "Add New Chapters"
-msgstr "ഭാഗങ്ങള്‍"
+msgid "Remove the chapter from the list"
+msgstr "പട്ടികയില്‍ നിന്നും പാഠം നീക്കം ചെയ്യുക"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:3
-#, fuzzy
-msgid "Create a new chapter list for the movie"
-msgstr "അടുത്ത ഭാഗം അല്ലെങ്കില്‍ സിനിമ"
+msgid "_Go to Chapter"
+msgstr "ഭാഗത്തേയ്ക്ക് പോവു_ക"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:4
-#, fuzzy
-msgid "Go to Chapter"
-msgstr "ഭാഗത്തേയ്ക്ക് പോവുക"
+msgid "Go to the chapter in the movie"
+msgstr "ചലചിത്രത്തിലുള്ള പാഠഭാഗത്തിലേക്കു് പോകുക"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:5
-#, fuzzy
-msgid "Go to the chapter in the movie"
-msgstr "ഭാഗങ്ങളുടെ മെനുവിലേയ്ക്കു് പോവുക"
+msgid "Add Chapter..."
+msgstr "പാഠം ചേര്‍ക്കുക..."
 
 #: ../src/plugins/chapters/chapters-list.ui.h:6
-#, fuzzy
-msgid "Load Chapters..."
-msgstr "ഭാഗങ്ങള്‍ ലഭ്യമാക്കുക..."
+msgid "Remove Chapter"
+msgstr "ഭാഗം നീക്കം ചെയ്യുക"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:7
-msgid "Load chapters from an external CMML file"
-msgstr ""
+msgid "Go to Chapter"
+msgstr "ഭാഗത്തേയ്ക്ക് പോവുക"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:8
-#, fuzzy
-msgid "No chapter data"
-msgstr "ഭാഗങ്ങളുടെ വിവരം ഇല്ല"
+msgid "Save Changes"
+msgstr "മാറ്റങ്ങള്‍ സംരക്ഷിക്കുക"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:9
-#, fuzzy
-msgid "Remove Chapter"
-msgstr "ഭാഗങ്ങള്‍"
+msgid "No chapter data"
+msgstr "പാഠ വിവരം ലഭ്യമല്ല"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:10
-#, fuzzy
-msgid "Remove the chapter from the list"
-msgstr "ഫയല്‍ പ്ലേലിസ്റ്റില്‍ നിന്നും ഭാഗം കളയുക"
+msgid "Load Chapters..."
+msgstr "പാഠങ്ങള്‍ ലഭ്യമാക്കുക..."
 
 #: ../src/plugins/chapters/chapters-list.ui.h:11
-#, fuzzy
-msgid "Save Changes"
-msgstr "മാറ്റങ്ങള്‍ സംരക്ഷിക്കുക"
+msgid "Load chapters from an external CMML file"
+msgstr "ആന്തരിക സിഎംഎംഎല്‍ ഫയലില്‍ നിന്നും പാഠങ്ങള്‍ ലഭ്യമാക്കുക"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:12
-#, fuzzy
-msgid "_Go to Chapter"
-msgstr "ഭാഗത്തേയ്ക്ക് പോവുക"
+msgid "Add New Chapters"
+msgstr "പുതിയ പാഠങ്ങള്‍ ചേര്‍ക്കുക"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:13
-#, fuzzy
-msgid "_Remove Chapter"
-msgstr "_നീക്കം ചെയ്യുക"
+msgid "Create a new chapter list for the movie"
+msgstr "ചലചിത്രത്തിനുള്ള പുതിയ പാഠപട്ടിക തയ്യാറാക്കുക"
+
+#: ../src/plugins/chapters/chapters.plugin.in.h:1
+#: ../src/plugins/chapters/totem-chapters.c:1139
+msgid "Chapters"
+msgstr "പാഠങ്ങള്‍"
+
+#: ../src/plugins/chapters/chapters.plugin.in.h:2
+msgid "Support chapter markers in movies"
+msgstr "ചലചിത്രങ്ങളില്‍ പാഠം അടയാളങ്ങള്‍ പിന്തുണയ്ക്കുന്നു"
 
 #: ../src/plugins/chapters/totem-chapters.c:56
 #, c-format
@@ -2088,69 +1917,70 @@
 "Title: %s\n"
 "Start time: %s"
 msgstr ""
+"തലക്കെട്ട്: %s\n"
+"തുടക്കം: %s"
 
 #: ../src/plugins/chapters/totem-chapters.c:328
 msgid "Error while reading file with chapters"
-msgstr ""
+msgstr "പാഠങ്ങളിലൂടെ ഫയല്‍ ലഭ്യമാക്കുമ്പോള്‍ പിശക്"
 
 #: ../src/plugins/chapters/totem-chapters.c:543
 msgid "Chapter with the same time already exists"
-msgstr ""
+msgstr "ഇതേ സമയത്തുള്ള പാഠം നിലവിലുണ്ടു്"
 
 #: ../src/plugins/chapters/totem-chapters.c:544
 msgid "Try another name or remove an existing chapter."
-msgstr ""
+msgstr "മറ്റൊരു പേരു് നല്‍കുക അല്ലെങ്കില്‍ നിലവിലുള്ളൊരു പാഠം നീക്കം ചെയ്യുക."
 
 #: ../src/plugins/chapters/totem-chapters.c:717
 msgid "Error while writing file with chapters"
-msgstr ""
+msgstr "പാഠങ്ങളുള്ള ഫയലിലേക്കു് എഴുതുന്നതില്‍ പിശക്"
 
 #: ../src/plugins/chapters/totem-chapters.c:842
-#, fuzzy
 msgid "Error occurred while saving chapters"
-msgstr "ആല്‍ബങ്ങള്‍ ലഭ്യമാക്കുമ്പോള്‍ ഒരു പിശകുണ്ടായി."
+msgstr "പാഠങ്ങള്‍ സൂക്ഷിയ്ക്കുന്നതില്‍ പിശക്"
 
 #: ../src/plugins/chapters/totem-chapters.c:843
-msgid ""
-"Please check you have permission to write to the folder containing the movie."
-msgstr ""
+msgid "Please check you have permission to write to the folder containing the movie."
+msgstr "ചലചിത്രമടങ്ങുന്ന ഫോള്‍ഡറിലേക്കു് സൂക്ഷിയ്ക്കുവാനുള്ള അനുമതി ദയവായി പരിശോധിയ്ക്കുക."
 
 #: ../src/plugins/chapters/totem-chapters.c:976
-#, fuzzy
 msgid "Open Chapter File"
-msgstr "ഭാഗങ്ങളുടെ ഫയല്‍ തുറക്കുക"
+msgstr "പാഠ ഫയല്‍ തുറക്കുക"
 
 #: ../src/plugins/chapters/totem-chapters.c:1093
-#, fuzzy
 msgid "Chapter Screenshot"
-msgstr "സ്ക്രീന്‍ ഷോട്ട് സൂക്ഷിക്കുക"
+msgstr "പാഠത്തിന്റെ സ്ക്രീന്‍ഷോട്ട്"
 
 #: ../src/plugins/chapters/totem-chapters.c:1104
-#, fuzzy
 msgid "Chapter Title"
-msgstr "ഭാഗങ്ങളുടെ ഫയല്‍ തുറക്കുക"
+msgstr "പാഠ തലക്കെട്ട്"
 
 #: ../src/plugins/chapters/totem-chapters.c:1184
 msgid "Save changes to chapter list before closing?"
-msgstr ""
+msgstr "അടയ്ക്കുന്നതിനു് മുമ്പായി പാഠ പട്ടികയിലേക്കു് മാറ്റങ്ങള്‍ സൂക്ഷിയ്ക്കണമോ?"
 
 #. Translators: close Totem without saving changes to the chapter list of the current movie.
 #: ../src/plugins/chapters/totem-chapters.c:1189
 msgid "Close without Saving"
-msgstr ""
+msgstr "സൂക്ഷിയ്ക്കാതെ അടയ്ക്കുക"
 
 #. Translators: save changes to the chapter list of the current movie before closing Totem.
 #: ../src/plugins/chapters/totem-chapters.c:1191
 msgid "Save"
-msgstr ""
+msgstr "സൂക്ഷിയ്ക്കുക"
 
 #: ../src/plugins/chapters/totem-chapters.c:1194
 msgid "If you don't save, changes to the chapter list will be lost."
-msgstr ""
+msgstr "സൂക്ഷിച്ചില്ലെങ്കില്‍, പാഠ പട്ടികയില്‍ വരുത്തിയ മാറ്റങ്ങള്‍ നഷ്ടമാകുന്നു."
 
 #: ../src/plugins/chapters/totem-cmml-parser.c:651
 msgid "Failed to parse CMML file"
-msgstr ""
+msgstr "സിഎംഎംഎല്‍ ഫയല്‍ പാഴ്സ് ചെയ്യുന്നതില്‍ പരാജയം"
+
+#: ../src/plugins/chapters/totem-edit-chapter.c:95
+msgid "Add Chapter"
+msgstr "ഭാഗങ്ങള്‍ ചേര്‍ക്കുക"
 
 #: ../src/plugins/dbusservice/dbusservice.plugin.in.h:1
 msgid "D-Bus Service"
@@ -2167,30 +1997,56 @@
 #: ../src/plugins/dbusservice/dbusservice.py:243
 #, python-format
 msgid "The MediaPlayer2 object does not implement the ‘%s’ interface"
-msgstr ""
+msgstr "MediaPlayer2 വസ്തു ‘%s’ ഇന്റര്‍ഫെയിസ് ലഭ്യമാക്കുന്നില്ല"
 
 #: ../src/plugins/dbusservice/dbusservice.py:222
 #, python-format
 msgid "The property ‘%s’ is not writeable."
-msgstr ""
+msgstr "‘%s’ വിശേഷത സൂക്ഷിയ്ക്കുവാന്‍ സാധ്യമല്ല"
 
 #: ../src/plugins/dbusservice/dbusservice.py:238
 #, python-format
 msgid "Unknown property ‘%s’ requested of a MediaPlayer 2 object"
-msgstr ""
+msgstr "ഒരു മീഡിയാപ്ലേയര്‍ 2 വസ്തുവിനുള്ള അ‍ജ്ഞാതമായ വിശേഷത ‘%s’"
 
 #: ../src/plugins/dbusservice/dbusservice.py:341
 #, python-format
 msgid "The URI ‘%s’ is not supported."
-msgstr ""
+msgstr "യുആര്‍ഐ '%s' പിന്തുണയ്ക്കുന്നില്ല."
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
-msgid "Instant Messenger status"
-msgstr "ഇന്‍സ്റ്റന്റ് മെസ്സഞ്ചര്‍ സ്റ്റാറ്റസ്"
+#: ../src/plugins/grilo/grilo.plugin.in.h:1
+msgid "Grilo Browser"
+msgstr "ഗ്രിലോ ബ്രൌസര്‍"
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
-msgid "Set your Instant Messenger status to away when a movie is playing"
-msgstr "ചലച്ചിത്രം ഓടുമ്പോള്‍ നിങ്ങളുടെ ഇന്‍സ്റ്റന്റ് മെസ്സഞ്ചര്‍ സ്റ്റാറ്റസ് 'ദൂരെ' ആക്കുക."
+#: ../src/plugins/grilo/grilo.plugin.in.h:2
+msgid "A plugin to let you browse media content from various sources"
+msgstr "അനവധി ശ്രോതസ്സുകളില്‍ നിന്നുള്ള മീഡിയാ തെരയുവാന്‍ അനുവദിക്കുന്ന സമ്യോജകം"
+
+#: ../src/plugins/grilo/grilo.ui.h:1
+#| msgid "_Add to Playlist"
+msgid "Add to Playlist"
+msgstr "പ്ലേലിസ്റ്റിലേയ്ക്കു് ചേര്‍ക്കുക"
+
+#: ../src/plugins/grilo/grilo.ui.h:2
+#| msgid "_Copy Location"
+msgid "Copy Location"
+msgstr "വിലാസം പകര്‍ത്തുക"
+
+#: ../src/plugins/grilo/grilo.ui.h:3 ../src/plugins/grilo/totem-grilo.c:1184
+msgid "Browse"
+msgstr "പരതുക"
+
+#: ../src/plugins/grilo/grilo.ui.h:4 ../src/plugins/grilo/totem-grilo.c:1227
+msgid "Search"
+msgstr "തെരയുക"
+
+#: ../src/plugins/grilo/totem-grilo.c:454
+msgid "Browse Error"
+msgstr "തെരച്ചിലില്‍ പിശക്"
+
+#: ../src/plugins/grilo/totem-grilo.c:609
+msgid "Search Error"
+msgstr "തെരച്ചില്‍ പിശക്"
 
 #: ../src/plugins/gromit/gromit.plugin.in.h:1
 msgid "Gromit Annotations"
@@ -2204,55 +2060,14 @@
 msgid "The gromit binary was not found."
 msgstr "ഗ്രോമിറ്റ് ബൈനറി കണ്ടു പിടിക്കാനായില്ല"
 
-#. Add the interface to Totem's sidebar
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:1
-#: ../src/plugins/iplayer/iplayer.py:46
-msgid "BBC iPlayer"
-msgstr "ബിബിസി ഐപ്ലേയര്‍"
-
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:2
-msgid "Stream BBC programs from the last 7 days from the BBC iPlayer service."
-msgstr ""
-"ബിബിസി ഐപ്ലേയര്‍ സര്‍വീസില്‍ നിന്നും കഴിഞ്ഞ 7 ദിവസത്തെ ബിബിസി പ്രോഗ്രാമുകള്‍ സ്ട്രീം ചെയ്യുക."
-
-#: ../src/plugins/iplayer/iplayer.py:72
-msgid "Error listing channel categories"
-msgstr "ചാനല്‍ വിഭാഗങ്ങള്‍ ലഭ്യമാക്കുന്നതില്‍ പിശക്"
-
-#: ../src/plugins/iplayer/iplayer.py:73
-msgid ""
-"There was an unknown error getting the list of television channels available "
-"on BBC iPlayer."
-msgstr ""
-"ബിബിസി ഐപ്ലേയറില്‍ ലഭ്യമായ ടെലിവിഷന്‍ ചാനലുകളുടെ പട്ടിക ലഭ്യമാക്കുന്നതില്‍ അപരിചിതമായ പിശക്."
-
-#. Append a dummy child row so that the expander's visible; we can
-#. then queue off the expander to load the programme listing for this
-#. category
-#: ../src/plugins/iplayer/iplayer.py:84
-msgid "Loading…"
-msgstr "ലഭ്യമാക്കുന്നു…"
-
-#. Translators: the "programme feed" is the list of TV shows
-#. available to watch online
-#: ../src/plugins/iplayer/iplayer.py:136
-msgid "Error getting programme feed"
-msgstr "പ്രോഗ്രാം ഫീഡ് ലഭിക്കുന്നതില്‍ പിശക്"
-
-#: ../src/plugins/iplayer/iplayer.py:137
-msgid ""
-"There was an error getting the list of programmes for this channel and "
-"category combination."
-msgstr "ഈ ചാനലിലും വിഭാഗത്തിലും പ്രോഗ്രാമുകളുടെ പട്ടിക ലഭ്യമാക്കുന്നതില്‍ പിശക്."
-
-#: ../src/plugins/iplayer/iplayer2.py:298
-msgid ""
-msgstr ""
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
+#| msgid "Instant Messenger status"
+msgid "Instant Messenger Status"
+msgstr "ഇന്‍സ്റ്റന്റ് മെസ്സഞ്ചര്‍ അവസ്ഥ"
 
-#: ../src/plugins/iplayer/iplayer2.py:299
-#, python-format
-msgid "Programme unavailable (\"%s\")"
-msgstr "പ്രോഗ്രാം ലഭ്യമല്ല (\"%s\")"
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
+msgid "Set your Instant Messenger status to away when a movie is playing"
+msgstr "ചലച്ചിത്രം ഓടുമ്പോള്‍ നിങ്ങളുടെ ഇന്‍സ്റ്റന്റ് മെസ്സഞ്ചര്‍ സ്റ്റാറ്റസ് 'ദൂരെ' ആക്കുക."
 
 #: ../src/plugins/lirc/lirc.plugin.in.h:1
 msgid "Infrared Remote Control"
@@ -2270,33 +2085,37 @@
 msgid "Couldn't read lirc configuration."
 msgstr "lirc ക്രമീകരണം വായിക്കാന്‍ കഴിഞ്ഞില്ല"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
-msgid "Download Movie Subtitles"
-msgstr "ചലചിത്ര അടിക്കുറിപ്പുകള്‍ ഡൌണ്‍ലോട് ചെയ്യുക"
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:1
+#| msgid "Movie Player"
+msgid "Media Player Keys"
+msgstr "മീഡിയ പ്ലേയര്‍ കീകള്‍"
+
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:2
+msgid "Support additional media player keys"
+msgstr "അധികമായ മീഡിയാ പ്ലേയര്‍ കീ പിന്തുണയ്ക്കുന്നു"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
-msgid "Subtitle _language:"
-msgstr "അടിക്കുറിപ്പു് _ഭാഷകള്‍:"
+#: ../src/plugins/ontop/ontop.plugin.in.h:1
+msgid "Always On Top"
+msgstr "എപ്പോഴും മുകളില്‍ "
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
-msgid "_Play with Subtitle"
-msgstr "അടിക്കുറിപ്പുകളുമായ _പ്രവര്‍ത്തിപ്പിക്കുക"
+#: ../src/plugins/ontop/ontop.plugin.in.h:2
+msgid "Keep the main window on top when playing a movie"
+msgstr "പ്രധാന ജാലകം മുകളില്‍ തന്നെ വെക്കുക ചലച്ചിത്രം ഓടുമ്പോള്‍"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:1
-msgid "Look for subtitles for the currently playing movie."
-msgstr "നിലവിലോടുന്ന ചലചിത്രത്തിനുള്ള അടിക്കുറപ്പു് തെരയുക"
-
-#: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:2
 msgid "Subtitle Downloader"
 msgstr "അടിക്കുറിപ്പു് ഡൌണ്‍ലോട് ചെയ്യുന്നതിനുള്ള പ്രയോഗം"
 
+#: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:2
+#| msgid "Look for subtitles for the currently playing movie."
+msgid "Look for subtitles for the currently playing movie"
+msgstr "നിലവിലോടുന്ന ചലചിത്രത്തിനുള്ള അടിക്കുറപ്പു് തെരയുക"
+
 #: ../src/plugins/opensubtitles/opensubtitles.py:42
-#, fuzzy
 msgid "Brazilian Portuguese"
 msgstr "ബ്രസീലിയന്‍ പോര്‍ച്ചുഗീസ്"
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:177
-#, fuzzy
 msgid "Searching for subtitles…"
 msgstr "അടിക്കുറിപ്പിനായി തെരയുന്നു..."
 
@@ -2311,14 +2130,12 @@
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:323
 #: ../src/plugins/opensubtitles/opensubtitles.py:341
-#, fuzzy
 msgid "Could not contact the OpenSubtitles website."
 msgstr "OpenSubtitles വെബ്സൈറ്റുമായി ബന്ധപ്പെടുവാന്‍ സാധ്യമായില്ല"
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:329
-#, fuzzy
 msgid "No results found."
-msgstr "ഫലമൊന്നും ലഭ്യമായില്ല"
+msgstr "ഫലമൊന്നും ലഭ്യമായില്ല."
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:478
 msgid "Subtitles"
@@ -2341,7 +2158,6 @@
 msgstr "OpenSubtitles-ല്‍ നിന്നും ചലചിത്ര അടിക്കുറിപ്പുകള്‍ ഡൌണ്‍ലോട് ചെയ്യുക"
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:527
-#, fuzzy
 msgid "_Download Movie Subtitles…"
 msgstr "_ചലചിത്ര അടിക്കുറിപ്പുകള്‍ ഡൌണ്‍ലോട് ചെയ്യുക..."
 
@@ -2349,168 +2165,202 @@
 msgid "Searching subtitles…"
 msgstr "അടിക്കുറിപ്പിനായി തെരയുന്നു..."
 
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
+msgid "Download Movie Subtitles"
+msgstr "ചലചിത്ര അടിക്കുറിപ്പുകള്‍ ഡൌണ്‍ലോട് ചെയ്യുക"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
+msgid "Subtitle _language:"
+msgstr "അടിക്കുറിപ്പു് _ഭാഷകള്‍:"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
+msgid "_Play with Subtitle"
+msgstr "അടിക്കുറിപ്പുകളുമായ _പ്രവര്‍ത്തിപ്പിക്കുക"
+
 #: ../src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in.h:1
 msgid "Subtitle language"
 msgstr "അടിക്കുറിപ്പു് _ഭാഷകള്‍:"
 
 #: ../src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in.h:2
 msgid "The language to search for subtitles for movies in."
+msgstr "ചലചിത്രങ്ങള്‍ക്കുള്ള അടക്കുറിപ്പിനുള്ള ഭാഷ തെരയുക."
+
+#: ../src/plugins/properties/movie-properties.plugin.in.h:1
+#| msgid "Properties"
+msgid "Movie Properties"
+msgstr "ചലചിത്ര വിശേഷതകള്‍"
+
+#: ../src/plugins/properties/movie-properties.plugin.in.h:2
+#| msgid "Show or hide the sidebar"
+msgid "Adds movie properties to the sidebar"
+msgstr "സൈഡ് ബാറിലേക്കു് ചലചിത്ര വിശേഷതകള്‍ ചേര്‍ക്കുന്നു"
+
+#: ../src/plugins/properties/totem-movie-properties.c:246
+msgid "Properties"
+msgstr "ഗുണഗണങ്ങള്‍"
+
+#: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:1
+msgid "rpdb2 password"
+msgstr "rpdb2 രഹസ്യവാക്ക്"
+
+#: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:2
+msgid ""
+"A password to protect the rpdb2 server for debugging Totem from unauthorized "
+"remote access. If this is empty, a default of 'totem' will be used."
 msgstr ""
+"അനധികൃതമായ പ്രവേശനത്തില്‍ നിന്നും ടോട്ടം ഡീബഗ്ഗ് ചെയ്യുന്നതിനായി rpdb2 സര്‍വര്‍ "
+"സുരക്ഷിതമാക്കുന്നതിനുള്ളൊരു രഹസ്യവാക്ക്. ഇതു് കാലിയെങ്കില്‍, സ്വതവേയുള്ള 'totem' ഉപയോഗിയ്ക്കുന്നു."
+
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
+msgid "Python Console"
+msgstr "പൈത്തണ്‍ കണ്‍സോള്‍ "
 
-#: ../src/plugins/ontop/ontop.plugin.in.h:1
-msgid "Always On Top"
-msgstr "എപ്പോഴും മുകളില്‍ "
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
+#| msgid "Interactive Python console."
+msgid "Interactive Python console"
+msgstr "ഇന്ററാക്ടീവ് പൈത്തണ്‍ കണ്‍സോള്‍"
 
-#: ../src/plugins/ontop/ontop.plugin.in.h:2
-msgid "Keep the main window on top when playing a movie"
-msgstr "പ്രധാന ജാലകം മുകളില്‍ തന്നെ വെക്കുക ചലച്ചിത്രം ഓടുമ്പോള്‍"
+#: ../src/plugins/pythonconsole/pythonconsole.py:88
+msgid "Python Console Menu"
+msgstr "പൈത്തണ്‍ കണ്‍സോള്‍ വിഭവസൂചിക"
 
-#: ../src/plugins/properties/totem-movie-properties.c:246
-msgid "Properties"
-msgstr "ഗുണഗണങ്ങള്‍"
+#: ../src/plugins/pythonconsole/pythonconsole.py:93
+msgid "_Python Console"
+msgstr "(_P)പൈത്തണ്‍ കണ്‍സോള്‍ "
 
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:2
-#, no-c-format
-msgid ""
-"A format string used to build the network service name used when publishing "
-"playlists over the network. The following format placeholders can be used: • "
-"%a: the program name as returned by g_get_application_name() • %h: the "
-"machine's host name in title case • %u: the user's login name in title case "
-"• %U: the user's real name • %%: the percent sign"
-msgstr ""
+#: ../src/plugins/pythonconsole/pythonconsole.py:94
+msgid "Show Totem's Python console"
+msgstr "ടോട്ടെം പൈത്തണ്‍ കണ്‍സോള്‍ കാണിയ്ക്കുക"
 
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:3
-msgid "Format for network service name"
-msgstr ""
+#: ../src/plugins/pythonconsole/pythonconsole.py:100
+msgid "Python Debugger"
+msgstr "പൈത്തണ്‍ ഡീബഗ്ഗര്‍"
 
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:4
-msgid "Publisher protocol to use"
-msgstr ""
+#: ../src/plugins/pythonconsole/pythonconsole.py:101
+msgid "Enable remote Python debugging with rpdb2"
+msgstr "ദൂരെയുള്ള പൈത്തണ്‍ ഡീബഗ്ഗിങ്ങ് അര്‍.പി.ഡി.ബി.2 ഉപയോഗിച്ചു് പ്രാവര്‍ത്തികമാക്കുക"
 
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:5
-msgid ""
-"The transport protocol to use when publishing playlists over the network."
-msgstr ""
+#. pylint: disable-msg=E1101
+#: ../src/plugins/pythonconsole/pythonconsole.py:125
+#, python-format
+msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
+msgstr "'totem_object'ലൂടെ നിങ്ങള്‍ക്ക് Totem.Object ഉപയോഗിക്കാം:\\n%s\""
 
-#. Translators: computers on the local network which are publishing their playlists over the network
-#: ../src/plugins/publish/totem-publish.c:552
-msgid "Neighbors"
-msgstr "അയല്‍വാസികള്‍"
-
-#: ../src/plugins/publish/publish.plugin.in.h:1
-msgid "Publish Playlist"
-msgstr "പ്ലേലിസ്റ്റ് പ്രസിദ്ധീകരിക്കുക"
-
-#: ../src/plugins/publish/publish.plugin.in.h:2
-msgid "Share the current playlist via HTTP"
-msgstr "നിലവിലുള്ള പ്ലേലിസ്റ്റ് എഹ്.റ്റി.റ്റി.പി വഴി പങ്കുവെക്കുക"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:1
-msgid "Service _Name:"
-msgstr "സേവന (_N)പേരു:"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:3
-#, fuzzy, no-c-format
-msgid ""
-"The name used for announcing the playlist service on the network.\n"
-"All occurrences of the string %u will be replaced by your name,\n"
-"and %h will be replaced by your computer's host name."
-msgstr ""
-"പ്ലേലിസ്റ്റ് സേവനം നെറ്റ്‌വര്‍ക്കില്‍ അറിയിക്കാന്‍ ഉപയോഗിക്കുന്ന പേരു.\n"
-"ഈ സ്ട്രിങ് %u എവിടെല്ലാം വരുന്നോ അവിടെ നിങ്ങളുടെ പേരു വച്ചു മാറ്റും,\n"
-"പിന്നെ %h -നു പകരം നിങ്ങളുടെ കമ്പ്യൂട്ടറിന്റെ പേരായി മാറ്റും."
-
-#: ../src/plugins/publish/publish-plugin.ui.h:6
-msgid "Use _encrypted transport protocol (HTTPS)"
-msgstr "എങ്ക്രിപ്റ്റഡ് (_e) ട്രാന്‍സ്ഫര്‍ പ്രോടോക്കോള്‍ ഉപയോഗിക്കുക (HTTPS)"
+#: ../src/plugins/pythonconsole/pythonconsole.py:129
+msgid "Totem Python Console"
+msgstr "ടോട്ടം പൈത്തണ്‍ കണ്‍സോള്‍"
 
-#: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:1
+#: ../src/plugins/pythonconsole/pythonconsole.py:139
 msgid ""
-"A password to protect the rpdb2 server for debugging Totem from unauthorized "
-"remote access. If this is empty, a default of 'totem' will be used."
-msgstr ""
-
-#: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:2
-msgid "rpdb2 password"
+"After you press OK, Totem will wait until you connect to it with winpdb or "
+"rpdb2. If you have not set a debugger password in DConf, it will use the "
+"default password ('totem')."
 msgstr ""
+"നിങ്ങള്‍ ശരി അമര്‍ത്തി കഴിഞ്ഞാല്‍, നിങ്ങള്‍ അതിലേയ്ക്കു് winpdb അല്ലെങ്കില്‍ rpdb2 ഉപയോഗിച്ച് "
+"ബന്ധപെടുന്നതു് വരെ ടോട്ടം കാത്തിരിക്കുന്നു. നിങ്ങള്‍ DConf-ല്‍ ഡീബഗര്‍ രഹസ്യവാക്ക് "
+"സജ്ജമാക്കിയില്ലെങ്കില്‍, അതു സഹജമായ രഹസ്യവാക്ക് ഉപയോഗിക്കുന്നു ('totem')."
+
+#: ../src/plugins/recent/recent.plugin.in.h:1
+#| msgid "Video files"
+msgid "Recent files"
+msgstr "ഏറ്റവും പുതിയ ഫയലുകള്‍"
+
+#: ../src/plugins/recent/recent.plugin.in.h:2
+msgid "Adds files that have been played to recent files"
+msgstr "ഏറ്റവും പുതിയ ഫയലുകളിലേക്കു് ഈ ഫയലുകള്‍ ചേര്‍ക്കുക"
 
 #: ../src/plugins/rotation/rotation.plugin.in.h:1
-msgid "Allows videos to be rotated if they're in the wrong orientation."
-msgstr ""
+msgid "Rotation Plugin"
+msgstr "റൊട്ടേഷന്‍ പ്ലഗിന്‍"
 
 #: ../src/plugins/rotation/rotation.plugin.in.h:2
-msgid "Rotation Plugin"
-msgstr ""
+msgid "Allows videos to be rotated if they are in the wrong orientation"
+msgstr "തെറ്റായ സംവേദനത്തിലാണു് ചലചിത്രമെങ്കില്‍ അവയെ കറക്കുവാന്‍ അനുവദിയ്ക്കുക"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:60
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:50
 msgid "_Rotate Clockwise"
-msgstr ""
+msgstr "ക്ലോക്ക്‌വൈസ് രീതിയല്‍ _കറക്കുക"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:62
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:52
 msgid "Rotate Counterc_lockwise"
-msgstr ""
+msgstr "കൌണ്ടര്‍ക്ലോക്ക്‌വൈ_സ് രീതിയല്‍ കറക്കുക"
+
+#: ../src/plugins/save-file/save-file.plugin.in.h:1
+msgid "Save Copy"
+msgstr "പകര്‍പ്പ് സൂക്ഷിയ്ക്കുക"
+
+#: ../src/plugins/save-file/save-file.plugin.in.h:2
+#| msgid "Copy the currently playing video DVD"
+msgid "Save a copy of the currently playing movie"
+msgstr "നിലവില്‍ പ്രവര്‍ത്തിക്കുന്ന വീഡിയോയുടെ ഒരു പകര്‍പ്പു് സൂക്ഷിയ്ക്കുക"
 
 #: ../src/plugins/save-file/totem-save-file.c:63
-#, fuzzy
 msgid "Save a Copy..."
-msgstr "പ്ലേലിസ്റ്റ് സൂക്ഷിയ്ക്കുക..."
+msgstr "ഒരു പകര്‍പ്പ് സൂക്ഷിയ്ക്കുക..."
 
 #: ../src/plugins/save-file/totem-save-file.c:64
-#, fuzzy
 msgid "Save a copy of the movie"
-msgstr "ചലച്ചിത്രത്തിന്റെ തെളിച്ചം"
+msgstr "ചലച്ചിത്രത്തിന്റെ ഒരു പകര്‍പ്പ് സൂക്ഷിയ്ക്കുക"
 
 #: ../src/plugins/save-file/totem-save-file.c:129
-#, fuzzy
 msgid "Save a Copy"
-msgstr "ഗാലറി സൂക്ഷിക്കുക"
+msgstr "ഒരു പകര്‍പ്പ് സൂക്ഷിയ്ക്കുക"
 
 #. translators: Movie is the default saved movie filename,
 #. * without the suffix
 #: ../src/plugins/save-file/totem-save-file.c:161
-#, fuzzy
 msgid "Movie"
-msgstr "_ചലച്ചിത്രം"
+msgstr "ചലച്ചിത്രം"
 
 #: ../src/plugins/save-file/totem-save-file.c:183
-#, fuzzy
 msgid "Movie stream"
-msgstr "ഓടിക്കേണ്ട ചലച്ചിത്രങ്ങള്‍"
+msgstr "ചലചിത്ര സ്ട്രീം"
 
-#: ../src/plugins/screensaver/totem-screensaver.c:116
-#: ../browser-plugin/totem-plugin-viewer.c:1891
-msgid "Playing a movie"
-msgstr "ഒരു ചലച്ചിത്രം പ്രവര്‍ത്തിപ്പിക്കുന്നു"
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:1
+msgid "Screen Saver"
+msgstr "സ്ക്രീന്‍ സേവര്‍"
+
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:2
+#| msgid "Disable screensaver when playing "
+msgid "Deactivates the screen saver when a movie is playing"
+msgstr "ഒരു ചലചിത്രമോടുമ്പോള്‍ സ്ക്രീന്‍സേവര്‍ നിര്‍ജ്ജീവമാക്കുക"
 
 #: ../src/plugins/screenshot/gallery.ui.h:1
+msgid "Screenshot width (in pixels):"
+msgstr "സ്ക്രീന്‍ഷോട്ടിന്റെ വീതി (പിക്സലുകളില്‍):"
+
+#: ../src/plugins/screenshot/gallery.ui.h:2
 msgid "Calculate the number of screenshots"
 msgstr "തിരചിത്രങ്ങളുടെ എണ്ണം കണക്കുകൂട്ടുക"
 
-#: ../src/plugins/screenshot/gallery.ui.h:2
+#: ../src/plugins/screenshot/gallery.ui.h:3
 msgid "Number of screenshots:"
 msgstr "തിരചിത്രങ്ങളുടെ എണ്ണം:"
 
-#: ../src/plugins/screenshot/gallery.ui.h:3
-msgid "Screenshot width (in pixels):"
-msgstr "സ്ക്രീന്‍ഷോട്ടിന്റെ വീതി (പിക്സലുകളില്‍):"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:1
-msgid "Save in _folder:"
-msgstr "_ഫോള്‍ഡറില്‍ സൂക്ഷിക്കുക:"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:2
-msgid "Select a folder"
-msgstr "ഒരു ഫോള്‍ഡര്‍ തെരഞ്ഞെടുക്കുക"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:3
-msgid "_Name:"
-msgstr "_പേരു്:"
-
-#. Write the screenshot to the temporary file
-#: ../src/plugins/screenshot/gnome-screenshot-widget.c:385
-#: ../src/plugins/screenshot/totem-screenshot.c:64
-msgid "Screenshot.png"
-msgstr "Screenshot.png"
+#. translators: this is the name of the file that gets made up
+#. * with the screenshot if the entire screen is taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:147
+#, c-format
+#| msgid "Screenshot.png"
+msgid "Screenshot from %s.png"
+msgstr "%s.png-ല്‍ നിന്നുള്ള സ്ക്രീന്‍ഷോട്ട്"
+
+#. translators: this is the name of the file that gets
+#. * made up with the screenshot if the entire screen is
+#. * taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:154
+#, c-format
+msgid "Screenshot from %s - %d.png"
+msgstr "%s-ല്‍ നിന്നുള്ള സ്ക്രീന്‍ഷോട്ട് - %d.png"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:1
+#| msgid "Screenshot.png"
+msgid "Screenshot"
+msgstr "സ്ക്രീന്‍ഷോട്ട്"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:2
+msgid "Allows screenshots and galleries to be taken of videos"
+msgstr "വീഡിയോകളുടെ സ്ക്രീന്‍ഷോട്ടുകളും ഗ്യാലറികളും എടുക്കുവാന്‍ അനുവദിയ്ക്കുന്നു"
 
 #: ../src/plugins/screenshot/totem-gallery.c:91
 msgid "Save Gallery"
@@ -2523,7 +2373,7 @@
 #: ../src/plugins/screenshot/totem-gallery.c:115
 #, c-format
 msgid "Gallery-%s-%d.jpg"
-msgstr ""
+msgstr "Gallery-%s-%d.jpg"
 
 #. Set up the window
 #: ../src/plugins/screenshot/totem-gallery-progress.c:101
@@ -2536,217 +2386,368 @@
 msgid "Saving gallery as \"%s\""
 msgstr "ഗാലറി \"%s\" ആയി സൂക്ഷിക്കുന്നു"
 
-#: ../src/plugins/screenshot/totem-screenshot.c:113
-msgid "There was an error saving the screenshot."
-msgstr "സ്ക്രീന്‍ ഷോട്ട് സംരക്ഷിക്കുന്നതില്‍ ഒരു പിശക്."
-
-#: ../src/plugins/screenshot/totem-screenshot.c:139
-msgid "Save Screenshot"
-msgstr "സ്ക്രീന്‍ ഷോട്ട് സൂക്ഷിക്കുക"
-
-#. Create the screenshot widget
-#. Translators: %s is the movie title and %d is an auto-incrementing number to make filename unique
-#: ../src/plugins/screenshot/totem-screenshot.c:160
-#, fuzzy, c-format
-msgid "Screenshot-%s-%d.png"
-msgstr "Screenshot%d.png"
-
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:88
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:220
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "Totem could not get a screenshot of the video."
 msgstr "ടോട്ടത്തിനു് വീഡിയോയുടെ സ്ക്രീന്‍ ഷോട്ട് ലഭ്യമായില്ല."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "This is not supposed to happen; please file a bug report."
 msgstr "ഇത് പാടില്ലാത്തതാണ്; ഒരു റിപ്പോര്‍ട്ട് തയ്യാറാക്കുക."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
-msgid "Take _Screenshot..."
-msgstr "_സ്ക്രീന്‍ഷോട്ട് എടുക്കുക..."
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
+#| msgid "Take _Screenshot..."
+msgid "Take _Screenshot"
+msgstr "_സ്ക്രീന്‍ഷോട്ട് എടുക്കുക"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
 msgid "Take a screenshot"
 msgstr "ഒരു സ്ക്രീന്‍ ഷോട്ട് എടുക്കുക"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create Screenshot _Gallery..."
 msgstr "സ്ക്രീന്‍ഷോട്ട് _ഗാലറി ഉണ്ടാക്കുക..."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create a gallery of screenshots"
 msgstr "സ്ക്രീന്‍ ഷോട്ടുകളുടെ ഗാലറിയുണ്ടാക്കുക"
 
+#: ../src/plugins/skipto/skipto.plugin.in.h:1
+#: ../src/plugins/skipto/totem-skipto.c:196
+msgid "Skip To"
+msgstr "അടുത്തത്"
+
+#: ../src/plugins/skipto/skipto.plugin.in.h:2
+msgid "Provides the \"Skip to\" dialog"
+msgstr "\"അടുത്തതിലേക്കു്\" എന്ന ഡയലോഗ് ലഭ്യമാക്കുന്നു"
+
+#: ../src/plugins/skipto/skipto.ui.h:1
+msgid "_Skip to:"
+msgstr "_അടുത്തത്:"
+
 #. Update the "seconds" label so that it always has the correct singular/plural form
 #. Translators: label for the seconds selector in the "Skip to" dialogue
-#: ../src/plugins/skipto/totem-skipto.c:160
-#, fuzzy
+#: ../src/plugins/skipto/totem-skipto.c:159
 msgid "second"
 msgid_plural "seconds"
-msgstr[0] "സെക്കന്റുകള്‍"
-msgstr[1] "സെക്കന്റുകള്‍"
+msgstr[0] "സെക്കന്റ്"
+msgstr[1] "സെക്കന്റുകള്‍ "
 
 #. Fix the label width at the maximum necessary for the plural labels, to prevent it changing size when we change the spinner value
 #. Translators: you should translate this string to a number (written in digits) which corresponds to the longer character length of the
 #. * translations for "second" and "seconds", as translated elsewhere in this file. For example, in English, "second" is 6 characters long and
 #. * "seconds" is 7 characters long, so this string should be translated to "7". See: bgo#639398
-#: ../src/plugins/skipto/totem-skipto.c:190
+#: ../src/plugins/skipto/totem-skipto.c:189
 msgctxt "Skip To label length"
 msgid "7"
-msgstr ""
-
-#: ../src/plugins/skipto/totem-skipto.c:197
-#, fuzzy
-msgid "Skip To"
-msgstr "അടുത്തത്"
+msgstr "7"
 
 #: ../src/plugins/skipto/totem-skipto-plugin.c:182
-#, fuzzy
 msgid "_Skip To..."
-msgstr "അടുത്തത്...(_S)"
+msgstr "_അടുത്തത്..."
 
 #: ../src/plugins/skipto/totem-skipto-plugin.c:182
 msgid "Skip to a specific time"
 msgstr "ഒരു വ്യക്തമായ സമയത്തിലേയ്ക്കു് മാറുക"
 
-#: ../src/plugins/skipto/skipto.ui.h:1
-msgid "_Skip to:"
-msgstr "_അടുത്തത്:"
+#~ msgid "Play movies and songs"
+#~ msgstr "സിനിമയും പാട്ടുകളും പ്രവര്‍ത്തിപ്പിക്കുന്നു"
 
-#: ../browser-plugin/totem-plugin-viewer.c:431
-msgid "No URI to play"
-msgstr "പ്ലേ ചെയ്യാന്‍ യു.ആര്‍.എല്‍ ഇല്ല"
+#~ msgid "1.5 Mbps T1/Intranet/LAN"
+#~ msgstr "1.5 എം.ബി.പി.എസ് ടി-1/ഇന്‍ട്രാനെറ്റ്/ലാന്‍"
 
-#. translators: this is:
-#. * Open With ApplicationName
-#. * as in nautilus' right-click menu
-#: ../browser-plugin/totem-plugin-viewer.c:1107
-#, c-format
-msgid "_Open with \"%s\""
-msgstr "(_O)തുറക്കുക \"%s\" ഉപയോഗിച്ച്"
+#~ msgid "112 Kbps Dual ISDN/DSL"
+#~ msgstr "112 കെ.ബി.പി.എസ് ഡുഅല്‍ ഐ.എസ്.ഡി.എന്‍/ഡി.എസ്.എല്‍"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2136
-msgid "No playlist or playlist empty"
-msgstr "പ്ലേലിസ്റ്റില്ല അല്ലെങ്കില്‍ പ്ലേലിസ്റ്റ് ഖാലിയാണു"
+#~ msgid "14.4 Kbps Modem"
+#~ msgstr "14.4 കെ.ബി.പി.എസ് മോഡെം"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2235
-msgid "Movie browser plugin"
-msgstr "ചലചിത്രം ബ്രൌസര്‍ സംയോജകം"
+#~ msgid "19.2 Kbps Modem"
+#~ msgstr "19.2 കെ.ബി.പി.എസ് മോഡെം"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Verify your system installation. The Totem plugin will now exit."
-msgstr "നിങ്ങളുടെ സിസ്റ്റം ഇന്‍സ്റ്റലേഷന്‍ പരിശോധിക്കുക. Totem സംയോജകം ഇപ്പോള്‍ നില്‍ക്കുന്നതാണ്."
+#~ msgid "256 Kbps DSL/Cable"
+#~ msgstr "256 കെ.ബി.പി.എസ് ഡി.എസ്.എല്‍ കേബിള്‍"
 
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
-msgid "Interactive Python console."
-msgstr "ഇന്റാക്ടീവ് പൈത്തണ്‍ കണ്‍സോള്‍."
+#~ msgid "28.8 Kbps Modem"
+#~ msgstr "28.8 കെ.ബി.പി.എസ് മോഡെം"
 
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
-msgid "Python Console"
-msgstr "പൈത്തണ്‍ കണ്‍സോള്‍ "
+#~ msgid "33.6 Kbps Modem"
+#~ msgstr "33.6 കെ.ബി.പി.എസ് മോഡെം"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:88
-msgid "Python Console Menu"
-msgstr "പൈത്തണ്‍ കണ്‍സോള്‍ വിഭവസൂചിക"
+#~ msgid "34.4 Kbps Modem"
+#~ msgstr "34.4 കെ.ബി.പി.എസ് മോഡെം"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:93
-msgid "_Python Console"
-msgstr "(_P)പൈത്തണ്‍ കണ്‍സോള്‍ "
+#~ msgid "384 Kbps DSL/Cable"
+#~ msgstr "384 കെ.ബി.പി.എസ് ഡി.എസ്.എല്‍ കേബിള്‍"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:94
-msgid "Show Totem's Python console"
-msgstr "ടോട്ടെം പൈത്തണ്‍ കണ്‍സോള്‍ കാണിയ്ക്കുക"
+#~ msgid "512 Kbps DSL/Cable"
+#~ msgstr "512 കെ.ബി.പി.എസ് ഡി.എസ്.എല്‍/കേബിള്‍"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:100
-msgid "Python Debugger"
-msgstr "പൈത്തണ്‍ ഡീബഗ്ഗര്‍"
+#~ msgid "56 Kbps Modem/ISDN"
+#~ msgstr "56 കെ.ബി.പി.എസ് മോഡം/ഐ.എസ്.ഡി.എന്‍"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:101
-msgid "Enable remote Python debugging with rpdb2"
-msgstr "ദൂരെയുള്ള പൈത്തണ്‍ ഡീബഗ്ഗിങ്ങ് അര്‍.പി.ഡി.ബി.2 ഉപയോഗിച്ചു് പ്രാവര്‍ത്തികമാക്കുക"
+#~ msgid "Configure the application"
+#~ msgstr "പ്രയോഗം ക്രമീകരിയ്ക്കുക"
 
-#. pylint: disable-msg=E1101
-#: ../src/plugins/pythonconsole/pythonconsole.py:125
-#, fuzzy, python-format
-msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
-msgstr "'totem_object'ലൂടെ നിങ്ങള്‍ക്ക് ടോട്ടം വസ്തു ഉപയോഗിക്കാം:\\n%s\""
+#~ msgid "Connection _speed:"
+#~ msgstr "കണക്ഷന്‍ _വേഗത:"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:129
-msgid "Totem Python Console"
-msgstr "ടോട്ടം പൈത്തണ്‍ കണ്‍സോള്‍"
+#~ msgid "Intranet/LAN"
+#~ msgstr "ഇന്‍ട്രാനെറ്റ്/ലാന്‍"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:139
-#, fuzzy
-msgid ""
-"After you press OK, Totem will wait until you connect to it with winpdb or "
-"rpdb2. If you have not set a debugger password in DConf, it will use the "
-"default password ('totem')."
-msgstr ""
-"നിങ്ങള്‍ ഒ.കെ അമര്‍ത്തി കഴിഞ്ഞാല്‍ ടോട്ടം കാത്തിരിക്കുന്നു നിങ്ങള്‍ അതിലേയ്ക്കു് വിന്‍.പി.ഡി.ബി "
-"അല്ലെങ്കില്‍ അര്‍.പി.ഡി.ബി.2 ഉപയോഗിച്ച് ബന്ധപെട്ടില്ലെങ്കില്‍. നിങ്ങള്‍ ജികോണ്‍ഫില്‍ ഒരു ഡീബഗര്‍ "
-"പാസ്വര്‍ഡ് ഇട്ടിറ്റില്ലെങ്കില്‍, അതു സഹജമായ പാസ്വര്‍ഡ് ഉപയോഗിക്കും  ('totem')."
+#~ msgid "Networking"
+#~ msgstr "നെറ്റ്‌വര്‍ക്കിങ്ങ്"
 
-#: ../src/plugins/grilo/grilo.plugin.in.h:1
-#, fuzzy
-msgid "A plugin to let you browse media content from various sources."
-msgstr "യൂട്യൂബ് വീഡിയോകള്‍ ബ്രൗസ് ചെയ്യാന്‍ അനുവദിക്കുന്ന സമ്യോജകം"
+#~ msgid "Open a file"
+#~ msgstr "ഒരു ഫയല്‍ തുറക്കുക"
 
-#: ../src/plugins/grilo/grilo.plugin.in.h:2
-#, fuzzy
-msgid "Grilo Browser"
-msgstr "യൂട്യൂബ് ബ്രൌസര്‍"
+#~ msgid "Open a non-local file"
+#~ msgstr "ഒരു നോണ്‍-ലോക്കല്‍ ഫയല്‍ തുറക്കുക"
 
-#: ../src/plugins/grilo/totem-grilo.c:452
-#, fuzzy
-msgid "Browse Error"
-msgstr "ഫയല്‍ പിശക്"
+#~ msgid "Quit the program"
+#~ msgstr "പ്രയോഗം നിര്‍ത്തുക"
 
-#: ../src/plugins/grilo/totem-grilo.c:599
-#, fuzzy
-msgid "Search Error"
-msgstr "ഫയല്‍ പിശക്"
+#~ msgid "Set the repeat mode"
+#~ msgstr "റിപ്പീറ്റ് മോഡ് സജ്ജമാക്കുക"
 
-#: ../src/plugins/grilo/totem-grilo.c:1219 ../src/plugins/grilo/grilo.ui.h:1
-msgid "Browse"
-msgstr ""
+#~ msgid "Set the shuffle mode"
+#~ msgstr "ഷഫിള്‍ മോഡ് സജ്ജമാക്കുക"
+
+#~ msgid "Switch to fullscreen"
+#~ msgstr "സ്ക്രീനിന്റെ പരാമാവധി വലിപ്പത്തിലേയ്ക്കു് മാറുക"
+
+#~ msgid "Network connection speed"
+#~ msgstr "നെറ്റ്‌വര്‍ക്ക് കണക്ഷന്‍ വേഗത"
+
+#~ msgid "Play Image '%s'"
+#~ msgstr "'%s ഡിസ്ക് ഇമേജ് പ്രവര്‍ത്തിപ്പിക്കുക"
+
+#~ msgid "device%d"
+#~ msgstr "ഉപകരണം%d"
+
+#~ msgid "Play Disc '%s'"
+#~ msgstr "'%s' ഡിസ്ക് പ്രവര്‍ത്തിപ്പിക്കുക"
+
+#~ msgid "Movie Player using %s"
+#~ msgstr "%s ഉപയോഗിക്കുന്ന മൂവി പ്ലേയര്‍"
+
+#~ msgid ""
+#~ "Totem could not play this media (%s) although a plugin is present to "
+#~ "handle it."
+#~ msgstr ""
+#~ "ടോട്ടമിനു ഈ മധ്യമം പ്ലേ ചെയ്യാന്‍ കഴിഞ്ഞില്ല (%s), ഇത് കയ്കാര്യം ചെയ്യാന്‍ സംയോജകം "
+#~ "ഉണ്ടെങ്കിലും."
+
+#~ msgid ""
+#~ "You might want to check that a disc is present in the drive and that it "
+#~ "is correctly configured."
+#~ msgstr "ഡിസ്ക് ഡ്രൈവില്‍ ഉണ്ടെന്നും അതു ശരിയായി ക്രമീകരിച്ചിട്ടുണ്ടെന്നും തീര്‍ച്ചപ്പെടുത്തുക"
+
+#~ msgid "More information about media plugins"
+#~ msgstr "മാധ്യമ സം യോജകങ്ങളെ കുറിച്ച് കൂടുതല്‍ വിവരങ്ങള്‍"
+
+#~ msgid ""
+#~ "Please install the necessary plugins and restart Totem to be able to play "
+#~ "this media."
+#~ msgstr "ആവശ്യമുളള സംയോജകങ്ങള്‍ ഇന്‍സ്റ്റോള്‍ ചെയ്ത് ടോട്ടം വീണ്ടും ആരംഭിക്കുക"
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it does not have the "
+#~ "appropriate plugins to be able to read from the disc."
+#~ msgstr ""
+#~ "ടോട്ടമിനു ഇത്തരം മാധ്യമം പ്ലേ ചെയ്യാന്‍ കഴിയില്ല (%s), കാരണം അതിനു ഡിസ്കില്‍ നിന്നു "
+#~ "വായിക്കാനുള്ള ശരിയായ സംയോജകങ്ങളില്ല"
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because you do not have the "
+#~ "appropriate plugins to handle it."
+#~ msgstr ""
+#~ "ടോട്ടമിനു ഇത്തരം മാധ്യമം പ്ലേ ചെയ്യാന്‍ കഴിയില്ല (%s), കാരണം അതിനു കയ്കാര്യം ചെയ്യാനുള്ള "
+#~ "ശരിയായ സംയോജകങ്ങളില്ല"
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it is not supported."
+#~ msgstr ""
+#~ "ടോട്ടമിനു ഇത്തരം മാധ്യമം പ്ലേ ചെയ്യാന്‍ കഴിയില്ല (%s), കാരണം അത് പിന്തുണയ്ക്കുന്നില്ല"
+
+#~ msgid "Please insert another disc to play back."
+#~ msgstr "ദയവായി പ്ലേ-ബാക്ക് ചെയ്യാന്‍ വേറെ ഒരു ഡിസ്ക് ഇടുക"
+
+#~ msgid "Totem does not support playback of Audio CDs"
+#~ msgstr "ടോട്ടം ശബ്ദ സി.ഡികളൂടെ പ്ലേ.ബാക്ക് പിന്തുണയ്ക്കുന്നില്ല"
+
+#~ msgid ""
+#~ "Please consider using a music player or a CD extractor to play this CD"
+#~ msgstr ""
+#~ "ദയവായി ഈ സി.ഡി പ്ലേ ചെയ്യാന്‍ ഒരു ശബ്ദ-പ്ലേയറോ സി.ഡി എക്സ്റ്റ്രാക്റ്ററോ ഉപയോഗിക്കുന്നതിനെ "
+#~ "കുറിച്ച് ആലോചിക്കുക."
+
+#~ msgid "%d %%"
+#~ msgstr "%d %%"
+
+#~ msgid ""
+#~ "The requested audio output was not found. Please select another audio "
+#~ "output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "അഭ്യര്‍ഥിച്ച ശബ്ദ ഔട്പുട്ട് കണ്ടുപിടിച്ചില്ല. ദയവായി വേറൊരു ശബ്ദ-ഔട്പുട് തെരഞ്ഞെടുക്കുക മള്‍ടി-"
+#~ "മീഡിയ സിസ്റ്റംസ് സെലക്റ്ററില്‍."
+
+#~ msgid "Location not found."
+#~ msgstr "സ്ഥാനം കണ്ടുകിട്ടിയില്ല."
+
+#~ msgid ""
+#~ "Could not open location; you might not have permission to open the file."
+#~ msgstr "സ്ഥാനം തുറക്കുവാന്‍ സാധ്യമായില്ല; നിങ്ങള്‍ക്ക് അതിനുളള അനുവാദം ഇല്ലായിരിക്കാം."
+
+#~ msgid ""
+#~ "The video output is in use by another application. Please close other "
+#~ "video applications, or select another video output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "വീഡിയോ ഔട്പുട്ട് വേറെ ഒരു പ്രയോഗം ഉപയോഗിക്കുന്നു. ദയവായി മറ്റു വീഡിയോ പ്രയോഗങ്ങള്‍ "
+#~ "നിര്‍ത്തുക, അല്ലെങ്കില്‍ വേറൊരു വീഡിയോ ഔട്പുട് തെരഞ്ഞെടുക്കുക മള്‍ടി-മീഡിയ സിസ്റ്റംസ് "
+#~ "സെലക്റ്ററില്‍."
+
+#~ msgid ""
+#~ "The audio output is in use by another application. Please select another "
+#~ "audio output in the Multimedia Systems Selector. You may want to consider "
+#~ "using a sound server."
+#~ msgstr ""
+#~ "ശബ്ദ ഔട്പുട്ട് വേറെ ഒരു പ്രയോഗം ഉപയോഗിക്കുന്നു. ദയവായി വേറൊരു ശബ്ദ ഔട്പുട് തെരഞ്ഞെടുക്കുക "
+#~ "മള്‍ടി-മീഡിയ സിസ്റ്റംസ് സെലക്റ്ററില്‍. നിങ്ങള്‍ക്കൊരു ശബ്ദ സെര്‍വര്‍ ഉപയോഗിക്കുന്നതിനെ കുറിച്ച് "
+#~ "ആലോചിക്കാവുന്നതാണു."
+
+#~ msgid ""
+#~ "Failed to create a GStreamer play object. Please check your GStreamer "
+#~ "installation."
+#~ msgstr ""
+#~ "ജി-സ്ട്രീമര്‍ പ്ലേ ഓബ്ജെക്റ്റ് ഉണ്ടാക്കുന്നതില്‍ പരാജയപെട്ടു. ദയവായി നിങ്ങളുടെ ജി-സ്ട്രീമര്‍ "
+#~ "ഇന്‍സ്റ്റൊളേഷന്‍ പരിശോധിക്കുക."
+
+#~ msgid ""
+#~ "Failed to open audio output. You may not have permission to open the "
+#~ "sound device, or the sound server may not be running. Please select "
+#~ "another audio output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "ശബ്ദ ഔട്പുട്ട് തുറക്കുന്നതില്‍ പരാജയപെട്ടു. നിങ്ങള്‍ക്ക് ശബ്ദ ഉപകരണം തുറക്കാന്‍ അനുവാദം "
+#~ "ഇല്ലായിരിക്കാം, അല്ലെങ്കില്‍ ശബ്ദ സെര്‍വര്‍ പ്രവര്‍ത്തിക്കുന്നില്ലായിരിക്കാം. ദയവായി വേറൊരു "
+#~ "ശബ്ദയോ ഔട്പുട്ട് തെരഞ്ഞെടുക്കുക മള്‍ടി-മീഡിയ സിസ്റ്റംസ് സെലക്റ്ററില്‍"
+
+#~ msgid ""
+#~ "Could not find the audio output. You may need to install additional "
+#~ "GStreamer plugins, or select another audio output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "ശബ്ദ ഔട്പുട്ട് കണ്ടു പിടിക്കാന്‍ സാധിച്ചില്ല. നിങ്ങള്‍ക്ക് വേറെ ജി-സ്ട്രീമര്‍ സംയോജകങ്ങള്‍ "
+#~ "ഇന്‍സ്റ്റാള്‍ ചെയ്യേണ്ടി വരും, അല്ലെങ്കില്‍ വേറൊരു ശബ്ദ ഔട്പുട് തെരഞ്ഞെടുക്കേണ്ടി വരും മള്‍ടി-"
+#~ "മീഡിയ സിസ്റ്റംസ് സെലക്റ്ററില്‍."
+
+#~ msgid "BBC iPlayer"
+#~ msgstr "ബിബിസി ഐപ്ലേയര്‍"
+
+#~ msgid ""
+#~ "Stream BBC programs from the last 7 days from the BBC iPlayer service."
+#~ msgstr ""
+#~ "ബിബിസി ഐപ്ലേയര്‍ സര്‍വീസില്‍ നിന്നും കഴിഞ്ഞ 7 ദിവസത്തെ ബിബിസി പ്രോഗ്രാമുകള്‍ സ്ട്രീം ചെയ്യുക."
+
+#~ msgid "Error listing channel categories"
+#~ msgstr "ചാനല്‍ വിഭാഗങ്ങള്‍ ലഭ്യമാക്കുന്നതില്‍ പിശക്"
+
+#~ msgid ""
+#~ "There was an unknown error getting the list of television channels "
+#~ "available on BBC iPlayer."
+#~ msgstr ""
+#~ "ബിബിസി ഐപ്ലേയറില്‍ ലഭ്യമായ ടെലിവിഷന്‍ ചാനലുകളുടെ പട്ടിക ലഭ്യമാക്കുന്നതില്‍ അപരിചിതമായ "
+#~ "പിശക്."
+
+#~ msgid "Loading…"
+#~ msgstr "ലഭ്യമാക്കുന്നു…"
+
+#~ msgid "Error getting programme feed"
+#~ msgstr "പ്രോഗ്രാം ഫീഡ് ലഭിക്കുന്നതില്‍ പിശക്"
+
+#~ msgid ""
+#~ "There was an error getting the list of programmes for this channel and "
+#~ "category combination."
+#~ msgstr "ഈ ചാനലിലും വിഭാഗത്തിലും പ്രോഗ്രാമുകളുടെ പട്ടിക ലഭ്യമാക്കുന്നതില്‍ പിശക്."
+
+#~ msgid "Programme unavailable (\"%s\")"
+#~ msgstr "പ്രോഗ്രാം ലഭ്യമല്ല (\"%s\")"
+
+#~ msgid "Neighbors"
+#~ msgstr "അയല്‍വാസികള്‍"
+
+#~ msgid "Publish Playlist"
+#~ msgstr "പ്ലേലിസ്റ്റ് പ്രസിദ്ധീകരിക്കുക"
+
+#~ msgid "Share the current playlist via HTTP"
+#~ msgstr "നിലവിലുള്ള പ്ലേലിസ്റ്റ് എഹ്.റ്റി.റ്റി.പി വഴി പങ്കുവെക്കുക"
+
+#~ msgid "Service _Name:"
+#~ msgstr "സേവന (_N)പേരു:"
 
-#: ../src/plugins/grilo/totem-grilo.c:1285 ../src/plugins/grilo/grilo.ui.h:2
 #, fuzzy
-msgid "Search"
-msgstr "പ്രാദേശിക തിരയല്‍"
+#~ msgid ""
+#~ "The name used for announcing the playlist service on the network.\n"
+#~ "All occurrences of the string %u will be replaced by your name,\n"
+#~ "and %h will be replaced by your computer's host name."
+#~ msgstr ""
+#~ "പ്ലേലിസ്റ്റ് സേവനം നെറ്റ്‌വര്‍ക്കില്‍ അറിയിക്കാന്‍ ഉപയോഗിക്കുന്ന പേരു.\n"
+#~ "ഈ സ്ട്രിങ് %u എവിടെല്ലാം വരുന്നോ അവിടെ നിങ്ങളുടെ പേരു വച്ചു മാറ്റും,\n"
+#~ "പിന്നെ %h -നു പകരം നിങ്ങളുടെ കമ്പ്യൂട്ടറിന്റെ പേരായി മാറ്റും."
 
-msgid "Don't connect to an already-running instance"
-msgstr "നേരത്തെ ഓടുന്ന ഇന്‍സ്റ്റന്‍സിലേയ്ക്കു് ബന്ധപ്പെടുത്തരുത്"
+#~ msgid "Use _encrypted transport protocol (HTTPS)"
+#~ msgstr "എങ്ക്രിപ്റ്റഡ് (_e) ട്രാന്‍സ്ഫര്‍ പ്രോടോക്കോള്‍ ഉപയോഗിക്കുക (HTTPS)"
 
-msgid "Changing the visuals effect type will require a restart to take effect."
-msgstr ""
-"വിഷ്വല്‍ ഇഫക്റ്റുകളില്‍ വരുത്തുന്ന മാറ്റം പ്രാവര്‍ത്തികമാക്കണമെങ്കില്‍ കംപ്യൂട്ടര്‍ വീണ്ടും "
-"ആരംഭിക്കേണ്ടതാണ്."
+#~ msgid "Save in _folder:"
+#~ msgstr "_ഫോള്‍ഡറില്‍ സൂക്ഷിക്കുക:"
 
-msgid ""
-"The change of audio output type will only take effect when Totem is "
-"restarted."
-msgstr ""
-"ടോട്ടം വീണ്ടും ആരംഭിച്ചാല്‍ മാത്രമേ ഓഡിയോ ഔട്ട്പുട്ട് രീതിയില്‍ വരുത്തിയ മാറ്റങ്ങള്‍ "
-"പ്രാവര്‍ത്തികമാകൂ."
+#~ msgid "Select a folder"
+#~ msgstr "ഒരു ഫോള്‍ഡര്‍ തെരഞ്ഞെടുക്കുക"
 
-msgid ""
-"Unable to activate plugin %s.\n"
-"%s"
-msgstr ""
-"സംയോജകം %s പ്രാവര്‍ത്തികമാക്കാന്‍ കഴിയുന്നില്ല.\n"
-"%s"
+#~ msgid "_Name:"
+#~ msgstr "_പേരു്:"
+
+#~ msgid "There was an error saving the screenshot."
+#~ msgstr "സ്ക്രീന്‍ ഷോട്ട് സംരക്ഷിക്കുന്നതില്‍ ഒരു പിശക്."
 
-msgid "Unable to activate plugin %s"
-msgstr "സംയോജകം %s പ്രാവര്‍ത്തികമാക്കാന്‍ കഴിയുന്നില്ല"
+#~ msgid "Save Screenshot"
+#~ msgstr "സ്ക്രീന്‍ ഷോട്ട് സൂക്ഷിക്കുക"
 
-msgid "Jamendo Plugin Configuration"
-msgstr "ജമെണ്ടോ പ്ലഗിന്‍ ക്രമീകരണം"
+#~ msgid "Don't connect to an already-running instance"
+#~ msgstr "നേരത്തെ ഓടുന്ന ഇന്‍സ്റ്റന്‍സിലേയ്ക്കു് ബന്ധപ്പെടുത്തരുത്"
 
-msgid "MythTV Recordings"
-msgstr "മിത്-ടി.വ്വി റിക്കോര്‍ഡിങ്ങുകള്‍"
+#~ msgid ""
+#~ "Changing the visuals effect type will require a restart to take effect."
+#~ msgstr ""
+#~ "വിഷ്വല്‍ ഇഫക്റ്റുകളില്‍ വരുത്തുന്ന മാറ്റം പ്രാവര്‍ത്തികമാക്കണമെങ്കില്‍ കംപ്യൂട്ടര്‍ വീണ്ടും "
+#~ "ആരംഭിക്കേണ്ടതാണ്."
+
+#~ msgid ""
+#~ "The change of audio output type will only take effect when Totem is "
+#~ "restarted."
+#~ msgstr ""
+#~ "ടോട്ടം വീണ്ടും ആരംഭിച്ചാല്‍ മാത്രമേ ഓഡിയോ ഔട്ട്പുട്ട് രീതിയില്‍ വരുത്തിയ മാറ്റങ്ങള്‍ "
+#~ "പ്രാവര്‍ത്തികമാകൂ."
+
+#~ msgid ""
+#~ "Unable to activate plugin %s.\n"
+#~ "%s"
+#~ msgstr ""
+#~ "സംയോജകം %s പ്രാവര്‍ത്തികമാക്കാന്‍ കഴിയുന്നില്ല.\n"
+#~ "%s"
+
+#~ msgid "Unable to activate plugin %s"
+#~ msgstr "സംയോജകം %s പ്രാവര്‍ത്തികമാക്കാന്‍ കഴിയുന്നില്ല"
+
+#~ msgid "Jamendo Plugin Configuration"
+#~ msgstr "ജമെണ്ടോ പ്ലഗിന്‍ ക്രമീകരണം"
 
-msgid "MythTV LiveTV"
-msgstr "മിത്ത് ടിവി ലൈവ് ടിവി"
+#~ msgid "MythTV Recordings"
+#~ msgstr "മിത്-ടി.വ്വി റിക്കോര്‍ഡിങ്ങുകള്‍"
+
+#~ msgid "MythTV LiveTV"
+#~ msgstr "മിത്ത് ടിവി ലൈവ് ടിവി"
 
 #~ msgid "Author:"
 #~ msgstr "രചയിതാവ്:"
@@ -3105,10 +3106,6 @@
 #~ msgstr "Screenshot.png"
 
 #, fuzzy
-#~ msgid "Could not load the \"Skip to\" dialog interface."
-#~ msgstr "'%s' വിനിമയതലം ചേര്‍ക്കുവാന്‍ സാധ്യമായില്ല. %s"
-
-#, fuzzy
 #~ msgid "Could not get metadata for file %s: %s"
 #~ msgstr "ഫയല്‍ %s-ഇനു മെറ്റാഡാറ്റാ കിട്ടുവാന്‍ സാധിച്ചില്ല: %s"
 
@@ -3135,9 +3132,6 @@
 #~ msgid "Related Videos"
 #~ msgstr "സംബന്ധിതമായ വീഡിയോകള്‍"
 
-#~ msgid "Videos"
-#~ msgstr "വീഡിയോകള്‍"
-
 #~ msgid "_Open in Web Browser"
 #~ msgstr "(_O)തുറക്കുക വെബ് ബ്രൗസറില്‍"
 
diff -Nru totem-3.4.3/po/mr.po totem-3.6.2/po/mr.po
--- totem-3.4.3/po/mr.po	2011-08-25 18:35:01.000000000 +0000
+++ totem-3.6.2/po/mr.po	2012-10-09 15:42:00.000000000 +0000
@@ -4,959 +4,968 @@
 #
 # Onkar Shinde , 2006.
 # Rahul Bhalerao , 2006.
-# Sandeep Shedmake , 2008.
-# Sandeep Shedmake , 2009, 2010.
+# Sandeep Shedmake , 2008.
+# Sandeep Shedmake , 2009, 2010, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: mr\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=totem&component=general\n"
-"POT-Creation-Date: 2010-07-21 17:28+0000\n"
-"PO-Revision-Date: 2010-07-22 15:13+0530\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=totem&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2012-09-11 16:43+0000\n"
+"PO-Revision-Date: 2012-09-13 13:10+0530\n"
 "Last-Translator: Sandeep Shedmake \n"
-"Language-Team: Marathi \n"
+"Language-Team: Marathi \n"
+"Language: mr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 1.4\n"
+
+#: ../browser-plugin/totem-plugin-viewer.c:352 ../src/totem-object.c:1180
+#: ../src/totem-object.c:1650 ../src/totem-statusbar.c:115
+msgid "Stopped"
+msgstr "थांबले आहे"
+
+#: ../browser-plugin/totem-plugin-viewer.c:364 ../src/totem-object.c:1173
+msgid "Paused"
+msgstr "स्तब्ध"
+
+#: ../browser-plugin/totem-plugin-viewer.c:368 ../src/totem-object.c:1166
+msgid "Playing"
+msgstr "चालवित आहे"
+
+#: ../browser-plugin/totem-plugin-viewer.c:386
+#: ../src/plugins/screensaver/totem-screensaver.c:97
+msgid "Playing a movie"
+msgstr "चित्रपट चालवत आहे"
+
+#: ../browser-plugin/totem-plugin-viewer.c:443
+msgid "No URI to play"
+msgstr "चालविण्याकरीता URI उपलब्ध नाही"
+
+#: ../browser-plugin/totem-plugin-viewer.c:676
+#: ../browser-plugin/totem-plugin-viewer.c:1700
+msgid "Totem Movie Player"
+msgstr "टोटेम चित्रपट वादक"
+
+#. translators: this is:
+#. * Open With ApplicationName
+#. * as in nautilus' right-click menu
+#: ../browser-plugin/totem-plugin-viewer.c:1120
+#, c-format
+msgid "_Open with \"%s\""
+msgstr "\"%s\" सह उघडा (_O)"
+
+#: ../browser-plugin/totem-plugin-viewer.c:1341 ../src/totem-object.c:2475
+msgid "An error occurred"
+msgstr "त्रुटी निर्माण झाली"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2033
+msgid "No playlist or playlist empty"
+msgstr "वादकयादी उपलब्ध नाही किंवा वादकयादी रिकामी नाही"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2128
+msgid "Movie browser plugin"
+msgstr "चलचित्र ब्राऊजर प्लगइन"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144 ../src/totem.c:240
+msgid "Could not initialize the thread-safe libraries."
+msgstr "थ्रेड-सेफ लायब्ररी प्रारंभ करू शकले नाही."
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144
+msgid "Verify your system installation. The Totem plugin will now exit."
+msgstr "तुमचे प्रणाली प्रतिष्ठपना तपासून पहा. टोटेम प्लगइन आता बाहेर पडेल."
 
 #: ../data/fullscreen.ui.h:1
 msgid "Leave Fullscreen"
 msgstr "पडदाभर सोडा"
 
-#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:95
+#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:81
 msgid "Time:"
 msgstr "वेळ:"
 
-#: ../data/playlist.ui.h:1
-msgid "Add..."
-msgstr "समाविष्ट करा..."
-
-#: ../data/playlist.ui.h:2 ../data/video-list.ui.h:2
-msgid "Copy the location to the clipboard"
-msgstr "क्लिपबोर्ड मध्ये स्थानाचे प्रत बनवा"
-
-#: ../data/playlist.ui.h:3
-msgid "Move Down"
-msgstr "खाली हलवा"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
+msgid "Allow the screensaver to activate when playing audio"
+msgstr "ऑडिओ चालवितेवेळी स्क्रीनसेवरला स्क्रीय होण्यास परवानगी द्या"
 
-#: ../data/playlist.ui.h:4
-msgid "Move Up"
-msgstr "वर हलवा"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
+msgid ""
+"Allow the screensaver to activate when playing audio. Disable if you have "
+"monitor-powered speakers."
+msgstr ""
+"ऑडिओ चालवितेवेळी स्क्रीनसेवरला स्क्रीय होण्यास परवानगी द्या. मॉनीटर सक्षम "
+"स्पीकर्स् "
+"असल्यास अक्षम करा."
 
-#: ../data/playlist.ui.h:5
-msgid "Remove"
-msgstr "काढून टाका"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
+msgid "Show visual effects when no video is displayed"
+msgstr "जेव्हा व्हिडीओ दर्शवला जाणार नाही तेव्हा दृष्यपरिणाम दर्शवा"
 
-#: ../data/playlist.ui.h:6
-msgid "Remove file from playlist"
-msgstr "वादकयादी मधून फाइल काढून टाका"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
+msgid "Show visual effects when playing an audio only file."
+msgstr "फक्त ऑडिओ फाइल वापरताना दृष्य परिणाम दर्शवा."
 
-#: ../data/playlist.ui.h:7
-msgid "Save Playlist..."
-msgstr "यादी साठवा..."
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
+#| msgid "Name of the visual effects plugins"
+msgid "Name of the visual effects plugin"
+msgstr "विज्युअल इफेक्टस् प्लगइनचे नाव"
 
-#: ../data/playlist.ui.h:8 ../data/totem.ui.h:70
-msgid "Select a file to use for text subtitles"
-msgstr "पाठ्य उपशिर्षक करीता फाइल निवडा"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
+msgid "The brightness of the video"
+msgstr "व्हिडिओचा तेजपणा"
 
-#: ../data/playlist.ui.h:9 ../data/video-list.ui.h:4
-msgid "_Copy Location"
-msgstr "प्रत बनविण्याचे स्थळ (_C)"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
+msgid "The contrast of the video"
+msgstr "व्हिडिओची विभिन्नता"
 
-#: ../data/playlist.ui.h:10
-msgid "_Remove"
-msgstr "काढून टाका (_R)"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
+msgid "The hue of the video"
+msgstr "व्हिडिओचा ह्य"
 
-#: ../data/playlist.ui.h:11 ../data/totem.ui.h:138
-msgid "_Select Text Subtitles..."
-msgstr "मजकूर उपशिर्षक नीवडा (_S)..."
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
+msgid "The saturation of the video"
+msgstr "व्हिडीओची संपृक्तता"
 
-#: ../data/plugins.ui.h:1
-msgid "Author:"
-msgstr "लेखक:"
-
-#: ../data/plugins.ui.h:2
-msgid "C_onfigure..."
-msgstr "संयोजीत करा (_o)..."
-
-#: ../data/plugins.ui.h:3
-msgid "Copyright:"
-msgstr "प्रतिकृती हक्काधिकार:"
-
-#: ../data/plugins.ui.h:4
-msgid "Description:"
-msgstr "वर्णन:"
-
-#: ../data/plugins.ui.h:5
-msgid "Site:"
-msgstr "स्थान:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
+msgid "Resize the canvas automatically on file load"
+msgstr "फाइल लोड झाल्यावर कॅनव्हास आपोआप मूळ आकारात आणा"
 
-#. Channels
-#: ../data/properties.ui.h:1
-#: ../src/plugins/properties/bacon-video-widget-properties.c:173
-msgid "0 Channels"
-msgstr "0 मार्ग"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
+msgid "Repeat mode"
+msgstr "पुन:प्रसारण मार्ग"
 
-#. Sample rate
-#: ../data/properties.ui.h:2
-#: ../src/plugins/properties/bacon-video-widget-properties.c:171
-msgid "0 Hz"
-msgstr "0 Hz"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
+msgid "Shuffle mode"
+msgstr "स्थानांतरण रीत"
 
-#: ../data/properties.ui.h:3
-msgid "0 frames per second"
-msgstr "0 फ्रेम्स प्रती सेकंद"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
+msgid "Whether to disable deinterlacing for interlaced movies"
+msgstr "इंटरलेस्ड् चित्रपटांकरीता डिइंटरलेसिंग बंद करायचे"
 
-#: ../data/properties.ui.h:4
-msgid "0 kbps"
-msgstr "0 kbps"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
+msgid "Whether to enable debug for the playback engine"
+msgstr "पार्श्वभूमीतील इंजीन करीता सदोष निर्धारण कार्यान्वीत करायचे का"
 
-#. 0 seconds
-#: ../data/properties.ui.h:5 ../src/backend/video-utils.c:158
-msgid "0 seconds"
-msgstr "0 सेकंद"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
+msgid "Type of audio output to use"
+msgstr "वापरण्याजोगी ऑडिओ आऊपुटचा प्रकार"
 
-#: ../data/properties.ui.h:6
-msgid "0 x 0"
-msgstr "0 x 0"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
+msgid "Visualization quality setting"
+msgstr "आभासीकरण दर्जा संयोजना"
 
-#: ../data/properties.ui.h:7
-msgid "Album:"
-msgstr "अल्बम:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
+msgid "Quality setting for the audio visualization."
+msgstr "ऑडिओ विज्युअलाइजेशनकरीता दर्जा निश्चित करत आहे."
 
-#: ../data/properties.ui.h:8
-msgid "Artist:"
-msgstr "कलाकार:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
+msgid "Network buffering threshold"
+msgstr "संजाळ बफरची कमाल क्षमता"
 
-#: ../data/properties.ui.h:9 ../data/totem.ui.h:22
-#: ../src/totem-properties-view.c:89
-msgid "Audio"
-msgstr "ऑडिओ"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
+#| msgid ""
+#| "Amount of data to buffer for network streams before starting to display "
+#| "the stream (in seconds)"
+msgid ""
+"Amount of data to buffer for network streams before starting to display the "
+"stream (in seconds)."
+msgstr ""
+"स्ट्रिम (सेकंदात) दाखण्यापूर्वी नेटवर्क स्ट्रिम्स् करीता बफर करण्याजोगी डाटा"
 
-#: ../data/properties.ui.h:10
-msgid "Bitrate:"
-msgstr "बिट दर:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
+msgid "Subtitle font"
+msgstr "उपशिर्षक फॉन्ट"
 
-#: ../data/properties.ui.h:11
-msgid "Channels:"
-msgstr "मार्ग:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
+#| msgid "Pango font description for subtitle rendering"
+msgid "Pango font description for subtitle rendering."
+msgstr "उपशीर्षक दाखवण्याकरीता पाँगो फाँट वर्णन."
 
-#: ../data/properties.ui.h:12
-msgid "Codec:"
-msgstr "कोडेक:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
+msgid "Subtitle encoding"
+msgstr "उपशिर्षक ऐंकोडींग"
 
-#: ../data/properties.ui.h:13
-msgid "Comment:"
-msgstr "टीप्पणी:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
+#| msgid "Encoding charset for subtitle"
+msgid "Encoding character set for subtitle."
+msgstr "उपशीर्षककरीता एंकोडिंग कॅरेक्टर."
 
-#: ../data/properties.ui.h:14
-msgid "Dimensions:"
-msgstr "परिमाण:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
+msgid "Default location for the \"Open...\" dialogs"
+msgstr "\"उघडा...\" संवाद करीता पूर्वनिर्धारीत ठिकाण"
 
-#: ../data/properties.ui.h:15
-msgid "Duration:"
-msgstr "वेळ:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
+#| msgid ""
+#| "Default location for the \"Open...\" dialogs, default is the current "
+#| "directory"
+msgid ""
+"Default location for the \"Open...\" dialogs. Default is the current "
+"directory."
+msgstr ""
+"\"उघडा...\" संवादकरीता पूर्वनिर्धारीत ठिकाण. पूर्वनिर्धारीत सध्याचे "
+"डिरेक्ट्री आहे."
 
-#: ../data/properties.ui.h:16
-msgid "Framerate:"
-msgstr "फ्रेम दर:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
+msgid "Default location for the \"Take Screenshot\" dialogs"
+msgstr "\"Take Screenshot\" संवाद करीता पूर्वनिर्धारीत ठिकाण"
 
-#: ../data/properties.ui.h:17 ../data/totem.ui.h:38
-msgid "General"
-msgstr "सर्वसाधारण"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
+#| msgid ""
+#| "Default location for the \"Take Screenshot\" dialogs, default is the "
+#| "Pictures directory"
+msgid ""
+"Default location for the \"Take Screenshot\" dialogs. Default is the "
+"Pictures directory."
+msgstr ""
+"\"स्क्रीनशॉठ घ्या\" संवादकरीता पूर्वनिर्धारीत ठिकाण. छायाचित्र डिरेक्ट्री "
+"पूर्वनिर्धारीत आहे."
 
-#. Dimensions
-#. Video Codec
-#. Audio Codec
-#: ../data/properties.ui.h:18
-#: ../src/plugins/properties/bacon-video-widget-properties.c:156
-#: ../src/plugins/properties/bacon-video-widget-properties.c:158
-#: ../src/plugins/properties/bacon-video-widget-properties.c:161
-#: ../src/plugins/properties/bacon-video-widget-properties.c:164
-#: ../src/plugins/properties/bacon-video-widget-properties.c:167
-#: ../src/plugins/properties/bacon-video-widget-properties.c:169
-#: ../src/plugins/properties/bacon-video-widget-properties.c:238
-#: ../src/plugins/properties/bacon-video-widget-properties.c:240
-#: ../src/plugins/properties/bacon-video-widget-properties.c:257
-#: ../src/plugins/properties/bacon-video-widget-properties.c:260
-msgid "N/A"
-msgstr "N/A"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
+msgid "Whether to disable the plugins in the user's home directory"
+msgstr "वापरकर्त्याची मुख्य संचयीकातील प्लगइन अकार्यान्वीत करायचे का"
 
-#: ../data/properties.ui.h:19
-msgid "Sample rate:"
-msgstr "सॅम्पल दर:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
+msgid "Whether to disable the keyboard shortcuts"
+msgstr "किबोर्ड शार्टकट्स् बंद करायचे"
 
-#: ../data/properties.ui.h:20
-msgid "Title:"
-msgstr "शिर्षक:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
+msgid "Whether to autoload text subtitle files when a movie is loaded"
+msgstr "चित्रपट दाखल केल्यावर पाठ्य उपशिर्षक आपोआप दाखल करायचे का"
 
-#. Title
-#. Artist
-#. Album
-#. Year
-#: ../data/properties.ui.h:21
-#: ../src/plugins/properties/bacon-video-widget-properties.c:143
-#: ../src/plugins/properties/bacon-video-widget-properties.c:145
-#: ../src/plugins/properties/bacon-video-widget-properties.c:147
-#: ../src/plugins/properties/bacon-video-widget-properties.c:149
-msgid "Unknown"
-msgstr "अपरिचीत"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
+#| msgid "Whether to autoload text subtitle files when a movie is loaded"
+msgid "Whether to autoload external chapter files when a movie is loaded"
+msgstr "चित्रपट लोड केल्यावर बाहेरील अध्याय फाइल्स् स्वयंलोड करायचे"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
+#| msgid ""
+#| "Whether to remember the position of played audio/video files when pausing "
+#| "or closing them."
+msgid ""
+"Whether to remember the position of played audio/video files when pausing or "
+"closing them"
+msgstr ""
+"स्तब्ध किंवा बंद करतेवेळी चालवलेल्या ऑडिओ/विडीओ फाइल्स्चे ठिकाण स्मरणात "
+"ठेवायचे"
 
-#: ../data/properties.ui.h:22 ../data/totem.ui.h:97
-#: ../src/totem-properties-view.c:85
-msgid "Video"
-msgstr "व्हिडीओ"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
+msgid "Active plugins list"
+msgstr "सुरू असलेल्या प्लगइन्स्ची सूची"
 
-#: ../data/properties.ui.h:23
-msgid "Year:"
-msgstr "वर्ष:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+msgid ""
+"A list of the names of the plugins which are currently active (loaded and "
+"running)."
+msgstr "सध्या सुरू (लोड केलेले व सुरू) असलेल्या प्लगइन नावांची सूची."
 
-#: ../data/video-list.ui.h:1
-msgid "Add the video to the playlist"
-msgstr "वादकसूची मध्ये व्हिडीओ समाविष्ट करा"
+#: ../data/playlist.ui.h:1
+msgid "_Remove"
+msgstr "काढून टाका (_R)"
 
-#: ../data/video-list.ui.h:3 ../src/totem-dnd-menu.c:97
-#: ../src/plugins/jamendo/jamendo.ui.h:9
-msgid "_Add to Playlist"
-msgstr "वादकयादी मध्ये जोडा (_A)"
+#: ../data/playlist.ui.h:2
+msgid "Remove file from playlist"
+msgstr "वादकयादी मधून फाइल काढून टाका"
 
-#. Title
-#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:48
-#: ../src/totem-object.c:1626
-msgid "Movie Player"
-msgstr "चित्रपट वादक"
+#: ../data/playlist.ui.h:3 ../data/video-list.ui.h:3
+msgid "_Copy Location"
+msgstr "प्रत बनविण्याचे स्थळ (_C)"
 
-#: ../data/totem.desktop.in.in.in.h:2
-msgid "Play movies and songs"
-msgstr "चित्रपट आणि गाणी चालवा"
+#: ../data/playlist.ui.h:4 ../data/video-list.ui.h:4
+msgid "Copy the location to the clipboard"
+msgstr "क्लिपबोर्ड मध्ये स्थानाचे प्रत बनवा"
 
-#: ../data/totem.ui.h:1
-msgid "1.5 Mbps T1/Intranet/LAN"
-msgstr "1.5 Mbps T1/इन्ट्रानेट/LAN"
+#: ../data/playlist.ui.h:5 ../data/totem.ui.h:71
+msgid "_Select Text Subtitles..."
+msgstr "मजकूर उपशिर्षक नीवडा (_S)..."
 
-#: ../data/totem.ui.h:2
-msgid "112 Kbps Dual ISDN/DSL"
-msgstr "112 Kbps दुहेरी ISDN/DSL"
+#: ../data/playlist.ui.h:6 ../data/totem.ui.h:72
+msgid "Select a file to use for text subtitles"
+msgstr "पाठ्य उपशिर्षक करीता फाइल निवडा"
 
-#: ../data/totem.ui.h:3
-msgid "14.4 Kbps Modem"
-msgstr "14.4 Kbps मोडेम"
+#: ../data/playlist.ui.h:7
+msgid "Add..."
+msgstr "समाविष्ट करा..."
 
-#: ../data/totem.ui.h:4
-msgid "16:9 (Widescreen)"
-msgstr "16:9 (मोठा पडदा)"
+#: ../data/playlist.ui.h:8
+msgid "Remove"
+msgstr "काढून टाका"
 
-#: ../data/totem.ui.h:5
-msgid "19.2 Kbps Modem"
-msgstr "19.2 Kbps मोडेम"
+#: ../data/playlist.ui.h:9
+msgid "Save Playlist..."
+msgstr "यादी साठवा..."
 
-#: ../data/totem.ui.h:6
-msgid "2.11:1 (DVB)"
-msgstr "2.11:1 (DVB)"
+#: ../data/playlist.ui.h:10
+msgid "Move Up"
+msgstr "वर हलवा"
 
-#: ../data/totem.ui.h:7
-msgid "256 Kbps DSL/Cable"
-msgstr "256 Kbps DSL/केबल"
+#: ../data/playlist.ui.h:11
+msgid "Move Down"
+msgstr "खाली हलवा"
 
-#: ../data/totem.ui.h:8
-msgid "28.8 Kbps Modem"
-msgstr "28.8 Kbps मोडेम"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:2
+msgid "Normal"
+msgstr "साधारण"
 
-#: ../data/totem.ui.h:9
-msgid "33.6 Kbps Modem"
-msgstr "33.6 Kbps मोडेम"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:4
+msgid "Large"
+msgstr "मोठे"
 
-#: ../data/totem.ui.h:10
-msgid "34.4 Kbps Modem"
-msgstr "34.4 Kbps मोडेम"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:6
+msgid "Extra Large"
+msgstr "अगाऊ वाढीव"
 
-#: ../data/totem.ui.h:11
-msgid "384 Kbps DSL/Cable"
-msgstr "384 Kbps DSL/केबल"
+#: ../data/preferences.ui.h:7 ../src/backend/bacon-video-widget.c:5498
+#: ../src/totem-properties-view.c:231
+msgid "Stereo"
+msgstr "स्टिरीओ"
 
-#: ../data/totem.ui.h:12
+#: ../data/preferences.ui.h:8
 msgid "4-channel"
 msgstr "4-मार्ग"
 
-#: ../data/totem.ui.h:13
+#: ../data/preferences.ui.h:9
 msgid "4.1-channel"
 msgstr "4.1-मार्ग"
 
-#: ../data/totem.ui.h:14
-msgid "4:3 (TV)"
-msgstr "4:3 (TV)"
-
-#: ../data/totem.ui.h:15
+#: ../data/preferences.ui.h:10
 msgid "5.0-channel"
 msgstr "5.0-मार्ग"
 
-#: ../data/totem.ui.h:16
+#: ../data/preferences.ui.h:11
 msgid "5.1-channel"
 msgstr "5.1-मार्ग"
 
-#: ../data/totem.ui.h:17
-msgid "512 Kbps DSL/Cable"
-msgstr "512 Kbps DSL/केबल"
-
-#: ../data/totem.ui.h:18
-msgid "56 Kbps Modem/ISDN"
-msgstr "56 Kbps मोडेम/ISDN"
-
-#: ../data/totem.ui.h:19
+#: ../data/preferences.ui.h:12
 msgid "AC3 Passthrough"
 msgstr "AC3 पासथ्रु"
 
-#: ../data/totem.ui.h:20
-msgid "A_udio Menu"
-msgstr "ऑडिओ मेन्यु (_u)"
-
-#: ../data/totem.ui.h:21
-msgid "About this application"
-msgstr "या ऍप्लिकेशन विषयी"
-
-#: ../data/totem.ui.h:23
-msgid "Audio Output"
-msgstr "ऑडिओ आऊपुट"
-
-#: ../data/totem.ui.h:24 ../src/totem-menu.c:195
-msgid "Auto"
-msgstr "आपोआप"
-
-#: ../data/totem.ui.h:25
-msgid "Clear the playlist"
-msgstr "वादकयादी पुसून टाका"
+#: ../data/preferences.ui.h:13
+msgid "Totem Preferences"
+msgstr "टोटेम प्राधान्यता"
 
-#: ../data/totem.ui.h:26
-msgid "Co_ntrast:"
-msgstr "विभिन्नता (_n):"
+#: ../data/preferences.ui.h:14
+msgid "Playback"
+msgstr "चालवा"
 
-#: ../data/totem.ui.h:27
-msgid "Color Balance"
-msgstr "रंग समतुल"
+#: ../data/preferences.ui.h:15
+msgid "Start playing files from last position"
+msgstr "शेवटच्या ठिकाणापासून फाइल्स् चालवायला सुरू करा"
 
-#: ../data/totem.ui.h:28
-msgid "Configure plugins to extend the application"
-msgstr "ऍप्लिकेशन विस्तारीता करण्यासाठी प्लगइन संरचीत करा"
+#: ../data/preferences.ui.h:16
+msgid "Text Subtitles"
+msgstr "मजकूर उपशिर्षक"
 
-#: ../data/totem.ui.h:29
-msgid "Configure the application"
-msgstr "ऍप्लिकेशन संयोजीत करा"
+#: ../data/preferences.ui.h:17
+msgid "_Load subtitle files when movie is loaded"
+msgstr "चित्रपट लोड केल्यावर उपशीर्षक फाइल्स् लोड करा (_L)"
 
-#: ../data/totem.ui.h:30
-msgid "Connection _speed:"
-msgstr "जुळवणीचा वेग (_s):"
+#: ../data/preferences.ui.h:18
+msgid "_Font:"
+msgstr "फॉन्ट (_F):"
 
-#: ../data/totem.ui.h:31
-msgid "Decrease volume"
-msgstr "आवाज कमी करा"
+#: ../data/preferences.ui.h:19
+msgid "_Encoding:"
+msgstr "एनकोडिंग (_E):"
 
-#: ../data/totem.ui.h:32
-msgid "Disable _deinterlacing of interlaced videos"
-msgstr ""
+#: ../data/preferences.ui.h:20
+msgid "External Chapters"
+msgstr "बाहेरील अध्याय"
+
+#: ../data/preferences.ui.h:21
+msgid "Load _chapter files when movie is loaded"
+msgstr "चित्रपट लोड झाल्यावर अध्याय फाइल्स् लोड करा (_c)"
 
-#: ../data/totem.ui.h:33
-#, fuzzy
-msgid "Disable screensaver when playing "
-msgstr "ऑडिओ चालवतेवेळी स्क्रिनसेवर देखील अकार्यक्षम करायचे (_a)"
+#: ../data/preferences.ui.h:22 ../data/properties.ui.h:1
+msgid "General"
+msgstr "सर्वसाधारण"
 
-#: ../data/totem.ui.h:34
+#. Tab label in the Preferences dialogue
+#: ../data/preferences.ui.h:24
 msgid "Display"
 msgstr "दृश्य"
 
-#: ../data/totem.ui.h:35
-msgid "Eject the current disc"
-msgstr "सध्याची डिस्क बाहेर काढा"
-
-#: ../data/totem.ui.h:36
-msgid "Extra Large"
-msgstr "अगाऊ वाढीव"
-
-#: ../data/totem.ui.h:37
-msgid "Fit Window to Movie"
-msgstr "चित्रपटास चौकटीत बसवा"
-
-#: ../data/totem.ui.h:39
-msgid "Go to the DVD menu"
-msgstr "डिव्हिडी मेनूकडे जा"
-
-#: ../data/totem.ui.h:40
-msgid "Go to the angle menu"
-msgstr "कोन मेनूकडे जा"
-
-#: ../data/totem.ui.h:41
-msgid "Go to the audio menu"
-msgstr "ऑडिओ मेनूकडे जा"
-
-#: ../data/totem.ui.h:42
-msgid "Go to the chapter menu"
-msgstr "पाठ मेनूकडे जा"
-
-#: ../data/totem.ui.h:43
-msgid "Go to the title menu"
-msgstr "शिर्षक मेनूकडे जा"
-
-#: ../data/totem.ui.h:44
-msgid "Help contents"
-msgstr "मदत तपशील"
-
-#: ../data/totem.ui.h:45
-msgid "Increase volume"
-msgstr "आवाज वाढवा"
-
-#: ../data/totem.ui.h:46
-msgid "Intranet/LAN"
-msgstr "इन्ट्रानेट/LAN"
-
-#: ../data/totem.ui.h:47
-msgid "Large"
-msgstr "मोठे"
+#: ../data/preferences.ui.h:25
+msgid "_Resize the window when a new video is loaded"
+msgstr "नवीन व्हिडीओ लोड झाल्यावर चौकटीचा आकार पुनः बदलवा (_R)"
 
-#: ../data/totem.ui.h:49
-msgid "Networking"
-msgstr "संजाळीकरण"
+#: ../data/preferences.ui.h:26
+msgid "Disable _deinterlacing of interlaced videos"
+msgstr "इंटलेस्ड् व्हिडिजचे डिइंटरलेसिंग बंद करा (_d)"
 
-#: ../data/totem.ui.h:50
-msgid "Next chapter or movie"
-msgstr "पुढचा पाठ किंवा चित्रपट"
+#: ../data/preferences.ui.h:27
+msgid "Disable screensaver when playing "
+msgstr "चालवतेवेळी स्क्रीनसेवर बंद करा"
 
-#: ../data/totem.ui.h:51
-msgid "Normal"
-msgstr "साधारण"
+#: ../data/preferences.ui.h:28 ../data/properties.ui.h:9
+#: ../src/totem-properties-view.c:273
+msgid "Video"
+msgstr "व्हिडीओ"
 
-#: ../data/totem.ui.h:52
-msgid "Open _Location..."
-msgstr "स्थळ उघडा (_L)..."
+#: ../data/preferences.ui.h:29
+msgid "Video or Audio"
+msgstr "व्हिडिओ किंवा ऑडिओ"
 
-#: ../data/totem.ui.h:53
-msgid "Open a file"
-msgstr "फाइल उघडा"
+#: ../data/preferences.ui.h:30
+msgid "Visual Effects"
+msgstr "दृश्यमान प्रभाव"
 
-#: ../data/totem.ui.h:54
-msgid "Open a non-local file"
-msgstr "स्थानिकहीन फाइल उघडा"
+#: ../data/preferences.ui.h:31
+msgid "Show _visual effects when an audio file is played"
+msgstr "जेव्हा ऑडिओ फाइल वाजवली जाते तेव्हा दृश्य परिणाम दर्शवा (_v)"
 
-#: ../data/totem.ui.h:55
-msgid "Play / P_ause"
-msgstr "चालवा / स्तब्ध (_a)"
+#: ../data/preferences.ui.h:32
+msgid "_Type of visualization:"
+msgstr "दृष्याचा प्रकार (_T):"
 
-#: ../data/totem.ui.h:56
-msgid "Play or pause the movie"
-msgstr "चित्रपट चालवा किंवा स्तब्ध करा"
+#: ../data/preferences.ui.h:33
+msgid "Visualization _size:"
+msgstr "आभासीकरण आकार (_s):"
 
-#: ../data/totem.ui.h:57
-msgid "Playback"
-msgstr "चालवा"
+#: ../data/preferences.ui.h:34
+msgid "Color Balance"
+msgstr "रंग समतुल"
 
-#: ../data/totem.ui.h:58
-msgid "Plugins..."
-msgstr "प्लगइन..."
+#: ../data/preferences.ui.h:35
+msgid "_Brightness:"
+msgstr "तेजपणा (_B):"
 
-#: ../data/totem.ui.h:59
-msgid "Prefere_nces"
-msgstr "प्राधान्यता (_n)"
+#: ../data/preferences.ui.h:36
+msgid "Co_ntrast:"
+msgstr "विभिन्नता (_n):"
 
-#: ../data/totem.ui.h:60
-msgid "Previous chapter or movie"
-msgstr "मागचा पाठ किंवा चित्रपट"
+#: ../data/preferences.ui.h:37
+msgid "Sat_uration:"
+msgstr "संपृक्तता (_u):"
 
-#: ../data/totem.ui.h:61
-msgid "Quit the program"
-msgstr "कार्यक्रमाच्या बाहेर पडा"
+#: ../data/preferences.ui.h:38
+msgid "_Hue:"
+msgstr "ह्यू (_H):"
 
-#: ../data/totem.ui.h:62
+#: ../data/preferences.ui.h:39
 msgid "Reset to _Defaults"
 msgstr "पूर्वनिर्धारीत मुळस्थितीत न्या (_D)"
 
-#: ../data/totem.ui.h:63
-msgid "Resize _1:1"
-msgstr "आकार बदलवा 1:1 (_1)"
+#: ../data/preferences.ui.h:40
+msgid "Audio Output"
+msgstr "ऑडिओ आऊपुट"
 
-#: ../data/totem.ui.h:64
-msgid "Resize _2:1"
-msgstr "आकार बदलवा 2:1 (_2)"
+#: ../data/preferences.ui.h:41
+msgid "_Audio output type:"
+msgstr "ऑडिओ आऊटपुट प्रकार (_A):"
 
-#: ../data/totem.ui.h:65
-msgid "Resize to double the original video size"
-msgstr "मुळ व्हिडीओ आकारच्या दुप्पट आकार करा"
+#: ../data/preferences.ui.h:42 ../data/properties.ui.h:14
+#: ../src/totem-properties-view.c:271
+msgid "Audio"
+msgstr "ऑडिओ"
 
-#: ../data/totem.ui.h:66
-msgid "Resize to half the original video size"
-msgstr "मुळ व्हिडीओ आकारचे अर्धे आकार करा"
+#: ../data/properties.ui.h:2
+msgid "Title:"
+msgstr "शिर्षक:"
 
-#: ../data/totem.ui.h:67
-msgid "Resize to the original video size"
-msgstr "मुळ व्हिडीओ आकार एवढे करा"
+#: ../data/properties.ui.h:3
+msgid "Artist:"
+msgstr "कलाकार:"
 
-#: ../data/totem.ui.h:68
-msgid "S_ubtitles"
-msgstr "उपशिर्षक (_u)"
+#: ../data/properties.ui.h:4
+msgid "Duration:"
+msgstr "वेळ:"
 
-#: ../data/totem.ui.h:69
-msgid "Sat_uration:"
-msgstr "संपृक्तता (_u):"
+#: ../data/properties.ui.h:5
+msgid "Year:"
+msgstr "वर्ष:"
 
-#: ../data/totem.ui.h:71
-msgid "Set the repeat mode"
-msgstr "पुन:प्रसारण पध्दती निश्चित करा"
-
-#: ../data/totem.ui.h:72
-msgid "Set the shuffle mode"
-msgstr "शफल मार्ग स्थिर करा"
+#: ../data/properties.ui.h:6
+msgid "Album:"
+msgstr "अल्बम:"
 
-#: ../data/totem.ui.h:73
-msgid "Sets 16:9 (widescreen) aspect ratio"
-msgstr "16:9 (मोठा पडदा) aspect प्रमाण निश्चित करा"
+#: ../data/properties.ui.h:7
+msgid "Comment:"
+msgstr "टीप्पणी:"
 
-#: ../data/totem.ui.h:74
-msgid "Sets 2.11:1 (DVB) aspect ratio"
-msgstr "2.11:1 (डिव्हिबी) aspect प्रमाण निश्चित करा"
+#: ../data/properties.ui.h:8
+msgid "Container:"
+msgstr "कंटेनर:"
 
-#: ../data/totem.ui.h:75
-msgid "Sets 4:3 (TV) aspect ratio"
-msgstr "4:3 (टीव्ही) aspect प्रमाण निश्चित करा"
+#: ../data/properties.ui.h:10
+msgid "Dimensions:"
+msgstr "परिमाण:"
 
-#: ../data/totem.ui.h:76
-msgid "Sets automatic aspect ratio"
-msgstr "आपोआप aspect प्रमाण निश्चित करा"
+#: ../data/properties.ui.h:11
+msgid "Codec:"
+msgstr "कोडेक:"
 
-#: ../data/totem.ui.h:77
-msgid "Sets square aspect ratio"
-msgstr "चौकोनी aspect प्रमाण निश्चित करा"
+#: ../data/properties.ui.h:12
+msgid "Framerate:"
+msgstr "फ्रेम दर:"
 
-#: ../data/totem.ui.h:78
-msgid "Show _Controls"
-msgstr "नियंत्रण साधने दर्शवा (_C)"
+#: ../data/properties.ui.h:13
+msgid "Bitrate:"
+msgstr "बिट दर:"
 
-#: ../data/totem.ui.h:79
-msgid "Show _visual effects when an audio file is played"
-msgstr "जेव्हा ऑडिओ फाइल वाजवली जाते तेव्हा दृश्य परिणाम दर्शवा (_v)"
+#: ../data/properties.ui.h:15
+msgid "Sample rate:"
+msgstr "सॅम्पल दर:"
 
-#: ../data/totem.ui.h:80
-msgid "Show controls"
-msgstr "नियंत्रण साधने दर्शवा"
+#: ../data/properties.ui.h:16
+msgid "Channels:"
+msgstr "मार्ग:"
 
-#: ../data/totem.ui.h:81
-msgid "Show or hide the sidebar"
-msgstr "बाजूचीपट्टी दर्शवा किंवा लपवा"
+#. Title
+#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:80 ../src/totem.c:239
+#: ../src/totem.c:248 ../src/totem-menu.c:790 ../src/totem-object.c:1658
+msgid "Videos"
+msgstr "व्हिडीओज्"
 
-#: ../data/totem.ui.h:82
-msgid "Shuff_le Mode"
-msgstr "शफल पध्दती (_l)"
+#: ../data/totem.desktop.in.in.in.h:2
+#| msgid "Playing a movie"
+msgid "Play movies"
+msgstr "चित्रपट चालवा"
+
+#: ../data/totem.desktop.in.in.in.h:3
+msgid "Video;Movie;Film;Clip;Series;Player;DVD;TV;Disc;"
+msgstr "व्हिडिओ;चित्रपट;फिल्म;क्लिप;सिरिज्;प्लेअर;DVD;TV;डिस्क;"
 
-#: ../data/totem.ui.h:83
-msgid "Skip _Backwards"
-msgstr "मागे सरकवा (_B)"
+#: ../data/totem.ui.h:1
+#| msgid "_Open..."
+msgid "_Open"
+msgstr "उघडा (_O)"
 
-#: ../data/totem.ui.h:84
-msgid "Skip _Forward"
-msgstr "पुढे सरकवा (_F)"
+#: ../data/totem.ui.h:2
+#| msgid "Open _Location..."
+msgid "Open _Location"
+msgstr "ठिकाण उघडा (_L)"
 
-#: ../data/totem.ui.h:85
-msgid "Skip backwards"
-msgstr "मागे सरकवा"
+#: ../data/totem.ui.h:3
+msgid "_Fullscreen"
+msgstr "पडदाभर (_F)"
 
-#: ../data/totem.ui.h:86
-msgid "Skip forward"
-msgstr "पुढे सरकवा"
+#: ../data/totem.ui.h:4
+msgid "Prefere_nces"
+msgstr "प्राधान्यता (_n)"
 
-#: ../data/totem.ui.h:87
-msgid "Square"
-msgstr "चौरस"
+#: ../data/totem.ui.h:5
+#| msgid "Shuff_le Mode"
+msgid "Shuff_le"
+msgstr "टोलणे (_l)"
 
-#: ../data/totem.ui.h:88
-msgid "Start playing files from last position"
-msgstr "शेवटच्या ठिकाणापासून फाइल्स् चालवायला सुरू करा"
+#: ../data/totem.ui.h:6
+#| msgid "_Repeat Mode"
+msgid "_Repeat"
+msgstr "पुनरावृत्त (_R)"
 
-#: ../data/totem.ui.h:89 ../src/backend/bacon-video-widget-gst-0.10.c:5818
-msgid "Stereo"
-msgstr "स्टिरीओ"
+#: ../data/totem.ui.h:7
+msgid "_Quit"
+msgstr "बाहेर पडा (_Q)"
 
-#: ../data/totem.ui.h:90
-msgid "Switch An_gles"
-msgstr "कोन बदलवा (_g)"
+#: ../data/totem.ui.h:8
+msgid "_Movie"
+msgstr "चित्रपट (_M)"
 
-#: ../data/totem.ui.h:91
-msgid "Switch camera angles"
-msgstr "कॅमेराचे कोन बदलवा"
+#: ../data/totem.ui.h:9
+msgid "_Eject"
+msgstr "बाहेर काढा (_E)"
 
-#: ../data/totem.ui.h:92
-msgid "Switch to fullscreen"
-msgstr "पडदाभर करा"
+#: ../data/totem.ui.h:10
+msgid "Eject the current disc"
+msgstr "सध्याची डिस्क बाहेर काढा"
 
-#: ../data/totem.ui.h:93
-msgid "Text Subtitles"
-msgstr "मजकूर उपशिर्षक"
+#: ../data/totem.ui.h:11
+msgid "_Properties"
+msgstr "वैशिष्ट्ये (_P)"
 
-#: ../data/totem.ui.h:94
-msgid "Time seek bar"
-msgstr "वेळ संचयन पट्टी"
+#: ../data/totem.ui.h:12
+msgid "View the properties of the current stream"
+msgstr "सध्याच्या स्ट्रीमच्या गुणधर्मचे दृष्य पहा"
 
-#: ../data/totem.ui.h:96
-msgid "Totem Preferences"
-msgstr "टोटेम प्राधान्यता"
+#: ../data/totem.ui.h:13
+msgid "Play / P_ause"
+msgstr "चालवा / स्तब्ध (_a)"
 
-#: ../data/totem.ui.h:98
-msgid "Video or Audio"
-msgstr ""
+#: ../data/totem.ui.h:14
+msgid "Play or pause the movie"
+msgstr "चित्रपट चालवा किंवा स्तब्ध करा"
+
+#: ../data/totem.ui.h:15
+msgid "_Edit"
+msgstr "संपादन (_E)"
+
+#: ../data/totem.ui.h:16
+msgid "_Clear Playlist"
+msgstr "वादकयादी पुसून टाका (_C)"
 
-#: ../data/totem.ui.h:99
-msgid "View the properties of the current stream"
-msgstr "सध्याच्या स्ट्रीमच्या गुणधर्मचे दृष्य पहा"
+#: ../data/totem.ui.h:17
+msgid "Clear the playlist"
+msgstr "वादकयादी पुसून टाका"
 
-#: ../data/totem.ui.h:100
-msgid "Visual Effects"
-msgstr "दृश्यमान प्रभाव"
+#: ../data/totem.ui.h:18
+msgid "Plugins..."
+msgstr "प्लगइन..."
 
-#: ../data/totem.ui.h:101
-msgid "Visualization _size:"
-msgstr "आभासीकरण आकार (_s):"
+#: ../data/totem.ui.h:19
+msgid "Configure plugins to extend the application"
+msgstr "ऍप्लिकेशन विस्तारीता करण्यासाठी प्लगइन संरचीत करा"
 
-#: ../data/totem.ui.h:102
-msgid "Volume _Down"
-msgstr "आवाज कमी करा (_D)"
+#: ../data/totem.ui.h:20
+msgid "_View"
+msgstr "दृश्य (_V)"
 
-#: ../data/totem.ui.h:103
-msgid "Volume _Up"
-msgstr "आवाज वाढवा (_U)"
+#: ../data/totem.ui.h:21
+msgid "Fit Window to Movie"
+msgstr "चित्रपटास चौकटीत बसवा"
 
-#: ../data/totem.ui.h:104
-msgid "Zoom In"
-msgstr "मोठे करा"
+#: ../data/totem.ui.h:22
+msgid "_Resize 1:2"
+msgstr "आकार बदलवा 1:2 (_R)"
 
-#: ../data/totem.ui.h:105
-msgid "Zoom Out"
-msgstr "लहान करा"
-
-#: ../data/totem.ui.h:106
-msgid "Zoom Reset"
-msgstr "मोठे करण्याची पुर्नस्थापना"
+#: ../data/totem.ui.h:23
+msgid "Resize to half the original video size"
+msgstr "मुळ व्हिडीओ आकारचे अर्धे आकार करा"
 
-#: ../data/totem.ui.h:107
-msgid "Zoom in"
-msgstr "मोठे करा"
+#: ../data/totem.ui.h:24
+msgid "Resize _1:1"
+msgstr "आकार बदलवा 1:1 (_1)"
 
-#: ../data/totem.ui.h:108
-msgid "Zoom out"
-msgstr "लहान करा"
-
-#: ../data/totem.ui.h:109
-msgid "Zoom reset"
-msgstr "मोठे करण्याची पुर्नस्थापना"
+#: ../data/totem.ui.h:25
+msgid "Resize to the original video size"
+msgstr "मुळ व्हिडीओ आकार एवढे करा"
 
-#: ../data/totem.ui.h:110
-msgid "_About"
-msgstr "विषयी (_A)"
+#: ../data/totem.ui.h:26
+msgid "Resize _2:1"
+msgstr "आकार बदलवा 2:1 (_2)"
 
-#: ../data/totem.ui.h:111
-msgid "_Angle Menu"
-msgstr "कोन मेनू (_A)"
+#: ../data/totem.ui.h:27
+msgid "Resize to double the original video size"
+msgstr "मुळ व्हिडीओ आकारच्या दुप्पट आकार करा"
 
-#: ../data/totem.ui.h:112
+#: ../data/totem.ui.h:28
 msgid "_Aspect Ratio"
 msgstr "Aspect प्रमाण (_A)"
 
-#: ../data/totem.ui.h:113
-msgid "_Audio output type:"
-msgstr "ऑडिओ आऊटपुट प्रकार (_A):"
-
-#: ../data/totem.ui.h:114
-msgid "_Brightness:"
-msgstr "तेजपणा (_B):"
-
-#: ../data/totem.ui.h:115
-msgid "_Chapter Menu"
-msgstr "पाठ मेनू (_C)"
+#: ../data/totem.ui.h:29
+msgid "Switch An_gles"
+msgstr "कोन बदलवा (_g)"
 
-#: ../data/totem.ui.h:116
-msgid "_Clear Playlist"
-msgstr "वादकयादी पुसून टाका (_C)"
+#: ../data/totem.ui.h:30
+msgid "Switch camera angles"
+msgstr "कॅमेराचे कोन बदलवा"
 
-#: ../data/totem.ui.h:117
-msgid "_Contents"
-msgstr "अनुक्रम(_C)"
+#: ../data/totem.ui.h:31
+msgid "_Go"
+msgstr "जा (_G)"
 
-#: ../data/totem.ui.h:118
+#: ../data/totem.ui.h:32
 msgid "_DVD Menu"
 msgstr "डिव्हिडी मेनू (_D)"
 
-#: ../data/totem.ui.h:119
-msgid "_Edit"
-msgstr "संपादन (_E)"
-
-#: ../data/totem.ui.h:120
-msgid "_Eject"
-msgstr "बाहेर काढा (_E)"
-
-#: ../data/totem.ui.h:121
-msgid "_Encoding:"
-msgstr "एनकोडिंग (_E):"
+#: ../data/totem.ui.h:33
+msgid "Go to the DVD menu"
+msgstr "डिव्हिडी मेनूकडे जा"
 
-#: ../data/totem.ui.h:122
-msgid "_Font:"
-msgstr "फॉन्ट (_F):"
+#: ../data/totem.ui.h:34
+msgid "_Title Menu"
+msgstr "शिर्षक मेनू (_T)"
 
-#: ../data/totem.ui.h:123
-msgid "_Fullscreen"
-msgstr "पडदाभर (_F)"
+#: ../data/totem.ui.h:35
+msgid "Go to the title menu"
+msgstr "शिर्षक मेनूकडे जा"
 
-#: ../data/totem.ui.h:124
-msgid "_Go"
-msgstr "जा (_G)"
+#: ../data/totem.ui.h:36
+msgid "A_udio Menu"
+msgstr "ऑडिओ मेन्यु (_u)"
 
-#: ../data/totem.ui.h:125
-msgid "_Help"
-msgstr "मदत (_H)"
+#: ../data/totem.ui.h:37
+msgid "Go to the audio menu"
+msgstr "ऑडिओ मेनूकडे जा"
 
-#: ../data/totem.ui.h:126
-msgid "_Hue:"
-msgstr "ह्यू (_H):"
+#: ../data/totem.ui.h:38
+msgid "_Angle Menu"
+msgstr "कोन मेनू (_A)"
 
-#: ../data/totem.ui.h:127
-msgid "_Languages"
-msgstr "भाषा (_L)"
+#: ../data/totem.ui.h:39
+msgid "Go to the angle menu"
+msgstr "कोन मेनूकडे जा"
 
-#: ../data/totem.ui.h:128
-#, fuzzy
-msgid "_Load subtitle files when movie is loaded"
-msgstr "चित्रपट दाखल होताच उपशिर्षक फाइल आपोआप दाखल करा (_l)"
+#: ../data/totem.ui.h:40
+msgid "_Chapter Menu"
+msgstr "पाठ मेनू (_C)"
 
-#: ../data/totem.ui.h:129
-msgid "_Movie"
-msgstr "चित्रपट (_M)"
+#: ../data/totem.ui.h:41
+msgid "Go to the chapter menu"
+msgstr "पाठ मेनूकडे जा"
 
-#: ../data/totem.ui.h:130
+#: ../data/totem.ui.h:42
 msgid "_Next Chapter/Movie"
 msgstr "पुढचा पाठ/चित्रपट (_N)"
 
-#: ../data/totem.ui.h:131
-msgid "_Open..."
-msgstr "उघडा (_O)..."
+#: ../data/totem.ui.h:43
+msgid "Next chapter or movie"
+msgstr "पुढचा पाठ किंवा चित्रपट"
 
-#: ../data/totem.ui.h:132
+#: ../data/totem.ui.h:44
 msgid "_Previous Chapter/Movie"
 msgstr "पूर्वीचा पाठ/चित्रपट (_P)"
 
-#: ../data/totem.ui.h:133
-msgid "_Properties"
-msgstr "वैशिष्ट्ये (_P)"
+#: ../data/totem.ui.h:45
+msgid "Previous chapter or movie"
+msgstr "मागचा पाठ किंवा चित्रपट"
 
-#: ../data/totem.ui.h:134
-msgid "_Quit"
-msgstr "बाहेर पडा (_Q)"
+#: ../data/totem.ui.h:46
+msgid "_Sound"
+msgstr "आवाज (_S)"
 
-#: ../data/totem.ui.h:135
-msgid "_Repeat Mode"
-msgstr "पुन:प्रसारण पध्दत (_R)"
+#: ../data/totem.ui.h:47
+msgid "Volume _Up"
+msgstr "आवाज वाढवा (_U)"
 
-#: ../data/totem.ui.h:136
-msgid "_Resize 1:2"
-msgstr "आकार बदलवा 1:2 (_R)"
+#: ../data/totem.ui.h:48
+msgid "Increase volume"
+msgstr "आवाज वाढवा"
 
-#: ../data/totem.ui.h:137
-#, fuzzy
-msgid "_Resize the window when a new video is loaded"
-msgstr "नवीन व्हिडीओ लावल्यावर चौकटीचा आकार आपोआप बदलवा (_r)"
+#: ../data/totem.ui.h:49
+msgid "Volume _Down"
+msgstr "आवाज कमी करा (_D)"
 
-#: ../data/totem.ui.h:139
-msgid "_Sound"
-msgstr "आवाज (_S)"
+#: ../data/totem.ui.h:50
+msgid "Decrease volume"
+msgstr "आवाज कमी करा"
 
-#: ../data/totem.ui.h:140
-msgid "_Title Menu"
-msgstr "शिर्षक मेनू (_T)"
+#: ../data/totem.ui.h:51
+msgid "_Help"
+msgstr "मदत (_H)"
 
-#: ../data/totem.ui.h:141
-msgid "_Type of visualization:"
-msgstr "दृष्याचा प्रकार (_T):"
+#: ../data/totem.ui.h:52
+msgid "_Contents"
+msgstr "अनुक्रम(_C)"
 
-#: ../data/totem.ui.h:142
-msgid "_View"
-msgstr "दृश्य (_V)"
+#: ../data/totem.ui.h:53
+msgid "Help contents"
+msgstr "मदत तपशील"
 
-#: ../data/totem.schemas.in.h:1
-msgid "Allow the screensaver to activate when playing audio"
-msgstr "ऑडिओ चालवितेवेळी स्क्रीनसेवरला स्क्रीय होण्यास परवानगी द्या"
+#: ../data/totem.ui.h:54
+msgid "_About"
+msgstr "विषयी (_A)"
 
-#: ../data/totem.schemas.in.h:2
-msgid ""
-"Allow the screensaver to activate when playing audio. Disable if you have "
-"monitor-powered speakers."
-msgstr ""
-"ऑडिओ चालवितेवेळी स्क्रीनसेवरला स्क्रीय होण्यास परवानगी द्या. मॉनीटर सक्षम स्पीकर्स् "
-"असल्यास अक्षम करा."
+#: ../data/totem.ui.h:55
+msgid "About this application"
+msgstr "या ऍप्लिकेशन विषयी"
 
-#: ../data/totem.schemas.in.h:3
-msgid ""
-"Amount of data to buffer for network streams before starting to display the "
-"stream (in seconds)"
-msgstr "स्ट्रीम दर्शविण्यापूर्वी (सेकंद मध्ये) संजाळ स्ट्रीम करीता बफर करण्याजोगी माहिती प्रमाण"
+#: ../data/totem.ui.h:56
+msgid "Show _Controls"
+msgstr "नियंत्रण साधने दर्शवा (_C)"
 
-#: ../data/totem.schemas.in.h:4
-msgid ""
-"Approximate network connection speed, used to select quality on media over "
-"the network: \"0\" for 14.4 Kbps Modem, \"1\" for 19.2 Kbps Modem, \"2\" for "
-"28.8 Kbps Modem, \"3\" for 33.6 Kbps Modem, \"4\" for 34.4 Kbps Modem, \"5\" "
-"for 56 Kbps Modem/ISDN, \"6\" for 112 Kbps Dual ISDN/DSL, \"7\" for 256 Kbps "
-"DSL/Cable, \"8\" for 384 Kbps DSL/Cable, \"9\" for 512 Kbps DSL/Cable, \"10"
-"\" for 1.5 Mbps T1/Intranet/LAN, \"11\" for Intranet/LAN."
-msgstr ""
-"अंदाजे नेटवर्क जुळवणी वेग, ज्याचा वापर नेटवर्कवरील मिडीयाचा दर्जा ठरवण्याकरीता केला "
-"जातो: \"0\" 14.4 Kbps मोडेमसाठी, \"1\" 19.2 Kbps मोडेमसाठी, \"2\"  28.8 Kbps "
-"मोडेमसाठी, \"3\" 33.6 Kbps मोडेमसाठी, \"4\" 34.4 Kbps मोडेमसाठी, \"5\" 56 Kbps "
-"मोडेम/ISDN साठी, \"6\" 112 Kbps डुअल ISDN/DSL साठी, \"7\" 256 Kbps DSL/"
-"केबलसाठी, \"8\" 384 Kbps DSL/केबलसाठी, \"9\" 512 Kbps DSL/केबलसाठी, \"10\" 1.5 "
-"Mbps T1/इंट्रानेट/LAN साठी, \"11\" इंट्रानेट/LAN साठी."
+#: ../data/totem.ui.h:57
+msgid "Show controls"
+msgstr "नियंत्रण साधने दर्शवा"
 
-#: ../data/totem.schemas.in.h:5
-msgid "Default location for the \"Open...\" dialogs"
-msgstr "\"उघडा...\" संवाद करीता पूर्वनिर्धारीत ठिकाण"
+#: ../data/totem.ui.h:58
+msgid "S_idebar"
+msgstr "बाजूचीपट्टी (_i)"
 
-#: ../data/totem.schemas.in.h:6
-msgid ""
-"Default location for the \"Open...\" dialogs, default is the current "
-"directory"
-msgstr "\"उघडा...\" संवाद करीता पूर्वनिर्धारीत ठिकाण, पूर्वनिर्धारीत सध्याची डिरेक्ट्री आहे"
+#: ../data/totem.ui.h:59
+msgid "Show or hide the sidebar"
+msgstr "बाजूचीपट्टी दर्शवा किंवा लपवा"
 
-#: ../data/totem.schemas.in.h:7
-msgid "Default location for the \"Take Screenshot\" dialogs"
-msgstr "\"Take Screenshot\" संवाद करीता पूर्वनिर्धारीत ठिकाण"
+#: ../data/totem.ui.h:60
+#| msgid "Auto"
+msgctxt "Aspect ratio"
+msgid "Auto"
+msgstr "स्वयं"
 
-#: ../data/totem.schemas.in.h:8
-msgid ""
-"Default location for the \"Take Screenshot\" dialogs, default is the "
-"Pictures directory"
-msgstr "\"Take Screenshot\" संवाद करीता पूर्वनिर्धारीत ठिकाण, पूर्वनिर्धारीत चित्र डिरेक्ट्री आहे"
+#: ../data/totem.ui.h:61
+msgid "Sets automatic aspect ratio"
+msgstr "आपोआप aspect प्रमाण निश्चित करा"
+
+#: ../data/totem.ui.h:62
+msgid "Square"
+msgstr "चौरस"
+
+#: ../data/totem.ui.h:63
+msgid "Sets square aspect ratio"
+msgstr "चौकोनी aspect प्रमाण निश्चित करा"
 
-#: ../data/totem.schemas.in.h:9
-msgid "Encoding charset for subtitle"
-msgstr "उपशिर्षक करीता एनकोडिंग अक्षरसंच"
+#: ../data/totem.ui.h:64
+msgid "4:3 (TV)"
+msgstr "4:3 (TV)"
 
-#: ../data/totem.schemas.in.h:10
-msgid "Name of the visual effects plugins"
-msgstr "दृश्य प्रभाव प्लगइनचे नाव"
+#: ../data/totem.ui.h:65
+msgid "Sets 4:3 (TV) aspect ratio"
+msgstr "4:3 (टीव्ही) aspect प्रमाण निश्चित करा"
 
-#: ../data/totem.schemas.in.h:11
-msgid "Network buffering threshold"
-msgstr "संजाळ बफरची कमाल क्षमता"
+#: ../data/totem.ui.h:66
+msgid "16:9 (Widescreen)"
+msgstr "16:9 (मोठा पडदा)"
+
+#: ../data/totem.ui.h:67
+msgid "Sets 16:9 (widescreen) aspect ratio"
+msgstr "16:9 (मोठा पडदा) aspect प्रमाण निश्चित करा"
 
-#: ../data/totem.schemas.in.h:12
-msgid "Network connection speed"
-msgstr "नेटवर्क जुळवणी वेग"
+#: ../data/totem.ui.h:68
+msgid "2.11:1 (DVB)"
+msgstr "2.11:1 (DVB)"
 
-#: ../data/totem.schemas.in.h:13
-msgid "Pango font description for subtitle rendering"
-msgstr "उपशिर्षकाच्या मांडणीसाठी पॅन्गो फॉन्टचे वर्णन"
+#: ../data/totem.ui.h:69
+msgid "Sets 2.11:1 (DVB) aspect ratio"
+msgstr "2.11:1 (डिव्हिबी) aspect प्रमाण निश्चित करा"
 
-#: ../data/totem.schemas.in.h:14
-msgid ""
-"Quality settings for the audio visualization: \"0\" for small, \"1\" for "
-"normal, \"2\" for large, \"3\" for extra large."
-msgstr ""
-"ऑडिओ आभासीकरणसाठी दर्जा संरचना: \"0\" लहानकरीता, \"1\" सर्वसाधारणसाठी, \"2\" "
-"मोठ्याकरीता, \"3\" जास्त मोठ्यांकरीता."
+#: ../data/totem.ui.h:70
+msgid "S_ubtitles"
+msgstr "उपशिर्षक (_u)"
+
+#: ../data/totem.ui.h:73
+msgid "_Languages"
+msgstr "भाषा (_L)"
+
+#: ../data/totem.ui.h:74
+msgid "Zoom In"
+msgstr "मोठे करा"
+
+#: ../data/totem.ui.h:75
+msgid "Zoom in"
+msgstr "मोठे करा"
+
+#: ../data/totem.ui.h:76
+msgid "Skip _Forward"
+msgstr "पुढे सरकवा (_F)"
 
-#: ../data/totem.schemas.in.h:15
-msgid "Repeat mode"
-msgstr "पुन:प्रसारण मार्ग"
+#: ../data/totem.ui.h:77
+msgid "Skip forward"
+msgstr "पुढे सरकवा"
 
-#: ../data/totem.schemas.in.h:16
-msgid "Resize the canvas automatically on file load"
-msgstr "फाइल लोड झाल्यावर कॅनव्हास आपोआप मूळ आकारात आणा"
+#: ../data/totem.ui.h:78
+msgid "Skip _Backwards"
+msgstr "मागे सरकवा (_B)"
 
-#: ../data/totem.schemas.in.h:17
-msgid "Show visual effects when no video is displayed"
-msgstr "जेव्हा व्हिडीओ दर्शवला जाणार नाही तेव्हा दृष्यपरिणाम दर्शवा"
+#: ../data/totem.ui.h:79
+msgid "Skip backwards"
+msgstr "मागे सरकवा"
 
-#: ../data/totem.schemas.in.h:18
-msgid "Show visual effects when playing an audio only file."
-msgstr "फक्त ऑडिओ फाइल वापरताना दृष्य परिणाम दर्शवा."
+#: ../data/totem.ui.h:82
+msgid "Time seek bar"
+msgstr "वेळ संचयन पट्टी"
 
-#: ../data/totem.schemas.in.h:19
-msgid "Shuffle mode"
-msgstr "स्थानांतरण रीत"
+#: ../data/uri.ui.h:1
+msgid "Enter the _address of the file you would like to open:"
+msgstr "तुम्हाला उघडायची त्या फाइलचा पत्ता प्रविष्ट करा (_a):"
 
-#: ../data/totem.schemas.in.h:20
-msgid "Subtitle encoding"
-msgstr "उपशिर्षक ऐंकोडींग"
+#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
+msgid "_Add to Playlist"
+msgstr "वादकयादी मध्ये जोडा (_A)"
 
-#: ../data/totem.schemas.in.h:21
-msgid "Subtitle font"
-msgstr "उपशिर्षक फॉन्ट"
+#: ../data/video-list.ui.h:2
+msgid "Add the video to the playlist"
+msgstr "वादकसूची मध्ये व्हिडीओ समाविष्ट करा"
 
-#: ../data/totem.schemas.in.h:22
-msgid "The brightness of the video"
-msgstr "व्हिडिओचा तेजपणा"
+#: ../src/backend/bacon-video-widget.c:1643
+msgid "Password requested for RTSP server"
+msgstr "RTSP सर्व्हरकरीता पासवर्डची विनंती केली"
 
-#: ../data/totem.schemas.in.h:23
-msgid "The contrast of the video"
-msgstr "व्हिडिओची विभिन्नता"
+#: ../src/backend/bacon-video-widget.c:2944
+#, c-format
+msgid "Audio Track #%d"
+msgstr "ऑडिओ ट्रॅक #%d"
 
-#: ../data/totem.schemas.in.h:24
-msgid "The hue of the video"
-msgstr "व्हिडिओचा ह्य"
+#: ../src/backend/bacon-video-widget.c:2948
+#, c-format
+msgid "Subtitle #%d"
+msgstr "उपशिर्षक #%d"
 
-#: ../data/totem.schemas.in.h:25
-msgid "The saturation of the video"
-msgstr "व्हिडीओची संपृक्तता"
+#: ../src/backend/bacon-video-widget.c:3345
+msgid "The server you are trying to connect to is not known."
+msgstr "जोडणी करण्याजोगी सर्व्हर परिचीत नाही."
+
+#: ../src/backend/bacon-video-widget.c:3348
+msgid "The connection to this server was refused."
+msgstr "या सर्व्हरकरीता जोडणी नकारली गेली."
+
+#: ../src/backend/bacon-video-widget.c:3351
+#| msgid "The movie could not be recorded."
+msgid "The specified movie could not be found."
+msgstr "निर्देशीत चित्रपट आढळले नाही."
+
+#: ../src/backend/bacon-video-widget.c:3358
+msgid "The server refused access to this file or stream."
+msgstr "सर्व्हरने या फाइल किंवा स्ट्रिमकरीता प्रवेश नकारले."
+
+#: ../src/backend/bacon-video-widget.c:3364
+msgid "Authentication is required to access this file or stream."
+msgstr "या फाइल किंवा स्ट्रिमकरीता प्रवेश प्राप्त करण्यासाठी ओळख पटवणे आवश्यक."
+
+#: ../src/backend/bacon-video-widget.c:3371
+#| msgid "Totem was not able to play this disc."
+msgid "You are not allowed to open this file."
+msgstr "ह्या फाइलला उघडण्यास तुमच्याकडे परवानगी नाही."
+
+#: ../src/backend/bacon-video-widget.c:3376
+#| msgid "File is not a valid .desktop file"
+msgid "This location is not a valid one."
+msgstr "हे ठिकाण वैध नाही."
+
+#: ../src/backend/bacon-video-widget.c:3384
+#| msgid "The movie could not be recorded."
+msgid "The movie could not be read."
+msgstr "चित्रपट वाचणे अशक्य."
 
-#: ../data/totem.schemas.in.h:26
-msgid "Type of audio output to use"
-msgstr "वापरण्याजोगी ऑडिओ आऊपुटचा प्रकार"
+#. should be exactly one missing thing (source or converter)
+#: ../src/backend/bacon-video-widget.c:3407
+#: ../src/backend/bacon-video-widget.c:3415
+#, c-format
+#| msgid ""
+#| "The playback of this movie requires a %s plugin which is not installed."
+msgid "The playback of this movie requires a %s plugin which is not installed."
+msgid_plural ""
+"The playback of this movie requires the following decoders which are not "
+"installed:\n"
+"\n"
+"%s"
+msgstr[0] ""
+"हे चित्रपट चालविण्याकरीता %s प्लगइन आवश्यक आहे, जे प्रतिष्ठापीत नाही."
+msgstr[1] ""
+"हे चित्रपट चालविण्याकरीता खालील डिकोडर्स आवश्यक आहे, जे "
+"प्रतिष्ठापीत नाही:\n"
+"\n"
+"%s"
 
-#: ../data/totem.schemas.in.h:27
+#: ../src/backend/bacon-video-widget.c:3426
 msgid ""
-"Type of audio output to use: \"0\" for stereo, \"1\" for 4-channel output, "
-"\"2\" for 5.0 channel output, \"3\" for 5.1 channel output, \"4\" for AC3 "
-"Passthrough."
-msgstr ""
-"ऑडिओ आऊपुटचा वापरण्याजोगी प्रकरा: स्टिरीओ करीता \"0\" , 4-मार्ग आउटपुट करीता \"1"
-"\", 5.0 मार्ग आउटपुट करीता \"2\", 5.1 मार्ग आउटपुट करीता \"3\", AC3 उत्तीर्ण करीता "
-"\"4\"."
-
-#. Translators: This is default subtitle encoding
-#. character set. You can change this to be the most common
-#. encoding for fansub subtitles in your language. File a bug
-#. against Totem, and leave UTF-8 as the default if in doubt.
-#: ../data/totem.schemas.in.h:32
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: ../data/totem.schemas.in.h:33
-msgid "Visualization quality setting"
-msgstr "आभासीकरण दर्जा संयोजना"
-
-#: ../data/totem.schemas.in.h:34
-msgid "Whether to autoload text subtitle files when a movie is loaded"
-msgstr "चित्रपट दाखल केल्यावर पाठ्य उपशिर्षक आपोआप दाखल करायचे का"
+"An audio or video stream is not handled due to missing codecs. You might "
+"need to install additional plugins to be able to play some types of movies"
+msgstr ""
+"न आढळणाऱ्या कोडेक्समुळे ऑडिओ किंवा व्हिडिओ स्ट्रिम. चित्रपटांचे काहिक प्रकार "
+"चालवण्यासाठी अगाऊ प्लगइन्स् प्रतिष्ठापीत करणे आवश्यक आहे"
 
-#: ../data/totem.schemas.in.h:35
-#, fuzzy
-msgid "Whether to disable deinterlacing for interlaced movies"
-msgstr "पार्श्वभूमीतील इंजीन करीता सदोष निर्धारण कार्यान्वीत करायचे का"
+#: ../src/backend/bacon-video-widget.c:3436
+#| msgid ""
+#| "Cannot play this file over the network. Try downloading it to disk first."
+msgid ""
+"This file cannot be played over the network. Try downloading it locally "
+"first."
+msgstr ""
+"ह्या फाइलला नेटवर्कवर चालवणे शक्य नाही. त्यास प्रथम स्थानीयरित्या डाउनलोड "
+"करायचा प्रयत्न करा."
 
-#: ../data/totem.schemas.in.h:36
-#, fuzzy
-msgid "Whether to disable the keyboard shortcuts"
-msgstr "वापरकर्त्याची मुख्य संचयीकातील प्लगइन अकार्यान्वीत करायचे का"
+#: ../src/backend/bacon-video-widget.c:5494 ../src/totem-properties-view.c:227
+msgid "Surround"
+msgstr "भोवती"
 
-#: ../data/totem.schemas.in.h:37
-msgid "Whether to disable the plugins in the user's home directory"
-msgstr "वापरकर्त्याची मुख्य संचयीकातील प्लगइन अकार्यान्वीत करायचे का"
+#: ../src/backend/bacon-video-widget.c:5496 ../src/totem-properties-view.c:229
+msgid "Mono"
+msgstr "एकसंख्यी"
 
-#: ../data/totem.schemas.in.h:38
-msgid "Whether to enable debug for the playback engine"
-msgstr "पार्श्वभूमीतील इंजीन करीता सदोष निर्धारण कार्यान्वीत करायचे का"
+#: ../src/backend/bacon-video-widget.c:5781
+msgid "Media contains no supported video streams."
+msgstr "मिडिया मध्ये समर्थीत व्हिडियो प्रव्हा समाविष्टीत नाही."
 
-#: ../data/totem.schemas.in.h:39
+#: ../src/backend/bacon-video-widget.c:5963
 msgid ""
-"Whether to remember the position of played audio/video files when pausing or "
-"closing them."
-msgstr "स्तब्ध किंवा बंद करतेवेळी चालवलेल्या ऑडिओ/विडीओ फाइलचे ठिकाण लक्ष्यात ठेवायचे का."
-
-#: ../data/uri.ui.h:1
-msgid "Enter the _address of the file you would like to open:"
-msgstr "तुम्हाला उघडायची त्या फाइलचा पत्ता प्रविष्ट करा (_a):"
+"Some necessary plug-ins are missing. Make sure that the program is correctly "
+"installed."
+msgstr ""
+"काहिक आवश्यक प्लगइन्स् आढळले नाहीत. प्रोग्रमा योग्यरित्या प्रतिष्ठापीत आहे "
+"याची खात्री करा."
 
 #: ../src/eggdesktopfile.c:165
 #, c-format
@@ -968,102 +977,246 @@
 msgid "Unrecognized desktop file Version '%s'"
 msgstr "अनोळखी डेस्कटॉप फाइल आवृत्ती '%s'"
 
-#: ../src/eggdesktopfile.c:958
+#: ../src/eggdesktopfile.c:968
 #, c-format
 msgid "Starting %s"
 msgstr "%s सुरू करत आहे"
 
-#: ../src/eggdesktopfile.c:1100
+#: ../src/eggdesktopfile.c:1110
 #, c-format
 msgid "Application does not accept documents on command line"
 msgstr "ऍप्लिकेशन आदेशओळीवरून दस्तऐवज स्वीकारत नाही"
 
-#: ../src/eggdesktopfile.c:1168
+#: ../src/eggdesktopfile.c:1178
 #, c-format
 msgid "Unrecognized launch option: %d"
 msgstr "अनोळखी प्रक्षेपण पर्याय: %d"
 
-#: ../src/eggdesktopfile.c:1373
+#: ../src/eggdesktopfile.c:1383
 #, c-format
 msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
 msgstr "दस्तऐवजाचे URIs 'Type=Link' डेस्कटॉप नोंद करीता पाठवण्यास अशक्य"
 
-#: ../src/eggdesktopfile.c:1394
+#: ../src/eggdesktopfile.c:1404
 #, c-format
 msgid "Not a launchable item"
 msgstr "प्रक्षेपणजोगी घटक आढळले नाही"
 
-#: ../src/eggfileformatchooser.c:235
+#: ../src/eggfileformatchooser.c:240
 #, c-format
 msgid "File _Format: %s"
 msgstr "फाइल रूपण (_F): %s"
 
-#: ../src/eggfileformatchooser.c:374
+#: ../src/eggfileformatchooser.c:379
 msgid "All Files"
 msgstr "सर्व फाइल्स्"
 
-#: ../src/eggfileformatchooser.c:375
+#: ../src/eggfileformatchooser.c:380
 msgid "All Supported Files"
 msgstr "सर्व समर्थीत फाइल्स्"
 
-#: ../src/eggfileformatchooser.c:384
+#: ../src/eggfileformatchooser.c:389
 msgid "By Extension"
 msgstr "विस्तार प्रमाणे"
 
-#: ../src/eggfileformatchooser.c:399
+#: ../src/eggfileformatchooser.c:404
 msgid "File Format"
 msgstr "फाइल रूपण"
 
-#: ../src/eggfileformatchooser.c:417
+#: ../src/eggfileformatchooser.c:422
 msgid "Extension(s)"
 msgstr "विस्तार"
 
-#: ../src/eggfileformatchooser.c:651
+#. Translators: the parameter is a filename
+#: ../src/eggfileformatchooser.c:657
 #, c-format
 msgid ""
-"The program was not able to find out the file format you want to use for `%"
-"s'. Please make sure to use a known extension for that file or manually "
+"The program was not able to find out the file format you want to use for `"
+"%s'. Please make sure to use a known extension for that file or manually "
 "choose a file format from the list below."
 msgstr ""
 "`%s' साठी वापरण्याजोगी फाइल रूपण कार्यक्रमाला आढळले नाही. फाइलकरीता परिचीत "
-"विस्तारचा वापरण्याची कृपया खात्री करा किंवा खालील सूचीतून स्वयं फाइल रूपणची नीवड करा."
+"विस्तारचा वापरण्याची कृपया खात्री करा किंवा खालील सूचीतून स्वयं फाइल रूपणची "
+"नीवड करा."
 
-#: ../src/eggfileformatchooser.c:658
+#: ../src/eggfileformatchooser.c:664
 msgid "File format not recognized"
 msgstr "फाइल रूपण अनोळखी आहे"
 
-#: ../src/eggsmclient.c:225
+#: ../src/eggsmclient.c:226
 msgid "Disable connection to session manager"
 msgstr "सत्र व्यवस्थापकाशी जुळवणी अकार्यक्षम करा"
 
-#: ../src/eggsmclient.c:228
+#: ../src/eggsmclient.c:229
 msgid "Specify file containing saved configuration"
 msgstr "साठवलेली संरचना समाविष्ट असलेली फाइल ठरवा"
 
-#: ../src/eggsmclient.c:228
+#: ../src/eggsmclient.c:229
 msgid "FILE"
 msgstr "FILE"
 
-#: ../src/eggsmclient.c:231
+#: ../src/eggsmclient.c:232
 msgid "Specify session management ID"
 msgstr "सत्र व्यवस्थापन ID ठरवा"
 
-#: ../src/eggsmclient.c:231
+#: ../src/eggsmclient.c:232
 msgid "ID"
 msgstr "ID"
 
-#: ../src/eggsmclient.c:252
+#: ../src/eggsmclient.c:253
 msgid "Session management options:"
 msgstr "सत्र व्यवस्थापक पर्याय:"
 
-#: ../src/eggsmclient.c:253
+#: ../src/eggsmclient.c:254
 msgid "Show session management options"
 msgstr "सत्र व्यवस्थापक पर्याय दाखवा"
 
-#: ../src/totem-audio-preview.c:82
+#. hour:minutes:seconds
+#. Translators: This is a time format, like "9:05:02" for 9
+#. * hours, 5 minutes, and 2 seconds. You may change ":" to
+#. * the separator that your locale uses or use "%Id" instead
+#. * of "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:56
+#: ../src/plugins/skipto/totem-time-entry.c:57
+#, c-format
+msgctxt "long time format"
+msgid "%d:%02d:%02d"
+msgstr "%d:%02d:%02d"
+
+#. minutes:seconds
+#. Translators: This is a time format, like "5:02" for 5
+#. * minutes and 2 seconds. You may change ":" to the
+#. * separator that your locale uses or use "%Id" instead of
+#. * "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:65
+#, c-format
+msgctxt "short time format"
+msgid "%d:%02d"
+msgstr "%d:%02d"
+
+#. Title
+#. Artist
+#. Album
+#. Year
+#. Container
+#: ../src/properties/bacon-video-widget-properties.c:107
+#: ../src/properties/bacon-video-widget-properties.c:109
+#: ../src/properties/bacon-video-widget-properties.c:111
+#: ../src/properties/bacon-video-widget-properties.c:113
+#: ../src/properties/bacon-video-widget-properties.c:119
+msgid "Unknown"
+msgstr "अपरिचीत"
+
+#. Dimensions
+#: ../src/properties/bacon-video-widget-properties.c:122
+#| msgid "N/A"
+msgctxt "Dimensions"
+msgid "N/A"
+msgstr "N/A"
+
+#. Video Codec
+#: ../src/properties/bacon-video-widget-properties.c:124
+#| msgid "N/A"
+msgctxt "Video codec"
+msgid "N/A"
+msgstr "N/A"
+
+#: ../src/properties/bacon-video-widget-properties.c:127
+#| msgid "N/A"
+msgctxt "Video bit rate"
+msgid "N/A"
+msgstr "N/A"
+
+#: ../src/properties/bacon-video-widget-properties.c:130
+#: ../src/properties/bacon-video-widget-properties.c:240
+#| msgid "N/A"
+msgctxt "Frame rate"
+msgid "N/A"
+msgstr "N/A"
+
+#: ../src/properties/bacon-video-widget-properties.c:134
+#| msgid "N/A"
+msgctxt "Audio bit rate"
+msgid "N/A"
+msgstr "N/A"
+
+#. Audio Codec
+#: ../src/properties/bacon-video-widget-properties.c:136
+#| msgid "N/A"
+msgctxt "Audio codec"
+msgid "N/A"
+msgstr "N/A"
+
+#. Sample rate
+#: ../src/properties/bacon-video-widget-properties.c:138
+msgid "0 Hz"
+msgstr "0 Hz"
+
+#. Channels
+#: ../src/properties/bacon-video-widget-properties.c:140
+msgid "0 Channels"
+msgstr "0 मार्ग"
+
+#: ../src/properties/bacon-video-widget-properties.c:156
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d तास"
+msgstr[1] "%d तास"
+
+#: ../src/properties/bacon-video-widget-properties.c:158
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d मिनिट"
+msgstr[1] "%d मिनिट"
+
+#: ../src/properties/bacon-video-widget-properties.c:161
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d सेकंद"
+msgstr[1] "%d सेकंद"
+
+#. 5 hours 2 minutes 12 seconds
+#: ../src/properties/bacon-video-widget-properties.c:167
+#, c-format
+#| msgid "%s %s %s"
+msgctxt "time"
+msgid "%s %s %s"
+msgstr "%s %s %s"
+
+#. 2 minutes 12 seconds
+#: ../src/properties/bacon-video-widget-properties.c:170
+#, c-format
+#| msgid "%s %s"
+msgctxt "time"
+msgid "%s %s"
+msgstr "%s %s"
+
+#. 0 seconds
+#: ../src/properties/bacon-video-widget-properties.c:176
+msgid "0 seconds"
+msgstr "0 सेकंद"
+
+#: ../src/properties/bacon-video-widget-properties.c:237
+#, c-format
+#| msgid "%d frames per second"
+msgid "%d frame per second"
+msgid_plural "%d frames per second"
+msgstr[0] "दर सेकंदकरीता %d फ्रेम"
+msgstr[1] "दर सेकंदकरीता %d फ्रेम्स्"
+
+#: ../src/totem-audio-preview.c:137
 msgid "Audio Preview"
 msgstr "ऑडिओ पूर्वावलोकन"
 
+#: ../src/totem.c:240
+msgid "Verify your system installation. Totem will now exit."
+msgstr "तुमच्या प्रणालीचे प्रतिष्ठापना तपासा. टोटेम आता बाहेर पडेल."
+
 #: ../src/totem-cell-renderer-video.c:126
 msgid "Unknown video"
 msgstr "अपरिचीत व्हिडीओ"
@@ -1076,252 +1229,165 @@
 msgid "Cancel"
 msgstr "रद्द करा"
 
-#: ../src/totem-fullscreen.c:595
+#: ../src/totem-fullscreen.c:573
 msgid "No File"
 msgstr "फाइल नाही"
 
-#: ../src/totem-interface.c:170 ../src/totem-interface.c:202
+#: ../src/totem-interface.c:181 ../src/totem-interface.c:224
 #, c-format
 msgid "Couldn't load the '%s' interface. %s"
 msgstr "'%1$s' संवाद दाखल करू शकले नाही. %2$s"
 
-#: ../src/totem-interface.c:170
+#: ../src/totem-interface.c:181
 msgid "The file does not exist."
 msgstr "फाइल अस्तित्वात नाही."
 
-#: ../src/totem-interface.c:172 ../src/totem-interface.c:174
-#: ../src/totem-interface.c:204 ../src/totem-interface.c:206
+#: ../src/totem-interface.c:183 ../src/totem-interface.c:185
+#: ../src/totem-interface.c:226 ../src/totem-interface.c:228
 msgid "Make sure that Totem is properly installed."
 msgstr "टोटेम व्यवस्थित स्थापीत केले आहे ह्याची खात्री करा."
 
-#: ../src/totem-interface.c:317
+#: ../src/totem-interface.c:357
 msgid ""
 "Totem 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."
 msgstr ""
-"Totem मुक्त सॉफ्टवेअर आहे; तुम्ही याचे वितरण व/किंवा संपादन Free Software Foundation "
-"प्रकाशीत GNU General Public License च्या अंतर्गत; एकतर परवानातील आवृत्ती 2 , किंवा "
+"Totem मुक्त सॉफ्टवेअर आहे; तुम्ही याचे वितरण व/किंवा संपादन Free Software "
+"Foundation "
+"प्रकाशीत GNU General Public License च्या अंतर्गत; एकतर परवानातील आवृत्ती 2 , "
+"किंवा "
 "(तुमच्या पर्यायनुसारे) पुढील कुठल्याही आवृत्तीनुसारे करू शकता."
 
-#: ../src/totem-interface.c:321
+#: ../src/totem-interface.c:361
 msgid ""
 "Totem 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 General Public License for more "
 "details."
 msgstr ""
-"Totem चा वापर लाभदायी ठरावा या हेतुने त्याचे वितरन केले आहे, पण कुठल्याही हमी विना; "
-"व्यापारहेतु अंतर्भुतीत किंवा कुठल्याही हेतुकरीता वापरकरीतायेण्याजोगी हमी विना.  अधिक "
+"Totem चा वापर लाभदायी ठरावा या हेतुने त्याचे वितरन केले आहे, पण कुठल्याही हमी "
+"विना; "
+"व्यापारहेतु अंतर्भुतीत किंवा कुठल्याही हेतुकरीता वापरकरीतायेण्याजोगी हमी "
+"विना.  अधिक "
 "माहितीकरीता GNU General Public License पहा."
 
-#: ../src/totem-interface.c:325
+#: ../src/totem-interface.c:365
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Totem; if not, write to the Free Software Foundation, Inc., 59 Temple Place, "
 "Suite 330, Boston, MA  02111-1307  USA"
 msgstr ""
-"तुमच्याकडे Totem सह GNU General Public License ची एक प्रत असायला हवी; नसल्यास, "
+"तुमच्याकडे Totem सह GNU General Public License ची एक प्रत असायला हवी; "
+"नसल्यास, "
 "Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  "
 "02111-1307  USA कडे लिहून पाठवा"
 
-#: ../src/totem-interface.c:328
+#: ../src/totem-interface.c:368
 msgid ""
 "Totem contains an exception to allow the use of proprietary GStreamer "
 "plugins."
 msgstr ""
-"टोटेम मधला एक अपवाद असा की सर्वोतया मालकीचे GStreamer प्लगइनच्या वापर करीता दिली "
+"टोटेम मधला एक अपवाद असा की सर्वोतया मालकीचे GStreamer प्लगइनच्या वापर करीता "
+"दिली "
 "जाते."
 
-#: ../src/totem-menu.c:191
+#. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
+#: ../src/totem-menu.c:291
 msgid "None"
 msgstr "काहीच नाही"
 
-#. Translators:
-#. * This is not a JPEG image, but a disc image, for example,
-#. * an ISO file
-#: ../src/totem-menu.c:737
-#, fuzzy, c-format
-msgid "Play Image '%s'"
-msgstr "डिस्क '%s' चालवा"
-
-#: ../src/totem-menu.c:740 ../src/totem-menu.c:822
-#, c-format
-msgid "device%d"
-msgstr "साधन%d"
-
-#: ../src/totem-menu.c:819
-#, c-format
-msgid "Play Disc '%s'"
-msgstr "डिस्क '%s' चालवा"
-
-#. This lists the back-end type and version, such as
-#. * Movie Player using GStreamer 0.10.1
-#: ../src/totem-menu.c:1170
-#, c-format
-msgid "Movie Player using %s"
-msgstr "%s सह Movie Player वापरा"
+#. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
+#: ../src/totem-menu.c:296
+#| msgid "Auto"
+msgctxt "Language"
+msgid "Auto"
+msgstr "स्वयं"
 
-#: ../src/totem-menu.c:1174
+#: ../src/totem-menu.c:789
 msgid "Copyright © 2002-2009 Bastien Nocera"
 msgstr "सर्वहक्काधिकार © 2002-2009 Bastien Nocera"
 
-#: ../src/totem-menu.c:1179 ../browser-plugin/totem-plugin-viewer.c:1167
+#: ../src/totem-menu.c:794
 msgid "translator-credits"
 msgstr ""
-"संदिप शेडमाके , 2008; संदिप शेडमाके , 2008; संदिप शेडमाके <"
+"sshedmak@redhat."
 "com>, 2009, 2010."
 
-#: ../src/totem-menu.c:1183
+#: ../src/totem-menu.c:798
 msgid "Totem Website"
 msgstr "टोटेम संकेतस्थळ"
 
-#: ../src/totem-menu.c:1218
+#: ../src/totem-menu.c:829
 msgid "Configure Plugins"
 msgstr "प्लगइन संयोजीत करा"
 
+#: ../src/totem-object.c:162
+#, c-format
+msgid ""
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"%s\n"
+"उपलब्ध आदेश ओळ पर्याय पाहण्याकरीता '%s --help' चालवा.\n"
+
 #. Translators: %s is the totem version number
-#: ../src/totem-object.c:434
-#, fuzzy, c-format
+#: ../src/totem-object.c:591
+#, c-format
 msgid "Totem %s"
-msgstr "टोटेम संकेतस्थळ"
+msgstr "टोटेम %s"
 
-#: ../src/totem-object.c:1004 ../browser-plugin/totem-plugin-viewer.c:369
-msgid "Playing"
-msgstr "चालवित आहे"
-
-#: ../src/totem-object.c:1006 ../src/totem-options.c:52
+#: ../src/totem-object.c:1168 ../src/totem-options.c:52
 msgid "Pause"
 msgstr "स्तब्ध करा"
 
-#: ../src/totem-object.c:1011 ../browser-plugin/totem-plugin-viewer.c:365
-msgid "Paused"
-msgstr "स्तब्ध"
-
-#. Translators: this refers to a media file
-#: ../src/totem-object.c:1013 ../src/totem-object.c:1023
+#: ../src/totem-object.c:1175 ../src/totem-object.c:1185
 #: ../src/totem-options.c:51
-#: ../src/plugins/coherence_upnp/coherence_upnp.py:79
-#: ../src/plugins/coherence_upnp/coherence_upnp.py:91
 msgid "Play"
 msgstr "चालवा"
 
-#: ../src/totem-object.c:1018 ../src/totem-object.c:1618
-#: ../src/totem-statusbar.c:96 ../browser-plugin/totem-plugin-viewer.c:353
-msgid "Stopped"
-msgstr "थांबले आहे"
-
-#: ../src/totem-object.c:1099 ../src/totem-object.c:1126
-#: ../src/totem-object.c:1748 ../src/totem-object.c:1911
+#: ../src/totem-object.c:1267 ../src/totem-object.c:1294
+#: ../src/totem-object.c:1787 ../src/totem-object.c:1942
 #, c-format
 msgid "Totem could not play '%s'."
 msgstr "टोटेम '%1$s' चालवू शकले नाही."
 
-#: ../src/totem-object.c:1203
-#, c-format
-msgid ""
-"Totem could not play this media (%s) although a plugin is present to handle "
-"it."
-msgstr ""
-"मिडीया हाताळणी करीता योग्य प्लगइन उपलब्ध असल्यावरही टोटेम या प्रकारची मिडीया (%s) "
-"चालवू शकत नाही."
-
-#: ../src/totem-object.c:1204
-msgid ""
-"You might want to check that a disc is present in the drive and that it is "
-"correctly configured."
-msgstr ""
-"तुम्हाला बहुदा ड्राइव्ह मध्ये डिस्क आहे का याची तपासणी घ्याची असावी व ते सुस्थितरित्या "
-"संयोजीत आहे का याची तपासणीही घ्याची असेल."
-
-#: ../src/totem-object.c:1212
-msgid "More information about media plugins"
-msgstr "मिडीया प्लगइन विषयी अधिक माहिती"
-
-#: ../src/totem-object.c:1213
-msgid ""
-"Please install the necessary plugins and restart Totem to be able to play "
-"this media."
-msgstr "कृपया आवश्यक प्लगइन प्रतिष्ठापीत करा व ही मिडीया चालविण्याकरीता टोटेम पुनःसुरू करा."
-
-#: ../src/totem-object.c:1215
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because it does not have the "
-"appropriate plugins to be able to read from the disc."
-msgstr ""
-"टोटेम या प्रकारची मिडीया (%s) चालवू शकत नाही कारण त्याकडे डीस्क पासून वाचण्याकरीताचे "
-"योग्य प्लगइन नाही."
-
-#: ../src/totem-object.c:1217
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because you do not have the "
-"appropriate plugins to handle it."
-msgstr ""
-"टोटेम या प्रकारची मिडीया (%s) चालवू शकत नाही कारण त्याकडे हाताळण्याकरीताचे योग्य "
-"प्लगइन नाही."
-
-#: ../src/totem-object.c:1220
-#, c-format
-msgid "Totem cannot play this type of media (%s) because it is not supported."
-msgstr "टोटेम या प्रकारची मिडीया (%s) चालवू शकत नाही कराण प्रकार समर्थीत नाही."
-
-#: ../src/totem-object.c:1221
-msgid "Please insert another disc to play back."
-msgstr "चालविण्याकरीता कृपया आणखी डीस्क अंतर्भूत करा."
-
-#: ../src/totem-object.c:1257
-msgid "Totem was not able to play this disc."
-msgstr "टोटेम ही डिस्क चालवू शकले नाही."
-
-#: ../src/totem-object.c:1258 ../src/totem-object.c:4194
-msgid "No reason."
-msgstr "कारण नाही."
-
-#: ../src/totem-object.c:1272
-msgid "Totem does not support playback of Audio CDs"
-msgstr "टोटेम ऑडिओ CD चे गायन करीता समर्थन करीत नाही"
-
-#: ../src/totem-object.c:1273
-msgid "Please consider using a music player or a CD extractor to play this CD"
-msgstr "ही CD चालविण्याकरीता संगीत वादक किंवा CD एक्सट्रॅक्टरचा वापर करणे आवश्यक आहे"
-
-#: ../src/totem-object.c:1754
+#: ../src/totem-object.c:1793
 msgid "No error message"
 msgstr "त्रुटी संदेश नाही"
 
-#: ../src/totem-object.c:2140
+#: ../src/totem-object.c:2133
 msgid "Totem could not display the help contents."
 msgstr "टोटेम मदत अनुक्रम दर्शवू शकले नाही."
 
-#: ../src/totem-object.c:2495 ../src/totem-object.c:2497
-#: ../browser-plugin/totem-plugin-viewer.c:1470
-msgid "An error occurred"
-msgstr "त्रुटी निर्माण झाली"
-
-#: ../src/totem-object.c:4036 ../src/totem-object.c:4038
+#: ../src/totem-object.c:4019 ../src/totem-object.c:4021
 msgid "Previous Chapter/Movie"
 msgstr "पूर्वीचे पाठ/चित्रपट"
 
-#: ../src/totem-object.c:4045 ../src/totem-object.c:4047
+#: ../src/totem-object.c:4028 ../src/totem-object.c:4030
 msgid "Play / Pause"
 msgstr "चालवा / स्तब्ध"
 
-#: ../src/totem-object.c:4055 ../src/totem-object.c:4057
+#: ../src/totem-object.c:4038 ../src/totem-object.c:4040
 msgid "Next Chapter/Movie"
 msgstr "पुढचाचे पाठ/चित्रपट"
 
-#: ../src/totem-object.c:4069 ../src/totem-object.c:4071
+#. Translators: this is the accessibility text for the fullscreen button in the controls box in Totem's main window.
+#: ../src/totem-object.c:4051 ../src/totem-object.c:4053
 msgid "Fullscreen"
 msgstr "पडदाभर"
 
-#: ../src/totem-object.c:4194
+#: ../src/totem-object.c:4184
 msgid "Totem could not startup."
 msgstr "टोटेम सुरू होऊ शकले नाही."
 
-#: ../src/totem-open-location.c:179
+#: ../src/totem-object.c:4184
+msgid "No reason."
+msgstr "कारण नाही."
+
+#: ../src/totem-open-location.c:182
 msgid "Open Location..."
 msgstr "स्थळ उघडा..."
 
@@ -1373,10 +1439,7 @@
 msgid "Quit"
 msgstr "बाहेर पडा"
 
-#. Translators: this refers to a media file
 #: ../src/totem-options.c:63
-#: ../src/plugins/coherence_upnp/coherence_upnp.py:82
-#: ../src/plugins/coherence_upnp/coherence_upnp.py:94
 msgid "Enqueue"
 msgstr "रांगेत लावा"
 
@@ -1385,13 +1448,10 @@
 msgstr "बदलवा"
 
 #: ../src/totem-options.c:65
-msgid "Don't connect to an already-running instance"
-msgstr "आधिपासूनच कार्यरत घटनाशी जुळवू नका"
-
-#: ../src/totem-options.c:66
 msgid "Seek"
 msgstr "सीक"
 
+#. Translators: help for a (hidden) command line option to specify (the zero-based index of) a playlist entry to start playing once Totem's finished loading
 #: ../src/totem-options.c:67
 msgid "Playlist index"
 msgstr "वादकयादीची अनुक्रमणिका"
@@ -1400,131 +1460,161 @@
 msgid "Movies to play"
 msgstr "चालवण्याजोगी चलचित्र"
 
+#: ../src/totem-options.c:79
+msgid "- Play movies and songs"
+msgstr "- चित्रपट व गाणी चालवा"
+
+#: ../src/totem-options.c:142
+msgid "Can't enqueue and replace at the same time"
+msgstr "रांगेत लावणे व त्यास एकाचवेळी अदलाबदल करणे अशक्य"
+
 #. By extension entry
-#: ../src/totem-playlist.c:157
+#: ../src/totem-playlist.c:162
 msgid "MP3 ShoutCast playlist"
 msgstr "MP3 शाउटकास्ट वादकयादी"
 
-#: ../src/totem-playlist.c:158
+#: ../src/totem-playlist.c:163
 msgid "MP3 audio (streamed)"
 msgstr "MP3 ऑडिओ (स्ट्रीम्ड्)"
 
-#: ../src/totem-playlist.c:159
+#: ../src/totem-playlist.c:164
 msgid "MP3 audio (streamed, DOS format)"
 msgstr "MP3 ऑडिओ (स्ट्रीम्ड्, DOS रूपण)"
 
-#: ../src/totem-playlist.c:160
+#: ../src/totem-playlist.c:165
 msgid "XML Shareable Playlist"
 msgstr "XML सहभागीय वादकयादी"
 
 #. This is "Title 3", where title is a DVD title
 #. * Note: NOT a DVD chapter
-#: ../src/totem-playlist.c:359
+#: ../src/totem-playlist.c:348
 #, c-format
 msgid "Title %d"
 msgstr "शिर्षक %d"
 
-#: ../src/totem-playlist.c:458
+#: ../src/totem-playlist.c:447
 msgid "Could not save the playlist"
 msgstr "वादकयादी संचयीत करू शकले नाही"
 
-#: ../src/totem-playlist.c:1029
+#: ../src/totem-playlist.c:1022
 msgid "Save Playlist"
 msgstr "वादकयादी साठवा"
 
 #. translators: Playlist is the default saved playlist filename,
 #. * without the suffix
-#: ../src/totem-playlist.c:1041 ../src/totem-sidebar.c:145
+#: ../src/totem-playlist.c:1034 ../src/totem-playlist.c:1263
+#: ../src/totem-sidebar.c:145
 msgid "Playlist"
 msgstr "वादकयादी"
 
-#: ../src/totem-playlist.c:1864
-#, fuzzy, c-format
-msgid "The playlist '%s' could not be parsed. It might be damaged."
-msgstr "वापरायची यादी '%s' पार्स होत नाही, ती कदाचीत बिघडली असेल."
-
-#: ../src/totem-playlist.c:1865
-msgid "Playlist error"
-msgstr "वादकयादी मध्ये त्रुटी"
-
-#: ../src/totem-preferences.c:106
-msgid "Enable visual effects?"
-msgstr "दृष्य प्रभाव चालू करायचे का?"
-
-#: ../src/totem-preferences.c:108
-msgid ""
-"It seems you are running Totem remotely.\n"
-"Are you sure you want to enable the visual effects?"
-msgstr ""
-"टोटेमला दूर्रस्थरित्या चालविले जात आहे असे दिसून येते.\n"
-"तुम्हाला नक्की दृश्यीय प्रभाव कार्यान्वीत करायचे?"
-
-#: ../src/totem-preferences.c:386
-msgid "Changing the visuals effect type will require a restart to take effect."
-msgstr "दृश्य प्रभाव प्रकार बदल प्रभावी होण्याकरीता पुन्हसुरू करणे आवश्यक आहे."
+#: ../src/totem-playlist.c:1862
+#, c-format
+msgid "The playlist '%s' could not be parsed. It might be damaged."
+msgstr "वादकसूची '%s' वाचणे अशक्य. ते कदाचित दोषीत असावे."
 
-#: ../src/totem-preferences.c:470
-msgid ""
-"The change of audio output type will only take effect when Totem is "
-"restarted."
-msgstr "टोटेम पुन्हा सूरू केल्यावरच ऑडिओ आऊटपुट प्रकार मधिल बदल प्रभावी पडेल."
+#: ../src/totem-playlist.c:1863
+msgid "Playlist error"
+msgstr "वादकयादी मध्ये त्रुटी"
 
-#: ../src/totem-preferences.c:564
+#: ../src/totem-preferences.c:297
 msgid "Preferences"
 msgstr "प्राधान्यता"
 
-#: ../src/totem-preferences.c:725
+#: ../src/totem-preferences.c:445
 msgid "Select Subtitle Font"
 msgstr "उपशिर्षक फॉन्ट निवडा"
 
-#. FIXME this should be setting an error?
-#: ../src/totem-properties-main.c:114 ../src/totem-properties-view.c:83
-#: ../src/totem-properties-view.c:91
+#: ../src/totem-properties-main.c:116 ../src/totem-properties-view.c:269
 msgid "Audio/Video"
 msgstr "ऑडिओ/व्हिडीओ"
 
-#: ../src/totem-statusbar.c:91
+#: ../src/totem-properties-view.c:131
+msgid "N/A"
+msgstr "N/A"
+
+#: ../src/totem-properties-view.c:160
+#: ../src/plugins/properties/totem-movie-properties.c:152
+#: ../src/plugins/properties/totem-movie-properties.c:163
+#| msgid "N/A"
+msgctxt "Stream bit rate"
+msgid "N/A"
+msgstr "N/A"
+
+#: ../src/totem-properties-view.c:163
+#: ../src/plugins/properties/totem-movie-properties.c:152
+#: ../src/plugins/properties/totem-movie-properties.c:163
+#, c-format
+msgid "%d kbps"
+msgstr "%d kbps"
+
+#: ../src/totem-properties-view.c:180
+#: ../src/plugins/properties/totem-movie-properties.c:149
+#, c-format
+msgid "%d x %d"
+msgstr "%d x %d"
+
+#: ../src/totem-properties-view.c:212
+#: ../src/plugins/properties/totem-movie-properties.c:166
+#, c-format
+msgid "%d Hz"
+msgstr "%d Hz"
+
+#: ../src/totem-properties-view.c:219
+#: ../src/plugins/properties/totem-movie-properties.c:166
+#| msgid "N/A"
+msgctxt "Sample rate"
+msgid "N/A"
+msgstr "N/A"
+
+#: ../src/totem-properties-view.c:239
+#| msgid "N/A"
+msgctxt "Number of audio channels"
+msgid "N/A"
+msgstr "N/A"
+
+#: ../src/totem-statusbar.c:110
 msgid "0:00 / 0:00"
 msgstr "0:00 / 0:00"
 
-#: ../src/totem-statusbar.c:113
+#: ../src/totem-statusbar.c:133
 #, c-format
 msgid "%s (Streaming)"
 msgstr "%s (स्ट्रीमींग)"
 
 #. Elapsed / Total Length
-#: ../src/totem-statusbar.c:120 ../src/totem-time-label.c:64
+#: ../src/totem-statusbar.c:140 ../src/totem-time-label.c:64
 #, c-format
 msgid "%s / %s"
 msgstr "%s / %s"
 
 #. Seeking to Time / Total Length
-#: ../src/totem-statusbar.c:123 ../src/totem-time-label.c:67
+#: ../src/totem-statusbar.c:143 ../src/totem-time-label.c:67
 #, c-format
 msgid "Seek to %s / %s"
 msgstr "%s / %s करीता सीक"
 
-#: ../src/totem-statusbar.c:217
+#: ../src/totem-statusbar.c:239
 msgid "Buffering"
 msgstr "बफर करीत आहे"
 
 #. eg: 75 %
-#: ../src/totem-statusbar.c:228
+#: ../src/totem-statusbar.c:250
 #, c-format
-msgid "%d %%"
-msgstr "%d %%"
+msgid "%lf %%"
+msgstr "%lf %%"
 
 #. eg: Paused, 0:32 / 1:05
-#: ../src/totem-statusbar.c:303
+#: ../src/totem-statusbar.c:325
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
 #. eg: Buffering, 75 %
-#: ../src/totem-statusbar.c:308
+#: ../src/totem-statusbar.c:330
 #, c-format
-msgid "%s, %d %%"
-msgstr "%s, %d %%"
+#| msgid "%s, %d %%"
+msgid "%s, %f %%"
+msgstr "%s, %f %%"
 
 #: ../src/totem-subtitle-encoding.c:156
 msgid "Current Locale"
@@ -1667,818 +1757,691 @@
 msgid "Vietnamese"
 msgstr "वियेतनामी"
 
-#: ../src/totem-video-list.c:307
-msgid "No video URI"
-msgstr "व्हिडीओ URI आढळले नाही"
-
-#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
-#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
-#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
-#: ../src/totem-video-thumbnailer.c:672
-#, c-format
-msgid ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-msgstr ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-
-#: ../src/totem-video-thumbnailer.c:673
-msgid "Filename"
-msgstr "फाइलचेनाव"
-
-#: ../src/totem-video-thumbnailer.c:675
-msgid "Resolution"
-msgstr "रेजॉल्यूशन"
-
-#: ../src/totem-video-thumbnailer.c:678
-msgid "Duration"
-msgstr "कार्यकाळ"
-
-#: ../src/totem-uri.c:500
+#: ../src/totem-uri.c:343 ../src/plugins/chapters/totem-chapters.c:998
 msgid "All files"
 msgstr "सर्व फाइली"
 
-#: ../src/totem-uri.c:505
+#: ../src/totem-uri.c:348 ../src/plugins/chapters/totem-chapters.c:995
 msgid "Supported files"
 msgstr "मदत करणाऱ्या फाइल"
 
-#: ../src/totem-uri.c:517
+#: ../src/totem-uri.c:360
 msgid "Audio files"
 msgstr "ऑडिओ"
 
-#: ../src/totem-uri.c:525
+#: ../src/totem-uri.c:368
 msgid "Video files"
 msgstr "व्हिडीओ फाइल्स्"
 
-#: ../src/totem-uri.c:535
+#: ../src/totem-uri.c:378
 msgid "Subtitle files"
 msgstr "उपशिर्षक फाइल्स्"
 
-#: ../src/totem-uri.c:587
+#: ../src/totem-uri.c:430
 msgid "Select Text Subtitles"
 msgstr "मजकूर उपशिर्षक नीवडा"
 
-#: ../src/totem-uri.c:649
+#: ../src/totem-uri.c:495
 msgid "Select Movies or Playlists"
 msgstr "चित्रपट किंवा वादकसूची निवडा"
 
-#: ../src/totem.c:114
-msgid "Could not open link"
-msgstr "दुवा उघडा"
-
-#: ../src/totem.c:173 ../src/totem.c:199
-#: ../browser-plugin/totem-plugin-viewer.c:667
-#: ../browser-plugin/totem-plugin-viewer.c:1865
-msgid "Totem Movie Player"
-msgstr "टोटेम चित्रपट वादक"
-
-#: ../src/totem.c:174 ../browser-plugin/totem-plugin-viewer.c:2292
-msgid "Could not initialize the thread-safe libraries."
-msgstr "थ्रेड-सेफ लायब्ररी प्रारंभ करू शकले नाही."
-
-#: ../src/totem.c:174
-msgid "Verify your system installation. Totem will now exit."
-msgstr "तुमच्या प्रणालीचे प्रतिष्ठापना तपासा. टोटेम आता बाहेर पडेल."
-
-#. Handle command line arguments
-#: ../src/totem.c:182
-msgid "- Play movies and songs"
-msgstr "- चित्रपट व गाणी चालवा"
-
-#: ../src/totem.c:191
-#, c-format
-msgid ""
-"%s\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"%s\n"
-"उपलब्ध आदेश ओळ पर्याय पाहण्याकरीता '%s --help' चालवा.\n"
-
-#: ../src/totem.c:210
-msgid "Totem could not initialize the configuration engine."
-msgstr "संयोजना इंजिन टोटेम प्रारंभ करू शकले नाही."
-
-#: ../src/totem.c:211
-msgid "Make sure that GNOME is properly installed."
-msgstr "जिनोम व्यवस्थित स्थापीत आहे याची खात्री करा."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:1745
-msgid "Password requested for RTSP server"
-msgstr ""
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2954
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2958
-#, c-format
-msgid "Audio Track #%d"
-msgstr "ऑडिओ ट्रॅक #%d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2986
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2990
-#, c-format
-msgid "Subtitle #%d"
-msgstr "उपशिर्षक #%d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3399
-msgid ""
-"The requested audio output was not found. Please select another audio output "
-"in the Multimedia Systems Selector."
-msgstr ""
-"विनंतीकृत ऑडिओ आउटपुट आढळले नाही. कृपया मल्टिमिडीया प्रणाली निवडक मधिल अन्य ऑडिओ "
-"ऑउटपुट निवडा."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3404
-msgid "Location not found."
-msgstr "ठिकाण सापडले नाही."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3408
-msgid "Could not open location; you might not have permission to open the file."
-msgstr "स्थान उघडू शकले नाही; तुमच्याकडे फाइल उघडण्याची परवानगी कदाचीत नसावी."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3419
-msgid ""
-"The video output is in use by another application. Please close other video "
-"applications, or select another video output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"व्हिडिओ आउटपुट अन्य अनुप्रयोग द्वारे वापरले जात आहे. कृपया अन्य व्हिडीओ अनुप्रयोग बंद करा, "
-"किंवा मल्टिमिडीया प्रणाली निवडक मधिल अन्य ऑडिओ ऑउटपुट निवडा."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3425
-msgid ""
-"The audio output is in use by another application. Please select another "
-"audio output in the Multimedia Systems Selector. You may want to consider "
-"using a sound server."
-msgstr ""
-"ऑडिओ आउटपुट अन्य अनुप्रयोग द्वारे वापरले जात आहे. कृपया मल्टिमिडीया प्रणाली निवडक मधिल "
-"अन्य ऑडिओ ऑउटपुट निवडा. तुम्हच्याकडे अन्य श्राव्य सर्वर वापराचे पर्याय आहे."
+#: ../src/totem-uri.c:499
+msgid "Add Directory"
+msgstr "डिरेक्ट्री समाविष्ट करा"
 
-#. should be exactly one missing thing (source or converter)
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3443
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3449
-#, c-format
-msgid "The playback of this movie requires a %s plugin which is not installed."
-msgstr "या चित्रपट चालविण्याकरीता %s प्लगइनची आवश्यकता आहे जी प्रतिष्ठापीत नाही."
+#: ../src/totem-video-list.c:330
+msgid "No video URI"
+msgstr "व्हिडीओ URI आढळले नाही"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3450
+#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
+#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
+#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
+#: ../src/totem-video-thumbnailer.c:841
 #, c-format
 msgid ""
-"The playback of this movie requires the following decoders which are not "
-"installed:\n"
-"\n"
-"%s"
-msgstr ""
-"या चित्रपट चालविण्याकरीता खालिल डीकोडरची आवश्यकता आहे जी प्रतिष्ठापीत नाही:\n"
-"\n"
-"%s"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3475
-msgid "Cannot play this file over the network. Try downloading it to disk first."
-msgstr "नेटवर्कवरील फाइल वापरता येत नाही. चकतीवर प्रथ उतरवून घेण्याचा प्रयत्न करा."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3547
-msgid "Media file could not be played."
-msgstr "मिडिया फाइल वापरता आली नाही."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5814
-msgid "Surround"
-msgstr "भोवती"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5816
-msgid "Mono"
-msgstr "एकसंख्यी"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6163
-msgid "Too old version of GStreamer installed."
-msgstr "जीस्टीमरची अगोदरची जुनी आवृती स्थापित झाली आहे."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6170
-msgid "Media contains no supported video streams."
-msgstr "मिडिया मध्ये समर्थीत व्हिडियो प्रव्हा समाविष्टीत नाही."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6683
-msgid ""
-"Failed to create a GStreamer play object. Please check your GStreamer "
-"installation."
-msgstr ""
-"GStreamer चालविण्याकरती घटक निर्माण करण्यास अपयशी. कृपया GStreamer प्रतिष्ठापना "
-"तपासून पहा."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6797
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6932
-msgid ""
-"Failed to open video output. It may not be available. Please select another "
-"video output in the Multimedia Systems Selector."
-msgstr ""
-"व्हिडिओ आउपुट उघडण्यास अपयशी. ते उपलब्ध नसावे. कृपया मल्टिमिडीया प्रणाली निवडक मधिल "
-"अन्य ऑडिओ ऑउटपुट निवडा."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6809
-msgid ""
-"Could not find the video output. You may need to install additional "
-"GStreamer plugins, or select another video output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"व्हिडीओ आउपुट आढळले नाही. तुम्हाला अगाऊ GStreamer प्लगइन प्रतिष्ठापीत करायची आवश्यकता "
-"आहे, किंवा मल्टिमिडीया प्रणाली निवडक मधिल अन्य ऑडिओ ऑउटपुट निवडा."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6844
-msgid ""
-"Failed to open audio output. You may not have permission to open the sound "
-"device, or the sound server may not be running. Please select another audio "
-"output in the Multimedia Systems Selector."
-msgstr ""
-"ऑडिओ आउपुट उघडण्यास अपयशी. श्राव्य साधन उघडण्याकरीताचे लागणारी परवानगी तुमच्याकडे "
-"नाही, किंवा आवाज सर्वर कार्यरत नसावे. कृपया मल्टिमिडीया प्रणाली निवडक मधिल अन्य ऑडिओ "
-"ऑउटपुट निवडा."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6864
-msgid ""
-"Could not find the audio output. You may need to install additional "
-"GStreamer plugins, or select another audio output in the Multimedia Systems "
-"Selector."
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 msgstr ""
-"ऑडिओ आउपुट आढळले नाही. तुम्हाला अगाऊ GStreamer प्लगइन प्रतिष्ठापीत करायची आवश्यकता "
-"आहे, किंवा मल्टिमिडीया प्रणाली निवडक मधिल अन्य ऑडिओ ऑउटपुट निवडा."
-
-#. hour:minutes:seconds
-#. Translators: This is a time format, like "9:05:02" for 9
-#. * hours, 5 minutes, and 2 seconds. You may change ":" to
-#. * the separator that your locale uses or use "%Id" instead
-#. * of "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:91 ../src/backend/video-utils.c:108
-#, c-format
-msgctxt "long time format"
-msgid "%d:%02d:%02d"
-msgstr "%d:%02d:%02d"
-
-#. minutes:seconds
-#. Translators: This is a time format, like "5:02" for 5
-#. * minutes and 2 seconds. You may change ":" to the
-#. * separator that your locale uses or use "%Id" instead of
-#. * "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:100
-#, c-format
-msgctxt "short time format"
-msgid "%d:%02d"
-msgstr "%d:%02d"
-
-#: ../src/backend/video-utils.c:138
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d तास"
-msgstr[1] "%d तास"
-
-#: ../src/backend/video-utils.c:140
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d मिनिट"
-msgstr[1] "%d मिनिट"
-
-#: ../src/backend/video-utils.c:143
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d सेकंद"
-msgstr[1] "%d सेकंद"
-
-#. hour:minutes:seconds
-#: ../src/backend/video-utils.c:149
-#, c-format
-msgid "%s %s %s"
-msgstr "%1$s %2$s %3$s"
-
-#. minutes:seconds
-#: ../src/backend/video-utils.c:152
-#, c-format
-msgid "%s %s"
-msgstr "%1$s %2$s"
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 
-#. seconds
-#: ../src/backend/video-utils.c:155
-#, c-format
-msgid "%s"
-msgstr "%1$s"
+#: ../src/totem-video-thumbnailer.c:842
+msgid "Filename"
+msgstr "फाइलचेनाव"
 
-#: ../src/plugins/bemused/bemused.totem-plugin.in.h:1
-msgid "Bemused"
-msgstr "Bemused"
+#: ../src/totem-video-thumbnailer.c:844
+msgid "Resolution"
+msgstr "रेजॉल्यूशन"
 
-#: ../src/plugins/bemused/bemused.totem-plugin.in.h:2
-msgid "Control Totem through a mobile phone with a Bemused client"
-msgstr "टोटेमला मोबाईल फोनच्या द्वारे Bemused क्लाऐंटचा वापर करून नियंत्रीत करा"
+#: ../src/totem-video-thumbnailer.c:847
+msgid "Duration"
+msgstr "कार्यकाळ"
 
-#: ../src/plugins/bemused/totem-bemused.c:179
-#, c-format
-msgid "Untitled %d"
-msgstr "शिर्षकहीन %d"
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:1
+msgid "Apple Trailers"
+msgstr "ॲपल ट्रैलर्स्"
+
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:2
+msgid "Sets the user agent for the Apple Trailers site"
+msgstr "ॲपल ट्रैलर्स् स्थळकरीता युजर एजेंट ठरवतो"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:1
+#| msgid "Download Movie Subtitles"
+msgid "Autoload Subtitles"
+msgstr "उपशीर्षक स्वयंलोड करा"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:2
+#| msgid "Downloading the subtitles..."
+msgid "Autoloads text subtitles"
+msgstr "उपशीर्षक स्वयंलोड करा"
 
-#: ../src/plugins/bemused/totem-bemused.c:601
-msgid "Totem Bemused Server"
-msgstr "टोटेम Bemused सर्वर"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
+msgid "Video Disc Recorder"
+msgstr "व्हिडीओ डिस्क रेकॉर्डर"
 
-#. FIXME version
-#: ../src/plugins/bemused/totem-bemused.c:603
-msgid "Totem Bemused Server version 1.0"
-msgstr "टोटेम Bemused सर्वर आवृत्ती 1.0"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
+msgid "Records (S)VCDs or video DVDs"
+msgstr "(S)VCDs किंवा व्हिडीओ DVDs रेकॉर्ड करतो"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:79
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:65
 msgid "_Create Video Disc..."
 msgstr "व्हिडीओ डिस्क निर्माण करा (_C)..."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:80
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:66
 msgid "Create a video DVD or a (S)VCD from the currently opened movie"
 msgstr "सध्या उघडलेल्या चलचित्रपासून व्हिडीओ DVD किंवा (S)VCD निर्माण करा"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:82
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:68
 msgid "Copy Vide_o DVD..."
 msgstr "व्हिडीओ DVD चे प्रत बनवा (_o)..."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:83
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:69
 msgid "Copy the currently playing video DVD"
 msgstr "सध्याचे कार्यरत व्हिडीओ DVD चे प्रत बनवा"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:85
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:71
 msgid "Copy (S)VCD..."
 msgstr "(S)VCD चे प्रत बनवा..."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:86
-msgid "Copy the currently playing (S)VCD"
-msgstr "सध्या चालत असलेल्या (S)VCD चे प्रत बनवा"
-
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:126
-msgid "The video disc could not be duplicated."
-msgstr "व्हिडीओ डिस्कचे हुबेहुब प्रत बनवणे अशक्य."
-
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:130
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:281
-msgid "The movie could not be recorded."
-msgstr "चित्रपटला रेकॉर्ड करणे अशक्य."
-
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:162
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:172
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:268
-msgid "Unable to write a project."
-msgstr "प्रकल्प लिहण्यास अशक्य."
-
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.totem-plugin.in.h:1
-msgid "Records (S)VCDs or video DVDs"
-msgstr "(S)VCDs किंवा व्हिडीओ DVDs रेकॉर्ड करतो"
-
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.totem-plugin.in.h:2
-msgid "Video Disc Recorder"
-msgstr "व्हिडीओ डिस्क रेकॉर्डर"
-
-#. Translators: this refers to a media file
-#: ../src/plugins/coherence_upnp/coherence_upnp.py:100
-msgid "Delete"
-msgstr "नष्ट करा"
-
-#: ../src/plugins/coherence_upnp/coherence_upnp.py:111
-#: ../src/plugins/coherence_upnp/coherence_upnp.totem-plugin.in.h:2
-msgid "Coherence DLNA/UPnP Client"
-msgstr "Coherence DLNA/UPnP क्लाएंट"
-
-#: ../src/plugins/coherence_upnp/coherence_upnp.totem-plugin.in.h:1
-msgid "A DLNA/UPnP client for Totem powered by Coherence"
-msgstr "Coherence कडून Totem सक्षम करीता DLNA/UPnP क्लाएंट"
-
-#: ../src/plugins/dbus-service/dbus-service.totem-plugin.in.h:1
-msgid "D-Bus Service"
-msgstr "D-Bus सेवा"
-
-#: ../src/plugins/dbus-service/dbus-service.totem-plugin.in.h:2
-#, fuzzy
-msgid ""
-"Plugin for sending notifications of currently playing movies to the D-Bus "
-"subsystem."
-msgstr "D-Bus उपप्रणालीसाठी सध्याचे-चालू असलेल्या चित्रपटांसाठी सूचना पाठवण्यासाठी प्लगइन."
-
-#: ../src/plugins/galago/galago.totem-plugin.in.h:1
-msgid "Instant Messenger status"
-msgstr "त्वारीत संदेश वाहकाची स्थिती"
-
-#: ../src/plugins/galago/galago.totem-plugin.in.h:2
-msgid "Set your Instant Messenger status to away when a movie is playing"
-msgstr "चित्रपट चालवितेवेळी त्वरीत संदेश पाठवाची स्थिती उपलब्ध नाही म्हणून निश्चित करा"
-
-#: ../src/plugins/galago/totem-galago.c:162
-msgid "Error loading Galago plugin"
-msgstr ""
-
-#: ../src/plugins/galago/totem-galago.c:162
-msgid "Could not connect to the Galago daemon."
-msgstr "Galago डीमनशी जुळवणी करू शकले नाही."
-
-#: ../src/plugins/gromit/gromit.totem-plugin.in.h:1
-msgid "Gromit Annotations"
-msgstr "Gromit टिप्पणी"
-
-#: ../src/plugins/gromit/gromit.totem-plugin.in.h:2
-msgid "Presentation helper to make annotations on screen"
-msgstr "टिप्पणी पडद्यावर दर्शविण्याकरीताचे प्रस्तुती मदतकार"
-
-#: ../src/plugins/gromit/totem-gromit.c:268
-msgid "The gromit binary was not found."
-msgstr "gromit बायनरी आढळले नाही."
-
-#. Add the interface to Totem's sidebar
-#: ../src/plugins/iplayer/iplayer.totem-plugin.in.h:1
-#: ../src/plugins/iplayer/iplayer.py:40
-msgid "BBC iPlayer"
-msgstr "BBC iPlayer"
-
-#: ../src/plugins/iplayer/iplayer.totem-plugin.in.h:2
-msgid "Stream BBC programs from the last 7 days from the BBC iPlayer service."
-msgstr "BBC iPlayer सेवाचा वापर करून शेवटच्या 7 दिवसांचे BBC कार्यक्रम स्ट्रीम."
-
-#: ../src/plugins/iplayer/iplayer.py:65
-#, fuzzy
-msgid "Error listing channel categories"
-msgstr "वाहिनी विभागची सूची निर्माण करतेवेळी त्रुटी"
-
-#: ../src/plugins/iplayer/iplayer.py:65
-msgid ""
-"There was an unknown error getting the list of television channels available "
-"on BBC iPlayer."
-msgstr "BBC iPlayer वरील उपलब्ध टेलीवीशन वाहिनींची सूची प्राप्त करतवेळी अपरिचीत त्रुटी आढळली."
-
-#. Append a dummy child row so that the expander's visible; we can
-#. then queue off the expander to load the programme listing for this category
-#: ../src/plugins/iplayer/iplayer.py:73
-msgid "Loading…"
-msgstr "लोड करत आहे…"
-
-#: ../src/plugins/iplayer/iplayer.py:114
-msgid "Error getting programme feed"
-msgstr "प्रोग्राम फीड प्राप्त करतेवेळी त्रुटी"
-
-#: ../src/plugins/iplayer/iplayer.py:114
-#, fuzzy
-msgid ""
-"There was an error getting the list of programmes for this channel and "
-"category combination."
-msgstr ""
-"या वाहिनी किंवा विभाग जोडणी करीता प्रोग्रामची सूची प्राप्त करतेवेळी अपरिचीत त्रुटी "
-"आढळली."
-
-#: ../src/plugins/iplayer/iplayer2.py:299
-#, python-format
-msgid "Programme unavailable (\"%s\")"
-msgstr "कार्यक्रम अनुपलब्ध (\"%s\")"
-
-#: ../src/plugins/jamendo/jamendo.ui.h:1
-msgid "By artist"
-msgstr "कलाकार कडून"
-
-#: ../src/plugins/jamendo/jamendo.ui.h:2
-msgid "By tag"
-msgstr "टॅग कडून"
-
-#: ../src/plugins/jamendo/jamendo.ui.h:3
-msgid "Jamendo Album Page"
-msgstr "Jamendo अल्बम पान"
-
-#: ../src/plugins/jamendo/jamendo.ui.h:4
-msgid "Latest Releases"
-msgstr "अलिकडील प्रकाशन"
-
-#: ../src/plugins/jamendo/jamendo.ui.h:5
-#, fuzzy
-msgid "Number of albums to _retrieve:"
-msgstr "पुनःप्राप्य करण्याजोगी अल्बमची संख्या (_r)"
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:72
+msgid "Copy the currently playing (S)VCD"
+msgstr "सध्या चालत असलेल्या (S)VCD चे प्रत बनवा"
 
-#: ../src/plugins/jamendo/jamendo.ui.h:6
-msgid "Popular"
-msgstr "प्रतिष्ठीत"
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:136
+msgid "The video disc could not be duplicated."
+msgstr "व्हिडीओ डिस्कचे हुबेहुब प्रत बनवणे अशक्य."
 
-#: ../src/plugins/jamendo/jamendo.ui.h:7
-#, fuzzy
-msgid "Preferred audio _format:"
-msgstr "पसंतीचे ऑडिओ रूपण (_f)"
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:138
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:283
+msgid "The movie could not be recorded."
+msgstr "चित्रपटला रेकॉर्ड करणे अशक्य."
 
-#: ../src/plugins/jamendo/jamendo.ui.h:8
-#: ../src/plugins/tracker/totem-tracker-widget.c:521
-#: ../src/plugins/youtube/youtube.ui.h:2
-msgid "Search Results"
-msgstr "शोध परीणाम"
-
-#: ../src/plugins/jamendo/jamendo.ui.h:10
-msgid "_Open Jamendo Album Page in Browser"
-msgstr "अल्बम पान ब्राउजर मध्ये उघडा (_O)"
-
-#: ../src/plugins/jamendo/jamendo.totem-plugin.in.h:1
-#: ../src/plugins/jamendo/jamendo.py:126
-msgid "Jamendo"
-msgstr "Jamendo"
-
-#: ../src/plugins/jamendo/jamendo.totem-plugin.in.h:2
-msgid "Listen to the large collection of Creative Commons licensed music on Jamendo."
-msgstr "Jamendo वर Creative Commons करारबद्ध संगीतचे मोठे संग्रह ऐका."
-
-#: ../src/plugins/jamendo/jamendo.py:58
-msgid "You need to install the Python simplejson module."
-msgstr "तुम्हाला Python simplejson घटक प्रतिष्ठापीत करावे लागेल."
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:164
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:174
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:270
+msgid "Unable to write a project."
+msgstr "प्रकल्प लिहण्यास अशक्य."
 
-#: ../src/plugins/jamendo/jamendo.py:277 ../src/plugins/jamendo/jamendo.py:290
-#: ../src/plugins/jamendo/jamendo.py:313
-#, python-format
-msgid "Artist: %s"
-msgstr "कलाकार: %s"
+#: ../src/plugins/chapters/chapters-edit.ui.h:1
+msgid "Name for new chapter:"
+msgstr "नवीन अध्यायकरीता नाव:"
+
+#: ../src/plugins/chapters/chapters-list.ui.h:1
+#| msgid "_Remove"
+msgid "_Remove Chapter"
+msgstr "अध्याय काढून टाका (_R)"
+
+#: ../src/plugins/chapters/chapters-list.ui.h:2
+#| msgid "Remove file from playlist"
+msgid "Remove the chapter from the list"
+msgstr "सूचीतून अध्याय काढून टाका"
+
+#: ../src/plugins/chapters/chapters-list.ui.h:3
+#| msgid "Go to the chapter menu"
+msgid "_Go to Chapter"
+msgstr "अध्यायकडे जा (_G)"
+
+#: ../src/plugins/chapters/chapters-list.ui.h:4
+#| msgid "Go to the chapter menu"
+msgid "Go to the chapter in the movie"
+msgstr "चित्रपटात ह्या अध्यायवर जा"
+
+#: ../src/plugins/chapters/chapters-list.ui.h:5
+msgid "Add Chapter..."
+msgstr "अध्याय समाविष्ट करा..."
+
+#: ../src/plugins/chapters/chapters-list.ui.h:6
+#| msgid "Remove"
+msgid "Remove Chapter"
+msgstr "अध्याय काढून टाका"
+
+#: ../src/plugins/chapters/chapters-list.ui.h:7
+#| msgid "Go to the chapter menu"
+msgid "Go to Chapter"
+msgstr "अध्यायकडे जा"
+
+#: ../src/plugins/chapters/chapters-list.ui.h:8
+#| msgid "0 Channels"
+msgid "Save Changes"
+msgstr "बदल साठवा"
+
+#: ../src/plugins/chapters/chapters-list.ui.h:9
+msgid "No chapter data"
+msgstr "अध्याय डाटा आढळले नाही"
+
+#: ../src/plugins/chapters/chapters-list.ui.h:10
+msgid "Load Chapters..."
+msgstr "अध्याय लोड करा..."
+
+#: ../src/plugins/chapters/chapters-list.ui.h:11
+msgid "Load chapters from an external CMML file"
+msgstr "बाहेरिल CMML फाइलपासून अध्याय लोड करा"
+
+#: ../src/plugins/chapters/chapters-list.ui.h:12
+msgid "Add New Chapters"
+msgstr "नवीन अध्याय समाविष्ट करा"
+
+#: ../src/plugins/chapters/chapters-list.ui.h:13
+#| msgid "Next chapter or movie"
+msgid "Create a new chapter list for the movie"
+msgstr "चित्रपटकरीता नवीन अध्याय सूची निर्माण करा"
+
+#: ../src/plugins/chapters/chapters.plugin.in.h:1
+#: ../src/plugins/chapters/totem-chapters.c:1139
+#| msgid "_Chapter Menu"
+msgid "Chapters"
+msgstr "अध्याय"
+
+#: ../src/plugins/chapters/chapters.plugin.in.h:2
+#| msgid "Next chapter or movie"
+msgid "Support chapter markers in movies"
+msgstr "चित्रपटात अध्याय मार्करकरीता समर्थन"
+
+#: ../src/plugins/chapters/totem-chapters.c:56
+#, c-format
+msgid ""
+"Title: %s\n"
+"Start time: %s"
+msgstr ""
+"शीर्षक: %s\n"
+"सुरूवातीचा वेळ: %s"
+
+#: ../src/plugins/chapters/totem-chapters.c:328
+msgid "Error while reading file with chapters"
+msgstr "अध्यायसह फाइल वाचतेवेळी त्रुटी"
+
+#: ../src/plugins/chapters/totem-chapters.c:543
+msgid "Chapter with the same time already exists"
+msgstr "समान वेळसह अध्याय आधिपासूनच अस्तित्वात आहे"
+
+#: ../src/plugins/chapters/totem-chapters.c:544
+msgid "Try another name or remove an existing chapter."
+msgstr "इतर नाव किंवा अस्तित्वातील अध्याय वापरून पहा."
+
+#: ../src/plugins/chapters/totem-chapters.c:717
+msgid "Error while writing file with chapters"
+msgstr "अध्यायसह फाइलकरीता लिहतेवेळी त्रुटी"
+
+#: ../src/plugins/chapters/totem-chapters.c:842
+#| msgid "An error occurred while fetching albums."
+msgid "Error occurred while saving chapters"
+msgstr "अध्याय साठवतेवेळी त्रुटी आढळली"
+
+#: ../src/plugins/chapters/totem-chapters.c:843
+msgid ""
+"Please check you have permission to write to the folder containing the movie."
+msgstr ""
+"चित्रपट समाविष्टीत असलेल्या फोल्डरकरीता लिहण्यासाठी तुमच्याकडे परवानगी आहे "
+"कृपया याची तपासणी करा."
+
+#: ../src/plugins/chapters/totem-chapters.c:976
+#| msgid "Open a file"
+msgid "Open Chapter File"
+msgstr "अध्याय फाइल उघडा"
+
+#: ../src/plugins/chapters/totem-chapters.c:1093
+#| msgid "Save Screenshot"
+msgid "Chapter Screenshot"
+msgstr "अध्याय स्क्रीनशॉट"
+
+#: ../src/plugins/chapters/totem-chapters.c:1104
+#| msgid "_Chapter Menu"
+msgid "Chapter Title"
+msgstr "अध्याय शीर्षक"
+
+#: ../src/plugins/chapters/totem-chapters.c:1184
+msgid "Save changes to chapter list before closing?"
+msgstr "बंद करण्यापूर्वी अध्याय सूचीकरीता बदल साठवा?"
+
+#. Translators: close Totem without saving changes to the chapter list of the current movie.
+#: ../src/plugins/chapters/totem-chapters.c:1189
+msgid "Close without Saving"
+msgstr "न साठवता बंद करा"
+
+#. Translators: save changes to the chapter list of the current movie before closing Totem.
+#: ../src/plugins/chapters/totem-chapters.c:1191
+msgid "Save"
+msgstr "साठवा"
+
+#: ../src/plugins/chapters/totem-chapters.c:1194
+msgid "If you don't save, changes to the chapter list will be lost."
+msgstr "न साठवल्यास, अध्याय सूचीरीता बदल गमवाल."
+
+#: ../src/plugins/chapters/totem-cmml-parser.c:651
+msgid "Failed to parse CMML file"
+msgstr "CMML फाइल वाचण्यास अपयशी"
+
+#: ../src/plugins/chapters/totem-edit-chapter.c:95
+msgid "Add Chapter"
+msgstr "अध्याय समाविष्ट करा"
 
-#. Translators: this is the release date of an album in Python strptime format
-#: ../src/plugins/jamendo/jamendo.py:283
-msgid "%Y-%m-%d"
-msgstr "%Y-%m-%d"
+#: ../src/plugins/dbusservice/dbusservice.plugin.in.h:1
+msgid "D-Bus Service"
+msgstr "D-Bus सेवा"
 
-#. Translators: this is the release time of an album in Python strftime format
-#: ../src/plugins/jamendo/jamendo.py:285
-#, python-format
-msgid "%x"
-msgstr "%x"
+#: ../src/plugins/dbusservice/dbusservice.plugin.in.h:2
+msgid ""
+"Plugin for sending notifications of currently playing movies to the D-Bus "
+"subsystem."
+msgstr ""
+"D-Bus उपप्रणालीसाठी सध्या सुरू असलेल्या चित्रपटांकरीता सूचना पाठवण्यासाठीचे "
+"प्लगइन."
 
-#: ../src/plugins/jamendo/jamendo.py:291
+#: ../src/plugins/dbusservice/dbusservice.py:213
+#: ../src/plugins/dbusservice/dbusservice.py:243
 #, python-format
-msgid "Genre: %s"
-msgstr "वर्ग: %s"
+msgid "The MediaPlayer2 object does not implement the ‘%s’ interface"
+msgstr "मिडियावादक 2 ऑब्जेक्टने ‘%s’ संवाद लागू केला नाही"
 
-#: ../src/plugins/jamendo/jamendo.py:292
+#: ../src/plugins/dbusservice/dbusservice.py:222
 #, python-format
-msgid "Released on: %s"
-msgstr "प्रकाशीत केले: %s"
+msgid "The property ‘%s’ is not writeable."
+msgstr "गुणधर्म ‘%s’ लेखनजोगी नाही."
 
-#: ../src/plugins/jamendo/jamendo.py:293
+#: ../src/plugins/dbusservice/dbusservice.py:238
 #, python-format
-msgid "License: %s"
-msgstr "करार: %s"
+msgid "Unknown property ‘%s’ requested of a MediaPlayer 2 object"
+msgstr "मिडियावादक 2 ऑब्जेक्टने अपरिचीत गुणधर्म ‘%s’ करीता विनंती केली"
 
-#. track title
-#. Translators: this is the title of a track in Python format
-#. (first argument is the track number, second is the track title)
-#: ../src/plugins/jamendo/jamendo.py:305
+#: ../src/plugins/dbusservice/dbusservice.py:341
 #, python-format
-msgid "%02d. %s"
-msgstr "%02d. %s"
+msgid "The URI ‘%s’ is not supported."
+msgstr "URI ‘%s’ समर्थीत नाही."
 
-#: ../src/plugins/jamendo/jamendo.py:312
-#, python-format
-msgid "Album: %s"
-msgstr "अल्बम: %s"
+#: ../src/plugins/grilo/grilo.plugin.in.h:1
+#| msgid "YouTube Browser"
+msgid "Grilo Browser"
+msgstr "ग्रिलो ब्राउजर"
+
+#: ../src/plugins/grilo/grilo.plugin.in.h:2
+#| msgid "A plugin to let you browse YouTube videos."
+msgid "A plugin to let you browse media content from various sources"
+msgstr ""
+"विविध स्रोतपासून मिडिया अंतर्भुत माहिती तपासणीकरीता परवानगी देणारे प्लगइन"
+
+#: ../src/plugins/grilo/grilo.ui.h:1
+#| msgid "_Add to Playlist"
+msgid "Add to Playlist"
+msgstr "वादकसूचीत समाविष्ट करा"
+
+#: ../src/plugins/grilo/grilo.ui.h:2
+#| msgid "_Copy Location"
+msgid "Copy Location"
+msgstr "ठिकाणाचे प्रत बनवा"
+
+#: ../src/plugins/grilo/grilo.ui.h:3 ../src/plugins/grilo/totem-grilo.c:1184
+msgid "Browse"
+msgstr "तपासणी करा"
+
+#: ../src/plugins/grilo/grilo.ui.h:4 ../src/plugins/grilo/totem-grilo.c:1227
+#| msgid "Local Search"
+msgid "Search"
+msgstr "शोधा"
+
+#: ../src/plugins/grilo/totem-grilo.c:454
+#| msgid "File Error"
+msgid "Browse Error"
+msgstr "त्रुटीची तपासणी करा"
+
+#: ../src/plugins/grilo/totem-grilo.c:609
+#| msgid "File Error"
+msgid "Search Error"
+msgstr "सर्च त्रुटी"
 
-#: ../src/plugins/jamendo/jamendo.py:314
-#, python-format
-msgid "Duration: %s"
-msgstr "कार्यकाळ: %s"
+#: ../src/plugins/gromit/gromit.plugin.in.h:1
+msgid "Gromit Annotations"
+msgstr "Gromit टिप्पणी"
 
-#: ../src/plugins/jamendo/jamendo.py:371
-msgid "Fetching albums, please wait..."
-msgstr "अल्बम्स् प्राप्त करत आहे, कृपया थांबा..."
+#: ../src/plugins/gromit/gromit.plugin.in.h:2
+msgid "Presentation helper to make annotations on screen"
+msgstr "टिप्पणी पडद्यावर दर्शविण्याकरीताचे प्रस्तुती मदतकार"
 
-#: ../src/plugins/jamendo/jamendo.py:426
-#, python-format
-msgid ""
-"Failed to connect to Jamendo server.\n"
-"%s."
-msgstr ""
-"Jamendo सर्व्हरशी जुळवणी करण्यास अपयशी.\n"
-"%s."
+#: ../src/plugins/gromit/totem-gromit.c:231
+msgid "The gromit binary was not found."
+msgstr "gromit बायनरी आढळले नाही."
 
-#: ../src/plugins/jamendo/jamendo.py:428
-#, python-format
-msgid "The Jamendo server returned code %s."
-msgstr "Jamendo सर्व्हरने कोड %s पाठवले."
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
+#| msgid "Instant Messenger status"
+msgid "Instant Messenger Status"
+msgstr "इंस्टंट मेसेंजर स्थिती"
 
-#: ../src/plugins/jamendo/jamendo.py:432
-msgid "An error occurred while fetching albums."
-msgstr "अल्बम्स् प्राप्त करतेवेळी त्रुटी आढळली."
-
-#. Translators: time formatting (in Python strftime format) for the Jamendo plugin
-#. for times longer than an hour
-#: ../src/plugins/jamendo/jamendo.py:636
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
-
-#. Translators: time formatting (in Python strftime format) for the Jamendo plugin
-#. for times shorter than an hour
-#: ../src/plugins/jamendo/jamendo.py:639
-msgid "%M:%S"
-msgstr "%M:%S"
-
-#. Translators: If Jamendo supports your language, replace "en" with the language code, enclosed
-#. in slashes, used to view pages in your language on the Jamendo website. e.g. For French, "en"
-#. would be translated to "fr", as Jamendo uses that in its URLs:
-#. http://www.jamendo.com/fr/album/4818
-#. Compared to:
-#. http://www.jamendo.com/en/album/4818
-#. If Jamendo doesn't support your language, *do not translate this string*!
-#: ../src/plugins/jamendo/jamendo.py:689
-msgid "en"
-msgstr "en"
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
+msgid "Set your Instant Messenger status to away when a movie is playing"
+msgstr ""
+"चित्रपट चालवितेवेळी त्वरीत संदेश पाठवाची स्थिती उपलब्ध नाही म्हणून निश्चित करा"
 
-#: ../src/plugins/lirc/lirc.totem-plugin.in.h:1
+#: ../src/plugins/lirc/lirc.plugin.in.h:1
 msgid "Infrared Remote Control"
 msgstr "इंफ्रारेड दुर्रस्थ नियंत्रक"
 
-#: ../src/plugins/lirc/lirc.totem-plugin.in.h:2
+#: ../src/plugins/lirc/lirc.plugin.in.h:2
 msgid "Support infrared remote control"
 msgstr "इंफ्रारेड दुर्रस्थ नियंत्रकास समर्थन द्या"
 
-#: ../src/plugins/lirc/totem-lirc.c:264
+#: ../src/plugins/lirc/totem-lirc.c:242
 msgid "Couldn't initialize lirc."
 msgstr "lirc प्रारंभ करू शकले नाही."
 
-#: ../src/plugins/lirc/totem-lirc.c:276
+#: ../src/plugins/lirc/totem-lirc.c:254
 msgid "Couldn't read lirc configuration."
 msgstr "lirc संयोजना वाचू शकले नाही."
 
-#: ../src/plugins/mythtv/totem-mythtv.c:195
-msgid "Recordings"
-msgstr "रेकॉर्डींग"
-
-#: ../src/plugins/mythtv/totem-mythtv.c:514
-msgid "MythTV Recordings"
-msgstr "MythTV रेकॉर्डींग्स्"
-
-#: ../src/plugins/mythtv/totem-mythtv.c:515
-msgid "MythTV LiveTV"
-msgstr "MythTV LiveTV"
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:1
+#| msgid "Movie Player"
+msgid "Media Player Keys"
+msgstr "मिडिया वादक किज्"
+
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:2
+msgid "Support additional media player keys"
+msgstr "अगाऊ मिडिया वादक किजकरीता समर्थन"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
-msgid "Download Movie Subtitles"
-msgstr "चित्रपटाचे उपशिर्षक डाउनलोड करा"
-
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
-#, fuzzy
-msgid "Language"
-msgstr "भाषा (_L)"
-
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
-msgid "Subtitle _language:"
-msgstr "उपशिर्षक भाषा (_l):"
-
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:4
-msgid "_Play with Subtitle"
-msgstr "Subtitle सह चालवा (_P)"
+#: ../src/plugins/ontop/ontop.plugin.in.h:1
+msgid "Always On Top"
+msgstr "नेहमी वर"
 
-#: ../src/plugins/opensubtitles/opensubtitles.totem-plugin.in.h:1
-msgid "Look for subtitles for the currently playing movie."
-msgstr "सध्याचे कार्यरत चलचित्र करीता उपशिर्षक पहा."
+#: ../src/plugins/ontop/ontop.plugin.in.h:2
+msgid "Keep the main window on top when playing a movie"
+msgstr "चित्रपट चालवितेवेळी नेहमी मुख्य चौकट वर दर्शवा"
 
-#: ../src/plugins/opensubtitles/opensubtitles.totem-plugin.in.h:2
+#: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:1
 msgid "Subtitle Downloader"
 msgstr "Subtitle डाउनलोडर"
 
-#: ../src/plugins/opensubtitles/opensubtitles.py:43
-msgid "Brasilian Portuguese"
-msgstr "ब्रसिलीयन पॉर्ट्यूगीज"
-
-#: ../src/plugins/opensubtitles/opensubtitles.py:246
-#: ../src/plugins/opensubtitles/opensubtitles.py:262
-#: ../src/plugins/opensubtitles/opensubtitles.py:279
-#: ../src/plugins/opensubtitles/opensubtitles.py:285
+#: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:2
+#| msgid "Look for subtitles for the currently playing movie."
+msgid "Look for subtitles for the currently playing movie"
+msgstr "सध्या सुरू असलेल्या चित्रपटकरीता उपशीर्षक पहा"
+
+#: ../src/plugins/opensubtitles/opensubtitles.py:42
+#| msgid "Brasilian Portuguese"
+msgid "Brazilian Portuguese"
+msgstr "ब्रजिलियन पॉर्ट्यूगिज्"
+
+#: ../src/plugins/opensubtitles/opensubtitles.py:177
+#| msgid "Searching subtitles..."
+msgid "Searching for subtitles…"
+msgstr "उपशीर्षक शोधत आहे..."
+
+#: ../src/plugins/opensubtitles/opensubtitles.py:225
+#: ../src/plugins/opensubtitles/opensubtitles.py:645
+#| msgid "Downloading the subtitles..."
+msgid "Downloading the subtitles…"
+msgstr "उपशीर्षक डाउनलोड करत आहे..."
+
+#: ../src/plugins/opensubtitles/opensubtitles.py:290
 msgid "Could not contact the OpenSubtitles website"
 msgstr "OpenSubtitles संकेतस्थळ उघडणे अशक्य"
 
-#: ../src/plugins/opensubtitles/opensubtitles.py:267
-msgid "No results found"
-msgstr "परिणाम आढळले नाही"
+#: ../src/plugins/opensubtitles/opensubtitles.py:323
+#: ../src/plugins/opensubtitles/opensubtitles.py:341
+#| msgid "Could not contact the OpenSubtitles website"
+msgid "Could not contact the OpenSubtitles website."
+msgstr "OpenSubtitles संकेतस्थळशी संपर्क करणे अशक्य."
+
+#: ../src/plugins/opensubtitles/opensubtitles.py:329
+#| msgid "No results found"
+msgid "No results found."
+msgstr "परिणाम आढळले नाही."
 
-#: ../src/plugins/opensubtitles/opensubtitles.py:373
+#: ../src/plugins/opensubtitles/opensubtitles.py:478
 msgid "Subtitles"
 msgstr "उपशिर्षक"
 
 #. translators comment:
 #. This is the file-type of the subtitle file detected
-#: ../src/plugins/opensubtitles/opensubtitles.py:379
+#: ../src/plugins/opensubtitles/opensubtitles.py:484
 msgid "Format"
 msgstr "रूपण"
 
 #. translators comment:
 #. This is a rating of the quality of the subtitle
-#: ../src/plugins/opensubtitles/opensubtitles.py:384
+#: ../src/plugins/opensubtitles/opensubtitles.py:489
 msgid "Rating"
 msgstr "गुणवत्ताश्रेणी"
 
-#: ../src/plugins/opensubtitles/opensubtitles.py:425
-msgid "_Download Movie Subtitles..."
-msgstr "चित्रपटाचे उपशिर्षक डाउनलोड करा (_D)..."
-
-#: ../src/plugins/opensubtitles/opensubtitles.py:426
+#: ../src/plugins/opensubtitles/opensubtitles.py:525
 msgid "Download movie subtitles from OpenSubtitles"
 msgstr "OpenSubtitles पासून चित्रपटाचे उपशिर्षक डाउनलोड करा"
 
-#: ../src/plugins/opensubtitles/opensubtitles.py:484
-msgid "Searching subtitles..."
-msgstr "उपशिर्षक शोधत आहे..."
+#: ../src/plugins/opensubtitles/opensubtitles.py:527
+#| msgid "Download Movie Subtitles"
+msgid "_Download Movie Subtitles…"
+msgstr "चित्रपटाचे उपशीर्षक डाउनलोड करा (_D)..."
+
+#: ../src/plugins/opensubtitles/opensubtitles.py:589
+#| msgid "Searching subtitles..."
+msgid "Searching subtitles…"
+msgstr "उपशीर्षक शोधत आहे..."
 
-#: ../src/plugins/opensubtitles/opensubtitles.py:542
-msgid "Downloading the subtitles..."
-msgstr "उपशिर्षक डाऊनलोड करत आहे..."
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
+msgid "Download Movie Subtitles"
+msgstr "चित्रपटाचे उपशिर्षक डाउनलोड करा"
 
-#: ../src/plugins/ontop/ontop.totem-plugin.in.h:1
-msgid "Always On Top"
-msgstr "नेहमी वर"
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
+msgid "Subtitle _language:"
+msgstr "उपशिर्षक भाषा (_l):"
 
-#: ../src/plugins/ontop/ontop.totem-plugin.in.h:2
-msgid "Keep the main window on top when playing a movie"
-msgstr "चित्रपट चालवितेवेळी नेहमी मुख्य चौकट वर दर्शवा"
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
+msgid "_Play with Subtitle"
+msgstr "Subtitle सह चालवा (_P)"
 
-#: ../src/plugins/properties/totem-movie-properties.c:149
+#: ../src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in.h:1
+#| msgid "Subtitle _language:"
+msgid "Subtitle language"
+msgstr "उपशीर्षक भाषा"
+
+#: ../src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in.h:2
+msgid "The language to search for subtitles for movies in."
+msgstr "चित्रपटकरीता उपशीर्षक शोधण्याकरीता भाषा."
+
+#: ../src/plugins/properties/movie-properties.plugin.in.h:1
+#| msgid "Properties"
+msgid "Movie Properties"
+msgstr "चित्रपट गुणधर्म"
+
+#: ../src/plugins/properties/movie-properties.plugin.in.h:2
+#| msgid "Show or hide the sidebar"
+msgid "Adds movie properties to the sidebar"
+msgstr "बाजूच्यापट्टीकरीता चित्रपट गुणधर्म समाविष्ट करतो"
+
+#: ../src/plugins/properties/totem-movie-properties.c:246
 msgid "Properties"
 msgstr "गुणधर्म"
 
-#: ../src/plugins/properties/bacon-video-widget-properties.c:235
-#, c-format
-msgid "%d x %d"
-msgstr "%d x %d"
+#: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:1
+msgid "rpdb2 password"
+msgstr "rpdb2 पासवर्ड"
 
-#: ../src/plugins/properties/bacon-video-widget-properties.c:238
-#, c-format
-msgid "%d frames per second"
-msgstr "%d फ्रेम्स प्रती सेकंद"
+#: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:2
+msgid ""
+"A password to protect the rpdb2 server for debugging Totem from unauthorized "
+"remote access. If this is empty, a default of 'totem' will be used."
+msgstr ""
+"अनोळखी रिमोट प्रवेशपासून टोटेमला डिबग करण्यासाठी rpdb2 सर्व्हर सुरक्षित "
+"करण्यासाठी पासवर्ड. "
+"हे रिकामे असल्यास, 'totem' चे पूर्वनिर्धारित वापरले जाईल."
 
-#: ../src/plugins/properties/bacon-video-widget-properties.c:240
-#: ../src/plugins/properties/bacon-video-widget-properties.c:257
-#, c-format
-msgid "%d kbps"
-msgstr "%d kbps"
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
+msgid "Python Console"
+msgstr "Python कंसोल"
 
-#: ../src/plugins/properties/bacon-video-widget-properties.c:260
-#, c-format
-msgid "%d Hz"
-msgstr "%d Hz"
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
+#| msgid "Interactive Python console."
+msgid "Interactive Python console"
+msgstr "इंटरॲक्टिव्ह पायथन कंसोल"
 
-#: ../src/plugins/publish/totem-publish.c:593
-msgid "Neighbors"
-msgstr "शेजारी"
-
-#: ../src/plugins/publish/publish.totem-plugin.in.h:1
-msgid "Publish Playlist"
-msgstr "वादकयादी दर्शवा"
-
-#: ../src/plugins/publish/publish.totem-plugin.in.h:2
-msgid "Share the current playlist via HTTP"
-msgstr "सध्याची वादकयादी HTTP द्वारे सहभागीय करा"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:1
-msgid "Service _Name:"
-msgstr "सेवाचे नाव (_N):"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:3
-#, fuzzy, no-c-format
-msgid ""
-"The name used for announcing the playlist service on the network.\n"
-"All occurrences of the string %u will be replaced by your name,\n"
-"and %h will be replaced by your computer's host name."
-msgstr ""
-"नेवर्क वरील वादकयादी सेवा घोषीत करण्यासाठी वापरले गेलेले नाव.\n"
-"%u चे सर्व घटनाक्रम तुमच्या नावाद्वारे बदलविले जाईल,\n"
-"व %h तुमच्या संगणकीय यजमान नावाशी बदलविले जाईल."
-
-#: ../src/plugins/publish/publish-plugin.ui.h:6
-msgid "Use _encrypted transport protocol (HTTPS)"
-msgstr "एनक्रीप्टेड स्थानांतरन शिष्टाचार वापरा (_e) (HTTPS)"
+#: ../src/plugins/pythonconsole/pythonconsole.py:88
+msgid "Python Console Menu"
+msgstr "Python कंसोल मेन्यू"
 
-#: ../src/plugins/screensaver/totem-screensaver.c:90
-#: ../browser-plugin/totem-plugin-viewer.c:1966
-msgid "Playing a movie"
-msgstr "चित्रपट चालवत आहे"
+#: ../src/plugins/pythonconsole/pythonconsole.py:93
+msgid "_Python Console"
+msgstr "Python कंसोल (_P)"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:94
+msgid "Show Totem's Python console"
+msgstr "Totem चे Python कंसोल दाखवा"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:100
+msgid "Python Debugger"
+msgstr "Python डीबगर"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:101
+msgid "Enable remote Python debugging with rpdb2"
+msgstr "दूरस्थ Python डीबगींग rpdb2 सह चालू करा"
+
+#. pylint: disable-msg=E1101
+#: ../src/plugins/pythonconsole/pythonconsole.py:125
+#, python-format
+msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
+msgstr "Totem.Object करीता 'totem_object' :\\n%s तर्फे प्रवेश शक्य आहे"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:129
+msgid "Totem Python Console"
+msgstr "Totem Python कंसोल"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:139
+#| msgid ""
+#| "After you press OK, Totem will wait until you connect to it with winpdb "
+#| "or rpdb2. If you have not set a debugger password in GConf, it will use "
+#| "the default password ('totem')."
+msgid ""
+"After you press OK, Totem will wait until you connect to it with winpdb or "
+"rpdb2. If you have not set a debugger password in DConf, it will use the "
+"default password ('totem')."
+msgstr ""
+"ठिक आहे दाबल्यावर, winpdb किंवा rpdb2 शी जुळवणी स्थापीत होईपर्यंत Totem "
+"प्रतिक्षा "
+"करेल. DConf मध्ये डीबगर गुप्तशब्द निश्चित न केल्यास, पूर्वनिर्धारित पासवर्ड "
+"('totem') याचा वापर केला जाईल."
+
+#: ../src/plugins/recent/recent.plugin.in.h:1
+#| msgid "Video files"
+msgid "Recent files"
+msgstr "नुकतेच फाइल्स्"
+
+#: ../src/plugins/recent/recent.plugin.in.h:2
+msgid "Adds files that have been played to recent files"
+msgstr "नुकतेच फाइल्स् करीता चालवलेल्या फाइल्स् समाविष्ट करतो"
+
+#: ../src/plugins/rotation/rotation.plugin.in.h:1
+msgid "Rotation Plugin"
+msgstr "गोलाकार प्लगइन"
+
+#: ../src/plugins/rotation/rotation.plugin.in.h:2
+msgid "Allows videos to be rotated if they are in the wrong orientation"
+msgstr "चुकिच्या दिशेने असल्यास व्हिडिओज्ना फिरवण्यस परवानगी देतो"
+
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:50
+msgid "_Rotate Clockwise"
+msgstr "घड्याळीच्या दिशेने फिरवा (_R)"
+
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:52
+msgid "Rotate Counterc_lockwise"
+msgstr "घड्याळीच्या उलट दिशेने फिरवा (_l)"
+
+#: ../src/plugins/save-file/save-file.plugin.in.h:1
+msgid "Save Copy"
+msgstr "प्रत साठवा"
+
+#: ../src/plugins/save-file/save-file.plugin.in.h:2
+#| msgid "Copy the currently playing video DVD"
+msgid "Save a copy of the currently playing movie"
+msgstr "सध्याचे चालवत असलेल्या चित्रपटाचे प्रत साठवा"
+
+#: ../src/plugins/save-file/totem-save-file.c:63
+#| msgid "Save Playlist..."
+msgid "Save a Copy..."
+msgstr "प्रत साठवा..."
+
+#: ../src/plugins/save-file/totem-save-file.c:64
+#| msgid "The contrast of the video"
+msgid "Save a copy of the movie"
+msgstr "चित्रपटाचे प्रत साठवा"
+
+#: ../src/plugins/save-file/totem-save-file.c:129
+#| msgid "Save Gallery"
+msgid "Save a Copy"
+msgstr "प्रत साठवा"
+
+#. translators: Movie is the default saved movie filename,
+#. * without the suffix
+#: ../src/plugins/save-file/totem-save-file.c:161
+#| msgid "_Movie"
+msgid "Movie"
+msgstr "चित्रपट"
+
+#: ../src/plugins/save-file/totem-save-file.c:183
+#| msgid "Movies to play"
+msgid "Movie stream"
+msgstr "चित्रपट स्ट्रिम"
+
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:1
+msgid "Screen Saver"
+msgstr "स्क्रीनसेवर"
+
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:2
+msgid "Deactivates the screen saver when a movie is playing"
+msgstr "चित्रपट चालवतेवेळी स्क्रिनसेवरला बंद करतो"
 
 #: ../src/plugins/screenshot/gallery.ui.h:1
+msgid "Screenshot width (in pixels):"
+msgstr "स्क्रीनशॉटची रूंदी (पिक्सेल्स् मध्ये):"
+
+#: ../src/plugins/screenshot/gallery.ui.h:2
 msgid "Calculate the number of screenshots"
 msgstr "स्क्रीशॉटस्ची संख्या मोजा"
 
-#: ../src/plugins/screenshot/gallery.ui.h:2
+#: ../src/plugins/screenshot/gallery.ui.h:3
 msgid "Number of screenshots:"
 msgstr "स्क्रीनशॉटचा संख्या:"
 
-#: ../src/plugins/screenshot/gallery.ui.h:3
-msgid "Screenshot width (in pixels):"
-msgstr "स्क्रीनशॉटची रूंदी (पिक्सेल्स् मध्ये):"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:1
-msgid "Save in _folder:"
-msgstr "फोल्डरमध्ये साठवा (_f):"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:2
-msgid "Select a folder"
-msgstr "फोल्डर नीवडा"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:3
-msgid "_Name:"
-msgstr "नाव (_N):"
-
-#. Write the screenshot to the temporary file
-#: ../src/plugins/screenshot/gnome-screenshot-widget.c:383
-#: ../src/plugins/screenshot/totem-screenshot.c:64
-msgid "Screenshot.png"
-msgstr "स्क्रीनशॉट.png"
+#. translators: this is the name of the file that gets made up
+#. * with the screenshot if the entire screen is taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:147
+#, c-format
+#| msgid "Screenshot.png"
+msgid "Screenshot from %s.png"
+msgstr "%s.png पासून स्क्रीनशॉट"
+
+#. translators: this is the name of the file that gets
+#. * made up with the screenshot if the entire screen is
+#. * taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:154
+#, c-format
+msgid "Screenshot from %s - %d.png"
+msgstr "%s पासून स्क्रीनशॉट- %d.png"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:1
+#| msgid "Screenshot.png"
+msgid "Screenshot"
+msgstr "स्क्रीनशॉट"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:2
+msgid "Allows screenshots and galleries to be taken of videos"
+msgstr "व्हिडिओज्चे स्क्रीनशॉटस् व दालनकरीता परवानगी देतो"
 
 #: ../src/plugins/screenshot/totem-gallery.c:91
 msgid "Save Gallery"
@@ -2491,7 +2454,7 @@
 #: ../src/plugins/screenshot/totem-gallery.c:115
 #, c-format
 msgid "Gallery-%s-%d.jpg"
-msgstr ""
+msgstr "Gallery-%s-%d.jpg"
 
 #. Set up the window
 #: ../src/plugins/screenshot/totem-gallery-progress.c:101
@@ -2499,272 +2462,671 @@
 msgstr "कलादालनचे निर्माण करत आहे..."
 
 #. Set the progress label
-#: ../src/plugins/screenshot/totem-gallery-progress.c:108
+#: ../src/plugins/screenshot/totem-gallery-progress.c:107
 #, c-format
 msgid "Saving gallery as \"%s\""
 msgstr "कलादालन यांस \"%s\""
 
-#: ../src/plugins/screenshot/totem-screenshot.c:113
-msgid "There was an error saving the screenshot."
-msgstr "स्क्रीनशॉट साठवताना त्रुटी झाली आहे."
-
-#: ../src/plugins/screenshot/totem-screenshot.c:140
-msgid "Save Screenshot"
-msgstr "स्क्रीनशॉट साठवा"
-
-#. Create the screenshot widget
-#. Translators: %s is the movie title and %d is an auto-incrementing number to make filename unique
-#: ../src/plugins/screenshot/totem-screenshot.c:161
-#, fuzzy, c-format
-msgid "Screenshot-%s-%d.png"
-msgstr "स्क्रीनशॉट%d.png"
-
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:96
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:103
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:220
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "Totem could not get a screenshot of the video."
 msgstr "टोटेम चित्रपटाचे स्क्रीनशॉट प्राप्त करण्यास अशक्य."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:103
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "This is not supposed to happen; please file a bug report."
 msgstr "हे घडायला नको हवे होते; कृपया बग अहवाल दाखल करा."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:207
-msgid "Take _Screenshot..."
-msgstr "स्क्रीनशॉट घ्या (_S)..."
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
+#| msgid "Take _Screenshot..."
+msgid "Take _Screenshot"
+msgstr "स्क्रीनशॉट घ्या (_S)"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:207
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
 msgid "Take a screenshot"
 msgstr "स्क्रीनशॉट घ्या"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:208
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create Screenshot _Gallery..."
 msgstr "स्क्रीनशॉट कलादालन निर्माण करा (_G)..."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:208
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create a gallery of screenshots"
 msgstr "स्क्रीनशॉटचे कलादालन निर्माण करा"
 
-#: ../src/plugins/skipto/totem-skipto.c:172
-msgid "Skip to"
-msgstr "येथे चला"
-
-#: ../src/plugins/skipto/totem-skipto-plugin.c:208
-msgid "_Skip to..."
-msgstr "येथे चला (_S)..."
-
-#: ../src/plugins/skipto/totem-skipto-plugin.c:208
-msgid "Skip to a specific time"
-msgstr "ठराविक वेळेवर जा"
+#: ../src/plugins/skipto/skipto.plugin.in.h:1
+#: ../src/plugins/skipto/totem-skipto.c:196
+#| msgid "Skip to"
+msgid "Skip To"
+msgstr "याकरीता वगळा"
+
+#: ../src/plugins/skipto/skipto.plugin.in.h:2
+msgid "Provides the \"Skip to\" dialog"
+msgstr "\"याकरीता वगळा\" संवाद पुरवतो"
 
 #: ../src/plugins/skipto/skipto.ui.h:1
 msgid "_Skip to:"
 msgstr "येथे चला (_S):"
 
-#: ../src/plugins/skipto/skipto.ui.h:2
-msgid "seconds"
-msgstr "सेकंद"
-
-#. Display an error
-#: ../src/plugins/tracker/totem-tracker-widget.c:173
-#, fuzzy, c-format
-msgid "Could not get name and thumbnail for %s: %s"
-msgstr "फाइल %s करीता मेटाडेटा प्राप्त करू शकत नाही: %s"
-
-#: ../src/plugins/tracker/totem-tracker-widget.c:174
-msgid "File Error"
-msgstr "फाइल त्रुटी"
+#. Update the "seconds" label so that it always has the correct singular/plural form
+#. Translators: label for the seconds selector in the "Skip to" dialogue
+#: ../src/plugins/skipto/totem-skipto.c:159
+#| msgid "seconds"
+msgid "second"
+msgid_plural "seconds"
+msgstr[0] "सेकंद"
+msgstr[1] "सेकंद"
+
+#. Fix the label width at the maximum necessary for the plural labels, to prevent it changing size when we change the spinner value
+#. Translators: you should translate this string to a number (written in digits) which corresponds to the longer character length of the
+#. * translations for "second" and "seconds", as translated elsewhere in this file. For example, in English, "second" is 6 characters long and
+#. * "seconds" is 7 characters long, so this string should be translated to "7". See: bgo#639398
+#: ../src/plugins/skipto/totem-skipto.c:189
+msgctxt "Skip To label length"
+msgid "7"
+msgstr "7"
+
+#: ../src/plugins/skipto/totem-skipto-plugin.c:182
+#| msgid "_Skip to..."
+msgid "_Skip To..."
+msgstr "याकरीता वगळा (_S)..."
+
+#: ../src/plugins/skipto/totem-skipto-plugin.c:182
+msgid "Skip to a specific time"
+msgstr "ठराविक वेळेवर जा"
+
+#~ msgid "Author:"
+#~ msgstr "लेखक:"
+
+#~ msgid "C_onfigure..."
+#~ msgstr "संयोजीत करा (_o)..."
+
+#~ msgid "Copyright:"
+#~ msgstr "प्रतिकृती हक्काधिकार:"
+
+#~ msgid "Description:"
+#~ msgstr "वर्णन:"
+
+#~ msgid "Site:"
+#~ msgstr "स्थान:"
+
+#~ msgid "0 frames per second"
+#~ msgstr "0 फ्रेम्स प्रती सेकंद"
+
+#~ msgid "0 kbps"
+#~ msgstr "0 kbps"
+
+#~ msgid "0 x 0"
+#~ msgstr "0 x 0"
+
+#~ msgid "Play movies and songs"
+#~ msgstr "चित्रपट आणि गाणी चालवा"
+
+#~ msgid "1.5 Mbps T1/Intranet/LAN"
+#~ msgstr "1.5 Mbps T1/इन्ट्रानेट/LAN"
+
+#~ msgid "112 Kbps Dual ISDN/DSL"
+#~ msgstr "112 Kbps दुहेरी ISDN/DSL"
+
+#~ msgid "14.4 Kbps Modem"
+#~ msgstr "14.4 Kbps मोडेम"
+
+#~ msgid "19.2 Kbps Modem"
+#~ msgstr "19.2 Kbps मोडेम"
+
+#~ msgid "256 Kbps DSL/Cable"
+#~ msgstr "256 Kbps DSL/केबल"
+
+#~ msgid "28.8 Kbps Modem"
+#~ msgstr "28.8 Kbps मोडेम"
+
+#~ msgid "33.6 Kbps Modem"
+#~ msgstr "33.6 Kbps मोडेम"
+
+#~ msgid "34.4 Kbps Modem"
+#~ msgstr "34.4 Kbps मोडेम"
+
+#~ msgid "384 Kbps DSL/Cable"
+#~ msgstr "384 Kbps DSL/केबल"
+
+#~ msgid "512 Kbps DSL/Cable"
+#~ msgstr "512 Kbps DSL/केबल"
+
+#~ msgid "56 Kbps Modem/ISDN"
+#~ msgstr "56 Kbps मोडेम/ISDN"
+
+#~ msgid "Configure the application"
+#~ msgstr "ऍप्लिकेशन संयोजीत करा"
+
+#~ msgid "Connection _speed:"
+#~ msgstr "जुळवणीचा वेग (_s):"
+
+#~ msgid "Intranet/LAN"
+#~ msgstr "इन्ट्रानेट/LAN"
+
+#~ msgid "Networking"
+#~ msgstr "संजाळीकरण"
+
+#~ msgid "Open a non-local file"
+#~ msgstr "स्थानिकहीन फाइल उघडा"
+
+#~ msgid "Quit the program"
+#~ msgstr "कार्यक्रमाच्या बाहेर पडा"
+
+#~ msgid "Set the repeat mode"
+#~ msgstr "पुन:प्रसारण पध्दती निश्चित करा"
+
+#~ msgid "Set the shuffle mode"
+#~ msgstr "शफल मार्ग स्थिर करा"
+
+#~ msgid "Switch to fullscreen"
+#~ msgstr "पडदाभर करा"
+
+#~ msgid "Zoom Out"
+#~ msgstr "लहान करा"
+
+#~ msgid "Zoom Reset"
+#~ msgstr "मोठे करण्याची पुर्नस्थापना"
+
+#~ msgid "Zoom out"
+#~ msgstr "लहान करा"
+
+#~ msgid "Zoom reset"
+#~ msgstr "मोठे करण्याची पुर्नस्थापना"
+
+#~ msgid ""
+#~ "Approximate network connection speed, used to select quality on media "
+#~ "over the network: \"0\" for 14.4 Kbps Modem, \"1\" for 19.2 Kbps Modem, "
+#~ "\"2\" for 28.8 Kbps Modem, \"3\" for 33.6 Kbps Modem, \"4\" for 34.4 Kbps "
+#~ "Modem, \"5\" for 56 Kbps Modem/ISDN, \"6\" for 112 Kbps Dual ISDN/DSL, "
+#~ "\"7\" for 256 Kbps DSL/Cable, \"8\" for 384 Kbps DSL/Cable, \"9\" for 512 "
+#~ "Kbps DSL/Cable, \"10\" for 1.5 Mbps T1/Intranet/LAN, \"11\" for Intranet/"
+#~ "LAN."
+#~ msgstr ""
+#~ "अंदाजे नेटवर्क जुळवणी वेग, ज्याचा वापर नेटवर्कवरील मिडीयाचा दर्जा ठरवण्याकरीता केला "
+#~ "जातो: \"0\" 14.4 Kbps मोडेमसाठी, \"1\" 19.2 Kbps मोडेमसाठी, \"2\"  28.8 "
+#~ "Kbps मोडेमसाठी, \"3\" 33.6 Kbps मोडेमसाठी, \"4\" 34.4 Kbps मोडेमसाठी, \"5\" "
+#~ "56 Kbps मोडेम/ISDN साठी, \"6\" 112 Kbps डुअल ISDN/DSL साठी, \"7\" 256 Kbps "
+#~ "DSL/केबलसाठी, \"8\" 384 Kbps DSL/केबलसाठी, \"9\" 512 Kbps DSL/केबलसाठी, "
+#~ "\"10\" 1.5 Mbps T1/इंट्रानेट/LAN साठी, \"11\" इंट्रानेट/LAN साठी."
+
+#~ msgid "Network connection speed"
+#~ msgstr "नेटवर्क जुळवणी वेग"
+
+#~ msgid ""
+#~ "Quality settings for the audio visualization: \"0\" for small, \"1\" for "
+#~ "normal, \"2\" for large, \"3\" for extra large."
+#~ msgstr ""
+#~ "ऑडिओ आभासीकरणसाठी दर्जा संरचना: \"0\" लहानकरीता, \"1\" सर्वसाधारणसाठी, \"2\" "
+#~ "मोठ्याकरीता, \"3\" जास्त मोठ्यांकरीता."
+
+#~ msgid ""
+#~ "Type of audio output to use: \"0\" for stereo, \"1\" for 4-channel "
+#~ "output, \"2\" for 5.0 channel output, \"3\" for 5.1 channel output, \"4\" "
+#~ "for AC3 Passthrough."
+#~ msgstr ""
+#~ "ऑडिओ आऊपुटचा वापरण्याजोगी प्रकरा: स्टिरीओ करीता \"0\" , 4-मार्ग आउटपुट करीता "
+#~ "\"1\", 5.0 मार्ग आउटपुट करीता \"2\", 5.1 मार्ग आउटपुट करीता \"3\", AC3 उत्तीर्ण "
+#~ "करीता \"4\"."
+
+#~ msgid "UTF-8"
+#~ msgstr "UTF-8"
 
-#: ../src/plugins/tracker/totem-tracker-widget.c:251
-#: ../src/plugins/tracker/totem-tracker-widget.c:368
 #, fuzzy
-msgid "Could not connect to Tracker"
-msgstr "Galago डीमनशी जुळवणी करू शकले नाही."
+#~ msgid "Play Image '%s'"
+#~ msgstr "डिस्क '%s' चालवा"
 
-#: ../src/plugins/tracker/totem-tracker-widget.c:258
-msgid "No results"
-msgstr "परिणाम नाही"
-
-#. Translators:
-#. * This is used to show which items are listed in the list view, for example:
-#. * Showing 10-20 of 128 matches
-#. * This is similar to what web searches use, eg. Google on the top-right of their search results page show:
-#. * Personalized Results 1 - 10 of about 4,130,000 for foobar
-#: ../src/plugins/tracker/totem-tracker-widget.c:283
-#, c-format
-msgid "Showing %i - %i of %i match"
-msgid_plural "Showing %i - %i of %i matches"
-msgstr[0] "%3$i जुळवणी पैकी %1$i - %2$i दर्शवित आहे"
-msgstr[1] "%3$i जुळवणी पैकी %1$i - %2$i दर्शवित आहे"
-
-#: ../src/plugins/tracker/totem-tracker-widget.c:581
-msgid "Page"
-msgstr "पान"
-
-#: ../src/plugins/tracker/totem-tracker.c:82
-#: ../src/plugins/tracker/tracker.totem-plugin.in.h:1
-msgid "Local Search"
-msgstr "स्थानिक शोध"
-
-#: ../src/plugins/thumbnail/thumbnail.totem-plugin.in.h:1
-msgid "Set the window icon to the thumbnail of the playing movie"
-msgstr "चित्रपट चालवितेवेळी चौकट चिन्हला थंबनेल करीता निश्चित करा"
-
-#: ../src/plugins/thumbnail/thumbnail.totem-plugin.in.h:2
-msgid "Thumbnail"
-msgstr "थंबनेल"
-
-#: ../src/plugins/tracker/tracker.totem-plugin.in.h:2
-msgid "Search for local videos using Tracker"
-msgstr "निरिक्षकाचे वापर करून स्थानिक व्हिडीओज् शोधा"
-
-#: ../src/plugins/youtube/youtube.totem-plugin.in.h:1
-msgid "A plugin to let you browse YouTube videos."
-msgstr "YouTube वरील व्हिडीओज् पहाण्याकरीताचे प्लगइन."
-
-#: ../src/plugins/youtube/youtube.totem-plugin.in.h:2
-msgid "YouTube Browser"
-msgstr "YouTube ब्राऊजर"
-
-#: ../src/plugins/youtube/youtube.ui.h:1
-msgid "Related Videos"
-msgstr "संबंधित व्हिडीओज्"
+#~ msgid "device%d"
+#~ msgstr "साधन%d"
 
-#: ../src/plugins/youtube/youtube.ui.h:3
-msgid "Videos"
-msgstr "व्हिडीओज्"
+#~ msgid "Play Disc '%s'"
+#~ msgstr "डिस्क '%s' चालवा"
 
-#: ../src/plugins/youtube/totem-youtube.c:309
-msgid "_Open in Web Browser"
-msgstr "वेब ब्राऊजर मध्ये उघडा (_O)"
-
-#: ../src/plugins/youtube/totem-youtube.c:309
-msgid "Open the video in your web browser"
-msgstr "विडीओ वेब ब्राऊजर मध्ये उघडा"
-
-#. Add the sidebar page
-#: ../src/plugins/youtube/totem-youtube.c:360
-msgid "YouTube"
-msgstr "YouTube"
-
-#: ../src/plugins/youtube/totem-youtube.c:450
-msgid "Cancelling query…"
-msgstr "चौकशी रद्द करत आहे…"
-
-#: ../src/plugins/youtube/totem-youtube.c:491
-msgid "Error Looking Up Video URI"
-msgstr "व्हिडीओ URI शोधतेवेळी त्रुटी आढळली"
-
-#. Hide the ugly technical message libgdata gives behind a nice one telling them it's out of date (which it likely is
-#. * if we're receiving a protocol error).
-#. Spew out the error message as provided
-#: ../src/plugins/youtube/totem-youtube.c:719
-#: ../src/plugins/youtube/totem-youtube.c:724
-msgid "Error Searching for Videos"
-msgstr "व्हिडीओज् शोधतेवेळी त्रुटी"
-
-#: ../src/plugins/youtube/totem-youtube.c:720
-msgid ""
-"The response from the server could not be understood. Please check you are "
-"running the latest version of libgdata."
-msgstr ""
-"सर्व्हर पासून प्रतिसाद समझला नाही. कृपया तुम्ही libgdata ची सर्वात अलिकडील आवृत्ती "
-"चालवत आहे याची खात्री करा."
-
-#. Update the UI
-#: ../src/plugins/youtube/totem-youtube.c:894
-msgid "Fetching search results…"
-msgstr "शोध परिणाम प्राप्त करत आहे…"
-
-#. Update the UI
-#: ../src/plugins/youtube/totem-youtube.c:956
-msgid "Fetching related videos…"
-msgstr "संबंधित विडीओ प्राप्त करत आहे…"
-
-#: ../src/plugins/youtube/totem-youtube.c:1008
-msgid "Error Opening Video in Web Browser"
-msgstr "वेब ब्राऊजर मध्ये व्हिडीओ उघडतेवेळी त्रुटी"
-
-#: ../src/plugins/youtube/totem-youtube.c:1028
-msgid "Fetching more videos…"
-msgstr "आणखी व्हिडीओज् प्राप्त करत आहे…"
+#~ msgid "Movie Player using %s"
+#~ msgstr "%s सह Movie Player वापरा"
+
+#~ msgid ""
+#~ "Totem could not play this media (%s) although a plugin is present to "
+#~ "handle it."
+#~ msgstr ""
+#~ "मिडीया हाताळणी करीता योग्य प्लगइन उपलब्ध असल्यावरही टोटेम या प्रकारची मिडीया "
+#~ "(%s) चालवू शकत नाही."
+
+#~ msgid ""
+#~ "You might want to check that a disc is present in the drive and that it "
+#~ "is correctly configured."
+#~ msgstr ""
+#~ "तुम्हाला बहुदा ड्राइव्ह मध्ये डिस्क आहे का याची तपासणी घ्याची असावी व ते सुस्थितरित्या "
+#~ "संयोजीत आहे का याची तपासणीही घ्याची असेल."
+
+#~ msgid "More information about media plugins"
+#~ msgstr "मिडीया प्लगइन विषयी अधिक माहिती"
+
+#~ msgid ""
+#~ "Please install the necessary plugins and restart Totem to be able to play "
+#~ "this media."
+#~ msgstr ""
+#~ "कृपया आवश्यक प्लगइन प्रतिष्ठापीत करा व ही मिडीया चालविण्याकरीता टोटेम पुनःसुरू करा."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it does not have the "
+#~ "appropriate plugins to be able to read from the disc."
+#~ msgstr ""
+#~ "टोटेम या प्रकारची मिडीया (%s) चालवू शकत नाही कारण त्याकडे डीस्क पासून "
+#~ "वाचण्याकरीताचे योग्य प्लगइन नाही."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because you do not have the "
+#~ "appropriate plugins to handle it."
+#~ msgstr ""
+#~ "टोटेम या प्रकारची मिडीया (%s) चालवू शकत नाही कारण त्याकडे हाताळण्याकरीताचे योग्य "
+#~ "प्लगइन नाही."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it is not supported."
+#~ msgstr "टोटेम या प्रकारची मिडीया (%s) चालवू शकत नाही कराण प्रकार समर्थीत नाही."
+
+#~ msgid "Please insert another disc to play back."
+#~ msgstr "चालविण्याकरीता कृपया आणखी डीस्क अंतर्भूत करा."
+
+#~ msgid "Totem does not support playback of Audio CDs"
+#~ msgstr "टोटेम ऑडिओ CD चे गायन करीता समर्थन करीत नाही"
+
+#~ msgid ""
+#~ "Please consider using a music player or a CD extractor to play this CD"
+#~ msgstr "ही CD चालविण्याकरीता संगीत वादक किंवा CD एक्सट्रॅक्टरचा वापर करणे आवश्यक आहे"
+
+#~ msgid "Don't connect to an already-running instance"
+#~ msgstr "आधिपासूनच कार्यरत घटनाशी जुळवू नका"
+
+#~ msgid "Enable visual effects?"
+#~ msgstr "दृष्य प्रभाव चालू करायचे का?"
+
+#~ msgid ""
+#~ "It seems you are running Totem remotely.\n"
+#~ "Are you sure you want to enable the visual effects?"
+#~ msgstr ""
+#~ "टोटेमला दूर्रस्थरित्या चालविले जात आहे असे दिसून येते.\n"
+#~ "तुम्हाला नक्की दृश्यीय प्रभाव कार्यान्वीत करायचे?"
+
+#~ msgid ""
+#~ "Changing the visuals effect type will require a restart to take effect."
+#~ msgstr "दृश्य प्रभाव प्रकार बदल प्रभावी होण्याकरीता पुन्हसुरू करणे आवश्यक आहे."
+
+#~ msgid ""
+#~ "The change of audio output type will only take effect when Totem is "
+#~ "restarted."
+#~ msgstr "टोटेम पुन्हा सूरू केल्यावरच ऑडिओ आऊटपुट प्रकार मधिल बदल प्रभावी पडेल."
+
+#~ msgid "%d %%"
+#~ msgstr "%d %%"
+
+#~ msgid "Could not open link"
+#~ msgstr "दुवा उघडा"
+
+#~ msgid "Totem could not initialize the configuration engine."
+#~ msgstr "संयोजना इंजिन टोटेम प्रारंभ करू शकले नाही."
+
+#~ msgid "Make sure that GNOME is properly installed."
+#~ msgstr "जिनोम व्यवस्थित स्थापीत आहे याची खात्री करा."
+
+#~ msgid ""
+#~ "The requested audio output was not found. Please select another audio "
+#~ "output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "विनंतीकृत ऑडिओ आउटपुट आढळले नाही. कृपया मल्टिमिडीया प्रणाली निवडक मधिल अन्य ऑडिओ "
+#~ "ऑउटपुट निवडा."
+
+#~ msgid "Location not found."
+#~ msgstr "ठिकाण सापडले नाही."
+
+#~ msgid ""
+#~ "Could not open location; you might not have permission to open the file."
+#~ msgstr "स्थान उघडू शकले नाही; तुमच्याकडे फाइल उघडण्याची परवानगी कदाचीत नसावी."
+
+#~ msgid ""
+#~ "The video output is in use by another application. Please close other "
+#~ "video applications, or select another video output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "व्हिडिओ आउटपुट अन्य अनुप्रयोग द्वारे वापरले जात आहे. कृपया अन्य व्हिडीओ अनुप्रयोग बंद "
+#~ "करा, किंवा मल्टिमिडीया प्रणाली निवडक मधिल अन्य ऑडिओ ऑउटपुट निवडा."
+
+#~ msgid ""
+#~ "The audio output is in use by another application. Please select another "
+#~ "audio output in the Multimedia Systems Selector. You may want to consider "
+#~ "using a sound server."
+#~ msgstr ""
+#~ "ऑडिओ आउटपुट अन्य अनुप्रयोग द्वारे वापरले जात आहे. कृपया मल्टिमिडीया प्रणाली निवडक "
+#~ "मधिल अन्य ऑडिओ ऑउटपुट निवडा. तुम्हच्याकडे अन्य श्राव्य सर्वर वापराचे पर्याय आहे."
+
+#~ msgid ""
+#~ "The playback of this movie requires the following decoders which are not "
+#~ "installed:\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "या चित्रपट चालविण्याकरीता खालिल डीकोडरची आवश्यकता आहे जी प्रतिष्ठापीत नाही:\n"
+#~ "\n"
+#~ "%s"
+
+#~ msgid "Media file could not be played."
+#~ msgstr "मिडिया फाइल वापरता आली नाही."
+
+#~ msgid "Too old version of GStreamer installed."
+#~ msgstr "जीस्टीमरची अगोदरची जुनी आवृती स्थापित झाली आहे."
+
+#~ msgid ""
+#~ "Failed to create a GStreamer play object. Please check your GStreamer "
+#~ "installation."
+#~ msgstr ""
+#~ "GStreamer चालविण्याकरती घटक निर्माण करण्यास अपयशी. कृपया GStreamer प्रतिष्ठापना "
+#~ "तपासून पहा."
+
+#~ msgid ""
+#~ "Failed to open video output. It may not be available. Please select "
+#~ "another video output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "व्हिडिओ आउपुट उघडण्यास अपयशी. ते उपलब्ध नसावे. कृपया मल्टिमिडीया प्रणाली निवडक "
+#~ "मधिल अन्य ऑडिओ ऑउटपुट निवडा."
+
+#~ msgid ""
+#~ "Could not find the video output. You may need to install additional "
+#~ "GStreamer plugins, or select another video output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "व्हिडीओ आउपुट आढळले नाही. तुम्हाला अगाऊ GStreamer प्लगइन प्रतिष्ठापीत करायची "
+#~ "आवश्यकता आहे, किंवा मल्टिमिडीया प्रणाली निवडक मधिल अन्य ऑडिओ ऑउटपुट निवडा."
+
+#~ msgid ""
+#~ "Failed to open audio output. You may not have permission to open the "
+#~ "sound device, or the sound server may not be running. Please select "
+#~ "another audio output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "ऑडिओ आउपुट उघडण्यास अपयशी. श्राव्य साधन उघडण्याकरीताचे लागणारी परवानगी तुमच्याकडे "
+#~ "नाही, किंवा आवाज सर्वर कार्यरत नसावे. कृपया मल्टिमिडीया प्रणाली निवडक मधिल अन्य "
+#~ "ऑडिओ ऑउटपुट निवडा."
+
+#~ msgid ""
+#~ "Could not find the audio output. You may need to install additional "
+#~ "GStreamer plugins, or select another audio output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "ऑडिओ आउपुट आढळले नाही. तुम्हाला अगाऊ GStreamer प्लगइन प्रतिष्ठापीत करायची "
+#~ "आवश्यकता आहे, किंवा मल्टिमिडीया प्रणाली निवडक मधिल अन्य ऑडिओ ऑउटपुट निवडा."
+
+#~ msgid "%s"
+#~ msgstr "%1$s"
+
+#~ msgid "Bemused"
+#~ msgstr "Bemused"
+
+#~ msgid "Control Totem through a mobile phone with a Bemused client"
+#~ msgstr "टोटेमला मोबाईल फोनच्या द्वारे Bemused क्लाऐंटचा वापर करून नियंत्रीत करा"
+
+#~ msgid "Untitled %d"
+#~ msgstr "शिर्षकहीन %d"
+
+#~ msgid "Totem Bemused Server"
+#~ msgstr "टोटेम Bemused सर्वर"
+
+#~ msgid "Totem Bemused Server version 1.0"
+#~ msgstr "टोटेम Bemused सर्वर आवृत्ती 1.0"
+
+#~ msgid "Delete"
+#~ msgstr "नष्ट करा"
+
+#~ msgid "Coherence DLNA/UPnP Client"
+#~ msgstr "Coherence DLNA/UPnP क्लाएंट"
+
+#~ msgid "A DLNA/UPnP client for Totem powered by Coherence"
+#~ msgstr "Coherence कडून Totem सक्षम करीता DLNA/UPnP क्लाएंट"
+
+#~ msgid "Could not connect to the Galago daemon."
+#~ msgstr "Galago डीमनशी जुळवणी करू शकले नाही."
+
+#~ msgid "BBC iPlayer"
+#~ msgstr "BBC iPlayer"
+
+#~ msgid ""
+#~ "Stream BBC programs from the last 7 days from the BBC iPlayer service."
+#~ msgstr "BBC iPlayer सेवाचा वापर करून शेवटच्या 7 दिवसांचे BBC कार्यक्रम स्ट्रीम."
+
+#~ msgid ""
+#~ "There was an unknown error getting the list of television channels "
+#~ "available on BBC iPlayer."
+#~ msgstr ""
+#~ "BBC iPlayer वरील उपलब्ध टेलीवीशन वाहिनींची सूची प्राप्त करतवेळी अपरिचीत त्रुटी "
+#~ "आढळली."
 
-#: ../browser-plugin/totem-plugin-viewer.c:432
-msgid "No URI to play"
-msgstr "चालविण्याकरीता URI उपलब्ध नाही"
+#~ msgid "Loading…"
+#~ msgstr "लोड करत आहे…"
 
-#. translators: this is:
-#. * Open With ApplicationName
-#. * as in nautilus' right-click menu
-#: ../browser-plugin/totem-plugin-viewer.c:1105
-#, c-format
-msgid "_Open with \"%s\""
-msgstr "\"%s\" सह उघडा (_O)"
+#~ msgid "Error getting programme feed"
+#~ msgstr "प्रोग्राम फीड प्राप्त करतेवेळी त्रुटी"
 
-#: ../browser-plugin/totem-plugin-viewer.c:1156
-#, c-format
-msgid "Browser Plugin using %s"
-msgstr "%s चा वापर करणारे ब्राऊजर प्लगइन"
+#, fuzzy
+#~ msgid ""
+#~ "There was an error getting the list of programmes for this channel and "
+#~ "category combination."
+#~ msgstr ""
+#~ "या वाहिनी किंवा विभाग जोडणी करीता प्रोग्रामची सूची प्राप्त करतेवेळी अपरिचीत त्रुटी "
+#~ "आढळली."
+
+#~ msgid "Programme unavailable (\"%s\")"
+#~ msgstr "कार्यक्रम अनुपलब्ध (\"%s\")"
+
+#~ msgid "By artist"
+#~ msgstr "कलाकार कडून"
 
-#: ../browser-plugin/totem-plugin-viewer.c:1161
-msgid "Totem Browser Plugin"
-msgstr "टोटेम ब्राऊजर प्लगइन"
+#~ msgid "By tag"
+#~ msgstr "टॅग कडून"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2185
-msgid "No playlist or playlist empty"
-msgstr "वादकयादी उपलब्ध नाही किंवा वादकयादी रिकामी नाही"
+#~ msgid "Jamendo Album Page"
+#~ msgstr "Jamendo अल्बम पान"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2276
-msgid "Movie browser plugin"
-msgstr "चलचित्र ब्राऊजर प्लगइन"
+#~ msgid "Latest Releases"
+#~ msgstr "अलिकडील प्रकाशन"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2292
-msgid "Verify your system installation. The Totem plugin will now exit."
-msgstr "तुमचे प्रणाली प्रतिष्ठपना तपासून पहा. टोटेम प्लगइन आता बाहेर पडेल."
+#, fuzzy
+#~ msgid "Number of albums to _retrieve:"
+#~ msgstr "पुनःप्राप्य करण्याजोगी अल्बमची संख्या (_r)"
 
-#: ../src/plugins/pythonconsole/pythonconsole.totem-plugin.in.h:1
-msgid "Interactive Python console."
-msgstr "संवादात्मक python कंसोल."
+#~ msgid "Popular"
+#~ msgstr "प्रतिष्ठीत"
 
-#: ../src/plugins/pythonconsole/pythonconsole.totem-plugin.in.h:2
-msgid "Python Console"
-msgstr "Python कंसोल"
+#, fuzzy
+#~ msgid "Preferred audio _format:"
+#~ msgstr "पसंतीचे ऑडिओ रूपण (_f)"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:82
-msgid "Python Console Menu"
-msgstr "Python कंसोल मेन्यू"
+#~ msgid "Search Results"
+#~ msgstr "शोध परीणाम"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:85
-msgid "_Python Console"
-msgstr "Python कंसोल (_P)"
+#~ msgid "_Open Jamendo Album Page in Browser"
+#~ msgstr "अल्बम पान ब्राउजर मध्ये उघडा (_O)"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:86
-msgid "Show Totem's Python console"
-msgstr "Totem चे Python कंसोल दाखवा"
+#~ msgid "Jamendo"
+#~ msgstr "Jamendo"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:91
-msgid "Python Debugger"
-msgstr "Python डीबगर"
+#~ msgid ""
+#~ "Listen to the large collection of Creative Commons licensed music on "
+#~ "Jamendo."
+#~ msgstr "Jamendo वर Creative Commons करारबद्ध संगीतचे मोठे संग्रह ऐका."
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:92
-msgid "Enable remote Python debugging with rpdb2"
-msgstr "दूरस्थ Python डीबगींग rpdb2 सह चालू करा"
+#~ msgid "You need to install the Python simplejson module."
+#~ msgstr "तुम्हाला Python simplejson घटक प्रतिष्ठापीत करावे लागेल."
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:113
-#, fuzzy, python-format
-msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
-msgstr "totem घटक 'totem_object' द्वारे प्राप्त केले जाऊ शकते:\\n%s"
+#~ msgid "Artist: %s"
+#~ msgstr "कलाकार: %s"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:117
-msgid "Totem Python Console"
-msgstr "Totem Python कंसोल"
+#~ msgid "%Y-%m-%d"
+#~ msgstr "%Y-%m-%d"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:126
-msgid ""
-"After you press OK, Totem will wait until you connect to it with winpdb or "
-"rpdb2. If you have not set a debugger password in GConf, it will use the "
-"default password ('totem')."
-msgstr ""
-"ठिक आहे दाबल्यावर, winpdb किंवा rpdb2 शी जुळवणी स्थापीत होईपर्यंत Totem प्रतिक्षा "
-"करेल.  GConf मध्ये डीबगर गुप्तशब्द निश्चित न केल्यास, मुलभूत गुप्तशब्दचा वापर केला जाईल "
-"('totem')."
+#~ msgid "%x"
+#~ msgstr "%x"
+
+#~ msgid "Genre: %s"
+#~ msgstr "वर्ग: %s"
+
+#~ msgid "Released on: %s"
+#~ msgstr "प्रकाशीत केले: %s"
+
+#~ msgid "License: %s"
+#~ msgstr "करार: %s"
+
+#~ msgid "%02d. %s"
+#~ msgstr "%02d. %s"
+
+#~ msgid "Album: %s"
+#~ msgstr "अल्बम: %s"
+
+#~ msgid "Duration: %s"
+#~ msgstr "कार्यकाळ: %s"
+
+#~ msgid "Fetching albums, please wait..."
+#~ msgstr "अल्बम्स् प्राप्त करत आहे, कृपया थांबा..."
+
+#~ msgid ""
+#~ "Failed to connect to Jamendo server.\n"
+#~ "%s."
+#~ msgstr ""
+#~ "Jamendo सर्व्हरशी जुळवणी करण्यास अपयशी.\n"
+#~ "%s."
+
+#~ msgid "The Jamendo server returned code %s."
+#~ msgstr "Jamendo सर्व्हरने कोड %s पाठवले."
+
+#~ msgid "%H:%M:%S"
+#~ msgstr "%H:%M:%S"
+
+#~ msgid "%M:%S"
+#~ msgstr "%M:%S"
+
+#~ msgid "en"
+#~ msgstr "en"
+
+#~ msgid "Recordings"
+#~ msgstr "रेकॉर्डींग"
+
+#~ msgid "MythTV Recordings"
+#~ msgstr "MythTV रेकॉर्डींग्स्"
+
+#~ msgid "MythTV LiveTV"
+#~ msgstr "MythTV LiveTV"
+
+#, fuzzy
+#~ msgid "Language"
+#~ msgstr "भाषा (_L)"
+
+#~ msgid "_Download Movie Subtitles..."
+#~ msgstr "चित्रपटाचे उपशिर्षक डाउनलोड करा (_D)..."
+
+#~ msgid "Neighbors"
+#~ msgstr "शेजारी"
+
+#~ msgid "Publish Playlist"
+#~ msgstr "वादकयादी दर्शवा"
+
+#~ msgid "Share the current playlist via HTTP"
+#~ msgstr "सध्याची वादकयादी HTTP द्वारे सहभागीय करा"
+
+#~ msgid "Service _Name:"
+#~ msgstr "सेवाचे नाव (_N):"
+
+#, fuzzy
+#~ msgid ""
+#~ "The name used for announcing the playlist service on the network.\n"
+#~ "All occurrences of the string %u will be replaced by your name,\n"
+#~ "and %h will be replaced by your computer's host name."
+#~ msgstr ""
+#~ "नेवर्क वरील वादकयादी सेवा घोषीत करण्यासाठी वापरले गेलेले नाव.\n"
+#~ "%u चे सर्व घटनाक्रम तुमच्या नावाद्वारे बदलविले जाईल,\n"
+#~ "व %h तुमच्या संगणकीय यजमान नावाशी बदलविले जाईल."
+
+#~ msgid "Use _encrypted transport protocol (HTTPS)"
+#~ msgstr "एनक्रीप्टेड स्थानांतरन शिष्टाचार वापरा (_e) (HTTPS)"
+
+#~ msgid "Save in _folder:"
+#~ msgstr "फोल्डरमध्ये साठवा (_f):"
+
+#~ msgid "Select a folder"
+#~ msgstr "फोल्डर नीवडा"
+
+#~ msgid "_Name:"
+#~ msgstr "नाव (_N):"
+
+#~ msgid "There was an error saving the screenshot."
+#~ msgstr "स्क्रीनशॉट साठवताना त्रुटी झाली आहे."
+
+#, fuzzy
+#~ msgid "Could not get name and thumbnail for %s: %s"
+#~ msgstr "फाइल %s करीता मेटाडेटा प्राप्त करू शकत नाही: %s"
+
+#, fuzzy
+#~ msgid "Could not connect to Tracker"
+#~ msgstr "Galago डीमनशी जुळवणी करू शकले नाही."
+
+#~ msgid "No results"
+#~ msgstr "परिणाम नाही"
+
+#~ msgid "Showing %i - %i of %i match"
+#~ msgid_plural "Showing %i - %i of %i matches"
+#~ msgstr[0] "%3$i जुळवणी पैकी %1$i - %2$i दर्शवित आहे"
+#~ msgstr[1] "%3$i जुळवणी पैकी %1$i - %2$i दर्शवित आहे"
+
+#~ msgid "Page"
+#~ msgstr "पान"
+
+#~ msgid "Set the window icon to the thumbnail of the playing movie"
+#~ msgstr "चित्रपट चालवितेवेळी चौकट चिन्हला थंबनेल करीता निश्चित करा"
+
+#~ msgid "Thumbnail"
+#~ msgstr "थंबनेल"
+
+#~ msgid "Search for local videos using Tracker"
+#~ msgstr "निरिक्षकाचे वापर करून स्थानिक व्हिडीओज् शोधा"
+
+#~ msgid "Related Videos"
+#~ msgstr "संबंधित व्हिडीओज्"
+
+#~ msgid "_Open in Web Browser"
+#~ msgstr "वेब ब्राऊजर मध्ये उघडा (_O)"
+
+#~ msgid "Open the video in your web browser"
+#~ msgstr "विडीओ वेब ब्राऊजर मध्ये उघडा"
+
+#~ msgid "YouTube"
+#~ msgstr "YouTube"
+
+#~ msgid "Cancelling query…"
+#~ msgstr "चौकशी रद्द करत आहे…"
+
+#~ msgid "Error Looking Up Video URI"
+#~ msgstr "व्हिडीओ URI शोधतेवेळी त्रुटी आढळली"
+
+#~ msgid "Error Searching for Videos"
+#~ msgstr "व्हिडीओज् शोधतेवेळी त्रुटी"
+
+#~ msgid ""
+#~ "The response from the server could not be understood. Please check you "
+#~ "are running the latest version of libgdata."
+#~ msgstr ""
+#~ "सर्व्हर पासून प्रतिसाद समझला नाही. कृपया तुम्ही libgdata ची सर्वात अलिकडील आवृत्ती "
+#~ "चालवत आहे याची खात्री करा."
+
+#~ msgid "Fetching search results…"
+#~ msgstr "शोध परिणाम प्राप्त करत आहे…"
+
+#~ msgid "Fetching related videos…"
+#~ msgstr "संबंधित विडीओ प्राप्त करत आहे…"
+
+#~ msgid "Error Opening Video in Web Browser"
+#~ msgstr "वेब ब्राऊजर मध्ये व्हिडीओ उघडतेवेळी त्रुटी"
+
+#~ msgid "Fetching more videos…"
+#~ msgstr "आणखी व्हिडीओज् प्राप्त करत आहे…"
+
+#~ msgid "Browser Plugin using %s"
+#~ msgstr "%s चा वापर करणारे ब्राऊजर प्लगइन"
 
+#~ msgid "Totem Browser Plugin"
+#~ msgstr "टोटेम ब्राऊजर प्लगइन"
diff -Nru totem-3.4.3/po/nb.po totem-3.6.2/po/nb.po
--- totem-3.4.3/po/nb.po	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/po/nb.po	2012-08-29 23:07:45.000000000 +0000
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: totem 3.4.x\n"
+"Project-Id-Version: totem 3.5.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-30 13:02+0200\n"
-"PO-Revision-Date: 2012-04-30 13:03+0200\n"
+"POT-Creation-Date: 2012-07-25 16:36+0200\n"
+"PO-Revision-Date: 2012-07-25 16:38+0200\n"
 "Last-Translator: Kjartan Maraas \n"
 "Language-Team: Norwegian bokmål \n"
 "Language: nb\n"
@@ -17,14 +17,227 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ../browser-plugin/totem-plugin-viewer.c:352 ../src/totem-object.c:1180
+#: ../src/totem-object.c:1650 ../src/totem-statusbar.c:115
+msgid "Stopped"
+msgstr "Stoppet"
+
+#: ../browser-plugin/totem-plugin-viewer.c:364 ../src/totem-object.c:1173
+msgid "Paused"
+msgstr "Pause"
+
+#: ../browser-plugin/totem-plugin-viewer.c:368 ../src/totem-object.c:1166
+msgid "Playing"
+msgstr "Spiller"
+
+#: ../browser-plugin/totem-plugin-viewer.c:386
+#: ../src/plugins/screensaver/totem-screensaver.c:97
+msgid "Playing a movie"
+msgstr "Spiller av en film"
+
+#: ../browser-plugin/totem-plugin-viewer.c:443
+msgid "No URI to play"
+msgstr "Ingen URI å spille av"
+
+#: ../browser-plugin/totem-plugin-viewer.c:676
+#: ../browser-plugin/totem-plugin-viewer.c:1700
+msgid "Totem Movie Player"
+msgstr "Totem filmavspiller"
+
+#. translators: this is:
+#. * Open With ApplicationName
+#. * as in nautilus' right-click menu
+#: ../browser-plugin/totem-plugin-viewer.c:1120
+#, c-format
+msgid "_Open with \"%s\""
+msgstr "_Åpne med «%s»"
+
+#: ../browser-plugin/totem-plugin-viewer.c:1341 ../src/totem-object.c:2475
+msgid "An error occurred"
+msgstr "En feil oppsto"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2033
+msgid "No playlist or playlist empty"
+msgstr "Ingen spilleliste eller tom spilleliste"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2128
+msgid "Movie browser plugin"
+msgstr "Tillegg for filmvisning"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144 ../src/totem.c:239
+msgid "Could not initialize the thread-safe libraries."
+msgstr "Kunne ikke initiere trådsikre biblioteker."
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144
+msgid "Verify your system installation. The Totem plugin will now exit."
+msgstr "Sjekk systeminstallasjonen. Tillegget for Totem avslutter nå."
+
 #: ../data/fullscreen.ui.h:1
 msgid "Leave Fullscreen"
 msgstr "Forlat fullskjerm"
 
-#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:144
+#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:81
 msgid "Time:"
 msgstr "Tid:"
 
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
+msgid "Allow the screensaver to activate when playing audio"
+msgstr "La skjermspareren aktiveres når lyd spilles av"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
+msgid ""
+"Allow the screensaver to activate when playing audio. Disable if you have "
+"monitor-powered speakers."
+msgstr ""
+"La skjermspareren aktiveres når kun lyd spilles av. Slå dette av hvis du har "
+"høyttalere som får strøm fra skjermen."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
+msgid "Show visual effects when no video is displayed"
+msgstr "Vis visuelle effekter hvis ingen film spilles av"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
+msgid "Show visual effects when playing an audio only file."
+msgstr "Vis visuelle effekter ved avspilling av en lydfil."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
+msgid "Name of the visual effects plugin"
+msgstr "Navn på tillegg for visuell effekt"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
+msgid "The brightness of the video"
+msgstr "Lysstyrke for filmen"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
+msgid "The contrast of the video"
+msgstr "Kontrast for filmen"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
+msgid "The hue of the video"
+msgstr "Lysglød i filmen"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
+msgid "The saturation of the video"
+msgstr "Metning for filmen"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
+msgid "Resize the canvas automatically on file load"
+msgstr "Endre størrelse på kanvas automatisk ved lasting av fil"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
+msgid "Repeat mode"
+msgstr "Repeteringsmodus"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
+msgid "Shuffle mode"
+msgstr "Byttemodus"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
+msgid "Whether to disable deinterlacing for interlaced movies"
+msgstr ""
+"Hvorvidt fjerning av sammenfletting skal slås av for filmer med "
+"sammenfletting"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
+msgid "Whether to enable debug for the playback engine"
+msgstr "Om feilsøking skal aktiveres for avspillingsmotoren"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
+msgid "Type of audio output to use"
+msgstr "Type lydutgang som skal brukes"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
+msgid "Visualization quality setting"
+msgstr "Innstilling for kvalitet for visualisering"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
+msgid "Quality setting for the audio visualization."
+msgstr "Kvalitetsinnstilling for lydvisualisering."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
+msgid "Network buffering threshold"
+msgstr "Terskel for nettverksbuffer"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
+msgid ""
+"Amount of data to buffer for network streams before starting to display the "
+"stream (in seconds)."
+msgstr ""
+"Mengde data som skal lastes ned før visning av en strøm som lastes ned fra "
+"nettverket (i sekunder)."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
+msgid "Subtitle font"
+msgstr "Skrift for teksting"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
+msgid "Pango font description for subtitle rendering."
+msgstr "Pango skriftbeskrivelse for rendring av undertekst."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
+msgid "Subtitle encoding"
+msgstr "Koding av tekst"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
+msgid "Encoding character set for subtitle."
+msgstr "Tegnsett for koding av undertekst."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
+msgid "Default location for the \"Open...\" dialogs"
+msgstr "Forvalgt lokasjon for «Åpne …»-dialoger"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
+msgid ""
+"Default location for the \"Open...\" dialogs. Default is the current "
+"directory."
+msgstr "Forvalgt lokasjon for «Åpne …»-dialoger. Forvalg er aktiv katalog."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
+msgid "Default location for the \"Take Screenshot\" dialogs"
+msgstr "Forvalgt lokasjon for «Ta skjermdump»-dialoger"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
+msgid ""
+"Default location for the \"Take Screenshot\" dialogs. Default is the "
+"Pictures directory."
+msgstr ""
+"Forvalgt lokasjon for «Ta skjermdump»-dialoger. Forvalg er brukerens "
+"bildekatalog."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
+msgid "Whether to disable the plugins in the user's home directory"
+msgstr "Om tillegg i brukerens hjemmekatalog skal deaktiveres"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
+msgid "Whether to disable the keyboard shortcuts"
+msgstr "Om tastatursnarveier skal deaktiveres"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
+msgid "Whether to autoload text subtitle files when a movie is loaded"
+msgstr "Om undertekstfiler skal lastes automatisk når en film lastes"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
+msgid "Whether to autoload external chapter files when a movie is loaded"
+msgstr "Om eksterne kapittelfiler skal lastes automatisk når en film lastes"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
+msgid ""
+"Whether to remember the position of played audio/video files when pausing or "
+"closing them"
+msgstr ""
+"Om posisjon i avspilte lyd/videofiler skal huskes når de settes på pause "
+"eller lukkes"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
+msgid "Active plugins list"
+msgstr "Liste med aktive tillegg"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+msgid ""
+"A list of the names of the plugins which are currently active (loaded and "
+"running)."
+msgstr "En liste med navn på tillegg som er aktive (lastet og kjører)."
+
 #: ../data/playlist.ui.h:1
 msgid "_Remove"
 msgstr "Fje_rn"
@@ -41,11 +254,11 @@
 msgid "Copy the location to the clipboard"
 msgstr "Kopier lokasjonen til utklippstavlen"
 
-#: ../data/playlist.ui.h:5 ../data/totem.ui.h:78
+#: ../data/playlist.ui.h:5 ../data/totem.ui.h:71
 msgid "_Select Text Subtitles..."
 msgstr "_Velg undertittel …"
 
-#: ../data/playlist.ui.h:6 ../data/totem.ui.h:79
+#: ../data/playlist.ui.h:6 ../data/totem.ui.h:72
 msgid "Select a file to use for text subtitles"
 msgstr "Velg en fil som skal brukes som undertekst"
 
@@ -69,64 +282,209 @@
 msgid "Move Down"
 msgstr "Flytt ned"
 
-#: ../data/properties.ui.h:1 ../data/totem.ui.h:122
-msgid "General"
-msgstr "Generelt"
-
-#: ../data/properties.ui.h:2
-msgid "Title:"
-msgstr "Tittel:"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:2
+msgid "Normal"
+msgstr "Normal"
 
-#: ../data/properties.ui.h:3
-msgid "Artist:"
-msgstr "Artist:"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:4
+msgid "Large"
+msgstr "Stor"
 
-#: ../data/properties.ui.h:4
-msgid "Duration:"
-msgstr "Varighet:"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:6
+msgid "Extra Large"
+msgstr "Ekstra stor"
 
-#: ../data/properties.ui.h:5
-msgid "Year:"
-msgstr "År:"
+#: ../data/preferences.ui.h:7 ../src/backend/bacon-video-widget.c:5498
+#: ../src/totem-properties-view.c:231
+msgid "Stereo"
+msgstr "Stereo"
 
-#: ../data/properties.ui.h:6
-msgid "Album:"
-msgstr "Album:"
+#: ../data/preferences.ui.h:8
+msgid "4-channel"
+msgstr "4-kanaler"
 
-#: ../data/properties.ui.h:7
-msgid "Comment:"
-msgstr "Kommentar:"
+#: ../data/preferences.ui.h:9
+msgid "4.1-channel"
+msgstr "4.1-kanal"
 
-#: ../data/properties.ui.h:8
-msgid "Container:"
-msgstr "Konteiner:"
+#: ../data/preferences.ui.h:10
+msgid "5.0-channel"
+msgstr "5.0-kanal"
 
-#: ../data/properties.ui.h:9 ../data/totem.ui.h:128
-#: ../src/totem-properties-view.c:270
-msgid "Video"
-msgstr "Film"
+#: ../data/preferences.ui.h:11
+msgid "5.1-channel"
+msgstr "5.1-kanal"
 
-#: ../data/properties.ui.h:10
-msgid "Dimensions:"
-msgstr "Størrelse:"
+#: ../data/preferences.ui.h:12
+msgid "AC3 Passthrough"
+msgstr "AC3-passthrough"
 
-#: ../data/properties.ui.h:11
-msgid "Codec:"
-msgstr "Kodek:"
+#: ../data/preferences.ui.h:13
+msgid "Totem Preferences"
+msgstr "Brukervalg for Totem"
 
-#: ../data/properties.ui.h:12
-msgid "Framerate:"
-msgstr "Rammerate:"
+#: ../data/preferences.ui.h:14
+msgid "Playback"
+msgstr "Avspilling"
 
-#: ../data/properties.ui.h:13
-msgid "Bitrate:"
-msgstr "Bitrate:"
+#: ../data/preferences.ui.h:15
+msgid "Start playing files from last position"
+msgstr "Start avspilling av filer fra siste posisjon"
+
+#: ../data/preferences.ui.h:16
+msgid "Text Subtitles"
+msgstr "Teksting"
+
+#: ../data/preferences.ui.h:17
+msgid "_Load subtitle files when movie is loaded"
+msgstr "_Last undertekstfiler når en video lastes"
+
+#: ../data/preferences.ui.h:18
+msgid "_Font:"
+msgstr "Skri_ft:"
+
+#: ../data/preferences.ui.h:19
+msgid "_Encoding:"
+msgstr "_Koding:"
+
+#: ../data/preferences.ui.h:20
+msgid "External Chapters"
+msgstr "Eksterne kapittel"
+
+#: ../data/preferences.ui.h:21
+msgid "Load _chapter files when movie is loaded"
+msgstr "Last _kapittelfiler når en video lastes"
+
+#: ../data/preferences.ui.h:22 ../data/properties.ui.h:1
+msgid "General"
+msgstr "Generelt"
+
+#. Tab label in the Preferences dialogue
+#: ../data/preferences.ui.h:24
+msgid "Display"
+msgstr "Skjerm"
+
+#: ../data/preferences.ui.h:25
+msgid "_Resize the window when a new video is loaded"
+msgstr "End_re størrelse på vinduet når en video lastes"
+
+#: ../data/preferences.ui.h:26
+msgid "Disable _deinterlacing of interlaced videos"
+msgstr "Slå av _fjerning av sammenfletting for videoer med sammenfletting"
+
+#: ../data/preferences.ui.h:27
+msgid "Disable screensaver when playing "
+msgstr "Slå av skjermsparer ved avspilling "
+
+#: ../data/preferences.ui.h:28 ../data/properties.ui.h:9
+#: ../src/totem-properties-view.c:273
+msgid "Video"
+msgstr "Film"
+
+#: ../data/preferences.ui.h:29
+msgid "Video or Audio"
+msgstr "Video eller lyd"
+
+#: ../data/preferences.ui.h:30
+msgid "Visual Effects"
+msgstr "Visuelle effekter?"
+
+#: ../data/preferences.ui.h:31
+msgid "Show _visual effects when an audio file is played"
+msgstr "Vis _visuelle effekter når en lydfil spilles av"
+
+#: ../data/preferences.ui.h:32
+msgid "_Type of visualization:"
+msgstr "_Type visualisering"
+
+#: ../data/preferences.ui.h:33
+msgid "Visualization _size:"
+msgstr "_Størrelse på visualisering:"
+
+#: ../data/preferences.ui.h:34
+msgid "Color Balance"
+msgstr "Fargebalanse"
+
+#: ../data/preferences.ui.h:35
+msgid "_Brightness:"
+msgstr "_Lysstyrke:"
+
+#: ../data/preferences.ui.h:36
+msgid "Co_ntrast:"
+msgstr "Ko_ntrast:"
+
+#: ../data/preferences.ui.h:37
+msgid "Sat_uration:"
+msgstr "Me_tning:"
+
+#: ../data/preferences.ui.h:38
+msgid "_Hue:"
+msgstr "_Glød:"
+
+#: ../data/preferences.ui.h:39
+msgid "Reset to _Defaults"
+msgstr "Sett til _forvalg"
+
+#: ../data/preferences.ui.h:40
+msgid "Audio Output"
+msgstr "Lydutgang"
+
+#: ../data/preferences.ui.h:41
+msgid "_Audio output type:"
+msgstr "Type _lydutgang:"
 
-#: ../data/properties.ui.h:14 ../data/totem.ui.h:142
-#: ../src/totem-properties-view.c:268
+#: ../data/preferences.ui.h:42 ../data/properties.ui.h:14
+#: ../src/totem-properties-view.c:271
 msgid "Audio"
 msgstr "Lyd"
 
+#: ../data/properties.ui.h:2
+msgid "Title:"
+msgstr "Tittel:"
+
+#: ../data/properties.ui.h:3
+msgid "Artist:"
+msgstr "Artist:"
+
+#: ../data/properties.ui.h:4
+msgid "Duration:"
+msgstr "Varighet:"
+
+#: ../data/properties.ui.h:5
+msgid "Year:"
+msgstr "År:"
+
+#: ../data/properties.ui.h:6
+msgid "Album:"
+msgstr "Album:"
+
+#: ../data/properties.ui.h:7
+msgid "Comment:"
+msgstr "Kommentar:"
+
+#: ../data/properties.ui.h:8
+msgid "Container:"
+msgstr "Konteiner:"
+
+#: ../data/properties.ui.h:10
+msgid "Dimensions:"
+msgstr "Størrelse:"
+
+#: ../data/properties.ui.h:11
+msgid "Codec:"
+msgstr "Kodek:"
+
+#: ../data/properties.ui.h:12
+msgid "Framerate:"
+msgstr "Rammerate:"
+
+#: ../data/properties.ui.h:13
+msgid "Bitrate:"
+msgstr "Bitrate:"
+
 #: ../data/properties.ui.h:15
 msgid "Sample rate:"
 msgstr "Samplingsrate:"
@@ -135,737 +493,437 @@
 msgid "Channels:"
 msgstr "Kanaler:"
 
-#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
-msgid "_Add to Playlist"
-msgstr "_Legg til i spilleliste"
-
-#: ../data/video-list.ui.h:2
-msgid "Add the video to the playlist"
-msgstr "Legg til video i spillelisten"
-
 #. Title
-#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:143
-#: ../src/totem-object.c:1667
-msgid "Movie Player"
-msgstr "Filmavspiller"
+#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:80 ../src/totem.c:238
+#: ../src/totem.c:247 ../src/totem-menu.c:790 ../src/totem-object.c:1658
+msgid "Videos"
+msgstr "Filmer"
 
 #: ../data/totem.desktop.in.in.in.h:2
-msgid "Play movies and songs"
-msgstr "Spill av filmer og sanger"
+msgid "Play movies"
+msgstr "Spill av filmer"
+
+#: ../data/totem.desktop.in.in.in.h:3
+msgid "Video;Movie;Film;Clip;Series;Player;DVD;TV;Disc;"
+msgstr "Video;Film;Film;Klipp;Serier;Spiller;DVD;TV;Plate;"
 
 #: ../data/totem.ui.h:1
-msgid "_Movie"
-msgstr "_Film"
+msgid "_Open"
+msgstr "_Åpne"
 
 #: ../data/totem.ui.h:2
-msgid "_Open..."
-msgstr "_Åpne …"
+msgid "Open _Location"
+msgstr "Åpne _lokasjon"
 
 #: ../data/totem.ui.h:3
-msgid "Open a file"
-msgstr "Åpne en fil"
+msgid "_Fullscreen"
+msgstr "_Fullskjerm"
 
 #: ../data/totem.ui.h:4
-msgid "Open _Location..."
-msgstr "Åpne _lokasjon …"
+msgid "Prefere_nces"
+msgstr "_Brukervalg"
 
 #: ../data/totem.ui.h:5
-msgid "Open a non-local file"
-msgstr "Åpne en ekstern fil"
+msgid "Shuff_le"
+msgstr "S_tokk om"
 
 #: ../data/totem.ui.h:6
+msgid "_Repeat"
+msgstr "_Gjenta"
+
+#: ../data/totem.ui.h:7
+msgid "_Quit"
+msgstr "A_vslutt"
+
+#: ../data/totem.ui.h:8
+msgid "_Movie"
+msgstr "_Film"
+
+#: ../data/totem.ui.h:9
 msgid "_Eject"
 msgstr "_Løs ut"
 
-#: ../data/totem.ui.h:7
+#: ../data/totem.ui.h:10
 msgid "Eject the current disc"
 msgstr "Løs ut aktiv plate"
 
-#: ../data/totem.ui.h:8
+#: ../data/totem.ui.h:11
 msgid "_Properties"
 msgstr "Egenska_per"
 
-#: ../data/totem.ui.h:9
+#: ../data/totem.ui.h:12
 msgid "View the properties of the current stream"
 msgstr "Vis egenskaper for aktiv strøm"
 
-#: ../data/totem.ui.h:10
+#: ../data/totem.ui.h:13
 msgid "Play / P_ause"
 msgstr "Spill av / p_ause"
 
-#: ../data/totem.ui.h:11
+#: ../data/totem.ui.h:14
 msgid "Play or pause the movie"
 msgstr "Spill av eller pause en film"
 
-#: ../data/totem.ui.h:12
-msgid "_Quit"
-msgstr "A_vslutt"
-
-#: ../data/totem.ui.h:13
-msgid "Quit the program"
-msgstr "Avslutt programmet"
-
-#: ../data/totem.ui.h:14
+#: ../data/totem.ui.h:15
 msgid "_Edit"
 msgstr "R_ediger"
 
-#: ../data/totem.ui.h:15
+#: ../data/totem.ui.h:16
 msgid "_Clear Playlist"
 msgstr "_Tøm spilleliste"
 
-#: ../data/totem.ui.h:16
+#: ../data/totem.ui.h:17
 msgid "Clear the playlist"
 msgstr "Tøm spillelisten"
 
-#: ../data/totem.ui.h:17
-msgid "Prefere_nces"
-msgstr "_Brukervalg"
-
 #: ../data/totem.ui.h:18
-msgid "Configure the application"
-msgstr "Konfigurer programmet"
-
-#: ../data/totem.ui.h:19
 msgid "Plugins..."
 msgstr "Tillegg …"
 
-#: ../data/totem.ui.h:20
+#: ../data/totem.ui.h:19
 msgid "Configure plugins to extend the application"
 msgstr "Konfigurer tillegg for å utvide programmet"
 
-#: ../data/totem.ui.h:21
+#: ../data/totem.ui.h:20
 msgid "_View"
 msgstr "_Vis"
 
-#: ../data/totem.ui.h:22
-msgid "_Fullscreen"
-msgstr "_Fullskjerm"
-
-#: ../data/totem.ui.h:23
-msgid "Switch to fullscreen"
-msgstr "Bytt til fullskjerm"
-
-#: ../data/totem.ui.h:24
+#: ../data/totem.ui.h:21
 msgid "Fit Window to Movie"
 msgstr "Tilpass vinduet til filmen"
 
-#: ../data/totem.ui.h:25
+#: ../data/totem.ui.h:22
 msgid "_Resize 1:2"
 msgstr "End_re størrelse 1:2"
 
-#: ../data/totem.ui.h:26
+#: ../data/totem.ui.h:23
 msgid "Resize to half the original video size"
 msgstr "Endre størrelse til halvparten av filmens størrelse"
 
-#: ../data/totem.ui.h:27
+#: ../data/totem.ui.h:24
 msgid "Resize _1:1"
 msgstr "Endre størrelse til _1:1"
 
-#: ../data/totem.ui.h:28
+#: ../data/totem.ui.h:25
 msgid "Resize to the original video size"
 msgstr "Endre størrelse til opprinnelig størrelse"
 
-#: ../data/totem.ui.h:29
+#: ../data/totem.ui.h:26
 msgid "Resize _2:1"
 msgstr "Endre størrelse til _2:1"
 
-#: ../data/totem.ui.h:30
+#: ../data/totem.ui.h:27
 msgid "Resize to double the original video size"
 msgstr "Endre størrelse til det dobbelte av filmens størrelse"
 
-#: ../data/totem.ui.h:31
+#: ../data/totem.ui.h:28
 msgid "_Aspect Ratio"
 msgstr "_Bildeforhold"
 
-#: ../data/totem.ui.h:32
+#: ../data/totem.ui.h:29
 msgid "Switch An_gles"
 msgstr "Bytt vi_nkel"
 
-#: ../data/totem.ui.h:33
+#: ../data/totem.ui.h:30
 msgid "Switch camera angles"
 msgstr "Bytt kameravinkel"
 
-#: ../data/totem.ui.h:34
+#: ../data/totem.ui.h:31
 msgid "_Go"
 msgstr "_Start"
 
-#: ../data/totem.ui.h:35
+#: ../data/totem.ui.h:32
 msgid "_DVD Menu"
 msgstr "_DVD-meny"
 
-#: ../data/totem.ui.h:36
+#: ../data/totem.ui.h:33
 msgid "Go to the DVD menu"
 msgstr "Gå til DVD-menyen"
 
-#: ../data/totem.ui.h:37
+#: ../data/totem.ui.h:34
 msgid "_Title Menu"
 msgstr "_Tittelmeny"
 
-#: ../data/totem.ui.h:38
+#: ../data/totem.ui.h:35
 msgid "Go to the title menu"
 msgstr "Gå til tittelmenyen"
 
-#: ../data/totem.ui.h:39
+#: ../data/totem.ui.h:36
 msgid "A_udio Menu"
 msgstr "L_ydmeny"
 
-#: ../data/totem.ui.h:40
+#: ../data/totem.ui.h:37
 msgid "Go to the audio menu"
 msgstr "Gå til lydmenyen"
 
-#: ../data/totem.ui.h:41
+#: ../data/totem.ui.h:38
 msgid "_Angle Menu"
 msgstr "_Vinkelmeny"
 
-#: ../data/totem.ui.h:42
+#: ../data/totem.ui.h:39
 msgid "Go to the angle menu"
 msgstr "Gå til vinkelmenyen"
 
-#: ../data/totem.ui.h:43
+#: ../data/totem.ui.h:40
 msgid "_Chapter Menu"
 msgstr "_Kapittelmeny"
 
-#: ../data/totem.ui.h:44
+#: ../data/totem.ui.h:41
 msgid "Go to the chapter menu"
 msgstr "Gå til kapittelmenyen"
 
-#: ../data/totem.ui.h:45
+#: ../data/totem.ui.h:42
 msgid "_Next Chapter/Movie"
 msgstr "_Neste kapittel/film"
 
-#: ../data/totem.ui.h:46
+#: ../data/totem.ui.h:43
 msgid "Next chapter or movie"
 msgstr "Neste kapittel eller film"
 
-#: ../data/totem.ui.h:47
+#: ../data/totem.ui.h:44
 msgid "_Previous Chapter/Movie"
 msgstr "_Forrige kapittel/film"
 
-#: ../data/totem.ui.h:48
+#: ../data/totem.ui.h:45
 msgid "Previous chapter or movie"
 msgstr "Forrige kapittel eller film"
 
-#: ../data/totem.ui.h:49
+#: ../data/totem.ui.h:46
 msgid "_Sound"
 msgstr "_Lyd"
 
-#: ../data/totem.ui.h:50
+#: ../data/totem.ui.h:47
 msgid "Volume _Up"
 msgstr "Volum _opp"
 
-#: ../data/totem.ui.h:51
+#: ../data/totem.ui.h:48
 msgid "Increase volume"
 msgstr "Skru opp volumet"
 
-#: ../data/totem.ui.h:52
+#: ../data/totem.ui.h:49
 msgid "Volume _Down"
 msgstr "Volum ne_d"
 
-#: ../data/totem.ui.h:53
+#: ../data/totem.ui.h:50
 msgid "Decrease volume"
 msgstr "Skru ned volumet"
 
-#: ../data/totem.ui.h:54
+#: ../data/totem.ui.h:51
 msgid "_Help"
 msgstr "_Hjelp:"
 
-#: ../data/totem.ui.h:55
+#: ../data/totem.ui.h:52
 msgid "_Contents"
 msgstr "_Innhold"
 
-#: ../data/totem.ui.h:56
+#: ../data/totem.ui.h:53
 msgid "Help contents"
 msgstr "Innhold i hjelp"
 
-#: ../data/totem.ui.h:57
+#: ../data/totem.ui.h:54
 msgid "_About"
 msgstr "_Om"
 
-#: ../data/totem.ui.h:58
+#: ../data/totem.ui.h:55
 msgid "About this application"
 msgstr "Om dette programmet"
 
-#: ../data/totem.ui.h:59
-msgid "_Repeat Mode"
-msgstr "_Repeteringsmodus"
-
-#: ../data/totem.ui.h:60
-msgid "Set the repeat mode"
-msgstr "Sett repeteringsmodus"
-
-#: ../data/totem.ui.h:61
-msgid "Shuff_le Mode"
-msgstr "S_tokk om"
-
-#: ../data/totem.ui.h:62
-msgid "Set the shuffle mode"
-msgstr "Sett byttemodus"
-
-#: ../data/totem.ui.h:63
+#: ../data/totem.ui.h:56
 msgid "Show _Controls"
 msgstr "Vis _kontroller"
 
-#: ../data/totem.ui.h:64
+#: ../data/totem.ui.h:57
 msgid "Show controls"
 msgstr "Vis kontroller"
 
-#: ../data/totem.ui.h:65
+#: ../data/totem.ui.h:58
 msgid "S_idebar"
 msgstr "S_idelinje"
 
-#: ../data/totem.ui.h:66
+#: ../data/totem.ui.h:59
 msgid "Show or hide the sidebar"
 msgstr "Vis eller skjul sidelinjen"
 
-#: ../data/totem.ui.h:67
+#: ../data/totem.ui.h:60
 msgctxt "Aspect ratio"
 msgid "Auto"
 msgstr "Auto"
 
-#: ../data/totem.ui.h:68
+#: ../data/totem.ui.h:61
 msgid "Sets automatic aspect ratio"
 msgstr "Sett automatisk høyde-/breddeforhold"
 
-#: ../data/totem.ui.h:69
+#: ../data/totem.ui.h:62
 msgid "Square"
 msgstr "Kvadratisk"
 
-#: ../data/totem.ui.h:70
+#: ../data/totem.ui.h:63
 msgid "Sets square aspect ratio"
 msgstr "Sett kvadratisk høyde-/breddeforhold"
 
-#: ../data/totem.ui.h:71
+#: ../data/totem.ui.h:64
 msgid "4:3 (TV)"
 msgstr "4:3 (TV)"
 
-#: ../data/totem.ui.h:72
+#: ../data/totem.ui.h:65
 msgid "Sets 4:3 (TV) aspect ratio"
 msgstr "Sett høyde-/breddeforhold til 4:3"
 
-#: ../data/totem.ui.h:73
+#: ../data/totem.ui.h:66
 msgid "16:9 (Widescreen)"
 msgstr "16:9 (widescreen)"
 
-#: ../data/totem.ui.h:74
+#: ../data/totem.ui.h:67
 msgid "Sets 16:9 (widescreen) aspect ratio"
 msgstr "Sett høyde-/breddeforhold til 16:9 (widescreen)"
 
-#: ../data/totem.ui.h:75
+#: ../data/totem.ui.h:68
 msgid "2.11:1 (DVB)"
 msgstr "2.11:1 (DVB)"
 
-#: ../data/totem.ui.h:76
+#: ../data/totem.ui.h:69
 msgid "Sets 2.11:1 (DVB) aspect ratio"
 msgstr "Sett høyde-/breddeforhold til 2.11:1 (DVB)"
 
-#: ../data/totem.ui.h:77
+#: ../data/totem.ui.h:70
 msgid "S_ubtitles"
 msgstr "_Undertekster"
 
-#: ../data/totem.ui.h:80
+#: ../data/totem.ui.h:73
 msgid "_Languages"
 msgstr "_Språk"
 
-#: ../data/totem.ui.h:81
+#: ../data/totem.ui.h:74
 msgid "Zoom In"
 msgstr "Zoom inn"
 
-#: ../data/totem.ui.h:82
+#: ../data/totem.ui.h:75
 msgid "Zoom in"
 msgstr "Zoom inn"
 
-#: ../data/totem.ui.h:83
+#: ../data/totem.ui.h:76
 msgid "Skip _Forward"
 msgstr "Hopp _fremover"
 
-#: ../data/totem.ui.h:84
+#: ../data/totem.ui.h:77
 msgid "Skip forward"
 msgstr "Hopp fremover"
 
-#: ../data/totem.ui.h:85
+#: ../data/totem.ui.h:78
 msgid "Skip _Backwards"
 msgstr "Hopp _bakover"
 
-#: ../data/totem.ui.h:86
+#: ../data/totem.ui.h:79
 msgid "Skip backwards"
 msgstr "Hopp bakover"
 
-#: ../data/totem.ui.h:87
-msgid "14.4 Kbps Modem"
-msgstr "14.4 Kb/s modem"
-
-#: ../data/totem.ui.h:88
-msgid "19.2 Kbps Modem"
-msgstr "19.2 Kb/s modem"
-
-#: ../data/totem.ui.h:89
-msgid "28.8 Kbps Modem"
-msgstr "28.8 Kb/s modem"
-
-#: ../data/totem.ui.h:90
-msgid "33.6 Kbps Modem"
-msgstr "33.6 Kb/s modem"
-
-#: ../data/totem.ui.h:91
-msgid "34.4 Kbps Modem"
-msgstr "34.4 Kb/s modem"
-
-#: ../data/totem.ui.h:92
-msgid "56 Kbps Modem/ISDN"
-msgstr "56 Kb/s modem/ISDN"
-
-#: ../data/totem.ui.h:93
-msgid "112 Kbps Dual ISDN/DSL"
-msgstr "112 Kb/s to-kanaler ISDN/DSL"
-
-#: ../data/totem.ui.h:94
-msgid "256 Kbps DSL/Cable"
-msgstr "256 Kb/s DSL/kabel"
-
-#: ../data/totem.ui.h:95
-msgid "384 Kbps DSL/Cable"
-msgstr "384 Kb/s DSL/kabel"
-
-#: ../data/totem.ui.h:96
-msgid "512 Kbps DSL/Cable"
-msgstr "512 Kb/s DSL/kabel"
-
-#: ../data/totem.ui.h:97
-msgid "1.5 Mbps T1/Intranet/LAN"
-msgstr "1.5 Mb/s T1/intranett/LAN"
-
-#: ../data/totem.ui.h:98
-msgid "Intranet/LAN"
-msgstr "Intranett/LAN"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:100
-msgid "Normal"
-msgstr "Normal"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:102
-msgid "Large"
-msgstr "Stor"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:104
-msgid "Extra Large"
-msgstr "Ekstra stor"
-
-#: ../data/totem.ui.h:105 ../src/totem-properties-view.c:228
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5593
-msgid "Stereo"
-msgstr "Stereo"
-
-#: ../data/totem.ui.h:106
-msgid "4-channel"
-msgstr "4-kanaler"
-
-#: ../data/totem.ui.h:107
-msgid "4.1-channel"
-msgstr "4.1-kanal"
-
-#: ../data/totem.ui.h:108
-msgid "5.0-channel"
-msgstr "5.0-kanal"
-
-#: ../data/totem.ui.h:109
-msgid "5.1-channel"
-msgstr "5.1-kanal"
-
-#: ../data/totem.ui.h:110
-msgid "AC3 Passthrough"
-msgstr "AC3-passthrough"
-
-#: ../data/totem.ui.h:111
-msgid "Totem Preferences"
-msgstr "Brukervalg for Totem"
-
-#: ../data/totem.ui.h:112
-msgid "Playback"
-msgstr "Avspilling"
-
-#: ../data/totem.ui.h:113
-msgid "Start playing files from last position"
-msgstr "Start avspilling av filer fra siste posisjon"
-
-#: ../data/totem.ui.h:114
-msgid "Networking"
-msgstr "Nettverk"
-
-#: ../data/totem.ui.h:115
-msgid "Connection _speed:"
-msgstr "Tilkobling_shastighet:"
-
-#: ../data/totem.ui.h:116
-msgid "Text Subtitles"
-msgstr "Teksting"
-
-#: ../data/totem.ui.h:117
-msgid "_Load subtitle files when movie is loaded"
-msgstr "_Last undertekstfiler når en video lastes"
-
-#: ../data/totem.ui.h:118
-msgid "_Font:"
-msgstr "Skri_ft:"
-
-#: ../data/totem.ui.h:119
-msgid "_Encoding:"
-msgstr "_Koding:"
-
-#: ../data/totem.ui.h:120
-msgid "External Chapters"
-msgstr "Eksterne kapittel"
-
-#: ../data/totem.ui.h:121
-msgid "Load _chapter files when movie is loaded"
-msgstr "Last _kapittelfiler når en video lastes"
-
-#. Tab label in the Preferences dialogue
-#: ../data/totem.ui.h:124
-msgid "Display"
-msgstr "Skjerm"
-
-#: ../data/totem.ui.h:125
-msgid "_Resize the window when a new video is loaded"
-msgstr "End_re størrelse på vinduet når en video lastes"
-
-#: ../data/totem.ui.h:126
-msgid "Disable _deinterlacing of interlaced videos"
-msgstr "Slå av _fjerning av sammenfletting for videoer med sammenfletting"
-
-#: ../data/totem.ui.h:127
-msgid "Disable screensaver when playing "
-msgstr "Slå av skjermsparer ved avspilling "
-
-#: ../data/totem.ui.h:129
-msgid "Video or Audio"
-msgstr "Video eller lyd"
-
-#: ../data/totem.ui.h:130
-msgid "Visual Effects"
-msgstr "Visuelle effekter?"
-
-#: ../data/totem.ui.h:131
-msgid "Show _visual effects when an audio file is played"
-msgstr "Vis _visuelle effekter når en lydfil spilles av"
-
-#: ../data/totem.ui.h:132
-msgid "_Type of visualization:"
-msgstr "_Type visualisering"
-
-#: ../data/totem.ui.h:133
-msgid "Visualization _size:"
-msgstr "_Størrelse på visualisering:"
-
-#: ../data/totem.ui.h:134
-msgid "Color Balance"
-msgstr "Fargebalanse"
-
-#: ../data/totem.ui.h:135
-msgid "_Brightness:"
-msgstr "_Lysstyrke:"
-
-#: ../data/totem.ui.h:136
-msgid "Co_ntrast:"
-msgstr "Ko_ntrast:"
-
-#: ../data/totem.ui.h:137
-msgid "Sat_uration:"
-msgstr "Me_tning:"
-
-#: ../data/totem.ui.h:138
-msgid "_Hue:"
-msgstr "_Glød:"
-
-#: ../data/totem.ui.h:139
-msgid "Reset to _Defaults"
-msgstr "Sett til _forvalg"
-
-#: ../data/totem.ui.h:140
-msgid "Audio Output"
-msgstr "Lydutgang"
-
-#: ../data/totem.ui.h:141
-msgid "_Audio output type:"
-msgstr "Type _lydutgang:"
-
-#: ../data/totem.ui.h:145
+#: ../data/totem.ui.h:82
 msgid "Time seek bar"
 msgstr "Søk på tid"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
-msgid "Allow the screensaver to activate when playing audio"
-msgstr "La skjermspareren aktiveres når lyd spilles av"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
-msgid ""
-"Allow the screensaver to activate when playing audio. Disable if you have "
-"monitor-powered speakers."
-msgstr ""
-"La skjermspareren aktiveres når kun lyd spilles av. Slå dette av hvis du har "
-"høyttalere som får strøm fra skjermen."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
-msgid "Show visual effects when no video is displayed"
-msgstr "Vis visuelle effekter hvis ingen film spilles av"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
-msgid "Show visual effects when playing an audio only file."
-msgstr "Vis visuelle effekter ved avspilling av en lydfil."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
-msgid "Name of the visual effects plugin"
-msgstr "Navn på tillegg for visuell effekt"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
-msgid "The brightness of the video"
-msgstr "Lysstyrke for filmen"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
-msgid "The contrast of the video"
-msgstr "Kontrast for filmen"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
-msgid "The hue of the video"
-msgstr "Lysglød i filmen"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
-msgid "The saturation of the video"
-msgstr "Metning for filmen"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
-msgid "Resize the canvas automatically on file load"
-msgstr "Endre størrelse på kanvas automatisk ved lasting av fil"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
-msgid "Network connection speed"
-msgstr "Tilkoblingshastighet for nettverk"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
-msgid ""
-"Approximate network connection speed, used to select quality on media over "
-"the network."
-msgstr ""
-"Omtrentlig tilkoblingshastighet for nettverk. Brukes til å velge kvalitet på "
-"media over nettverket."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
-msgid "Repeat mode"
-msgstr "Repeteringsmodus"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
-msgid "Shuffle mode"
-msgstr "Byttemodus"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
-msgid "Whether to disable deinterlacing for interlaced movies"
-msgstr "Hvorvidt fjerning av sammenfletting skal slås av for filmer med sammenfletting"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
-msgid "Whether to enable debug for the playback engine"
-msgstr "Om feilsøking skal aktiveres for avspillingsmotoren"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
-msgid "Type of audio output to use"
-msgstr "Type lydutgang som skal brukes"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
-msgid "Visualization quality setting"
-msgstr "Innstilling for kvalitet for visualisering"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
-msgid "Quality setting for the audio visualization."
-msgstr "Kvalitetsinnstilling for lydvisualisering."
+#: ../data/uri.ui.h:1
+msgid "Enter the _address of the file you would like to open:"
+msgstr "Oppgi _adressen for filen du ønsker å åpne:"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
-msgid "Network buffering threshold"
-msgstr "Terskel for nettverksbuffer"
+#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
+msgid "_Add to Playlist"
+msgstr "_Legg til i spilleliste"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
-msgid ""
-"Amount of data to buffer for network streams before starting to display the "
-"stream (in seconds)."
-msgstr ""
-"Mengde data som skal lastes ned før visning av en strøm som lastes ned fra "
-"nettverket (i sekunder)."
+#: ../data/video-list.ui.h:2
+msgid "Add the video to the playlist"
+msgstr "Legg til video i spillelisten"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
-msgid "Subtitle font"
-msgstr "Skrift for teksting"
+#: ../src/backend/bacon-video-widget.c:1643
+msgid "Password requested for RTSP server"
+msgstr "Passord forespurt for RTSP-tjener"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
-msgid "Pango font description for subtitle rendering."
-msgstr "Pango skriftbeskrivelse for rendring av undertekst."
+#: ../src/backend/bacon-video-widget.c:2944
+#, c-format
+msgid "Audio Track #%d"
+msgstr "Lydspor #%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
-msgid "Subtitle encoding"
-msgstr "Koding av tekst"
+#: ../src/backend/bacon-video-widget.c:2948
+#, c-format
+msgid "Subtitle #%d"
+msgstr "Undertekst #%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
-msgid "Encoding character set for subtitle."
-msgstr "Tegnsett for koding av undertekst."
+#: ../src/backend/bacon-video-widget.c:3345
+msgid "The server you are trying to connect to is not known."
+msgstr "Tjeneren du prøver å koble til er ikke kjent."
+
+#: ../src/backend/bacon-video-widget.c:3348
+msgid "The connection to this server was refused."
+msgstr "Tilkobling til denne tjeneren ble nektet."
+
+#: ../src/backend/bacon-video-widget.c:3351
+msgid "The specified movie could not be found."
+msgstr "Spesifisert film ble ikke funnet."
+
+#: ../src/backend/bacon-video-widget.c:3358
+msgid "The server refused access to this file or stream."
+msgstr "Tjener nektet tilgang til denne filen eller strømmen."
+
+#: ../src/backend/bacon-video-widget.c:3364
+msgid "Authentication is required to access this file or stream."
+msgstr "Autentisering kreves for å aksessere denne filen eller strømmen."
+
+#: ../src/backend/bacon-video-widget.c:3371
+msgid "You are not allowed to open this file."
+msgstr "Du har ikke tilgang til å åpne denne filen."
+
+#: ../src/backend/bacon-video-widget.c:3376
+msgid "This location is not a valid one."
+msgstr "Lokasjonen er ikke gyldig."
+
+#: ../src/backend/bacon-video-widget.c:3384
+msgid "The movie could not be read."
+msgstr "Filmen kunne ikke leses."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
-msgid "Default location for the \"Open...\" dialogs"
-msgstr "Forvalgt lokasjon for «Åpne …»-dialoger"
+#. should be exactly one missing thing (source or converter)
+#: ../src/backend/bacon-video-widget.c:3407
+#: ../src/backend/bacon-video-widget.c:3415
+#, c-format
+msgid "The playback of this movie requires a %s plugin which is not installed."
+msgid_plural ""
+"The playback of this movie requires the following decoders which are not "
+"installed:\n"
+"\n"
+"%s"
+msgstr[0] ""
+"Avspilling av denne filmen krever et tillegg %s og dette er ikke installert."
+msgstr[1] ""
+"Avspilling av denne filmen krever følgende dekodere som ikke er installert:\n"
+"\n"
+"%s"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
+#: ../src/backend/bacon-video-widget.c:3426
 msgid ""
-"Default location for the \"Open...\" dialogs. Default is the current "
-"directory."
-msgstr "Forvalgt lokasjon for «Åpne …»-dialoger. Forvalg er aktiv katalog."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
-msgid "Default location for the \"Take Screenshot\" dialogs"
-msgstr "Forvalgt lokasjon for «Ta skjermdump»-dialoger"
+"An audio or video stream is not handled due to missing codecs. You might "
+"need to install additional plugins to be able to play some types of movies"
+msgstr "En lyd- eller videostrøm ble ikke håndtert pga manglende kodeker. Du må kanskje installere ekstra tillegg for å kunne spille av noen typer videoer"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
+#: ../src/backend/bacon-video-widget.c:3436
 msgid ""
-"Default location for the \"Take Screenshot\" dialogs. Default is the "
-"Pictures directory."
-msgstr ""
-"Forvalgt lokasjon for «Ta skjermdump»-dialoger. Forvalg er brukerens "
-"bildekatalog."
+"This file cannot be played over the network. Try downloading it locally "
+"first."
+msgstr "Filen kan ikke spilles over nettverket. Prøv å laste den ned lokalt."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
-msgid "Whether to disable the plugins in the user's home directory"
-msgstr "Om tillegg i brukerens hjemmekatalog skal deaktiveres"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
-msgid "Whether to disable the keyboard shortcuts"
-msgstr "Om tastatursnarveier skal deaktiveres"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
-msgid "Whether to autoload text subtitle files when a movie is loaded"
-msgstr "Om undertekstfiler skal lastes automatisk når en film lastes"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
-msgid "Whether to autoload external chapter files when a movie is loaded"
-msgstr "Om eksterne kapittelfiler skal lastes automatisk når en film lastes"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
-msgid ""
-"Whether to remember the position of played audio/video files when pausing or "
-"closing them"
-msgstr ""
-"Om posisjon i avspilte lyd/videofiler skal huskes når de settes på pause "
-"eller lukkes"
+#: ../src/backend/bacon-video-widget.c:5494 ../src/totem-properties-view.c:227
+msgid "Surround"
+msgstr "Surround"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:35
-msgid "Active plugins list"
-msgstr "Liste med aktive tillegg"
+#: ../src/backend/bacon-video-widget.c:5496 ../src/totem-properties-view.c:229
+msgid "Mono"
+msgstr "Mono"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:36
-msgid ""
-"A list of the names of the plugins which are currently active (loaded and "
-"running)."
-msgstr "En liste med navn på tillegg som er aktive (lastet og kjører)."
+#: ../src/backend/bacon-video-widget.c:5781
+msgid "Media contains no supported video streams."
+msgstr "Medier inneholder ingen støttede videostrømmer."
 
-#: ../data/uri.ui.h:1
-msgid "Enter the _address of the file you would like to open:"
-msgstr "Oppgi _adressen for filen du ønsker å åpne:"
+#: ../src/backend/bacon-video-widget.c:5963
+msgid ""
+"Some necessary plug-ins are missing. Make sure that the program is correctly "
+"installed."
+msgstr "Noen nødvendige tillegg mangler. Sjekk at programmet er korrekt installert."
 
 #: ../src/eggdesktopfile.c:165
 #, c-format
@@ -971,6 +1029,31 @@
 msgid "Show session management options"
 msgstr "Vis alternativer for sesjonshåndtering"
 
+#. hour:minutes:seconds
+#. Translators: This is a time format, like "9:05:02" for 9
+#. * hours, 5 minutes, and 2 seconds. You may change ":" to
+#. * the separator that your locale uses or use "%Id" instead
+#. * of "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:56
+#: ../src/plugins/skipto/totem-time-entry.c:57
+#, c-format
+msgctxt "long time format"
+msgid "%d:%02d:%02d"
+msgstr "%d:%02d:%02d"
+
+#. minutes:seconds
+#. Translators: This is a time format, like "5:02" for 5
+#. * minutes and 2 seconds. You may change ":" to the
+#. * separator that your locale uses or use "%Id" instead of
+#. * "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:65
+#, c-format
+msgctxt "short time format"
+msgid "%d:%02d"
+msgstr "%d:%02d"
+
 #. Title
 #. Artist
 #. Album
@@ -1075,10 +1158,14 @@
 msgstr[0] "%d bilde per sekund"
 msgstr[1] "%d bilder per sekund"
 
-#: ../src/totem-audio-preview.c:168
+#: ../src/totem-audio-preview.c:137
 msgid "Audio Preview"
 msgstr "Forhåndsvisning av lyd"
 
+#: ../src/totem.c:239
+msgid "Verify your system installation. Totem will now exit."
+msgstr "Sjekk systeminstallasjonen. Totem avslutter nå."
+
 #: ../src/totem-cell-renderer-video.c:126
 msgid "Unknown video"
 msgstr "Ukjent video"
@@ -1091,7 +1178,7 @@
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../src/totem-fullscreen.c:616
+#: ../src/totem-fullscreen.c:573
 msgid "No File"
 msgstr "Ingen fil"
 
@@ -1109,7 +1196,7 @@
 msgid "Make sure that Totem is properly installed."
 msgstr "Sjekk at Totem er korrekt installert."
 
-#: ../src/totem-interface.c:347
+#: ../src/totem-interface.c:357
 msgid ""
 "Totem 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 "
@@ -1121,7 +1208,7 @@
 "Software Foundation; enten versjon 2 av lisensen, eller (hvis du ønsker det) "
 "enhver senere versjon."
 
-#: ../src/totem-interface.c:351
+#: ../src/totem-interface.c:361
 msgid ""
 "Totem is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -1132,7 +1219,7 @@
 "ikke engang implisitt garanti om at det er SALGBART eller PASSER ET BESTEMT "
 "FORMÅL. Se GNU General Public License for detaljer."
 
-#: ../src/totem-interface.c:355
+#: ../src/totem-interface.c:365
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Totem; if not, write to the Free Software Foundation, Inc., 59 Temple Place, "
@@ -1142,7 +1229,7 @@
 "Hvis dette ikke er tilfelle, kan du skrive til Free Software Foundation, "
 "Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA"
 
-#: ../src/totem-interface.c:358
+#: ../src/totem-interface.c:368
 msgid ""
 "Totem contains an exception to allow the use of proprietary GStreamer "
 "plugins."
@@ -1151,203 +1238,98 @@
 "tillegg."
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:190
+#: ../src/totem-menu.c:291
 msgid "None"
 msgstr "Ingen"
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:195
+#: ../src/totem-menu.c:296
 msgctxt "Language"
 msgid "Auto"
 msgstr "Automatisk"
 
-#. Translators:
-#. * This is not a JPEG image, but a disc image, for example,
-#. * an ISO file
-#: ../src/totem-menu.c:765
-#, c-format
-msgid "Play Image '%s'"
-msgstr "Spill av avtrykk «%s»"
-
-#: ../src/totem-menu.c:768 ../src/totem-menu.c:851
-#, c-format
-msgid "device%d"
-msgstr "enhet%d"
-
-#: ../src/totem-menu.c:848
-#, c-format
-msgid "Play Disc '%s'"
-msgstr "Spill av plate «%s»"
-
-#. This lists the back-end type and version, such as
-#. * Movie Player using GStreamer 0.10.1
-#: ../src/totem-menu.c:1189
-#, c-format
-msgid "Movie Player using %s"
-msgstr "Filmavspiller bruker %s"
-
-#: ../src/totem-menu.c:1193
+#: ../src/totem-menu.c:789
 msgid "Copyright © 2002-2009 Bastien Nocera"
 msgstr "Opphavsrett © 2002-2009 Bastien Nocera"
 
-#: ../src/totem-menu.c:1198
+#: ../src/totem-menu.c:794
 msgid "translator-credits"
 msgstr ""
 "Kjartan Maraas \n"
 "Espen Stefansen "
 
-#: ../src/totem-menu.c:1202
+#: ../src/totem-menu.c:798
 msgid "Totem Website"
 msgstr "Totem nettsted"
 
-#: ../src/totem-menu.c:1236
+#: ../src/totem-menu.c:829
 msgid "Configure Plugins"
 msgstr "Konfigurer tillegg"
 
+#: ../src/totem-object.c:162
+#, c-format
+msgid ""
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"%s\n"
+"Kjør «%s --help» for å se en full liste med tilgjengelige "
+"komanndolinjeflagg.\n"
+
 #. Translators: %s is the totem version number
-#: ../src/totem-object.c:471
+#: ../src/totem-object.c:591
 #, c-format
 msgid "Totem %s"
 msgstr "Totem %s"
 
-#: ../src/totem-object.c:1047 ../browser-plugin/totem-plugin-viewer.c:367
-msgid "Playing"
-msgstr "Spiller"
-
-#: ../src/totem-object.c:1049 ../src/totem-options.c:52
+#: ../src/totem-object.c:1168 ../src/totem-options.c:52
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/totem-object.c:1054 ../browser-plugin/totem-plugin-viewer.c:363
-msgid "Paused"
-msgstr "Pause"
-
-#: ../src/totem-object.c:1056 ../src/totem-object.c:1066
+#: ../src/totem-object.c:1175 ../src/totem-object.c:1185
 #: ../src/totem-options.c:51
 msgid "Play"
 msgstr "Spill av"
 
-#: ../src/totem-object.c:1061 ../src/totem-object.c:1659
-#: ../src/totem-statusbar.c:115 ../browser-plugin/totem-plugin-viewer.c:351
-msgid "Stopped"
-msgstr "Stoppet"
-
-#: ../src/totem-object.c:1142 ../src/totem-object.c:1169
-#: ../src/totem-object.c:1799 ../src/totem-object.c:1963
+#: ../src/totem-object.c:1267 ../src/totem-object.c:1294
+#: ../src/totem-object.c:1787 ../src/totem-object.c:1942
 #, c-format
 msgid "Totem could not play '%s'."
 msgstr "Totem kunne ikke spille av «%s»."
 
-#: ../src/totem-object.c:1246
-#, c-format
-msgid ""
-"Totem could not play this media (%s) although a plugin is present to handle "
-"it."
-msgstr ""
-"Totem kunne ikke spille av dette mediet (%s) selv om et tillegg finnes som "
-"skal håndtere det."
-
-#: ../src/totem-object.c:1247
-msgid ""
-"You might want to check that a disc is present in the drive and that it is "
-"correctly configured."
-msgstr ""
-"Du bør sjekke at det finnes en disk i stasjonen og at den er riktig "
-"konfigurert."
-
-#: ../src/totem-object.c:1255
-msgid "More information about media plugins"
-msgstr "Mer informasjon om media-tillegg"
-
-#: ../src/totem-object.c:1256
-msgid ""
-"Please install the necessary plugins and restart Totem to be able to play "
-"this media."
-msgstr ""
-"Installer de nødvendige tilleggene og start Totem på nytt for å kunne spille "
-"av dette mediet."
-
-#: ../src/totem-object.c:1258
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because it does not have the "
-"appropriate plugins to be able to read from the disc."
-msgstr ""
-"Totem kan ikke spille av denne typen media (%s) fordi du ikke har tilleggene "
-"som  kreves for å lese fra platen."
-
-#: ../src/totem-object.c:1260
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because you do not have the "
-"appropriate plugins to handle it."
-msgstr ""
-"Totem kan ikke spille av denne typen media (%s) fordi du ikke har tilleggene "
-"som  kreves for å håndtere det."
-
-#: ../src/totem-object.c:1263
-#, c-format
-msgid "Totem cannot play this type of media (%s) because it is not supported."
-msgstr ""
-"Totem kan ikke spille av denne typen media (%s) fordi det ikke er støttet."
-
-#: ../src/totem-object.c:1264
-msgid "Please insert another disc to play back."
-msgstr "Vennligst sett inn en annen plate som skal spilles av."
-
-#: ../src/totem-object.c:1300
-msgid "Totem was not able to play this disc."
-msgstr "Totem kunne ikke spille av denne platen."
-
-#: ../src/totem-object.c:1301 ../src/totem-object.c:4228
-msgid "No reason."
-msgstr "Ingen årsak."
-
-#: ../src/totem-object.c:1315
-msgid "Totem does not support playback of Audio CDs"
-msgstr "Totem støtter ikke avspilling av lyd-CDer"
-
-#: ../src/totem-object.c:1316
-msgid "Please consider using a music player or a CD extractor to play this CD"
-msgstr ""
-"Vennligst bruk et musikkavspillingsprogram eller en CD-ripper til å spille "
-"av denne CDen"
-
-#: ../src/totem-object.c:1805
+#: ../src/totem-object.c:1793
 msgid "No error message"
 msgstr "Ingen feilmelding"
 
-#: ../src/totem-object.c:2154
+#: ../src/totem-object.c:2133
 msgid "Totem could not display the help contents."
 msgstr "Totem kunne ikke vise hjelpinnhold."
 
-#: ../src/totem-object.c:2493 ../src/totem-object.c:2495
-#: ../browser-plugin/totem-plugin-viewer.c:1417
-msgid "An error occurred"
-msgstr "En feil oppsto"
-
-#: ../src/totem-object.c:4063 ../src/totem-object.c:4065
+#: ../src/totem-object.c:4019 ../src/totem-object.c:4021
 msgid "Previous Chapter/Movie"
 msgstr "Forrige kapittel/film"
 
-#: ../src/totem-object.c:4072 ../src/totem-object.c:4074
+#: ../src/totem-object.c:4028 ../src/totem-object.c:4030
 msgid "Play / Pause"
 msgstr "Spill av/pause"
 
-#: ../src/totem-object.c:4082 ../src/totem-object.c:4084
+#: ../src/totem-object.c:4038 ../src/totem-object.c:4040
 msgid "Next Chapter/Movie"
 msgstr "Neste kapittel/film"
 
-#. Translators: this is the tooltip text for the fullscreen button in the controls box in Totem's main window.
 #. Translators: this is the accessibility text for the fullscreen button in the controls box in Totem's main window.
-#: ../src/totem-object.c:4096 ../src/totem-object.c:4098
+#: ../src/totem-object.c:4051 ../src/totem-object.c:4053
 msgid "Fullscreen"
 msgstr "Fullskjerm"
 
-#: ../src/totem-object.c:4228
+#: ../src/totem-object.c:4184
 msgid "Totem could not startup."
 msgstr "Totem kunne ikke starte opp."
 
+#: ../src/totem-object.c:4184
+msgid "No reason."
+msgstr "Ingen årsak."
+
 #: ../src/totem-open-location.c:182
 msgid "Open Location..."
 msgstr "Åpne lokasjon …"
@@ -1421,117 +1403,111 @@
 msgid "Movies to play"
 msgstr "Filmer som skal spilles av"
 
-#: ../src/totem-options.c:117
+#: ../src/totem-options.c:79
+msgid "- Play movies and songs"
+msgstr "- Spill av filmer og sanger"
+
+#: ../src/totem-options.c:142
 msgid "Can't enqueue and replace at the same time"
 msgstr "Kan ikke legge i kø og erstatte samtidig"
 
 #. By extension entry
-#: ../src/totem-playlist.c:161
+#: ../src/totem-playlist.c:162
 msgid "MP3 ShoutCast playlist"
 msgstr "MP3 ShoutCast-spilleliste"
 
-#: ../src/totem-playlist.c:162
+#: ../src/totem-playlist.c:163
 msgid "MP3 audio (streamed)"
 msgstr "MP3-lyd (strøm)"
 
-#: ../src/totem-playlist.c:163
+#: ../src/totem-playlist.c:164
 msgid "MP3 audio (streamed, DOS format)"
 msgstr "MP3-lyd (strøm, DOS-format)"
 
-#: ../src/totem-playlist.c:164
+#: ../src/totem-playlist.c:165
 msgid "XML Shareable Playlist"
 msgstr "XML-spilleliste som kan deles"
 
 #. This is "Title 3", where title is a DVD title
 #. * Note: NOT a DVD chapter
-#: ../src/totem-playlist.c:347
+#: ../src/totem-playlist.c:348
 #, c-format
 msgid "Title %d"
 msgstr "Tittel %d"
 
-#: ../src/totem-playlist.c:446
+#: ../src/totem-playlist.c:447
 msgid "Could not save the playlist"
 msgstr "Kunne ikke lagre spillelisten"
 
-#: ../src/totem-playlist.c:1021
+#: ../src/totem-playlist.c:1022
 msgid "Save Playlist"
 msgstr "Lagre spilleliste"
 
 #. translators: Playlist is the default saved playlist filename,
 #. * without the suffix
-#: ../src/totem-playlist.c:1033 ../src/totem-playlist.c:1264
+#: ../src/totem-playlist.c:1034 ../src/totem-playlist.c:1263
 #: ../src/totem-sidebar.c:145
 msgid "Playlist"
 msgstr "Spilleliste"
 
-#: ../src/totem-playlist.c:1857
+#: ../src/totem-playlist.c:1862
 #, c-format
 msgid "The playlist '%s' could not be parsed. It might be damaged."
 msgstr "Spilleliste «%s» kunne ikke leses. Den kan være skadet."
 
-#: ../src/totem-playlist.c:1858
+#: ../src/totem-playlist.c:1863
 msgid "Playlist error"
 msgstr "Feil med spilleliste"
 
-#: ../src/totem-preferences.c:295
+#: ../src/totem-preferences.c:297
 msgid "Preferences"
 msgstr "Brukervalg"
 
-#: ../src/totem-preferences.c:451
+#: ../src/totem-preferences.c:445
 msgid "Select Subtitle Font"
 msgstr "Velg skrift for teksting"
 
-#: ../src/totem-properties-main.c:115 ../src/totem-properties-view.c:266
+#: ../src/totem-properties-main.c:116 ../src/totem-properties-view.c:269
 msgid "Audio/Video"
 msgstr "Lyd/bilde"
 
-#: ../src/totem-properties-view.c:128
+#: ../src/totem-properties-view.c:131
 msgid "N/A"
 msgstr "I/T"
 
-#: ../src/totem-properties-view.c:157
+#: ../src/totem-properties-view.c:160
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 msgctxt "Stream bit rate"
 msgid "N/A"
 msgstr "I/T"
 
-#: ../src/totem-properties-view.c:160
+#: ../src/totem-properties-view.c:163
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: ../src/totem-properties-view.c:177
+#: ../src/totem-properties-view.c:180
 #: ../src/plugins/properties/totem-movie-properties.c:149
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../src/totem-properties-view.c:209
+#: ../src/totem-properties-view.c:212
 #: ../src/plugins/properties/totem-movie-properties.c:166
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: ../src/totem-properties-view.c:216
+#: ../src/totem-properties-view.c:219
 #: ../src/plugins/properties/totem-movie-properties.c:166
 msgctxt "Sample rate"
 msgid "N/A"
 msgstr "I/T"
 
-#: ../src/totem-properties-view.c:224
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5589
-msgid "Surround"
-msgstr "Surround"
-
-#: ../src/totem-properties-view.c:226
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5591
-msgid "Mono"
-msgstr "Mono"
-
-#: ../src/totem-properties-view.c:236
+#: ../src/totem-properties-view.c:239
 msgctxt "Number of audio channels"
 msgid "N/A"
 msgstr "I/T"
@@ -1564,8 +1540,8 @@
 #. eg: 75 %
 #: ../src/totem-statusbar.c:250
 #, c-format
-msgid "%d %%"
-msgstr "%d %%"
+msgid "%lf %%"
+msgstr "%lf %%"
 
 #. eg: Paused, 0:32 / 1:05
 #: ../src/totem-statusbar.c:325
@@ -1576,8 +1552,8 @@
 #. eg: Buffering, 75 %
 #: ../src/totem-statusbar.c:330
 #, c-format
-msgid "%s, %d %%"
-msgstr "%s, %d %%"
+msgid "%s, %f %%"
+msgstr "%s, %f %%"
 
 #: ../src/totem-subtitle-encoding.c:156
 msgid "Current Locale"
@@ -1720,224 +1696,91 @@
 msgid "Vietnamese"
 msgstr "Vietnamesisk"
 
-#: ../src/totem-video-list.c:330
-msgid "No video URI"
-msgstr "Ingen video-URI"
-
-#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
-#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
-#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
-#: ../src/totem-video-thumbnailer.c:872
-#, c-format
-msgid ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-msgstr ""
-"%s: %s\n"
-"%s: %dx%d\n"
-"%s: %s"
-
-#: ../src/totem-video-thumbnailer.c:873
-msgid "Filename"
-msgstr "Filnavn"
-
-#: ../src/totem-video-thumbnailer.c:875
-msgid "Resolution"
-msgstr "Oppløsning"
-
-#: ../src/totem-video-thumbnailer.c:878
-msgid "Duration"
-msgstr "Varighet"
-
-#: ../src/totem-uri.c:506 ../src/plugins/chapters/totem-chapters.c:998
+#: ../src/totem-uri.c:343 ../src/plugins/chapters/totem-chapters.c:998
 msgid "All files"
 msgstr "Alle filer"
 
-#: ../src/totem-uri.c:511 ../src/plugins/chapters/totem-chapters.c:995
+#: ../src/totem-uri.c:348 ../src/plugins/chapters/totem-chapters.c:995
 msgid "Supported files"
 msgstr "Støttede filer"
 
-#: ../src/totem-uri.c:523
+#: ../src/totem-uri.c:360
 msgid "Audio files"
 msgstr "Lydfiler"
 
-#: ../src/totem-uri.c:531
+#: ../src/totem-uri.c:368
 msgid "Video files"
 msgstr "Videofiler"
 
-#: ../src/totem-uri.c:541
+#: ../src/totem-uri.c:378
 msgid "Subtitle files"
 msgstr "Undertekstfiler"
 
-#: ../src/totem-uri.c:593
+#: ../src/totem-uri.c:430
 msgid "Select Text Subtitles"
 msgstr "Velg tekstfil for teksting"
 
-#: ../src/totem-uri.c:656
+#: ../src/totem-uri.c:495
 msgid "Select Movies or Playlists"
 msgstr "Velg filmer eller spillelister"
 
-#. Options parsing
-#: ../src/totem.c:204
-msgid "- Play movies and songs"
-msgstr "- Spill av filmer og sanger"
-
-#: ../src/totem.c:220
-#, c-format
-msgid ""
-"%s\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"%s\n"
-"Kjør «%s --help» for å se en full liste med tilgjengelige "
-"komanndolinjeflagg.\n"
-
-#: ../src/totem.c:262 ../src/totem.c:273
-#: ../browser-plugin/totem-plugin-viewer.c:663
-#: ../browser-plugin/totem-plugin-viewer.c:1793
-msgid "Totem Movie Player"
-msgstr "Totem filmavspiller"
-
-#: ../src/totem.c:263 ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Could not initialize the thread-safe libraries."
-msgstr "Kunne ikke initiere trådsikre biblioteker."
-
-#: ../src/totem.c:263
-msgid "Verify your system installation. Totem will now exit."
-msgstr "Sjekk systeminstallasjonen. Totem avslutter nå."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:1589
-msgid "Password requested for RTSP server"
-msgstr "Passord forespurt for RTSP-tjener"
+#: ../src/totem-uri.c:499
+msgid "Add Directory"
+msgstr "Legg til mappe"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2858
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2862
-#, c-format
-msgid "Audio Track #%d"
-msgstr "Lydspor #%d"
+#: ../src/totem-video-list.c:330
+msgid "No video URI"
+msgstr "Ingen video-URI"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2890
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2894
+#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
+#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
+#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
+#: ../src/totem-video-thumbnailer.c:841
 #, c-format
-msgid "Subtitle #%d"
-msgstr "Undertekst #%d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3298
-msgid ""
-"The requested audio output was not found. Please select another audio output "
-"in the Multimedia Systems Selector."
-msgstr ""
-"Forespurt utgang for lyd ble ikke funnet. Velg annen utgang for lyd i «Valg "
-"av multimediesystemer»"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3303
-msgid "Location not found."
-msgstr "Plassering ikke funnet."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3307
-msgid ""
-"Could not open location; you might not have permission to open the file."
-msgstr ""
-"Kunne ikke åpne lokasjon. Du har kanskje ikke tillatelse til å åpne den "
-"filen."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3318
-msgid ""
-"The video output is in use by another application. Please close other video "
-"applications, or select another video output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"Filmutdataen er i bruk av et annet program. Avslutt andre filmprogrammer "
-"eller velg en annen utdata for film i «Valg av multimediesystem»."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3324
 msgid ""
-"The audio output is in use by another application. Please select another "
-"audio output in the Multimedia Systems Selector. You may want to consider "
-"using a sound server."
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 msgstr ""
-"Utdataen for lyd er i bruk av et annet program. Velg en annen utdata for lyd "
-"i «Valg av multimediesystem». Du kan muligens bruke en lydtjener."
-
-#. should be exactly one missing thing (source or converter)
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3342
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3348
-#, c-format
-msgid "The playback of this movie requires a %s plugin which is not installed."
-msgid_plural ""
-"The playback of this movie requires the following decoders which are not "
-"installed:\n"
-"\n"
-"%s"
-msgstr[0] ""
-"Avspilling av denne filmen krever et tillegg %s og dette er ikke installert."
-msgstr[1] ""
-"Avspilling av denne filmen krever følgende dekodere som ikke er installert:\n"
-"\n"
-"%s"
+"%s: %s\n"
+"%s: %dx%d\n"
+"%s: %s"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3374
-msgid ""
-"Cannot play this file over the network. Try downloading it to disk first."
-msgstr ""
-"Kan ikke spille denne filen over nettverket. Prøv å laste den ned først."
+#: ../src/totem-video-thumbnailer.c:842
+msgid "Filename"
+msgstr "Filnavn"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5878
-msgid "Media contains no supported video streams."
-msgstr "Medier inneholder ingen støttede videostrømmer."
+#: ../src/totem-video-thumbnailer.c:844
+msgid "Resolution"
+msgstr "Oppløsning"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6053
-msgid ""
-"Failed to create a GStreamer play object. Please check your GStreamer "
-"installation."
-msgstr ""
-"Kunne ikke opprette et spilleobjekt for GStreamer. Sjekk din GStreamer "
-"installasjon."
+#: ../src/totem-video-thumbnailer.c:847
+msgid "Duration"
+msgstr "Varighet"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6173
-msgid ""
-"Failed to open audio output. You may not have permission to open the sound "
-"device, or the sound server may not be running. Please select another audio "
-"output in the Multimedia Systems Selector."
-msgstr ""
-"Kunne ikke åpne utgang for lyd. Du har kanskje ikke tillatelse til å åpne "
-"lydenheten eller lydtjeneren kjører ikke. Velg en annen utgang for lyd i "
-"«Valg av multimediesystemer»."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6193
-msgid ""
-"Could not find the audio output. You may need to install additional "
-"GStreamer plugins, or select another audio output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"Fant ikke utgang for lyd. Du må kanskje installere flere tillegg for "
-"GStreamer eller velge en annen utgang for lyd i dialogen «Valg av "
-"multimediesystemer»."
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:1
+msgid "Apple Trailers"
+msgstr "Apple Trailers"
+
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:2
+msgid "Sets the user agent for the Apple Trailers site"
+msgstr "Setter brukeragent for Apple Trailers nettstedet"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:1
+msgid "Autoload Subtitles"
+msgstr "Last undertekst automatisk"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:2
+msgid "Autoloads text subtitles"
+msgstr "Laster undertekster automatisk"
 
-#. hour:minutes:seconds
-#. Translators: This is a time format, like "9:05:02" for 9
-#. * hours, 5 minutes, and 2 seconds. You may change ":" to
-#. * the separator that your locale uses or use "%Id" instead
-#. * of "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:83 ../src/plugins/skipto/totem-time-entry.c:57
-#, c-format
-msgctxt "long time format"
-msgid "%d:%02d:%02d"
-msgstr "%d:%02d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
+msgid "Video Disc Recorder"
+msgstr "Opptak av videoplater"
 
-#. minutes:seconds
-#. Translators: This is a time format, like "5:02" for 5
-#. * minutes and 2 seconds. You may change ":" to the
-#. * separator that your locale uses or use "%Id" instead of
-#. * "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:92
-#, c-format
-msgctxt "short time format"
-msgid "%d:%02d"
-msgstr "%d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
+msgid "Records (S)VCDs or video DVDs"
+msgstr "Tar opp (S)VCDer eller video-DVDer"
 
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:65
 msgid "_Create Video Disc..."
@@ -1963,37 +1806,20 @@
 msgid "Copy the currently playing (S)VCD"
 msgstr "Kopier (S)VCD som spilles av"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:129
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:136
 msgid "The video disc could not be duplicated."
 msgstr "Videoplaten kunne ikke kopieres."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:131
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:276
-msgid "The movie could not be recorded."
-msgstr "Kunne ikke ta opp filmen."
-
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:157
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:167
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:263
-msgid "Unable to write a project."
-msgstr "Kan ikke skrive et prosjekt."
-
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
-msgid "Video Disc Recorder"
-msgstr "Opptak av videoplater"
-
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
-msgid "Records (S)VCDs or video DVDs"
-msgstr "Tar opp (S)VCDer eller video-DVDer"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:1
-#: ../src/plugins/chapters/totem-chapters.c:1139
-msgid "Chapters"
-msgstr "Kapitler"
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:138
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:283
+msgid "The movie could not be recorded."
+msgstr "Kunne ikke ta opp filmen."
 
-#: ../src/plugins/chapters/chapters.plugin.in.h:2
-msgid "Support chapter markers in movies."
-msgstr "Støtte for kapittelmarkører i filmer."
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:164
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:174
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:270
+msgid "Unable to write a project."
+msgstr "Kan ikke skrive et prosjekt."
 
 #: ../src/plugins/chapters/chapters-edit.ui.h:1
 msgid "Name for new chapter:"
@@ -2051,6 +1877,15 @@
 msgid "Create a new chapter list for the movie"
 msgstr "Lag en ny kapittelliste for filmen"
 
+#: ../src/plugins/chapters/chapters.plugin.in.h:1
+#: ../src/plugins/chapters/totem-chapters.c:1139
+msgid "Chapters"
+msgstr "Kapitler"
+
+#: ../src/plugins/chapters/chapters.plugin.in.h:2
+msgid "Support chapter markers in movies"
+msgstr "Støtte for kapittelmarkører i filmer"
+
 #: ../src/plugins/chapters/totem-chapters.c:56
 #, c-format
 msgid ""
@@ -2155,13 +1990,37 @@
 msgid "The URI ‘%s’ is not supported."
 msgstr "URI «%s» er ikke støttet."
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
-msgid "Instant Messenger status"
-msgstr "Status for lynmeldingsklient"
+#: ../src/plugins/grilo/grilo.plugin.in.h:1
+msgid "Grilo Browser"
+msgstr "Grilo-leser"
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
-msgid "Set your Instant Messenger status to away when a movie is playing"
-msgstr "Sett status for lynmeldingsklient til borte når en film spilles av"
+#: ../src/plugins/grilo/grilo.plugin.in.h:2
+msgid "A plugin to let you browse media content from various sources"
+msgstr "Et tillegg som lar deg se på medieinnhold fra forskjellige kilder"
+
+#: ../src/plugins/grilo/grilo.ui.h:1
+msgid "Add to Playlist"
+msgstr "Legg til i spilleliste"
+
+#: ../src/plugins/grilo/grilo.ui.h:2
+msgid "Copy Location"
+msgstr "Kopier lokasjon"
+
+#: ../src/plugins/grilo/grilo.ui.h:3 ../src/plugins/grilo/totem-grilo.c:1184
+msgid "Browse"
+msgstr "Bla gjennom"
+
+#: ../src/plugins/grilo/grilo.ui.h:4 ../src/plugins/grilo/totem-grilo.c:1227
+msgid "Search"
+msgstr "Søk"
+
+#: ../src/plugins/grilo/totem-grilo.c:454
+msgid "Browse Error"
+msgstr "Feil ved lesing"
+
+#: ../src/plugins/grilo/totem-grilo.c:609
+msgid "Search Error"
+msgstr "Feil ved søk"
 
 #: ../src/plugins/gromit/gromit.plugin.in.h:1
 msgid "Gromit Annotations"
@@ -2175,57 +2034,13 @@
 msgid "The gromit binary was not found."
 msgstr "Binærfilen for gromit ble ikke funnet"
 
-#. Add the interface to Totem's sidebar
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:1
-#: ../src/plugins/iplayer/iplayer.py:46
-msgid "BBC iPlayer"
-msgstr "BBC iPlayer"
-
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:2
-msgid "Stream BBC programs from the last 7 days from the BBC iPlayer service."
-msgstr "Vis BBC-programmer fra BBC iPlayer-tjenesten de siste 7 dagene."
-
-#: ../src/plugins/iplayer/iplayer.py:72
-msgid "Error listing channel categories"
-msgstr "Feil ved listing av kanalkategorier"
-
-#: ../src/plugins/iplayer/iplayer.py:73
-msgid ""
-"There was an unknown error getting the list of television channels available "
-"on BBC iPlayer."
-msgstr ""
-"Det oppsto en ukjent feil under henting av listen over TV-kanaler som er "
-"tilgjengelige på BBC iPlayer."
-
-#. Append a dummy child row so that the expander's visible; we can
-#. then queue off the expander to load the programme listing for this
-#. category
-#: ../src/plugins/iplayer/iplayer.py:84
-msgid "Loading…"
-msgstr "Laster …"
-
-#. Translators: the "programme feed" is the list of TV shows
-#. available to watch online
-#: ../src/plugins/iplayer/iplayer.py:136
-msgid "Error getting programme feed"
-msgstr "Feil under henting av program"
-
-#: ../src/plugins/iplayer/iplayer.py:137
-msgid ""
-"There was an error getting the list of programmes for this channel and "
-"category combination."
-msgstr ""
-"Det oppsto en feil ved henting av program for denne kombinasjonen av kanal "
-"og kategori."
-
-#: ../src/plugins/iplayer/iplayer2.py:298
-msgid ""
-msgstr ""
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
+msgid "Instant Messenger Status"
+msgstr "Status for lynmeldingsklient"
 
-#: ../src/plugins/iplayer/iplayer2.py:299
-#, python-format
-msgid "Programme unavailable (\"%s\")"
-msgstr "Programmet er ikke tilgjengelig («%s»)"
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
+msgid "Set your Instant Messenger status to away when a movie is playing"
+msgstr "Sett status for lynmeldingsklient til borte når en film spilles av"
 
 #: ../src/plugins/lirc/lirc.plugin.in.h:1
 msgid "Infrared Remote Control"
@@ -2243,25 +2058,29 @@
 msgid "Couldn't read lirc configuration."
 msgstr "Kunne ikke lese konfigurasjon for lirc."
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
-msgid "Download Movie Subtitles"
-msgstr "Last ned undertekst for film"
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:1
+msgid "Media Player Keys"
+msgstr "Mediespillertaster"
+
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:2
+msgid "Support additional media player keys"
+msgstr "Støtter flere mediespillertaster"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
-msgid "Subtitle _language:"
-msgstr "Språ_k for undertekst:"
+#: ../src/plugins/ontop/ontop.plugin.in.h:1
+msgid "Always On Top"
+msgstr "Alltid øverst"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
-msgid "_Play with Subtitle"
-msgstr "S_pill av med undertekst"
+#: ../src/plugins/ontop/ontop.plugin.in.h:2
+msgid "Keep the main window on top when playing a movie"
+msgstr "Behold hovedvinduet øverst når en film spilles av"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:1
 msgid "Subtitle Downloader"
 msgstr "Nedlasting av undertekst"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:2
-msgid "Look for subtitles for the currently playing movie."
-msgstr "Se etter en undertekst for filmen som spilles av."
+msgid "Look for subtitles for the currently playing movie"
+msgstr "Se etter en undertekst for filmen som spilles av"
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:42
 msgid "Brazilian Portuguese"
@@ -2317,6 +2136,18 @@
 msgid "Searching subtitles…"
 msgstr "Søker etter undertekster …"
 
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
+msgid "Download Movie Subtitles"
+msgstr "Last ned undertekst for film"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
+msgid "Subtitle _language:"
+msgstr "Språ_k for undertekst:"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
+msgid "_Play with Subtitle"
+msgstr "S_pill av med undertekst"
+
 #: ../src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in.h:1
 msgid "Subtitle language"
 msgstr "Språk for undertekst"
@@ -2325,80 +2156,18 @@
 msgid "The language to search for subtitles for movies in."
 msgstr "Språk du vil søke etter undertekster for filmer."
 
-#: ../src/plugins/ontop/ontop.plugin.in.h:1
-msgid "Always On Top"
-msgstr "Alltid øverst"
-
-#: ../src/plugins/ontop/ontop.plugin.in.h:2
-msgid "Keep the main window on top when playing a movie"
-msgstr "Behold hovedvinduet øverst når en film spilles av"
+#: ../src/plugins/properties/movie-properties.plugin.in.h:1
+msgid "Movie Properties"
+msgstr "Egenskaper for film"
+
+#: ../src/plugins/properties/movie-properties.plugin.in.h:2
+msgid "Adds movie properties to the sidebar"
+msgstr "Legger til egenskaper for filmen på sidelinjen"
 
 #: ../src/plugins/properties/totem-movie-properties.c:246
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:1
-msgid "Publisher protocol to use"
-msgstr "Protokoll som skal brukes for publisering"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:2
-msgid ""
-"The transport protocol to use when publishing playlists over the network."
-msgstr ""
-"Protokoll som skal brukes for transport når spillelister publiseres over "
-"nettverket."
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:3
-msgid "Format for network service name"
-msgstr "Format for navn på nettverkstjeneste"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:5
-#, no-c-format
-msgid ""
-"A format string used to build the network service name used when publishing "
-"playlists over the network. The following format placeholders can be used: • "
-"%a: the program name as returned by g_get_application_name() • %h: the "
-"machine's host name in title case • %u: the user's login name in title case "
-"• %U: the user's real name • %%: the percent sign"
-msgstr ""
-"En formatstreng som brukes til å bygge tjenestenavn for nettverk som brukes "
-"ved publisering av spillelister over nettverket. Følgende plassholdere for "
-"format kan brukes: · %a: programnavnet som returneres av "
-"g_get_application_name() · %h: maskinens vertsnavn i tittelform · %u: "
-"brukernavn i tittelform · %U: brukers egentlige navn · %%: prosenttegnet"
-
-#. Translators: computers on the local network which are publishing their playlists over the network
-#: ../src/plugins/publish/totem-publish.c:552
-msgid "Neighbors"
-msgstr "Naboer"
-
-#: ../src/plugins/publish/publish.plugin.in.h:1
-msgid "Publish Playlist"
-msgstr "Publiser spilleliste"
-
-#: ../src/plugins/publish/publish.plugin.in.h:2
-msgid "Share the current playlist via HTTP"
-msgstr "Del denne spillelisten via HTTP"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:1
-msgid "Service _Name:"
-msgstr "_Navn på tjeneste:"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:3
-#, no-c-format
-msgid ""
-"The name used for announcing the playlist service on the network.\n"
-"All occurrences of the string %u will be replaced by your name,\n"
-"and %h will be replaced by your computer's host name."
-msgstr ""
-"Navn brukt for å annonsere spillelistetjenesten på nettverket.\n"
-"Alle oppføringer av strengen %u vil bli erstattet med ditt navn,\n"
-"og %h vil bli erstattet av navnet på din datamaskin."
-
-#: ../src/plugins/publish/publish-plugin.ui.h:6
-msgid "Use _encrypted transport protocol (HTTPS)"
-msgstr "Bruk krypt_ert transportprotokoll (HTTPS)"
-
 #: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:1
 msgid "rpdb2 password"
 msgstr "rpdb2-passord"
@@ -2412,22 +2181,86 @@
 "uautorisert tilgang. Hvis dette er tomt vil forvalgt passord «totem» bli "
 "brukt."
 
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
+msgid "Python Console"
+msgstr "Python-konsoll"
+
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
+msgid "Interactive Python console"
+msgstr "Interaktivt Python-konsoll"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:88
+msgid "Python Console Menu"
+msgstr "Meny for Python-konsoll"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:93
+msgid "_Python Console"
+msgstr "_Python-konsoll"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:94
+msgid "Show Totem's Python console"
+msgstr "Vis Totem's Python-konsoll"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:100
+msgid "Python Debugger"
+msgstr "Python feilsøking"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:101
+msgid "Enable remote Python debugging with rpdb2"
+msgstr "Aktiver ekstern Python-feilsøking med rpdb2"
+
+#. pylint: disable-msg=E1101
+#: ../src/plugins/pythonconsole/pythonconsole.py:125
+#, python-format
+msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
+msgstr "Du kan aksessere Totem.Object gjennom 'totem_object' :\\n%s"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:129
+msgid "Totem Python Console"
+msgstr "Python-konsoll for Totem"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:139
+msgid ""
+"After you press OK, Totem will wait until you connect to it with winpdb or "
+"rpdb2. If you have not set a debugger password in DConf, it will use the "
+"default password ('totem')."
+msgstr ""
+"Etter at du trykker OK vil Totem vente til du kobler til med winpdb eller "
+"rpdb2. Hvis du ikke har satt et passord for feilsøking i DConf vil forvalgt "
+"passord benyttes ('totem')."
+
+#: ../src/plugins/recent/recent.plugin.in.h:1
+msgid "Recent files"
+msgstr "Nylig brukte filer"
+
+#: ../src/plugins/recent/recent.plugin.in.h:2
+msgid "Adds files that have been played to recent files"
+msgstr "Legger til filer som er avspilt til nylig brukte filer"
+
 #: ../src/plugins/rotation/rotation.plugin.in.h:1
 msgid "Rotation Plugin"
 msgstr "Tillegg for rotering"
 
 #: ../src/plugins/rotation/rotation.plugin.in.h:2
-msgid "Allows videos to be rotated if they're in the wrong orientation."
-msgstr "Gjør det mulig å rotere videoer hvis de har feil orientering."
+msgid "Allows videos to be rotated if they are in the wrong orientation"
+msgstr "Gjør det mulig å rotere videoer hvis de har feil orientering"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:60
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:50
 msgid "_Rotate Clockwise"
 msgstr "_Roter med klokken"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:62
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:52
 msgid "Rotate Counterc_lockwise"
 msgstr "Roter _mot klokken"
 
+#: ../src/plugins/save-file/save-file.plugin.in.h:1
+msgid "Save Copy"
+msgstr "Lagre en kopi"
+
+#: ../src/plugins/save-file/save-file.plugin.in.h:2
+msgid "Save a copy of the currently playing movie"
+msgstr "Lagre en kopi av filmen som spilles av"
+
 #: ../src/plugins/save-file/totem-save-file.c:63
 msgid "Save a Copy..."
 msgstr "Lagre en kopi …"
@@ -2450,10 +2283,13 @@
 msgid "Movie stream"
 msgstr "Filmstrøm"
 
-#: ../src/plugins/screensaver/totem-screensaver.c:116
-#: ../browser-plugin/totem-plugin-viewer.c:1891
-msgid "Playing a movie"
-msgstr "Spiller av en film"
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:1
+msgid "Screen Saver"
+msgstr "Skjermsparer"
+
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:2
+msgid "Deactivates the screen saver when a movie is playing"
+msgstr "Slår av skjermsparer når en film spilles av"
 
 #: ../src/plugins/screenshot/gallery.ui.h:1
 msgid "Screenshot width (in pixels):"
@@ -2467,23 +2303,28 @@
 msgid "Number of screenshots:"
 msgstr "Antall skjermdump:"
 
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:1
-msgid "_Name:"
-msgstr "_Navn:"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:2
-msgid "Save in _folder:"
-msgstr "Lagre i _mappe:"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:3
-msgid "Select a folder"
-msgstr "Velg en mappe"
-
-#. Write the screenshot to the temporary file
-#: ../src/plugins/screenshot/gnome-screenshot-widget.c:385
-#: ../src/plugins/screenshot/totem-screenshot.c:64
-msgid "Screenshot.png"
-msgstr "Skjermdump.png"
+#. translators: this is the name of the file that gets made up
+#. * with the screenshot if the entire screen is taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:147
+#, c-format
+msgid "Screenshot from %s.png"
+msgstr "Skjermdump fra %s.png"
+
+#. translators: this is the name of the file that gets
+#. * made up with the screenshot if the entire screen is
+#. * taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:154
+#, c-format
+msgid "Screenshot from %s - %d.png"
+msgstr "Skjermdump fra %s - %d.png"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:1
+msgid "Screenshot"
+msgstr "Skjermdump"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:2
+msgid "Allows screenshots and galleries to be taken of videos"
+msgstr "Muliggjør skjermdump og gallerier fra videoer"
 
 #: ../src/plugins/screenshot/totem-gallery.c:91
 msgid "Save Gallery"
@@ -2509,49 +2350,47 @@
 msgid "Saving gallery as \"%s\""
 msgstr "Lagrer galleri som «%s»"
 
-#: ../src/plugins/screenshot/totem-screenshot.c:113
-msgid "There was an error saving the screenshot."
-msgstr "Det oppsto en feil under lagring av skjermdump."
-
-#: ../src/plugins/screenshot/totem-screenshot.c:139
-msgid "Save Screenshot"
-msgstr "Lagre skjermdump"
-
-#. Create the screenshot widget
-#. Translators: %s is the movie title and %d is an auto-incrementing number to make filename unique
-#: ../src/plugins/screenshot/totem-screenshot.c:160
-#, c-format
-msgid "Screenshot-%s-%d.png"
-msgstr "Skjermdump-%s-%d.png"
-
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:88
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:220
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "Totem could not get a screenshot of the video."
 msgstr "Totem kunne ikke ta et skjermdump av denne filmen."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "This is not supposed to happen; please file a bug report."
 msgstr "Dette skal ikke skje. Vennligst rapporter feilen."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
-msgid "Take _Screenshot..."
-msgstr "Ta _skjermdump …"
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
+msgid "Take _Screenshot"
+msgstr "Ta _skjermdump"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
 msgid "Take a screenshot"
 msgstr "Ta et bilde av skjermen"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create Screenshot _Gallery..."
 msgstr "Lag _galleri av skjermdump …"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create a gallery of screenshots"
 msgstr "Lag et galleri av skjermdump"
 
+#: ../src/plugins/skipto/skipto.plugin.in.h:1
+#: ../src/plugins/skipto/totem-skipto.c:196
+msgid "Skip To"
+msgstr "Hopp til"
+
+#: ../src/plugins/skipto/skipto.plugin.in.h:2
+msgid "Provides the \"Skip to\" dialog"
+msgstr "Støtte for «Hopp til»-dialogen"
+
+#: ../src/plugins/skipto/skipto.ui.h:1
+msgid "_Skip to:"
+msgstr "_Hopp til:"
+
 #. Update the "seconds" label so that it always has the correct singular/plural form
 #. Translators: label for the seconds selector in the "Skip to" dialogue
-#: ../src/plugins/skipto/totem-skipto.c:160
+#: ../src/plugins/skipto/totem-skipto.c:159
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "sekund"
@@ -2561,15 +2400,11 @@
 #. Translators: you should translate this string to a number (written in digits) which corresponds to the longer character length of the
 #. * translations for "second" and "seconds", as translated elsewhere in this file. For example, in English, "second" is 6 characters long and
 #. * "seconds" is 7 characters long, so this string should be translated to "7". See: bgo#639398
-#: ../src/plugins/skipto/totem-skipto.c:190
+#: ../src/plugins/skipto/totem-skipto.c:189
 msgctxt "Skip To label length"
 msgid "7"
 msgstr "8"
 
-#: ../src/plugins/skipto/totem-skipto.c:197
-msgid "Skip To"
-msgstr "Hopp til"
-
 #: ../src/plugins/skipto/totem-skipto-plugin.c:182
 msgid "_Skip To..."
 msgstr "_Hopp til …"
@@ -2577,111 +2412,3 @@
 #: ../src/plugins/skipto/totem-skipto-plugin.c:182
 msgid "Skip to a specific time"
 msgstr "Hopp til en gitt tid"
-
-#: ../src/plugins/skipto/skipto.ui.h:1
-msgid "_Skip to:"
-msgstr "_Hopp til:"
-
-#: ../browser-plugin/totem-plugin-viewer.c:431
-msgid "No URI to play"
-msgstr "Ingen URI å spille av"
-
-#. translators: this is:
-#. * Open With ApplicationName
-#. * as in nautilus' right-click menu
-#: ../browser-plugin/totem-plugin-viewer.c:1107
-#, c-format
-msgid "_Open with \"%s\""
-msgstr "_Åpne med «%s»"
-
-#: ../browser-plugin/totem-plugin-viewer.c:2136
-msgid "No playlist or playlist empty"
-msgstr "Ingen spilleliste eller tom spilleliste"
-
-#: ../browser-plugin/totem-plugin-viewer.c:2235
-msgid "Movie browser plugin"
-msgstr "Tillegg for filmvisning"
-
-#: ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Verify your system installation. The Totem plugin will now exit."
-msgstr "Sjekk systeminstallasjonen. Tillegget for Totem avslutter nå."
-
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
-msgid "Python Console"
-msgstr "Python-konsoll"
-
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
-msgid "Interactive Python console."
-msgstr "Interaktivt Python-konsoll."
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:88
-msgid "Python Console Menu"
-msgstr "Meny for Python-konsoll"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:93
-msgid "_Python Console"
-msgstr "_Python-konsoll"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:94
-msgid "Show Totem's Python console"
-msgstr "Vis Totem's Python-konsoll"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:100
-msgid "Python Debugger"
-msgstr "Python feilsøking"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:101
-msgid "Enable remote Python debugging with rpdb2"
-msgstr "Aktiver ekstern Python-feilsøking med rpdb2"
-
-#. pylint: disable-msg=E1101
-#: ../src/plugins/pythonconsole/pythonconsole.py:125
-#, python-format
-msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
-msgstr "Du kan aksessere Totem.Object gjennom 'totem_object' :\\n%s"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:129
-msgid "Totem Python Console"
-msgstr "Python-konsoll for Totem"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:139
-msgid ""
-"After you press OK, Totem will wait until you connect to it with winpdb or "
-"rpdb2. If you have not set a debugger password in DConf, it will use the "
-"default password ('totem')."
-msgstr ""
-"Etter at du trykker OK vil Totem vente til du kobler til med winpdb eller "
-"rpdb2. Hvis du ikke har satt et passord for feilsøking i DConf vil forvalgt "
-"passord benyttes ('totem')."
-
-#: ../src/plugins/grilo/grilo.plugin.in.h:1
-msgid "Grilo Browser"
-msgstr "Grilo-leser"
-
-#: ../src/plugins/grilo/grilo.plugin.in.h:2
-msgid "A plugin to let you browse media content from various sources."
-msgstr "Et tillegg som lar deg se på media fra ulike kilder."
-
-#: ../src/plugins/grilo/totem-grilo.c:452
-msgid "Browse Error"
-msgstr "Feil ved lesing"
-
-#: ../src/plugins/grilo/totem-grilo.c:599
-msgid "Search Error"
-msgstr "Feil ved søk"
-
-#: ../src/plugins/grilo/totem-grilo.c:1219 ../src/plugins/grilo/grilo.ui.h:3
-msgid "Browse"
-msgstr "Bla gjennom"
-
-#: ../src/plugins/grilo/totem-grilo.c:1285 ../src/plugins/grilo/grilo.ui.h:4
-msgid "Search"
-msgstr "Søk"
-
-#: ../src/plugins/grilo/grilo.ui.h:1
-msgid "Add to Playlist"
-msgstr "Legg til i spilleliste"
-
-#: ../src/plugins/grilo/grilo.ui.h:2
-msgid "Copy Location"
-msgstr "Kopier lokasjon"
diff -Nru totem-3.4.3/po/pa.po totem-3.6.2/po/pa.po
--- totem-3.4.3/po/pa.po	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/po/pa.po	2012-10-25 13:15:32.000000000 +0000
@@ -10,26 +10,241 @@
 "Project-Id-Version: totem.HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=totem&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-03-23 06:16+0000\n"
-"PO-Revision-Date: 2012-03-26 17:20+0530\n"
+"POT-Creation-Date: 2012-09-11 16:43+0000\n"
+"PO-Revision-Date: 2012-09-12 07:28+0530\n"
 "Last-Translator: A S Alam \n"
 "Language-Team: Punjabi/Panjabi \n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Lokalize 1.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-Bookmarks: 42,-1,-1,-1,-1,-1,-1,-1,-1,-1\n"
-"Language: pa\n"
+
+#: ../browser-plugin/totem-plugin-viewer.c:352 ../src/totem-object.c:1180
+#: ../src/totem-object.c:1650 ../src/totem-statusbar.c:115
+msgid "Stopped"
+msgstr "ਰੁਕਿਆ"
+
+#: ../browser-plugin/totem-plugin-viewer.c:364 ../src/totem-object.c:1173
+msgid "Paused"
+msgstr "ਰੁਕਿਆ"
+
+#: ../browser-plugin/totem-plugin-viewer.c:368 ../src/totem-object.c:1166
+msgid "Playing"
+msgstr "ਚੱਲ ਰਿਹਾ ਹੈ"
+
+#: ../browser-plugin/totem-plugin-viewer.c:386
+#: ../src/plugins/screensaver/totem-screensaver.c:97
+msgid "Playing a movie"
+msgstr "ਇੱਕ ਮੂਵੀ ਚੱਲਦੀ ਏ"
+
+#: ../browser-plugin/totem-plugin-viewer.c:443
+msgid "No URI to play"
+msgstr "ਚਲਾਉਣ ਲਈ URI ਨਹੀਂ"
+
+#: ../browser-plugin/totem-plugin-viewer.c:676
+#: ../browser-plugin/totem-plugin-viewer.c:1700
+msgid "Totem Movie Player"
+msgstr "ਟੋਟੇਮ ਮੂਵੀ ਪਲੇਅਰ"
+
+#. translators: this is:
+#. * Open With ApplicationName
+#. * as in nautilus' right-click menu
+#: ../browser-plugin/totem-plugin-viewer.c:1120
+#, c-format
+msgid "_Open with \"%s\""
+msgstr "\"%s\" ਨਾਲ ਖੋਲ੍ਹੋ(_O)"
+
+#: ../browser-plugin/totem-plugin-viewer.c:1341 ../src/totem-object.c:2475
+msgid "An error occurred"
+msgstr "ਇੱਕ ਗਲਤੀ ਆਈ ਹੈ"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2033
+msgid "No playlist or playlist empty"
+msgstr "ਕੋਈ ਪਲੇਅ-ਲਿਸਟ ਨਹੀਂ ਜਾਂ ਖਾਲੀ ਹੈ"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2128
+msgid "Movie browser plugin"
+msgstr "ਮੂਵੀ ਬਰਾਊਜ਼ਰ ਪਲੱਗਇਨ"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144 ../src/totem.c:240
+msgid "Could not initialize the thread-safe libraries."
+msgstr "ਥਰਿੱਡ-ਸੁਰੱਖਿਆ ਲਾਇਬਰੇਰੀ ਸ਼ੁਰੂ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ ਹੈ।"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144
+msgid "Verify your system installation. The Totem plugin will now exit."
+msgstr "ਤੁਹਾਡੇ ਸਿਸਟਮ ਇੰਸਟਾਲ  ਪੜਤਾਲ ਹੋਈ। ਟੋਟੇਮ ਪਲੱਗਇਨ ਹੁਣ ਬੰਦ ਹੋਵੇਗੀ।"
 
 #: ../data/fullscreen.ui.h:1
 msgid "Leave Fullscreen"
 msgstr "ਪੂਰੀ ਸਕਰੀਨ ਛੱਡੋ"
 
-#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:144
+#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:81
 msgid "Time:"
 msgstr "ਟਾਈਮ:"
 
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
+msgid "Allow the screensaver to activate when playing audio"
+msgstr "ਜਦੋਂ ਕੇਵਲ ਆਡੀਓ ਹੀ ਚੱਲੇ ਤਾਂ ਸਕਰੀਨ-ਸੇਵਰ ਨੂੰ ਐਕਟੀਵੇਟ ਹੋਣ ਦਿਓ"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
+msgid ""
+"Allow the screensaver to activate when playing audio. Disable if you have "
+"monitor-powered speakers."
+msgstr ""
+"ਜਦੋਂ ਕੇਵਲ ਆਡੀਓ ਹੀ ਚੱਲੇ ਤਾਂ ਸਕਰੀਨ-ਸੇਵਰ ਨੂੰ ਐਕਟੀਵੇਟ ਹੋਣ ਦਿਓ। ਇਹ ਫਾਇਦੇਮੰਦ ਹੈ, ਜੇ "
+"ਮਾਨੀਟਰ ਪਾਵਰ "
+"ਸਪੀਕਰ ਹਨ।"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
+msgid "Show visual effects when no video is displayed"
+msgstr "ਆਡੀਓ ਫਾਇਲ ਚਲਾਉਣ ਸਮੇਂ, ਕੋਈ ਵਿਡੀਓ ਨਾ ਵੇਖਾਓ"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
+msgid "Show visual effects when playing an audio only file."
+msgstr "ਆਡੀਓ ਫਾਇਲ ਚਲਾਉਣ ਸਮੇਂ, ਦਿੱਖ ਪਰਭਾਵ ਵੇਖਾਓ।"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
+msgid "Name of the visual effects plugin"
+msgstr "ਦਿੱਖ ਪਰਭਾਵੀ ਪਲੱਗਇਨ ਦਾ ਨਾਂ"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
+msgid "The brightness of the video"
+msgstr "ਵਿਡੀਓ ਦੀ ਚਮਕ"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
+msgid "The contrast of the video"
+msgstr "ਵਿਡੀਓ ਦੀ ਕੰਟਰੈਂਸਟ"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
+msgid "The hue of the video"
+msgstr "ਵਿਡੀਓ ਆਭਾ"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
+msgid "The saturation of the video"
+msgstr "ਵਿਡੀਓ ਸੰਤੁਲਨ"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
+msgid "Resize the canvas automatically on file load"
+msgstr "ਫਾਇਲ ਲੋਡ ਕਰਨ ਤੇ ਪਰਦਾ ਦਾ ਅਕਾਰ ਖੁਦ ਹੀ ਮੁੜ-ਅਕਾਰ ਕਰੋ"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
+msgid "Repeat mode"
+msgstr "ਦੁਹਰਾਓ ਢੰਗ"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
+msgid "Shuffle mode"
+msgstr "ਰਲਵੀਂ ਢੰਗ"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
+msgid "Whether to disable deinterlacing for interlaced movies"
+msgstr "ਕੀ ਇੰਟਰਲੇਸ ਮੂਵੀ ਲਈ ਡਿ-ਇੰਟਰਲੇਸ ਨੂੰ ਬੰਦ ਕਰਨਾ ਹੈ"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
+msgid "Whether to enable debug for the playback engine"
+msgstr "ਕੀ ਪਲੇਅ-ਲਿਸਟ ਇੰਜਣ ਲਈ ਡੀਬੱਗ ਯੋਗ ਕਰਨਾ ਹੈ"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
+msgid "Type of audio output to use"
+msgstr "ਵਰਤਣ ਲਈ ਆਡੀਓ ਆਉਟਪੁੱਟ ਕਿਸਮ"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
+msgid "Visualization quality setting"
+msgstr "ਦਿੱਖ ਕੁਆਲਟੀ ਸੈਟਿੰਗ"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
+msgid "Quality setting for the audio visualization."
+msgstr "ਆਡੀਓ ਵਿਜ਼ੂਲਾਈਜੇਸ਼ਨ ਲਈ ਕੁਆਲਟੀ ਸੈਟਿੰਗ।"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
+msgid "Network buffering threshold"
+msgstr "ਨੈੱਟਵਰਕ ਬਫ਼ਰਿੰਗ ਥਰੈਂਸ਼ਹੋਲਡ"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
+msgid ""
+"Amount of data to buffer for network streams before starting to display the "
+"stream (in seconds)."
+msgstr ""
+"ਨੈੱਟਵਰਕ ਸਟਰੀਮ 'ਚ ਮੌਜੂਦ ਬਫ਼ਰ ਕਰਨ ਲਈ ਡਾਟੇ ਦੀ ਮਾਤਰਾ, ਜੋ ਸਟਰੀਮ ਨੂੰ ਵਿਖਾਉਣ ਤੋਂ "
+"ਪਹਿਲਾਂ ਇੱਕਠਾ "
+"ਕੀਤਾ ਜਾਵੇ (ਸਕਿੰਟ 'ਚ)।"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
+msgid "Subtitle font"
+msgstr "ਸਬ-ਟਾਇਟਲ ਫੋਂਟ"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
+msgid "Pango font description for subtitle rendering."
+msgstr "ਸਬ-ਟਾਇਟਲ ਰੈਂਡਰਿੰਗ ਲਈ ਪੈਂਗੋ ਫੋਂਟ ਵੇਰਵਾ।"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
+msgid "Subtitle encoding"
+msgstr "ਸਬ-ਟਾਇਟਲ ਇੰਕੋਡਿੰਗ"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
+msgid "Encoding character set for subtitle."
+msgstr "ਸਬ-ਟਾਇਟਲ ਲਈ ਇੰਕੋਡਿੰਗ ਕਰੈਕਟਰ ਸੈੱਟ"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
+msgid "Default location for the \"Open...\" dialogs"
+msgstr "\"ਖੋਲ੍ਹੋ...\" ਡਾਈਲਾਗ ਲਈ ਮੂਲ ਟਿਕਾਣਾ"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
+msgid ""
+"Default location for the \"Open...\" dialogs. Default is the current "
+"directory."
+msgstr ""
+"\"ਖੋਲ੍ਹੋ...\" ਡਾਈਲਾਗ ਲਈ ਡਿਫਾਲਟ ਟਿਕਾਣਾ ਹੈ। ਡਿਫਾਲਟ ਰੂਪ 'ਚ ਇਹ ਮੌਜੂਦਾ ਡਾਇਰੈਕਟਰੀ "
+"ਹੈ।"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
+msgid "Default location for the \"Take Screenshot\" dialogs"
+msgstr "\"ਸਕਰੀਨਸ਼ਾਟ ਲਵੋ\" ਡਾਈਲਾਗ ਲਈ ਡਿਫਾਲਟ ਟਿਕਾਣਾ"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
+msgid ""
+"Default location for the \"Take Screenshot\" dialogs. Default is the "
+"Pictures directory."
+msgstr ""
+"\"ਸਕਰੀਨਸ਼ਾਟ ਲਵੋ\" ਡਾਈਲਾਗ ਲਈ ਡਿਫਾਲਟ ਟਿਕਾਣਾ ਹੈ। ਡਿਫਾਲਟ ਤਸਵੀਰਾਂ ਡਾਇਰੈਕਟਰੀ ਹੈ।"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
+msgid "Whether to disable the plugins in the user's home directory"
+msgstr "ਯੂਜ਼ਰ ਦੀ ਘਰ ਡਾਇਰੈਕਟਰੀ ਵਿੱਚ ਪਲੱਗਇਨਾਂ ਨੂੰ ਆਯੋਗ ਕਰਨਾ ਹੈ"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
+msgid "Whether to disable the keyboard shortcuts"
+msgstr "ਕੀ ਕੀਬੋਰਡ ਸ਼ਾਰਟਕੱਟ ਬੰਦ ਕਰਨੇ ਹਨ"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
+msgid "Whether to autoload text subtitle files when a movie is loaded"
+msgstr "ਕੀ ਇੱਕ ਮੂਵੀ ਲੋਡ ਕਰਨ ਦੌਰਾਨ ਟੈਕਸਟ ਸਬ-ਟਾਇਟਲ ਫਾਇਲਾਂ ਨੂੰ ਆਟੋ-ਲੋਡ ਕਰਨਾ ਹੈ"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
+msgid "Whether to autoload external chapter files when a movie is loaded"
+msgstr "ਕੀ ਇੱਕ ਮੂਵੀ ਲੋਡ ਕਰਨ ਦੌਰਾਨ ਬਾਹਰੀ ਚੈਪਟਰ ਫਾਇਲਾਂ ਨੂੰ ਆਟੋ-ਲੋਡ ਕਰਨਾ ਹੈ।"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
+msgid ""
+"Whether to remember the position of played audio/video files when pausing or "
+"closing them"
+msgstr ""
+"ਕੀ ਆਡੀਓ/ਵਿਡੀਓ ਫਾਇਲਾਂ ਦੀ ਸਥਿਤੀ ਨੂੰ ਯਾਦ ਰੱਖਣਾ ਹੈ, ਜਦੋਂ ਉਹਨਾਂ ਪੌਜ਼ ਕਰਨਾ ਹੋਵੇ ਤਾਂ "
+"ਬੰਦ ਕਰਨਾ ਹੋਵੇ।"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
+msgid "Active plugins list"
+msgstr "ਐਕਟਿਵ ਪਲੱਗਇਨ ਲਿਸਟ"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+msgid ""
+"A list of the names of the plugins which are currently active (loaded and "
+"running)."
+msgstr ""
+"ਪਲੱਗਇਨ ਦੇ ਨਾਂ ਦੀ ਲਿਸਟ, ਜੋ ਕਿ ਇਸ ਸਮੇਂ ਐਕਟਿਵ ਹਨ (ਲੋਡ ਕੀਤੀਆਂ ਤੇ ਚੱਲ ਰਹੀਆਂ)।"
+
 #: ../data/playlist.ui.h:1
 msgid "_Remove"
 msgstr "ਹਟਾਓ(_R)"
@@ -46,11 +261,11 @@
 msgid "Copy the location to the clipboard"
 msgstr "ਟਿਕਾਣਾ ਕਲਿੱਪਬੋਰਡ 'ਚ ਕਾਪੀ ਕਰੋ"
 
-#: ../data/playlist.ui.h:5 ../data/totem.ui.h:78
+#: ../data/playlist.ui.h:5 ../data/totem.ui.h:71
 msgid "_Select Text Subtitles..."
 msgstr "ਟੈਕਸਟ ਸਬ-ਟਾਇਟਲ ਚੁਣੋ(_S)..."
 
-#: ../data/playlist.ui.h:6 ../data/totem.ui.h:79
+#: ../data/playlist.ui.h:6 ../data/totem.ui.h:72
 msgid "Select a file to use for text subtitles"
 msgstr "ਟੈਕਸਟ ਸਬ-ਟਾਇਟਲ ਵਰਤਣ ਵਾਸਤੇ ਇੱਕ ਫਾਇਲ ਚੁਣੋ"
 
@@ -74,50 +289,200 @@
 msgid "Move Down"
 msgstr "ਹੇਠਾਂ"
 
-#: ../data/properties.ui.h:1 ../data/totem.ui.h:122
-msgid "General"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:2
+msgid "Normal"
 msgstr "ਸਧਾਰਨ"
 
-#: ../data/properties.ui.h:2
-msgid "Title:"
-msgstr "ਟਾਇਟਲ:"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:4
+msgid "Large"
+msgstr "ਵੱਡਾ"
 
-#: ../data/properties.ui.h:3
-msgid "Artist:"
-msgstr "ਕਲਾਕਾਰ:"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:6
+msgid "Extra Large"
+msgstr "ਬਹੁਤ ਵੱਡਾ"
 
-#: ../data/properties.ui.h:4
-msgid "Duration:"
-msgstr "ਅੰਤਰਾਲ:"
+#: ../data/preferences.ui.h:7 ../src/backend/bacon-video-widget.c:5498
+#: ../src/totem-properties-view.c:231
+msgid "Stereo"
+msgstr "ਸਟੀਰਿਓ"
 
-#: ../data/properties.ui.h:5
-msgid "Year:"
-msgstr "ਸਾਲ:"
+#: ../data/preferences.ui.h:8
+msgid "4-channel"
+msgstr "੪-ਚੈਨਲ"
 
-#: ../data/properties.ui.h:6
-msgid "Album:"
-msgstr "ਐਲਬਮ:"
+#: ../data/preferences.ui.h:9
+msgid "4.1-channel"
+msgstr "੪.੧-ਚੈਨਲ"
 
-#: ../data/properties.ui.h:7
-msgid "Comment:"
-msgstr "ਟਿੱਪਣੀ:"
+#: ../data/preferences.ui.h:10
+msgid "5.0-channel"
+msgstr "੫.੦-ਚੈਨਲ"
 
-#: ../data/properties.ui.h:8
-msgid "Container:"
-msgstr "ਕੰਨਟੇਨਰ:"
+#: ../data/preferences.ui.h:11
+msgid "5.1-channel"
+msgstr "੫.੧-ਚੈਨਲ"
 
-#: ../data/properties.ui.h:9 ../data/totem.ui.h:128
-#: ../src/totem-properties-view.c:270
-msgid "Video"
-msgstr "ਵਿਡੀਓ"
+#: ../data/preferences.ui.h:12
+msgid "AC3 Passthrough"
+msgstr "AC3 ਪਾਸ-ਥਰੂ"
 
-#: ../data/properties.ui.h:10
-msgid "Dimensions:"
-msgstr "ਮਾਪ:"
+#: ../data/preferences.ui.h:13
+msgid "Totem Preferences"
+msgstr "ਟੋਟੇਮ ਪਸੰਦ"
 
-#: ../data/properties.ui.h:11
-msgid "Codec:"
-msgstr "Codec:"
+#: ../data/preferences.ui.h:14
+msgid "Playback"
+msgstr "ਪਲੇਅਬੈਕ"
+
+#: ../data/preferences.ui.h:15
+msgid "Start playing files from last position"
+msgstr "ਫਾਇਲਾਂ ਆਖਰੀ ਸਥਿਤੀ ਤੋਂ ਚਲਾਉਣਾ ਸ਼ੁਰੂ ਕਰੋ"
+
+#: ../data/preferences.ui.h:16
+msgid "Text Subtitles"
+msgstr "ਟੈਕਸਟ ਸਬ-ਟਾਇਟਲ"
+
+#: ../data/preferences.ui.h:17
+msgid "_Load subtitle files when movie is loaded"
+msgstr "ਮੂਵੀ ਲੋਡ ਕਰਨ ਦੌਰਾਨ ਸਬ-ਟਾਇਟਲ ਫਾਇਲਾਂ ਲੋਡ ਕਰੋ(_L)"
+
+#: ../data/preferences.ui.h:18
+msgid "_Font:"
+msgstr "ਫੋਂਟ(_F):"
+
+#: ../data/preferences.ui.h:19
+msgid "_Encoding:"
+msgstr "ਇੰਕੋਡਿੰਗ(_E):"
+
+#: ../data/preferences.ui.h:20
+msgid "External Chapters"
+msgstr "ਬਾਹਰੀ ਚੈਪਟਰ"
+
+#: ../data/preferences.ui.h:21
+msgid "Load _chapter files when movie is loaded"
+msgstr "ਜਦੋ ਮੂਵੀ ਲੋਡ ਹੋਵੇ ਤਾਂ ਚੈਪਟਰ ਫਾਇਲਾਂ ਆਟੋਮੈਟਿਕ ਹੀ ਲੋਡ ਕਰੋ(_c)"
+
+#: ../data/preferences.ui.h:22 ../data/properties.ui.h:1
+msgid "General"
+msgstr "ਸਧਾਰਨ"
+
+#. Tab label in the Preferences dialogue
+#: ../data/preferences.ui.h:24
+msgid "Display"
+msgstr "ਡਿਸਪਲੇਅ"
+
+#: ../data/preferences.ui.h:25
+msgid "_Resize the window when a new video is loaded"
+msgstr "ਨਵੀਂ ਵਿਡੀਓ ਲੋਡ ਕਰਨ ਦੌਰਾਨ ਵਿੰਡੋ ਮੁੜ-ਅਕਾਰ ਕਰੋ(_R)"
+
+#: ../data/preferences.ui.h:26
+msgid "Disable _deinterlacing of interlaced videos"
+msgstr "ਇੰਟਰਲੇਸ ਵਿਡੀਓ ਲਈ ਡਿ-ਇੰਟਰਲੇਸ ਕਰਨ ਬੰਦ(_d)"
+
+#: ../data/preferences.ui.h:27
+msgid "Disable screensaver when playing "
+msgstr "ਜਦੋਂ ਕੁਝ ਚੱਲ ਰਿਹਾ ਹੋਵੇ ਤਾਂ ਸਕਰੀਨ-ਸੇਵਰ ਬੰਦ ਰੱਖੋ "
+
+#: ../data/preferences.ui.h:28 ../data/properties.ui.h:9
+#: ../src/totem-properties-view.c:273
+msgid "Video"
+msgstr "ਵਿਡੀਓ"
+
+#: ../data/preferences.ui.h:29
+msgid "Video or Audio"
+msgstr "ਵਿਡੀਓ ਜਾਂ ਆਡੀਓ"
+
+#: ../data/preferences.ui.h:30
+msgid "Visual Effects"
+msgstr "ਦਿੱਖ ਪਰਭਾਵ"
+
+#: ../data/preferences.ui.h:31
+msgid "Show _visual effects when an audio file is played"
+msgstr "ਆਡੀਓ ਫਾਇਲ ਚਲਾਉਣ ਦੌਰਾਨ ਦਿੱਖ ਪਰਭਾਵ ਚਲਾਓ(_v)"
+
+#: ../data/preferences.ui.h:32
+msgid "_Type of visualization:"
+msgstr "ਦਿੱਖ ਦੀ ਕਿਸਮ(_T):"
+
+#: ../data/preferences.ui.h:33
+msgid "Visualization _size:"
+msgstr "ਦਿੱਖ ਅਕਾਰ(_s):"
+
+#: ../data/preferences.ui.h:34
+msgid "Color Balance"
+msgstr "ਰੰਗ ਸੰਤੁਲਨ"
+
+#: ../data/preferences.ui.h:35
+msgid "_Brightness:"
+msgstr "ਚਮਕ(_B):"
+
+#: ../data/preferences.ui.h:36
+msgid "Co_ntrast:"
+msgstr "ਭਿੰਨਤਾ(_n):"
+
+#: ../data/preferences.ui.h:37
+msgid "Sat_uration:"
+msgstr "ਸੰਤ੍ਰਿਪਤ(_u):"
+
+#: ../data/preferences.ui.h:38
+msgid "_Hue:"
+msgstr "ਆਭਾ(_H):"
+
+#: ../data/preferences.ui.h:39
+msgid "Reset to _Defaults"
+msgstr "ਡਿਫਾਲਟ ਮੁਡ਼-ਸੈੱਟ(_D)"
+
+#: ../data/preferences.ui.h:40
+msgid "Audio Output"
+msgstr "ਆਡੀਓ ਆਉਟਪੁੱਟ"
+
+#: ../data/preferences.ui.h:41
+msgid "_Audio output type:"
+msgstr "ਆਡੀਓ ਆਉਟਪੁੱਟ ਕਿਸਮ(_A):"
+
+#: ../data/preferences.ui.h:42 ../data/properties.ui.h:14
+#: ../src/totem-properties-view.c:271
+msgid "Audio"
+msgstr "ਆਡੀਓ"
+
+#: ../data/properties.ui.h:2
+msgid "Title:"
+msgstr "ਟਾਇਟਲ:"
+
+#: ../data/properties.ui.h:3
+msgid "Artist:"
+msgstr "ਕਲਾਕਾਰ:"
+
+#: ../data/properties.ui.h:4
+msgid "Duration:"
+msgstr "ਅੰਤਰਾਲ:"
+
+#: ../data/properties.ui.h:5
+msgid "Year:"
+msgstr "ਸਾਲ:"
+
+#: ../data/properties.ui.h:6
+msgid "Album:"
+msgstr "ਐਲਬਮ:"
+
+#: ../data/properties.ui.h:7
+msgid "Comment:"
+msgstr "ਟਿੱਪਣੀ:"
+
+#: ../data/properties.ui.h:8
+msgid "Container:"
+msgstr "ਕੰਨਟੇਨਰ:"
+
+#: ../data/properties.ui.h:10
+msgid "Dimensions:"
+msgstr "ਮਾਪ:"
+
+#: ../data/properties.ui.h:11
+msgid "Codec:"
+msgstr "Codec:"
 
 #: ../data/properties.ui.h:12
 msgid "Framerate:"
@@ -127,11 +492,6 @@
 msgid "Bitrate:"
 msgstr "ਬਿੱਟਰੇਟ:"
 
-#: ../data/properties.ui.h:14 ../data/totem.ui.h:142
-#: ../src/totem-properties-view.c:268
-msgid "Audio"
-msgstr "ਆਡੀਓ"
-
 #: ../data/properties.ui.h:15
 msgid "Sample rate:"
 msgstr "ਸੈਂਪਲ ਰੇਟ:"
@@ -140,741 +500,454 @@
 msgid "Channels:"
 msgstr "ਚੈਨਲ:"
 
-#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
-msgid "_Add to Playlist"
-msgstr "ਪਲੇਅਲਿਸਟ 'ਚ ਸ਼ਾਮਲ(_A)"
-
-#: ../data/video-list.ui.h:2
-msgid "Add the video to the playlist"
-msgstr "ਵਿਡੀਓ ਪਲੇਅਲਿਸਟ 'ਚ ਸ਼ਾਮਲ ਕਰੋ"
-
 #. Title
-#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:143
-#: ../src/totem-object.c:1667
-msgid "Movie Player"
-msgstr "ਮੂਵੀ ਪਲੇਅਰ"
+#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:80 ../src/totem.c:239
+#: ../src/totem.c:248 ../src/totem-menu.c:790 ../src/totem-object.c:1658
+msgid "Videos"
+msgstr "ਵਿਡੀਓ"
 
 #: ../data/totem.desktop.in.in.in.h:2
-msgid "Play movies and songs"
-msgstr "ਵਿਡੀਓ ਅਤੇ ਗਾਣੇ ਚਲਾਓ"
+msgid "Play movies"
+msgstr "ਮੂਵੀ ਚਲਾਓ"
+
+#: ../data/totem.desktop.in.in.in.h:3
+msgid "Video;Movie;Film;Clip;Series;Player;DVD;TV;Disc;"
+msgstr ""
+"ਵੀਡਿਓ;ਮੂਵੀ;ਫਿਲਮ;ਕਲਿੱਪ;ਸੀਰਿਜ਼;ਪਲੇਅਰ;ਡੀਵੀਡੀ;ਟੀਵੀ;ਡਿਸਕ;Video;Movie;Film;Clip;Seri"
+"es;"
+"Player;DVD;TV;Disc;"
 
 #: ../data/totem.ui.h:1
-msgid "_Movie"
-msgstr "ਮੂਵੀ(_M)"
+msgid "_Open"
+msgstr "_ਖੋਲ੍ਹੋ"
 
 #: ../data/totem.ui.h:2
-msgid "_Open..."
-msgstr "ਖੋਲ੍ਹੋ(_O)..."
+msgid "Open _Location"
+msgstr "_ਟਿਕਾਣਾ ਖੋਲ੍ਹੋ"
 
 #: ../data/totem.ui.h:3
-msgid "Open a file"
-msgstr "ਇੱਕ ਫਾਇਲ ਖੋਲ੍ਹੋ"
+msgid "_Fullscreen"
+msgstr "_ਪੂਰੀ ਸਕਰੀਨ"
 
 #: ../data/totem.ui.h:4
-msgid "Open _Location..."
-msgstr "ਟਿਕਾਣਾ ਖੋਲ੍ਹੋ(_L)..."
+msgid "Prefere_nces"
+msgstr "ਮੇਰੀ _ਪਸੰਦ"
 
 #: ../data/totem.ui.h:5
-msgid "Open a non-local file"
-msgstr "ਨਾ-ਲੋਕਲ ਫਾਇਲ ਖੋਲ੍ਹੋ"
+msgid "Shuff_le"
+msgstr "ਰ_ਲਵਾਂ ਢੰਗ"
 
 #: ../data/totem.ui.h:6
+msgid "_Repeat"
+msgstr "_ਦੁਹਰਾਓ"
+
+#: ../data/totem.ui.h:7
+msgid "_Quit"
+msgstr "ਬੰਦ ਕਰੋ(_Q)"
+
+#: ../data/totem.ui.h:8
+msgid "_Movie"
+msgstr "ਮੂਵੀ(_M)"
+
+#: ../data/totem.ui.h:9
 msgid "_Eject"
 msgstr "ਬਾਹਰ ਕੱਢੋ(_E)"
 
-#: ../data/totem.ui.h:7
+#: ../data/totem.ui.h:10
 msgid "Eject the current disc"
 msgstr "ਮੌਜੂਦਾ ਡਿਸਕ ਬਾਹਰ ਕੱਢੋ"
 
-#: ../data/totem.ui.h:8
+#: ../data/totem.ui.h:11
 msgid "_Properties"
 msgstr "ਵਿਸ਼ੇਸ਼ਤਾ(_P)"
 
-#: ../data/totem.ui.h:9
+#: ../data/totem.ui.h:12
 msgid "View the properties of the current stream"
 msgstr "ਮੌਜੂਦਾ ਸਟਰੀਮ ਦੀ ਵਿਸ਼ੇਸ਼ਤਾ ਵੇਖੋ"
 
-#: ../data/totem.ui.h:10
+#: ../data/totem.ui.h:13
 msgid "Play / P_ause"
 msgstr "ਚਲਾਓ / ਵਿਰਾਮ(_a)"
 
-#: ../data/totem.ui.h:11
+#: ../data/totem.ui.h:14
 msgid "Play or pause the movie"
 msgstr "ਫਿਲਮ ਨੂੰ ਚਲਾਓ ਜਾਂ ਰੋਕੋ"
 
-#: ../data/totem.ui.h:12
-msgid "_Quit"
-msgstr "ਬੰਦ ਕਰੋ(_Q)"
-
-#: ../data/totem.ui.h:13
-msgid "Quit the program"
-msgstr "ਪਰੋਗਰਾਮ ਬੰਦ ਕਰੋ"
-
-#: ../data/totem.ui.h:14
+#: ../data/totem.ui.h:15
 msgid "_Edit"
 msgstr "ਸੋਧ(_E)"
 
-#: ../data/totem.ui.h:15
+#: ../data/totem.ui.h:16
 msgid "_Clear Playlist"
 msgstr "ਪਲੇਅ-ਲਿਸਟ ਸਾਫ਼ ਕਰੋ(_C)"
 
-#: ../data/totem.ui.h:16
+#: ../data/totem.ui.h:17
 msgid "Clear the playlist"
 msgstr "ਪਲੇਅਲਿਸਟ ਸਾਫ਼ ਕਰੋ"
 
-#: ../data/totem.ui.h:17
-msgid "Prefere_nces"
-msgstr "ਮੇਰੀ ਪਸੰਦ(_n)"
-
 #: ../data/totem.ui.h:18
-msgid "Configure the application"
-msgstr "ਐਪਲੀਕੇਸ਼ਨ ਸੰਰਚਨਾ"
-
-#: ../data/totem.ui.h:19
 msgid "Plugins..."
 msgstr "ਪਲੱਗਇਨ..."
 
-#: ../data/totem.ui.h:20
+#: ../data/totem.ui.h:19
 msgid "Configure plugins to extend the application"
 msgstr "ਐਪਲੀਕੇਸ਼ਨ ਫੈਲਾਉਣ ਲਈ ਪਲੱਗਇਨ ਸੰਰਚਨਾ"
 
-#: ../data/totem.ui.h:21
+#: ../data/totem.ui.h:20
 msgid "_View"
 msgstr "ਵੇਖੋ(_V)"
 
-#: ../data/totem.ui.h:22
-msgid "_Fullscreen"
-msgstr "ਪੂਰੀ ਸਕਰੀਨ(_F)"
-
-#: ../data/totem.ui.h:23
-msgid "Switch to fullscreen"
-msgstr "ਪੂਰੀ ਸਕਰੀਨ 'ਤੇ ਤਬਦੀਲ"
-
-#: ../data/totem.ui.h:24
+#: ../data/totem.ui.h:21
 msgid "Fit Window to Movie"
 msgstr "ਫਿਲਮ ਵਿੰਡੋ ਉੱਤੇ ਫਿੱਟ"
 
-#: ../data/totem.ui.h:25
+#: ../data/totem.ui.h:22
 msgid "_Resize 1:2"
 msgstr "ਮੁੜ ਅਕਾਰ(_R) 1:2"
 
-#: ../data/totem.ui.h:26
+#: ../data/totem.ui.h:23
 msgid "Resize to half the original video size"
 msgstr "ਅਸਲੀ ਵਿਡੀਓ ਅਕਾਰ ਅੱਧਾ ਕਰੋ"
 
-#: ../data/totem.ui.h:27
+#: ../data/totem.ui.h:24
 msgid "Resize _1:1"
 msgstr "ਮੁੜ-ਅਕਾਰ _1:1"
 
-#: ../data/totem.ui.h:28
+#: ../data/totem.ui.h:25
 msgid "Resize to the original video size"
 msgstr "ਅਸਲੀ ਵਿਡੀਓ ਸਾਈਜ਼ ਕਰੋ"
 
-#: ../data/totem.ui.h:29
+#: ../data/totem.ui.h:26
 msgid "Resize _2:1"
 msgstr "ਮੁੜ-ਅਕਾਰ _2:1"
 
-#: ../data/totem.ui.h:30
+#: ../data/totem.ui.h:27
 msgid "Resize to double the original video size"
 msgstr "ਅਸਲੀ ਵਿਡੀਓ ਸਾਈਜ਼ ਤੋਂ ਡਬਲ ਕਰੋ"
 
-#: ../data/totem.ui.h:31
+#: ../data/totem.ui.h:28
 msgid "_Aspect Ratio"
 msgstr "ਆਕਾਰ ਅਨੁਪਾਤ(_A)"
 
-#: ../data/totem.ui.h:32
+#: ../data/totem.ui.h:29
 msgid "Switch An_gles"
 msgstr "ਕੋਣ ਤਬਦੀਲ(_g)"
 
-#: ../data/totem.ui.h:33
+#: ../data/totem.ui.h:30
 msgid "Switch camera angles"
 msgstr "ਕੈਮਰਾ ਕੋਣ ਬਦਲੋ"
 
-#: ../data/totem.ui.h:34
+#: ../data/totem.ui.h:31
 msgid "_Go"
 msgstr "ਜਾਓ(_G)"
 
-#: ../data/totem.ui.h:35
+#: ../data/totem.ui.h:32
 msgid "_DVD Menu"
 msgstr "_DVD ਮੇਨੂ"
 
-#: ../data/totem.ui.h:36
+#: ../data/totem.ui.h:33
 msgid "Go to the DVD menu"
 msgstr "DVD ਮੇਨੂ 'ਤੇ ਜਾਓ"
 
-#: ../data/totem.ui.h:37
+#: ../data/totem.ui.h:34
 msgid "_Title Menu"
 msgstr "ਟਾਈਟਲ ਮੇਨੂ(_T)"
 
-#: ../data/totem.ui.h:38
+#: ../data/totem.ui.h:35
 msgid "Go to the title menu"
 msgstr "ਟਾਈਟਲ ਮੇਨੂ 'ਤੇ ਜਾਓ"
 
-#: ../data/totem.ui.h:39
+#: ../data/totem.ui.h:36
 msgid "A_udio Menu"
 msgstr "ਆਡੀਓ ਮੇਨੂ(_u)"
 
-#: ../data/totem.ui.h:40
+#: ../data/totem.ui.h:37
 msgid "Go to the audio menu"
 msgstr "ਧੁਨੀ ਮੇਨੂ 'ਤੇ ਜਾਓ"
 
-#: ../data/totem.ui.h:41
+#: ../data/totem.ui.h:38
 msgid "_Angle Menu"
 msgstr "ਕੋਣ ਮੇਨੂ(_A)"
 
-#: ../data/totem.ui.h:42
+#: ../data/totem.ui.h:39
 msgid "Go to the angle menu"
 msgstr "ਕੋਣ ਮੇਨੂ 'ਤੇ ਜਾਓ"
 
-#: ../data/totem.ui.h:43
+#: ../data/totem.ui.h:40
 msgid "_Chapter Menu"
 msgstr "ਚੈਪਟਰ ਮੇਨੂ(_C)"
 
-#: ../data/totem.ui.h:44
+#: ../data/totem.ui.h:41
 msgid "Go to the chapter menu"
 msgstr "ਚੈਪਟਰ ਮੇਨੂ 'ਤੇ ਜਾਓ"
 
-#: ../data/totem.ui.h:45
+#: ../data/totem.ui.h:42
 msgid "_Next Chapter/Movie"
 msgstr "ਅੱਗੇ ਚੈਪਟਰ/ਫਿਲਮ(_N)"
 
-#: ../data/totem.ui.h:46
+#: ../data/totem.ui.h:43
 msgid "Next chapter or movie"
 msgstr "ਅੱਗੇ ਚੈਪਟਰ ਜਾਂ ਫਿਲਮ"
 
-#: ../data/totem.ui.h:47
+#: ../data/totem.ui.h:44
 msgid "_Previous Chapter/Movie"
 msgstr "ਪਿੱਛੇ ਚੈਪਟਰ/ਫਿਲਮ(_P)"
 
-#: ../data/totem.ui.h:48
+#: ../data/totem.ui.h:45
 msgid "Previous chapter or movie"
 msgstr "ਚੈਪਟਰ ਜਾਂ ਫਿਲਮ ਪਿੱਛੇ"
 
-#: ../data/totem.ui.h:49
+#: ../data/totem.ui.h:46
 msgid "_Sound"
 msgstr "ਸਾਊਂਡ(_S)"
 
-#: ../data/totem.ui.h:50
+#: ../data/totem.ui.h:47
 msgid "Volume _Up"
 msgstr "ਆਵਾਜ਼ ਵਧਾਓ(_U)"
 
-#: ../data/totem.ui.h:51
+#: ../data/totem.ui.h:48
 msgid "Increase volume"
 msgstr "ਵਾਲੀਅਮ ਵਧਾਓ"
 
-#: ../data/totem.ui.h:52
+#: ../data/totem.ui.h:49
 msgid "Volume _Down"
 msgstr "ਆਵਾਜ਼ ਘਟਾਓ(_D)"
 
-#: ../data/totem.ui.h:53
+#: ../data/totem.ui.h:50
 msgid "Decrease volume"
 msgstr "ਵਾਲੀਅਮ ਘਟਾਓ"
 
-#: ../data/totem.ui.h:54
+#: ../data/totem.ui.h:51
 msgid "_Help"
 msgstr "ਮੱਦਦ(_H)"
 
-#: ../data/totem.ui.h:55
+#: ../data/totem.ui.h:52
 msgid "_Contents"
 msgstr "ਸਮੱਗਰੀ(_C)"
 
-#: ../data/totem.ui.h:56
+#: ../data/totem.ui.h:53
 msgid "Help contents"
 msgstr "ਮੱਦਦ ਸਮੱਗਰੀ"
 
-#: ../data/totem.ui.h:57
+#: ../data/totem.ui.h:54
 msgid "_About"
 msgstr "ਇਸ ਬਾਰੇ(_A)"
 
-#: ../data/totem.ui.h:58
+#: ../data/totem.ui.h:55
 msgid "About this application"
 msgstr "ਇਸ ਕਾਰਜ ਬਾਰੇ"
 
-#: ../data/totem.ui.h:59
-msgid "_Repeat Mode"
-msgstr "ਦੁਹਰਾਓ ਢੰਗ(_R)"
-
-#: ../data/totem.ui.h:60
-msgid "Set the repeat mode"
-msgstr "ਦੁਹਰਾਓ ਢੰਗ ਸੈੱਟ"
-
-#: ../data/totem.ui.h:61
-msgid "Shuff_le Mode"
-msgstr "ਰਲਵਾਂ ਢੰਗ(_l)"
-
-#: ../data/totem.ui.h:62
-msgid "Set the shuffle mode"
-msgstr "ਰਲਵਾਂ ਢੰਗ ਸੈੱਟ"
-
-#: ../data/totem.ui.h:63
+#: ../data/totem.ui.h:56
 msgid "Show _Controls"
 msgstr "ਕੰਟਰੋਲ ਵੇਖਾਓ(_C)"
 
-#: ../data/totem.ui.h:64
+#: ../data/totem.ui.h:57
 msgid "Show controls"
 msgstr "ਕੰਟਰੋਲ ਵੇਖਾਓ"
 
-#: ../data/totem.ui.h:65
+#: ../data/totem.ui.h:58
 msgid "S_idebar"
 msgstr "ਬਾਹੀ(_i)"
 
-#: ../data/totem.ui.h:66
+#: ../data/totem.ui.h:59
 msgid "Show or hide the sidebar"
 msgstr "ਬਾਹੀ ਵੇਖਾਓ ਜਾਂ ਓਹਲੇ"
 
-#: ../data/totem.ui.h:67
+#: ../data/totem.ui.h:60
 msgctxt "Aspect ratio"
 msgid "Auto"
 msgstr "ਆਟੋ"
 
-#: ../data/totem.ui.h:68
+#: ../data/totem.ui.h:61
 msgid "Sets automatic aspect ratio"
 msgstr "ਆਟੋਮੈਟਿਕ ਅਕਾਰ ਅਨੁਪਾਤ ਦਿਓ"
 
-#: ../data/totem.ui.h:69
+#: ../data/totem.ui.h:62
 msgid "Square"
 msgstr "ਵਰਗ"
 
-#: ../data/totem.ui.h:70
-msgid "Sets square aspect ratio"
-msgstr "ਅਕਾਰ ਅਨੁਪਾਤ ਵਰਗ ਦਿਓ"
-
-#: ../data/totem.ui.h:71
-msgid "4:3 (TV)"
-msgstr "੪:੩ (TV)"
-
-#: ../data/totem.ui.h:72
-msgid "Sets 4:3 (TV) aspect ratio"
-msgstr "4:3 (TV) ਅਕਾਰ ਅਨੁਪਾਤ ਦਿਓ"
-
-#: ../data/totem.ui.h:73
-msgid "16:9 (Widescreen)"
-msgstr "੧੬:੯ (ਚੌੜੀ ਸਕਰੀਨ)"
-
-#: ../data/totem.ui.h:74
-msgid "Sets 16:9 (widescreen) aspect ratio"
-msgstr "16:9 (ਵਾਇਡਸਕਰੀਨ) ਅਕਾਰ ਅਨੁਪਾਤ ਦਿਓ"
-
-#: ../data/totem.ui.h:75
-msgid "2.11:1 (DVB)"
-msgstr "੨.੧੧:੧ (DVB)"
-
-#: ../data/totem.ui.h:76
-msgid "Sets 2.11:1 (DVB) aspect ratio"
-msgstr "2.11:1 (DVB) ਅਕਾਰ ਅਨੁਪਾਤ ਦਿਓ"
-
-#: ../data/totem.ui.h:77
-msgid "S_ubtitles"
-msgstr "ਸਬ-ਟਾਈਟਲ(_u)"
-
-#: ../data/totem.ui.h:80
-msgid "_Languages"
-msgstr "ਭਾਸ਼ਾ(_L)"
-
-#: ../data/totem.ui.h:81
-msgid "Zoom In"
-msgstr "ਜ਼ੂਮ ਅੰਦਰ"
-
-#: ../data/totem.ui.h:82
-msgid "Zoom in"
-msgstr "ਜ਼ੂਮ ਅੰਦਰ"
-
-#: ../data/totem.ui.h:83
-msgid "Skip _Forward"
-msgstr "ਅੱਗੇ ਛੱਡੋ(_F)"
-
-#: ../data/totem.ui.h:84
-msgid "Skip forward"
-msgstr "ਅੱਗੇ ਛੱਡੋ"
-
-#: ../data/totem.ui.h:85
-msgid "Skip _Backwards"
-msgstr "ਪਿੱਛੇ ਛੱਡੋ(_B)"
-
-#: ../data/totem.ui.h:86
-msgid "Skip backwards"
-msgstr "ਪਿੱਛੇ ਛੱਡੋ"
-
-#: ../data/totem.ui.h:87
-msgid "14.4 Kbps Modem"
-msgstr "੧੪.੪ Kbps ਮਾਡਮ"
-
-#: ../data/totem.ui.h:88
-msgid "19.2 Kbps Modem"
-msgstr "੧੯.੨ Kbps ਮਾਡਮ"
-
-#: ../data/totem.ui.h:89
-msgid "28.8 Kbps Modem"
-msgstr "੨੮.੮ Kbps ਮਾਡਮ"
-
-#: ../data/totem.ui.h:90
-msgid "33.6 Kbps Modem"
-msgstr "੩੩.੬ Kbps ਮਾਡਮ"
-
-#: ../data/totem.ui.h:91
-msgid "34.4 Kbps Modem"
-msgstr "੩੪.੪ Kbps ਮਾਡਮ"
-
-#: ../data/totem.ui.h:92
-msgid "56 Kbps Modem/ISDN"
-msgstr "੫੬ Kbps ਮਾਡਮ/ISDN"
-
-#: ../data/totem.ui.h:93
-msgid "112 Kbps Dual ISDN/DSL"
-msgstr "੧੧੨ Kbps ਡਿਊਲl ISDN/DSL"
-
-#: ../data/totem.ui.h:94
-msgid "256 Kbps DSL/Cable"
-msgstr "੨੫੬ Kbps DSL/ਕੇਬਲ"
-
-#: ../data/totem.ui.h:95
-msgid "384 Kbps DSL/Cable"
-msgstr "੩੮੪ Kbps DSL/ਕੇਬਲ"
-
-#: ../data/totem.ui.h:96
-msgid "512 Kbps DSL/Cable"
-msgstr "੫੧੨ Kbps DSL/ਕੇਬਲ"
-
-#: ../data/totem.ui.h:97
-msgid "1.5 Mbps T1/Intranet/LAN"
-msgstr "੧.੫ Mbps T1/ਇੰਟਰਾਨੈੱਟ/LAN"
-
-#: ../data/totem.ui.h:98
-msgid "Intranet/LAN"
-msgstr "ਇੰਟਰਾਨੈੱਟ/LAN"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:100
-msgid "Normal"
-msgstr "ਸਧਾਰਨ"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:102
-msgid "Large"
-msgstr "ਵੱਡਾ"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:104
-msgid "Extra Large"
-msgstr "ਬਹੁਤ ਵੱਡਾ"
-
-#: ../data/totem.ui.h:105 ../src/totem-properties-view.c:228
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5593
-msgid "Stereo"
-msgstr "ਸਟੀਰਿਓ"
-
-#: ../data/totem.ui.h:106
-msgid "4-channel"
-msgstr "੪-ਚੈਨਲ"
-
-#: ../data/totem.ui.h:107
-msgid "4.1-channel"
-msgstr "੪.੧-ਚੈਨਲ"
-
-#: ../data/totem.ui.h:108
-msgid "5.0-channel"
-msgstr "੫.੦-ਚੈਨਲ"
-
-#: ../data/totem.ui.h:109
-msgid "5.1-channel"
-msgstr "੫.੧-ਚੈਨਲ"
-
-#: ../data/totem.ui.h:110
-msgid "AC3 Passthrough"
-msgstr "AC3 ਪਾਸ-ਥਰੂ"
-
-#: ../data/totem.ui.h:111
-msgid "Totem Preferences"
-msgstr "ਟੋਟੇਮ ਪਸੰਦ"
-
-#: ../data/totem.ui.h:112
-msgid "Playback"
-msgstr "ਪਲੇਅਬੈਕ"
-
-#: ../data/totem.ui.h:113
-msgid "Start playing files from last position"
-msgstr "ਫਾਇਲਾਂ ਆਖਰੀ ਸਥਿਤੀ ਤੋਂ ਚਲਾਉਣਾ ਸ਼ੁਰੂ ਕਰੋ"
-
-#: ../data/totem.ui.h:114
-msgid "Networking"
-msgstr "ਨੈੱਟਵਰਕਿੰਗ"
-
-#: ../data/totem.ui.h:115
-msgid "Connection _speed:"
-msgstr "ਕੁਨੈਕਸ਼ਨ ਗਤੀ(_s):"
-
-#: ../data/totem.ui.h:116
-msgid "Text Subtitles"
-msgstr "ਟੈਕਸਟ ਸਬ-ਟਾਇਟਲ"
-
-#: ../data/totem.ui.h:117
-msgid "_Load subtitle files when movie is loaded"
-msgstr "ਮੂਵੀ ਲੋਡ ਕਰਨ ਦੌਰਾਨ ਸਬ-ਟਾਇਟਲ ਫਾਇਲਾਂ ਲੋਡ ਕਰੋ(_L)"
-
-#: ../data/totem.ui.h:118
-msgid "_Font:"
-msgstr "ਫੋਂਟ(_F):"
-
-#: ../data/totem.ui.h:119
-msgid "_Encoding:"
-msgstr "ਇੰਕੋਡਿੰਗ(_E):"
-
-#: ../data/totem.ui.h:120
-msgid "External Chapters"
-msgstr "ਬਾਹਰੀ ਚੈਪਟਰ"
-
-#: ../data/totem.ui.h:121
-msgid "Load _chapter files when movie is loaded"
-msgstr "ਜਦੋ ਮੂਵੀ ਲੋਡ ਹੋਵੇ ਤਾਂ ਚੈਪਟਰ ਫਾਇਲਾਂ ਆਟੋਮੈਟਿਕ ਹੀ ਲੋਡ ਕਰੋ(_c)"
-
-#. Tab label in the Preferences dialogue
-#: ../data/totem.ui.h:124
-msgid "Display"
-msgstr "ਡਿਸਪਲੇਅ"
-
-#: ../data/totem.ui.h:125
-msgid "_Resize the window when a new video is loaded"
-msgstr "ਨਵੀਂ ਵਿਡੀਓ ਲੋਡ ਕਰਨ ਦੌਰਾਨ ਵਿੰਡੋ ਮੁੜ-ਅਕਾਰ ਕਰੋ(_R)"
-
-#: ../data/totem.ui.h:126
-msgid "Disable _deinterlacing of interlaced videos"
-msgstr "ਇੰਟਰਲੇਸ ਵਿਡੀਓ ਲਈ ਡਿ-ਇੰਟਰਲੇਸ ਕਰਨ ਬੰਦ(_d)"
-
-#: ../data/totem.ui.h:127
-msgid "Disable screensaver when playing "
-msgstr "ਜਦੋਂ ਕੁਝ ਚੱਲ ਰਿਹਾ ਹੋਵੇ ਤਾਂ ਸਕਰੀਨ-ਸੇਵਰ ਬੰਦ ਰੱਖੋ "
-
-#: ../data/totem.ui.h:129
-msgid "Video or Audio"
-msgstr "ਵਿਡੀਓ ਜਾਂ ਆਡੀਓ"
-
-#: ../data/totem.ui.h:130
-msgid "Visual Effects"
-msgstr "ਦਿੱਖ ਪਰਭਾਵ"
-
-#: ../data/totem.ui.h:131
-msgid "Show _visual effects when an audio file is played"
-msgstr "ਆਡੀਓ ਫਾਇਲ ਚਲਾਉਣ ਦੌਰਾਨ ਦਿੱਖ ਪਰਭਾਵ ਚਲਾਓ(_v)"
-
-#: ../data/totem.ui.h:132
-msgid "_Type of visualization:"
-msgstr "ਦਿੱਖ ਦੀ ਕਿਸਮ(_T):"
-
-#: ../data/totem.ui.h:133
-msgid "Visualization _size:"
-msgstr "ਦਿੱਖ ਅਕਾਰ(_s):"
-
-#: ../data/totem.ui.h:134
-msgid "Color Balance"
-msgstr "ਰੰਗ ਸੰਤੁਲਨ"
-
-#: ../data/totem.ui.h:135
-msgid "_Brightness:"
-msgstr "ਚਮਕ(_B):"
-
-#: ../data/totem.ui.h:136
-msgid "Co_ntrast:"
-msgstr "ਭਿੰਨਤਾ(_n):"
-
-#: ../data/totem.ui.h:137
-msgid "Sat_uration:"
-msgstr "ਸੰਤ੍ਰਿਪਤ(_u):"
-
-#: ../data/totem.ui.h:138
-msgid "_Hue:"
-msgstr "ਆਭਾ(_H):"
-
-#: ../data/totem.ui.h:139
-msgid "Reset to _Defaults"
-msgstr "ਡਿਫਾਲਟ ਮੁਡ਼-ਸੈੱਟ(_D)"
-
-#: ../data/totem.ui.h:140
-msgid "Audio Output"
-msgstr "ਆਡੀਓ ਆਉਟਪੁੱਟ"
-
-#: ../data/totem.ui.h:141
-msgid "_Audio output type:"
-msgstr "ਆਡੀਓ ਆਉਟਪੁੱਟ ਕਿਸਮ(_A):"
-
-#: ../data/totem.ui.h:145
-msgid "Time seek bar"
-msgstr "ਸਮਾਂ ਪ੍ਰਾਪਤੀ ਪੱਟੀ"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
-msgid "Allow the screensaver to activate when playing audio"
-msgstr "ਜਦੋਂ ਕੇਵਲ ਆਡੀਓ ਹੀ ਚੱਲੇ ਤਾਂ ਸਕਰੀਨ-ਸੇਵਰ ਨੂੰ ਐਕਟੀਵੇਟ ਹੋਣ ਦਿਓ"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
-msgid ""
-"Allow the screensaver to activate when playing audio. Disable if you have "
-"monitor-powered speakers."
-msgstr ""
-"ਜਦੋਂ ਕੇਵਲ ਆਡੀਓ ਹੀ ਚੱਲੇ ਤਾਂ ਸਕਰੀਨ-ਸੇਵਰ ਨੂੰ ਐਕਟੀਵੇਟ ਹੋਣ ਦਿਓ। ਇਹ ਫਾਇਦੇਮੰਦ ਹੈ, ਜੇ "
-"ਮਾਨੀਟਰ ਪਾਵਰ "
-"ਸਪੀਕਰ ਹਨ।"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
-msgid "Show visual effects when no video is displayed"
-msgstr "ਆਡੀਓ ਫਾਇਲ ਚਲਾਉਣ ਸਮੇਂ, ਕੋਈ ਵਿਡੀਓ ਨਾ ਵੇਖਾਓ"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
-msgid "Show visual effects when playing an audio only file."
-msgstr "ਆਡੀਓ ਫਾਇਲ ਚਲਾਉਣ ਸਮੇਂ, ਦਿੱਖ ਪਰਭਾਵ ਵੇਖਾਓ।"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
-msgid "Name of the visual effects plugin"
-msgstr "ਦਿੱਖ ਪਰਭਾਵੀ ਪਲੱਗਇਨ ਦਾ ਨਾਂ"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
-msgid "The brightness of the video"
-msgstr "ਵਿਡੀਓ ਦੀ ਚਮਕ"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
-msgid "The contrast of the video"
-msgstr "ਵਿਡੀਓ ਦੀ ਕੰਟਰੈਂਸਟ"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
-msgid "The hue of the video"
-msgstr "ਵਿਡੀਓ ਆਭਾ"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
-msgid "The saturation of the video"
-msgstr "ਵਿਡੀਓ ਸੰਤੁਲਨ"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
-msgid "Resize the canvas automatically on file load"
-msgstr "ਫਾਇਲ ਲੋਡ ਕਰਨ ਤੇ ਪਰਦਾ ਦਾ ਅਕਾਰ ਖੁਦ ਹੀ ਮੁੜ-ਅਕਾਰ ਕਰੋ"
+#: ../data/totem.ui.h:63
+msgid "Sets square aspect ratio"
+msgstr "ਅਕਾਰ ਅਨੁਪਾਤ ਵਰਗ ਦਿਓ"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
-msgid "Network connection speed"
-msgstr "ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ ਗਤੀ"
+#: ../data/totem.ui.h:64
+msgid "4:3 (TV)"
+msgstr "੪:੩ (TV)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
-msgid ""
-"Approximate network connection speed, used to select quality on media over "
-"the network."
-msgstr ""
-"ਲਗਭਗ ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ ਸਪੀਡ, ਨੈੱਟਵਰਕ ਉੱਤੇ ਮੀਡਿਆ ਦੀ ਕੁਆਲਟੀ ਚੁਣਨ ਲਈ ਵਰਤੀ ਜਾਂਦੀ "
-"ਹੈ।"
+#: ../data/totem.ui.h:65
+msgid "Sets 4:3 (TV) aspect ratio"
+msgstr "4:3 (TV) ਅਕਾਰ ਅਨੁਪਾਤ ਦਿਓ"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
-msgid "Repeat mode"
-msgstr "ਦੁਹਰਾਓ ਢੰਗ"
+#: ../data/totem.ui.h:66
+msgid "16:9 (Widescreen)"
+msgstr "੧੬:੯ (ਚੌੜੀ ਸਕਰੀਨ)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
-msgid "Shuffle mode"
-msgstr "ਰਲਵੀਂ ਢੰਗ"
+#: ../data/totem.ui.h:67
+msgid "Sets 16:9 (widescreen) aspect ratio"
+msgstr "16:9 (ਵਾਇਡਸਕਰੀਨ) ਅਕਾਰ ਅਨੁਪਾਤ ਦਿਓ"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
-msgid "Whether to disable deinterlacing for interlaced movies"
-msgstr "ਕੀ ਇੰਟਰਲੇਸ ਮੂਵੀ ਲਈ ਡਿ-ਇੰਟਰਲੇਸ ਨੂੰ ਬੰਦ ਕਰਨਾ ਹੈ"
+#: ../data/totem.ui.h:68
+msgid "2.11:1 (DVB)"
+msgstr "੨.੧੧:੧ (DVB)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
-msgid "Whether to enable debug for the playback engine"
-msgstr "ਕੀ ਪਲੇਅ-ਲਿਸਟ ਇੰਜਣ ਲਈ ਡੀਬੱਗ ਯੋਗ ਕਰਨਾ ਹੈ"
+#: ../data/totem.ui.h:69
+msgid "Sets 2.11:1 (DVB) aspect ratio"
+msgstr "2.11:1 (DVB) ਅਕਾਰ ਅਨੁਪਾਤ ਦਿਓ"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
-msgid "Type of audio output to use"
-msgstr "ਵਰਤਣ ਲਈ ਆਡੀਓ ਆਉਟਪੁੱਟ ਕਿਸਮ"
+#: ../data/totem.ui.h:70
+msgid "S_ubtitles"
+msgstr "ਸਬ-ਟਾਈਟਲ(_u)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
-msgid "Visualization quality setting"
-msgstr "ਦਿੱਖ ਕੁਆਲਟੀ ਸੈਟਿੰਗ"
+#: ../data/totem.ui.h:73
+msgid "_Languages"
+msgstr "ਭਾਸ਼ਾ(_L)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
-msgid "Quality setting for the audio visualization."
-msgstr "ਆਡੀਓ ਵਿਜ਼ੂਲਾਈਜੇਸ਼ਨ ਲਈ ਕੁਆਲਟੀ ਸੈਟਿੰਗ।"
+#: ../data/totem.ui.h:74
+msgid "Zoom In"
+msgstr "ਜ਼ੂਮ ਅੰਦਰ"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
-msgid "Network buffering threshold"
-msgstr "ਨੈੱਟਵਰਕ ਬਫ਼ਰਿੰਗ ਥਰੈਂਸ਼ਹੋਲਡ"
+#: ../data/totem.ui.h:75
+msgid "Zoom in"
+msgstr "ਜ਼ੂਮ ਅੰਦਰ"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
-msgid ""
-"Amount of data to buffer for network streams before starting to display the "
-"stream (in seconds)."
-msgstr ""
-"ਨੈੱਟਵਰਕ ਸਟਰੀਮ 'ਚ ਮੌਜੂਦ ਬਫ਼ਰ ਕਰਨ ਲਈ ਡਾਟੇ ਦੀ ਮਾਤਰਾ, ਜੋ ਸਟਰੀਮ ਨੂੰ ਵਿਖਾਉਣ ਤੋਂ "
-"ਪਹਿਲਾਂ ਇੱਕਠਾ "
-"ਕੀਤਾ ਜਾਵੇ (ਸਕਿੰਟ 'ਚ)।"
+#: ../data/totem.ui.h:76
+msgid "Skip _Forward"
+msgstr "ਅੱਗੇ ਛੱਡੋ(_F)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
-msgid "Subtitle font"
-msgstr "ਸਬ-ਟਾਇਟਲ ਫੋਂਟ"
+#: ../data/totem.ui.h:77
+msgid "Skip forward"
+msgstr "ਅੱਗੇ ਛੱਡੋ"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
-msgid "Pango font description for subtitle rendering."
-msgstr "ਸਬ-ਟਾਇਟਲ ਰੈਂਡਰਿੰਗ ਲਈ ਪੈਂਗੋ ਫੋਂਟ ਵੇਰਵਾ।"
+#: ../data/totem.ui.h:78
+msgid "Skip _Backwards"
+msgstr "ਪਿੱਛੇ ਛੱਡੋ(_B)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
-msgid "Subtitle encoding"
-msgstr "ਸਬ-ਟਾਇਟਲ ਇੰਕੋਡਿੰਗ"
+#: ../data/totem.ui.h:79
+msgid "Skip backwards"
+msgstr "ਪਿੱਛੇ ਛੱਡੋ"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
-msgid "Encoding character set for subtitle."
-msgstr "ਸਬ-ਟਾਇਟਲ ਲਈ ਇੰਕੋਡਿੰਗ ਕਰੈਕਟਰ ਸੈੱਟ"
+#: ../data/totem.ui.h:82
+msgid "Time seek bar"
+msgstr "ਸਮਾਂ ਪ੍ਰਾਪਤੀ ਪੱਟੀ"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
-msgid "Default location for the \"Open...\" dialogs"
-msgstr "\"ਖੋਲ੍ਹੋ...\" ਡਾਈਲਾਗ ਲਈ ਮੂਲ ਟਿਕਾਣਾ"
+#: ../data/uri.ui.h:1
+msgid "Enter the _address of the file you would like to open:"
+msgstr "ਫਾਇਲ ਦੀ ਫਾਇਲ ਦਾ ਟਿਕਾਣਾ ਦਿਉ, ਜਿਸ ਨੂੰ ਤੁਸੀਂ ਖੋਲ੍ਹਣਾ ਹੈ(_a):"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
-msgid ""
-"Default location for the \"Open...\" dialogs. Default is the current "
-"directory."
-msgstr ""
-"\"ਖੋਲ੍ਹੋ...\" ਡਾਈਲਾਗ ਲਈ ਡਿਫਾਲਟ ਟਿਕਾਣਾ ਹੈ। ਡਿਫਾਲਟ ਰੂਪ 'ਚ ਇਹ ਮੌਜੂਦਾ ਡਾਇਰੈਕਟਰੀ "
-"ਹੈ।"
+#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
+msgid "_Add to Playlist"
+msgstr "ਪਲੇਅਲਿਸਟ 'ਚ ਸ਼ਾਮਲ(_A)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
-msgid "Default location for the \"Take Screenshot\" dialogs"
-msgstr "\"ਸਕਰੀਨਸ਼ਾਟ ਲਵੋ\" ਡਾਈਲਾਗ ਲਈ ਡਿਫਾਲਟ ਟਿਕਾਣਾ"
+#: ../data/video-list.ui.h:2
+msgid "Add the video to the playlist"
+msgstr "ਵਿਡੀਓ ਪਲੇਅਲਿਸਟ 'ਚ ਸ਼ਾਮਲ ਕਰੋ"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
-msgid ""
-"Default location for the \"Take Screenshot\" dialogs. Default is the "
-"Pictures directory."
-msgstr ""
-"\"ਸਕਰੀਨਸ਼ਾਟ ਲਵੋ\" ਡਾਈਲਾਗ ਲਈ ਡਿਫਾਲਟ ਟਿਕਾਣਾ ਹੈ। ਡਿਫਾਲਟ ਤਸਵੀਰਾਂ ਡਾਇਰੈਕਟਰੀ ਹੈ।"
+#: ../src/backend/bacon-video-widget.c:1643
+msgid "Password requested for RTSP server"
+msgstr "RTSP ਸਰਵਰ ਵਲੋਂ ਪਾਸਵਰਡ ਮੰਗਿਆ ਗਿਆ"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
-msgid "Whether to disable the plugins in the user's home directory"
-msgstr "ਯੂਜ਼ਰ ਦੀ ਘਰ ਡਾਇਰੈਕਟਰੀ ਵਿੱਚ ਪਲੱਗਇਨਾਂ ਨੂੰ ਆਯੋਗ ਕਰਨਾ ਹੈ"
+#: ../src/backend/bacon-video-widget.c:2944
+#, c-format
+msgid "Audio Track #%d"
+msgstr "ਆਡੀਓ ਟਰੈਕ #%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
-msgid "Whether to disable the keyboard shortcuts"
-msgstr "ਕੀ ਕੀਬੋਰਡ ਸ਼ਾਰਟਕੱਟ ਬੰਦ ਕਰਨੇ ਹਨ"
+#: ../src/backend/bacon-video-widget.c:2948
+#, c-format
+msgid "Subtitle #%d"
+msgstr "ਸਬਟਾਈਟਲ #%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
-msgid "Whether to autoload text subtitle files when a movie is loaded"
-msgstr "ਕੀ ਇੱਕ ਮੂਵੀ ਲੋਡ ਕਰਨ ਦੌਰਾਨ ਟੈਕਸਟ ਸਬ-ਟਾਇਟਲ ਫਾਇਲਾਂ ਨੂੰ ਆਟੋ-ਲੋਡ ਕਰਨਾ ਹੈ"
+#: ../src/backend/bacon-video-widget.c:3345
+msgid "The server you are trying to connect to is not known."
+msgstr "ਸਰਵਰ, ਜਿਸ ਨਾਲ ਤੁਸੀਂ ਜੁੜਨ ਦੀ ਕੋਸ਼ਿਸ ਕਰ ਰਹੇ ਹੋ, ਪਛਾਣਿਆ ਨਹੀਂ ਗਿਆ ਹੈ।"
+
+#: ../src/backend/bacon-video-widget.c:3348
+msgid "The connection to this server was refused."
+msgstr "ਇਸ ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਤੋਂ ਇਨਕਾਰ ਕਰ ਦਿੱਤਾ ਗਿਆ ਹੈ।"
+
+#: ../src/backend/bacon-video-widget.c:3351
+msgid "The specified movie could not be found."
+msgstr "ਖਾਸ ਫਿਲਮ ਨਹੀਂ ਲੱਭੀ ਹੈ"
+
+#: ../src/backend/bacon-video-widget.c:3358
+msgid "The server refused access to this file or stream."
+msgstr "ਸਰਵਰ ਨੇ ਇਹ ਫਾਇਲ ਜਾਂ ਸਟਰੀਮ ਲਈ ਪਹੁੰਚ ਤੋਂ ਇਨਕਾਰ ਕਰ ਦਿੱਤਾ ਹੈ।"
+
+#: ../src/backend/bacon-video-widget.c:3364
+msgid "Authentication is required to access this file or stream."
+msgstr "ਇਹ ਫਾਇਲ ਜਾਂ ਸਟਰੀਮ ਲਈ ਪਹੁੰਚ ਵਾਸਤੇ ਪਰਮਾਣਕਿਤਾ ਦੀ ਲੋੜ ਹੈ।"
+
+#: ../src/backend/bacon-video-widget.c:3371
+msgid "You are not allowed to open this file."
+msgstr "ਤੁਹਾਨੂੰ ਇਹ ਫਾਇਲ ਖੋਲ੍ਹਣ ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ ਹੈ।"
+
+#: ../src/backend/bacon-video-widget.c:3376
+msgid "This location is not a valid one."
+msgstr "ਇਸ ਟਿਕਾਣਾ ਠੀਕ ਨਹੀਂ ਹੈ।"
+
+#: ../src/backend/bacon-video-widget.c:3384
+msgid "The movie could not be read."
+msgstr "ਮੂਵੀ ਪੜ੍ਹੀ ਨਹੀਂ ਜਾ ਸਕਦੀ ਹੈ।"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
-msgid "Whether to autoload external chapter files when a movie is loaded"
-msgstr "ਕੀ ਇੱਕ ਮੂਵੀ ਲੋਡ ਕਰਨ ਦੌਰਾਨ ਬਾਹਰੀ ਚੈਪਟਰ ਫਾਇਲਾਂ ਨੂੰ ਆਟੋ-ਲੋਡ ਕਰਨਾ ਹੈ।"
+#. should be exactly one missing thing (source or converter)
+#: ../src/backend/bacon-video-widget.c:3407
+#: ../src/backend/bacon-video-widget.c:3415
+#, c-format
+msgid "The playback of this movie requires a %s plugin which is not installed."
+msgid_plural ""
+"The playback of this movie requires the following decoders which are not "
+"installed:\n"
+"\n"
+"%s"
+msgstr[0] "ਇਹ ਮੂਵੀ ਨੂੰ ਚਲਾਉਣ ਲਈ %s ਪਲੱਗਇਨ ਦੀ ਲੋੜ ਹੈ, ਜੋ ਕਿ ਇੰਸਟਾਲ ਨਹੀਂ ਹੈ।"
+msgstr[1] ""
+"ਇਹ ਮੂਵੀ ਨੂੰ ਚਲਾਉਣ ਲਈ ਅੱਗੇ ਦਿੱਤੇ ਡੀਕੋਡਰ ਚਾਹੀਦੇ ਹਨ, ਜੋ ਕਿ ਇੰਸਟਾਲ ਨਹੀਂ ਹਨ:\n"
+"\n"
+"%s"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+#: ../src/backend/bacon-video-widget.c:3426
+#| msgid ""
+#| "Audio codec '%s' is not handled. You might need to install additional "
+#| "plugins to be able to play some types of movies"
+msgid ""
+"An audio or video stream is not handled due to missing codecs. You might "
+"need to install additional plugins to be able to play some types of movies"
+msgstr ""
+"ਨਾ-ਮੌਜੂਦ ਕੋਡਕ (codecs) ਕਰਕੇ ਆਡੀਓ ਜਾਂ ਵਿਡੀਓ ਸਟਰੀਮ ਨੂੰ ਕੰਟਰੋਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ "
+"ਹੈ। ਤੁਹਾਨੂੰ "
+"ਇਸ ਕਿਸਮ ਦੀਆਂ ਵਾਧੂ ਪਲੱਗਇਨਾਂ ਇਸ ਫਿਲਮ ਕਿਸਮ ਚਲਾਉਣ ਲਈ ਇੰਸਟਾਲ ਕਰਨੀਆਂ ਚਾਹੀਦੀਆਂ ਹਨ।"
+
+#: ../src/backend/bacon-video-widget.c:3436
+#| msgid ""
+#| "Cannot play this file over the network. Try downloading it to disk first."
 msgid ""
-"Whether to remember the position of played audio/video files when pausing or "
-"closing them"
+"This file cannot be played over the network. Try downloading it locally "
+"first."
 msgstr ""
-"ਕੀ ਆਡੀਓ/ਵਿਡੀਓ ਫਾਇਲਾਂ ਦੀ ਸਥਿਤੀ ਨੂੰ ਯਾਦ ਰੱਖਣਾ ਹੈ, ਜਦੋਂ ਉਹਨਾਂ ਪੌਜ਼ ਕਰਨਾ ਹੋਵੇ ਤਾਂ "
-"ਬੰਦ ਕਰਨਾ ਹੋਵੇ।"
+"ਇਹ ਫਾਇਲ ਨੂੰ ਨੈੱਟਵਰਕ ਉੱਤੇ ਚਲਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ। ਇਹ ਨੂੰ ਪਹਿਲਾਂ ਲੋਕਲ ਡਾਊਨਲੋਡ "
+"ਕਰਨ ਦੀ "
+"ਕੋਸ਼ਿਸ਼ ਕਰੋ।"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:35
-msgid "Active plugins list"
-msgstr "ਐਕਟਿਵ ਪਲੱਗਇਨ ਲਿਸਟ"
+#: ../src/backend/bacon-video-widget.c:5494 ../src/totem-properties-view.c:227
+msgid "Surround"
+msgstr "ਸਰਾਊਂਡਿੰਗ"
+
+#: ../src/backend/bacon-video-widget.c:5496 ../src/totem-properties-view.c:229
+msgid "Mono"
+msgstr "ਮੋਨੋ"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:36
+#: ../src/backend/bacon-video-widget.c:5781
+msgid "Media contains no supported video streams."
+msgstr "ਮੀਡਿਆ ਵਿਡੀਓ ਸਟਰੀਮ ਲਈ ਕੋਈ ਸਹਿਯੋਗ ਨਹੀਂ ਹੈ।"
+
+#: ../src/backend/bacon-video-widget.c:5963
+#| msgid ""
+#| "No video output is available. Make sure that the program is correctly "
+#| "installed."
 msgid ""
-"A list of the names of the plugins which are currently active (loaded and "
-"running)."
+"Some necessary plug-ins are missing. Make sure that the program is correctly "
+"installed."
 msgstr ""
-"ਪਲੱਗਇਨ ਦੇ ਨਾਂ ਦੀ ਲਿਸਟ, ਜੋ ਕਿ ਇਸ ਸਮੇਂ ਐਕਟਿਵ ਹਨ (ਲੋਡ ਕੀਤੀਆਂ ਤੇ ਚੱਲ ਰਹੀਆਂ)।"
-
-#: ../data/uri.ui.h:1
-msgid "Enter the _address of the file you would like to open:"
-msgstr "ਫਾਇਲ ਦੀ ਫਾਇਲ ਦਾ ਟਿਕਾਣਾ ਦਿਉ, ਜਿਸ ਨੂੰ ਤੁਸੀਂ ਖੋਲ੍ਹਣਾ ਹੈ(_a):"
+"ਕੁਝ ਜ਼ਰੂਰੀ ਪਲੱਗ-ਇਨ ਮੌਜੂਦ ਨਹੀਂ ਹਨ। ਪੱਕਾ ਕਰੋ ਕਿ ਪ੍ਰੋਗਰਾਮ ਠੀਕ ਤਰ੍ਹਾਂ ਇੰਸਟਾਲ ਹੈ।"
 
 #: ../src/eggdesktopfile.c:165
 #, c-format
@@ -940,8 +1013,8 @@
 #: ../src/eggfileformatchooser.c:657
 #, c-format
 msgid ""
-"The program was not able to find out the file format you want to use for `%"
-"s'. Please make sure to use a known extension for that file or manually "
+"The program was not able to find out the file format you want to use for `"
+"%s'. Please make sure to use a known extension for that file or manually "
 "choose a file format from the list below."
 msgstr ""
 "ਪਰੋਗਰਾਮ ਫਾਇਲ ਫਾਰਮੈਟ ਲੱਭਣ ਲਈ ਅਸਮਰੱਥ ਹੈ, ਜੋ ਤੁਸੀਂ `%s' ਲਈ ਵਰਤਣਾ ਚਾਹੁੰਦੇ ਹੋ। "
@@ -981,6 +1054,31 @@
 msgid "Show session management options"
 msgstr "ਸ਼ੈਸ਼ਨ ਪਰਬੰਧ ਚੋਣਾਂ ਵੇਖੋ"
 
+#. hour:minutes:seconds
+#. Translators: This is a time format, like "9:05:02" for 9
+#. * hours, 5 minutes, and 2 seconds. You may change ":" to
+#. * the separator that your locale uses or use "%Id" instead
+#. * of "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:56
+#: ../src/plugins/skipto/totem-time-entry.c:57
+#, c-format
+msgctxt "long time format"
+msgid "%d:%02d:%02d"
+msgstr "%d:%02d:%02d"
+
+#. minutes:seconds
+#. Translators: This is a time format, like "5:02" for 5
+#. * minutes and 2 seconds. You may change ":" to the
+#. * separator that your locale uses or use "%Id" instead of
+#. * "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:65
+#, c-format
+msgctxt "short time format"
+msgid "%d:%02d"
+msgstr "%d:%02d"
+
 #. Title
 #. Artist
 #. Album
@@ -1085,10 +1183,14 @@
 msgstr[0] "%d ਫਰੇਮ ਪ੍ਰਤੀ ਸਕਿੰਟ"
 msgstr[1] "%d ਫਰੇਮ ਪ੍ਰਤੀ ਸਕਿੰਟ"
 
-#: ../src/totem-audio-preview.c:168
+#: ../src/totem-audio-preview.c:137
 msgid "Audio Preview"
 msgstr "ਆਡੀਓ ਝਲਕ"
 
+#: ../src/totem.c:240
+msgid "Verify your system installation. Totem will now exit."
+msgstr "ਤੁਹਾਡੇ ਸਿਸਟਮ ਦੀ ਇੰਸਟਾਲ ਦੀ ਪੜਤਾਲ ਹੈ। ਟੋਟੇਮ ਹੁਣ ਬੰਦ ਹੋ ਰਿਹਾ ਹੈ।"
+
 #: ../src/totem-cell-renderer-video.c:126
 msgid "Unknown video"
 msgstr "ਅਣਜਾਣ ਵਿਡੀਓ"
@@ -1101,7 +1203,7 @@
 msgid "Cancel"
 msgstr "ਰੱਦ ਕਰੋ"
 
-#: ../src/totem-fullscreen.c:616
+#: ../src/totem-fullscreen.c:573
 msgid "No File"
 msgstr "ਕੋਈ ਫਾਇਲ ਨਹੀਂ"
 
@@ -1119,7 +1221,7 @@
 msgid "Make sure that Totem is properly installed."
 msgstr "ਪੜਤਾਲ ਕਰੋ ਕਿ ਟੋਟੇਮ ਠੀਕ ਤਰਾਂ ਇੰਸਟਾਲ ਹੈ।"
 
-#: ../src/totem-interface.c:347
+#: ../src/totem-interface.c:357
 msgid ""
 "Totem 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 "
@@ -1132,7 +1234,7 @@
 "ਮਰਜ਼ੀ ਹੈ) ਅਧੀਨ ਵੰਡ "
 "ਅਤੇ/ਜਾਂ ਸੋਧ ਸਕਦੇ ਹੋ।"
 
-#: ../src/totem-interface.c:351
+#: ../src/totem-interface.c:361
 msgid ""
 "Totem is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -1145,7 +1247,7 @@
 "ਨਹੀਂ ਹੈ।  ਹੋਰ ਵੇਰਵੇ "
 "ਲਈ ਗਨੂ ਜਰਨਲਪਬਲਿਕ ਲਾਇਸੈਂਸ ਨੂੰ ਪੜ੍ਹੋ।"
 
-#: ../src/totem-interface.c:355
+#: ../src/totem-interface.c:365
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Totem; if not, write to the Free Software Foundation, Inc., 59 Temple Place, "
@@ -1157,7 +1259,7 @@
 "ਅਮਰੀਕਾ ਨੂੰ "
 "ਲਿਖੋ।"
 
-#: ../src/totem-interface.c:358
+#: ../src/totem-interface.c:368
 msgid ""
 "Totem contains an exception to allow the use of proprietary GStreamer "
 "plugins."
@@ -1166,203 +1268,98 @@
 "ਸਹਾਇਕ ਹੈ।"
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:190
+#: ../src/totem-menu.c:291
 msgid "None"
 msgstr "ਕੋਈ ਨਹੀਂ"
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:195
+#: ../src/totem-menu.c:296
 msgctxt "Language"
 msgid "Auto"
 msgstr "ਆਟੋ"
 
-#. Translators:
-#. * This is not a JPEG image, but a disc image, for example,
-#. * an ISO file
-#: ../src/totem-menu.c:765
-#, c-format
-msgid "Play Image '%s'"
-msgstr "ਈਮੇਜ਼ '%s' ਚਲਾਓ"
-
-#: ../src/totem-menu.c:768 ../src/totem-menu.c:851
-#, c-format
-msgid "device%d"
-msgstr "ਜੰਤਰ%d"
-
-#: ../src/totem-menu.c:848
-#, c-format
-msgid "Play Disc '%s'"
-msgstr "ਡਿਸਕ '%s' ਚਲਾਓ"
-
-#. This lists the back-end type and version, such as
-#. * Movie Player using GStreamer 0.10.1
-#: ../src/totem-menu.c:1189
-#, c-format
-msgid "Movie Player using %s"
-msgstr "%s ਨਾਲ ਮੂਵੀ ਪਲੇਅਰ"
-
-#: ../src/totem-menu.c:1193
+#: ../src/totem-menu.c:789
 msgid "Copyright © 2002-2009 Bastien Nocera"
 msgstr "Copyright © 2002-2009 Bastien Nocera"
 
-#: ../src/totem-menu.c:1198
+#: ../src/totem-menu.c:794
 msgid "translator-credits"
 msgstr ""
 "ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ ੨੦੦੪-੨੦੧੦\n"
 "aalam@users.sf.net\n"
 "http://www.satluj.com"
 
-#: ../src/totem-menu.c:1202
+#: ../src/totem-menu.c:798
 msgid "Totem Website"
 msgstr "ਟੋਟੇਮ ਵੈੱਬਸਾਈਟ"
 
-#: ../src/totem-menu.c:1236
+#: ../src/totem-menu.c:829
 msgid "Configure Plugins"
 msgstr "ਪਲੱਗਇਨ ਸੰਰਚਨਾ"
 
-#. Translators: %s is the totem version number
-#: ../src/totem-object.c:471
-#, c-format
-msgid "Totem %s"
-msgstr "ਟੋਟੇਮ %s"
-
-#: ../src/totem-object.c:1047 ../browser-plugin/totem-plugin-viewer.c:367
-msgid "Playing"
-msgstr "ਚੱਲ ਰਿਹਾ ਹੈ"
-
-#: ../src/totem-object.c:1049 ../src/totem-options.c:52
-msgid "Pause"
-msgstr "ਰੁਕਿਆ"
-
-#: ../src/totem-object.c:1054 ../browser-plugin/totem-plugin-viewer.c:363
-msgid "Paused"
-msgstr "ਰੁਕਿਆ"
-
-#: ../src/totem-object.c:1056 ../src/totem-object.c:1066
-#: ../src/totem-options.c:51
-msgid "Play"
-msgstr "ਚੱਲ ਰਿਹਾ ਹੈ"
-
-#: ../src/totem-object.c:1061 ../src/totem-object.c:1659
-#: ../src/totem-statusbar.c:115 ../browser-plugin/totem-plugin-viewer.c:351
-msgid "Stopped"
-msgstr "ਰੁਕਿਆ"
-
-#: ../src/totem-object.c:1142 ../src/totem-object.c:1169
-#: ../src/totem-object.c:1799 ../src/totem-object.c:1963
-#, c-format
-msgid "Totem could not play '%s'."
-msgstr "ਟੋਟੇਮ '%s' ਨੂੰ ਚਲਾ ਨਹੀਂ ਸਕਦਾ ਹੈ।"
-
-#: ../src/totem-object.c:1246
-#, c-format
-msgid ""
-"Totem could not play this media (%s) although a plugin is present to handle "
-"it."
-msgstr ""
-"ਟੋਟੇਮ ਇਹ ਮਾਧਿਅਮ (%s) ਨੂੰ ਚਲਾ ਨਹੀ ਸਕਦਾ ਹੈ, ਭਾਵੇਂ ਕਿ ਇਸ ਨੂੰ ਵਰਤਣ ਵਾਲੀ ਪਲੱਗਇਨ "
-"ਮੌਜੂਦ ਹੈ।"
-
-#: ../src/totem-object.c:1247
-msgid ""
-"You might want to check that a disc is present in the drive and that it is "
-"correctly configured."
-msgstr ""
-"ਤੁਹਾਨੂੰ ਇਹ ਪੜਤਾਲ ਕਰਨੀ ਚਾਹੀਦੀ ਹੈ ਕਿ ਡਿਸਕ ਡਰਾਇਵ ਅੰਦਰ ਹੈ ਅਤੇ ਇਹ ਠੀਕ ਤਰਾਂ ਸੰਰਚਿਤ "
-"ਹੈ।"
-
-#: ../src/totem-object.c:1255
-msgid "More information about media plugins"
-msgstr "ਮੀਡਿਆ ਪਲੱਗਇਨ ਬਾਰੇ ਹੋਰ ਜਾਣਕਾਰੀ"
-
-#: ../src/totem-object.c:1256
-msgid ""
-"Please install the necessary plugins and restart Totem to be able to play "
-"this media."
-msgstr ""
-"ਲੋੜੀਦੀਂ ਪਲੱਗਇਨ ਇੰਸਟਾਲ ਕਰੋ ਅਤੇ ਟੋਟੇਮ ਨੂੰ ਇਸ ਮਾਧਿਅਮ ਨੂੰ ਚਲਾਉਣ ਲਈ ਮੁੜ-ਚਾਲੂ ਕਰੋ।"
-
-#: ../src/totem-object.c:1258
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because it does not have the "
-"appropriate plugins to be able to read from the disc."
-msgstr ""
-"ਟੋਟੇਮ ਇਹ ਮਾਧਿਅਮ (%s) ਨੂੰ ਚਲਾ ਨਹੀ ਸਕਦਾ ਹੈ, ਕਿਉਕਿ ਇਸ ਕੋਲ ਡਿਸਕ ਤੋਂ ਪੜ੍ਹਨ ਲਈ "
-"ਢੁੱਕਵੀਂ ਪਲੱਗਇਨ "
-"ਮੌਜੂਦ ਨਹੀਂ ਹੈ।"
-
-#: ../src/totem-object.c:1260
+#: ../src/totem-object.c:162
 #, c-format
 msgid ""
-"Totem cannot play this type of media (%s) because you do not have the "
-"appropriate plugins to handle it."
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
-"ਟੋਟੇਮ ਇਹ ਮਾਧਿਅਮ (%s) ਨੂੰ ਚਲਾ ਨਹੀ ਸਕਦਾ ਹੈ, ਕਿਉਕਿ ਤੁਹਾਡੇ ਕੋਲ ਇਸ ਨੂੰ ਵਰਤਣ ਲਈ "
-"ਪਲੱਗਇਨ ਮੌਜੂਦ "
-"ਨਹੀਂ ਹੈ।"
+"%s\n"
+"ਪੂਰੀਆਂ ਕਮਾਂਡ ਲਾਈਨ ਚੋਣਂ ਦੀ ਲਿਸਟ ਵੇਖਣ ਵਾਸਤੇ '%s --help' ਚਲਾਉ।\n"
 
-#: ../src/totem-object.c:1263
+#. Translators: %s is the totem version number
+#: ../src/totem-object.c:591
 #, c-format
-msgid "Totem cannot play this type of media (%s) because it is not supported."
-msgstr "ਟੋਟੇਮ ਇਹ ਮਾਧਿਅਮ (%s) ਨੂੰ ਚਲਾ ਨਹੀਂ ਸਕਦਾ ਹੈ, ਕਿਉਂਕਿ ਇਹ ਸਹਿਯੋਗੀ ਨਹੀਂ ਹੈ।"
-
-#: ../src/totem-object.c:1264
-msgid "Please insert another disc to play back."
-msgstr "ਪਲੇਅਬੈਕ ਲਈ ਹੋਰ ਡਿਸਕ ਪਾਓ ਜੀ।"
-
-#: ../src/totem-object.c:1300
-msgid "Totem was not able to play this disc."
-msgstr "ਟੋਟੇਮ ਇਹ ਡਿਸਕ ਚਲਾਉਣ ਦੇ ਯੋਗ ਨਹੀਂ ਹੈ।"
+msgid "Totem %s"
+msgstr "ਟੋਟੇਮ %s"
 
-#: ../src/totem-object.c:1301 ../src/totem-object.c:4229
-msgid "No reason."
-msgstr "ਕੋਈ ਕਾਰਨ ਨਹੀਂ ਹੈ।"
+#: ../src/totem-object.c:1168 ../src/totem-options.c:52
+msgid "Pause"
+msgstr "ਰੁਕਿਆ"
 
-#: ../src/totem-object.c:1315
-msgid "Totem does not support playback of Audio CDs"
-msgstr "ਟੋਟੇਮ ਆਡੀਓ CD ਚਲਾਉਣ ਵਾਸਤੇ ਸਹਿਯੋਗੀ ਨਹੀਂ ਹੈ।"
+#: ../src/totem-object.c:1175 ../src/totem-object.c:1185
+#: ../src/totem-options.c:51
+msgid "Play"
+msgstr "ਚੱਲ ਰਿਹਾ ਹੈ"
 
-#: ../src/totem-object.c:1316
-msgid "Please consider using a music player or a CD extractor to play this CD"
-msgstr ""
-"ਇੱਕ ਸੰਗੀਤ ਪਲੇਅਰ ਜਾਂ ਇੱਕ CD ਐਕਸਟਾਕਟਰ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਇਹ CD ਚਲਾਉਣ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੋ"
+#: ../src/totem-object.c:1267 ../src/totem-object.c:1294
+#: ../src/totem-object.c:1787 ../src/totem-object.c:1942
+#, c-format
+msgid "Totem could not play '%s'."
+msgstr "ਟੋਟੇਮ '%s' ਨੂੰ ਚਲਾ ਨਹੀਂ ਸਕਦਾ ਹੈ।"
 
-#: ../src/totem-object.c:1805
+#: ../src/totem-object.c:1793
 msgid "No error message"
 msgstr "ਕੋਈ ਗਲਤੀ ਸੁਨੇਹਾ ਨਹੀਂ"
 
-#: ../src/totem-object.c:2154
+#: ../src/totem-object.c:2133
 msgid "Totem could not display the help contents."
 msgstr "ਟੋਟੇਮ ਸਹਾਇਤਾ ਅੰਸ਼ ਨਹੀਂ ਵੇਖਾ ਸਕਦਾ ਹੈ।"
 
-#: ../src/totem-object.c:2493 ../src/totem-object.c:2495
-#: ../browser-plugin/totem-plugin-viewer.c:1417
-msgid "An error occurred"
-msgstr "ਇੱਕ ਗਲਤੀ ਆਈ ਹੈ"
-
-#: ../src/totem-object.c:4064 ../src/totem-object.c:4066
+#: ../src/totem-object.c:4019 ../src/totem-object.c:4021
 msgid "Previous Chapter/Movie"
 msgstr "ਪਿਛਲਾ ਚੈਪਟਰ/ਮੂਵੀ"
 
-#: ../src/totem-object.c:4073 ../src/totem-object.c:4075
+#: ../src/totem-object.c:4028 ../src/totem-object.c:4030
 msgid "Play / Pause"
 msgstr "ਚਲਾਓ / ਵਿਰਾਮ"
 
-#: ../src/totem-object.c:4083 ../src/totem-object.c:4085
+#: ../src/totem-object.c:4038 ../src/totem-object.c:4040
 msgid "Next Chapter/Movie"
 msgstr "ਅੱਗੇ ਚੈਪਟਰ/ਮੂਵੀ"
 
-#. Translators: this is the tooltip text for the fullscreen button in the controls box in Totem's main window.
 #. Translators: this is the accessibility text for the fullscreen button in the controls box in Totem's main window.
-#: ../src/totem-object.c:4097 ../src/totem-object.c:4099
+#: ../src/totem-object.c:4051 ../src/totem-object.c:4053
 msgid "Fullscreen"
 msgstr "ਪੂਰੀ ਸਕਰੀਨ"
 
-#: ../src/totem-object.c:4229
+#: ../src/totem-object.c:4184
 msgid "Totem could not startup."
 msgstr "ਟੋਟੇਮ ਸ਼ੁਰੂ ਨਹੀਂ ਹੋ ਸਕਿਆ ਹੈ।"
 
+#: ../src/totem-object.c:4184
+msgid "No reason."
+msgstr "ਕੋਈ ਕਾਰਨ ਨਹੀਂ ਹੈ।"
+
 #: ../src/totem-open-location.c:182
 msgid "Open Location..."
 msgstr "ਟਿਕਾਣਾ ਖੋਲ੍ਹੋ..."
@@ -1436,117 +1433,111 @@
 msgid "Movies to play"
 msgstr "ਚਲਾਉਣ ਲਈ ਮੂਵੀ"
 
-#: ../src/totem-options.c:117
+#: ../src/totem-options.c:79
+msgid "- Play movies and songs"
+msgstr " - ਮੂਵੀ ਅਤੇ ਗਾਣੇ ਚਲਾਓ"
+
+#: ../src/totem-options.c:142
 msgid "Can't enqueue and replace at the same time"
 msgstr "ਇੱਕ ਸਮੇਂ ਲਿਆ ਤੇ ਬਦਲਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ"
 
 #. By extension entry
-#: ../src/totem-playlist.c:161
+#: ../src/totem-playlist.c:162
 msgid "MP3 ShoutCast playlist"
 msgstr "MP3 ਸਾਊਂਟਕਾਸਟ ਪਲੇਅਲਿਸਟ"
 
-#: ../src/totem-playlist.c:162
+#: ../src/totem-playlist.c:163
 msgid "MP3 audio (streamed)"
 msgstr "MP3 ਆਡੀਓ (ਸਟਰੀਮ)"
 
-#: ../src/totem-playlist.c:163
+#: ../src/totem-playlist.c:164
 msgid "MP3 audio (streamed, DOS format)"
 msgstr "MP3 ਆਡੀਓ (ਸਟਰੀਮ, DOS ਫਾਰਮੈਟ)"
 
-#: ../src/totem-playlist.c:164
+#: ../src/totem-playlist.c:165
 msgid "XML Shareable Playlist"
 msgstr "XML ਸਾਂਝੀ ਕਰਨ ਯੋਗ ਪਲੇਅ-ਲਿਸਟ"
 
 #. This is "Title 3", where title is a DVD title
 #. * Note: NOT a DVD chapter
-#: ../src/totem-playlist.c:347
+#: ../src/totem-playlist.c:348
 #, c-format
 msgid "Title %d"
 msgstr "ਟਾਈਟਲ %d"
 
-#: ../src/totem-playlist.c:446
+#: ../src/totem-playlist.c:447
 msgid "Could not save the playlist"
 msgstr "ਪਲੇਅ-ਲਿਸਟ ਸੰਭਾਲੀ ਨਹੀਂ ਜਾ ਸਕਦੀ"
 
-#: ../src/totem-playlist.c:1021
+#: ../src/totem-playlist.c:1022
 msgid "Save Playlist"
 msgstr "ਪਲੇਅ-ਲਿਸਟ ਸੰਭਾਲੋ"
 
 #. translators: Playlist is the default saved playlist filename,
 #. * without the suffix
-#: ../src/totem-playlist.c:1033 ../src/totem-playlist.c:1264
-#: ../src/totem-sidebar.c:142
+#: ../src/totem-playlist.c:1034 ../src/totem-playlist.c:1263
+#: ../src/totem-sidebar.c:145
 msgid "Playlist"
 msgstr "ਪਲੇਅ-ਲਿਸਟ"
 
-#: ../src/totem-playlist.c:1857
+#: ../src/totem-playlist.c:1862
 #, c-format
 msgid "The playlist '%s' could not be parsed. It might be damaged."
 msgstr "ਪਲੇਅਲਿਸਟ '%s' ਨੂੰ ਪਾਰਸ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ, ਇਹ ਖਰਾਬ ਹੋ ਗਈ ਹੋ ਸਕਦੀ ਹੈ।"
 
-#: ../src/totem-playlist.c:1858
+#: ../src/totem-playlist.c:1863
 msgid "Playlist error"
 msgstr "ਪਲੇਅ-ਲਿਸਟ ਗਲਤੀ"
 
-#: ../src/totem-preferences.c:295
+#: ../src/totem-preferences.c:297
 msgid "Preferences"
 msgstr "ਮੇਰੀ ਪਸੰਦ"
 
-#: ../src/totem-preferences.c:451
+#: ../src/totem-preferences.c:445
 msgid "Select Subtitle Font"
 msgstr "ਸਬ-ਟਾਇਟਲ ਫੋਂਟ ਚੁਣੋ"
 
-#: ../src/totem-properties-main.c:115 ../src/totem-properties-view.c:266
+#: ../src/totem-properties-main.c:116 ../src/totem-properties-view.c:269
 msgid "Audio/Video"
 msgstr "ਆਡੀਓ/ਵਿਡੀਓ"
 
-#: ../src/totem-properties-view.c:128
+#: ../src/totem-properties-view.c:131
 msgid "N/A"
 msgstr "ਲਾਗੂ ਨਹੀਂ"
 
-#: ../src/totem-properties-view.c:157
+#: ../src/totem-properties-view.c:160
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 msgctxt "Stream bit rate"
 msgid "N/A"
 msgstr "ਲਾਗੂ ਨਹੀਂ"
 
-#: ../src/totem-properties-view.c:160
+#: ../src/totem-properties-view.c:163
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: ../src/totem-properties-view.c:177
+#: ../src/totem-properties-view.c:180
 #: ../src/plugins/properties/totem-movie-properties.c:149
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../src/totem-properties-view.c:209
+#: ../src/totem-properties-view.c:212
 #: ../src/plugins/properties/totem-movie-properties.c:166
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: ../src/totem-properties-view.c:216
+#: ../src/totem-properties-view.c:219
 #: ../src/plugins/properties/totem-movie-properties.c:166
 msgctxt "Sample rate"
 msgid "N/A"
 msgstr "ਉਪਲੱਬਧ ਨਹੀਂ"
 
-#: ../src/totem-properties-view.c:224
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5589
-msgid "Surround"
-msgstr "ਸਰਾਊਂਡਿੰਗ"
-
-#: ../src/totem-properties-view.c:226
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5591
-msgid "Mono"
-msgstr "ਮੋਨੋ"
-
-#: ../src/totem-properties-view.c:236
+#: ../src/totem-properties-view.c:239
 msgctxt "Number of audio channels"
 msgid "N/A"
 msgstr "ਲਾਗੂ ਨਹੀਂ"
@@ -1579,8 +1570,8 @@
 #. eg: 75 %
 #: ../src/totem-statusbar.c:250
 #, c-format
-msgid "%d %%"
-msgstr "%d %%"
+msgid "%lf %%"
+msgstr "%lf %%"
 
 #. eg: Paused, 0:32 / 1:05
 #: ../src/totem-statusbar.c:325
@@ -1591,8 +1582,9 @@
 #. eg: Buffering, 75 %
 #: ../src/totem-statusbar.c:330
 #, c-format
-msgid "%s, %d %%"
-msgstr "%s, %d %%"
+#| msgid "%s, %d %%"
+msgid "%s, %f %%"
+msgstr "%s, %f %%"
 
 #: ../src/totem-subtitle-encoding.c:156
 msgid "Current Locale"
@@ -1735,228 +1727,91 @@
 msgid "Vietnamese"
 msgstr "ਵੀਅਤਨਾਮੀ"
 
-#: ../src/totem-video-list.c:330
-msgid "No video URI"
-msgstr "ਕੋਈ ਵਿਡੀਓ URI ਨਹੀਂ"
-
-#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
-#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
-#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
-#: ../src/totem-video-thumbnailer.c:872
-#, c-format
-msgid ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-msgstr ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-
-#: ../src/totem-video-thumbnailer.c:873
-msgid "Filename"
-msgstr "ਫਾਇਲ-ਨਾਂ"
-
-#: ../src/totem-video-thumbnailer.c:875
-msgid "Resolution"
-msgstr "ਰੈਜ਼ੋਲੂਸ਼ਨ"
-
-#: ../src/totem-video-thumbnailer.c:878
-msgid "Duration"
-msgstr "ਅੰਤਰਾਲ"
-
-#: ../src/totem-uri.c:506 ../src/plugins/chapters/totem-chapters.c:998
+#: ../src/totem-uri.c:343 ../src/plugins/chapters/totem-chapters.c:998
 msgid "All files"
 msgstr "ਸਭ ਫਾਇਲਾਂ"
 
-#: ../src/totem-uri.c:511 ../src/plugins/chapters/totem-chapters.c:995
+#: ../src/totem-uri.c:348 ../src/plugins/chapters/totem-chapters.c:995
 msgid "Supported files"
 msgstr "ਸਹਾਇਕ ਫਾਇਲਾਂ"
 
-#: ../src/totem-uri.c:523
+#: ../src/totem-uri.c:360
 msgid "Audio files"
 msgstr "ਆਡੀਓ ਫਾਇਲਾਂ"
 
-#: ../src/totem-uri.c:531
+#: ../src/totem-uri.c:368
 msgid "Video files"
 msgstr "ਵਿਡੀਓ ਫਾਇਲਾਂ"
 
-#: ../src/totem-uri.c:541
+#: ../src/totem-uri.c:378
 msgid "Subtitle files"
 msgstr "ਸਬ-ਟਾਈਟਲ ਫਾਇਲਾਂ"
 
-#: ../src/totem-uri.c:593
+#: ../src/totem-uri.c:430
 msgid "Select Text Subtitles"
 msgstr "ਟੈਕਸਟ ਸਬ-ਟਾਈਟਲ ਚੁਣੋ"
 
-#: ../src/totem-uri.c:656
+#: ../src/totem-uri.c:495
 msgid "Select Movies or Playlists"
 msgstr "ਮੂਵੀ ਜਾਂ ਪਲੇਅ-ਲਿਸਟ ਚੁਣੋ"
 
-#. Options parsing
-#: ../src/totem.c:201
-msgid "- Play movies and songs"
-msgstr " - ਮੂਵੀ ਅਤੇ ਗਾਣੇ ਚਲਾਓ"
-
-#: ../src/totem.c:212
-#, c-format
-msgid ""
-"%s\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"%s\n"
-"ਪੂਰੀਆਂ ਕਮਾਂਡ ਲਾਈਨ ਚੋਣਂ ਦੀ ਲਿਸਟ ਵੇਖਣ ਵਾਸਤੇ '%s --help' ਚਲਾਉ।\n"
-
-#: ../src/totem.c:254 ../src/totem.c:265
-#: ../browser-plugin/totem-plugin-viewer.c:663
-#: ../browser-plugin/totem-plugin-viewer.c:1793
-msgid "Totem Movie Player"
-msgstr "ਟੋਟੇਮ ਮੂਵੀ ਪਲੇਅਰ"
-
-#: ../src/totem.c:255 ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Could not initialize the thread-safe libraries."
-msgstr "ਥਰਿੱਡ-ਸੁਰੱਖਿਆ ਲਾਇਬਰੇਰੀ ਸ਼ੁਰੂ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ ਹੈ।"
-
-#: ../src/totem.c:255
-msgid "Verify your system installation. Totem will now exit."
-msgstr "ਤੁਹਾਡੇ ਸਿਸਟਮ ਦੀ ਇੰਸਟਾਲ ਦੀ ਪੜਤਾਲ ਹੈ। ਟੋਟੇਮ ਹੁਣ ਬੰਦ ਹੋ ਰਿਹਾ ਹੈ।"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:1589
-msgid "Password requested for RTSP server"
-msgstr "RTSP ਸਰਵਰ ਵਲੋਂ ਪਾਸਵਰਡ ਮੰਗਿਆ ਗਿਆ"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2858
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2862
-#, c-format
-msgid "Audio Track #%d"
-msgstr "ਆਡੀਓ ਟਰੈਕ #%d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2890
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2894
-#, c-format
-msgid "Subtitle #%d"
-msgstr "ਸਬਟਾਈਟਲ #%d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3298
-msgid ""
-"The requested audio output was not found. Please select another audio output "
-"in the Multimedia Systems Selector."
-msgstr ""
-"ਲੋੜੀਦੀਂ ਆਡੀਓ ਆਉਟਪੁੱਟ ਨਹੀਂ ਲੱਭੀ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਬਹੁ-ਰੰਗ ਸਿਸਟਮ ਚੋਣਕਾਰ ਵਿੱਚ ਹੋਰ "
-"ਆਡੀਓ ਆਉਟਪੁੱਟ ਦੀ "
-"ਚੋਣ ਕਰੋ।"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3303
-msgid "Location not found."
-msgstr "ਟਿਕਾਣਾ ਨਹੀਂ ਮਿਲਿਆ ਹੈ।"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3307
-msgid ""
-"Could not open location; you might not have permission to open the file."
-msgstr ""
-"ਟਿਕਾਣਾ ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ; ਤੁਹਾਨੂੰ ਫਾਇਲ ਖੋਲ੍ਹਣ ਲਈ ਅਧਿਕਾਰ ਨਹੀਂ ਹੋ ਸਕਦੇ ਹਨ।"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3318
-msgid ""
-"The video output is in use by another application. Please close other video "
-"applications, or select another video output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"ਵਿਡੀਓ ਆਉਟਪੁੱਟ ਨੂੰ ਹੋਰ ਕਾਰਜ ਰਾਹੀਂ ਵਰਤਿਆ ਜਾ ਰਿਹਾ ਹੈ। ਹੋਰ ਵਿਡੀਓ ਕਾਰਜ ਬੰਦ ਕਰੋ ਜਾਂ "
-"ਮਲਟੀਮੀਡਿਆ "
-"ਸਿਸਟਮ ਚੋਣਕਾਰ 'ਚੋਂ ਹੋਰ ਵਿਡੀਓ ਆਉਟ-ਪੁੱਟ ਦੀ ਚੋਣ ਕਰੋ।"
+#: ../src/totem-uri.c:499
+msgid "Add Directory"
+msgstr "ਡਾਇਰੈਕਟਰੀ ਸ਼ਾਮਿਲ"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3324
-msgid ""
-"The audio output is in use by another application. Please select another "
-"audio output in the Multimedia Systems Selector. You may want to consider "
-"using a sound server."
-msgstr ""
-"ਆਡੀਓ ਆਉਟਪੁੱਟ ਨੂੰ ਹੋਰ ਕਾਰਜ ਰਾਹੀਂ ਵਰਤਿਆ ਜਾ ਰਿਹਾ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਬਹੁ-ਰੰਗ ਸਿਸਟਮ "
-"ਚੋਣਕਾਰ 'ਚੋਂ ਹੋਰ "
-"ਆਡੀਓ ਆਉਟ-ਪੁੱਟ ਦੀ ਚੋਣ ਕਰੋ। ਤੁਸੀਂ ਇੱਕ ਸਾਊਂਡ ਸਰਵਰ ਦੀ ਵਰਤੋਂ ਵੀ ਕਰ ਸਕਦੇ ਹੋ।"
+#: ../src/totem-video-list.c:330
+msgid "No video URI"
+msgstr "ਕੋਈ ਵਿਡੀਓ URI ਨਹੀਂ"
 
-#. should be exactly one missing thing (source or converter)
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3342
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3348
+#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
+#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
+#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
+#: ../src/totem-video-thumbnailer.c:841
 #, c-format
-msgid "The playback of this movie requires a %s plugin which is not installed."
-msgid_plural ""
-"The playback of this movie requires the following decoders which are not "
-"installed:\n"
-"\n"
-"%s"
-msgstr[0] "ਇਹ ਮੂਵੀ ਨੂੰ ਚਲਾਉਣ ਲਈ %s ਪਲੱਗਇਨ ਦੀ ਲੋੜ ਹੈ, ਜੋ ਕਿ ਇੰਸਟਾਲ ਨਹੀਂ ਹੈ।"
-msgstr[1] ""
-"ਇਹ ਮੂਵੀ ਨੂੰ ਚਲਾਉਣ ਲਈ ਅੱਗੇ ਦਿੱਤੇ ਡੀਕੋਡਰ ਚਾਹੀਦੇ ਹਨ, ਜੋ ਕਿ ਇੰਸਟਾਲ ਨਹੀਂ ਹਨ:\n"
-"\n"
-"%s"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3374
 msgid ""
-"Cannot play this file over the network. Try downloading it to disk first."
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 msgstr ""
-"ਇਹ ਫਾਇਲ ਨੂੰ ਨੈੱਟਵਰਕ ਉੱਤੇ ਚਲਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ। ਇਹ ਨੂੰ ਪਹਿਲਾਂ ਡਿਸਕ ਉੱਤੇ "
-"ਡਾਊਨਲੋਡ ਕਰਨ ਦੀ "
-"ਕੋਸ਼ਿਸ਼ ਕਰੋ।"
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5878
-msgid "Media contains no supported video streams."
-msgstr "ਮੀਡਿਆ ਵਿਡੀਓ ਸਟਰੀਮ ਲਈ ਕੋਈ ਸਹਿਯੋਗ ਨਹੀਂ ਹੈ।"
+#: ../src/totem-video-thumbnailer.c:842
+msgid "Filename"
+msgstr "ਫਾਇਲ-ਨਾਂ"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6052
-msgid ""
-"Failed to create a GStreamer play object. Please check your GStreamer "
-"installation."
-msgstr ""
-"GStreamer ਚੱਲਣ ਇਕਾਈ ਬਣਾਉਣ ਵਿੱਚ ਅਸਫਲ ਹੈ। ਆਪਣੀ ਜੀ-ਸਟਰੀਮਰ ਇੰਸਟਰਫੇਸ ਇੰਸਟਾਲੇਸ਼ਨ ਦੀ "
-"ਜਾਂਚ ਕਰੋ।"
+#: ../src/totem-video-thumbnailer.c:844
+msgid "Resolution"
+msgstr "ਰੈਜ਼ੋਲੂਸ਼ਨ"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6172
-msgid ""
-"Failed to open audio output. You may not have permission to open the sound "
-"device, or the sound server may not be running. Please select another audio "
-"output in the Multimedia Systems Selector."
-msgstr ""
-"ਆਡੀਓ ਆਉਟਪੁੱਟ ਨੂੰ ਖੋਲਣ 'ਚ ਅਸਫ਼ਲ ਹੈ। ਤੁਹਾਨੂੰ ਸਾਊਂਡ ਜੰਤਰ ਖੋਲਣ ਲਈ ਅਧਿਕਾਰ ਨਹੀਂ ਹੋ "
-"ਸਕਦਾ ਜਾਂ ਸਾਊਂਡ "
-"ਸਰਵਰ ਚੱਲਦਾ ਨਹੀਂ ਹੋ ਸਕਦਾ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਬਹੁ-ਰੰਗ ਸਿਸਟਮ ਚੋਣਕਾਰ 'ਚੋਂ ਹੋਰ ਆਡੀਓ "
-"ਆਉਟ-ਪੁੱਟ ਦੀ ਚੋਣ "
-"ਕਰੋ।"
+#: ../src/totem-video-thumbnailer.c:847
+msgid "Duration"
+msgstr "ਅੰਤਰਾਲ"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6192
-msgid ""
-"Could not find the audio output. You may need to install additional "
-"GStreamer plugins, or select another audio output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"ਆਡੀਓ ਆਉਟਪੁੱਟ ਨਹੀਂ ਲੱਭੀ ਜਾ ਸਕੀ ਹੈ। ਤੁਹਾਨੂੰ ਹੋਰ ਜੀ-ਸਟਰੀਮਰ ਪਲੱਗਇਨ ਦੀ ਚੋਣ ਕਰਨੀ "
-"ਚਾਹੀਦੀ ਹੈ ਜਾਂ "
-"ਬਹੁ-ਰੰਗ ਸਿਸਟਮ ਚੋਣਕਾਰ ਵਿੱਚ ਹੋਰ ਆਡੀਓ ਆਉਟਪੁੱਟ ਦੀ ਚੋਣ ਕਰੋ।"
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:1
+msgid "Apple Trailers"
+msgstr "ਐਪਲ ਟਰੇਲਰ"
+
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:2
+msgid "Sets the user agent for the Apple Trailers site"
+msgstr "ਐਪਲ ਟਰੇਲਰ ਸਾਈਟ ਲਈ ਯੂਜ਼ਰ ਏਜੰਟ ਸੈੱਟ ਕਰੋ"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:1
+msgid "Autoload Subtitles"
+msgstr "ਆਟੋ-ਲੋਡ ਸਬ-ਟਾਈਟਲ"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:2
+msgid "Autoloads text subtitles"
+msgstr "ਟੈਕਸਟ ਸਬ-ਟਾਈਟਲ ਆਪਣੇ-ਆਪ ਲੋਡ"
 
-#. hour:minutes:seconds
-#. Translators: This is a time format, like "9:05:02" for 9
-#. * hours, 5 minutes, and 2 seconds. You may change ":" to
-#. * the separator that your locale uses or use "%Id" instead
-#. * of "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:83 ../src/plugins/skipto/totem-time-entry.c:57
-#, c-format
-msgctxt "long time format"
-msgid "%d:%02d:%02d"
-msgstr "%d:%02d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
+msgid "Video Disc Recorder"
+msgstr "ਵਿਡੀਓ ਡਿਸਕ ਰਿਕਾਰਡ"
 
-#. minutes:seconds
-#. Translators: This is a time format, like "5:02" for 5
-#. * minutes and 2 seconds. You may change ":" to the
-#. * separator that your locale uses or use "%Id" instead of
-#. * "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:92
-#, c-format
-msgctxt "short time format"
-msgid "%d:%02d"
-msgstr "%d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
+msgid "Records (S)VCDs or video DVDs"
+msgstr "(S)VCD ਜਾਂ ਵਿਡੀਓ DVD ਰਿਕਾਰਡ ਕਰੋ"
 
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:65
 msgid "_Create Video Disc..."
@@ -1982,38 +1837,21 @@
 msgid "Copy the currently playing (S)VCD"
 msgstr "ਚੱਲ ਰਹੀ (S)VCD ਕਾਪੀ ਕਰੋ"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:129
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:136
 msgid "The video disc could not be duplicated."
 msgstr "ਵਿਡੀਓ ਡਿਸਕ ਡੁਪਲੀਕੇਟ ਨਹੀਂ ਬਣਾਈ ਜਾ ਸਕੀ।"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:131
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:276
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:138
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:283
 msgid "The movie could not be recorded."
 msgstr "ਮੂਵੀ ਰਿਕਾਰਡ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ।"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:157
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:167
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:263
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:164
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:174
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:270
 msgid "Unable to write a project."
 msgstr "ਇੱਕ ਪਰੋਜੈਕਟ ਲਿਖਣ ਲਈ ਅਸਮਰੱਥ ਹੈ।"
 
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
-msgid "Video Disc Recorder"
-msgstr "ਵਿਡੀਓ ਡਿਸਕ ਰਿਕਾਰਡ"
-
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
-msgid "Records (S)VCDs or video DVDs"
-msgstr "(S)VCD ਜਾਂ ਵਿਡੀਓ DVD ਰਿਕਾਰਡ ਕਰੋ"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:1
-#: ../src/plugins/chapters/totem-chapters.c:1139
-msgid "Chapters"
-msgstr "ਚੈਪਟਰ"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:2
-msgid "Support chapter markers in movies."
-msgstr "ਮੂਵੀ ਵਿੱਚ ਸਹਾਇਕ ਚੈਪਟਰ ਮੇਕਰ।"
-
 #: ../src/plugins/chapters/chapters-edit.ui.h:1
 msgid "Name for new chapter:"
 msgstr "ਨਵੇਂ ਚੈਪਟਰ ਲਈ ਨਾਂ ਹੈ।"
@@ -2070,6 +1908,15 @@
 msgid "Create a new chapter list for the movie"
 msgstr "ਮੂਵੀ ਲਈ ਨਵੀਂ ਚੈਪਟਰ ਲਿਸਟ ਬਣਾਓ"
 
+#: ../src/plugins/chapters/chapters.plugin.in.h:1
+#: ../src/plugins/chapters/totem-chapters.c:1139
+msgid "Chapters"
+msgstr "ਚੈਪਟਰ"
+
+#: ../src/plugins/chapters/chapters.plugin.in.h:2
+msgid "Support chapter markers in movies"
+msgstr "ਮੂਵੀ ਵਿੱਚ ਸਹਾਇਕ ਚੈਪਟਰ ਮੇਕਰ ਸਹਾਇਕ"
+
 #: ../src/plugins/chapters/totem-chapters.c:56
 #, c-format
 msgid ""
@@ -2139,7 +1986,6 @@
 msgstr "CMML ਫਾਇਲ ਪਾਰਸ ਕਰਨ ਲਈ ਫੇਲ੍ਹ"
 
 #: ../src/plugins/chapters/totem-edit-chapter.c:95
-#| msgid "Add Chapter..."
 msgid "Add Chapter"
 msgstr "ਚੈਪਟਰ ਸ਼ਾਮਲ"
 
@@ -2175,13 +2021,37 @@
 msgid "The URI ‘%s’ is not supported."
 msgstr "URI ‘%s’ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।"
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
-msgid "Instant Messenger status"
-msgstr "ਤੁਰੰਤ ਮੈਸੈਂਜ਼ਰ ਹਾਲਤ"
+#: ../src/plugins/grilo/grilo.plugin.in.h:1
+msgid "Grilo Browser"
+msgstr "ਗਰੀਲੋ ਬਰਾਊਜ਼ਰ"
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
-msgid "Set your Instant Messenger status to away when a movie is playing"
-msgstr "ਜਦੋਂ ਇੱਕ ਮੂਵੀ ਚੱਲਦੀ ਹੋਵੇ ਤਾਂ ਤੁਰੰਤ ਮੈਸੈਂਜ਼ਰ ਹਾਲਤ ਦੂਰ ਸੈੱਟ ਕਰੋ।"
+#: ../src/plugins/grilo/grilo.plugin.in.h:2
+msgid "A plugin to let you browse media content from various sources"
+msgstr "ਇੱਕ ਪਲੱਗਇਨ, ਜੋ ਤੁਹਾਨੂੰ ਕਈ ਸਰੋਤਾਂ ਤੋਂ ਮੀਡਿਆ ਸਮੱਗਰੀ ਵੇਖਣ ਲਈ ਸਹਾਇਕ ਹੈ"
+
+#: ../src/plugins/grilo/grilo.ui.h:1
+msgid "Add to Playlist"
+msgstr "ਪਲੇਅਲਿਸਟ 'ਚ ਸ਼ਾਮਲ"
+
+#: ../src/plugins/grilo/grilo.ui.h:2
+msgid "Copy Location"
+msgstr "ਟਿਕਾਣਾ ਕਾਪੀ ਕਰੋ"
+
+#: ../src/plugins/grilo/grilo.ui.h:3 ../src/plugins/grilo/totem-grilo.c:1184
+msgid "Browse"
+msgstr "ਝਲਕ"
+
+#: ../src/plugins/grilo/grilo.ui.h:4 ../src/plugins/grilo/totem-grilo.c:1227
+msgid "Search"
+msgstr "ਖੋਜ"
+
+#: ../src/plugins/grilo/totem-grilo.c:454
+msgid "Browse Error"
+msgstr "ਬਰਾਊਜ਼ ਗਲਤੀ"
+
+#: ../src/plugins/grilo/totem-grilo.c:609
+msgid "Search Error"
+msgstr "ਖੋਜ ਗਲਤੀ"
 
 #: ../src/plugins/gromit/gromit.plugin.in.h:1
 msgid "Gromit Annotations"
@@ -2195,54 +2065,13 @@
 msgid "The gromit binary was not found."
 msgstr "ਗਰੋਮਿਟ ਬਾਈਨਰੀ ਨਹੀਂ ਮਿਲੀ।"
 
-#. Add the interface to Totem's sidebar
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:1
-#: ../src/plugins/iplayer/iplayer.py:46
-msgid "BBC iPlayer"
-msgstr "BBC iPlayer"
-
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:2
-msgid "Stream BBC programs from the last 7 days from the BBC iPlayer service."
-msgstr "BBC iPlayer ਸਰਵਿਸ ਤੋਂ ਪਿਛਲੇ ੭ ਦਿਨਾਂ ਤੋਂ BBC ਪਰੋਗਰਾਮ ਸਟਰੀਮ ਕਰੋ।"
-
-#: ../src/plugins/iplayer/iplayer.py:72
-msgid "Error listing channel categories"
-msgstr "ਚੈਨਲ ਕੈਟਾਗਰੀ ਲੈਣ ਦੌਰਾਨ ਗਲਤੀ"
-
-#: ../src/plugins/iplayer/iplayer.py:73
-msgid ""
-"There was an unknown error getting the list of television channels available "
-"on BBC iPlayer."
-msgstr ""
-"BBC iPlayer ਉੱਤੇ ਉਪਲੱਬਧ ਟੈਲੀਵਿਜ਼ਨ ਚੈਨਲਾਂ ਦੀ ਲਿਸਟ ਲੈਣ ਦੌਰਾਨ ਅਣਜਾਣ ਗਲਤੀ ਹੈ।"
-
-#. Append a dummy child row so that the expander's visible; we can
-#. then queue off the expander to load the programme listing for this
-#. category
-#: ../src/plugins/iplayer/iplayer.py:84
-msgid "Loading…"
-msgstr "ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
-
-#. Translators: the "programme feed" is the list of TV shows
-#. available to watch online
-#: ../src/plugins/iplayer/iplayer.py:136
-msgid "Error getting programme feed"
-msgstr "ਪਰੋਗਰਾਮ ਫੀਡ ਲੈਣ ਦੌਰਾਨ ਗਲਤੀ"
-
-#: ../src/plugins/iplayer/iplayer.py:137
-msgid ""
-"There was an error getting the list of programmes for this channel and "
-"category combination."
-msgstr "ਇਸ ਚੈਨਲ ਅਤੇ ਕੈਟਾਗਰੀ ਸਬੰਧ ਲਈ ਪਰੋਗਰਾਮਾਂ ਦੀ ਲਿਸਟ ਲੈਣ ਦੌਰਾਨ ਗਲਤੀ ਆਈ ਹੈ।"
-
-#: ../src/plugins/iplayer/iplayer2.py:298
-msgid ""
-msgstr "<ਕੋਈ ਕਾਰਨ ਨਹੀਂ ਦਿੱਤਾ>"
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
+msgid "Instant Messenger Status"
+msgstr "ਤੁਰੰਤ ਮੈਸੈਂਜ਼ਰ ਹਾਲਤ"
 
-#: ../src/plugins/iplayer/iplayer2.py:299
-#, python-format
-msgid "Programme unavailable (\"%s\")"
-msgstr "ਪਰੋਗਰਾਮ ਉਪਲੱਬਧ ਨਹੀਂ (\"%s\")"
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
+msgid "Set your Instant Messenger status to away when a movie is playing"
+msgstr "ਜਦੋਂ ਇੱਕ ਮੂਵੀ ਚੱਲਦੀ ਹੋਵੇ ਤਾਂ ਤੁਰੰਤ ਮੈਸੈਂਜ਼ਰ ਹਾਲਤ ਦੂਰ ਸੈੱਟ ਕਰੋ।"
 
 #: ../src/plugins/lirc/lirc.plugin.in.h:1
 msgid "Infrared Remote Control"
@@ -2260,25 +2089,29 @@
 msgid "Couldn't read lirc configuration."
 msgstr "lirc ਸੰਰਚਨਾ ਪੜ੍ਹੀ ਨਹੀਂ ਜਾ ਸਕੀ।"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
-msgid "Download Movie Subtitles"
-msgstr "ਮੂਵੀ ਸਬ-ਟਾਈਟਲ ਡਾਊਨਲੋਡ"
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:1
+msgid "Media Player Keys"
+msgstr "ਮੀਡਿਆ ਪਲੇਅਰ ਸਵਿੱਚਾਂ"
+
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:2
+msgid "Support additional media player keys"
+msgstr "ਵਾਧੂ ਮੀਡਿਆ ਪਲੇਅਰ ਸਵਿੱਚਾਂ ਲਈ ਸਹਾਇਕ"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
-msgid "Subtitle _language:"
-msgstr "ਸਬ-ਟਾਈਟਲ ਭਾਸ਼ਾ(_l):"
+#: ../src/plugins/ontop/ontop.plugin.in.h:1
+msgid "Always On Top"
+msgstr "ਹਮੇਸ਼ਾ ਉੱਤੇ ਰੱਖੋ"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
-msgid "_Play with Subtitle"
-msgstr "ਸਬ-ਟਾਈਟਲ ਨਾਲ ਚਲਾਓ(_P)"
+#: ../src/plugins/ontop/ontop.plugin.in.h:2
+msgid "Keep the main window on top when playing a movie"
+msgstr "ਇੱਕ ਮੂਵੀ ਚਲਾਉਣ ਦੌਰਾਨ ਮੇਨ ਵਿੰਡੋ ਸਭ ਦੇ ਉੱਤੇ ਰੱਖੋ"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:1
 msgid "Subtitle Downloader"
 msgstr "ਸਬ-ਟਾਈਟਲ ਡਾਊਨਲੋਡਰ"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:2
-msgid "Look for subtitles for the currently playing movie."
-msgstr "ਮੌਜੂਦਾ ਚੱਲ ਰਹੀ ਮੂਵੀ ਲਈ ਸਬ-ਟਾਈਟਲ ਵੇਖੋ।"
+msgid "Look for subtitles for the currently playing movie"
+msgstr "ਮੌਜੂਦਾ ਚੱਲ ਰਹੀ ਮੂਵੀ ਲਈ ਸਬ-ਟਾਈਟਲ ਵੇਖੋ"
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:42
 msgid "Brazilian Portuguese"
@@ -2334,6 +2167,18 @@
 msgid "Searching subtitles…"
 msgstr "ਸਬ-ਟਾਈਟਲ ਖੋਜ ਜਾਰੀ…"
 
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
+msgid "Download Movie Subtitles"
+msgstr "ਮੂਵੀ ਸਬ-ਟਾਈਟਲ ਡਾਊਨਲੋਡ"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
+msgid "Subtitle _language:"
+msgstr "ਸਬ-ਟਾਈਟਲ ਭਾਸ਼ਾ(_l):"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
+msgid "_Play with Subtitle"
+msgstr "ਸਬ-ਟਾਈਟਲ ਨਾਲ ਚਲਾਓ(_P)"
+
 #: ../src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in.h:1
 msgid "Subtitle language"
 msgstr "ਸਬ-ਟਾਈਟਲ ਭਾਸ਼ਾ"
@@ -2342,84 +2187,18 @@
 msgid "The language to search for subtitles for movies in."
 msgstr "ਮੂਵੀ ਵਿੱਚ ਸਬ-ਟਾਈਟਲ ਲੱਭਣ ਲਈ ਭਾਸ਼ਾ।"
 
-#: ../src/plugins/ontop/ontop.plugin.in.h:1
-msgid "Always On Top"
-msgstr "ਹਮੇਸ਼ਾ ਉੱਤੇ ਰੱਖੋ"
-
-#: ../src/plugins/ontop/ontop.plugin.in.h:2
-msgid "Keep the main window on top when playing a movie"
-msgstr "ਇੱਕ ਮੂਵੀ ਚਲਾਉਣ ਦੌਰਾਨ ਮੇਨ ਵਿੰਡੋ ਸਭ ਦੇ ਉੱਤੇ ਰੱਖੋ"
+#: ../src/plugins/properties/movie-properties.plugin.in.h:1
+msgid "Movie Properties"
+msgstr "ਮੂਵੀ ਵਿਸ਼ੇਸ਼ਤਾ"
+
+#: ../src/plugins/properties/movie-properties.plugin.in.h:2
+msgid "Adds movie properties to the sidebar"
+msgstr "ਮੂਵੀ ਵਿਸ਼ੇਸ਼ਤਾ ਬਾਹੀ ਵਿੱਚ ਜੋੜੋ"
 
 #: ../src/plugins/properties/totem-movie-properties.c:246
 msgid "Properties"
 msgstr "ਵਿਸ਼ੇਸ਼ਤਾ"
 
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:1
-msgid "Publisher protocol to use"
-msgstr "ਵਰਤਣ ਲਈ ਪਬਲਿਸ਼ਰ ਪਰੋਟੋਕਾਲ"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:2
-msgid ""
-"The transport protocol to use when publishing playlists over the network."
-msgstr ""
-"ਜਦੋਂ ਪਲੇਅਲਿਸਟ ਨੈੱਟਵਰਕ ਉੱਤੇ ਪਬਲਿਸ਼ ਕਰਨ ਕਰਨੀਆਂ ਹੋਣ ਤਾਂ ਵਰਤਣ ਵਾਸਤੇ ਟਰਾਂਸਪੋਰਟ "
-"ਪਰੋਟੋਕਾਲ।"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:3
-msgid "Format for network service name"
-msgstr "ਨੈੱਟਵਰਕ ਸਰਵਿਸ ਨਾਂ ਲਈ ਫਾਰਮੈਟ"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:5
-#, no-c-format
-msgid ""
-"A format string used to build the network service name used when publishing "
-"playlists over the network. The following format placeholders can be used: • "
-"%a: the program name as returned by g_get_application_name() • %h: the "
-"machine's host name in title case • %u: the user's login name in title case "
-"• %U: the user's real name • %%: the percent sign"
-msgstr ""
-"ਫਾਰਮੈਟ ਲਾਈਨ ਨੂੰ ਨੈੱਟਵਰਕ ਸਰਵਿਸ ਬਣਾਉਣ ਲਈ ਵਰਤੀ ਜਾਂਦੀ ਹੈ, ਜਦੋਂ ਕਿ ਪਲੇਅਲਿਸਟ ਨੂੰ "
-"ਨੈੱਟਵਰਕ ਉੱਤੇ "
-"ਪਬਲਿਸ਼ ਕੀਤਾ ਜਾਂਦਾ ਹੈ। ਅੱਗੇ ਦਿੱਤੇ ਪਲੇਸਹੋਲਡਰ ਵਰਤੇ ਜਾ ਸਕਦੇ ਹਨ: • %a: "
-"g_get_application_name"
-"() ਵਲੋਂ ਪ੍ਰੋਗਰਾਮ ਨਾਂ ਦਿੱਤਾ ਜਾਂਦਾ ਹੈ • %h: ਟਾਈਟਲ ਕੇਸ ਵਿੱਚ ਮਸ਼ੀਨ ਦਾ ਹੋਸਟ ਨਾਂ "
-"ਦਿੱਤਾ ਜਾਂਦਾ ਹੈ• %"
-"u: ਟਾਈਟਲ ਕੇਸ ਵਿੱਚ ਯੂਜ਼ਰ ਦਾ ਲਾਗਇਨ ਨਾਂ ਦਿੱਤਾ ਜਾਂਦਾ ਹੈ • %U: ਯੂਜ਼ਰ ਦਾ ਅਸਲੀ ਨਾਂ • "
-"%%: ਫੀਸਦੀ "
-"ਨਿਸ਼ਾਨ"
-
-#. Translators: computers on the local network which are publishing their playlists over the network
-#: ../src/plugins/publish/totem-publish.c:552
-msgid "Neighbors"
-msgstr "ਗੁਆਂਢੀ"
-
-#: ../src/plugins/publish/publish.plugin.in.h:1
-msgid "Publish Playlist"
-msgstr "ਪਲੇਅਲਿਸਟ ਪਰਕਾਸ਼ਿਤ ਕਰੋ"
-
-#: ../src/plugins/publish/publish.plugin.in.h:2
-msgid "Share the current playlist via HTTP"
-msgstr "ਮੌਜੂਦਾ ਪਲੇਅ-ਲਿਸਟ HTTP ਰਾਹੀਂ ਸਾਂਝੀ ਕਰੋ"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:1
-msgid "Service _Name:"
-msgstr "ਸਰਵਿਸ ਨਾਂ(_N):"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:3
-#, no-c-format
-msgid ""
-"The name used for announcing the playlist service on the network.\n"
-"All occurrences of the string %u will be replaced by your name,\n"
-"and %h will be replaced by your computer's host name."
-msgstr ""
-"ਨੈੱਟਵਰਕ ਉੱਤੇ ਪਲੇਅਲਿਸਟ ਸਰਵਿਸ ਦਾ ਐਲਾਨ ਕਰਨ ਲਈ ਨਾਂ ਹੈ।\n"
-"ਲਾਇਨ %u ਦੀਆਂ ਸਭ ਮੌਜੂਦਗੀਆਂ ਨੂੰ ਤੁਹਾਡੇ ਨਾਲ ਨਾਂ ਬਦਲ ਦਿੱਤਾ ਜਾਵੇਗਾ ਅਤੇ\n"
-"%h ਨੂੰ ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ ਦੇ ਹੋਸਟ ਨਾਂ ਨਾਲ ਬਦਲਿਆ ਜਾਵੇਗਾ।"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:6
-msgid "Use _encrypted transport protocol (HTTPS)"
-msgstr "ਇੰਕ੍ਰਿਪਟਡ ਟਰਾਂਸਪੋਰਟ ਪਰੋਟੋਕਾਲ ਵਰਤੋਂ (_e)(HTTPS)"
-
 #: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:1
 msgid "rpdb2 password"
 msgstr "rpdb2 ਪਾਸਵਰਡ"
@@ -2433,22 +2212,89 @@
 "ਰਿਮੋਟ ਵਰਤੋਂ ਤੋਂ "
 "ਬਚਾਉਂਦੀ ਹੈ। ਜੇ ਇਹ ਖਾਲੀ ਹੋਇਆ ਤਾਂ ਡਿਫਾਲਟ 'totem' ਵਰਤਿਆ ਜਾਵੇਗਾ।"
 
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
+msgid "Python Console"
+msgstr "ਪਾਈਥਨ ਕਨਸੋਲ"
+
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
+msgid "Interactive Python console"
+msgstr "ਦਿਲਚਸਪ ਪਾਈਥਨ ਕਨਸੋਲ"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:88
+msgid "Python Console Menu"
+msgstr "ਪਾਈਥਨ ਕਨਸੋਲ ਮੇਨੂ"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:93
+msgid "_Python Console"
+msgstr "ਪਾਈਥਨ ਕਨਸੋਲ(_P)"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:94
+msgid "Show Totem's Python console"
+msgstr "ਟੋਟੇਮ ਦੀ ਪਾਈਥਨ ਕਨਸੋਲ ਵੇਖੋ"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:100
+msgid "Python Debugger"
+msgstr "ਪਾਈਥਨ ਡੀਬੱਗਰ"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:101
+msgid "Enable remote Python debugging with rpdb2"
+msgstr "rpdb2 ਨਾਲ ਰਿਮੋਟ ਪਾਈਥਨ ਡੀਬੱਗ ਕਰਨ ਯੋਗ ਕਰੋ"
+
+#. pylint: disable-msg=E1101
+#: ../src/plugins/pythonconsole/pythonconsole.py:125
+#, python-format
+msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
+msgstr "ਤੁਸੀਂ ਟੋਟੇਮ ਆਬਜੈਕਟ ਨੂੰ Totem.Object ਰਾਹੀਂ ਵਰਤ ਸਕਦੇ ਹੋ:\\n%s"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:129
+msgid "Totem Python Console"
+msgstr "ਟੋਟੇਮ ਪਾਈਥਨ ਕਨਸੋਲ"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:139
+msgid ""
+"After you press OK, Totem will wait until you connect to it with winpdb or "
+"rpdb2. If you have not set a debugger password in DConf, it will use the "
+"default password ('totem')."
+msgstr ""
+"ਜਦੋਂ ਤੁਸੀਂ ਠੀਕ ਹੈ ਦੱਬੋਗੇ ਤਾਂ ਟੋਟੇਮ ਤੁਹਾਡੇ ਵਲੋਂ ਇਸ ਨੂੰ winpdb ਜਾਂ rpdb2 ਨਾਲ "
+"ਕੁਨੈਕਟ ਕਰਨ ਦੀ ਉਡੀਕ "
+"ਕਰੇਗਾ। ਜੇ ਤੁਸੀਂ DConf ਵੱਚ ਡੀਬੱਗਰ ਲਈ ਪਾਸਵਰਡ ਨਾ ਸੈੱਟ ਕੀਤਾ ਹੋਇਆ ਤਾਂ ਇਹ ਡਿਫਾਲਟ "
+"ਪਾਸਵਰਡ "
+"('totem') ਵਰਤੇਗਾ।"
+
+#: ../src/plugins/recent/recent.plugin.in.h:1
+#| msgid "Video files"
+msgid "Recent files"
+msgstr "ਤਾਜ਼ਾ ਫਾਇਲਾਂ"
+
+#: ../src/plugins/recent/recent.plugin.in.h:2
+msgid "Adds files that have been played to recent files"
+msgstr "ਫਾਇਲਾਂ ਨੂੰ ਤਾਜ਼ਾ ਚਲਾਈਆਂ ਗਈਆਂ ਫਾਇਲਾਂ ਵਿੱਚ ਜੋੜਨ ਦਿਓ"
+
 #: ../src/plugins/rotation/rotation.plugin.in.h:1
 msgid "Rotation Plugin"
 msgstr "ਘੁੰਮਾਉਣ ਪਲੱਗਇਨ"
 
 #: ../src/plugins/rotation/rotation.plugin.in.h:2
-msgid "Allows videos to be rotated if they're in the wrong orientation."
+msgid "Allows videos to be rotated if they are in the wrong orientation"
 msgstr "ਵਿਡੀਓ ਦੀ ਦਿਸ਼ਾ ਬਦਲਣ ਲਈ ਸਹਾਇਕ ਹੈ, ਜੇ ਇਹ ਗਲਤ ਹੋਵੇ।"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:60
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:50
 msgid "_Rotate Clockwise"
 msgstr "ਸੱਜੇ ਦਾਅ ਘੁੰਮਾਓ(_R)"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:62
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:52
 msgid "Rotate Counterc_lockwise"
 msgstr "ਖੱਬੇ ਦਾਅ ਘੁੰਮਾਓ(_l)"
 
+#: ../src/plugins/save-file/save-file.plugin.in.h:1
+msgid "Save Copy"
+msgstr "ਕਾਪੀ ਸੰਭਾਲੋ"
+
+#: ../src/plugins/save-file/save-file.plugin.in.h:2
+msgid "Save a copy of the currently playing movie"
+msgstr "ਹੁਣ ਚੱਲ ਰਹੀ ਮੂਵੀ ਦੀ ਕਾਪੀ ਸੰਭਾਲੋ"
+
 #: ../src/plugins/save-file/totem-save-file.c:63
 msgid "Save a Copy..."
 msgstr "...ਇੱਕ ਕਾਪੀ ਵਜੋਂ ਸੰਭਾਲੋ"
@@ -2471,10 +2317,14 @@
 msgid "Movie stream"
 msgstr "ਮੂਵੀ ਸਟਰੀਮ"
 
-#: ../src/plugins/screensaver/totem-screensaver.c:116
-#: ../browser-plugin/totem-plugin-viewer.c:1891
-msgid "Playing a movie"
-msgstr "ਇੱਕ ਮੂਵੀ ਚੱਲਦੀ ਏ"
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:1
+msgid "Screen Saver"
+msgstr "ਸਕਰੀਨ ਸੇਵਰ"
+
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:2
+#| msgid "Disable screensaver when playing "
+msgid "Deactivates the screen saver when a movie is playing"
+msgstr "ਜਦੋਂ ਮੂਵੀ ਚੱਲ ਰਹੀ ਹੋਵੇ ਤਾਂ ਸਕਰੀਨ-ਸੇਵਰ ਬੰਦ ਰੱਖੋ"
 
 #: ../src/plugins/screenshot/gallery.ui.h:1
 msgid "Screenshot width (in pixels):"
@@ -2488,23 +2338,30 @@
 msgid "Number of screenshots:"
 msgstr "ਸਕਰੀਨ-ਸ਼ਾਟ ਦੀ ਗਿਣਤੀ:"
 
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:1
-msgid "_Name:"
-msgstr "ਨਾਂ(_N):"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:2
-msgid "Save in _folder:"
-msgstr "ਫੋਲਡਰ ਵਿੱਚ ਸੰਭਾਲੋ(_f):"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:3
-msgid "Select a folder"
-msgstr "ਫੋਲਡਰ ਚੁਣੋ"
-
-#. Write the screenshot to the temporary file
-#: ../src/plugins/screenshot/gnome-screenshot-widget.c:385
-#: ../src/plugins/screenshot/totem-screenshot.c:64
-msgid "Screenshot.png"
-msgstr "Screenshot.png"
+#. translators: this is the name of the file that gets made up
+#. * with the screenshot if the entire screen is taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:147
+#, c-format
+#| msgid "Screenshot.png"
+msgid "Screenshot from %s.png"
+msgstr "%s ਤੋਂ ਸਕਰੀਨਸ਼ਾਟ.png"
+
+#. translators: this is the name of the file that gets
+#. * made up with the screenshot if the entire screen is
+#. * taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:154
+#, c-format
+#| msgid "Screenshot-%s-%d.png"
+msgid "Screenshot from %s - %d.png"
+msgstr "%s - %d ਤੋਂ ਸਕਰੀਨਸ਼ਾਟ.png"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:1
+msgid "Screenshot"
+msgstr "ਸਕਰੀਨਸ਼ਾਟ"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:2
+msgid "Allows screenshots and galleries to be taken of videos"
+msgstr "ਵਿਡੀਓ ਦੇ ਸਕਰੀਨ-ਸ਼ਾਟ ਲੈਣ ਅਤੇ ਗੈਲਰੀਆਂ ਲੈਣ ਦਿਉ"
 
 #: ../src/plugins/screenshot/totem-gallery.c:91
 msgid "Save Gallery"
@@ -2530,49 +2387,48 @@
 msgid "Saving gallery as \"%s\""
 msgstr "ਗੈਲਰੀ ਇੰਝ \"%s\" ਸੰਭਾਲੀ ਜਾ ਰਹੀ ਹੈ"
 
-#: ../src/plugins/screenshot/totem-screenshot.c:113
-msgid "There was an error saving the screenshot."
-msgstr "ਸਕਰੀਨ-ਸ਼ਾਟ ਨੂੰ ਸੰਭਾਲਣ ਦੌਰਾਨ ਗਲਤੀ ਆਈ ਹੈ।"
-
-#: ../src/plugins/screenshot/totem-screenshot.c:139
-msgid "Save Screenshot"
-msgstr "ਸਕਰੀਨ-ਸ਼ਾਟ ਸੰਭਾਲੋ"
-
-#. Create the screenshot widget
-#. Translators: %s is the movie title and %d is an auto-incrementing number to make filename unique
-#: ../src/plugins/screenshot/totem-screenshot.c:160
-#, c-format
-msgid "Screenshot-%s-%d.png"
-msgstr "ਸਕਰੀਨਸ਼ਾਟ-%s-%d.png"
-
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:88
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:220
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "Totem could not get a screenshot of the video."
 msgstr "ਟੋਟੇਮ ਇਸ ਵਿਡੀਓ ਦੀ ਸਕਰੀਨ-ਸ਼ਾਟ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕਿਆ ਹੈ।"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "This is not supposed to happen; please file a bug report."
 msgstr "ਇਹ ਅਜੇ ਹੋਇਆ ਨਹੀਂ ਹੈ; ਇੱਕ ਬੱਗ ਰਿਪੋਰਟ ਦਿਓ।"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
-msgid "Take _Screenshot..."
-msgstr "ਸਕਰੀਨ-ਸ਼ਾਟ ਲਵੋ(_S)..."
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
+#| msgid "Take _Screenshot..."
+msgid "Take _Screenshot"
+msgstr "ਸਕਰੀਨ-ਸ਼ਾਟ ਲਵੋ(_S)"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
 msgid "Take a screenshot"
 msgstr "ਇੱਕ ਸਕਰੀਨ-ਸ਼ਾਟ ਲਵੋ"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create Screenshot _Gallery..."
 msgstr "ਸਕਰੀਨ-ਸ਼ਾਟ ਗੈਲਰੀ ਬਣਾਓ(_G)..."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create a gallery of screenshots"
 msgstr "ਸਕਰੀਨਸ਼ਾਟ ਲਈ ਗੈਲਰੀ ਬਣਾਓ"
 
+#: ../src/plugins/skipto/skipto.plugin.in.h:1
+#: ../src/plugins/skipto/totem-skipto.c:196
+msgid "Skip To"
+msgstr "ਇੱਥੇ ਜਾਓ"
+
+#: ../src/plugins/skipto/skipto.plugin.in.h:2
+msgid "Provides the \"Skip to\" dialog"
+msgstr "\"ਛੱਡੋ\" ਡਾਈਲਾਗ ਦਿੰਦਾ ਹੈ"
+
+#: ../src/plugins/skipto/skipto.ui.h:1
+msgid "_Skip to:"
+msgstr "ਛੱਡੋ(_S):"
+
 #. Update the "seconds" label so that it always has the correct singular/plural form
 #. Translators: label for the seconds selector in the "Skip to" dialogue
-#: ../src/plugins/skipto/totem-skipto.c:160
+#: ../src/plugins/skipto/totem-skipto.c:159
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "ਸਕਿੰਟ"
@@ -2582,15 +2438,11 @@
 #. Translators: you should translate this string to a number (written in digits) which corresponds to the longer character length of the
 #. * translations for "second" and "seconds", as translated elsewhere in this file. For example, in English, "second" is 6 characters long and
 #. * "seconds" is 7 characters long, so this string should be translated to "7". See: bgo#639398
-#: ../src/plugins/skipto/totem-skipto.c:190
+#: ../src/plugins/skipto/totem-skipto.c:189
 msgctxt "Skip To label length"
 msgid "7"
 msgstr "7"
 
-#: ../src/plugins/skipto/totem-skipto.c:197
-msgid "Skip To"
-msgstr "ਇੱਥੇ ਜਾਓ"
-
 #: ../src/plugins/skipto/totem-skipto-plugin.c:182
 msgid "_Skip To..."
 msgstr "... ਤੱਕ ਛੱਡੋ(_S)"
@@ -2599,117 +2451,295 @@
 msgid "Skip to a specific time"
 msgstr "ਖਾਸ ਸਮਾਂ ਛੱਡੋ"
 
-#: ../src/plugins/skipto/skipto.ui.h:1
-msgid "_Skip to:"
-msgstr "ਛੱਡੋ(_S):"
+#~ msgid "Location not found."
+#~ msgstr "ਟਿਕਾਣਾ ਨਹੀਂ ਮਿਲਿਆ ਹੈ।"
 
-#: ../browser-plugin/totem-plugin-viewer.c:431
-msgid "No URI to play"
-msgstr "ਚਲਾਉਣ ਲਈ URI ਨਹੀਂ"
+#~ msgid ""
+#~ "Could not open location; you might not have permission to open the file."
+#~ msgstr "ਟਿਕਾਣਾ ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ; ਤੁਹਾਨੂੰ ਫਾਇਲ ਖੋਲ੍ਹਣ ਲਈ ਅਧਿਕਾਰ ਨਹੀਂ ਹੋ ਸਕਦੇ ਹਨ।"
 
-#. translators: this is:
-#. * Open With ApplicationName
-#. * as in nautilus' right-click menu
-#: ../browser-plugin/totem-plugin-viewer.c:1107
-#, c-format
-msgid "_Open with \"%s\""
-msgstr "\"%s\" ਨਾਲ ਖੋਲ੍ਹੋ(_O)"
+#~ msgid ""
+#~ "Failed to create a GStreamer play object. Please check your GStreamer "
+#~ "installation."
+#~ msgstr ""
+#~ "GStreamer ਚੱਲਣ ਇਕਾਈ ਬਣਾਉਣ ਵਿੱਚ ਅਸਫਲ ਹੈ। ਆਪਣੀ ਜੀ-ਸਟਰੀਮਰ ਇੰਸਟਰਫੇਸ ਇੰਸਟਾਲੇਸ਼ਨ ਦੀ ਜਾਂਚ "
+#~ "ਕਰੋ।"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2136
-msgid "No playlist or playlist empty"
-msgstr "ਕੋਈ ਪਲੇਅ-ਲਿਸਟ ਨਹੀਂ ਜਾਂ ਖਾਲੀ ਹੈ"
+#~ msgid "%d %%"
+#~ msgstr "%d %%"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2235
-msgid "Movie browser plugin"
-msgstr "ਮੂਵੀ ਬਰਾਊਜ਼ਰ ਪਲੱਗਇਨ"
+#~ msgid ""
+#~ msgstr "<ਕੋਈ ਕਾਰਨ ਨਹੀਂ ਦਿੱਤਾ>"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Verify your system installation. The Totem plugin will now exit."
-msgstr "ਤੁਹਾਡੇ ਸਿਸਟਮ ਇੰਸਟਾਲ  ਪੜਤਾਲ ਹੋਈ। ਟੋਟੇਮ ਪਲੱਗਇਨ ਹੁਣ ਬੰਦ ਹੋਵੇਗੀ।"
+#~ msgid "Programme unavailable (\"%s\")"
+#~ msgstr "ਪਰੋਗਰਾਮ ਉਪਲੱਬਧ ਨਹੀਂ (\"%s\")"
 
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
-msgid "Python Console"
-msgstr "ਪਾਈਥਨ ਕਨਸੋਲ"
+#~ msgid "BBC iPlayer"
+#~ msgstr "BBC iPlayer"
 
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
-msgid "Interactive Python console."
-msgstr "ਦਿਲਚਸਪ ਪਾਈਥਨ ਕਨਸੋਲ"
+#~| msgid ""
+#~| "Stream BBC programs from the last 7 days from the BBC iPlayer service."
+#~ msgid ""
+#~ "Stream BBC programs from the last 7 days from the BBC iPlayer service"
+#~ msgstr "BBC iPlayer ਸਰਵਿਸ ਤੋਂ ਪਿਛਲੇ ੭ ਦਿਨਾਂ ਤੋਂ BBC ਪਰੋਗਰਾਮ ਸਟਰੀਮ"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:88
-msgid "Python Console Menu"
-msgstr "ਪਾਈਥਨ ਕਨਸੋਲ ਮੇਨੂ"
+#~ msgid "Error listing channel categories"
+#~ msgstr "ਚੈਨਲ ਕੈਟਾਗਰੀ ਲੈਣ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:93
-msgid "_Python Console"
-msgstr "ਪਾਈਥਨ ਕਨਸੋਲ(_P)"
+#~ msgid ""
+#~ "There was an unknown error getting the list of television channels "
+#~ "available on BBC iPlayer."
+#~ msgstr "BBC iPlayer ਉੱਤੇ ਉਪਲੱਬਧ ਟੈਲੀਵਿਜ਼ਨ ਚੈਨਲਾਂ ਦੀ ਲਿਸਟ ਲੈਣ ਦੌਰਾਨ ਅਣਜਾਣ ਗਲਤੀ ਹੈ।"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:94
-msgid "Show Totem's Python console"
-msgstr "ਟੋਟੇਮ ਦੀ ਪਾਈਥਨ ਕਨਸੋਲ ਵੇਖੋ"
+#~ msgid "Loading…"
+#~ msgstr "ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:100
-msgid "Python Debugger"
-msgstr "ਪਾਈਥਨ ਡੀਬੱਗਰ"
+#~ msgid "Error getting programme feed"
+#~ msgstr "ਪਰੋਗਰਾਮ ਫੀਡ ਲੈਣ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:101
-msgid "Enable remote Python debugging with rpdb2"
-msgstr "rpdb2 ਨਾਲ ਰਿਮੋਟ ਪਾਈਥਨ ਡੀਬੱਗ ਕਰਨ ਯੋਗ ਕਰੋ"
+#~ msgid ""
+#~ "There was an error getting the list of programmes for this channel and "
+#~ "category combination."
+#~ msgstr "ਇਸ ਚੈਨਲ ਅਤੇ ਕੈਟਾਗਰੀ ਸਬੰਧ ਲਈ ਪਰੋਗਰਾਮਾਂ ਦੀ ਲਿਸਟ ਲੈਣ ਦੌਰਾਨ ਗਲਤੀ ਆਈ ਹੈ।"
 
-#. pylint: disable-msg=E1101
-#: ../src/plugins/pythonconsole/pythonconsole.py:125
-#, python-format
-msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
-msgstr "ਤੁਸੀਂ ਟੋਟੇਮ ਆਬਜੈਕਟ ਨੂੰ Totem.Object ਰਾਹੀਂ ਵਰਤ ਸਕਦੇ ਹੋ:\\n%s"
+#~ msgid "_Name:"
+#~ msgstr "ਨਾਂ(_N):"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:129
-msgid "Totem Python Console"
-msgstr "ਟੋਟੇਮ ਪਾਈਥਨ ਕਨਸੋਲ"
+#~ msgid "Save in _folder:"
+#~ msgstr "ਫੋਲਡਰ ਵਿੱਚ ਸੰਭਾਲੋ(_f):"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:139
-msgid ""
-"After you press OK, Totem will wait until you connect to it with winpdb or "
-"rpdb2. If you have not set a debugger password in DConf, it will use the "
-"default password ('totem')."
-msgstr ""
-"ਜਦੋਂ ਤੁਸੀਂ ਠੀਕ ਹੈ ਦੱਬੋਗੇ ਤਾਂ ਟੋਟੇਮ ਤੁਹਾਡੇ ਵਲੋਂ ਇਸ ਨੂੰ winpdb ਜਾਂ rpdb2 ਨਾਲ "
-"ਕੁਨੈਕਟ ਕਰਨ ਦੀ ਉਡੀਕ "
-"ਕਰੇਗਾ। ਜੇ ਤੁਸੀਂ DConf ਵੱਚ ਡੀਬੱਗਰ ਲਈ ਪਾਸਵਰਡ ਨਾ ਸੈੱਟ ਕੀਤਾ ਹੋਇਆ ਤਾਂ ਇਹ ਡਿਫਾਲਟ "
-"ਪਾਸਵਰਡ "
-"('totem') ਵਰਤੇਗਾ।"
+#~ msgid "Select a folder"
+#~ msgstr "ਫੋਲਡਰ ਚੁਣੋ"
 
-#: ../src/plugins/grilo/grilo.plugin.in.h:1
-msgid "Grilo Browser"
-msgstr "ਗਰੀਲੋ ਬਰਾਊਜ਼ਰ"
+#~ msgid "There was an error saving the screenshot."
+#~ msgstr "ਸਕਰੀਨ-ਸ਼ਾਟ ਨੂੰ ਸੰਭਾਲਣ ਦੌਰਾਨ ਗਲਤੀ ਆਈ ਹੈ।"
 
-#: ../src/plugins/grilo/grilo.plugin.in.h:2
-msgid "A plugin to let you browse media content from various sources."
-msgstr "ਇੱਕ ਪਲੱਗਇਨ, ਜੋ ਤੁਹਾਨੂੰ ਕਈ ਸਰੋਤਾਂ ਤੋਂ ਮੀਡਿਆ ਸਮੱਗਰੀ ਵੇਖਣ ਲਈ ਸਹਾਇਕ ਹੈ।"
+#~ msgid "Save Screenshot"
+#~ msgstr "ਸਕਰੀਨ-ਸ਼ਾਟ ਸੰਭਾਲੋ"
 
-#: ../src/plugins/grilo/totem-grilo.c:452
-msgid "Browse Error"
-msgstr "ਬਰਾਊਜ਼ ਗਲਤੀ"
+#~ msgid "Play movies and songs"
+#~ msgstr "ਵਿਡੀਓ ਅਤੇ ਗਾਣੇ ਚਲਾਓ"
 
-#: ../src/plugins/grilo/totem-grilo.c:599
-msgid "Search Error"
-msgstr "ਖੋਜ ਗਲਤੀ"
+#~ msgid "Open a file"
+#~ msgstr "ਇੱਕ ਫਾਇਲ ਖੋਲ੍ਹੋ"
 
-#: ../src/plugins/grilo/totem-grilo.c:1219 ../src/plugins/grilo/grilo.ui.h:3
-msgid "Browse"
-msgstr "ਝਲਕ"
+#~ msgid "Open a non-local file"
+#~ msgstr "ਨਾ-ਲੋਕਲ ਫਾਇਲ ਖੋਲ੍ਹੋ"
 
-#: ../src/plugins/grilo/totem-grilo.c:1285 ../src/plugins/grilo/grilo.ui.h:4
-msgid "Search"
-msgstr "ਖੋਜ"
+#~ msgid "Quit the program"
+#~ msgstr "ਪਰੋਗਰਾਮ ਬੰਦ ਕਰੋ"
 
-#: ../src/plugins/grilo/grilo.ui.h:1
-#| msgid "_Add to Playlist"
-msgid "Add to Playlist"
-msgstr "ਪਲੇਅਲਿਸਟ 'ਚ ਸ਼ਾਮਲ"
+#~ msgid "Configure the application"
+#~ msgstr "ਐਪਲੀਕੇਸ਼ਨ ਸੰਰਚਨਾ"
 
-#: ../src/plugins/grilo/grilo.ui.h:2
-#| msgid "_Copy Location"
-msgid "Copy Location"
-msgstr "ਟਿਕਾਣਾ ਕਾਪੀ ਕਰੋ"
+#~ msgid "Switch to fullscreen"
+#~ msgstr "ਪੂਰੀ ਸਕਰੀਨ 'ਤੇ ਤਬਦੀਲ"
+
+#~ msgid "Set the repeat mode"
+#~ msgstr "ਦੁਹਰਾਓ ਢੰਗ ਸੈੱਟ"
+
+#~ msgid "Set the shuffle mode"
+#~ msgstr "ਰਲਵਾਂ ਢੰਗ ਸੈੱਟ"
+
+#~ msgid "14.4 Kbps Modem"
+#~ msgstr "੧੪.੪ Kbps ਮਾਡਮ"
+
+#~ msgid "19.2 Kbps Modem"
+#~ msgstr "੧੯.੨ Kbps ਮਾਡਮ"
+
+#~ msgid "28.8 Kbps Modem"
+#~ msgstr "੨੮.੮ Kbps ਮਾਡਮ"
+
+#~ msgid "33.6 Kbps Modem"
+#~ msgstr "੩੩.੬ Kbps ਮਾਡਮ"
+
+#~ msgid "34.4 Kbps Modem"
+#~ msgstr "੩੪.੪ Kbps ਮਾਡਮ"
+
+#~ msgid "56 Kbps Modem/ISDN"
+#~ msgstr "੫੬ Kbps ਮਾਡਮ/ISDN"
+
+#~ msgid "112 Kbps Dual ISDN/DSL"
+#~ msgstr "੧੧੨ Kbps ਡਿਊਲl ISDN/DSL"
+
+#~ msgid "256 Kbps DSL/Cable"
+#~ msgstr "੨੫੬ Kbps DSL/ਕੇਬਲ"
+
+#~ msgid "384 Kbps DSL/Cable"
+#~ msgstr "੩੮੪ Kbps DSL/ਕੇਬਲ"
+
+#~ msgid "512 Kbps DSL/Cable"
+#~ msgstr "੫੧੨ Kbps DSL/ਕੇਬਲ"
+
+#~ msgid "1.5 Mbps T1/Intranet/LAN"
+#~ msgstr "੧.੫ Mbps T1/ਇੰਟਰਾਨੈੱਟ/LAN"
+
+#~ msgid "Intranet/LAN"
+#~ msgstr "ਇੰਟਰਾਨੈੱਟ/LAN"
+
+#~ msgid "Networking"
+#~ msgstr "ਨੈੱਟਵਰਕਿੰਗ"
+
+#~ msgid "Connection _speed:"
+#~ msgstr "ਕੁਨੈਕਸ਼ਨ ਗਤੀ(_s):"
+
+#~ msgid "Network connection speed"
+#~ msgstr "ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ ਗਤੀ"
+
+#~ msgid ""
+#~ "Approximate network connection speed, used to select quality on media "
+#~ "over the network."
+#~ msgstr "ਲਗਭਗ ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ ਸਪੀਡ, ਨੈੱਟਵਰਕ ਉੱਤੇ ਮੀਡਿਆ ਦੀ ਕੁਆਲਟੀ ਚੁਣਨ ਲਈ ਵਰਤੀ ਜਾਂਦੀ ਹੈ।"
+
+#~ msgid "Play Image '%s'"
+#~ msgstr "ਈਮੇਜ਼ '%s' ਚਲਾਓ"
+
+#~ msgid "device%d"
+#~ msgstr "ਜੰਤਰ%d"
+
+#~ msgid "Play Disc '%s'"
+#~ msgstr "ਡਿਸਕ '%s' ਚਲਾਓ"
+
+#~ msgid "Movie Player using %s"
+#~ msgstr "%s ਨਾਲ ਮੂਵੀ ਪਲੇਅਰ"
+
+#~ msgid ""
+#~ "Totem could not play this media (%s) although a plugin is present to "
+#~ "handle it."
+#~ msgstr ""
+#~ "ਟੋਟੇਮ ਇਹ ਮਾਧਿਅਮ (%s) ਨੂੰ ਚਲਾ ਨਹੀ ਸਕਦਾ ਹੈ, ਭਾਵੇਂ ਕਿ ਇਸ ਨੂੰ ਵਰਤਣ ਵਾਲੀ ਪਲੱਗਇਨ ਮੌਜੂਦ ਹੈ।"
+
+#~ msgid ""
+#~ "You might want to check that a disc is present in the drive and that it "
+#~ "is correctly configured."
+#~ msgstr ""
+#~ "ਤੁਹਾਨੂੰ ਇਹ ਪੜਤਾਲ ਕਰਨੀ ਚਾਹੀਦੀ ਹੈ ਕਿ ਡਿਸਕ ਡਰਾਇਵ ਅੰਦਰ ਹੈ ਅਤੇ ਇਹ ਠੀਕ ਤਰਾਂ ਸੰਰਚਿਤ ਹੈ।"
+
+#~ msgid "More information about media plugins"
+#~ msgstr "ਮੀਡਿਆ ਪਲੱਗਇਨ ਬਾਰੇ ਹੋਰ ਜਾਣਕਾਰੀ"
+
+#~ msgid ""
+#~ "Please install the necessary plugins and restart Totem to be able to play "
+#~ "this media."
+#~ msgstr "ਲੋੜੀਦੀਂ ਪਲੱਗਇਨ ਇੰਸਟਾਲ ਕਰੋ ਅਤੇ ਟੋਟੇਮ ਨੂੰ ਇਸ ਮਾਧਿਅਮ ਨੂੰ ਚਲਾਉਣ ਲਈ ਮੁੜ-ਚਾਲੂ ਕਰੋ।"
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it does not have the "
+#~ "appropriate plugins to be able to read from the disc."
+#~ msgstr ""
+#~ "ਟੋਟੇਮ ਇਹ ਮਾਧਿਅਮ (%s) ਨੂੰ ਚਲਾ ਨਹੀ ਸਕਦਾ ਹੈ, ਕਿਉਕਿ ਇਸ ਕੋਲ ਡਿਸਕ ਤੋਂ ਪੜ੍ਹਨ ਲਈ ਢੁੱਕਵੀਂ "
+#~ "ਪਲੱਗਇਨ ਮੌਜੂਦ ਨਹੀਂ ਹੈ।"
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because you do not have the "
+#~ "appropriate plugins to handle it."
+#~ msgstr ""
+#~ "ਟੋਟੇਮ ਇਹ ਮਾਧਿਅਮ (%s) ਨੂੰ ਚਲਾ ਨਹੀ ਸਕਦਾ ਹੈ, ਕਿਉਕਿ ਤੁਹਾਡੇ ਕੋਲ ਇਸ ਨੂੰ ਵਰਤਣ ਲਈ ਪਲੱਗਇਨ ਮੌਜੂਦ "
+#~ "ਨਹੀਂ ਹੈ।"
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it is not supported."
+#~ msgstr "ਟੋਟੇਮ ਇਹ ਮਾਧਿਅਮ (%s) ਨੂੰ ਚਲਾ ਨਹੀਂ ਸਕਦਾ ਹੈ, ਕਿਉਂਕਿ ਇਹ ਸਹਿਯੋਗੀ ਨਹੀਂ ਹੈ।"
+
+#~ msgid "Please insert another disc to play back."
+#~ msgstr "ਪਲੇਅਬੈਕ ਲਈ ਹੋਰ ਡਿਸਕ ਪਾਓ ਜੀ।"
+
+#~ msgid "Totem was not able to play this disc."
+#~ msgstr "ਟੋਟੇਮ ਇਹ ਡਿਸਕ ਚਲਾਉਣ ਦੇ ਯੋਗ ਨਹੀਂ ਹੈ।"
+
+#~ msgid "Totem does not support playback of Audio CDs"
+#~ msgstr "ਟੋਟੇਮ ਆਡੀਓ CD ਚਲਾਉਣ ਵਾਸਤੇ ਸਹਿਯੋਗੀ ਨਹੀਂ ਹੈ।"
+
+#~ msgid ""
+#~ "Please consider using a music player or a CD extractor to play this CD"
+#~ msgstr "ਇੱਕ ਸੰਗੀਤ ਪਲੇਅਰ ਜਾਂ ਇੱਕ CD ਐਕਸਟਾਕਟਰ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਇਹ CD ਚਲਾਉਣ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੋ"
+
+#~ msgid ""
+#~ "The requested audio output was not found. Please select another audio "
+#~ "output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "ਲੋੜੀਦੀਂ ਆਡੀਓ ਆਉਟਪੁੱਟ ਨਹੀਂ ਲੱਭੀ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਬਹੁ-ਰੰਗ ਸਿਸਟਮ ਚੋਣਕਾਰ ਵਿੱਚ ਹੋਰ ਆਡੀਓ ਆਉਟਪੁੱਟ "
+#~ "ਦੀ ਚੋਣ ਕਰੋ।"
+
+#~ msgid ""
+#~ "The video output is in use by another application. Please close other "
+#~ "video applications, or select another video output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "ਵਿਡੀਓ ਆਉਟਪੁੱਟ ਨੂੰ ਹੋਰ ਕਾਰਜ ਰਾਹੀਂ ਵਰਤਿਆ ਜਾ ਰਿਹਾ ਹੈ। ਹੋਰ ਵਿਡੀਓ ਕਾਰਜ ਬੰਦ ਕਰੋ ਜਾਂ "
+#~ "ਮਲਟੀਮੀਡਿਆ ਸਿਸਟਮ ਚੋਣਕਾਰ 'ਚੋਂ ਹੋਰ ਵਿਡੀਓ ਆਉਟ-ਪੁੱਟ ਦੀ ਚੋਣ ਕਰੋ।"
+
+#~ msgid ""
+#~ "The audio output is in use by another application. Please select another "
+#~ "audio output in the Multimedia Systems Selector. You may want to consider "
+#~ "using a sound server."
+#~ msgstr ""
+#~ "ਆਡੀਓ ਆਉਟਪੁੱਟ ਨੂੰ ਹੋਰ ਕਾਰਜ ਰਾਹੀਂ ਵਰਤਿਆ ਜਾ ਰਿਹਾ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਬਹੁ-ਰੰਗ ਸਿਸਟਮ ਚੋਣਕਾਰ 'ਚੋਂ "
+#~ "ਹੋਰ ਆਡੀਓ ਆਉਟ-ਪੁੱਟ ਦੀ ਚੋਣ ਕਰੋ। ਤੁਸੀਂ ਇੱਕ ਸਾਊਂਡ ਸਰਵਰ ਦੀ ਵਰਤੋਂ ਵੀ ਕਰ ਸਕਦੇ ਹੋ।"
+
+#~ msgid ""
+#~ "Failed to open audio output. You may not have permission to open the "
+#~ "sound device, or the sound server may not be running. Please select "
+#~ "another audio output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "ਆਡੀਓ ਆਉਟਪੁੱਟ ਨੂੰ ਖੋਲਣ 'ਚ ਅਸਫ਼ਲ ਹੈ। ਤੁਹਾਨੂੰ ਸਾਊਂਡ ਜੰਤਰ ਖੋਲਣ ਲਈ ਅਧਿਕਾਰ ਨਹੀਂ ਹੋ ਸਕਦਾ ਜਾਂ "
+#~ "ਸਾਊਂਡ ਸਰਵਰ ਚੱਲਦਾ ਨਹੀਂ ਹੋ ਸਕਦਾ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਬਹੁ-ਰੰਗ ਸਿਸਟਮ ਚੋਣਕਾਰ 'ਚੋਂ ਹੋਰ ਆਡੀਓ ਆਉਟ-"
+#~ "ਪੁੱਟ ਦੀ ਚੋਣ ਕਰੋ।"
+
+#~ msgid ""
+#~ "Could not find the audio output. You may need to install additional "
+#~ "GStreamer plugins, or select another audio output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "ਆਡੀਓ ਆਉਟਪੁੱਟ ਨਹੀਂ ਲੱਭੀ ਜਾ ਸਕੀ ਹੈ। ਤੁਹਾਨੂੰ ਹੋਰ ਜੀ-ਸਟਰੀਮਰ ਪਲੱਗਇਨ ਦੀ ਚੋਣ ਕਰਨੀ ਚਾਹੀਦੀ ਹੈ "
+#~ "ਜਾਂ ਬਹੁ-ਰੰਗ ਸਿਸਟਮ ਚੋਣਕਾਰ ਵਿੱਚ ਹੋਰ ਆਡੀਓ ਆਉਟਪੁੱਟ ਦੀ ਚੋਣ ਕਰੋ।"
+
+#~ msgid "Publisher protocol to use"
+#~ msgstr "ਵਰਤਣ ਲਈ ਪਬਲਿਸ਼ਰ ਪਰੋਟੋਕਾਲ"
+
+#~ msgid ""
+#~ "The transport protocol to use when publishing playlists over the network."
+#~ msgstr "ਜਦੋਂ ਪਲੇਅਲਿਸਟ ਨੈੱਟਵਰਕ ਉੱਤੇ ਪਬਲਿਸ਼ ਕਰਨ ਕਰਨੀਆਂ ਹੋਣ ਤਾਂ ਵਰਤਣ ਵਾਸਤੇ ਟਰਾਂਸਪੋਰਟ ਪਰੋਟੋਕਾਲ।"
+
+#~ msgid "Format for network service name"
+#~ msgstr "ਨੈੱਟਵਰਕ ਸਰਵਿਸ ਨਾਂ ਲਈ ਫਾਰਮੈਟ"
+
+#~ msgid ""
+#~ "A format string used to build the network service name used when "
+#~ "publishing playlists over the network. The following format placeholders "
+#~ "can be used: • %a: the program name as returned by g_get_application_name"
+#~ "() • %h: the machine's host name in title case • %u: the user's login "
+#~ "name in title case • %U: the user's real name • %%: the percent sign"
+#~ msgstr ""
+#~ "ਫਾਰਮੈਟ ਲਾਈਨ ਨੂੰ ਨੈੱਟਵਰਕ ਸਰਵਿਸ ਬਣਾਉਣ ਲਈ ਵਰਤੀ ਜਾਂਦੀ ਹੈ, ਜਦੋਂ ਕਿ ਪਲੇਅਲਿਸਟ ਨੂੰ ਨੈੱਟਵਰਕ ਉੱਤੇ "
+#~ "ਪਬਲਿਸ਼ ਕੀਤਾ ਜਾਂਦਾ ਹੈ। ਅੱਗੇ ਦਿੱਤੇ ਪਲੇਸਹੋਲਡਰ ਵਰਤੇ ਜਾ ਸਕਦੇ ਹਨ: • %a: "
+#~ "g_get_application_name() ਵਲੋਂ ਪ੍ਰੋਗਰਾਮ ਨਾਂ ਦਿੱਤਾ ਜਾਂਦਾ ਹੈ • %h: ਟਾਈਟਲ ਕੇਸ ਵਿੱਚ ਮਸ਼ੀਨ "
+#~ "ਦਾ ਹੋਸਟ ਨਾਂ ਦਿੱਤਾ ਜਾਂਦਾ ਹੈ• %u: ਟਾਈਟਲ ਕੇਸ ਵਿੱਚ ਯੂਜ਼ਰ ਦਾ ਲਾਗਇਨ ਨਾਂ ਦਿੱਤਾ ਜਾਂਦਾ ਹੈ • %U: "
+#~ "ਯੂਜ਼ਰ ਦਾ ਅਸਲੀ ਨਾਂ • %%: ਫੀਸਦੀ ਨਿਸ਼ਾਨ"
+
+#~ msgid "Neighbors"
+#~ msgstr "ਗੁਆਂਢੀ"
+
+#~ msgid "Publish Playlist"
+#~ msgstr "ਪਲੇਅਲਿਸਟ ਪਰਕਾਸ਼ਿਤ ਕਰੋ"
+
+#~ msgid "Share the current playlist via HTTP"
+#~ msgstr "ਮੌਜੂਦਾ ਪਲੇਅ-ਲਿਸਟ HTTP ਰਾਹੀਂ ਸਾਂਝੀ ਕਰੋ"
+
+#~ msgid "Service _Name:"
+#~ msgstr "ਸਰਵਿਸ ਨਾਂ(_N):"
+
+#~ msgid ""
+#~ "The name used for announcing the playlist service on the network.\n"
+#~ "All occurrences of the string %u will be replaced by your name,\n"
+#~ "and %h will be replaced by your computer's host name."
+#~ msgstr ""
+#~ "ਨੈੱਟਵਰਕ ਉੱਤੇ ਪਲੇਅਲਿਸਟ ਸਰਵਿਸ ਦਾ ਐਲਾਨ ਕਰਨ ਲਈ ਨਾਂ ਹੈ।\n"
+#~ "ਲਾਇਨ %u ਦੀਆਂ ਸਭ ਮੌਜੂਦਗੀਆਂ ਨੂੰ ਤੁਹਾਡੇ ਨਾਲ ਨਾਂ ਬਦਲ ਦਿੱਤਾ ਜਾਵੇਗਾ ਅਤੇ\n"
+#~ "%h ਨੂੰ ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ ਦੇ ਹੋਸਟ ਨਾਂ ਨਾਲ ਬਦਲਿਆ ਜਾਵੇਗਾ।"
+
+#~ msgid "Use _encrypted transport protocol (HTTPS)"
+#~ msgstr "ਇੰਕ੍ਰਿਪਟਡ ਟਰਾਂਸਪੋਰਟ ਪਰੋਟੋਕਾਲ ਵਰਤੋਂ (_e)(HTTPS)"
 
 #~ msgid "Bemused"
 #~ msgstr "ਬੀਮੂਜਡ"
@@ -2738,9 +2768,6 @@
 #~ msgid "Search Results"
 #~ msgstr "ਖੋਜ ਨਤੀਜੇ"
 
-#~ msgid "Videos"
-#~ msgstr "ਵਿਡੀਓ"
-
 #~ msgid "_Open in Web Browser"
 #~ msgstr "ਵੈੱਬ ਬਰਾਊਜ਼ਰ ਖੋਲ੍ਹੋ(_O)"
 
@@ -3046,17 +3073,17 @@
 #~ "Approximate network connection speed, used to select quality on media "
 #~ "over the network: \"0\" for 14.4 Kbps Modem, \"1\" for 19.2 Kbps Modem, "
 #~ "\"2\" for 28.8 Kbps Modem, \"3\" for 33.6 Kbps Modem, \"4\" for 34.4 Kbps "
-#~ "Modem, \"5\" for 56 Kbps Modem/ISDN, \"6\" for 112 Kbps Dual ISDN/DSL, \"7"
-#~ "\" for 256 Kbps DSL/Cable, \"8\" for 384 Kbps DSL/Cable, \"9\" for 512 "
+#~ "Modem, \"5\" for 56 Kbps Modem/ISDN, \"6\" for 112 Kbps Dual ISDN/DSL, "
+#~ "\"7\" for 256 Kbps DSL/Cable, \"8\" for 384 Kbps DSL/Cable, \"9\" for 512 "
 #~ "Kbps DSL/Cable, \"10\" for 1.5 Mbps T1/Intranet/LAN, \"11\" for Intranet/"
 #~ "LAN."
 #~ msgstr ""
 #~ "ਅੰਦਾਜਨ ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ ਗਤੀ, ਨੈੱਟਵਰਕ ਉੱਤੇ ਮੀਡਿਆ ਦੀ ਕੁਆਲਟੀ ਚੁਣਨ ਲਈ ਵਰਤੀ ਜਾਂਦੀ ਹੈ: ੧੪.੪ "
 #~ "Kbps ਮਾਡਮ ਲਈ \"0\" , ੧੯.੨ Kbps ਮਾਡਮ ਲਈ \"1\", ੨੮.੮ Kbps ਮਾਡਲ ਲਈ \"2\", "
-#~ "੩੩.੬ Kbps ਮਾਡਮ ਲਈ \"3\", ੩੪.੪ Kbps ਮਾਡਲ ਲਈ \"4\", ੫੬ Kbps ਮਾਡਮ/ISDN ਲਈ \"5"
-#~ "\", ੧੧੨ Kbps ਦੋਹਰਾ ISDN/DSL ਲਈ \"6\", ੨੫੬ Kbps DSL/ਕੇਬਲ ਲਈ \"7\", ੨੭੪ DSL/"
-#~ "ਕੇਬਲ ਲਈ \"8\", ੪੧੨ Kbps DSL/ਕੇਬਲ ਲਈ \"9\", ੧.੫ Mbps T1/ਇੰਟਰਾਨੈੱਟ/ਲਾਨ ਲਈ \"10\","
-#~ "ਇੰਟਰਨੈੱਟ/ਲਾਨ ਲਈ \"11\"।"
+#~ "੩੩.੬ Kbps ਮਾਡਮ ਲਈ \"3\", ੩੪.੪ Kbps ਮਾਡਲ ਲਈ \"4\", ੫੬ Kbps ਮਾਡਮ/ISDN ਲਈ "
+#~ "\"5\", ੧੧੨ Kbps ਦੋਹਰਾ ISDN/DSL ਲਈ \"6\", ੨੫੬ Kbps DSL/ਕੇਬਲ ਲਈ \"7\", ੨੭੪ "
+#~ "DSL/ਕੇਬਲ ਲਈ \"8\", ੪੧੨ Kbps DSL/ਕੇਬਲ ਲਈ \"9\", ੧.੫ Mbps T1/ਇੰਟਰਾਨੈੱਟ/ਲਾਨ ਲਈ "
+#~ "\"10\",ਇੰਟਰਨੈੱਟ/ਲਾਨ ਲਈ \"11\"।"
 
 #~ msgid ""
 #~ "Quality settings for the audio visualization: \"0\" for small, \"1\" for "
@@ -3154,9 +3181,6 @@
 #~ msgid "Jamendo Plugin Configuration"
 #~ msgstr "ਜਾਮੀਂਡੂ ਪਲੱਗਇਨ ਸੰਰਚਨਾ"
 
-#~ msgid "Could not load the \"Skip to\" dialog interface."
-#~ msgstr "\"ਛੱਡੋ\" ਡਾਈਲਾਗ ਇੰਟਰਫੇਸ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"
-
 #~ msgid "Sound volume"
 #~ msgstr "ਧੁਨੀ ਆਵਾਜ਼"
 
@@ -3235,27 +3259,12 @@
 #~ "'%s' ਆਡੀਓ ਡਰਾਇਵਰ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ\n"
 #~ "ਇਹ ਜਾਂਚ ਕਰੋ ਕਿ ਕੀ ਜੰਤਰ ਰੁੱਝਿਆ ਤਾਂ ਨਹੀਂ ਹੈ।"
 
-#~ msgid ""
-#~ "No video output is available. Make sure that the program is correctly "
-#~ "installed."
-#~ msgstr ""
-#~ "ਕੋਈ ਵੀਡਿਓ ਆਉਟਪੁੱਟ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ। ਇਹ ਯਕੀਨੀ ਬਣਾਉ ਕਿ ਕਾਰਜ ਠੀਕ ਤਰਾਂ ਇੰਸਟਾਲ ਨਹੀਂ ਹੈ।"
-
-#~ msgid "The server you are trying to connect to is not known."
-#~ msgstr "ਸਰਵਰ, ਜਿਸ ਨਾਲ ਤੁਸੀਂ ਜੁੜਨ ਦੀ ਕੋਸ਼ਿਸ ਕਰ ਰਹੇ ਹੋ, ਪਛਾਣਿਆ ਨਹੀਂ ਗਿਆ ਹੈ।"
-
 #~ msgid "The device name you specified (%s) seems to be invalid."
 #~ msgstr "ਜੰਤਰ ਨਾਂ, ਜੋ ਕਿ ਤੁਸੀਂ ਦਿੱਤਾ ਹੈ (%s), ਠੀਕ ਨਹੀਂ ਜਾਪਦਾ ਹੈ।"
 
 #~ msgid "The server you are trying to connect to (%s) is unreachable."
 #~ msgstr "ਸਰਵਰ, ਜਿਸ ਨਾਲ ਤੁਸੀਂ ਜੁੜਨ ਦੀ ਕੋਸ਼ਿਸ ਕਰ ਰਹੇ ਹੋ (%s), ਪਹੁੰਚਯੋਗ ਨਹੀਂ ਹੈ।"
 
-#~ msgid "The connection to this server was refused."
-#~ msgstr "ਇਸ ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਤੋਂ ਇਨਕਾਰ ਕਰ ਦਿੱਤਾ ਗਿਆ ਹੈ।"
-
-#~ msgid "The specified movie could not be found."
-#~ msgstr "ਖਾਸ ਫਿਲਮ ਨਹੀਂ ਲੱਭੀ ਹੈ"
-
 #~ msgid ""
 #~ "The source seems encrypted and can't be read. Are you trying to play an "
 #~ "encrypted DVD without libdvdcss?"
@@ -3263,9 +3272,6 @@
 #~ "ਸਰੋਤ ਇਕ੍ਰਿਪਟਡ ਜਾਪਦਾ ਹੈ ਅਤੇ ਪੜ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ। ਕੀ ਤੁਸੀਂ ਇੱਕ ਇਕ੍ਰਿਪਟਡ DVD ਬਿਨਾਂ "
 #~ "libdvdcss ਤੇ ਚਲਾਉਣ ਦੀ ਕੋਸ਼ਿਸ ਕਰਨੀ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#~ msgid "The movie could not be read."
-#~ msgstr "ਮੂਵੀ ਪੜ੍ਹੀ ਨਹੀਂ ਜਾ ਸਕਦੀ ਹੈ।"
-
 #~ msgid "A problem occurred while loading a library or a decoder (%s)."
 #~ msgstr "ਲਾਇਬਰੇਰੀ ਜਾਂ ਡੀਕੋਡਰ (%s) ਨੂੰ ਲੋਡ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ ਆਈ ਹੈ।"
 
@@ -3281,15 +3287,6 @@
 #~ msgid "Authentication is required to access this file."
 #~ msgstr "ਇਹ ਫਾਇਲ ਵਰਤਣ ਵਾਸਤੇ ਪਰਮਾਣਕਿਤਾ ਦੀ ਲੋੜ ਹੈ।"
 
-#~ msgid "Authentication is required to access this file or stream."
-#~ msgstr "ਇਹ ਫਾਇਲ ਜਾਂ ਸਟਰੀਮ ਲਈ ਪਹੁੰਚ ਵਾਸਤੇ ਪਰਮਾਣਕਿਤਾ ਦੀ ਲੋੜ ਹੈ।"
-
-#~ msgid "You are not allowed to open this file."
-#~ msgstr "ਤੁਹਾਨੂੰ ਇਹ ਫਾਇਲ ਖੋਲ੍ਹਣ ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ ਹੈ।"
-
-#~ msgid "The server refused access to this file or stream."
-#~ msgstr "ਸਰਵਰ ਨੇ ਇਹ ਫਾਇਲ ਜਾਂ ਸਟਰੀਮ ਲਈ ਪਹੁੰਚ ਤੋਂ ਇਨਕਾਰ ਕਰ ਦਿੱਤਾ ਹੈ।"
-
 #~ msgid "The file you tried to play is an empty file."
 #~ msgstr "ਫਾਇਲ, ਜੋ ਤੁਸੀਂ ਚਲਾਉਣ ਦੀ ਕੋਸ਼ਿਸ ਕਰ ਰਹੇ ਹੋ, ਖਾਲੀ ਫਾਇਲ ਹੈ।"
 
@@ -3302,9 +3299,6 @@
 #~ msgid "This movie is broken and can not be played further."
 #~ msgstr "ਇਹ ਫਿਲਮ ਟੁੱਟ ਗਈ ਹੈ ਅਤੇ ਹੋਰ ਨਹੀਂ ਚਲਾਈ ਜਾ ਸਕਦੀ ਹੈ।"
 
-#~ msgid "This location is not a valid one."
-#~ msgstr "ਇਸ ਟਿਕਾਣਾ ਠੀਕ ਨਹੀਂ ਹੈ।"
-
 #~ msgid "This movie could not be opened."
 #~ msgstr "ਇਹ ਮੂਵੀ ਖੋਲ੍ਹੀ ਨਹੀਂ ਜਾ ਸਕਦੀ ਹੈ।"
 
@@ -3315,13 +3309,6 @@
 #~ "ਵੀਡਿਓ ਕੋਡ '%s' ਕੰਟਰੋਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ। ਤੁਹਾਨੂੰ ਇਸ ਕਿਸਮ ਦੀਆਂ ਵਾਧੂ ਪਲੱਗਇਨਾਂ ਇਸ "
 #~ "ਫਿਲਮ ਕਿਸਮ ਚਲਾਉਣ ਲਈ ਇੰਸਟਾਲ ਕਰਨੀਆਂ ਚਾਹੀਦੀਆਂ ਹਨ।"
 
-#~ msgid ""
-#~ "Audio codec '%s' is not handled. You might need to install additional "
-#~ "plugins to be able to play some types of movies"
-#~ msgstr ""
-#~ "ਆਡੀਓ ਕੋਡ '%s' ਕੰਟਰੋਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ। ਤੁਹਾਨੂੰ ਇਸ ਕਿਸਮ ਦੀਆਂ ਵਾਧੂ ਪਲੱਗਇਨਾਂ ਇਸ ਫਿਲਮ "
-#~ "ਕਿਸਮ ਚਲਾਉਣ ਲਈ ਇੰਸਟਾਲ ਕਰਨੀਆਂ ਚਾਹੀਦੀਆਂ ਹਨ।"
-
 #~ msgid "This is an audio-only file and there is no audio output available."
 #~ msgstr "ਇਹ ਫਾਇਲ ਸਿਰਫ ਆਡੀਓ ਹੀ ਹੈ ਅਤੇ ਕੋਈ ਆਡੀਓ ਆਉਟਪੁੱਟ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ।"
 
diff -Nru totem-3.4.3/po/pl.po totem-3.6.2/po/pl.po
--- totem-3.4.3/po/pl.po	2012-05-15 13:36:27.000000000 +0000
+++ totem-3.6.2/po/pl.po	2012-10-25 13:15:32.000000000 +0000
@@ -4,12 +4,21 @@
 # pomóc w jego rozwijaniu i pielęgnowaniu, napisz do nas:
 # gnomepl@aviary.pl
 # -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+# Zbigniew Chyla , 2003.
+# Artur Flinta , 2003-2004.
+# Bartosz Kosiorek , 2005.
+# Artur Flinta , 2006.
+# Stanisław Małolepszy , 2007.
+# Tomasz Dominikowski , 2007-2009.
+# Piotr Drąg , 2010-2012.
+# Asia Słowik , 2011.
+# Aviary.pl , 2007-2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: totem\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-16 21:31+0200\n"
-"PO-Revision-Date: 2012-04-29 22:59+0200\n"
+"POT-Creation-Date: 2012-09-10 19:45+0200\n"
+"PO-Revision-Date: 2012-09-10 19:48+0200\n"
 "Last-Translator: Piotr Drąg \n"
 "Language-Team: Polish \n"
 "Language: pl\n"
@@ -21,14 +30,235 @@
 "X-Poedit-Language: Polish\n"
 "X-Poedit-Country: Poland\n"
 
+#: ../browser-plugin/totem-plugin-viewer.c:352 ../src/totem-object.c:1180
+#: ../src/totem-object.c:1650 ../src/totem-statusbar.c:115
+msgid "Stopped"
+msgstr "Zatrzymano"
+
+#: ../browser-plugin/totem-plugin-viewer.c:364 ../src/totem-object.c:1173
+msgid "Paused"
+msgstr "Wstrzymano"
+
+#: ../browser-plugin/totem-plugin-viewer.c:368 ../src/totem-object.c:1166
+msgid "Playing"
+msgstr "Odtwarzanie"
+
+#: ../browser-plugin/totem-plugin-viewer.c:386
+#: ../src/plugins/screensaver/totem-screensaver.c:97
+msgid "Playing a movie"
+msgstr "Odtwarzanie filmu"
+
+#: ../browser-plugin/totem-plugin-viewer.c:443
+msgid "No URI to play"
+msgstr "Brak adresu URI do odtworzenia"
+
+#: ../browser-plugin/totem-plugin-viewer.c:676
+#: ../browser-plugin/totem-plugin-viewer.c:1700
+msgid "Totem Movie Player"
+msgstr "Odtwarzacz filmów Totem"
+
+#. translators: this is:
+#. * Open With ApplicationName
+#. * as in nautilus' right-click menu
+#: ../browser-plugin/totem-plugin-viewer.c:1120
+#, c-format
+msgid "_Open with \"%s\""
+msgstr "_Otwórz za pomocą \"%s\""
+
+#: ../browser-plugin/totem-plugin-viewer.c:1341 ../src/totem-object.c:2475
+msgid "An error occurred"
+msgstr "Wystąpił błąd"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2033
+msgid "No playlist or playlist empty"
+msgstr "Brak listy odtwarzania lub lista jest pusta"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2128
+msgid "Movie browser plugin"
+msgstr "Wtyczka przeglądarki filmów"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144 ../src/totem.c:240
+msgid "Could not initialize the thread-safe libraries."
+msgstr "Nie można zainicjować bibliotek bezpiecznych dla wątków."
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144
+msgid "Verify your system installation. The Totem plugin will now exit."
+msgstr ""
+"Proszę sprawdzić poprawność instalacji systemu. Działanie wtyczki programu "
+"Totem zostanie teraz zakończone."
+
 #: ../data/fullscreen.ui.h:1
 msgid "Leave Fullscreen"
 msgstr "Opuść pełny ekran"
 
-#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:144
+#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:81
 msgid "Time:"
 msgstr "Czas:"
 
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
+msgid "Allow the screensaver to activate when playing audio"
+msgstr "Umożliwia wygaszanie ekranu podczas odtwarzania dźwięku"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
+msgid ""
+"Allow the screensaver to activate when playing audio. Disable if you have "
+"monitor-powered speakers."
+msgstr ""
+"Zezwolenie na włączenie wygaszacza ekranu podczas odtwarzania dźwięku. "
+"Przydatne w przypadku głośników wbudowanych w monitor."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
+msgid "Show visual effects when no video is displayed"
+msgstr "Efekty wizualne przy braku obrazu"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
+msgid "Show visual effects when playing an audio only file."
+msgstr ""
+"Wyświetlanie efektów wizualnych podczas odtwarzania plików dźwiękowych."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
+msgid "Name of the visual effects plugin"
+msgstr "Nazwa wtyczki wizualizacji"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
+msgid "The brightness of the video"
+msgstr "Jasność obrazu wideo"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
+msgid "The contrast of the video"
+msgstr "Kontrast obrazu wideo"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
+msgid "The hue of the video"
+msgstr "Odcień obrazu wideo"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
+msgid "The saturation of the video"
+msgstr "Nasycenie obrazu wideo"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
+msgid "Resize the canvas automatically on file load"
+msgstr "Automatyczne dopasowanie rozmiaru okna programu po wczytaniu pliku"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
+msgid "Repeat mode"
+msgstr "Tryb powtarzania"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
+msgid "Shuffle mode"
+msgstr "Tryb losowy"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
+msgid "Whether to disable deinterlacing for interlaced movies"
+msgstr "Określa, czy wyłączyć usuwanie przeplotu dla nagrań wideo z przeplotem"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
+msgid "Whether to enable debug for the playback engine"
+msgstr "Określa, czy włączyć dodatkowe informacje dla mechanizmu odtwarzania"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
+msgid "Type of audio output to use"
+msgstr "Typ użytego wyjścia dźwięku"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
+msgid "Visualization quality setting"
+msgstr "Ustawienia jakości wizualizacji"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
+msgid "Quality setting for the audio visualization."
+msgstr "Ustawienia jakości wizualizacji dźwięku."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
+msgid "Network buffering threshold"
+msgstr "Próg buforowania sieciowego"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
+msgid ""
+"Amount of data to buffer for network streams before starting to display the "
+"stream (in seconds)."
+msgstr ""
+"Ilość buforowanych danych dla strumieni sieciowych przed rozpoczęciem "
+"wyświetlania strumienia (w sekundach)."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
+msgid "Subtitle font"
+msgstr "Czcionka napisów"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
+msgid "Pango font description for subtitle rendering."
+msgstr "Opis czcionki do wyświetlania napisów biblioteki Pango."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
+msgid "Subtitle encoding"
+msgstr "Kodowanie napisów"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
+msgid "Encoding character set for subtitle."
+msgstr "Strona kodowa napisów."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
+msgid "Default location for the \"Open...\" dialogs"
+msgstr "Domyślne położenie dla okien dialogowych \"Otwórz...\""
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
+msgid ""
+"Default location for the \"Open...\" dialogs. Default is the current "
+"directory."
+msgstr ""
+"Domyślne położenie dla okien dialogowych \"Otwórz...\". Domyślnie jest to "
+"bieżący katalog."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
+msgid "Default location for the \"Take Screenshot\" dialogs"
+msgstr "Domyślne położenie dla okien dialogowych \"Pobierz zrzut ekranu\""
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
+msgid ""
+"Default location for the \"Take Screenshot\" dialogs. Default is the "
+"Pictures directory."
+msgstr ""
+"Domyślne położenie dla okien dialogowych \"Pobierz zrzut ekranu\". Domyślnie "
+"jest to katalog Obrazy."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
+msgid "Whether to disable the plugins in the user's home directory"
+msgstr ""
+"Określa, czy wyłączyć wtyczki znajdujące się w katalogu domowym użytkownika"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
+msgid "Whether to disable the keyboard shortcuts"
+msgstr "Określa, czy wyłączyć skróty klawiszowe"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
+msgid "Whether to autoload text subtitle files when a movie is loaded"
+msgstr ""
+"Określa, czy automatycznie wczytywać plik z napisami podczas wczytywania "
+"filmu"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
+msgid "Whether to autoload external chapter files when a movie is loaded"
+msgstr ""
+"Określa, czy automatycznie wczytywać zewnętrzne pliki rozdziałów podczas "
+"wczytywania filmu"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
+msgid ""
+"Whether to remember the position of played audio/video files when pausing or "
+"closing them"
+msgstr ""
+"Określa, czy zapamiętywać położenie plików dźwiękowych i nagrań wideo przy "
+"wstrzymaniu odtwarzania lub ich zamknięciu"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
+msgid "Active plugins list"
+msgstr "Lista aktywnych wtyczek"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+msgid ""
+"A list of the names of the plugins which are currently active (loaded and "
+"running)."
+msgstr "Lista aktywnych wtyczek (wczytanych i uruchomionych)."
+
 #: ../data/playlist.ui.h:1
 msgid "_Remove"
 msgstr "_Usuń"
@@ -45,11 +275,11 @@
 msgid "Copy the location to the clipboard"
 msgstr "Kopiuje położenie do schowka"
 
-#: ../data/playlist.ui.h:5 ../data/totem.ui.h:78
+#: ../data/playlist.ui.h:5 ../data/totem.ui.h:71
 msgid "_Select Text Subtitles..."
 msgstr "_Wybierz plik napisów..."
 
-#: ../data/playlist.ui.h:6 ../data/totem.ui.h:79
+#: ../data/playlist.ui.h:6 ../data/totem.ui.h:72
 msgid "Select a file to use for text subtitles"
 msgstr "Wybór pliku napisów"
 
@@ -73,10 +303,165 @@
 msgid "Move Down"
 msgstr "Przesuwa w dół na liście odtwarzania"
 
-#: ../data/properties.ui.h:1 ../data/totem.ui.h:122
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:2
+msgid "Normal"
+msgstr "Normalny"
+
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:4
+msgid "Large"
+msgstr "Duży"
+
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:6
+msgid "Extra Large"
+msgstr "Bardzo duży"
+
+#: ../data/preferences.ui.h:7 ../src/backend/bacon-video-widget.c:5498
+#: ../src/totem-properties-view.c:231
+msgid "Stereo"
+msgstr "Stereo"
+
+#: ../data/preferences.ui.h:8
+msgid "4-channel"
+msgstr "4-kanałowy"
+
+#: ../data/preferences.ui.h:9
+msgid "4.1-channel"
+msgstr "4.1-kanałowy"
+
+#: ../data/preferences.ui.h:10
+msgid "5.0-channel"
+msgstr "5.0-kanałowy"
+
+#: ../data/preferences.ui.h:11
+msgid "5.1-channel"
+msgstr "5.1-kanałowy"
+
+#: ../data/preferences.ui.h:12
+msgid "AC3 Passthrough"
+msgstr "Przekazywanie AC3"
+
+#: ../data/preferences.ui.h:13
+msgid "Totem Preferences"
+msgstr "Preferencje programu Totem"
+
+#: ../data/preferences.ui.h:14
+msgid "Playback"
+msgstr "Odtwarzanie"
+
+#: ../data/preferences.ui.h:15
+msgid "Start playing files from last position"
+msgstr "Rozpoczęcie odtwarzania plików od ostatniej pozycji"
+
+#: ../data/preferences.ui.h:16
+msgid "Text Subtitles"
+msgstr "Napisy"
+
+#: ../data/preferences.ui.h:17
+msgid "_Load subtitle files when movie is loaded"
+msgstr "Wczytywanie pliku _napisów po wczytaniu filmu"
+
+#: ../data/preferences.ui.h:18
+msgid "_Font:"
+msgstr "Czcion_ka:"
+
+#: ../data/preferences.ui.h:19
+msgid "_Encoding:"
+msgstr "_Kodowanie:"
+
+#: ../data/preferences.ui.h:20
+msgid "External Chapters"
+msgstr "Zewnętrzne rozdziały"
+
+#: ../data/preferences.ui.h:21
+msgid "Load _chapter files when movie is loaded"
+msgstr "W_czytywanie plików rozdziałów po wczytaniu filmu"
+
+#: ../data/preferences.ui.h:22 ../data/properties.ui.h:1
 msgid "General"
 msgstr "Ogólne"
 
+#. Tab label in the Preferences dialogue
+#: ../data/preferences.ui.h:24
+msgid "Display"
+msgstr "Wyświetlanie"
+
+#: ../data/preferences.ui.h:25
+msgid "_Resize the window when a new video is loaded"
+msgstr "_Skalowanie okna po wczytaniu nowego nagrania wideo"
+
+#: ../data/preferences.ui.h:26
+msgid "Disable _deinterlacing of interlaced videos"
+msgstr "Wyłączenie _usuwania przeplotu z nagrań wideo z przeplotem"
+
+#: ../data/preferences.ui.h:27
+msgid "Disable screensaver when playing "
+msgstr "Wyłączanie wygaszania ekranu podczas odtwarzania "
+
+#: ../data/preferences.ui.h:28 ../data/properties.ui.h:9
+#: ../src/totem-properties-view.c:273
+msgid "Video"
+msgstr "Wideo"
+
+#: ../data/preferences.ui.h:29
+msgid "Video or Audio"
+msgstr "Wideo lub dźwięk"
+
+#: ../data/preferences.ui.h:30
+msgid "Visual Effects"
+msgstr "Efekty wizualne"
+
+#: ../data/preferences.ui.h:31
+msgid "Show _visual effects when an audio file is played"
+msgstr "_Wyświetlanie podczas odtwarzania plików dźwiękowych"
+
+#: ../data/preferences.ui.h:32
+msgid "_Type of visualization:"
+msgstr "_Typ efektu:"
+
+#: ../data/preferences.ui.h:33
+msgid "Visualization _size:"
+msgstr "R_ozmiar wizualizacji:"
+
+#: ../data/preferences.ui.h:34
+msgid "Color Balance"
+msgstr "Korekcja koloru"
+
+#: ../data/preferences.ui.h:35
+msgid "_Brightness:"
+msgstr "Jas_ność:"
+
+#: ../data/preferences.ui.h:36
+msgid "Co_ntrast:"
+msgstr "Ko_ntrast:"
+
+#: ../data/preferences.ui.h:37
+msgid "Sat_uration:"
+msgstr "Nasy_cenie:"
+
+#: ../data/preferences.ui.h:38
+msgid "_Hue:"
+msgstr "_Odcień:"
+
+#: ../data/preferences.ui.h:39
+msgid "Reset to _Defaults"
+msgstr "P_rzywróć domyślne"
+
+#: ../data/preferences.ui.h:40
+msgid "Audio Output"
+msgstr "Wyjście dźwięku"
+
+#: ../data/preferences.ui.h:41
+msgid "_Audio output type:"
+msgstr "_Typ wyjścia dźwięku:"
+
+#: ../data/preferences.ui.h:42 ../data/properties.ui.h:14
+#: ../src/totem-properties-view.c:271
+msgid "Audio"
+msgstr "Dźwięk"
+
 #: ../data/properties.ui.h:2
 msgid "Title:"
 msgstr "Tytuł:"
@@ -105,11 +490,6 @@
 msgid "Container:"
 msgstr "Kontener:"
 
-#: ../data/properties.ui.h:9 ../data/totem.ui.h:128
-#: ../src/totem-properties-view.c:270
-msgid "Video"
-msgstr "Wideo"
-
 #: ../data/properties.ui.h:10
 msgid "Dimensions:"
 msgstr "Wymiary:"
@@ -126,11 +506,6 @@
 msgid "Bitrate:"
 msgstr "Gęstość bitowa:"
 
-#: ../data/properties.ui.h:14 ../data/totem.ui.h:142
-#: ../src/totem-properties-view.c:268
-msgid "Audio"
-msgstr "Dźwięk"
-
 #: ../data/properties.ui.h:15
 msgid "Sample rate:"
 msgstr "Częstotliwość próbkowania:"
@@ -139,745 +514,453 @@
 msgid "Channels:"
 msgstr "Kanały:"
 
-#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
-msgid "_Add to Playlist"
-msgstr "Dod_aj do listy odtwarzania"
-
-#: ../data/video-list.ui.h:2
-msgid "Add the video to the playlist"
-msgstr "Dodanie nagrania wideo do listy odtwarzania"
-
 #. Title
-#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:143
-#: ../src/totem-object.c:1667
-msgid "Movie Player"
-msgstr "Odtwarzacz filmów Totem"
+#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:80 ../src/totem.c:239
+#: ../src/totem.c:248 ../src/totem-menu.c:790 ../src/totem-object.c:1658
+msgid "Videos"
+msgstr "Filmy"
 
 #: ../data/totem.desktop.in.in.in.h:2
-msgid "Play movies and songs"
-msgstr "Odtwarzanie filmów i muzyki"
+msgid "Play movies"
+msgstr "Odtwarzanie filmów"
+
+#: ../data/totem.desktop.in.in.in.h:3
+msgid "Video;Movie;Film;Clip;Series;Player;DVD;TV;Disc;"
+msgstr "Wideo;Video;Film;Klip;Serial;Odtwarzacz;DVD;TV;Telewizja;Płyta;"
 
 #: ../data/totem.ui.h:1
-msgid "_Movie"
-msgstr "_Film"
+msgid "_Open"
+msgstr "_Otwórz"
 
 #: ../data/totem.ui.h:2
-msgid "_Open..."
-msgstr "_Otwórz..."
+msgid "Open _Location"
+msgstr "Otwórz z położe_nia"
 
 #: ../data/totem.ui.h:3
-msgid "Open a file"
-msgstr "Otwiera plik"
+msgid "_Fullscreen"
+msgstr "_Pełny ekran"
 
 #: ../data/totem.ui.h:4
-msgid "Open _Location..."
-msgstr "Otwórz z położe_nia..."
+msgid "Prefere_nces"
+msgstr "P_referencje"
 
 #: ../data/totem.ui.h:5
-msgid "Open a non-local file"
-msgstr "Otwiera plik zdalny"
+msgid "Shuff_le"
+msgstr "_Losowanie"
 
 #: ../data/totem.ui.h:6
+msgid "_Repeat"
+msgstr "_Powtarzanie"
+
+#: ../data/totem.ui.h:7
+msgid "_Quit"
+msgstr "Za_kończ"
+
+#: ../data/totem.ui.h:8
+msgid "_Movie"
+msgstr "_Film"
+
+#: ../data/totem.ui.h:9
 msgid "_Eject"
 msgstr "Wy_suń płytę"
 
-#: ../data/totem.ui.h:7
+#: ../data/totem.ui.h:10
 msgid "Eject the current disc"
 msgstr "Wysuwa bieżącą płytę"
 
-#: ../data/totem.ui.h:8
+#: ../data/totem.ui.h:11
 msgid "_Properties"
 msgstr "_Właściwości"
 
-#: ../data/totem.ui.h:9
+#: ../data/totem.ui.h:12
 msgid "View the properties of the current stream"
 msgstr "Wyświetla właściwości bieżącego strumienia"
 
-#: ../data/totem.ui.h:10
+#: ../data/totem.ui.h:13
 msgid "Play / P_ause"
 msgstr "O_dtwarzaj/wstrzymaj"
 
-#: ../data/totem.ui.h:11
+#: ../data/totem.ui.h:14
 msgid "Play or pause the movie"
 msgstr "Odtwarza lub wstrzymuje film"
 
-#: ../data/totem.ui.h:12
-msgid "_Quit"
-msgstr "Za_kończ"
-
-#: ../data/totem.ui.h:13
-msgid "Quit the program"
-msgstr "Kończy działanie programu"
-
-#: ../data/totem.ui.h:14
+#: ../data/totem.ui.h:15
 msgid "_Edit"
 msgstr "_Edycja"
 
-#: ../data/totem.ui.h:15
+#: ../data/totem.ui.h:16
 msgid "_Clear Playlist"
 msgstr "_Wyczyść listę odtwarzania"
 
-#: ../data/totem.ui.h:16
+#: ../data/totem.ui.h:17
 msgid "Clear the playlist"
 msgstr "Czyści listę odtwarzania"
 
-#: ../data/totem.ui.h:17
-msgid "Prefere_nces"
-msgstr "P_referencje"
-
 #: ../data/totem.ui.h:18
-msgid "Configure the application"
-msgstr "Konfiguruje program"
-
-#: ../data/totem.ui.h:19
 msgid "Plugins..."
 msgstr "Wtyczki..."
 
-#: ../data/totem.ui.h:20
+#: ../data/totem.ui.h:19
 msgid "Configure plugins to extend the application"
 msgstr "Konfiguruje wtyczki rozszerzające możliwości programu"
 
-#: ../data/totem.ui.h:21
+#: ../data/totem.ui.h:20
 msgid "_View"
 msgstr "_Widok"
 
-#: ../data/totem.ui.h:22
-msgid "_Fullscreen"
-msgstr "_Pełny ekran"
-
-#: ../data/totem.ui.h:23
-msgid "Switch to fullscreen"
-msgstr "Tryb pełnego ekranu"
-
-#: ../data/totem.ui.h:24
+#: ../data/totem.ui.h:21
 msgid "Fit Window to Movie"
 msgstr "Dopasowanie okna do obrazu"
 
-#: ../data/totem.ui.h:25
+#: ../data/totem.ui.h:22
 msgid "_Resize 1:2"
 msgstr "_Rozmiar 1:2"
 
-#: ../data/totem.ui.h:26
+#: ../data/totem.ui.h:23
 msgid "Resize to half the original video size"
 msgstr "Zmniejsza o połowę pierwotny rozmiar obrazu"
 
-#: ../data/totem.ui.h:27
+#: ../data/totem.ui.h:24
 msgid "Resize _1:1"
 msgstr "Rozmiar _1:1"
 
-#: ../data/totem.ui.h:28
+#: ../data/totem.ui.h:25
 msgid "Resize to the original video size"
 msgstr "Przywraca pierwotny rozmiar obrazu"
 
-#: ../data/totem.ui.h:29
+#: ../data/totem.ui.h:26
 msgid "Resize _2:1"
 msgstr "Rozmiar _2:1"
 
-#: ../data/totem.ui.h:30
+#: ../data/totem.ui.h:27
 msgid "Resize to double the original video size"
 msgstr "Zwiększa dwukrotnie pierwotny rozmiar obrazu"
 
-#: ../data/totem.ui.h:31
+#: ../data/totem.ui.h:28
 msgid "_Aspect Ratio"
 msgstr "P_roporcje obrazu"
 
-#: ../data/totem.ui.h:32
+#: ../data/totem.ui.h:29
 msgid "Switch An_gles"
 msgstr "Przełącz _kamerę"
 
-#: ../data/totem.ui.h:33
+#: ../data/totem.ui.h:30
 msgid "Switch camera angles"
 msgstr "Przełącza kamerę"
 
-#: ../data/totem.ui.h:34
+#: ../data/totem.ui.h:31
 msgid "_Go"
 msgstr "_Przejdź"
 
-#: ../data/totem.ui.h:35
+#: ../data/totem.ui.h:32
 msgid "_DVD Menu"
 msgstr "Menu D_VD"
 
-#: ../data/totem.ui.h:36
+#: ../data/totem.ui.h:33
 msgid "Go to the DVD menu"
 msgstr "Przechodzi do menu DVD"
 
-#: ../data/totem.ui.h:37
+#: ../data/totem.ui.h:34
 msgid "_Title Menu"
 msgstr "Menu _tytułów"
 
-#: ../data/totem.ui.h:38
+#: ../data/totem.ui.h:35
 msgid "Go to the title menu"
 msgstr "Przechodzi do menu tytułów"
 
-#: ../data/totem.ui.h:39
+#: ../data/totem.ui.h:36
 msgid "A_udio Menu"
 msgstr "Menu _dźwięku"
 
-#: ../data/totem.ui.h:40
+#: ../data/totem.ui.h:37
 msgid "Go to the audio menu"
 msgstr "Przechodzi do menu dźwięku"
 
-#: ../data/totem.ui.h:41
+#: ../data/totem.ui.h:38
 msgid "_Angle Menu"
 msgstr "Menu _kamer"
 
-#: ../data/totem.ui.h:42
+#: ../data/totem.ui.h:39
 msgid "Go to the angle menu"
 msgstr "Przechodzi do menu kamer"
 
-#: ../data/totem.ui.h:43
+#: ../data/totem.ui.h:40
 msgid "_Chapter Menu"
 msgstr "Menu _rozdziałów"
 
-#: ../data/totem.ui.h:44
+#: ../data/totem.ui.h:41
 msgid "Go to the chapter menu"
 msgstr "Przechodzi do menu rozdziałów"
 
-#: ../data/totem.ui.h:45
+#: ../data/totem.ui.h:42
 msgid "_Next Chapter/Movie"
 msgstr "N_astępny rozdział/film"
 
-#: ../data/totem.ui.h:46
+#: ../data/totem.ui.h:43
 msgid "Next chapter or movie"
 msgstr "Następny rozdział lub film"
 
-#: ../data/totem.ui.h:47
+#: ../data/totem.ui.h:44
 msgid "_Previous Chapter/Movie"
 msgstr "_Poprzedni rozdział/film"
 
-#: ../data/totem.ui.h:48
+#: ../data/totem.ui.h:45
 msgid "Previous chapter or movie"
 msgstr "Poprzedni rozdział lub film"
 
-#: ../data/totem.ui.h:49
+#: ../data/totem.ui.h:46
 msgid "_Sound"
 msgstr "_Dźwięk"
 
-#: ../data/totem.ui.h:50
+#: ../data/totem.ui.h:47
 msgid "Volume _Up"
 msgstr "Z_większ głośność"
 
-#: ../data/totem.ui.h:51
+#: ../data/totem.ui.h:48
 msgid "Increase volume"
 msgstr "Zwiększa głośność"
 
-#: ../data/totem.ui.h:52
+#: ../data/totem.ui.h:49
 msgid "Volume _Down"
 msgstr "Z_mniejsz głośność"
 
-#: ../data/totem.ui.h:53
+#: ../data/totem.ui.h:50
 msgid "Decrease volume"
 msgstr "Zmniejsza głośność"
 
-#: ../data/totem.ui.h:54
+#: ../data/totem.ui.h:51
 msgid "_Help"
 msgstr "Pomo_c"
 
-#: ../data/totem.ui.h:55
+#: ../data/totem.ui.h:52
 msgid "_Contents"
 msgstr "_Spis treści"
 
-#: ../data/totem.ui.h:56
+#: ../data/totem.ui.h:53
 msgid "Help contents"
 msgstr "Spis treści pomocy"
 
-#: ../data/totem.ui.h:57
+#: ../data/totem.ui.h:54
 msgid "_About"
 msgstr "_O programie"
 
-#: ../data/totem.ui.h:58
+#: ../data/totem.ui.h:55
 msgid "About this application"
 msgstr "O tym programie"
 
-#: ../data/totem.ui.h:59
-msgid "_Repeat Mode"
-msgstr "_Powtarzanie"
-
-#: ../data/totem.ui.h:60
-msgid "Set the repeat mode"
-msgstr "Ustawia tryb powtarzania"
-
-#: ../data/totem.ui.h:61
-msgid "Shuff_le Mode"
-msgstr "_Tryb losowy"
-
-#: ../data/totem.ui.h:62
-msgid "Set the shuffle mode"
-msgstr "Ustawia tryb losowy"
-
-#: ../data/totem.ui.h:63
+#: ../data/totem.ui.h:56
 msgid "Show _Controls"
 msgstr "_Elementy sterujące"
 
-#: ../data/totem.ui.h:64
+#: ../data/totem.ui.h:57
 msgid "Show controls"
 msgstr "Wyświetla lub ukrywa elementy sterujące"
 
-#: ../data/totem.ui.h:65
-msgid "S_idebar"
-msgstr "P_anel"
-
-#: ../data/totem.ui.h:66
-msgid "Show or hide the sidebar"
-msgstr "Wyświetla lub ukrywa boczny panel"
-
-#: ../data/totem.ui.h:67
-msgctxt "Aspect ratio"
-msgid "Auto"
-msgstr "Automatycznie"
-
-#: ../data/totem.ui.h:68
-msgid "Sets automatic aspect ratio"
-msgstr "Ustawia automatyczny współczynnik proporcji obrazu"
-
-#: ../data/totem.ui.h:69
-msgid "Square"
-msgstr "Kwadratowy"
-
-#: ../data/totem.ui.h:70
-msgid "Sets square aspect ratio"
-msgstr "Ustawia kwadratowy współczynnik proporcji obrazu"
-
-#: ../data/totem.ui.h:71
-msgid "4:3 (TV)"
-msgstr "4:3 (TV)"
-
-#: ../data/totem.ui.h:72
-msgid "Sets 4:3 (TV) aspect ratio"
-msgstr "Ustawia współczynnik proporcji obrazu 4:3 (TV)"
-
-#: ../data/totem.ui.h:73
-msgid "16:9 (Widescreen)"
-msgstr "16:9 (szeroki ekran)"
-
-#: ../data/totem.ui.h:74
-msgid "Sets 16:9 (widescreen) aspect ratio"
-msgstr "Ustawia współczynnik proporcji obrazu 16:9 (szeroki ekran)"
-
-#: ../data/totem.ui.h:75
-msgid "2.11:1 (DVB)"
-msgstr "2,11:1 (DVB)"
-
-#: ../data/totem.ui.h:76
-msgid "Sets 2.11:1 (DVB) aspect ratio"
-msgstr "Ustawia współczynnik proporcji obrazu 2,11:1 (DVB)"
-
-#: ../data/totem.ui.h:77
-msgid "S_ubtitles"
-msgstr "_Napisy"
-
-#: ../data/totem.ui.h:80
-msgid "_Languages"
-msgstr "Języ_ki"
-
-#: ../data/totem.ui.h:81
-msgid "Zoom In"
-msgstr "Powiększenie"
-
-#: ../data/totem.ui.h:82
-msgid "Zoom in"
-msgstr "Powiększa obraz"
-
-#: ../data/totem.ui.h:83
-msgid "Skip _Forward"
-msgstr "Przejdź _naprzód"
-
-#: ../data/totem.ui.h:84
-msgid "Skip forward"
-msgstr "Przechodzi naprzód"
-
-#: ../data/totem.ui.h:85
-msgid "Skip _Backwards"
-msgstr "Przejdź _wstecz"
-
-#: ../data/totem.ui.h:86
-msgid "Skip backwards"
-msgstr "Przechodzi wstecz"
-
-#: ../data/totem.ui.h:87
-msgid "14.4 Kbps Modem"
-msgstr "Modem 14,4 Kb/s"
-
-#: ../data/totem.ui.h:88
-msgid "19.2 Kbps Modem"
-msgstr "Modem 19,2 Kb/s"
-
-#: ../data/totem.ui.h:89
-msgid "28.8 Kbps Modem"
-msgstr "Modem 28,8 Kb/s"
-
-#: ../data/totem.ui.h:90
-msgid "33.6 Kbps Modem"
-msgstr "Modem 33,6 Kb/s"
-
-#: ../data/totem.ui.h:91
-msgid "34.4 Kbps Modem"
-msgstr "Modem 34,4 Kb/s"
-
-#: ../data/totem.ui.h:92
-msgid "56 Kbps Modem/ISDN"
-msgstr "Modem/ISDN 56 Kb/s"
-
-#: ../data/totem.ui.h:93
-msgid "112 Kbps Dual ISDN/DSL"
-msgstr "Podwójny ISDN/DSL 112 Kb/s"
-
-#: ../data/totem.ui.h:94
-msgid "256 Kbps DSL/Cable"
-msgstr "DSL/Modem kablowy 256 Kb/s"
-
-#: ../data/totem.ui.h:95
-msgid "384 Kbps DSL/Cable"
-msgstr "DSL/Modem kablowy 384 Kb/s"
-
-#: ../data/totem.ui.h:96
-msgid "512 Kbps DSL/Cable"
-msgstr "DSL/Modem kablowy 512 Kb/s"
-
-#: ../data/totem.ui.h:97
-msgid "1.5 Mbps T1/Intranet/LAN"
-msgstr "T1/Intranet/LAN 1,5 Mb/s"
-
-#: ../data/totem.ui.h:98
-msgid "Intranet/LAN"
-msgstr "Intranet/LAN"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:100
-msgid "Normal"
-msgstr "Normalny"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:102
-msgid "Large"
-msgstr "Duży"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:104
-msgid "Extra Large"
-msgstr "Bardzo duży"
-
-#: ../data/totem.ui.h:105 ../src/totem-properties-view.c:228
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5593
-msgid "Stereo"
-msgstr "Stereo"
-
-#: ../data/totem.ui.h:106
-msgid "4-channel"
-msgstr "4-kanałowy"
-
-#: ../data/totem.ui.h:107
-msgid "4.1-channel"
-msgstr "4.1-kanałowy"
-
-#: ../data/totem.ui.h:108
-msgid "5.0-channel"
-msgstr "5.0-kanałowy"
-
-#: ../data/totem.ui.h:109
-msgid "5.1-channel"
-msgstr "5.1-kanałowy"
-
-#: ../data/totem.ui.h:110
-msgid "AC3 Passthrough"
-msgstr "Przekazywanie AC3"
-
-#: ../data/totem.ui.h:111
-msgid "Totem Preferences"
-msgstr "Preferencje programu Totem"
-
-#: ../data/totem.ui.h:112
-msgid "Playback"
-msgstr "Odtwarzanie"
-
-#: ../data/totem.ui.h:113
-msgid "Start playing files from last position"
-msgstr "Rozpoczęcie odtwarzania plików od ostatniej pozycji"
-
-#: ../data/totem.ui.h:114
-msgid "Networking"
-msgstr "Sieć"
-
-#: ../data/totem.ui.h:115
-msgid "Connection _speed:"
-msgstr "P_rędkość połączenia:"
-
-#: ../data/totem.ui.h:116
-msgid "Text Subtitles"
-msgstr "Napisy"
-
-#: ../data/totem.ui.h:117
-msgid "_Load subtitle files when movie is loaded"
-msgstr "Wczytywanie pliku _napisów po wczytaniu filmu"
-
-#: ../data/totem.ui.h:118
-msgid "_Font:"
-msgstr "Czcion_ka:"
-
-#: ../data/totem.ui.h:119
-msgid "_Encoding:"
-msgstr "_Kodowanie:"
-
-#: ../data/totem.ui.h:120
-msgid "External Chapters"
-msgstr "Zewnętrzne rozdziały"
-
-#: ../data/totem.ui.h:121
-msgid "Load _chapter files when movie is loaded"
-msgstr "W_czytywanie plików rozdziałów po wczytaniu filmu"
-
-#. Tab label in the Preferences dialogue
-#: ../data/totem.ui.h:124
-msgid "Display"
-msgstr "Wyświetlanie"
-
-#: ../data/totem.ui.h:125
-msgid "_Resize the window when a new video is loaded"
-msgstr "_Skalowanie okna po wczytaniu nowego nagrania wideo"
-
-#: ../data/totem.ui.h:126
-msgid "Disable _deinterlacing of interlaced videos"
-msgstr "Wyłączenie _usuwania przeplotu z nagrań wideo z przeplotem"
-
-#: ../data/totem.ui.h:127
-msgid "Disable screensaver when playing "
-msgstr "Wyłączanie wygaszania ekranu podczas odtwarzania "
-
-#: ../data/totem.ui.h:129
-msgid "Video or Audio"
-msgstr "Wideo lub dźwięk"
-
-#: ../data/totem.ui.h:130
-msgid "Visual Effects"
-msgstr "Efekty wizualne"
-
-#: ../data/totem.ui.h:131
-msgid "Show _visual effects when an audio file is played"
-msgstr "_Wyświetlanie podczas odtwarzania plików dźwiękowych"
-
-#: ../data/totem.ui.h:132
-msgid "_Type of visualization:"
-msgstr "_Typ efektu:"
-
-#: ../data/totem.ui.h:133
-msgid "Visualization _size:"
-msgstr "R_ozmiar wizualizacji:"
-
-#: ../data/totem.ui.h:134
-msgid "Color Balance"
-msgstr "Korekcja koloru"
-
-#: ../data/totem.ui.h:135
-msgid "_Brightness:"
-msgstr "Jas_ność:"
-
-#: ../data/totem.ui.h:136
-msgid "Co_ntrast:"
-msgstr "Ko_ntrast:"
-
-#: ../data/totem.ui.h:137
-msgid "Sat_uration:"
-msgstr "Nasy_cenie:"
-
-#: ../data/totem.ui.h:138
-msgid "_Hue:"
-msgstr "_Odcień:"
-
-#: ../data/totem.ui.h:139
-msgid "Reset to _Defaults"
-msgstr "P_rzywróć domyślne"
-
-#: ../data/totem.ui.h:140
-msgid "Audio Output"
-msgstr "Wyjście dźwięku"
-
-#: ../data/totem.ui.h:141
-msgid "_Audio output type:"
-msgstr "_Typ wyjścia dźwięku:"
-
-#: ../data/totem.ui.h:145
-msgid "Time seek bar"
-msgstr "Pasek czasu"
+#: ../data/totem.ui.h:58
+msgid "S_idebar"
+msgstr "P_anel"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
-msgid "Allow the screensaver to activate when playing audio"
-msgstr "Umożliwia wygaszanie ekranu podczas odtwarzania dźwięku"
+#: ../data/totem.ui.h:59
+msgid "Show or hide the sidebar"
+msgstr "Wyświetla lub ukrywa boczny panel"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
-msgid ""
-"Allow the screensaver to activate when playing audio. Disable if you have "
-"monitor-powered speakers."
-msgstr ""
-"Zezwolenie na włączenie wygaszacza ekranu podczas odtwarzania dźwięku. "
-"Przydatne w przypadku głośników wbudowanych w monitor."
+#: ../data/totem.ui.h:60
+msgctxt "Aspect ratio"
+msgid "Auto"
+msgstr "Automatycznie"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
-msgid "Show visual effects when no video is displayed"
-msgstr "Efekty wizualne przy braku obrazu"
+#: ../data/totem.ui.h:61
+msgid "Sets automatic aspect ratio"
+msgstr "Ustawia automatyczny współczynnik proporcji obrazu"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
-msgid "Show visual effects when playing an audio only file."
-msgstr ""
-"Wyświetlanie efektów wizualnych podczas odtwarzania plików dźwiękowych."
+#: ../data/totem.ui.h:62
+msgid "Square"
+msgstr "Kwadratowy"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
-msgid "Name of the visual effects plugin"
-msgstr "Nazwa wtyczki wizualizacji"
+#: ../data/totem.ui.h:63
+msgid "Sets square aspect ratio"
+msgstr "Ustawia kwadratowy współczynnik proporcji obrazu"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
-msgid "The brightness of the video"
-msgstr "Jasność obrazu wideo"
+#: ../data/totem.ui.h:64
+msgid "4:3 (TV)"
+msgstr "4:3 (TV)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
-msgid "The contrast of the video"
-msgstr "Kontrast obrazu wideo"
+#: ../data/totem.ui.h:65
+msgid "Sets 4:3 (TV) aspect ratio"
+msgstr "Ustawia współczynnik proporcji obrazu 4:3 (TV)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
-msgid "The hue of the video"
-msgstr "Odcień obrazu wideo"
+#: ../data/totem.ui.h:66
+msgid "16:9 (Widescreen)"
+msgstr "16:9 (szeroki ekran)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
-msgid "The saturation of the video"
-msgstr "Nasycenie obrazu wideo"
+#: ../data/totem.ui.h:67
+msgid "Sets 16:9 (widescreen) aspect ratio"
+msgstr "Ustawia współczynnik proporcji obrazu 16:9 (szeroki ekran)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
-msgid "Resize the canvas automatically on file load"
-msgstr "Automatyczne dopasowanie rozmiaru okna programu po wczytaniu pliku"
+#: ../data/totem.ui.h:68
+msgid "2.11:1 (DVB)"
+msgstr "2,11:1 (DVB)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
-msgid "Network connection speed"
-msgstr "Prędkość połączenia sieciowego"
+#: ../data/totem.ui.h:69
+msgid "Sets 2.11:1 (DVB) aspect ratio"
+msgstr "Ustawia współczynnik proporcji obrazu 2,11:1 (DVB)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
-msgid ""
-"Approximate network connection speed, used to select quality on media over "
-"the network."
-msgstr ""
-"Przybliżona prędkość połączenia sieciowego używana do wyboru jakości "
-"multimediów przesyłanych przez sieć."
+#: ../data/totem.ui.h:70
+msgid "S_ubtitles"
+msgstr "_Napisy"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
-msgid "Repeat mode"
-msgstr "Tryb powtarzania"
+#: ../data/totem.ui.h:73
+msgid "_Languages"
+msgstr "Języ_ki"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
-msgid "Shuffle mode"
-msgstr "Tryb losowy"
+#: ../data/totem.ui.h:74
+msgid "Zoom In"
+msgstr "Powiększenie"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
-msgid "Whether to disable deinterlacing for interlaced movies"
-msgstr "Określa, czy wyłączyć usuwanie przeplotu dla nagrań wideo z przeplotem"
+#: ../data/totem.ui.h:75
+msgid "Zoom in"
+msgstr "Powiększa obraz"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
-msgid "Whether to enable debug for the playback engine"
-msgstr "Określa, czy włączyć dodatkowe informacje dla mechanizmu odtwarzania"
+#: ../data/totem.ui.h:76
+msgid "Skip _Forward"
+msgstr "Przejdź _naprzód"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
-msgid "Type of audio output to use"
-msgstr "Typ użytego wyjścia dźwięku"
+#: ../data/totem.ui.h:77
+msgid "Skip forward"
+msgstr "Przechodzi naprzód"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
-msgid "Visualization quality setting"
-msgstr "Ustawienia jakości wizualizacji"
+#: ../data/totem.ui.h:78
+msgid "Skip _Backwards"
+msgstr "Przejdź _wstecz"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
-msgid "Quality setting for the audio visualization."
-msgstr "Ustawienia jakości wizualizacji dźwięku."
+#: ../data/totem.ui.h:79
+msgid "Skip backwards"
+msgstr "Przechodzi wstecz"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
-msgid "Network buffering threshold"
-msgstr "Próg buforowania sieciowego"
+#: ../data/totem.ui.h:82
+msgid "Time seek bar"
+msgstr "Pasek czasu"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
-msgid ""
-"Amount of data to buffer for network streams before starting to display the "
-"stream (in seconds)."
-msgstr ""
-"Ilość buforowanych danych dla strumieni sieciowych przed rozpoczęciem "
-"wyświetlania strumienia (w sekundach)."
+#: ../data/uri.ui.h:1
+msgid "Enter the _address of the file you would like to open:"
+msgstr "Proszę wprowadzić adres p_liku do otwarcia:"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
-msgid "Subtitle font"
-msgstr "Czcionka napisów"
+#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
+msgid "_Add to Playlist"
+msgstr "_Dodaj do listy odtwarzania"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
-msgid "Pango font description for subtitle rendering."
-msgstr "Opis czcionki do wyświetlania napisów biblioteki Pango."
+#: ../data/video-list.ui.h:2
+msgid "Add the video to the playlist"
+msgstr "Dodanie nagrania wideo do listy odtwarzania"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
-msgid "Subtitle encoding"
-msgstr "Kodowanie napisów"
+#: ../src/backend/bacon-video-widget.c:1643
+msgid "Password requested for RTSP server"
+msgstr "Zażądano hasła dla serwera RTSP"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
-msgid "Encoding character set for subtitle."
-msgstr "Strona kodowa napisów."
+#: ../src/backend/bacon-video-widget.c:2944
+#, c-format
+msgid "Audio Track #%d"
+msgstr "Ścieżka dźwiękowa #%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
-msgid "Default location for the \"Open...\" dialogs"
-msgstr "Domyślne położenie dla okien dialogowych \"Otwórz...\""
+#: ../src/backend/bacon-video-widget.c:2948
+#, c-format
+msgid "Subtitle #%d"
+msgstr "Napisy #%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
-msgid ""
-"Default location for the \"Open...\" dialogs. Default is the current "
-"directory."
-msgstr ""
-"Domyślne położenie dla okien dialogowych \"Otwórz...\". Domyślnie jest to "
-"bieżący katalog."
+#: ../src/backend/bacon-video-widget.c:3345
+msgid "The server you are trying to connect to is not known."
+msgstr "Łączenie z nieznanym serwerem."
+
+#: ../src/backend/bacon-video-widget.c:3348
+msgid "The connection to this server was refused."
+msgstr "Odrzucono połączenie z tym serwerem."
+
+#: ../src/backend/bacon-video-widget.c:3351
+msgid "The specified movie could not be found."
+msgstr "Nie można odnaleźć podanego filmu."
+
+#: ../src/backend/bacon-video-widget.c:3358
+msgid "The server refused access to this file or stream."
+msgstr "Serwer odmówił dostępu do tego pliku lub strumienia."
+
+#: ../src/backend/bacon-video-widget.c:3364
+msgid "Authentication is required to access this file or stream."
+msgstr ""
+"Wymagane jest uwierzytelnienie, aby uzyskać dostęp do tego pliku lub "
+"strumienia."
+
+#: ../src/backend/bacon-video-widget.c:3371
+msgid "You are not allowed to open this file."
+msgstr "Brak uprawnień do otwarcia tego pliku."
+
+#: ../src/backend/bacon-video-widget.c:3376
+msgid "This location is not a valid one."
+msgstr "To położenie jest nieprawidłowe."
+
+#: ../src/backend/bacon-video-widget.c:3384
+msgid "The movie could not be read."
+msgstr "Nie można odczytać filmu."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
-msgid "Default location for the \"Take Screenshot\" dialogs"
-msgstr "Domyślne położenie dla okien dialogowych \"Pobierz zrzut ekranu\""
+#. should be exactly one missing thing (source or converter)
+#: ../src/backend/bacon-video-widget.c:3407
+#: ../src/backend/bacon-video-widget.c:3415
+#, c-format
+msgid "The playback of this movie requires a %s plugin which is not installed."
+msgid_plural ""
+"The playback of this movie requires the following decoders which are not "
+"installed:\n"
+"\n"
+"%s"
+msgstr[0] ""
+"Odtworzenie tego nagrania wideo wymaga wtyczki %s, która nie jest "
+"zainstalowana."
+msgstr[1] ""
+"Odtworzenie tego nagrania wideo wymaga następujących dekoderów, które nie są "
+"zainstalowane:\n"
+"\n"
+"%s"
+msgstr[2] ""
+"Odtworzenie tego nagrania wideo wymaga następujących dekoderów, które nie są "
+"zainstalowane:\n"
+"\n"
+"%s"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
+#: ../src/backend/bacon-video-widget.c:3426
 msgid ""
-"Default location for the \"Take Screenshot\" dialogs. Default is the "
-"Pictures directory."
+"An audio or video stream is not handled due to missing codecs. You might "
+"need to install additional plugins to be able to play some types of movies"
 msgstr ""
-"Domyślne położenie dla okien dialogowych \"Pobierz zrzut ekranu\". Domyślnie "
-"jest to katalog Obrazy."
+"Strumień dźwięku lub obrazu nie jest obsługiwany z powodu brakujących "
+"kodeków. Należy zainstalować dodatkowe wtyczki, aby odtwarzać niektóre "
+"rodzaje filmów"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
-msgid "Whether to disable the plugins in the user's home directory"
+#: ../src/backend/bacon-video-widget.c:3436
+msgid ""
+"This file cannot be played over the network. Try downloading it locally "
+"first."
 msgstr ""
-"Określa, czy wyłączyć wtyczki znajdujące się w katalogu domowym użytkownika"
+"Ten plik nie może być odtwarzany przez sieć. Proszę spróbować najpierw "
+"pobrać plik na dysk."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
-msgid "Whether to disable the keyboard shortcuts"
-msgstr "Określa, czy wyłączyć skróty klawiszowe"
+#: ../src/backend/bacon-video-widget.c:5494 ../src/totem-properties-view.c:227
+msgid "Surround"
+msgstr "Przestrzenny"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
-msgid "Whether to autoload text subtitle files when a movie is loaded"
-msgstr ""
-"Określa, czy automatycznie wczytywać plik z napisami podczas wczytywania "
-"filmu"
+#: ../src/backend/bacon-video-widget.c:5496 ../src/totem-properties-view.c:229
+msgid "Mono"
+msgstr "Mono"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
-msgid "Whether to autoload external chapter files when a movie is loaded"
-msgstr ""
-"Określa, czy automatycznie wczytywać zewnętrzne pliki rozdziałów podczas "
-"wczytywania filmu"
+#: ../src/backend/bacon-video-widget.c:5781
+msgid "Media contains no supported video streams."
+msgstr "Plik multimediów zawiera nieobsługiwany strumień wideo."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+#: ../src/backend/bacon-video-widget.c:5963
 msgid ""
-"Whether to remember the position of played audio/video files when pausing or "
-"closing them"
+"Some necessary plug-ins are missing. Make sure that the program is correctly "
+"installed."
 msgstr ""
-"Określa, czy zapamiętywać położenie plików dźwiękowych i nagrań wideo przy "
-"wstrzymaniu odtwarzania lub ich zamknięciu"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:35
-msgid "Active plugins list"
-msgstr "Lista aktywnych wtyczek"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:36
-msgid ""
-"A list of the names of the plugins which are currently active (loaded and "
-"running)."
-msgstr "Lista aktywnych wtyczek (wczytanych i uruchomionych)."
-
-#: ../data/uri.ui.h:1
-msgid "Enter the _address of the file you would like to open:"
-msgstr "Proszę wprowadzić adres p_liku do otwarcia:"
+"Brak kilku wymaganych wtyczek. Proszę się upewnić, że program jest poprawnie "
+"zainstalowany."
 
 #: ../src/eggdesktopfile.c:165
 #, c-format
@@ -985,6 +1068,31 @@
 msgid "Show session management options"
 msgstr "Wyświetla opcje zarządzania sesją"
 
+#. hour:minutes:seconds
+#. Translators: This is a time format, like "9:05:02" for 9
+#. * hours, 5 minutes, and 2 seconds. You may change ":" to
+#. * the separator that your locale uses or use "%Id" instead
+#. * of "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:56
+#: ../src/plugins/skipto/totem-time-entry.c:57
+#, c-format
+msgctxt "long time format"
+msgid "%d:%02d:%02d"
+msgstr "%d:%02d:%02d"
+
+#. minutes:seconds
+#. Translators: This is a time format, like "5:02" for 5
+#. * minutes and 2 seconds. You may change ":" to the
+#. * separator that your locale uses or use "%Id" instead of
+#. * "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:65
+#, c-format
+msgctxt "short time format"
+msgid "%d:%02d"
+msgstr "%d:%02d"
+
 #. Title
 #. Artist
 #. Album
@@ -1093,10 +1201,16 @@
 msgstr[1] "%d klatki na sekundę"
 msgstr[2] "%d klatek na sekundę"
 
-#: ../src/totem-audio-preview.c:168
+#: ../src/totem-audio-preview.c:137
 msgid "Audio Preview"
 msgstr "Podgląd dźwięku"
 
+#: ../src/totem.c:240
+msgid "Verify your system installation. Totem will now exit."
+msgstr ""
+"Proszę sprawdzić poprawność instalacji systemu. Działanie programu Totem "
+"zostanie teraz zakończone."
+
 #: ../src/totem-cell-renderer-video.c:126
 msgid "Unknown video"
 msgstr "Nieznane nagranie wideo"
@@ -1109,7 +1223,7 @@
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: ../src/totem-fullscreen.c:616
+#: ../src/totem-fullscreen.c:573
 msgid "No File"
 msgstr "Brak pliku"
 
@@ -1127,7 +1241,7 @@
 msgid "Make sure that Totem is properly installed."
 msgstr "Proszę się upewnić, że program Totem został poprawnie zainstalowany."
 
-#: ../src/totem-interface.c:347
+#: ../src/totem-interface.c:357
 msgid ""
 "Totem 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 "
@@ -1139,30 +1253,30 @@
 "Fundację Wolnego Oprogramowania (Free Software Foundation) - według wersji "
 "drugiej tej Licencji lub którejś z późniejszych wersji."
 
-#: ../src/totem-interface.c:351
+#: ../src/totem-interface.c:361
 msgid ""
 "Totem 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 General Public License for more "
 "details."
 msgstr ""
-"Niniejszy program rozpowszechniany jest z nadzieją, iż będzie on użyteczny - "
+"Program Totem rozpowszechniany jest z nadzieją, iż będzie on użyteczny - "
 "jednak BEZ JAKIEJKOLWIEK GWARANCJI, nawet domyślnej gwarancji PRZYDATNOŚCI "
 "HANDLOWEJ albo PRZYDATNOŚCI DO OKREŚLONYCH ZASTOSOWAŃ. W celu uzyskania "
 "bliższych informacji należy zapoznać się z Powszechną Licencją Publiczną GNU."
 
-#: ../src/totem-interface.c:355
+#: ../src/totem-interface.c:365
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Totem; if not, write to the Free Software Foundation, Inc., 59 Temple Place, "
 "Suite 330, Boston, MA  02111-1307  USA"
 msgstr ""
-"Z pewnością wraz z niniejszym programem dostarczono także egzemplarz "
-"Powszechnej Licencji Publicznej GNU (GNU General Public License); jeśli nie "
-"- proszę napisać do Free Software Foundation, Inc., 51 Franklin Street, "
-"Fifth Floor, Boston, MA 02110-130159 USA."
+"Z pewnością wraz z programem Totem dostarczono także egzemplarz Powszechnej "
+"Licencji Publicznej GNU (GNU General Public License); jeśli nie - proszę "
+"napisać do Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, "
+"Boston, MA 02110-130159 USA."
 
-#: ../src/totem-interface.c:358
+#: ../src/totem-interface.c:368
 msgid ""
 "Totem contains an exception to allow the use of proprietary GStreamer "
 "plugins."
@@ -1171,202 +1285,105 @@
 "biblioteki GStreamer."
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:190
+#: ../src/totem-menu.c:291
 msgid "None"
 msgstr "Brak"
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:195
+#: ../src/totem-menu.c:296
 msgctxt "Language"
 msgid "Auto"
 msgstr "Automatyczny"
 
-#. Translators:
-#. * This is not a JPEG image, but a disc image, for example,
-#. * an ISO file
-#: ../src/totem-menu.c:765
-#, c-format
-msgid "Play Image '%s'"
-msgstr "Odtwarzaj obraz \"%s\""
-
-#: ../src/totem-menu.c:768 ../src/totem-menu.c:851
-#, c-format
-msgid "device%d"
-msgstr "urządzenie%d"
-
-#: ../src/totem-menu.c:848
-#, c-format
-msgid "Play Disc '%s'"
-msgstr "Odtwarzaj płytę \"%s\""
-
-#. This lists the back-end type and version, such as
-#. * Movie Player using GStreamer 0.10.1
-#: ../src/totem-menu.c:1189
-#, c-format
-msgid "Movie Player using %s"
-msgstr "Odtwarzacz filmów używający biblioteki %s"
-
-#: ../src/totem-menu.c:1193
+#: ../src/totem-menu.c:789
 msgid "Copyright © 2002-2009 Bastien Nocera"
 msgstr "Copyright © 2002-2009 Bastien Nocera"
 
-#: ../src/totem-menu.c:1198
+#: ../src/totem-menu.c:794
 msgid "translator-credits"
-msgstr "Aviary.pl , 2007, 2008, 2009, 2010, 2011, 2012"
+msgstr ""
+"Zbigniew Chyla , 2003\n"
+"Artur Flinta , 2003-2004\n"
+"Bartosz Kosiorek , 2005\n"
+"Artur Flinta , 2006\n"
+"Stanisław Małolepszy , 2007\n"
+"Tomasz Dominikowski , 2007-2009\n"
+"Piotr Drąg , 2010-2012\n"
+"Asia Słowik , 2011\n"
+"Aviary.pl , 2007-2012"
 
-#: ../src/totem-menu.c:1202
+#: ../src/totem-menu.c:798
 msgid "Totem Website"
 msgstr "Witryna programu Totem"
 
-#: ../src/totem-menu.c:1236
+#: ../src/totem-menu.c:829
 msgid "Configure Plugins"
 msgstr "Konfiguracja wtyczek"
 
+#: ../src/totem-object.c:162
+#, c-format
+msgid ""
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"%s\n"
+"Wykonanie polecenia \"%s --help\" wyświetli pełną listę dostępnych opcji "
+"wiersza poleceń.\n"
+
 #. Translators: %s is the totem version number
-#: ../src/totem-object.c:471
+#: ../src/totem-object.c:591
 #, c-format
 msgid "Totem %s"
 msgstr "Totem %s"
 
-#: ../src/totem-object.c:1047 ../browser-plugin/totem-plugin-viewer.c:367
-msgid "Playing"
-msgstr "Odtwarzanie"
-
-#: ../src/totem-object.c:1049 ../src/totem-options.c:52
+#: ../src/totem-object.c:1168 ../src/totem-options.c:52
 msgid "Pause"
 msgstr "Wstrzymuje"
 
-#: ../src/totem-object.c:1054 ../browser-plugin/totem-plugin-viewer.c:363
-msgid "Paused"
-msgstr "Wstrzymano"
-
-#: ../src/totem-object.c:1056 ../src/totem-object.c:1066
+#: ../src/totem-object.c:1175 ../src/totem-object.c:1185
 #: ../src/totem-options.c:51
 msgid "Play"
 msgstr "Odtwarza"
 
-#: ../src/totem-object.c:1061 ../src/totem-object.c:1659
-#: ../src/totem-statusbar.c:115 ../browser-plugin/totem-plugin-viewer.c:351
-msgid "Stopped"
-msgstr "Zatrzymano"
-
-#: ../src/totem-object.c:1142 ../src/totem-object.c:1169
-#: ../src/totem-object.c:1799 ../src/totem-object.c:1963
+#: ../src/totem-object.c:1267 ../src/totem-object.c:1294
+#: ../src/totem-object.c:1787 ../src/totem-object.c:1942
 #, c-format
 msgid "Totem could not play '%s'."
 msgstr "Program Totem nie może odtworzyć \"%s\"."
 
-#: ../src/totem-object.c:1246
-#, c-format
-msgid ""
-"Totem could not play this media (%s) although a plugin is present to handle "
-"it."
-msgstr ""
-"Program Totem nie może odtworzyć tego nośnika (%s), mimo że w systemie "
-"obecna jest odpowiednia wtyczka."
-
-#: ../src/totem-object.c:1247
-msgid ""
-"You might want to check that a disc is present in the drive and that it is "
-"correctly configured."
-msgstr ""
-"Proszę sprawdzić, czy płyta znajduje się w napędzie i czy napęd jest "
-"prawidłowo skonfigurowany."
-
-#: ../src/totem-object.c:1255
-msgid "More information about media plugins"
-msgstr "Więcej informacji na temat wtyczek multimediów"
-
-#: ../src/totem-object.c:1256
-msgid ""
-"Please install the necessary plugins and restart Totem to be able to play "
-"this media."
-msgstr ""
-"Aby odtworzyć ten nośnik należy zainstalować odpowiednie wtyczki i ponownie "
-"uruchomić program."
-
-#: ../src/totem-object.c:1258
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because it does not have the "
-"appropriate plugins to be able to read from the disc."
-msgstr ""
-"Program Totem nie może odtworzyć tego typu nośnika (%s), ponieważ nie "
-"zainstalowano wtyczek obsługujących ten format."
-
-#: ../src/totem-object.c:1260
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because you do not have the "
-"appropriate plugins to handle it."
-msgstr ""
-"Program Totem nie może odtworzyć tego typu nośnika (%s), ponieważ nie "
-"zainstalowano wtyczek obsługujących ten format."
-
-#: ../src/totem-object.c:1263
-#, c-format
-msgid "Totem cannot play this type of media (%s) because it is not supported."
-msgstr ""
-"Program Totem nie może odtworzyć tego typu nośnika (%s), ponieważ nie jest "
-"on obsługiwany."
-
-#: ../src/totem-object.c:1264
-msgid "Please insert another disc to play back."
-msgstr "Proszę wsunąć następną płytę, aby odtwarzać."
-
-#: ../src/totem-object.c:1300
-msgid "Totem was not able to play this disc."
-msgstr "Program Totem nie może odtworzyć tej płyty."
-
-#: ../src/totem-object.c:1301 ../src/totem-object.c:4228
-msgid "No reason."
-msgstr "Brak powodu."
-
-#: ../src/totem-object.c:1315
-msgid "Totem does not support playback of Audio CDs"
-msgstr "Program Totem nie obsługuje odtwarzania płyt CD-Audio"
-
-#: ../src/totem-object.c:1316
-msgid "Please consider using a music player or a CD extractor to play this CD"
-msgstr ""
-"Proszę skorzystać z odtwarzacza muzyki lub zgrywarki CD-Audio do odtworzenia "
-"tej płyty CD"
-
-#: ../src/totem-object.c:1805
+#: ../src/totem-object.c:1793
 msgid "No error message"
 msgstr "Brak komunikatu błędu"
 
-#: ../src/totem-object.c:2154
+#: ../src/totem-object.c:2133
 msgid "Totem could not display the help contents."
 msgstr "Nie można wyświetlić spisu treści pomocy programu Totem."
 
-#: ../src/totem-object.c:2493 ../src/totem-object.c:2495
-#: ../browser-plugin/totem-plugin-viewer.c:1417
-msgid "An error occurred"
-msgstr "Wystąpił błąd"
-
-#: ../src/totem-object.c:4063 ../src/totem-object.c:4065
+#: ../src/totem-object.c:4019 ../src/totem-object.c:4021
 msgid "Previous Chapter/Movie"
 msgstr "Poprzedni rozdział/film"
 
-#: ../src/totem-object.c:4072 ../src/totem-object.c:4074
+#: ../src/totem-object.c:4028 ../src/totem-object.c:4030
 msgid "Play / Pause"
 msgstr "Odtwarza/wstrzymuje"
 
-#: ../src/totem-object.c:4082 ../src/totem-object.c:4084
+#: ../src/totem-object.c:4038 ../src/totem-object.c:4040
 msgid "Next Chapter/Movie"
 msgstr "Następny rozdział/film"
 
-#. Translators: this is the tooltip text for the fullscreen button in the controls box in Totem's main window.
 #. Translators: this is the accessibility text for the fullscreen button in the controls box in Totem's main window.
-#: ../src/totem-object.c:4096 ../src/totem-object.c:4098
+#: ../src/totem-object.c:4051 ../src/totem-object.c:4053
 msgid "Fullscreen"
 msgstr "Pełny ekran"
 
-#: ../src/totem-object.c:4228
+#: ../src/totem-object.c:4184
 msgid "Totem could not startup."
 msgstr "Nie można uruchomić programu Totem."
 
+#: ../src/totem-object.c:4184
+msgid "No reason."
+msgstr "Brak powodu."
+
 #: ../src/totem-open-location.c:182
 msgid "Open Location..."
 msgstr "Otwarcie położenia"
@@ -1440,117 +1457,111 @@
 msgid "Movies to play"
 msgstr "Filmy do odtworzenia"
 
-#: ../src/totem-options.c:117
+#: ../src/totem-options.c:79
+msgid "- Play movies and songs"
+msgstr "- odtwarzanie filmów i muzyki"
+
+#: ../src/totem-options.c:142
 msgid "Can't enqueue and replace at the same time"
 msgstr "Nie można równocześnie dodać do kolejki i zamienić pliku"
 
 #. By extension entry
-#: ../src/totem-playlist.c:161
+#: ../src/totem-playlist.c:162
 msgid "MP3 ShoutCast playlist"
 msgstr "Lista odtwarzania ShoutCast MP3"
 
-#: ../src/totem-playlist.c:162
+#: ../src/totem-playlist.c:163
 msgid "MP3 audio (streamed)"
 msgstr "Dźwięk MP3 (strumień)"
 
-#: ../src/totem-playlist.c:163
+#: ../src/totem-playlist.c:164
 msgid "MP3 audio (streamed, DOS format)"
 msgstr "Dźwięk MP3 (strumień, format DOS)"
 
-#: ../src/totem-playlist.c:164
+#: ../src/totem-playlist.c:165
 msgid "XML Shareable Playlist"
 msgstr "Współdzielona lista odtwarzania XML"
 
 #. This is "Title 3", where title is a DVD title
 #. * Note: NOT a DVD chapter
-#: ../src/totem-playlist.c:347
+#: ../src/totem-playlist.c:348
 #, c-format
 msgid "Title %d"
 msgstr "Tytuł %d"
 
-#: ../src/totem-playlist.c:446
+#: ../src/totem-playlist.c:447
 msgid "Could not save the playlist"
 msgstr "Nie można zapisać listy odtwarzania"
 
-#: ../src/totem-playlist.c:1021
+#: ../src/totem-playlist.c:1022
 msgid "Save Playlist"
 msgstr "Zapis listy odtwarzania"
 
 #. translators: Playlist is the default saved playlist filename,
 #. * without the suffix
-#: ../src/totem-playlist.c:1033 ../src/totem-playlist.c:1264
-#: ../src/totem-sidebar.c:142
+#: ../src/totem-playlist.c:1034 ../src/totem-playlist.c:1263
+#: ../src/totem-sidebar.c:145
 msgid "Playlist"
 msgstr "Lista odtwarzania"
 
-#: ../src/totem-playlist.c:1857
+#: ../src/totem-playlist.c:1862
 #, c-format
 msgid "The playlist '%s' could not be parsed. It might be damaged."
 msgstr "Nie można przetworzyć listy odtwarzania \"%s\". Może być uszkodzona."
 
-#: ../src/totem-playlist.c:1858
+#: ../src/totem-playlist.c:1863
 msgid "Playlist error"
 msgstr "Błąd listy odtwarzania"
 
-#: ../src/totem-preferences.c:295
+#: ../src/totem-preferences.c:297
 msgid "Preferences"
 msgstr "Preferencje"
 
-#: ../src/totem-preferences.c:451
+#: ../src/totem-preferences.c:445
 msgid "Select Subtitle Font"
 msgstr "Wybór czcionki napisów"
 
-#: ../src/totem-properties-main.c:115 ../src/totem-properties-view.c:266
+#: ../src/totem-properties-main.c:116 ../src/totem-properties-view.c:269
 msgid "Audio/Video"
 msgstr "Dźwięk/obraz"
 
-#: ../src/totem-properties-view.c:128
+#: ../src/totem-properties-view.c:131
 msgid "N/A"
 msgstr "Brak danych"
 
-#: ../src/totem-properties-view.c:157
+#: ../src/totem-properties-view.c:160
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 msgctxt "Stream bit rate"
 msgid "N/A"
 msgstr "Brak danych"
 
-#: ../src/totem-properties-view.c:160
+#: ../src/totem-properties-view.c:163
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 #, c-format
 msgid "%d kbps"
 msgstr "%d kb/s"
 
-#: ../src/totem-properties-view.c:177
+#: ../src/totem-properties-view.c:180
 #: ../src/plugins/properties/totem-movie-properties.c:149
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../src/totem-properties-view.c:209
+#: ../src/totem-properties-view.c:212
 #: ../src/plugins/properties/totem-movie-properties.c:166
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: ../src/totem-properties-view.c:216
+#: ../src/totem-properties-view.c:219
 #: ../src/plugins/properties/totem-movie-properties.c:166
 msgctxt "Sample rate"
 msgid "N/A"
 msgstr "Brak danych"
 
-#: ../src/totem-properties-view.c:224
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5589
-msgid "Surround"
-msgstr "Przestrzenny"
-
-#: ../src/totem-properties-view.c:226
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5591
-msgid "Mono"
-msgstr "Mono"
-
-#: ../src/totem-properties-view.c:236
+#: ../src/totem-properties-view.c:239
 msgctxt "Number of audio channels"
 msgid "N/A"
 msgstr "Brak danych"
@@ -1583,8 +1594,8 @@
 #. eg: 75 %
 #: ../src/totem-statusbar.c:250
 #, c-format
-msgid "%d %%"
-msgstr "%d %%"
+msgid "%lf %%"
+msgstr "%lf%%"
 
 #. eg: Paused, 0:32 / 1:05
 #: ../src/totem-statusbar.c:325
@@ -1595,8 +1606,8 @@
 #. eg: Buffering, 75 %
 #: ../src/totem-statusbar.c:330
 #, c-format
-msgid "%s, %d %%"
-msgstr "%s, %d %%"
+msgid "%s, %f %%"
+msgstr "%s, %f%%"
 
 #: ../src/totem-subtitle-encoding.c:156
 msgid "Current Locale"
@@ -1739,236 +1750,91 @@
 msgid "Vietnamese"
 msgstr "Wietnamskie"
 
-#: ../src/totem-video-list.c:330
-msgid "No video URI"
-msgstr "Brak adresu URI nagrania wideo"
-
-#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
-#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
-#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
-#: ../src/totem-video-thumbnailer.c:872
-#, c-format
-msgid ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-msgstr ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-
-#: ../src/totem-video-thumbnailer.c:873
-msgid "Filename"
-msgstr "Nazwa pliku"
-
-#: ../src/totem-video-thumbnailer.c:875
-msgid "Resolution"
-msgstr "Rozdzielczość"
-
-#: ../src/totem-video-thumbnailer.c:878
-msgid "Duration"
-msgstr "Czas trwania"
-
-#: ../src/totem-uri.c:506 ../src/plugins/chapters/totem-chapters.c:998
+#: ../src/totem-uri.c:343 ../src/plugins/chapters/totem-chapters.c:998
 msgid "All files"
 msgstr "Wszystkie pliki"
 
-#: ../src/totem-uri.c:511 ../src/plugins/chapters/totem-chapters.c:995
+#: ../src/totem-uri.c:348 ../src/plugins/chapters/totem-chapters.c:995
 msgid "Supported files"
 msgstr "Obsługiwane pliki"
 
-#: ../src/totem-uri.c:523
+#: ../src/totem-uri.c:360
 msgid "Audio files"
 msgstr "Pliki dźwiękowe"
 
-#: ../src/totem-uri.c:531
+#: ../src/totem-uri.c:368
 msgid "Video files"
 msgstr "Pliki wideo"
 
-#: ../src/totem-uri.c:541
+#: ../src/totem-uri.c:378
 msgid "Subtitle files"
 msgstr "Pliki napisów"
 
-#: ../src/totem-uri.c:593
+#: ../src/totem-uri.c:430
 msgid "Select Text Subtitles"
 msgstr "Wybór pliku napisów"
 
-#: ../src/totem-uri.c:656
+#: ../src/totem-uri.c:495
 msgid "Select Movies or Playlists"
 msgstr "Wybór filmów lub list odtwarzania"
 
-#. Options parsing
-#: ../src/totem.c:204
-msgid "- Play movies and songs"
-msgstr "- odtwarzanie filmów i muzyki"
-
-#: ../src/totem.c:220
-#, c-format
-msgid ""
-"%s\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"%s\n"
-"Wykonanie polecenia \"%s --help\" wyświetli pełną listę dostępnych opcji "
-"wiersza poleceń.\n"
-
-#: ../src/totem.c:262 ../src/totem.c:273
-#: ../browser-plugin/totem-plugin-viewer.c:663
-#: ../browser-plugin/totem-plugin-viewer.c:1793
-msgid "Totem Movie Player"
-msgstr "Odtwarzacz filmów Totem"
-
-#: ../src/totem.c:263 ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Could not initialize the thread-safe libraries."
-msgstr "Nie można zainicjować bibliotek bezpiecznych dla wątków."
-
-#: ../src/totem.c:263
-msgid "Verify your system installation. Totem will now exit."
-msgstr ""
-"Proszę sprawdzić poprawność instalacji systemu. Działanie programu Totem "
-"zostanie teraz zakończone."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:1589
-msgid "Password requested for RTSP server"
-msgstr "Zażądano hasła dla serwera RTSP"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2858
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2862
-#, c-format
-msgid "Audio Track #%d"
-msgstr "Ścieżka dźwiękowa #%d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2890
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2894
-#, c-format
-msgid "Subtitle #%d"
-msgstr "Napisy #%d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3298
-msgid ""
-"The requested audio output was not found. Please select another audio output "
-"in the Multimedia Systems Selector."
-msgstr ""
-"Żądane wyjście dźwięku nie zostało odnalezione. Proszę wybrać inne wyjście "
-"dźwięku w oknie Wyboru systemu multimediów."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3303
-msgid "Location not found."
-msgstr "Nie odnaleziono położenia."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3307
-msgid ""
-"Could not open location; you might not have permission to open the file."
-msgstr ""
-"Nie można otworzyć położenia. Użytkownik może nie mieć uprawnień do otwarcia "
-"pliku."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3318
-msgid ""
-"The video output is in use by another application. Please close other video "
-"applications, or select another video output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"Wyjście wideo jest używane przez inny program. Proszę zamknąć inne programy "
-"wideo lub wybrać inne wyjście wideo w oknie Wyboru systemu multimediów."
+#: ../src/totem-uri.c:499
+msgid "Add Directory"
+msgstr "Dodaj katalog"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3324
-msgid ""
-"The audio output is in use by another application. Please select another "
-"audio output in the Multimedia Systems Selector. You may want to consider "
-"using a sound server."
-msgstr ""
-"Wyjście dźwięku jest używane przez inny program. Proszę wybrać inne wyjście "
-"dźwięku w oknie Wyboru systemu multimediów. Możesz rozważyć również użycie "
-"serwera dźwięku."
+#: ../src/totem-video-list.c:330
+msgid "No video URI"
+msgstr "Brak adresu URI nagrania wideo"
 
-#. should be exactly one missing thing (source or converter)
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3342
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3348
+#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
+#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
+#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
+#: ../src/totem-video-thumbnailer.c:841
 #, c-format
-msgid "The playback of this movie requires a %s plugin which is not installed."
-msgid_plural ""
-"The playback of this movie requires the following decoders which are not "
-"installed:\n"
-"\n"
-"%s"
-msgstr[0] ""
-"Odtworzenie tego nagrania wideo wymaga wtyczki %s, która nie jest "
-"zainstalowana."
-msgstr[1] ""
-"Odtworzenie tego nagrania wideo wymaga następujących dekoderów, które nie są "
-"zainstalowane:\n"
-"\n"
-"%s"
-msgstr[2] ""
-"Odtworzenie tego nagrania wideo wymaga następujących dekoderów, które nie są "
-"zainstalowane:\n"
-"\n"
-"%s"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3374
 msgid ""
-"Cannot play this file over the network. Try downloading it to disk first."
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 msgstr ""
-"Nie można odtworzyć pliku przez sieć. Proszę spróbować najpierw pobrać plik "
-"na dysk."
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5878
-msgid "Media contains no supported video streams."
-msgstr "Plik multimediów zawiera nieobsługiwany strumień wideo."
+#: ../src/totem-video-thumbnailer.c:842
+msgid "Filename"
+msgstr "Nazwa pliku"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6053
-msgid ""
-"Failed to create a GStreamer play object. Please check your GStreamer "
-"installation."
-msgstr ""
-"Utworzenie obiektu odtwarzania GStreamer się nie powiodło. Proszę sprawdzić "
-"poprawność instalacji biblioteki GStreamer."
+#: ../src/totem-video-thumbnailer.c:844
+msgid "Resolution"
+msgstr "Rozdzielczość"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6173
-msgid ""
-"Failed to open audio output. You may not have permission to open the sound "
-"device, or the sound server may not be running. Please select another audio "
-"output in the Multimedia Systems Selector."
-msgstr ""
-"Otwarcie wyjścia dźwięku się nie powiodło. Użytkownik może nie mieć "
-"uprawnień do urządzenia dźwiękowego albo nie jest uruchomiony serwer "
-"dźwięku. Proszę wybrać inne wyjście dźwięku w oknie Wyboru systemu "
-"multimediów."
+#: ../src/totem-video-thumbnailer.c:847
+msgid "Duration"
+msgstr "Czas trwania"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6193
-msgid ""
-"Could not find the audio output. You may need to install additional "
-"GStreamer plugins, or select another audio output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"Nie można odnaleźć wyjścia dźwięku. Może być wymagana instalacja dodatkowych "
-"wtyczek biblioteki GStreamer, lub należy wybrać inne wyjście dźwięku w oknie "
-"Wyboru systemu multimediów."
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:1
+msgid "Apple Trailers"
+msgstr "Zwiastuny Apple"
+
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:2
+msgid "Sets the user agent for the Apple Trailers site"
+msgstr "Ustawia agenta użytkownika dla witryny zwiastunów firmy Apple"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:1
+msgid "Autoload Subtitles"
+msgstr "Automatyczne wczytywanie napisów"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:2
+msgid "Autoloads text subtitles"
+msgstr "Automatycznie wczytuje napisy tekstowe"
 
-#. hour:minutes:seconds
-#. Translators: This is a time format, like "9:05:02" for 9
-#. * hours, 5 minutes, and 2 seconds. You may change ":" to
-#. * the separator that your locale uses or use "%Id" instead
-#. * of "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:83 ../src/plugins/skipto/totem-time-entry.c:57
-#, c-format
-msgctxt "long time format"
-msgid "%d:%02d:%02d"
-msgstr "%d:%02d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
+msgid "Video Disc Recorder"
+msgstr "Nagrywarka płyt wideo"
 
-#. minutes:seconds
-#. Translators: This is a time format, like "5:02" for 5
-#. * minutes and 2 seconds. You may change ":" to the
-#. * separator that your locale uses or use "%Id" instead of
-#. * "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:92
-#, c-format
-msgctxt "short time format"
-msgid "%d:%02d"
-msgstr "%d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
+msgid "Records (S)VCDs or video DVDs"
+msgstr "Nagrywa płyty (S)VCD lub DVD-Video"
 
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:65
 msgid "_Create Video Disc..."
@@ -1994,37 +1860,20 @@
 msgid "Copy the currently playing (S)VCD"
 msgstr "Kopiuje bieżąco odtwarzaną płytę (S)VCD"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:129
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:136
 msgid "The video disc could not be duplicated."
-msgstr "Płyta wideo nie mogła zostać powielona."
-
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:131
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:276
-msgid "The movie could not be recorded."
-msgstr "Nagranie wideo nie mogło zostać nagrane."
-
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:157
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:167
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:263
-msgid "Unable to write a project."
-msgstr "Nie można zapisać projektu."
-
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
-msgid "Video Disc Recorder"
-msgstr "Nagrywarka płyt wideo"
-
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
-msgid "Records (S)VCDs or video DVDs"
-msgstr "Nagrywa płyty (S)VCD lub DVD-Video"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:1
-#: ../src/plugins/chapters/totem-chapters.c:1139
-msgid "Chapters"
-msgstr "Rozdziały"
+msgstr "Płyta wideo nie mogła zostać powielona."
 
-#: ../src/plugins/chapters/chapters.plugin.in.h:2
-msgid "Support chapter markers in movies."
-msgstr "Obsługa znaczników rozdziałów w filmach."
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:138
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:283
+msgid "The movie could not be recorded."
+msgstr "Nagranie wideo nie mogło zostać nagrane."
+
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:164
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:174
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:270
+msgid "Unable to write a project."
+msgstr "Nie można zapisać projektu."
 
 #: ../src/plugins/chapters/chapters-edit.ui.h:1
 msgid "Name for new chapter:"
@@ -2082,6 +1931,15 @@
 msgid "Create a new chapter list for the movie"
 msgstr "Tworzy nową listę rozdziałów filmu"
 
+#: ../src/plugins/chapters/chapters.plugin.in.h:1
+#: ../src/plugins/chapters/totem-chapters.c:1139
+msgid "Chapters"
+msgstr "Rozdziały"
+
+#: ../src/plugins/chapters/chapters.plugin.in.h:2
+msgid "Support chapter markers in movies"
+msgstr "Obsługa znaczników rozdziałów w filmach"
+
 #: ../src/plugins/chapters/totem-chapters.c:56
 #, c-format
 msgid ""
@@ -2190,13 +2048,37 @@
 msgid "The URI ‘%s’ is not supported."
 msgstr "Adres URI \"%s\" nie jest obsługiwany."
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
-msgid "Instant Messenger status"
-msgstr "Stan komunikatora"
+#: ../src/plugins/grilo/grilo.plugin.in.h:1
+msgid "Grilo Browser"
+msgstr "Przeglądarka Grilo"
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
-msgid "Set your Instant Messenger status to away when a movie is playing"
-msgstr "Ustawienie stanu komunikatora na \"Zajęty\" podczas odtwarzania filmu"
+#: ../src/plugins/grilo/grilo.plugin.in.h:2
+msgid "A plugin to let you browse media content from various sources"
+msgstr "Wtyczka umożliwiająca przeglądania nagrań wideo z różnych źródeł"
+
+#: ../src/plugins/grilo/grilo.ui.h:1
+msgid "Add to Playlist"
+msgstr "Dodaj do listy odtwarzania"
+
+#: ../src/plugins/grilo/grilo.ui.h:2
+msgid "Copy Location"
+msgstr "Skopiuj położenie"
+
+#: ../src/plugins/grilo/grilo.ui.h:3 ../src/plugins/grilo/totem-grilo.c:1184
+msgid "Browse"
+msgstr "Przeglądaj"
+
+#: ../src/plugins/grilo/grilo.ui.h:4 ../src/plugins/grilo/totem-grilo.c:1227
+msgid "Search"
+msgstr "Wyszukaj"
+
+#: ../src/plugins/grilo/totem-grilo.c:454
+msgid "Browse Error"
+msgstr "Błąd przeglądania"
+
+#: ../src/plugins/grilo/totem-grilo.c:609
+msgid "Search Error"
+msgstr "Błąd wyszukiwania"
 
 #: ../src/plugins/gromit/gromit.plugin.in.h:1
 msgid "Gromit Annotations"
@@ -2210,59 +2092,13 @@
 msgid "The gromit binary was not found."
 msgstr "Plik wykonywalny gromit nie został odnaleziony."
 
-#. Add the interface to Totem's sidebar
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:1
-#: ../src/plugins/iplayer/iplayer.py:46
-msgid "BBC iPlayer"
-msgstr "BBC iPlayer"
-
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:2
-msgid "Stream BBC programs from the last 7 days from the BBC iPlayer service."
-msgstr ""
-"Odtwarzanie strumieniowe programów BBC z ostatnich 7 dni z usługi BBC "
-"iPlayer (dostępne wyłącznie w Wielkiej Brytanii)."
-
-#: ../src/plugins/iplayer/iplayer.py:72
-msgid "Error listing channel categories"
-msgstr "Błąd podczas pobierania listy kategorii kanałów"
-
-#: ../src/plugins/iplayer/iplayer.py:73
-msgid ""
-"There was an unknown error getting the list of television channels available "
-"on BBC iPlayer."
-msgstr ""
-"Wystąpił nieznany błąd podczas uzyskiwania listy kanałów telewizyjnych "
-"dostępnych na BBC iPlayer."
-
-#. Append a dummy child row so that the expander's visible; we can
-#. then queue off the expander to load the programme listing for this
-#. category
-#: ../src/plugins/iplayer/iplayer.py:84
-msgid "Loading…"
-msgstr "Wczytywanie…"
-
-#. Translators: the "programme feed" is the list of TV shows
-#. available to watch online
-#: ../src/plugins/iplayer/iplayer.py:136
-msgid "Error getting programme feed"
-msgstr "Błąd podczas uzyskiwania danych programu"
-
-#: ../src/plugins/iplayer/iplayer.py:137
-msgid ""
-"There was an error getting the list of programmes for this channel and "
-"category combination."
-msgstr ""
-"Wystąpił błąd podczas pobierania listy programów tego połączenia kanału i "
-"kategorii."
-
-#: ../src/plugins/iplayer/iplayer2.py:298
-msgid ""
-msgstr ""
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
+msgid "Instant Messenger Status"
+msgstr "Stan komunikatora"
 
-#: ../src/plugins/iplayer/iplayer2.py:299
-#, python-format
-msgid "Programme unavailable (\"%s\")"
-msgstr "Program niedostępny (\"%s\")"
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
+msgid "Set your Instant Messenger status to away when a movie is playing"
+msgstr "Ustawia stan komunikatora na \"Zajęty\" podczas odtwarzania filmu"
 
 #: ../src/plugins/lirc/lirc.plugin.in.h:1
 msgid "Infrared Remote Control"
@@ -2280,25 +2116,29 @@
 msgid "Couldn't read lirc configuration."
 msgstr "Nie można odczytać konfiguracji biblioteki lirc."
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
-msgid "Download Movie Subtitles"
-msgstr "Napisy do filmów"
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:1
+msgid "Media Player Keys"
+msgstr "Klawisze odtwarzacza multimedialnego"
+
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:2
+msgid "Support additional media player keys"
+msgstr "Obsługuje dodatkowe klawisze odtwarzacza multimedialnego"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
-msgid "Subtitle _language:"
-msgstr "Język n_apisów:"
+#: ../src/plugins/ontop/ontop.plugin.in.h:1
+msgid "Always On Top"
+msgstr "Zawsze na wierzchu"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
-msgid "_Play with Subtitle"
-msgstr "_Wczytaj napisy"
+#: ../src/plugins/ontop/ontop.plugin.in.h:2
+msgid "Keep the main window on top when playing a movie"
+msgstr "Utrzymuje główne okno ponad innymi podczas odtwarzania filmu"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:1
 msgid "Subtitle Downloader"
 msgstr "Pobieranie napisów"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:2
-msgid "Look for subtitles for the currently playing movie."
-msgstr "Wyszukiwanie napisów do obecnie odtwarzanego filmu."
+msgid "Look for subtitles for the currently playing movie"
+msgstr "Wyszukuje napisy do obecnie odtwarzanego filmu"
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:42
 msgid "Brazilian Portuguese"
@@ -2354,6 +2194,18 @@
 msgid "Searching subtitles…"
 msgstr "Wyszukiwanie napisów…"
 
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
+msgid "Download Movie Subtitles"
+msgstr "Napisy do filmów"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
+msgid "Subtitle _language:"
+msgstr "Język n_apisów:"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
+msgid "_Play with Subtitle"
+msgstr "_Wczytaj napisy"
+
 #: ../src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in.h:1
 msgid "Subtitle language"
 msgstr "Język napisów"
@@ -2362,80 +2214,18 @@
 msgid "The language to search for subtitles for movies in."
 msgstr "Język wyszukiwanych napisów."
 
-#: ../src/plugins/ontop/ontop.plugin.in.h:1
-msgid "Always On Top"
-msgstr "Zawsze na wierzchu"
-
-#: ../src/plugins/ontop/ontop.plugin.in.h:2
-msgid "Keep the main window on top when playing a movie"
-msgstr "Utrzymywanie głównego okna ponad innymi podczas odtwarzania filmu"
+#: ../src/plugins/properties/movie-properties.plugin.in.h:1
+msgid "Movie Properties"
+msgstr "Właściwości filmu"
+
+#: ../src/plugins/properties/movie-properties.plugin.in.h:2
+msgid "Adds movie properties to the sidebar"
+msgstr "Dodaje właściwości filmu do bocznego panelu"
 
 #: ../src/plugins/properties/totem-movie-properties.c:246
 msgid "Properties"
 msgstr "Właściwości"
 
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:1
-msgid "Publisher protocol to use"
-msgstr "Użyty protokół publikowania"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:2
-msgid ""
-"The transport protocol to use when publishing playlists over the network."
-msgstr ""
-"Użyty protokół przesyłania podczas publikowania list odtwarzania "
-"przesyłanych przez sieć."
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:3
-msgid "Format for network service name"
-msgstr "Format nazwy usługi sieciowej"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:5
-#, no-c-format
-msgid ""
-"A format string used to build the network service name used when publishing "
-"playlists over the network. The following format placeholders can be used: • "
-"%a: the program name as returned by g_get_application_name() • %h: the "
-"machine's host name in title case • %u: the user's login name in title case "
-"• %U: the user's real name • %%: the percent sign"
-msgstr ""
-"Ciąg formatu użyty do stworzenia nazwy usługi sieciowej podczas publikowania "
-"list odtwarzania przez sieć. Można użyć następujących symboli zastępczych: • "
-"%a: nazwa programu zwracana przez g_get_application_name() • %h: nazwa "
-"komputera (jak nazwy własne) • %u: login użytkownika (jak nazwy własne) • "
-"%U: imię i nazwisko użytkownika • %%: znak procentu"
-
-#. Translators: computers on the local network which are publishing their playlists over the network
-#: ../src/plugins/publish/totem-publish.c:552
-msgid "Neighbors"
-msgstr "Sąsiedzi"
-
-#: ../src/plugins/publish/publish.plugin.in.h:1
-msgid "Publish Playlist"
-msgstr "Opublikowanie listy odtwarzania"
-
-#: ../src/plugins/publish/publish.plugin.in.h:2
-msgid "Share the current playlist via HTTP"
-msgstr "Współdzielenie bieżącej listy odtwarzania przez HTTP"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:1
-msgid "Service _Name:"
-msgstr "_Nazwa usługi:"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:3
-#, no-c-format
-msgid ""
-"The name used for announcing the playlist service on the network.\n"
-"All occurrences of the string %u will be replaced by your name,\n"
-"and %h will be replaced by your computer's host name."
-msgstr ""
-"Nazwa używana do rozgłaszania usługi listy odtwarzania w sieci.\n"
-"Wszystkie wystąpienia ciągu %u zostaną zastąpione nazwą użytkownika,\n"
-"a %h zostanie zastąpiony nazwą komputera użytkownika."
-
-#: ../src/plugins/publish/publish-plugin.ui.h:6
-msgid "Use _encrypted transport protocol (HTTPS)"
-msgstr "_Szyfrowanie protokołu przesyłania (HTTPS)"
-
 #: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:1
 msgid "rpdb2 password"
 msgstr "hasło rpdb2"
@@ -2449,22 +2239,88 @@
 "programu Totem. W przypadku opuszczenia pola użyte zostanie hasło domyślne "
 "\"totem\"."
 
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
+msgid "Python Console"
+msgstr "Konsola języka Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
+msgid "Interactive Python console"
+msgstr "Interaktywna konsola języka Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:88
+msgid "Python Console Menu"
+msgstr "Menu konsoli języka Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:93
+msgid "_Python Console"
+msgstr "_Konsola języka Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:94
+msgid "Show Totem's Python console"
+msgstr "Wyświetla konsolę języka Python programu Totem"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:100
+msgid "Python Debugger"
+msgstr "Debuger języka Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:101
+msgid "Enable remote Python debugging with rpdb2"
+msgstr ""
+"Włączenie zdalnego debugowania języka Python za pomocą biblioteki rpdb2"
+
+#. pylint: disable-msg=E1101
+#: ../src/plugins/pythonconsole/pythonconsole.py:125
+#, python-format
+msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
+msgstr ""
+"Dostęp do obiektu Totem.Object można uzyskać przez \"totem_object\":\\n%s"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:129
+msgid "Totem Python Console"
+msgstr "Konsola języka Python dla programu Totem"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:139
+msgid ""
+"After you press OK, Totem will wait until you connect to it with winpdb or "
+"rpdb2. If you have not set a debugger password in DConf, it will use the "
+"default password ('totem')."
+msgstr ""
+"Po naciśnięciu przycisku OK program Totem poczeka na połączenie z winpdb lub "
+"rpdb2. Jeśli hasło debugowania nie zostało ustawione w DConf, to zostanie "
+"użyte domyślne hasło (\"totem\")."
+
+#: ../src/plugins/recent/recent.plugin.in.h:1
+msgid "Recent files"
+msgstr "Ostatnie pliki"
+
+#: ../src/plugins/recent/recent.plugin.in.h:2
+msgid "Adds files that have been played to recent files"
+msgstr "Dodaje odtworzone filmy do listy ostatnich plików"
+
 #: ../src/plugins/rotation/rotation.plugin.in.h:1
 msgid "Rotation Plugin"
 msgstr "Wtyczka obracania"
 
 #: ../src/plugins/rotation/rotation.plugin.in.h:2
-msgid "Allows videos to be rotated if they're in the wrong orientation."
-msgstr "Umożliwia obracanie nagrań wideo, jeśli mają błędną orientację."
+msgid "Allows videos to be rotated if they are in the wrong orientation"
+msgstr "Umożliwia obracanie nagrań wideo, jeśli mają błędną orientację"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:60
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:50
 msgid "_Rotate Clockwise"
 msgstr "_Obróć zgodnie z ruchem wskazówek zegara"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:62
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:52
 msgid "Rotate Counterc_lockwise"
 msgstr "O_bróć przeciwnie do ruchu wskazówek zegara"
 
+#: ../src/plugins/save-file/save-file.plugin.in.h:1
+msgid "Save Copy"
+msgstr "Zapis kopii"
+
+#: ../src/plugins/save-file/save-file.plugin.in.h:2
+msgid "Save a copy of the currently playing movie"
+msgstr "Zapisuje kopię obecnie odtwarzanego filmu"
+
 #: ../src/plugins/save-file/totem-save-file.c:63
 msgid "Save a Copy..."
 msgstr "Zapisz kopię..."
@@ -2487,10 +2343,13 @@
 msgid "Movie stream"
 msgstr "Strumień wideo"
 
-#: ../src/plugins/screensaver/totem-screensaver.c:116
-#: ../browser-plugin/totem-plugin-viewer.c:1891
-msgid "Playing a movie"
-msgstr "Odtwarzanie filmu"
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:1
+msgid "Screen Saver"
+msgstr "Wygaszacz ekranu"
+
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:2
+msgid "Deactivates the screen saver when a movie is playing"
+msgstr "Wyłącza wygaszacz ekranu podczas odtwarzania filmu"
 
 #: ../src/plugins/screenshot/gallery.ui.h:1
 msgid "Screenshot width (in pixels):"
@@ -2504,23 +2363,28 @@
 msgid "Number of screenshots:"
 msgstr "Liczba zrzutów ekranu:"
 
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:1
-msgid "_Name:"
-msgstr "_Nazwa:"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:2
-msgid "Save in _folder:"
-msgstr "Zapis w _katalogu:"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:3
-msgid "Select a folder"
-msgstr "Wybór katalogu"
-
-#. Write the screenshot to the temporary file
-#: ../src/plugins/screenshot/gnome-screenshot-widget.c:385
-#: ../src/plugins/screenshot/totem-screenshot.c:64
-msgid "Screenshot.png"
-msgstr "Zrzut_ekranu.png"
+#. translators: this is the name of the file that gets made up
+#. * with the screenshot if the entire screen is taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:147
+#, c-format
+msgid "Screenshot from %s.png"
+msgstr "Zrzut ekranu z %s.png"
+
+#. translators: this is the name of the file that gets
+#. * made up with the screenshot if the entire screen is
+#. * taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:154
+#, c-format
+msgid "Screenshot from %s - %d.png"
+msgstr "Zrzut ekranu z %s - %d.png"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:1
+msgid "Screenshot"
+msgstr "Zrzut ekranu"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:2
+msgid "Allows screenshots and galleries to be taken of videos"
+msgstr "Umożliwia pobieranie zrzutów ekranu i galerii filmów"
 
 #: ../src/plugins/screenshot/totem-gallery.c:91
 msgid "Save Gallery"
@@ -2546,50 +2410,48 @@
 msgid "Saving gallery as \"%s\""
 msgstr "Zapisywanie galerii jako \"%s\""
 
-#: ../src/plugins/screenshot/totem-screenshot.c:113
-msgid "There was an error saving the screenshot."
-msgstr "Wystąpił błąd podczas zapisywania zrzutu ekranu."
-
-#: ../src/plugins/screenshot/totem-screenshot.c:139
-msgid "Save Screenshot"
-msgstr "Zapis zrzutu ekranu"
-
-#. Create the screenshot widget
-#. Translators: %s is the movie title and %d is an auto-incrementing number to make filename unique
-#: ../src/plugins/screenshot/totem-screenshot.c:160
-#, c-format
-msgid "Screenshot-%s-%d.png"
-msgstr "Zrzut_ekranu-%s-%d.png"
-
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:88
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:220
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "Totem could not get a screenshot of the video."
 msgstr "Program Totem nie może pobrać zrzutu ekranu tego wideo."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "This is not supposed to happen; please file a bug report."
 msgstr ""
 "Ta sytuacja nie powinna mieć miejsca. Proszę wypełnić zgłoszenie błędu."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
-msgid "Take _Screenshot..."
-msgstr "_Zrzut ekranu..."
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
+msgid "Take _Screenshot"
+msgstr "_Zrzut ekranu"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
 msgid "Take a screenshot"
 msgstr "Wykonuje zrzut ekranu"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create Screenshot _Gallery..."
 msgstr "_Utwórz galerię zrzutów ekranu..."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create a gallery of screenshots"
 msgstr "Tworzy galerię zrzutów ekranu"
 
+#: ../src/plugins/skipto/skipto.plugin.in.h:1
+#: ../src/plugins/skipto/totem-skipto.c:196
+msgid "Skip To"
+msgstr "Przejście do"
+
+#: ../src/plugins/skipto/skipto.plugin.in.h:2
+msgid "Provides the \"Skip to\" dialog"
+msgstr "Dostarcza okno dialogowe \"Przejdź do\""
+
+#: ../src/plugins/skipto/skipto.ui.h:1
+msgid "_Skip to:"
+msgstr "_Przejście do:"
+
 #. Update the "seconds" label so that it always has the correct singular/plural form
 #. Translators: label for the seconds selector in the "Skip to" dialogue
-#: ../src/plugins/skipto/totem-skipto.c:160
+#: ../src/plugins/skipto/totem-skipto.c:159
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "sekunda"
@@ -2600,15 +2462,11 @@
 #. Translators: you should translate this string to a number (written in digits) which corresponds to the longer character length of the
 #. * translations for "second" and "seconds", as translated elsewhere in this file. For example, in English, "second" is 6 characters long and
 #. * "seconds" is 7 characters long, so this string should be translated to "7". See: bgo#639398
-#: ../src/plugins/skipto/totem-skipto.c:190
+#: ../src/plugins/skipto/totem-skipto.c:189
 msgctxt "Skip To label length"
 msgid "7"
 msgstr "7"
 
-#: ../src/plugins/skipto/totem-skipto.c:197
-msgid "Skip To"
-msgstr "Przejście"
-
 #: ../src/plugins/skipto/totem-skipto-plugin.c:182
 msgid "_Skip To..."
 msgstr "P_rzejdź do..."
@@ -2616,115 +2474,3 @@
 #: ../src/plugins/skipto/totem-skipto-plugin.c:182
 msgid "Skip to a specific time"
 msgstr "Przechodzi do podanego czasu"
-
-#: ../src/plugins/skipto/skipto.ui.h:1
-msgid "_Skip to:"
-msgstr "_Przejście do:"
-
-#: ../browser-plugin/totem-plugin-viewer.c:431
-msgid "No URI to play"
-msgstr "Brak adresu URI do odtworzenia"
-
-#. translators: this is:
-#. * Open With ApplicationName
-#. * as in nautilus' right-click menu
-#: ../browser-plugin/totem-plugin-viewer.c:1107
-#, c-format
-msgid "_Open with \"%s\""
-msgstr "_Otwórz za pomocą \"%s\""
-
-#: ../browser-plugin/totem-plugin-viewer.c:2136
-msgid "No playlist or playlist empty"
-msgstr "Brak listy odtwarzania lub lista jest pusta"
-
-#: ../browser-plugin/totem-plugin-viewer.c:2235
-msgid "Movie browser plugin"
-msgstr "Wtyczka przeglądarki filmów"
-
-#: ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Verify your system installation. The Totem plugin will now exit."
-msgstr ""
-"Proszę sprawdzić poprawność instalacji systemu. Działanie wtyczki programu "
-"Totem zostanie teraz zakończone."
-
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
-msgid "Python Console"
-msgstr "Konsola języka Python"
-
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
-msgid "Interactive Python console."
-msgstr "Interaktywna konsola języka Python."
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:88
-msgid "Python Console Menu"
-msgstr "Menu konsoli języka Python"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:93
-msgid "_Python Console"
-msgstr "_Konsola języka Python"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:94
-msgid "Show Totem's Python console"
-msgstr "Wyświetla konsolę języka Python programu Totem"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:100
-msgid "Python Debugger"
-msgstr "Debuger języka Python"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:101
-msgid "Enable remote Python debugging with rpdb2"
-msgstr ""
-"Włączenie zdalnego debugowania języka Python za pomocą biblioteki rpdb2"
-
-#. pylint: disable-msg=E1101
-#: ../src/plugins/pythonconsole/pythonconsole.py:125
-#, python-format
-msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
-msgstr ""
-"Dostęp do obiektu Totem.Object można uzyskać przez \"totem_object\":\\n%s"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:129
-msgid "Totem Python Console"
-msgstr "Konsola języka Python dla programu Totem"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:139
-msgid ""
-"After you press OK, Totem will wait until you connect to it with winpdb or "
-"rpdb2. If you have not set a debugger password in DConf, it will use the "
-"default password ('totem')."
-msgstr ""
-"Po naciśnięciu przycisku OK program Totem poczeka na połączenie z winpdb lub "
-"rpdb2. Jeśli hasło debugowania nie zostało ustawione w DConf, to zostanie "
-"użyte domyślne hasło (\"totem\")."
-
-#: ../src/plugins/grilo/grilo.plugin.in.h:1
-msgid "Grilo Browser"
-msgstr "Przeglądarka Grilo"
-
-#: ../src/plugins/grilo/grilo.plugin.in.h:2
-msgid "A plugin to let you browse media content from various sources."
-msgstr "Wtyczka umożliwiająca przeglądania nagrań wideo z różnych źródeł."
-
-#: ../src/plugins/grilo/totem-grilo.c:452
-msgid "Browse Error"
-msgstr "Błąd przeglądania"
-
-#: ../src/plugins/grilo/totem-grilo.c:599
-msgid "Search Error"
-msgstr "Błąd wyszukiwania"
-
-#: ../src/plugins/grilo/totem-grilo.c:1219 ../src/plugins/grilo/grilo.ui.h:3
-msgid "Browse"
-msgstr "Przeglądaj"
-
-#: ../src/plugins/grilo/totem-grilo.c:1285 ../src/plugins/grilo/grilo.ui.h:4
-msgid "Search"
-msgstr "Wyszukaj"
-
-#: ../src/plugins/grilo/grilo.ui.h:1
-msgid "Add to Playlist"
-msgstr "Dodaj do listy odtwarzania"
-
-#: ../src/plugins/grilo/grilo.ui.h:2
-msgid "Copy Location"
-msgstr "Skopiuj położenie"
diff -Nru totem-3.4.3/po/pt.po totem-3.6.2/po/pt.po
--- totem-3.4.3/po/pt.po	2012-04-02 14:15:40.000000000 +0000
+++ totem-3.6.2/po/pt.po	2012-10-25 13:15:32.000000000 +0000
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.4\n"
+"Project-Id-Version: 3.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-24 12:07+0000\n"
-"PO-Revision-Date: 2012-03-24 12:10+0000\n"
+"POT-Creation-Date: 2012-09-12 23:39+0100\n"
+"PO-Revision-Date: 2012-09-09 01:55+0000\n"
 "Last-Translator: Duarte Loreto \n"
 "Language-Team: Portuguese \n"
 "Language: pt\n"
@@ -17,14 +17,232 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ../browser-plugin/totem-plugin-viewer.c:352 ../src/totem-object.c:1180
+#: ../src/totem-object.c:1650 ../src/totem-statusbar.c:115
+msgid "Stopped"
+msgstr "Parado"
+
+#: ../browser-plugin/totem-plugin-viewer.c:364 ../src/totem-object.c:1173
+msgid "Paused"
+msgstr "Pausado"
+
+#: ../browser-plugin/totem-plugin-viewer.c:368 ../src/totem-object.c:1166
+msgid "Playing"
+msgstr "A Reproduzir"
+
+#: ../browser-plugin/totem-plugin-viewer.c:386
+#: ../src/plugins/screensaver/totem-screensaver.c:97
+msgid "Playing a movie"
+msgstr "A reproduzir um filme"
+
+#: ../browser-plugin/totem-plugin-viewer.c:443
+msgid "No URI to play"
+msgstr "Nenhum URI a reproduzir"
+
+#: ../browser-plugin/totem-plugin-viewer.c:676
+#: ../browser-plugin/totem-plugin-viewer.c:1700
+msgid "Totem Movie Player"
+msgstr "Reprodutor de Filmes Totem"
+
+#. translators: this is:
+#. * Open With ApplicationName
+#. * as in nautilus' right-click menu
+#: ../browser-plugin/totem-plugin-viewer.c:1120
+#, c-format
+msgid "_Open with \"%s\""
+msgstr "_Abrir com \"%s\""
+
+#: ../browser-plugin/totem-plugin-viewer.c:1341 ../src/totem-object.c:2475
+msgid "An error occurred"
+msgstr "Ocorreu um erro"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2033
+msgid "No playlist or playlist empty"
+msgstr "Nenhuma lista de reprodução ou lista vazia"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2128
+msgid "Movie browser plugin"
+msgstr "Plugin de navegador de filmes"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144 ../src/totem.c:240
+msgid "Could not initialize the thread-safe libraries."
+msgstr "Incapaz de inicializar as bibliotecas de threads seguras."
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144
+msgid "Verify your system installation. The Totem plugin will now exit."
+msgstr ""
+"Verifique a instalação do seu sistema. O plugin Totem irá agora terminar."
+
 #: ../data/fullscreen.ui.h:1
 msgid "Leave Fullscreen"
 msgstr "Deixar Modo de Ecrã Completo"
 
-#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:144
+#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:81
 msgid "Time:"
 msgstr "Tempo:"
 
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
+msgid "Allow the screensaver to activate when playing audio"
+msgstr "Permitir que a protecção de ecrã seja activada ao reproduzir áudio"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
+msgid ""
+"Allow the screensaver to activate when playing audio. Disable if you have "
+"monitor-powered speakers."
+msgstr ""
+"Permitir que a protecção de ecrã seja activada ao reproduzir áudio. "
+"Desactive se tiver colunas de som alimentadas pelo monitor."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
+msgid "Show visual effects when no video is displayed"
+msgstr ""
+"Apresentar efeitos visuais quando não está a ser apresentado nenhum vídeo"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
+msgid "Show visual effects when playing an audio only file."
+msgstr "Apresentar efeitos visuais ao reproduzir um ficheiro apenas de áudio."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
+msgid "Name of the visual effects plugin"
+msgstr "Nome do plugin de efeitos visuais"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
+msgid "The brightness of the video"
+msgstr "O brilho do vídeo"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
+msgid "The contrast of the video"
+msgstr "O contraste do vídeo"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
+msgid "The hue of the video"
+msgstr "A matiz do vídeo"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
+msgid "The saturation of the video"
+msgstr "A saturação do vídeo"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
+msgid "Resize the canvas automatically on file load"
+msgstr "Redimensionar automaticamente a tela ao ler ficheiro"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
+msgid "Repeat mode"
+msgstr "Modo de repetição"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
+msgid "Shuffle mode"
+msgstr "Modo de baralhar"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
+msgid "Whether to disable deinterlacing for interlaced movies"
+msgstr "Se desactivar ou não o desinterlaçar de filmes interlaçados"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
+msgid "Whether to enable debug for the playback engine"
+msgstr "Se activar ou não depuração para o motor de reprodução"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
+msgid "Type of audio output to use"
+msgstr "O tipo de saída áudio a utilizar"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
+msgid "Visualization quality setting"
+msgstr "Definição da qualidade de visualização"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
+msgid "Quality setting for the audio visualization."
+msgstr "Definição de qualidade para a visualização áudio."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
+msgid "Network buffering threshold"
+msgstr "Limite de buffer de rede"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
+msgid ""
+"Amount of data to buffer for network streams before starting to display the "
+"stream (in seconds)."
+msgstr ""
+"Quantidade de dados a guardar em buffer para fluxos por rede antes de "
+"iniciar a apresentação do fluxo (em segundos)."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
+msgid "Subtitle font"
+msgstr "Fonte das legendas"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
+msgid "Pango font description for subtitle rendering."
+msgstr "Descrição da fonte Pango para a renderização de legendas."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
+msgid "Subtitle encoding"
+msgstr "Codificação das legendas"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
+msgid "Encoding character set for subtitle."
+msgstr "Codificação de caracteres das legendas."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
+msgid "Default location for the \"Open...\" dialogs"
+msgstr "Localização por omissão para os diálogos \"Abrir...\""
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
+msgid ""
+"Default location for the \"Open...\" dialogs. Default is the current "
+"directory."
+msgstr ""
+"Localização por omissão para os diálogos \"Abrir...\". Por omissão é o "
+"directório actual."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
+msgid "Default location for the \"Take Screenshot\" dialogs"
+msgstr "Localização por omissão para os diálogos \"Capturar Ecrã\""
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
+msgid ""
+"Default location for the \"Take Screenshot\" dialogs. Default is the "
+"Pictures directory."
+msgstr ""
+"Localização por omissão para os diálogos \"Capturar Ecrã\". Por omissão é o "
+"directório Imagens."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
+msgid "Whether to disable the plugins in the user's home directory"
+msgstr "Se desactivar ou não os plugins na pasta pessoal do utilizador"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
+msgid "Whether to disable the keyboard shortcuts"
+msgstr "Se desactivar ou não os atalhos de teclado"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
+msgid "Whether to autoload text subtitle files when a movie is loaded"
+msgstr "Se ler automaticamente ou não o ficheiro de legendas ao ler um filme"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
+msgid "Whether to autoload external chapter files when a movie is loaded"
+msgstr ""
+"Se ler automaticamente ou não os ficheiros de capítulos ao ler um filme"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
+msgid ""
+"Whether to remember the position of played audio/video files when pausing or "
+"closing them"
+msgstr ""
+"Se recordar ou não a posição nos ficheiros de áudio/vídeo ao pausá-los ou "
+"fechá-los"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
+msgid "Active plugins list"
+msgstr "Lista de plugins activos"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+msgid ""
+"A list of the names of the plugins which are currently active (loaded and "
+"running)."
+msgstr ""
+"A lista dos nomes dos plugins que estão actualmente activos (lidos e em "
+"execução)."
+
 #: ../data/playlist.ui.h:1
 msgid "_Remove"
 msgstr "_Remover"
@@ -41,11 +259,11 @@
 msgid "Copy the location to the clipboard"
 msgstr "Copiar a localização para a área de transferência"
 
-#: ../data/playlist.ui.h:5 ../data/totem.ui.h:78
+#: ../data/playlist.ui.h:5 ../data/totem.ui.h:71
 msgid "_Select Text Subtitles..."
 msgstr "_Seleccionar as Legendas..."
 
-#: ../data/playlist.ui.h:6 ../data/totem.ui.h:79
+#: ../data/playlist.ui.h:6 ../data/totem.ui.h:72
 msgid "Select a file to use for text subtitles"
 msgstr "Seleccione um ficheiro a utilizar para as legendas"
 
@@ -69,10 +287,165 @@
 msgid "Move Down"
 msgstr "Mover Abaixo"
 
-#: ../data/properties.ui.h:1 ../data/totem.ui.h:122
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:2
+msgid "Normal"
+msgstr "Normal"
+
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:4
+msgid "Large"
+msgstr "Grande"
+
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:6
+msgid "Extra Large"
+msgstr "Extra Grande"
+
+#: ../data/preferences.ui.h:7 ../src/backend/bacon-video-widget.c:5498
+#: ../src/totem-properties-view.c:231
+msgid "Stereo"
+msgstr "Stereo"
+
+#: ../data/preferences.ui.h:8
+msgid "4-channel"
+msgstr "4-canais"
+
+#: ../data/preferences.ui.h:9
+msgid "4.1-channel"
+msgstr "4.1-canais"
+
+#: ../data/preferences.ui.h:10
+msgid "5.0-channel"
+msgstr "5.0-canais"
+
+#: ../data/preferences.ui.h:11
+msgid "5.1-channel"
+msgstr "5.1-canais"
+
+#: ../data/preferences.ui.h:12
+msgid "AC3 Passthrough"
+msgstr "Passagem AC3"
+
+#: ../data/preferences.ui.h:13
+msgid "Totem Preferences"
+msgstr "Preferências Totem"
+
+#: ../data/preferences.ui.h:14
+msgid "Playback"
+msgstr "Reproduzir"
+
+#: ../data/preferences.ui.h:15
+msgid "Start playing files from last position"
+msgstr "Iniciar a reprodução de ficheiros a partir da última posição"
+
+#: ../data/preferences.ui.h:16
+msgid "Text Subtitles"
+msgstr "Legendas"
+
+#: ../data/preferences.ui.h:17
+msgid "_Load subtitle files when movie is loaded"
+msgstr "_Ler os ficheiros de legendas ao ler o filme"
+
+#: ../data/preferences.ui.h:18
+msgid "_Font:"
+msgstr "_Fonte:"
+
+#: ../data/preferences.ui.h:19
+msgid "_Encoding:"
+msgstr "C_odificação"
+
+#: ../data/preferences.ui.h:20
+msgid "External Chapters"
+msgstr "Capítulos Externos"
+
+#: ../data/preferences.ui.h:21
+msgid "Load _chapter files when movie is loaded"
+msgstr "Ler os ficheiros de _capítulos ao ler o filme"
+
+#: ../data/preferences.ui.h:22 ../data/properties.ui.h:1
 msgid "General"
 msgstr "Geral"
 
+#. Tab label in the Preferences dialogue
+#: ../data/preferences.ui.h:24
+msgid "Display"
+msgstr "Ecrã"
+
+#: ../data/preferences.ui.h:25
+msgid "_Resize the window when a new video is loaded"
+msgstr "_Redimensionar a janela ao ler um novo vídeo"
+
+#: ../data/preferences.ui.h:26
+msgid "Disable _deinterlacing of interlaced videos"
+msgstr "Desactivar o _desinterlaçar de vídeos interlaçados"
+
+#: ../data/preferences.ui.h:27
+msgid "Disable screensaver when playing "
+msgstr "Desactivar a protecção de ecrã durante a reprodução "
+
+#: ../data/preferences.ui.h:28 ../data/properties.ui.h:9
+#: ../src/totem-properties-view.c:273
+msgid "Video"
+msgstr "Vídeo"
+
+#: ../data/preferences.ui.h:29
+msgid "Video or Audio"
+msgstr "Vídeo ou Áudio"
+
+#: ../data/preferences.ui.h:30
+msgid "Visual Effects"
+msgstr "Efeitos Visuais"
+
+#: ../data/preferences.ui.h:31
+msgid "Show _visual effects when an audio file is played"
+msgstr "Apresentar efeitos _visuais ao reproduzir um ficheiro áudio"
+
+#: ../data/preferences.ui.h:32
+msgid "_Type of visualization:"
+msgstr "_Tipo de visualização:"
+
+#: ../data/preferences.ui.h:33
+msgid "Visualization _size:"
+msgstr "_Tamanho de visualização:"
+
+#: ../data/preferences.ui.h:34
+msgid "Color Balance"
+msgstr "Equilíbrio de Cores"
+
+#: ../data/preferences.ui.h:35
+msgid "_Brightness:"
+msgstr "_Brilho:"
+
+#: ../data/preferences.ui.h:36
+msgid "Co_ntrast:"
+msgstr "Co_ntraste:"
+
+#: ../data/preferences.ui.h:37
+msgid "Sat_uration:"
+msgstr "Sat_uração:"
+
+#: ../data/preferences.ui.h:38
+msgid "_Hue:"
+msgstr "_Matiz:"
+
+#: ../data/preferences.ui.h:39
+msgid "Reset to _Defaults"
+msgstr "Repor Valores por _Omissão"
+
+#: ../data/preferences.ui.h:40
+msgid "Audio Output"
+msgstr "Saída Áudio"
+
+#: ../data/preferences.ui.h:41
+msgid "_Audio output type:"
+msgstr "Tipo de saída á_udio:"
+
+#: ../data/preferences.ui.h:42 ../data/properties.ui.h:14
+#: ../src/totem-properties-view.c:271
+msgid "Audio"
+msgstr "Áudio"
+
 #: ../data/properties.ui.h:2
 msgid "Title:"
 msgstr "Título:"
@@ -101,11 +474,6 @@
 msgid "Container:"
 msgstr "Contentor:"
 
-#: ../data/properties.ui.h:9 ../data/totem.ui.h:128
-#: ../src/totem-properties-view.c:270
-msgid "Video"
-msgstr "Vídeo"
-
 #: ../data/properties.ui.h:10
 msgid "Dimensions:"
 msgstr "Dimensões:"
@@ -122,11 +490,6 @@
 msgid "Bitrate:"
 msgstr "Rácio bit:"
 
-#: ../data/properties.ui.h:14 ../data/totem.ui.h:142
-#: ../src/totem-properties-view.c:268
-msgid "Audio"
-msgstr "Áudio"
-
 #: ../data/properties.ui.h:15
 msgid "Sample rate:"
 msgstr "Rácio de amostra:"
@@ -135,743 +498,445 @@
 msgid "Channels:"
 msgstr "Canais:"
 
-#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
-msgid "_Add to Playlist"
-msgstr "_Adicionar à Lista de Reprodução"
-
-#: ../data/video-list.ui.h:2
-msgid "Add the video to the playlist"
-msgstr "Adicionar o vídeo à lista de reprodução"
-
 #. Title
-#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:143
-#: ../src/totem-object.c:1667
-msgid "Movie Player"
-msgstr "Reprodutor de Filmes"
+#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:80 ../src/totem.c:239
+#: ../src/totem.c:248 ../src/totem-menu.c:790 ../src/totem-object.c:1658
+msgid "Videos"
+msgstr "Vídeos"
 
 #: ../data/totem.desktop.in.in.in.h:2
-msgid "Play movies and songs"
-msgstr "Reproduzir filmes e músicas"
+msgid "Play movies"
+msgstr "Reproduzir filmes"
+
+#: ../data/totem.desktop.in.in.in.h:3
+msgid "Video;Movie;Film;Clip;Series;Player;DVD;TV;Disc;"
+msgstr "Vídeo;Filme;Clip;Séries;Reprodutor;DVD;TV;Disc;"
 
 #: ../data/totem.ui.h:1
-msgid "_Movie"
-msgstr "_Filme"
+msgid "_Open"
+msgstr "_Abrir"
 
 #: ../data/totem.ui.h:2
-msgid "_Open..."
-msgstr "_Abrir..."
+msgid "Open _Location"
+msgstr "Abrir _Localização"
 
 #: ../data/totem.ui.h:3
-msgid "Open a file"
-msgstr "Abrir um ficheiro"
+msgid "_Fullscreen"
+msgstr "_Ecrã Completo"
 
 #: ../data/totem.ui.h:4
-msgid "Open _Location..."
-msgstr "Abrir _Localização..."
+msgid "Prefere_nces"
+msgstr "Preferê_ncias"
 
 #: ../data/totem.ui.h:5
-msgid "Open a non-local file"
-msgstr "Abrir um ficheiro não-local"
+msgid "Shuff_le"
+msgstr "Bara_lhar"
 
 #: ../data/totem.ui.h:6
+msgid "_Repeat"
+msgstr "_Repetir"
+
+#: ../data/totem.ui.h:7
+msgid "_Quit"
+msgstr "_Sair"
+
+#: ../data/totem.ui.h:8
+msgid "_Movie"
+msgstr "_Filme"
+
+#: ../data/totem.ui.h:9
 msgid "_Eject"
 msgstr "_Ejectar"
 
-#: ../data/totem.ui.h:7
+#: ../data/totem.ui.h:10
 msgid "Eject the current disc"
 msgstr "Ejectar o disco actual"
 
-#: ../data/totem.ui.h:8
+#: ../data/totem.ui.h:11
 msgid "_Properties"
 msgstr "_Propriedades"
 
-#: ../data/totem.ui.h:9
+#: ../data/totem.ui.h:12
 msgid "View the properties of the current stream"
 msgstr "Visualizar as propriedades do fluxo actual"
 
-#: ../data/totem.ui.h:10
+#: ../data/totem.ui.h:13
 msgid "Play / P_ause"
 msgstr "Reproduzir / P_ausar"
 
-#: ../data/totem.ui.h:11
+#: ../data/totem.ui.h:14
 msgid "Play or pause the movie"
 msgstr "Reproduzir ou pausar o filme"
 
-#: ../data/totem.ui.h:12
-msgid "_Quit"
-msgstr "_Sair"
-
-#: ../data/totem.ui.h:13
-msgid "Quit the program"
-msgstr "Sair da aplicação"
-
-#: ../data/totem.ui.h:14
+#: ../data/totem.ui.h:15
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../data/totem.ui.h:15
+#: ../data/totem.ui.h:16
 msgid "_Clear Playlist"
 msgstr "_Limpar a Lista de Reprodução"
 
-#: ../data/totem.ui.h:16
+#: ../data/totem.ui.h:17
 msgid "Clear the playlist"
 msgstr "Limpar a lista de reprodução"
 
-#: ../data/totem.ui.h:17
-msgid "Prefere_nces"
-msgstr "Preferê_ncias"
-
 #: ../data/totem.ui.h:18
-msgid "Configure the application"
-msgstr "Configurar a aplicação"
-
-#: ../data/totem.ui.h:19
 msgid "Plugins..."
 msgstr "Plugins..."
 
-#: ../data/totem.ui.h:20
+#: ../data/totem.ui.h:19
 msgid "Configure plugins to extend the application"
 msgstr "Configure plugins para estender a aplicação"
 
-#: ../data/totem.ui.h:21
+#: ../data/totem.ui.h:20
 msgid "_View"
 msgstr "_Ver"
 
-#: ../data/totem.ui.h:22
-msgid "_Fullscreen"
-msgstr "_Ecrã Completo"
-
-#: ../data/totem.ui.h:23
-msgid "Switch to fullscreen"
-msgstr "Alternar para ecrã completo"
-
-#: ../data/totem.ui.h:24
+#: ../data/totem.ui.h:21
 msgid "Fit Window to Movie"
 msgstr "Dimensionar a Janela ao Filme"
 
-#: ../data/totem.ui.h:25
+#: ../data/totem.ui.h:22
 msgid "_Resize 1:2"
 msgstr "_Redimensionar 1:2"
 
-#: ../data/totem.ui.h:26
+#: ../data/totem.ui.h:23
 msgid "Resize to half the original video size"
 msgstr "Redimensionar para metade do tamanho original do vídeo"
 
-#: ../data/totem.ui.h:27
+#: ../data/totem.ui.h:24
 msgid "Resize _1:1"
 msgstr "Redimensionar _1:1"
 
-#: ../data/totem.ui.h:28
+#: ../data/totem.ui.h:25
 msgid "Resize to the original video size"
 msgstr "Redimensionar para o tamanho original do vídeo"
 
-#: ../data/totem.ui.h:29
+#: ../data/totem.ui.h:26
 msgid "Resize _2:1"
 msgstr "Redimensionar _2:1"
 
-#: ../data/totem.ui.h:30
+#: ../data/totem.ui.h:27
 msgid "Resize to double the original video size"
 msgstr "Redimensionar para o dobro do tamanho original do vídeo"
 
-#: ../data/totem.ui.h:31
+#: ../data/totem.ui.h:28
 msgid "_Aspect Ratio"
 msgstr "Rácio de _Aparência"
 
-#: ../data/totem.ui.h:32
+#: ../data/totem.ui.h:29
 msgid "Switch An_gles"
 msgstr "Alternar Ân_gulos"
 
-#: ../data/totem.ui.h:33
+#: ../data/totem.ui.h:30
 msgid "Switch camera angles"
 msgstr "Alternar os ângulos da câmara"
 
-#: ../data/totem.ui.h:34
+#: ../data/totem.ui.h:31
 msgid "_Go"
 msgstr "_Ir"
 
-#: ../data/totem.ui.h:35
+#: ../data/totem.ui.h:32
 msgid "_DVD Menu"
 msgstr "Menu de _DVD"
 
-#: ../data/totem.ui.h:36
+#: ../data/totem.ui.h:33
 msgid "Go to the DVD menu"
 msgstr "Ir para o menu de DVD"
 
-#: ../data/totem.ui.h:37
+#: ../data/totem.ui.h:34
 msgid "_Title Menu"
 msgstr "Menu de _Título"
 
-#: ../data/totem.ui.h:38
+#: ../data/totem.ui.h:35
 msgid "Go to the title menu"
 msgstr "Ir para o menu de título"
 
-#: ../data/totem.ui.h:39
+#: ../data/totem.ui.h:36
 msgid "A_udio Menu"
 msgstr "Menu de A_udio"
 
-#: ../data/totem.ui.h:40
+#: ../data/totem.ui.h:37
 msgid "Go to the audio menu"
 msgstr "Ir para o menu de áudio"
 
-#: ../data/totem.ui.h:41
+#: ../data/totem.ui.h:38
 msgid "_Angle Menu"
 msgstr "_Menu de Ângulo"
 
-#: ../data/totem.ui.h:42
+#: ../data/totem.ui.h:39
 msgid "Go to the angle menu"
 msgstr "Ir para o menu de ângulo"
 
-#: ../data/totem.ui.h:43
+#: ../data/totem.ui.h:40
 msgid "_Chapter Menu"
 msgstr "Menu de _Capítulos"
 
-#: ../data/totem.ui.h:44
+#: ../data/totem.ui.h:41
 msgid "Go to the chapter menu"
 msgstr "Ir para o menu de capítulos"
 
-#: ../data/totem.ui.h:45
+#: ../data/totem.ui.h:42
 msgid "_Next Chapter/Movie"
 msgstr "Capítulo/Filme _Seguinte"
 
-#: ../data/totem.ui.h:46
+#: ../data/totem.ui.h:43
 msgid "Next chapter or movie"
 msgstr "Capítulo ou filme seguinte"
 
-#: ../data/totem.ui.h:47
+#: ../data/totem.ui.h:44
 msgid "_Previous Chapter/Movie"
 msgstr "Capítulo/Filme _Anterior"
 
-#: ../data/totem.ui.h:48
+#: ../data/totem.ui.h:45
 msgid "Previous chapter or movie"
 msgstr "Capítulo ou filme anterior"
 
-#: ../data/totem.ui.h:49
+#: ../data/totem.ui.h:46
 msgid "_Sound"
 msgstr "_Som"
 
-#: ../data/totem.ui.h:50
+#: ../data/totem.ui.h:47
 msgid "Volume _Up"
 msgstr "A_umentar o Volume"
 
-#: ../data/totem.ui.h:51
+#: ../data/totem.ui.h:48
 msgid "Increase volume"
 msgstr "Aumentar o volume"
 
-#: ../data/totem.ui.h:52
+#: ../data/totem.ui.h:49
 msgid "Volume _Down"
 msgstr "Reduzir o _Volume"
 
-#: ../data/totem.ui.h:53
+#: ../data/totem.ui.h:50
 msgid "Decrease volume"
 msgstr "Reduzir o volume"
 
-#: ../data/totem.ui.h:54
+#: ../data/totem.ui.h:51
 msgid "_Help"
 msgstr "_Ajuda"
 
-#: ../data/totem.ui.h:55
+#: ../data/totem.ui.h:52
 msgid "_Contents"
 msgstr "_Conteúdo"
 
-#: ../data/totem.ui.h:56
+#: ../data/totem.ui.h:53
 msgid "Help contents"
 msgstr "Conteúdo da ajuda"
 
-#: ../data/totem.ui.h:57
+#: ../data/totem.ui.h:54
 msgid "_About"
 msgstr "_Sobre"
 
-#: ../data/totem.ui.h:58
+#: ../data/totem.ui.h:55
 msgid "About this application"
 msgstr "Sobre esta aplicação"
 
-#: ../data/totem.ui.h:59
-msgid "_Repeat Mode"
-msgstr "_Modo de Repetição"
-
-#: ../data/totem.ui.h:60
-msgid "Set the repeat mode"
-msgstr "Definir o modo de repetição"
-
-#: ../data/totem.ui.h:61
-msgid "Shuff_le Mode"
-msgstr "Modo de Bara_lhar"
-
-#: ../data/totem.ui.h:62
-msgid "Set the shuffle mode"
-msgstr "Definir o modo de baralhar"
-
-#: ../data/totem.ui.h:63
+#: ../data/totem.ui.h:56
 msgid "Show _Controls"
 msgstr "Apresentar _Controlos"
 
-#: ../data/totem.ui.h:64
+#: ../data/totem.ui.h:57
 msgid "Show controls"
 msgstr "Apresentar controlos"
 
-#: ../data/totem.ui.h:65
+#: ../data/totem.ui.h:58
 msgid "S_idebar"
 msgstr "Barra _Lateral"
 
-#: ../data/totem.ui.h:66
+#: ../data/totem.ui.h:59
 msgid "Show or hide the sidebar"
 msgstr "Apresentar ou esconder a barra lateral"
 
-#: ../data/totem.ui.h:67
+#: ../data/totem.ui.h:60
 msgctxt "Aspect ratio"
 msgid "Auto"
 msgstr "Auto"
 
-#: ../data/totem.ui.h:68
+#: ../data/totem.ui.h:61
 msgid "Sets automatic aspect ratio"
 msgstr "Define o rácio de aparência automático"
 
-#: ../data/totem.ui.h:69
+#: ../data/totem.ui.h:62
 msgid "Square"
 msgstr "Quadrado"
 
-#: ../data/totem.ui.h:70
+#: ../data/totem.ui.h:63
 msgid "Sets square aspect ratio"
 msgstr "Define o rácio de aparência quadrado"
 
-#: ../data/totem.ui.h:71
+#: ../data/totem.ui.h:64
 msgid "4:3 (TV)"
 msgstr "4:3 (TV)"
 
-#: ../data/totem.ui.h:72
+#: ../data/totem.ui.h:65
 msgid "Sets 4:3 (TV) aspect ratio"
 msgstr "Define o rácio de aparência 4:3 (TV)"
 
-#: ../data/totem.ui.h:73
-msgid "16:9 (Widescreen)"
-msgstr "16:9 (Ecrã largo)"
-
-#: ../data/totem.ui.h:74
-msgid "Sets 16:9 (widescreen) aspect ratio"
-msgstr "Define o rácio de aparência 16:9 (ecrã panorâmico)"
-
-#: ../data/totem.ui.h:75
-msgid "2.11:1 (DVB)"
-msgstr "2.11:1 (DVB)"
-
-#: ../data/totem.ui.h:76
-msgid "Sets 2.11:1 (DVB) aspect ratio"
-msgstr "Define o rácio de aparência 2.11:1 (DVB)"
-
-#: ../data/totem.ui.h:77
-msgid "S_ubtitles"
-msgstr "Le_gendas"
-
-#: ../data/totem.ui.h:80
-msgid "_Languages"
-msgstr "_Idiomas"
-
-#: ../data/totem.ui.h:81
-msgid "Zoom In"
-msgstr "Aumentar o Zoom"
-
-#: ../data/totem.ui.h:82
-msgid "Zoom in"
-msgstr "Aumentar o zoom"
-
-#: ../data/totem.ui.h:83
-msgid "Skip _Forward"
-msgstr "Saltar à _Frente"
-
-#: ../data/totem.ui.h:84
-msgid "Skip forward"
-msgstr "Saltar à frente"
-
-#: ../data/totem.ui.h:85
-msgid "Skip _Backwards"
-msgstr "Saltar _Atrás"
-
-#: ../data/totem.ui.h:86
-msgid "Skip backwards"
-msgstr "Saltar atrás"
-
-#: ../data/totem.ui.h:87
-msgid "14.4 Kbps Modem"
-msgstr "Modem a 14.4 Kbps"
-
-#: ../data/totem.ui.h:88
-msgid "19.2 Kbps Modem"
-msgstr "Modem a 19.2 Kbps"
-
-#: ../data/totem.ui.h:89
-msgid "28.8 Kbps Modem"
-msgstr "Modem a 28.8 Kbps"
-
-#: ../data/totem.ui.h:90
-msgid "33.6 Kbps Modem"
-msgstr "Modem a 33.6 Kbps"
-
-#: ../data/totem.ui.h:91
-msgid "34.4 Kbps Modem"
-msgstr "Modem a 34.4 Kbps"
-
-#: ../data/totem.ui.h:92
-msgid "56 Kbps Modem/ISDN"
-msgstr "Modem/RDIS a 56 Kbps"
-
-#: ../data/totem.ui.h:93
-msgid "112 Kbps Dual ISDN/DSL"
-msgstr "112 Kbps RDIS Dupla/DSL"
-
-#: ../data/totem.ui.h:94
-msgid "256 Kbps DSL/Cable"
-msgstr "DSL/Cabo a 256 Kbps"
-
-#: ../data/totem.ui.h:95
-msgid "384 Kbps DSL/Cable"
-msgstr "DSL/Cabo a 384 Kbps"
-
-#: ../data/totem.ui.h:96
-msgid "512 Kbps DSL/Cable"
-msgstr "DSL/Cabo a 512 Kbps"
-
-#: ../data/totem.ui.h:97
-msgid "1.5 Mbps T1/Intranet/LAN"
-msgstr "T1/Intranet/LAN a 1.5 Mbps"
-
-#: ../data/totem.ui.h:98
-msgid "Intranet/LAN"
-msgstr "Intranet/LAN"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:100
-msgid "Normal"
-msgstr "Normal"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:102
-msgid "Large"
-msgstr "Grande"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:104
-msgid "Extra Large"
-msgstr "Extra Grande"
-
-#: ../data/totem.ui.h:105 ../src/totem-properties-view.c:228
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5593
-msgid "Stereo"
-msgstr "Stereo"
-
-#: ../data/totem.ui.h:106
-msgid "4-channel"
-msgstr "4-canais"
-
-#: ../data/totem.ui.h:107
-msgid "4.1-channel"
-msgstr "4.1-canais"
-
-#: ../data/totem.ui.h:108
-msgid "5.0-channel"
-msgstr "5.0-canais"
-
-#: ../data/totem.ui.h:109
-msgid "5.1-channel"
-msgstr "5.1-canais"
-
-#: ../data/totem.ui.h:110
-msgid "AC3 Passthrough"
-msgstr "Passagem AC3"
-
-#: ../data/totem.ui.h:111
-msgid "Totem Preferences"
-msgstr "Preferências Totem"
-
-#: ../data/totem.ui.h:112
-msgid "Playback"
-msgstr "Reproduzir"
-
-#: ../data/totem.ui.h:113
-msgid "Start playing files from last position"
-msgstr "Iniciar a reprodução de ficheiros a partir da última posição"
-
-#: ../data/totem.ui.h:114
-msgid "Networking"
-msgstr "Rede"
-
-#: ../data/totem.ui.h:115
-msgid "Connection _speed:"
-msgstr "_Velocidade da ligação:"
-
-#: ../data/totem.ui.h:116
-msgid "Text Subtitles"
-msgstr "Legendas"
-
-#: ../data/totem.ui.h:117
-msgid "_Load subtitle files when movie is loaded"
-msgstr "_Ler os ficheiros de legendas ao ler o filme"
-
-#: ../data/totem.ui.h:118
-msgid "_Font:"
-msgstr "_Fonte:"
-
-#: ../data/totem.ui.h:119
-msgid "_Encoding:"
-msgstr "C_odificação"
-
-#: ../data/totem.ui.h:120
-msgid "External Chapters"
-msgstr "Capítulos Externos"
-
-#: ../data/totem.ui.h:121
-msgid "Load _chapter files when movie is loaded"
-msgstr "Ler os ficheiros de _capítulos ao ler o filme"
-
-#. Tab label in the Preferences dialogue
-#: ../data/totem.ui.h:124
-msgid "Display"
-msgstr "Ecrã"
-
-#: ../data/totem.ui.h:125
-msgid "_Resize the window when a new video is loaded"
-msgstr "_Redimensionar a janela ao ler um novo vídeo"
-
-#: ../data/totem.ui.h:126
-msgid "Disable _deinterlacing of interlaced videos"
-msgstr "Desactivar o _desinterlaçar de vídeos interlaçados"
-
-#: ../data/totem.ui.h:127
-msgid "Disable screensaver when playing "
-msgstr "Desactivar a protecção de ecrã durante a reprodução "
-
-#: ../data/totem.ui.h:129
-msgid "Video or Audio"
-msgstr "Vídeo ou Áudio"
-
-#: ../data/totem.ui.h:130
-msgid "Visual Effects"
-msgstr "Efeitos Visuais"
-
-#: ../data/totem.ui.h:131
-msgid "Show _visual effects when an audio file is played"
-msgstr "Apresentar efeitos _visuais ao reproduzir um ficheiro áudio"
-
-#: ../data/totem.ui.h:132
-msgid "_Type of visualization:"
-msgstr "_Tipo de visualização:"
-
-#: ../data/totem.ui.h:133
-msgid "Visualization _size:"
-msgstr "_Tamanho de visualização:"
-
-#: ../data/totem.ui.h:134
-msgid "Color Balance"
-msgstr "Equilíbrio de Cores"
-
-#: ../data/totem.ui.h:135
-msgid "_Brightness:"
-msgstr "_Brilho:"
-
-#: ../data/totem.ui.h:136
-msgid "Co_ntrast:"
-msgstr "Co_ntraste:"
-
-#: ../data/totem.ui.h:137
-msgid "Sat_uration:"
-msgstr "Sat_uração:"
-
-#: ../data/totem.ui.h:138
-msgid "_Hue:"
-msgstr "_Matiz:"
-
-#: ../data/totem.ui.h:139
-msgid "Reset to _Defaults"
-msgstr "Repor Valores por _Omissão"
-
-#: ../data/totem.ui.h:140
-msgid "Audio Output"
-msgstr "Saída Áudio"
-
-#: ../data/totem.ui.h:141
-msgid "_Audio output type:"
-msgstr "Tipo de saída á_udio:"
-
-#: ../data/totem.ui.h:145
-msgid "Time seek bar"
-msgstr "Barra de procura temporal"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
-msgid "Allow the screensaver to activate when playing audio"
-msgstr "Permitir que a protecção de ecrã seja activada ao reproduzir áudio"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
-msgid ""
-"Allow the screensaver to activate when playing audio. Disable if you have "
-"monitor-powered speakers."
-msgstr ""
-"Permitir que a protecção de ecrã seja activada ao reproduzir áudio. "
-"Desactive se tiver colunas de som alimentadas pelo monitor."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
-msgid "Show visual effects when no video is displayed"
-msgstr ""
-"Apresentar efeitos visuais quando não está a ser apresentado nenhum vídeo"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
-msgid "Show visual effects when playing an audio only file."
-msgstr "Apresentar efeitos visuais ao reproduzir um ficheiro apenas de áudio."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
-msgid "Name of the visual effects plugin"
-msgstr "Nome do plugin de efeitos visuais"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
-msgid "The brightness of the video"
-msgstr "O brilho do vídeo"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
-msgid "The contrast of the video"
-msgstr "O contraste do vídeo"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
-msgid "The hue of the video"
-msgstr "A matiz do vídeo"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
-msgid "The saturation of the video"
-msgstr "A saturação do vídeo"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
-msgid "Resize the canvas automatically on file load"
-msgstr "Redimensionar automaticamente a tela ao ler ficheiro"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
-msgid "Network connection speed"
-msgstr "Velocidade da ligação de rede"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
-msgid ""
-"Approximate network connection speed, used to select quality on media over "
-"the network."
-msgstr ""
-"Velocidade aproximada da rede, utilizada para seleccionar a qualidade do "
-"media sobre a rede."
+#: ../data/totem.ui.h:66
+msgid "16:9 (Widescreen)"
+msgstr "16:9 (Ecrã largo)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
-msgid "Repeat mode"
-msgstr "Modo de repetição"
+#: ../data/totem.ui.h:67
+msgid "Sets 16:9 (widescreen) aspect ratio"
+msgstr "Define o rácio de aparência 16:9 (ecrã panorâmico)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
-msgid "Shuffle mode"
-msgstr "Modo de baralhar"
+#: ../data/totem.ui.h:68
+msgid "2.11:1 (DVB)"
+msgstr "2.11:1 (DVB)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
-msgid "Whether to disable deinterlacing for interlaced movies"
-msgstr "Se desactivar ou não o desinterlaçar de filmes interlaçados"
+#: ../data/totem.ui.h:69
+msgid "Sets 2.11:1 (DVB) aspect ratio"
+msgstr "Define o rácio de aparência 2.11:1 (DVB)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
-msgid "Whether to enable debug for the playback engine"
-msgstr "Se activar ou não depuração para o motor de reprodução"
+#: ../data/totem.ui.h:70
+msgid "S_ubtitles"
+msgstr "Le_gendas"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
-msgid "Type of audio output to use"
-msgstr "O tipo de saída áudio a utilizar"
+#: ../data/totem.ui.h:73
+msgid "_Languages"
+msgstr "_Idiomas"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
-msgid "Visualization quality setting"
-msgstr "Definição da qualidade de visualização"
+#: ../data/totem.ui.h:74
+msgid "Zoom In"
+msgstr "Aumentar o Zoom"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
-msgid "Quality setting for the audio visualization."
-msgstr "Definição de qualidade para a visualização áudio."
+#: ../data/totem.ui.h:75
+msgid "Zoom in"
+msgstr "Aumentar o zoom"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
-msgid "Network buffering threshold"
-msgstr "Limite de buffer de rede"
+#: ../data/totem.ui.h:76
+msgid "Skip _Forward"
+msgstr "Saltar à _Frente"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
-msgid ""
-"Amount of data to buffer for network streams before starting to display the "
-"stream (in seconds)."
-msgstr ""
-"Quantidade de dados a guardar em buffer para fluxos por rede antes de "
-"iniciar a apresentação do fluxo (em segundos)."
+#: ../data/totem.ui.h:77
+msgid "Skip forward"
+msgstr "Saltar à frente"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
-msgid "Subtitle font"
-msgstr "Fonte das legendas"
+#: ../data/totem.ui.h:78
+msgid "Skip _Backwards"
+msgstr "Saltar _Atrás"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
-msgid "Pango font description for subtitle rendering."
-msgstr "Descrição da fonte Pango para a renderização de legendas."
+#: ../data/totem.ui.h:79
+msgid "Skip backwards"
+msgstr "Saltar atrás"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
-msgid "Subtitle encoding"
-msgstr "Codificação das legendas"
+#: ../data/totem.ui.h:82
+msgid "Time seek bar"
+msgstr "Barra de procura temporal"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
-msgid "Encoding character set for subtitle."
-msgstr "Codificação de caracteres das legendas."
+#: ../data/uri.ui.h:1
+msgid "Enter the _address of the file you would like to open:"
+msgstr "Introduza a _localização do ficheiro que deseja abrir:"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
-msgid "Default location for the \"Open...\" dialogs"
-msgstr "Localização por omissão para os diálogos \"Abrir...\""
+#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
+msgid "_Add to Playlist"
+msgstr "_Adicionar à Lista de Reprodução"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
-msgid ""
-"Default location for the \"Open...\" dialogs. Default is the current "
-"directory."
-msgstr ""
-"Localização por omissão para os diálogos \"Abrir...\". Por omissão é o "
-"directório actual."
+#: ../data/video-list.ui.h:2
+msgid "Add the video to the playlist"
+msgstr "Adicionar o vídeo à lista de reprodução"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
-msgid "Default location for the \"Take Screenshot\" dialogs"
-msgstr "Localização por omissão para os diálogos \"Capturar Ecrã\""
+#: ../src/backend/bacon-video-widget.c:1643
+msgid "Password requested for RTSP server"
+msgstr "Foi pedida uma senha de acesso ao servidor RTSP"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
-msgid ""
-"Default location for the \"Take Screenshot\" dialogs. Default is the "
-"Pictures directory."
-msgstr ""
-"Localização por omissão para os diálogos \"Capturar Ecrã\". Por omissão é o "
-"directório Imagens."
+#: ../src/backend/bacon-video-widget.c:2944
+#, c-format
+msgid "Audio Track #%d"
+msgstr "Faixa Áudio nº%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
-msgid "Whether to disable the plugins in the user's home directory"
-msgstr "Se desactivar ou não os plugins na pasta pessoal do utilizador"
+#: ../src/backend/bacon-video-widget.c:2948
+#, c-format
+msgid "Subtitle #%d"
+msgstr "Legenda nº%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
-msgid "Whether to disable the keyboard shortcuts"
-msgstr "Se desactivar ou não os atalhos de teclado"
+#: ../src/backend/bacon-video-widget.c:3345
+msgid "The server you are trying to connect to is not known."
+msgstr "O servidor a que se está a tentar ligar é desconhecido."
+
+#: ../src/backend/bacon-video-widget.c:3348
+msgid "The connection to this server was refused."
+msgstr "A ligação a este servidor foi recusada."
+
+#: ../src/backend/bacon-video-widget.c:3351
+msgid "The specified movie could not be found."
+msgstr "Incapaz de encontrar o filme especificado."
+
+#: ../src/backend/bacon-video-widget.c:3358
+msgid "The server refused access to this file or stream."
+msgstr "O servidor recusou o acesso e este ficheiro ou fluxo."
+
+#: ../src/backend/bacon-video-widget.c:3364
+msgid "Authentication is required to access this file or stream."
+msgstr "É necessária autenticação para aceder a este ficheiro ou fluxo."
+
+#: ../src/backend/bacon-video-widget.c:3371
+msgid "You are not allowed to open this file."
+msgstr "Não possui permissões para abrir este ficheiro."
+
+#: ../src/backend/bacon-video-widget.c:3376
+msgid "This location is not a valid one."
+msgstr "Esta localização não é válida."
+
+#: ../src/backend/bacon-video-widget.c:3384
+msgid "The movie could not be read."
+msgstr "Incapaz de ler o filme."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
-msgid "Whether to autoload text subtitle files when a movie is loaded"
-msgstr "Se ler automaticamente ou não o ficheiro de legendas ao ler um filme"
+#. should be exactly one missing thing (source or converter)
+#: ../src/backend/bacon-video-widget.c:3407
+#: ../src/backend/bacon-video-widget.c:3415
+#, c-format
+msgid "The playback of this movie requires a %s plugin which is not installed."
+msgid_plural ""
+"The playback of this movie requires the following decoders which are not "
+"installed:\n"
+"\n"
+"%s"
+msgstr[0] ""
+"A reprodução deste filme requer o plugin %s, que não está instalado."
+msgstr[1] ""
+"A reprodução deste filme requer os seguintes descodificadores, que não se "
+"encontram instalados:\n"
+"\n"
+"%s"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
-msgid "Whether to autoload external chapter files when a movie is loaded"
+#: ../src/backend/bacon-video-widget.c:3426
+msgid ""
+"An audio or video stream is not handled due to missing codecs. You might "
+"need to install additional plugins to be able to play some types of movies"
 msgstr ""
-"Se ler automaticamente ou não os ficheiros de capítulos ao ler um filme"
+"Incapaz de manipular um fluxo áudio ou vídeo por inexistência de codecs. "
+"Poderá ter de instalar plugins adicionais para ser capaz de reproduzir "
+"alguns tipos de filmes"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+#: ../src/backend/bacon-video-widget.c:3436
 msgid ""
-"Whether to remember the position of played audio/video files when pausing or "
-"closing them"
+"This file cannot be played over the network. Try downloading it locally "
+"first."
 msgstr ""
-"Se recordar ou não a posição nos ficheiros de áudio/vídeo ao pausá-los ou "
-"fechá-los"
+"Incapaz de reproduzir este ficheiro através da rede. Tente efectuar download "
+"do mesmo para o seu disco primeiro."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:35
-msgid "Active plugins list"
-msgstr "Lista de plugins activos"
+#: ../src/backend/bacon-video-widget.c:5494 ../src/totem-properties-view.c:227
+msgid "Surround"
+msgstr "Surround"
+
+#: ../src/backend/bacon-video-widget.c:5496 ../src/totem-properties-view.c:229
+msgid "Mono"
+msgstr "Mono"
+
+#: ../src/backend/bacon-video-widget.c:5781
+msgid "Media contains no supported video streams."
+msgstr "Media não contém qualquer fluxo de vídeo suportado."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:36
+#: ../src/backend/bacon-video-widget.c:5963
 msgid ""
-"A list of the names of the plugins which are currently active (loaded and "
-"running)."
+"Some necessary plug-ins are missing. Make sure that the program is correctly "
+"installed."
 msgstr ""
-"A lista dos nomes dos plugins que estão actualmente activos (lidos e em "
-"execução)."
-
-#: ../data/uri.ui.h:1
-msgid "Enter the _address of the file you would like to open:"
-msgstr "Introduza a _localização do ficheiro que deseja abrir:"
+"Faltam alguns plugins necessários. Certifique-se de que a aplicação está "
+"correctamente instalada."
 
 #: ../src/eggdesktopfile.c:165
 #, c-format
@@ -979,6 +1044,31 @@
 msgid "Show session management options"
 msgstr "Apresentar as opções de gestão de sessão"
 
+#. hour:minutes:seconds
+#. Translators: This is a time format, like "9:05:02" for 9
+#. * hours, 5 minutes, and 2 seconds. You may change ":" to
+#. * the separator that your locale uses or use "%Id" instead
+#. * of "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:56
+#: ../src/plugins/skipto/totem-time-entry.c:57
+#, c-format
+msgctxt "long time format"
+msgid "%d:%02d:%02d"
+msgstr "%d:%02d:%02d"
+
+#. minutes:seconds
+#. Translators: This is a time format, like "5:02" for 5
+#. * minutes and 2 seconds. You may change ":" to the
+#. * separator that your locale uses or use "%Id" instead of
+#. * "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:65
+#, c-format
+msgctxt "short time format"
+msgid "%d:%02d"
+msgstr "%d:%02d"
+
 #. Title
 #. Artist
 #. Album
@@ -1083,10 +1173,14 @@
 msgstr[0] "%d imagem por segundo"
 msgstr[1] "%d imagens por segundo"
 
-#: ../src/totem-audio-preview.c:168
+#: ../src/totem-audio-preview.c:137
 msgid "Audio Preview"
 msgstr "Antevisão Áudio"
 
+#: ../src/totem.c:240
+msgid "Verify your system installation. Totem will now exit."
+msgstr "Verifique a instalação do seu sistema. Totem irá agora terminar."
+
 #: ../src/totem-cell-renderer-video.c:126
 msgid "Unknown video"
 msgstr "Vídeo desconhecido"
@@ -1099,7 +1193,7 @@
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../src/totem-fullscreen.c:616
+#: ../src/totem-fullscreen.c:573
 msgid "No File"
 msgstr "Nenhum Ficheiro"
 
@@ -1117,7 +1211,7 @@
 msgid "Make sure that Totem is properly installed."
 msgstr "Certifique-se de que o Totem está correctamente instalado."
 
-#: ../src/totem-interface.c:347
+#: ../src/totem-interface.c:357
 msgid ""
 "Totem 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 "
@@ -1129,7 +1223,7 @@
 "Foundation; ou a versão 2 da Licença ou, (à sua discrição) qualquer versão "
 "posterior."
 
-#: ../src/totem-interface.c:351
+#: ../src/totem-interface.c:361
 msgid ""
 "Totem is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -1141,7 +1235,7 @@
 "UM PROPÓSITO ESPECÍFICO.  Consulte a Licença Pública Genérica GNU para mais "
 "detalhes."
 
-#: ../src/totem-interface.c:355
+#: ../src/totem-interface.c:365
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Totem; if not, write to the Free Software Foundation, Inc., 59 Temple Place, "
@@ -1151,7 +1245,7 @@
 "o Totem; caso contrário, escreva para Free Software Foundation, Inc., 59 "
 "Temple Place, Suite 330, Boston, MA  02111-1307  USA (em inglês)"
 
-#: ../src/totem-interface.c:358
+#: ../src/totem-interface.c:368
 msgid ""
 "Totem contains an exception to allow the use of proprietary GStreamer "
 "plugins."
@@ -1160,201 +1254,96 @@
 "do GStreamer."
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:190
+#: ../src/totem-menu.c:291
 msgid "None"
 msgstr "Nenhum"
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:195
+#: ../src/totem-menu.c:296
 msgctxt "Language"
 msgid "Auto"
 msgstr "Auto"
 
-#. Translators:
-#. * This is not a JPEG image, but a disc image, for example,
-#. * an ISO file
-#: ../src/totem-menu.c:765
-#, c-format
-msgid "Play Image '%s'"
-msgstr "Reproduzir a Imagem '%s'"
-
-#: ../src/totem-menu.c:768 ../src/totem-menu.c:851
-#, c-format
-msgid "device%d"
-msgstr "dispositivo%d"
-
-#: ../src/totem-menu.c:848
-#, c-format
-msgid "Play Disc '%s'"
-msgstr "Reproduzir o Disco '%s'"
-
-#. This lists the back-end type and version, such as
-#. * Movie Player using GStreamer 0.10.1
-#: ../src/totem-menu.c:1189
-#, c-format
-msgid "Movie Player using %s"
-msgstr "Reprodutor de Filmes a utilizar o %s"
-
-#: ../src/totem-menu.c:1193
+#: ../src/totem-menu.c:789
 msgid "Copyright © 2002-2009 Bastien Nocera"
 msgstr "Copyright © 2002-2009 Bastien Nocera"
 
-#: ../src/totem-menu.c:1198
+#: ../src/totem-menu.c:794
 msgid "translator-credits"
 msgstr "Duarte Loreto "
 
-#: ../src/totem-menu.c:1202
+#: ../src/totem-menu.c:798
 msgid "Totem Website"
 msgstr "Página do Totem"
 
-#: ../src/totem-menu.c:1236
+#: ../src/totem-menu.c:829
 msgid "Configure Plugins"
 msgstr "Configurar Plugins"
 
+#: ../src/totem-object.c:162
+#, c-format
+msgid ""
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"%s\n"
+"Execute '%s --help' para consultar uma lista completa de todas as opções de "
+"comando disponíveis.\n"
+
 #. Translators: %s is the totem version number
-#: ../src/totem-object.c:471
+#: ../src/totem-object.c:591
 #, c-format
 msgid "Totem %s"
 msgstr "Totem %s"
 
-#: ../src/totem-object.c:1047 ../browser-plugin/totem-plugin-viewer.c:367
-msgid "Playing"
-msgstr "A Reproduzir"
-
-#: ../src/totem-object.c:1049 ../src/totem-options.c:52
+#: ../src/totem-object.c:1168 ../src/totem-options.c:52
 msgid "Pause"
 msgstr "Pausar"
 
-#: ../src/totem-object.c:1054 ../browser-plugin/totem-plugin-viewer.c:363
-msgid "Paused"
-msgstr "Pausado"
-
-#: ../src/totem-object.c:1056 ../src/totem-object.c:1066
+#: ../src/totem-object.c:1175 ../src/totem-object.c:1185
 #: ../src/totem-options.c:51
 msgid "Play"
 msgstr "Reproduzir"
 
-#: ../src/totem-object.c:1061 ../src/totem-object.c:1659
-#: ../src/totem-statusbar.c:115 ../browser-plugin/totem-plugin-viewer.c:351
-msgid "Stopped"
-msgstr "Parado"
-
-#: ../src/totem-object.c:1142 ../src/totem-object.c:1169
-#: ../src/totem-object.c:1799 ../src/totem-object.c:1963
+#: ../src/totem-object.c:1267 ../src/totem-object.c:1294
+#: ../src/totem-object.c:1787 ../src/totem-object.c:1942
 #, c-format
 msgid "Totem could not play '%s'."
 msgstr "Totem incapaz de reproduzir '%s'."
 
-#: ../src/totem-object.c:1246
-#, c-format
-msgid ""
-"Totem could not play this media (%s) although a plugin is present to handle "
-"it."
-msgstr ""
-"Totem não conseguiu reproduzir este media (%s) apesar de existir um plugin "
-"para o suportar."
-
-#: ../src/totem-object.c:1247
-msgid ""
-"You might want to check that a disc is present in the drive and that it is "
-"correctly configured."
-msgstr ""
-"Poderá querer verificar se existe um disco na unidade e se esta está "
-"correctamente configurada."
-
-#: ../src/totem-object.c:1255
-msgid "More information about media plugins"
-msgstr "Mais informações sobre plugins de media"
-
-#: ../src/totem-object.c:1256
-msgid ""
-"Please install the necessary plugins and restart Totem to be able to play "
-"this media."
-msgstr ""
-"Instale os plugins necessários e reinicie o Totem para ser possível "
-"reproduzir este media."
-
-#: ../src/totem-object.c:1258
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because it does not have the "
-"appropriate plugins to be able to read from the disc."
-msgstr ""
-"Totem é incapaz de reproduzir este tipo de media (%s) pois não possui os "
-"plugins apropriados para conseguir ler do disco."
-
-#: ../src/totem-object.c:1260
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because you do not have the "
-"appropriate plugins to handle it."
-msgstr ""
-"Totem é incapaz de reproduzir este tipo de media (%s) pois não possui os "
-"plugins apropriados para o suportar."
-
-#: ../src/totem-object.c:1263
-#, c-format
-msgid "Totem cannot play this type of media (%s) because it is not supported."
-msgstr ""
-"Totem é incapaz de reproduzir este tipo de media (%s) pois não é suportado."
-
-#: ../src/totem-object.c:1264
-msgid "Please insert another disc to play back."
-msgstr "Introduza outro disco para reprodução."
-
-#: ../src/totem-object.c:1300
-msgid "Totem was not able to play this disc."
-msgstr "Totem foi incapaz de reproduzir este disco."
-
-#: ../src/totem-object.c:1301 ../src/totem-object.c:4229
-msgid "No reason."
-msgstr "Sem motivo."
-
-#: ../src/totem-object.c:1315
-msgid "Totem does not support playback of Audio CDs"
-msgstr "O Totem não suporta a reprodução de CDs Áudio"
-
-#: ../src/totem-object.c:1316
-msgid "Please consider using a music player or a CD extractor to play this CD"
-msgstr ""
-"Considere utilizar um reprodutor de música ou um extrator de CD para "
-"reproduzir este CD"
-
-#: ../src/totem-object.c:1805
+#: ../src/totem-object.c:1793
 msgid "No error message"
 msgstr "Nenhuma mensagem de erro"
 
-#: ../src/totem-object.c:2154
+#: ../src/totem-object.c:2133
 msgid "Totem could not display the help contents."
 msgstr "Totem incapaz de apresentar o conteúdo da ajuda."
 
-#: ../src/totem-object.c:2493 ../src/totem-object.c:2495
-#: ../browser-plugin/totem-plugin-viewer.c:1417
-msgid "An error occurred"
-msgstr "Ocorreu um erro"
-
-#: ../src/totem-object.c:4064 ../src/totem-object.c:4066
+#: ../src/totem-object.c:4019 ../src/totem-object.c:4021
 msgid "Previous Chapter/Movie"
 msgstr "Capítulo/Filme Anterior"
 
-#: ../src/totem-object.c:4073 ../src/totem-object.c:4075
+#: ../src/totem-object.c:4028 ../src/totem-object.c:4030
 msgid "Play / Pause"
 msgstr "Reproduzir / Pausar"
 
-#: ../src/totem-object.c:4083 ../src/totem-object.c:4085
+#: ../src/totem-object.c:4038 ../src/totem-object.c:4040
 msgid "Next Chapter/Movie"
 msgstr "Capítulo/Filme Seguinte"
 
-#. Translators: this is the tooltip text for the fullscreen button in the controls box in Totem's main window.
 #. Translators: this is the accessibility text for the fullscreen button in the controls box in Totem's main window.
-#: ../src/totem-object.c:4097 ../src/totem-object.c:4099
+#: ../src/totem-object.c:4051 ../src/totem-object.c:4053
 msgid "Fullscreen"
 msgstr "Ecrã Completo"
 
-#: ../src/totem-object.c:4229
+#: ../src/totem-object.c:4184
 msgid "Totem could not startup."
 msgstr "Totem incapaz de se iniciar."
 
+#: ../src/totem-object.c:4184
+msgid "No reason."
+msgstr "Sem motivo."
+
 #: ../src/totem-open-location.c:182
 msgid "Open Location..."
 msgstr "Abrir Localização..."
@@ -1428,118 +1417,112 @@
 msgid "Movies to play"
 msgstr "Filmes a reproduzir"
 
-#: ../src/totem-options.c:117
+#: ../src/totem-options.c:79
+msgid "- Play movies and songs"
+msgstr "- Reproduzir filmes e músicas"
+
+#: ../src/totem-options.c:142
 msgid "Can't enqueue and replace at the same time"
 msgstr "Incapaz de colocar em pilha e substituir ao mesmo tempo"
 
 #. By extension entry
-#: ../src/totem-playlist.c:161
+#: ../src/totem-playlist.c:162
 msgid "MP3 ShoutCast playlist"
 msgstr "Lista de reprodução MP3 ShoutCast"
 
-#: ../src/totem-playlist.c:162
+#: ../src/totem-playlist.c:163
 msgid "MP3 audio (streamed)"
 msgstr "Áudio MP3 (em fluxo)"
 
-#: ../src/totem-playlist.c:163
+#: ../src/totem-playlist.c:164
 msgid "MP3 audio (streamed, DOS format)"
 msgstr "Áudio MP3 (em fluxo, formato DOS)"
 
-#: ../src/totem-playlist.c:164
+#: ../src/totem-playlist.c:165
 msgid "XML Shareable Playlist"
 msgstr "Lista de Reprodução Partilhável em XML"
 
 #. This is "Title 3", where title is a DVD title
 #. * Note: NOT a DVD chapter
-#: ../src/totem-playlist.c:347
+#: ../src/totem-playlist.c:348
 #, c-format
 msgid "Title %d"
 msgstr "Título %d"
 
-#: ../src/totem-playlist.c:446
+#: ../src/totem-playlist.c:447
 msgid "Could not save the playlist"
 msgstr "Incapaz de gravar a lista de reprodução"
 
-#: ../src/totem-playlist.c:1021
+#: ../src/totem-playlist.c:1022
 msgid "Save Playlist"
 msgstr "Gravar a Lista de Reprodução"
 
 #. translators: Playlist is the default saved playlist filename,
 #. * without the suffix
-#: ../src/totem-playlist.c:1033 ../src/totem-playlist.c:1264
-#: ../src/totem-sidebar.c:142
+#: ../src/totem-playlist.c:1034 ../src/totem-playlist.c:1263
+#: ../src/totem-sidebar.c:145
 msgid "Playlist"
 msgstr "Lista de Reprodução"
 
-#: ../src/totem-playlist.c:1857
+#: ../src/totem-playlist.c:1862
 #, c-format
 msgid "The playlist '%s' could not be parsed. It might be damaged."
 msgstr ""
 "Incapaz de processar a lista de reprodução '%s'. Poderá estar danificada."
 
-#: ../src/totem-playlist.c:1858
+#: ../src/totem-playlist.c:1863
 msgid "Playlist error"
 msgstr "Erro na lista de reprodução"
 
-#: ../src/totem-preferences.c:295
+#: ../src/totem-preferences.c:297
 msgid "Preferences"
 msgstr "Preferências"
 
-#: ../src/totem-preferences.c:451
+#: ../src/totem-preferences.c:445
 msgid "Select Subtitle Font"
 msgstr "Seleccionar a Fonte das Legendas"
 
-#: ../src/totem-properties-main.c:115 ../src/totem-properties-view.c:266
+#: ../src/totem-properties-main.c:116 ../src/totem-properties-view.c:269
 msgid "Audio/Video"
 msgstr "Áudio/Vídeo"
 
-#: ../src/totem-properties-view.c:128
+#: ../src/totem-properties-view.c:131
 msgid "N/A"
 msgstr "N/A"
 
-#: ../src/totem-properties-view.c:157
+#: ../src/totem-properties-view.c:160
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 msgctxt "Stream bit rate"
 msgid "N/A"
 msgstr "N/A"
 
-#: ../src/totem-properties-view.c:160
+#: ../src/totem-properties-view.c:163
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: ../src/totem-properties-view.c:177
+#: ../src/totem-properties-view.c:180
 #: ../src/plugins/properties/totem-movie-properties.c:149
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../src/totem-properties-view.c:209
+#: ../src/totem-properties-view.c:212
 #: ../src/plugins/properties/totem-movie-properties.c:166
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: ../src/totem-properties-view.c:216
+#: ../src/totem-properties-view.c:219
 #: ../src/plugins/properties/totem-movie-properties.c:166
 msgctxt "Sample rate"
 msgid "N/A"
 msgstr "N/A"
 
-#: ../src/totem-properties-view.c:224
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5589
-msgid "Surround"
-msgstr "Surround"
-
-#: ../src/totem-properties-view.c:226
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5591
-msgid "Mono"
-msgstr "Mono"
-
-#: ../src/totem-properties-view.c:236
+#: ../src/totem-properties-view.c:239
 msgctxt "Number of audio channels"
 msgid "N/A"
 msgstr "N/A"
@@ -1572,8 +1555,8 @@
 #. eg: 75 %
 #: ../src/totem-statusbar.c:250
 #, c-format
-msgid "%d %%"
-msgstr "%d %%"
+msgid "%lf %%"
+msgstr "%lf %%"
 
 #. eg: Paused, 0:32 / 1:05
 #: ../src/totem-statusbar.c:325
@@ -1584,8 +1567,8 @@
 #. eg: Buffering, 75 %
 #: ../src/totem-statusbar.c:330
 #, c-format
-msgid "%s, %d %%"
-msgstr "%s, %d %%"
+msgid "%s, %f %%"
+msgstr "%s, %f %%"
 
 #: ../src/totem-subtitle-encoding.c:156
 msgid "Current Locale"
@@ -1728,228 +1711,91 @@
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
-#: ../src/totem-video-list.c:330
-msgid "No video URI"
-msgstr "Nenhum URI de vídeo"
-
-#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
-#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
-#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
-#: ../src/totem-video-thumbnailer.c:872
-#, c-format
-msgid ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-msgstr ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-
-#: ../src/totem-video-thumbnailer.c:873
-msgid "Filename"
-msgstr "Nome do ficheiro"
-
-#: ../src/totem-video-thumbnailer.c:875
-msgid "Resolution"
-msgstr "Resolução"
-
-#: ../src/totem-video-thumbnailer.c:878
-msgid "Duration"
-msgstr "Duração"
-
-#: ../src/totem-uri.c:506 ../src/plugins/chapters/totem-chapters.c:998
+#: ../src/totem-uri.c:343 ../src/plugins/chapters/totem-chapters.c:998
 msgid "All files"
 msgstr "Todos os ficheiros"
 
-#: ../src/totem-uri.c:511 ../src/plugins/chapters/totem-chapters.c:995
+#: ../src/totem-uri.c:348 ../src/plugins/chapters/totem-chapters.c:995
 msgid "Supported files"
 msgstr "Ficheiros suportados"
 
-#: ../src/totem-uri.c:523
+#: ../src/totem-uri.c:360
 msgid "Audio files"
 msgstr "Ficheiros áudio"
 
-#: ../src/totem-uri.c:531
+#: ../src/totem-uri.c:368
 msgid "Video files"
 msgstr "Ficheiros de vídeo"
 
-#: ../src/totem-uri.c:541
+#: ../src/totem-uri.c:378
 msgid "Subtitle files"
 msgstr "Ficheiro de legendas"
 
-#: ../src/totem-uri.c:593
+#: ../src/totem-uri.c:430
 msgid "Select Text Subtitles"
 msgstr "Seleccionar as Legendas"
 
-#: ../src/totem-uri.c:656
+#: ../src/totem-uri.c:495
 msgid "Select Movies or Playlists"
 msgstr "Seleccione Filmes ou Listas de Reprodução"
 
-#. Options parsing
-#: ../src/totem.c:201
-msgid "- Play movies and songs"
-msgstr "- Reproduzir filmes e músicas"
-
-#: ../src/totem.c:212
-#, c-format
-msgid ""
-"%s\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"%s\n"
-"Execute '%s --help' para consultar uma lista completa de todas as opções de "
-"comando disponíveis.\n"
-
-#: ../src/totem.c:254 ../src/totem.c:265
-#: ../browser-plugin/totem-plugin-viewer.c:663
-#: ../browser-plugin/totem-plugin-viewer.c:1793
-msgid "Totem Movie Player"
-msgstr "Reprodutor de Filmes Totem"
-
-#: ../src/totem.c:255 ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Could not initialize the thread-safe libraries."
-msgstr "Incapaz de inicializar as bibliotecas de threads seguras."
-
-#: ../src/totem.c:255
-msgid "Verify your system installation. Totem will now exit."
-msgstr "Verifique a instalação do seu sistema. Totem irá agora terminar."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:1589
-msgid "Password requested for RTSP server"
-msgstr "Foi pedida uma senha de acesso ao servidor RTSP"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2858
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2862
-#, c-format
-msgid "Audio Track #%d"
-msgstr "Faixa Áudio nº%d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2890
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2894
-#, c-format
-msgid "Subtitle #%d"
-msgstr "Legenda nº%d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3298
-msgid ""
-"The requested audio output was not found. Please select another audio output "
-"in the Multimedia Systems Selector."
-msgstr ""
-"A saída de áudio definida não foi encontrada. Seleccione outra saída de "
-"áudio no Selector de Sistemas Multimédia."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3303
-msgid "Location not found."
-msgstr "Localização não encontrada."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3307
-msgid ""
-"Could not open location; you might not have permission to open the file."
-msgstr ""
-"Incapaz de abrir a localização; poderá não possui permissões para abrir o "
-"ficheiro."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3318
-msgid ""
-"The video output is in use by another application. Please close other video "
-"applications, or select another video output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"A saída de vídeo está a ser utilizada por outra aplicação. Feche as outras "
-"aplicações de vídeo ou seleccione outra saída de vídeo no Selector de "
-"Sistemas Multimédia."
+#: ../src/totem-uri.c:499
+msgid "Add Directory"
+msgstr "Adicionar Directório"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3324
-msgid ""
-"The audio output is in use by another application. Please select another "
-"audio output in the Multimedia Systems Selector. You may want to consider "
-"using a sound server."
-msgstr ""
-"A saída de áudio está a ser utilizada por outra aplicação. Seleccione outra "
-"saída de áudio no Selector de Sistemas Multimédia. Deverá considerar a "
-"utilização de um servidor de som."
+#: ../src/totem-video-list.c:330
+msgid "No video URI"
+msgstr "Nenhum URI de vídeo"
 
-#. should be exactly one missing thing (source or converter)
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3342
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3348
+#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
+#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
+#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
+#: ../src/totem-video-thumbnailer.c:841
 #, c-format
-msgid "The playback of this movie requires a %s plugin which is not installed."
-msgid_plural ""
-"The playback of this movie requires the following decoders which are not "
-"installed:\n"
-"\n"
-"%s"
-msgstr[0] ""
-"A reprodução deste filme requer o plugin %s, que não está instalado."
-msgstr[1] ""
-"A reprodução deste filme requer os seguintes descodificadores, que não se "
-"encontram instalados:\n"
-"\n"
-"%s"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3374
 msgid ""
-"Cannot play this file over the network. Try downloading it to disk first."
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 msgstr ""
-"Incapaz de reproduzir este ficheiro através da rede. Tende efectuar download "
-"do mesmo para o seu disco primeiro."
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5878
-msgid "Media contains no supported video streams."
-msgstr "Media não contém qualquer fluxo de vídeo suportado."
+#: ../src/totem-video-thumbnailer.c:842
+msgid "Filename"
+msgstr "Nome do ficheiro"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6052
-msgid ""
-"Failed to create a GStreamer play object. Please check your GStreamer "
-"installation."
-msgstr ""
-"Falha ao criar um objecto de reprodução GStreamer. Verifique a sua "
-"instalação do GStreamer."
+#: ../src/totem-video-thumbnailer.c:844
+msgid "Resolution"
+msgstr "Resolução"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6172
-msgid ""
-"Failed to open audio output. You may not have permission to open the sound "
-"device, or the sound server may not be running. Please select another audio "
-"output in the Multimedia Systems Selector."
-msgstr ""
-"Falha ao abrir a saída de áudio. Poderá não possuir permissões para abrir o "
-"dispositivo de som ou o servidor de som poderá não se encontrar em execução. "
-"Seleccione outra saída de áudio no Selector de Sistemas Multimédia."
+#: ../src/totem-video-thumbnailer.c:847
+msgid "Duration"
+msgstr "Duração"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6192
-msgid ""
-"Could not find the audio output. You may need to install additional "
-"GStreamer plugins, or select another audio output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"Incapaz de encontrar a saída de áudio. Poderá ter de instalar plugins do "
-"GStreamer adicionais ou seleccionar outra saída de áudio no Selector de "
-"Sistemas Multimédia."
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:1
+msgid "Apple Trailers"
+msgstr "Trailers Apple"
+
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:2
+msgid "Sets the user agent for the Apple Trailers site"
+msgstr "Define o agente de utilização para a página de Trailers Apple"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:1
+msgid "Autoload Subtitles"
+msgstr "Ler Legendas Automaticamente"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:2
+msgid "Autoloads text subtitles"
+msgstr "Lê automaticamente as legendas"
 
-#. hour:minutes:seconds
-#. Translators: This is a time format, like "9:05:02" for 9
-#. * hours, 5 minutes, and 2 seconds. You may change ":" to
-#. * the separator that your locale uses or use "%Id" instead
-#. * of "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:83 ../src/plugins/skipto/totem-time-entry.c:57
-#, c-format
-msgctxt "long time format"
-msgid "%d:%02d:%02d"
-msgstr "%d:%02d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
+msgid "Video Disc Recorder"
+msgstr "Gravador de Discos Vídeo"
 
-#. minutes:seconds
-#. Translators: This is a time format, like "5:02" for 5
-#. * minutes and 2 seconds. You may change ":" to the
-#. * separator that your locale uses or use "%Id" instead of
-#. * "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:92
-#, c-format
-msgctxt "short time format"
-msgid "%d:%02d"
-msgstr "%d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
+msgid "Records (S)VCDs or video DVDs"
+msgstr "Grava (S)VCDs ou DVDs vídeo"
 
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:65
 msgid "_Create Video Disc..."
@@ -1975,38 +1821,21 @@
 msgid "Copy the currently playing (S)VCD"
 msgstr "Copiar o (S)VCD vídeo actualmente a ser reproduzido"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:129
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:136
 msgid "The video disc could not be duplicated."
 msgstr "Incapaz de duplicar o disco vídeo."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:131
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:276
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:138
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:283
 msgid "The movie could not be recorded."
 msgstr "Incapaz de gravar o filme."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:157
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:167
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:263
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:164
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:174
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:270
 msgid "Unable to write a project."
 msgstr "Incapaz de gravar um projecto."
 
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
-msgid "Video Disc Recorder"
-msgstr "Gravador de Discos Vídeo"
-
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
-msgid "Records (S)VCDs or video DVDs"
-msgstr "Grava (S)VCDs ou DVDs vídeo"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:1
-#: ../src/plugins/chapters/totem-chapters.c:1139
-msgid "Chapters"
-msgstr "Capítulos"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:2
-msgid "Support chapter markers in movies."
-msgstr "Suportar marcadores de capítulo nos filmes."
-
 #: ../src/plugins/chapters/chapters-edit.ui.h:1
 msgid "Name for new chapter:"
 msgstr "Nome do novo capítulo:"
@@ -2063,6 +1892,15 @@
 msgid "Create a new chapter list for the movie"
 msgstr "Criar uma nova lista de capítulos do filme"
 
+#: ../src/plugins/chapters/chapters.plugin.in.h:1
+#: ../src/plugins/chapters/totem-chapters.c:1139
+msgid "Chapters"
+msgstr "Capítulos"
+
+#: ../src/plugins/chapters/chapters.plugin.in.h:2
+msgid "Support chapter markers in movies"
+msgstr "Suportar marcadores de capítulo nos filmes"
+
 #: ../src/plugins/chapters/totem-chapters.c:56
 #, c-format
 msgid ""
@@ -2169,15 +2007,37 @@
 msgid "The URI ‘%s’ is not supported."
 msgstr "O URI ‘%s’ não é suportado."
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
-msgid "Instant Messenger status"
-msgstr "Estado da aplicação de Mensagens Instantâneas"
+#: ../src/plugins/grilo/grilo.plugin.in.h:1
+msgid "Grilo Browser"
+msgstr "Navegador Grilo"
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
-msgid "Set your Instant Messenger status to away when a movie is playing"
-msgstr ""
-"Definir o seu estado na aplicação de Mensagens Instantâneas como ausente "
-"durante a reprodução de um filme"
+#: ../src/plugins/grilo/grilo.plugin.in.h:2
+msgid "A plugin to let you browse media content from various sources"
+msgstr "Um plugin que lhe permite navegar pelo conteúdo de várias origens"
+
+#: ../src/plugins/grilo/grilo.ui.h:1
+msgid "Add to Playlist"
+msgstr "Adicionar à Lista de Reprodução"
+
+#: ../src/plugins/grilo/grilo.ui.h:2
+msgid "Copy Location"
+msgstr "Copiar Localização"
+
+#: ../src/plugins/grilo/grilo.ui.h:3 ../src/plugins/grilo/totem-grilo.c:1184
+msgid "Browse"
+msgstr "Navegar"
+
+#: ../src/plugins/grilo/grilo.ui.h:4 ../src/plugins/grilo/totem-grilo.c:1227
+msgid "Search"
+msgstr "Procurar"
+
+#: ../src/plugins/grilo/totem-grilo.c:454
+msgid "Browse Error"
+msgstr "Erro de Navegador"
+
+#: ../src/plugins/grilo/totem-grilo.c:609
+msgid "Search Error"
+msgstr "Erro de Pesquisa"
 
 #: ../src/plugins/gromit/gromit.plugin.in.h:1
 msgid "Gromit Annotations"
@@ -2191,58 +2051,15 @@
 msgid "The gromit binary was not found."
 msgstr "Não foi encontrado o binário gromit."
 
-#. Add the interface to Totem's sidebar
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:1
-#: ../src/plugins/iplayer/iplayer.py:46
-msgid "BBC iPlayer"
-msgstr "iPlayer da BBC"
-
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:2
-msgid "Stream BBC programs from the last 7 days from the BBC iPlayer service."
-msgstr ""
-"Veja programas da BBC emitidos nos últimos 7 dias no serviço iPlayer da BBC."
-
-#: ../src/plugins/iplayer/iplayer.py:72
-msgid "Error listing channel categories"
-msgstr "Erro ao listar as categorias de canais"
-
-#: ../src/plugins/iplayer/iplayer.py:73
-msgid ""
-"There was an unknown error getting the list of television channels available "
-"on BBC iPlayer."
-msgstr ""
-"Ocorreu um erro desconhecido ao obter a listagem de canais de televisão "
-"disponíveis no iPlayer da BBC."
-
-#. Append a dummy child row so that the expander's visible; we can
-#. then queue off the expander to load the programme listing for this
-#. category
-#: ../src/plugins/iplayer/iplayer.py:84
-msgid "Loading…"
-msgstr "A Ler…"
-
-#. Translators: the "programme feed" is the list of TV shows
-#. available to watch online
-#: ../src/plugins/iplayer/iplayer.py:136
-msgid "Error getting programme feed"
-msgstr "Erro ao obter a informação de programação"
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
+msgid "Instant Messenger Status"
+msgstr "Estado na aplicação de Mensagens Instantâneas"
 
-#: ../src/plugins/iplayer/iplayer.py:137
-msgid ""
-"There was an error getting the list of programmes for this channel and "
-"category combination."
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
+msgid "Set your Instant Messenger status to away when a movie is playing"
 msgstr ""
-"Ocorreu um erro ao obter a lista de programas da combinação entre este canal "
-"e categoria."
-
-#: ../src/plugins/iplayer/iplayer2.py:298
-msgid ""
-msgstr ""
-
-#: ../src/plugins/iplayer/iplayer2.py:299
-#, python-format
-msgid "Programme unavailable (\"%s\")"
-msgstr "Programação indisponível (\"%s\")"
+"Definir o seu estado na aplicação de Mensagens Instantâneas como ausente "
+"durante a reprodução de um filme"
 
 #: ../src/plugins/lirc/lirc.plugin.in.h:1
 msgid "Infrared Remote Control"
@@ -2260,25 +2077,29 @@
 msgid "Couldn't read lirc configuration."
 msgstr "Incapaz de ler a configuração do lirc."
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
-msgid "Download Movie Subtitles"
-msgstr "Realizar Download das Legendas do Filme"
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:1
+msgid "Media Player Keys"
+msgstr "Teclas de Reprodução de Média"
+
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:2
+msgid "Support additional media player keys"
+msgstr "Suportar teclas adicionais de reprodução de média"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
-msgid "Subtitle _language:"
-msgstr "_Idioma das legendas:"
+#: ../src/plugins/ontop/ontop.plugin.in.h:1
+msgid "Always On Top"
+msgstr "Sempre no Topo"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
-msgid "_Play with Subtitle"
-msgstr "_Reproduzir com Legendas"
+#: ../src/plugins/ontop/ontop.plugin.in.h:2
+msgid "Keep the main window on top when playing a movie"
+msgstr "Manter a janela principal no topo durante a reprodução de um filme"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:1
 msgid "Subtitle Downloader"
 msgstr "Downloader de Legendas"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:2
-msgid "Look for subtitles for the currently playing movie."
-msgstr "Procurar legendas para o filme actualmente a ser reproduzido."
+msgid "Look for subtitles for the currently playing movie"
+msgstr "Procurar legendas para o filme actualmente a ser reproduzido"
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:42
 msgid "Brazilian Portuguese"
@@ -2334,91 +2155,38 @@
 msgid "Searching subtitles…"
 msgstr "A procurar legendas…"
 
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
+msgid "Download Movie Subtitles"
+msgstr "Realizar Download das Legendas do Filme"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
+msgid "Subtitle _language:"
+msgstr "_Idioma das legendas:"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
+msgid "_Play with Subtitle"
+msgstr "_Reproduzir com Legendas"
+
 #: ../src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in.h:1
 msgid "Subtitle language"
 msgstr "Idioma das legendas"
 
-#: ../src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in.h:2
-msgid "The language to search for subtitles for movies in."
-msgstr "O idioma das legendas a procurar para o filme."
-
-#: ../src/plugins/ontop/ontop.plugin.in.h:1
-msgid "Always On Top"
-msgstr "Sempre no Topo"
+#: ../src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in.h:2
+msgid "The language to search for subtitles for movies in."
+msgstr "O idioma das legendas a procurar para o filme."
 
-#: ../src/plugins/ontop/ontop.plugin.in.h:2
-msgid "Keep the main window on top when playing a movie"
-msgstr "Manter a janela principal no topo durante a reprodução de um filme"
+#: ../src/plugins/properties/movie-properties.plugin.in.h:1
+msgid "Movie Properties"
+msgstr "Propriedades do Filme"
+
+#: ../src/plugins/properties/movie-properties.plugin.in.h:2
+msgid "Adds movie properties to the sidebar"
+msgstr "Adiciona as propriedades do filme à barra lateral"
 
 #: ../src/plugins/properties/totem-movie-properties.c:246
 msgid "Properties"
 msgstr "Propriedades"
 
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:1
-msgid "Publisher protocol to use"
-msgstr "Protocolo de publicação a utilizar"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:2
-msgid ""
-"The transport protocol to use when publishing playlists over the network."
-msgstr ""
-"O protocolo de transporte a utilizar ao publicar listas de reprodução na "
-"rede."
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:3
-msgid "Format for network service name"
-msgstr "Formato do nome de serviço de rede"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:5
-#, no-c-format
-msgid ""
-"A format string used to build the network service name used when publishing "
-"playlists over the network. The following format placeholders can be used: • "
-"%a: the program name as returned by g_get_application_name() • %h: the "
-"machine's host name in title case • %u: the user's login name in title case "
-"• %U: the user's real name • %%: the percent sign"
-msgstr ""
-"Uma expressão de formatação utilizada para construir o nome do serviço de "
-"rede utilizado ao publicar na rede listas de reprodução. Podem ser "
-"utilizadas as seguintes palavras-chave de formatação: • %a: o nome da "
-"aplicação tal como devolvido por g_get_application_name() • %h: o nome da "
-"máquina em capitalização de título • %u: o nome do utilizador em "
-"capitalização de título • %U: o nome real do utilizador • %%: o sinal de "
-"percentagem"
-
-#. Translators: computers on the local network which are publishing their playlists over the network
-#: ../src/plugins/publish/totem-publish.c:552
-msgid "Neighbors"
-msgstr "Vizinhos"
-
-#: ../src/plugins/publish/publish.plugin.in.h:1
-msgid "Publish Playlist"
-msgstr "Publicar a Lista de Reprodução"
-
-#: ../src/plugins/publish/publish.plugin.in.h:2
-msgid "Share the current playlist via HTTP"
-msgstr "Partilhar a lista de reprodução actual via HTTP"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:1
-msgid "Service _Name:"
-msgstr "_Nome do Serviço:"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:3
-#, no-c-format
-msgid ""
-"The name used for announcing the playlist service on the network.\n"
-"All occurrences of the string %u will be replaced by your name,\n"
-"and %h will be replaced by your computer's host name."
-msgstr ""
-"O nome utilizado para anunciar na rede o serviço de lista de reprodução.\n"
-"Todas as ocorrências da expressão %u serão substituídas pelo seu "
-"nome,\n"
-"e %h será substituído pelo nome da sua máquina."
-
-#: ../src/plugins/publish/publish-plugin.ui.h:6
-msgid "Use _encrypted transport protocol (HTTPS)"
-msgstr "Utilizar protocolo de transporte _encriptado (HTTPS)"
-
 #: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:1
 msgid "rpdb2 password"
 msgstr "Senha rpdb2"
@@ -2431,22 +2199,86 @@
 "A senha para proteger o servidor rpdb2 de acessos remotos não autorizados ao "
 "depurar o Totem. Se vazio, será utilizado por omissão 'totem'."
 
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
+msgid "Python Console"
+msgstr "Consola Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
+msgid "Interactive Python console"
+msgstr "Consola Python interactiva"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:88
+msgid "Python Console Menu"
+msgstr "Menu da Consola Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:93
+msgid "_Python Console"
+msgstr "Consola _Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:94
+msgid "Show Totem's Python console"
+msgstr "Apresentar a consola Python do Totem"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:100
+msgid "Python Debugger"
+msgstr "Depurador Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:101
+msgid "Enable remote Python debugging with rpdb2"
+msgstr "Activar a depuração remota de Python utilizando o rpdb2"
+
+#. pylint: disable-msg=E1101
+#: ../src/plugins/pythonconsole/pythonconsole.py:125
+#, python-format
+msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
+msgstr "Pode aceder ao Totem.Object através de 'totem_object' :\\n%s"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:129
+msgid "Totem Python Console"
+msgstr "Consola Python do Totem"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:139
+msgid ""
+"After you press OK, Totem will wait until you connect to it with winpdb or "
+"rpdb2. If you have not set a debugger password in DConf, it will use the "
+"default password ('totem')."
+msgstr ""
+"Após premir OK, o Totem irá aguardar até que se lhe ligue utilizando o "
+"winpdb ou rpdb2. Caso não tenha definido uma senha de depuração no DConf, "
+"irá utilizar a senha por omissão ('totem')."
+
+#: ../src/plugins/recent/recent.plugin.in.h:1
+msgid "Recent files"
+msgstr "Ficheiros recentes"
+
+#: ../src/plugins/recent/recent.plugin.in.h:2
+msgid "Adds files that have been played to recent files"
+msgstr "Adiciona os ficheiros reproduzidos aos ficheiros recentes"
+
 #: ../src/plugins/rotation/rotation.plugin.in.h:1
 msgid "Rotation Plugin"
 msgstr "Plugin de Rotação"
 
 #: ../src/plugins/rotation/rotation.plugin.in.h:2
-msgid "Allows videos to be rotated if they're in the wrong orientation."
-msgstr "Permite rodar vídeos se estiverem com a orientação incorrecta."
+msgid "Allows videos to be rotated if they are in the wrong orientation"
+msgstr "Permite rodar vídeos se estiverem com a orientação incorrecta"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:60
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:50
 msgid "_Rotate Clockwise"
 msgstr "_Rodar no Sentido dos Ponteiros"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:62
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:52
 msgid "Rotate Counterc_lockwise"
 msgstr "Rodar _Contra o Sentido dos Ponteiros"
 
+#: ../src/plugins/save-file/save-file.plugin.in.h:1
+msgid "Save Copy"
+msgstr "Gravar Cópia"
+
+#: ../src/plugins/save-file/save-file.plugin.in.h:2
+msgid "Save a copy of the currently playing movie"
+msgstr "Gravar uma cópia do vídeo actualmente a ser reproduzido"
+
 #: ../src/plugins/save-file/totem-save-file.c:63
 msgid "Save a Copy..."
 msgstr "Gravar uma Cópia..."
@@ -2469,10 +2301,13 @@
 msgid "Movie stream"
 msgstr "Fluxo do filme"
 
-#: ../src/plugins/screensaver/totem-screensaver.c:116
-#: ../browser-plugin/totem-plugin-viewer.c:1891
-msgid "Playing a movie"
-msgstr "A reproduzir um filme"
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:1
+msgid "Screen Saver"
+msgstr "Protector de Ecrã"
+
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:2
+msgid "Deactivates the screen saver when a movie is playing"
+msgstr "Desactivar a protecção de ecrã durante a reprodução"
 
 #: ../src/plugins/screenshot/gallery.ui.h:1
 msgid "Screenshot width (in pixels):"
@@ -2486,23 +2321,28 @@
 msgid "Number of screenshots:"
 msgstr "Número de capturas de ecrã:"
 
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:1
-msgid "_Name:"
-msgstr "_Nome:"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:2
-msgid "Save in _folder:"
-msgstr "Gravar na _pasta:"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:3
-msgid "Select a folder"
-msgstr "Seleccione uma pasta"
-
-#. Write the screenshot to the temporary file
-#: ../src/plugins/screenshot/gnome-screenshot-widget.c:385
-#: ../src/plugins/screenshot/totem-screenshot.c:64
-msgid "Screenshot.png"
-msgstr "CapturaEcra.png"
+#. translators: this is the name of the file that gets made up
+#. * with the screenshot if the entire screen is taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:147
+#, c-format
+msgid "Screenshot from %s.png"
+msgstr "Captura de ecra de %s.png"
+
+#. translators: this is the name of the file that gets
+#. * made up with the screenshot if the entire screen is
+#. * taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:154
+#, c-format
+msgid "Screenshot from %s - %d.png"
+msgstr "Captura de ecra de %s - %d.png"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:1
+msgid "Screenshot"
+msgstr "Captura de Ecrã"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:2
+msgid "Allows screenshots and galleries to be taken of videos"
+msgstr "Permite realizar capturas de ecrã e criar galerias a partir de vídeos"
 
 #: ../src/plugins/screenshot/totem-gallery.c:91
 msgid "Save Gallery"
@@ -2528,49 +2368,47 @@
 msgid "Saving gallery as \"%s\""
 msgstr "A gravar a galeria como \"%s\""
 
-#: ../src/plugins/screenshot/totem-screenshot.c:113
-msgid "There was an error saving the screenshot."
-msgstr "Ocorreu um erro ao gravar a captura de ecrã."
-
-#: ../src/plugins/screenshot/totem-screenshot.c:139
-msgid "Save Screenshot"
-msgstr "Gravar Captura de Ecrã"
-
-#. Create the screenshot widget
-#. Translators: %s is the movie title and %d is an auto-incrementing number to make filename unique
-#: ../src/plugins/screenshot/totem-screenshot.c:160
-#, c-format
-msgid "Screenshot-%s-%d.png"
-msgstr "CapturaEcra-%s-%d.png"
-
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:88
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:220
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "Totem could not get a screenshot of the video."
 msgstr "Totem não conseguiu obter uma captura de ecrã do vídeo."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "This is not supposed to happen; please file a bug report."
 msgstr "Não é suposto isto acontecer; apresente um relatório de erro."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
-msgid "Take _Screenshot..."
-msgstr "Capturar Imagem de _Ecrã..."
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
+msgid "Take _Screenshot"
+msgstr "Capturar Imagem de _Ecrã"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
 msgid "Take a screenshot"
 msgstr "Capturar uma imagem do ecrã"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create Screenshot _Gallery..."
 msgstr "Criar uma _Galeria de Capturas de Ecrã..."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create a gallery of screenshots"
 msgstr "Criar uma galeria de capturas de ecrã"
 
+#: ../src/plugins/skipto/skipto.plugin.in.h:1
+#: ../src/plugins/skipto/totem-skipto.c:196
+msgid "Skip To"
+msgstr "Saltar Para"
+
+#: ../src/plugins/skipto/skipto.plugin.in.h:2
+msgid "Provides the \"Skip to\" dialog"
+msgstr "Disponibiliza o diálogo de \"Saltar para\""
+
+#: ../src/plugins/skipto/skipto.ui.h:1
+msgid "_Skip to:"
+msgstr "_Saltar para:"
+
 #. Update the "seconds" label so that it always has the correct singular/plural form
 #. Translators: label for the seconds selector in the "Skip to" dialogue
-#: ../src/plugins/skipto/totem-skipto.c:160
+#: ../src/plugins/skipto/totem-skipto.c:159
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "segundo"
@@ -2580,15 +2418,11 @@
 #. Translators: you should translate this string to a number (written in digits) which corresponds to the longer character length of the
 #. * translations for "second" and "seconds", as translated elsewhere in this file. For example, in English, "second" is 6 characters long and
 #. * "seconds" is 7 characters long, so this string should be translated to "7". See: bgo#639398
-#: ../src/plugins/skipto/totem-skipto.c:190
+#: ../src/plugins/skipto/totem-skipto.c:189
 msgctxt "Skip To label length"
 msgid "7"
 msgstr "8"
 
-#: ../src/plugins/skipto/totem-skipto.c:197
-msgid "Skip To"
-msgstr "Saltar Para"
-
 #: ../src/plugins/skipto/totem-skipto-plugin.c:182
 msgid "_Skip To..."
 msgstr "_Saltar Para..."
@@ -2597,114 +2431,323 @@
 msgid "Skip to a specific time"
 msgstr "Saltar para uma hora específica"
 
-#: ../src/plugins/skipto/skipto.ui.h:1
-msgid "_Skip to:"
-msgstr "_Saltar para:"
+#~ msgid "Play movies and songs"
+#~ msgstr "Reproduzir filmes e músicas"
 
-#: ../browser-plugin/totem-plugin-viewer.c:431
-msgid "No URI to play"
-msgstr "Nenhum URI a reproduzir"
+#~ msgid "Open a file"
+#~ msgstr "Abrir um ficheiro"
 
-#. translators: this is:
-#. * Open With ApplicationName
-#. * as in nautilus' right-click menu
-#: ../browser-plugin/totem-plugin-viewer.c:1107
-#, c-format
-msgid "_Open with \"%s\""
-msgstr "_Abrir com \"%s\""
+#~ msgid "Open _Location..."
+#~ msgstr "Abrir _Localização..."
 
-#: ../browser-plugin/totem-plugin-viewer.c:2136
-msgid "No playlist or playlist empty"
-msgstr "Nenhuma lista de reprodução ou lista vazia"
+#~ msgid "Open a non-local file"
+#~ msgstr "Abrir um ficheiro não-local"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2235
-msgid "Movie browser plugin"
-msgstr "Plugin de navegador de filmes"
+#~ msgid "Quit the program"
+#~ msgstr "Sair da aplicação"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Verify your system installation. The Totem plugin will now exit."
-msgstr ""
-"Verifique a instalação do seu sistema. O plugin Totem irá agora terminar."
+#~ msgid "Configure the application"
+#~ msgstr "Configurar a aplicação"
 
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
-msgid "Python Console"
-msgstr "Consola Python"
+#~ msgid "Switch to fullscreen"
+#~ msgstr "Alternar para ecrã completo"
 
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
-msgid "Interactive Python console."
-msgstr "Consola Python interactiva."
+#~ msgid "Set the repeat mode"
+#~ msgstr "Definir o modo de repetição"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:88
-msgid "Python Console Menu"
-msgstr "Menu da Consola Python"
+#~ msgid "Set the shuffle mode"
+#~ msgstr "Definir o modo de baralhar"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:93
-msgid "_Python Console"
-msgstr "Consola _Python"
+#~ msgid "14.4 Kbps Modem"
+#~ msgstr "Modem a 14.4 Kbps"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:94
-msgid "Show Totem's Python console"
-msgstr "Apresentar a consola Python do Totem"
+#~ msgid "19.2 Kbps Modem"
+#~ msgstr "Modem a 19.2 Kbps"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:100
-msgid "Python Debugger"
-msgstr "Depurador Python"
+#~ msgid "28.8 Kbps Modem"
+#~ msgstr "Modem a 28.8 Kbps"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:101
-msgid "Enable remote Python debugging with rpdb2"
-msgstr "Activar a depuração remota de Python utilizando o rpdb2"
+#~ msgid "33.6 Kbps Modem"
+#~ msgstr "Modem a 33.6 Kbps"
 
-#. pylint: disable-msg=E1101
-#: ../src/plugins/pythonconsole/pythonconsole.py:125
-#, python-format
-msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
-msgstr "Pode aceder ao Totem.Object através de 'totem_object' :\\n%s"
+#~ msgid "34.4 Kbps Modem"
+#~ msgstr "Modem a 34.4 Kbps"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:129
-msgid "Totem Python Console"
-msgstr "Consola Python do Totem"
+#~ msgid "56 Kbps Modem/ISDN"
+#~ msgstr "Modem/RDIS a 56 Kbps"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:139
-msgid ""
-"After you press OK, Totem will wait until you connect to it with winpdb or "
-"rpdb2. If you have not set a debugger password in DConf, it will use the "
-"default password ('totem')."
-msgstr ""
-"Após premir OK, o Totem irá aguardar até que se lhe ligue utilizando o "
-"winpdb ou rpdb2. Caso não tenha definido uma senha de depuração no DConf, "
-"irá utilizar a senha por omissão ('totem')."
+#~ msgid "112 Kbps Dual ISDN/DSL"
+#~ msgstr "112 Kbps RDIS Dupla/DSL"
 
-#: ../src/plugins/grilo/grilo.plugin.in.h:1
-msgid "Grilo Browser"
-msgstr "Navegador Grilo"
+#~ msgid "256 Kbps DSL/Cable"
+#~ msgstr "DSL/Cabo a 256 Kbps"
 
-#: ../src/plugins/grilo/grilo.plugin.in.h:2
-msgid "A plugin to let you browse media content from various sources."
-msgstr "Um plugin que lhe permite navegar pelo conteúdo de várias origens."
+#~ msgid "384 Kbps DSL/Cable"
+#~ msgstr "DSL/Cabo a 384 Kbps"
 
-#: ../src/plugins/grilo/totem-grilo.c:452
-msgid "Browse Error"
-msgstr "Erro de Navegador"
+#~ msgid "512 Kbps DSL/Cable"
+#~ msgstr "DSL/Cabo a 512 Kbps"
 
-#: ../src/plugins/grilo/totem-grilo.c:599
-msgid "Search Error"
-msgstr "Erro de Pesquisa"
+#~ msgid "1.5 Mbps T1/Intranet/LAN"
+#~ msgstr "T1/Intranet/LAN a 1.5 Mbps"
 
-#: ../src/plugins/grilo/totem-grilo.c:1219 ../src/plugins/grilo/grilo.ui.h:3
-msgid "Browse"
-msgstr "Navegar"
+#~ msgid "Intranet/LAN"
+#~ msgstr "Intranet/LAN"
 
-#: ../src/plugins/grilo/totem-grilo.c:1285 ../src/plugins/grilo/grilo.ui.h:4
-msgid "Search"
-msgstr "Procurar"
+#~ msgid "Networking"
+#~ msgstr "Rede"
 
-#: ../src/plugins/grilo/grilo.ui.h:1
-msgid "Add to Playlist"
-msgstr "Adicionar à Lista de Reprodução"
+#~ msgid "Connection _speed:"
+#~ msgstr "_Velocidade da ligação:"
 
-#: ../src/plugins/grilo/grilo.ui.h:2
-msgid "Copy Location"
-msgstr "Copiar Localização"
+#~ msgid "Network connection speed"
+#~ msgstr "Velocidade da ligação de rede"
+
+#~ msgid ""
+#~ "Approximate network connection speed, used to select quality on media "
+#~ "over the network."
+#~ msgstr ""
+#~ "Velocidade aproximada da rede, utilizada para seleccionar a qualidade do "
+#~ "media sobre a rede."
+
+#~ msgid "Play Image '%s'"
+#~ msgstr "Reproduzir a Imagem '%s'"
+
+#~ msgid "device%d"
+#~ msgstr "dispositivo%d"
+
+#~ msgid "Play Disc '%s'"
+#~ msgstr "Reproduzir o Disco '%s'"
+
+#~ msgid "Movie Player using %s"
+#~ msgstr "Reprodutor de Filmes a utilizar o %s"
+
+#~ msgid ""
+#~ "Totem could not play this media (%s) although a plugin is present to "
+#~ "handle it."
+#~ msgstr ""
+#~ "Totem não conseguiu reproduzir este media (%s) apesar de existir um "
+#~ "plugin para o suportar."
+
+#~ msgid ""
+#~ "You might want to check that a disc is present in the drive and that it "
+#~ "is correctly configured."
+#~ msgstr ""
+#~ "Poderá querer verificar se existe um disco na unidade e se esta está "
+#~ "correctamente configurada."
+
+#~ msgid "More information about media plugins"
+#~ msgstr "Mais informações sobre plugins de media"
+
+#~ msgid ""
+#~ "Please install the necessary plugins and restart Totem to be able to play "
+#~ "this media."
+#~ msgstr ""
+#~ "Instale os plugins necessários e reinicie o Totem para ser possível "
+#~ "reproduzir este media."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it does not have the "
+#~ "appropriate plugins to be able to read from the disc."
+#~ msgstr ""
+#~ "Totem é incapaz de reproduzir este tipo de media (%s) pois não possui os "
+#~ "plugins apropriados para conseguir ler do disco."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because you do not have the "
+#~ "appropriate plugins to handle it."
+#~ msgstr ""
+#~ "Totem é incapaz de reproduzir este tipo de media (%s) pois não possui os "
+#~ "plugins apropriados para o suportar."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it is not supported."
+#~ msgstr ""
+#~ "Totem é incapaz de reproduzir este tipo de media (%s) pois não é "
+#~ "suportado."
+
+#~ msgid "Please insert another disc to play back."
+#~ msgstr "Introduza outro disco para reprodução."
+
+#~ msgid "Totem was not able to play this disc."
+#~ msgstr "Totem foi incapaz de reproduzir este disco."
+
+#~ msgid "Totem does not support playback of Audio CDs"
+#~ msgstr "O Totem não suporta a reprodução de CDs Áudio"
+
+#~ msgid ""
+#~ "Please consider using a music player or a CD extractor to play this CD"
+#~ msgstr ""
+#~ "Considere utilizar um reprodutor de música ou um extrator de CD para "
+#~ "reproduzir este CD"
+
+#~ msgid "%d %%"
+#~ msgstr "%d %%"
+
+#~ msgid ""
+#~ "The requested audio output was not found. Please select another audio "
+#~ "output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "A saída de áudio definida não foi encontrada. Seleccione outra saída de "
+#~ "áudio no Selector de Sistemas Multimédia."
+
+#~ msgid "Location not found."
+#~ msgstr "Localização não encontrada."
+
+#~ msgid ""
+#~ "Could not open location; you might not have permission to open the file."
+#~ msgstr ""
+#~ "Incapaz de abrir a localização; poderá não possui permissões para abrir o "
+#~ "ficheiro."
+
+#~ msgid ""
+#~ "The video output is in use by another application. Please close other "
+#~ "video applications, or select another video output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "A saída de vídeo está a ser utilizada por outra aplicação. Feche as "
+#~ "outras aplicações de vídeo ou seleccione outra saída de vídeo no Selector "
+#~ "de Sistemas Multimédia."
+
+#~ msgid ""
+#~ "The audio output is in use by another application. Please select another "
+#~ "audio output in the Multimedia Systems Selector. You may want to consider "
+#~ "using a sound server."
+#~ msgstr ""
+#~ "A saída de áudio está a ser utilizada por outra aplicação. Seleccione "
+#~ "outra saída de áudio no Selector de Sistemas Multimédia. Deverá "
+#~ "considerar a utilização de um servidor de som."
+
+#~ msgid ""
+#~ "Failed to create a GStreamer play object. Please check your GStreamer "
+#~ "installation."
+#~ msgstr ""
+#~ "Falha ao criar um objecto de reprodução GStreamer. Verifique a sua "
+#~ "instalação do GStreamer."
+
+#~ msgid ""
+#~ "Failed to open audio output. You may not have permission to open the "
+#~ "sound device, or the sound server may not be running. Please select "
+#~ "another audio output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "Falha ao abrir a saída de áudio. Poderá não possuir permissões para abrir "
+#~ "o dispositivo de som ou o servidor de som poderá não se encontrar em "
+#~ "execução. Seleccione outra saída de áudio no Selector de Sistemas "
+#~ "Multimédia."
+
+#~ msgid ""
+#~ "Could not find the audio output. You may need to install additional "
+#~ "GStreamer plugins, or select another audio output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "Incapaz de encontrar a saída de áudio. Poderá ter de instalar plugins do "
+#~ "GStreamer adicionais ou seleccionar outra saída de áudio no Selector de "
+#~ "Sistemas Multimédia."
+
+#~ msgid "BBC iPlayer"
+#~ msgstr "iPlayer da BBC"
+
+#~ msgid ""
+#~ "Stream BBC programs from the last 7 days from the BBC iPlayer service."
+#~ msgstr ""
+#~ "Veja programas da BBC emitidos nos últimos 7 dias no serviço iPlayer da "
+#~ "BBC."
+
+#~ msgid "Error listing channel categories"
+#~ msgstr "Erro ao listar as categorias de canais"
+
+#~ msgid ""
+#~ "There was an unknown error getting the list of television channels "
+#~ "available on BBC iPlayer."
+#~ msgstr ""
+#~ "Ocorreu um erro desconhecido ao obter a listagem de canais de televisão "
+#~ "disponíveis no iPlayer da BBC."
+
+#~ msgid "Loading…"
+#~ msgstr "A Ler…"
+
+#~ msgid "Error getting programme feed"
+#~ msgstr "Erro ao obter a informação de programação"
+
+#~ msgid ""
+#~ "There was an error getting the list of programmes for this channel and "
+#~ "category combination."
+#~ msgstr ""
+#~ "Ocorreu um erro ao obter a lista de programas da combinação entre este "
+#~ "canal e categoria."
+
+#~ msgid ""
+#~ msgstr ""
+
+#~ msgid "Programme unavailable (\"%s\")"
+#~ msgstr "Programação indisponível (\"%s\")"
+
+#~ msgid "Publisher protocol to use"
+#~ msgstr "Protocolo de publicação a utilizar"
+
+#~ msgid ""
+#~ "The transport protocol to use when publishing playlists over the network."
+#~ msgstr ""
+#~ "O protocolo de transporte a utilizar ao publicar listas de reprodução na "
+#~ "rede."
+
+#~ msgid "Format for network service name"
+#~ msgstr "Formato do nome de serviço de rede"
+
+#~ msgid ""
+#~ "A format string used to build the network service name used when "
+#~ "publishing playlists over the network. The following format placeholders "
+#~ "can be used: • %a: the program name as returned by g_get_application_name"
+#~ "() • %h: the machine's host name in title case • %u: the user's login "
+#~ "name in title case • %U: the user's real name • %%: the percent sign"
+#~ msgstr ""
+#~ "Uma expressão de formatação utilizada para construir o nome do serviço de "
+#~ "rede utilizado ao publicar na rede listas de reprodução. Podem ser "
+#~ "utilizadas as seguintes palavras-chave de formatação: • %a: o nome da "
+#~ "aplicação tal como devolvido por g_get_application_name() • %h: o nome da "
+#~ "máquina em capitalização de título • %u: o nome do utilizador em "
+#~ "capitalização de título • %U: o nome real do utilizador • %%: o sinal de "
+#~ "percentagem"
+
+#~ msgid "Neighbors"
+#~ msgstr "Vizinhos"
+
+#~ msgid "Publish Playlist"
+#~ msgstr "Publicar a Lista de Reprodução"
+
+#~ msgid "Share the current playlist via HTTP"
+#~ msgstr "Partilhar a lista de reprodução actual via HTTP"
+
+#~ msgid "Service _Name:"
+#~ msgstr "_Nome do Serviço:"
+
+#~ msgid ""
+#~ "The name used for announcing the playlist service on the network.\n"
+#~ "All occurrences of the string %u will be replaced by your name,\n"
+#~ "and %h will be replaced by your computer's host name."
+#~ msgstr ""
+#~ "O nome utilizado para anunciar na rede o serviço de lista de reprodução.\n"
+#~ "Todas as ocorrências da expressão %u serão substituídas pelo seu "
+#~ "nome,\n"
+#~ "e %h será substituído pelo nome da sua máquina."
+
+#~ msgid "Use _encrypted transport protocol (HTTPS)"
+#~ msgstr "Utilizar protocolo de transporte _encriptado (HTTPS)"
+
+#~ msgid "_Name:"
+#~ msgstr "_Nome:"
+
+#~ msgid "Save in _folder:"
+#~ msgstr "Gravar na _pasta:"
+
+#~ msgid "Select a folder"
+#~ msgstr "Seleccione uma pasta"
+
+#~ msgid "There was an error saving the screenshot."
+#~ msgstr "Ocorreu um erro ao gravar a captura de ecrã."
+
+#~ msgid "Save Screenshot"
+#~ msgstr "Gravar Captura de Ecrã"
 
 #~ msgid "Bemused"
 #~ msgstr "Bemused"
@@ -2733,9 +2776,6 @@
 #~ msgid "Search Results"
 #~ msgstr "Resultados da Procura"
 
-#~ msgid "Videos"
-#~ msgstr "Vídeos"
-
 #~ msgid "_Open in Web Browser"
 #~ msgstr "_Abrir num Navegador Web"
 
@@ -3135,9 +3175,6 @@
 #~ msgid "Jamendo Plugin Configuration"
 #~ msgstr "Configuração do Plugin da Jamendo"
 
-#~ msgid "Could not load the \"Skip to\" dialog interface."
-#~ msgstr "Incapaz de ler o interface do diálogo de \"Saltar para\"."
-
 #~ msgid "Deinterlace"
 #~ msgstr "Desinterlaçar"
 
@@ -3256,34 +3293,18 @@
 #~ "Verifique se o dispositivo não está ocupado."
 
 #~ msgid ""
-#~ "No video output is available. Make sure that the program is correctly "
-#~ "installed."
-#~ msgstr ""
-#~ "Não existe nenhuma entrada de vídeo disponível. Certifique-se de que a "
-#~ "aplicação está correctamente instalada."
-
-#~ msgid ""
 #~ "The TV adapter could not tune into the channel. Please check your "
 #~ "hardware setup and channel configuration."
 #~ msgstr ""
 #~ "O adaptador de TV foi incapaz de sintonizar o canal. Verifique o seu "
 #~ "equipamento e configuração de canal."
 
-#~ msgid "The server you are trying to connect to is not known."
-#~ msgstr "O servidor a que se está a tentar ligar é desconhecido."
-
 #~ msgid "The device name you specified (%s) seems to be invalid."
 #~ msgstr "O nome de dispositivo que especificou (%s) parece ser inválido."
 
 #~ msgid "The server you are trying to connect to (%s) is unreachable."
 #~ msgstr "O servidor a que se está a tentar ligar (%s) está inacessível."
 
-#~ msgid "The connection to this server was refused."
-#~ msgstr "A ligação a este servidor foi recusada."
-
-#~ msgid "The specified movie could not be found."
-#~ msgstr "Incapaz de encontrar o filme especificado."
-
 #~ msgid ""
 #~ "The source seems encrypted and can't be read. Are you trying to play an "
 #~ "encrypted DVD without libdvdcss?"
@@ -3291,9 +3312,6 @@
 #~ "A origem parece estar encriptada e não pode ser lida. Está a tentar "
 #~ "reproduzir um DVD encriptado sem a libdvdcss?"
 
-#~ msgid "The movie could not be read."
-#~ msgstr "Incapaz de ler o filme."
-
 #~ msgid "A problem occurred while loading a library or a decoder (%s)."
 #~ msgstr "Ocorreu um problema ao ler uma biblioteca ou descodificador (%s)."
 
@@ -3310,15 +3328,6 @@
 #~ msgid "Authentication is required to access this file."
 #~ msgstr "É necessária autenticação para aceder a este ficheiro."
 
-#~ msgid "Authentication is required to access this file or stream."
-#~ msgstr "É necessária autenticação para aceder a este ficheiro ou fluxo."
-
-#~ msgid "You are not allowed to open this file."
-#~ msgstr "Não possui permissões para abrir este ficheiro."
-
-#~ msgid "The server refused access to this file or stream."
-#~ msgstr "O servidor recusou o acesso e este ficheiro ou fluxo."
-
 #~ msgid "The file you tried to play is an empty file."
 #~ msgstr "O ficheiro que tentou reproduzir é um ficheiro vazio."
 
@@ -3333,9 +3342,6 @@
 #~ msgid "This movie is broken and can not be played further."
 #~ msgstr "Este filme está estragado e não pode mais ser reproduzido."
 
-#~ msgid "This location is not a valid one."
-#~ msgstr "Esta localização não é válida."
-
 #~ msgid "This movie could not be opened."
 #~ msgstr "Não foi possível abrir este filme."
 
@@ -3346,13 +3352,6 @@
 #~ "Codec de vídeo '%s' não é manipulado. Poderá ter de instalar plugins "
 #~ "adicionais para ser capaz de reproduzir alguns tipos de filmes."
 
-#~ msgid ""
-#~ "Audio codec '%s' is not handled. You might need to install additional "
-#~ "plugins to be able to play some types of movies"
-#~ msgstr ""
-#~ "Codec de vídeo '%s' não é manipulado. Poderá ter de instalar plugins "
-#~ "adicionais para ser capaz de reproduzir alguns tipos de filmes"
-
 #~ msgid "This is an audio-only file and there is no audio output available."
 #~ msgstr ""
 #~ "Este é um ficheiro apenas de áudio e não existe saída de áudio disponível."
@@ -3549,9 +3548,6 @@
 #~ "5.1-canais\n"
 #~ "Passagem AC3"
 
-#~ msgid "Open Location"
-#~ msgstr "Abrir Localização"
-
 #~ msgid "Vanity Webcam utility"
 #~ msgstr "Utilitário Webcam Vanity"
 
diff -Nru totem-3.4.3/po/pt_BR.po totem-3.6.2/po/pt_BR.po
--- totem-3.4.3/po/pt_BR.po	2012-04-02 14:15:40.000000000 +0000
+++ totem-3.6.2/po/pt_BR.po	2012-10-25 13:15:32.000000000 +0000
@@ -11,29 +11,248 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Totem\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=totem&"
-"keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-03-23 06:16+0000\n"
-"PO-Revision-Date: 2012-03-21 05:59-0200\n"
-"Last-Translator: Djavan Fagundes \n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=totem&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2012-09-10 17:46+0000\n"
+"PO-Revision-Date: 2012-09-11 01:17-0300\n"
+"Last-Translator: Rafael Ferreira \n"
 "Language-Team: Brazilian Portuguese \n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Virtaal 0.7.1\n"
 "X-DamnedLies-Scope: partial\n"
 "X-Project-Style: gnome\n"
 
+#: ../browser-plugin/totem-plugin-viewer.c:352 ../src/totem-object.c:1180
+#: ../src/totem-object.c:1650 ../src/totem-statusbar.c:115
+msgid "Stopped"
+msgstr "Parado"
+
+#: ../browser-plugin/totem-plugin-viewer.c:364 ../src/totem-object.c:1173
+msgid "Paused"
+msgstr "Pausado"
+
+#: ../browser-plugin/totem-plugin-viewer.c:368 ../src/totem-object.c:1166
+msgid "Playing"
+msgstr "Reproduzindo"
+
+#: ../browser-plugin/totem-plugin-viewer.c:386
+#: ../src/plugins/screensaver/totem-screensaver.c:97
+msgid "Playing a movie"
+msgstr "Reproduz um filme"
+
+#: ../browser-plugin/totem-plugin-viewer.c:443
+msgid "No URI to play"
+msgstr "Sem URI para reproduzir"
+
+#: ../browser-plugin/totem-plugin-viewer.c:676
+#: ../browser-plugin/totem-plugin-viewer.c:1700
+msgid "Totem Movie Player"
+msgstr "Reprodutor de filmes Totem"
+
+#. translators: this is:
+#. * Open With ApplicationName
+#. * as in nautilus' right-click menu
+#: ../browser-plugin/totem-plugin-viewer.c:1120
+#, c-format
+msgid "_Open with \"%s\""
+msgstr "Abrir c_om \"%s\""
+
+#: ../browser-plugin/totem-plugin-viewer.c:1341 ../src/totem-object.c:2475
+msgid "An error occurred"
+msgstr "Ocorreu um erro"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2033
+msgid "No playlist or playlist empty"
+msgstr "Sem listas de reprodução ou ela está vazia"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2128
+msgid "Movie browser plugin"
+msgstr "Plug-in do navegador de filme"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144 ../src/totem.c:240
+msgid "Could not initialize the thread-safe libraries."
+msgstr "Não foi possível inicializar as bibliotecas de processo-seguro."
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144
+msgid "Verify your system installation. The Totem plugin will now exit."
+msgstr "Verifique a instalação do seu sistema. O plug-in do Totem irá sair."
+
 #: ../data/fullscreen.ui.h:1
 msgid "Leave Fullscreen"
 msgstr "Deixar tela cheia"
 
-#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:144
+#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:81
 msgid "Time:"
 msgstr "Tempo:"
 
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
+msgid "Allow the screensaver to activate when playing audio"
+msgstr ""
+"Permitir que o protetor de tela seja ativado durante a reprodução de áudio"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
+msgid ""
+"Allow the screensaver to activate when playing audio. Disable if you have "
+"monitor-powered speakers."
+msgstr ""
+"Permitir que o protetor de tela seja ativado durante a reprodução de áudio. "
+"Desative se você tiver monitor com alto-falantes."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
+msgid "Show visual effects when no video is displayed"
+msgstr "Mostrar efeitos visuais quando nenhum vídeo for exibido"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
+msgid "Show visual effects when playing an audio only file."
+msgstr ""
+"Mostra efeitos visuais durante a reprodução de um arquivo somente áudio."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
+msgid "Name of the visual effects plugin"
+msgstr "Nome do plug-in de efeitos visuais"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
+msgid "The brightness of the video"
+msgstr "O brilho do vídeo"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
+msgid "The contrast of the video"
+msgstr "O contraste do vídeo"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
+msgid "The hue of the video"
+msgstr "A tonalidade do vídeo"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
+msgid "The saturation of the video"
+msgstr "A saturação do vídeo"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
+msgid "Resize the canvas automatically on file load"
+msgstr "Redimensionar a tela automaticamente no carregamento de arquivo"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
+msgid "Repeat mode"
+msgstr "Modo de repetição"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
+msgid "Shuffle mode"
+msgstr "Modo aleatório"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
+msgid "Whether to disable deinterlacing for interlaced movies"
+msgstr "Desativar o desentrelaçamento para filmes entrelaçados"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
+msgid "Whether to enable debug for the playback engine"
+msgstr "Ativar a depuração para o mecanismo de reprodução"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
+msgid "Type of audio output to use"
+msgstr "Tipo de saída de áudio para usar"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
+msgid "Visualization quality setting"
+msgstr "Definição de qualidade de visualização"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
+msgid "Quality setting for the audio visualization."
+msgstr "Definição de qualidade para a visualização de áudio."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
+msgid "Network buffering threshold"
+msgstr "Limite de armazenamento em buffer de rede"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
+msgid ""
+"Amount of data to buffer for network streams before starting to display the "
+"stream (in seconds)."
+msgstr ""
+"Quantidade de dados em buffer para os fluxos de rede antes de iniciar a "
+"exibição da transmissão (em segundos)."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
+msgid "Subtitle font"
+msgstr "Fonte das legendas"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
+msgid "Pango font description for subtitle rendering."
+msgstr "Descrição da fonte Pango para renderização das legendas."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
+msgid "Subtitle encoding"
+msgstr "Codificação das legendas"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
+msgid "Encoding character set for subtitle."
+msgstr "Codificação de caractere definido para legendas."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
+msgid "Default location for the \"Open...\" dialogs"
+msgstr "Local padrão para os diálogos \"Abrir...\""
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
+msgid ""
+"Default location for the \"Open...\" dialogs. Default is the current "
+"directory."
+msgstr ""
+"Local padrão para os diálogos \"Abrir...\". O padrão é o diretório atual."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
+msgid "Default location for the \"Take Screenshot\" dialogs"
+msgstr "Local padrão para os diálogos \"Capturar tela\""
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
+msgid ""
+"Default location for the \"Take Screenshot\" dialogs. Default is the "
+"Pictures directory."
+msgstr ""
+"Local padrão para os diálogos \"Capturar tela\". O padrão é o diretório de "
+"imagens."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
+msgid "Whether to disable the plugins in the user's home directory"
+msgstr "Desativar os plug-ins no diretório home do usuário"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
+msgid "Whether to disable the keyboard shortcuts"
+msgstr "Desativar os atalhos de teclado"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
+msgid "Whether to autoload text subtitle files when a movie is loaded"
+msgstr ""
+"Carregar automaticamente os arquivos de legenda quando um filme for carregado"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
+msgid "Whether to autoload external chapter files when a movie is loaded"
+msgstr ""
+"Carregar automaticamente arquivos de capítulo externo quando um filme for "
+"carregado"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
+msgid ""
+"Whether to remember the position of played audio/video files when pausing or "
+"closing them"
+msgstr ""
+"Lembrar a posição de arquivos de áudio/vídeo reproduzidos ao pausar ou fechá-"
+"los"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
+msgid "Active plugins list"
+msgstr "Lista de plug-ins ativos"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+msgid ""
+"A list of the names of the plugins which are currently active (loaded and "
+"running)."
+msgstr ""
+"Uma lista dos nomes dos plug-ins que estão atualmente ativos (carregados e "
+"em execução)."
+
 #: ../data/playlist.ui.h:1
 msgid "_Remove"
 msgstr "_Remover"
@@ -50,11 +269,11 @@
 msgid "Copy the location to the clipboard"
 msgstr "Copiar para a área de transferência"
 
-#: ../data/playlist.ui.h:5 ../data/totem.ui.h:78
+#: ../data/playlist.ui.h:5 ../data/totem.ui.h:71
 msgid "_Select Text Subtitles..."
 msgstr "_Select legendas de texto..."
 
-#: ../data/playlist.ui.h:6 ../data/totem.ui.h:79
+#: ../data/playlist.ui.h:6 ../data/totem.ui.h:72
 msgid "Select a file to use for text subtitles"
 msgstr "Selecionar um arquivo para usar como legenda"
 
@@ -78,48 +297,198 @@
 msgid "Move Down"
 msgstr "Mover para baixo"
 
-#: ../data/properties.ui.h:1 ../data/totem.ui.h:122
-msgid "General"
-msgstr "Geral"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:2
+msgid "Normal"
+msgstr "Normal"
 
-#: ../data/properties.ui.h:2
-msgid "Title:"
-msgstr "Título:"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:4
+msgid "Large"
+msgstr "Grande"
 
-#: ../data/properties.ui.h:3
-msgid "Artist:"
-msgstr "Artista:"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:6
+msgid "Extra Large"
+msgstr "Extra largo"
 
-#: ../data/properties.ui.h:4
-msgid "Duration:"
-msgstr "Duração:"
+#: ../data/preferences.ui.h:7 ../src/backend/bacon-video-widget.c:5498
+#: ../src/totem-properties-view.c:231
+msgid "Stereo"
+msgstr "Estéreo"
 
-#: ../data/properties.ui.h:5
-msgid "Year:"
-msgstr "Ano:"
+#: ../data/preferences.ui.h:8
+msgid "4-channel"
+msgstr "4 canais"
 
-#: ../data/properties.ui.h:6
-msgid "Album:"
-msgstr "Álbum:"
+#: ../data/preferences.ui.h:9
+msgid "4.1-channel"
+msgstr "4.1 canais"
 
-#: ../data/properties.ui.h:7
-msgid "Comment:"
-msgstr "Comentário:"
+#: ../data/preferences.ui.h:10
+msgid "5.0-channel"
+msgstr "5.0 canais"
 
-#: ../data/properties.ui.h:8
-msgid "Container:"
-msgstr "Contêiner:"
+#: ../data/preferences.ui.h:11
+msgid "5.1-channel"
+msgstr "5.1 canais"
 
-#: ../data/properties.ui.h:9 ../data/totem.ui.h:128
-#: ../src/totem-properties-view.c:270
-msgid "Video"
-msgstr "Vídeo"
+#: ../data/preferences.ui.h:12
+msgid "AC3 Passthrough"
+msgstr "Passagem AC3"
 
-#: ../data/properties.ui.h:10
-msgid "Dimensions:"
-msgstr "Dimensões:"
+#: ../data/preferences.ui.h:13
+msgid "Totem Preferences"
+msgstr "Preferências do Totem"
 
-#: ../data/properties.ui.h:11
+#: ../data/preferences.ui.h:14
+msgid "Playback"
+msgstr "Reprodução"
+
+#: ../data/preferences.ui.h:15
+msgid "Start playing files from last position"
+msgstr "Começar a reproduzir arquivos da última posição"
+
+#: ../data/preferences.ui.h:16
+msgid "Text Subtitles"
+msgstr "Legendas de texto"
+
+#: ../data/preferences.ui.h:17
+msgid "_Load subtitle files when movie is loaded"
+msgstr "Carregar _legendas quando o filme for carregado"
+
+#: ../data/preferences.ui.h:18
+msgid "_Font:"
+msgstr "_Fonte:"
+
+#: ../data/preferences.ui.h:19
+msgid "_Encoding:"
+msgstr "Co_dificação:"
+
+#: ../data/preferences.ui.h:20
+msgid "External Chapters"
+msgstr "Capítulos externos"
+
+#: ../data/preferences.ui.h:21
+msgid "Load _chapter files when movie is loaded"
+msgstr "Carregar arquivos dos _capítulos quando o filme estiver carregado"
+
+#: ../data/preferences.ui.h:22 ../data/properties.ui.h:1
+msgid "General"
+msgstr "Geral"
+
+#. Tab label in the Preferences dialogue
+#: ../data/preferences.ui.h:24
+msgid "Display"
+msgstr "Monitor"
+
+#: ../data/preferences.ui.h:25
+msgid "_Resize the window when a new video is loaded"
+msgstr "_Redimensionar a janela quando um novo vídeo for carregado"
+
+#: ../data/preferences.ui.h:26
+msgid "Disable _deinterlacing of interlaced videos"
+msgstr "Desativar _desentrelaçamento de vídeos entrelaçados"
+
+#: ../data/preferences.ui.h:27
+msgid "Disable screensaver when playing "
+msgstr "Desabilitar proteção de tela quando estiver assistindo "
+
+#: ../data/preferences.ui.h:28 ../data/properties.ui.h:9
+#: ../src/totem-properties-view.c:273
+msgid "Video"
+msgstr "Vídeo"
+
+#: ../data/preferences.ui.h:29
+msgid "Video or Audio"
+msgstr "Vídeo ou áudio"
+
+#: ../data/preferences.ui.h:30
+msgid "Visual Effects"
+msgstr "Efeitos visuais"
+
+#: ../data/preferences.ui.h:31
+msgid "Show _visual effects when an audio file is played"
+msgstr "Mostrar efeitos _visuais quando um arquivo de som for reproduzido"
+
+#: ../data/preferences.ui.h:32
+msgid "_Type of visualization:"
+msgstr "_Tipo de visualização:"
+
+#: ../data/preferences.ui.h:33
+msgid "Visualization _size:"
+msgstr "Tamanho da vi_sualização:"
+
+#: ../data/preferences.ui.h:34
+msgid "Color Balance"
+msgstr "Balanço de cor"
+
+#: ../data/preferences.ui.h:35
+msgid "_Brightness:"
+msgstr "_Brilho:"
+
+#: ../data/preferences.ui.h:36
+msgid "Co_ntrast:"
+msgstr "Co_ntraste:"
+
+#: ../data/preferences.ui.h:37
+msgid "Sat_uration:"
+msgstr "Sat_uração:"
+
+#: ../data/preferences.ui.h:38
+msgid "_Hue:"
+msgstr "T_onalidade:"
+
+#: ../data/preferences.ui.h:39
+msgid "Reset to _Defaults"
+msgstr "Resetar para o pa_drão"
+
+#: ../data/preferences.ui.h:40
+msgid "Audio Output"
+msgstr "Saída de áudio"
+
+#: ../data/preferences.ui.h:41
+msgid "_Audio output type:"
+msgstr "Tipo de s_aída de áudio:"
+
+#: ../data/preferences.ui.h:42 ../data/properties.ui.h:14
+#: ../src/totem-properties-view.c:271
+msgid "Audio"
+msgstr "Áudio"
+
+#: ../data/properties.ui.h:2
+msgid "Title:"
+msgstr "Título:"
+
+#: ../data/properties.ui.h:3
+msgid "Artist:"
+msgstr "Artista:"
+
+#: ../data/properties.ui.h:4
+msgid "Duration:"
+msgstr "Duração:"
+
+#: ../data/properties.ui.h:5
+msgid "Year:"
+msgstr "Ano:"
+
+#: ../data/properties.ui.h:6
+msgid "Album:"
+msgstr "Álbum:"
+
+#: ../data/properties.ui.h:7
+msgid "Comment:"
+msgstr "Comentário:"
+
+#: ../data/properties.ui.h:8
+msgid "Container:"
+msgstr "Contêiner:"
+
+#: ../data/properties.ui.h:10
+msgid "Dimensions:"
+msgstr "Dimensões:"
+
+#: ../data/properties.ui.h:11
 msgid "Codec:"
 msgstr "Codec:"
 
@@ -131,11 +500,6 @@
 msgid "Bitrate:"
 msgstr "Taxa de bits:"
 
-#: ../data/properties.ui.h:14 ../data/totem.ui.h:142
-#: ../src/totem-properties-view.c:268
-msgid "Audio"
-msgstr "Áudio"
-
 #: ../data/properties.ui.h:15
 msgid "Sample rate:"
 msgstr "Taxa de amostra:"
@@ -144,745 +508,445 @@
 msgid "Channels:"
 msgstr "Canais:"
 
-#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
-msgid "_Add to Playlist"
-msgstr "_Adicionar à lista de reprodução"
-
-#: ../data/video-list.ui.h:2
-msgid "Add the video to the playlist"
-msgstr "Adicionar o vídeo à lista de reprodução"
-
 #. Title
-#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:143
-#: ../src/totem-object.c:1667
-msgid "Movie Player"
-msgstr "Reprodutor de filmes"
+#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:80 ../src/totem.c:239
+#: ../src/totem.c:248 ../src/totem-menu.c:790 ../src/totem-object.c:1658
+msgid "Videos"
+msgstr "Vídeos"
 
 #: ../data/totem.desktop.in.in.in.h:2
-msgid "Play movies and songs"
-msgstr "Reproduz filmes e músicas"
+msgid "Play movies"
+msgstr "Reproduzir filmes"
+
+#: ../data/totem.desktop.in.in.in.h:3
+msgid "Video;Movie;Film;Clip;Series;Player;DVD;TV;Disc;"
+msgstr "Vídeo;Filme;Clipe;Série;Reprodutor;DVD;TV;Disco;"
 
 #: ../data/totem.ui.h:1
-msgid "_Movie"
-msgstr "_Filme"
+msgid "_Open"
+msgstr "_Abrir"
 
 #: ../data/totem.ui.h:2
-msgid "_Open..."
-msgstr "_Abrir..."
+msgid "Open _Location"
+msgstr "Abrir um en_dereço"
 
 #: ../data/totem.ui.h:3
-msgid "Open a file"
-msgstr "Abrir um arquivo"
+msgid "_Fullscreen"
+msgstr "_Tela cheia"
 
 #: ../data/totem.ui.h:4
-msgid "Open _Location..."
-msgstr "Abrir um en_dereço..."
+msgid "Prefere_nces"
+msgstr "Preferê_ncias"
 
 #: ../data/totem.ui.h:5
-msgid "Open a non-local file"
-msgstr "Abrir um arquivo não local"
+msgid "Shuff_le"
+msgstr "A_leatório"
 
 #: ../data/totem.ui.h:6
+msgid "_Repeat"
+msgstr "_Repetir"
+
+#: ../data/totem.ui.h:7
+msgid "_Quit"
+msgstr "Sai_r"
+
+#: ../data/totem.ui.h:8
+msgid "_Movie"
+msgstr "_Filme"
+
+#: ../data/totem.ui.h:9
 msgid "_Eject"
 msgstr "_Ejetar"
 
-#: ../data/totem.ui.h:7
+#: ../data/totem.ui.h:10
 msgid "Eject the current disc"
 msgstr "Ejetar o disco atual"
 
-#: ../data/totem.ui.h:8
+#: ../data/totem.ui.h:11
 msgid "_Properties"
 msgstr "_Propriedades"
 
-#: ../data/totem.ui.h:9
+#: ../data/totem.ui.h:12
 msgid "View the properties of the current stream"
 msgstr "Visualizar as propriedade da transmissão atual"
 
-#: ../data/totem.ui.h:10
+#: ../data/totem.ui.h:13
 msgid "Play / P_ause"
 msgstr "Reproduzir / P_ausar"
 
-#: ../data/totem.ui.h:11
+#: ../data/totem.ui.h:14
 msgid "Play or pause the movie"
 msgstr "Reproduzir ou pausar o filme"
 
-#: ../data/totem.ui.h:12
-msgid "_Quit"
-msgstr "Sai_r"
-
-#: ../data/totem.ui.h:13
-msgid "Quit the program"
-msgstr "Sair do programa"
-
-#: ../data/totem.ui.h:14
+#: ../data/totem.ui.h:15
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../data/totem.ui.h:15
+#: ../data/totem.ui.h:16
 msgid "_Clear Playlist"
 msgstr "Limpar lista de re_produção"
 
-#: ../data/totem.ui.h:16
+#: ../data/totem.ui.h:17
 msgid "Clear the playlist"
 msgstr "Limpar lista de reprodução"
 
-#: ../data/totem.ui.h:17
-msgid "Prefere_nces"
-msgstr "Preferê_ncias"
-
 #: ../data/totem.ui.h:18
-msgid "Configure the application"
-msgstr "Configurar o aplicativo"
-
-#: ../data/totem.ui.h:19
 msgid "Plugins..."
 msgstr "Plug-ins..."
 
-#: ../data/totem.ui.h:20
+#: ../data/totem.ui.h:19
 msgid "Configure plugins to extend the application"
 msgstr "Configurar plugins para complementar o aplicativo"
 
-#: ../data/totem.ui.h:21
+#: ../data/totem.ui.h:20
 msgid "_View"
 msgstr "_Ver"
 
-#: ../data/totem.ui.h:22
-msgid "_Fullscreen"
-msgstr "_Tela cheia"
-
-#: ../data/totem.ui.h:23
-msgid "Switch to fullscreen"
-msgstr "Alternar para tela cheia"
-
-#: ../data/totem.ui.h:24
+#: ../data/totem.ui.h:21
 msgid "Fit Window to Movie"
 msgstr "Expandir janela para o tamanho do filme"
 
-#: ../data/totem.ui.h:25
+#: ../data/totem.ui.h:22
 msgid "_Resize 1:2"
 msgstr "_Redimensionar para 1:2"
 
-#: ../data/totem.ui.h:26
+#: ../data/totem.ui.h:23
 msgid "Resize to half the original video size"
 msgstr "Redimensionar para metade do tamanho original do vídeo"
 
-#: ../data/totem.ui.h:27
+#: ../data/totem.ui.h:24
 msgid "Resize _1:1"
 msgstr "Redimensionar para _1:1"
 
-#: ../data/totem.ui.h:28
+#: ../data/totem.ui.h:25
 msgid "Resize to the original video size"
 msgstr "Redimensionar para o tamanho original do video"
 
-#: ../data/totem.ui.h:29
+#: ../data/totem.ui.h:26
 msgid "Resize _2:1"
 msgstr "Redimensionar para _2:1"
 
-#: ../data/totem.ui.h:30
+#: ../data/totem.ui.h:27
 msgid "Resize to double the original video size"
 msgstr "Redimensionar para o dobro do tamanho original do vídeo"
 
-#: ../data/totem.ui.h:31
+#: ../data/totem.ui.h:28
 msgid "_Aspect Ratio"
 msgstr "Rel_ação de tamanho"
 
-#: ../data/totem.ui.h:32
+#: ../data/totem.ui.h:29
 msgid "Switch An_gles"
 msgstr "Alternar ân_gulos"
 
-#: ../data/totem.ui.h:33
+#: ../data/totem.ui.h:30
 msgid "Switch camera angles"
 msgstr "Alternar ângulos de câmera"
 
-#: ../data/totem.ui.h:34
+#: ../data/totem.ui.h:31
 msgid "_Go"
 msgstr "_Ir"
 
-#: ../data/totem.ui.h:35
+#: ../data/totem.ui.h:32
 msgid "_DVD Menu"
 msgstr "Menu de _DVD"
 
-#: ../data/totem.ui.h:36
+#: ../data/totem.ui.h:33
 msgid "Go to the DVD menu"
 msgstr "Ir para o menu do DVD"
 
-#: ../data/totem.ui.h:37
+#: ../data/totem.ui.h:34
 msgid "_Title Menu"
 msgstr "Menu de _título"
 
-#: ../data/totem.ui.h:38
+#: ../data/totem.ui.h:35
 msgid "Go to the title menu"
 msgstr "Ir para o menu de título"
 
-#: ../data/totem.ui.h:39
+#: ../data/totem.ui.h:36
 msgid "A_udio Menu"
 msgstr "Menu de Áu_dio"
 
-#: ../data/totem.ui.h:40
+#: ../data/totem.ui.h:37
 msgid "Go to the audio menu"
 msgstr "Ir para o menu de áudio"
 
-#: ../data/totem.ui.h:41
+#: ../data/totem.ui.h:38
 msgid "_Angle Menu"
 msgstr "Ân_gulo do menu"
 
-#: ../data/totem.ui.h:42
+#: ../data/totem.ui.h:39
 msgid "Go to the angle menu"
 msgstr "Ir para o menu de ângulos"
 
-#: ../data/totem.ui.h:43
+#: ../data/totem.ui.h:40
 msgid "_Chapter Menu"
 msgstr "_Menu de capítulo"
 
-#: ../data/totem.ui.h:44
+#: ../data/totem.ui.h:41
 msgid "Go to the chapter menu"
 msgstr "Ir para o menu de capítulos"
 
-#: ../data/totem.ui.h:45
+#: ../data/totem.ui.h:42
 msgid "_Next Chapter/Movie"
 msgstr "_Próximo capítulo/filme"
 
-#: ../data/totem.ui.h:46
+#: ../data/totem.ui.h:43
 msgid "Next chapter or movie"
 msgstr "Próximo capítulo ou filme"
 
-#: ../data/totem.ui.h:47
+#: ../data/totem.ui.h:44
 msgid "_Previous Chapter/Movie"
 msgstr "Ca_pítulo/filme anterior"
 
-#: ../data/totem.ui.h:48
+#: ../data/totem.ui.h:45
 msgid "Previous chapter or movie"
 msgstr "Capítulo anterior ou filme"
 
-#: ../data/totem.ui.h:49
+#: ../data/totem.ui.h:46
 msgid "_Sound"
 msgstr "_Som"
 
-#: ../data/totem.ui.h:50
+#: ../data/totem.ui.h:47
 msgid "Volume _Up"
 msgstr "A_umentar volume"
 
-#: ../data/totem.ui.h:51
+#: ../data/totem.ui.h:48
 msgid "Increase volume"
 msgstr "Aumentar volume"
 
-#: ../data/totem.ui.h:52
+#: ../data/totem.ui.h:49
 msgid "Volume _Down"
 msgstr "_Diminuir volume"
 
-#: ../data/totem.ui.h:53
+#: ../data/totem.ui.h:50
 msgid "Decrease volume"
 msgstr "Diminuir o volume"
 
-#: ../data/totem.ui.h:54
+#: ../data/totem.ui.h:51
 msgid "_Help"
 msgstr "Aj_uda"
 
-#: ../data/totem.ui.h:55
+#: ../data/totem.ui.h:52
 msgid "_Contents"
 msgstr "S_umário"
 
-#: ../data/totem.ui.h:56
+#: ../data/totem.ui.h:53
 msgid "Help contents"
 msgstr "Conteúdos de ajuda"
 
-#: ../data/totem.ui.h:57
+#: ../data/totem.ui.h:54
 msgid "_About"
 msgstr "_Sobre"
 
-#: ../data/totem.ui.h:58
+#: ../data/totem.ui.h:55
 msgid "About this application"
 msgstr "Sobre esse aplicativo"
 
-#: ../data/totem.ui.h:59
-msgid "_Repeat Mode"
-msgstr "Modo de _repetição"
-
-#: ../data/totem.ui.h:60
-msgid "Set the repeat mode"
-msgstr "Define o modo de repetição"
-
-#: ../data/totem.ui.h:61
-msgid "Shuff_le Mode"
-msgstr "Modo de embara_lhamento"
-
-#: ../data/totem.ui.h:62
-msgid "Set the shuffle mode"
-msgstr "Define o modo de embaralhamento"
-
-#: ../data/totem.ui.h:63
+#: ../data/totem.ui.h:56
 msgid "Show _Controls"
 msgstr "Mostrar _controles"
 
-#: ../data/totem.ui.h:64
+#: ../data/totem.ui.h:57
 msgid "Show controls"
 msgstr "Mostrar controles"
 
-#: ../data/totem.ui.h:65
+#: ../data/totem.ui.h:58
 msgid "S_idebar"
 msgstr "Bar_ra lateral"
 
-#: ../data/totem.ui.h:66
+#: ../data/totem.ui.h:59
 msgid "Show or hide the sidebar"
 msgstr "Mostrar ou ocultar barra lateral"
 
-#: ../data/totem.ui.h:67
+#: ../data/totem.ui.h:60
 msgctxt "Aspect ratio"
 msgid "Auto"
 msgstr "Automático"
 
-#: ../data/totem.ui.h:68
+#: ../data/totem.ui.h:61
 msgid "Sets automatic aspect ratio"
 msgstr "Define a taxa de proporção automática"
 
-#: ../data/totem.ui.h:69
+#: ../data/totem.ui.h:62
 msgid "Square"
 msgstr "Quadrado"
 
-#: ../data/totem.ui.h:70
+#: ../data/totem.ui.h:63
 msgid "Sets square aspect ratio"
 msgstr "Define a proporção de aspecto de quadro"
 
-#: ../data/totem.ui.h:71
+#: ../data/totem.ui.h:64
 msgid "4:3 (TV)"
 msgstr "4:3 (TV)"
 
-#: ../data/totem.ui.h:72
+#: ../data/totem.ui.h:65
 msgid "Sets 4:3 (TV) aspect ratio"
 msgstr "Define a taxa de proporção 4:3 (TV)"
 
-#: ../data/totem.ui.h:73
+#: ../data/totem.ui.h:66
 msgid "16:9 (Widescreen)"
 msgstr "16:9 (Widescreen)"
 
-#: ../data/totem.ui.h:74
+#: ../data/totem.ui.h:67
 msgid "Sets 16:9 (widescreen) aspect ratio"
 msgstr "Define a proporção de 16:9 (widescreen)"
 
-#: ../data/totem.ui.h:75
+#: ../data/totem.ui.h:68
 msgid "2.11:1 (DVB)"
 msgstr "2.11:1 (DVB)"
 
-#: ../data/totem.ui.h:76
+#: ../data/totem.ui.h:69
 msgid "Sets 2.11:1 (DVB) aspect ratio"
 msgstr "Define a taxa de proporção 2.11:1 (DVB)"
 
-#: ../data/totem.ui.h:77
+#: ../data/totem.ui.h:70
 msgid "S_ubtitles"
 msgstr "Legenda_s"
 
-#: ../data/totem.ui.h:80
+#: ../data/totem.ui.h:73
 msgid "_Languages"
 msgstr "Idioma_s"
 
-#: ../data/totem.ui.h:81
+#: ../data/totem.ui.h:74
 msgid "Zoom In"
 msgstr "Ampliar"
 
-#: ../data/totem.ui.h:82
+#: ../data/totem.ui.h:75
 msgid "Zoom in"
 msgstr "Afastar"
 
-#: ../data/totem.ui.h:83
+#: ../data/totem.ui.h:76
 msgid "Skip _Forward"
 msgstr "Pular para _frente"
 
-#: ../data/totem.ui.h:84
+#: ../data/totem.ui.h:77
 msgid "Skip forward"
 msgstr "Pula para frente"
 
-#: ../data/totem.ui.h:85
+#: ../data/totem.ui.h:78
 msgid "Skip _Backwards"
 msgstr "Pular para t_rás"
 
-#: ../data/totem.ui.h:86
+#: ../data/totem.ui.h:79
 msgid "Skip backwards"
 msgstr "Pula para trás"
 
-#: ../data/totem.ui.h:87
-msgid "14.4 Kbps Modem"
-msgstr "Modem de 14.4 kbps"
-
-#: ../data/totem.ui.h:88
-msgid "19.2 Kbps Modem"
-msgstr "Modem de 19.2 kbps"
-
-#: ../data/totem.ui.h:89
-msgid "28.8 Kbps Modem"
-msgstr "Modem de 28.8 kbps"
-
-#: ../data/totem.ui.h:90
-msgid "33.6 Kbps Modem"
-msgstr "Modem de 33.6 kbps"
-
-#: ../data/totem.ui.h:91
-msgid "34.4 Kbps Modem"
-msgstr "Modem de 34.4 kbps"
-
-#: ../data/totem.ui.h:92
-msgid "56 Kbps Modem/ISDN"
-msgstr "Modem/ISDN de 56 kbps"
-
-#: ../data/totem.ui.h:93
-msgid "112 Kbps Dual ISDN/DSL"
-msgstr "112 kbps Dual ISDN/DSL"
-
-#: ../data/totem.ui.h:94
-msgid "256 Kbps DSL/Cable"
-msgstr "256 Kbps DSL/Cabeada"
-
-#: ../data/totem.ui.h:95
-msgid "384 Kbps DSL/Cable"
-msgstr "DSL/Cabeada de 384 kbps"
-
-#: ../data/totem.ui.h:96
-msgid "512 Kbps DSL/Cable"
-msgstr "DSL/Cabeada de 512 kbps"
-
-#: ../data/totem.ui.h:97
-msgid "1.5 Mbps T1/Intranet/LAN"
-msgstr "1.5 Mbps T1/Intranet/LAN"
-
-#: ../data/totem.ui.h:98
-msgid "Intranet/LAN"
-msgstr "Intranet/LAN"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:100
-msgid "Normal"
-msgstr "Normal"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:102
-msgid "Large"
-msgstr "Grande"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:104
-msgid "Extra Large"
-msgstr "Extra largo"
-
-#: ../data/totem.ui.h:105 ../src/totem-properties-view.c:228
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5593
-msgid "Stereo"
-msgstr "Estéreo"
-
-#: ../data/totem.ui.h:106
-msgid "4-channel"
-msgstr "4 canais"
-
-#: ../data/totem.ui.h:107
-msgid "4.1-channel"
-msgstr "4.1 canais"
-
-#: ../data/totem.ui.h:108
-msgid "5.0-channel"
-msgstr "5.0 canais"
-
-#: ../data/totem.ui.h:109
-msgid "5.1-channel"
-msgstr "5.1 canais"
-
-#: ../data/totem.ui.h:110
-msgid "AC3 Passthrough"
-msgstr "Passagem AC3"
-
-#: ../data/totem.ui.h:111
-msgid "Totem Preferences"
-msgstr "Preferências do Totem"
-
-#: ../data/totem.ui.h:112
-msgid "Playback"
-msgstr "Reprodução"
-
-#: ../data/totem.ui.h:113
-msgid "Start playing files from last position"
-msgstr "Começar a reproduzir arquivos da última posição"
-
-#: ../data/totem.ui.h:114
-msgid "Networking"
-msgstr "Rede"
-
-#: ../data/totem.ui.h:115
-msgid "Connection _speed:"
-msgstr "Veloci_dade de conexão:"
-
-#: ../data/totem.ui.h:116
-msgid "Text Subtitles"
-msgstr "Legendas de texto"
-
-#: ../data/totem.ui.h:117
-msgid "_Load subtitle files when movie is loaded"
-msgstr "Carregar _legendas quando o filme for carregado"
-
-#: ../data/totem.ui.h:118
-msgid "_Font:"
-msgstr "_Fonte:"
-
-#: ../data/totem.ui.h:119
-msgid "_Encoding:"
-msgstr "Co_dificação:"
-
-#: ../data/totem.ui.h:120
-msgid "External Chapters"
-msgstr "Capítulos externos"
-
-#: ../data/totem.ui.h:121
-msgid "Load _chapter files when movie is loaded"
-msgstr "Carregar arquivos dos _capítulos quando o filme estiver carregado"
-
-#. Tab label in the Preferences dialogue
-#: ../data/totem.ui.h:124
-msgid "Display"
-msgstr "Monitor"
-
-#: ../data/totem.ui.h:125
-msgid "_Resize the window when a new video is loaded"
-msgstr "_Redimensionar a janela quando um novo vídeo for carregado"
-
-#: ../data/totem.ui.h:126
-msgid "Disable _deinterlacing of interlaced videos"
-msgstr "Desativar _desentrelaçamento de vídeos entrelaçados"
-
-#: ../data/totem.ui.h:127
-msgid "Disable screensaver when playing "
-msgstr "Desabilitar proteção de tela quando estiver assistindo "
-
-#: ../data/totem.ui.h:129
-msgid "Video or Audio"
-msgstr "Vídeo ou áudio"
-
-#: ../data/totem.ui.h:130
-msgid "Visual Effects"
-msgstr "Efeitos visuais"
-
-#: ../data/totem.ui.h:131
-msgid "Show _visual effects when an audio file is played"
-msgstr "Mostrar efeitos _visuais quando um arquivo de som for reproduzido"
-
-#: ../data/totem.ui.h:132
-msgid "_Type of visualization:"
-msgstr "_Tipo de visualização:"
-
-#: ../data/totem.ui.h:133
-msgid "Visualization _size:"
-msgstr "Tamanho da vi_sualização:"
-
-#: ../data/totem.ui.h:134
-msgid "Color Balance"
-msgstr "Balanço de cor"
-
-#: ../data/totem.ui.h:135
-msgid "_Brightness:"
-msgstr "_Brilho:"
-
-#: ../data/totem.ui.h:136
-msgid "Co_ntrast:"
-msgstr "Co_ntraste:"
-
-#: ../data/totem.ui.h:137
-msgid "Sat_uration:"
-msgstr "Sat_uração:"
-
-#: ../data/totem.ui.h:138
-msgid "_Hue:"
-msgstr "T_onalidade:"
-
-#: ../data/totem.ui.h:139
-msgid "Reset to _Defaults"
-msgstr "Resetar para o pa_drão"
-
-#: ../data/totem.ui.h:140
-msgid "Audio Output"
-msgstr "Saída de áudio"
-
-#: ../data/totem.ui.h:141
-msgid "_Audio output type:"
-msgstr "Tipo de s_aída de áudio:"
-
-#: ../data/totem.ui.h:145
+#: ../data/totem.ui.h:82
 msgid "Time seek bar"
 msgstr "Barra de busca de tempo"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
-msgid "Allow the screensaver to activate when playing audio"
-msgstr ""
-"Permitir que o protetor de tela seja ativado durante a reprodução de áudio"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
-msgid ""
-"Allow the screensaver to activate when playing audio. Disable if you have "
-"monitor-powered speakers."
-msgstr ""
-"Permitir que o protetor de tela seja ativado durante a reprodução de áudio. "
-"Desative se você tiver monitor com alto-falantes."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
-msgid "Show visual effects when no video is displayed"
-msgstr "Mostrar efeitos visuais quando nenhum vídeo for exibido"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
-msgid "Show visual effects when playing an audio only file."
-msgstr ""
-"Mostra efeitos visuais durante a reprodução de um arquivo somente áudio."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
-msgid "Name of the visual effects plugin"
-msgstr "Nome do plug-in de efeitos visuais"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
-msgid "The brightness of the video"
-msgstr "O brilho do vídeo"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
-msgid "The contrast of the video"
-msgstr "O contraste do vídeo"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
-msgid "The hue of the video"
-msgstr "A tonalidade do vídeo"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
-msgid "The saturation of the video"
-msgstr "A saturação do vídeo"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
-msgid "Resize the canvas automatically on file load"
-msgstr "Redimensionar a tela automaticamente no carregamento de arquivo"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
-msgid "Network connection speed"
-msgstr "Velocidade de conexão de rede"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
-msgid ""
-"Approximate network connection speed, used to select quality on media over "
-"the network."
-msgstr ""
-"Mensurar a velocidade de conexão, usada para selecionar a qualidade de mídia "
-"na rede."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
-msgid "Repeat mode"
-msgstr "Modo de repetição"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
-msgid "Shuffle mode"
-msgstr "Modo aleatório"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
-msgid "Whether to disable deinterlacing for interlaced movies"
-msgstr "Desativar o desentrelaçamento para filmes entrelaçados"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
-msgid "Whether to enable debug for the playback engine"
-msgstr "Ativar a depuração para o mecanismo de reprodução"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
-msgid "Type of audio output to use"
-msgstr "Tipo de saída de áudio para usar"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
-msgid "Visualization quality setting"
-msgstr "Definição de qualidade de visualização"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
-msgid "Quality setting for the audio visualization."
-msgstr "Definição de qualidade para a visualização de áudio."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
-msgid "Network buffering threshold"
-msgstr "Limite de armazenamento em buffer de rede"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
-msgid ""
-"Amount of data to buffer for network streams before starting to display the "
-"stream (in seconds)."
-msgstr ""
-"Quantidade de dados em buffer para os fluxos de rede antes de iniciar a "
-"exibição da transmissão (em segundos)."
+#: ../data/uri.ui.h:1
+msgid "Enter the _address of the file you would like to open:"
+msgstr "Insira o _endereço do arquivo que você gostaria de abrir:"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
-msgid "Subtitle font"
-msgstr "Fonte das legendas"
+#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
+msgid "_Add to Playlist"
+msgstr "_Adicionar à lista de reprodução"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
-msgid "Pango font description for subtitle rendering."
-msgstr "Descrição da fonte Pango para renderização das legendas."
+#: ../data/video-list.ui.h:2
+msgid "Add the video to the playlist"
+msgstr "Adicionar o vídeo à lista de reprodução"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
-msgid "Subtitle encoding"
-msgstr "Codificação das legendas"
+#: ../src/backend/bacon-video-widget.c:1643
+msgid "Password requested for RTSP server"
+msgstr "Requisição de senha para servidor RTSP"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
-msgid "Encoding character set for subtitle."
-msgstr "Codificação de caractere definido para legendas."
+#: ../src/backend/bacon-video-widget.c:2944
+#, c-format
+msgid "Audio Track #%d"
+msgstr "Faixa de áudio #%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
-msgid "Default location for the \"Open...\" dialogs"
-msgstr "Local padrão para os diálogos \"Abrir...\""
+#: ../src/backend/bacon-video-widget.c:2948
+#, c-format
+msgid "Subtitle #%d"
+msgstr "Legenda #%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
-msgid ""
-"Default location for the \"Open...\" dialogs. Default is the current "
-"directory."
-msgstr ""
-"Local padrão para os diálogos \"Abrir...\". O padrão é o diretório atual."
+#: ../src/backend/bacon-video-widget.c:3345
+msgid "The server you are trying to connect to is not known."
+msgstr "O servidor que você está tentando se conectar não é conhecido."
+
+#: ../src/backend/bacon-video-widget.c:3348
+msgid "The connection to this server was refused."
+msgstr "A conexão a este servidor foi recusada."
+
+#: ../src/backend/bacon-video-widget.c:3351
+msgid "The specified movie could not be found."
+msgstr "O filme especificado não pôde ser encontrado."
+
+#: ../src/backend/bacon-video-widget.c:3358
+msgid "The server refused access to this file or stream."
+msgstr "O servidor rejeitou acesso a este arquivo ou transmissão."
+
+#: ../src/backend/bacon-video-widget.c:3364
+msgid "Authentication is required to access this file or stream."
+msgstr "Autenticação é necessária para acessar este arquivo ou transmissão."
+
+#: ../src/backend/bacon-video-widget.c:3371
+msgid "You are not allowed to open this file."
+msgstr "Você não tem permissão para abrir este arquivo."
+
+#: ../src/backend/bacon-video-widget.c:3376
+msgid "This location is not a valid one."
+msgstr "Esta localização não é válida."
+
+#: ../src/backend/bacon-video-widget.c:3384
+msgid "The movie could not be read."
+msgstr "O filme não pôde ser lido."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
-msgid "Default location for the \"Take Screenshot\" dialogs"
-msgstr "Local padrão para os diálogos \"Capturar tela\""
+#. should be exactly one missing thing (source or converter)
+#: ../src/backend/bacon-video-widget.c:3407
+#: ../src/backend/bacon-video-widget.c:3415
+#, c-format
+msgid "The playback of this movie requires a %s plugin which is not installed."
+msgid_plural ""
+"The playback of this movie requires the following decoders which are not "
+"installed:\n"
+"\n"
+"%s"
+msgstr[0] ""
+"A reprodução deste filme requer que o plug-in %s que não está instalado."
+msgstr[1] ""
+"A reprodução dos filmes requer que os seguintes decodificadores que não "
+"estão instalado:\n"
+"\n"
+"%s"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
+#: ../src/backend/bacon-video-widget.c:3426
 msgid ""
-"Default location for the \"Take Screenshot\" dialogs. Default is the "
-"Pictures directory."
+"An audio or video stream is not handled due to missing codecs. You might "
+"need to install additional plugins to be able to play some types of movies"
 msgstr ""
-"Local padrão para os diálogos \"Capturar tela\". O padrão é o diretório de "
-"imagens."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
-msgid "Whether to disable the plugins in the user's home directory"
-msgstr "Desativar os plug-ins no diretório home do usuário"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
-msgid "Whether to disable the keyboard shortcuts"
-msgstr "Desativar os atalhos de teclado"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
-msgid "Whether to autoload text subtitle files when a movie is loaded"
-msgstr ""
-"Carregar automaticamente os arquivos de legenda quando um filme for carregado"
+"Uma transmissão de áudio ou vídeo não é tratada devido a falta de codecs. "
+"Talvez você precise instalar plug-ins adicionais para ser capaz de "
+"reproduzir alguns tipos de filmes"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
-msgid "Whether to autoload external chapter files when a movie is loaded"
-msgstr ""
-"Carregar automaticamente arquivos de capítulo externo quando um filme for "
-"carregado"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+#: ../src/backend/bacon-video-widget.c:3436
 msgid ""
-"Whether to remember the position of played audio/video files when pausing or "
-"closing them"
+"This file cannot be played over the network. Try downloading it locally "
+"first."
 msgstr ""
-"Lembrar a posição de arquivos de áudio/vídeo reproduzidos ao pausar ou fechá-"
-"los"
+"Esse arquivo não pode ser reproduzido pela rede. Tente baixá-lo localmente "
+"primeiro."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:35
-msgid "Active plugins list"
-msgstr "Lista de plug-ins ativos"
+#: ../src/backend/bacon-video-widget.c:5494 ../src/totem-properties-view.c:227
+msgid "Surround"
+msgstr "Surround"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:36
-msgid ""
-"A list of the names of the plugins which are currently active (loaded and "
-"running)."
-msgstr ""
-"Uma lista dos nomes dos plug-ins que estão atualmente ativos (carregados e "
-"em execução)."
+#: ../src/backend/bacon-video-widget.c:5496 ../src/totem-properties-view.c:229
+msgid "Mono"
+msgstr "Mono"
 
-#: ../data/uri.ui.h:1
-msgid "Enter the _address of the file you would like to open:"
-msgstr "Insira o _endereço do arquivo que você gostaria de abrir:"
+#: ../src/backend/bacon-video-widget.c:5781
+msgid "Media contains no supported video streams."
+msgstr "A mídia não contêm suporte a transmissões de vídeo."
+
+#: ../src/backend/bacon-video-widget.c:5963
+msgid ""
+"Some necessary plug-ins are missing. Make sure that the program is correctly "
+"installed."
+msgstr ""
+"Alguns dos plug-ins necessários estão faltando. Certifique-se de que o "
+"programa está instalado corretamente."
 
 #: ../src/eggdesktopfile.c:165
 #, c-format
@@ -950,8 +1014,8 @@
 #: ../src/eggfileformatchooser.c:657
 #, c-format
 msgid ""
-"The program was not able to find out the file format you want to use for `%"
-"s'. Please make sure to use a known extension for that file or manually "
+"The program was not able to find out the file format you want to use for `"
+"%s'. Please make sure to use a known extension for that file or manually "
 "choose a file format from the list below."
 msgstr ""
 "O programa não foi capaz de descobrir o formato de arquivo que deseja usar "
@@ -991,6 +1055,31 @@
 msgid "Show session management options"
 msgstr "Mostrar opções de gerenciamento de sessão"
 
+#. hour:minutes:seconds
+#. Translators: This is a time format, like "9:05:02" for 9
+#. * hours, 5 minutes, and 2 seconds. You may change ":" to
+#. * the separator that your locale uses or use "%Id" instead
+#. * of "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:56
+#: ../src/plugins/skipto/totem-time-entry.c:57
+#, c-format
+msgctxt "long time format"
+msgid "%d:%02d:%02d"
+msgstr "%d:%02d:%02d"
+
+#. minutes:seconds
+#. Translators: This is a time format, like "5:02" for 5
+#. * minutes and 2 seconds. You may change ":" to the
+#. * separator that your locale uses or use "%Id" instead of
+#. * "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:65
+#, c-format
+msgctxt "short time format"
+msgid "%d:%02d"
+msgstr "%d:%02d"
+
 #. Title
 #. Artist
 #. Album
@@ -1095,10 +1184,14 @@
 msgstr[0] "%d quadro por segundo"
 msgstr[1] "%d quadros por segundo"
 
-#: ../src/totem-audio-preview.c:168
+#: ../src/totem-audio-preview.c:137
 msgid "Audio Preview"
 msgstr "Pré-visualização de áudio"
 
+#: ../src/totem.c:240
+msgid "Verify your system installation. Totem will now exit."
+msgstr "Verifique a instalação do seu sistema. O Totem irá sair."
+
 #: ../src/totem-cell-renderer-video.c:126
 msgid "Unknown video"
 msgstr "Vídeo desconhecido"
@@ -1111,7 +1204,7 @@
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../src/totem-fullscreen.c:616
+#: ../src/totem-fullscreen.c:573
 msgid "No File"
 msgstr "Nenhum arquivo"
 
@@ -1129,7 +1222,7 @@
 msgid "Make sure that Totem is properly installed."
 msgstr "Certifique-se de que o Totem está instalado corretamente."
 
-#: ../src/totem-interface.c:347
+#: ../src/totem-interface.c:357
 msgid ""
 "Totem 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 "
@@ -1140,7 +1233,7 @@
 "Public license publicada pela Free Software Foundation; tanto a versão 2 "
 "dessa licença, como (a seu critério) qualquer versão posterior."
 
-#: ../src/totem-interface.c:351
+#: ../src/totem-interface.c:361
 msgid ""
 "Totem is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -1151,7 +1244,7 @@
 "sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou ADEQUAÇÃO PARA UM "
 "PROPÓSITO PARTICULAR.  Veja a Licença Pública Geral GNU para mais detalhes."
 
-#: ../src/totem-interface.c:355
+#: ../src/totem-interface.c:365
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Totem; if not, write to the Free Software Foundation, Inc., 59 Temple Place, "
@@ -1161,7 +1254,7 @@
 "com Totem; caso contrário, escreva para a Free Software Foundation, Inc., 59 "
 "Temple Place, Suite 330, Boston, MA 02111-1307 USA"
 
-#: ../src/totem-interface.c:358
+#: ../src/totem-interface.c:368
 msgid ""
 "Totem contains an exception to allow the use of proprietary GStreamer "
 "plugins."
@@ -1170,207 +1263,102 @@
 "GStreamer."
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:190
+#: ../src/totem-menu.c:291
 msgid "None"
 msgstr "Nenhum"
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:195
+#: ../src/totem-menu.c:296
 msgctxt "Language"
 msgid "Auto"
 msgstr "Automático"
 
-#. Translators:
-#. * This is not a JPEG image, but a disc image, for example,
-#. * an ISO file
-#: ../src/totem-menu.c:765
-#, c-format
-msgid "Play Image '%s'"
-msgstr "Reproduzir imagem \"%s\""
-
-#: ../src/totem-menu.c:768 ../src/totem-menu.c:851
-#, c-format
-msgid "device%d"
-msgstr "dispositivo%d"
-
-#: ../src/totem-menu.c:848
-#, c-format
-msgid "Play Disc '%s'"
-msgstr "Reproduzir o disco \"%s\""
-
-#. This lists the back-end type and version, such as
-#. * Movie Player using GStreamer 0.10.1
-#: ../src/totem-menu.c:1189
-#, c-format
-msgid "Movie Player using %s"
-msgstr "Reproduzir filme usando %s"
-
-#: ../src/totem-menu.c:1193
+#: ../src/totem-menu.c:789
 msgid "Copyright © 2002-2009 Bastien Nocera"
 msgstr "Copyright © 2002-2009 Bastien Nocera"
 
-#: ../src/totem-menu.c:1198
+#: ../src/totem-menu.c:794
 msgid "translator-credits"
 msgstr ""
 "Raphael Higino , 2007.\n"
 "Irapuan Pascoal , 2007.\n"
 "Leonardo Ferreira Fontenelle , 2008.\n"
 "Fabrício Godoy , 2009.\n"
-"Ísis Binder , 2010."
+"Ísis Binder , 2010.\n"
+"Rafael Ferreira , 2012."
 
-#: ../src/totem-menu.c:1202
+#: ../src/totem-menu.c:798
 msgid "Totem Website"
 msgstr "Site do Totem"
 
-#: ../src/totem-menu.c:1236
+#: ../src/totem-menu.c:829
 msgid "Configure Plugins"
 msgstr "Configurar plug-ins"
 
+#: ../src/totem-object.c:162
+#, c-format
+msgid ""
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"%s\n"
+"Execute \"%s --help\" para ver uma lista completa das oções de linha de "
+"comando.\n"
+
 #. Translators: %s is the totem version number
-#: ../src/totem-object.c:471
+#: ../src/totem-object.c:591
 #, c-format
 msgid "Totem %s"
 msgstr "Totem %s"
 
-#: ../src/totem-object.c:1047 ../browser-plugin/totem-plugin-viewer.c:367
-msgid "Playing"
-msgstr "Reproduzindo"
-
-#: ../src/totem-object.c:1049 ../src/totem-options.c:52
+#: ../src/totem-object.c:1168 ../src/totem-options.c:52
 msgid "Pause"
 msgstr "Pausar"
 
-#: ../src/totem-object.c:1054 ../browser-plugin/totem-plugin-viewer.c:363
-msgid "Paused"
-msgstr "Pausado"
-
-#: ../src/totem-object.c:1056 ../src/totem-object.c:1066
+#: ../src/totem-object.c:1175 ../src/totem-object.c:1185
 #: ../src/totem-options.c:51
 msgid "Play"
 msgstr "Reproduzir"
 
-#: ../src/totem-object.c:1061 ../src/totem-object.c:1659
-#: ../src/totem-statusbar.c:115 ../browser-plugin/totem-plugin-viewer.c:351
-msgid "Stopped"
-msgstr "Parado"
-
-#: ../src/totem-object.c:1142 ../src/totem-object.c:1169
-#: ../src/totem-object.c:1799 ../src/totem-object.c:1963
+#: ../src/totem-object.c:1267 ../src/totem-object.c:1294
+#: ../src/totem-object.c:1787 ../src/totem-object.c:1942
 #, c-format
 msgid "Totem could not play '%s'."
 msgstr "Totem não conseguiu reproduzir \"%s\"."
 
-#: ../src/totem-object.c:1246
-#, c-format
-msgid ""
-"Totem could not play this media (%s) although a plugin is present to handle "
-"it."
-msgstr ""
-"Totem não conseguiu reproduzir esta mídia (%s) embora o plug-in esteja "
-"presente."
-
-#: ../src/totem-object.c:1247
-msgid ""
-"You might want to check that a disc is present in the drive and that it is "
-"correctly configured."
-msgstr ""
-"Você pode querer verificar se o disco está presente no leitor e se está "
-"configurado corretamente."
-
-#: ../src/totem-object.c:1255
-msgid "More information about media plugins"
-msgstr "Mais informações sobre plug-ins de mídia"
-
-#: ../src/totem-object.c:1256
-msgid ""
-"Please install the necessary plugins and restart Totem to be able to play "
-"this media."
-msgstr ""
-"Por favor, instale os plug-ins necessários e reinicie o Totem para conseguir "
-"reproduzir esta mídia."
-
-#: ../src/totem-object.c:1258
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because it does not have the "
-"appropriate plugins to be able to read from the disc."
-msgstr ""
-"O Totem não pode reproduzir este tipo de mídia (%s) pelo fato de não possui "
-"plug-ins apropriados para ler do disco."
-
-#: ../src/totem-object.c:1260
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because you do not have the "
-"appropriate plugins to handle it."
-msgstr ""
-"O Totem não pode reproduzir este tipo de mídia (%s) pelo fato de não possui "
-"plug-ins apropriados para manipulá-la."
-
-#: ../src/totem-object.c:1263
-#, c-format
-msgid "Totem cannot play this type of media (%s) because it is not supported."
-msgstr ""
-"O Totem não pode reproduzir este tipo de mídia (%s) pelo fato de não ter "
-"suporte."
-
-#: ../src/totem-object.c:1264
-msgid "Please insert another disc to play back."
-msgstr "Por favor, insira outro disco para reprodução."
-
-#: ../src/totem-object.c:1300
-msgid "Totem was not able to play this disc."
-msgstr "O Totem não conseguiu reproduzir o disco."
-
-#: ../src/totem-object.c:1301 ../src/totem-object.c:4229
-msgid "No reason."
-msgstr "Sem razão."
-
-#: ../src/totem-object.c:1315
-msgid "Totem does not support playback of Audio CDs"
-msgstr "O Totem não tem suporte a reprodução de CDs de áudio"
-
-#: ../src/totem-object.c:1316
-msgid "Please consider using a music player or a CD extractor to play this CD"
-msgstr ""
-"Por favor, considere usar um reprodutor de música ou um ripador de CD para "
-"reproduzir este CD"
-
-#: ../src/totem-object.c:1805
+#: ../src/totem-object.c:1793
 msgid "No error message"
 msgstr "Sem mensagens de erro"
 
-#: ../src/totem-object.c:2154
+#: ../src/totem-object.c:2133
 msgid "Totem could not display the help contents."
 msgstr "O Totem não pôde exibir o conteúdo da ajuda."
 
-#: ../src/totem-object.c:2493 ../src/totem-object.c:2495
-#: ../browser-plugin/totem-plugin-viewer.c:1417
-msgid "An error occurred"
-msgstr "Ocorreu um erro"
-
-#: ../src/totem-object.c:4064 ../src/totem-object.c:4066
+#: ../src/totem-object.c:4019 ../src/totem-object.c:4021
 msgid "Previous Chapter/Movie"
 msgstr "Capítulo/filme anterior"
 
-#: ../src/totem-object.c:4073 ../src/totem-object.c:4075
+#: ../src/totem-object.c:4028 ../src/totem-object.c:4030
 msgid "Play / Pause"
 msgstr "Reproduzir / pausar"
 
-#: ../src/totem-object.c:4083 ../src/totem-object.c:4085
+#: ../src/totem-object.c:4038 ../src/totem-object.c:4040
 msgid "Next Chapter/Movie"
 msgstr "Próximo capítulo/filme"
 
-#. Translators: this is the tooltip text for the fullscreen button in the controls box in Totem's main window.
 #. Translators: this is the accessibility text for the fullscreen button in the controls box in Totem's main window.
-#: ../src/totem-object.c:4097 ../src/totem-object.c:4099
+#: ../src/totem-object.c:4051 ../src/totem-object.c:4053
 msgid "Fullscreen"
 msgstr "Tela cheia"
 
-#: ../src/totem-object.c:4229
+#: ../src/totem-object.c:4184
 msgid "Totem could not startup."
 msgstr "O Totem não pôde iniciar."
 
+#: ../src/totem-object.c:4184
+msgid "No reason."
+msgstr "Sem razão."
+
 #: ../src/totem-open-location.c:182
 msgid "Open Location..."
 msgstr "Abrir um endereço..."
@@ -1444,119 +1432,113 @@
 msgid "Movies to play"
 msgstr "Filmes para reproduzir"
 
-#: ../src/totem-options.c:117
+#: ../src/totem-options.c:79
+msgid "- Play movies and songs"
+msgstr "- Reproduz filmes e músicas"
+
+#: ../src/totem-options.c:142
 msgid "Can't enqueue and replace at the same time"
 msgstr "Não é possível enfileirar e substituir ao mesmo tempo"
 
 #. By extension entry
-#: ../src/totem-playlist.c:161
+#: ../src/totem-playlist.c:162
 msgid "MP3 ShoutCast playlist"
 msgstr "Lista de reprodução ShoutCast MP3"
 
-#: ../src/totem-playlist.c:162
+#: ../src/totem-playlist.c:163
 msgid "MP3 audio (streamed)"
 msgstr "Áudio MP3 (transmitido)"
 
-#: ../src/totem-playlist.c:163
+#: ../src/totem-playlist.c:164
 msgid "MP3 audio (streamed, DOS format)"
 msgstr "Áudio MP3 (transmitido, formato DOS)"
 
-#: ../src/totem-playlist.c:164
+#: ../src/totem-playlist.c:165
 msgid "XML Shareable Playlist"
 msgstr "Lista de reprodução XML compartilhável"
 
 #. This is "Title 3", where title is a DVD title
 #. * Note: NOT a DVD chapter
-#: ../src/totem-playlist.c:347
+#: ../src/totem-playlist.c:348
 #, c-format
 msgid "Title %d"
 msgstr "Título %d"
 
-#: ../src/totem-playlist.c:446
+#: ../src/totem-playlist.c:447
 msgid "Could not save the playlist"
 msgstr "Não foi possível salvar a lista de reprodução"
 
-#: ../src/totem-playlist.c:1021
+#: ../src/totem-playlist.c:1022
 msgid "Save Playlist"
 msgstr "Salvar lista de reprodução"
 
 #. translators: Playlist is the default saved playlist filename,
 #. * without the suffix
-#: ../src/totem-playlist.c:1033 ../src/totem-playlist.c:1264
-#: ../src/totem-sidebar.c:142
+#: ../src/totem-playlist.c:1034 ../src/totem-playlist.c:1263
+#: ../src/totem-sidebar.c:145
 msgid "Playlist"
 msgstr "Lista de reprodução"
 
-#: ../src/totem-playlist.c:1857
+#: ../src/totem-playlist.c:1862
 #, c-format
 msgid "The playlist '%s' could not be parsed. It might be damaged."
 msgstr ""
 "A lista de reprodução \"%s\" não pôde ser analisada. Ela pode estar "
 "danificada."
 
-#: ../src/totem-playlist.c:1858
+#: ../src/totem-playlist.c:1863
 msgid "Playlist error"
 msgstr "Erro na lista de reprodução"
 
-#: ../src/totem-preferences.c:295
+#: ../src/totem-preferences.c:297
 msgid "Preferences"
 msgstr "Preferências"
 
-#: ../src/totem-preferences.c:451
+#: ../src/totem-preferences.c:445
 msgid "Select Subtitle Font"
 msgstr "Selecionar fonte da legenda"
 
-#: ../src/totem-properties-main.c:115 ../src/totem-properties-view.c:266
+#: ../src/totem-properties-main.c:116 ../src/totem-properties-view.c:269
 msgid "Audio/Video"
 msgstr "Áudio/vídeo"
 
-#: ../src/totem-properties-view.c:128
+#: ../src/totem-properties-view.c:131
 msgid "N/A"
 msgstr "N/A"
 
-#: ../src/totem-properties-view.c:157
+#: ../src/totem-properties-view.c:160
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 msgctxt "Stream bit rate"
 msgid "N/A"
 msgstr "N/A"
 
-#: ../src/totem-properties-view.c:160
+#: ../src/totem-properties-view.c:163
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: ../src/totem-properties-view.c:177
+#: ../src/totem-properties-view.c:180
 #: ../src/plugins/properties/totem-movie-properties.c:149
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../src/totem-properties-view.c:209
+#: ../src/totem-properties-view.c:212
 #: ../src/plugins/properties/totem-movie-properties.c:166
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: ../src/totem-properties-view.c:216
+#: ../src/totem-properties-view.c:219
 #: ../src/plugins/properties/totem-movie-properties.c:166
 msgctxt "Sample rate"
 msgid "N/A"
 msgstr "N/A"
 
-#: ../src/totem-properties-view.c:224
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5589
-msgid "Surround"
-msgstr "Surround"
-
-#: ../src/totem-properties-view.c:226
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5591
-msgid "Mono"
-msgstr "Mono"
-
-#: ../src/totem-properties-view.c:236
+#: ../src/totem-properties-view.c:239
 msgctxt "Number of audio channels"
 msgid "N/A"
 msgstr "N/A"
@@ -1589,8 +1571,8 @@
 #. eg: 75 %
 #: ../src/totem-statusbar.c:250
 #, c-format
-msgid "%d %%"
-msgstr "%d %%"
+msgid "%lf %%"
+msgstr "%lf %%"
 
 #. eg: Paused, 0:32 / 1:05
 #: ../src/totem-statusbar.c:325
@@ -1601,8 +1583,8 @@
 #. eg: Buffering, 75 %
 #: ../src/totem-statusbar.c:330
 #, c-format
-msgid "%s, %d %%"
-msgstr "%s, %d %%"
+msgid "%s, %f %%"
+msgstr "%s, %f %%"
 
 #: ../src/totem-subtitle-encoding.c:156
 msgid "Current Locale"
@@ -1745,228 +1727,91 @@
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
-#: ../src/totem-video-list.c:330
-msgid "No video URI"
-msgstr "Sem URI de vídeo"
-
-#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
-#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
-#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
-#: ../src/totem-video-thumbnailer.c:872
-#, c-format
-msgid ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-msgstr ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-
-#: ../src/totem-video-thumbnailer.c:873
-msgid "Filename"
-msgstr "Nome do arquivo"
-
-#: ../src/totem-video-thumbnailer.c:875
-msgid "Resolution"
-msgstr "Resolução"
-
-#: ../src/totem-video-thumbnailer.c:878
-msgid "Duration"
-msgstr "Duração"
-
-#: ../src/totem-uri.c:506 ../src/plugins/chapters/totem-chapters.c:998
+#: ../src/totem-uri.c:343 ../src/plugins/chapters/totem-chapters.c:998
 msgid "All files"
 msgstr "Todos os arquivos"
 
-#: ../src/totem-uri.c:511 ../src/plugins/chapters/totem-chapters.c:995
+#: ../src/totem-uri.c:348 ../src/plugins/chapters/totem-chapters.c:995
 msgid "Supported files"
 msgstr "Arquivos suportados"
 
-#: ../src/totem-uri.c:523
+#: ../src/totem-uri.c:360
 msgid "Audio files"
 msgstr "Arquivos de áudio"
 
-#: ../src/totem-uri.c:531
+#: ../src/totem-uri.c:368
 msgid "Video files"
 msgstr "Arquivos de vídeo"
 
-#: ../src/totem-uri.c:541
+#: ../src/totem-uri.c:378
 msgid "Subtitle files"
 msgstr "Arquivos de legendas"
 
-#: ../src/totem-uri.c:593
+#: ../src/totem-uri.c:430
 msgid "Select Text Subtitles"
 msgstr "Selecionar as legendas de texto"
 
-#: ../src/totem-uri.c:656
+#: ../src/totem-uri.c:495
 msgid "Select Movies or Playlists"
 msgstr "Selecionar filmes ou lista de reprodução"
 
-#. Options parsing
-#: ../src/totem.c:201
-msgid "- Play movies and songs"
-msgstr "- Reproduz filmes e músicas"
-
-#: ../src/totem.c:212
-#, c-format
-msgid ""
-"%s\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"%s\n"
-"Execute \"%s --help\" para ver uma lista completa das oções de linha de "
-"comando.\n"
-
-#: ../src/totem.c:254 ../src/totem.c:265
-#: ../browser-plugin/totem-plugin-viewer.c:663
-#: ../browser-plugin/totem-plugin-viewer.c:1793
-msgid "Totem Movie Player"
-msgstr "Reprodutor de filmes Totem"
-
-#: ../src/totem.c:255 ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Could not initialize the thread-safe libraries."
-msgstr "Não foi possível inicializar as bibliotecas de processo-seguro."
-
-#: ../src/totem.c:255
-msgid "Verify your system installation. Totem will now exit."
-msgstr "Verifique a instalação do seu sistema. O Totem irá sair."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:1589
-msgid "Password requested for RTSP server"
-msgstr "Requisição de senha para servidor RTSP"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2858
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2862
-#, c-format
-msgid "Audio Track #%d"
-msgstr "Faixa de áudio #%d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2890
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2894
-#, c-format
-msgid "Subtitle #%d"
-msgstr "Legenda #%d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3298
-msgid ""
-"The requested audio output was not found. Please select another audio output "
-"in the Multimedia Systems Selector."
-msgstr ""
-"A saída de áudio requisitada não foi encontrada. Por favor, selecione outra "
-"saída de áudio no Seletor de mídia do sistema."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3303
-msgid "Location not found."
-msgstr "Local não encontrado."
+#: ../src/totem-uri.c:499
+msgid "Add Directory"
+msgstr "Adicionar diretório"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3307
-msgid ""
-"Could not open location; you might not have permission to open the file."
-msgstr ""
-"Não foi possível abrir o local; você não deve ter permissão para abrir o "
-"arquivo."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3318
-msgid ""
-"The video output is in use by another application. Please close other video "
-"applications, or select another video output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"A saída de vídeo está em uso por outro aplicativo. Por favor, feche outros "
-"aplicativos de vídeo ou selecione outra saída de vídeo no Seletor de mídia "
-"do sistema."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3324
-msgid ""
-"The audio output is in use by another application. Please select another "
-"audio output in the Multimedia Systems Selector. You may want to consider "
-"using a sound server."
-msgstr ""
-"A saída de áudio está em uso por outro aplicativo. Por favor, selecione "
-"outra saída de áudio no Seletor de mídia do sistema. Você deve considerar "
-"usar um servidor de som."
+#: ../src/totem-video-list.c:330
+msgid "No video URI"
+msgstr "Sem URI de vídeo"
 
-#. should be exactly one missing thing (source or converter)
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3342
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3348
+#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
+#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
+#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
+#: ../src/totem-video-thumbnailer.c:841
 #, c-format
-msgid "The playback of this movie requires a %s plugin which is not installed."
-msgid_plural ""
-"The playback of this movie requires the following decoders which are not "
-"installed:\n"
-"\n"
-"%s"
-msgstr[0] ""
-"A reprodução deste filme requer que o plug-in %s que não está instalado."
-msgstr[1] ""
-"A reprodução dos filmes requer que os seguintes decodificadores que não "
-"estão instalado:\n"
-"\n"
-"%s"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3374
 msgid ""
-"Cannot play this file over the network. Try downloading it to disk first."
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 msgstr ""
-"Não é possível reproduzir este arquivo pela rede. Tente baixá-lo para o "
-"disco primeiro."
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5878
-msgid "Media contains no supported video streams."
-msgstr "A mídia não contêm suporte a transmissões de vídeo."
+#: ../src/totem-video-thumbnailer.c:842
+msgid "Filename"
+msgstr "Nome do arquivo"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6052
-msgid ""
-"Failed to create a GStreamer play object. Please check your GStreamer "
-"installation."
-msgstr ""
-"Falhou ao criar o objeto de reprodução GStreamer. Por favor, verifique a sua "
-"instalação do GStreamer."
+#: ../src/totem-video-thumbnailer.c:844
+msgid "Resolution"
+msgstr "Resolução"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6172
-msgid ""
-"Failed to open audio output. You may not have permission to open the sound "
-"device, or the sound server may not be running. Please select another audio "
-"output in the Multimedia Systems Selector."
-msgstr ""
-"Falhou ao abrir a saida de áudio. Você não deve ter permissão para abrir o "
-"dispositivo de som ou o servidor de som não deve estar em execução. Por "
-"favor, selecione outra saída de áudio no Seletor de mídia do sistema."
+#: ../src/totem-video-thumbnailer.c:847
+msgid "Duration"
+msgstr "Duração"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6192
-msgid ""
-"Could not find the audio output. You may need to install additional "
-"GStreamer plugins, or select another audio output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"Não foi possível encontrar a saída de áudio. Talvez você precise instalar "
-"plug-ins adicionais de GStreamer ou selecionar uma saída de áudio no Seletor "
-"de mídia do sistema."
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:1
+msgid "Apple Trailers"
+msgstr "Trailers da Apple"
+
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:2
+msgid "Sets the user agent for the Apple Trailers site"
+msgstr "Define o agente do usuário para o site de trailers da Apple"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:1
+msgid "Autoload Subtitles"
+msgstr "Carregar legendas automaticamente"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:2
+msgid "Autoloads text subtitles"
+msgstr "Carrega automaticamente os arquivos de legenda"
 
-#. hour:minutes:seconds
-#. Translators: This is a time format, like "9:05:02" for 9
-#. * hours, 5 minutes, and 2 seconds. You may change ":" to
-#. * the separator that your locale uses or use "%Id" instead
-#. * of "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:83 ../src/plugins/skipto/totem-time-entry.c:57
-#, c-format
-msgctxt "long time format"
-msgid "%d:%02d:%02d"
-msgstr "%d:%02d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
+msgid "Video Disc Recorder"
+msgstr "Gravador de discos de vídeo"
 
-#. minutes:seconds
-#. Translators: This is a time format, like "5:02" for 5
-#. * minutes and 2 seconds. You may change ":" to the
-#. * separator that your locale uses or use "%Id" instead of
-#. * "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:92
-#, c-format
-msgctxt "short time format"
-msgid "%d:%02d"
-msgstr "%d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
+msgid "Records (S)VCDs or video DVDs"
+msgstr "Gravar (S)VCDs ou DVDs de vídeo"
 
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:65
 msgid "_Create Video Disc..."
@@ -1992,37 +1837,20 @@
 msgid "Copy the currently playing (S)VCD"
 msgstr "Copiar o (S)VCD que está em reprodução"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:129
-msgid "The video disc could not be duplicated."
-msgstr "O disco de vídeo não pôde ser duplicado."
-
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:131
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:276
-msgid "The movie could not be recorded."
-msgstr "O filme não pôde ser gravado."
-
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:157
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:167
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:263
-msgid "Unable to write a project."
-msgstr "Não foi possível gravar um projeto."
-
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
-msgid "Video Disc Recorder"
-msgstr "Gravador de discos de vídeo"
-
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
-msgid "Records (S)VCDs or video DVDs"
-msgstr "Gravar (S)VCDs ou DVDs de vídeo"
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:136
+msgid "The video disc could not be duplicated."
+msgstr "O disco de vídeo não pôde ser duplicado."
 
-#: ../src/plugins/chapters/chapters.plugin.in.h:1
-#: ../src/plugins/chapters/totem-chapters.c:1139
-msgid "Chapters"
-msgstr "Capítulos"
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:138
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:283
+msgid "The movie could not be recorded."
+msgstr "O filme não pôde ser gravado."
 
-#: ../src/plugins/chapters/chapters.plugin.in.h:2
-msgid "Support chapter markers in movies."
-msgstr "Suportar marcadores de capítulo no filme."
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:164
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:174
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:270
+msgid "Unable to write a project."
+msgstr "Não foi possível gravar um projeto."
 
 #: ../src/plugins/chapters/chapters-edit.ui.h:1
 msgid "Name for new chapter:"
@@ -2080,6 +1908,15 @@
 msgid "Create a new chapter list for the movie"
 msgstr "Criar uma nova lista de capítulos para o filme"
 
+#: ../src/plugins/chapters/chapters.plugin.in.h:1
+#: ../src/plugins/chapters/totem-chapters.c:1139
+msgid "Chapters"
+msgstr "Capítulos"
+
+#: ../src/plugins/chapters/chapters.plugin.in.h:2
+msgid "Support chapter markers in movies"
+msgstr "Suportar marcadores de capítulo em filmes"
+
 #: ../src/plugins/chapters/totem-chapters.c:56
 #, c-format
 msgid ""
@@ -2152,7 +1989,6 @@
 msgstr "Falhou ao analisar o arquivo CMML"
 
 #: ../src/plugins/chapters/totem-edit-chapter.c:95
-#| msgid "Add Chapter..."
 msgid "Add Chapter"
 msgstr "Adicionar capítulo"
 
@@ -2190,15 +2026,38 @@
 msgid "The URI ‘%s’ is not supported."
 msgstr "A URI \"%s\" não possui suporte."
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
-msgid "Instant Messenger status"
-msgstr "Status do mensageiro instantâneo"
+#: ../src/plugins/grilo/grilo.plugin.in.h:1
+msgid "Grilo Browser"
+msgstr "Navegador do Grilo"
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
-msgid "Set your Instant Messenger status to away when a movie is playing"
+#: ../src/plugins/grilo/grilo.plugin.in.h:2
+msgid "A plugin to let you browse media content from various sources"
 msgstr ""
-"Define o seu status do mensageiro instantâneo para ausente quando um filme "
-"estiver sendo exibido"
+"Um plug-in que permite que você navegue no conteúdo de mídia de várias fontes"
+
+#: ../src/plugins/grilo/grilo.ui.h:1
+msgid "Add to Playlist"
+msgstr "Adicionar à lista de reprodução"
+
+#: ../src/plugins/grilo/grilo.ui.h:2
+msgid "Copy Location"
+msgstr "Copiar localização"
+
+#: ../src/plugins/grilo/grilo.ui.h:3 ../src/plugins/grilo/totem-grilo.c:1184
+msgid "Browse"
+msgstr "Navegar"
+
+#: ../src/plugins/grilo/grilo.ui.h:4 ../src/plugins/grilo/totem-grilo.c:1227
+msgid "Search"
+msgstr "Pesquisa"
+
+#: ../src/plugins/grilo/totem-grilo.c:454
+msgid "Browse Error"
+msgstr "Erro do navegador"
+
+#: ../src/plugins/grilo/totem-grilo.c:609
+msgid "Search Error"
+msgstr "Erro de busca"
 
 #: ../src/plugins/gromit/gromit.plugin.in.h:1
 msgid "Gromit Annotations"
@@ -2212,59 +2071,15 @@
 msgid "The gromit binary was not found."
 msgstr "O binário do gromit não foi encontrado."
 
-#. Add the interface to Totem's sidebar
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:1
-#: ../src/plugins/iplayer/iplayer.py:46
-msgid "BBC iPlayer"
-msgstr "BBC iPlayer"
-
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:2
-msgid "Stream BBC programs from the last 7 days from the BBC iPlayer service."
-msgstr ""
-"Transmite programas da BBC dos últimos 7 dias a partir do serviço BBC "
-"iPlayer."
-
-#: ../src/plugins/iplayer/iplayer.py:72
-msgid "Error listing channel categories"
-msgstr "Erro listando categorias de canais"
-
-#: ../src/plugins/iplayer/iplayer.py:73
-msgid ""
-"There was an unknown error getting the list of television channels available "
-"on BBC iPlayer."
-msgstr ""
-"Ocorreu um erro desconhecido ao obter a lista de canais de televisão "
-"disponíveis no BBC iPlayer."
-
-#. Append a dummy child row so that the expander's visible; we can
-#. then queue off the expander to load the programme listing for this
-#. category
-#: ../src/plugins/iplayer/iplayer.py:84
-msgid "Loading…"
-msgstr "Carregando…"
-
-#. Translators: the "programme feed" is the list of TV shows
-#. available to watch online
-#: ../src/plugins/iplayer/iplayer.py:136
-msgid "Error getting programme feed"
-msgstr "Erro ao obter feed de programas"
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
+msgid "Instant Messenger Status"
+msgstr "Status do mensageiro instantâneo"
 
-#: ../src/plugins/iplayer/iplayer.py:137
-msgid ""
-"There was an error getting the list of programmes for this channel and "
-"category combination."
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
+msgid "Set your Instant Messenger status to away when a movie is playing"
 msgstr ""
-"Ocorreu um erro ao obter uma lista de programas para este canal e combinação "
-"de categorias."
-
-#: ../src/plugins/iplayer/iplayer2.py:298
-msgid ""
-msgstr ""
-
-#: ../src/plugins/iplayer/iplayer2.py:299
-#, python-format
-msgid "Programme unavailable (\"%s\")"
-msgstr "Programa indisponível (\"%s\")"
+"Define o seu status do mensageiro instantâneo para ausente quando um filme "
+"estiver sendo exibido"
 
 #: ../src/plugins/lirc/lirc.plugin.in.h:1
 msgid "Infrared Remote Control"
@@ -2282,25 +2097,29 @@
 msgid "Couldn't read lirc configuration."
 msgstr "Não foi possível ler a configuração lirc."
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
-msgid "Download Movie Subtitles"
-msgstr "Baixar legendas de filmes"
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:1
+msgid "Media Player Keys"
+msgstr "Teclas de reprodução de mídia"
+
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:2
+msgid "Support additional media player keys"
+msgstr "Suporte a teclas adicionais de reprodução de mídia"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
-msgid "Subtitle _language:"
-msgstr "Idioma das _legendas:"
+#: ../src/plugins/ontop/ontop.plugin.in.h:1
+msgid "Always On Top"
+msgstr "Sempre no topo"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
-msgid "_Play with Subtitle"
-msgstr "Re_produzir com legenda"
+#: ../src/plugins/ontop/ontop.plugin.in.h:2
+msgid "Keep the main window on top when playing a movie"
+msgstr "Manter a janela principal na parte superior ao reproduzir um filme"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:1
 msgid "Subtitle Downloader"
 msgstr "Buscador de legendas"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:2
-msgid "Look for subtitles for the currently playing movie."
-msgstr "Procura por legendas para o filme atual."
+msgid "Look for subtitles for the currently playing movie"
+msgstr "Procura por legendas para o filme atual"
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:42
 msgid "Brazilian Portuguese"
@@ -2356,6 +2175,18 @@
 msgid "Searching subtitles…"
 msgstr "Procurando legendas…"
 
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
+msgid "Download Movie Subtitles"
+msgstr "Baixar legendas de filmes"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
+msgid "Subtitle _language:"
+msgstr "Idioma das _legendas:"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
+msgid "_Play with Subtitle"
+msgstr "Re_produzir com legenda"
+
 #: ../src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in.h:1
 msgid "Subtitle language"
 msgstr "Idioma das legendas"
@@ -2364,81 +2195,18 @@
 msgid "The language to search for subtitles for movies in."
 msgstr "O idioma para procurar legendas para filmes."
 
-#: ../src/plugins/ontop/ontop.plugin.in.h:1
-msgid "Always On Top"
-msgstr "Sempre no topo"
-
-#: ../src/plugins/ontop/ontop.plugin.in.h:2
-msgid "Keep the main window on top when playing a movie"
-msgstr "Manter a janela principal na parte superior ao reproduzir um filme"
+#: ../src/plugins/properties/movie-properties.plugin.in.h:1
+msgid "Movie Properties"
+msgstr "Propriedades do filme"
+
+#: ../src/plugins/properties/movie-properties.plugin.in.h:2
+msgid "Adds movie properties to the sidebar"
+msgstr "Adiciona propriedades do filme à barra lateral"
 
 #: ../src/plugins/properties/totem-movie-properties.c:246
 msgid "Properties"
 msgstr "Propriedades"
 
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:1
-msgid "Publisher protocol to use"
-msgstr "Protocolo de publicação a usar"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:2
-msgid ""
-"The transport protocol to use when publishing playlists over the network."
-msgstr ""
-"O protocolo de transporte para usar ao publicar listas de reprodução na rede."
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:3
-msgid "Format for network service name"
-msgstr "Formato para nome de serviço de rede"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:5
-#, no-c-format
-msgid ""
-"A format string used to build the network service name used when publishing "
-"playlists over the network. The following format placeholders can be used: • "
-"%a: the program name as returned by g_get_application_name() • %h: the "
-"machine's host name in title case • %u: the user's login name in title case "
-"• %U: the user's real name • %%: the percent sign"
-msgstr ""
-"Um formato de string usado para formar o nome de serviço de rede usado ao "
-"publicar listas de reprodução na rede. Os seguintes formatos de espaços "
-"reservados podem ser usados: • %a: o nome do programa como retornado por "
-"g_get_application_name() • %h: o nome da máquina convidada como título • %u: "
-"o nome do login do usuário como título • %U: O nome real do usuário • %%: o "
-"sinal de porcentagem"
-
-#. Translators: computers on the local network which are publishing their playlists over the network
-#: ../src/plugins/publish/totem-publish.c:552
-msgid "Neighbors"
-msgstr "Vizinhos"
-
-#: ../src/plugins/publish/publish.plugin.in.h:1
-msgid "Publish Playlist"
-msgstr "Publicar lista de reprodução"
-
-#: ../src/plugins/publish/publish.plugin.in.h:2
-msgid "Share the current playlist via HTTP"
-msgstr "Compartilhar a lista de reprodução atual via HTTP"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:1
-msgid "Service _Name:"
-msgstr "_Nome do serviço:"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:3
-#, no-c-format
-msgid ""
-"The name used for announcing the playlist service on the network.\n"
-"All occurrences of the string %u will be replaced by your name,\n"
-"and %h will be replaced by your computer's host name."
-msgstr ""
-"O nome usado para anunciar o serviço de listas de reprodução na rede.\n"
-"Todas as ocorrências da expressão %u serão substituídas pelo seu "
-"nome,\n"
-"e %h será substituído pelo nome do seu computador."
-
-#: ../src/plugins/publish/publish-plugin.ui.h:6
-msgid "Use _encrypted transport protocol (HTTPS)"
-msgstr "Usar protocolo de transport_e criptografado (HTTPS)"
-
 #: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:1
 msgid "rpdb2 password"
 msgstr "senha rpdb2"
@@ -2451,23 +2219,87 @@
 "Uma senha para proteger o servidor rpdb2 de depuração do Totem de acesso "
 "remoto não autorizado. Se estiver vazio, a padrão \"totem\" será usada."
 
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
+msgid "Python Console"
+msgstr "Console do Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
+msgid "Interactive Python console"
+msgstr "Console interativo do Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:88
+msgid "Python Console Menu"
+msgstr "Menu do console do Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:93
+msgid "_Python Console"
+msgstr "Console do _Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:94
+msgid "Show Totem's Python console"
+msgstr "Exibe o console do Pyhon do Totem"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:100
+msgid "Python Debugger"
+msgstr "Depurador do Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:101
+msgid "Enable remote Python debugging with rpdb2"
+msgstr "Habilitar a depuração remota do Python com rpdb2"
+
+#. pylint: disable-msg=E1101
+#: ../src/plugins/pythonconsole/pythonconsole.py:125
+#, python-format
+msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
+msgstr "Você pode acessar o Totem.Object através do \"totem_object\" :\\n%s"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:129
+msgid "Totem Python Console"
+msgstr "Console Python do Totem"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:139
+msgid ""
+"After you press OK, Totem will wait until you connect to it with winpdb or "
+"rpdb2. If you have not set a debugger password in DConf, it will use the "
+"default password ('totem')."
+msgstr ""
+"Depois de clicar em OK, o Totem vai esperar até que se ligue a ele com "
+"winpdb ou rpdb2. Se não definiu uma senha de depurador no DConf, será "
+"utilizada a senha por defeito (\"totem\")."
+
+#: ../src/plugins/recent/recent.plugin.in.h:1
+msgid "Recent files"
+msgstr "Arquivos recentes"
+
+#: ../src/plugins/recent/recent.plugin.in.h:2
+msgid "Adds files that have been played to recent files"
+msgstr "Adiciona arquivos que foram reproduzidos aos arquivos recentes"
+
 #: ../src/plugins/rotation/rotation.plugin.in.h:1
 msgid "Rotation Plugin"
 msgstr "Plug-in de rotação"
 
 #: ../src/plugins/rotation/rotation.plugin.in.h:2
-msgid "Allows videos to be rotated if they're in the wrong orientation."
+msgid "Allows videos to be rotated if they are in the wrong orientation"
 msgstr ""
-"Permite que os vídeos sejam girados se eles estiverem o orientação errada."
+"Permite que os vídeos sejam girados se eles estiverem o orientação errada"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:60
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:50
 msgid "_Rotate Clockwise"
 msgstr "Gi_rar no sentido horário"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:62
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:52
 msgid "Rotate Counterc_lockwise"
 msgstr "Girar no sen_tido anti-horário"
 
+#: ../src/plugins/save-file/save-file.plugin.in.h:1
+msgid "Save Copy"
+msgstr "Salvar cópia"
+
+#: ../src/plugins/save-file/save-file.plugin.in.h:2
+msgid "Save a copy of the currently playing movie"
+msgstr "Salvar uma cópia do filme que está em reprodução"
+
 #: ../src/plugins/save-file/totem-save-file.c:63
 msgid "Save a Copy..."
 msgstr "Salvar cópia..."
@@ -2490,10 +2322,13 @@
 msgid "Movie stream"
 msgstr "Transmissão de filme"
 
-#: ../src/plugins/screensaver/totem-screensaver.c:116
-#: ../browser-plugin/totem-plugin-viewer.c:1891
-msgid "Playing a movie"
-msgstr "Reproduz um filme"
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:1
+msgid "Screen Saver"
+msgstr "Protetor de tela"
+
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:2
+msgid "Deactivates the screen saver when a movie is playing"
+msgstr "Desativa a proteção de tela quando estiver reproduzindo um filme"
 
 #: ../src/plugins/screenshot/gallery.ui.h:1
 msgid "Screenshot width (in pixels):"
@@ -2507,23 +2342,28 @@
 msgid "Number of screenshots:"
 msgstr "Número de capturas de tela:"
 
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:1
-msgid "_Name:"
-msgstr "_Nome:"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:2
-msgid "Save in _folder:"
-msgstr "Salvar na _pasta:"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:3
-msgid "Select a folder"
-msgstr "Selecionar uma pasta"
-
-#. Write the screenshot to the temporary file
-#: ../src/plugins/screenshot/gnome-screenshot-widget.c:385
-#: ../src/plugins/screenshot/totem-screenshot.c:64
-msgid "Screenshot.png"
-msgstr "Captura_de_tela.png"
+#. translators: this is the name of the file that gets made up
+#. * with the screenshot if the entire screen is taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:147
+#, c-format
+msgid "Screenshot from %s.png"
+msgstr "Captura de tela de %s.png"
+
+#. translators: this is the name of the file that gets
+#. * made up with the screenshot if the entire screen is
+#. * taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:154
+#, c-format
+msgid "Screenshot from %s - %d.png"
+msgstr "Captura de tela de %s - %d.png"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:1
+msgid "Screenshot"
+msgstr "Captura de tela"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:2
+msgid "Allows screenshots and galleries to be taken of videos"
+msgstr "Permite que capturas de telas e galerias sejam tiradas de vídeos"
 
 #: ../src/plugins/screenshot/totem-gallery.c:91
 msgid "Save Gallery"
@@ -2549,49 +2389,47 @@
 msgid "Saving gallery as \"%s\""
 msgstr "Salvando galeria como \"%s\""
 
-#: ../src/plugins/screenshot/totem-screenshot.c:113
-msgid "There was an error saving the screenshot."
-msgstr "Ocorreu um erro ao salvar a captura de tela."
-
-#: ../src/plugins/screenshot/totem-screenshot.c:139
-msgid "Save Screenshot"
-msgstr "Salvar captura de tela"
-
-#. Create the screenshot widget
-#. Translators: %s is the movie title and %d is an auto-incrementing number to make filename unique
-#: ../src/plugins/screenshot/totem-screenshot.c:160
-#, c-format
-msgid "Screenshot-%s-%d.png"
-msgstr "Captura_de_tela-%s-%d.png"
-
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:88
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:220
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "Totem could not get a screenshot of the video."
 msgstr "O Totem não pôde obter uma captura de tela do vídeo."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "This is not supposed to happen; please file a bug report."
 msgstr "Isso não deveria acontecer; por favor, relate o erro."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
-msgid "Take _Screenshot..."
-msgstr "Obter uma cap_tura de tela..."
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
+msgid "Take _Screenshot"
+msgstr "Obter cap_tura de tela"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
 msgid "Take a screenshot"
 msgstr "Obtêm uma captura de tela"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create Screenshot _Gallery..."
 msgstr "Criar uma _galeria de capturas de tela…"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create a gallery of screenshots"
 msgstr "Cria uma galeria das capturas de tela"
 
+#: ../src/plugins/skipto/skipto.plugin.in.h:1
+#: ../src/plugins/skipto/totem-skipto.c:196
+msgid "Skip To"
+msgstr "Pular para"
+
+#: ../src/plugins/skipto/skipto.plugin.in.h:2
+msgid "Provides the \"Skip to\" dialog"
+msgstr "Fornece o diálogo \"Pular para\""
+
+#: ../src/plugins/skipto/skipto.ui.h:1
+msgid "_Skip to:"
+msgstr "Pu_lar para:"
+
 #. Update the "seconds" label so that it always has the correct singular/plural form
 #. Translators: label for the seconds selector in the "Skip to" dialogue
-#: ../src/plugins/skipto/totem-skipto.c:160
+#: ../src/plugins/skipto/totem-skipto.c:159
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "segundo"
@@ -2601,15 +2439,11 @@
 #. Translators: you should translate this string to a number (written in digits) which corresponds to the longer character length of the
 #. * translations for "second" and "seconds", as translated elsewhere in this file. For example, in English, "second" is 6 characters long and
 #. * "seconds" is 7 characters long, so this string should be translated to "7". See: bgo#639398
-#: ../src/plugins/skipto/totem-skipto.c:190
+#: ../src/plugins/skipto/totem-skipto.c:189
 msgctxt "Skip To label length"
 msgid "7"
 msgstr "7"
 
-#: ../src/plugins/skipto/totem-skipto.c:197
-msgid "Skip To"
-msgstr "Pular para"
-
 #: ../src/plugins/skipto/totem-skipto-plugin.c:182
 msgid "_Skip To..."
 msgstr "_Pular para..."
@@ -2618,114 +2452,312 @@
 msgid "Skip to a specific time"
 msgstr "Pular para um tempo específico"
 
-#: ../src/plugins/skipto/skipto.ui.h:1
-msgid "_Skip to:"
-msgstr "Pu_lar para:"
-
-#: ../browser-plugin/totem-plugin-viewer.c:431
-msgid "No URI to play"
-msgstr "Sem URI para reproduzir"
-
-#. translators: this is:
-#. * Open With ApplicationName
-#. * as in nautilus' right-click menu
-#: ../browser-plugin/totem-plugin-viewer.c:1107
-#, c-format
-msgid "_Open with \"%s\""
-msgstr "Abrir c_om \"%s\""
-
-#: ../browser-plugin/totem-plugin-viewer.c:2136
-msgid "No playlist or playlist empty"
-msgstr "Sem listas de reprodução ou ela está vazia"
-
-#: ../browser-plugin/totem-plugin-viewer.c:2235
-msgid "Movie browser plugin"
-msgstr "Plug-in do navegador de filme"
-
-#: ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Verify your system installation. The Totem plugin will now exit."
-msgstr "Verifique a instalação do seu sistema. O plug-in do Totem irá sair."
-
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
-msgid "Python Console"
-msgstr "Console do Python"
-
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
-msgid "Interactive Python console."
-msgstr "Console interativo do Python."
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:88
-msgid "Python Console Menu"
-msgstr "Menu do console do Python"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:93
-msgid "_Python Console"
-msgstr "Console do _Python"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:94
-msgid "Show Totem's Python console"
-msgstr "Exibe o console do Pyhon do Totem"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:100
-msgid "Python Debugger"
-msgstr "Depurador do Python"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:101
-msgid "Enable remote Python debugging with rpdb2"
-msgstr "Habilitar a depuração remota do Python com rpdb2"
-
-#. pylint: disable-msg=E1101
-#: ../src/plugins/pythonconsole/pythonconsole.py:125
-#, python-format
-msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
-msgstr "Você pode acessar o Totem.Object através do \"totem_object\" :\\n%s"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:129
-msgid "Totem Python Console"
-msgstr "Console Python do Totem"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:139
-msgid ""
-"After you press OK, Totem will wait until you connect to it with winpdb or "
-"rpdb2. If you have not set a debugger password in DConf, it will use the "
-"default password ('totem')."
-msgstr ""
-"Depois de clicar em OK, o Totem vai esperar até que se ligue a ele com "
-"winpdb ou rpdb2. Se não definiu uma senha de depurador no DConf, será "
-"utilizada a senha por defeito (\"totem\")."
-
-#: ../src/plugins/grilo/grilo.plugin.in.h:1
-msgid "Grilo Browser"
-msgstr "Navegador do Grilo"
-
-#: ../src/plugins/grilo/grilo.plugin.in.h:2
-msgid "A plugin to let you browse media content from various sources."
-msgstr ""
-"Um plug-in que permite que você navegue no conteúdo de mídia de várias "
-"fontes."
+#~ msgid "Play movies and songs"
+#~ msgstr "Reproduz filmes e músicas"
 
-#: ../src/plugins/grilo/totem-grilo.c:452
-msgid "Browse Error"
-msgstr "Erro do navegador"
+#~ msgid "Open a file"
+#~ msgstr "Abrir um arquivo"
 
-#: ../src/plugins/grilo/totem-grilo.c:599
-msgid "Search Error"
-msgstr "Erro de busca"
+#~ msgid "Open a non-local file"
+#~ msgstr "Abrir um arquivo não local"
 
-#: ../src/plugins/grilo/totem-grilo.c:1219 ../src/plugins/grilo/grilo.ui.h:3
-msgid "Browse"
-msgstr "Navegar"
+#~ msgid "Quit the program"
+#~ msgstr "Sair do programa"
+
+#~ msgid "Configure the application"
+#~ msgstr "Configurar o aplicativo"
+
+#~ msgid "Switch to fullscreen"
+#~ msgstr "Alternar para tela cheia"
+
+#~ msgid "Set the repeat mode"
+#~ msgstr "Define o modo de repetição"
+
+#~ msgid "Set the shuffle mode"
+#~ msgstr "Define o modo de embaralhamento"
+
+#~ msgid "14.4 Kbps Modem"
+#~ msgstr "Modem de 14.4 kbps"
+
+#~ msgid "19.2 Kbps Modem"
+#~ msgstr "Modem de 19.2 kbps"
+
+#~ msgid "28.8 Kbps Modem"
+#~ msgstr "Modem de 28.8 kbps"
+
+#~ msgid "33.6 Kbps Modem"
+#~ msgstr "Modem de 33.6 kbps"
+
+#~ msgid "34.4 Kbps Modem"
+#~ msgstr "Modem de 34.4 kbps"
+
+#~ msgid "56 Kbps Modem/ISDN"
+#~ msgstr "Modem/ISDN de 56 kbps"
+
+#~ msgid "112 Kbps Dual ISDN/DSL"
+#~ msgstr "112 kbps Dual ISDN/DSL"
+
+#~ msgid "256 Kbps DSL/Cable"
+#~ msgstr "256 Kbps DSL/Cabeada"
+
+#~ msgid "384 Kbps DSL/Cable"
+#~ msgstr "DSL/Cabeada de 384 kbps"
+
+#~ msgid "512 Kbps DSL/Cable"
+#~ msgstr "DSL/Cabeada de 512 kbps"
+
+#~ msgid "1.5 Mbps T1/Intranet/LAN"
+#~ msgstr "1.5 Mbps T1/Intranet/LAN"
+
+#~ msgid "Intranet/LAN"
+#~ msgstr "Intranet/LAN"
+
+#~ msgid "Networking"
+#~ msgstr "Rede"
+
+#~ msgid "Connection _speed:"
+#~ msgstr "Veloci_dade de conexão:"
+
+#~ msgid "Network connection speed"
+#~ msgstr "Velocidade de conexão de rede"
+
+#~ msgid ""
+#~ "Approximate network connection speed, used to select quality on media "
+#~ "over the network."
+#~ msgstr ""
+#~ "Mensurar a velocidade de conexão, usada para selecionar a qualidade de "
+#~ "mídia na rede."
+
+#~ msgid "Play Image '%s'"
+#~ msgstr "Reproduzir imagem \"%s\""
+
+#~ msgid "device%d"
+#~ msgstr "dispositivo%d"
+
+#~ msgid "Play Disc '%s'"
+#~ msgstr "Reproduzir o disco \"%s\""
+
+#~ msgid "Movie Player using %s"
+#~ msgstr "Reproduzir filme usando %s"
+
+#~ msgid ""
+#~ "Totem could not play this media (%s) although a plugin is present to "
+#~ "handle it."
+#~ msgstr ""
+#~ "Totem não conseguiu reproduzir esta mídia (%s) embora o plug-in esteja "
+#~ "presente."
+
+#~ msgid ""
+#~ "You might want to check that a disc is present in the drive and that it "
+#~ "is correctly configured."
+#~ msgstr ""
+#~ "Você pode querer verificar se o disco está presente no leitor e se está "
+#~ "configurado corretamente."
+
+#~ msgid "More information about media plugins"
+#~ msgstr "Mais informações sobre plug-ins de mídia"
+
+#~ msgid ""
+#~ "Please install the necessary plugins and restart Totem to be able to play "
+#~ "this media."
+#~ msgstr ""
+#~ "Por favor, instale os plug-ins necessários e reinicie o Totem para "
+#~ "conseguir reproduzir esta mídia."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it does not have the "
+#~ "appropriate plugins to be able to read from the disc."
+#~ msgstr ""
+#~ "O Totem não pode reproduzir este tipo de mídia (%s) pelo fato de não "
+#~ "possui plug-ins apropriados para ler do disco."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because you do not have the "
+#~ "appropriate plugins to handle it."
+#~ msgstr ""
+#~ "O Totem não pode reproduzir este tipo de mídia (%s) pelo fato de não "
+#~ "possui plug-ins apropriados para manipulá-la."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it is not supported."
+#~ msgstr ""
+#~ "O Totem não pode reproduzir este tipo de mídia (%s) pelo fato de não ter "
+#~ "suporte."
+
+#~ msgid "Please insert another disc to play back."
+#~ msgstr "Por favor, insira outro disco para reprodução."
+
+#~ msgid "Totem does not support playback of Audio CDs"
+#~ msgstr "O Totem não tem suporte a reprodução de CDs de áudio"
+
+#~ msgid ""
+#~ "Please consider using a music player or a CD extractor to play this CD"
+#~ msgstr ""
+#~ "Por favor, considere usar um reprodutor de música ou um ripador de CD "
+#~ "para reproduzir este CD"
+
+#~ msgid "%d %%"
+#~ msgstr "%d %%"
+
+#~ msgid ""
+#~ "The requested audio output was not found. Please select another audio "
+#~ "output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "A saída de áudio requisitada não foi encontrada. Por favor, selecione "
+#~ "outra saída de áudio no Seletor de mídia do sistema."
+
+#~ msgid "Location not found."
+#~ msgstr "Local não encontrado."
+
+#~ msgid ""
+#~ "Could not open location; you might not have permission to open the file."
+#~ msgstr ""
+#~ "Não foi possível abrir o local; você não deve ter permissão para abrir o "
+#~ "arquivo."
+
+#~ msgid ""
+#~ "The video output is in use by another application. Please close other "
+#~ "video applications, or select another video output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "A saída de vídeo está em uso por outro aplicativo. Por favor, feche "
+#~ "outros aplicativos de vídeo ou selecione outra saída de vídeo no Seletor "
+#~ "de mídia do sistema."
+
+#~ msgid ""
+#~ "The audio output is in use by another application. Please select another "
+#~ "audio output in the Multimedia Systems Selector. You may want to consider "
+#~ "using a sound server."
+#~ msgstr ""
+#~ "A saída de áudio está em uso por outro aplicativo. Por favor, selecione "
+#~ "outra saída de áudio no Seletor de mídia do sistema. Você deve considerar "
+#~ "usar um servidor de som."
+
+#~ msgid ""
+#~ "Failed to create a GStreamer play object. Please check your GStreamer "
+#~ "installation."
+#~ msgstr ""
+#~ "Falhou ao criar o objeto de reprodução GStreamer. Por favor, verifique a "
+#~ "sua instalação do GStreamer."
+
+#~ msgid ""
+#~ "Failed to open audio output. You may not have permission to open the "
+#~ "sound device, or the sound server may not be running. Please select "
+#~ "another audio output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "Falhou ao abrir a saida de áudio. Você não deve ter permissão para abrir "
+#~ "o dispositivo de som ou o servidor de som não deve estar em execução. Por "
+#~ "favor, selecione outra saída de áudio no Seletor de mídia do sistema."
+
+#~ msgid ""
+#~ "Could not find the audio output. You may need to install additional "
+#~ "GStreamer plugins, or select another audio output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "Não foi possível encontrar a saída de áudio. Talvez você precise instalar "
+#~ "plug-ins adicionais de GStreamer ou selecionar uma saída de áudio no "
+#~ "Seletor de mídia do sistema."
+
+#~ msgid "BBC iPlayer"
+#~ msgstr "BBC iPlayer"
+
+#~ msgid ""
+#~ "Stream BBC programs from the last 7 days from the BBC iPlayer service."
+#~ msgstr ""
+#~ "Transmite programas da BBC dos últimos 7 dias a partir do serviço BBC "
+#~ "iPlayer."
+
+#~ msgid "Error listing channel categories"
+#~ msgstr "Erro listando categorias de canais"
+
+#~ msgid ""
+#~ "There was an unknown error getting the list of television channels "
+#~ "available on BBC iPlayer."
+#~ msgstr ""
+#~ "Ocorreu um erro desconhecido ao obter a lista de canais de televisão "
+#~ "disponíveis no BBC iPlayer."
+
+#~ msgid "Loading…"
+#~ msgstr "Carregando…"
+
+#~ msgid "Error getting programme feed"
+#~ msgstr "Erro ao obter feed de programas"
+
+#~ msgid ""
+#~ "There was an error getting the list of programmes for this channel and "
+#~ "category combination."
+#~ msgstr ""
+#~ "Ocorreu um erro ao obter uma lista de programas para este canal e "
+#~ "combinação de categorias."
+
+#~ msgid ""
+#~ msgstr ""
+
+#~ msgid "Programme unavailable (\"%s\")"
+#~ msgstr "Programa indisponível (\"%s\")"
+
+#~ msgid "Publisher protocol to use"
+#~ msgstr "Protocolo de publicação a usar"
+
+#~ msgid ""
+#~ "The transport protocol to use when publishing playlists over the network."
+#~ msgstr ""
+#~ "O protocolo de transporte para usar ao publicar listas de reprodução na "
+#~ "rede."
+
+#~ msgid "Format for network service name"
+#~ msgstr "Formato para nome de serviço de rede"
+
+#~ msgid ""
+#~ "A format string used to build the network service name used when "
+#~ "publishing playlists over the network. The following format placeholders "
+#~ "can be used: • %a: the program name as returned by g_get_application_name"
+#~ "() • %h: the machine's host name in title case • %u: the user's login "
+#~ "name in title case • %U: the user's real name • %%: the percent sign"
+#~ msgstr ""
+#~ "Um formato de string usado para formar o nome de serviço de rede usado ao "
+#~ "publicar listas de reprodução na rede. Os seguintes formatos de espaços "
+#~ "reservados podem ser usados: • %a: o nome do programa como retornado por "
+#~ "g_get_application_name() • %h: o nome da máquina convidada como título • "
+#~ "%u: o nome do login do usuário como título • %U: O nome real do usuário • "
+#~ "%%: o sinal de porcentagem"
+
+#~ msgid "Neighbors"
+#~ msgstr "Vizinhos"
+
+#~ msgid "Publish Playlist"
+#~ msgstr "Publicar lista de reprodução"
+
+#~ msgid "Share the current playlist via HTTP"
+#~ msgstr "Compartilhar a lista de reprodução atual via HTTP"
+
+#~ msgid "Service _Name:"
+#~ msgstr "_Nome do serviço:"
+
+#~ msgid ""
+#~ "The name used for announcing the playlist service on the network.\n"
+#~ "All occurrences of the string %u will be replaced by your name,\n"
+#~ "and %h will be replaced by your computer's host name."
+#~ msgstr ""
+#~ "O nome usado para anunciar o serviço de listas de reprodução na rede.\n"
+#~ "Todas as ocorrências da expressão %u serão substituídas pelo seu "
+#~ "nome,\n"
+#~ "e %h será substituído pelo nome do seu computador."
+
+#~ msgid "Use _encrypted transport protocol (HTTPS)"
+#~ msgstr "Usar protocolo de transport_e criptografado (HTTPS)"
+
+#~ msgid "_Name:"
+#~ msgstr "_Nome:"
+
+#~ msgid "Save in _folder:"
+#~ msgstr "Salvar na _pasta:"
 
-#: ../src/plugins/grilo/totem-grilo.c:1285 ../src/plugins/grilo/grilo.ui.h:4
-msgid "Search"
-msgstr "Pesquisa"
+#~ msgid "Select a folder"
+#~ msgstr "Selecionar uma pasta"
 
-#: ../src/plugins/grilo/grilo.ui.h:1
-#| msgid "_Add to Playlist"
-msgid "Add to Playlist"
-msgstr "Adicionar à lista de reprodução"
+#~ msgid "There was an error saving the screenshot."
+#~ msgstr "Ocorreu um erro ao salvar a captura de tela."
 
-#: ../src/plugins/grilo/grilo.ui.h:2
-#| msgid "_Copy Location"
-msgid "Copy Location"
-msgstr "Copiar localização"
+#~ msgid "Save Screenshot"
+#~ msgstr "Salvar captura de tela"
diff -Nru totem-3.4.3/po/ru.po totem-3.6.2/po/ru.po
--- totem-3.4.3/po/ru.po	2012-04-02 14:15:40.000000000 +0000
+++ totem-3.6.2/po/ru.po	2012-10-25 13:15:32.000000000 +0000
@@ -10,29 +10,252 @@
 # Alexander Saprykin , 2009.
 # Alexander Saprykin , 2010.
 # Yuri Kozlov , 2010.
+# Yuri Myasoedov , 2012.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=totem&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-03-23 06:16+0000\n"
-"PO-Revision-Date: 2012-03-24 12:06+0300\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=totem&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2012-09-15 21:46+0000\n"
+"PO-Revision-Date: 2012-09-17 15:46+0400\n"
 "Last-Translator: Yuri Myasoedov \n"
-"Language-Team: Russian \n"
+"Language-Team: русский \n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 "X-Generator: KBabel 1.11.4\n"
 
+#: ../browser-plugin/totem-plugin-viewer.c:352 ../src/totem-object.c:1180
+#: ../src/totem-object.c:1650 ../src/totem-statusbar.c:115
+msgid "Stopped"
+msgstr "Остановлено"
+
+#: ../browser-plugin/totem-plugin-viewer.c:364 ../src/totem-object.c:1173
+msgid "Paused"
+msgstr "Приостановлено"
+
+#: ../browser-plugin/totem-plugin-viewer.c:368 ../src/totem-object.c:1166
+msgid "Playing"
+msgstr "Воспроизведение"
+
+#: ../browser-plugin/totem-plugin-viewer.c:386
+#: ../src/plugins/screensaver/totem-screensaver.c:97
+msgid "Playing a movie"
+msgstr "Воспроизведение фильма"
+
+#: ../browser-plugin/totem-plugin-viewer.c:443
+msgid "No URI to play"
+msgstr "Отсутствует URI для воспроизведения"
+
+#: ../browser-plugin/totem-plugin-viewer.c:676
+#: ../browser-plugin/totem-plugin-viewer.c:1700
+msgid "Totem Movie Player"
+msgstr "Видеопроигрыватель Totem"
+
+#. translators: this is:
+#. * Open With ApplicationName
+#. * as in nautilus' right-click menu
+#: ../browser-plugin/totem-plugin-viewer.c:1120
+#, c-format
+msgid "_Open with \"%s\""
+msgstr "Открыть _с помощью «%s»"
+
+#: ../browser-plugin/totem-plugin-viewer.c:1341 ../src/totem-object.c:2475
+msgid "An error occurred"
+msgstr "Произошла ошибка"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2033
+msgid "No playlist or playlist empty"
+msgstr "Нет списка воспроизведения или он пуст"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2128
+msgid "Movie browser plugin"
+msgstr "Модуль браузера для фильмов"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144 ../src/totem.c:240
+msgid "Could not initialize the thread-safe libraries."
+msgstr "Не удалось инициализировать библиотеки с поддержкой потоков."
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144
+msgid "Verify your system installation. The Totem plugin will now exit."
+msgstr ""
+"Проверьте, правильно ли установлена ваша система. Модуль Totem завершает "
+"свою работу."
+
 #: ../data/fullscreen.ui.h:1
 msgid "Leave Fullscreen"
 msgstr "Выйти из полноэкранного режима"
 
-#: ../data/fullscreen.ui.h:2
-#: ../data/totem.ui.h:144
+#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:81
 msgid "Time:"
 msgstr "Время:"
 
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
+msgid "Allow the screensaver to activate when playing audio"
+msgstr "Не выключать хранитель экрана при проигрывании аудио"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
+msgid ""
+"Allow the screensaver to activate when playing audio. Disable if you have "
+"monitor-powered speakers."
+msgstr ""
+"Не выключать хранитель экрана при проигрывании аудио. Выключите, если "
+"колонки встроены в монитор."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
+msgid "Show visual effects when no video is displayed"
+msgstr "Показывать эффекты визуализации при отсутствии видео"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
+msgid "Show visual effects when playing an audio only file."
+msgstr "Показывать эффекты визуализации при воспроизведении звукового файла."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
+msgid "Name of the visual effects plugin"
+msgstr "Название модуля визуальных эффектов"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
+msgid "The brightness of the video"
+msgstr "Яркость видео"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
+msgid "The contrast of the video"
+msgstr "Контрастность видео"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
+msgid "The hue of the video"
+msgstr "Оттенок видео"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
+msgid "The saturation of the video"
+msgstr "Насыщенность видео"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
+msgid "Resize the canvas automatically on file load"
+msgstr "Автоматически менять размер экрана при загрузке файла"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
+msgid "Repeat mode"
+msgstr "Режим повтора"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
+msgid "Shuffle mode"
+msgstr "В случайном порядке"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
+msgid "Whether to disable deinterlacing for interlaced movies"
+msgstr "Оставлять чересстрочность изображения в фильмах или нет"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
+msgid "Whether to enable debug for the playback engine"
+msgstr "Включить отладку движка воспроизведения или нет"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
+msgid "Type of audio output to use"
+msgstr "Тип аудиовыхода"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
+msgid "Visualization quality setting"
+msgstr "Качество визуализации"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
+msgid "Quality setting for the audio visualization."
+msgstr "Качество визуализации звука."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
+msgid "Network buffering threshold"
+msgstr "Порог сетевой буферизации"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
+msgid ""
+"Amount of data to buffer for network streams before starting to display the "
+"stream (in seconds)."
+msgstr ""
+"Количество накопленных в буфере данных, необходимых для начала "
+"воспроизведения потока (в секундах)."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
+msgid "Subtitle font"
+msgstr "Шрифт субтитров"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
+msgid "Pango font description for subtitle rendering."
+msgstr "Pango-описание шрифта для отрисовки субтитров."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
+msgid "Subtitle encoding"
+msgstr "Кодировка субтитров"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
+msgid "Encoding character set for subtitle."
+msgstr "Кодировка символов для субтитров."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
+msgid "Default location for the \"Open...\" dialogs"
+msgstr "Адрес по умолчанию для диалогов «Открыть…»"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
+msgid ""
+"Default location for the \"Open...\" dialogs. Default is the current "
+"directory."
+msgstr ""
+"Адрес, используемый по умолчанию, для диалогов открытия файлов. По умолчанию "
+"— текущий каталог."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
+msgid "Default location for the \"Take Screenshot\" dialogs"
+msgstr "Адрес по умолчанию для диалогов «Сохранить кадр»"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
+msgid ""
+"Default location for the \"Take Screenshot\" dialogs. Default is the "
+"Pictures directory."
+msgstr ""
+"Адрес, используемый по умолчанию, для диалогов сохранения кадров. По "
+"умолчанию — каталог «Изображения»."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
+msgid "Whether to disable the plugins in the user's home directory"
+msgstr "Отключить модули из домашнего каталога пользователя или нет"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
+msgid "Whether to disable the keyboard shortcuts"
+msgstr "Отключить комбинации клавиш или нет"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
+msgid "Whether to autoload text subtitle files when a movie is loaded"
+msgstr ""
+"Загружать автоматически файлы текстовых субтитров после загрузки фильма или "
+"нет"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
+msgid "Whether to autoload external chapter files when a movie is loaded"
+msgstr ""
+"Загружать ли автоматически файлы внешних фрагментов после загрузки фильма"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
+msgid ""
+"Whether to remember the position of played audio/video files when pausing or "
+"closing them"
+msgstr ""
+"Запоминать ли место воспроизведения аудио- и видеофайлов при приостановке "
+"или закрытии"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
+msgid "Active plugins list"
+msgstr "Список использующихся модулей"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+msgid ""
+"A list of the names of the plugins which are currently active (loaded and "
+"running)."
+msgstr ""
+"Список использующихся (загруженных и запущенных) в настоящий момент модулей."
+
 #: ../data/playlist.ui.h:1
 msgid "_Remove"
 msgstr "_Удалить"
@@ -41,23 +264,19 @@
 msgid "Remove file from playlist"
 msgstr "Удалить файл из списка воспроизведения"
 
-#: ../data/playlist.ui.h:3
-#: ../data/video-list.ui.h:3
+#: ../data/playlist.ui.h:3 ../data/video-list.ui.h:3
 msgid "_Copy Location"
 msgstr "_Копировать адрес"
 
-#: ../data/playlist.ui.h:4
-#: ../data/video-list.ui.h:4
+#: ../data/playlist.ui.h:4 ../data/video-list.ui.h:4
 msgid "Copy the location to the clipboard"
 msgstr "Копировать адрес в буфер обмена"
 
-#: ../data/playlist.ui.h:5
-#: ../data/totem.ui.h:78
+#: ../data/playlist.ui.h:5 ../data/totem.ui.h:71
 msgid "_Select Text Subtitles..."
 msgstr "Выбрать _текстовые субтитры…"
 
-#: ../data/playlist.ui.h:6
-#: ../data/totem.ui.h:79
+#: ../data/playlist.ui.h:6 ../data/totem.ui.h:72
 msgid "Select a file to use for text subtitles"
 msgstr "Выберите файл текстовых субтитров"
 
@@ -81,785 +300,670 @@
 msgid "Move Down"
 msgstr "Переместить вниз"
 
-#: ../data/properties.ui.h:1
-#: ../data/totem.ui.h:122
-msgid "General"
-msgstr "Общие"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:2
+msgid "Normal"
+msgstr "Обычный"
 
-#: ../data/properties.ui.h:2
-msgid "Title:"
-msgstr "Название:"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:4
+msgid "Large"
+msgstr "Большой"
 
-#: ../data/properties.ui.h:3
-msgid "Artist:"
-msgstr "Исполнитель:"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:6
+msgid "Extra Large"
+msgstr "Очень большой"
 
-#: ../data/properties.ui.h:4
-msgid "Duration:"
-msgstr "Продолжительность:"
+#: ../data/preferences.ui.h:7 ../src/backend/bacon-video-widget.c:5498
+#: ../src/totem-properties-view.c:231
+msgid "Stereo"
+msgstr "Стерео"
 
-#: ../data/properties.ui.h:5
-msgid "Year:"
-msgstr "Год:"
+#: ../data/preferences.ui.h:8
+msgid "4-channel"
+msgstr "4-канальный"
 
-#: ../data/properties.ui.h:6
-msgid "Album:"
-msgstr "Альбом:"
+#: ../data/preferences.ui.h:9
+msgid "4.1-channel"
+msgstr "4.1-канальный"
 
-#: ../data/properties.ui.h:7
-msgid "Comment:"
-msgstr "Комментарий:"
+#: ../data/preferences.ui.h:10
+msgid "5.0-channel"
+msgstr "5.0-канальный"
 
-#: ../data/properties.ui.h:8
-msgid "Container:"
-msgstr "Контейнер:"
+#: ../data/preferences.ui.h:11
+msgid "5.1-channel"
+msgstr "5.1-канальный"
 
-#: ../data/properties.ui.h:9
-#: ../data/totem.ui.h:128
-#: ../src/totem-properties-view.c:270
-msgid "Video"
-msgstr "Видео"
+#: ../data/preferences.ui.h:12
+msgid "AC3 Passthrough"
+msgstr "Пропускать AC3"
 
-#: ../data/properties.ui.h:10
-msgid "Dimensions:"
-msgstr "Размер:"
+#: ../data/preferences.ui.h:13
+msgid "Totem Preferences"
+msgstr "Параметры Totem"
 
-#: ../data/properties.ui.h:11
-msgid "Codec:"
-msgstr "Кодек:"
+#: ../data/preferences.ui.h:14
+msgid "Playback"
+msgstr "Воспроизведение"
 
-#: ../data/properties.ui.h:12
-msgid "Framerate:"
-msgstr "Частота кадров:"
+#: ../data/preferences.ui.h:15
+msgid "Start playing files from last position"
+msgstr "Воспроизведение файлов с последней позиции"
 
-#: ../data/properties.ui.h:13
-msgid "Bitrate:"
-msgstr "Скорость потока:"
+#: ../data/preferences.ui.h:16
+msgid "Text Subtitles"
+msgstr "Текстовые субтитры"
 
-#: ../data/properties.ui.h:14
-#: ../data/totem.ui.h:142
-#: ../src/totem-properties-view.c:268
-msgid "Audio"
-msgstr "Аудио"
+#: ../data/preferences.ui.h:17
+msgid "_Load subtitle files when movie is loaded"
+msgstr "Загружать файлы _субтитров после загрузки фильма"
 
-#: ../data/properties.ui.h:15
-msgid "Sample rate:"
-msgstr "Частота дискретизации:"
+#: ../data/preferences.ui.h:18
+msgid "_Font:"
+msgstr "_Шрифт:"
 
-#: ../data/properties.ui.h:16
-msgid "Channels:"
-msgstr "Каналы:"
+#: ../data/preferences.ui.h:19
+msgid "_Encoding:"
+msgstr "_Кодировка:"
 
-#: ../data/video-list.ui.h:1
-#: ../src/totem-dnd-menu.c:97
-msgid "_Add to Playlist"
-msgstr "_Добавить в список воспроизведения"
+#: ../data/preferences.ui.h:20
+msgid "External Chapters"
+msgstr "Внешние фрагменты"
 
-#: ../data/video-list.ui.h:2
-msgid "Add the video to the playlist"
-msgstr "Добавить видео в список воспроизведения"
+#: ../data/preferences.ui.h:21
+msgid "Load _chapter files when movie is loaded"
+msgstr "Загружать файлы _фрагментов после загрузки фильма"
+
+#: ../data/preferences.ui.h:22 ../data/properties.ui.h:1
+msgid "General"
+msgstr "Общие"
+
+#. Tab label in the Preferences dialogue
+#: ../data/preferences.ui.h:24
+msgid "Display"
+msgstr "Видео"
+
+#: ../data/preferences.ui.h:25
+msgid "_Resize the window when a new video is loaded"
+msgstr "Изменять _размер окна после загрузки нового видео"
+
+#: ../data/preferences.ui.h:26
+msgid "Disable _deinterlacing of interlaced videos"
+msgstr "Отключить маскировку _чересстрочности"
+
+#: ../data/preferences.ui.h:27
+msgid "Disable screensaver when playing "
+msgstr "Выключить хранитель экрана при воспроизведении"
+
+#: ../data/preferences.ui.h:28 ../data/properties.ui.h:9
+#: ../src/totem-properties-view.c:273
+msgid "Video"
+msgstr "Видео"
+
+#: ../data/preferences.ui.h:29
+msgid "Video or Audio"
+msgstr "Видео и звук"
+
+#: ../data/preferences.ui.h:30
+msgid "Visual Effects"
+msgstr "Визуальные эффекты"
+
+#: ../data/preferences.ui.h:31
+msgid "Show _visual effects when an audio file is played"
+msgstr "Показывать _визуальные эффекты при воспроизведении звуковых файлов"
+
+#: ../data/preferences.ui.h:32
+msgid "_Type of visualization:"
+msgstr "_Тип визуализации:"
+
+#: ../data/preferences.ui.h:33
+msgid "Visualization _size:"
+msgstr "Размер _визуализации:"
+
+#: ../data/preferences.ui.h:34
+msgid "Color Balance"
+msgstr "Баланс цвета"
+
+#: ../data/preferences.ui.h:35
+msgid "_Brightness:"
+msgstr "_Яркость:"
+
+#: ../data/preferences.ui.h:36
+msgid "Co_ntrast:"
+msgstr "_Контрастность:"
+
+#: ../data/preferences.ui.h:37
+msgid "Sat_uration:"
+msgstr "Нас_ыщенность:"
+
+#: ../data/preferences.ui.h:38
+msgid "_Hue:"
+msgstr "_Оттенок:"
+
+#: ../data/preferences.ui.h:39
+msgid "Reset to _Defaults"
+msgstr "_Восстановить параметры по умолчанию"
+
+#: ../data/preferences.ui.h:40
+msgid "Audio Output"
+msgstr "Аудиовыход"
+
+#: ../data/preferences.ui.h:41
+msgid "_Audio output type:"
+msgstr "_Тип аудиовыхода:"
+
+#: ../data/preferences.ui.h:42 ../data/properties.ui.h:14
+#: ../src/totem-properties-view.c:271
+msgid "Audio"
+msgstr "Аудио"
+
+#: ../data/properties.ui.h:2
+msgid "Title:"
+msgstr "Название:"
+
+#: ../data/properties.ui.h:3
+msgid "Artist:"
+msgstr "Исполнитель:"
+
+#: ../data/properties.ui.h:4
+msgid "Duration:"
+msgstr "Продолжительность:"
+
+#: ../data/properties.ui.h:5
+msgid "Year:"
+msgstr "Год:"
+
+#: ../data/properties.ui.h:6
+msgid "Album:"
+msgstr "Альбом:"
+
+#: ../data/properties.ui.h:7
+msgid "Comment:"
+msgstr "Комментарий:"
+
+#: ../data/properties.ui.h:8
+msgid "Container:"
+msgstr "Контейнер:"
+
+#: ../data/properties.ui.h:10
+msgid "Dimensions:"
+msgstr "Размер:"
+
+#: ../data/properties.ui.h:11
+msgid "Codec:"
+msgstr "Кодек:"
+
+#: ../data/properties.ui.h:12
+msgid "Framerate:"
+msgstr "Частота кадров:"
+
+#: ../data/properties.ui.h:13
+msgid "Bitrate:"
+msgstr "Скорость потока:"
+
+#: ../data/properties.ui.h:15
+msgid "Sample rate:"
+msgstr "Частота дискретизации:"
+
+#: ../data/properties.ui.h:16
+msgid "Channels:"
+msgstr "Каналы:"
 
 #. Title
-#: ../data/totem.desktop.in.in.in.h:1
-#: ../data/totem.ui.h:143
-#: ../src/totem-object.c:1667
-msgid "Movie Player"
-msgstr "Видеопроигрыватель"
+#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:80 ../src/totem.c:239
+#: ../src/totem.c:248 ../src/totem-menu.c:790 ../src/totem-object.c:1658
+msgid "Videos"
+msgstr "Видео"
 
 #: ../data/totem.desktop.in.in.in.h:2
-msgid "Play movies and songs"
-msgstr "Воспроизводит фильмы и песни"
+#| msgid "Playing a movie"
+msgid "Play movies"
+msgstr "Воспроизведение фильмов"
+
+#: ../data/totem.desktop.in.in.in.h:3
+msgid "Video;Movie;Film;Clip;Series;Player;DVD;TV;Disc;"
+msgstr "Видео;Ролик;Фильм;Клип;Серии;Проигрыватель;Плеер;DVD;ТВ;TV;Диск;"
 
 #: ../data/totem.ui.h:1
-msgid "_Movie"
-msgstr "_Фильм"
+#| msgid "_Open..."
+msgid "_Open"
+msgstr "_Открыть"
 
 #: ../data/totem.ui.h:2
-msgid "_Open..."
-msgstr "_Открыть…"
+#| msgid "Open _Location..."
+msgid "Open _Location"
+msgstr "Открыть _адрес"
 
 #: ../data/totem.ui.h:3
-msgid "Open a file"
-msgstr "Открыть файл"
+msgid "_Fullscreen"
+msgstr "_Во весь экран"
 
 #: ../data/totem.ui.h:4
-msgid "Open _Location..."
-msgstr "Открыть _адрес…"
+msgid "Prefere_nces"
+msgstr "_Параметры"
 
 #: ../data/totem.ui.h:5
-msgid "Open a non-local file"
-msgstr "Открыть файл на удалённой системе"
+#| msgid "Shuff_le Mode"
+msgid "Shuff_le"
+msgstr "В с_лучайном порядке"
 
 #: ../data/totem.ui.h:6
+#| msgid "_Repeat Mode"
+msgid "_Repeat"
+msgstr "_Режим повтора"
+
+#: ../data/totem.ui.h:7
+msgid "_Quit"
+msgstr "_Выйти"
+
+#: ../data/totem.ui.h:8
+msgid "_Movie"
+msgstr "_Фильм"
+
+#: ../data/totem.ui.h:9
 msgid "_Eject"
 msgstr "_Извлечь"
 
-#: ../data/totem.ui.h:7
+#: ../data/totem.ui.h:10
 msgid "Eject the current disc"
 msgstr "Извлечь текущий диск"
 
-#: ../data/totem.ui.h:8
+#: ../data/totem.ui.h:11
 msgid "_Properties"
 msgstr "_Свойства"
 
-#: ../data/totem.ui.h:9
+#: ../data/totem.ui.h:12
 msgid "View the properties of the current stream"
 msgstr "Просмотр свойств текущего потока"
 
-#: ../data/totem.ui.h:10
+#: ../data/totem.ui.h:13
 msgid "Play / P_ause"
 msgstr "Воспроизведение / _Пауза"
 
-#: ../data/totem.ui.h:11
+#: ../data/totem.ui.h:14
 msgid "Play or pause the movie"
 msgstr "Воспроизведение или приостановка фильма"
 
-#: ../data/totem.ui.h:12
-msgid "_Quit"
-msgstr "_Выйти"
-
-#: ../data/totem.ui.h:13
-msgid "Quit the program"
-msgstr "Выйти из программы"
-
-#: ../data/totem.ui.h:14
+#: ../data/totem.ui.h:15
 msgid "_Edit"
 msgstr "_Правка"
 
-#: ../data/totem.ui.h:15
+#: ../data/totem.ui.h:16
 msgid "_Clear Playlist"
 msgstr "_Очистить список воспроизведения"
 
-#: ../data/totem.ui.h:16
+#: ../data/totem.ui.h:17
 msgid "Clear the playlist"
 msgstr "Очистить список воспроизведения"
 
-#: ../data/totem.ui.h:17
-msgid "Prefere_nces"
-msgstr "_Параметры"
-
 #: ../data/totem.ui.h:18
-msgid "Configure the application"
-msgstr "Настройка приложения"
-
-#: ../data/totem.ui.h:19
 msgid "Plugins..."
 msgstr "Модули…"
 
-#: ../data/totem.ui.h:20
+#: ../data/totem.ui.h:19
 msgid "Configure plugins to extend the application"
 msgstr "Настройка модулей"
 
-#: ../data/totem.ui.h:21
+#: ../data/totem.ui.h:20
 msgid "_View"
 msgstr "_Вид"
 
-#: ../data/totem.ui.h:22
-msgid "_Fullscreen"
-msgstr "_Во весь экран"
-
-#: ../data/totem.ui.h:23
-msgid "Switch to fullscreen"
-msgstr "Переключиться в полноэкранный режим"
-
-#: ../data/totem.ui.h:24
+#: ../data/totem.ui.h:21
 msgid "Fit Window to Movie"
 msgstr "Окно по размеру фильма"
 
-#: ../data/totem.ui.h:25
+#: ../data/totem.ui.h:22
 msgid "_Resize 1:2"
 msgstr "_Масштаб 1:2"
 
-#: ../data/totem.ui.h:26
+#: ../data/totem.ui.h:23
 msgid "Resize to half the original video size"
 msgstr "Сделать размер окна равным половине размера видео"
 
-#: ../data/totem.ui.h:27
+#: ../data/totem.ui.h:24
 msgid "Resize _1:1"
 msgstr "Масштаб _1:1"
 
-#: ../data/totem.ui.h:28
+#: ../data/totem.ui.h:25
 msgid "Resize to the original video size"
 msgstr "Сделать размер окна равным размеру видео"
 
-#: ../data/totem.ui.h:29
+#: ../data/totem.ui.h:26
 msgid "Resize _2:1"
 msgstr "Масштаб _2:1"
 
-#: ../data/totem.ui.h:30
+#: ../data/totem.ui.h:27
 msgid "Resize to double the original video size"
 msgstr "Сделать размер окна равным удвоенному размеру видео"
 
-#: ../data/totem.ui.h:31
+#: ../data/totem.ui.h:28
 msgid "_Aspect Ratio"
 msgstr "_Пропорции"
 
-#: ../data/totem.ui.h:32
+#: ../data/totem.ui.h:29
 msgid "Switch An_gles"
 msgstr "Сменить рак_урс"
 
-#: ../data/totem.ui.h:33
+#: ../data/totem.ui.h:30
 msgid "Switch camera angles"
 msgstr "Переключить ракурс камеры"
 
-#: ../data/totem.ui.h:34
+#: ../data/totem.ui.h:31
 msgid "_Go"
 msgstr "П_ереход"
 
-#: ../data/totem.ui.h:35
+#: ../data/totem.ui.h:32
 msgid "_DVD Menu"
 msgstr "Меню _DVD"
 
-#: ../data/totem.ui.h:36
+#: ../data/totem.ui.h:33
 msgid "Go to the DVD menu"
 msgstr "Перейти к меню DVD"
 
-#: ../data/totem.ui.h:37
+#: ../data/totem.ui.h:34
 msgid "_Title Menu"
 msgstr "Меню _эпизода"
 
-#: ../data/totem.ui.h:38
+#: ../data/totem.ui.h:35
 msgid "Go to the title menu"
 msgstr "Перейти к меню эпизода"
 
-#: ../data/totem.ui.h:39
+#: ../data/totem.ui.h:36
 msgid "A_udio Menu"
 msgstr "Меню а_удио"
 
-#: ../data/totem.ui.h:40
+#: ../data/totem.ui.h:37
 msgid "Go to the audio menu"
 msgstr "Перейти к меню звука"
 
-#: ../data/totem.ui.h:41
+#: ../data/totem.ui.h:38
 msgid "_Angle Menu"
 msgstr "Меню рак_урсов"
 
-#: ../data/totem.ui.h:42
+#: ../data/totem.ui.h:39
 msgid "Go to the angle menu"
 msgstr "Перейти к меню ракурсов"
 
-#: ../data/totem.ui.h:43
+#: ../data/totem.ui.h:40
 msgid "_Chapter Menu"
 msgstr "Меню _фрагментов"
 
-#: ../data/totem.ui.h:44
+#: ../data/totem.ui.h:41
 msgid "Go to the chapter menu"
 msgstr "Перейти к меню фрагментов"
 
-#: ../data/totem.ui.h:45
+#: ../data/totem.ui.h:42
 msgid "_Next Chapter/Movie"
 msgstr "С_ледующий фрагмент/фильм"
 
-#: ../data/totem.ui.h:46
+#: ../data/totem.ui.h:43
 msgid "Next chapter or movie"
 msgstr "Следующий фрагмент или фильм"
 
-#: ../data/totem.ui.h:47
+#: ../data/totem.ui.h:44
 msgid "_Previous Chapter/Movie"
 msgstr "_Предыдущий фрагмент/фильм"
 
-#: ../data/totem.ui.h:48
+#: ../data/totem.ui.h:45
 msgid "Previous chapter or movie"
 msgstr "Предыдущий фрагмент или фильм"
 
-#: ../data/totem.ui.h:49
+#: ../data/totem.ui.h:46
 msgid "_Sound"
 msgstr "_Звук"
 
-#: ../data/totem.ui.h:50
-msgid "Volume _Up"
-msgstr "_Увеличить громкость"
-
-#: ../data/totem.ui.h:51
-msgid "Increase volume"
-msgstr "Увеличить громкость"
-
-#: ../data/totem.ui.h:52
-msgid "Volume _Down"
-msgstr "У_меньшить громкость"
-
-#: ../data/totem.ui.h:53
-msgid "Decrease volume"
-msgstr "Уменьшить громкость"
-
-#: ../data/totem.ui.h:54
-msgid "_Help"
-msgstr "_Справка"
-
-#: ../data/totem.ui.h:55
-msgid "_Contents"
-msgstr "_Содержание"
-
-#: ../data/totem.ui.h:56
-msgid "Help contents"
-msgstr "Содержание справки"
-
-#: ../data/totem.ui.h:57
-msgid "_About"
-msgstr "_O программе"
-
-#: ../data/totem.ui.h:58
-msgid "About this application"
-msgstr "О программе"
-
-#: ../data/totem.ui.h:59
-msgid "_Repeat Mode"
-msgstr "_Режим повтора"
-
-#: ../data/totem.ui.h:60
-msgid "Set the repeat mode"
-msgstr "Установить режим повтора"
-
-#: ../data/totem.ui.h:61
-msgid "Shuff_le Mode"
-msgstr "В с_лучайном порядке"
-
-#: ../data/totem.ui.h:62
-msgid "Set the shuffle mode"
-msgstr "Установить режим воспроизведения в случайном порядке"
-
-#: ../data/totem.ui.h:63
-msgid "Show _Controls"
-msgstr "П_оказывать средства управления"
-
-#: ../data/totem.ui.h:64
-msgid "Show controls"
-msgstr "Показывать средства управления"
-
-#: ../data/totem.ui.h:65
-msgid "S_idebar"
-msgstr "_Боковая панель"
-
-#: ../data/totem.ui.h:66
-msgid "Show or hide the sidebar"
-msgstr "Показать или скрыть боковую панель"
-
-#: ../data/totem.ui.h:67
-msgctxt "Aspect ratio"
-msgid "Auto"
-msgstr "Авто"
-
-#: ../data/totem.ui.h:68
-msgid "Sets automatic aspect ratio"
-msgstr "Установить автоматическую пропорцию изображения"
-
-#: ../data/totem.ui.h:69
-msgid "Square"
-msgstr "Квадрат"
-
-#: ../data/totem.ui.h:70
-msgid "Sets square aspect ratio"
-msgstr "Установить квадратную пропорцию изображения"
-
-#: ../data/totem.ui.h:71
-msgid "4:3 (TV)"
-msgstr "4:3 (ТВ)"
-
-#: ../data/totem.ui.h:72
-msgid "Sets 4:3 (TV) aspect ratio"
-msgstr "Установить пропорцию изображения 4:3 (ТВ)"
-
-#: ../data/totem.ui.h:73
-msgid "16:9 (Widescreen)"
-msgstr "16:9 (широкий экран)"
-
-#: ../data/totem.ui.h:74
-msgid "Sets 16:9 (widescreen) aspect ratio"
-msgstr "Установить пропорцию изображения 16:9 (широкоэкранное)"
-
-#: ../data/totem.ui.h:75
-msgid "2.11:1 (DVB)"
-msgstr "2.11:1 (DVB)"
-
-#: ../data/totem.ui.h:76
-msgid "Sets 2.11:1 (DVB) aspect ratio"
-msgstr "Установить пропорцию изображения 2.11:1 (DVB)"
-
-#: ../data/totem.ui.h:77
-msgid "S_ubtitles"
-msgstr "С_убтитры"
-
-#: ../data/totem.ui.h:80
-msgid "_Languages"
-msgstr "_Языки"
-
-#: ../data/totem.ui.h:81
-msgid "Zoom In"
-msgstr "Увеличить"
-
-#: ../data/totem.ui.h:82
-msgid "Zoom in"
-msgstr "Увеличить"
-
-#: ../data/totem.ui.h:83
-msgid "Skip _Forward"
-msgstr "Пропустить _вперёд"
-
-#: ../data/totem.ui.h:84
-msgid "Skip forward"
-msgstr "Пропустить вперёд"
-
-#: ../data/totem.ui.h:85
-msgid "Skip _Backwards"
-msgstr "Пропустить _назад"
-
-#: ../data/totem.ui.h:86
-msgid "Skip backwards"
-msgstr "Пропустить назад"
-
-#: ../data/totem.ui.h:87
-msgid "14.4 Kbps Modem"
-msgstr "14.4 Кбит/c модем"
-
-#: ../data/totem.ui.h:88
-msgid "19.2 Kbps Modem"
-msgstr "19.2 Кбит/c модем"
-
-#: ../data/totem.ui.h:89
-msgid "28.8 Kbps Modem"
-msgstr "28.8 Кбит/c модем"
-
-#: ../data/totem.ui.h:90
-msgid "33.6 Kbps Modem"
-msgstr "33.6 Кбит/c модем"
-
-#: ../data/totem.ui.h:91
-msgid "34.4 Kbps Modem"
-msgstr "34.4 Кбит/c модем"
-
-#: ../data/totem.ui.h:92
-msgid "56 Kbps Modem/ISDN"
-msgstr "56 Кбит/c модем/ISDN"
-
-#: ../data/totem.ui.h:93
-msgid "112 Kbps Dual ISDN/DSL"
-msgstr "112 Кбит/c ISDN/DSL"
-
-#: ../data/totem.ui.h:94
-msgid "256 Kbps DSL/Cable"
-msgstr "256 Кбит/c DSL/кабель"
-
-#: ../data/totem.ui.h:95
-msgid "384 Kbps DSL/Cable"
-msgstr "384 Кбит/c DSL/кабель"
-
-#: ../data/totem.ui.h:96
-msgid "512 Kbps DSL/Cable"
-msgstr "512 Кбит/c DSL/кабель"
-
-#: ../data/totem.ui.h:97
-msgid "1.5 Mbps T1/Intranet/LAN"
-msgstr "1.5 Мбит/c T1/Внутренняя сеть/Локальная сеть"
-
-#: ../data/totem.ui.h:98
-msgid "Intranet/LAN"
-msgstr "Внутренняя сеть/Локальная сеть"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:100
-msgid "Normal"
-msgstr "Обычный"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:102
-msgid "Large"
-msgstr "Большой"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:104
-msgid "Extra Large"
-msgstr "Очень большой"
-
-#: ../data/totem.ui.h:105
-#: ../src/totem-properties-view.c:228
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5593
-msgid "Stereo"
-msgstr "Стерео"
-
-#: ../data/totem.ui.h:106
-msgid "4-channel"
-msgstr "4-канальный"
-
-#: ../data/totem.ui.h:107
-msgid "4.1-channel"
-msgstr "4.1-канальный"
-
-#: ../data/totem.ui.h:108
-msgid "5.0-channel"
-msgstr "5.0-канальный"
-
-#: ../data/totem.ui.h:109
-msgid "5.1-channel"
-msgstr "5.1-канальный"
-
-#: ../data/totem.ui.h:110
-msgid "AC3 Passthrough"
-msgstr "Пропускать AC3"
-
-#: ../data/totem.ui.h:111
-msgid "Totem Preferences"
-msgstr "Параметры Totem"
-
-#: ../data/totem.ui.h:112
-msgid "Playback"
-msgstr "Воспроизведение"
-
-#: ../data/totem.ui.h:113
-msgid "Start playing files from last position"
-msgstr "Воспроизведение файлов с последней позиции"
-
-#: ../data/totem.ui.h:114
-msgid "Networking"
-msgstr "Сеть"
-
-#: ../data/totem.ui.h:115
-msgid "Connection _speed:"
-msgstr "_Скорость соединения:"
-
-#: ../data/totem.ui.h:116
-msgid "Text Subtitles"
-msgstr "Текстовые субтитры"
-
-#: ../data/totem.ui.h:117
-msgid "_Load subtitle files when movie is loaded"
-msgstr "Загружать файлы _субтитров после загрузки фильма"
-
-#: ../data/totem.ui.h:118
-msgid "_Font:"
-msgstr "_Шрифт:"
-
-#: ../data/totem.ui.h:119
-msgid "_Encoding:"
-msgstr "_Кодировка:"
-
-#: ../data/totem.ui.h:120
-msgid "External Chapters"
-msgstr "Внешние фрагменты"
-
-#: ../data/totem.ui.h:121
-msgid "Load _chapter files when movie is loaded"
-msgstr "Загружать файлы _фрагментов после загрузки фильма"
-
-#. Tab label in the Preferences dialogue
-#: ../data/totem.ui.h:124
-msgid "Display"
-msgstr "Видео"
-
-#: ../data/totem.ui.h:125
-msgid "_Resize the window when a new video is loaded"
-msgstr "Изменять _размер окна после загрузки нового видео"
-
-#: ../data/totem.ui.h:126
-msgid "Disable _deinterlacing of interlaced videos"
-msgstr "Отключить маскировку _чересстрочности"
-
-#: ../data/totem.ui.h:127
-msgid "Disable screensaver when playing "
-msgstr "Выключить хранитель экрана при воспроизведении"
-
-#: ../data/totem.ui.h:129
-msgid "Video or Audio"
-msgstr "Видео и звук"
-
-#: ../data/totem.ui.h:130
-msgid "Visual Effects"
-msgstr "Визуальные эффекты"
-
-#: ../data/totem.ui.h:131
-msgid "Show _visual effects when an audio file is played"
-msgstr "Показывать _визуальные эффекты при воспроизведении звуковых файлов"
-
-#: ../data/totem.ui.h:132
-msgid "_Type of visualization:"
-msgstr "_Тип визуализации:"
-
-#: ../data/totem.ui.h:133
-msgid "Visualization _size:"
-msgstr "Размер _визуализации:"
-
-#: ../data/totem.ui.h:134
-msgid "Color Balance"
-msgstr "Баланс цвета"
-
-#: ../data/totem.ui.h:135
-msgid "_Brightness:"
-msgstr "_Яркость:"
+#: ../data/totem.ui.h:47
+msgid "Volume _Up"
+msgstr "_Увеличить громкость"
 
-#: ../data/totem.ui.h:136
-msgid "Co_ntrast:"
-msgstr "_Контрастность:"
+#: ../data/totem.ui.h:48
+msgid "Increase volume"
+msgstr "Увеличить громкость"
 
-#: ../data/totem.ui.h:137
-msgid "Sat_uration:"
-msgstr "Нас_ыщенность:"
+#: ../data/totem.ui.h:49
+msgid "Volume _Down"
+msgstr "У_меньшить громкость"
 
-#: ../data/totem.ui.h:138
-msgid "_Hue:"
-msgstr "_Оттенок:"
+#: ../data/totem.ui.h:50
+msgid "Decrease volume"
+msgstr "Уменьшить громкость"
 
-#: ../data/totem.ui.h:139
-msgid "Reset to _Defaults"
-msgstr "_Восстановить параметры по умолчанию"
+#: ../data/totem.ui.h:51
+msgid "_Help"
+msgstr "_Справка"
 
-#: ../data/totem.ui.h:140
-msgid "Audio Output"
-msgstr "Аудиовыход"
+#: ../data/totem.ui.h:52
+msgid "_Contents"
+msgstr "_Содержание"
 
-#: ../data/totem.ui.h:141
-msgid "_Audio output type:"
-msgstr "_Тип аудиовыхода:"
+#: ../data/totem.ui.h:53
+msgid "Help contents"
+msgstr "Содержание справки"
 
-#: ../data/totem.ui.h:145
-msgid "Time seek bar"
-msgstr "Полоса хронометража"
+#: ../data/totem.ui.h:54
+msgid "_About"
+msgstr "_O программе"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
-msgid "Allow the screensaver to activate when playing audio"
-msgstr "Не выключать хранитель экрана при проигрывании аудио"
+#: ../data/totem.ui.h:55
+msgid "About this application"
+msgstr "О программе"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
-msgid "Allow the screensaver to activate when playing audio. Disable if you have monitor-powered speakers."
-msgstr "Не выключать хранитель экрана при проигрывании аудио. Выключите, если колонки встроены в монитор."
+#: ../data/totem.ui.h:56
+msgid "Show _Controls"
+msgstr "П_оказывать средства управления"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
-msgid "Show visual effects when no video is displayed"
-msgstr "Показывать эффекты визуализации при отсутствии видео"
+#: ../data/totem.ui.h:57
+msgid "Show controls"
+msgstr "Показывать средства управления"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
-msgid "Show visual effects when playing an audio only file."
-msgstr "Показывать эффекты визуализации при воспроизведении звукового файла."
+#: ../data/totem.ui.h:58
+msgid "S_idebar"
+msgstr "_Боковая панель"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
-msgid "Name of the visual effects plugin"
-msgstr "Название модуля визуальных эффектов"
+#: ../data/totem.ui.h:59
+msgid "Show or hide the sidebar"
+msgstr "Показать или скрыть боковую панель"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
-msgid "The brightness of the video"
-msgstr "Яркость видео"
+#: ../data/totem.ui.h:60
+msgctxt "Aspect ratio"
+msgid "Auto"
+msgstr "Авто"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
-msgid "The contrast of the video"
-msgstr "Контрастность видео"
+#: ../data/totem.ui.h:61
+msgid "Sets automatic aspect ratio"
+msgstr "Установить автоматическую пропорцию изображения"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
-msgid "The hue of the video"
-msgstr "Оттенок видео"
+#: ../data/totem.ui.h:62
+msgid "Square"
+msgstr "Квадрат"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
-msgid "The saturation of the video"
-msgstr "Насыщенность видео"
+#: ../data/totem.ui.h:63
+msgid "Sets square aspect ratio"
+msgstr "Установить квадратную пропорцию изображения"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
-msgid "Resize the canvas automatically on file load"
-msgstr "Автоматически менять размер экрана при загрузке файла"
+#: ../data/totem.ui.h:64
+msgid "4:3 (TV)"
+msgstr "4:3 (ТВ)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
-msgid "Network connection speed"
-msgstr "Скорость сетевого соединения"
+#: ../data/totem.ui.h:65
+msgid "Sets 4:3 (TV) aspect ratio"
+msgstr "Установить пропорцию изображения 4:3 (ТВ)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
-msgid "Approximate network connection speed, used to select quality on media over the network."
-msgstr "Аппроксимировать скорость сетевого соединения для выбора качества данных при передаче через сеть."
+#: ../data/totem.ui.h:66
+msgid "16:9 (Widescreen)"
+msgstr "16:9 (широкий экран)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
-msgid "Repeat mode"
-msgstr "Режим повтора"
+#: ../data/totem.ui.h:67
+msgid "Sets 16:9 (widescreen) aspect ratio"
+msgstr "Установить пропорцию изображения 16:9 (широкоэкранное)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
-msgid "Shuffle mode"
-msgstr "В случайном порядке"
+#: ../data/totem.ui.h:68
+msgid "2.11:1 (DVB)"
+msgstr "2.11:1 (DVB)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
-msgid "Whether to disable deinterlacing for interlaced movies"
-msgstr "Оставлять чересстрочность изображения в фильмах или нет"
+#: ../data/totem.ui.h:69
+msgid "Sets 2.11:1 (DVB) aspect ratio"
+msgstr "Установить пропорцию изображения 2.11:1 (DVB)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
-msgid "Whether to enable debug for the playback engine"
-msgstr "Включить отладку движка воспроизведения или нет"
+#: ../data/totem.ui.h:70
+msgid "S_ubtitles"
+msgstr "С_убтитры"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
-msgid "Type of audio output to use"
-msgstr "Тип аудиовыхода"
+#: ../data/totem.ui.h:73
+msgid "_Languages"
+msgstr "_Языки"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
-msgid "Visualization quality setting"
-msgstr "Качество визуализации"
+#: ../data/totem.ui.h:74
+msgid "Zoom In"
+msgstr "Увеличить"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
-msgid "Quality setting for the audio visualization."
-msgstr "Качество визуализации звука."
+#: ../data/totem.ui.h:75
+msgid "Zoom in"
+msgstr "Увеличить"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
-msgid "Network buffering threshold"
-msgstr "Порог сетевой буферизации"
+#: ../data/totem.ui.h:76
+msgid "Skip _Forward"
+msgstr "Пропустить _вперёд"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
-msgid "Amount of data to buffer for network streams before starting to display the stream (in seconds)."
-msgstr "Количество накопленных в буфере данных, необходимых для начала воспроизведения потока (в секундах)."
+#: ../data/totem.ui.h:77
+msgid "Skip forward"
+msgstr "Пропустить вперёд"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
-msgid "Subtitle font"
-msgstr "Шрифт субтитров"
+#: ../data/totem.ui.h:78
+msgid "Skip _Backwards"
+msgstr "Пропустить _назад"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
-msgid "Pango font description for subtitle rendering."
-msgstr "Pango-описание шрифта для отрисовки субтитров."
+#: ../data/totem.ui.h:79
+msgid "Skip backwards"
+msgstr "Пропустить назад"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
-msgid "Subtitle encoding"
-msgstr "Кодировка субтитров"
+#: ../data/totem.ui.h:82
+msgid "Time seek bar"
+msgstr "Полоса хронометража"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
-msgid "Encoding character set for subtitle."
-msgstr "Кодировка символов для субтитров."
+#: ../data/uri.ui.h:1
+msgid "Enter the _address of the file you would like to open:"
+msgstr "Введите _адрес файла, который нужно открыть:"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
-msgid "Default location for the \"Open...\" dialogs"
-msgstr "Адрес по умолчанию для диалогов «Открыть…»"
+#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
+msgid "_Add to Playlist"
+msgstr "_Добавить в список воспроизведения"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
-msgid "Default location for the \"Open...\" dialogs. Default is the current directory."
-msgstr "Адрес, используемый по умолчанию, для диалогов открытия файлов. По умолчанию — текущий каталог."
+#: ../data/video-list.ui.h:2
+msgid "Add the video to the playlist"
+msgstr "Добавить видео в список воспроизведения"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
-msgid "Default location for the \"Take Screenshot\" dialogs"
-msgstr "Адрес по умолчанию для диалогов «Сохранить кадр»"
+#: ../src/backend/bacon-video-widget.c:1643
+msgid "Password requested for RTSP server"
+msgstr "Требуется пароль для сервера RTSP"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
-msgid "Default location for the \"Take Screenshot\" dialogs. Default is the Pictures directory."
-msgstr "Адрес, используемый по умолчанию, для диалогов сохранения кадров. По умолчанию — каталог «Изображения»."
+#: ../src/backend/bacon-video-widget.c:2944
+#, c-format
+msgid "Audio Track #%d"
+msgstr "Дорожка аудио #%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
-msgid "Whether to disable the plugins in the user's home directory"
-msgstr "Отключить модули из домашнего каталога пользователя или нет"
+#: ../src/backend/bacon-video-widget.c:2948
+#, c-format
+msgid "Subtitle #%d"
+msgstr "Субтитры #%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
-msgid "Whether to disable the keyboard shortcuts"
-msgstr "Отключить комбинации клавиш или нет"
+#: ../src/backend/bacon-video-widget.c:3345
+msgid "The server you are trying to connect to is not known."
+msgstr "Сервер, к которому вы пытаетесь подключиться, неизвестен."
+
+#: ../src/backend/bacon-video-widget.c:3348
+msgid "The connection to this server was refused."
+msgstr "Соединение к этому серверу было отклонено."
+
+#: ../src/backend/bacon-video-widget.c:3351
+#| msgid "The movie could not be recorded."
+msgid "The specified movie could not be found."
+msgstr "Не удалось найти указанный фильм."
+
+#: ../src/backend/bacon-video-widget.c:3358
+msgid "The server refused access to this file or stream."
+msgstr "Сервер отклонил доступ к этому файлу или потоку."
+
+#: ../src/backend/bacon-video-widget.c:3364
+msgid "Authentication is required to access this file or stream."
+msgstr "Для доступа к этому файлу или потоку требуется проверка подлинности."
+
+#: ../src/backend/bacon-video-widget.c:3371
+#| msgid "Totem was not able to play this disc."
+msgid "You are not allowed to open this file."
+msgstr "Вам запрещено открывать этот файл."
+
+#: ../src/backend/bacon-video-widget.c:3376
+#| msgid "File is not a valid .desktop file"
+msgid "This location is not a valid one."
+msgstr "Этот адрес не является корректным."
+
+#: ../src/backend/bacon-video-widget.c:3384
+#| msgid "The movie could not be recorded."
+msgid "The movie could not be read."
+msgstr "Не удалось прочитать фильм."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
-msgid "Whether to autoload text subtitle files when a movie is loaded"
-msgstr "Загружать автоматически файлы текстовых субтитров после загрузки фильма или нет"
+#. should be exactly one missing thing (source or converter)
+#: ../src/backend/bacon-video-widget.c:3407
+#: ../src/backend/bacon-video-widget.c:3415
+#, c-format
+msgid "The playback of this movie requires a %s plugin which is not installed."
+msgid_plural ""
+"The playback of this movie requires the following decoders which are not "
+"installed:\n"
+"\n"
+"%s"
+msgstr[0] ""
+"Для воспроизведения этого фильма требуется модуль %s, который не установлен."
+msgstr[1] ""
+"Для воспроизведения этого фильма требуются следующие декодеры, которые не "
+"установлены:\n"
+"\n"
+"%s"
+msgstr[2] ""
+"Для воспроизведения этого фильма требуется модуль (%s), который не "
+"установлен."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
-msgid "Whether to autoload external chapter files when a movie is loaded"
-msgstr "Загружать ли автоматически файлы внешних фрагментов после загрузки фильма"
+#: ../src/backend/bacon-video-widget.c:3426
+msgid ""
+"An audio or video stream is not handled due to missing codecs. You might "
+"need to install additional plugins to be able to play some types of movies"
+msgstr ""
+"Аудио- или видеопоток не является управляемым из-за отсутствия кодеков. "
+"Возможно, для воспроизведения некоторых типов фильмов, нужно установить "
+"дополнительные модули"
+
+#: ../src/backend/bacon-video-widget.c:3436
+#| msgid ""
+#| "Cannot play this file over the network. Try downloading it to disk first."
+msgid ""
+"This file cannot be played over the network. Try downloading it locally "
+"first."
+msgstr ""
+"Этот файл не может быть воспроизведён по сети. Попробуйте сначала загрузить "
+"его на локальный диск."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
-msgid "Whether to remember the position of played audio/video files when pausing or closing them"
-msgstr "Запоминать ли место воспроизведения аудио- и видеофайлов при приостановке или закрытии"
+#: ../src/backend/bacon-video-widget.c:5494 ../src/totem-properties-view.c:227
+msgid "Surround"
+msgstr "Объёмный"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:35
-msgid "Active plugins list"
-msgstr "Список использующихся модулей"
+#: ../src/backend/bacon-video-widget.c:5496 ../src/totem-properties-view.c:229
+msgid "Mono"
+msgstr "Моно"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:36
-msgid "A list of the names of the plugins which are currently active (loaded and running)."
-msgstr "Список использующихся (загруженных и запущенных) в настоящий момент модулей."
+#: ../src/backend/bacon-video-widget.c:5781
+msgid "Media contains no supported video streams."
+msgstr "На носителе не найдено поддерживаемых потоков видео."
 
-#: ../data/uri.ui.h:1
-msgid "Enter the _address of the file you would like to open:"
-msgstr "Введите _адрес файла, который нужно открыть:"
+#: ../src/backend/bacon-video-widget.c:5963
+msgid ""
+"Some necessary plug-ins are missing. Make sure that the program is correctly "
+"installed."
+msgstr ""
+"Отсутствуют некоторые необходимые модули. Проверьте правильность установки "
+"программы."
 
 #: ../src/eggdesktopfile.c:165
 #, c-format
@@ -889,7 +993,9 @@
 #: ../src/eggdesktopfile.c:1383
 #, c-format
 msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
-msgstr "Не удалось передать URI документа элементу рабочего стола, он является ссылкой"
+msgstr ""
+"Не удалось передать URI документа элементу рабочего стола, он является "
+"ссылкой"
 
 #: ../src/eggdesktopfile.c:1404
 #, c-format
@@ -924,8 +1030,14 @@
 #. Translators: the parameter is a filename
 #: ../src/eggfileformatchooser.c:657
 #, c-format
-msgid "The program was not able to find out the file format you want to use for `%s'. Please make sure to use a known extension for that file or manually choose a file format from the list below."
-msgstr "Не удалось определить формат файла для: «%s». Убедитесь, что используется правильное расширение для данного файла, или вручную выберите формат файла из списка ниже."
+msgid ""
+"The program was not able to find out the file format you want to use for `"
+"%s'. Please make sure to use a known extension for that file or manually "
+"choose a file format from the list below."
+msgstr ""
+"Не удалось определить формат файла для: «%s». Убедитесь, что используется "
+"правильное расширение для данного файла, или вручную выберите формат файла "
+"из списка ниже."
 
 #: ../src/eggfileformatchooser.c:664
 msgid "File format not recognized"
@@ -955,9 +1067,34 @@
 msgid "Session management options:"
 msgstr "Параметры сеанса:"
 
-#: ../src/eggsmclient.c:254
-msgid "Show session management options"
-msgstr "Показать параметры управления сеансом"
+#: ../src/eggsmclient.c:254
+msgid "Show session management options"
+msgstr "Показать параметры управления сеансом"
+
+#. hour:minutes:seconds
+#. Translators: This is a time format, like "9:05:02" for 9
+#. * hours, 5 minutes, and 2 seconds. You may change ":" to
+#. * the separator that your locale uses or use "%Id" instead
+#. * of "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:56
+#: ../src/plugins/skipto/totem-time-entry.c:57
+#, c-format
+msgctxt "long time format"
+msgid "%d:%02d:%02d"
+msgstr "%d:%02d:%02d"
+
+#. minutes:seconds
+#. Translators: This is a time format, like "5:02" for 5
+#. * minutes and 2 seconds. You may change ":" to the
+#. * separator that your locale uses or use "%Id" instead of
+#. * "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:65
+#, c-format
+msgctxt "short time format"
+msgid "%d:%02d"
+msgstr "%d:%02d"
 
 #. Title
 #. Artist
@@ -1067,10 +1204,16 @@
 msgstr[1] "%d кадра в секунду"
 msgstr[2] "%d кадров в секунду"
 
-#: ../src/totem-audio-preview.c:168
+#: ../src/totem-audio-preview.c:137
 msgid "Audio Preview"
 msgstr "Предварительное прослушивание"
 
+#: ../src/totem.c:240
+msgid "Verify your system installation. Totem will now exit."
+msgstr ""
+"Проверьте, правильно ли установлена ваша система. Totem завершает свою "
+"работу."
+
 #: ../src/totem-cell-renderer-video.c:126
 msgid "Unknown video"
 msgstr "Неизвестное видео"
@@ -1083,12 +1226,11 @@
 msgid "Cancel"
 msgstr "Отменить"
 
-#: ../src/totem-fullscreen.c:616
+#: ../src/totem-fullscreen.c:573
 msgid "No File"
 msgstr "Нет файла"
 
-#: ../src/totem-interface.c:181
-#: ../src/totem-interface.c:224
+#: ../src/totem-interface.c:181 ../src/totem-interface.c:224
 #, c-format
 msgid "Couldn't load the '%s' interface. %s"
 msgstr "Не удалось загрузить интерфейс «%s». %s"
@@ -1097,71 +1239,71 @@
 msgid "The file does not exist."
 msgstr "Файл не существует."
 
-#: ../src/totem-interface.c:183
-#: ../src/totem-interface.c:185
-#: ../src/totem-interface.c:226
-#: ../src/totem-interface.c:228
+#: ../src/totem-interface.c:183 ../src/totem-interface.c:185
+#: ../src/totem-interface.c:226 ../src/totem-interface.c:228
 msgid "Make sure that Totem is properly installed."
 msgstr "Проверьте правильность установки Totem."
 
-#: ../src/totem-interface.c:347
-msgid "Totem 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."
-msgstr "Totem — свободное программное обеспечение; вы можете распространять и/или изменять его на условиях лицензии GNU General Public License, опубликованной Фондом свободного программного обеспечения; либо версии 2 этой лицензии, либо (по вашему выбору) любой более поздней версии."
-
-#: ../src/totem-interface.c:351
-msgid "Totem 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 General Public License for more details."
-msgstr "Totem распространяется в надежде, что он может быть полезен, но БЕЗ КАКОГО-ЛИБО ВИДА ГАРАНТИЙ, ВЫРАЖЕННЫХ ЯВНО ИЛИ ПОДРАЗУМЕВАЕМЫХ, ВКЛЮЧАЯ, НО НЕ ОГРАНИЧИВАЯСЬ ПОДРАЗУМЕВАЕМЫМИ ГАРАНТИЯМИ КОММЕРЧЕСКОЙ ЦЕННОСТИ И ПРИГОДНОСТИ ДЛЯ КОНКРЕТНОЙ ЦЕЛИ. Для получения дополнительных сведений обратитесь к лицензии GNU General Public License."
-
-#: ../src/totem-interface.c:355
-msgid "You should have received a copy of the GNU General Public License along with Totem; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA"
-msgstr "Вы должны были получить копию лицензии GNU General Public License c программой Totem. Если это не так, известите об этом Фонд свободного программного обеспечения по адресу: Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA"
-
-#: ../src/totem-interface.c:358
-msgid "Totem contains an exception to allow the use of proprietary GStreamer plugins."
-msgstr "Totem содержит исключение, позволяющее использовать собственнические модули GStreamer."
+#: ../src/totem-interface.c:357
+msgid ""
+"Totem 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."
+msgstr ""
+"Totem — свободное программное обеспечение; вы можете распространять и/или "
+"изменять его на условиях лицензии GNU General Public License, опубликованной "
+"Фондом свободного программного обеспечения; либо версии 2 этой лицензии, "
+"либо (по вашему выбору) любой более поздней версии."
+
+#: ../src/totem-interface.c:361
+msgid ""
+"Totem 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 General Public License for more "
+"details."
+msgstr ""
+"Totem распространяется в надежде, что он может быть полезен, но БЕЗ КАКОГО-"
+"ЛИБО ВИДА ГАРАНТИЙ, ВЫРАЖЕННЫХ ЯВНО ИЛИ ПОДРАЗУМЕВАЕМЫХ, ВКЛЮЧАЯ, НО НЕ "
+"ОГРАНИЧИВАЯСЬ ПОДРАЗУМЕВАЕМЫМИ ГАРАНТИЯМИ КОММЕРЧЕСКОЙ ЦЕННОСТИ И "
+"ПРИГОДНОСТИ ДЛЯ КОНКРЕТНОЙ ЦЕЛИ. Для получения дополнительных сведений "
+"обратитесь к лицензии GNU General Public License."
+
+#: ../src/totem-interface.c:365
+msgid ""
+"You should have received a copy of the GNU General Public License along with "
+"Totem; if not, write to the Free Software Foundation, Inc., 59 Temple Place, "
+"Suite 330, Boston, MA  02111-1307  USA"
+msgstr ""
+"Вы должны были получить копию лицензии GNU General Public License c "
+"программой Totem. Если это не так, известите об этом Фонд свободного "
+"программного обеспечения по адресу: Free Software Foundation, Inc., 59 "
+"Temple Place, Suite 330, Boston, MA  02111-1307  USA"
+
+#: ../src/totem-interface.c:368
+msgid ""
+"Totem contains an exception to allow the use of proprietary GStreamer "
+"plugins."
+msgstr ""
+"Totem содержит исключение, позволяющее использовать собственнические модули "
+"GStreamer."
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:190
+#: ../src/totem-menu.c:291
 msgid "None"
 msgstr "Нет"
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:195
+#: ../src/totem-menu.c:296
 msgctxt "Language"
 msgid "Auto"
 msgstr "Авто"
 
-#. Translators:
-#. * This is not a JPEG image, but a disc image, for example,
-#. * an ISO file
-#: ../src/totem-menu.c:765
-#, c-format
-msgid "Play Image '%s'"
-msgstr "Воспроизвести образ '%s'"
-
-#: ../src/totem-menu.c:768
-#: ../src/totem-menu.c:851
-#, c-format
-msgid "device%d"
-msgstr "устройство%d"
-
-#: ../src/totem-menu.c:848
-#, c-format
-msgid "Play Disc '%s'"
-msgstr "Воспроизвести диск «%s»"
-
-#. This lists the back-end type and version, such as
-#. * Movie Player using GStreamer 0.10.1
-#: ../src/totem-menu.c:1189
-#, c-format
-msgid "Movie Player using %s"
-msgstr "Видеопроигрыватель использует %s"
-
-#: ../src/totem-menu.c:1193
+#: ../src/totem-menu.c:789
 msgid "Copyright © 2002-2009 Bastien Nocera"
 msgstr "Авторское право © 2002—2009 Bastien Nocera"
 
-#: ../src/totem-menu.c:1198
+#: ../src/totem-menu.c:794
 msgid "translator-credits"
 msgstr ""
 "Nail Abdrahmanov \n"
@@ -1169,149 +1311,77 @@
 "Василий Фаронов , 2008\n"
 "Alexander Saprykin , 2009-2010"
 
-#: ../src/totem-menu.c:1202
+#: ../src/totem-menu.c:798
 msgid "Totem Website"
 msgstr "Веб-сайт Totem"
 
-#: ../src/totem-menu.c:1236
+#: ../src/totem-menu.c:829
 msgid "Configure Plugins"
 msgstr "Настройка модулей"
 
+#: ../src/totem-object.c:162
+#, c-format
+msgid ""
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"%s\n"
+"Запустите '%s --help' чтобы увидеть полный список доступных команд.\n"
+
 #. Translators: %s is the totem version number
-#: ../src/totem-object.c:471
+#: ../src/totem-object.c:591
 #, c-format
 msgid "Totem %s"
 msgstr "Totem %s"
 
-#: ../src/totem-object.c:1047
-#: ../browser-plugin/totem-plugin-viewer.c:367
-msgid "Playing"
-msgstr "Воспроизведение"
-
-#: ../src/totem-object.c:1049
-#: ../src/totem-options.c:52
+#: ../src/totem-object.c:1168 ../src/totem-options.c:52
 msgid "Pause"
 msgstr "Пауза"
 
-#: ../src/totem-object.c:1054
-#: ../browser-plugin/totem-plugin-viewer.c:363
-msgid "Paused"
-msgstr "Приостановлено"
-
-#: ../src/totem-object.c:1056
-#: ../src/totem-object.c:1066
+#: ../src/totem-object.c:1175 ../src/totem-object.c:1185
 #: ../src/totem-options.c:51
 msgid "Play"
 msgstr "Воспроизведение"
 
-#: ../src/totem-object.c:1061
-#: ../src/totem-object.c:1659
-#: ../src/totem-statusbar.c:115
-#: ../browser-plugin/totem-plugin-viewer.c:351
-msgid "Stopped"
-msgstr "Остановлено"
-
-#: ../src/totem-object.c:1142
-#: ../src/totem-object.c:1169
-#: ../src/totem-object.c:1799
-#: ../src/totem-object.c:1963
+#: ../src/totem-object.c:1267 ../src/totem-object.c:1294
+#: ../src/totem-object.c:1787 ../src/totem-object.c:1942
 #, c-format
 msgid "Totem could not play '%s'."
 msgstr "Не удалось воспроизвести «%s»."
 
-#: ../src/totem-object.c:1246
-#, c-format
-msgid "Totem could not play this media (%s) although a plugin is present to handle it."
-msgstr "Не удалось воспроизвести этот носитель (%s), несмотря на то, что модуль для его обработки установлен."
-
-#: ../src/totem-object.c:1247
-msgid "You might want to check that a disc is present in the drive and that it is correctly configured."
-msgstr "Убедитесь, что диск вставлен в устройство, а устройство правильно настроено."
-
-#: ../src/totem-object.c:1255
-msgid "More information about media plugins"
-msgstr "Подробнее о модулях носителей"
-
-#: ../src/totem-object.c:1256
-msgid "Please install the necessary plugins and restart Totem to be able to play this media."
-msgstr "Установите необходимые модули и перезапустите Totem, чтобы воспроизвести этот носитель."
-
-#: ../src/totem-object.c:1258
-#, c-format
-msgid "Totem cannot play this type of media (%s) because it does not have the appropriate plugins to be able to read from the disc."
-msgstr "Не удалось воспроизвести этот носитель (%s), потому что нет модулей, способных прочитать данные с него."
-
-#: ../src/totem-object.c:1260
-#, c-format
-msgid "Totem cannot play this type of media (%s) because you do not have the appropriate plugins to handle it."
-msgstr "Не удалось воспроизвести этот носитель (%s), потому что нет соответствующих модулей."
-
-#: ../src/totem-object.c:1263
-#, c-format
-msgid "Totem cannot play this type of media (%s) because it is not supported."
-msgstr "Не удалось воспроизвести этот носитель (%s), потому что он не поддерживается."
-
-#: ../src/totem-object.c:1264
-msgid "Please insert another disc to play back."
-msgstr "Вставьте другой диск для проигрывания."
-
-#: ../src/totem-object.c:1300
-msgid "Totem was not able to play this disc."
-msgstr "Не удалось воспроизвести этот диск."
-
-#: ../src/totem-object.c:1301
-#: ../src/totem-object.c:4229
-msgid "No reason."
-msgstr "Нет причины."
-
-#: ../src/totem-object.c:1315
-msgid "Totem does not support playback of Audio CDs"
-msgstr "Totem не поддерживает воспроизведение звуковых компакт-дисков"
-
-#: ../src/totem-object.c:1316
-msgid "Please consider using a music player or a CD extractor to play this CD"
-msgstr "Используйте проигрыватель музыки или специальную программу для переноса с компакт-дисков"
-
-#: ../src/totem-object.c:1805
+#: ../src/totem-object.c:1793
 msgid "No error message"
 msgstr "Отсутствуют данные об ошибке"
 
-#: ../src/totem-object.c:2154
+#: ../src/totem-object.c:2133
 msgid "Totem could not display the help contents."
 msgstr "Не удалось отобразить содержимое справки."
 
-#: ../src/totem-object.c:2493
-#: ../src/totem-object.c:2495
-#: ../browser-plugin/totem-plugin-viewer.c:1417
-msgid "An error occurred"
-msgstr "Произошла ошибка"
-
-#: ../src/totem-object.c:4064
-#: ../src/totem-object.c:4066
+#: ../src/totem-object.c:4019 ../src/totem-object.c:4021
 msgid "Previous Chapter/Movie"
 msgstr "Предыдущий фрагмент/фильм"
 
-#: ../src/totem-object.c:4073
-#: ../src/totem-object.c:4075
+#: ../src/totem-object.c:4028 ../src/totem-object.c:4030
 msgid "Play / Pause"
 msgstr "Воспроизведение / Пауза"
 
-#: ../src/totem-object.c:4083
-#: ../src/totem-object.c:4085
+#: ../src/totem-object.c:4038 ../src/totem-object.c:4040
 msgid "Next Chapter/Movie"
 msgstr "Следующий фрагмент/фильм"
 
-#. Translators: this is the tooltip text for the fullscreen button in the controls box in Totem's main window.
 #. Translators: this is the accessibility text for the fullscreen button in the controls box in Totem's main window.
-#: ../src/totem-object.c:4097
-#: ../src/totem-object.c:4099
+#: ../src/totem-object.c:4051 ../src/totem-object.c:4053
 msgid "Fullscreen"
 msgstr "Во весь экран"
 
-#: ../src/totem-object.c:4229
+#: ../src/totem-object.c:4184
 msgid "Totem could not startup."
 msgstr "Не удалось запустить Totem."
 
+#: ../src/totem-object.c:4184
+msgid "No reason."
+msgstr "Нет причины."
+
 #: ../src/totem-open-location.c:182
 msgid "Open Location..."
 msgstr "Открыть адрес…"
@@ -1385,119 +1455,112 @@
 msgid "Movies to play"
 msgstr "Фильмы для воспроизведения"
 
-#: ../src/totem-options.c:117
+#: ../src/totem-options.c:79
+msgid "- Play movies and songs"
+msgstr "— воспроизведение фильмов и музыки"
+
+#: ../src/totem-options.c:142
 msgid "Can't enqueue and replace at the same time"
 msgstr "Невозможно одновременно поставить в очередь и заменить"
 
 #. By extension entry
-#: ../src/totem-playlist.c:161
+#: ../src/totem-playlist.c:162
 msgid "MP3 ShoutCast playlist"
 msgstr "Список воспроизведения MP3 ShoutCast"
 
-#: ../src/totem-playlist.c:162
+#: ../src/totem-playlist.c:163
 msgid "MP3 audio (streamed)"
 msgstr "MP3 аудио (поток)"
 
-#: ../src/totem-playlist.c:163
+#: ../src/totem-playlist.c:164
 msgid "MP3 audio (streamed, DOS format)"
 msgstr "MP3 аудио (поток, формат DOS)"
 
-#: ../src/totem-playlist.c:164
+#: ../src/totem-playlist.c:165
 msgid "XML Shareable Playlist"
 msgstr "Список воспроизведения XML Shareable"
 
 #. This is "Title 3", where title is a DVD title
 #. * Note: NOT a DVD chapter
-#: ../src/totem-playlist.c:347
+#: ../src/totem-playlist.c:348
 #, c-format
 msgid "Title %d"
 msgstr "Заголовок %d"
 
-#: ../src/totem-playlist.c:446
+#: ../src/totem-playlist.c:447
 msgid "Could not save the playlist"
 msgstr "Не удалось сохранить список воспроизведения"
 
-#: ../src/totem-playlist.c:1021
+#: ../src/totem-playlist.c:1022
 msgid "Save Playlist"
 msgstr "Сохранить список воспроизведения"
 
 #. translators: Playlist is the default saved playlist filename,
 #. * without the suffix
-#: ../src/totem-playlist.c:1033
-#: ../src/totem-playlist.c:1264
-#: ../src/totem-sidebar.c:142
+#: ../src/totem-playlist.c:1034 ../src/totem-playlist.c:1263
+#: ../src/totem-sidebar.c:145
 msgid "Playlist"
 msgstr "Список воспроизведения"
 
-#: ../src/totem-playlist.c:1857
+#: ../src/totem-playlist.c:1862
 #, c-format
 msgid "The playlist '%s' could not be parsed. It might be damaged."
-msgstr "Не удалось разобрать список воспроизведения «%s». Возможно, список повреждён."
+msgstr ""
+"Не удалось разобрать список воспроизведения «%s». Возможно, список повреждён."
 
-#: ../src/totem-playlist.c:1858
+#: ../src/totem-playlist.c:1863
 msgid "Playlist error"
 msgstr "Ошибка списка воспроизведения"
 
-#: ../src/totem-preferences.c:295
+#: ../src/totem-preferences.c:297
 msgid "Preferences"
 msgstr "Параметры"
 
-#: ../src/totem-preferences.c:451
+#: ../src/totem-preferences.c:445
 msgid "Select Subtitle Font"
 msgstr "Выбрать шрифт субтитров"
 
-#: ../src/totem-properties-main.c:115
-#: ../src/totem-properties-view.c:266
+#: ../src/totem-properties-main.c:116 ../src/totem-properties-view.c:269
 msgid "Audio/Video"
 msgstr "Аудио/Видео"
 
-#: ../src/totem-properties-view.c:128
+#: ../src/totem-properties-view.c:131
 msgid "N/A"
 msgstr "Н/Д"
 
-#: ../src/totem-properties-view.c:157
+#: ../src/totem-properties-view.c:160
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 msgctxt "Stream bit rate"
 msgid "N/A"
 msgstr "Н/Д"
 
-#: ../src/totem-properties-view.c:160
+#: ../src/totem-properties-view.c:163
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 #, c-format
 msgid "%d kbps"
 msgstr "%d кбит/сек"
 
-#: ../src/totem-properties-view.c:177
+#: ../src/totem-properties-view.c:180
 #: ../src/plugins/properties/totem-movie-properties.c:149
 #, c-format
 msgid "%d x %d"
 msgstr "%d × %d"
 
-#: ../src/totem-properties-view.c:209
+#: ../src/totem-properties-view.c:212
 #: ../src/plugins/properties/totem-movie-properties.c:166
 #, c-format
 msgid "%d Hz"
 msgstr "%d Гц"
 
-#: ../src/totem-properties-view.c:216
+#: ../src/totem-properties-view.c:219
 #: ../src/plugins/properties/totem-movie-properties.c:166
 msgctxt "Sample rate"
 msgid "N/A"
 msgstr "Н/Д"
 
-#: ../src/totem-properties-view.c:224
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5589
-msgid "Surround"
-msgstr "Объёмный"
-
-#: ../src/totem-properties-view.c:226
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5591
-msgid "Mono"
-msgstr "Моно"
-
-#: ../src/totem-properties-view.c:236
+#: ../src/totem-properties-view.c:239
 msgctxt "Number of audio channels"
 msgid "N/A"
 msgstr "Н/Д"
@@ -1512,15 +1575,13 @@
 msgstr "%s (поток)"
 
 #. Elapsed / Total Length
-#: ../src/totem-statusbar.c:140
-#: ../src/totem-time-label.c:64
+#: ../src/totem-statusbar.c:140 ../src/totem-time-label.c:64
 #, c-format
 msgid "%s / %s"
 msgstr "%s / %s"
 
 #. Seeking to Time / Total Length
-#: ../src/totem-statusbar.c:143
-#: ../src/totem-time-label.c:67
+#: ../src/totem-statusbar.c:143 ../src/totem-time-label.c:67
 #, c-format
 msgid "Seek to %s / %s"
 msgstr "Перейти к %s / %s"
@@ -1532,8 +1593,8 @@
 #. eg: 75 %
 #: ../src/totem-statusbar.c:250
 #, c-format
-msgid "%d %%"
-msgstr "%d %%"
+msgid "%lf %%"
+msgstr "%lf %%"
 
 #. eg: Paused, 0:32 / 1:05
 #: ../src/totem-statusbar.c:325
@@ -1544,17 +1605,16 @@
 #. eg: Buffering, 75 %
 #: ../src/totem-statusbar.c:330
 #, c-format
-msgid "%s, %d %%"
-msgstr "%s, %d %%"
+#| msgid "%s, %d %%"
+msgid "%s, %f %%"
+msgstr "%s, %f %%"
 
 #: ../src/totem-subtitle-encoding.c:156
 msgid "Current Locale"
 msgstr "Текущая локаль"
 
-#: ../src/totem-subtitle-encoding.c:159
-#: ../src/totem-subtitle-encoding.c:161
-#: ../src/totem-subtitle-encoding.c:163
-#: ../src/totem-subtitle-encoding.c:165
+#: ../src/totem-subtitle-encoding.c:159 ../src/totem-subtitle-encoding.c:161
+#: ../src/totem-subtitle-encoding.c:163 ../src/totem-subtitle-encoding.c:165
 msgid "Arabic"
 msgstr "Арабская"
 
@@ -1562,8 +1622,7 @@
 msgid "Armenian"
 msgstr "Армянская"
 
-#: ../src/totem-subtitle-encoding.c:171
-#: ../src/totem-subtitle-encoding.c:173
+#: ../src/totem-subtitle-encoding.c:171 ../src/totem-subtitle-encoding.c:173
 #: ../src/totem-subtitle-encoding.c:175
 msgid "Baltic"
 msgstr "Балтийская"
@@ -1572,22 +1631,17 @@
 msgid "Celtic"
 msgstr "Кельтская"
 
-#: ../src/totem-subtitle-encoding.c:181
-#: ../src/totem-subtitle-encoding.c:183
-#: ../src/totem-subtitle-encoding.c:185
-#: ../src/totem-subtitle-encoding.c:187
+#: ../src/totem-subtitle-encoding.c:181 ../src/totem-subtitle-encoding.c:183
+#: ../src/totem-subtitle-encoding.c:185 ../src/totem-subtitle-encoding.c:187
 msgid "Central European"
 msgstr "Центрально-европейская"
 
-#: ../src/totem-subtitle-encoding.c:190
-#: ../src/totem-subtitle-encoding.c:192
-#: ../src/totem-subtitle-encoding.c:194
-#: ../src/totem-subtitle-encoding.c:196
+#: ../src/totem-subtitle-encoding.c:190 ../src/totem-subtitle-encoding.c:192
+#: ../src/totem-subtitle-encoding.c:194 ../src/totem-subtitle-encoding.c:196
 msgid "Chinese Simplified"
 msgstr "Китайская упрощённая"
 
-#: ../src/totem-subtitle-encoding.c:199
-#: ../src/totem-subtitle-encoding.c:201
+#: ../src/totem-subtitle-encoding.c:199 ../src/totem-subtitle-encoding.c:201
 #: ../src/totem-subtitle-encoding.c:203
 msgid "Chinese Traditional"
 msgstr "Китайская традиционная"
@@ -1596,12 +1650,9 @@
 msgid "Croatian"
 msgstr "Хорватская"
 
-#: ../src/totem-subtitle-encoding.c:209
-#: ../src/totem-subtitle-encoding.c:211
-#: ../src/totem-subtitle-encoding.c:213
-#: ../src/totem-subtitle-encoding.c:215
-#: ../src/totem-subtitle-encoding.c:217
-#: ../src/totem-subtitle-encoding.c:219
+#: ../src/totem-subtitle-encoding.c:209 ../src/totem-subtitle-encoding.c:211
+#: ../src/totem-subtitle-encoding.c:213 ../src/totem-subtitle-encoding.c:215
+#: ../src/totem-subtitle-encoding.c:217 ../src/totem-subtitle-encoding.c:219
 msgid "Cyrillic"
 msgstr "Кириллическая"
 
@@ -1609,8 +1660,7 @@
 msgid "Cyrillic/Russian"
 msgstr "Кириллическая (Россия)"
 
-#: ../src/totem-subtitle-encoding.c:225
-#: ../src/totem-subtitle-encoding.c:227
+#: ../src/totem-subtitle-encoding.c:225 ../src/totem-subtitle-encoding.c:227
 msgid "Cyrillic/Ukrainian"
 msgstr "Кириллическая (Украина)"
 
@@ -1618,8 +1668,7 @@
 msgid "Georgian"
 msgstr "Грузинская"
 
-#: ../src/totem-subtitle-encoding.c:233
-#: ../src/totem-subtitle-encoding.c:235
+#: ../src/totem-subtitle-encoding.c:233 ../src/totem-subtitle-encoding.c:235
 #: ../src/totem-subtitle-encoding.c:237
 msgid "Greek"
 msgstr "Греческая"
@@ -1632,10 +1681,8 @@
 msgid "Gurmukhi"
 msgstr "Пакистанская"
 
-#: ../src/totem-subtitle-encoding.c:246
-#: ../src/totem-subtitle-encoding.c:248
-#: ../src/totem-subtitle-encoding.c:250
-#: ../src/totem-subtitle-encoding.c:252
+#: ../src/totem-subtitle-encoding.c:246 ../src/totem-subtitle-encoding.c:248
+#: ../src/totem-subtitle-encoding.c:250 ../src/totem-subtitle-encoding.c:252
 msgid "Hebrew"
 msgstr "Иврит"
 
@@ -1651,16 +1698,13 @@
 msgid "Icelandic"
 msgstr "Исландская"
 
-#: ../src/totem-subtitle-encoding.c:264
-#: ../src/totem-subtitle-encoding.c:266
+#: ../src/totem-subtitle-encoding.c:264 ../src/totem-subtitle-encoding.c:266
 #: ../src/totem-subtitle-encoding.c:268
 msgid "Japanese"
 msgstr "Японская"
 
-#: ../src/totem-subtitle-encoding.c:271
-#: ../src/totem-subtitle-encoding.c:273
-#: ../src/totem-subtitle-encoding.c:275
-#: ../src/totem-subtitle-encoding.c:277
+#: ../src/totem-subtitle-encoding.c:271 ../src/totem-subtitle-encoding.c:273
+#: ../src/totem-subtitle-encoding.c:275 ../src/totem-subtitle-encoding.c:277
 msgid "Korean"
 msgstr "Корейская"
 
@@ -1672,8 +1716,7 @@
 msgid "Persian"
 msgstr "Персидская"
 
-#: ../src/totem-subtitle-encoding.c:286
-#: ../src/totem-subtitle-encoding.c:288
+#: ../src/totem-subtitle-encoding.c:286 ../src/totem-subtitle-encoding.c:288
 msgid "Romanian"
 msgstr "Румынская"
 
@@ -1685,221 +1728,115 @@
 msgid "Thai"
 msgstr "Тайская"
 
-#: ../src/totem-subtitle-encoding.c:297
-#: ../src/totem-subtitle-encoding.c:299
-#: ../src/totem-subtitle-encoding.c:301
-#: ../src/totem-subtitle-encoding.c:303
+#: ../src/totem-subtitle-encoding.c:297 ../src/totem-subtitle-encoding.c:299
+#: ../src/totem-subtitle-encoding.c:301 ../src/totem-subtitle-encoding.c:303
 msgid "Turkish"
 msgstr "Турецкая"
 
-#: ../src/totem-subtitle-encoding.c:306
-#: ../src/totem-subtitle-encoding.c:308
-#: ../src/totem-subtitle-encoding.c:310
-#: ../src/totem-subtitle-encoding.c:312
+#: ../src/totem-subtitle-encoding.c:306 ../src/totem-subtitle-encoding.c:308
+#: ../src/totem-subtitle-encoding.c:310 ../src/totem-subtitle-encoding.c:312
 #: ../src/totem-subtitle-encoding.c:314
 msgid "Unicode"
 msgstr "Юникод"
 
-#: ../src/totem-subtitle-encoding.c:317
-#: ../src/totem-subtitle-encoding.c:319
-#: ../src/totem-subtitle-encoding.c:321
-#: ../src/totem-subtitle-encoding.c:323
+#: ../src/totem-subtitle-encoding.c:317 ../src/totem-subtitle-encoding.c:319
+#: ../src/totem-subtitle-encoding.c:321 ../src/totem-subtitle-encoding.c:323
 #: ../src/totem-subtitle-encoding.c:325
 msgid "Western"
 msgstr "Западная"
 
-#: ../src/totem-subtitle-encoding.c:328
-#: ../src/totem-subtitle-encoding.c:330
+#: ../src/totem-subtitle-encoding.c:328 ../src/totem-subtitle-encoding.c:330
 #: ../src/totem-subtitle-encoding.c:332
 msgid "Vietnamese"
 msgstr "Вьетнамская"
 
-#: ../src/totem-video-list.c:330
-msgid "No video URI"
-msgstr "Отсутствует URI видео"
-
-#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
-#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
-#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
-#: ../src/totem-video-thumbnailer.c:872
-#, c-format
-msgid ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-msgstr ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-
-#: ../src/totem-video-thumbnailer.c:873
-msgid "Filename"
-msgstr "Файл"
-
-#: ../src/totem-video-thumbnailer.c:875
-msgid "Resolution"
-msgstr "Разрешение"
-
-#: ../src/totem-video-thumbnailer.c:878
-msgid "Duration"
-msgstr "Продолжительность"
-
-#: ../src/totem-uri.c:506
-#: ../src/plugins/chapters/totem-chapters.c:998
+#: ../src/totem-uri.c:343 ../src/plugins/chapters/totem-chapters.c:998
 msgid "All files"
 msgstr "Все файлы"
 
-#: ../src/totem-uri.c:511
-#: ../src/plugins/chapters/totem-chapters.c:995
+#: ../src/totem-uri.c:348 ../src/plugins/chapters/totem-chapters.c:995
 msgid "Supported files"
 msgstr "Поддерживаемые файлы"
 
-#: ../src/totem-uri.c:523
+#: ../src/totem-uri.c:360
 msgid "Audio files"
 msgstr "Звуковые файлы"
 
-#: ../src/totem-uri.c:531
+#: ../src/totem-uri.c:368
 msgid "Video files"
 msgstr "Видеофайлы"
 
-#: ../src/totem-uri.c:541
+#: ../src/totem-uri.c:378
 msgid "Subtitle files"
 msgstr "Файлы субтитров"
 
-#: ../src/totem-uri.c:593
+#: ../src/totem-uri.c:430
 msgid "Select Text Subtitles"
 msgstr "Выбрать текстовые субтитры"
 
-#: ../src/totem-uri.c:656
+#: ../src/totem-uri.c:495
 msgid "Select Movies or Playlists"
 msgstr "Выбор фильмов или списков воспроизведения"
 
-#. Options parsing
-#: ../src/totem.c:201
-msgid "- Play movies and songs"
-msgstr "— воспроизведение фильмов и музыки"
+#: ../src/totem-uri.c:499
+msgid "Add Directory"
+msgstr "Добавить каталог"
+
+#: ../src/totem-video-list.c:330
+msgid "No video URI"
+msgstr "Отсутствует URI видео"
 
-#: ../src/totem.c:212
+#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
+#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
+#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
+#: ../src/totem-video-thumbnailer.c:841
 #, c-format
 msgid ""
-"%s\n"
-"Run '%s --help' to see a full list of available command line options.\n"
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 msgstr ""
-"%s\n"
-"Запустите '%s --help' чтобы увидеть полный список доступных команд.\n"
-
-#: ../src/totem.c:254
-#: ../src/totem.c:265
-#: ../browser-plugin/totem-plugin-viewer.c:663
-#: ../browser-plugin/totem-plugin-viewer.c:1793
-msgid "Totem Movie Player"
-msgstr "Видеопроигрыватель Totem"
-
-#: ../src/totem.c:255
-#: ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Could not initialize the thread-safe libraries."
-msgstr "Не удалось инициализировать библиотеки с поддержкой потоков."
-
-#: ../src/totem.c:255
-msgid "Verify your system installation. Totem will now exit."
-msgstr "Проверьте, правильно ли установлена ваша система. Totem завершает свою работу."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:1589
-msgid "Password requested for RTSP server"
-msgstr "Требуется пароль для сервера RTSP"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2858
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2862
-#, c-format
-msgid "Audio Track #%d"
-msgstr "Дорожка аудио #%d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2890
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2894
-#, c-format
-msgid "Subtitle #%d"
-msgstr "Субтитры #%d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3298
-msgid "The requested audio output was not found. Please select another audio output in the Multimedia Systems Selector."
-msgstr "Выбранная система вывода звука не найдена. Пожалуйста, выберите другую систему вывода звука в настройках рабочей среды."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3303
-msgid "Location not found."
-msgstr "Адрес не найден."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3307
-msgid "Could not open location; you might not have permission to open the file."
-msgstr "Не удалось открыть адрес; возможно, у вас нет прав на доступ к файлу."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3318
-msgid "The video output is in use by another application. Please close other video applications, or select another video output in the Multimedia Systems Selector."
-msgstr "Система вывода видео используется другим приложением. Закройте другие видео-приложения или выберите другой способ вывода видео в параметрах рабочей среды."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3324
-msgid "The audio output is in use by another application. Please select another audio output in the Multimedia Systems Selector. You may want to consider using a sound server."
-msgstr "Система вывода звука используется другим приложением. Выберите другую систему вывода звука в параметрах рабочей среды. Возможно, вам стоит использовать сервер звука."
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 
-#. should be exactly one missing thing (source or converter)
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3342
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3348
-#, c-format
-msgid "The playback of this movie requires a %s plugin which is not installed."
-msgid_plural ""
-"The playback of this movie requires the following decoders which are not installed:\n"
-"\n"
-"%s"
-msgstr[0] "Для воспроизведения этого фильма требуется модуль %s, который не установлен."
-msgstr[1] ""
-"Для воспроизведения этого фильма требуются следующие декодеры, которые не установлены:\n"
-"\n"
-"%s"
-msgstr[2] "Для воспроизведения этого фильма требуется модуль (%s), который не установлен."
+#: ../src/totem-video-thumbnailer.c:842
+msgid "Filename"
+msgstr "Файл"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3374
-msgid "Cannot play this file over the network. Try downloading it to disk first."
-msgstr "Не удалось воспроизвести этот файл по сети. Попробуйте сначала загрузить его на локальный диск."
+#: ../src/totem-video-thumbnailer.c:844
+msgid "Resolution"
+msgstr "Разрешение"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5878
-msgid "Media contains no supported video streams."
-msgstr "На носителе не найдено поддерживаемых потоков видео."
+#: ../src/totem-video-thumbnailer.c:847
+msgid "Duration"
+msgstr "Продолжительность"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6052
-msgid "Failed to create a GStreamer play object. Please check your GStreamer installation."
-msgstr "Не удалось создать объект воспроизведения GStreamer. Проверьте, правильно ли установлен GStreamer."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6172
-msgid "Failed to open audio output. You may not have permission to open the sound device, or the sound server may not be running. Please select another audio output in the Multimedia Systems Selector."
-msgstr "Не удалось открыть систему вывода звука. Возможно, у вас нет прав для доступа к звуковому устройству, или не запущен сервер звука. Выберите другую систему вывода звука в параметрах рабочей среды."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6192
-msgid "Could not find the audio output. You may need to install additional GStreamer plugins, or select another audio output in the Multimedia Systems Selector."
-msgstr "Не удалось найти систему вывода звука. Возможно, вам следует установить дополнительные модули GStreamer или выбрать другую систему вывода звука в параметрах рабочей среды."
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:1
+msgid "Apple Trailers"
+msgstr "Apple Trailers"
+
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:2
+msgid "Sets the user agent for the Apple Trailers site"
+msgstr "Устанавливает user agent для сайта Apple Trailers"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:1
+#| msgid "Download Movie Subtitles"
+msgid "Autoload Subtitles"
+msgstr "Автоматическая загрузка субтитров"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:2
+#| msgid "Downloading the subtitles…"
+msgid "Autoloads text subtitles"
+msgstr "Автоматическая загрузка текстовых субтитров"
 
-#. hour:minutes:seconds
-#. Translators: This is a time format, like "9:05:02" for 9
-#. * hours, 5 minutes, and 2 seconds. You may change ":" to
-#. * the separator that your locale uses or use "%Id" instead
-#. * of "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:83
-#: ../src/plugins/skipto/totem-time-entry.c:57
-#, c-format
-msgctxt "long time format"
-msgid "%d:%02d:%02d"
-msgstr "%d:%02d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
+msgid "Video Disc Recorder"
+msgstr "Запись видеодисков"
 
-#. minutes:seconds
-#. Translators: This is a time format, like "5:02" for 5
-#. * minutes and 2 seconds. You may change ":" to the
-#. * separator that your locale uses or use "%Id" instead of
-#. * "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:92
-#, c-format
-msgctxt "short time format"
-msgid "%d:%02d"
-msgstr "%d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
+msgid "Records (S)VCDs or video DVDs"
+msgstr "Записывает (S)VCD или видео DVD"
 
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:65
 msgid "_Create Video Disc..."
@@ -1925,38 +1862,21 @@
 msgid "Copy the currently playing (S)VCD"
 msgstr "Копировать (S)VCD, проигрываемый в данный момент"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:129
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:136
 msgid "The video disc could not be duplicated."
 msgstr "Не удалось скопировать видеодиск."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:131
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:276
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:138
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:283
 msgid "The movie could not be recorded."
 msgstr "Не удалось записать фильм."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:157
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:167
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:263
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:164
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:174
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:270
 msgid "Unable to write a project."
 msgstr "Не удалось записать проект."
 
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
-msgid "Video Disc Recorder"
-msgstr "Запись видеодисков"
-
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
-msgid "Records (S)VCDs or video DVDs"
-msgstr "Записывает (S)VCD или видео DVD"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:1
-#: ../src/plugins/chapters/totem-chapters.c:1139
-msgid "Chapters"
-msgstr "Фрагменты"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:2
-msgid "Support chapter markers in movies."
-msgstr "Поддержка указателей фрагментов в фильмах."
-
 #: ../src/plugins/chapters/chapters-edit.ui.h:1
 msgid "Name for new chapter:"
 msgstr "Название нового фрагмента:"
@@ -2013,6 +1933,16 @@
 msgid "Create a new chapter list for the movie"
 msgstr "Создать новый список фрагментов для фильма"
 
+#: ../src/plugins/chapters/chapters.plugin.in.h:1
+#: ../src/plugins/chapters/totem-chapters.c:1139
+msgid "Chapters"
+msgstr "Фрагменты"
+
+#: ../src/plugins/chapters/chapters.plugin.in.h:2
+#| msgid "Support chapter markers in movies."
+msgid "Support chapter markers in movies"
+msgstr "Поддержка указателей фрагментов в фильмах"
+
 #: ../src/plugins/chapters/totem-chapters.c:56
 #, c-format
 msgid ""
@@ -2043,7 +1973,8 @@
 msgstr "Во время сохранения фрагментов произошла ошибка."
 
 #: ../src/plugins/chapters/totem-chapters.c:843
-msgid "Please check you have permission to write to the folder containing the movie."
+msgid ""
+"Please check you have permission to write to the folder containing the movie."
 msgstr "Проверьте, достаточно ли у вас прав для записи в папку с фильмом."
 
 #: ../src/plugins/chapters/totem-chapters.c:976
@@ -2074,14 +2005,14 @@
 
 #: ../src/plugins/chapters/totem-chapters.c:1194
 msgid "If you don't save, changes to the chapter list will be lost."
-msgstr "Если не сохранить изменения в списке фрагментов, изменения будут утеряны."
+msgstr ""
+"Если не сохранить изменения в списке фрагментов, изменения будут утеряны."
 
 #: ../src/plugins/chapters/totem-cmml-parser.c:651
 msgid "Failed to parse CMML file"
 msgstr "Сбой при разборе файла CMML"
 
 #: ../src/plugins/chapters/totem-edit-chapter.c:95
-#| msgid "Add Chapter..."
 msgid "Add Chapter"
 msgstr "Добавить фрагмент"
 
@@ -2090,8 +2021,12 @@
 msgstr "Служба D-Bus"
 
 #: ../src/plugins/dbusservice/dbusservice.plugin.in.h:2
-msgid "Plugin for sending notifications of currently playing movies to the D-Bus subsystem."
-msgstr "Модуль для отправки уведомлений о проигрываемых в текущий момент фильмах через службу D-Bus."
+msgid ""
+"Plugin for sending notifications of currently playing movies to the D-Bus "
+"subsystem."
+msgstr ""
+"Модуль для отправки уведомлений о проигрываемых в текущий момент фильмах "
+"через службу D-Bus."
 
 #: ../src/plugins/dbusservice/dbusservice.py:213
 #: ../src/plugins/dbusservice/dbusservice.py:243
@@ -2114,13 +2049,38 @@
 msgid "The URI ‘%s’ is not supported."
 msgstr "URI «%s» не поддерживается."
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
-msgid "Instant Messenger status"
-msgstr "Состояние в программе обмена мгновенными сообщениями"
+#: ../src/plugins/grilo/grilo.plugin.in.h:1
+msgid "Grilo Browser"
+msgstr "Браузер Grilo"
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
-msgid "Set your Instant Messenger status to away when a movie is playing"
-msgstr "Устанавливает статус «отошёл» в программе обмена мгновенными сообщениями во время просмотра фильма"
+#: ../src/plugins/grilo/grilo.plugin.in.h:2
+#| msgid "A plugin to let you browse media content from various sources."
+msgid "A plugin to let you browse media content from various sources"
+msgstr "Модуль, позволяющий просматривать медиаконтент из различных источников"
+
+#: ../src/plugins/grilo/grilo.ui.h:1
+msgid "Add to Playlist"
+msgstr "Добавить в список воспроизведения"
+
+#: ../src/plugins/grilo/grilo.ui.h:2
+msgid "Copy Location"
+msgstr "Копировать адрес"
+
+#: ../src/plugins/grilo/grilo.ui.h:3 ../src/plugins/grilo/totem-grilo.c:1184
+msgid "Browse"
+msgstr "Обзор"
+
+#: ../src/plugins/grilo/grilo.ui.h:4 ../src/plugins/grilo/totem-grilo.c:1227
+msgid "Search"
+msgstr "Поиск"
+
+#: ../src/plugins/grilo/totem-grilo.c:454
+msgid "Browse Error"
+msgstr "Ошибка обзора"
+
+#: ../src/plugins/grilo/totem-grilo.c:609
+msgid "Search Error"
+msgstr "Ошибка поиска"
 
 #: ../src/plugins/gromit/gromit.plugin.in.h:1
 msgid "Gromit Annotations"
@@ -2134,49 +2094,16 @@
 msgid "The gromit binary was not found."
 msgstr "Не удалось найти исполняемый файл gromit."
 
-#. Add the interface to Totem's sidebar
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:1
-#: ../src/plugins/iplayer/iplayer.py:46
-msgid "BBC iPlayer"
-msgstr "BBC iPlayer"
-
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:2
-msgid "Stream BBC programs from the last 7 days from the BBC iPlayer service."
-msgstr "Позволяет просматривать программы BBC за последние 7 дней через сервис BBC iPlayer."
-
-#: ../src/plugins/iplayer/iplayer.py:72
-msgid "Error listing channel categories"
-msgstr "Ошибка построения списка категорий каналов"
-
-#: ../src/plugins/iplayer/iplayer.py:73
-msgid "There was an unknown error getting the list of television channels available on BBC iPlayer."
-msgstr "Не удалось получить список телевизионных каналов с BBC iPlayer."
-
-#. Append a dummy child row so that the expander's visible; we can
-#. then queue off the expander to load the programme listing for this
-#. category
-#: ../src/plugins/iplayer/iplayer.py:84
-msgid "Loading…"
-msgstr "Загрузка…"
-
-#. Translators: the "programme feed" is the list of TV shows
-#. available to watch online
-#: ../src/plugins/iplayer/iplayer.py:136
-msgid "Error getting programme feed"
-msgstr "Ошибка получения списка программ"
-
-#: ../src/plugins/iplayer/iplayer.py:137
-msgid "There was an error getting the list of programmes for this channel and category combination."
-msgstr "Ошибка получения списка программ для этой комбинации канала и категории."
-
-#: ../src/plugins/iplayer/iplayer2.py:298
-msgid ""
-msgstr "<причина не указана>"
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
+#| msgid "Instant Messenger status"
+msgid "Instant Messenger Status"
+msgstr "Состояние в программе обмена мгновенными сообщениями"
 
-#: ../src/plugins/iplayer/iplayer2.py:299
-#, python-format
-msgid "Programme unavailable (\"%s\")"
-msgstr "Программа недоступна («%s»)"
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
+msgid "Set your Instant Messenger status to away when a movie is playing"
+msgstr ""
+"Устанавливает статус «отошёл» в программе обмена мгновенными сообщениями во "
+"время просмотра фильма"
 
 #: ../src/plugins/lirc/lirc.plugin.in.h:1
 msgid "Infrared Remote Control"
@@ -2194,25 +2121,32 @@
 msgid "Couldn't read lirc configuration."
 msgstr "Не удалось прочитать конфигурацию lirc."
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
-msgid "Download Movie Subtitles"
-msgstr "Загрузка субтитров к фильму"
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:1
+#| msgid "Movie Player"
+msgid "Media Player Keys"
+msgstr "Клавиши медиапроигрывателя"
+
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:2
+msgid "Support additional media player keys"
+msgstr "Поддержка дополнительных клавиш медиапроигрывателя"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
-msgid "Subtitle _language:"
-msgstr "_Язык субтитров"
+#: ../src/plugins/ontop/ontop.plugin.in.h:1
+msgid "Always On Top"
+msgstr "Всегда поверх всех окон"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
-msgid "_Play with Subtitle"
-msgstr "_Воспроизвести с субтитрами"
+#: ../src/plugins/ontop/ontop.plugin.in.h:2
+msgid "Keep the main window on top when playing a movie"
+msgstr ""
+"Удерживает главное окно поверх других окон во время воспроизведения фильма"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:1
 msgid "Subtitle Downloader"
 msgstr "Загрузка субтитров"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:2
-msgid "Look for subtitles for the currently playing movie."
-msgstr "Поиск субтитров для проигрываемого в данный момент фильма."
+#| msgid "Look for subtitles for the currently playing movie."
+msgid "Look for subtitles for the currently playing movie"
+msgstr "Поиск субтитров для воспроизводимого в данный момент фильма"
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:42
 msgid "Brazilian Portuguese"
@@ -2268,6 +2202,18 @@
 msgid "Searching subtitles…"
 msgstr "Поиск субтитров…"
 
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
+msgid "Download Movie Subtitles"
+msgstr "Загрузка субтитров к фильму"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
+msgid "Subtitle _language:"
+msgstr "_Язык субтитров"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
+msgid "_Play with Subtitle"
+msgstr "_Воспроизвести с субтитрами"
+
 #: ../src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in.h:1
 msgid "Subtitle language"
 msgstr "Язык субтитров"
@@ -2276,91 +2222,119 @@
 msgid "The language to search for subtitles for movies in."
 msgstr "Язык для поиска субтитров для фильмов."
 
-#: ../src/plugins/ontop/ontop.plugin.in.h:1
-msgid "Always On Top"
-msgstr "Всегда поверх всех окон"
-
-#: ../src/plugins/ontop/ontop.plugin.in.h:2
-msgid "Keep the main window on top when playing a movie"
-msgstr "Удерживает главное окно поверх других окон во время воспроизведения фильма"
+#: ../src/plugins/properties/movie-properties.plugin.in.h:1
+#| msgid "Properties"
+msgid "Movie Properties"
+msgstr "Свойства фильма"
+
+#: ../src/plugins/properties/movie-properties.plugin.in.h:2
+#| msgid "Show or hide the sidebar"
+msgid "Adds movie properties to the sidebar"
+msgstr "Добавляет свойства фильма в боковую панель"
 
 #: ../src/plugins/properties/totem-movie-properties.c:246
 msgid "Properties"
 msgstr "Свойства"
 
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:1
-msgid "Publisher protocol to use"
-msgstr "Протокол сервера публикаций"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:2
-msgid "The transport protocol to use when publishing playlists over the network."
-msgstr "Транспортный протокол для публикации списков воспроизведений через сеть."
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:3
-msgid "Format for network service name"
-msgstr "Формат имени сетевой службы"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:5
-#, no-c-format
-msgid "A format string used to build the network service name used when publishing playlists over the network. The following format placeholders can be used: • %a: the program name as returned by g_get_application_name() • %h: the machine's host name in title case • %u: the user's login name in title case • %U: the user's real name • %%: the percent sign"
-msgstr "Формат строки, используемый при построении названия сетевой службы при публикации списков воспроизведения через сеть. Можно использовать следующие заполнители: • %a: название программы, возвращаемое функцией g_get_application_name() • %h: название узла машины заглавными буквами • %u: имя пользователя заглавными буквами • %U: настоящее имя пользователя • %%: знак процента"
-
-#. Translators: computers on the local network which are publishing their playlists over the network
-#: ../src/plugins/publish/totem-publish.c:552
-msgid "Neighbors"
-msgstr "Окружение"
-
-#: ../src/plugins/publish/publish.plugin.in.h:1
-msgid "Publish Playlist"
-msgstr "Опубликовать список воспроизведения"
-
-#: ../src/plugins/publish/publish.plugin.in.h:2
-msgid "Share the current playlist via HTTP"
-msgstr "Обеспечивает общий доступ к текущему списку воспроизведения через HTTP"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:1
-msgid "Service _Name:"
-msgstr "_Имя сервиса"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:3
-#, no-c-format
-msgid ""
-"The name used for announcing the playlist service on the network.\n"
-"All occurrences of the string %u will be replaced by your name,\n"
-"and %h will be replaced by your computer's host name."
-msgstr ""
-"Имя, используемое для представления списка воспроизведения в сети.\n"
-"Все вхождения строки %u будут заменены вашим именем,\n"
-"и %h будет заменено именем вашего компьютера в сети."
-
-#: ../src/plugins/publish/publish-plugin.ui.h:6
-msgid "Use _encrypted transport protocol (HTTPS)"
-msgstr "Использовать _защищённый транспортный протокол (https)"
-
 #: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:1
 msgid "rpdb2 password"
 msgstr "Пароль rpdb2"
 
 #: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:2
-msgid "A password to protect the rpdb2 server for debugging Totem from unauthorized remote access. If this is empty, a default of 'totem' will be used."
-msgstr "Пароль для защиты сервера rpdb2 для отладки Totem от неавторизованного удалённого доступа. Если пароль пуст, будет использоваться пароль по умолчанию — «totem»."
+msgid ""
+"A password to protect the rpdb2 server for debugging Totem from unauthorized "
+"remote access. If this is empty, a default of 'totem' will be used."
+msgstr ""
+"Пароль для защиты сервера rpdb2 для отладки Totem от неавторизованного "
+"удалённого доступа. Если пароль пуст, будет использоваться пароль по "
+"умолчанию — «totem»."
+
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
+msgid "Python Console"
+msgstr "Консоль Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
+#| msgid "Interactive Python console."
+msgid "Interactive Python console"
+msgstr "Интерактивная консоль Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:88
+msgid "Python Console Menu"
+msgstr "Меню консоли Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:93
+msgid "_Python Console"
+msgstr "_Консоль Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:94
+msgid "Show Totem's Python console"
+msgstr "Показать консоль Python видеопроигрывателя Totem"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:100
+msgid "Python Debugger"
+msgstr "Отладчик Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:101
+msgid "Enable remote Python debugging with rpdb2"
+msgstr "Включить удалённую отладку Python с помощью rpdb2"
+
+#. pylint: disable-msg=E1101
+#: ../src/plugins/pythonconsole/pythonconsole.py:125
+#, python-format
+msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
+msgstr ""
+"Получить доступ к объекту Totem.Object можно через «totem_object» :\\n%s"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:129
+msgid "Totem Python Console"
+msgstr "Консоль Python видеопроигрывателя Totem"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:139
+msgid ""
+"After you press OK, Totem will wait until you connect to it with winpdb or "
+"rpdb2. If you have not set a debugger password in DConf, it will use the "
+"default password ('totem')."
+msgstr ""
+"После нажатия кнопки «OK» видеопроигрыватель будет ожидать соединения с "
+"winpdb или rpdb2. Если в DConf не указан пароль отладчика, то будет "
+"использован пароль по умолчанию («totem»)."
+
+#: ../src/plugins/recent/recent.plugin.in.h:1
+#| msgid "Video files"
+msgid "Recent files"
+msgstr "Недавние файлы"
+
+#: ../src/plugins/recent/recent.plugin.in.h:2
+msgid "Adds files that have been played to recent files"
+msgstr "Добавляет файлы в список недавних"
 
 #: ../src/plugins/rotation/rotation.plugin.in.h:1
 msgid "Rotation Plugin"
 msgstr "Модуль вращения"
 
 #: ../src/plugins/rotation/rotation.plugin.in.h:2
-msgid "Allows videos to be rotated if they're in the wrong orientation."
-msgstr "Позволяет поворачивать видео, если его положение неверно."
+#| msgid "Allows videos to be rotated if they're in the wrong orientation."
+msgid "Allows videos to be rotated if they are in the wrong orientation"
+msgstr "Позволяет поворачивать видео, если его положение неверно"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:60
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:50
 msgid "_Rotate Clockwise"
 msgstr "По _часовой стрелке"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:62
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:52
 msgid "Rotate Counterc_lockwise"
 msgstr "_Против часовой стрелки"
 
+#: ../src/plugins/save-file/save-file.plugin.in.h:1
+#| msgid "Save a Copy"
+msgid "Save Copy"
+msgstr "Сохранить копию"
+
+#: ../src/plugins/save-file/save-file.plugin.in.h:2
+#| msgid "Copy the currently playing video DVD"
+msgid "Save a copy of the currently playing movie"
+msgstr "Сохранить копию, воспроизводимого в данный момент фильма"
+
 #: ../src/plugins/save-file/totem-save-file.c:63
 msgid "Save a Copy..."
 msgstr "Сохранить копию…"
@@ -2383,10 +2357,14 @@
 msgid "Movie stream"
 msgstr "Поток фильма"
 
-#: ../src/plugins/screensaver/totem-screensaver.c:116
-#: ../browser-plugin/totem-plugin-viewer.c:1891
-msgid "Playing a movie"
-msgstr "Воспроизведение фильма"
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:1
+msgid "Screen Saver"
+msgstr "Хранитель экрана"
+
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:2
+#| msgid "Disable screensaver when playing "
+msgid "Deactivates the screen saver when a movie is playing"
+msgstr "Выключить хранитель экрана при воспроизведении фильма"
 
 #: ../src/plugins/screenshot/gallery.ui.h:1
 msgid "Screenshot width (in pixels):"
@@ -2400,23 +2378,31 @@
 msgid "Number of screenshots:"
 msgstr "Количество кадров:"
 
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:1
-msgid "_Name:"
-msgstr "_Имя"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:2
-msgid "Save in _folder:"
-msgstr "Сохранить в _папке:"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:3
-msgid "Select a folder"
-msgstr "Укажите папку"
-
-#. Write the screenshot to the temporary file
-#: ../src/plugins/screenshot/gnome-screenshot-widget.c:385
-#: ../src/plugins/screenshot/totem-screenshot.c:64
-msgid "Screenshot.png"
-msgstr "Кадр.png"
+#. translators: this is the name of the file that gets made up
+#. * with the screenshot if the entire screen is taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:147
+#, c-format
+#| msgid "Screenshot.png"
+msgid "Screenshot from %s.png"
+msgstr "Кадр от %s.png"
+
+#. translators: this is the name of the file that gets
+#. * made up with the screenshot if the entire screen is
+#. * taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:154
+#, c-format
+#| msgid "Screenshot-%s-%d.png"
+msgid "Screenshot from %s - %d.png"
+msgstr "Кадр от %s-%d.png"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:1
+#| msgid "Screenshot.png"
+msgid "Screenshot"
+msgstr "Снимок экрана"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:2
+msgid "Allows screenshots and galleries to be taken of videos"
+msgstr "Позволяет делать снимки экранов"
 
 #: ../src/plugins/screenshot/totem-gallery.c:91
 msgid "Save Gallery"
@@ -2442,49 +2428,48 @@
 msgid "Saving gallery as \"%s\""
 msgstr "Сохранение серии кадров в «%s»"
 
-#: ../src/plugins/screenshot/totem-screenshot.c:113
-msgid "There was an error saving the screenshot."
-msgstr "Произошла ошибка при сохранении кадра."
-
-#: ../src/plugins/screenshot/totem-screenshot.c:139
-msgid "Save Screenshot"
-msgstr "Сохранить кадр"
-
-#. Create the screenshot widget
-#. Translators: %s is the movie title and %d is an auto-incrementing number to make filename unique
-#: ../src/plugins/screenshot/totem-screenshot.c:160
-#, c-format
-msgid "Screenshot-%s-%d.png"
-msgstr "Кадр-%s-%d.png"
-
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:88
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:220
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "Totem could not get a screenshot of the video."
 msgstr "Не удалось получить кадр этого фильма."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "This is not supposed to happen; please file a bug report."
 msgstr "Этого не должно было случиться. Пожалуйста, отправьте отчёт об ошибке."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
-msgid "Take _Screenshot..."
-msgstr "Сохранить _кадр…"
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
+#| msgid "Take _Screenshot..."
+msgid "Take _Screenshot"
+msgstr "Сохранить _кадр"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
 msgid "Take a screenshot"
 msgstr "Сохранить кадр с экрана"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create Screenshot _Gallery..."
 msgstr "Создать серию _кадров…"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create a gallery of screenshots"
 msgstr "Создать серию кадров"
 
+#: ../src/plugins/skipto/skipto.plugin.in.h:1
+#: ../src/plugins/skipto/totem-skipto.c:196
+msgid "Skip To"
+msgstr "Перейти к"
+
+#: ../src/plugins/skipto/skipto.plugin.in.h:2
+msgid "Provides the \"Skip to\" dialog"
+msgstr "Предоставляет диалоговое окно «Перейти к»"
+
+#: ../src/plugins/skipto/skipto.ui.h:1
+msgid "_Skip to:"
+msgstr "_Перейти к:"
+
 #. Update the "seconds" label so that it always has the correct singular/plural form
 #. Translators: label for the seconds selector in the "Skip to" dialogue
-#: ../src/plugins/skipto/totem-skipto.c:160
+#: ../src/plugins/skipto/totem-skipto.c:159
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "секунда"
@@ -2495,15 +2480,11 @@
 #. Translators: you should translate this string to a number (written in digits) which corresponds to the longer character length of the
 #. * translations for "second" and "seconds", as translated elsewhere in this file. For example, in English, "second" is 6 characters long and
 #. * "seconds" is 7 characters long, so this string should be translated to "7". See: bgo#639398
-#: ../src/plugins/skipto/totem-skipto.c:190
+#: ../src/plugins/skipto/totem-skipto.c:189
 msgctxt "Skip To label length"
 msgid "7"
 msgstr "7"
 
-#: ../src/plugins/skipto/totem-skipto.c:197
-msgid "Skip To"
-msgstr "Перейти к"
-
 #: ../src/plugins/skipto/totem-skipto-plugin.c:182
 msgid "_Skip To..."
 msgstr "_Перейти к…"
@@ -2512,115 +2493,311 @@
 msgid "Skip to a specific time"
 msgstr "Перейти к указанному времени"
 
-#: ../src/plugins/skipto/skipto.ui.h:1
-msgid "_Skip to:"
-msgstr "_Перейти к:"
+#~ msgid "Play movies and songs"
+#~ msgstr "Воспроизводит фильмы и песни"
 
-#: ../browser-plugin/totem-plugin-viewer.c:431
-msgid "No URI to play"
-msgstr "Отсутствует URI для воспроизведения"
+#~ msgid "Open a file"
+#~ msgstr "Открыть файл"
 
-#. translators: this is:
-#. * Open With ApplicationName
-#. * as in nautilus' right-click menu
-#: ../browser-plugin/totem-plugin-viewer.c:1107
-#, c-format
-msgid "_Open with \"%s\""
-msgstr "Открыть _с помощью «%s»"
+#~ msgid "Open a non-local file"
+#~ msgstr "Открыть файл на удалённой системе"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2136
-msgid "No playlist or playlist empty"
-msgstr "Нет списка воспроизведения или он пуст"
+#~ msgid "Quit the program"
+#~ msgstr "Выйти из программы"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2235
-msgid "Movie browser plugin"
-msgstr "Модуль браузера для фильмов"
+#~ msgid "Configure the application"
+#~ msgstr "Настройка приложения"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Verify your system installation. The Totem plugin will now exit."
-msgstr "Проверьте, правильно ли установлена ваша система. Модуль Totem завершает свою работу."
+#~ msgid "Switch to fullscreen"
+#~ msgstr "Переключиться в полноэкранный режим"
 
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
-msgid "Python Console"
-msgstr "Консоль Python"
+#~ msgid "Set the repeat mode"
+#~ msgstr "Установить режим повтора"
 
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
-msgid "Interactive Python console."
-msgstr "Интерактивная консоль Python."
+#~ msgid "Set the shuffle mode"
+#~ msgstr "Установить режим воспроизведения в случайном порядке"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:88
-msgid "Python Console Menu"
-msgstr "Меню консоли Python"
+#~ msgid "14.4 Kbps Modem"
+#~ msgstr "14.4 Кбит/c модем"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:93
-msgid "_Python Console"
-msgstr "_Консоль Python"
+#~ msgid "19.2 Kbps Modem"
+#~ msgstr "19.2 Кбит/c модем"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:94
-msgid "Show Totem's Python console"
-msgstr "Показать консоль Python видеопроигрывателя Totem"
+#~ msgid "28.8 Kbps Modem"
+#~ msgstr "28.8 Кбит/c модем"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:100
-msgid "Python Debugger"
-msgstr "Отладчик Python"
+#~ msgid "33.6 Kbps Modem"
+#~ msgstr "33.6 Кбит/c модем"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:101
-msgid "Enable remote Python debugging with rpdb2"
-msgstr "Включить удалённую отладку Python с помощью rpdb2"
+#~ msgid "34.4 Kbps Modem"
+#~ msgstr "34.4 Кбит/c модем"
 
-#. pylint: disable-msg=E1101
-#: ../src/plugins/pythonconsole/pythonconsole.py:125
-#, python-format
-msgid ""
-"You can access the Totem.Object through 'totem_object' :\\n"
-"%s"
-msgstr ""
-"Получить доступ к объекту Totem.Object можно через «totem_object» :\\n"
-"%s"
+#~ msgid "56 Kbps Modem/ISDN"
+#~ msgstr "56 Кбит/c модем/ISDN"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:129
-msgid "Totem Python Console"
-msgstr "Консоль Python видеопроигрывателя Totem"
+#~ msgid "112 Kbps Dual ISDN/DSL"
+#~ msgstr "112 Кбит/c ISDN/DSL"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:139
-msgid "After you press OK, Totem will wait until you connect to it with winpdb or rpdb2. If you have not set a debugger password in DConf, it will use the default password ('totem')."
-msgstr "После нажатия кнопки «OK» видеопроигрыватель будет ожидать соединения с winpdb или rpdb2. Если в DConf не указан пароль отладчика, то будет использован пароль по умолчанию («totem»)."
+#~ msgid "256 Kbps DSL/Cable"
+#~ msgstr "256 Кбит/c DSL/кабель"
 
-#: ../src/plugins/grilo/grilo.plugin.in.h:1
-msgid "Grilo Browser"
-msgstr "Браузер Grilo"
+#~ msgid "384 Kbps DSL/Cable"
+#~ msgstr "384 Кбит/c DSL/кабель"
 
-#: ../src/plugins/grilo/grilo.plugin.in.h:2
-msgid "A plugin to let you browse media content from various sources."
-msgstr "Модуль, позволяющий просматривать медиаконтент из разрилчных источников."
+#~ msgid "512 Kbps DSL/Cable"
+#~ msgstr "512 Кбит/c DSL/кабель"
 
-#: ../src/plugins/grilo/totem-grilo.c:452
-msgid "Browse Error"
-msgstr "Ошибка обзора"
+#~ msgid "1.5 Mbps T1/Intranet/LAN"
+#~ msgstr "1.5 Мбит/c T1/Внутренняя сеть/Локальная сеть"
 
-#: ../src/plugins/grilo/totem-grilo.c:599
-msgid "Search Error"
-msgstr "Ошибка поиска"
+#~ msgid "Intranet/LAN"
+#~ msgstr "Внутренняя сеть/Локальная сеть"
 
-#: ../src/plugins/grilo/totem-grilo.c:1219
-#: ../src/plugins/grilo/grilo.ui.h:3
-msgid "Browse"
-msgstr "Обзор"
+#~ msgid "Networking"
+#~ msgstr "Сеть"
 
-#: ../src/plugins/grilo/totem-grilo.c:1285
-#: ../src/plugins/grilo/grilo.ui.h:4
-msgid "Search"
-msgstr "Поиск"
+#~ msgid "Connection _speed:"
+#~ msgstr "_Скорость соединения:"
 
-#: ../src/plugins/grilo/grilo.ui.h:1
-#| msgid "_Add to Playlist"
-msgid "Add to Playlist"
-msgstr "Добавить в список воспроизведения"
+#~ msgid "Network connection speed"
+#~ msgstr "Скорость сетевого соединения"
 
-#: ../src/plugins/grilo/grilo.ui.h:2
-#| msgid "_Copy Location"
-msgid "Copy Location"
-msgstr "Копировать адрес"
+#~ msgid ""
+#~ "Approximate network connection speed, used to select quality on media "
+#~ "over the network."
+#~ msgstr ""
+#~ "Аппроксимировать скорость сетевого соединения для выбора качества данных "
+#~ "при передаче через сеть."
+
+#~ msgid "Play Image '%s'"
+#~ msgstr "Воспроизвести образ '%s'"
+
+#~ msgid "device%d"
+#~ msgstr "устройство%d"
+
+#~ msgid "Play Disc '%s'"
+#~ msgstr "Воспроизвести диск «%s»"
+
+#~ msgid "Movie Player using %s"
+#~ msgstr "Видеопроигрыватель использует %s"
+
+#~ msgid ""
+#~ "Totem could not play this media (%s) although a plugin is present to "
+#~ "handle it."
+#~ msgstr ""
+#~ "Не удалось воспроизвести этот носитель (%s), несмотря на то, что модуль "
+#~ "для его обработки установлен."
+
+#~ msgid ""
+#~ "You might want to check that a disc is present in the drive and that it "
+#~ "is correctly configured."
+#~ msgstr ""
+#~ "Убедитесь, что диск вставлен в устройство, а устройство правильно "
+#~ "настроено."
+
+#~ msgid "More information about media plugins"
+#~ msgstr "Подробнее о модулях носителей"
+
+#~ msgid ""
+#~ "Please install the necessary plugins and restart Totem to be able to play "
+#~ "this media."
+#~ msgstr ""
+#~ "Установите необходимые модули и перезапустите Totem, чтобы воспроизвести "
+#~ "этот носитель."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it does not have the "
+#~ "appropriate plugins to be able to read from the disc."
+#~ msgstr ""
+#~ "Не удалось воспроизвести этот носитель (%s), потому что нет модулей, "
+#~ "способных прочитать данные с него."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because you do not have the "
+#~ "appropriate plugins to handle it."
+#~ msgstr ""
+#~ "Не удалось воспроизвести этот носитель (%s), потому что нет "
+#~ "соответствующих модулей."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it is not supported."
+#~ msgstr ""
+#~ "Не удалось воспроизвести этот носитель (%s), потому что он не "
+#~ "поддерживается."
+
+#~ msgid "Please insert another disc to play back."
+#~ msgstr "Вставьте другой диск для проигрывания."
+
+#~ msgid "Totem does not support playback of Audio CDs"
+#~ msgstr "Totem не поддерживает воспроизведение звуковых компакт-дисков"
+
+#~ msgid ""
+#~ "Please consider using a music player or a CD extractor to play this CD"
+#~ msgstr ""
+#~ "Используйте проигрыватель музыки или специальную программу для переноса с "
+#~ "компакт-дисков"
+
+#~ msgid "%d %%"
+#~ msgstr "%d %%"
+
+#~ msgid ""
+#~ "The requested audio output was not found. Please select another audio "
+#~ "output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "Выбранная система вывода звука не найдена. Пожалуйста, выберите другую "
+#~ "систему вывода звука в настройках рабочей среды."
+
+#~ msgid "Location not found."
+#~ msgstr "Адрес не найден."
+
+#~ msgid ""
+#~ "Could not open location; you might not have permission to open the file."
+#~ msgstr ""
+#~ "Не удалось открыть адрес; возможно, у вас нет прав на доступ к файлу."
+
+#~ msgid ""
+#~ "The video output is in use by another application. Please close other "
+#~ "video applications, or select another video output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "Система вывода видео используется другим приложением. Закройте другие "
+#~ "видео-приложения или выберите другой способ вывода видео в параметрах "
+#~ "рабочей среды."
+
+#~ msgid ""
+#~ "The audio output is in use by another application. Please select another "
+#~ "audio output in the Multimedia Systems Selector. You may want to consider "
+#~ "using a sound server."
+#~ msgstr ""
+#~ "Система вывода звука используется другим приложением. Выберите другую "
+#~ "систему вывода звука в параметрах рабочей среды. Возможно, вам стоит "
+#~ "использовать сервер звука."
+
+#~ msgid ""
+#~ "Failed to create a GStreamer play object. Please check your GStreamer "
+#~ "installation."
+#~ msgstr ""
+#~ "Не удалось создать объект воспроизведения GStreamer. Проверьте, правильно "
+#~ "ли установлен GStreamer."
+
+#~ msgid ""
+#~ "Failed to open audio output. You may not have permission to open the "
+#~ "sound device, or the sound server may not be running. Please select "
+#~ "another audio output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "Не удалось открыть систему вывода звука. Возможно, у вас нет прав для "
+#~ "доступа к звуковому устройству, или не запущен сервер звука. Выберите "
+#~ "другую систему вывода звука в параметрах рабочей среды."
+
+#~ msgid ""
+#~ "Could not find the audio output. You may need to install additional "
+#~ "GStreamer plugins, or select another audio output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "Не удалось найти систему вывода звука. Возможно, вам следует установить "
+#~ "дополнительные модули GStreamer или выбрать другую систему вывода звука в "
+#~ "параметрах рабочей среды."
+
+#~ msgid "BBC iPlayer"
+#~ msgstr "BBC iPlayer"
+
+#~ msgid ""
+#~ "Stream BBC programs from the last 7 days from the BBC iPlayer service."
+#~ msgstr ""
+#~ "Позволяет просматривать программы BBC за последние 7 дней через сервис "
+#~ "BBC iPlayer."
+
+#~ msgid "Error listing channel categories"
+#~ msgstr "Ошибка построения списка категорий каналов"
+
+#~ msgid ""
+#~ "There was an unknown error getting the list of television channels "
+#~ "available on BBC iPlayer."
+#~ msgstr "Не удалось получить список телевизионных каналов с BBC iPlayer."
+
+#~ msgid "Loading…"
+#~ msgstr "Загрузка…"
+
+#~ msgid "Error getting programme feed"
+#~ msgstr "Ошибка получения списка программ"
+
+#~ msgid ""
+#~ "There was an error getting the list of programmes for this channel and "
+#~ "category combination."
+#~ msgstr ""
+#~ "Ошибка получения списка программ для этой комбинации канала и категории."
+
+#~ msgid ""
+#~ msgstr "<причина не указана>"
+
+#~ msgid "Programme unavailable (\"%s\")"
+#~ msgstr "Программа недоступна («%s»)"
+
+#~ msgid "Publisher protocol to use"
+#~ msgstr "Протокол сервера публикаций"
+
+#~ msgid ""
+#~ "The transport protocol to use when publishing playlists over the network."
+#~ msgstr ""
+#~ "Транспортный протокол для публикации списков воспроизведений через сеть."
+
+#~ msgid "Format for network service name"
+#~ msgstr "Формат имени сетевой службы"
+
+#~ msgid ""
+#~ "A format string used to build the network service name used when "
+#~ "publishing playlists over the network. The following format placeholders "
+#~ "can be used: • %a: the program name as returned by g_get_application_name"
+#~ "() • %h: the machine's host name in title case • %u: the user's login "
+#~ "name in title case • %U: the user's real name • %%: the percent sign"
+#~ msgstr ""
+#~ "Формат строки, используемый при построении названия сетевой службы при "
+#~ "публикации списков воспроизведения через сеть. Можно использовать "
+#~ "следующие заполнители: • %a: название программы, возвращаемое функцией "
+#~ "g_get_application_name() • %h: название узла машины заглавными буквами • "
+#~ "%u: имя пользователя заглавными буквами • %U: настоящее имя пользователя "
+#~ "• %%: знак процента"
+
+#~ msgid "Neighbors"
+#~ msgstr "Окружение"
+
+#~ msgid "Publish Playlist"
+#~ msgstr "Опубликовать список воспроизведения"
+
+#~ msgid "Share the current playlist via HTTP"
+#~ msgstr ""
+#~ "Обеспечивает общий доступ к текущему списку воспроизведения через HTTP"
+
+#~ msgid "Service _Name:"
+#~ msgstr "_Имя сервиса"
+
+#~ msgid ""
+#~ "The name used for announcing the playlist service on the network.\n"
+#~ "All occurrences of the string %u will be replaced by your name,\n"
+#~ "and %h will be replaced by your computer's host name."
+#~ msgstr ""
+#~ "Имя, используемое для представления списка воспроизведения в "
+#~ "сети.\n"
+#~ "Все вхождения строки %u будут заменены вашим именем,\n"
+#~ "и %h будет заменено именем вашего компьютера в сети."
+
+#~ msgid "Use _encrypted transport protocol (HTTPS)"
+#~ msgstr "Использовать _защищённый транспортный протокол (https)"
+
+#~ msgid "_Name:"
+#~ msgstr "_Имя"
+
+#~ msgid "Save in _folder:"
+#~ msgstr "Сохранить в _папке:"
+
+#~ msgid "Select a folder"
+#~ msgstr "Укажите папку"
+
+#~ msgid "There was an error saving the screenshot."
+#~ msgstr "Произошла ошибка при сохранении кадра."
+
+#~ msgid "Save Screenshot"
+#~ msgstr "Сохранить кадр"
 
 #~ msgid "Bemused"
 #~ msgstr "Bemused"
@@ -2649,9 +2826,6 @@
 #~ msgid "Search Results"
 #~ msgstr "Результаты поиска"
 
-#~ msgid "Videos"
-#~ msgstr "Видео"
-
 #~ msgid "_Open in Web Browser"
 #~ msgstr "_Открыть в веб-браузере"
 
diff -Nru totem-3.4.3/po/sl.po totem-3.6.2/po/sl.po
--- totem-3.4.3/po/sl.po	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/po/sl.po	2012-08-29 23:07:45.000000000 +0000
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: totem master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=totem&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-03-23 16:26+0000\n"
-"PO-Revision-Date: 2012-03-23 18:44+0100\n"
+"POT-Creation-Date: 2012-07-18 17:07+0000\n"
+"PO-Revision-Date: 2012-07-19 10:08+0100\n"
 "Last-Translator: Matej Urbančič \n"
 "Language-Team: Slovenian GNOME Translation Team \n"
 "Language: \n"
@@ -21,15 +21,212 @@
 "X-Poedit-Country: SLOVENIA\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
+#: ../browser-plugin/totem-plugin-viewer.c:352
+#: ../src/totem-object.c:1180
+#: ../src/totem-object.c:1650
+#: ../src/totem-statusbar.c:115
+msgid "Stopped"
+msgstr "Zaustavljeno"
+
+#: ../browser-plugin/totem-plugin-viewer.c:364
+#: ../src/totem-object.c:1173
+msgid "Paused"
+msgstr "V premoru"
+
+#: ../browser-plugin/totem-plugin-viewer.c:368
+#: ../src/totem-object.c:1166
+msgid "Playing"
+msgstr "Predvajanje"
+
+#: ../browser-plugin/totem-plugin-viewer.c:386
+#: ../src/plugins/screensaver/totem-screensaver.c:97
+msgid "Playing a movie"
+msgstr "Predvajanje filma"
+
+#: ../browser-plugin/totem-plugin-viewer.c:443
+msgid "No URI to play"
+msgstr "Ni naslova URI za predvajanje"
+
+#: ../browser-plugin/totem-plugin-viewer.c:676
+#: ../browser-plugin/totem-plugin-viewer.c:1700
+msgid "Totem Movie Player"
+msgstr "Totem predvajalnik filmov"
+
+#. translators: this is:
+#. * Open With ApplicationName
+#. * as in nautilus' right-click menu
+#: ../browser-plugin/totem-plugin-viewer.c:1120
+#, c-format
+msgid "_Open with \"%s\""
+msgstr "_Odpri s programom \"%s\""
+
+#: ../browser-plugin/totem-plugin-viewer.c:1341
+#: ../src/totem-object.c:2475
+msgid "An error occurred"
+msgstr "Prišlo je do napake"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2033
+msgid "No playlist or playlist empty"
+msgstr "Ni seznama predvajanja ali pa je ta prazen"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2128
+msgid "Movie browser plugin"
+msgstr "Vstavek brskanja posnetkov"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144
+#: ../src/totem.c:239
+msgid "Could not initialize the thread-safe libraries."
+msgstr "Ni mogoče naložiti knjižnic varovanja niti."
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144
+msgid "Verify your system installation. The Totem plugin will now exit."
+msgstr "Preverite sistemske nastavitve. Vstavek predvajalnika Totem bo končan."
+
 #: ../data/fullscreen.ui.h:1
 msgid "Leave Fullscreen"
 msgstr "Zapusti celozaslonski način"
 
 #: ../data/fullscreen.ui.h:2
-#: ../data/totem.ui.h:144
+#: ../data/totem.ui.h:81
 msgid "Time:"
 msgstr "Čas:"
 
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
+msgid "Allow the screensaver to activate when playing audio"
+msgstr "Omogoči zagon ohranjevalnika zaslona med predvajanjem zvoka."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
+msgid "Allow the screensaver to activate when playing audio. Disable if you have monitor-powered speakers."
+msgstr "Omogoči zagon ohranjevalnika zaslona med predvajanjem zvoka. Možnost je treba onemogočiti pri uporabi zvočnikov v monitorjih."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
+msgid "Show visual effects when no video is displayed"
+msgstr "Pokaži učinke predočenja, kadar posnetek ne vsebuje slike"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
+msgid "Show visual effects when playing an audio only file."
+msgstr "Pokaži učinke predočenja med predvajanjem zvočnih posnetkov."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
+msgid "Name of the visual effects plugin"
+msgstr "Ime vstavka učinkov predočenja"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
+msgid "The brightness of the video"
+msgstr "Svetlost slike"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
+msgid "The contrast of the video"
+msgstr "Kontrast slike"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
+msgid "The hue of the video"
+msgstr "Odtenek slike"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
+msgid "The saturation of the video"
+msgstr "Zasičenost slike"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
+msgid "Resize the canvas automatically on file load"
+msgstr "Samodejno prilagodi velikost okna ob zagonu datoteke"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
+msgid "Repeat mode"
+msgstr "Ponavljajoče predvajanje"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
+msgid "Shuffle mode"
+msgstr "Premešano predvajanje"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
+msgid "Whether to disable deinterlacing for interlaced movies"
+msgstr "Ali naj bo onemogočena možnost odstranjevanja prepletanja za prepletene posnetke"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
+msgid "Whether to enable debug for the playback engine"
+msgstr "Omogočeno delovanje razhroščevalnika za predvajalnik"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
+msgid "Type of audio output to use"
+msgstr "Vrsta uporabljenega zvočnega odvoda"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
+msgid "Visualization quality setting"
+msgstr "Nastavitev kakovosti predočenja"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
+msgid "Quality setting for the audio visualization."
+msgstr "Nastavitev kakovosti za učinke predočenja zvoka"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
+msgid "Network buffering threshold"
+msgstr "Omrežni prag medpomnilnika"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
+msgid "Amount of data to buffer for network streams before starting to display the stream (in seconds)."
+msgstr "Velikost podatkov, ki naj jih medpomnilnik sprejme pri omrežnem prenosu pred začetkom predvajanja  (v sekundah)"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
+msgid "Subtitle font"
+msgstr "Pisava podnapisa"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
+msgid "Pango font description for subtitle rendering."
+msgstr "Pango opis pisave in izrisovanje podnapisov,"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
+msgid "Subtitle encoding"
+msgstr "Znakovni nabor podnapisa"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
+msgid "Encoding character set for subtitle."
+msgstr "Nabor znakov za kodiranje podnapisov."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
+msgid "Default location for the \"Open...\" dialogs"
+msgstr "Privzeto mesto za pogovorno okno \"Odpri ...\""
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
+msgid "Default location for the \"Open...\" dialogs. Default is the current directory."
+msgstr "Privzeto mesto za pogovorno okno \"Odpri ...\"; privzeto je določena trenutna mapa."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
+msgid "Default location for the \"Take Screenshot\" dialogs"
+msgstr "Privzeto mesto za pogovorno okno \"Zajem zaslonske slike ...\""
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
+msgid "Default location for the \"Take Screenshot\" dialogs. Default is the Pictures directory."
+msgstr "Privzeto mesto za pogovorno okno \"Zajem zaslonske slike ...\"; privzeta je določena mapa Slike."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
+msgid "Whether to disable the plugins in the user's home directory"
+msgstr "Ali naj se onemogočijo vstavki v uporabnikovi domači mapi"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
+msgid "Whether to disable the keyboard shortcuts"
+msgstr "Ali naj se onemogočijo tipkovne bližnjice"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
+msgid "Whether to autoload text subtitle files when a movie is loaded"
+msgstr "Ali naj bodo podnapisi naloženi samodejno ob začetku predvajanja posnetka"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
+msgid "Whether to autoload external chapter files when a movie is loaded"
+msgstr "Ali naj bodo podnapisi samodejno naloženi ob začetku predvajanja podnapisov"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
+msgid "Whether to remember the position of played audio/video files when pausing or closing them"
+msgstr "Izbrana možnost določa ali naj si program zapomni mesto predvajanja zvočnih in slikovnih posnetkov ob premoru ali ob zapiranju programskega okna."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
+msgid "Active plugins list"
+msgstr "Seznam dejavnih vstavkov."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+msgid "A list of the names of the plugins which are currently active (loaded and running)."
+msgstr "Seznam imen vstavkov, ki so trenutno dejavni (naloženi in zagnani)."
+
 #: ../data/playlist.ui.h:1
 msgid "_Remove"
 msgstr "Od_strani"
@@ -49,12 +246,12 @@
 msgstr "Kopiraj mesto v odložišče"
 
 #: ../data/playlist.ui.h:5
-#: ../data/totem.ui.h:78
+#: ../data/totem.ui.h:71
 msgid "_Select Text Subtitles..."
 msgstr "_Izbor podnapisa ..."
 
 #: ../data/playlist.ui.h:6
-#: ../data/totem.ui.h:79
+#: ../data/totem.ui.h:72
 msgid "Select a file to use for text subtitles"
 msgstr "Izbor datoteke za besedilne podnapise"
 
@@ -78,68 +275,214 @@
 msgid "Move Down"
 msgstr "Premakni navzdol"
 
-#: ../data/properties.ui.h:1
-#: ../data/totem.ui.h:122
-msgid "General"
-msgstr "Splošno"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:2
+msgid "Normal"
+msgstr "Običajno"
 
-#: ../data/properties.ui.h:2
-msgid "Title:"
-msgstr "Naslov:"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:4
+msgid "Large"
+msgstr "Veliko"
 
-#: ../data/properties.ui.h:3
-msgid "Artist:"
-msgstr "Izvajalec:"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:6
+msgid "Extra Large"
+msgstr "Zelo veliko"
 
-#: ../data/properties.ui.h:4
-msgid "Duration:"
-msgstr "Trajanje:"
+#: ../data/preferences.ui.h:7
+#: ../src/backend/bacon-video-widget.c:5487
+#: ../src/totem-properties-view.c:231
+msgid "Stereo"
+msgstr "Stereo"
 
-#: ../data/properties.ui.h:5
-msgid "Year:"
-msgstr "Leto:"
+#: ../data/preferences.ui.h:8
+msgid "4-channel"
+msgstr "4-kanalni"
 
-#: ../data/properties.ui.h:6
-msgid "Album:"
-msgstr "Album:"
+#: ../data/preferences.ui.h:9
+msgid "4.1-channel"
+msgstr "4.1-kanalni"
 
-#: ../data/properties.ui.h:7
-msgid "Comment:"
-msgstr "Opomba:"
+#: ../data/preferences.ui.h:10
+msgid "5.0-channel"
+msgstr "5.0-kanalni"
 
-#: ../data/properties.ui.h:8
-msgid "Container:"
-msgstr "Vsebovalnik:"
+#: ../data/preferences.ui.h:11
+msgid "5.1-channel"
+msgstr "5.1-kanalni"
 
-#: ../data/properties.ui.h:9
-#: ../data/totem.ui.h:128
-#: ../src/totem-properties-view.c:270
-msgid "Video"
-msgstr "Posnetek"
+#: ../data/preferences.ui.h:12
+msgid "AC3 Passthrough"
+msgstr "AC3 Passthrough"
 
-#: ../data/properties.ui.h:10
-msgid "Dimensions:"
-msgstr "Mere:"
+#: ../data/preferences.ui.h:13
+msgid "Totem Preferences"
+msgstr "Možnosti Totem"
 
-#: ../data/properties.ui.h:11
-msgid "Codec:"
-msgstr "Kodek:"
+#: ../data/preferences.ui.h:14
+msgid "Playback"
+msgstr "Predvajanje"
 
-#: ../data/properties.ui.h:12
-msgid "Framerate:"
-msgstr "Hitrost sličic:"
+#: ../data/preferences.ui.h:15
+msgid "Start playing files from last position"
+msgstr "Začni s predvajanjem od zadaj naprej"
 
-#: ../data/properties.ui.h:13
-msgid "Bitrate:"
-msgstr "Bitna hitrost:"
+#: ../data/preferences.ui.h:16
+msgid "Text Subtitles"
+msgstr "Besedilni podnapisi"
 
-#: ../data/properties.ui.h:14
-#: ../data/totem.ui.h:142
-#: ../src/totem-properties-view.c:268
-msgid "Audio"
-msgstr "Zvok"
+#: ../data/preferences.ui.h:17
+msgid "_Load subtitle files when movie is loaded"
+msgstr "_Naloži podnapis ob nalaganju posnetka"
 
-#: ../data/properties.ui.h:15
+#: ../data/preferences.ui.h:18
+msgid "_Font:"
+msgstr "_Pisava:"
+
+#: ../data/preferences.ui.h:19
+msgid "_Encoding:"
+msgstr "_Nabor znakov:"
+
+#: ../data/preferences.ui.h:20
+msgid "External Chapters"
+msgstr "Zunanja poglavja"
+
+#: ../data/preferences.ui.h:21
+msgid "Load _chapter files when movie is loaded"
+msgstr "Samodejno _naloži podnapise ob začetku predvajanja posnetka"
+
+#: ../data/preferences.ui.h:22
+#: ../data/properties.ui.h:1
+msgid "General"
+msgstr "Splošno"
+
+#. Tab label in the Preferences dialogue
+#: ../data/preferences.ui.h:24
+msgid "Display"
+msgstr "Zaslon"
+
+#: ../data/preferences.ui.h:25
+msgid "_Resize the window when a new video is loaded"
+msgstr "Spremeni _velikost okna, kadar je ob nalaganju posnetka"
+
+#: ../data/preferences.ui.h:26
+msgid "Disable _deinterlacing of interlaced videos"
+msgstr "Onemogoči odstranjevanja prepletanja prepletenih posnetkov"
+
+#: ../data/preferences.ui.h:27
+msgid "Disable screensaver when playing "
+msgstr "Onemogoči ohranjevalnik zaslona med predvajanjem"
+
+#: ../data/preferences.ui.h:28
+#: ../data/properties.ui.h:9
+#: ../src/totem-properties-view.c:273
+msgid "Video"
+msgstr "Posnetek"
+
+#: ../data/preferences.ui.h:29
+msgid "Video or Audio"
+msgstr "Slika ali zvok"
+
+#: ../data/preferences.ui.h:30
+msgid "Visual Effects"
+msgstr "Učinki predočenja"
+
+#: ../data/preferences.ui.h:31
+msgid "Show _visual effects when an audio file is played"
+msgstr "Pokaži _učinke predočenja med predvajanjem zvočnega posnetka"
+
+#: ../data/preferences.ui.h:32
+msgid "_Type of visualization:"
+msgstr "_Vrsta predočenja:"
+
+#: ../data/preferences.ui.h:33
+msgid "Visualization _size:"
+msgstr "Veliko_st predočenja:"
+
+#: ../data/preferences.ui.h:34
+msgid "Color Balance"
+msgstr "Barvno uravnoteženje"
+
+#: ../data/preferences.ui.h:35
+msgid "_Brightness:"
+msgstr "_Svetlost:"
+
+#: ../data/preferences.ui.h:36
+msgid "Co_ntrast:"
+msgstr "Ko_ntrast:"
+
+#: ../data/preferences.ui.h:37
+msgid "Sat_uration:"
+msgstr "Na_sičenost:"
+
+#: ../data/preferences.ui.h:38
+msgid "_Hue:"
+msgstr "_Odtenek:"
+
+#: ../data/preferences.ui.h:39
+msgid "Reset to _Defaults"
+msgstr "_Povrni na privzeto"
+
+#: ../data/preferences.ui.h:40
+msgid "Audio Output"
+msgstr "Zvočni odvod"
+
+#: ../data/preferences.ui.h:41
+msgid "_Audio output type:"
+msgstr "Vrsta _zvočnega odvoda:"
+
+#: ../data/preferences.ui.h:42
+#: ../data/properties.ui.h:14
+#: ../src/totem-properties-view.c:271
+msgid "Audio"
+msgstr "Zvok"
+
+#: ../data/properties.ui.h:2
+msgid "Title:"
+msgstr "Naslov:"
+
+#: ../data/properties.ui.h:3
+msgid "Artist:"
+msgstr "Izvajalec:"
+
+#: ../data/properties.ui.h:4
+msgid "Duration:"
+msgstr "Trajanje:"
+
+#: ../data/properties.ui.h:5
+msgid "Year:"
+msgstr "Leto:"
+
+#: ../data/properties.ui.h:6
+msgid "Album:"
+msgstr "Album:"
+
+#: ../data/properties.ui.h:7
+msgid "Comment:"
+msgstr "Opomba:"
+
+#: ../data/properties.ui.h:8
+msgid "Container:"
+msgstr "Vsebovalnik:"
+
+#: ../data/properties.ui.h:10
+msgid "Dimensions:"
+msgstr "Mere:"
+
+#: ../data/properties.ui.h:11
+msgid "Codec:"
+msgstr "Kodek:"
+
+#: ../data/properties.ui.h:12
+msgid "Framerate:"
+msgstr "Hitrost sličic:"
+
+#: ../data/properties.ui.h:13
+msgid "Bitrate:"
+msgstr "Bitna hitrost:"
+
+#: ../data/properties.ui.h:15
 msgid "Sample rate:"
 msgstr "Hitrost vzorčenja:"
 
@@ -147,716 +490,444 @@
 msgid "Channels:"
 msgstr "Kanali:"
 
-#: ../data/video-list.ui.h:1
-#: ../src/totem-dnd-menu.c:97
-msgid "_Add to Playlist"
-msgstr "_Dodaj na seznam predvajanja"
-
-#: ../data/video-list.ui.h:2
-msgid "Add the video to the playlist"
-msgstr "Dodaj posnetek na seznam predvajanja"
-
 #. Title
 #: ../data/totem.desktop.in.in.in.h:1
-#: ../data/totem.ui.h:143
-#: ../src/totem-object.c:1667
-msgid "Movie Player"
-msgstr "Predvajalnik posnetkov"
+#: ../data/totem.ui.h:80
+#: ../src/totem.c:238
+#: ../src/totem.c:247
+#: ../src/totem-menu.c:790
+#: ../src/totem-object.c:1658
+msgid "Videos"
+msgstr "Video"
 
 #: ../data/totem.desktop.in.in.in.h:2
-msgid "Play movies and songs"
-msgstr "Predvajanje filmov in glasbe"
+msgid "Play movies"
+msgstr "Predvajanje posnetkov"
+
+#: ../data/totem.desktop.in.in.in.h:3
+msgid "Video;Movie;Film;Clip;Series;Player;DVD;TV;Disc;"
+msgstr "Video;Oddaja;Klip;Film;Posnetek;Serija;Predvajalnik;DVD;TV;Disk;"
 
 #: ../data/totem.ui.h:1
-msgid "_Movie"
-msgstr "_Film"
+msgid "_Open"
+msgstr "_Odpri"
 
 #: ../data/totem.ui.h:2
-msgid "_Open..."
-msgstr "_Odpri ..."
+msgid "Open _Location"
+msgstr "Odpri _mesto"
 
 #: ../data/totem.ui.h:3
-msgid "Open a file"
-msgstr "Odpri datoteko"
+msgid "_Fullscreen"
+msgstr "_Celozaslonski način"
 
 #: ../data/totem.ui.h:4
-msgid "Open _Location..."
-msgstr "Odpri _mesto ..."
+msgid "Prefere_nces"
+msgstr "_Lastnosti"
 
 #: ../data/totem.ui.h:5
-msgid "Open a non-local file"
-msgstr "Odpri oddaljeno datoteko"
+msgid "Shuff_le"
+msgstr "Pre_mešaj"
 
 #: ../data/totem.ui.h:6
+msgid "_Repeat"
+msgstr "_Ponovi"
+
+#: ../data/totem.ui.h:7
+msgid "_Quit"
+msgstr "_Končaj"
+
+#: ../data/totem.ui.h:8
+msgid "_Movie"
+msgstr "_Film"
+
+#: ../data/totem.ui.h:9
 msgid "_Eject"
 msgstr "I_zvrzi"
 
-#: ../data/totem.ui.h:7
+#: ../data/totem.ui.h:10
 msgid "Eject the current disc"
 msgstr "Izvrzi trenutni disk"
 
-#: ../data/totem.ui.h:8
+#: ../data/totem.ui.h:11
 msgid "_Properties"
 msgstr "_Lastnosti"
 
-#: ../data/totem.ui.h:9
+#: ../data/totem.ui.h:12
 msgid "View the properties of the current stream"
 msgstr "Pregled podrobnosti trenutnega pretoka"
 
-#: ../data/totem.ui.h:10
+#: ../data/totem.ui.h:13
 msgid "Play / P_ause"
 msgstr "Predvajanje / _Premor"
 
-#: ../data/totem.ui.h:11
+#: ../data/totem.ui.h:14
 msgid "Play or pause the movie"
 msgstr "Predvajanje ali zaustavitev filma"
 
-#: ../data/totem.ui.h:12
-msgid "_Quit"
-msgstr "_Končaj"
-
-#: ../data/totem.ui.h:13
-msgid "Quit the program"
-msgstr "Končaj program"
-
-#: ../data/totem.ui.h:14
+#: ../data/totem.ui.h:15
 msgid "_Edit"
 msgstr "_Uredi"
 
-#: ../data/totem.ui.h:15
+#: ../data/totem.ui.h:16
 msgid "_Clear Playlist"
 msgstr "Po_čisti seznam predvajanja"
 
-#: ../data/totem.ui.h:16
+#: ../data/totem.ui.h:17
 msgid "Clear the playlist"
 msgstr "Počisti seznam predvajanja"
 
-#: ../data/totem.ui.h:17
-msgid "Prefere_nces"
-msgstr "_Lastnosti"
-
 #: ../data/totem.ui.h:18
-msgid "Configure the application"
-msgstr "Spremeni nastavitve programa"
-
-#: ../data/totem.ui.h:19
 msgid "Plugins..."
 msgstr "Vstavki ..."
 
-#: ../data/totem.ui.h:20
+#: ../data/totem.ui.h:19
 msgid "Configure plugins to extend the application"
 msgstr "Nastavitev vstavkov za razširitev delovanja programa"
 
-#: ../data/totem.ui.h:21
+#: ../data/totem.ui.h:20
 msgid "_View"
 msgstr "_Pogled"
 
-#: ../data/totem.ui.h:22
-msgid "_Fullscreen"
-msgstr "_Celozaslonski način"
-
-#: ../data/totem.ui.h:23
-msgid "Switch to fullscreen"
-msgstr "Preklop na celozaslonski način"
-
-#: ../data/totem.ui.h:24
+#: ../data/totem.ui.h:21
 msgid "Fit Window to Movie"
 msgstr "Prilagodi okno velikosti slike"
 
-#: ../data/totem.ui.h:25
+#: ../data/totem.ui.h:22
 msgid "_Resize 1:2"
 msgstr "_Pomanjšaj 1:2"
 
-#: ../data/totem.ui.h:26
+#: ../data/totem.ui.h:23
 msgid "Resize to half the original video size"
 msgstr "Spremeni velikost na polovico osnovne vrednosti"
 
-#: ../data/totem.ui.h:27
+#: ../data/totem.ui.h:24
 msgid "Resize _1:1"
 msgstr "Spremeni na _1:1"
 
-#: ../data/totem.ui.h:28
+#: ../data/totem.ui.h:25
 msgid "Resize to the original video size"
 msgstr "Spremeni velikost na osnovno vrednost"
 
-#: ../data/totem.ui.h:29
+#: ../data/totem.ui.h:26
 msgid "Resize _2:1"
 msgstr "Spremeni na _2:1"
 
-#: ../data/totem.ui.h:30
+#: ../data/totem.ui.h:27
 msgid "Resize to double the original video size"
 msgstr "Spremeni velikost na dvakratno osnovno vrednost"
 
-#: ../data/totem.ui.h:31
+#: ../data/totem.ui.h:28
 msgid "_Aspect Ratio"
 msgstr "_Razmerje velikosti"
 
-#: ../data/totem.ui.h:32
+#: ../data/totem.ui.h:29
 msgid "Switch An_gles"
 msgstr "Preklopi _kote"
 
-#: ../data/totem.ui.h:33
+#: ../data/totem.ui.h:30
 msgid "Switch camera angles"
 msgstr "Preklopi kote kamere"
 
-#: ../data/totem.ui.h:34
+#: ../data/totem.ui.h:31
 msgid "_Go"
 msgstr "Pojdi _na"
 
-#: ../data/totem.ui.h:35
+#: ../data/totem.ui.h:32
 msgid "_DVD Menu"
 msgstr "_DVD meni"
 
-#: ../data/totem.ui.h:36
+#: ../data/totem.ui.h:33
 msgid "Go to the DVD menu"
 msgstr "Skoči na DVD meni"
 
-#: ../data/totem.ui.h:37
+#: ../data/totem.ui.h:34
 msgid "_Title Menu"
 msgstr "Meni _naslova"
 
-#: ../data/totem.ui.h:38
+#: ../data/totem.ui.h:35
 msgid "Go to the title menu"
 msgstr "Skoči na meni naslova"
 
-#: ../data/totem.ui.h:39
+#: ../data/totem.ui.h:36
 msgid "A_udio Menu"
 msgstr "_Zvočni meni"
 
-#: ../data/totem.ui.h:40
+#: ../data/totem.ui.h:37
 msgid "Go to the audio menu"
 msgstr "Skoči na meni zvoka"
 
-#: ../data/totem.ui.h:41
+#: ../data/totem.ui.h:38
 msgid "_Angle Menu"
 msgstr "Meni _kota"
 
-#: ../data/totem.ui.h:42
+#: ../data/totem.ui.h:39
 msgid "Go to the angle menu"
 msgstr "Skoči na meni kota"
 
-#: ../data/totem.ui.h:43
+#: ../data/totem.ui.h:40
 msgid "_Chapter Menu"
 msgstr "Meni pog_lavij"
 
-#: ../data/totem.ui.h:44
+#: ../data/totem.ui.h:41
 msgid "Go to the chapter menu"
 msgstr "Skoči na meni poglavij"
 
-#: ../data/totem.ui.h:45
+#: ../data/totem.ui.h:42
 msgid "_Next Chapter/Movie"
 msgstr "Nas_lednje poglavje/film"
 
-#: ../data/totem.ui.h:46
+#: ../data/totem.ui.h:43
 msgid "Next chapter or movie"
 msgstr "Naslednje poglavje/film"
 
-#: ../data/totem.ui.h:47
+#: ../data/totem.ui.h:44
 msgid "_Previous Chapter/Movie"
 msgstr "Pred_hodno poglavje/film"
 
-#: ../data/totem.ui.h:48
+#: ../data/totem.ui.h:45
 msgid "Previous chapter or movie"
 msgstr "Predhodno poglavje/film"
 
-#: ../data/totem.ui.h:49
+#: ../data/totem.ui.h:46
 msgid "_Sound"
 msgstr "_Zvok"
 
-#: ../data/totem.ui.h:50
+#: ../data/totem.ui.h:47
 msgid "Volume _Up"
 msgstr "Po_večaj glasnost"
 
-#: ../data/totem.ui.h:51
+#: ../data/totem.ui.h:48
 msgid "Increase volume"
 msgstr "Povečaj glasnost"
 
-#: ../data/totem.ui.h:52
+#: ../data/totem.ui.h:49
 msgid "Volume _Down"
 msgstr "_Zmanjšaj glasnost"
 
-#: ../data/totem.ui.h:53
+#: ../data/totem.ui.h:50
 msgid "Decrease volume"
 msgstr "Zmanjšaj glasnost"
 
-#: ../data/totem.ui.h:54
+#: ../data/totem.ui.h:51
 msgid "_Help"
 msgstr "Pomo_č"
 
-#: ../data/totem.ui.h:55
+#: ../data/totem.ui.h:52
 msgid "_Contents"
-msgstr "_Vsebina"
-
-#: ../data/totem.ui.h:56
-msgid "Help contents"
-msgstr "Vsebina pomoči"
-
-#: ../data/totem.ui.h:57
-msgid "_About"
-msgstr "_O programu"
-
-#: ../data/totem.ui.h:58
-msgid "About this application"
-msgstr "O programu"
-
-#: ../data/totem.ui.h:59
-msgid "_Repeat Mode"
-msgstr "_Ponavljajoče predvajanje"
-
-#: ../data/totem.ui.h:60
-msgid "Set the repeat mode"
-msgstr "Določi ponavljajoče predvajanje"
-
-#: ../data/totem.ui.h:61
-msgid "Shuff_le Mode"
-msgstr "Pre_mešano predvajanje"
-
-#: ../data/totem.ui.h:62
-msgid "Set the shuffle mode"
-msgstr "Določi premešano predvajanje"
-
-#: ../data/totem.ui.h:63
-msgid "Show _Controls"
-msgstr "Pokaži _ukazne gumbe"
-
-#: ../data/totem.ui.h:64
-msgid "Show controls"
-msgstr "Pokaži ukazne gumbe"
-
-#: ../data/totem.ui.h:65
-msgid "S_idebar"
-msgstr "_Stranska vrstica"
-
-#: ../data/totem.ui.h:66
-msgid "Show or hide the sidebar"
-msgstr "Pokaži ali skrij stransko vrstico"
-
-#: ../data/totem.ui.h:67
-msgctxt "Aspect ratio"
-msgid "Auto"
-msgstr "Samodejno"
-
-#: ../data/totem.ui.h:68
-msgid "Sets automatic aspect ratio"
-msgstr "Določi samodejno razmerje velikosti"
-
-#: ../data/totem.ui.h:69
-msgid "Square"
-msgstr "Kvadrat"
-
-#: ../data/totem.ui.h:70
-msgid "Sets square aspect ratio"
-msgstr "Določi razmerje kvadrata"
-
-#: ../data/totem.ui.h:71
-msgid "4:3 (TV)"
-msgstr "4:3 (TV)"
-
-#: ../data/totem.ui.h:72
-msgid "Sets 4:3 (TV) aspect ratio"
-msgstr "Določi razmerje 4:3 (TV)"
-
-#: ../data/totem.ui.h:73
-msgid "16:9 (Widescreen)"
-msgstr "16:9 (širok zaslon)"
-
-#: ../data/totem.ui.h:74
-msgid "Sets 16:9 (widescreen) aspect ratio"
-msgstr "Določi razmerje 16:9 (širok zaslon)"
-
-#: ../data/totem.ui.h:75
-msgid "2.11:1 (DVB)"
-msgstr "2.11:1 (DVB)"
-
-#: ../data/totem.ui.h:76
-msgid "Sets 2.11:1 (DVB) aspect ratio"
-msgstr "Določi razmerje 2.11:1 (DVB)"
-
-#: ../data/totem.ui.h:77
-msgid "S_ubtitles"
-msgstr "_Podnapisi"
-
-#: ../data/totem.ui.h:80
-msgid "_Languages"
-msgstr "_Jeziki"
-
-#: ../data/totem.ui.h:81
-msgid "Zoom In"
-msgstr "Približaj"
-
-#: ../data/totem.ui.h:82
-msgid "Zoom in"
-msgstr "Približaj"
-
-#: ../data/totem.ui.h:83
-msgid "Skip _Forward"
-msgstr "Preskoči na_prej"
-
-#: ../data/totem.ui.h:84
-msgid "Skip forward"
-msgstr "Preskoči naprej"
-
-#: ../data/totem.ui.h:85
-msgid "Skip _Backwards"
-msgstr "Preskoči na_zaj"
-
-#: ../data/totem.ui.h:86
-msgid "Skip backwards"
-msgstr "Preskoči nazaj"
-
-#: ../data/totem.ui.h:87
-msgid "14.4 Kbps Modem"
-msgstr "14.4 Kbps modem"
-
-#: ../data/totem.ui.h:88
-msgid "19.2 Kbps Modem"
-msgstr "19.2 Kbps modem"
-
-#: ../data/totem.ui.h:89
-msgid "28.8 Kbps Modem"
-msgstr "28.8 Kbps modem"
-
-#: ../data/totem.ui.h:90
-msgid "33.6 Kbps Modem"
-msgstr "33.6 Kbps modem"
-
-#: ../data/totem.ui.h:91
-msgid "34.4 Kbps Modem"
-msgstr "34.4 Kbps modem"
-
-#: ../data/totem.ui.h:92
-msgid "56 Kbps Modem/ISDN"
-msgstr "56 Kbps modem/ISDN"
-
-#: ../data/totem.ui.h:93
-msgid "112 Kbps Dual ISDN/DSL"
-msgstr "112 Kbps dvojni ISDN/DSL"
-
-#: ../data/totem.ui.h:94
-msgid "256 Kbps DSL/Cable"
-msgstr "256 Kbps DSL/kabel"
-
-#: ../data/totem.ui.h:95
-msgid "384 Kbps DSL/Cable"
-msgstr "384 Kbps DSL/kabel"
-
-#: ../data/totem.ui.h:96
-msgid "512 Kbps DSL/Cable"
-msgstr "512 Kbps DSL/kabel"
-
-#: ../data/totem.ui.h:97
-msgid "1.5 Mbps T1/Intranet/LAN"
-msgstr "1.5 Mbps T1/Intranet/LAN"
-
-#: ../data/totem.ui.h:98
-msgid "Intranet/LAN"
-msgstr "Intranet/LAN"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:100
-msgid "Normal"
-msgstr "Običajno"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:102
-msgid "Large"
-msgstr "Veliko"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:104
-msgid "Extra Large"
-msgstr "Zelo veliko"
-
-#: ../data/totem.ui.h:105
-#: ../src/totem-properties-view.c:228
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5593
-msgid "Stereo"
-msgstr "Stereo"
-
-#: ../data/totem.ui.h:106
-msgid "4-channel"
-msgstr "4-kanalni"
-
-#: ../data/totem.ui.h:107
-msgid "4.1-channel"
-msgstr "4.1-kanalni"
-
-#: ../data/totem.ui.h:108
-msgid "5.0-channel"
-msgstr "5.0-kanalni"
-
-#: ../data/totem.ui.h:109
-msgid "5.1-channel"
-msgstr "5.1-kanalni"
-
-#: ../data/totem.ui.h:110
-msgid "AC3 Passthrough"
-msgstr "AC3 Passthrough"
-
-#: ../data/totem.ui.h:111
-msgid "Totem Preferences"
-msgstr "Možnosti Totem"
-
-#: ../data/totem.ui.h:112
-msgid "Playback"
-msgstr "Predvajanje"
-
-#: ../data/totem.ui.h:113
-msgid "Start playing files from last position"
-msgstr "Začni s predvajanjem od zadaj naprej"
-
-#: ../data/totem.ui.h:114
-msgid "Networking"
-msgstr "Omrežje"
-
-#: ../data/totem.ui.h:115
-msgid "Connection _speed:"
-msgstr "Hitro_st povezave:"
-
-#: ../data/totem.ui.h:116
-msgid "Text Subtitles"
-msgstr "Besedilni podnapisi"
-
-#: ../data/totem.ui.h:117
-msgid "_Load subtitle files when movie is loaded"
-msgstr "_Naloži podnapis ob nalaganju posnetka"
-
-#: ../data/totem.ui.h:118
-msgid "_Font:"
-msgstr "_Pisava:"
-
-#: ../data/totem.ui.h:119
-msgid "_Encoding:"
-msgstr "_Nabor znakov:"
-
-#: ../data/totem.ui.h:120
-msgid "External Chapters"
-msgstr "Zunanja poglavja"
-
-#: ../data/totem.ui.h:121
-msgid "Load _chapter files when movie is loaded"
-msgstr "Samodejno _naloži podnapise ob začetku predvajanja posnetka"
-
-#. Tab label in the Preferences dialogue
-#: ../data/totem.ui.h:124
-msgid "Display"
-msgstr "Zaslon"
-
-#: ../data/totem.ui.h:125
-msgid "_Resize the window when a new video is loaded"
-msgstr "Spremeni _velikost okna, kadar je ob nalaganju posnetka"
-
-#: ../data/totem.ui.h:126
-msgid "Disable _deinterlacing of interlaced videos"
-msgstr "Onemogoči odstranjevanja prepletanja prepletenih posnetkov"
-
-#: ../data/totem.ui.h:127
-msgid "Disable screensaver when playing "
-msgstr "Onemogoči ohranjevalnik zaslona med predvajanjem"
-
-#: ../data/totem.ui.h:129
-msgid "Video or Audio"
-msgstr "Slika ali zvok"
-
-#: ../data/totem.ui.h:130
-msgid "Visual Effects"
-msgstr "Učinki predočenja"
-
-#: ../data/totem.ui.h:131
-msgid "Show _visual effects when an audio file is played"
-msgstr "Pokaži _učinke predočenja med predvajanjem zvočnega posnetka"
-
-#: ../data/totem.ui.h:132
-msgid "_Type of visualization:"
-msgstr "_Vrsta predočenja:"
-
-#: ../data/totem.ui.h:133
-msgid "Visualization _size:"
-msgstr "Veliko_st predočenja:"
-
-#: ../data/totem.ui.h:134
-msgid "Color Balance"
-msgstr "Barvno uravnoteženje"
-
-#: ../data/totem.ui.h:135
-msgid "_Brightness:"
-msgstr "_Svetlost:"
-
-#: ../data/totem.ui.h:136
-msgid "Co_ntrast:"
-msgstr "Ko_ntrast:"
-
-#: ../data/totem.ui.h:137
-msgid "Sat_uration:"
-msgstr "Na_sičenost:"
-
-#: ../data/totem.ui.h:138
-msgid "_Hue:"
-msgstr "_Odtenek:"
-
-#: ../data/totem.ui.h:139
-msgid "Reset to _Defaults"
-msgstr "_Povrni na privzeto"
-
-#: ../data/totem.ui.h:140
-msgid "Audio Output"
-msgstr "Zvočni odvod"
+msgstr "_Vsebina"
 
-#: ../data/totem.ui.h:141
-msgid "_Audio output type:"
-msgstr "Vrsta _zvočnega odvoda:"
+#: ../data/totem.ui.h:53
+msgid "Help contents"
+msgstr "Vsebina pomoči"
 
-#: ../data/totem.ui.h:145
-msgid "Time seek bar"
-msgstr "Vrstica časovnega iskanja"
+#: ../data/totem.ui.h:54
+msgid "_About"
+msgstr "_O programu"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
-msgid "Allow the screensaver to activate when playing audio"
-msgstr "Omogoči zagon ohranjevalnika zaslona med predvajanjem zvoka."
+#: ../data/totem.ui.h:55
+msgid "About this application"
+msgstr "O programu"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
-msgid "Allow the screensaver to activate when playing audio. Disable if you have monitor-powered speakers."
-msgstr "Omogoči zagon ohranjevalnika zaslona med predvajanjem zvoka. Možnost je treba onemogočiti pri uporabi zvočnikov v monitorjih."
+#: ../data/totem.ui.h:56
+msgid "Show _Controls"
+msgstr "Pokaži _ukazne gumbe"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
-msgid "Show visual effects when no video is displayed"
-msgstr "Pokaži učinke predočenja, kadar posnetek ne vsebuje slike"
+#: ../data/totem.ui.h:57
+msgid "Show controls"
+msgstr "Pokaži ukazne gumbe"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
-msgid "Show visual effects when playing an audio only file."
-msgstr "Pokaži učinke predočenja med predvajanjem zvočnih posnetkov."
+#: ../data/totem.ui.h:58
+msgid "S_idebar"
+msgstr "_Stranska vrstica"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
-msgid "Name of the visual effects plugin"
-msgstr "Ime vstavka učinkov predočenja"
+#: ../data/totem.ui.h:59
+msgid "Show or hide the sidebar"
+msgstr "Pokaži ali skrij stransko vrstico"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
-msgid "The brightness of the video"
-msgstr "Svetlost slike"
+#: ../data/totem.ui.h:60
+msgctxt "Aspect ratio"
+msgid "Auto"
+msgstr "Samodejno"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
-msgid "The contrast of the video"
-msgstr "Kontrast slike"
+#: ../data/totem.ui.h:61
+msgid "Sets automatic aspect ratio"
+msgstr "Določi samodejno razmerje velikosti"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
-msgid "The hue of the video"
-msgstr "Odtenek slike"
+#: ../data/totem.ui.h:62
+msgid "Square"
+msgstr "Kvadrat"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
-msgid "The saturation of the video"
-msgstr "Zasičenost slike"
+#: ../data/totem.ui.h:63
+msgid "Sets square aspect ratio"
+msgstr "Določi razmerje kvadrata"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
-msgid "Resize the canvas automatically on file load"
-msgstr "Samodejno prilagodi velikost okna ob zagonu datoteke"
+#: ../data/totem.ui.h:64
+msgid "4:3 (TV)"
+msgstr "4:3 (TV)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
-msgid "Network connection speed"
-msgstr "Hitrost omrežne povezave"
+#: ../data/totem.ui.h:65
+msgid "Sets 4:3 (TV) aspect ratio"
+msgstr "Določi razmerje 4:3 (TV)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
-msgid "Approximate network connection speed, used to select quality on media over the network."
-msgstr "Približna hitrost omrežne povezave, ki je uporabljena za izbor kakovosti predstavne datoteke preko omrežja."
+#: ../data/totem.ui.h:66
+msgid "16:9 (Widescreen)"
+msgstr "16:9 (širok zaslon)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
-msgid "Repeat mode"
-msgstr "Ponavljajoče predvajanje"
+#: ../data/totem.ui.h:67
+msgid "Sets 16:9 (widescreen) aspect ratio"
+msgstr "Določi razmerje 16:9 (širok zaslon)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
-msgid "Shuffle mode"
-msgstr "Premešano predvajanje"
+#: ../data/totem.ui.h:68
+msgid "2.11:1 (DVB)"
+msgstr "2.11:1 (DVB)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
-msgid "Whether to disable deinterlacing for interlaced movies"
-msgstr "Ali naj bo onemogočena možnost odstranjevanja prepletanja za prepletene posnetke"
+#: ../data/totem.ui.h:69
+msgid "Sets 2.11:1 (DVB) aspect ratio"
+msgstr "Določi razmerje 2.11:1 (DVB)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
-msgid "Whether to enable debug for the playback engine"
-msgstr "Omogočeno delovanje razhroščevalnika za predvajalnik"
+#: ../data/totem.ui.h:70
+msgid "S_ubtitles"
+msgstr "_Podnapisi"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
-msgid "Type of audio output to use"
-msgstr "Vrsta uporabljenega zvočnega odvoda"
+#: ../data/totem.ui.h:73
+msgid "_Languages"
+msgstr "_Jeziki"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
-msgid "Visualization quality setting"
-msgstr "Nastavitev kakovosti predočenja"
+#: ../data/totem.ui.h:74
+msgid "Zoom In"
+msgstr "Približaj"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
-msgid "Quality setting for the audio visualization."
-msgstr "Nastavitev kakovosti za učinke predočenja zvoka"
+#: ../data/totem.ui.h:75
+msgid "Zoom in"
+msgstr "Približaj"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
-msgid "Network buffering threshold"
-msgstr "Omrežni prag medpomnilnika"
+#: ../data/totem.ui.h:76
+msgid "Skip _Forward"
+msgstr "Preskoči na_prej"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
-msgid "Amount of data to buffer for network streams before starting to display the stream (in seconds)."
-msgstr "Velikost podatkov, ki naj jih medpomnilnik sprejme pri omrežnem prenosu pred začetkom predvajanja  (v sekundah)"
+#: ../data/totem.ui.h:77
+msgid "Skip forward"
+msgstr "Preskoči naprej"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
-msgid "Subtitle font"
-msgstr "Pisava podnapisa"
+#: ../data/totem.ui.h:78
+msgid "Skip _Backwards"
+msgstr "Preskoči na_zaj"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
-msgid "Pango font description for subtitle rendering."
-msgstr "Pango opis pisave in izrisovanje podnapisov,"
+#: ../data/totem.ui.h:79
+msgid "Skip backwards"
+msgstr "Preskoči nazaj"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
-msgid "Subtitle encoding"
-msgstr "Znakovni nabor podnapisa"
+#: ../data/totem.ui.h:82
+msgid "Time seek bar"
+msgstr "Vrstica časovnega iskanja"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
-msgid "Encoding character set for subtitle."
-msgstr "Nabor znakov za kodiranje podnapisov."
+#: ../data/uri.ui.h:1
+msgid "Enter the _address of the file you would like to open:"
+msgstr "Vnesite n_aslov datoteke, ki jo želite odpreti:"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
-msgid "Default location for the \"Open...\" dialogs"
-msgstr "Privzeto mesto za pogovorno okno \"Odpri ...\""
+#: ../data/video-list.ui.h:1
+#: ../src/totem-dnd-menu.c:97
+msgid "_Add to Playlist"
+msgstr "_Dodaj na seznam predvajanja"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
-msgid "Default location for the \"Open...\" dialogs. Default is the current directory."
-msgstr "Privzeto mesto za pogovorno okno \"Odpri ...\"; privzeto je določena trenutna mapa."
+#: ../data/video-list.ui.h:2
+msgid "Add the video to the playlist"
+msgstr "Dodaj posnetek na seznam predvajanja"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
-msgid "Default location for the \"Take Screenshot\" dialogs"
-msgstr "Privzeto mesto za pogovorno okno \"Zajem zaslonske slike ...\""
+#: ../src/backend/bacon-video-widget.c:1643
+msgid "Password requested for RTSP server"
+msgstr "Zahtevano je geslo za dostop do RTSP strežnika"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
-msgid "Default location for the \"Take Screenshot\" dialogs. Default is the Pictures directory."
-msgstr "Privzeto mesto za pogovorno okno \"Zajem zaslonske slike ...\"; privzeta je določena mapa Slike."
+#: ../src/backend/bacon-video-widget.c:2933
+#, c-format
+msgid "Audio Track #%d"
+msgstr "Zvočna sled #%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
-msgid "Whether to disable the plugins in the user's home directory"
-msgstr "Ali naj se onemogočijo vstavki v uporabnikovi domači mapi"
+#: ../src/backend/bacon-video-widget.c:2937
+#, c-format
+msgid "Subtitle #%d"
+msgstr "Podnapis #%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
-msgid "Whether to disable the keyboard shortcuts"
-msgstr "Ali naj se onemogočijo tipkovne bližnjice"
+#: ../src/backend/bacon-video-widget.c:3334
+msgid "The server you are trying to connect to is not known."
+msgstr "Strežnik za povezavo ni znan."
+
+#: ../src/backend/bacon-video-widget.c:3337
+msgid "The connection to this server was refused."
+msgstr "Povezava s strežnikom je bila zavrnjena."
+
+#: ../src/backend/bacon-video-widget.c:3340
+msgid "The specified movie could not be found."
+msgstr "Navedenega posnetka ni mogoče najti."
+
+#: ../src/backend/bacon-video-widget.c:3347
+msgid "The server refused access to this file or stream."
+msgstr "Dostop do datoteke ali pretoka je s strani strežnika zavrnjen."
+
+#: ../src/backend/bacon-video-widget.c:3353
+msgid "Authentication is required to access this file or stream."
+msgstr "Pred dostopom do datoteke ali pretoka je zahtevana overitev."
+
+#: ../src/backend/bacon-video-widget.c:3360
+msgid "You are not allowed to open this file."
+msgstr "Za odpiranje te datoteke so zahtevana skrbniška dovoljenja."
+
+#: ../src/backend/bacon-video-widget.c:3365
+msgid "This location is not a valid one."
+msgstr "Mesto datoteke ni veljavno."
+
+#: ../src/backend/bacon-video-widget.c:3373
+msgid "The movie could not be read."
+msgstr "Posnetka ni mogoče prebrati."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
-msgid "Whether to autoload text subtitle files when a movie is loaded"
-msgstr "Ali naj bodo podnapisi naloženi samodejno ob začetku predvajanja posnetka"
+#. should be exactly one missing thing (source or converter)
+#: ../src/backend/bacon-video-widget.c:3396
+#: ../src/backend/bacon-video-widget.c:3404
+#, c-format
+msgid "The playback of this movie requires a %s plugin which is not installed."
+msgid_plural ""
+"The playback of this movie requires the following decoders which are not installed:\n"
+"\n"
+"%s"
+msgstr[0] ""
+"Predvajanje tega posnetka zahteva uporabo navedenih dekodirnikov, ki pa niso nameščeni:\n"
+"\n"
+"%s"
+msgstr[1] "Predvajanje tega posnetka zahteva uporabo dekodirnika %s, ki pa ni nameščen."
+msgstr[2] ""
+"Predvajanje tega posnetka zahteva uporabo navedenih dekodirnikov, ki pa niso nameščeni:\n"
+"\n"
+"%s"
+msgstr[3] ""
+"Predvajanje tega posnetka zahteva uporabo navedenih dekodirnikov, ki pa niso nameščeni:\n"
+"\n"
+"%s"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
-msgid "Whether to autoload external chapter files when a movie is loaded"
-msgstr "Ali naj bodo podnapisi samodejno naloženi ob začetku predvajanja podnapisov"
+#: ../src/backend/bacon-video-widget.c:3415
+msgid "An audio or video stream is not handled due to missing codecs. You might need to install additional plugins to be able to play some types of movies"
+msgstr "Zvočnega ali slikovnega pretoka ni mogoče predvajati zaradi manjkajočih kodekov. Pred nadaljevanjem je treba namestiti ustrezne kodeke za predvajanje tovrstnih datotek."
+
+#: ../src/backend/bacon-video-widget.c:3425
+msgid "This file cannot be played over the network. Try downloading it locally first."
+msgstr "Te datoteke ni mogoče predvajanje preko omrežja. Datoteko je treba najprej prejeti na disk in nato  predvajati."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
-msgid "Whether to remember the position of played audio/video files when pausing or closing them"
-msgstr "Izbrana možnost določa ali naj si program zapomni mesto predvajanja zvočnih in slikovnih posnetkov ob premoru ali ob zapiranju programskega okna."
+#: ../src/backend/bacon-video-widget.c:5483
+#: ../src/totem-properties-view.c:227
+msgid "Surround"
+msgstr "Surround sistem zvoka"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:35
-msgid "Active plugins list"
-msgstr "Seznam dejavnih vstavkov."
+#: ../src/backend/bacon-video-widget.c:5485
+#: ../src/totem-properties-view.c:229
+msgid "Mono"
+msgstr "Mono"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:36
-msgid "A list of the names of the plugins which are currently active (loaded and running)."
-msgstr "Seznam imen vstavkov, ki so trenutno dejavni (naloženi in zagnani)."
+#: ../src/backend/bacon-video-widget.c:5770
+msgid "Media contains no supported video streams."
+msgstr "Posnetek ne vsebuje podprtih pretokov slike."
 
-#: ../data/uri.ui.h:1
-msgid "Enter the _address of the file you would like to open:"
-msgstr "Vnesite n_aslov datoteke, ki jo želite odpreti:"
+#: ../src/backend/bacon-video-widget.c:5952
+msgid "Some necessary plug-ins are missing. Make sure that the program is correctly installed."
+msgstr "Nekateri zahtevani vstavki niso nameščeni. Za popolno delovanje mora biti program ustrezno nameščen."
 
 #: ../src/eggdesktopfile.c:165
 #, c-format
@@ -956,6 +1027,31 @@
 msgid "Show session management options"
 msgstr "Pokaži možnosti upravljanja seje"
 
+#. hour:minutes:seconds
+#. Translators: This is a time format, like "9:05:02" for 9
+#. * hours, 5 minutes, and 2 seconds. You may change ":" to
+#. * the separator that your locale uses or use "%Id" instead
+#. * of "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:56
+#: ../src/plugins/skipto/totem-time-entry.c:57
+#, c-format
+msgctxt "long time format"
+msgid "%d:%02d:%02d"
+msgstr "%d:%02d:%02d"
+
+#. minutes:seconds
+#. Translators: This is a time format, like "5:02" for 5
+#. * minutes and 2 seconds. You may change ":" to the
+#. * separator that your locale uses or use "%Id" instead of
+#. * "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:65
+#, c-format
+msgctxt "short time format"
+msgid "%d:%02d"
+msgstr "%d:%02d"
+
 #. Title
 #. Artist
 #. Album
@@ -1068,10 +1164,14 @@
 msgstr[2] "%d sličici na sekundo"
 msgstr[3] "%d sličice na sekundo"
 
-#: ../src/totem-audio-preview.c:168
+#: ../src/totem-audio-preview.c:137
 msgid "Audio Preview"
 msgstr "Poslušanje zvočne datoteke"
 
+#: ../src/totem.c:239
+msgid "Verify your system installation. Totem will now exit."
+msgstr "Preverite sistemske nastavitve. Totem bo končan."
+
 #: ../src/totem-cell-renderer-video.c:126
 msgid "Unknown video"
 msgstr "Neznan video"
@@ -1084,7 +1184,7 @@
 msgid "Cancel"
 msgstr "Prekliči"
 
-#: ../src/totem-fullscreen.c:616
+#: ../src/totem-fullscreen.c:573
 msgid "No File"
 msgstr "Ni datoteke"
 
@@ -1105,212 +1205,122 @@
 msgid "Make sure that Totem is properly installed."
 msgstr "Prepričajte se, da je totem pravilno nameščen."
 
-#: ../src/totem-interface.c:347
+#: ../src/totem-interface.c:357
 msgid "Totem 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."
 msgstr "Totem je prosta programska oprema; lahko ga širite in spreminjati pod pogoji GNU Splošnega javnega dovoljenja kot to določa Free Software Foundation; različica 2  ali kasnejše različice."
 
-#: ../src/totem-interface.c:351
+#: ../src/totem-interface.c:361
 msgid "Totem 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 General Public License for more details."
 msgstr "Totem se lahko razširja prosto, vendar brez kakršnekoli garancije. Za več podrobnosti si poglejte GNU Splošno javno dovoljenje."
 
-#: ../src/totem-interface.c:355
+#: ../src/totem-interface.c:365
 msgid "You should have received a copy of the GNU General Public License along with Totem; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA"
 msgstr "S programom bi morali dobiti tudi kopijo GNU splošnega javnega dovoljenja; če ga niste, pišite na Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA"
 
-#: ../src/totem-interface.c:358
+#: ../src/totem-interface.c:368
 msgid "Totem contains an exception to allow the use of proprietary GStreamer plugins."
 msgstr "Program Totem ima dovoljenje za uporabo zaščitenih GStreamer vstavkov."
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:190
+#: ../src/totem-menu.c:291
 msgid "None"
 msgstr "Noben"
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:195
+#: ../src/totem-menu.c:296
 msgctxt "Language"
 msgid "Auto"
 msgstr "Samodejno"
 
-#. Translators:
-#. * This is not a JPEG image, but a disc image, for example,
-#. * an ISO file
-#: ../src/totem-menu.c:765
-#, c-format
-msgid "Play Image '%s'"
-msgstr "Predvajaj odtis '%s'"
-
-#: ../src/totem-menu.c:768
-#: ../src/totem-menu.c:851
-#, c-format
-msgid "device%d"
-msgstr "naprava%d"
-
-#: ../src/totem-menu.c:848
-#, c-format
-msgid "Play Disc '%s'"
-msgstr "Predvajaj disk '%s'"
-
-#. This lists the back-end type and version, such as
-#. * Movie Player using GStreamer 0.10.1
-#: ../src/totem-menu.c:1189
-#, c-format
-msgid "Movie Player using %s"
-msgstr "Predvajalnik uporablja %s"
-
-#: ../src/totem-menu.c:1193
+#: ../src/totem-menu.c:789
 msgid "Copyright © 2002-2009 Bastien Nocera"
 msgstr "Avtorske pravice © 2002-2009 Bastien Nocera"
 
-#: ../src/totem-menu.c:1198
+#: ../src/totem-menu.c:794
 msgid "translator-credits"
 msgstr ""
 "Matic Žgur \n"
 "Matej Urbančič "
 
-#: ../src/totem-menu.c:1202
+#: ../src/totem-menu.c:798
 msgid "Totem Website"
 msgstr "Spletna stran Totem"
 
-#: ../src/totem-menu.c:1236
+#: ../src/totem-menu.c:829
 msgid "Configure Plugins"
 msgstr "Nastavitve vstavkov"
 
+#: ../src/totem-object.c:162
+#, c-format
+msgid ""
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"%s\n"
+"Zaženite '%s --help' za podroben pregled celotnega seznama možnosti ukazne vrstice.\n"
+
 #. Translators: %s is the totem version number
-#: ../src/totem-object.c:471
+#: ../src/totem-object.c:591
 #, c-format
 msgid "Totem %s"
 msgstr "Totem %s"
 
-#: ../src/totem-object.c:1047
-#: ../browser-plugin/totem-plugin-viewer.c:367
-msgid "Playing"
-msgstr "Predvajanje"
-
-#: ../src/totem-object.c:1049
+#: ../src/totem-object.c:1168
 #: ../src/totem-options.c:52
 msgid "Pause"
 msgstr "Premor"
 
-#: ../src/totem-object.c:1054
-#: ../browser-plugin/totem-plugin-viewer.c:363
-msgid "Paused"
-msgstr "V premoru"
-
-#: ../src/totem-object.c:1056
-#: ../src/totem-object.c:1066
+#: ../src/totem-object.c:1175
+#: ../src/totem-object.c:1185
 #: ../src/totem-options.c:51
 msgid "Play"
 msgstr "Predvajaj"
 
-#: ../src/totem-object.c:1061
-#: ../src/totem-object.c:1659
-#: ../src/totem-statusbar.c:115
-#: ../browser-plugin/totem-plugin-viewer.c:351
-msgid "Stopped"
-msgstr "Zaustavljeno"
-
-#: ../src/totem-object.c:1142
-#: ../src/totem-object.c:1169
-#: ../src/totem-object.c:1799
-#: ../src/totem-object.c:1963
+#: ../src/totem-object.c:1267
+#: ../src/totem-object.c:1294
+#: ../src/totem-object.c:1787
+#: ../src/totem-object.c:1942
 #, c-format
 msgid "Totem could not play '%s'."
 msgstr "S programom totem ni mogoče predvajati '%s'."
 
-#: ../src/totem-object.c:1246
-#, c-format
-msgid "Totem could not play this media (%s) although a plugin is present to handle it."
-msgstr "S programom Totem ni mogoče predvajati te vrste posnetka (%s), čeprav je vstavek pravilno naložen."
-
-#: ../src/totem-object.c:1247
-msgid "You might want to check that a disc is present in the drive and that it is correctly configured."
-msgstr "Preverite, da je disk v pogonu in ali je pogon pravilno nastavljen."
-
-#: ../src/totem-object.c:1255
-msgid "More information about media plugins"
-msgstr "Več podrobnosti o vstavkih zapisov posnetkov"
-
-#: ../src/totem-object.c:1256
-msgid "Please install the necessary plugins and restart Totem to be able to play this media."
-msgstr "Naložite zahtevane vstavke in ponovno zaženite program za predvajanje tega vrste posnetka."
-
-#: ../src/totem-object.c:1258
-#, c-format
-msgid "Totem cannot play this type of media (%s) because it does not have the appropriate plugins to be able to read from the disc."
-msgstr "S programom Totem ni mogoče predvajati te vrste posnetka (%s), ker ni nameščenih ustreznih vstavkov za predvajanje."
-
-#: ../src/totem-object.c:1260
-#, c-format
-msgid "Totem cannot play this type of media (%s) because you do not have the appropriate plugins to handle it."
-msgstr "S programom Totem ni mogoče predvajati te vrste posnetka (%s), ker ni ustreznih vstavkov za predvajanje."
-
-#: ../src/totem-object.c:1263
-#, c-format
-msgid "Totem cannot play this type of media (%s) because it is not supported."
-msgstr "S programom Totem ni mogoče predvajati te vrste posnetka (%s), ker ta vrsta ni podprta."
-
-#: ../src/totem-object.c:1264
-msgid "Please insert another disc to play back."
-msgstr "Vstavite nov disk za predvajanje."
-
-#: ../src/totem-object.c:1300
-msgid "Totem was not able to play this disc."
-msgstr "Ni mogoče predvajati diska."
-
-#: ../src/totem-object.c:1301
-#: ../src/totem-object.c:4229
-msgid "No reason."
-msgstr "Brez razloga."
-
-#: ../src/totem-object.c:1315
-msgid "Totem does not support playback of Audio CDs"
-msgstr "Program Totem ne podpira predvajanja zvočnih CD-jev"
-
-#: ../src/totem-object.c:1316
-msgid "Please consider using a music player or a CD extractor to play this CD"
-msgstr "Uporabite predvajalnik glasbe ali pa pretvorite zapis na zvočnem CD-ju."
-
-#: ../src/totem-object.c:1805
+#: ../src/totem-object.c:1793
 msgid "No error message"
 msgstr "Ni sporočil o napakah"
 
-#: ../src/totem-object.c:2154
+#: ../src/totem-object.c:2133
 msgid "Totem could not display the help contents."
 msgstr "Ni mogoče zagnati vsebine pomoči."
 
-#: ../src/totem-object.c:2493
-#: ../src/totem-object.c:2495
-#: ../browser-plugin/totem-plugin-viewer.c:1417
-msgid "An error occurred"
-msgstr "Prišlo je do napake"
-
-#: ../src/totem-object.c:4064
-#: ../src/totem-object.c:4066
+#: ../src/totem-object.c:4019
+#: ../src/totem-object.c:4021
 msgid "Previous Chapter/Movie"
 msgstr "Predhodno poglavje/film"
 
-#: ../src/totem-object.c:4073
-#: ../src/totem-object.c:4075
+#: ../src/totem-object.c:4028
+#: ../src/totem-object.c:4030
 msgid "Play / Pause"
 msgstr "Predvajaj / Premor"
 
-#: ../src/totem-object.c:4083
-#: ../src/totem-object.c:4085
+#: ../src/totem-object.c:4038
+#: ../src/totem-object.c:4040
 msgid "Next Chapter/Movie"
 msgstr "Naslednje poglavje/film"
 
-#. Translators: this is the tooltip text for the fullscreen button in the controls box in Totem's main window.
 #. Translators: this is the accessibility text for the fullscreen button in the controls box in Totem's main window.
-#: ../src/totem-object.c:4097
-#: ../src/totem-object.c:4099
+#: ../src/totem-object.c:4051
+#: ../src/totem-object.c:4053
 msgid "Fullscreen"
 msgstr "Celozaslonski način"
 
-#: ../src/totem-object.c:4229
+#: ../src/totem-object.c:4184
 msgid "Totem could not startup."
 msgstr "Programa Totem ni mogoče zagnati"
 
+#: ../src/totem-object.c:4184
+msgid "No reason."
+msgstr "Brez razloga."
+
 #: ../src/totem-open-location.c:182
 msgid "Open Location..."
 msgstr "Odpri mesto ..."
@@ -1384,119 +1394,113 @@
 msgid "Movies to play"
 msgstr "Filmi za predvajanje"
 
-#: ../src/totem-options.c:117
+#: ../src/totem-options.c:79
+msgid "- Play movies and songs"
+msgstr "- predvajanje filmov in glasbe"
+
+#: ../src/totem-options.c:142
 msgid "Can't enqueue and replace at the same time"
 msgstr "Ni mogoče hkrati postaviti v vrsto in zamenjati"
 
 #. By extension entry
-#: ../src/totem-playlist.c:161
+#: ../src/totem-playlist.c:162
 msgid "MP3 ShoutCast playlist"
 msgstr "MP3 ShoutCast seznam predvajanja"
 
-#: ../src/totem-playlist.c:162
+#: ../src/totem-playlist.c:163
 msgid "MP3 audio (streamed)"
 msgstr "MP3 zvok (pretočni)"
 
-#: ../src/totem-playlist.c:163
+#: ../src/totem-playlist.c:164
 msgid "MP3 audio (streamed, DOS format)"
 msgstr "MP3 zvok (pretočni v DOS obliki)"
 
-#: ../src/totem-playlist.c:164
+#: ../src/totem-playlist.c:165
 msgid "XML Shareable Playlist"
 msgstr "XML souporabni seznama predvajanja"
 
 #. This is "Title 3", where title is a DVD title
 #. * Note: NOT a DVD chapter
-#: ../src/totem-playlist.c:347
+#: ../src/totem-playlist.c:348
 #, c-format
 msgid "Title %d"
 msgstr "Naslov %d"
 
-#: ../src/totem-playlist.c:446
+#: ../src/totem-playlist.c:447
 msgid "Could not save the playlist"
 msgstr "Ni mogoče shraniti seznama predvajanja"
 
-#: ../src/totem-playlist.c:1021
+#: ../src/totem-playlist.c:1022
 msgid "Save Playlist"
 msgstr "Shrani seznam predvajanja"
 
 #. translators: Playlist is the default saved playlist filename,
 #. * without the suffix
-#: ../src/totem-playlist.c:1033
-#: ../src/totem-playlist.c:1264
-#: ../src/totem-sidebar.c:142
+#: ../src/totem-playlist.c:1034
+#: ../src/totem-playlist.c:1263
+#: ../src/totem-sidebar.c:145
 msgid "Playlist"
 msgstr "Seznam predvajanja"
 
-#: ../src/totem-playlist.c:1857
+#: ../src/totem-playlist.c:1862
 #, c-format
 msgid "The playlist '%s' could not be parsed. It might be damaged."
 msgstr "Seznama predvajanja '%s' ni mogoče razčleniti. Morda je seznam poškodovan."
 
-#: ../src/totem-playlist.c:1858
+#: ../src/totem-playlist.c:1863
 msgid "Playlist error"
 msgstr "Napaka seznama predvajanja"
 
-#: ../src/totem-preferences.c:295
+#: ../src/totem-preferences.c:297
 msgid "Preferences"
 msgstr "Možnosti"
 
-#: ../src/totem-preferences.c:451
+#: ../src/totem-preferences.c:445
 msgid "Select Subtitle Font"
 msgstr "Izbor pisave podnapisa"
 
-#: ../src/totem-properties-main.c:115
-#: ../src/totem-properties-view.c:266
+#: ../src/totem-properties-main.c:116
+#: ../src/totem-properties-view.c:269
 msgid "Audio/Video"
 msgstr "Zvok / Slika"
 
-#: ../src/totem-properties-view.c:128
+#: ../src/totem-properties-view.c:131
 msgid "N/A"
 msgstr "N/A"
 
-#: ../src/totem-properties-view.c:157
+#: ../src/totem-properties-view.c:160
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 msgctxt "Stream bit rate"
 msgid "N/A"
 msgstr "N/A"
 
-#: ../src/totem-properties-view.c:160
+#: ../src/totem-properties-view.c:163
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: ../src/totem-properties-view.c:177
+#: ../src/totem-properties-view.c:180
 #: ../src/plugins/properties/totem-movie-properties.c:149
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../src/totem-properties-view.c:209
+#: ../src/totem-properties-view.c:212
 #: ../src/plugins/properties/totem-movie-properties.c:166
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: ../src/totem-properties-view.c:216
+#: ../src/totem-properties-view.c:219
 #: ../src/plugins/properties/totem-movie-properties.c:166
 msgctxt "Sample rate"
 msgid "N/A"
 msgstr "ni podatka"
 
-#: ../src/totem-properties-view.c:224
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5589
-msgid "Surround"
-msgstr "Surround sistem zvoka"
-
-#: ../src/totem-properties-view.c:226
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5591
-msgid "Mono"
-msgstr "Mono"
-
-#: ../src/totem-properties-view.c:236
+#: ../src/totem-properties-view.c:239
 msgctxt "Number of audio channels"
 msgid "N/A"
 msgstr "N/A"
@@ -1531,8 +1535,8 @@
 #. eg: 75 %
 #: ../src/totem-statusbar.c:250
 #, c-format
-msgid "%d %%"
-msgstr "%d %%"
+msgid "%lf %%"
+msgstr "%lf %%"
 
 #. eg: Paused, 0:32 / 1:05
 #: ../src/totem-statusbar.c:325
@@ -1543,8 +1547,8 @@
 #. eg: Buffering, 75 %
 #: ../src/totem-statusbar.c:330
 #, c-format
-msgid "%s, %d %%"
-msgstr "%s, %d %%"
+msgid "%s, %f %%"
+msgstr "%s, %f %%"
 
 #: ../src/totem-subtitle-encoding.c:156
 msgid "Current Locale"
@@ -1713,199 +1717,93 @@
 msgid "Vietnamese"
 msgstr "Vietnamski"
 
-#: ../src/totem-video-list.c:330
-msgid "No video URI"
-msgstr "Ni video naslova URI"
-
-#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
-#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
-#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
-#: ../src/totem-video-thumbnailer.c:872
-#, c-format
-msgid ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-msgstr ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-
-#: ../src/totem-video-thumbnailer.c:873
-msgid "Filename"
-msgstr "Ime datoteke"
-
-#: ../src/totem-video-thumbnailer.c:875
-msgid "Resolution"
-msgstr "Ločljivost"
-
-#: ../src/totem-video-thumbnailer.c:878
-msgid "Duration"
-msgstr "Trajanje"
-
-#: ../src/totem-uri.c:506
+#: ../src/totem-uri.c:343
 #: ../src/plugins/chapters/totem-chapters.c:998
 msgid "All files"
 msgstr "Vse datoteke"
 
-#: ../src/totem-uri.c:511
+#: ../src/totem-uri.c:348
 #: ../src/plugins/chapters/totem-chapters.c:995
 msgid "Supported files"
 msgstr "Podprte datoteke"
 
-#: ../src/totem-uri.c:523
+#: ../src/totem-uri.c:360
 msgid "Audio files"
 msgstr "Zvočne datoteke"
 
-#: ../src/totem-uri.c:531
+#: ../src/totem-uri.c:368
 msgid "Video files"
 msgstr "Video datoteke"
 
-#: ../src/totem-uri.c:541
+#: ../src/totem-uri.c:378
 msgid "Subtitle files"
 msgstr "Datoteke podnapisov"
 
-#: ../src/totem-uri.c:593
+#: ../src/totem-uri.c:430
 msgid "Select Text Subtitles"
 msgstr "Izbor podnapisov"
 
-#: ../src/totem-uri.c:656
+#: ../src/totem-uri.c:495
 msgid "Select Movies or Playlists"
 msgstr "Izberite filme ali sezname predvajanja"
 
-#. Options parsing
-#: ../src/totem.c:201
-msgid "- Play movies and songs"
-msgstr "- predvajanje filmov in glasbe"
+#: ../src/totem-uri.c:499
+msgid "Add Directory"
+msgstr "Dodaj mapo"
+
+#: ../src/totem-video-list.c:330
+msgid "No video URI"
+msgstr "Ni video naslova URI"
 
-#: ../src/totem.c:212
+#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
+#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
+#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
+#: ../src/totem-video-thumbnailer.c:841
 #, c-format
 msgid ""
-"%s\n"
-"Run '%s --help' to see a full list of available command line options.\n"
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 msgstr ""
-"%s\n"
-"Zaženite '%s --help' za podroben pregled celotnega seznama možnosti ukazne vrstice.\n"
-
-#: ../src/totem.c:254
-#: ../src/totem.c:265
-#: ../browser-plugin/totem-plugin-viewer.c:663
-#: ../browser-plugin/totem-plugin-viewer.c:1793
-msgid "Totem Movie Player"
-msgstr "Totem predvajalnik filmov"
-
-#: ../src/totem.c:255
-#: ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Could not initialize the thread-safe libraries."
-msgstr "Ni mogoče naložiti knjižnic varovanja niti."
-
-#: ../src/totem.c:255
-msgid "Verify your system installation. Totem will now exit."
-msgstr "Preverite sistemske nastavitve. Totem bo končan."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:1589
-msgid "Password requested for RTSP server"
-msgstr "Zahtevano je geslo za dostop do RTSP strežnika"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2858
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2862
-#, c-format
-msgid "Audio Track #%d"
-msgstr "Zvočna sled #%d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2890
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2894
-#, c-format
-msgid "Subtitle #%d"
-msgstr "Podnapis #%d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3298
-msgid "The requested audio output was not found. Please select another audio output in the Multimedia Systems Selector."
-msgstr "Zahtevanega odvoda zvoka ni mogoče najti. Izberite drug odvod zvoka med sistemskimi nastavitvami."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3303
-msgid "Location not found."
-msgstr "Mesta ni mogoče najti."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3307
-msgid "Could not open location; you might not have permission to open the file."
-msgstr "Ni mogoče odpreti želenega mesta; morda nimate ustreznih dovoljenj."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3318
-msgid "The video output is in use by another application. Please close other video applications, or select another video output in the Multimedia Systems Selector."
-msgstr "Odvod slike uporablja drug program. Ustavite program, ki zaseda odvod, ali pa izberite nov odvod med nastavitvami sistema."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3324
-msgid "The audio output is in use by another application. Please select another audio output in the Multimedia Systems Selector. You may want to consider using a sound server."
-msgstr "Odvod zvoka uporablja drug program. Ustavite program, ki zaseda izhod, ali pa izberite nov odvod med nastavitvami sistema. Razmislite o uporabi zvočnega strežnika."
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 
-#. should be exactly one missing thing (source or converter)
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3342
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3348
-#, c-format
-msgid "The playback of this movie requires a %s plugin which is not installed."
-msgid_plural ""
-"The playback of this movie requires the following decoders which are not installed:\n"
-"\n"
-"%s"
-msgstr[0] ""
-"Predvajanje tega posnetka zahteva uporabo navedenih dekodirnikov, ki pa niso nameščeni:\n"
-"\n"
-"%s"
-msgstr[1] "Predvajanje tega posnetka zahteva uporabo dekodirnika %s, ki pa ni nameščen."
-msgstr[2] ""
-"Predvajanje tega posnetka zahteva uporabo navedenih dekodirnikov, ki pa niso nameščeni:\n"
-"\n"
-"%s"
-msgstr[3] ""
-"Predvajanje tega posnetka zahteva uporabo navedenih dekodirnikov, ki pa niso nameščeni:\n"
-"\n"
-"%s"
+#: ../src/totem-video-thumbnailer.c:842
+msgid "Filename"
+msgstr "Ime datoteke"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3374
-msgid "Cannot play this file over the network. Try downloading it to disk first."
-msgstr "Ni mogoče predvajanje preko omrežja. Poskusite prenesti datoteko na disk."
+#: ../src/totem-video-thumbnailer.c:844
+msgid "Resolution"
+msgstr "Ločljivost"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5878
-msgid "Media contains no supported video streams."
-msgstr "Posnetek ne vsebuje podprtih pretokov slike."
+#: ../src/totem-video-thumbnailer.c:847
+msgid "Duration"
+msgstr "Trajanje"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6052
-msgid "Failed to create a GStreamer play object. Please check your GStreamer installation."
-msgstr "Napaka med ustvarjanjem GStreamer predmeta predvajanja. Preverite nastavitve."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6172
-msgid "Failed to open audio output. You may not have permission to open the sound device, or the sound server may not be running. Please select another audio output in the Multimedia Systems Selector."
-msgstr "Napaka med odpiranjem zvočnega odvoda. Morda ni ustreznih sistemskih dovoljenj za odpiranje zvočne naprave ali pa zvočni strežnik ne deluje. Izberite drug zvočni odvod v sistemskih nastavitvah."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6192
-msgid "Could not find the audio output. You may need to install additional GStreamer plugins, or select another audio output in the Multimedia Systems Selector."
-msgstr "Ni mogoče najti odvoda zvoka. Naložiti je treba dodatne GStreamer vstavke ali pa je treba izbrati drug odvod slike med sistemskimi nastavitvami."
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:1
+msgid "Apple Trailers"
+msgstr "Napovedniki Apple"
+
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:2
+msgid "Sets the user agent for the Apple Trailers site"
+msgstr "Nastavi uporabniški dostop do spletišča napovednikov filmov Apple"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:1
+msgid "Autoload Subtitles"
+msgstr "Samodejno nalaganje podnapisov"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:2
+msgid "Autoloads text subtitles"
+msgstr "Naloži podnapise samodejno ob predvajanju posnetka"
 
-#. hour:minutes:seconds
-#. Translators: This is a time format, like "9:05:02" for 9
-#. * hours, 5 minutes, and 2 seconds. You may change ":" to
-#. * the separator that your locale uses or use "%Id" instead
-#. * of "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:83
-#: ../src/plugins/skipto/totem-time-entry.c:57
-#, c-format
-msgctxt "long time format"
-msgid "%d:%02d:%02d"
-msgstr "%d:%02d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
+msgid "Video Disc Recorder"
+msgstr "Snemalnik video diskov"
 
-#. minutes:seconds
-#. Translators: This is a time format, like "5:02" for 5
-#. * minutes and 2 seconds. You may change ":" to the
-#. * separator that your locale uses or use "%Id" instead of
-#. * "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:92
-#, c-format
-msgctxt "short time format"
-msgid "%d:%02d"
-msgstr "%d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
+msgid "Records (S)VCDs or video DVDs"
+msgstr "Zapiše (S)VCD ali video DVD"
 
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:65
 msgid "_Create Video Disc..."
@@ -1931,38 +1829,21 @@
 msgid "Copy the currently playing (S)VCD"
 msgstr "Kopiraj trenutno predvajani (S)VCD"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:129
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:136
 msgid "The video disc could not be duplicated."
 msgstr "Video diska ni mogoče podvojiti."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:131
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:276
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:138
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:283
 msgid "The movie could not be recorded."
 msgstr "Filma ni mogoče posneti."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:157
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:167
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:263
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:164
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:174
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:270
 msgid "Unable to write a project."
 msgstr "Ni mogoče zapisati projekta."
 
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
-msgid "Video Disc Recorder"
-msgstr "Snemalnik video diskov"
-
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
-msgid "Records (S)VCDs or video DVDs"
-msgstr "Zapiše (S)VCD ali video DVD"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:1
-#: ../src/plugins/chapters/totem-chapters.c:1139
-msgid "Chapters"
-msgstr "Poglavja"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:2
-msgid "Support chapter markers in movies."
-msgstr "Omogoči podporo oznakam poglavij filmov."
-
 #: ../src/plugins/chapters/chapters-edit.ui.h:1
 msgid "Name for new chapter:"
 msgstr "Ime novega poglavja:"
@@ -2019,6 +1900,15 @@
 msgid "Create a new chapter list for the movie"
 msgstr "Ustvari nov seznam poglavij filma"
 
+#: ../src/plugins/chapters/chapters.plugin.in.h:1
+#: ../src/plugins/chapters/totem-chapters.c:1139
+msgid "Chapters"
+msgstr "Poglavja"
+
+#: ../src/plugins/chapters/chapters.plugin.in.h:2
+msgid "Support chapter markers in movies"
+msgstr "Omogoči podporo oznakam poglavij filmov."
+
 #: ../src/plugins/chapters/totem-chapters.c:56
 #, c-format
 msgid ""
@@ -2119,13 +2009,39 @@
 msgid "The URI ‘%s’ is not supported."
 msgstr "Naslov URI ‘%s’ ni podprt."
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
-msgid "Instant Messenger status"
-msgstr "Stanje hipnih sporočil"
+#: ../src/plugins/grilo/grilo.plugin.in.h:1
+msgid "Grilo Browser"
+msgstr "Brskalnik Grilo"
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
-msgid "Set your Instant Messenger status to away when a movie is playing"
-msgstr "Nastavi stanje hipnih sporočil na odsotno med predvajanjem posnetka."
+#: ../src/plugins/grilo/grilo.plugin.in.h:2
+msgid "A plugin to let you browse media content from various sources"
+msgstr "Vstavek za brskanje med posnetki predstavnih vsebin različnih virov."
+
+#: ../src/plugins/grilo/grilo.ui.h:1
+msgid "Add to Playlist"
+msgstr "Dodaj na seznam predvajanja"
+
+#: ../src/plugins/grilo/grilo.ui.h:2
+msgid "Copy Location"
+msgstr "Kopiraj mesto"
+
+#: ../src/plugins/grilo/grilo.ui.h:3
+#: ../src/plugins/grilo/totem-grilo.c:1184
+msgid "Browse"
+msgstr "Prebrskaj"
+
+#: ../src/plugins/grilo/grilo.ui.h:4
+#: ../src/plugins/grilo/totem-grilo.c:1227
+msgid "Search"
+msgstr "Iskanje"
+
+#: ../src/plugins/grilo/totem-grilo.c:454
+msgid "Browse Error"
+msgstr "Napaka med brskanjem"
+
+#: ../src/plugins/grilo/totem-grilo.c:609
+msgid "Search Error"
+msgstr "Napaka med iskanjem"
 
 #: ../src/plugins/gromit/gromit.plugin.in.h:1
 msgid "Gromit Annotations"
@@ -2139,49 +2055,13 @@
 msgid "The gromit binary was not found."
 msgstr "Binarne datoteke gromit ni mogoče najti."
 
-#. Add the interface to Totem's sidebar
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:1
-#: ../src/plugins/iplayer/iplayer.py:46
-msgid "BBC iPlayer"
-msgstr "BBC iPredvajalnik"
-
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:2
-msgid "Stream BBC programs from the last 7 days from the BBC iPlayer service."
-msgstr "Pretakanje BBC programov zadnjih sedmih dni preko storitve BBC iPredvajalnik."
-
-#: ../src/plugins/iplayer/iplayer.py:72
-msgid "Error listing channel categories"
-msgstr "Napaka med izpisovanjem kategorij kanala"
-
-#: ../src/plugins/iplayer/iplayer.py:73
-msgid "There was an unknown error getting the list of television channels available on BBC iPlayer."
-msgstr "Prišlo je do neznane napake pri pridobivanju seznama televizijskih programov na BBC iPredvajalniku."
-
-#. Append a dummy child row so that the expander's visible; we can
-#. then queue off the expander to load the programme listing for this
-#. category
-#: ../src/plugins/iplayer/iplayer.py:84
-msgid "Loading…"
-msgstr "Nalaganje ..."
-
-#. Translators: the "programme feed" is the list of TV shows
-#. available to watch online
-#: ../src/plugins/iplayer/iplayer.py:136
-msgid "Error getting programme feed"
-msgstr "Napaka med pridobivanjem programskega vira"
-
-#: ../src/plugins/iplayer/iplayer.py:137
-msgid "There was an error getting the list of programmes for this channel and category combination."
-msgstr "Prišlo je do neznane napake med pridobivanjem seznama programov kanala v povezavi s kategorijami."
-
-#: ../src/plugins/iplayer/iplayer2.py:298
-msgid ""
-msgstr ""
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
+msgid "Instant Messenger Status"
+msgstr "Stanje hipnega sporočilnika"
 
-#: ../src/plugins/iplayer/iplayer2.py:299
-#, python-format
-msgid "Programme unavailable (\"%s\")"
-msgstr "Program ni na voljo (\"%s\")"
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
+msgid "Set your Instant Messenger status to away when a movie is playing"
+msgstr "Nastavi stanje hipnih sporočil na odsotno med predvajanjem posnetka."
 
 #: ../src/plugins/lirc/lirc.plugin.in.h:1
 msgid "Infrared Remote Control"
@@ -2199,25 +2079,29 @@
 msgid "Couldn't read lirc configuration."
 msgstr "Ni mogoče prebrati lirc nastavitev."
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
-msgid "Download Movie Subtitles"
-msgstr "Prejmi podnapis filma"
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:1
+msgid "Media Player Keys"
+msgstr "Tipke predstavnih predvajalnikov"
+
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:2
+msgid "Support additional media player keys"
+msgstr "Podpora dodatnim predstavnim tipkam predvajalnika"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
-msgid "Subtitle _language:"
-msgstr "_Jezik podnapisov:"
+#: ../src/plugins/ontop/ontop.plugin.in.h:1
+msgid "Always On Top"
+msgstr "Vedno na vrhu"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
-msgid "_Play with Subtitle"
-msgstr "_Predvajaj s podnapisi"
+#: ../src/plugins/ontop/ontop.plugin.in.h:2
+msgid "Keep the main window on top when playing a movie"
+msgstr "Glavno okno je med predvajanjem vedno na vrhu."
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:1
 msgid "Subtitle Downloader"
 msgstr "Prejemnik podnapisov"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:2
-msgid "Look for subtitles for the currently playing movie."
-msgstr "Poišči podnapise za trenutno predvajani film."
+msgid "Look for subtitles for the currently playing movie"
+msgstr "Poišči podnapise za trenutno predvajani posnetek."
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:42
 msgid "Brazilian Portuguese"
@@ -2273,6 +2157,18 @@
 msgid "Searching subtitles…"
 msgstr "Iskanje podnapisov ..."
 
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
+msgid "Download Movie Subtitles"
+msgstr "Prejmi podnapis filma"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
+msgid "Subtitle _language:"
+msgstr "_Jezik podnapisov:"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
+msgid "_Play with Subtitle"
+msgstr "_Predvajaj s podnapisi"
+
 #: ../src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in.h:1
 msgid "Subtitle language"
 msgstr "Jezik podnapisov"
@@ -2281,67 +2177,18 @@
 msgid "The language to search for subtitles for movies in."
 msgstr "Jezik iskanih podnapisov filmov."
 
-#: ../src/plugins/ontop/ontop.plugin.in.h:1
-msgid "Always On Top"
-msgstr "Vedno na vrhu"
-
-#: ../src/plugins/ontop/ontop.plugin.in.h:2
-msgid "Keep the main window on top when playing a movie"
-msgstr "Glavno okno je med predvajanjem vedno na vrhu."
+#: ../src/plugins/properties/movie-properties.plugin.in.h:1
+msgid "Movie Properties"
+msgstr "Lastnosti posnetka"
+
+#: ../src/plugins/properties/movie-properties.plugin.in.h:2
+msgid "Adds movie properties to the sidebar"
+msgstr "Doda lastnosti posnetka v stransko vrstico"
 
 #: ../src/plugins/properties/totem-movie-properties.c:246
 msgid "Properties"
 msgstr "Lastnosti"
 
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:1
-msgid "Publisher protocol to use"
-msgstr "Protokol založnika za uporabo"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:2
-msgid "The transport protocol to use when publishing playlists over the network."
-msgstr "Uporabljen protokol prenosa za objavljanje seznamov predvajanja preko omrežja."
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:3
-msgid "Format for network service name"
-msgstr "Zapis imena omrežne storitve"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:5
-#, no-c-format
-msgid "A format string used to build the network service name used when publishing playlists over the network. The following format placeholders can be used: • %a: the program name as returned by g_get_application_name() • %h: the machine's host name in title case • %u: the user's login name in title case • %U: the user's real name • %%: the percent sign"
-msgstr "Niz oblike zapisa, ki je uporabljen za izgradnjo imena omrežne storitve med objavljanjem seznama predvajanja preko omrežja. Uporabiti je mogoče naslednja držala: • %a: vrne ime programa kot je določen z možnostjo g_get_application_name() • %h: ime gostitelja računalnika • %u: prijavno ime uporabnika • %U: pravo ime uporabnika • %%: znak za odstotek"
-
-#. Translators: computers on the local network which are publishing their playlists over the network
-#: ../src/plugins/publish/totem-publish.c:552
-msgid "Neighbors"
-msgstr "Sosedje"
-
-#: ../src/plugins/publish/publish.plugin.in.h:1
-msgid "Publish Playlist"
-msgstr "Objavi seznam predvajanja"
-
-#: ../src/plugins/publish/publish.plugin.in.h:2
-msgid "Share the current playlist via HTTP"
-msgstr "Izmenjava trenutnega seznama predvajanja preko HTTP"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:1
-msgid "Service _Name:"
-msgstr "Ime _storitve:"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:3
-#, no-c-format
-msgid ""
-"The name used for announcing the playlist service on the network.\n"
-"All occurrences of the string %u will be replaced by your name,\n"
-"and %h will be replaced by your computer's host name."
-msgstr ""
-"Ime se uporablja pri objavljanju storitev seznama predvajanja v omrežju.\n"
-"Najdeni nizi %u bodo zamenjani z vašim imenom,\n"
-"in %h z imenom gostitelja vašega računalnika."
-
-#: ../src/plugins/publish/publish-plugin.ui.h:6
-msgid "Use _encrypted transport protocol (HTTPS)"
-msgstr "Uporabi _šifriran način prenosa (HTTPS)"
-
 #: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:1
 msgid "rpdb2 password"
 msgstr "geslo rpdb2"
@@ -2350,22 +2197,84 @@
 msgid "A password to protect the rpdb2 server for debugging Totem from unauthorized remote access. If this is empty, a default of 'totem' will be used."
 msgstr "Geslo za zaščito strežnika rpdb2 za razhroščevanje programa Totem pred nepooblaščenim oddaljenim dostopom. V kolikor je možnost prazna, bo uporabljena privzeta vrednost 'totem'."
 
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
+msgid "Python Console"
+msgstr "Konzola python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
+msgid "Interactive Python console"
+msgstr "Vzajemna konzola python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:88
+msgid "Python Console Menu"
+msgstr "Meni konzole python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:93
+msgid "_Python Console"
+msgstr "Konzola _python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:94
+msgid "Show Totem's Python console"
+msgstr "Pokaži konzolo python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:100
+msgid "Python Debugger"
+msgstr "Razhroščevalnik Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:101
+msgid "Enable remote Python debugging with rpdb2"
+msgstr "Omogoči oddaljeno razhroščevanje z rpdb2"
+
+#. pylint: disable-msg=E1101
+#: ../src/plugins/pythonconsole/pythonconsole.py:125
+#, python-format
+msgid ""
+"You can access the Totem.Object through 'totem_object' :\\n"
+"%s"
+msgstr ""
+"Dostop do predmeta Totem.Object je mogoč preko 'totem_object' :\\n"
+"%s"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:129
+msgid "Totem Python Console"
+msgstr "Totem python konzola"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:139
+msgid "After you press OK, Totem will wait until you connect to it with winpdb or rpdb2. If you have not set a debugger password in DConf, it will use the default password ('totem')."
+msgstr "Po potrditvi ukaza, program počaka na povezavo preko winpdb ali rpdb2. V primeru, da ni določenega gesla v razhroščevalniku v DConf, bo uporabljeno privzeto geslo ('totem')."
+
+#: ../src/plugins/recent/recent.plugin.in.h:1
+msgid "Recent files"
+msgstr "Nedavne datoteke"
+
+#: ../src/plugins/recent/recent.plugin.in.h:2
+msgid "Adds files that have been played to recent files"
+msgstr "Doda predvajane datoteke na seznam nedavnih"
+
 #: ../src/plugins/rotation/rotation.plugin.in.h:1
 msgid "Rotation Plugin"
 msgstr "Vstavek vrtenja slike"
 
 #: ../src/plugins/rotation/rotation.plugin.in.h:2
-msgid "Allows videos to be rotated if they're in the wrong orientation."
-msgstr "Omogoča vrtenje slike video posnetka, v kolikor je ta posnet narobe."
+msgid "Allows videos to be rotated if they are in the wrong orientation"
+msgstr "Omogoča vrtenje slike video posnetka, v kolikor je ta usmerjen napačno."
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:60
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:50
 msgid "_Rotate Clockwise"
 msgstr "Zavrti v _desno"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:62
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:52
 msgid "Rotate Counterc_lockwise"
 msgstr "Zavrti v _levo"
 
+#: ../src/plugins/save-file/save-file.plugin.in.h:1
+msgid "Save Copy"
+msgstr "Shrani kopijo"
+
+#: ../src/plugins/save-file/save-file.plugin.in.h:2
+msgid "Save a copy of the currently playing movie"
+msgstr "Shrani kopijo trenutno predvajanega posnetka"
+
 #: ../src/plugins/save-file/totem-save-file.c:63
 msgid "Save a Copy..."
 msgstr "Shrani kopijo ..."
@@ -2388,10 +2297,13 @@
 msgid "Movie stream"
 msgstr "Pretok filma"
 
-#: ../src/plugins/screensaver/totem-screensaver.c:116
-#: ../browser-plugin/totem-plugin-viewer.c:1891
-msgid "Playing a movie"
-msgstr "Predvajanje filma"
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:1
+msgid "Screen Saver"
+msgstr "Ohranjevalnik zaslona"
+
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:2
+msgid "Deactivates the screen saver when a movie is playing"
+msgstr "Onemogoči ohranjevalnik zaslona med predvajanjem posnetka"
 
 #: ../src/plugins/screenshot/gallery.ui.h:1
 msgid "Screenshot width (in pixels):"
@@ -2405,23 +2317,28 @@
 msgid "Number of screenshots:"
 msgstr "Število zajetih slik:"
 
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:1
-msgid "_Name:"
-msgstr "_Ime:"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:2
-msgid "Save in _folder:"
-msgstr "_Shrani v mapo:"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:3
-msgid "Select a folder"
-msgstr "Izbira mape"
-
-#. Write the screenshot to the temporary file
-#: ../src/plugins/screenshot/gnome-screenshot-widget.c:385
-#: ../src/plugins/screenshot/totem-screenshot.c:64
-msgid "Screenshot.png"
-msgstr "slika.png"
+#. translators: this is the name of the file that gets made up
+#. * with the screenshot if the entire screen is taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:147
+#, c-format
+msgid "Screenshot from %s.png"
+msgstr "Zaslonska slika %s.png"
+
+#. translators: this is the name of the file that gets
+#. * made up with the screenshot if the entire screen is
+#. * taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:154
+#, c-format
+msgid "Screenshot from %s - %d.png"
+msgstr "Zaslonska slika %s - %d.png"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:1
+msgid "Screenshot"
+msgstr "Zaslonska slika"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:2
+msgid "Allows screenshots and galleries to be taken of videos"
+msgstr "Dovoli zajemanje zaslonskih slik iz posnetkov"
 
 #: ../src/plugins/screenshot/totem-gallery.c:91
 msgid "Save Gallery"
@@ -2447,49 +2364,47 @@
 msgid "Saving gallery as \"%s\""
 msgstr "Shranjevanje galerije kot \"%s\""
 
-#: ../src/plugins/screenshot/totem-screenshot.c:113
-msgid "There was an error saving the screenshot."
-msgstr "Prišlo je do napake pri shranjevanju zajete slike."
-
-#: ../src/plugins/screenshot/totem-screenshot.c:139
-msgid "Save Screenshot"
-msgstr "Shrani zajeto sliko"
-
-#. Create the screenshot widget
-#. Translators: %s is the movie title and %d is an auto-incrementing number to make filename unique
-#: ../src/plugins/screenshot/totem-screenshot.c:160
-#, c-format
-msgid "Screenshot-%s-%d.png"
-msgstr "slika-%s-%d.png"
-
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:88
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:220
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "Totem could not get a screenshot of the video."
 msgstr "Ni mogoče pridobiti zaslonske slike predvajanega posnetka."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "This is not supposed to happen; please file a bug report."
 msgstr "Prišlo je do nepričakovane napake; pošljite poročilo o hrošču."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
-msgid "Take _Screenshot..."
-msgstr "Zajem _zaslonske slike ..."
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
+msgid "Take _Screenshot"
+msgstr "Zajemi zaslonsko _sliko"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
 msgid "Take a screenshot"
 msgstr "Zajemi zaslonsko sliko"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create Screenshot _Gallery..."
 msgstr "Ustvari _galerijo zajetih slik ..."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create a gallery of screenshots"
 msgstr "Ustvari galerijo zajetih slik"
 
+#: ../src/plugins/skipto/skipto.plugin.in.h:1
+#: ../src/plugins/skipto/totem-skipto.c:196
+msgid "Skip To"
+msgstr "Skoči na"
+
+#: ../src/plugins/skipto/skipto.plugin.in.h:2
+msgid "Provides the \"Skip to\" dialog"
+msgstr "Omogoči pogovorno okno \"Preskoči na\""
+
+#: ../src/plugins/skipto/skipto.ui.h:1
+msgid "_Skip to:"
+msgstr "Pre_skoči na:"
+
 #. Update the "seconds" label so that it always has the correct singular/plural form
 #. Translators: label for the seconds selector in the "Skip to" dialogue
-#: ../src/plugins/skipto/totem-skipto.c:160
+#: ../src/plugins/skipto/totem-skipto.c:159
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "sekund"
@@ -2501,15 +2416,11 @@
 #. Translators: you should translate this string to a number (written in digits) which corresponds to the longer character length of the
 #. * translations for "second" and "seconds", as translated elsewhere in this file. For example, in English, "second" is 6 characters long and
 #. * "seconds" is 7 characters long, so this string should be translated to "7". See: bgo#639398
-#: ../src/plugins/skipto/totem-skipto.c:190
+#: ../src/plugins/skipto/totem-skipto.c:189
 msgctxt "Skip To label length"
 msgid "7"
 msgstr "7"
 
-#: ../src/plugins/skipto/totem-skipto.c:197
-msgid "Skip To"
-msgstr "Skoči na"
-
 #: ../src/plugins/skipto/totem-skipto-plugin.c:182
 msgid "_Skip To..."
 msgstr "_Skoči na ..."
@@ -2518,113 +2429,306 @@
 msgid "Skip to a specific time"
 msgstr "Preskoči na določen čas"
 
-#: ../src/plugins/skipto/skipto.ui.h:1
-msgid "_Skip to:"
-msgstr "Pre_skoči na:"
+#~ msgid "Location not found."
+#~ msgstr "Mesta ni mogoče najti."
 
-#: ../browser-plugin/totem-plugin-viewer.c:431
-msgid "No URI to play"
-msgstr "Ni naslova URI za predvajanje"
+#~ msgid ""
+#~ "Could not open location; you might not have permission to open the file."
+#~ msgstr "Ni mogoče odpreti želenega mesta; morda nimate ustreznih dovoljenj."
 
-#. translators: this is:
-#. * Open With ApplicationName
-#. * as in nautilus' right-click menu
-#: ../browser-plugin/totem-plugin-viewer.c:1107
-#, c-format
-msgid "_Open with \"%s\""
-msgstr "_Odpri s programom \"%s\""
+#~ msgid ""
+#~ "Failed to create a GStreamer play object. Please check your GStreamer "
+#~ "installation."
+#~ msgstr ""
+#~ "Napaka med ustvarjanjem GStreamer predmeta predvajanja. Preverite "
+#~ "nastavitve."
 
-#: ../browser-plugin/totem-plugin-viewer.c:2136
-msgid "No playlist or playlist empty"
-msgstr "Ni seznama predvajanja ali pa je ta prazen"
+#~ msgid "%d %%"
+#~ msgstr "%d %%"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2235
-msgid "Movie browser plugin"
-msgstr "Vstavek brskanja posnetkov"
+#~ msgid ""
+#~ msgstr ""
 
-#: ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Verify your system installation. The Totem plugin will now exit."
-msgstr "Preverite sistemske nastavitve. Vstavek predvajalnika Totem bo končan."
+#~ msgid "Programme unavailable (\"%s\")"
+#~ msgstr "Program ni na voljo (\"%s\")"
 
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
-msgid "Python Console"
-msgstr "Konzola python"
+#~ msgid "BBC iPlayer"
+#~ msgstr "BBC iPredvajalnik"
 
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
-msgid "Interactive Python console."
-msgstr "Interaktivna konzola python."
+#~ msgid ""
+#~ "Stream BBC programs from the last 7 days from the BBC iPlayer service"
+#~ msgstr ""
+#~ "Pretakanje programov BBC zadnjih sedmih dni preko storitve iPredvajalnik "
+#~ "BBC."
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:88
-msgid "Python Console Menu"
-msgstr "Meni konzole python"
+#~ msgid "Error listing channel categories"
+#~ msgstr "Napaka med izpisovanjem kategorij kanala"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:93
-msgid "_Python Console"
-msgstr "Konzola _python"
+#~ msgid ""
+#~ "There was an unknown error getting the list of television channels "
+#~ "available on BBC iPlayer."
+#~ msgstr ""
+#~ "Prišlo je do neznane napake pri pridobivanju seznama televizijskih "
+#~ "programov na BBC iPredvajalniku."
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:94
-msgid "Show Totem's Python console"
-msgstr "Pokaži konzolo python"
+#~ msgid "Loading…"
+#~ msgstr "Nalaganje ..."
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:100
-msgid "Python Debugger"
-msgstr "Razhroščevalnik Python"
+#~ msgid "Error getting programme feed"
+#~ msgstr "Napaka med pridobivanjem programskega vira"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:101
-msgid "Enable remote Python debugging with rpdb2"
-msgstr "Omogoči oddaljeno razhroščevanje z rpdb2"
+#~ msgid ""
+#~ "There was an error getting the list of programmes for this channel and "
+#~ "category combination."
+#~ msgstr ""
+#~ "Prišlo je do neznane napake med pridobivanjem seznama programov kanala v "
+#~ "povezavi s kategorijami."
 
-#. pylint: disable-msg=E1101
-#: ../src/plugins/pythonconsole/pythonconsole.py:125
-#, python-format
-msgid ""
-"You can access the Totem.Object through 'totem_object' :\\n"
-"%s"
-msgstr ""
-"Dostop do predmeta Totem.Object je mogoč preko 'totem_object' :\\n"
-"%s"
+#~ msgid "_Name:"
+#~ msgstr "_Ime:"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:129
-msgid "Totem Python Console"
-msgstr "Totem python konzola"
+#~ msgid "Save in _folder:"
+#~ msgstr "_Shrani v mapo:"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:139
-msgid "After you press OK, Totem will wait until you connect to it with winpdb or rpdb2. If you have not set a debugger password in DConf, it will use the default password ('totem')."
-msgstr "Po potrditvi ukaza, program počaka na povezavo preko winpdb ali rpdb2. V primeru, da ni določenega gesla v razhroščevalniku v DConf, bo uporabljeno privzeto geslo ('totem')."
+#~ msgid "Select a folder"
+#~ msgstr "Izbira mape"
 
-#: ../src/plugins/grilo/grilo.plugin.in.h:1
-msgid "Grilo Browser"
-msgstr "Brskalnik Grilo"
+#~ msgid "There was an error saving the screenshot."
+#~ msgstr "Prišlo je do napake pri shranjevanju zajete slike."
 
-#: ../src/plugins/grilo/grilo.plugin.in.h:2
-msgid "A plugin to let you browse media content from various sources."
-msgstr "Vstavek za brskanje med posnetki predstavne vsebine različnih virov."
+#~ msgid "Save Screenshot"
+#~ msgstr "Shrani zajeto sliko"
 
-#: ../src/plugins/grilo/totem-grilo.c:452
-msgid "Browse Error"
-msgstr "Napaka med brskanjem"
+#~ msgid "14.4 Kbps Modem"
+#~ msgstr "14.4 Kbps modem"
 
-#: ../src/plugins/grilo/totem-grilo.c:599
-msgid "Search Error"
-msgstr "Napaka med iskanjem"
+#~ msgid "19.2 Kbps Modem"
+#~ msgstr "19.2 Kbps modem"
 
-#: ../src/plugins/grilo/totem-grilo.c:1219
-#: ../src/plugins/grilo/grilo.ui.h:3
-msgid "Browse"
-msgstr "Prebrskaj"
+#~ msgid "28.8 Kbps Modem"
+#~ msgstr "28.8 Kbps modem"
 
-#: ../src/plugins/grilo/totem-grilo.c:1285
-#: ../src/plugins/grilo/grilo.ui.h:4
-msgid "Search"
-msgstr "Iskanje"
+#~ msgid "33.6 Kbps Modem"
+#~ msgstr "33.6 Kbps modem"
 
-#: ../src/plugins/grilo/grilo.ui.h:1
-msgid "Add to Playlist"
-msgstr "Dodaj na seznam predvajanja"
+#~ msgid "34.4 Kbps Modem"
+#~ msgstr "34.4 Kbps modem"
 
-#: ../src/plugins/grilo/grilo.ui.h:2
-msgid "Copy Location"
-msgstr "Kopiraj mesto"
+#~ msgid "56 Kbps Modem/ISDN"
+#~ msgstr "56 Kbps modem/ISDN"
+
+#~ msgid "112 Kbps Dual ISDN/DSL"
+#~ msgstr "112 Kbps dvojni ISDN/DSL"
+
+#~ msgid "256 Kbps DSL/Cable"
+#~ msgstr "256 Kbps DSL/kabel"
+
+#~ msgid "384 Kbps DSL/Cable"
+#~ msgstr "384 Kbps DSL/kabel"
+
+#~ msgid "512 Kbps DSL/Cable"
+#~ msgstr "512 Kbps DSL/kabel"
+
+#~ msgid "1.5 Mbps T1/Intranet/LAN"
+#~ msgstr "1.5 Mbps T1/Intranet/LAN"
+
+#~ msgid "Intranet/LAN"
+#~ msgstr "Intranet/LAN"
+
+#~ msgid "Networking"
+#~ msgstr "Omrežje"
+
+#~ msgid "Connection _speed:"
+#~ msgstr "Hitro_st povezave:"
+
+#~ msgid "Network connection speed"
+#~ msgstr "Hitrost omrežne povezave"
+
+#~ msgid ""
+#~ "Approximate network connection speed, used to select quality on media "
+#~ "over the network."
+#~ msgstr ""
+#~ "Približna hitrost omrežne povezave, ki je uporabljena za izbor kakovosti "
+#~ "predstavne datoteke preko omrežja."
+
+#~ msgid "Play movies and songs"
+#~ msgstr "Predvajanje filmov in glasbe"
+
+#~ msgid "Open a file"
+#~ msgstr "Odpri datoteko"
+
+#~ msgid "Open a non-local file"
+#~ msgstr "Odpri oddaljeno datoteko"
+
+#~ msgid "Quit the program"
+#~ msgstr "Končaj program"
+
+#~ msgid "Configure the application"
+#~ msgstr "Spremeni nastavitve programa"
+
+#~ msgid "Switch to fullscreen"
+#~ msgstr "Preklop na celozaslonski način"
+
+#~ msgid "Set the repeat mode"
+#~ msgstr "Določi ponavljajoče predvajanje"
+
+#~ msgid "Set the shuffle mode"
+#~ msgstr "Določi premešano predvajanje"
+
+#~ msgid "Play Image '%s'"
+#~ msgstr "Predvajaj odtis '%s'"
+
+#~ msgid "device%d"
+#~ msgstr "naprava%d"
+
+#~ msgid "Play Disc '%s'"
+#~ msgstr "Predvajaj disk '%s'"
+
+#~ msgid "Movie Player using %s"
+#~ msgstr "Predvajalnik uporablja %s"
+
+#~ msgid ""
+#~ "Totem could not play this media (%s) although a plugin is present to "
+#~ "handle it."
+#~ msgstr ""
+#~ "S programom Totem ni mogoče predvajati te vrste posnetka (%s), čeprav je "
+#~ "vstavek pravilno naložen."
+
+#~ msgid ""
+#~ "You might want to check that a disc is present in the drive and that it "
+#~ "is correctly configured."
+#~ msgstr "Preverite, da je disk v pogonu in ali je pogon pravilno nastavljen."
+
+#~ msgid "More information about media plugins"
+#~ msgstr "Več podrobnosti o vstavkih zapisov posnetkov"
+
+#~ msgid ""
+#~ "Please install the necessary plugins and restart Totem to be able to play "
+#~ "this media."
+#~ msgstr ""
+#~ "Naložite zahtevane vstavke in ponovno zaženite program za predvajanje "
+#~ "tega vrste posnetka."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it does not have the "
+#~ "appropriate plugins to be able to read from the disc."
+#~ msgstr ""
+#~ "S programom Totem ni mogoče predvajati te vrste posnetka (%s), ker ni "
+#~ "nameščenih ustreznih vstavkov za predvajanje."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because you do not have the "
+#~ "appropriate plugins to handle it."
+#~ msgstr ""
+#~ "S programom Totem ni mogoče predvajati te vrste posnetka (%s), ker ni "
+#~ "ustreznih vstavkov za predvajanje."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it is not supported."
+#~ msgstr ""
+#~ "S programom Totem ni mogoče predvajati te vrste posnetka (%s), ker ta "
+#~ "vrsta ni podprta."
+
+#~ msgid "Please insert another disc to play back."
+#~ msgstr "Vstavite nov disk za predvajanje."
+
+#~ msgid "Totem does not support playback of Audio CDs"
+#~ msgstr "Program Totem ne podpira predvajanja zvočnih CD-jev"
+
+#~ msgid ""
+#~ "Please consider using a music player or a CD extractor to play this CD"
+#~ msgstr ""
+#~ "Uporabite predvajalnik glasbe ali pa pretvorite zapis na zvočnem CD-ju."
+
+#~ msgid ""
+#~ "The requested audio output was not found. Please select another audio "
+#~ "output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "Zahtevanega odvoda zvoka ni mogoče najti. Izberite drug odvod zvoka med "
+#~ "sistemskimi nastavitvami."
+
+#~ msgid ""
+#~ "The video output is in use by another application. Please close other "
+#~ "video applications, or select another video output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "Odvod slike uporablja drug program. Ustavite program, ki zaseda odvod, "
+#~ "ali pa izberite nov odvod med nastavitvami sistema."
+
+#~ msgid ""
+#~ "The audio output is in use by another application. Please select another "
+#~ "audio output in the Multimedia Systems Selector. You may want to consider "
+#~ "using a sound server."
+#~ msgstr ""
+#~ "Odvod zvoka uporablja drug program. Ustavite program, ki zaseda izhod, "
+#~ "ali pa izberite nov odvod med nastavitvami sistema. Razmislite o uporabi "
+#~ "zvočnega strežnika."
+
+#~ msgid ""
+#~ "Failed to open audio output. You may not have permission to open the "
+#~ "sound device, or the sound server may not be running. Please select "
+#~ "another audio output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "Napaka med odpiranjem zvočnega odvoda. Morda ni ustreznih sistemskih "
+#~ "dovoljenj za odpiranje zvočne naprave ali pa zvočni strežnik ne deluje. "
+#~ "Izberite drug zvočni odvod v sistemskih nastavitvah."
+
+#~ msgid ""
+#~ "Could not find the audio output. You may need to install additional "
+#~ "GStreamer plugins, or select another audio output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "Ni mogoče najti odvoda zvoka. Naložiti je treba dodatne GStreamer vstavke "
+#~ "ali pa je treba izbrati drug odvod slike med sistemskimi nastavitvami."
+
+#~ msgid "Publisher protocol to use"
+#~ msgstr "Protokol založnika za uporabo"
+
+#~ msgid ""
+#~ "The transport protocol to use when publishing playlists over the network."
+#~ msgstr ""
+#~ "Uporabljen protokol prenosa za objavljanje seznamov predvajanja preko "
+#~ "omrežja."
+
+#~ msgid "Format for network service name"
+#~ msgstr "Zapis imena omrežne storitve"
+
+#~ msgid ""
+#~ "A format string used to build the network service name used when "
+#~ "publishing playlists over the network. The following format placeholders "
+#~ "can be used: • %a: the program name as returned by g_get_application_name"
+#~ "() • %h: the machine's host name in title case • %u: the user's login "
+#~ "name in title case • %U: the user's real name • %%: the percent sign"
+#~ msgstr ""
+#~ "Niz oblike zapisa, ki je uporabljen za izgradnjo imena omrežne storitve "
+#~ "med objavljanjem seznama predvajanja preko omrežja. Uporabiti je mogoče "
+#~ "naslednja držala: • %a: vrne ime programa kot je določen z možnostjo "
+#~ "g_get_application_name() • %h: ime gostitelja računalnika • %u: prijavno "
+#~ "ime uporabnika • %U: pravo ime uporabnika • %%: znak za odstotek"
+
+#~ msgid "Neighbors"
+#~ msgstr "Sosedje"
+
+#~ msgid "Publish Playlist"
+#~ msgstr "Objavi seznam predvajanja"
+
+#~ msgid "Share the current playlist via HTTP"
+#~ msgstr "Izmenjava trenutnega seznama predvajanja preko HTTP"
+
+#~ msgid "Service _Name:"
+#~ msgstr "Ime _storitve:"
+
+#~ msgid ""
+#~ "The name used for announcing the playlist service on the network.\n"
+#~ "All occurrences of the string %u will be replaced by your name,\n"
+#~ "and %h will be replaced by your computer's host name."
+#~ msgstr ""
+#~ "Ime se uporablja pri objavljanju storitev seznama predvajanja v omrežju.\n"
+#~ "Najdeni nizi %u bodo zamenjani z vašim imenom,\n"
+#~ "in %h z imenom gostitelja vašega računalnika."
+
+#~ msgid "Use _encrypted transport protocol (HTTPS)"
+#~ msgstr "Uporabi _šifriran način prenosa (HTTPS)"
 
 #~ msgid "Bemused"
 #~ msgstr "Bemused"
@@ -2654,9 +2758,6 @@
 #~ msgid "Search Results"
 #~ msgstr "Rezultati iskanja"
 
-#~ msgid "Videos"
-#~ msgstr "Video"
-
 #~ msgid "_Open in Web Browser"
 #~ msgstr "_Odpri v brskalniku"
 
@@ -3052,6 +3153,3 @@
 
 #~ msgid "Plugin Error"
 #~ msgstr "Napaka vstavka"
-
-#~ msgid "Could not load the \"Skip to\" dialog interface."
-#~ msgstr "Ni mogoče zagnati pogovornega okna \"Preskoči na\"."
diff -Nru totem-3.4.3/po/sr.po totem-3.6.2/po/sr.po
--- totem-3.4.3/po/sr.po	2012-04-02 14:15:40.000000000 +0000
+++ totem-3.6.2/po/sr.po	2012-08-29 23:07:45.000000000 +0000
@@ -12,8 +12,8 @@
 "Project-Id-Version: totem\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=totem&"
 "keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-03-23 06:16+0000\n"
-"PO-Revision-Date: 2012-03-27 08:49+0200\n"
+"POT-Creation-Date: 2012-07-17 09:30+0000\n"
+"PO-Revision-Date: 2012-07-29 15:53+0200\n"
 "Last-Translator: Мирослав Николић \n"
 "Language-Team: Serbian \n"
 "Language: sr\n"
@@ -24,21 +24,238 @@
 "n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"
 
+#: ../browser-plugin/totem-plugin-viewer.c:352 ../src/totem-object.c:1180
+#: ../src/totem-object.c:1650 ../src/totem-statusbar.c:115
+msgid "Stopped"
+msgstr "Заустављено"
+
+#: ../browser-plugin/totem-plugin-viewer.c:364 ../src/totem-object.c:1173
+msgid "Paused"
+msgstr "Паузирано"
+
+#: ../browser-plugin/totem-plugin-viewer.c:368 ../src/totem-object.c:1166
+msgid "Playing"
+msgstr "Пуштам"
+
+#: ../browser-plugin/totem-plugin-viewer.c:386
+#: ../src/plugins/screensaver/totem-screensaver.c:97
+msgid "Playing a movie"
+msgstr "Пуштам филм"
+
+#: ../browser-plugin/totem-plugin-viewer.c:443
+msgid "No URI to play"
+msgstr "Нема адресе за пуштање"
+
+#: ../browser-plugin/totem-plugin-viewer.c:676
+#: ../browser-plugin/totem-plugin-viewer.c:1700
+msgid "Totem Movie Player"
+msgstr "Тотем — пуштање филмова"
+
+#. translators: this is:
+#. * Open With ApplicationName
+#. * as in nautilus' right-click menu
+#: ../browser-plugin/totem-plugin-viewer.c:1120
+#, c-format
+msgid "_Open with \"%s\""
+msgstr "_Отвори помоћу „%s“"
+
+#: ../browser-plugin/totem-plugin-viewer.c:1341 ../src/totem-object.c:2475
+msgid "An error occurred"
+msgstr "Дошло је до грешке"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2033
+msgid "No playlist or playlist empty"
+msgstr "Нема списка за пуштање или је празан"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2128
+msgid "Movie browser plugin"
+msgstr "Прикључак за прегледање филмова"
+
+# andrija: непотпун превод, а тежак :)
+# данило: нити и безбедно, послужиће ;)
+#: ../browser-plugin/totem-plugin-viewer.c:2144 ../src/totem.c:239
+msgid "Could not initialize the thread-safe libraries."
+msgstr "Нисам успео да учитам библиотеке за безбедан рад са нитима."
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144
+msgid "Verify your system installation. The Totem plugin will now exit."
+msgstr ""
+"Проверите инсталацију вашег система. Тотемов прикључак ће се сада затворити."
+
 #: ../data/fullscreen.ui.h:1
 msgid "Leave Fullscreen"
 msgstr "Напусти цео екран"
 
-#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:144
+#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:81
 msgid "Time:"
 msgstr "Време:"
 
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
+msgid "Allow the screensaver to activate when playing audio"
+msgstr "Допушта покретање чувара екрана при пуштању музике"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
+msgid ""
+"Allow the screensaver to activate when playing audio. Disable if you have "
+"monitor-powered speakers."
+msgstr ""
+"Допушта покретање чувара екрана када је пуштена само музика. Искључите ако "
+"имате звучнике који се напајају са монитора."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
+msgid "Show visual effects when no video is displayed"
+msgstr "Приказује визуелне ефекте када се не приказује видео"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
+msgid "Show visual effects when playing an audio only file."
+msgstr "Приказује визуелне ефекте када је пуштена само звучна датотека."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
+msgid "Name of the visual effects plugin"
+msgstr "Назив прикључка за визуелне ефекте"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
+msgid "The brightness of the video"
+msgstr "Осветљење видео снимка"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
+msgid "The contrast of the video"
+msgstr "Контраст видео снимка"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
+msgid "The hue of the video"
+msgstr "Нијансе видео снимка"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
+msgid "The saturation of the video"
+msgstr "Засићење видео снимка"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
+msgid "Resize the canvas automatically on file load"
+msgstr "Сам мења величину платна при учитавању датотеке"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
+msgid "Repeat mode"
+msgstr "Режим понављања"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
+msgid "Shuffle mode"
+msgstr "Насумични режим"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
+msgid "Whether to disable deinterlacing for interlaced movies"
+msgstr "Да ли да искључи расплитање видеа са испреплетеним кадровима"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
+msgid "Whether to enable debug for the playback engine"
+msgstr "Да ли да укључи уклањање грешака приликом пуштања"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
+msgid "Type of audio output to use"
+msgstr "Врста звучног излаза који се користи"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
+msgid "Visualization quality setting"
+msgstr "Подешавање квалитета визуелизације"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
+msgid "Quality setting for the audio visualization."
+msgstr "Подешавање квалитета за визуелизацију звука."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
+msgid "Network buffering threshold"
+msgstr "Праг за мрежно читање унапред"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
+msgid ""
+"Amount of data to buffer for network streams before starting to display the "
+"stream (in seconds)."
+msgstr ""
+"Количина података која ће бити унапред учитана за мрежне токове пре почетка "
+"приказивања тока (у секундама)."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
+msgid "Subtitle font"
+msgstr "Словни лик за титл"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
+msgid "Pango font description for subtitle rendering."
+msgstr "Опис Панго словног лика за исцртавање текста превода."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
+msgid "Subtitle encoding"
+msgstr "Кодирање за титл"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
+msgid "Encoding character set for subtitle."
+msgstr "Скуп знакова кодирања за титл."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
+msgid "Default location for the \"Open...\" dialogs"
+msgstr "Подразумевана путања за прозорче „Отвори...“"
+
+# bug: folder or directory?
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
+msgid ""
+"Default location for the \"Open...\" dialogs. Default is the current "
+"directory."
+msgstr "Подразумевана путања за прозорче „Отвори...“, иначе текућа фасцикла."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
+msgid "Default location for the \"Take Screenshot\" dialogs"
+msgstr "Подразумевана путања за прозорче „Направи снимак екрана“"
+
+# bug: folder or directory?
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
+msgid ""
+"Default location for the \"Take Screenshot\" dialogs. Default is the "
+"Pictures directory."
+msgstr ""
+"Подразумевана путања за прозорче „Направи снимак екрана“, у супротном "
+"подразумевана фасцикла са сликама."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
+msgid "Whether to disable the plugins in the user's home directory"
+msgstr "Да ли да искључи прикључке у корисниковом личном директоријуму"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
+msgid "Whether to disable the keyboard shortcuts"
+msgstr "Да ли да онемогућим пречице са тастатуре"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
+msgid "Whether to autoload text subtitle files when a movie is loaded"
+msgstr "Да ли сам да учита текстуалне датотеке са титлом при учитавању филма"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
+msgid "Whether to autoload external chapter files when a movie is loaded"
+msgstr "Да ли сам да учита спољне датотеке са поглављима при учитавању филма"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
+msgid ""
+"Whether to remember the position of played audio/video files when pausing or "
+"closing them"
+msgstr ""
+"Да ли да памти положај пуштене аудио/видео датотеке приликом њеног паузирања "
+"или затварања"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
+msgid "Active plugins list"
+msgstr "Списак активних прикључака"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+msgid ""
+"A list of the names of the plugins which are currently active (loaded and "
+"running)."
+msgstr ""
+"Списак назива прикључака који су тренутно активни (учитани и покренути)."
+
 #: ../data/playlist.ui.h:1
 msgid "_Remove"
-msgstr "У_клони"
+msgstr "_Уклони"
 
 #: ../data/playlist.ui.h:2
 msgid "Remove file from playlist"
-msgstr "Уклони датотеку из списка"
+msgstr "Уклоните датотеку из списка"
 
 #: ../data/playlist.ui.h:3 ../data/video-list.ui.h:3
 msgid "_Copy Location"
@@ -46,13 +263,13 @@
 
 #: ../data/playlist.ui.h:4 ../data/video-list.ui.h:4
 msgid "Copy the location to the clipboard"
-msgstr "Умножи путању међу исечке"
+msgstr "Умножите путању међу исечке"
 
-#: ../data/playlist.ui.h:5 ../data/totem.ui.h:78
+#: ../data/playlist.ui.h:5 ../data/totem.ui.h:71
 msgid "_Select Text Subtitles..."
 msgstr "_Изабери текстуални титл..."
 
-#: ../data/playlist.ui.h:6 ../data/totem.ui.h:79
+#: ../data/playlist.ui.h:6 ../data/totem.ui.h:72
 msgid "Select a file to use for text subtitles"
 msgstr "Изаберите текстуалну датотеку са титловима"
 
@@ -70,16 +287,171 @@
 
 #: ../data/playlist.ui.h:10
 msgid "Move Up"
-msgstr "Премести изнад"
+msgstr "Помери горе"
 
 #: ../data/playlist.ui.h:11
 msgid "Move Down"
-msgstr "Премести испод"
+msgstr "Помери доле"
+
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:2
+msgid "Normal"
+msgstr "Нормално"
 
-#: ../data/properties.ui.h:1 ../data/totem.ui.h:122
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:4
+msgid "Large"
+msgstr "Велико"
+
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:6
+msgid "Extra Large"
+msgstr "Веома велико"
+
+#: ../data/preferences.ui.h:7 ../src/backend/bacon-video-widget.c:5479
+#: ../src/totem-properties-view.c:231
+msgid "Stereo"
+msgstr "Стерео"
+
+#: ../data/preferences.ui.h:8
+msgid "4-channel"
+msgstr "4-канала"
+
+#: ../data/preferences.ui.h:9
+msgid "4.1-channel"
+msgstr "4.1-канала"
+
+#: ../data/preferences.ui.h:10
+msgid "5.0-channel"
+msgstr "5.0-канала"
+
+#: ../data/preferences.ui.h:11
+msgid "5.1-channel"
+msgstr "5.1-канала"
+
+#: ../data/preferences.ui.h:12
+msgid "AC3 Passthrough"
+msgstr "АЦ3 пропуштање"
+
+#: ../data/preferences.ui.h:13
+msgid "Totem Preferences"
+msgstr "Поставке Тотема"
+
+#: ../data/preferences.ui.h:14
+msgid "Playback"
+msgstr "Пуштање"
+
+#: ../data/preferences.ui.h:15
+msgid "Start playing files from last position"
+msgstr "Пустите датотеке од места где су заустављене"
+
+#: ../data/preferences.ui.h:16
+msgid "Text Subtitles"
+msgstr "Текстуални титлови"
+
+#: ../data/preferences.ui.h:17
+msgid "_Load subtitle files when movie is loaded"
+msgstr "Учитај _титлове при учитавању филма"
+
+#: ../data/preferences.ui.h:18
+msgid "_Font:"
+msgstr "_Словни лик:"
+
+#: ../data/preferences.ui.h:19
+msgid "_Encoding:"
+msgstr "_Кодирање:"
+
+#: ../data/preferences.ui.h:20
+msgid "External Chapters"
+msgstr "Спољна поглавља"
+
+#: ../data/preferences.ui.h:21
+msgid "Load _chapter files when movie is loaded"
+msgstr "Учитај _поглавља при учитавању филма"
+
+#: ../data/preferences.ui.h:22 ../data/properties.ui.h:1
 msgid "General"
 msgstr "Опште"
 
+#. Tab label in the Preferences dialogue
+#: ../data/preferences.ui.h:24
+msgid "Display"
+msgstr "Приказ"
+
+#: ../data/preferences.ui.h:25
+msgid "_Resize the window when a new video is loaded"
+msgstr "_Промени величину прозора при учитавању видеа"
+
+#: ../data/preferences.ui.h:26
+msgid "Disable _deinterlacing of interlaced videos"
+msgstr "Искључи _расплитање преплетеног видеа"
+
+#: ../data/preferences.ui.h:27
+msgid "Disable screensaver when playing "
+msgstr "Искључи чувара екрана приликом пуштања "
+
+#: ../data/preferences.ui.h:28 ../data/properties.ui.h:9
+#: ../src/totem-properties-view.c:273
+msgid "Video"
+msgstr "Видео"
+
+#: ../data/preferences.ui.h:29
+msgid "Video or Audio"
+msgstr "Видео или звук"
+
+#: ../data/preferences.ui.h:30
+msgid "Visual Effects"
+msgstr "Визуелни ефекти"
+
+#: ../data/preferences.ui.h:31
+msgid "Show _visual effects when an audio file is played"
+msgstr "Прикажи _визуелне ефекте када је пуштена аудио датотека"
+
+#: ../data/preferences.ui.h:32
+msgid "_Type of visualization:"
+msgstr "В_рста визуализације:"
+
+#: ../data/preferences.ui.h:33
+msgid "Visualization _size:"
+msgstr "В_еличина визуализације:"
+
+#: ../data/preferences.ui.h:34
+msgid "Color Balance"
+msgstr "Равнотежа боја"
+
+#: ../data/preferences.ui.h:35
+msgid "_Brightness:"
+msgstr "_Осветљеност:"
+
+#: ../data/preferences.ui.h:36
+msgid "Co_ntrast:"
+msgstr "_Контраст:"
+
+#: ../data/preferences.ui.h:37
+msgid "Sat_uration:"
+msgstr "_Засићење:"
+
+#: ../data/preferences.ui.h:38
+msgid "_Hue:"
+msgstr "_Нијанса:"
+
+#: ../data/preferences.ui.h:39
+msgid "Reset to _Defaults"
+msgstr "Врати на _основно"
+
+#: ../data/preferences.ui.h:40
+msgid "Audio Output"
+msgstr "Звучни излаз"
+
+#: ../data/preferences.ui.h:41
+msgid "_Audio output type:"
+msgstr "Врста _звучног излаза:"
+
+#: ../data/preferences.ui.h:42 ../data/properties.ui.h:14
+#: ../src/totem-properties-view.c:271
+msgid "Audio"
+msgstr "Звук"
+
 #: ../data/properties.ui.h:2
 msgid "Title:"
 msgstr "Наслов:"
@@ -102,22 +474,16 @@
 
 #: ../data/properties.ui.h:7
 msgid "Comment:"
-msgstr "Коментар:"
+msgstr "Напомена:"
 
 #: ../data/properties.ui.h:8
 msgid "Container:"
 msgstr "Садржалац:"
 
-#: ../data/properties.ui.h:9 ../data/totem.ui.h:128
-#: ../src/totem-properties-view.c:270
-msgid "Video"
-msgstr "Видео"
-
 #: ../data/properties.ui.h:10
 msgid "Dimensions:"
 msgstr "Димензије:"
 
-# кодирање/декодирање
 #: ../data/properties.ui.h:11
 msgid "Codec:"
 msgstr "Кодек:"
@@ -126,16 +492,10 @@
 msgid "Framerate:"
 msgstr "Проток кадрова:"
 
-# bug: jargon
 #: ../data/properties.ui.h:13
 msgid "Bitrate:"
 msgstr "Проток бита:"
 
-#: ../data/properties.ui.h:14 ../data/totem.ui.h:142
-#: ../src/totem-properties-view.c:268
-msgid "Audio"
-msgstr "Звук"
-
 #: ../data/properties.ui.h:15
 msgid "Sample rate:"
 msgstr "Проток узорка:"
@@ -144,752 +504,458 @@
 msgid "Channels:"
 msgstr "Канала:"
 
-#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
-msgid "_Add to Playlist"
-msgstr "_Додај у листу за пуштање"
-
-#: ../data/video-list.ui.h:2
-msgid "Add the video to the playlist"
-msgstr "Додај видео у листу за пуштање"
-
-# note(slobo):Тотем је Гномов централни програм за пуштање
-# и филмова и музике а чини се да ће тако и остати
-# „Гномов биоскоп и музичка кутија“ ?
 #. Title
-#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:143
-#: ../src/totem-object.c:1667
-msgid "Movie Player"
-msgstr "Гномов биоскоп и музичка кутија"
+#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:80 ../src/totem.c:238
+#: ../src/totem.c:247 ../src/totem-menu.c:790 ../src/totem-object.c:1658
+msgid "Videos"
+msgstr "Видео снимци"
 
 #: ../data/totem.desktop.in.in.in.h:2
-msgid "Play movies and songs"
-msgstr "Пуштање филмова и песама"
+msgid "Play movies"
+msgstr "Пуштајте филмове"
+
+#: ../data/totem.desktop.in.in.in.h:3
+msgid "Video;Movie;Film;Clip;Series;Player;DVD;TV;Disc;"
+msgstr "Видео;Снимак;Филм;Епизода;Серије;Пуштач;ДВД;ТВ;Диск;"
 
 #: ../data/totem.ui.h:1
-msgid "_Movie"
-msgstr "_Филм"
+msgid "_Open"
+msgstr "_Отвори"
 
 #: ../data/totem.ui.h:2
-msgid "_Open..."
-msgstr "_Отвори..."
+msgid "Open _Location"
+msgstr "Отвори _путању"
 
 #: ../data/totem.ui.h:3
-msgid "Open a file"
-msgstr "Отвори датотеку"
+msgid "_Fullscreen"
+msgstr "Преко _целог екрана"
 
 #: ../data/totem.ui.h:4
-msgid "Open _Location..."
-msgstr "Отвори _путању..."
+msgid "Prefere_nces"
+msgstr "Пос_тавке"
 
 #: ../data/totem.ui.h:5
-msgid "Open a non-local file"
-msgstr "Отвори датотеку која није локална"
+msgid "Shuff_le"
+msgstr "_Насумично"
 
 #: ../data/totem.ui.h:6
-msgid "_Eject"
-msgstr "Из_баци"
+msgid "_Repeat"
+msgstr "_Понови"
 
 #: ../data/totem.ui.h:7
-msgid "Eject the current disc"
-msgstr "Избаци тренутни диск"
+msgid "_Quit"
+msgstr "_Изађи"
 
 #: ../data/totem.ui.h:8
-msgid "_Properties"
-msgstr "Осо_бине"
+msgid "_Movie"
+msgstr "_Филм"
 
 #: ../data/totem.ui.h:9
-msgid "View the properties of the current stream"
-msgstr "Погледај особине тренутног тока"
+msgid "_Eject"
+msgstr "_Избаци"
 
 #: ../data/totem.ui.h:10
-msgid "Play / P_ause"
-msgstr "П_усти / паузирај"
+msgid "Eject the current disc"
+msgstr "Избаците тренутни диск"
 
 #: ../data/totem.ui.h:11
-msgid "Play or pause the movie"
-msgstr "Пустите или паузирајте филм"
+msgid "_Properties"
+msgstr "_Својства"
 
 #: ../data/totem.ui.h:12
-msgid "_Quit"
-msgstr "И_зађи"
+msgid "View the properties of the current stream"
+msgstr "Погледајте особине тренутног тока"
 
 #: ../data/totem.ui.h:13
-msgid "Quit the program"
-msgstr "Напусти програм"
+msgid "Play / P_ause"
+msgstr "П_усти / паузирај"
 
 #: ../data/totem.ui.h:14
-msgid "_Edit"
-msgstr "_Уређивање"
+msgid "Play or pause the movie"
+msgstr "Пустите или паузирајте филм"
 
 #: ../data/totem.ui.h:15
-msgid "_Clear Playlist"
-msgstr "О_чисти списак"
+msgid "_Edit"
+msgstr "_Уређивање"
 
 #: ../data/totem.ui.h:16
-msgid "Clear the playlist"
-msgstr "Очисти листу за пуштање"
+msgid "_Clear Playlist"
+msgstr "_Очисти списак"
 
 #: ../data/totem.ui.h:17
-msgid "Prefere_nces"
-msgstr "Пос_тавке"
+msgid "Clear the playlist"
+msgstr "Очистите листу за пуштање"
 
 #: ../data/totem.ui.h:18
-msgid "Configure the application"
-msgstr "Подесите програм"
-
-#: ../data/totem.ui.h:19
 msgid "Plugins..."
-msgstr "Додаци..."
+msgstr "Прикључци..."
 
-#: ../data/totem.ui.h:20
+#: ../data/totem.ui.h:19
 msgid "Configure plugins to extend the application"
-msgstr "Подесите додатке да проширите могућности програма"
+msgstr "Подесите прикључке да проширите могућности програма"
 
-#: ../data/totem.ui.h:21
+#: ../data/totem.ui.h:20
 msgid "_View"
-msgstr "П_реглед"
-
-#: ../data/totem.ui.h:22
-msgid "_Fullscreen"
-msgstr "_Цео екран"
-
-#: ../data/totem.ui.h:23
-msgid "Switch to fullscreen"
-msgstr "Пребаци на цео екран"
+msgstr "_Преглед"
 
-#: ../data/totem.ui.h:24
+#: ../data/totem.ui.h:21
 msgid "Fit Window to Movie"
 msgstr "Прилагоди прозор филму"
 
-#: ../data/totem.ui.h:25
+#: ../data/totem.ui.h:22
 msgid "_Resize 1:2"
 msgstr "_Величина 1:2"
 
-#: ../data/totem.ui.h:26
+#: ../data/totem.ui.h:23
 msgid "Resize to half the original video size"
-msgstr "Упола увећава оригиналну величину видеа"
+msgstr "Промените на половину величине првобитног видеа"
 
-#: ../data/totem.ui.h:27
+#: ../data/totem.ui.h:24
 msgid "Resize _1:1"
 msgstr "Величина _1:1"
 
-#: ../data/totem.ui.h:28
+#: ../data/totem.ui.h:25
 msgid "Resize to the original video size"
-msgstr "Увећава на оригиналну величину видеа"
+msgstr "Промените величину на првобитну величину видеа"
 
-#: ../data/totem.ui.h:29
+#: ../data/totem.ui.h:26
 msgid "Resize _2:1"
 msgstr "Величина _2:1"
 
-#: ../data/totem.ui.h:30
+#: ../data/totem.ui.h:27
 msgid "Resize to double the original video size"
-msgstr "Дупло увећава оригиналну величину видеа"
+msgstr "Удвостручите величину првобитног видеа"
 
-#: ../data/totem.ui.h:31
+#: ../data/totem.ui.h:28
 msgid "_Aspect Ratio"
 msgstr "_Однос ширине и висине"
 
-#: ../data/totem.ui.h:32
+#: ../data/totem.ui.h:29
 msgid "Switch An_gles"
-msgstr "Проме_на угла гледања"
+msgstr "Промени _угао гледања"
 
-#: ../data/totem.ui.h:33
+#: ../data/totem.ui.h:30
 msgid "Switch camera angles"
-msgstr "Промени угао камере"
+msgstr "Промените углове камере"
 
-#: ../data/totem.ui.h:34
+#: ../data/totem.ui.h:31
 msgid "_Go"
 msgstr "_Иди"
 
-#: ../data/totem.ui.h:35
+#: ../data/totem.ui.h:32
 msgid "_DVD Menu"
-msgstr "_ДВД мени"
+msgstr "_ДВД изборник"
 
-#: ../data/totem.ui.h:36
+#: ../data/totem.ui.h:33
 msgid "Go to the DVD menu"
-msgstr "Иди на ДВД мени"
+msgstr "Идите на ДВД изборник"
 
-#: ../data/totem.ui.h:37
+#: ../data/totem.ui.h:34
 msgid "_Title Menu"
-msgstr "Мени _наслова"
+msgstr "Изборник _наслова"
 
-#: ../data/totem.ui.h:38
+#: ../data/totem.ui.h:35
 msgid "Go to the title menu"
-msgstr "Иди на мени наслова"
+msgstr "Идите на изборник наслова"
 
-#: ../data/totem.ui.h:39
+#: ../data/totem.ui.h:36
 msgid "A_udio Menu"
 msgstr "Изборник _звука"
 
-#: ../data/totem.ui.h:40
+#: ../data/totem.ui.h:37
 msgid "Go to the audio menu"
-msgstr "Иди на мени звука"
+msgstr "Идите на изборник звука"
 
-#: ../data/totem.ui.h:41
+#: ../data/totem.ui.h:38
 msgid "_Angle Menu"
-msgstr "Мени за у_глове"
+msgstr "Изборник _углова"
 
-#: ../data/totem.ui.h:42
+#: ../data/totem.ui.h:39
 msgid "Go to the angle menu"
-msgstr "Иди на мени за углове"
+msgstr "Идите на изборник углова"
 
-#: ../data/totem.ui.h:43
+#: ../data/totem.ui.h:40
 msgid "_Chapter Menu"
-msgstr "Мени по_главља"
+msgstr "Изборник _поглавља"
 
-#: ../data/totem.ui.h:44
+#: ../data/totem.ui.h:41
 msgid "Go to the chapter menu"
-msgstr "Иди на мени поглавља"
+msgstr "Идите на изборник поглавља"
 
-#: ../data/totem.ui.h:45
+#: ../data/totem.ui.h:42
 msgid "_Next Chapter/Movie"
 msgstr "_Следеће поглавље/филм"
 
-#: ../data/totem.ui.h:46
+#: ../data/totem.ui.h:43
 msgid "Next chapter or movie"
 msgstr "Следеће поглавље или филм"
 
-#: ../data/totem.ui.h:47
+#: ../data/totem.ui.h:44
 msgid "_Previous Chapter/Movie"
 msgstr "_Претходно поглавље/филм"
 
-#: ../data/totem.ui.h:48
+#: ../data/totem.ui.h:45
 msgid "Previous chapter or movie"
 msgstr "Претходно поглавље или филм"
 
-#: ../data/totem.ui.h:49
+#: ../data/totem.ui.h:46
 msgid "_Sound"
 msgstr "_Звук"
 
-#: ../data/totem.ui.h:50
+#: ../data/totem.ui.h:47
 msgid "Volume _Up"
-msgstr "По_јачај"
+msgstr "_Појачај"
 
-#: ../data/totem.ui.h:51
+#: ../data/totem.ui.h:48
 msgid "Increase volume"
-msgstr "Појачај звук"
+msgstr "Појачајте звук"
 
-#: ../data/totem.ui.h:52
+#: ../data/totem.ui.h:49
 msgid "Volume _Down"
-msgstr "У_тишај"
+msgstr "_Утишај"
 
-#: ../data/totem.ui.h:53
+#: ../data/totem.ui.h:50
 msgid "Decrease volume"
 msgstr "Утишај звук"
 
-#: ../data/totem.ui.h:54
+#: ../data/totem.ui.h:51
 msgid "_Help"
-msgstr "_Помоћ"
+msgstr "По_моћ"
 
-#: ../data/totem.ui.h:55
+#: ../data/totem.ui.h:52
 msgid "_Contents"
 msgstr "_Садржај"
 
-#: ../data/totem.ui.h:56
+#: ../data/totem.ui.h:53
 msgid "Help contents"
 msgstr "Садржај помоћи"
 
-#: ../data/totem.ui.h:57
+#: ../data/totem.ui.h:54
 msgid "_About"
 msgstr "_О програму"
 
-#: ../data/totem.ui.h:58
-msgid "About this application"
-msgstr "О програму"
-
-#: ../data/totem.ui.h:59
-msgid "_Repeat Mode"
-msgstr "_Режим понављања"
-
-#: ../data/totem.ui.h:60
-msgid "Set the repeat mode"
-msgstr "Постави режим за понављање"
-
-#: ../data/totem.ui.h:61
-msgid "Shuff_le Mode"
-msgstr "Испре_тумбани режим"
-
-#: ../data/totem.ui.h:62
-msgid "Set the shuffle mode"
-msgstr "Постави испретумбани режим"
-
-#: ../data/totem.ui.h:63
-msgid "Show _Controls"
-msgstr "Прикажи _контроле"
-
-#: ../data/totem.ui.h:64
-msgid "Show controls"
-msgstr "Прикажи контроле"
-
-#: ../data/totem.ui.h:65
-msgid "S_idebar"
-msgstr "_Бочна површ"
-
-#: ../data/totem.ui.h:66
-msgid "Show or hide the sidebar"
-msgstr "Прикажи или сакриј бочну површ"
-
-#: ../data/totem.ui.h:67
-msgctxt "Aspect ratio"
-msgid "Auto"
-msgstr "Самоприлагоди"
-
-#: ../data/totem.ui.h:68
-msgid "Sets automatic aspect ratio"
-msgstr "Сам постави однос висине и ширине"
-
-#: ../data/totem.ui.h:69
-msgid "Square"
-msgstr "Квадрат"
-
-#: ../data/totem.ui.h:70
-msgid "Sets square aspect ratio"
-msgstr "Постави квадратни однос висине и ширине"
-
-#: ../data/totem.ui.h:71
-msgid "4:3 (TV)"
-msgstr "4:3 (ТВ)"
-
-#: ../data/totem.ui.h:72
-msgid "Sets 4:3 (TV) aspect ratio"
-msgstr "Поставља размеру на 4:3 (ТВ)"
-
-#: ../data/totem.ui.h:73
-msgid "16:9 (Widescreen)"
-msgstr "16:9 (широки екран)"
-
-#: ../data/totem.ui.h:74
-msgid "Sets 16:9 (widescreen) aspect ratio"
-msgstr "Поставља размеру на 16:9 (широки екран)"
-
-#: ../data/totem.ui.h:75
-msgid "2.11:1 (DVB)"
-msgstr "2.11:1 (ДВБ)"
-
-#: ../data/totem.ui.h:76
-msgid "Sets 2.11:1 (DVB) aspect ratio"
-msgstr "Поставља размеру на 2,11:9 (ДВБ)"
-
-#: ../data/totem.ui.h:77
-msgid "S_ubtitles"
-msgstr "_Преводи"
-
-#: ../data/totem.ui.h:80
-msgid "_Languages"
-msgstr "_Језици"
-
-#: ../data/totem.ui.h:81
-msgid "Zoom In"
-msgstr "Увећај"
-
-#: ../data/totem.ui.h:82
-msgid "Zoom in"
-msgstr "Увећај"
-
-#: ../data/totem.ui.h:83
-msgid "Skip _Forward"
-msgstr "Прескочи унапр_ед"
-
-#: ../data/totem.ui.h:84
-msgid "Skip forward"
-msgstr "Прескочи унапред"
-
-#: ../data/totem.ui.h:85
-msgid "Skip _Backwards"
-msgstr "Прескочи унатра_г"
-
-#: ../data/totem.ui.h:86
-msgid "Skip backwards"
-msgstr "Прескочи унатраг"
-
-#: ../data/totem.ui.h:87
-msgid "14.4 Kbps Modem"
-msgstr "14,4 Кб/с Модем"
-
-#: ../data/totem.ui.h:88
-msgid "19.2 Kbps Modem"
-msgstr "19,2 Кб/с Модем"
-
-#: ../data/totem.ui.h:89
-msgid "28.8 Kbps Modem"
-msgstr "28,8 Кб/с Модем"
-
-#: ../data/totem.ui.h:90
-msgid "33.6 Kbps Modem"
-msgstr "33,6 кб/с Модем"
-
-#: ../data/totem.ui.h:91
-msgid "34.4 Kbps Modem"
-msgstr "34,4 кб/с Модем"
-
-#: ../data/totem.ui.h:92
-msgid "56 Kbps Modem/ISDN"
-msgstr "56 Кб/с Модем/ИСДН"
-
-#: ../data/totem.ui.h:93
-msgid "112 Kbps Dual ISDN/DSL"
-msgstr "112 Кб/с Двојни ИСДН/ДСЛ"
-
-#: ../data/totem.ui.h:94
-msgid "256 Kbps DSL/Cable"
-msgstr "256 Кб/с ДСЛ/Кабал"
-
-#: ../data/totem.ui.h:95
-msgid "384 Kbps DSL/Cable"
-msgstr "384 Кб/с ДСЛ/Кабал"
-
-#: ../data/totem.ui.h:96
-msgid "512 Kbps DSL/Cable"
-msgstr "512 Кб/с ДСЛ/Кабал"
-
-#: ../data/totem.ui.h:97
-msgid "1.5 Mbps T1/Intranet/LAN"
-msgstr "1,5 Мб/с Т1/Интранет/ЛМ"
-
-#: ../data/totem.ui.h:98
-msgid "Intranet/LAN"
-msgstr "Интранет/ЛМ"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:100
-msgid "Normal"
-msgstr "Нормално"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:102
-msgid "Large"
-msgstr "Велико"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:104
-msgid "Extra Large"
-msgstr "Екстра велико"
-
-#: ../data/totem.ui.h:105 ../src/totem-properties-view.c:228
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5593
-msgid "Stereo"
-msgstr "Стерео"
-
-#: ../data/totem.ui.h:106
-msgid "4-channel"
-msgstr "4-канални"
-
-#: ../data/totem.ui.h:107
-msgid "4.1-channel"
-msgstr "4.1-канала"
-
-#: ../data/totem.ui.h:108
-msgid "5.0-channel"
-msgstr "5.0-канала"
-
-#: ../data/totem.ui.h:109
-msgid "5.1-channel"
-msgstr "5.1-канала"
-
-#: ../data/totem.ui.h:110
-msgid "AC3 Passthrough"
-msgstr "АЦ3 пропуштање"
-
-#: ../data/totem.ui.h:111
-msgid "Totem Preferences"
-msgstr "Поставке Тотема"
-
-#: ../data/totem.ui.h:112
-msgid "Playback"
-msgstr "Пуштање"
-
-#: ../data/totem.ui.h:113
-msgid "Start playing files from last position"
-msgstr "Пусти датотеке од места где су заустављене"
-
-#: ../data/totem.ui.h:114
-msgid "Networking"
-msgstr "Рад у мрежи"
-
-#: ../data/totem.ui.h:115
-msgid "Connection _speed:"
-msgstr "Брзина _везе:"
-
-#: ../data/totem.ui.h:116
-msgid "Text Subtitles"
-msgstr "Текстуални титлови"
-
-#: ../data/totem.ui.h:117
-msgid "_Load subtitle files when movie is loaded"
-msgstr "Учитај _титлове при учитавању видеа"
-
-#: ../data/totem.ui.h:118
-msgid "_Font:"
-msgstr "_Словни лик:"
-
-#: ../data/totem.ui.h:119
-msgid "_Encoding:"
-msgstr "_Кодирање:"
-
-#: ../data/totem.ui.h:120
-msgid "External Chapters"
-msgstr "Спољна поглавља"
-
-#: ../data/totem.ui.h:121
-msgid "Load _chapter files when movie is loaded"
-msgstr "Учитај п_оглавља при учитавању филма"
-
-#. Tab label in the Preferences dialogue
-#: ../data/totem.ui.h:124
-msgid "Display"
-msgstr "Приказ"
-
-#: ../data/totem.ui.h:125
-msgid "_Resize the window when a new video is loaded"
-msgstr "_Промени величину прозора при учитавању видеа"
-
-#: ../data/totem.ui.h:126
-msgid "Disable _deinterlacing of interlaced videos"
-msgstr "Искључи _расплитање преплетеног видеа"
-
-#: ../data/totem.ui.h:127
-msgid "Disable screensaver when playing "
-msgstr "Онемогући чувара екрана приликом пуштања "
-
-#: ../data/totem.ui.h:129
-msgid "Video or Audio"
-msgstr "Видео или звук"
-
-#: ../data/totem.ui.h:130
-msgid "Visual Effects"
-msgstr "Визуелни ефекти"
-
-#: ../data/totem.ui.h:131
-msgid "Show _visual effects when an audio file is played"
-msgstr "Прикажи _визуелне ефекте када је пуштена аудио датотека"
-
-#: ../data/totem.ui.h:132
-msgid "_Type of visualization:"
-msgstr "Врст_а визуализације:"
-
-#: ../data/totem.ui.h:133
-msgid "Visualization _size:"
-msgstr "В_еличина визуализације:"
-
-#: ../data/totem.ui.h:134
-msgid "Color Balance"
-msgstr "Равнотежа боја"
-
-#: ../data/totem.ui.h:135
-msgid "_Brightness:"
-msgstr "_Осветљеност:"
-
-#: ../data/totem.ui.h:136
-msgid "Co_ntrast:"
-msgstr "Ко_нтраст:"
-
-#: ../data/totem.ui.h:137
-msgid "Sat_uration:"
-msgstr "_Засићење:"
+#: ../data/totem.ui.h:55
+msgid "About this application"
+msgstr "О овом програму"
 
-#: ../data/totem.ui.h:138
-msgid "_Hue:"
-msgstr "_Нијанса:"
+#: ../data/totem.ui.h:56
+msgid "Show _Controls"
+msgstr "Прикажи _контроле"
 
-#: ../data/totem.ui.h:139
-msgid "Reset to _Defaults"
-msgstr "_Врати на подразумевано"
+#: ../data/totem.ui.h:57
+msgid "Show controls"
+msgstr "Прикажите контроле"
 
-#: ../data/totem.ui.h:140
-msgid "Audio Output"
-msgstr "Звучни излаз"
+#: ../data/totem.ui.h:58
+msgid "S_idebar"
+msgstr "_Бочна површ"
 
-#: ../data/totem.ui.h:141
-msgid "_Audio output type:"
-msgstr "Врста _звучног излаза:"
+#: ../data/totem.ui.h:59
+msgid "Show or hide the sidebar"
+msgstr "Прикажите или сакријте бочну површ"
 
-#: ../data/totem.ui.h:145
-msgid "Time seek bar"
-msgstr "Трака за време"
+#: ../data/totem.ui.h:60
+msgctxt "Aspect ratio"
+msgid "Auto"
+msgstr "Сам прилагоди"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
-msgid "Allow the screensaver to activate when playing audio"
-msgstr "Дозволи покретање чувара екрана када је пуштена само музика"
+#: ../data/totem.ui.h:61
+msgid "Sets automatic aspect ratio"
+msgstr "Сам ће да постави однос висине и ширине"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
-msgid ""
-"Allow the screensaver to activate when playing audio. Disable if you have "
-"monitor-powered speakers."
-msgstr ""
-"Дозволи покретање чувара екрана када је пуштена само музика. Онемогућите ако "
-"имате звучнике који се напајају са монитора."
+#: ../data/totem.ui.h:62
+msgid "Square"
+msgstr "Квадрат"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
-msgid "Show visual effects when no video is displayed"
-msgstr "Прикажи визуелне ефекте када се не приказује видео"
+#: ../data/totem.ui.h:63
+msgid "Sets square aspect ratio"
+msgstr "Поставите квадратни однос висине и ширине"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
-msgid "Show visual effects when playing an audio only file."
-msgstr "Прикажи визуелне ефекте када је пуштена звучна датотека."
+#: ../data/totem.ui.h:64
+msgid "4:3 (TV)"
+msgstr "4:3 (ТВ)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
-msgid "Name of the visual effects plugin"
-msgstr "Назив додатка за визуелне ефекте"
+#: ../data/totem.ui.h:65
+msgid "Sets 4:3 (TV) aspect ratio"
+msgstr "Поставите однос висине и ширине на 4:3 (ТВ)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
-msgid "The brightness of the video"
-msgstr "Осветљење видео снимка"
+#: ../data/totem.ui.h:66
+msgid "16:9 (Widescreen)"
+msgstr "16:9 (широки екран)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
-msgid "The contrast of the video"
-msgstr "Контраст видео снимка"
+#: ../data/totem.ui.h:67
+msgid "Sets 16:9 (widescreen) aspect ratio"
+msgstr "Поставите однос висине и ширине на 16:9 (широки екран)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
-msgid "The hue of the video"
-msgstr "Нијансе видео снимка"
+#: ../data/totem.ui.h:68
+msgid "2.11:1 (DVB)"
+msgstr "2.11:1 (ДВБ)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
-msgid "The saturation of the video"
-msgstr "Засићење видео снимка"
+#: ../data/totem.ui.h:69
+msgid "Sets 2.11:1 (DVB) aspect ratio"
+msgstr "Поставите однос висине и ширине на 2,11:1 (ДВБ)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
-msgid "Resize the canvas automatically on file load"
-msgstr "Промени аутоматски величину платна при уносу датотеке"
+#: ../data/totem.ui.h:70
+msgid "S_ubtitles"
+msgstr "_Преводи"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
-msgid "Network connection speed"
-msgstr "Брзина везе"
+#: ../data/totem.ui.h:73
+msgid "_Languages"
+msgstr "_Језици"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
-msgid ""
-"Approximate network connection speed, used to select quality on media over "
-"the network."
-msgstr ""
-"Приближна брзина мрежне везе, коришћена за избор квалитета на медијима преко "
-"мреже."
+#: ../data/totem.ui.h:74
+msgid "Zoom In"
+msgstr "Увећај"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
-msgid "Repeat mode"
-msgstr "Режим понављања"
+#: ../data/totem.ui.h:75
+msgid "Zoom in"
+msgstr "Увећајте приказ"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
-msgid "Shuffle mode"
-msgstr "Испретумбани режим"
+#: ../data/totem.ui.h:76
+msgid "Skip _Forward"
+msgstr "Премотај уна_пред"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
-msgid "Whether to disable deinterlacing for interlaced movies"
-msgstr "Да ли да онемогућим расплитање видеа са испреплетаним кадровима"
+#: ../data/totem.ui.h:77
+msgid "Skip forward"
+msgstr "Премотајте унапред"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
-msgid "Whether to enable debug for the playback engine"
-msgstr "Да ли да се укључи праћење грешака при пуштању"
+#: ../data/totem.ui.h:78
+msgid "Skip _Backwards"
+msgstr "Премотај уна_зад"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
-msgid "Type of audio output to use"
-msgstr "Врста звучног излаза који се користи"
+#: ../data/totem.ui.h:79
+msgid "Skip backwards"
+msgstr "Премотајте уназад"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
-msgid "Visualization quality setting"
-msgstr "Подешавање квалитета визуелизације"
+#: ../data/totem.ui.h:82
+msgid "Time seek bar"
+msgstr "Трака протока времена"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
-msgid "Quality setting for the audio visualization."
-msgstr "Подешавање квалитета за визуелизацију звука."
+#: ../data/uri.ui.h:1
+msgid "Enter the _address of the file you would like to open:"
+msgstr "Унесите _адресу датотеке коју желите да отворите:"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
-msgid "Network buffering threshold"
-msgstr "Праг за мрежно читање унапред"
+#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
+msgid "_Add to Playlist"
+msgstr "_Додај на списак за пуштање"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
-msgid ""
-"Amount of data to buffer for network streams before starting to display the "
-"stream (in seconds)."
-msgstr ""
-"Количина података које учитати унапред за мрежне токове пре почетка приказа "
-"тока (у секундама)."
+#: ../data/video-list.ui.h:2
+msgid "Add the video to the playlist"
+msgstr "Додајте видео на списак за пуштање"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
-msgid "Subtitle font"
-msgstr "Фонт за титл"
+#: ../src/backend/bacon-video-widget.c:1641
+msgid "Password requested for RTSP server"
+msgstr "Захтевана је лозинка за РТСП сервер"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
-msgid "Pango font description for subtitle rendering."
-msgstr "Опис Панго словног лика за исцртавање текста превода."
+#: ../src/backend/bacon-video-widget.c:2927
+#, c-format
+msgid "Audio Track #%d"
+msgstr "Звучна нумера #%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
-msgid "Subtitle encoding"
-msgstr "Кодирање за титл"
+#: ../src/backend/bacon-video-widget.c:2931
+#, c-format
+msgid "Subtitle #%d"
+msgstr "Превод #%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
-msgid "Encoding character set for subtitle."
-msgstr "Скуп знакова кодирања за титл."
+#: ../src/backend/bacon-video-widget.c:3328
+msgid "The server you are trying to connect to is not known."
+msgstr "Није познат сервер на који покушавате да се повежете."
+
+#: ../src/backend/bacon-video-widget.c:3331
+msgid "The connection to this server was refused."
+msgstr "Веза са овим сервером је одбијена."
+
+#: ../src/backend/bacon-video-widget.c:3334
+msgid "The specified movie could not be found."
+msgstr "Не могу да нађем наведени филм."
+
+#: ../src/backend/bacon-video-widget.c:3341
+msgid "The server refused access to this file or stream."
+msgstr "Сервер је одбио приступ овој датотеци или току."
+
+#: ../src/backend/bacon-video-widget.c:3347
+msgid "Authentication is required to access this file or stream."
+msgstr "Потребно је потврђивање идентитета за приступ овој датотеци или току."
+
+#: ../src/backend/bacon-video-widget.c:3354
+msgid "You are not allowed to open this file."
+msgstr "Вама није дозвољено да отворите ову датотеку."
+
+#: ../src/backend/bacon-video-widget.c:3359
+msgid "This location is not a valid one."
+msgstr "Ова путања није исправна."
+
+#: ../src/backend/bacon-video-widget.c:3367
+msgid "The movie could not be read."
+msgstr "Филм не може бити прочитан."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
-msgid "Default location for the \"Open...\" dialogs"
-msgstr "Подразумевана путања за прозорче „Отвори...“"
+#. should be exactly one missing thing (source or converter)
+#: ../src/backend/bacon-video-widget.c:3390
+#: ../src/backend/bacon-video-widget.c:3398
+#, c-format
+msgid "The playback of this movie requires a %s plugin which is not installed."
+msgid_plural ""
+"The playback of this movie requires the following decoders which are not "
+"installed:\n"
+"\n"
+"%s"
+msgstr[0] "Пуштање овог филма захтева прикључак %s који није инсталиран."
+msgstr[1] ""
+"Пуштање овог филма захтева следеће декодере који нису инсталирани:\n"
+"\n"
+"%s"
+msgstr[2] ""
+"Пуштање овог филма захтева следеће декодере који нису инсталирани:\n"
+"\n"
+"%s"
+msgstr[3] "прикључак"
 
-# bug: folder or directory?
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
+#: ../src/backend/bacon-video-widget.c:3409
 msgid ""
-"Default location for the \"Open...\" dialogs. Default is the current "
-"directory."
-msgstr "Подразумевана путања за прозорче „Отвори...“, иначе текућа фасцикла."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
-msgid "Default location for the \"Take Screenshot\" dialogs"
-msgstr "Подразумевана путања за прозорче „Направи снимак екрана“"
+"An audio or video stream is not handled due to missing codecs. You might "
+"need to install additional plugins to be able to play some types of movies"
+msgstr ""
+"Не може бити управљано звучним или видео током зато што недостају кодеци. "
+"Мораћете да инсталирате додатне прикључке да бисте могли да пуштате неке "
+"врсте филмова"
 
-# bug: folder or directory?
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
+#: ../src/backend/bacon-video-widget.c:3419
 msgid ""
-"Default location for the \"Take Screenshot\" dialogs. Default is the "
-"Pictures directory."
+"This file cannot be played over the network. Try downloading it locally "
+"first."
 msgstr ""
-"Подразумевана путања за прозорче „Направи снимак екрана“, у супротном "
-"подразумевана фасцикла са сликама."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
-msgid "Whether to disable the plugins in the user's home directory"
-msgstr "Да ли да онемогућим додатке у корисниковом личном директоријуму"
+"Не могу да пустим ову датотеку преко мреже. Покушајте да је прво пренесете "
+"на диск."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
-msgid "Whether to disable the keyboard shortcuts"
-msgstr "Да ли да онемогућим пречице са тастатуре"
+#: ../src/backend/bacon-video-widget.c:5475 ../src/totem-properties-view.c:227
+msgid "Surround"
+msgstr "Окружење"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
-msgid "Whether to autoload text subtitle files when a movie is loaded"
-msgstr "Да ли да сам учитам текстуалне датотеке са титлом при учитавању филма"
+#: ../src/backend/bacon-video-widget.c:5477 ../src/totem-properties-view.c:229
+msgid "Mono"
+msgstr "Моно"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
-msgid "Whether to autoload external chapter files when a movie is loaded"
-msgstr "Да ли да сам учитам спољне датотеке са поглављима при учитавању филма"
+#: ../src/backend/bacon-video-widget.c:5762
+msgid "Media contains no supported video streams."
+msgstr "Датотека не садржи подржане видео токове."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+#: ../src/backend/bacon-video-widget.c:5944
 msgid ""
-"Whether to remember the position of played audio/video files when pausing or "
-"closing them"
+"Some necessary plug-ins are missing. Make sure that the program is correctly "
+"installed."
 msgstr ""
-"Да ли да се памти позиција пуштене аудио/видео датотеке приликом њеног "
-"паузирања или затварања"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:35
-msgid "Active plugins list"
-msgstr "Списак активних додатака"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:36
-msgid ""
-"A list of the names of the plugins which are currently active (loaded and "
-"running)."
-msgstr "Списак имена додатака који су тренутно активни (учитани и покренути)."
-
-#: ../data/uri.ui.h:1
-msgid "Enter the _address of the file you would like to open:"
-msgstr "Унесите _адресу датотеке коју желите да отворите:"
+"Неки неопходни прикључци недостају. Уверите се да је програм исправно "
+"инсталиран."
 
 #: ../src/eggdesktopfile.c:165
 #, c-format
 msgid "File is not a valid .desktop file"
-msgstr "Ово није исправна .desktop датотека"
+msgstr "Ово није исправна „.desktop“ датотека"
 
 #: ../src/eggdesktopfile.c:188
 #, c-format
 msgid "Unrecognized desktop file Version '%s'"
-msgstr "Непрепознато издање датотеке радне површи „%s“"
+msgstr "Непознато издање датотеке радне површи „%s“"
 
 #: ../src/eggdesktopfile.c:968
 #, c-format
@@ -899,29 +965,27 @@
 #: ../src/eggdesktopfile.c:1110
 #, c-format
 msgid "Application does not accept documents on command line"
-msgstr "Програм не прихвата документе из командне линије"
+msgstr "Програм не прихвата документе из линије наредби"
 
 #: ../src/eggdesktopfile.c:1178
 #, c-format
 msgid "Unrecognized launch option: %d"
-msgstr "Непрепозната опција покретања: %d"
+msgstr "Непозната опција покретања: %d"
 
 #: ../src/eggdesktopfile.c:1383
 #, c-format
 msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
-msgstr ""
-"Не могу да упишем адресу документа у „Type=Link“ унос унутар датотеке за "
-"радну површ"
+msgstr "Не могу да проследим адресе докумената на „Type=Link“ унос"
 
 #: ../src/eggdesktopfile.c:1404
 #, c-format
 msgid "Not a launchable item"
-msgstr "Ову ставку не можете покренути"
+msgstr "Није ставка за покретање"
 
 #: ../src/eggfileformatchooser.c:240
 #, c-format
 msgid "File _Format: %s"
-msgstr "_Формат датотеке: %s"
+msgstr "_Врста датотеке: %s"
 
 #: ../src/eggfileformatchooser.c:379
 msgid "All Files"
@@ -933,39 +997,39 @@
 
 #: ../src/eggfileformatchooser.c:389
 msgid "By Extension"
-msgstr "По екстензији"
+msgstr "Према проширењу"
 
 #: ../src/eggfileformatchooser.c:404
 msgid "File Format"
-msgstr "Формат датотеке"
+msgstr "Врста датотеке"
 
 #: ../src/eggfileformatchooser.c:422
 msgid "Extension(s)"
-msgstr "Екстензија(е)"
+msgstr "Проширења"
 
 #. Translators: the parameter is a filename
 #: ../src/eggfileformatchooser.c:657
 #, c-format
 msgid ""
-"The program was not able to find out the file format you want to use for `%"
-"s'. Please make sure to use a known extension for that file or manually "
+"The program was not able to find out the file format you want to use for `"
+"%s'. Please make sure to use a known extension for that file or manually "
 "choose a file format from the list below."
 msgstr ""
-"Програм није био у могућности да открије формат датотеке коју желите да "
-"користите за „%s“. Проверите да ли користите познату екстензију или ручно "
-"одаберите формат датотеке из листе испод."
+"Програм не може да пронађе врсту датотеке коју желите да употребите за „%s“. "
+"Проверите да ли користите познато проширење датотеке или сами одаберите "
+"врсту датотеке из приложеног списка."
 
 #: ../src/eggfileformatchooser.c:664
 msgid "File format not recognized"
-msgstr "Није препознат формат датотеке"
+msgstr "Није препозната врста датотеке"
 
 #: ../src/eggsmclient.c:226
 msgid "Disable connection to session manager"
-msgstr "Онемогући везу са управником сесије"
+msgstr "Искључује везу са управником сесије"
 
 #: ../src/eggsmclient.c:229
 msgid "Specify file containing saved configuration"
-msgstr "Одаберите датотеку која садржи сачувана подешавања"
+msgstr "Наводи датотеку која садржи сачувана подешавања"
 
 #: ../src/eggsmclient.c:229
 msgid "FILE"
@@ -973,7 +1037,7 @@
 
 #: ../src/eggsmclient.c:232
 msgid "Specify session management ID"
-msgstr "Наведите ИБ управника сесије"
+msgstr "Наводи ИБ управника сесије"
 
 #: ../src/eggsmclient.c:232
 msgid "ID"
@@ -981,11 +1045,36 @@
 
 #: ../src/eggsmclient.c:253
 msgid "Session management options:"
-msgstr "Могућности управника сесије:"
+msgstr "Могућности управљања сесијом:"
 
 #: ../src/eggsmclient.c:254
 msgid "Show session management options"
-msgstr "Прикажи могућности управника сесије"
+msgstr "Приказује могућности управљања сесијом"
+
+#. hour:minutes:seconds
+#. Translators: This is a time format, like "9:05:02" for 9
+#. * hours, 5 minutes, and 2 seconds. You may change ":" to
+#. * the separator that your locale uses or use "%Id" instead
+#. * of "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:56
+#: ../src/plugins/skipto/totem-time-entry.c:57
+#, c-format
+msgctxt "long time format"
+msgid "%d:%02d:%02d"
+msgstr "%d:%02d:%02d"
+
+#. minutes:seconds
+#. Translators: This is a time format, like "5:02" for 5
+#. * minutes and 2 seconds. You may change ":" to the
+#. * separator that your locale uses or use "%Id" instead of
+#. * "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:65
+#, c-format
+msgctxt "short time format"
+msgid "%d:%02d"
+msgstr "%d:%02d"
 
 #. Title
 #. Artist
@@ -1100,30 +1189,34 @@
 msgstr[2] "%d кадрова у секунди"
 msgstr[3] "Један кадар у секунди"
 
-#: ../src/totem-audio-preview.c:168
+#: ../src/totem-audio-preview.c:137
 msgid "Audio Preview"
 msgstr "Звучни преглед"
 
+#: ../src/totem.c:239
+msgid "Verify your system installation. Totem will now exit."
+msgstr "Проверите инсталацију система. Тотем ће се сада угасити."
+
 #: ../src/totem-cell-renderer-video.c:126
 msgid "Unknown video"
 msgstr "Непознат видео"
 
 #: ../src/totem-dnd-menu.c:94
 msgid "_Play Now"
-msgstr "_Пусти сад"
+msgstr "_Пусти сада"
 
 #: ../src/totem-dnd-menu.c:103
 msgid "Cancel"
-msgstr "Поништи"
+msgstr "Откажи"
 
-#: ../src/totem-fullscreen.c:616
+#: ../src/totem-fullscreen.c:573
 msgid "No File"
 msgstr "Нема датотеке"
 
 #: ../src/totem-interface.c:181 ../src/totem-interface.c:224
 #, c-format
 msgid "Couldn't load the '%s' interface. %s"
-msgstr "Није успело учитавање „%s“ сучеља. %s"
+msgstr "Не могу да учитам „%s“ сучеље. %s"
 
 #: ../src/totem-interface.c:181
 msgid "The file does not exist."
@@ -1134,7 +1227,7 @@
 msgid "Make sure that Totem is properly installed."
 msgstr "Проверите да ли је Тотем правилно инсталиран."
 
-#: ../src/totem-interface.c:347
+#: ../src/totem-interface.c:357
 msgid ""
 "Totem 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 "
@@ -1145,7 +1238,7 @@
 "ГНУ Опште јавне лиценце коју је објавила Задужбина слободног софтвера; "
 "верзије 2 лиценце или (по вашем избору) било које новије верзије."
 
-#: ../src/totem-interface.c:351
+#: ../src/totem-interface.c:361
 msgid ""
 "Totem is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -1157,7 +1250,7 @@
 "НАМЕНИ. Погледајте ГНУ Општу јавну лиценцу за више детаља."
 
 # bug: old address for FSF
-#: ../src/totem-interface.c:355
+#: ../src/totem-interface.c:365
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Totem; if not, write to the Free Software Foundation, Inc., 59 Temple Place, "
@@ -1167,57 +1260,30 @@
 "пишите Задужбини слободног софтвера на адресу: „Free Software Foundation, "
 "Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA“"
 
-#: ../src/totem-interface.c:358
+#: ../src/totem-interface.c:368
 msgid ""
 "Totem contains an exception to allow the use of proprietary GStreamer "
 "plugins."
 msgstr ""
-"Тотем садржи изузетак да би дозволио употребу власничких додатака за "
+"Тотем садржи изузетак да би дозволио употребу власничких прикључака за "
 "ГСтример."
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:190
+#: ../src/totem-menu.c:291
 msgid "None"
 msgstr "Ништа"
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:195
+#: ../src/totem-menu.c:296
 msgctxt "Language"
 msgid "Auto"
-msgstr "Самоприлагоди"
-
-#. Translators:
-#. * This is not a JPEG image, but a disc image, for example,
-#. * an ISO file
-#: ../src/totem-menu.c:765
-#, c-format
-msgid "Play Image '%s'"
-msgstr "Пусти одраз „%s“"
-
-# bug: wtf?
-#: ../src/totem-menu.c:768 ../src/totem-menu.c:851
-#, c-format
-msgid "device%d"
-msgstr "уређај%d"
-
-#: ../src/totem-menu.c:848
-#, c-format
-msgid "Play Disc '%s'"
-msgstr "Пусти диск „%s“"
-
-# bug: string composition
-#. This lists the back-end type and version, such as
-#. * Movie Player using GStreamer 0.10.1
-#: ../src/totem-menu.c:1189
-#, c-format
-msgid "Movie Player using %s"
-msgstr "Програм за фолмове користи %s"
+msgstr "Сам одреди"
 
-#: ../src/totem-menu.c:1193
+#: ../src/totem-menu.c:789
 msgid "Copyright © 2002-2009 Bastien Nocera"
-msgstr "Сва права задржана © 2002–2009 Бастијен Носера"
+msgstr "Ауторска права © 2002–2009 Бастијен Носера"
 
-#: ../src/totem-menu.c:1198
+#: ../src/totem-menu.c:794
 msgid "translator-credits"
 msgstr ""
 "Вељко Станојевић \n"
@@ -1228,153 +1294,77 @@
 "Бранко Кокановић \n"
 "Превод.орг — превод на српски језик."
 
-#: ../src/totem-menu.c:1202
+#: ../src/totem-menu.c:798
 msgid "Totem Website"
-msgstr "Тотем веб адреса"
+msgstr "Веб сајт Тотема"
 
-#: ../src/totem-menu.c:1236
+#: ../src/totem-menu.c:829
 msgid "Configure Plugins"
-msgstr "Подеси додатке"
+msgstr "Подесите прикључке"
+
+#: ../src/totem-object.c:162
+#, c-format
+msgid ""
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"%s\n"
+"Покрените „%s --help“ да ​​видите потпун списак доступних опција линије "
+"наредби.\n"
 
 #. Translators: %s is the totem version number
-#: ../src/totem-object.c:471
+#: ../src/totem-object.c:591
 #, c-format
 msgid "Totem %s"
 msgstr "Тотем %s"
 
-#: ../src/totem-object.c:1047 ../browser-plugin/totem-plugin-viewer.c:367
-msgid "Playing"
-msgstr "Пушта"
-
-#: ../src/totem-object.c:1049 ../src/totem-options.c:52
+#: ../src/totem-object.c:1168 ../src/totem-options.c:52
 msgid "Pause"
 msgstr "Паузирај"
 
-#: ../src/totem-object.c:1054 ../browser-plugin/totem-plugin-viewer.c:363
-msgid "Paused"
-msgstr "Пауза"
-
-#: ../src/totem-object.c:1056 ../src/totem-object.c:1066
+#: ../src/totem-object.c:1175 ../src/totem-object.c:1185
 #: ../src/totem-options.c:51
 msgid "Play"
 msgstr "Пусти"
 
-#: ../src/totem-object.c:1061 ../src/totem-object.c:1659
-#: ../src/totem-statusbar.c:115 ../browser-plugin/totem-plugin-viewer.c:351
-msgid "Stopped"
-msgstr "Заустављено"
-
-#: ../src/totem-object.c:1142 ../src/totem-object.c:1169
-#: ../src/totem-object.c:1799 ../src/totem-object.c:1963
+#: ../src/totem-object.c:1267 ../src/totem-object.c:1294
+#: ../src/totem-object.c:1787 ../src/totem-object.c:1942
 #, c-format
 msgid "Totem could not play '%s'."
-msgstr "Тотем није могао да пусти „%s“."
-
-#: ../src/totem-object.c:1246
-#, c-format
-msgid ""
-"Totem could not play this media (%s) although a plugin is present to handle "
-"it."
-msgstr ""
-"Тотем није успео да пусти овај медиј (%s) иако је одговарајући додатак "
-"присутан."
-
-#: ../src/totem-object.c:1247
-msgid ""
-"You might want to check that a disc is present in the drive and that it is "
-"correctly configured."
-msgstr ""
-"Могли би сте проверити да ли је диск убачен и да ли је исправно подешен."
-
-#: ../src/totem-object.c:1255
-msgid "More information about media plugins"
-msgstr "Још информација о мултимедијалним додацима"
-
-#: ../src/totem-object.c:1256
-msgid ""
-"Please install the necessary plugins and restart Totem to be able to play "
-"this media."
-msgstr ""
-"Инсталирајте неопходне додатке и изнова покрените Тотем да би сте користили "
-"овај медиј."
-
-#: ../src/totem-object.c:1258
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because it does not have the "
-"appropriate plugins to be able to read from the disc."
-msgstr ""
-"Тотем не може да прикаже ову врсту медија (%s) јер немате одговарајуће "
-"додатке за читање диска."
-
-#: ../src/totem-object.c:1260
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because you do not have the "
-"appropriate plugins to handle it."
-msgstr ""
-"Тотем не може да прикаже ову врсту медија (%s) јер немате одговарајуће "
-"додатке."
-
-#: ../src/totem-object.c:1263
-#, c-format
-msgid "Totem cannot play this type of media (%s) because it is not supported."
-msgstr "Тотем не може да прикаже ову врсту медија (%s) јер она није подржана."
-
-#: ../src/totem-object.c:1264
-msgid "Please insert another disc to play back."
-msgstr "Убаците други диск за репродукцију."
-
-#: ../src/totem-object.c:1300
-msgid "Totem was not able to play this disc."
-msgstr "Тотем није могао да пусти овај диск."
-
-#: ../src/totem-object.c:1301 ../src/totem-object.c:4229
-msgid "No reason."
-msgstr "Без разлога."
-
-#: ../src/totem-object.c:1315
-msgid "Totem does not support playback of Audio CDs"
-msgstr "Гномов биоскоп е подржава пуштање звучних ЦД-а"
-
-#: ../src/totem-object.c:1316
-msgid "Please consider using a music player or a CD extractor to play this CD"
-msgstr "Користите програм за пуштање или извлачење музике за овај ЦД"
+msgstr "Тотем не може да пусти „%s“."
 
-#: ../src/totem-object.c:1805
+#: ../src/totem-object.c:1793
 msgid "No error message"
-msgstr "Нема поруке о грешци"
+msgstr "Нема порука о грешкама"
 
-#: ../src/totem-object.c:2154
+#: ../src/totem-object.c:2133
 msgid "Totem could not display the help contents."
-msgstr "Тотем није могао да прикаже садржај помоћи."
-
-#: ../src/totem-object.c:2493 ../src/totem-object.c:2495
-#: ../browser-plugin/totem-plugin-viewer.c:1417
-msgid "An error occurred"
-msgstr "Дошло је до грешке"
+msgstr "Тотем не може да прикаже садржај помоћи."
 
-#: ../src/totem-object.c:4064 ../src/totem-object.c:4066
+#: ../src/totem-object.c:4019 ../src/totem-object.c:4021
 msgid "Previous Chapter/Movie"
 msgstr "Претходно поглавље/филм"
 
-#: ../src/totem-object.c:4073 ../src/totem-object.c:4075
+#: ../src/totem-object.c:4028 ../src/totem-object.c:4030
 msgid "Play / Pause"
-msgstr "Пусти / пауза"
+msgstr "Пусти / Паузирај"
 
-#: ../src/totem-object.c:4083 ../src/totem-object.c:4085
+#: ../src/totem-object.c:4038 ../src/totem-object.c:4040
 msgid "Next Chapter/Movie"
 msgstr "Следеће поглавље/филм"
 
-#. Translators: this is the tooltip text for the fullscreen button in the controls box in Totem's main window.
 #. Translators: this is the accessibility text for the fullscreen button in the controls box in Totem's main window.
-#: ../src/totem-object.c:4097 ../src/totem-object.c:4099
+#: ../src/totem-object.c:4051 ../src/totem-object.c:4053
 msgid "Fullscreen"
-msgstr "Цео екран"
+msgstr "Преко целог екрана"
 
-#: ../src/totem-object.c:4229
+#: ../src/totem-object.c:4184
 msgid "Totem could not startup."
-msgstr "Тотем није успео да се покрене."
+msgstr "Тотем не може да се покрене."
+
+#: ../src/totem-object.c:4184
+msgid "No reason."
+msgstr "Без разлога."
 
 #: ../src/totem-open-location.c:182
 msgid "Open Location..."
@@ -1382,184 +1372,178 @@
 
 #: ../src/totem-options.c:49
 msgid "Enable debug"
-msgstr "Омогући разбубирање"
+msgstr "Укључује уклањање грешака"
 
 #: ../src/totem-options.c:50
 msgid "Play/Pause"
-msgstr "Пусти/пауза"
+msgstr "Пушта/паузира"
 
 #: ../src/totem-options.c:53
 msgid "Next"
-msgstr "Следећи"
+msgstr "Следеће"
 
 #: ../src/totem-options.c:54
 msgid "Previous"
-msgstr "Претходни"
+msgstr "Претходно"
 
 #: ../src/totem-options.c:55
 msgid "Seek Forwards"
-msgstr "Тражи унапред"
+msgstr "Премотава унапред"
 
 #: ../src/totem-options.c:56
 msgid "Seek Backwards"
-msgstr "Тражи уназад"
+msgstr "Премотава уназад"
 
 #: ../src/totem-options.c:57
 msgid "Volume Up"
-msgstr "Појачај"
+msgstr "Појачава јачину звука"
 
 #: ../src/totem-options.c:58
 msgid "Volume Down"
-msgstr "Утишај"
+msgstr "Утишава јачину звука"
 
 #: ../src/totem-options.c:59
 msgid "Mute sound"
-msgstr "Утишај звук"
+msgstr "Потпуно утишава јачину звука"
 
 #: ../src/totem-options.c:60
 msgid "Toggle Fullscreen"
-msgstr "На цео-екран"
+msgstr "Окида режим преко целог екрана"
 
 #: ../src/totem-options.c:61
 msgid "Show/Hide Controls"
-msgstr "Прикажи/сакриј контроле"
+msgstr "Приказује/скрива дугмад за управљање"
 
 #: ../src/totem-options.c:62
 msgid "Quit"
-msgstr "Изађи"
+msgstr "Затвара програм"
 
 #: ../src/totem-options.c:63
 msgid "Enqueue"
-msgstr "Закажи"
+msgstr "Заказује пуштање"
 
 #: ../src/totem-options.c:64
 msgid "Replace"
-msgstr "Замени"
+msgstr "Врши замену"
 
 #: ../src/totem-options.c:65
 msgid "Seek"
-msgstr "Скочи"
+msgstr "Премотава"
 
 #. Translators: help for a (hidden) command line option to specify (the zero-based index of) a playlist entry to start playing once Totem's finished loading
 #: ../src/totem-options.c:67
 msgid "Playlist index"
-msgstr "Индекс у списку"
+msgstr "Индекс списка нумера"
 
 #: ../src/totem-options.c:69
 msgid "Movies to play"
-msgstr "Пустити филмове"
+msgstr "Филмови за пуштање"
+
+#: ../src/totem-options.c:79
+msgid "- Play movies and songs"
+msgstr "— пуштајте филмове и песме"
 
-#: ../src/totem-options.c:117
+#: ../src/totem-options.c:142
 msgid "Can't enqueue and replace at the same time"
 msgstr "Не могу да закажем и да заменим у исто време"
 
 #. By extension entry
-#: ../src/totem-playlist.c:161
+#: ../src/totem-playlist.c:162
 msgid "MP3 ShoutCast playlist"
-msgstr "MP3 ShoutCast листа"
+msgstr "МП3 Шауткаст листа"
 
-#: ../src/totem-playlist.c:162
+#: ../src/totem-playlist.c:163
 msgid "MP3 audio (streamed)"
-msgstr "MP3 звук (кроз ток)"
+msgstr "МП3 звук (кроз ток)"
 
-#: ../src/totem-playlist.c:163
+#: ../src/totem-playlist.c:164
 msgid "MP3 audio (streamed, DOS format)"
-msgstr "MP3 звук (кроз ток, DOS формат)"
+msgstr "МП3 звук (кроз ток, DOS формат)"
 
-#: ../src/totem-playlist.c:164
+#: ../src/totem-playlist.c:165
 msgid "XML Shareable Playlist"
-msgstr "XML дељива листа"
+msgstr "ИксМЛ дељива листа"
 
 #. This is "Title 3", where title is a DVD title
 #. * Note: NOT a DVD chapter
-#: ../src/totem-playlist.c:347
+#: ../src/totem-playlist.c:348
 #, c-format
 msgid "Title %d"
 msgstr "Наслов %d"
 
-#: ../src/totem-playlist.c:446
+#: ../src/totem-playlist.c:447
 msgid "Could not save the playlist"
 msgstr "Не могу да сачувам листу"
 
-#: ../src/totem-playlist.c:1021
+#: ../src/totem-playlist.c:1022
 msgid "Save Playlist"
-msgstr "Сачувај листу"
+msgstr "Сачувај списак нумера"
 
 #. translators: Playlist is the default saved playlist filename,
 #. * without the suffix
-#: ../src/totem-playlist.c:1033 ../src/totem-playlist.c:1264
-#: ../src/totem-sidebar.c:142
+#: ../src/totem-playlist.c:1034 ../src/totem-playlist.c:1263
+#: ../src/totem-sidebar.c:145
 msgid "Playlist"
-msgstr "Листа"
+msgstr "Списак нумера"
 
-#: ../src/totem-playlist.c:1857
+#: ../src/totem-playlist.c:1862
 #, c-format
 msgid "The playlist '%s' could not be parsed. It might be damaged."
 msgstr "Не могу да учитам листу „%s“. Можда је оштећена."
 
-#: ../src/totem-playlist.c:1858
+#: ../src/totem-playlist.c:1863
 msgid "Playlist error"
 msgstr "Грешка са листом"
 
-#: ../src/totem-preferences.c:295
+#: ../src/totem-preferences.c:297
 msgid "Preferences"
 msgstr "Поставке"
 
-#: ../src/totem-preferences.c:451
+#: ../src/totem-preferences.c:445
 msgid "Select Subtitle Font"
-msgstr "Одаберите словни лик за преводе"
+msgstr "Изаберите словни лик за преводе"
 
-#: ../src/totem-properties-main.c:115 ../src/totem-properties-view.c:266
+#: ../src/totem-properties-main.c:116 ../src/totem-properties-view.c:269
 msgid "Audio/Video"
 msgstr "Звук/видео"
 
-#: ../src/totem-properties-view.c:128
+#: ../src/totem-properties-view.c:131
 msgid "N/A"
 msgstr "недоступно"
 
-#: ../src/totem-properties-view.c:157
+#: ../src/totem-properties-view.c:160
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 msgctxt "Stream bit rate"
 msgid "N/A"
 msgstr "недоступно"
 
-#: ../src/totem-properties-view.c:160
+#: ../src/totem-properties-view.c:163
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 #, c-format
 msgid "%d kbps"
 msgstr "%d kb/s"
 
-#: ../src/totem-properties-view.c:177
+#: ../src/totem-properties-view.c:180
 #: ../src/plugins/properties/totem-movie-properties.c:149
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../src/totem-properties-view.c:209
+#: ../src/totem-properties-view.c:212
 #: ../src/plugins/properties/totem-movie-properties.c:166
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: ../src/totem-properties-view.c:216
+#: ../src/totem-properties-view.c:219
 #: ../src/plugins/properties/totem-movie-properties.c:166
 msgctxt "Sample rate"
 msgid "N/A"
 msgstr "недоступно"
 
-#: ../src/totem-properties-view.c:224
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5589
-msgid "Surround"
-msgstr "Сараунд"
-
-#: ../src/totem-properties-view.c:226
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5591
-msgid "Mono"
-msgstr "Моно"
-
-#: ../src/totem-properties-view.c:236
+#: ../src/totem-properties-view.c:239
 msgctxt "Number of audio channels"
 msgid "N/A"
 msgstr "недоступно"
@@ -1571,7 +1555,7 @@
 #: ../src/totem-statusbar.c:133
 #, c-format
 msgid "%s (Streaming)"
-msgstr "%s (Текући)"
+msgstr "%s (проточни)"
 
 #. Elapsed / Total Length
 #: ../src/totem-statusbar.c:140 ../src/totem-time-label.c:64
@@ -1583,18 +1567,18 @@
 #: ../src/totem-statusbar.c:143 ../src/totem-time-label.c:67
 #, c-format
 msgid "Seek to %s / %s"
-msgstr "Прескочи до %s / %s"
+msgstr "Премотај на %s / %s"
 
 # andrija: Баферовање?
 #: ../src/totem-statusbar.c:239
 msgid "Buffering"
-msgstr "Пренос у бафер"
+msgstr "Смештам у међумеморију"
 
 #. eg: 75 %
 #: ../src/totem-statusbar.c:250
 #, c-format
-msgid "%d %%"
-msgstr "%d %%"
+msgid "%lf %%"
+msgstr "%lf %%"
 
 #. eg: Paused, 0:32 / 1:05
 #: ../src/totem-statusbar.c:325
@@ -1605,8 +1589,8 @@
 #. eg: Buffering, 75 %
 #: ../src/totem-statusbar.c:330
 #, c-format
-msgid "%s, %d %%"
-msgstr "%s, %d %%"
+msgid "%s, %f %%"
+msgstr "%s, %f %%"
 
 #: ../src/totem-subtitle-encoding.c:156
 msgid "Current Locale"
@@ -1638,12 +1622,12 @@
 #: ../src/totem-subtitle-encoding.c:190 ../src/totem-subtitle-encoding.c:192
 #: ../src/totem-subtitle-encoding.c:194 ../src/totem-subtitle-encoding.c:196
 msgid "Chinese Simplified"
-msgstr "кинески, поједностављени"
+msgstr "кинески поједностављени"
 
 #: ../src/totem-subtitle-encoding.c:199 ../src/totem-subtitle-encoding.c:201
 #: ../src/totem-subtitle-encoding.c:203
 msgid "Chinese Traditional"
-msgstr "кинески, традиционални"
+msgstr "кинески традиционални"
 
 #: ../src/totem-subtitle-encoding.c:206
 msgid "Croatian"
@@ -1674,7 +1658,7 @@
 
 #: ../src/totem-subtitle-encoding.c:240
 msgid "Gujarati"
-msgstr "гуџарати"
+msgstr "гујарати"
 
 #: ../src/totem-subtitle-encoding.c:243
 msgid "Gurmukhi"
@@ -1713,7 +1697,7 @@
 
 #: ../src/totem-subtitle-encoding.c:283
 msgid "Persian"
-msgstr "фарси"
+msgstr "персијски"
 
 #: ../src/totem-subtitle-encoding.c:286 ../src/totem-subtitle-encoding.c:288
 msgid "Romanian"
@@ -1749,228 +1733,91 @@
 msgid "Vietnamese"
 msgstr "вијетнамски"
 
-#: ../src/totem-video-list.c:330
-msgid "No video URI"
-msgstr "Нема адресе видео снимка"
-
-#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
-#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
-#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
-#: ../src/totem-video-thumbnailer.c:872
-#, c-format
-msgid ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-msgstr ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-
-#: ../src/totem-video-thumbnailer.c:873
-msgid "Filename"
-msgstr "Име датотеке"
-
-#: ../src/totem-video-thumbnailer.c:875
-msgid "Resolution"
-msgstr "Резолуција"
-
-#: ../src/totem-video-thumbnailer.c:878
-msgid "Duration"
-msgstr "Трајање"
-
-#: ../src/totem-uri.c:506 ../src/plugins/chapters/totem-chapters.c:998
+#: ../src/totem-uri.c:343 ../src/plugins/chapters/totem-chapters.c:998
 msgid "All files"
 msgstr "Све датотеке"
 
-#: ../src/totem-uri.c:511 ../src/plugins/chapters/totem-chapters.c:995
+#: ../src/totem-uri.c:348 ../src/plugins/chapters/totem-chapters.c:995
 msgid "Supported files"
 msgstr "Подржане датотеке"
 
-#: ../src/totem-uri.c:523
+#: ../src/totem-uri.c:360
 msgid "Audio files"
 msgstr "Звучне датотеке"
 
-#: ../src/totem-uri.c:531
+#: ../src/totem-uri.c:368
 msgid "Video files"
 msgstr "Видео датотеке"
 
-#: ../src/totem-uri.c:541
+#: ../src/totem-uri.c:378
 msgid "Subtitle files"
-msgstr "Датотеке са титлом"
+msgstr "Датотеке превода"
 
-#: ../src/totem-uri.c:593
+#: ../src/totem-uri.c:430
 msgid "Select Text Subtitles"
-msgstr "Одаберите текстуални титл"
+msgstr "Изаберите текстуални титл"
 
-#: ../src/totem-uri.c:656
+#: ../src/totem-uri.c:495
 msgid "Select Movies or Playlists"
 msgstr "Изаберите филмове или спискове"
 
-#. Options parsing
-#: ../src/totem.c:201
-msgid "- Play movies and songs"
-msgstr "— пуштајте филмове и песме"
-
-#: ../src/totem.c:212
-#, c-format
-msgid ""
-"%s\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"%s\n"
-"Покрените „%s --help“ за комплетан списак могућности из конзоле.\n"
-
-#: ../src/totem.c:254 ../src/totem.c:265
-#: ../browser-plugin/totem-plugin-viewer.c:663
-#: ../browser-plugin/totem-plugin-viewer.c:1793
-msgid "Totem Movie Player"
-msgstr "Тотем — пуштање филмова"
-
-# andrija: непотпун превод, а тежак :)
-# данило: нити и безбедно, послужиће ;)
-#: ../src/totem.c:255 ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Could not initialize the thread-safe libraries."
-msgstr "Нисам успео да учитам библиотеке за безбедан рад са нитима."
-
-#: ../src/totem.c:255
-msgid "Verify your system installation. Totem will now exit."
-msgstr "Проверите инсталацију система. Тотем ће се сада угасити."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:1589
-msgid "Password requested for RTSP server"
-msgstr "Захтевана је лозинка за РТСП сервер"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2858
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2862
-#, c-format
-msgid "Audio Track #%d"
-msgstr "Звучна нумера #%d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2890
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2894
-#, c-format
-msgid "Subtitle #%d"
-msgstr "Превод #%d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3298
-msgid ""
-"The requested audio output was not found. Please select another audio output "
-"in the Multimedia Systems Selector."
-msgstr ""
-"Није нађен тражени звучни излаз. Молим изаберите други звучни излаз у "
-"„Избирачу мултимедијалног система“."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3303
-msgid "Location not found."
-msgstr "Место није нађено."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3307
-msgid ""
-"Could not open location; you might not have permission to open the file."
-msgstr "Не могу да отворим место: можда немате дозволе за читање датотеке."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3318
-msgid ""
-"The video output is in use by another application. Please close other video "
-"applications, or select another video output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"Видео излаз већ користи неки други програм. Затворите остале видео програме, "
-"или изаберите неки други видео излаз у „Избирачу мултимедијалног система“."
+#: ../src/totem-uri.c:499
+msgid "Add Directory"
+msgstr "Додајте директоријум"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3324
-msgid ""
-"The audio output is in use by another application. Please select another "
-"audio output in the Multimedia Systems Selector. You may want to consider "
-"using a sound server."
-msgstr ""
-"Звучни излаз већ користи неки други програм. Изаберите други звучни излаз у "
-"„Избирачу мултимедијалног система“. Можете и размотрити коришћење звучног "
-"сервера."
+#: ../src/totem-video-list.c:330
+msgid "No video URI"
+msgstr "Нема адресе видео снимка"
 
-#. should be exactly one missing thing (source or converter)
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3342
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3348
+#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
+#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
+#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
+#: ../src/totem-video-thumbnailer.c:841
 #, c-format
-msgid "The playback of this movie requires a %s plugin which is not installed."
-msgid_plural ""
-"The playback of this movie requires the following decoders which are not "
-"installed:\n"
-"\n"
-"%s"
-msgstr[0] "Пуштање овог филма захтева додатак %s који није инсталиран."
-msgstr[1] ""
-"Пуштање овог филма захтева следеће декодере који нису инсталирани:\n"
-"\n"
-"%s"
-msgstr[2] ""
-"Пуштање овог филма захтева следеће декодере који нису инсталирани:\n"
-"\n"
-"%s"
-msgstr[3] "Пуштање овог филма захтева један додатак који није инсталиран."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3374
 msgid ""
-"Cannot play this file over the network. Try downloading it to disk first."
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 msgstr ""
-"Не могу да пустим ову датотеку преко мреже. Покушајте да је прво пренесете "
-"на диск."
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5878
-msgid "Media contains no supported video streams."
-msgstr "Датотека не садржи подржане видео токове."
+#: ../src/totem-video-thumbnailer.c:842
+msgid "Filename"
+msgstr "Назив датотеке"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6052
-msgid ""
-"Failed to create a GStreamer play object. Please check your GStreamer "
-"installation."
-msgstr ""
-"Неуспешно образовање ГСтримеров објекат за пуштање. Проверите инсталацију "
-"ГСтримера."
+#: ../src/totem-video-thumbnailer.c:844
+msgid "Resolution"
+msgstr "Резолуција"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6172
-msgid ""
-"Failed to open audio output. You may not have permission to open the sound "
-"device, or the sound server may not be running. Please select another audio "
-"output in the Multimedia Systems Selector."
-msgstr ""
-"Неуспешан приступ звучном излазу. Нисте овлашћени да приступите звучном "
-"уређају, или није покренут звучни сервер. Изаберите други звучни излаз у "
-"„Избирачу мултимедијалног система“."
+#: ../src/totem-video-thumbnailer.c:847
+msgid "Duration"
+msgstr "Трајање"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6192
-msgid ""
-"Could not find the audio output. You may need to install additional "
-"GStreamer plugins, or select another audio output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"Није нађен тражени звучни излаз. Можда треба да инсталирате још неке додатке "
-"или да изаберете други звучни излаз у „Избирачу мултимедијалног система“."
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:1
+msgid "Apple Trailers"
+msgstr "Еплови пробни снимци"
+
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:2
+msgid "Sets the user agent for the Apple Trailers site"
+msgstr "Подешава корисничког агента за сајт Еплових пробних снимака"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:1
+msgid "Autoload Subtitles"
+msgstr "Самоучитавање титлова"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:2
+msgid "Autoloads text subtitles"
+msgstr "Самоучитавање текстуалних титлова"
 
-#. hour:minutes:seconds
-#. Translators: This is a time format, like "9:05:02" for 9
-#. * hours, 5 minutes, and 2 seconds. You may change ":" to
-#. * the separator that your locale uses or use "%Id" instead
-#. * of "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:83 ../src/plugins/skipto/totem-time-entry.c:57
-#, c-format
-msgctxt "long time format"
-msgid "%d:%02d:%02d"
-msgstr "%d:%02d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
+msgid "Video Disc Recorder"
+msgstr "Смимање видео дискова"
 
-#. minutes:seconds
-#. Translators: This is a time format, like "5:02" for 5
-#. * minutes and 2 seconds. You may change ":" to the
-#. * separator that your locale uses or use "%Id" instead of
-#. * "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:92
-#, c-format
-msgctxt "short time format"
-msgid "%d:%02d"
-msgstr "%d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
+msgid "Records (S)VCDs or video DVDs"
+msgstr "Снимајте (С)ВЦД или видео ДВД дискове"
 
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:65
 msgid "_Create Video Disc..."
@@ -1978,15 +1825,15 @@
 
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:66
 msgid "Create a video DVD or a (S)VCD from the currently opened movie"
-msgstr "Прави видео ДВД или (С)ВЦД од тренутно пуштеног филма"
+msgstr "Направите видео ДВД или (С)ВЦД од тренутно пуштеног филма"
 
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:68
 msgid "Copy Vide_o DVD..."
-msgstr "Умножи Виде_о ДВД..."
+msgstr "_Умножи Видео ДВД..."
 
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:69
 msgid "Copy the currently playing video DVD"
-msgstr "Умножава тренутно пуштени видео ДВД"
+msgstr "Умножите тренутно пуштени видео ДВД"
 
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:71
 msgid "Copy (S)VCD..."
@@ -1994,43 +1841,26 @@
 
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:72
 msgid "Copy the currently playing (S)VCD"
-msgstr "Умножава тренутно пуштени (С)ВЦД"
+msgstr "Умножите тренутно пуштени (С)ВЦД"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:129
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:136
 msgid "The video disc could not be duplicated."
 msgstr "Не могу да умножим видео диск."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:131
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:276
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:138
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:283
 msgid "The movie could not be recorded."
 msgstr "Не могу да снимим филм."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:157
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:167
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:263
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:164
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:174
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:270
 msgid "Unable to write a project."
 msgstr "Не могу да упишем пројекат."
 
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
-msgid "Video Disc Recorder"
-msgstr "Смимање Видео дискова"
-
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
-msgid "Records (S)VCDs or video DVDs"
-msgstr "Снима (С)ВЦД или Видео ДВД дискове"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:1
-#: ../src/plugins/chapters/totem-chapters.c:1139
-msgid "Chapters"
-msgstr "Поглавља"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:2
-msgid "Support chapter markers in movies."
-msgstr "Подршка маркера поглавља у филмовима."
-
 #: ../src/plugins/chapters/chapters-edit.ui.h:1
 msgid "Name for new chapter:"
-msgstr "Име за ново поглавље:"
+msgstr "Назив новог поглавља:"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:1
 msgid "_Remove Chapter"
@@ -2046,7 +1876,7 @@
 
 #: ../src/plugins/chapters/chapters-list.ui.h:4
 msgid "Go to the chapter in the movie"
-msgstr "Иде на поглавље у филму"
+msgstr "Идите на поглавље у филму"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:5
 msgid "Add Chapter..."
@@ -2062,7 +1892,7 @@
 
 #: ../src/plugins/chapters/chapters-list.ui.h:8
 msgid "Save Changes"
-msgstr "Сачувај промене"
+msgstr "Сачувај измене"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:9
 msgid "No chapter data"
@@ -2082,7 +1912,16 @@
 
 #: ../src/plugins/chapters/chapters-list.ui.h:13
 msgid "Create a new chapter list for the movie"
-msgstr "Направите нови списак поглавље за филм"
+msgstr "Направите нови списак поглавља за филм"
+
+#: ../src/plugins/chapters/chapters.plugin.in.h:1
+#: ../src/plugins/chapters/totem-chapters.c:1139
+msgid "Chapters"
+msgstr "Поглавља"
+
+#: ../src/plugins/chapters/chapters.plugin.in.h:2
+msgid "Support chapter markers in movies"
+msgstr "Подршка маркера поглавља у филмовима"
 
 #: ../src/plugins/chapters/totem-chapters.c:56
 #, c-format
@@ -2103,7 +1942,7 @@
 
 #: ../src/plugins/chapters/totem-chapters.c:544
 msgid "Try another name or remove an existing chapter."
-msgstr "Покушајте друго име или уклоните постојеће поглавље."
+msgstr "Покушајте други назив или уклоните постојеће поглавље."
 
 #: ../src/plugins/chapters/totem-chapters.c:717
 msgid "Error while writing file with chapters"
@@ -2122,7 +1961,7 @@
 
 #: ../src/plugins/chapters/totem-chapters.c:976
 msgid "Open Chapter File"
-msgstr "Отвори датотеку са поглављима"
+msgstr "Отвори датотеку поглавља"
 
 #: ../src/plugins/chapters/totem-chapters.c:1093
 msgid "Chapter Screenshot"
@@ -2155,26 +1994,26 @@
 msgstr "Не могу да отворим ЦММЛ датотеку"
 
 #: ../src/plugins/chapters/totem-edit-chapter.c:95
-#| msgid "Add Chapter..."
 msgid "Add Chapter"
 msgstr "Додајте поглавље"
 
 #: ../src/plugins/dbusservice/dbusservice.plugin.in.h:1
 msgid "D-Bus Service"
-msgstr "D-Bus услуга"
+msgstr "Услуга Д-сабирнице"
 
 #: ../src/plugins/dbusservice/dbusservice.plugin.in.h:2
 msgid ""
 "Plugin for sending notifications of currently playing movies to the D-Bus "
 "subsystem."
 msgstr ""
-"Додатак за слање обавештења о тренутно пуштеном филму на D-Bus подсистем."
+"Додатак за слање обавештења о тренутно пуштеном филму на подсистем "
+"Д-сабирнице."
 
 #: ../src/plugins/dbusservice/dbusservice.py:213
 #: ../src/plugins/dbusservice/dbusservice.py:243
 #, python-format
 msgid "The MediaPlayer2 object does not implement the ‘%s’ interface"
-msgstr "Објекат Медија Плејера 2 не користи „%s“ сучеље"
+msgstr "Објекат Медија плејера 2 не користи „%s“ сучеље"
 
 #: ../src/plugins/dbusservice/dbusservice.py:222
 #, python-format
@@ -2184,22 +2023,44 @@
 #: ../src/plugins/dbusservice/dbusservice.py:238
 #, python-format
 msgid "Unknown property ‘%s’ requested of a MediaPlayer 2 object"
-msgstr "Објекат Медија Плејера 2 уахтева непознато својство „%s“"
+msgstr "Објекат Медија плејера 2 захтева непознато својство „%s“"
 
 #: ../src/plugins/dbusservice/dbusservice.py:341
 #, python-format
 msgid "The URI ‘%s’ is not supported."
 msgstr "Адреса „%s“ није подржана."
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
-msgid "Instant Messenger status"
-msgstr "Стање програма за брзе поруке"
+#: ../src/plugins/grilo/grilo.plugin.in.h:1
+msgid "Grilo Browser"
+msgstr "Грило разгледач"
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
-msgid "Set your Instant Messenger status to away when a movie is playing"
-msgstr ""
-"Наместите ваше стање у програму за брзе поруке на „одсутан“ када је пуштен "
-"филм"
+#: ../src/plugins/grilo/grilo.plugin.in.h:2
+msgid "A plugin to let you browse media content from various sources"
+msgstr "Додатак који дозвољава разгледање медијског садржаја са разних извора"
+
+#: ../src/plugins/grilo/grilo.ui.h:1
+msgid "Add to Playlist"
+msgstr "Додајте на списак за пуштање"
+
+#: ../src/plugins/grilo/grilo.ui.h:2
+msgid "Copy Location"
+msgstr "Умножи путању"
+
+#: ../src/plugins/grilo/grilo.ui.h:3 ../src/plugins/grilo/totem-grilo.c:1184
+msgid "Browse"
+msgstr "Разгледај"
+
+#: ../src/plugins/grilo/grilo.ui.h:4 ../src/plugins/grilo/totem-grilo.c:1227
+msgid "Search"
+msgstr "Тражи"
+
+#: ../src/plugins/grilo/totem-grilo.c:454
+msgid "Browse Error"
+msgstr "Грешка у разгледању"
+
+#: ../src/plugins/grilo/totem-grilo.c:609
+msgid "Search Error"
+msgstr "Грешка претраге"
 
 #: ../src/plugins/gromit/gromit.plugin.in.h:1
 msgid "Gromit Annotations"
@@ -2213,58 +2074,15 @@
 msgid "The gromit binary was not found."
 msgstr "Громитова извршна датотека није нађена."
 
-#. Add the interface to Totem's sidebar
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:1
-#: ../src/plugins/iplayer/iplayer.py:46
-msgid "BBC iPlayer"
-msgstr "БиБиСи иПлејер"
-
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:2
-msgid "Stream BBC programs from the last 7 days from the BBC iPlayer service."
-msgstr ""
-"Прима програме БиБиСи-ја од последњих 7 дана преко БиБиСи иПлејер сервиса."
-
-#: ../src/plugins/iplayer/iplayer.py:72
-msgid "Error listing channel categories"
-msgstr "Грешка при преузимању категорија канала"
-
-#: ../src/plugins/iplayer/iplayer.py:73
-msgid ""
-"There was an unknown error getting the list of television channels available "
-"on BBC iPlayer."
-msgstr ""
-"Десила се непозната грешка приликом преузимања листе доступних телевизијских "
-"канала преко БиБиСи иПлејера."
-
-#. Append a dummy child row so that the expander's visible; we can
-#. then queue off the expander to load the programme listing for this
-#. category
-#: ../src/plugins/iplayer/iplayer.py:84
-msgid "Loading…"
-msgstr "Учитавам…"
-
-#. Translators: the "programme feed" is the list of TV shows
-#. available to watch online
-#: ../src/plugins/iplayer/iplayer.py:136
-msgid "Error getting programme feed"
-msgstr "Грешка при узимању довода програма"
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
+msgid "Instant Messenger Status"
+msgstr "Стање програма за тренутне поруке"
 
-#: ../src/plugins/iplayer/iplayer.py:137
-msgid ""
-"There was an error getting the list of programmes for this channel and "
-"category combination."
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
+msgid "Set your Instant Messenger status to away when a movie is playing"
 msgstr ""
-"Догодила се грешка приликом преузимања списка програма за ове канале и "
-"категорије."
-
-#: ../src/plugins/iplayer/iplayer2.py:298
-msgid ""
-msgstr "<није дат разлог>"
-
-#: ../src/plugins/iplayer/iplayer2.py:299
-#, python-format
-msgid "Programme unavailable (\"%s\")"
-msgstr "Програм није доступан („%s“)"
+"Наместите ваше стање у програму за тренутне поруке на „одсутан“ када је "
+"пуштен филм"
 
 #: ../src/plugins/lirc/lirc.plugin.in.h:1
 msgid "Infrared Remote Control"
@@ -2278,31 +2096,35 @@
 # данило: нити и безбедно, послужиће ;)
 #: ../src/plugins/lirc/totem-lirc.c:242
 msgid "Couldn't initialize lirc."
-msgstr "Нисам успео да покренем lirc."
+msgstr "Нисам успео да покренем лирц."
 
 #: ../src/plugins/lirc/totem-lirc.c:254
 msgid "Couldn't read lirc configuration."
-msgstr "Не могу да учитам lirc поставке."
+msgstr "Не могу да учитам поставке лирца."
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
-msgid "Download Movie Subtitles"
-msgstr "Преузми титлове за филм"
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:1
+msgid "Media Player Keys"
+msgstr "Пречице звучног програма"
+
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:2
+msgid "Support additional media player keys"
+msgstr "Подршка за додатне тастере медијског програма"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
-msgid "Subtitle _language:"
-msgstr "Језик тит_ла:"
+#: ../src/plugins/ontop/ontop.plugin.in.h:1
+msgid "Always On Top"
+msgstr "Увек у првом плану"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
-msgid "_Play with Subtitle"
-msgstr "_Пусти са титлом"
+#: ../src/plugins/ontop/ontop.plugin.in.h:2
+msgid "Keep the main window on top when playing a movie"
+msgstr "Држи главни прозор у првом плану када је пуштен филм"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:1
 msgid "Subtitle Downloader"
 msgstr "Преузимач титлова"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:2
-msgid "Look for subtitles for the currently playing movie."
-msgstr "Прегледај титлове за тренутно пуштени филм."
+msgid "Look for subtitles for the currently playing movie"
+msgstr "Потражите титлове за тренутно пуштени филм"
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:42
 msgid "Brazilian Portuguese"
@@ -2310,7 +2132,7 @@
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:177
 msgid "Searching for subtitles…"
-msgstr "Претражујем преводе…"
+msgstr "Тражим преводе…"
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:225
 #: ../src/plugins/opensubtitles/opensubtitles.py:645
@@ -2319,12 +2141,12 @@
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:290
 msgid "Could not contact the OpenSubtitles website"
-msgstr "Неуспело повезивање са OpenSubtitles сајтом"
+msgstr "Не могу да се повежем са сајтом Отворених титлова"
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:323
 #: ../src/plugins/opensubtitles/opensubtitles.py:341
 msgid "Could not contact the OpenSubtitles website."
-msgstr "Неуспело повезивање са OpenSubtitles сајтом."
+msgstr "Не могу да се повежем са сајтом Отворених титлова."
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:329
 msgid "No results found."
@@ -2348,16 +2170,28 @@
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:525
 msgid "Download movie subtitles from OpenSubtitles"
-msgstr "Преузима преводе за филм са OpenSubtitles сајта"
+msgstr "Преузима преводе филмова са сајта Отворених титлова"
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:527
 msgid "_Download Movie Subtitles…"
-msgstr "_Преузми преводе за филм..."
+msgstr "_Преузми преводе за филм…"
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:589
 msgid "Searching subtitles…"
 msgstr "Претражујем преводе…"
 
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
+msgid "Download Movie Subtitles"
+msgstr "Преузмите титлове за филм"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
+msgid "Subtitle _language:"
+msgstr "Језик тит_ла:"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
+msgid "_Play with Subtitle"
+msgstr "_Пусти са титлом"
+
 #: ../src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in.h:1
 msgid "Subtitle language"
 msgstr "Језик превода"
@@ -2366,80 +2200,17 @@
 msgid "The language to search for subtitles for movies in."
 msgstr "Језик за претраживање за преводе филмова."
 
-#: ../src/plugins/ontop/ontop.plugin.in.h:1
-msgid "Always On Top"
-msgstr "Увек у првом плану"
-
-#: ../src/plugins/ontop/ontop.plugin.in.h:2
-msgid "Keep the main window on top when playing a movie"
-msgstr "Држи главни прозор у првом плану када је пуштен филм"
+#: ../src/plugins/properties/movie-properties.plugin.in.h:1
+msgid "Movie Properties"
+msgstr "Својства филма"
+
+#: ../src/plugins/properties/movie-properties.plugin.in.h:2
+msgid "Adds movie properties to the sidebar"
+msgstr "Додајте својства филма у бочну површ"
 
 #: ../src/plugins/properties/totem-movie-properties.c:246
 msgid "Properties"
-msgstr "Особине"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:1
-msgid "Publisher protocol to use"
-msgstr "Протокол издавача за коришћење"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:2
-msgid ""
-"The transport protocol to use when publishing playlists over the network."
-msgstr ""
-"Транспортни протокол за коришћење приликом објављивања списка песама преко "
-"мреже."
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:3
-msgid "Format for network service name"
-msgstr "Формат за име мрежне услуге"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:5
-#, no-c-format
-msgid ""
-"A format string used to build the network service name used when publishing "
-"playlists over the network. The following format placeholders can be used: • "
-"%a: the program name as returned by g_get_application_name() • %h: the "
-"machine's host name in title case • %u: the user's login name in title case "
-"• %U: the user's real name • %%: the percent sign"
-msgstr ""
-"Формат низа коришћеног за изградњу имена мрежне услуге коришћене приликом "
-"објављивања списка нумера преко мреже. Следећи носиоци места формата могу "
-"бити коришћени: • „%a“: име програма које враћа „g_get_application_name()“ • "
-"„%h“: име домаћина машине у предмету наслова • „%u“: корисниково име "
-"пријављивања у случају наслова • „%U“: право име корисника • „%%“: знак за "
-"проценат"
-
-#. Translators: computers on the local network which are publishing their playlists over the network
-#: ../src/plugins/publish/totem-publish.c:552
-msgid "Neighbors"
-msgstr "Комшије"
-
-#: ../src/plugins/publish/publish.plugin.in.h:1
-msgid "Publish Playlist"
-msgstr "Објави списак песама"
-
-#: ../src/plugins/publish/publish.plugin.in.h:2
-msgid "Share the current playlist via HTTP"
-msgstr "Подели тренутну листу за пуштање кроз ХТТП"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:1
-msgid "Service _Name:"
-msgstr "_Назив услуге:"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:3
-#, no-c-format
-msgid ""
-"The name used for announcing the playlist service on the network.\n"
-"All occurrences of the string %u will be replaced by your name,\n"
-"and %h will be replaced by your computer's host name."
-msgstr ""
-"Име коришћено за најаву услуге списка песама у мрежи.\n"
-"Свако појављивање карактера %u биће замењено вашим именом,\n"
-"а %h ће бити замењено именом домаћина вашег рачунара."
-
-#: ../src/plugins/publish/publish-plugin.ui.h:6
-msgid "Use _encrypted transport protocol (HTTPS)"
-msgstr "_Шифровани протокол преноса (HTTPS)"
+msgstr "Својства"
 
 #: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:1
 msgid "rpdb2 password"
@@ -2451,24 +2222,89 @@
 "remote access. If this is empty, a default of 'totem' will be used."
 msgstr ""
 "Лозинка за заштиту рпдб2 сервера за отклањање грешака Тотема од неовлашћеног "
-"удаљеног приступа. Ако је ово празно, подразумевано „тотем“ ће се користити."
+"удаљеног приступа. Ако је ово празно, подразумевано „totem“ ће се "
+"користити."
+
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
+msgid "Python Console"
+msgstr "Питонова конзола"
+
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
+msgid "Interactive Python console"
+msgstr "Међудејствена Питонова конзола"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:88
+msgid "Python Console Menu"
+msgstr "Изборник Питонове конзоле"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:93
+msgid "_Python Console"
+msgstr "_Питонова конзола"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:94
+msgid "Show Totem's Python console"
+msgstr "Прикажите Питонову конзолу за Тотем"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:100
+msgid "Python Debugger"
+msgstr "Питонов исправљач грешака"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:101
+msgid "Enable remote Python debugging with rpdb2"
+msgstr "Укључите удаљено уклањање грешака Питона помоћу rpdb2"
+
+#. pylint: disable-msg=E1101
+#: ../src/plugins/pythonconsole/pythonconsole.py:125
+#, python-format
+msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
+msgstr "Можете приступити тотемовом објекту кроз „totem_object“ :\\n%s"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:129
+msgid "Totem Python Console"
+msgstr "Питонова конзола за Тотем"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:139
+msgid ""
+"After you press OK, Totem will wait until you connect to it with winpdb or "
+"rpdb2. If you have not set a debugger password in DConf, it will use the "
+"default password ('totem')."
+msgstr ""
+"Након што притиснете У реду, Тотем ће сачекати да се повежете на њега преко "
+"„winpdb“ или „rpdb2“. Уколико нисте изабрали лозинку ради уклањања грешака у "
+"Дконфу, користите подразумевану лозинку (totem)."
+
+#: ../src/plugins/recent/recent.plugin.in.h:1
+msgid "Recent files"
+msgstr "Скорашње датотеке"
+
+#: ../src/plugins/recent/recent.plugin.in.h:2
+msgid "Adds files that have been played to recent files"
+msgstr "Додајте пуштане датотеке у скорашње"
 
 #: ../src/plugins/rotation/rotation.plugin.in.h:1
 msgid "Rotation Plugin"
-msgstr "Додатак окретања"
+msgstr "Прикључак заокретања"
 
 #: ../src/plugins/rotation/rotation.plugin.in.h:2
-msgid "Allows videos to be rotated if they're in the wrong orientation."
-msgstr "Омогућава окретање видео снимака ако су погрешно окренути."
+msgid "Allows videos to be rotated if they are in the wrong orientation"
+msgstr "Омогућава окретање видео снимака ако су погрешно окренути"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:60
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:50
 msgid "_Rotate Clockwise"
 msgstr "Окрени у _смеру казаљке на сату"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:62
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:52
 msgid "Rotate Counterc_lockwise"
 msgstr "Окрени супротно од смера _казаљке на сату"
 
+#: ../src/plugins/save-file/save-file.plugin.in.h:1
+msgid "Save Copy"
+msgstr "Сачувајте примерак"
+
+#: ../src/plugins/save-file/save-file.plugin.in.h:2
+msgid "Save a copy of the currently playing movie"
+msgstr "Сачувајте један примерак тренутно пуштеног филма"
+
 #: ../src/plugins/save-file/totem-save-file.c:63
 msgid "Save a Copy..."
 msgstr "Сачувај примерак..."
@@ -2479,7 +2315,7 @@
 
 #: ../src/plugins/save-file/totem-save-file.c:129
 msgid "Save a Copy"
-msgstr "Сачувај примерак"
+msgstr "Сачувајте примерак"
 
 #. translators: Movie is the default saved movie filename,
 #. * without the suffix
@@ -2491,10 +2327,13 @@
 msgid "Movie stream"
 msgstr "Ток филма"
 
-#: ../src/plugins/screensaver/totem-screensaver.c:116
-#: ../browser-plugin/totem-plugin-viewer.c:1891
-msgid "Playing a movie"
-msgstr "Пушта филм"
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:1
+msgid "Screen Saver"
+msgstr "Чувар екрана"
+
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:2
+msgid "Deactivates the screen saver when a movie is playing"
+msgstr "Искључите чувара екрана приликом пуштања филма"
 
 #: ../src/plugins/screenshot/gallery.ui.h:1
 msgid "Screenshot width (in pixels):"
@@ -2502,33 +2341,38 @@
 
 #: ../src/plugins/screenshot/gallery.ui.h:2
 msgid "Calculate the number of screenshots"
-msgstr "Израчунај број снимака екрана"
+msgstr "Израчунајте број снимака екрана"
 
 #: ../src/plugins/screenshot/gallery.ui.h:3
 msgid "Number of screenshots:"
 msgstr "Број снимака екрана:"
 
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:1
-msgid "_Name:"
-msgstr "_Име:"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:2
-msgid "Save in _folder:"
-msgstr "Сними у _фасциклу:"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:3
-msgid "Select a folder"
-msgstr "Одаберите фасциклу"
-
-#. Write the screenshot to the temporary file
-#: ../src/plugins/screenshot/gnome-screenshot-widget.c:385
-#: ../src/plugins/screenshot/totem-screenshot.c:64
-msgid "Screenshot.png"
-msgstr "филмски-снимак.png"
+#. translators: this is the name of the file that gets made up
+#. * with the screenshot if the entire screen is taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:147
+#, c-format
+msgid "Screenshot from %s.png"
+msgstr "Снимак екрана са %s.png"
+
+#. translators: this is the name of the file that gets
+#. * made up with the screenshot if the entire screen is
+#. * taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:154
+#, c-format
+msgid "Screenshot from %s - %d.png"
+msgstr "Снимак екрана са %s — %d.png"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:1
+msgid "Screenshot"
+msgstr "Снимак екрана"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:2
+msgid "Allows screenshots and galleries to be taken of videos"
+msgstr "Омогућава прављење снимака екрана и збирки из видеа"
 
 #: ../src/plugins/screenshot/totem-gallery.c:91
 msgid "Save Gallery"
-msgstr "Сними галерију"
+msgstr "Сачувај збирку"
 
 #. Translators: The first argument is the movie title. The second
 #. * argument is a number which is used to prevent overwriting files.
@@ -2537,62 +2381,60 @@
 #: ../src/plugins/screenshot/totem-gallery.c:115
 #, c-format
 msgid "Gallery-%s-%d.jpg"
-msgstr "Галерија-%s-%d.jpg"
+msgstr "Збирка-%s-%d.jpg"
 
 #. Set up the window
 #: ../src/plugins/screenshot/totem-gallery-progress.c:101
 msgid "Creating Gallery..."
-msgstr "Правим галерију..."
+msgstr "Правим збирку..."
 
 #. Set the progress label
 #: ../src/plugins/screenshot/totem-gallery-progress.c:107
 #, c-format
 msgid "Saving gallery as \"%s\""
-msgstr "Снимам галерију као „%s“"
-
-#: ../src/plugins/screenshot/totem-screenshot.c:113
-msgid "There was an error saving the screenshot."
-msgstr "Дошло је до грешке приликом снимања слике екрана."
-
-#: ../src/plugins/screenshot/totem-screenshot.c:139
-msgid "Save Screenshot"
-msgstr "Сачувај снимак екрана"
-
-#. Create the screenshot widget
-#. Translators: %s is the movie title and %d is an auto-incrementing number to make filename unique
-#: ../src/plugins/screenshot/totem-screenshot.c:160
-#, c-format
-msgid "Screenshot-%s-%d.png"
-msgstr "Снимак-филма-%s-%d.png"
+msgstr "Чувам збирку као „%s“"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:88
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:220
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "Totem could not get a screenshot of the video."
 msgstr "Тотем није успео да направи снимак екрана филма."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "This is not supposed to happen; please file a bug report."
-msgstr "Ово није требало да се деси; молимо пријавите грешку."
+msgstr "Ово није требало да се деси; молим пријавите грешку."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
-msgid "Take _Screenshot..."
-msgstr "Направи _снимак екрана..."
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
+msgid "Take _Screenshot"
+msgstr "_Сними екран"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
 msgid "Take a screenshot"
-msgstr "Направи снимак екрана"
+msgstr "Направите снимак екрана"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create Screenshot _Gallery..."
-msgstr "Направи _галерију снимака екрана..."
+msgstr "Направи _збирку снимака екрана..."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create a gallery of screenshots"
-msgstr "Прави галерију снимака екрана"
+msgstr "Направите збирку снимака екрана"
+
+#: ../src/plugins/skipto/skipto.plugin.in.h:1
+#: ../src/plugins/skipto/totem-skipto.c:196
+msgid "Skip To"
+msgstr "Премотај на"
+
+#: ../src/plugins/skipto/skipto.plugin.in.h:2
+msgid "Provides the \"Skip to\" dialog"
+msgstr "Приказује прозорче „Премотај на“"
+
+#: ../src/plugins/skipto/skipto.ui.h:1
+msgid "_Skip to:"
+msgstr "_Премотај на:"
 
 #. Update the "seconds" label so that it always has the correct singular/plural form
 #. Translators: label for the seconds selector in the "Skip to" dialogue
-#: ../src/plugins/skipto/totem-skipto.c:160
+#: ../src/plugins/skipto/totem-skipto.c:159
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "секунда"
@@ -2604,456 +2446,15 @@
 #. Translators: you should translate this string to a number (written in digits) which corresponds to the longer character length of the
 #. * translations for "second" and "seconds", as translated elsewhere in this file. For example, in English, "second" is 6 characters long and
 #. * "seconds" is 7 characters long, so this string should be translated to "7". See: bgo#639398
-#: ../src/plugins/skipto/totem-skipto.c:190
+#: ../src/plugins/skipto/totem-skipto.c:189
 msgctxt "Skip To label length"
 msgid "7"
 msgstr "7"
 
-#: ../src/plugins/skipto/totem-skipto.c:197
-msgid "Skip To"
-msgstr "Прескочи до"
-
 #: ../src/plugins/skipto/totem-skipto-plugin.c:182
 msgid "_Skip To..."
-msgstr "Прескочи _до..."
+msgstr "_Премотај на..."
 
 #: ../src/plugins/skipto/totem-skipto-plugin.c:182
 msgid "Skip to a specific time"
-msgstr "Прескочи до одређеног времена"
-
-#: ../src/plugins/skipto/skipto.ui.h:1
-msgid "_Skip to:"
-msgstr "Пре_скочи до:"
-
-#: ../browser-plugin/totem-plugin-viewer.c:431
-msgid "No URI to play"
-msgstr "Нема адресе за пуштање"
-
-#. translators: this is:
-#. * Open With ApplicationName
-#. * as in nautilus' right-click menu
-#: ../browser-plugin/totem-plugin-viewer.c:1107
-#, c-format
-msgid "_Open with \"%s\""
-msgstr "_Отвори са „%s“"
-
-#: ../browser-plugin/totem-plugin-viewer.c:2136
-msgid "No playlist or playlist empty"
-msgstr "Нема списка за пуштање или је празан"
-
-#: ../browser-plugin/totem-plugin-viewer.c:2235
-msgid "Movie browser plugin"
-msgstr "Тотемов додатак за преглед филмова"
-
-#: ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Verify your system installation. The Totem plugin will now exit."
-msgstr "Проверите инсталацију вашег система. Тотем додатак ће се сада угасити."
-
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
-msgid "Python Console"
-msgstr "Питонова конзола"
-
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
-msgid "Interactive Python console."
-msgstr "Интерактивна Питонова конзола."
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:88
-msgid "Python Console Menu"
-msgstr "Мени Питонове конзоле"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:93
-msgid "_Python Console"
-msgstr "_Питонова конзола"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:94
-msgid "Show Totem's Python console"
-msgstr "Приказује Питонову конзолу за Тотем"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:100
-msgid "Python Debugger"
-msgstr "Питоново уклањање грешака"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:101
-msgid "Enable remote Python debugging with rpdb2"
-msgstr "Омогући удаљено уклањање Питон грешака помоћу rpdb2"
-
-#. pylint: disable-msg=E1101
-#: ../src/plugins/pythonconsole/pythonconsole.py:125
-#, python-format
-msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
-msgstr "Можете приступити тотемовом објекту кроз „totem_object“ :\\n%s"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:129
-msgid "Totem Python Console"
-msgstr "Питонова конзола за Тотем"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:139
-msgid ""
-"After you press OK, Totem will wait until you connect to it with winpdb or "
-"rpdb2. If you have not set a debugger password in DConf, it will use the "
-"default password ('totem')."
-msgstr ""
-"Након што притиснете У реду, Тотем ће сачекати да се повежете на њега преко "
-"„winpdb“ или „rpdb2“. Уколико нисте изабрали лозинку ради уклањања грешака у "
-"ГКонфу, користите подразумевану лозинку (totem)."
-
-#: ../src/plugins/grilo/grilo.plugin.in.h:1
-msgid "Grilo Browser"
-msgstr "Грило разгледач"
-
-#: ../src/plugins/grilo/grilo.plugin.in.h:2
-msgid "A plugin to let you browse media content from various sources."
-msgstr "Додатак који дозвољава разгледање медијског садржаја са разних извора."
-
-#: ../src/plugins/grilo/totem-grilo.c:452
-msgid "Browse Error"
-msgstr "Грешка у разгледању"
-
-#: ../src/plugins/grilo/totem-grilo.c:599
-msgid "Search Error"
-msgstr "Грешка у претрази"
-
-#: ../src/plugins/grilo/totem-grilo.c:1219 ../src/plugins/grilo/grilo.ui.h:3
-msgid "Browse"
-msgstr "Прегледај"
-
-#: ../src/plugins/grilo/totem-grilo.c:1285 ../src/plugins/grilo/grilo.ui.h:4
-msgid "Search"
-msgstr "Тражи"
-
-#: ../src/plugins/grilo/grilo.ui.h:1
-#| msgid "_Add to Playlist"
-msgid "Add to Playlist"
-msgstr "Додајте у листу за пуштање"
-
-#: ../src/plugins/grilo/grilo.ui.h:2
-#| msgid "_Copy Location"
-msgid "Copy Location"
-msgstr "Умножи путању"
-
-#~ msgid "Bemused"
-#~ msgstr "Bemused"
-
-#~ msgid "Control Totem through a mobile phone with a Bemused client"
-#~ msgstr "Управљајте Тотемом преко мобилног телефона користећи Bemused услугу"
-
-#~ msgid "Untitled %d"
-#~ msgstr "Неименовано %d"
-
-#~ msgid "Totem Bemused Server"
-#~ msgstr "Тотемов Bemused сервер"
-
-#~ msgid "Totem Bemused Server version 1.0"
-#~ msgstr "Тотемов Bemused сервер, верзија 1.0"
-
-#~ msgid "A plugin to let you browse YouTube videos."
-#~ msgstr "Додатак који дозвољава разгледање YouTube видео снимака."
-
-#~ msgid "YouTube Browser"
-#~ msgstr "Јутуб разгледач"
-
-#~ msgid "Related Videos"
-#~ msgstr "Сродни снимци"
-
-#~ msgid "Search Results"
-#~ msgstr "Резултати претраге"
-
-#~ msgid "Videos"
-#~ msgstr "Видео снимци"
-
-#~ msgid "_Open in Web Browser"
-#~ msgstr "Отвори _интернет прегледник"
-
-#~ msgid "Open the video in your web browser"
-#~ msgstr "Отвара видео у интернет прегледачу"
-
-#~ msgid "YouTube"
-#~ msgstr "Јутуб"
-
-#~ msgid "Cancelling query…"
-#~ msgstr "Поништавам упит..."
-
-#~ msgid "Error Searching for Videos"
-#~ msgstr "Грешка при тражењу видео снимака"
-
-#~ msgid ""
-#~ "The response from the server could not be understood. Please check you "
-#~ "are running the latest version of libgdata."
-#~ msgstr ""
-#~ "Непознат одговор сервера. Молимо проверите да ли користити последње "
-#~ "издање libgdata библиотеке."
-
-#~ msgid "Fetching search results…"
-#~ msgstr "Преузимам резултате претраге..."
-
-#~ msgid "Fetching related videos…"
-#~ msgstr "Преузимам сродне снимке..."
-
-#~ msgid "Error Opening Video in Web Browser"
-#~ msgstr "Грешка при отварању видео снимка у интернет прегледнику"
-
-#~ msgid "Fetching more videos…"
-#~ msgstr "Преузимам још видео снимака..."
-
-#~ msgid "Video Format Not Supported"
-#~ msgstr "Видео формат није подржан"
-
-#~ msgid ""
-#~ "This video is not available in any formats which Totem supports. Would "
-#~ "you like to open it in your web browser instead?"
-#~ msgstr ""
-#~ "Овај видео није доступан ни у једном формату који Тотем подржава. Да ли "
-#~ "желите да га отворите у вашем веб претраживачу?"
-
-#~ msgid "0 frames per second"
-#~ msgstr "0 кадрова у секунди"
-
-#~ msgid "0 kbps"
-#~ msgstr "0 Kbit/s"
-
-#~ msgid "0 x 0"
-#~ msgstr "0 х 0"
-
-#~ msgid "Zoom Out"
-#~ msgstr "Умањи"
-
-#~ msgid "Zoom Reset"
-#~ msgstr "Врати увећање"
-
-#~ msgid "Zoom out"
-#~ msgstr "Умањи"
-
-#~ msgid "Zoom reset"
-#~ msgstr "Врати увећање"
-
-#~ msgid ""
-#~ "The playback of this movie requires the following decoders which are not "
-#~ "installed:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Пуштање овог филма захтева наредне додатке који нису инсталирани:\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid "Media file could not be played."
-#~ msgstr "Не могу пустити датотеку."
-
-#~ msgid "Too old version of GStreamer installed."
-#~ msgstr "Инсталиранo је престаро издање ГСтримера."
-
-#~ msgid ""
-#~ "Failed to open video output. It may not be available. Please select "
-#~ "another video output in the Multimedia Systems Selector."
-#~ msgstr ""
-#~ "Неуспешан приступ видео излазу. Можда није доступан. Изаберите неки други "
-#~ "видео излаз у „Избирачу мултимедијалног система“."
-
-#~ msgid ""
-#~ "Could not find the video output. You may need to install additional "
-#~ "GStreamer plugins, or select another video output in the Multimedia "
-#~ "Systems Selector."
-#~ msgstr ""
-#~ "Неуспешан приступ видео излазу. Можда треба да инсталирате још неке "
-#~ "додатке или изаберете неки други видео излаз у „Избирачу мултимедијалног "
-#~ "система“."
-
-#~ msgid "%s"
-#~ msgstr "%s"
-
-#~ msgid "Delete"
-#~ msgstr "Обриши"
-
-#~ msgid "Coherence DLNA/UPnP Client"
-#~ msgstr "Coherence-ов DLNA/UPnP клијент"
-
-#~ msgid "A DLNA/UPnP client for Totem powered by Coherence"
-#~ msgstr "DLNA/UPnP клијент за Гномов биоскоп и музичку кутију од Coherence-а"
-
-#~ msgid "By artist"
-#~ msgstr "По извођачу"
-
-#~ msgid "By tag"
-#~ msgstr "По ознаци"
-
-#~ msgid "Jamendo Album Page"
-#~ msgstr "Јамендо страна албума"
-
-#~ msgid "Latest Releases"
-#~ msgstr "Последња издања"
-
-#~ msgid "Number of albums to _retrieve:"
-#~ msgstr "Б_рој албума за преузимање:"
-
-#~ msgid "Popular"
-#~ msgstr "Популарни"
-
-#~ msgid "Preferred audio _format:"
-#~ msgstr "Омиљени _формат звука:"
-
-#~ msgid "_Open Jamendo Album Page in Browser"
-#~ msgstr "_Отвори Јамендо страну албума у интернет прегледнику"
-
-#~ msgid "Jamendo"
-#~ msgstr "Јамендо"
-
-#~ msgid ""
-#~ "Listen to the large collection of Creative Commons licensed music on "
-#~ "Jamendo."
-#~ msgstr ""
-#~ "Слушајте огромну збирку музике лиценциране под Creative Commons лиценцом "
-#~ "на Јаменду."
-
-#~ msgid "You need to install the Python simplejson module."
-#~ msgstr "Морате да инсталирате Питонов simplejson модул."
-
-#~ msgid "Artist: %s"
-#~ msgstr "Извођач: %s"
-
-#~ msgid "%Y-%m-%d"
-#~ msgstr "%d.%m.%Y"
-
-#~ msgid "%x"
-#~ msgstr "%x"
-
-#~ msgid "Genre: %s"
-#~ msgstr "Жанр: %s"
-
-#~ msgid "Released on: %s"
-#~ msgstr "Објављено: %s"
-
-#~ msgid "License: %s"
-#~ msgstr "Лиценца: %s"
-
-#~ msgid "%02d. %s"
-#~ msgstr "%02d. %s"
-
-#~ msgid "Album: %s"
-#~ msgstr "Албум: %s"
-
-#~ msgid "Duration: %s"
-#~ msgstr "Трајање: %s"
-
-#~ msgid "Fetching albums, please wait…"
-#~ msgstr "Преузимам албуме, сачекајте..."
-
-#~ msgid ""
-#~ "Failed to connect to Jamendo server.\n"
-#~ "%s."
-#~ msgstr ""
-#~ "Није успело повезивање са Јамендо сервером.\n"
-#~ "%s."
-
-#~ msgid "The Jamendo server returned code %s."
-#~ msgstr "Јамендо сервер је вратио код %s."
-
-#~ msgid "An error occurred while fetching albums."
-#~ msgstr "Догодила се грешка приликом преузимања албума."
-
-#~ msgid "%H:%M:%S"
-#~ msgstr "%H:%M:%S"
-
-#~ msgid "%M:%S"
-#~ msgstr "%M:%S"
-
-#~ msgid "en"
-#~ msgstr "en"
-
-#~ msgid "Audio format to download from Jamendo"
-#~ msgstr "Аудио формат за преузимање са Јаменда"
-
-#~ msgid "Number of results per page"
-#~ msgstr "Број резултата по страници"
-
-#~ msgid ""
-#~ "The number of Jamendo search results to display in each page of results."
-#~ msgstr ""
-#~ "Број резултата Јамендо претраге за приказ на свакој страници резултата."
-
-#~ msgid "The preferred audio format to download tracks from Jamendo in."
-#~ msgstr "Жељени аудио формат за преузимање песама са Јаменда."
-
-#~ msgid "Language"
-#~ msgstr "Језик"
-
-#~ msgid "Could not connect to Tracker"
-#~ msgstr "Не могу да се повежем на Тракер"
-
-#~ msgid "No results"
-#~ msgstr "Без резултата"
-
-#~ msgid "Showing %i - %i of %i match"
-#~ msgid_plural "Showing %i - %i of %i matches"
-#~ msgstr[0] "Приказујем %i - %i од %i поклапања"
-#~ msgstr[1] "Приказујем %i - %i од %i поклапања"
-#~ msgstr[2] "Приказујем %i - %i од %i поклапања"
-#~ msgstr[3] "Приказујем %i - %i од %i поклапања"
-
-#~ msgid "Page"
-#~ msgstr "Страница"
-
-#~ msgid "Set the window icon to the thumbnail of the playing movie"
-#~ msgstr "Постави иконицу прозора на умањени преглед пуштеног филма"
-
-#~ msgid "Thumbnail"
-#~ msgstr "Умањени преглед"
-
-#~ msgid "Search for local videos using Tracker"
-#~ msgstr "Тражи локалне видео снимке Тракером"
-
-# bug: clear it up?
-#~ msgid "Browser Plugin using %s"
-#~ msgstr "Додатак за веб читач користећи %s"
-
-#~ msgid "Totem Browser Plugin"
-#~ msgstr "Тотемов додатак за веб читач"
-
-#~ msgid "Author:"
-#~ msgstr "Аутор:"
-
-#~ msgid "C_onfigure..."
-#~ msgstr "_Поставке..."
-
-#~ msgid "Copyright:"
-#~ msgstr "Ауторско право:"
-
-#~ msgid "Description:"
-#~ msgstr "Опис:"
-
-#~ msgid "Site:"
-#~ msgstr "Веб адреса:"
-
-#~ msgid ""
-#~ "Approximate network connection speed, used to select quality on media "
-#~ "over the network: \"0\" for 14.4 Kbps Modem, \"1\" for 19.2 Kbps Modem, "
-#~ "\"2\" for 28.8 Kbps Modem, \"3\" for 33.6 Kbps Modem, \"4\" for 34.4 Kbps "
-#~ "Modem, \"5\" for 56 Kbps Modem/ISDN, \"6\" for 112 Kbps Dual ISDN/DSL, \"7"
-#~ "\" for 256 Kbps DSL/Cable, \"8\" for 384 Kbps DSL/Cable, \"9\" for 512 "
-#~ "Kbps DSL/Cable, \"10\" for 1.5 Mbps T1/Intranet/LAN, \"11\" for Intranet/"
-#~ "LAN."
-#~ msgstr ""
-#~ "Оквирне брзине мрежне конекције, користе се да се одабере квалитет медија "
-#~ "преко мреже: „0“ за 14,4 Kbit/s модем, „1“ за 19,2 Kbit/s модем, „2“ за "
-#~ "28,8 Kbit/s модем, „3“ за 33,6 Kbit/s модем, „4“ за 34,4 Kbit/s модем, "
-#~ "„5“ за 56 Kbit/s модем/ISDN, „6“ за 112 Kbit/s двоканални ISDN/DSL, „7“ "
-#~ "за 256 Kbit/s DSL/Кабл, „8“ за 384 Kbit/s DSL/Кабл, „9“ за 512 Kbit/s DSL/"
-#~ "Кабл, „10“ за 1,5 Mbit/s Т1/Интранет/ЛАН, „11“ за Интернет/ЛАН."
-
-#~ msgid ""
-#~ "Quality settings for the audio visualization: \"0\" for small, \"1\" for "
-#~ "normal, \"2\" for large, \"3\" for extra large."
-#~ msgstr ""
-#~ "Подешавање квалитета визуализације звука: „0“ за мали, „1“ за нормални, "
-#~ "„2“ за велики, „3“ за екстра велики."
-
-#~ msgid ""
-#~ "Type of audio output to use: \"0\" for stereo, \"1\" for 4-channel "
-#~ "output, \"2\" for 5.0 channel output, \"3\" for 5.1 channel output, \"4\" "
-#~ "for AC3 Passthrough."
-#~ msgstr ""
-#~ "Врста звучног излаза који се користи: „0“ за стерео, „1“ за 4-канални "
-#~ "излаз, „2“ за излаз са 5.0 канала, „3“ за излаз са 5.1 канала, „4“ за "
-#~ "пропуштање AC3."
-
-#~ msgid "UTF-8"
-#~ msgstr "CP1250"
+msgstr "Премотајте на одређено време"
diff -Nru totem-3.4.3/po/sr@latin.po totem-3.6.2/po/sr@latin.po
--- totem-3.4.3/po/sr@latin.po	2012-04-02 14:15:40.000000000 +0000
+++ totem-3.6.2/po/sr@latin.po	2012-08-29 23:07:45.000000000 +0000
@@ -12,8 +12,8 @@
 "Project-Id-Version: totem\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=totem&"
 "keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-03-23 06:16+0000\n"
-"PO-Revision-Date: 2012-03-27 08:49+0200\n"
+"POT-Creation-Date: 2012-07-17 09:30+0000\n"
+"PO-Revision-Date: 2012-07-29 15:53+0200\n"
 "Last-Translator: Miroslav Nikolić \n"
 "Language-Team: Serbian \n"
 "Language: sr\n"
@@ -24,21 +24,238 @@
 "n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"
 
+#: ../browser-plugin/totem-plugin-viewer.c:352 ../src/totem-object.c:1180
+#: ../src/totem-object.c:1650 ../src/totem-statusbar.c:115
+msgid "Stopped"
+msgstr "Zaustavljeno"
+
+#: ../browser-plugin/totem-plugin-viewer.c:364 ../src/totem-object.c:1173
+msgid "Paused"
+msgstr "Pauzirano"
+
+#: ../browser-plugin/totem-plugin-viewer.c:368 ../src/totem-object.c:1166
+msgid "Playing"
+msgstr "Puštam"
+
+#: ../browser-plugin/totem-plugin-viewer.c:386
+#: ../src/plugins/screensaver/totem-screensaver.c:97
+msgid "Playing a movie"
+msgstr "Puštam film"
+
+#: ../browser-plugin/totem-plugin-viewer.c:443
+msgid "No URI to play"
+msgstr "Nema adrese za puštanje"
+
+#: ../browser-plugin/totem-plugin-viewer.c:676
+#: ../browser-plugin/totem-plugin-viewer.c:1700
+msgid "Totem Movie Player"
+msgstr "Totem — puštanje filmova"
+
+#. translators: this is:
+#. * Open With ApplicationName
+#. * as in nautilus' right-click menu
+#: ../browser-plugin/totem-plugin-viewer.c:1120
+#, c-format
+msgid "_Open with \"%s\""
+msgstr "_Otvori pomoću „%s“"
+
+#: ../browser-plugin/totem-plugin-viewer.c:1341 ../src/totem-object.c:2475
+msgid "An error occurred"
+msgstr "Došlo je do greške"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2033
+msgid "No playlist or playlist empty"
+msgstr "Nema spiska za puštanje ili je prazan"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2128
+msgid "Movie browser plugin"
+msgstr "Priključak za pregledanje filmova"
+
+# andrija: nepotpun prevod, a težak :)
+# danilo: niti i bezbedno, poslužiće ;)
+#: ../browser-plugin/totem-plugin-viewer.c:2144 ../src/totem.c:239
+msgid "Could not initialize the thread-safe libraries."
+msgstr "Nisam uspeo da učitam biblioteke za bezbedan rad sa nitima."
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144
+msgid "Verify your system installation. The Totem plugin will now exit."
+msgstr ""
+"Proverite instalaciju vašeg sistema. Totemov priključak će se sada zatvoriti."
+
 #: ../data/fullscreen.ui.h:1
 msgid "Leave Fullscreen"
 msgstr "Napusti ceo ekran"
 
-#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:144
+#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:81
 msgid "Time:"
 msgstr "Vreme:"
 
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
+msgid "Allow the screensaver to activate when playing audio"
+msgstr "Dopušta pokretanje čuvara ekrana pri puštanju muzike"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
+msgid ""
+"Allow the screensaver to activate when playing audio. Disable if you have "
+"monitor-powered speakers."
+msgstr ""
+"Dopušta pokretanje čuvara ekrana kada je puštena samo muzika. Isključite ako "
+"imate zvučnike koji se napajaju sa monitora."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
+msgid "Show visual effects when no video is displayed"
+msgstr "Prikazuje vizuelne efekte kada se ne prikazuje video"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
+msgid "Show visual effects when playing an audio only file."
+msgstr "Prikazuje vizuelne efekte kada je puštena samo zvučna datoteka."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
+msgid "Name of the visual effects plugin"
+msgstr "Naziv priključka za vizuelne efekte"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
+msgid "The brightness of the video"
+msgstr "Osvetljenje video snimka"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
+msgid "The contrast of the video"
+msgstr "Kontrast video snimka"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
+msgid "The hue of the video"
+msgstr "Nijanse video snimka"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
+msgid "The saturation of the video"
+msgstr "Zasićenje video snimka"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
+msgid "Resize the canvas automatically on file load"
+msgstr "Sam menja veličinu platna pri učitavanju datoteke"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
+msgid "Repeat mode"
+msgstr "Režim ponavljanja"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
+msgid "Shuffle mode"
+msgstr "Nasumični režim"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
+msgid "Whether to disable deinterlacing for interlaced movies"
+msgstr "Da li da isključi rasplitanje videa sa isprepletenim kadrovima"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
+msgid "Whether to enable debug for the playback engine"
+msgstr "Da li da uključi uklanjanje grešaka prilikom puštanja"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
+msgid "Type of audio output to use"
+msgstr "Vrsta zvučnog izlaza koji se koristi"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
+msgid "Visualization quality setting"
+msgstr "Podešavanje kvaliteta vizuelizacije"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
+msgid "Quality setting for the audio visualization."
+msgstr "Podešavanje kvaliteta za vizuelizaciju zvuka."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
+msgid "Network buffering threshold"
+msgstr "Prag za mrežno čitanje unapred"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
+msgid ""
+"Amount of data to buffer for network streams before starting to display the "
+"stream (in seconds)."
+msgstr ""
+"Količina podataka koja će biti unapred učitana za mrežne tokove pre početka "
+"prikazivanja toka (u sekundama)."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
+msgid "Subtitle font"
+msgstr "Slovni lik za titl"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
+msgid "Pango font description for subtitle rendering."
+msgstr "Opis Pango slovnog lika za iscrtavanje teksta prevoda."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
+msgid "Subtitle encoding"
+msgstr "Kodiranje za titl"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
+msgid "Encoding character set for subtitle."
+msgstr "Skup znakova kodiranja za titl."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
+msgid "Default location for the \"Open...\" dialogs"
+msgstr "Podrazumevana putanja za prozorče „Otvori...“"
+
+# bug: folder or directory?
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
+msgid ""
+"Default location for the \"Open...\" dialogs. Default is the current "
+"directory."
+msgstr "Podrazumevana putanja za prozorče „Otvori...“, inače tekuća fascikla."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
+msgid "Default location for the \"Take Screenshot\" dialogs"
+msgstr "Podrazumevana putanja za prozorče „Napravi snimak ekrana“"
+
+# bug: folder or directory?
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
+msgid ""
+"Default location for the \"Take Screenshot\" dialogs. Default is the "
+"Pictures directory."
+msgstr ""
+"Podrazumevana putanja za prozorče „Napravi snimak ekrana“, u suprotnom "
+"podrazumevana fascikla sa slikama."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
+msgid "Whether to disable the plugins in the user's home directory"
+msgstr "Da li da isključi priključke u korisnikovom ličnom direktorijumu"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
+msgid "Whether to disable the keyboard shortcuts"
+msgstr "Da li da onemogućim prečice sa tastature"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
+msgid "Whether to autoload text subtitle files when a movie is loaded"
+msgstr "Da li sam da učita tekstualne datoteke sa titlom pri učitavanju filma"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
+msgid "Whether to autoload external chapter files when a movie is loaded"
+msgstr "Da li sam da učita spoljne datoteke sa poglavljima pri učitavanju filma"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
+msgid ""
+"Whether to remember the position of played audio/video files when pausing or "
+"closing them"
+msgstr ""
+"Da li da pamti položaj puštene audio/video datoteke prilikom njenog pauziranja "
+"ili zatvaranja"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
+msgid "Active plugins list"
+msgstr "Spisak aktivnih priključaka"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+msgid ""
+"A list of the names of the plugins which are currently active (loaded and "
+"running)."
+msgstr ""
+"Spisak naziva priključaka koji su trenutno aktivni (učitani i pokrenuti)."
+
 #: ../data/playlist.ui.h:1
 msgid "_Remove"
-msgstr "U_kloni"
+msgstr "_Ukloni"
 
 #: ../data/playlist.ui.h:2
 msgid "Remove file from playlist"
-msgstr "Ukloni datoteku iz spiska"
+msgstr "Uklonite datoteku iz spiska"
 
 #: ../data/playlist.ui.h:3 ../data/video-list.ui.h:3
 msgid "_Copy Location"
@@ -46,13 +263,13 @@
 
 #: ../data/playlist.ui.h:4 ../data/video-list.ui.h:4
 msgid "Copy the location to the clipboard"
-msgstr "Umnoži putanju među isečke"
+msgstr "Umnožite putanju među isečke"
 
-#: ../data/playlist.ui.h:5 ../data/totem.ui.h:78
+#: ../data/playlist.ui.h:5 ../data/totem.ui.h:71
 msgid "_Select Text Subtitles..."
 msgstr "_Izaberi tekstualni titl..."
 
-#: ../data/playlist.ui.h:6 ../data/totem.ui.h:79
+#: ../data/playlist.ui.h:6 ../data/totem.ui.h:72
 msgid "Select a file to use for text subtitles"
 msgstr "Izaberite tekstualnu datoteku sa titlovima"
 
@@ -70,16 +287,171 @@
 
 #: ../data/playlist.ui.h:10
 msgid "Move Up"
-msgstr "Premesti iznad"
+msgstr "Pomeri gore"
 
 #: ../data/playlist.ui.h:11
 msgid "Move Down"
-msgstr "Premesti ispod"
+msgstr "Pomeri dole"
+
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:2
+msgid "Normal"
+msgstr "Normalno"
 
-#: ../data/properties.ui.h:1 ../data/totem.ui.h:122
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:4
+msgid "Large"
+msgstr "Veliko"
+
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:6
+msgid "Extra Large"
+msgstr "Veoma veliko"
+
+#: ../data/preferences.ui.h:7 ../src/backend/bacon-video-widget.c:5479
+#: ../src/totem-properties-view.c:231
+msgid "Stereo"
+msgstr "Stereo"
+
+#: ../data/preferences.ui.h:8
+msgid "4-channel"
+msgstr "4-kanala"
+
+#: ../data/preferences.ui.h:9
+msgid "4.1-channel"
+msgstr "4.1-kanala"
+
+#: ../data/preferences.ui.h:10
+msgid "5.0-channel"
+msgstr "5.0-kanala"
+
+#: ../data/preferences.ui.h:11
+msgid "5.1-channel"
+msgstr "5.1-kanala"
+
+#: ../data/preferences.ui.h:12
+msgid "AC3 Passthrough"
+msgstr "AC3 propuštanje"
+
+#: ../data/preferences.ui.h:13
+msgid "Totem Preferences"
+msgstr "Postavke Totema"
+
+#: ../data/preferences.ui.h:14
+msgid "Playback"
+msgstr "Puštanje"
+
+#: ../data/preferences.ui.h:15
+msgid "Start playing files from last position"
+msgstr "Pustite datoteke od mesta gde su zaustavljene"
+
+#: ../data/preferences.ui.h:16
+msgid "Text Subtitles"
+msgstr "Tekstualni titlovi"
+
+#: ../data/preferences.ui.h:17
+msgid "_Load subtitle files when movie is loaded"
+msgstr "Učitaj _titlove pri učitavanju filma"
+
+#: ../data/preferences.ui.h:18
+msgid "_Font:"
+msgstr "_Slovni lik:"
+
+#: ../data/preferences.ui.h:19
+msgid "_Encoding:"
+msgstr "_Kodiranje:"
+
+#: ../data/preferences.ui.h:20
+msgid "External Chapters"
+msgstr "Spoljna poglavlja"
+
+#: ../data/preferences.ui.h:21
+msgid "Load _chapter files when movie is loaded"
+msgstr "Učitaj _poglavlja pri učitavanju filma"
+
+#: ../data/preferences.ui.h:22 ../data/properties.ui.h:1
 msgid "General"
 msgstr "Opšte"
 
+#. Tab label in the Preferences dialogue
+#: ../data/preferences.ui.h:24
+msgid "Display"
+msgstr "Prikaz"
+
+#: ../data/preferences.ui.h:25
+msgid "_Resize the window when a new video is loaded"
+msgstr "_Promeni veličinu prozora pri učitavanju videa"
+
+#: ../data/preferences.ui.h:26
+msgid "Disable _deinterlacing of interlaced videos"
+msgstr "Isključi _rasplitanje prepletenog videa"
+
+#: ../data/preferences.ui.h:27
+msgid "Disable screensaver when playing "
+msgstr "Isključi čuvara ekrana prilikom puštanja "
+
+#: ../data/preferences.ui.h:28 ../data/properties.ui.h:9
+#: ../src/totem-properties-view.c:273
+msgid "Video"
+msgstr "Video"
+
+#: ../data/preferences.ui.h:29
+msgid "Video or Audio"
+msgstr "Video ili zvuk"
+
+#: ../data/preferences.ui.h:30
+msgid "Visual Effects"
+msgstr "Vizuelni efekti"
+
+#: ../data/preferences.ui.h:31
+msgid "Show _visual effects when an audio file is played"
+msgstr "Prikaži _vizuelne efekte kada je puštena audio datoteka"
+
+#: ../data/preferences.ui.h:32
+msgid "_Type of visualization:"
+msgstr "V_rsta vizualizacije:"
+
+#: ../data/preferences.ui.h:33
+msgid "Visualization _size:"
+msgstr "V_eličina vizualizacije:"
+
+#: ../data/preferences.ui.h:34
+msgid "Color Balance"
+msgstr "Ravnoteža boja"
+
+#: ../data/preferences.ui.h:35
+msgid "_Brightness:"
+msgstr "_Osvetljenost:"
+
+#: ../data/preferences.ui.h:36
+msgid "Co_ntrast:"
+msgstr "_Kontrast:"
+
+#: ../data/preferences.ui.h:37
+msgid "Sat_uration:"
+msgstr "_Zasićenje:"
+
+#: ../data/preferences.ui.h:38
+msgid "_Hue:"
+msgstr "_Nijansa:"
+
+#: ../data/preferences.ui.h:39
+msgid "Reset to _Defaults"
+msgstr "Vrati na _osnovno"
+
+#: ../data/preferences.ui.h:40
+msgid "Audio Output"
+msgstr "Zvučni izlaz"
+
+#: ../data/preferences.ui.h:41
+msgid "_Audio output type:"
+msgstr "Vrsta _zvučnog izlaza:"
+
+#: ../data/preferences.ui.h:42 ../data/properties.ui.h:14
+#: ../src/totem-properties-view.c:271
+msgid "Audio"
+msgstr "Zvuk"
+
 #: ../data/properties.ui.h:2
 msgid "Title:"
 msgstr "Naslov:"
@@ -102,22 +474,16 @@
 
 #: ../data/properties.ui.h:7
 msgid "Comment:"
-msgstr "Komentar:"
+msgstr "Napomena:"
 
 #: ../data/properties.ui.h:8
 msgid "Container:"
 msgstr "Sadržalac:"
 
-#: ../data/properties.ui.h:9 ../data/totem.ui.h:128
-#: ../src/totem-properties-view.c:270
-msgid "Video"
-msgstr "Video"
-
 #: ../data/properties.ui.h:10
 msgid "Dimensions:"
 msgstr "Dimenzije:"
 
-# kodiranje/dekodiranje
 #: ../data/properties.ui.h:11
 msgid "Codec:"
 msgstr "Kodek:"
@@ -126,16 +492,10 @@
 msgid "Framerate:"
 msgstr "Protok kadrova:"
 
-# bug: jargon
 #: ../data/properties.ui.h:13
 msgid "Bitrate:"
 msgstr "Protok bita:"
 
-#: ../data/properties.ui.h:14 ../data/totem.ui.h:142
-#: ../src/totem-properties-view.c:268
-msgid "Audio"
-msgstr "Zvuk"
-
 #: ../data/properties.ui.h:15
 msgid "Sample rate:"
 msgstr "Protok uzorka:"
@@ -144,752 +504,458 @@
 msgid "Channels:"
 msgstr "Kanala:"
 
-#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
-msgid "_Add to Playlist"
-msgstr "_Dodaj u listu za puštanje"
-
-#: ../data/video-list.ui.h:2
-msgid "Add the video to the playlist"
-msgstr "Dodaj video u listu za puštanje"
-
-# note(slobo):Totem je Gnomov centralni program za puštanje
-# i filmova i muzike a čini se da će tako i ostati
-# „Gnomov bioskop i muzička kutija“ ?
 #. Title
-#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:143
-#: ../src/totem-object.c:1667
-msgid "Movie Player"
-msgstr "Gnomov bioskop i muzička kutija"
+#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:80 ../src/totem.c:238
+#: ../src/totem.c:247 ../src/totem-menu.c:790 ../src/totem-object.c:1658
+msgid "Videos"
+msgstr "Video snimci"
 
 #: ../data/totem.desktop.in.in.in.h:2
-msgid "Play movies and songs"
-msgstr "Puštanje filmova i pesama"
+msgid "Play movies"
+msgstr "Puštajte filmove"
+
+#: ../data/totem.desktop.in.in.in.h:3
+msgid "Video;Movie;Film;Clip;Series;Player;DVD;TV;Disc;"
+msgstr "Video;Snimak;Film;Epizoda;Serije;Puštač;DVD;TV;Disk;"
 
 #: ../data/totem.ui.h:1
-msgid "_Movie"
-msgstr "_Film"
+msgid "_Open"
+msgstr "_Otvori"
 
 #: ../data/totem.ui.h:2
-msgid "_Open..."
-msgstr "_Otvori..."
+msgid "Open _Location"
+msgstr "Otvori _putanju"
 
 #: ../data/totem.ui.h:3
-msgid "Open a file"
-msgstr "Otvori datoteku"
+msgid "_Fullscreen"
+msgstr "Preko _celog ekrana"
 
 #: ../data/totem.ui.h:4
-msgid "Open _Location..."
-msgstr "Otvori _putanju..."
+msgid "Prefere_nces"
+msgstr "Pos_tavke"
 
 #: ../data/totem.ui.h:5
-msgid "Open a non-local file"
-msgstr "Otvori datoteku koja nije lokalna"
+msgid "Shuff_le"
+msgstr "_Nasumično"
 
 #: ../data/totem.ui.h:6
-msgid "_Eject"
-msgstr "Iz_baci"
+msgid "_Repeat"
+msgstr "_Ponovi"
 
 #: ../data/totem.ui.h:7
-msgid "Eject the current disc"
-msgstr "Izbaci trenutni disk"
+msgid "_Quit"
+msgstr "_Izađi"
 
 #: ../data/totem.ui.h:8
-msgid "_Properties"
-msgstr "Oso_bine"
+msgid "_Movie"
+msgstr "_Film"
 
 #: ../data/totem.ui.h:9
-msgid "View the properties of the current stream"
-msgstr "Pogledaj osobine trenutnog toka"
+msgid "_Eject"
+msgstr "_Izbaci"
 
 #: ../data/totem.ui.h:10
-msgid "Play / P_ause"
-msgstr "P_usti / pauziraj"
+msgid "Eject the current disc"
+msgstr "Izbacite trenutni disk"
 
 #: ../data/totem.ui.h:11
-msgid "Play or pause the movie"
-msgstr "Pustite ili pauzirajte film"
+msgid "_Properties"
+msgstr "_Svojstva"
 
 #: ../data/totem.ui.h:12
-msgid "_Quit"
-msgstr "I_zađi"
+msgid "View the properties of the current stream"
+msgstr "Pogledajte osobine trenutnog toka"
 
 #: ../data/totem.ui.h:13
-msgid "Quit the program"
-msgstr "Napusti program"
+msgid "Play / P_ause"
+msgstr "P_usti / pauziraj"
 
 #: ../data/totem.ui.h:14
-msgid "_Edit"
-msgstr "_Uređivanje"
+msgid "Play or pause the movie"
+msgstr "Pustite ili pauzirajte film"
 
 #: ../data/totem.ui.h:15
-msgid "_Clear Playlist"
-msgstr "O_čisti spisak"
+msgid "_Edit"
+msgstr "_Uređivanje"
 
 #: ../data/totem.ui.h:16
-msgid "Clear the playlist"
-msgstr "Očisti listu za puštanje"
+msgid "_Clear Playlist"
+msgstr "_Očisti spisak"
 
 #: ../data/totem.ui.h:17
-msgid "Prefere_nces"
-msgstr "Pos_tavke"
+msgid "Clear the playlist"
+msgstr "Očistite listu za puštanje"
 
 #: ../data/totem.ui.h:18
-msgid "Configure the application"
-msgstr "Podesite program"
-
-#: ../data/totem.ui.h:19
 msgid "Plugins..."
-msgstr "Dodaci..."
+msgstr "Priključci..."
 
-#: ../data/totem.ui.h:20
+#: ../data/totem.ui.h:19
 msgid "Configure plugins to extend the application"
-msgstr "Podesite dodatke da proširite mogućnosti programa"
+msgstr "Podesite priključke da proširite mogućnosti programa"
 
-#: ../data/totem.ui.h:21
+#: ../data/totem.ui.h:20
 msgid "_View"
-msgstr "P_regled"
-
-#: ../data/totem.ui.h:22
-msgid "_Fullscreen"
-msgstr "_Ceo ekran"
-
-#: ../data/totem.ui.h:23
-msgid "Switch to fullscreen"
-msgstr "Prebaci na ceo ekran"
+msgstr "_Pregled"
 
-#: ../data/totem.ui.h:24
+#: ../data/totem.ui.h:21
 msgid "Fit Window to Movie"
 msgstr "Prilagodi prozor filmu"
 
-#: ../data/totem.ui.h:25
+#: ../data/totem.ui.h:22
 msgid "_Resize 1:2"
 msgstr "_Veličina 1:2"
 
-#: ../data/totem.ui.h:26
+#: ../data/totem.ui.h:23
 msgid "Resize to half the original video size"
-msgstr "Upola uvećava originalnu veličinu videa"
+msgstr "Promenite na polovinu veličine prvobitnog videa"
 
-#: ../data/totem.ui.h:27
+#: ../data/totem.ui.h:24
 msgid "Resize _1:1"
 msgstr "Veličina _1:1"
 
-#: ../data/totem.ui.h:28
+#: ../data/totem.ui.h:25
 msgid "Resize to the original video size"
-msgstr "Uvećava na originalnu veličinu videa"
+msgstr "Promenite veličinu na prvobitnu veličinu videa"
 
-#: ../data/totem.ui.h:29
+#: ../data/totem.ui.h:26
 msgid "Resize _2:1"
 msgstr "Veličina _2:1"
 
-#: ../data/totem.ui.h:30
+#: ../data/totem.ui.h:27
 msgid "Resize to double the original video size"
-msgstr "Duplo uvećava originalnu veličinu videa"
+msgstr "Udvostručite veličinu prvobitnog videa"
 
-#: ../data/totem.ui.h:31
+#: ../data/totem.ui.h:28
 msgid "_Aspect Ratio"
 msgstr "_Odnos širine i visine"
 
-#: ../data/totem.ui.h:32
+#: ../data/totem.ui.h:29
 msgid "Switch An_gles"
-msgstr "Prome_na ugla gledanja"
+msgstr "Promeni _ugao gledanja"
 
-#: ../data/totem.ui.h:33
+#: ../data/totem.ui.h:30
 msgid "Switch camera angles"
-msgstr "Promeni ugao kamere"
+msgstr "Promenite uglove kamere"
 
-#: ../data/totem.ui.h:34
+#: ../data/totem.ui.h:31
 msgid "_Go"
 msgstr "_Idi"
 
-#: ../data/totem.ui.h:35
+#: ../data/totem.ui.h:32
 msgid "_DVD Menu"
-msgstr "_DVD meni"
+msgstr "_DVD izbornik"
 
-#: ../data/totem.ui.h:36
+#: ../data/totem.ui.h:33
 msgid "Go to the DVD menu"
-msgstr "Idi na DVD meni"
+msgstr "Idite na DVD izbornik"
 
-#: ../data/totem.ui.h:37
+#: ../data/totem.ui.h:34
 msgid "_Title Menu"
-msgstr "Meni _naslova"
+msgstr "Izbornik _naslova"
 
-#: ../data/totem.ui.h:38
+#: ../data/totem.ui.h:35
 msgid "Go to the title menu"
-msgstr "Idi na meni naslova"
+msgstr "Idite na izbornik naslova"
 
-#: ../data/totem.ui.h:39
+#: ../data/totem.ui.h:36
 msgid "A_udio Menu"
 msgstr "Izbornik _zvuka"
 
-#: ../data/totem.ui.h:40
+#: ../data/totem.ui.h:37
 msgid "Go to the audio menu"
-msgstr "Idi na meni zvuka"
+msgstr "Idite na izbornik zvuka"
 
-#: ../data/totem.ui.h:41
+#: ../data/totem.ui.h:38
 msgid "_Angle Menu"
-msgstr "Meni za u_glove"
+msgstr "Izbornik _uglova"
 
-#: ../data/totem.ui.h:42
+#: ../data/totem.ui.h:39
 msgid "Go to the angle menu"
-msgstr "Idi na meni za uglove"
+msgstr "Idite na izbornik uglova"
 
-#: ../data/totem.ui.h:43
+#: ../data/totem.ui.h:40
 msgid "_Chapter Menu"
-msgstr "Meni po_glavlja"
+msgstr "Izbornik _poglavlja"
 
-#: ../data/totem.ui.h:44
+#: ../data/totem.ui.h:41
 msgid "Go to the chapter menu"
-msgstr "Idi na meni poglavlja"
+msgstr "Idite na izbornik poglavlja"
 
-#: ../data/totem.ui.h:45
+#: ../data/totem.ui.h:42
 msgid "_Next Chapter/Movie"
 msgstr "_Sledeće poglavlje/film"
 
-#: ../data/totem.ui.h:46
+#: ../data/totem.ui.h:43
 msgid "Next chapter or movie"
 msgstr "Sledeće poglavlje ili film"
 
-#: ../data/totem.ui.h:47
+#: ../data/totem.ui.h:44
 msgid "_Previous Chapter/Movie"
 msgstr "_Prethodno poglavlje/film"
 
-#: ../data/totem.ui.h:48
+#: ../data/totem.ui.h:45
 msgid "Previous chapter or movie"
 msgstr "Prethodno poglavlje ili film"
 
-#: ../data/totem.ui.h:49
+#: ../data/totem.ui.h:46
 msgid "_Sound"
 msgstr "_Zvuk"
 
-#: ../data/totem.ui.h:50
+#: ../data/totem.ui.h:47
 msgid "Volume _Up"
-msgstr "Po_jačaj"
+msgstr "_Pojačaj"
 
-#: ../data/totem.ui.h:51
+#: ../data/totem.ui.h:48
 msgid "Increase volume"
-msgstr "Pojačaj zvuk"
+msgstr "Pojačajte zvuk"
 
-#: ../data/totem.ui.h:52
+#: ../data/totem.ui.h:49
 msgid "Volume _Down"
-msgstr "U_tišaj"
+msgstr "_Utišaj"
 
-#: ../data/totem.ui.h:53
+#: ../data/totem.ui.h:50
 msgid "Decrease volume"
 msgstr "Utišaj zvuk"
 
-#: ../data/totem.ui.h:54
+#: ../data/totem.ui.h:51
 msgid "_Help"
-msgstr "_Pomoć"
+msgstr "Po_moć"
 
-#: ../data/totem.ui.h:55
+#: ../data/totem.ui.h:52
 msgid "_Contents"
 msgstr "_Sadržaj"
 
-#: ../data/totem.ui.h:56
+#: ../data/totem.ui.h:53
 msgid "Help contents"
 msgstr "Sadržaj pomoći"
 
-#: ../data/totem.ui.h:57
+#: ../data/totem.ui.h:54
 msgid "_About"
 msgstr "_O programu"
 
-#: ../data/totem.ui.h:58
-msgid "About this application"
-msgstr "O programu"
-
-#: ../data/totem.ui.h:59
-msgid "_Repeat Mode"
-msgstr "_Režim ponavljanja"
-
-#: ../data/totem.ui.h:60
-msgid "Set the repeat mode"
-msgstr "Postavi režim za ponavljanje"
-
-#: ../data/totem.ui.h:61
-msgid "Shuff_le Mode"
-msgstr "Ispre_tumbani režim"
-
-#: ../data/totem.ui.h:62
-msgid "Set the shuffle mode"
-msgstr "Postavi ispretumbani režim"
-
-#: ../data/totem.ui.h:63
-msgid "Show _Controls"
-msgstr "Prikaži _kontrole"
-
-#: ../data/totem.ui.h:64
-msgid "Show controls"
-msgstr "Prikaži kontrole"
-
-#: ../data/totem.ui.h:65
-msgid "S_idebar"
-msgstr "_Bočna površ"
-
-#: ../data/totem.ui.h:66
-msgid "Show or hide the sidebar"
-msgstr "Prikaži ili sakrij bočnu površ"
-
-#: ../data/totem.ui.h:67
-msgctxt "Aspect ratio"
-msgid "Auto"
-msgstr "Samoprilagodi"
-
-#: ../data/totem.ui.h:68
-msgid "Sets automatic aspect ratio"
-msgstr "Sam postavi odnos visine i širine"
-
-#: ../data/totem.ui.h:69
-msgid "Square"
-msgstr "Kvadrat"
-
-#: ../data/totem.ui.h:70
-msgid "Sets square aspect ratio"
-msgstr "Postavi kvadratni odnos visine i širine"
-
-#: ../data/totem.ui.h:71
-msgid "4:3 (TV)"
-msgstr "4:3 (TV)"
-
-#: ../data/totem.ui.h:72
-msgid "Sets 4:3 (TV) aspect ratio"
-msgstr "Postavlja razmeru na 4:3 (TV)"
-
-#: ../data/totem.ui.h:73
-msgid "16:9 (Widescreen)"
-msgstr "16:9 (široki ekran)"
-
-#: ../data/totem.ui.h:74
-msgid "Sets 16:9 (widescreen) aspect ratio"
-msgstr "Postavlja razmeru na 16:9 (široki ekran)"
-
-#: ../data/totem.ui.h:75
-msgid "2.11:1 (DVB)"
-msgstr "2.11:1 (DVB)"
-
-#: ../data/totem.ui.h:76
-msgid "Sets 2.11:1 (DVB) aspect ratio"
-msgstr "Postavlja razmeru na 2,11:9 (DVB)"
-
-#: ../data/totem.ui.h:77
-msgid "S_ubtitles"
-msgstr "_Prevodi"
-
-#: ../data/totem.ui.h:80
-msgid "_Languages"
-msgstr "_Jezici"
-
-#: ../data/totem.ui.h:81
-msgid "Zoom In"
-msgstr "Uvećaj"
-
-#: ../data/totem.ui.h:82
-msgid "Zoom in"
-msgstr "Uvećaj"
-
-#: ../data/totem.ui.h:83
-msgid "Skip _Forward"
-msgstr "Preskoči unapr_ed"
-
-#: ../data/totem.ui.h:84
-msgid "Skip forward"
-msgstr "Preskoči unapred"
-
-#: ../data/totem.ui.h:85
-msgid "Skip _Backwards"
-msgstr "Preskoči unatra_g"
-
-#: ../data/totem.ui.h:86
-msgid "Skip backwards"
-msgstr "Preskoči unatrag"
-
-#: ../data/totem.ui.h:87
-msgid "14.4 Kbps Modem"
-msgstr "14,4 Kb/s Modem"
-
-#: ../data/totem.ui.h:88
-msgid "19.2 Kbps Modem"
-msgstr "19,2 Kb/s Modem"
-
-#: ../data/totem.ui.h:89
-msgid "28.8 Kbps Modem"
-msgstr "28,8 Kb/s Modem"
-
-#: ../data/totem.ui.h:90
-msgid "33.6 Kbps Modem"
-msgstr "33,6 kb/s Modem"
-
-#: ../data/totem.ui.h:91
-msgid "34.4 Kbps Modem"
-msgstr "34,4 kb/s Modem"
-
-#: ../data/totem.ui.h:92
-msgid "56 Kbps Modem/ISDN"
-msgstr "56 Kb/s Modem/ISDN"
-
-#: ../data/totem.ui.h:93
-msgid "112 Kbps Dual ISDN/DSL"
-msgstr "112 Kb/s Dvojni ISDN/DSL"
-
-#: ../data/totem.ui.h:94
-msgid "256 Kbps DSL/Cable"
-msgstr "256 Kb/s DSL/Kabal"
-
-#: ../data/totem.ui.h:95
-msgid "384 Kbps DSL/Cable"
-msgstr "384 Kb/s DSL/Kabal"
-
-#: ../data/totem.ui.h:96
-msgid "512 Kbps DSL/Cable"
-msgstr "512 Kb/s DSL/Kabal"
-
-#: ../data/totem.ui.h:97
-msgid "1.5 Mbps T1/Intranet/LAN"
-msgstr "1,5 Mb/s T1/Intranet/LM"
-
-#: ../data/totem.ui.h:98
-msgid "Intranet/LAN"
-msgstr "Intranet/LM"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:100
-msgid "Normal"
-msgstr "Normalno"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:102
-msgid "Large"
-msgstr "Veliko"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:104
-msgid "Extra Large"
-msgstr "Ekstra veliko"
-
-#: ../data/totem.ui.h:105 ../src/totem-properties-view.c:228
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5593
-msgid "Stereo"
-msgstr "Stereo"
-
-#: ../data/totem.ui.h:106
-msgid "4-channel"
-msgstr "4-kanalni"
-
-#: ../data/totem.ui.h:107
-msgid "4.1-channel"
-msgstr "4.1-kanala"
-
-#: ../data/totem.ui.h:108
-msgid "5.0-channel"
-msgstr "5.0-kanala"
-
-#: ../data/totem.ui.h:109
-msgid "5.1-channel"
-msgstr "5.1-kanala"
-
-#: ../data/totem.ui.h:110
-msgid "AC3 Passthrough"
-msgstr "AC3 propuštanje"
-
-#: ../data/totem.ui.h:111
-msgid "Totem Preferences"
-msgstr "Postavke Totema"
-
-#: ../data/totem.ui.h:112
-msgid "Playback"
-msgstr "Puštanje"
-
-#: ../data/totem.ui.h:113
-msgid "Start playing files from last position"
-msgstr "Pusti datoteke od mesta gde su zaustavljene"
-
-#: ../data/totem.ui.h:114
-msgid "Networking"
-msgstr "Rad u mreži"
-
-#: ../data/totem.ui.h:115
-msgid "Connection _speed:"
-msgstr "Brzina _veze:"
-
-#: ../data/totem.ui.h:116
-msgid "Text Subtitles"
-msgstr "Tekstualni titlovi"
-
-#: ../data/totem.ui.h:117
-msgid "_Load subtitle files when movie is loaded"
-msgstr "Učitaj _titlove pri učitavanju videa"
-
-#: ../data/totem.ui.h:118
-msgid "_Font:"
-msgstr "_Slovni lik:"
-
-#: ../data/totem.ui.h:119
-msgid "_Encoding:"
-msgstr "_Kodiranje:"
-
-#: ../data/totem.ui.h:120
-msgid "External Chapters"
-msgstr "Spoljna poglavlja"
-
-#: ../data/totem.ui.h:121
-msgid "Load _chapter files when movie is loaded"
-msgstr "Učitaj p_oglavlja pri učitavanju filma"
-
-#. Tab label in the Preferences dialogue
-#: ../data/totem.ui.h:124
-msgid "Display"
-msgstr "Prikaz"
-
-#: ../data/totem.ui.h:125
-msgid "_Resize the window when a new video is loaded"
-msgstr "_Promeni veličinu prozora pri učitavanju videa"
-
-#: ../data/totem.ui.h:126
-msgid "Disable _deinterlacing of interlaced videos"
-msgstr "Isključi _rasplitanje prepletenog videa"
-
-#: ../data/totem.ui.h:127
-msgid "Disable screensaver when playing "
-msgstr "Onemogući čuvara ekrana prilikom puštanja "
-
-#: ../data/totem.ui.h:129
-msgid "Video or Audio"
-msgstr "Video ili zvuk"
-
-#: ../data/totem.ui.h:130
-msgid "Visual Effects"
-msgstr "Vizuelni efekti"
-
-#: ../data/totem.ui.h:131
-msgid "Show _visual effects when an audio file is played"
-msgstr "Prikaži _vizuelne efekte kada je puštena audio datoteka"
-
-#: ../data/totem.ui.h:132
-msgid "_Type of visualization:"
-msgstr "Vrst_a vizualizacije:"
-
-#: ../data/totem.ui.h:133
-msgid "Visualization _size:"
-msgstr "V_eličina vizualizacije:"
-
-#: ../data/totem.ui.h:134
-msgid "Color Balance"
-msgstr "Ravnoteža boja"
-
-#: ../data/totem.ui.h:135
-msgid "_Brightness:"
-msgstr "_Osvetljenost:"
-
-#: ../data/totem.ui.h:136
-msgid "Co_ntrast:"
-msgstr "Ko_ntrast:"
-
-#: ../data/totem.ui.h:137
-msgid "Sat_uration:"
-msgstr "_Zasićenje:"
+#: ../data/totem.ui.h:55
+msgid "About this application"
+msgstr "O ovom programu"
 
-#: ../data/totem.ui.h:138
-msgid "_Hue:"
-msgstr "_Nijansa:"
+#: ../data/totem.ui.h:56
+msgid "Show _Controls"
+msgstr "Prikaži _kontrole"
 
-#: ../data/totem.ui.h:139
-msgid "Reset to _Defaults"
-msgstr "_Vrati na podrazumevano"
+#: ../data/totem.ui.h:57
+msgid "Show controls"
+msgstr "Prikažite kontrole"
 
-#: ../data/totem.ui.h:140
-msgid "Audio Output"
-msgstr "Zvučni izlaz"
+#: ../data/totem.ui.h:58
+msgid "S_idebar"
+msgstr "_Bočna površ"
 
-#: ../data/totem.ui.h:141
-msgid "_Audio output type:"
-msgstr "Vrsta _zvučnog izlaza:"
+#: ../data/totem.ui.h:59
+msgid "Show or hide the sidebar"
+msgstr "Prikažite ili sakrijte bočnu površ"
 
-#: ../data/totem.ui.h:145
-msgid "Time seek bar"
-msgstr "Traka za vreme"
+#: ../data/totem.ui.h:60
+msgctxt "Aspect ratio"
+msgid "Auto"
+msgstr "Sam prilagodi"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
-msgid "Allow the screensaver to activate when playing audio"
-msgstr "Dozvoli pokretanje čuvara ekrana kada je puštena samo muzika"
+#: ../data/totem.ui.h:61
+msgid "Sets automatic aspect ratio"
+msgstr "Sam će da postavi odnos visine i širine"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
-msgid ""
-"Allow the screensaver to activate when playing audio. Disable if you have "
-"monitor-powered speakers."
-msgstr ""
-"Dozvoli pokretanje čuvara ekrana kada je puštena samo muzika. Onemogućite ako "
-"imate zvučnike koji se napajaju sa monitora."
+#: ../data/totem.ui.h:62
+msgid "Square"
+msgstr "Kvadrat"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
-msgid "Show visual effects when no video is displayed"
-msgstr "Prikaži vizuelne efekte kada se ne prikazuje video"
+#: ../data/totem.ui.h:63
+msgid "Sets square aspect ratio"
+msgstr "Postavite kvadratni odnos visine i širine"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
-msgid "Show visual effects when playing an audio only file."
-msgstr "Prikaži vizuelne efekte kada je puštena zvučna datoteka."
+#: ../data/totem.ui.h:64
+msgid "4:3 (TV)"
+msgstr "4:3 (TV)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
-msgid "Name of the visual effects plugin"
-msgstr "Naziv dodatka za vizuelne efekte"
+#: ../data/totem.ui.h:65
+msgid "Sets 4:3 (TV) aspect ratio"
+msgstr "Postavite odnos visine i širine na 4:3 (TV)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
-msgid "The brightness of the video"
-msgstr "Osvetljenje video snimka"
+#: ../data/totem.ui.h:66
+msgid "16:9 (Widescreen)"
+msgstr "16:9 (široki ekran)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
-msgid "The contrast of the video"
-msgstr "Kontrast video snimka"
+#: ../data/totem.ui.h:67
+msgid "Sets 16:9 (widescreen) aspect ratio"
+msgstr "Postavite odnos visine i širine na 16:9 (široki ekran)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
-msgid "The hue of the video"
-msgstr "Nijanse video snimka"
+#: ../data/totem.ui.h:68
+msgid "2.11:1 (DVB)"
+msgstr "2.11:1 (DVB)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
-msgid "The saturation of the video"
-msgstr "Zasićenje video snimka"
+#: ../data/totem.ui.h:69
+msgid "Sets 2.11:1 (DVB) aspect ratio"
+msgstr "Postavite odnos visine i širine na 2,11:1 (DVB)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
-msgid "Resize the canvas automatically on file load"
-msgstr "Promeni automatski veličinu platna pri unosu datoteke"
+#: ../data/totem.ui.h:70
+msgid "S_ubtitles"
+msgstr "_Prevodi"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
-msgid "Network connection speed"
-msgstr "Brzina veze"
+#: ../data/totem.ui.h:73
+msgid "_Languages"
+msgstr "_Jezici"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
-msgid ""
-"Approximate network connection speed, used to select quality on media over "
-"the network."
-msgstr ""
-"Približna brzina mrežne veze, korišćena za izbor kvaliteta na medijima preko "
-"mreže."
+#: ../data/totem.ui.h:74
+msgid "Zoom In"
+msgstr "Uvećaj"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
-msgid "Repeat mode"
-msgstr "Režim ponavljanja"
+#: ../data/totem.ui.h:75
+msgid "Zoom in"
+msgstr "Uvećajte prikaz"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
-msgid "Shuffle mode"
-msgstr "Ispretumbani režim"
+#: ../data/totem.ui.h:76
+msgid "Skip _Forward"
+msgstr "Premotaj una_pred"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
-msgid "Whether to disable deinterlacing for interlaced movies"
-msgstr "Da li da onemogućim rasplitanje videa sa isprepletanim kadrovima"
+#: ../data/totem.ui.h:77
+msgid "Skip forward"
+msgstr "Premotajte unapred"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
-msgid "Whether to enable debug for the playback engine"
-msgstr "Da li da se uključi praćenje grešaka pri puštanju"
+#: ../data/totem.ui.h:78
+msgid "Skip _Backwards"
+msgstr "Premotaj una_zad"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
-msgid "Type of audio output to use"
-msgstr "Vrsta zvučnog izlaza koji se koristi"
+#: ../data/totem.ui.h:79
+msgid "Skip backwards"
+msgstr "Premotajte unazad"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
-msgid "Visualization quality setting"
-msgstr "Podešavanje kvaliteta vizuelizacije"
+#: ../data/totem.ui.h:82
+msgid "Time seek bar"
+msgstr "Traka protoka vremena"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
-msgid "Quality setting for the audio visualization."
-msgstr "Podešavanje kvaliteta za vizuelizaciju zvuka."
+#: ../data/uri.ui.h:1
+msgid "Enter the _address of the file you would like to open:"
+msgstr "Unesite _adresu datoteke koju želite da otvorite:"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
-msgid "Network buffering threshold"
-msgstr "Prag za mrežno čitanje unapred"
+#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
+msgid "_Add to Playlist"
+msgstr "_Dodaj na spisak za puštanje"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
-msgid ""
-"Amount of data to buffer for network streams before starting to display the "
-"stream (in seconds)."
-msgstr ""
-"Količina podataka koje učitati unapred za mrežne tokove pre početka prikaza "
-"toka (u sekundama)."
+#: ../data/video-list.ui.h:2
+msgid "Add the video to the playlist"
+msgstr "Dodajte video na spisak za puštanje"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
-msgid "Subtitle font"
-msgstr "Font za titl"
+#: ../src/backend/bacon-video-widget.c:1641
+msgid "Password requested for RTSP server"
+msgstr "Zahtevana je lozinka za RTSP server"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
-msgid "Pango font description for subtitle rendering."
-msgstr "Opis Pango slovnog lika za iscrtavanje teksta prevoda."
+#: ../src/backend/bacon-video-widget.c:2927
+#, c-format
+msgid "Audio Track #%d"
+msgstr "Zvučna numera #%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
-msgid "Subtitle encoding"
-msgstr "Kodiranje za titl"
+#: ../src/backend/bacon-video-widget.c:2931
+#, c-format
+msgid "Subtitle #%d"
+msgstr "Prevod #%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
-msgid "Encoding character set for subtitle."
-msgstr "Skup znakova kodiranja za titl."
+#: ../src/backend/bacon-video-widget.c:3328
+msgid "The server you are trying to connect to is not known."
+msgstr "Nije poznat server na koji pokušavate da se povežete."
+
+#: ../src/backend/bacon-video-widget.c:3331
+msgid "The connection to this server was refused."
+msgstr "Veza sa ovim serverom je odbijena."
+
+#: ../src/backend/bacon-video-widget.c:3334
+msgid "The specified movie could not be found."
+msgstr "Ne mogu da nađem navedeni film."
+
+#: ../src/backend/bacon-video-widget.c:3341
+msgid "The server refused access to this file or stream."
+msgstr "Server je odbio pristup ovoj datoteci ili toku."
+
+#: ../src/backend/bacon-video-widget.c:3347
+msgid "Authentication is required to access this file or stream."
+msgstr "Potrebno je potvrđivanje identiteta za pristup ovoj datoteci ili toku."
+
+#: ../src/backend/bacon-video-widget.c:3354
+msgid "You are not allowed to open this file."
+msgstr "Vama nije dozvoljeno da otvorite ovu datoteku."
+
+#: ../src/backend/bacon-video-widget.c:3359
+msgid "This location is not a valid one."
+msgstr "Ova putanja nije ispravna."
+
+#: ../src/backend/bacon-video-widget.c:3367
+msgid "The movie could not be read."
+msgstr "Film ne može biti pročitan."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
-msgid "Default location for the \"Open...\" dialogs"
-msgstr "Podrazumevana putanja za prozorče „Otvori...“"
+#. should be exactly one missing thing (source or converter)
+#: ../src/backend/bacon-video-widget.c:3390
+#: ../src/backend/bacon-video-widget.c:3398
+#, c-format
+msgid "The playback of this movie requires a %s plugin which is not installed."
+msgid_plural ""
+"The playback of this movie requires the following decoders which are not "
+"installed:\n"
+"\n"
+"%s"
+msgstr[0] "Puštanje ovog filma zahteva priključak %s koji nije instaliran."
+msgstr[1] ""
+"Puštanje ovog filma zahteva sledeće dekodere koji nisu instalirani:\n"
+"\n"
+"%s"
+msgstr[2] ""
+"Puštanje ovog filma zahteva sledeće dekodere koji nisu instalirani:\n"
+"\n"
+"%s"
+msgstr[3] "priključak"
 
-# bug: folder or directory?
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
+#: ../src/backend/bacon-video-widget.c:3409
 msgid ""
-"Default location for the \"Open...\" dialogs. Default is the current "
-"directory."
-msgstr "Podrazumevana putanja za prozorče „Otvori...“, inače tekuća fascikla."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
-msgid "Default location for the \"Take Screenshot\" dialogs"
-msgstr "Podrazumevana putanja za prozorče „Napravi snimak ekrana“"
+"An audio or video stream is not handled due to missing codecs. You might "
+"need to install additional plugins to be able to play some types of movies"
+msgstr ""
+"Ne može biti upravljano zvučnim ili video tokom zato što nedostaju kodeci. "
+"Moraćete da instalirate dodatne priključke da biste mogli da puštate neke "
+"vrste filmova"
 
-# bug: folder or directory?
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
+#: ../src/backend/bacon-video-widget.c:3419
 msgid ""
-"Default location for the \"Take Screenshot\" dialogs. Default is the "
-"Pictures directory."
+"This file cannot be played over the network. Try downloading it locally "
+"first."
 msgstr ""
-"Podrazumevana putanja za prozorče „Napravi snimak ekrana“, u suprotnom "
-"podrazumevana fascikla sa slikama."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
-msgid "Whether to disable the plugins in the user's home directory"
-msgstr "Da li da onemogućim dodatke u korisnikovom ličnom direktorijumu"
+"Ne mogu da pustim ovu datoteku preko mreže. Pokušajte da je prvo prenesete "
+"na disk."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
-msgid "Whether to disable the keyboard shortcuts"
-msgstr "Da li da onemogućim prečice sa tastature"
+#: ../src/backend/bacon-video-widget.c:5475 ../src/totem-properties-view.c:227
+msgid "Surround"
+msgstr "Okruženje"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
-msgid "Whether to autoload text subtitle files when a movie is loaded"
-msgstr "Da li da sam učitam tekstualne datoteke sa titlom pri učitavanju filma"
+#: ../src/backend/bacon-video-widget.c:5477 ../src/totem-properties-view.c:229
+msgid "Mono"
+msgstr "Mono"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
-msgid "Whether to autoload external chapter files when a movie is loaded"
-msgstr "Da li da sam učitam spoljne datoteke sa poglavljima pri učitavanju filma"
+#: ../src/backend/bacon-video-widget.c:5762
+msgid "Media contains no supported video streams."
+msgstr "Datoteka ne sadrži podržane video tokove."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+#: ../src/backend/bacon-video-widget.c:5944
 msgid ""
-"Whether to remember the position of played audio/video files when pausing or "
-"closing them"
+"Some necessary plug-ins are missing. Make sure that the program is correctly "
+"installed."
 msgstr ""
-"Da li da se pamti pozicija puštene audio/video datoteke prilikom njenog "
-"pauziranja ili zatvaranja"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:35
-msgid "Active plugins list"
-msgstr "Spisak aktivnih dodataka"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:36
-msgid ""
-"A list of the names of the plugins which are currently active (loaded and "
-"running)."
-msgstr "Spisak imena dodataka koji su trenutno aktivni (učitani i pokrenuti)."
-
-#: ../data/uri.ui.h:1
-msgid "Enter the _address of the file you would like to open:"
-msgstr "Unesite _adresu datoteke koju želite da otvorite:"
+"Neki neophodni priključci nedostaju. Uverite se da je program ispravno "
+"instaliran."
 
 #: ../src/eggdesktopfile.c:165
 #, c-format
 msgid "File is not a valid .desktop file"
-msgstr "Ovo nije ispravna .desktop datoteka"
+msgstr "Ovo nije ispravna „.desktop“ datoteka"
 
 #: ../src/eggdesktopfile.c:188
 #, c-format
 msgid "Unrecognized desktop file Version '%s'"
-msgstr "Neprepoznato izdanje datoteke radne površi „%s“"
+msgstr "Nepoznato izdanje datoteke radne površi „%s“"
 
 #: ../src/eggdesktopfile.c:968
 #, c-format
@@ -899,29 +965,27 @@
 #: ../src/eggdesktopfile.c:1110
 #, c-format
 msgid "Application does not accept documents on command line"
-msgstr "Program ne prihvata dokumente iz komandne linije"
+msgstr "Program ne prihvata dokumente iz linije naredbi"
 
 #: ../src/eggdesktopfile.c:1178
 #, c-format
 msgid "Unrecognized launch option: %d"
-msgstr "Neprepoznata opcija pokretanja: %d"
+msgstr "Nepoznata opcija pokretanja: %d"
 
 #: ../src/eggdesktopfile.c:1383
 #, c-format
 msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
-msgstr ""
-"Ne mogu da upišem adresu dokumenta u „Type=Link“ unos unutar datoteke za "
-"radnu površ"
+msgstr "Ne mogu da prosledim adrese dokumenata na „Type=Link“ unos"
 
 #: ../src/eggdesktopfile.c:1404
 #, c-format
 msgid "Not a launchable item"
-msgstr "Ovu stavku ne možete pokrenuti"
+msgstr "Nije stavka za pokretanje"
 
 #: ../src/eggfileformatchooser.c:240
 #, c-format
 msgid "File _Format: %s"
-msgstr "_Format datoteke: %s"
+msgstr "_Vrsta datoteke: %s"
 
 #: ../src/eggfileformatchooser.c:379
 msgid "All Files"
@@ -933,39 +997,39 @@
 
 #: ../src/eggfileformatchooser.c:389
 msgid "By Extension"
-msgstr "Po ekstenziji"
+msgstr "Prema proširenju"
 
 #: ../src/eggfileformatchooser.c:404
 msgid "File Format"
-msgstr "Format datoteke"
+msgstr "Vrsta datoteke"
 
 #: ../src/eggfileformatchooser.c:422
 msgid "Extension(s)"
-msgstr "Ekstenzija(e)"
+msgstr "Proširenja"
 
 #. Translators: the parameter is a filename
 #: ../src/eggfileformatchooser.c:657
 #, c-format
 msgid ""
-"The program was not able to find out the file format you want to use for `%"
-"s'. Please make sure to use a known extension for that file or manually "
+"The program was not able to find out the file format you want to use for `"
+"%s'. Please make sure to use a known extension for that file or manually "
 "choose a file format from the list below."
 msgstr ""
-"Program nije bio u mogućnosti da otkrije format datoteke koju želite da "
-"koristite za „%s“. Proverite da li koristite poznatu ekstenziju ili ručno "
-"odaberite format datoteke iz liste ispod."
+"Program ne može da pronađe vrstu datoteke koju želite da upotrebite za „%s“. "
+"Proverite da li koristite poznato proširenje datoteke ili sami odaberite "
+"vrstu datoteke iz priloženog spiska."
 
 #: ../src/eggfileformatchooser.c:664
 msgid "File format not recognized"
-msgstr "Nije prepoznat format datoteke"
+msgstr "Nije prepoznata vrsta datoteke"
 
 #: ../src/eggsmclient.c:226
 msgid "Disable connection to session manager"
-msgstr "Onemogući vezu sa upravnikom sesije"
+msgstr "Isključuje vezu sa upravnikom sesije"
 
 #: ../src/eggsmclient.c:229
 msgid "Specify file containing saved configuration"
-msgstr "Odaberite datoteku koja sadrži sačuvana podešavanja"
+msgstr "Navodi datoteku koja sadrži sačuvana podešavanja"
 
 #: ../src/eggsmclient.c:229
 msgid "FILE"
@@ -973,7 +1037,7 @@
 
 #: ../src/eggsmclient.c:232
 msgid "Specify session management ID"
-msgstr "Navedite IB upravnika sesije"
+msgstr "Navodi IB upravnika sesije"
 
 #: ../src/eggsmclient.c:232
 msgid "ID"
@@ -981,11 +1045,36 @@
 
 #: ../src/eggsmclient.c:253
 msgid "Session management options:"
-msgstr "Mogućnosti upravnika sesije:"
+msgstr "Mogućnosti upravljanja sesijom:"
 
 #: ../src/eggsmclient.c:254
 msgid "Show session management options"
-msgstr "Prikaži mogućnosti upravnika sesije"
+msgstr "Prikazuje mogućnosti upravljanja sesijom"
+
+#. hour:minutes:seconds
+#. Translators: This is a time format, like "9:05:02" for 9
+#. * hours, 5 minutes, and 2 seconds. You may change ":" to
+#. * the separator that your locale uses or use "%Id" instead
+#. * of "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:56
+#: ../src/plugins/skipto/totem-time-entry.c:57
+#, c-format
+msgctxt "long time format"
+msgid "%d:%02d:%02d"
+msgstr "%d:%02d:%02d"
+
+#. minutes:seconds
+#. Translators: This is a time format, like "5:02" for 5
+#. * minutes and 2 seconds. You may change ":" to the
+#. * separator that your locale uses or use "%Id" instead of
+#. * "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:65
+#, c-format
+msgctxt "short time format"
+msgid "%d:%02d"
+msgstr "%d:%02d"
 
 #. Title
 #. Artist
@@ -1100,30 +1189,34 @@
 msgstr[2] "%d kadrova u sekundi"
 msgstr[3] "Jedan kadar u sekundi"
 
-#: ../src/totem-audio-preview.c:168
+#: ../src/totem-audio-preview.c:137
 msgid "Audio Preview"
 msgstr "Zvučni pregled"
 
+#: ../src/totem.c:239
+msgid "Verify your system installation. Totem will now exit."
+msgstr "Proverite instalaciju sistema. Totem će se sada ugasiti."
+
 #: ../src/totem-cell-renderer-video.c:126
 msgid "Unknown video"
 msgstr "Nepoznat video"
 
 #: ../src/totem-dnd-menu.c:94
 msgid "_Play Now"
-msgstr "_Pusti sad"
+msgstr "_Pusti sada"
 
 #: ../src/totem-dnd-menu.c:103
 msgid "Cancel"
-msgstr "Poništi"
+msgstr "Otkaži"
 
-#: ../src/totem-fullscreen.c:616
+#: ../src/totem-fullscreen.c:573
 msgid "No File"
 msgstr "Nema datoteke"
 
 #: ../src/totem-interface.c:181 ../src/totem-interface.c:224
 #, c-format
 msgid "Couldn't load the '%s' interface. %s"
-msgstr "Nije uspelo učitavanje „%s“ sučelja. %s"
+msgstr "Ne mogu da učitam „%s“ sučelje. %s"
 
 #: ../src/totem-interface.c:181
 msgid "The file does not exist."
@@ -1134,7 +1227,7 @@
 msgid "Make sure that Totem is properly installed."
 msgstr "Proverite da li je Totem pravilno instaliran."
 
-#: ../src/totem-interface.c:347
+#: ../src/totem-interface.c:357
 msgid ""
 "Totem 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 "
@@ -1145,7 +1238,7 @@
 "GNU Opšte javne licence koju je objavila Zadužbina slobodnog softvera; "
 "verzije 2 licence ili (po vašem izboru) bilo koje novije verzije."
 
-#: ../src/totem-interface.c:351
+#: ../src/totem-interface.c:361
 msgid ""
 "Totem is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -1157,7 +1250,7 @@
 "NAMENI. Pogledajte GNU Opštu javnu licencu za više detalja."
 
 # bug: old address for FSF
-#: ../src/totem-interface.c:355
+#: ../src/totem-interface.c:365
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Totem; if not, write to the Free Software Foundation, Inc., 59 Temple Place, "
@@ -1167,57 +1260,30 @@
 "pišite Zadužbini slobodnog softvera na adresu: „Free Software Foundation, "
 "Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA“"
 
-#: ../src/totem-interface.c:358
+#: ../src/totem-interface.c:368
 msgid ""
 "Totem contains an exception to allow the use of proprietary GStreamer "
 "plugins."
 msgstr ""
-"Totem sadrži izuzetak da bi dozvolio upotrebu vlasničkih dodataka za "
+"Totem sadrži izuzetak da bi dozvolio upotrebu vlasničkih priključaka za "
 "GStrimer."
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:190
+#: ../src/totem-menu.c:291
 msgid "None"
 msgstr "Ništa"
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:195
+#: ../src/totem-menu.c:296
 msgctxt "Language"
 msgid "Auto"
-msgstr "Samoprilagodi"
-
-#. Translators:
-#. * This is not a JPEG image, but a disc image, for example,
-#. * an ISO file
-#: ../src/totem-menu.c:765
-#, c-format
-msgid "Play Image '%s'"
-msgstr "Pusti odraz „%s“"
-
-# bug: wtf?
-#: ../src/totem-menu.c:768 ../src/totem-menu.c:851
-#, c-format
-msgid "device%d"
-msgstr "uređaj%d"
-
-#: ../src/totem-menu.c:848
-#, c-format
-msgid "Play Disc '%s'"
-msgstr "Pusti disk „%s“"
-
-# bug: string composition
-#. This lists the back-end type and version, such as
-#. * Movie Player using GStreamer 0.10.1
-#: ../src/totem-menu.c:1189
-#, c-format
-msgid "Movie Player using %s"
-msgstr "Program za folmove koristi %s"
+msgstr "Sam odredi"
 
-#: ../src/totem-menu.c:1193
+#: ../src/totem-menu.c:789
 msgid "Copyright © 2002-2009 Bastien Nocera"
-msgstr "Sva prava zadržana © 2002–2009 Bastijen Nosera"
+msgstr "Autorska prava © 2002–2009 Bastijen Nosera"
 
-#: ../src/totem-menu.c:1198
+#: ../src/totem-menu.c:794
 msgid "translator-credits"
 msgstr ""
 "Veljko Stanojević \n"
@@ -1228,153 +1294,77 @@
 "Branko Kokanović \n"
 "Prevod.org — prevod na srpski jezik."
 
-#: ../src/totem-menu.c:1202
+#: ../src/totem-menu.c:798
 msgid "Totem Website"
-msgstr "Totem veb adresa"
+msgstr "Veb sajt Totema"
 
-#: ../src/totem-menu.c:1236
+#: ../src/totem-menu.c:829
 msgid "Configure Plugins"
-msgstr "Podesi dodatke"
+msgstr "Podesite priključke"
+
+#: ../src/totem-object.c:162
+#, c-format
+msgid ""
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"%s\n"
+"Pokrenite „%s --help“ da ​​vidite potpun spisak dostupnih opcija linije "
+"naredbi.\n"
 
 #. Translators: %s is the totem version number
-#: ../src/totem-object.c:471
+#: ../src/totem-object.c:591
 #, c-format
 msgid "Totem %s"
 msgstr "Totem %s"
 
-#: ../src/totem-object.c:1047 ../browser-plugin/totem-plugin-viewer.c:367
-msgid "Playing"
-msgstr "Pušta"
-
-#: ../src/totem-object.c:1049 ../src/totem-options.c:52
+#: ../src/totem-object.c:1168 ../src/totem-options.c:52
 msgid "Pause"
 msgstr "Pauziraj"
 
-#: ../src/totem-object.c:1054 ../browser-plugin/totem-plugin-viewer.c:363
-msgid "Paused"
-msgstr "Pauza"
-
-#: ../src/totem-object.c:1056 ../src/totem-object.c:1066
+#: ../src/totem-object.c:1175 ../src/totem-object.c:1185
 #: ../src/totem-options.c:51
 msgid "Play"
 msgstr "Pusti"
 
-#: ../src/totem-object.c:1061 ../src/totem-object.c:1659
-#: ../src/totem-statusbar.c:115 ../browser-plugin/totem-plugin-viewer.c:351
-msgid "Stopped"
-msgstr "Zaustavljeno"
-
-#: ../src/totem-object.c:1142 ../src/totem-object.c:1169
-#: ../src/totem-object.c:1799 ../src/totem-object.c:1963
+#: ../src/totem-object.c:1267 ../src/totem-object.c:1294
+#: ../src/totem-object.c:1787 ../src/totem-object.c:1942
 #, c-format
 msgid "Totem could not play '%s'."
-msgstr "Totem nije mogao da pusti „%s“."
-
-#: ../src/totem-object.c:1246
-#, c-format
-msgid ""
-"Totem could not play this media (%s) although a plugin is present to handle "
-"it."
-msgstr ""
-"Totem nije uspeo da pusti ovaj medij (%s) iako je odgovarajući dodatak "
-"prisutan."
-
-#: ../src/totem-object.c:1247
-msgid ""
-"You might want to check that a disc is present in the drive and that it is "
-"correctly configured."
-msgstr ""
-"Mogli bi ste proveriti da li je disk ubačen i da li je ispravno podešen."
-
-#: ../src/totem-object.c:1255
-msgid "More information about media plugins"
-msgstr "Još informacija o multimedijalnim dodacima"
-
-#: ../src/totem-object.c:1256
-msgid ""
-"Please install the necessary plugins and restart Totem to be able to play "
-"this media."
-msgstr ""
-"Instalirajte neophodne dodatke i iznova pokrenite Totem da bi ste koristili "
-"ovaj medij."
-
-#: ../src/totem-object.c:1258
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because it does not have the "
-"appropriate plugins to be able to read from the disc."
-msgstr ""
-"Totem ne može da prikaže ovu vrstu medija (%s) jer nemate odgovarajuće "
-"dodatke za čitanje diska."
-
-#: ../src/totem-object.c:1260
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because you do not have the "
-"appropriate plugins to handle it."
-msgstr ""
-"Totem ne može da prikaže ovu vrstu medija (%s) jer nemate odgovarajuće "
-"dodatke."
-
-#: ../src/totem-object.c:1263
-#, c-format
-msgid "Totem cannot play this type of media (%s) because it is not supported."
-msgstr "Totem ne može da prikaže ovu vrstu medija (%s) jer ona nije podržana."
-
-#: ../src/totem-object.c:1264
-msgid "Please insert another disc to play back."
-msgstr "Ubacite drugi disk za reprodukciju."
-
-#: ../src/totem-object.c:1300
-msgid "Totem was not able to play this disc."
-msgstr "Totem nije mogao da pusti ovaj disk."
-
-#: ../src/totem-object.c:1301 ../src/totem-object.c:4229
-msgid "No reason."
-msgstr "Bez razloga."
-
-#: ../src/totem-object.c:1315
-msgid "Totem does not support playback of Audio CDs"
-msgstr "Gnomov bioskop e podržava puštanje zvučnih CD-a"
-
-#: ../src/totem-object.c:1316
-msgid "Please consider using a music player or a CD extractor to play this CD"
-msgstr "Koristite program za puštanje ili izvlačenje muzike za ovaj CD"
+msgstr "Totem ne može da pusti „%s“."
 
-#: ../src/totem-object.c:1805
+#: ../src/totem-object.c:1793
 msgid "No error message"
-msgstr "Nema poruke o grešci"
+msgstr "Nema poruka o greškama"
 
-#: ../src/totem-object.c:2154
+#: ../src/totem-object.c:2133
 msgid "Totem could not display the help contents."
-msgstr "Totem nije mogao da prikaže sadržaj pomoći."
-
-#: ../src/totem-object.c:2493 ../src/totem-object.c:2495
-#: ../browser-plugin/totem-plugin-viewer.c:1417
-msgid "An error occurred"
-msgstr "Došlo je do greške"
+msgstr "Totem ne može da prikaže sadržaj pomoći."
 
-#: ../src/totem-object.c:4064 ../src/totem-object.c:4066
+#: ../src/totem-object.c:4019 ../src/totem-object.c:4021
 msgid "Previous Chapter/Movie"
 msgstr "Prethodno poglavlje/film"
 
-#: ../src/totem-object.c:4073 ../src/totem-object.c:4075
+#: ../src/totem-object.c:4028 ../src/totem-object.c:4030
 msgid "Play / Pause"
-msgstr "Pusti / pauza"
+msgstr "Pusti / Pauziraj"
 
-#: ../src/totem-object.c:4083 ../src/totem-object.c:4085
+#: ../src/totem-object.c:4038 ../src/totem-object.c:4040
 msgid "Next Chapter/Movie"
 msgstr "Sledeće poglavlje/film"
 
-#. Translators: this is the tooltip text for the fullscreen button in the controls box in Totem's main window.
 #. Translators: this is the accessibility text for the fullscreen button in the controls box in Totem's main window.
-#: ../src/totem-object.c:4097 ../src/totem-object.c:4099
+#: ../src/totem-object.c:4051 ../src/totem-object.c:4053
 msgid "Fullscreen"
-msgstr "Ceo ekran"
+msgstr "Preko celog ekrana"
 
-#: ../src/totem-object.c:4229
+#: ../src/totem-object.c:4184
 msgid "Totem could not startup."
-msgstr "Totem nije uspeo da se pokrene."
+msgstr "Totem ne može da se pokrene."
+
+#: ../src/totem-object.c:4184
+msgid "No reason."
+msgstr "Bez razloga."
 
 #: ../src/totem-open-location.c:182
 msgid "Open Location..."
@@ -1382,184 +1372,178 @@
 
 #: ../src/totem-options.c:49
 msgid "Enable debug"
-msgstr "Omogući razbubiranje"
+msgstr "Uključuje uklanjanje grešaka"
 
 #: ../src/totem-options.c:50
 msgid "Play/Pause"
-msgstr "Pusti/pauza"
+msgstr "Pušta/pauzira"
 
 #: ../src/totem-options.c:53
 msgid "Next"
-msgstr "Sledeći"
+msgstr "Sledeće"
 
 #: ../src/totem-options.c:54
 msgid "Previous"
-msgstr "Prethodni"
+msgstr "Prethodno"
 
 #: ../src/totem-options.c:55
 msgid "Seek Forwards"
-msgstr "Traži unapred"
+msgstr "Premotava unapred"
 
 #: ../src/totem-options.c:56
 msgid "Seek Backwards"
-msgstr "Traži unazad"
+msgstr "Premotava unazad"
 
 #: ../src/totem-options.c:57
 msgid "Volume Up"
-msgstr "Pojačaj"
+msgstr "Pojačava jačinu zvuka"
 
 #: ../src/totem-options.c:58
 msgid "Volume Down"
-msgstr "Utišaj"
+msgstr "Utišava jačinu zvuka"
 
 #: ../src/totem-options.c:59
 msgid "Mute sound"
-msgstr "Utišaj zvuk"
+msgstr "Potpuno utišava jačinu zvuka"
 
 #: ../src/totem-options.c:60
 msgid "Toggle Fullscreen"
-msgstr "Na ceo-ekran"
+msgstr "Okida režim preko celog ekrana"
 
 #: ../src/totem-options.c:61
 msgid "Show/Hide Controls"
-msgstr "Prikaži/sakrij kontrole"
+msgstr "Prikazuje/skriva dugmad za upravljanje"
 
 #: ../src/totem-options.c:62
 msgid "Quit"
-msgstr "Izađi"
+msgstr "Zatvara program"
 
 #: ../src/totem-options.c:63
 msgid "Enqueue"
-msgstr "Zakaži"
+msgstr "Zakazuje puštanje"
 
 #: ../src/totem-options.c:64
 msgid "Replace"
-msgstr "Zameni"
+msgstr "Vrši zamenu"
 
 #: ../src/totem-options.c:65
 msgid "Seek"
-msgstr "Skoči"
+msgstr "Premotava"
 
 #. Translators: help for a (hidden) command line option to specify (the zero-based index of) a playlist entry to start playing once Totem's finished loading
 #: ../src/totem-options.c:67
 msgid "Playlist index"
-msgstr "Indeks u spisku"
+msgstr "Indeks spiska numera"
 
 #: ../src/totem-options.c:69
 msgid "Movies to play"
-msgstr "Pustiti filmove"
+msgstr "Filmovi za puštanje"
+
+#: ../src/totem-options.c:79
+msgid "- Play movies and songs"
+msgstr "— puštajte filmove i pesme"
 
-#: ../src/totem-options.c:117
+#: ../src/totem-options.c:142
 msgid "Can't enqueue and replace at the same time"
 msgstr "Ne mogu da zakažem i da zamenim u isto vreme"
 
 #. By extension entry
-#: ../src/totem-playlist.c:161
+#: ../src/totem-playlist.c:162
 msgid "MP3 ShoutCast playlist"
-msgstr "MP3 ShoutCast lista"
+msgstr "MP3 Šautkast lista"
 
-#: ../src/totem-playlist.c:162
+#: ../src/totem-playlist.c:163
 msgid "MP3 audio (streamed)"
 msgstr "MP3 zvuk (kroz tok)"
 
-#: ../src/totem-playlist.c:163
+#: ../src/totem-playlist.c:164
 msgid "MP3 audio (streamed, DOS format)"
 msgstr "MP3 zvuk (kroz tok, DOS format)"
 
-#: ../src/totem-playlist.c:164
+#: ../src/totem-playlist.c:165
 msgid "XML Shareable Playlist"
-msgstr "XML deljiva lista"
+msgstr "IksML deljiva lista"
 
 #. This is "Title 3", where title is a DVD title
 #. * Note: NOT a DVD chapter
-#: ../src/totem-playlist.c:347
+#: ../src/totem-playlist.c:348
 #, c-format
 msgid "Title %d"
 msgstr "Naslov %d"
 
-#: ../src/totem-playlist.c:446
+#: ../src/totem-playlist.c:447
 msgid "Could not save the playlist"
 msgstr "Ne mogu da sačuvam listu"
 
-#: ../src/totem-playlist.c:1021
+#: ../src/totem-playlist.c:1022
 msgid "Save Playlist"
-msgstr "Sačuvaj listu"
+msgstr "Sačuvaj spisak numera"
 
 #. translators: Playlist is the default saved playlist filename,
 #. * without the suffix
-#: ../src/totem-playlist.c:1033 ../src/totem-playlist.c:1264
-#: ../src/totem-sidebar.c:142
+#: ../src/totem-playlist.c:1034 ../src/totem-playlist.c:1263
+#: ../src/totem-sidebar.c:145
 msgid "Playlist"
-msgstr "Lista"
+msgstr "Spisak numera"
 
-#: ../src/totem-playlist.c:1857
+#: ../src/totem-playlist.c:1862
 #, c-format
 msgid "The playlist '%s' could not be parsed. It might be damaged."
 msgstr "Ne mogu da učitam listu „%s“. Možda je oštećena."
 
-#: ../src/totem-playlist.c:1858
+#: ../src/totem-playlist.c:1863
 msgid "Playlist error"
 msgstr "Greška sa listom"
 
-#: ../src/totem-preferences.c:295
+#: ../src/totem-preferences.c:297
 msgid "Preferences"
 msgstr "Postavke"
 
-#: ../src/totem-preferences.c:451
+#: ../src/totem-preferences.c:445
 msgid "Select Subtitle Font"
-msgstr "Odaberite slovni lik za prevode"
+msgstr "Izaberite slovni lik za prevode"
 
-#: ../src/totem-properties-main.c:115 ../src/totem-properties-view.c:266
+#: ../src/totem-properties-main.c:116 ../src/totem-properties-view.c:269
 msgid "Audio/Video"
 msgstr "Zvuk/video"
 
-#: ../src/totem-properties-view.c:128
+#: ../src/totem-properties-view.c:131
 msgid "N/A"
 msgstr "nedostupno"
 
-#: ../src/totem-properties-view.c:157
+#: ../src/totem-properties-view.c:160
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 msgctxt "Stream bit rate"
 msgid "N/A"
 msgstr "nedostupno"
 
-#: ../src/totem-properties-view.c:160
+#: ../src/totem-properties-view.c:163
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 #, c-format
 msgid "%d kbps"
 msgstr "%d kb/s"
 
-#: ../src/totem-properties-view.c:177
+#: ../src/totem-properties-view.c:180
 #: ../src/plugins/properties/totem-movie-properties.c:149
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../src/totem-properties-view.c:209
+#: ../src/totem-properties-view.c:212
 #: ../src/plugins/properties/totem-movie-properties.c:166
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: ../src/totem-properties-view.c:216
+#: ../src/totem-properties-view.c:219
 #: ../src/plugins/properties/totem-movie-properties.c:166
 msgctxt "Sample rate"
 msgid "N/A"
 msgstr "nedostupno"
 
-#: ../src/totem-properties-view.c:224
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5589
-msgid "Surround"
-msgstr "Saraund"
-
-#: ../src/totem-properties-view.c:226
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5591
-msgid "Mono"
-msgstr "Mono"
-
-#: ../src/totem-properties-view.c:236
+#: ../src/totem-properties-view.c:239
 msgctxt "Number of audio channels"
 msgid "N/A"
 msgstr "nedostupno"
@@ -1571,7 +1555,7 @@
 #: ../src/totem-statusbar.c:133
 #, c-format
 msgid "%s (Streaming)"
-msgstr "%s (Tekući)"
+msgstr "%s (protočni)"
 
 #. Elapsed / Total Length
 #: ../src/totem-statusbar.c:140 ../src/totem-time-label.c:64
@@ -1583,18 +1567,18 @@
 #: ../src/totem-statusbar.c:143 ../src/totem-time-label.c:67
 #, c-format
 msgid "Seek to %s / %s"
-msgstr "Preskoči do %s / %s"
+msgstr "Premotaj na %s / %s"
 
 # andrija: Baferovanje?
 #: ../src/totem-statusbar.c:239
 msgid "Buffering"
-msgstr "Prenos u bafer"
+msgstr "Smeštam u međumemoriju"
 
 #. eg: 75 %
 #: ../src/totem-statusbar.c:250
 #, c-format
-msgid "%d %%"
-msgstr "%d %%"
+msgid "%lf %%"
+msgstr "%lf %%"
 
 #. eg: Paused, 0:32 / 1:05
 #: ../src/totem-statusbar.c:325
@@ -1605,8 +1589,8 @@
 #. eg: Buffering, 75 %
 #: ../src/totem-statusbar.c:330
 #, c-format
-msgid "%s, %d %%"
-msgstr "%s, %d %%"
+msgid "%s, %f %%"
+msgstr "%s, %f %%"
 
 #: ../src/totem-subtitle-encoding.c:156
 msgid "Current Locale"
@@ -1638,12 +1622,12 @@
 #: ../src/totem-subtitle-encoding.c:190 ../src/totem-subtitle-encoding.c:192
 #: ../src/totem-subtitle-encoding.c:194 ../src/totem-subtitle-encoding.c:196
 msgid "Chinese Simplified"
-msgstr "kineski, pojednostavljeni"
+msgstr "kineski pojednostavljeni"
 
 #: ../src/totem-subtitle-encoding.c:199 ../src/totem-subtitle-encoding.c:201
 #: ../src/totem-subtitle-encoding.c:203
 msgid "Chinese Traditional"
-msgstr "kineski, tradicionalni"
+msgstr "kineski tradicionalni"
 
 #: ../src/totem-subtitle-encoding.c:206
 msgid "Croatian"
@@ -1674,7 +1658,7 @@
 
 #: ../src/totem-subtitle-encoding.c:240
 msgid "Gujarati"
-msgstr "gudžarati"
+msgstr "gujarati"
 
 #: ../src/totem-subtitle-encoding.c:243
 msgid "Gurmukhi"
@@ -1713,7 +1697,7 @@
 
 #: ../src/totem-subtitle-encoding.c:283
 msgid "Persian"
-msgstr "farsi"
+msgstr "persijski"
 
 #: ../src/totem-subtitle-encoding.c:286 ../src/totem-subtitle-encoding.c:288
 msgid "Romanian"
@@ -1749,228 +1733,91 @@
 msgid "Vietnamese"
 msgstr "vijetnamski"
 
-#: ../src/totem-video-list.c:330
-msgid "No video URI"
-msgstr "Nema adrese video snimka"
-
-#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
-#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
-#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
-#: ../src/totem-video-thumbnailer.c:872
-#, c-format
-msgid ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-msgstr ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-
-#: ../src/totem-video-thumbnailer.c:873
-msgid "Filename"
-msgstr "Ime datoteke"
-
-#: ../src/totem-video-thumbnailer.c:875
-msgid "Resolution"
-msgstr "Rezolucija"
-
-#: ../src/totem-video-thumbnailer.c:878
-msgid "Duration"
-msgstr "Trajanje"
-
-#: ../src/totem-uri.c:506 ../src/plugins/chapters/totem-chapters.c:998
+#: ../src/totem-uri.c:343 ../src/plugins/chapters/totem-chapters.c:998
 msgid "All files"
 msgstr "Sve datoteke"
 
-#: ../src/totem-uri.c:511 ../src/plugins/chapters/totem-chapters.c:995
+#: ../src/totem-uri.c:348 ../src/plugins/chapters/totem-chapters.c:995
 msgid "Supported files"
 msgstr "Podržane datoteke"
 
-#: ../src/totem-uri.c:523
+#: ../src/totem-uri.c:360
 msgid "Audio files"
 msgstr "Zvučne datoteke"
 
-#: ../src/totem-uri.c:531
+#: ../src/totem-uri.c:368
 msgid "Video files"
 msgstr "Video datoteke"
 
-#: ../src/totem-uri.c:541
+#: ../src/totem-uri.c:378
 msgid "Subtitle files"
-msgstr "Datoteke sa titlom"
+msgstr "Datoteke prevoda"
 
-#: ../src/totem-uri.c:593
+#: ../src/totem-uri.c:430
 msgid "Select Text Subtitles"
-msgstr "Odaberite tekstualni titl"
+msgstr "Izaberite tekstualni titl"
 
-#: ../src/totem-uri.c:656
+#: ../src/totem-uri.c:495
 msgid "Select Movies or Playlists"
 msgstr "Izaberite filmove ili spiskove"
 
-#. Options parsing
-#: ../src/totem.c:201
-msgid "- Play movies and songs"
-msgstr "— puštajte filmove i pesme"
-
-#: ../src/totem.c:212
-#, c-format
-msgid ""
-"%s\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"%s\n"
-"Pokrenite „%s --help“ za kompletan spisak mogućnosti iz konzole.\n"
-
-#: ../src/totem.c:254 ../src/totem.c:265
-#: ../browser-plugin/totem-plugin-viewer.c:663
-#: ../browser-plugin/totem-plugin-viewer.c:1793
-msgid "Totem Movie Player"
-msgstr "Totem — puštanje filmova"
-
-# andrija: nepotpun prevod, a težak :)
-# danilo: niti i bezbedno, poslužiće ;)
-#: ../src/totem.c:255 ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Could not initialize the thread-safe libraries."
-msgstr "Nisam uspeo da učitam biblioteke za bezbedan rad sa nitima."
-
-#: ../src/totem.c:255
-msgid "Verify your system installation. Totem will now exit."
-msgstr "Proverite instalaciju sistema. Totem će se sada ugasiti."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:1589
-msgid "Password requested for RTSP server"
-msgstr "Zahtevana je lozinka za RTSP server"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2858
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2862
-#, c-format
-msgid "Audio Track #%d"
-msgstr "Zvučna numera #%d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2890
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2894
-#, c-format
-msgid "Subtitle #%d"
-msgstr "Prevod #%d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3298
-msgid ""
-"The requested audio output was not found. Please select another audio output "
-"in the Multimedia Systems Selector."
-msgstr ""
-"Nije nađen traženi zvučni izlaz. Molim izaberite drugi zvučni izlaz u "
-"„Izbiraču multimedijalnog sistema“."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3303
-msgid "Location not found."
-msgstr "Mesto nije nađeno."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3307
-msgid ""
-"Could not open location; you might not have permission to open the file."
-msgstr "Ne mogu da otvorim mesto: možda nemate dozvole za čitanje datoteke."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3318
-msgid ""
-"The video output is in use by another application. Please close other video "
-"applications, or select another video output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"Video izlaz već koristi neki drugi program. Zatvorite ostale video programe, "
-"ili izaberite neki drugi video izlaz u „Izbiraču multimedijalnog sistema“."
+#: ../src/totem-uri.c:499
+msgid "Add Directory"
+msgstr "Dodajte direktorijum"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3324
-msgid ""
-"The audio output is in use by another application. Please select another "
-"audio output in the Multimedia Systems Selector. You may want to consider "
-"using a sound server."
-msgstr ""
-"Zvučni izlaz već koristi neki drugi program. Izaberite drugi zvučni izlaz u "
-"„Izbiraču multimedijalnog sistema“. Možete i razmotriti korišćenje zvučnog "
-"servera."
+#: ../src/totem-video-list.c:330
+msgid "No video URI"
+msgstr "Nema adrese video snimka"
 
-#. should be exactly one missing thing (source or converter)
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3342
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3348
+#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
+#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
+#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
+#: ../src/totem-video-thumbnailer.c:841
 #, c-format
-msgid "The playback of this movie requires a %s plugin which is not installed."
-msgid_plural ""
-"The playback of this movie requires the following decoders which are not "
-"installed:\n"
-"\n"
-"%s"
-msgstr[0] "Puštanje ovog filma zahteva dodatak %s koji nije instaliran."
-msgstr[1] ""
-"Puštanje ovog filma zahteva sledeće dekodere koji nisu instalirani:\n"
-"\n"
-"%s"
-msgstr[2] ""
-"Puštanje ovog filma zahteva sledeće dekodere koji nisu instalirani:\n"
-"\n"
-"%s"
-msgstr[3] "Puštanje ovog filma zahteva jedan dodatak koji nije instaliran."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3374
 msgid ""
-"Cannot play this file over the network. Try downloading it to disk first."
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 msgstr ""
-"Ne mogu da pustim ovu datoteku preko mreže. Pokušajte da je prvo prenesete "
-"na disk."
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5878
-msgid "Media contains no supported video streams."
-msgstr "Datoteka ne sadrži podržane video tokove."
+#: ../src/totem-video-thumbnailer.c:842
+msgid "Filename"
+msgstr "Naziv datoteke"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6052
-msgid ""
-"Failed to create a GStreamer play object. Please check your GStreamer "
-"installation."
-msgstr ""
-"Neuspešno obrazovanje GStrimerov objekat za puštanje. Proverite instalaciju "
-"GStrimera."
+#: ../src/totem-video-thumbnailer.c:844
+msgid "Resolution"
+msgstr "Rezolucija"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6172
-msgid ""
-"Failed to open audio output. You may not have permission to open the sound "
-"device, or the sound server may not be running. Please select another audio "
-"output in the Multimedia Systems Selector."
-msgstr ""
-"Neuspešan pristup zvučnom izlazu. Niste ovlašćeni da pristupite zvučnom "
-"uređaju, ili nije pokrenut zvučni server. Izaberite drugi zvučni izlaz u "
-"„Izbiraču multimedijalnog sistema“."
+#: ../src/totem-video-thumbnailer.c:847
+msgid "Duration"
+msgstr "Trajanje"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6192
-msgid ""
-"Could not find the audio output. You may need to install additional "
-"GStreamer plugins, or select another audio output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"Nije nađen traženi zvučni izlaz. Možda treba da instalirate još neke dodatke "
-"ili da izaberete drugi zvučni izlaz u „Izbiraču multimedijalnog sistema“."
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:1
+msgid "Apple Trailers"
+msgstr "Eplovi probni snimci"
+
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:2
+msgid "Sets the user agent for the Apple Trailers site"
+msgstr "Podešava korisničkog agenta za sajt Eplovih probnih snimaka"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:1
+msgid "Autoload Subtitles"
+msgstr "Samoučitavanje titlova"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:2
+msgid "Autoloads text subtitles"
+msgstr "Samoučitavanje tekstualnih titlova"
 
-#. hour:minutes:seconds
-#. Translators: This is a time format, like "9:05:02" for 9
-#. * hours, 5 minutes, and 2 seconds. You may change ":" to
-#. * the separator that your locale uses or use "%Id" instead
-#. * of "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:83 ../src/plugins/skipto/totem-time-entry.c:57
-#, c-format
-msgctxt "long time format"
-msgid "%d:%02d:%02d"
-msgstr "%d:%02d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
+msgid "Video Disc Recorder"
+msgstr "Smimanje video diskova"
 
-#. minutes:seconds
-#. Translators: This is a time format, like "5:02" for 5
-#. * minutes and 2 seconds. You may change ":" to the
-#. * separator that your locale uses or use "%Id" instead of
-#. * "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:92
-#, c-format
-msgctxt "short time format"
-msgid "%d:%02d"
-msgstr "%d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
+msgid "Records (S)VCDs or video DVDs"
+msgstr "Snimajte (S)VCD ili video DVD diskove"
 
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:65
 msgid "_Create Video Disc..."
@@ -1978,15 +1825,15 @@
 
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:66
 msgid "Create a video DVD or a (S)VCD from the currently opened movie"
-msgstr "Pravi video DVD ili (S)VCD od trenutno puštenog filma"
+msgstr "Napravite video DVD ili (S)VCD od trenutno puštenog filma"
 
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:68
 msgid "Copy Vide_o DVD..."
-msgstr "Umnoži Vide_o DVD..."
+msgstr "_Umnoži Video DVD..."
 
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:69
 msgid "Copy the currently playing video DVD"
-msgstr "Umnožava trenutno pušteni video DVD"
+msgstr "Umnožite trenutno pušteni video DVD"
 
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:71
 msgid "Copy (S)VCD..."
@@ -1994,43 +1841,26 @@
 
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:72
 msgid "Copy the currently playing (S)VCD"
-msgstr "Umnožava trenutno pušteni (S)VCD"
+msgstr "Umnožite trenutno pušteni (S)VCD"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:129
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:136
 msgid "The video disc could not be duplicated."
 msgstr "Ne mogu da umnožim video disk."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:131
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:276
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:138
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:283
 msgid "The movie could not be recorded."
 msgstr "Ne mogu da snimim film."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:157
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:167
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:263
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:164
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:174
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:270
 msgid "Unable to write a project."
 msgstr "Ne mogu da upišem projekat."
 
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
-msgid "Video Disc Recorder"
-msgstr "Smimanje Video diskova"
-
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
-msgid "Records (S)VCDs or video DVDs"
-msgstr "Snima (S)VCD ili Video DVD diskove"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:1
-#: ../src/plugins/chapters/totem-chapters.c:1139
-msgid "Chapters"
-msgstr "Poglavlja"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:2
-msgid "Support chapter markers in movies."
-msgstr "Podrška markera poglavlja u filmovima."
-
 #: ../src/plugins/chapters/chapters-edit.ui.h:1
 msgid "Name for new chapter:"
-msgstr "Ime za novo poglavlje:"
+msgstr "Naziv novog poglavlja:"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:1
 msgid "_Remove Chapter"
@@ -2046,7 +1876,7 @@
 
 #: ../src/plugins/chapters/chapters-list.ui.h:4
 msgid "Go to the chapter in the movie"
-msgstr "Ide na poglavlje u filmu"
+msgstr "Idite na poglavlje u filmu"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:5
 msgid "Add Chapter..."
@@ -2062,7 +1892,7 @@
 
 #: ../src/plugins/chapters/chapters-list.ui.h:8
 msgid "Save Changes"
-msgstr "Sačuvaj promene"
+msgstr "Sačuvaj izmene"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:9
 msgid "No chapter data"
@@ -2082,7 +1912,16 @@
 
 #: ../src/plugins/chapters/chapters-list.ui.h:13
 msgid "Create a new chapter list for the movie"
-msgstr "Napravite novi spisak poglavlje za film"
+msgstr "Napravite novi spisak poglavlja za film"
+
+#: ../src/plugins/chapters/chapters.plugin.in.h:1
+#: ../src/plugins/chapters/totem-chapters.c:1139
+msgid "Chapters"
+msgstr "Poglavlja"
+
+#: ../src/plugins/chapters/chapters.plugin.in.h:2
+msgid "Support chapter markers in movies"
+msgstr "Podrška markera poglavlja u filmovima"
 
 #: ../src/plugins/chapters/totem-chapters.c:56
 #, c-format
@@ -2103,7 +1942,7 @@
 
 #: ../src/plugins/chapters/totem-chapters.c:544
 msgid "Try another name or remove an existing chapter."
-msgstr "Pokušajte drugo ime ili uklonite postojeće poglavlje."
+msgstr "Pokušajte drugi naziv ili uklonite postojeće poglavlje."
 
 #: ../src/plugins/chapters/totem-chapters.c:717
 msgid "Error while writing file with chapters"
@@ -2122,7 +1961,7 @@
 
 #: ../src/plugins/chapters/totem-chapters.c:976
 msgid "Open Chapter File"
-msgstr "Otvori datoteku sa poglavljima"
+msgstr "Otvori datoteku poglavlja"
 
 #: ../src/plugins/chapters/totem-chapters.c:1093
 msgid "Chapter Screenshot"
@@ -2155,26 +1994,26 @@
 msgstr "Ne mogu da otvorim CMML datoteku"
 
 #: ../src/plugins/chapters/totem-edit-chapter.c:95
-#| msgid "Add Chapter..."
 msgid "Add Chapter"
 msgstr "Dodajte poglavlje"
 
 #: ../src/plugins/dbusservice/dbusservice.plugin.in.h:1
 msgid "D-Bus Service"
-msgstr "D-Bus usluga"
+msgstr "Usluga D-sabirnice"
 
 #: ../src/plugins/dbusservice/dbusservice.plugin.in.h:2
 msgid ""
 "Plugin for sending notifications of currently playing movies to the D-Bus "
 "subsystem."
 msgstr ""
-"Dodatak za slanje obaveštenja o trenutno puštenom filmu na D-Bus podsistem."
+"Dodatak za slanje obaveštenja o trenutno puštenom filmu na podsistem "
+"D-sabirnice."
 
 #: ../src/plugins/dbusservice/dbusservice.py:213
 #: ../src/plugins/dbusservice/dbusservice.py:243
 #, python-format
 msgid "The MediaPlayer2 object does not implement the ‘%s’ interface"
-msgstr "Objekat Medija Plejera 2 ne koristi „%s“ sučelje"
+msgstr "Objekat Medija plejera 2 ne koristi „%s“ sučelje"
 
 #: ../src/plugins/dbusservice/dbusservice.py:222
 #, python-format
@@ -2184,22 +2023,44 @@
 #: ../src/plugins/dbusservice/dbusservice.py:238
 #, python-format
 msgid "Unknown property ‘%s’ requested of a MediaPlayer 2 object"
-msgstr "Objekat Medija Plejera 2 uahteva nepoznato svojstvo „%s“"
+msgstr "Objekat Medija plejera 2 zahteva nepoznato svojstvo „%s“"
 
 #: ../src/plugins/dbusservice/dbusservice.py:341
 #, python-format
 msgid "The URI ‘%s’ is not supported."
 msgstr "Adresa „%s“ nije podržana."
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
-msgid "Instant Messenger status"
-msgstr "Stanje programa za brze poruke"
+#: ../src/plugins/grilo/grilo.plugin.in.h:1
+msgid "Grilo Browser"
+msgstr "Grilo razgledač"
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
-msgid "Set your Instant Messenger status to away when a movie is playing"
-msgstr ""
-"Namestite vaše stanje u programu za brze poruke na „odsutan“ kada je pušten "
-"film"
+#: ../src/plugins/grilo/grilo.plugin.in.h:2
+msgid "A plugin to let you browse media content from various sources"
+msgstr "Dodatak koji dozvoljava razgledanje medijskog sadržaja sa raznih izvora"
+
+#: ../src/plugins/grilo/grilo.ui.h:1
+msgid "Add to Playlist"
+msgstr "Dodajte na spisak za puštanje"
+
+#: ../src/plugins/grilo/grilo.ui.h:2
+msgid "Copy Location"
+msgstr "Umnoži putanju"
+
+#: ../src/plugins/grilo/grilo.ui.h:3 ../src/plugins/grilo/totem-grilo.c:1184
+msgid "Browse"
+msgstr "Razgledaj"
+
+#: ../src/plugins/grilo/grilo.ui.h:4 ../src/plugins/grilo/totem-grilo.c:1227
+msgid "Search"
+msgstr "Traži"
+
+#: ../src/plugins/grilo/totem-grilo.c:454
+msgid "Browse Error"
+msgstr "Greška u razgledanju"
+
+#: ../src/plugins/grilo/totem-grilo.c:609
+msgid "Search Error"
+msgstr "Greška pretrage"
 
 #: ../src/plugins/gromit/gromit.plugin.in.h:1
 msgid "Gromit Annotations"
@@ -2213,58 +2074,15 @@
 msgid "The gromit binary was not found."
 msgstr "Gromitova izvršna datoteka nije nađena."
 
-#. Add the interface to Totem's sidebar
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:1
-#: ../src/plugins/iplayer/iplayer.py:46
-msgid "BBC iPlayer"
-msgstr "BiBiSi iPlejer"
-
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:2
-msgid "Stream BBC programs from the last 7 days from the BBC iPlayer service."
-msgstr ""
-"Prima programe BiBiSi-ja od poslednjih 7 dana preko BiBiSi iPlejer servisa."
-
-#: ../src/plugins/iplayer/iplayer.py:72
-msgid "Error listing channel categories"
-msgstr "Greška pri preuzimanju kategorija kanala"
-
-#: ../src/plugins/iplayer/iplayer.py:73
-msgid ""
-"There was an unknown error getting the list of television channels available "
-"on BBC iPlayer."
-msgstr ""
-"Desila se nepoznata greška prilikom preuzimanja liste dostupnih televizijskih "
-"kanala preko BiBiSi iPlejera."
-
-#. Append a dummy child row so that the expander's visible; we can
-#. then queue off the expander to load the programme listing for this
-#. category
-#: ../src/plugins/iplayer/iplayer.py:84
-msgid "Loading…"
-msgstr "Učitavam…"
-
-#. Translators: the "programme feed" is the list of TV shows
-#. available to watch online
-#: ../src/plugins/iplayer/iplayer.py:136
-msgid "Error getting programme feed"
-msgstr "Greška pri uzimanju dovoda programa"
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
+msgid "Instant Messenger Status"
+msgstr "Stanje programa za trenutne poruke"
 
-#: ../src/plugins/iplayer/iplayer.py:137
-msgid ""
-"There was an error getting the list of programmes for this channel and "
-"category combination."
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
+msgid "Set your Instant Messenger status to away when a movie is playing"
 msgstr ""
-"Dogodila se greška prilikom preuzimanja spiska programa za ove kanale i "
-"kategorije."
-
-#: ../src/plugins/iplayer/iplayer2.py:298
-msgid ""
-msgstr ""
-
-#: ../src/plugins/iplayer/iplayer2.py:299
-#, python-format
-msgid "Programme unavailable (\"%s\")"
-msgstr "Program nije dostupan („%s“)"
+"Namestite vaše stanje u programu za trenutne poruke na „odsutan“ kada je "
+"pušten film"
 
 #: ../src/plugins/lirc/lirc.plugin.in.h:1
 msgid "Infrared Remote Control"
@@ -2282,27 +2100,31 @@
 
 #: ../src/plugins/lirc/totem-lirc.c:254
 msgid "Couldn't read lirc configuration."
-msgstr "Ne mogu da učitam lirc postavke."
+msgstr "Ne mogu da učitam postavke lirca."
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
-msgid "Download Movie Subtitles"
-msgstr "Preuzmi titlove za film"
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:1
+msgid "Media Player Keys"
+msgstr "Prečice zvučnog programa"
+
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:2
+msgid "Support additional media player keys"
+msgstr "Podrška za dodatne tastere medijskog programa"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
-msgid "Subtitle _language:"
-msgstr "Jezik tit_la:"
+#: ../src/plugins/ontop/ontop.plugin.in.h:1
+msgid "Always On Top"
+msgstr "Uvek u prvom planu"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
-msgid "_Play with Subtitle"
-msgstr "_Pusti sa titlom"
+#: ../src/plugins/ontop/ontop.plugin.in.h:2
+msgid "Keep the main window on top when playing a movie"
+msgstr "Drži glavni prozor u prvom planu kada je pušten film"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:1
 msgid "Subtitle Downloader"
 msgstr "Preuzimač titlova"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:2
-msgid "Look for subtitles for the currently playing movie."
-msgstr "Pregledaj titlove za trenutno pušteni film."
+msgid "Look for subtitles for the currently playing movie"
+msgstr "Potražite titlove za trenutno pušteni film"
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:42
 msgid "Brazilian Portuguese"
@@ -2310,7 +2132,7 @@
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:177
 msgid "Searching for subtitles…"
-msgstr "Pretražujem prevode…"
+msgstr "Tražim prevode…"
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:225
 #: ../src/plugins/opensubtitles/opensubtitles.py:645
@@ -2319,12 +2141,12 @@
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:290
 msgid "Could not contact the OpenSubtitles website"
-msgstr "Neuspelo povezivanje sa OpenSubtitles sajtom"
+msgstr "Ne mogu da se povežem sa sajtom Otvorenih titlova"
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:323
 #: ../src/plugins/opensubtitles/opensubtitles.py:341
 msgid "Could not contact the OpenSubtitles website."
-msgstr "Neuspelo povezivanje sa OpenSubtitles sajtom."
+msgstr "Ne mogu da se povežem sa sajtom Otvorenih titlova."
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:329
 msgid "No results found."
@@ -2348,16 +2170,28 @@
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:525
 msgid "Download movie subtitles from OpenSubtitles"
-msgstr "Preuzima prevode za film sa OpenSubtitles sajta"
+msgstr "Preuzima prevode filmova sa sajta Otvorenih titlova"
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:527
 msgid "_Download Movie Subtitles…"
-msgstr "_Preuzmi prevode za film..."
+msgstr "_Preuzmi prevode za film…"
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:589
 msgid "Searching subtitles…"
 msgstr "Pretražujem prevode…"
 
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
+msgid "Download Movie Subtitles"
+msgstr "Preuzmite titlove za film"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
+msgid "Subtitle _language:"
+msgstr "Jezik tit_la:"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
+msgid "_Play with Subtitle"
+msgstr "_Pusti sa titlom"
+
 #: ../src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in.h:1
 msgid "Subtitle language"
 msgstr "Jezik prevoda"
@@ -2366,80 +2200,17 @@
 msgid "The language to search for subtitles for movies in."
 msgstr "Jezik za pretraživanje za prevode filmova."
 
-#: ../src/plugins/ontop/ontop.plugin.in.h:1
-msgid "Always On Top"
-msgstr "Uvek u prvom planu"
-
-#: ../src/plugins/ontop/ontop.plugin.in.h:2
-msgid "Keep the main window on top when playing a movie"
-msgstr "Drži glavni prozor u prvom planu kada je pušten film"
+#: ../src/plugins/properties/movie-properties.plugin.in.h:1
+msgid "Movie Properties"
+msgstr "Svojstva filma"
+
+#: ../src/plugins/properties/movie-properties.plugin.in.h:2
+msgid "Adds movie properties to the sidebar"
+msgstr "Dodajte svojstva filma u bočnu površ"
 
 #: ../src/plugins/properties/totem-movie-properties.c:246
 msgid "Properties"
-msgstr "Osobine"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:1
-msgid "Publisher protocol to use"
-msgstr "Protokol izdavača za korišćenje"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:2
-msgid ""
-"The transport protocol to use when publishing playlists over the network."
-msgstr ""
-"Transportni protokol za korišćenje prilikom objavljivanja spiska pesama preko "
-"mreže."
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:3
-msgid "Format for network service name"
-msgstr "Format za ime mrežne usluge"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:5
-#, no-c-format
-msgid ""
-"A format string used to build the network service name used when publishing "
-"playlists over the network. The following format placeholders can be used: • "
-"%a: the program name as returned by g_get_application_name() • %h: the "
-"machine's host name in title case • %u: the user's login name in title case "
-"• %U: the user's real name • %%: the percent sign"
-msgstr ""
-"Format niza korišćenog za izgradnju imena mrežne usluge korišćene prilikom "
-"objavljivanja spiska numera preko mreže. Sledeći nosioci mesta formata mogu "
-"biti korišćeni: • „%a“: ime programa koje vraća „g_get_application_name()“ • "
-"„%h“: ime domaćina mašine u predmetu naslova • „%u“: korisnikovo ime "
-"prijavljivanja u slučaju naslova • „%U“: pravo ime korisnika • „%%“: znak za "
-"procenat"
-
-#. Translators: computers on the local network which are publishing their playlists over the network
-#: ../src/plugins/publish/totem-publish.c:552
-msgid "Neighbors"
-msgstr "Komšije"
-
-#: ../src/plugins/publish/publish.plugin.in.h:1
-msgid "Publish Playlist"
-msgstr "Objavi spisak pesama"
-
-#: ../src/plugins/publish/publish.plugin.in.h:2
-msgid "Share the current playlist via HTTP"
-msgstr "Podeli trenutnu listu za puštanje kroz HTTP"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:1
-msgid "Service _Name:"
-msgstr "_Naziv usluge:"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:3
-#, no-c-format
-msgid ""
-"The name used for announcing the playlist service on the network.\n"
-"All occurrences of the string %u will be replaced by your name,\n"
-"and %h will be replaced by your computer's host name."
-msgstr ""
-"Ime korišćeno za najavu usluge spiska pesama u mreži.\n"
-"Svako pojavljivanje karaktera %u biće zamenjeno vašim imenom,\n"
-"a %h će biti zamenjeno imenom domaćina vašeg računara."
-
-#: ../src/plugins/publish/publish-plugin.ui.h:6
-msgid "Use _encrypted transport protocol (HTTPS)"
-msgstr "_Šifrovani protokol prenosa (HTTPS)"
+msgstr "Svojstva"
 
 #: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:1
 msgid "rpdb2 password"
@@ -2451,24 +2222,89 @@
 "remote access. If this is empty, a default of 'totem' will be used."
 msgstr ""
 "Lozinka za zaštitu rpdb2 servera za otklanjanje grešaka Totema od neovlašćenog "
-"udaljenog pristupa. Ako je ovo prazno, podrazumevano „totem“ će se koristiti."
+"udaljenog pristupa. Ako je ovo prazno, podrazumevano „totem“ će se "
+"koristiti."
+
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
+msgid "Python Console"
+msgstr "Pitonova konzola"
+
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
+msgid "Interactive Python console"
+msgstr "Međudejstvena Pitonova konzola"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:88
+msgid "Python Console Menu"
+msgstr "Izbornik Pitonove konzole"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:93
+msgid "_Python Console"
+msgstr "_Pitonova konzola"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:94
+msgid "Show Totem's Python console"
+msgstr "Prikažite Pitonovu konzolu za Totem"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:100
+msgid "Python Debugger"
+msgstr "Pitonov ispravljač grešaka"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:101
+msgid "Enable remote Python debugging with rpdb2"
+msgstr "Uključite udaljeno uklanjanje grešaka Pitona pomoću rpdb2"
+
+#. pylint: disable-msg=E1101
+#: ../src/plugins/pythonconsole/pythonconsole.py:125
+#, python-format
+msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
+msgstr "Možete pristupiti totemovom objektu kroz „totem_object“ :\\n%s"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:129
+msgid "Totem Python Console"
+msgstr "Pitonova konzola za Totem"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:139
+msgid ""
+"After you press OK, Totem will wait until you connect to it with winpdb or "
+"rpdb2. If you have not set a debugger password in DConf, it will use the "
+"default password ('totem')."
+msgstr ""
+"Nakon što pritisnete U redu, Totem će sačekati da se povežete na njega preko "
+"„winpdb“ ili „rpdb2“. Ukoliko niste izabrali lozinku radi uklanjanja grešaka u "
+"Dkonfu, koristite podrazumevanu lozinku (totem)."
+
+#: ../src/plugins/recent/recent.plugin.in.h:1
+msgid "Recent files"
+msgstr "Skorašnje datoteke"
+
+#: ../src/plugins/recent/recent.plugin.in.h:2
+msgid "Adds files that have been played to recent files"
+msgstr "Dodajte puštane datoteke u skorašnje"
 
 #: ../src/plugins/rotation/rotation.plugin.in.h:1
 msgid "Rotation Plugin"
-msgstr "Dodatak okretanja"
+msgstr "Priključak zaokretanja"
 
 #: ../src/plugins/rotation/rotation.plugin.in.h:2
-msgid "Allows videos to be rotated if they're in the wrong orientation."
-msgstr "Omogućava okretanje video snimaka ako su pogrešno okrenuti."
+msgid "Allows videos to be rotated if they are in the wrong orientation"
+msgstr "Omogućava okretanje video snimaka ako su pogrešno okrenuti"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:60
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:50
 msgid "_Rotate Clockwise"
 msgstr "Okreni u _smeru kazaljke na satu"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:62
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:52
 msgid "Rotate Counterc_lockwise"
 msgstr "Okreni suprotno od smera _kazaljke na satu"
 
+#: ../src/plugins/save-file/save-file.plugin.in.h:1
+msgid "Save Copy"
+msgstr "Sačuvajte primerak"
+
+#: ../src/plugins/save-file/save-file.plugin.in.h:2
+msgid "Save a copy of the currently playing movie"
+msgstr "Sačuvajte jedan primerak trenutno puštenog filma"
+
 #: ../src/plugins/save-file/totem-save-file.c:63
 msgid "Save a Copy..."
 msgstr "Sačuvaj primerak..."
@@ -2479,7 +2315,7 @@
 
 #: ../src/plugins/save-file/totem-save-file.c:129
 msgid "Save a Copy"
-msgstr "Sačuvaj primerak"
+msgstr "Sačuvajte primerak"
 
 #. translators: Movie is the default saved movie filename,
 #. * without the suffix
@@ -2491,10 +2327,13 @@
 msgid "Movie stream"
 msgstr "Tok filma"
 
-#: ../src/plugins/screensaver/totem-screensaver.c:116
-#: ../browser-plugin/totem-plugin-viewer.c:1891
-msgid "Playing a movie"
-msgstr "Pušta film"
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:1
+msgid "Screen Saver"
+msgstr "Čuvar ekrana"
+
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:2
+msgid "Deactivates the screen saver when a movie is playing"
+msgstr "Isključite čuvara ekrana prilikom puštanja filma"
 
 #: ../src/plugins/screenshot/gallery.ui.h:1
 msgid "Screenshot width (in pixels):"
@@ -2502,33 +2341,38 @@
 
 #: ../src/plugins/screenshot/gallery.ui.h:2
 msgid "Calculate the number of screenshots"
-msgstr "Izračunaj broj snimaka ekrana"
+msgstr "Izračunajte broj snimaka ekrana"
 
 #: ../src/plugins/screenshot/gallery.ui.h:3
 msgid "Number of screenshots:"
 msgstr "Broj snimaka ekrana:"
 
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:1
-msgid "_Name:"
-msgstr "_Ime:"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:2
-msgid "Save in _folder:"
-msgstr "Snimi u _fasciklu:"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:3
-msgid "Select a folder"
-msgstr "Odaberite fasciklu"
-
-#. Write the screenshot to the temporary file
-#: ../src/plugins/screenshot/gnome-screenshot-widget.c:385
-#: ../src/plugins/screenshot/totem-screenshot.c:64
-msgid "Screenshot.png"
-msgstr "filmski-snimak.png"
+#. translators: this is the name of the file that gets made up
+#. * with the screenshot if the entire screen is taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:147
+#, c-format
+msgid "Screenshot from %s.png"
+msgstr "Snimak ekrana sa %s.png"
+
+#. translators: this is the name of the file that gets
+#. * made up with the screenshot if the entire screen is
+#. * taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:154
+#, c-format
+msgid "Screenshot from %s - %d.png"
+msgstr "Snimak ekrana sa %s — %d.png"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:1
+msgid "Screenshot"
+msgstr "Snimak ekrana"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:2
+msgid "Allows screenshots and galleries to be taken of videos"
+msgstr "Omogućava pravljenje snimaka ekrana i zbirki iz videa"
 
 #: ../src/plugins/screenshot/totem-gallery.c:91
 msgid "Save Gallery"
-msgstr "Snimi galeriju"
+msgstr "Sačuvaj zbirku"
 
 #. Translators: The first argument is the movie title. The second
 #. * argument is a number which is used to prevent overwriting files.
@@ -2537,62 +2381,60 @@
 #: ../src/plugins/screenshot/totem-gallery.c:115
 #, c-format
 msgid "Gallery-%s-%d.jpg"
-msgstr "Galerija-%s-%d.jpg"
+msgstr "Zbirka-%s-%d.jpg"
 
 #. Set up the window
 #: ../src/plugins/screenshot/totem-gallery-progress.c:101
 msgid "Creating Gallery..."
-msgstr "Pravim galeriju..."
+msgstr "Pravim zbirku..."
 
 #. Set the progress label
 #: ../src/plugins/screenshot/totem-gallery-progress.c:107
 #, c-format
 msgid "Saving gallery as \"%s\""
-msgstr "Snimam galeriju kao „%s“"
-
-#: ../src/plugins/screenshot/totem-screenshot.c:113
-msgid "There was an error saving the screenshot."
-msgstr "Došlo je do greške prilikom snimanja slike ekrana."
-
-#: ../src/plugins/screenshot/totem-screenshot.c:139
-msgid "Save Screenshot"
-msgstr "Sačuvaj snimak ekrana"
-
-#. Create the screenshot widget
-#. Translators: %s is the movie title and %d is an auto-incrementing number to make filename unique
-#: ../src/plugins/screenshot/totem-screenshot.c:160
-#, c-format
-msgid "Screenshot-%s-%d.png"
-msgstr "Snimak-filma-%s-%d.png"
+msgstr "Čuvam zbirku kao „%s“"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:88
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:220
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "Totem could not get a screenshot of the video."
 msgstr "Totem nije uspeo da napravi snimak ekrana filma."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "This is not supposed to happen; please file a bug report."
-msgstr "Ovo nije trebalo da se desi; molimo prijavite grešku."
+msgstr "Ovo nije trebalo da se desi; molim prijavite grešku."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
-msgid "Take _Screenshot..."
-msgstr "Napravi _snimak ekrana..."
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
+msgid "Take _Screenshot"
+msgstr "_Snimi ekran"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
 msgid "Take a screenshot"
-msgstr "Napravi snimak ekrana"
+msgstr "Napravite snimak ekrana"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create Screenshot _Gallery..."
-msgstr "Napravi _galeriju snimaka ekrana..."
+msgstr "Napravi _zbirku snimaka ekrana..."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create a gallery of screenshots"
-msgstr "Pravi galeriju snimaka ekrana"
+msgstr "Napravite zbirku snimaka ekrana"
+
+#: ../src/plugins/skipto/skipto.plugin.in.h:1
+#: ../src/plugins/skipto/totem-skipto.c:196
+msgid "Skip To"
+msgstr "Premotaj na"
+
+#: ../src/plugins/skipto/skipto.plugin.in.h:2
+msgid "Provides the \"Skip to\" dialog"
+msgstr "Prikazuje prozorče „Premotaj na“"
+
+#: ../src/plugins/skipto/skipto.ui.h:1
+msgid "_Skip to:"
+msgstr "_Premotaj na:"
 
 #. Update the "seconds" label so that it always has the correct singular/plural form
 #. Translators: label for the seconds selector in the "Skip to" dialogue
-#: ../src/plugins/skipto/totem-skipto.c:160
+#: ../src/plugins/skipto/totem-skipto.c:159
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "sekunda"
@@ -2604,456 +2446,15 @@
 #. Translators: you should translate this string to a number (written in digits) which corresponds to the longer character length of the
 #. * translations for "second" and "seconds", as translated elsewhere in this file. For example, in English, "second" is 6 characters long and
 #. * "seconds" is 7 characters long, so this string should be translated to "7". See: bgo#639398
-#: ../src/plugins/skipto/totem-skipto.c:190
+#: ../src/plugins/skipto/totem-skipto.c:189
 msgctxt "Skip To label length"
 msgid "7"
 msgstr "7"
 
-#: ../src/plugins/skipto/totem-skipto.c:197
-msgid "Skip To"
-msgstr "Preskoči do"
-
 #: ../src/plugins/skipto/totem-skipto-plugin.c:182
 msgid "_Skip To..."
-msgstr "Preskoči _do..."
+msgstr "_Premotaj na..."
 
 #: ../src/plugins/skipto/totem-skipto-plugin.c:182
 msgid "Skip to a specific time"
-msgstr "Preskoči do određenog vremena"
-
-#: ../src/plugins/skipto/skipto.ui.h:1
-msgid "_Skip to:"
-msgstr "Pre_skoči do:"
-
-#: ../browser-plugin/totem-plugin-viewer.c:431
-msgid "No URI to play"
-msgstr "Nema adrese za puštanje"
-
-#. translators: this is:
-#. * Open With ApplicationName
-#. * as in nautilus' right-click menu
-#: ../browser-plugin/totem-plugin-viewer.c:1107
-#, c-format
-msgid "_Open with \"%s\""
-msgstr "_Otvori sa „%s“"
-
-#: ../browser-plugin/totem-plugin-viewer.c:2136
-msgid "No playlist or playlist empty"
-msgstr "Nema spiska za puštanje ili je prazan"
-
-#: ../browser-plugin/totem-plugin-viewer.c:2235
-msgid "Movie browser plugin"
-msgstr "Totemov dodatak za pregled filmova"
-
-#: ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Verify your system installation. The Totem plugin will now exit."
-msgstr "Proverite instalaciju vašeg sistema. Totem dodatak će se sada ugasiti."
-
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
-msgid "Python Console"
-msgstr "Pitonova konzola"
-
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
-msgid "Interactive Python console."
-msgstr "Interaktivna Pitonova konzola."
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:88
-msgid "Python Console Menu"
-msgstr "Meni Pitonove konzole"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:93
-msgid "_Python Console"
-msgstr "_Pitonova konzola"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:94
-msgid "Show Totem's Python console"
-msgstr "Prikazuje Pitonovu konzolu za Totem"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:100
-msgid "Python Debugger"
-msgstr "Pitonovo uklanjanje grešaka"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:101
-msgid "Enable remote Python debugging with rpdb2"
-msgstr "Omogući udaljeno uklanjanje Piton grešaka pomoću rpdb2"
-
-#. pylint: disable-msg=E1101
-#: ../src/plugins/pythonconsole/pythonconsole.py:125
-#, python-format
-msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
-msgstr "Možete pristupiti totemovom objektu kroz „totem_object“ :\\n%s"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:129
-msgid "Totem Python Console"
-msgstr "Pitonova konzola za Totem"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:139
-msgid ""
-"After you press OK, Totem will wait until you connect to it with winpdb or "
-"rpdb2. If you have not set a debugger password in DConf, it will use the "
-"default password ('totem')."
-msgstr ""
-"Nakon što pritisnete U redu, Totem će sačekati da se povežete na njega preko "
-"„winpdb“ ili „rpdb2“. Ukoliko niste izabrali lozinku radi uklanjanja grešaka u "
-"GKonfu, koristite podrazumevanu lozinku (totem)."
-
-#: ../src/plugins/grilo/grilo.plugin.in.h:1
-msgid "Grilo Browser"
-msgstr "Grilo razgledač"
-
-#: ../src/plugins/grilo/grilo.plugin.in.h:2
-msgid "A plugin to let you browse media content from various sources."
-msgstr "Dodatak koji dozvoljava razgledanje medijskog sadržaja sa raznih izvora."
-
-#: ../src/plugins/grilo/totem-grilo.c:452
-msgid "Browse Error"
-msgstr "Greška u razgledanju"
-
-#: ../src/plugins/grilo/totem-grilo.c:599
-msgid "Search Error"
-msgstr "Greška u pretrazi"
-
-#: ../src/plugins/grilo/totem-grilo.c:1219 ../src/plugins/grilo/grilo.ui.h:3
-msgid "Browse"
-msgstr "Pregledaj"
-
-#: ../src/plugins/grilo/totem-grilo.c:1285 ../src/plugins/grilo/grilo.ui.h:4
-msgid "Search"
-msgstr "Traži"
-
-#: ../src/plugins/grilo/grilo.ui.h:1
-#| msgid "_Add to Playlist"
-msgid "Add to Playlist"
-msgstr "Dodajte u listu za puštanje"
-
-#: ../src/plugins/grilo/grilo.ui.h:2
-#| msgid "_Copy Location"
-msgid "Copy Location"
-msgstr "Umnoži putanju"
-
-#~ msgid "Bemused"
-#~ msgstr "Bemused"
-
-#~ msgid "Control Totem through a mobile phone with a Bemused client"
-#~ msgstr "Upravljajte Totemom preko mobilnog telefona koristeći Bemused uslugu"
-
-#~ msgid "Untitled %d"
-#~ msgstr "Neimenovano %d"
-
-#~ msgid "Totem Bemused Server"
-#~ msgstr "Totemov Bemused server"
-
-#~ msgid "Totem Bemused Server version 1.0"
-#~ msgstr "Totemov Bemused server, verzija 1.0"
-
-#~ msgid "A plugin to let you browse YouTube videos."
-#~ msgstr "Dodatak koji dozvoljava razgledanje YouTube video snimaka."
-
-#~ msgid "YouTube Browser"
-#~ msgstr "Jutub razgledač"
-
-#~ msgid "Related Videos"
-#~ msgstr "Srodni snimci"
-
-#~ msgid "Search Results"
-#~ msgstr "Rezultati pretrage"
-
-#~ msgid "Videos"
-#~ msgstr "Video snimci"
-
-#~ msgid "_Open in Web Browser"
-#~ msgstr "Otvori _internet preglednik"
-
-#~ msgid "Open the video in your web browser"
-#~ msgstr "Otvara video u internet pregledaču"
-
-#~ msgid "YouTube"
-#~ msgstr "Jutub"
-
-#~ msgid "Cancelling query…"
-#~ msgstr "Poništavam upit..."
-
-#~ msgid "Error Searching for Videos"
-#~ msgstr "Greška pri traženju video snimaka"
-
-#~ msgid ""
-#~ "The response from the server could not be understood. Please check you "
-#~ "are running the latest version of libgdata."
-#~ msgstr ""
-#~ "Nepoznat odgovor servera. Molimo proverite da li koristiti poslednje "
-#~ "izdanje libgdata biblioteke."
-
-#~ msgid "Fetching search results…"
-#~ msgstr "Preuzimam rezultate pretrage..."
-
-#~ msgid "Fetching related videos…"
-#~ msgstr "Preuzimam srodne snimke..."
-
-#~ msgid "Error Opening Video in Web Browser"
-#~ msgstr "Greška pri otvaranju video snimka u internet pregledniku"
-
-#~ msgid "Fetching more videos…"
-#~ msgstr "Preuzimam još video snimaka..."
-
-#~ msgid "Video Format Not Supported"
-#~ msgstr "Video format nije podržan"
-
-#~ msgid ""
-#~ "This video is not available in any formats which Totem supports. Would "
-#~ "you like to open it in your web browser instead?"
-#~ msgstr ""
-#~ "Ovaj video nije dostupan ni u jednom formatu koji Totem podržava. Da li "
-#~ "želite da ga otvorite u vašem veb pretraživaču?"
-
-#~ msgid "0 frames per second"
-#~ msgstr "0 kadrova u sekundi"
-
-#~ msgid "0 kbps"
-#~ msgstr "0 Kbit/s"
-
-#~ msgid "0 x 0"
-#~ msgstr "0 h 0"
-
-#~ msgid "Zoom Out"
-#~ msgstr "Umanji"
-
-#~ msgid "Zoom Reset"
-#~ msgstr "Vrati uvećanje"
-
-#~ msgid "Zoom out"
-#~ msgstr "Umanji"
-
-#~ msgid "Zoom reset"
-#~ msgstr "Vrati uvećanje"
-
-#~ msgid ""
-#~ "The playback of this movie requires the following decoders which are not "
-#~ "installed:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Puštanje ovog filma zahteva naredne dodatke koji nisu instalirani:\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid "Media file could not be played."
-#~ msgstr "Ne mogu pustiti datoteku."
-
-#~ msgid "Too old version of GStreamer installed."
-#~ msgstr "Instalirano je prestaro izdanje GStrimera."
-
-#~ msgid ""
-#~ "Failed to open video output. It may not be available. Please select "
-#~ "another video output in the Multimedia Systems Selector."
-#~ msgstr ""
-#~ "Neuspešan pristup video izlazu. Možda nije dostupan. Izaberite neki drugi "
-#~ "video izlaz u „Izbiraču multimedijalnog sistema“."
-
-#~ msgid ""
-#~ "Could not find the video output. You may need to install additional "
-#~ "GStreamer plugins, or select another video output in the Multimedia "
-#~ "Systems Selector."
-#~ msgstr ""
-#~ "Neuspešan pristup video izlazu. Možda treba da instalirate još neke "
-#~ "dodatke ili izaberete neki drugi video izlaz u „Izbiraču multimedijalnog "
-#~ "sistema“."
-
-#~ msgid "%s"
-#~ msgstr "%s"
-
-#~ msgid "Delete"
-#~ msgstr "Obriši"
-
-#~ msgid "Coherence DLNA/UPnP Client"
-#~ msgstr "Coherence-ov DLNA/UPnP klijent"
-
-#~ msgid "A DLNA/UPnP client for Totem powered by Coherence"
-#~ msgstr "DLNA/UPnP klijent za Gnomov bioskop i muzičku kutiju od Coherence-a"
-
-#~ msgid "By artist"
-#~ msgstr "Po izvođaču"
-
-#~ msgid "By tag"
-#~ msgstr "Po oznaci"
-
-#~ msgid "Jamendo Album Page"
-#~ msgstr "Jamendo strana albuma"
-
-#~ msgid "Latest Releases"
-#~ msgstr "Poslednja izdanja"
-
-#~ msgid "Number of albums to _retrieve:"
-#~ msgstr "B_roj albuma za preuzimanje:"
-
-#~ msgid "Popular"
-#~ msgstr "Popularni"
-
-#~ msgid "Preferred audio _format:"
-#~ msgstr "Omiljeni _format zvuka:"
-
-#~ msgid "_Open Jamendo Album Page in Browser"
-#~ msgstr "_Otvori Jamendo stranu albuma u internet pregledniku"
-
-#~ msgid "Jamendo"
-#~ msgstr "Jamendo"
-
-#~ msgid ""
-#~ "Listen to the large collection of Creative Commons licensed music on "
-#~ "Jamendo."
-#~ msgstr ""
-#~ "Slušajte ogromnu zbirku muzike licencirane pod Creative Commons licencom "
-#~ "na Jamendu."
-
-#~ msgid "You need to install the Python simplejson module."
-#~ msgstr "Morate da instalirate Pitonov simplejson modul."
-
-#~ msgid "Artist: %s"
-#~ msgstr "Izvođač: %s"
-
-#~ msgid "%Y-%m-%d"
-#~ msgstr "%d.%m.%Y"
-
-#~ msgid "%x"
-#~ msgstr "%x"
-
-#~ msgid "Genre: %s"
-#~ msgstr "Žanr: %s"
-
-#~ msgid "Released on: %s"
-#~ msgstr "Objavljeno: %s"
-
-#~ msgid "License: %s"
-#~ msgstr "Licenca: %s"
-
-#~ msgid "%02d. %s"
-#~ msgstr "%02d. %s"
-
-#~ msgid "Album: %s"
-#~ msgstr "Album: %s"
-
-#~ msgid "Duration: %s"
-#~ msgstr "Trajanje: %s"
-
-#~ msgid "Fetching albums, please wait…"
-#~ msgstr "Preuzimam albume, sačekajte..."
-
-#~ msgid ""
-#~ "Failed to connect to Jamendo server.\n"
-#~ "%s."
-#~ msgstr ""
-#~ "Nije uspelo povezivanje sa Jamendo serverom.\n"
-#~ "%s."
-
-#~ msgid "The Jamendo server returned code %s."
-#~ msgstr "Jamendo server je vratio kod %s."
-
-#~ msgid "An error occurred while fetching albums."
-#~ msgstr "Dogodila se greška prilikom preuzimanja albuma."
-
-#~ msgid "%H:%M:%S"
-#~ msgstr "%H:%M:%S"
-
-#~ msgid "%M:%S"
-#~ msgstr "%M:%S"
-
-#~ msgid "en"
-#~ msgstr "en"
-
-#~ msgid "Audio format to download from Jamendo"
-#~ msgstr "Audio format za preuzimanje sa Jamenda"
-
-#~ msgid "Number of results per page"
-#~ msgstr "Broj rezultata po stranici"
-
-#~ msgid ""
-#~ "The number of Jamendo search results to display in each page of results."
-#~ msgstr ""
-#~ "Broj rezultata Jamendo pretrage za prikaz na svakoj stranici rezultata."
-
-#~ msgid "The preferred audio format to download tracks from Jamendo in."
-#~ msgstr "Željeni audio format za preuzimanje pesama sa Jamenda."
-
-#~ msgid "Language"
-#~ msgstr "Jezik"
-
-#~ msgid "Could not connect to Tracker"
-#~ msgstr "Ne mogu da se povežem na Traker"
-
-#~ msgid "No results"
-#~ msgstr "Bez rezultata"
-
-#~ msgid "Showing %i - %i of %i match"
-#~ msgid_plural "Showing %i - %i of %i matches"
-#~ msgstr[0] "Prikazujem %i - %i od %i poklapanja"
-#~ msgstr[1] "Prikazujem %i - %i od %i poklapanja"
-#~ msgstr[2] "Prikazujem %i - %i od %i poklapanja"
-#~ msgstr[3] "Prikazujem %i - %i od %i poklapanja"
-
-#~ msgid "Page"
-#~ msgstr "Stranica"
-
-#~ msgid "Set the window icon to the thumbnail of the playing movie"
-#~ msgstr "Postavi ikonicu prozora na umanjeni pregled puštenog filma"
-
-#~ msgid "Thumbnail"
-#~ msgstr "Umanjeni pregled"
-
-#~ msgid "Search for local videos using Tracker"
-#~ msgstr "Traži lokalne video snimke Trakerom"
-
-# bug: clear it up?
-#~ msgid "Browser Plugin using %s"
-#~ msgstr "Dodatak za veb čitač koristeći %s"
-
-#~ msgid "Totem Browser Plugin"
-#~ msgstr "Totemov dodatak za veb čitač"
-
-#~ msgid "Author:"
-#~ msgstr "Autor:"
-
-#~ msgid "C_onfigure..."
-#~ msgstr "_Postavke..."
-
-#~ msgid "Copyright:"
-#~ msgstr "Autorsko pravo:"
-
-#~ msgid "Description:"
-#~ msgstr "Opis:"
-
-#~ msgid "Site:"
-#~ msgstr "Veb adresa:"
-
-#~ msgid ""
-#~ "Approximate network connection speed, used to select quality on media "
-#~ "over the network: \"0\" for 14.4 Kbps Modem, \"1\" for 19.2 Kbps Modem, "
-#~ "\"2\" for 28.8 Kbps Modem, \"3\" for 33.6 Kbps Modem, \"4\" for 34.4 Kbps "
-#~ "Modem, \"5\" for 56 Kbps Modem/ISDN, \"6\" for 112 Kbps Dual ISDN/DSL, \"7"
-#~ "\" for 256 Kbps DSL/Cable, \"8\" for 384 Kbps DSL/Cable, \"9\" for 512 "
-#~ "Kbps DSL/Cable, \"10\" for 1.5 Mbps T1/Intranet/LAN, \"11\" for Intranet/"
-#~ "LAN."
-#~ msgstr ""
-#~ "Okvirne brzine mrežne konekcije, koriste se da se odabere kvalitet medija "
-#~ "preko mreže: „0“ za 14,4 Kbit/s modem, „1“ za 19,2 Kbit/s modem, „2“ za "
-#~ "28,8 Kbit/s modem, „3“ za 33,6 Kbit/s modem, „4“ za 34,4 Kbit/s modem, "
-#~ "„5“ za 56 Kbit/s modem/ISDN, „6“ za 112 Kbit/s dvokanalni ISDN/DSL, „7“ "
-#~ "za 256 Kbit/s DSL/Kabl, „8“ za 384 Kbit/s DSL/Kabl, „9“ za 512 Kbit/s DSL/"
-#~ "Kabl, „10“ za 1,5 Mbit/s T1/Intranet/LAN, „11“ za Internet/LAN."
-
-#~ msgid ""
-#~ "Quality settings for the audio visualization: \"0\" for small, \"1\" for "
-#~ "normal, \"2\" for large, \"3\" for extra large."
-#~ msgstr ""
-#~ "Podešavanje kvaliteta vizualizacije zvuka: „0“ za mali, „1“ za normalni, "
-#~ "„2“ za veliki, „3“ za ekstra veliki."
-
-#~ msgid ""
-#~ "Type of audio output to use: \"0\" for stereo, \"1\" for 4-channel "
-#~ "output, \"2\" for 5.0 channel output, \"3\" for 5.1 channel output, \"4\" "
-#~ "for AC3 Passthrough."
-#~ msgstr ""
-#~ "Vrsta zvučnog izlaza koji se koristi: „0“ za stereo, „1“ za 4-kanalni "
-#~ "izlaz, „2“ za izlaz sa 5.0 kanala, „3“ za izlaz sa 5.1 kanala, „4“ za "
-#~ "propuštanje AC3."
-
-#~ msgid "UTF-8"
-#~ msgstr "CP1250"
+msgstr "Premotajte na određeno vreme"
diff -Nru totem-3.4.3/po/sv.po totem-3.6.2/po/sv.po
--- totem-3.4.3/po/sv.po	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/po/sv.po	2012-08-29 23:07:45.000000000 +0000
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: totem\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-24 18:50+0100\n"
-"PO-Revision-Date: 2012-03-24 18:50+0100\n"
+"POT-Creation-Date: 2012-05-16 12:31+0200\n"
+"PO-Revision-Date: 2012-05-16 12:36+0100\n"
 "Last-Translator: Daniel Nylander \n"
 "Language-Team: Swedish \n"
 "Language: sv\n"
@@ -17,15 +17,213 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ../browser-plugin/totem-plugin-viewer.c:352
+#: ../src/totem-object.c:1130
+#: ../src/totem-object.c:1590
+#: ../src/totem-statusbar.c:115
+msgid "Stopped"
+msgstr "Stoppad"
+
+#: ../browser-plugin/totem-plugin-viewer.c:364
+#: ../src/totem-object.c:1123
+msgid "Paused"
+msgstr "Gör paus"
+
+#: ../browser-plugin/totem-plugin-viewer.c:368
+#: ../src/totem-object.c:1116
+msgid "Playing"
+msgstr "Spelar upp"
+
+#: ../browser-plugin/totem-plugin-viewer.c:386
+#: ../src/plugins/screensaver/totem-screensaver.c:84
+msgid "Playing a movie"
+msgstr "Spelar upp en film"
+
+#: ../browser-plugin/totem-plugin-viewer.c:443
+msgid "No URI to play"
+msgstr "Ingen uri att spela upp"
+
+#: ../browser-plugin/totem-plugin-viewer.c:676
+#: ../browser-plugin/totem-plugin-viewer.c:1806
+msgid "Totem Movie Player"
+msgstr "Filmuppspelaren Totem"
+
+#. translators: this is:
+#. * Open With ApplicationName
+#. * as in nautilus' right-click menu
+#: ../browser-plugin/totem-plugin-viewer.c:1120
+#, c-format
+msgid "_Open with \"%s\""
+msgstr "_Öppna med \"%s\""
+
+#: ../browser-plugin/totem-plugin-viewer.c:1430
+#: ../src/totem-object.c:2417
+#: ../src/totem-object.c:2419
+msgid "An error occurred"
+msgstr "Ett fel inträffade"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144
+msgid "No playlist or playlist empty"
+msgstr "Ingen spellist eller att spellistan är tom"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2239
+msgid "Movie browser plugin"
+msgstr "Insticksmodul för filmbläddrare"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2255
+#: ../src/totem.c:238
+msgid "Could not initialize the thread-safe libraries."
+msgstr "Kunde inte initiera de trådsäkra biblioteken."
+
+#: ../browser-plugin/totem-plugin-viewer.c:2255
+msgid "Verify your system installation. The Totem plugin will now exit."
+msgstr "Kontrollera din systeminstallation. Totem-insticksmodulen kommer nu att avslutas."
+
 #: ../data/fullscreen.ui.h:1
 msgid "Leave Fullscreen"
 msgstr "Lämna helskärmsläge"
 
 #: ../data/fullscreen.ui.h:2
-#: ../data/totem.ui.h:144
+#: ../data/totem.ui.h:81
 msgid "Time:"
 msgstr "Tid:"
 
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
+msgid "Allow the screensaver to activate when playing audio"
+msgstr "Tillåt skärmsläckaren att aktiveras vid uppspelning av ljud"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
+msgid "Allow the screensaver to activate when playing audio. Disable if you have monitor-powered speakers."
+msgstr "Tillåt skärmsläckaren att aktiveras vid uppspelning av ljud. Inaktivera detta om du har högtalare som drivs av skärmen."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
+msgid "Show visual effects when no video is displayed"
+msgstr "Visa visuella effekter då ingen video visas"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
+msgid "Show visual effects when playing an audio only file."
+msgstr "Visa visuella effekter då en fil med endast ljud spelas upp."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
+msgid "Name of the visual effects plugin"
+msgstr "Namn på insticksmodulen för visuella effekter"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
+msgid "The brightness of the video"
+msgstr "Ljusstyrkan för videon"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
+msgid "The contrast of the video"
+msgstr "Kontrasten för videon"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
+msgid "The hue of the video"
+msgstr "Nyansen för videon"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
+msgid "The saturation of the video"
+msgstr "Mättnaden för videon"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
+msgid "Resize the canvas automatically on file load"
+msgstr "Ändra storleken automatiskt vid filinläsning"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
+msgid "Repeat mode"
+msgstr "Upprepningsläge"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
+msgid "Shuffle mode"
+msgstr "Blandningsläge"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
+msgid "Whether to disable deinterlacing for interlaced movies"
+msgstr "Huruvida avflätning ska inaktiveras för filmer med \"interlace\""
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
+msgid "Whether to enable debug for the playback engine"
+msgstr "Huruvida felsökning för uppspelningsmotorn ska aktiveras"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
+msgid "Type of audio output to use"
+msgstr "Typ av ljudutmatning som ska användas"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
+msgid "Visualization quality setting"
+msgstr "Kvalitetsinställning för visualisering"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
+msgid "Quality setting for the audio visualization."
+msgstr "Kvalitetsinställning för ljudvisualisering."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
+msgid "Network buffering threshold"
+msgstr "Tröskel för nätverksbuffring"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
+msgid "Amount of data to buffer for network streams before starting to display the stream (in seconds)."
+msgstr "Mängd data som ska buffras i nätverksströmmar innan strömmen börjar visas (i sekunder)."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
+msgid "Subtitle font"
+msgstr "Typsnitt för undertext"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
+msgid "Pango font description for subtitle rendering."
+msgstr "Pango-typsnittsbeskrivning för rendering av undertext."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
+msgid "Subtitle encoding"
+msgstr "Kodning för undertext"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
+msgid "Encoding character set for subtitle."
+msgstr "Teckenkodning för undertexter."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
+msgid "Default location for the \"Open...\" dialogs"
+msgstr "Standardplats för \"Öppna...\"-dialogerna"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
+msgid "Default location for the \"Open...\" dialogs. Default is the current directory."
+msgstr "Standardplats för \"Öppna...\"-dialogerna. Standard är aktuell katalog."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
+msgid "Default location for the \"Take Screenshot\" dialogs"
+msgstr "Standardplats för \"Ta skärmbild\"-dialogerna"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
+msgid "Default location for the \"Take Screenshot\" dialogs. Default is the Pictures directory."
+msgstr "Standardplats för \"Ta skärmbild\"-dialogerna. Standard är katalogen Bilder."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
+msgid "Whether to disable the plugins in the user's home directory"
+msgstr "Huruvida insticksmodulerna i användarens hemkatalog ska inaktiveras"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
+msgid "Whether to disable the keyboard shortcuts"
+msgstr "Huruvida tangentbordsgenvägarna ska inaktiveras"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
+msgid "Whether to autoload text subtitle files when a movie is loaded"
+msgstr "Huruvida undertextfiler automatiskt ska läsas in när en film läses in"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
+msgid "Whether to autoload external chapter files when a movie is loaded"
+msgstr "Huruvida kapitelfiler automatiskt ska läsas in när en film läses in"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
+msgid "Whether to remember the position of played audio/video files when pausing or closing them"
+msgstr "Huruvida positionen för uppspelade ljud-/videofiler ska kommas ihåg vid paus eller när de stängs"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
+msgid "Active plugins list"
+msgstr "Lista över aktiva insticksmoduler"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+msgid "A list of the names of the plugins which are currently active (loaded and running)."
+msgstr "En lista över namn på insticksmoduler som för närvarande är aktiva (inlästa och kör)."
+
 #: ../data/playlist.ui.h:1
 msgid "_Remove"
 msgstr "_Ta bort"
@@ -45,12 +243,12 @@
 msgstr "Kopiera platsen till urklipp"
 
 #: ../data/playlist.ui.h:5
-#: ../data/totem.ui.h:78
+#: ../data/totem.ui.h:71
 msgid "_Select Text Subtitles..."
 msgstr "_Välj undertexter..."
 
 #: ../data/playlist.ui.h:6
-#: ../data/totem.ui.h:79
+#: ../data/totem.ui.h:72
 msgid "Select a file to use for text subtitles"
 msgstr "Välj en fil att använda för undertexter"
 
@@ -74,11 +272,169 @@
 msgid "Move Down"
 msgstr "Flytta nedåt"
 
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:2
+msgid "Normal"
+msgstr "Normal"
+
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:4
+msgid "Large"
+msgstr "Stor"
+
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:6
+msgid "Extra Large"
+msgstr "Extra stor"
+
+#: ../data/preferences.ui.h:7
+#: ../src/backend/bacon-video-widget-gst-0.10.c:5403
+#: ../src/totem-properties-view.c:228
+msgid "Stereo"
+msgstr "Stereo"
+
+#: ../data/preferences.ui.h:8
+msgid "4-channel"
+msgstr "4-kanalig"
+
+#: ../data/preferences.ui.h:9
+msgid "4.1-channel"
+msgstr "4.1-kanalig"
+
+#: ../data/preferences.ui.h:10
+msgid "5.0-channel"
+msgstr "5.0-kanalig"
+
+#: ../data/preferences.ui.h:11
+msgid "5.1-channel"
+msgstr "5.1-kanalig"
+
+#: ../data/preferences.ui.h:12
+msgid "AC3 Passthrough"
+msgstr "AC3-genomströmning"
+
+#: ../data/preferences.ui.h:13
+msgid "Totem Preferences"
+msgstr "Inställningar för Totem"
+
+#: ../data/preferences.ui.h:14
+msgid "Playback"
+msgstr "Uppspelning"
+
+#: ../data/preferences.ui.h:15
+msgid "Start playing files from last position"
+msgstr "Starta uppspelning av filer från senaste position"
+
+#: ../data/preferences.ui.h:16
+msgid "Text Subtitles"
+msgstr "Undertexter"
+
+#: ../data/preferences.ui.h:17
+msgid "_Load subtitle files when movie is loaded"
+msgstr "_Läs in undertextfiler när filmen läses in"
+
+#: ../data/preferences.ui.h:18
+msgid "_Font:"
+msgstr "_Typsnitt:"
+
+#: ../data/preferences.ui.h:19
+msgid "_Encoding:"
+msgstr "T_eckenkodning:"
+
+#: ../data/preferences.ui.h:20
+msgid "External Chapters"
+msgstr "Externa kapitel"
+
+#: ../data/preferences.ui.h:21
+msgid "Load _chapter files when movie is loaded"
+msgstr "Läs in _kapitelfiler när filmen läses in"
+
+#: ../data/preferences.ui.h:22
 #: ../data/properties.ui.h:1
-#: ../data/totem.ui.h:122
 msgid "General"
 msgstr "Allmänt"
 
+#. Tab label in the Preferences dialogue
+#: ../data/preferences.ui.h:24
+msgid "Display"
+msgstr "Bild"
+
+#: ../data/preferences.ui.h:25
+msgid "_Resize the window when a new video is loaded"
+msgstr "Än_dra automatiskt storlek på fönstret när en ny video läses in"
+
+#: ../data/preferences.ui.h:26
+msgid "Disable _deinterlacing of interlaced videos"
+msgstr "Inaktivera a_vflätning av filmer med \"interlace\""
+
+#: ../data/preferences.ui.h:27
+msgid "Disable screensaver when playing "
+msgstr "Inaktivera skärmsläckaren vid uppspelning"
+
+#: ../data/preferences.ui.h:28
+#: ../data/properties.ui.h:9
+#: ../src/totem-properties-view.c:270
+msgid "Video"
+msgstr "Video"
+
+#: ../data/preferences.ui.h:29
+msgid "Video or Audio"
+msgstr "Video eller ljud"
+
+#: ../data/preferences.ui.h:30
+msgid "Visual Effects"
+msgstr "Visuella effekter"
+
+#: ../data/preferences.ui.h:31
+msgid "Show _visual effects when an audio file is played"
+msgstr "Visa _visuella effekter då en ljudfil spelas upp"
+
+#: ../data/preferences.ui.h:32
+msgid "_Type of visualization:"
+msgstr "_Typ av visualisering:"
+
+#: ../data/preferences.ui.h:33
+msgid "Visualization _size:"
+msgstr "Visualiserings_storlek:"
+
+#: ../data/preferences.ui.h:34
+msgid "Color Balance"
+msgstr "Färgbalans"
+
+#: ../data/preferences.ui.h:35
+msgid "_Brightness:"
+msgstr "_Ljusstyrka:"
+
+#: ../data/preferences.ui.h:36
+msgid "Co_ntrast:"
+msgstr "Ko_ntrast:"
+
+#: ../data/preferences.ui.h:37
+msgid "Sat_uration:"
+msgstr "M_ättnad:"
+
+#: ../data/preferences.ui.h:38
+msgid "_Hue:"
+msgstr "_Nyans:"
+
+#: ../data/preferences.ui.h:39
+msgid "Reset to _Defaults"
+msgstr "Å_terställ till standard"
+
+#: ../data/preferences.ui.h:40
+msgid "Audio Output"
+msgstr "Ljudutmatning"
+
+#: ../data/preferences.ui.h:41
+msgid "_Audio output type:"
+msgstr "Typ av _ljudutmatning:"
+
+#: ../data/preferences.ui.h:42
+#: ../data/properties.ui.h:14
+#: ../src/totem-properties-view.c:268
+msgid "Audio"
+msgstr "Ljud"
+
 #: ../data/properties.ui.h:2
 msgid "Title:"
 msgstr "Titel:"
@@ -107,12 +463,6 @@
 msgid "Container:"
 msgstr "Container:"
 
-#: ../data/properties.ui.h:9
-#: ../data/totem.ui.h:128
-#: ../src/totem-properties-view.c:270
-msgid "Video"
-msgstr "Video"
-
 #: ../data/properties.ui.h:10
 msgid "Dimensions:"
 msgstr "Dimensioner:"
@@ -129,12 +479,6 @@
 msgid "Bitrate:"
 msgstr "Bitfrekvens:"
 
-#: ../data/properties.ui.h:14
-#: ../data/totem.ui.h:142
-#: ../src/totem-properties-view.c:268
-msgid "Audio"
-msgstr "Ljud"
-
 #: ../data/properties.ui.h:15
 msgid "Sample rate:"
 msgstr "Samplingsfrekvens:"
@@ -143,717 +487,436 @@
 msgid "Channels:"
 msgstr "Kanaler:"
 
-#: ../data/video-list.ui.h:1
-#: ../src/totem-dnd-menu.c:97
-msgid "_Add to Playlist"
-msgstr "_Lägg till i spellista"
-
-#: ../data/video-list.ui.h:2
-msgid "Add the video to the playlist"
-msgstr "Lägg till video i spellistan"
-
 #. Title
 #: ../data/totem.desktop.in.in.in.h:1
-#: ../data/totem.ui.h:143
-#: ../src/totem-object.c:1667
-msgid "Movie Player"
-msgstr "Filmuppspelare"
+#: ../data/totem.ui.h:80
+#: ../src/totem.c:237
+#: ../src/totem.c:245
+#: ../src/totem-menu.c:877
+#: ../src/totem-object.c:1598
+msgid "Videos"
+msgstr "Videoklipp"
 
 #: ../data/totem.desktop.in.in.in.h:2
-msgid "Play movies and songs"
-msgstr "Spela upp filmer och låtar"
+msgid "Play movies"
+msgstr "Spela upp filmer"
+
+#: ../data/totem.desktop.in.in.in.h:3
+msgid "Video;Movie;Film;Clip;Series;Player;DVD;TV;Disc;"
+msgstr "Video;Film;Klipp;Serie;Spelare;Uppspelare;DVD;TV;Skiva;"
 
 #: ../data/totem.ui.h:1
-msgid "_Movie"
-msgstr "_Film"
+msgid "_Open"
+msgstr "_Öppna"
 
 #: ../data/totem.ui.h:2
-msgid "_Open..."
-msgstr "_Öppna..."
+msgid "Open _Location"
+msgstr "Öppna _plats"
 
 #: ../data/totem.ui.h:3
-msgid "Open a file"
-msgstr "Öppna en fil"
+msgid "_Fullscreen"
+msgstr "_Helskärm"
 
 #: ../data/totem.ui.h:4
-msgid "Open _Location..."
-msgstr "Öppna _plats..."
+msgid "Prefere_nces"
+msgstr "Inställni_ngar"
 
 #: ../data/totem.ui.h:5
-msgid "Open a non-local file"
-msgstr "Öppna en icke-lokal fil"
+msgid "Shuff_le"
+msgstr "Blan_da"
 
 #: ../data/totem.ui.h:6
+msgid "_Repeat"
+msgstr "_Upprepa"
+
+#: ../data/totem.ui.h:7
+msgid "_Quit"
+msgstr "A_vsluta"
+
+#: ../data/totem.ui.h:8
+msgid "_Movie"
+msgstr "_Film"
+
+#: ../data/totem.ui.h:9
 msgid "_Eject"
 msgstr "_Mata ut"
 
-#: ../data/totem.ui.h:7
+#: ../data/totem.ui.h:10
 msgid "Eject the current disc"
 msgstr "Mata ut aktuell skiva"
 
-#: ../data/totem.ui.h:8
+#: ../data/totem.ui.h:11
 msgid "_Properties"
 msgstr "_Egenskaper"
 
-#: ../data/totem.ui.h:9
+#: ../data/totem.ui.h:12
 msgid "View the properties of the current stream"
 msgstr "Visa egenskaperna för den aktuella strömmen"
 
-#: ../data/totem.ui.h:10
+#: ../data/totem.ui.h:13
 msgid "Play / P_ause"
 msgstr "Spela upp / Gör p_aus"
 
-#: ../data/totem.ui.h:11
+#: ../data/totem.ui.h:14
 msgid "Play or pause the movie"
 msgstr "Spela upp eller gör paus i filmen"
 
-#: ../data/totem.ui.h:12
-msgid "_Quit"
-msgstr "A_vsluta"
-
-#: ../data/totem.ui.h:13
-msgid "Quit the program"
-msgstr "Avsluta programmet"
-
-#: ../data/totem.ui.h:14
+#: ../data/totem.ui.h:15
 msgid "_Edit"
 msgstr "R_edigera"
 
-#: ../data/totem.ui.h:15
+#: ../data/totem.ui.h:16
 msgid "_Clear Playlist"
 msgstr "_Töm spellista"
 
-#: ../data/totem.ui.h:16
+#: ../data/totem.ui.h:17
 msgid "Clear the playlist"
 msgstr "Töm spellistan"
 
-#: ../data/totem.ui.h:17
-msgid "Prefere_nces"
-msgstr "Inställni_ngar"
-
 #: ../data/totem.ui.h:18
-msgid "Configure the application"
-msgstr "Konfigurera programmet"
-
-#: ../data/totem.ui.h:19
 msgid "Plugins..."
 msgstr "Insticksmoduler..."
 
-#: ../data/totem.ui.h:20
+#: ../data/totem.ui.h:19
 msgid "Configure plugins to extend the application"
 msgstr "Konfigurera insticksmoduler för att utöka programmet"
 
-#: ../data/totem.ui.h:21
+#: ../data/totem.ui.h:20
 msgid "_View"
 msgstr "_Visa"
 
-#: ../data/totem.ui.h:22
-msgid "_Fullscreen"
-msgstr "_Helskärm"
-
-#: ../data/totem.ui.h:23
-msgid "Switch to fullscreen"
-msgstr "Växla till helskärmsläge"
-
-#: ../data/totem.ui.h:24
+#: ../data/totem.ui.h:21
 msgid "Fit Window to Movie"
 msgstr "Anpassa fönstret till filmen"
 
-#: ../data/totem.ui.h:25
+#: ../data/totem.ui.h:22
 msgid "_Resize 1:2"
 msgstr "_Ändra storlek till 1:2"
 
-#: ../data/totem.ui.h:26
+#: ../data/totem.ui.h:23
 msgid "Resize to half the original video size"
 msgstr "Ändra storlek till halva originalstorleken"
 
-#: ../data/totem.ui.h:27
+#: ../data/totem.ui.h:24
 msgid "Resize _1:1"
 msgstr "Ändra storlek till _1:1"
 
-#: ../data/totem.ui.h:28
+#: ../data/totem.ui.h:25
 msgid "Resize to the original video size"
 msgstr "Ändra storlek till originalstorleken"
 
-#: ../data/totem.ui.h:29
+#: ../data/totem.ui.h:26
 msgid "Resize _2:1"
 msgstr "Ändra storlek till _2:1"
 
-#: ../data/totem.ui.h:30
+#: ../data/totem.ui.h:27
 msgid "Resize to double the original video size"
 msgstr "Ändra storlek till dubbla originalstorleken"
 
-#: ../data/totem.ui.h:31
+#: ../data/totem.ui.h:28
 msgid "_Aspect Ratio"
 msgstr "_Bildförhållande"
 
-#: ../data/totem.ui.h:32
+#: ../data/totem.ui.h:29
 msgid "Switch An_gles"
 msgstr "Växla vink_lar"
 
-#: ../data/totem.ui.h:33
+#: ../data/totem.ui.h:30
 msgid "Switch camera angles"
 msgstr "Växla kameravinklar"
 
-#: ../data/totem.ui.h:34
+#: ../data/totem.ui.h:31
 msgid "_Go"
 msgstr "_Gå"
 
-#: ../data/totem.ui.h:35
+#: ../data/totem.ui.h:32
 msgid "_DVD Menu"
 msgstr "_Dvd-meny"
 
-#: ../data/totem.ui.h:36
+#: ../data/totem.ui.h:33
 msgid "Go to the DVD menu"
 msgstr "Gå till dvd-menyn"
 
-#: ../data/totem.ui.h:37
+#: ../data/totem.ui.h:34
 msgid "_Title Menu"
 msgstr "_Titelmeny"
 
-#: ../data/totem.ui.h:38
+#: ../data/totem.ui.h:35
 msgid "Go to the title menu"
 msgstr "Gå till titelmenyn"
 
-#: ../data/totem.ui.h:39
+#: ../data/totem.ui.h:36
 msgid "A_udio Menu"
 msgstr "_Ljudmeny"
 
-#: ../data/totem.ui.h:40
+#: ../data/totem.ui.h:37
 msgid "Go to the audio menu"
 msgstr "Gå till ljudmenyn"
 
-#: ../data/totem.ui.h:41
+#: ../data/totem.ui.h:38
 msgid "_Angle Menu"
 msgstr "_Vinkelmeny"
 
-#: ../data/totem.ui.h:42
+#: ../data/totem.ui.h:39
 msgid "Go to the angle menu"
 msgstr "Gå till vinkelmenyn"
 
-#: ../data/totem.ui.h:43
+#: ../data/totem.ui.h:40
 msgid "_Chapter Menu"
 msgstr "_Kapitelmeny"
 
-#: ../data/totem.ui.h:44
+#: ../data/totem.ui.h:41
 msgid "Go to the chapter menu"
 msgstr "Gå till kapitelmenyn"
 
-#: ../data/totem.ui.h:45
+#: ../data/totem.ui.h:42
 msgid "_Next Chapter/Movie"
 msgstr "_Nästa kapitel/film"
 
-#: ../data/totem.ui.h:46
+#: ../data/totem.ui.h:43
 msgid "Next chapter or movie"
 msgstr "Nästa kapitel eller film"
 
-#: ../data/totem.ui.h:47
+#: ../data/totem.ui.h:44
 msgid "_Previous Chapter/Movie"
 msgstr "_Föregående kapitel/film"
 
-#: ../data/totem.ui.h:48
+#: ../data/totem.ui.h:45
 msgid "Previous chapter or movie"
 msgstr "Föregående kapitel eller film"
 
 # Eventuellt använda "Flerkanalsljud"
-#: ../data/totem.ui.h:49
+#: ../data/totem.ui.h:46
 msgid "_Sound"
 msgstr "_Ljud"
 
-#: ../data/totem.ui.h:50
+#: ../data/totem.ui.h:47
 msgid "Volume _Up"
 msgstr "Volym _upp"
 
-#: ../data/totem.ui.h:51
+#: ../data/totem.ui.h:48
 msgid "Increase volume"
 msgstr "Höj volym"
 
-#: ../data/totem.ui.h:52
+#: ../data/totem.ui.h:49
 msgid "Volume _Down"
 msgstr "Volym _ned"
 
-#: ../data/totem.ui.h:53
+#: ../data/totem.ui.h:50
 msgid "Decrease volume"
 msgstr "Sänk volym"
 
-#: ../data/totem.ui.h:54
+#: ../data/totem.ui.h:51
 msgid "_Help"
 msgstr "_Hjälp"
 
-#: ../data/totem.ui.h:55
+#: ../data/totem.ui.h:52
 msgid "_Contents"
 msgstr "_Innehåll"
 
-#: ../data/totem.ui.h:56
+#: ../data/totem.ui.h:53
 msgid "Help contents"
 msgstr "Hjälpinnehåll"
 
-#: ../data/totem.ui.h:57
+#: ../data/totem.ui.h:54
 msgid "_About"
 msgstr "_Om"
 
-#: ../data/totem.ui.h:58
+#: ../data/totem.ui.h:55
 msgid "About this application"
 msgstr "Om detta program"
 
-#: ../data/totem.ui.h:59
-msgid "_Repeat Mode"
-msgstr "_Upprepningsläge"
-
-#: ../data/totem.ui.h:60
-msgid "Set the repeat mode"
-msgstr "Ställ in upprepningsläget"
-
-#: ../data/totem.ui.h:61
-msgid "Shuff_le Mode"
-msgstr "Blandnings_läge"
-
-#: ../data/totem.ui.h:62
-msgid "Set the shuffle mode"
-msgstr "Ställ in blandningsläget"
-
-#: ../data/totem.ui.h:63
+#: ../data/totem.ui.h:56
 msgid "Show _Controls"
 msgstr "Visa _kontroller"
 
-#: ../data/totem.ui.h:64
+#: ../data/totem.ui.h:57
 msgid "Show controls"
 msgstr "Visa kontroller"
 
-#: ../data/totem.ui.h:65
+#: ../data/totem.ui.h:58
 msgid "S_idebar"
 msgstr "S_idopanel"
 
-#: ../data/totem.ui.h:66
+#: ../data/totem.ui.h:59
 msgid "Show or hide the sidebar"
 msgstr "Visa eller dölj sidopanelen"
 
-#: ../data/totem.ui.h:67
+#: ../data/totem.ui.h:60
 msgctxt "Aspect ratio"
 msgid "Auto"
 msgstr "Auto"
 
-#: ../data/totem.ui.h:68
+#: ../data/totem.ui.h:61
 msgid "Sets automatic aspect ratio"
 msgstr "Ställer in automatiskt bildförhållande"
 
-#: ../data/totem.ui.h:69
+#: ../data/totem.ui.h:62
 msgid "Square"
 msgstr "Kvadrat"
 
-#: ../data/totem.ui.h:70
-msgid "Sets square aspect ratio"
-msgstr "Ställer in kvadratiskt bildförhållande"
-
-#: ../data/totem.ui.h:71
-msgid "4:3 (TV)"
-msgstr "4:3 (TV)"
-
-#: ../data/totem.ui.h:72
-msgid "Sets 4:3 (TV) aspect ratio"
-msgstr "Ställer in bildförhållandet 4:3 (TV)"
-
-#: ../data/totem.ui.h:73
-msgid "16:9 (Widescreen)"
-msgstr "16:9 (bredbild)"
-
-#: ../data/totem.ui.h:74
-msgid "Sets 16:9 (widescreen) aspect ratio"
-msgstr "Ställer in bildförhållandet 16:9 (bredbild)"
-
-#: ../data/totem.ui.h:75
-msgid "2.11:1 (DVB)"
-msgstr "2,11:1 (Digital-tv)"
-
-#: ../data/totem.ui.h:76
-msgid "Sets 2.11:1 (DVB) aspect ratio"
-msgstr "Ställer in bildförhållandet 2,11:1 (DVB)"
-
-#: ../data/totem.ui.h:77
-msgid "S_ubtitles"
-msgstr "Underte_xter"
-
-#: ../data/totem.ui.h:80
-msgid "_Languages"
-msgstr "S_pråk"
-
-#: ../data/totem.ui.h:81
-msgid "Zoom In"
-msgstr "Zooma in"
-
-#: ../data/totem.ui.h:82
-msgid "Zoom in"
-msgstr "Zooma in"
-
-#: ../data/totem.ui.h:83
-msgid "Skip _Forward"
-msgstr "Hoppa fra_måt"
-
-#: ../data/totem.ui.h:84
-msgid "Skip forward"
-msgstr "Hoppa framåt"
-
-#: ../data/totem.ui.h:85
-msgid "Skip _Backwards"
-msgstr "Hoppa _bakåt"
-
-#: ../data/totem.ui.h:86
-msgid "Skip backwards"
-msgstr "Hoppa bakåt"
-
-#: ../data/totem.ui.h:87
-msgid "14.4 Kbps Modem"
-msgstr "14.4 Kbps Modem"
-
-#: ../data/totem.ui.h:88
-msgid "19.2 Kbps Modem"
-msgstr "19.2 Kbps Modem"
-
-#: ../data/totem.ui.h:89
-msgid "28.8 Kbps Modem"
-msgstr "28.8 Kbps Modem"
-
-#: ../data/totem.ui.h:90
-msgid "33.6 Kbps Modem"
-msgstr "33.6 Kbps Modem"
-
-#: ../data/totem.ui.h:91
-msgid "34.4 Kbps Modem"
-msgstr "34.4 Kbps Modem"
-
-#: ../data/totem.ui.h:92
-msgid "56 Kbps Modem/ISDN"
-msgstr "56 Kbps Modem/ISDN"
-
-#: ../data/totem.ui.h:93
-msgid "112 Kbps Dual ISDN/DSL"
-msgstr "112 Kbps Dubbelkanalig ISDN/DSL"
-
-#: ../data/totem.ui.h:94
-msgid "256 Kbps DSL/Cable"
-msgstr "256 Kbps DSL/Kabel"
-
-#: ../data/totem.ui.h:95
-msgid "384 Kbps DSL/Cable"
-msgstr "384 Kbps DSL/Kabel"
-
-#: ../data/totem.ui.h:96
-msgid "512 Kbps DSL/Cable"
-msgstr "512 Kbps DSL/Kabel"
-
-#: ../data/totem.ui.h:97
-msgid "1.5 Mbps T1/Intranet/LAN"
-msgstr "1.5 Mbps T1/Intranet/LAN"
-
-#: ../data/totem.ui.h:98
-msgid "Intranet/LAN"
-msgstr "Intranet/LAN"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:100
-msgid "Normal"
-msgstr "Normal"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:102
-msgid "Large"
-msgstr "Stor"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:104
-msgid "Extra Large"
-msgstr "Extra stor"
-
-#: ../data/totem.ui.h:105
-#: ../src/totem-properties-view.c:228
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5593
-msgid "Stereo"
-msgstr "Stereo"
-
-#: ../data/totem.ui.h:106
-msgid "4-channel"
-msgstr "4-kanalig"
-
-#: ../data/totem.ui.h:107
-msgid "4.1-channel"
-msgstr "4.1-kanalig"
-
-#: ../data/totem.ui.h:108
-msgid "5.0-channel"
-msgstr "5.0-kanalig"
-
-#: ../data/totem.ui.h:109
-msgid "5.1-channel"
-msgstr "5.1-kanalig"
-
-#: ../data/totem.ui.h:110
-msgid "AC3 Passthrough"
-msgstr "AC3-genomströmning"
-
-#: ../data/totem.ui.h:111
-msgid "Totem Preferences"
-msgstr "Inställningar för Totem"
-
-#: ../data/totem.ui.h:112
-msgid "Playback"
-msgstr "Uppspelning"
-
-#: ../data/totem.ui.h:113
-msgid "Start playing files from last position"
-msgstr "Starta uppspelning av filer från senaste position"
-
-#: ../data/totem.ui.h:114
-msgid "Networking"
-msgstr "Nätverk"
-
-#: ../data/totem.ui.h:115
-msgid "Connection _speed:"
-msgstr "Anslutnings_hastighet:"
-
-#: ../data/totem.ui.h:116
-msgid "Text Subtitles"
-msgstr "Undertexter"
-
-#: ../data/totem.ui.h:117
-msgid "_Load subtitle files when movie is loaded"
-msgstr "_Läs in undertextfiler när filmen läses in"
-
-#: ../data/totem.ui.h:118
-msgid "_Font:"
-msgstr "_Typsnitt:"
-
-#: ../data/totem.ui.h:119
-msgid "_Encoding:"
-msgstr "T_eckenkodning:"
-
-#: ../data/totem.ui.h:120
-msgid "External Chapters"
-msgstr "Externa kapitel"
-
-#: ../data/totem.ui.h:121
-msgid "Load _chapter files when movie is loaded"
-msgstr "Läs in _kapitelfiler när filmen läses in"
-
-#. Tab label in the Preferences dialogue
-#: ../data/totem.ui.h:124
-msgid "Display"
-msgstr "Bild"
-
-#: ../data/totem.ui.h:125
-msgid "_Resize the window when a new video is loaded"
-msgstr "Än_dra automatiskt storlek på fönstret när en ny video läses in"
-
-#: ../data/totem.ui.h:126
-msgid "Disable _deinterlacing of interlaced videos"
-msgstr "Inaktivera a_vflätning av filmer med \"interlace\""
-
-#: ../data/totem.ui.h:127
-msgid "Disable screensaver when playing "
-msgstr "Inaktivera skärmsläckaren vid uppspelning"
-
-#: ../data/totem.ui.h:129
-msgid "Video or Audio"
-msgstr "Video eller ljud"
-
-#: ../data/totem.ui.h:130
-msgid "Visual Effects"
-msgstr "Visuella effekter"
-
-#: ../data/totem.ui.h:131
-msgid "Show _visual effects when an audio file is played"
-msgstr "Visa _visuella effekter då en ljudfil spelas upp"
-
-#: ../data/totem.ui.h:132
-msgid "_Type of visualization:"
-msgstr "_Typ av visualisering:"
-
-#: ../data/totem.ui.h:133
-msgid "Visualization _size:"
-msgstr "Visualiserings_storlek:"
-
-#: ../data/totem.ui.h:134
-msgid "Color Balance"
-msgstr "Färgbalans"
-
-#: ../data/totem.ui.h:135
-msgid "_Brightness:"
-msgstr "_Ljusstyrka:"
-
-#: ../data/totem.ui.h:136
-msgid "Co_ntrast:"
-msgstr "Ko_ntrast:"
-
-#: ../data/totem.ui.h:137
-msgid "Sat_uration:"
-msgstr "M_ättnad:"
-
-#: ../data/totem.ui.h:138
-msgid "_Hue:"
-msgstr "_Nyans:"
-
-#: ../data/totem.ui.h:139
-msgid "Reset to _Defaults"
-msgstr "Å_terställ till standard"
-
-#: ../data/totem.ui.h:140
-msgid "Audio Output"
-msgstr "Ljudutmatning"
-
-#: ../data/totem.ui.h:141
-msgid "_Audio output type:"
-msgstr "Typ av _ljudutmatning:"
-
-#: ../data/totem.ui.h:145
-msgid "Time seek bar"
-msgstr "Tidsspolningsrad"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
-msgid "Allow the screensaver to activate when playing audio"
-msgstr "Tillåt skärmsläckaren att aktiveras vid uppspelning av ljud"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
-msgid "Allow the screensaver to activate when playing audio. Disable if you have monitor-powered speakers."
-msgstr "Tillåt skärmsläckaren att aktiveras vid uppspelning av ljud. Inaktivera detta om du har högtalare som drivs av skärmen."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
-msgid "Show visual effects when no video is displayed"
-msgstr "Visa visuella effekter då ingen video visas"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
-msgid "Show visual effects when playing an audio only file."
-msgstr "Visa visuella effekter då en fil med endast ljud spelas upp."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
-msgid "Name of the visual effects plugin"
-msgstr "Namn på insticksmodulen för visuella effekter"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
-msgid "The brightness of the video"
-msgstr "Ljusstyrkan för videon"
+#: ../data/totem.ui.h:63
+msgid "Sets square aspect ratio"
+msgstr "Ställer in kvadratiskt bildförhållande"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
-msgid "The contrast of the video"
-msgstr "Kontrasten för videon"
+#: ../data/totem.ui.h:64
+msgid "4:3 (TV)"
+msgstr "4:3 (TV)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
-msgid "The hue of the video"
-msgstr "Nyansen för videon"
+#: ../data/totem.ui.h:65
+msgid "Sets 4:3 (TV) aspect ratio"
+msgstr "Ställer in bildförhållandet 4:3 (TV)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
-msgid "The saturation of the video"
-msgstr "Mättnaden för videon"
+#: ../data/totem.ui.h:66
+msgid "16:9 (Widescreen)"
+msgstr "16:9 (bredbild)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
-msgid "Resize the canvas automatically on file load"
-msgstr "Ändra storleken automatiskt vid filinläsning"
+#: ../data/totem.ui.h:67
+msgid "Sets 16:9 (widescreen) aspect ratio"
+msgstr "Ställer in bildförhållandet 16:9 (bredbild)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
-msgid "Network connection speed"
-msgstr "Anslutningshastighet"
+#: ../data/totem.ui.h:68
+msgid "2.11:1 (DVB)"
+msgstr "2,11:1 (Digital-tv)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
-msgid "Approximate network connection speed, used to select quality on media over the network."
-msgstr "Ungefärlig hastighet för nätverksanslutningen. Används för att välja kvalitet på media över nätverket."
+#: ../data/totem.ui.h:69
+msgid "Sets 2.11:1 (DVB) aspect ratio"
+msgstr "Ställer in bildförhållandet 2,11:1 (DVB)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
-msgid "Repeat mode"
-msgstr "Upprepningsläge"
+#: ../data/totem.ui.h:70
+msgid "S_ubtitles"
+msgstr "Underte_xter"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
-msgid "Shuffle mode"
-msgstr "Blandningsläge"
+#: ../data/totem.ui.h:73
+msgid "_Languages"
+msgstr "S_pråk"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
-msgid "Whether to disable deinterlacing for interlaced movies"
-msgstr "Huruvida avflätning ska inaktiveras för filmer med \"interlace\""
+#: ../data/totem.ui.h:74
+msgid "Zoom In"
+msgstr "Zooma in"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
-msgid "Whether to enable debug for the playback engine"
-msgstr "Huruvida felsökning för uppspelningsmotorn ska aktiveras"
+#: ../data/totem.ui.h:75
+msgid "Zoom in"
+msgstr "Zooma in"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
-msgid "Type of audio output to use"
-msgstr "Typ av ljudutmatning som ska användas"
+#: ../data/totem.ui.h:76
+msgid "Skip _Forward"
+msgstr "Hoppa fra_måt"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
-msgid "Visualization quality setting"
-msgstr "Kvalitetsinställning för visualisering"
+#: ../data/totem.ui.h:77
+msgid "Skip forward"
+msgstr "Hoppa framåt"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
-msgid "Quality setting for the audio visualization."
-msgstr "Kvalitetsinställning för ljudvisualisering."
+#: ../data/totem.ui.h:78
+msgid "Skip _Backwards"
+msgstr "Hoppa _bakåt"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
-msgid "Network buffering threshold"
-msgstr "Tröskel för nätverksbuffring"
+#: ../data/totem.ui.h:79
+msgid "Skip backwards"
+msgstr "Hoppa bakåt"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
-msgid "Amount of data to buffer for network streams before starting to display the stream (in seconds)."
-msgstr "Mängd data som ska buffras i nätverksströmmar innan strömmen börjar visas (i sekunder)."
+#: ../data/totem.ui.h:82
+msgid "Time seek bar"
+msgstr "Tidsspolningsrad"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
-msgid "Subtitle font"
-msgstr "Typsnitt för undertext"
+#: ../data/uri.ui.h:1
+msgid "Enter the _address of the file you would like to open:"
+msgstr "Ange _platsen för filen som du vill öppna:"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
-msgid "Pango font description for subtitle rendering."
-msgstr "Pango-typsnittsbeskrivning för rendering av undertext."
+#: ../data/video-list.ui.h:1
+#: ../src/totem-dnd-menu.c:97
+msgid "_Add to Playlist"
+msgstr "_Lägg till i spellista"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
-msgid "Subtitle encoding"
-msgstr "Kodning för undertext"
+#: ../data/video-list.ui.h:2
+msgid "Add the video to the playlist"
+msgstr "Lägg till video i spellistan"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
-msgid "Encoding character set for subtitle."
-msgstr "Teckenkodning för undertexter."
+#: ../src/backend/bacon-video-widget-gst-0.10.c:1579
+msgid "Password requested for RTSP server"
+msgstr "Lösenord begärdes för RTSP-server"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
-msgid "Default location for the \"Open...\" dialogs"
-msgstr "Standardplats för \"Öppna...\"-dialogerna"
+#: ../src/backend/bacon-video-widget-gst-0.10.c:2914
+#, c-format
+msgid "Audio Track #%d"
+msgstr "Ljudspår nr. %d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
-msgid "Default location for the \"Open...\" dialogs. Default is the current directory."
-msgstr "Standardplats för \"Öppna...\"-dialogerna. Standard är aktuell katalog."
+#: ../src/backend/bacon-video-widget-gst-0.10.c:2918
+#, c-format
+msgid "Subtitle #%d"
+msgstr "Undertext nr. %d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
-msgid "Default location for the \"Take Screenshot\" dialogs"
-msgstr "Standardplats för \"Ta skärmbild\"-dialogerna"
+#: ../src/backend/bacon-video-widget-gst-0.10.c:3292
+msgid "Location not found."
+msgstr "Platsen hittades inte."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
-msgid "Default location for the \"Take Screenshot\" dialogs. Default is the Pictures directory."
-msgstr "Standardplats för \"Ta skärmbild\"-dialogerna. Standard är katalogen Bilder."
+#: ../src/backend/bacon-video-widget-gst-0.10.c:3295
+msgid "Could not open location; you might not have permission to open the file."
+msgstr "Kunde inte öppna platsen; du kanske inte har rättighet att öppna filen."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
-msgid "Whether to disable the plugins in the user's home directory"
-msgstr "Huruvida insticksmodulerna i användarens hemkatalog ska inaktiveras"
+#. should be exactly one missing thing (source or converter)
+#: ../src/backend/bacon-video-widget-gst-0.10.c:3315
+#: ../src/backend/bacon-video-widget-gst-0.10.c:3321
+#, c-format
+msgid "The playback of this movie requires a %s plugin which is not installed."
+msgid_plural ""
+"The playback of this movie requires the following decoders which are not installed:\n"
+"\n"
+"%s"
+msgstr[0] "Uppspelningen av denna film kräver en %s-insticksmodul som inte är installerad."
+msgstr[1] ""
+"Uppspelningen av denna film kräver följande avkodare som inte är installerade:\n"
+"\n"
+"%s"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
-msgid "Whether to disable the keyboard shortcuts"
-msgstr "Huruvida tangentbordsgenvägarna ska inaktiveras"
+#: ../src/backend/bacon-video-widget-gst-0.10.c:3347
+msgid "Cannot play this file over the network. Try downloading it to disk first."
+msgstr "Kan inte spela upp den här filen över nätverket. Försök hämta ner den till disk först."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
-msgid "Whether to autoload text subtitle files when a movie is loaded"
-msgstr "Huruvida undertextfiler automatiskt ska läsas in när en film läses in"
+# Eventuellt använda "Flerkanalsljud"
+#: ../src/backend/bacon-video-widget-gst-0.10.c:5399
+#: ../src/totem-properties-view.c:224
+msgid "Surround"
+msgstr "Surround"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
-msgid "Whether to autoload external chapter files when a movie is loaded"
-msgstr "Huruvida kapitelfiler automatiskt ska läsas in när en film läses in"
+#: ../src/backend/bacon-video-widget-gst-0.10.c:5401
+#: ../src/totem-properties-view.c:226
+msgid "Mono"
+msgstr "Mono"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
-msgid "Whether to remember the position of played audio/video files when pausing or closing them"
-msgstr "Huruvida positionen för uppspelade ljud-/videofiler ska kommas ihåg vid paus eller när de stängs"
+#: ../src/backend/bacon-video-widget-gst-0.10.c:5686
+msgid "Media contains no supported video streams."
+msgstr "Mediet innehåller inga videoströmmar som stöds."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:35
-msgid "Active plugins list"
-msgstr "Lista över aktiva insticksmoduler"
+#: ../src/backend/bacon-video-widget-gst-0.10.c:5849
+#: ../src/backend/bacon-video-widget-gst-0.10.c:5893
+msgid "Failed to create a GStreamer play object. Please check your GStreamer installation."
+msgstr "Misslyckades med att skapa ett GStreamer-spelobjekt. Kontrollera din installation av GStreamer."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:36
-msgid "A list of the names of the plugins which are currently active (loaded and running)."
-msgstr "En lista över namn på insticksmoduler som för närvarande är aktiva (inlästa och kör)."
+#. hour:minutes:seconds
+#. Translators: This is a time format, like "9:05:02" for 9
+#. * hours, 5 minutes, and 2 seconds. You may change ":" to
+#. * the separator that your locale uses or use "%Id" instead
+#. * of "%d" if your locale uses localized digits.
+#.
+#: ../src/backend/video-utils.c:83
+#: ../src/plugins/skipto/totem-time-entry.c:57
+#, c-format
+msgctxt "long time format"
+msgid "%d:%02d:%02d"
+msgstr "%d:%02d:%02d"
 
-#: ../data/uri.ui.h:1
-msgid "Enter the _address of the file you would like to open:"
-msgstr "Ange _platsen för filen som du vill öppna:"
+#. minutes:seconds
+#. Translators: This is a time format, like "5:02" for 5
+#. * minutes and 2 seconds. You may change ":" to the
+#. * separator that your locale uses or use "%Id" instead of
+#. * "%d" if your locale uses localized digits.
+#.
+#: ../src/backend/video-utils.c:92
+#, c-format
+msgctxt "short time format"
+msgid "%d:%02d"
+msgstr "%d:%02d"
 
 #: ../src/eggdesktopfile.c:165
 #, c-format
@@ -1057,10 +1120,14 @@
 msgstr[0] "%d bildruta per sekund"
 msgstr[1] "%d bildrutor per sekund"
 
-#: ../src/totem-audio-preview.c:168
+#: ../src/totem-audio-preview.c:164
 msgid "Audio Preview"
 msgstr "Ljudförhandsvisning"
 
+#: ../src/totem.c:238
+msgid "Verify your system installation. Totem will now exit."
+msgstr "Kontrollera din systeminstallation. Totem kommer nu att avslutas."
+
 #: ../src/totem-cell-renderer-video.c:126
 msgid "Unknown video"
 msgstr "Okänd video"
@@ -1073,7 +1140,7 @@
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../src/totem-fullscreen.c:616
+#: ../src/totem-fullscreen.c:573
 msgid "No File"
 msgstr "Ingen fil"
 
@@ -1094,64 +1161,38 @@
 msgid "Make sure that Totem is properly installed."
 msgstr "Försäkra dig om att Totem är korrekt installerat."
 
-#: ../src/totem-interface.c:347
+#: ../src/totem-interface.c:357
 msgid "Totem 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."
 msgstr "Totem är fri programvara. Du kan distribuera det och/eller modifiera det under villkoren i GNU General Public License, publicerad av Free Software Foundation, antingen version 2 eller (om du så vill) någon senare version."
 
-#: ../src/totem-interface.c:351
+#: ../src/totem-interface.c:361
 msgid "Totem 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 General Public License for more details."
 msgstr "Totem distribueras i hopp om att det ska vara användbart, men UTAN NÅGON SOM HELST GARANTI, även utan underförstådd garanti om SÄLJBARHET eller LÄMPLIGHET FÖR NÅGOT SPECIELLT ÄNDAMÅL. Se GNU General Public License för ytterligare information."
 
-#: ../src/totem-interface.c:355
+#: ../src/totem-interface.c:365
 msgid "You should have received a copy of the GNU General Public License along with Totem; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA"
 msgstr "Du bör ha fått en kopia av GNU General Public License tillsammans med detta program. Om inte, skriv till Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA"
 
-#: ../src/totem-interface.c:358
+#: ../src/totem-interface.c:368
 msgid "Totem contains an exception to allow the use of proprietary GStreamer plugins."
 msgstr "Totem innehåller ett undantag för att tillåta användningen av proprietära GStreamer-insticksmoduler."
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:190
+#: ../src/totem-menu.c:290
 msgid "None"
 msgstr "Ingen"
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:195
+#: ../src/totem-menu.c:295
 msgctxt "Language"
 msgid "Auto"
 msgstr "Auto"
 
-#. Translators:
-#. * This is not a JPEG image, but a disc image, for example,
-#. * an ISO file
-#: ../src/totem-menu.c:765
-#, c-format
-msgid "Play Image '%s'"
-msgstr "Spela upp avbildningen \"%s\""
-
-#: ../src/totem-menu.c:768
-#: ../src/totem-menu.c:851
-#, c-format
-msgid "device%d"
-msgstr "enhet%d"
-
-#: ../src/totem-menu.c:848
-#, c-format
-msgid "Play Disc '%s'"
-msgstr "Spela upp skivan \"%s\""
-
-#. This lists the back-end type and version, such as
-#. * Movie Player using GStreamer 0.10.1
-#: ../src/totem-menu.c:1189
-#, c-format
-msgid "Movie Player using %s"
-msgstr "Filmuppspelare som använder %s"
-
-#: ../src/totem-menu.c:1193
+#: ../src/totem-menu.c:876
 msgid "Copyright © 2002-2009 Bastien Nocera"
 msgstr "Copyright © 2002-2009 Bastien Nocera"
 
-#: ../src/totem-menu.c:1198
+#: ../src/totem-menu.c:881
 msgid "translator-credits"
 msgstr ""
 "Daniel Nylander \n"
@@ -1160,149 +1201,85 @@
 "Skicka synpunkter på översättningen till\n"
 "."
 
-#: ../src/totem-menu.c:1202
+#: ../src/totem-menu.c:885
 msgid "Totem Website"
 msgstr "Webbplats för Totem"
 
-#: ../src/totem-menu.c:1236
+#: ../src/totem-menu.c:916
 msgid "Configure Plugins"
 msgstr "Konfigurera insticksmoduler"
 
+#: ../src/totem-object.c:159
+#, c-format
+msgid ""
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"%s\n"
+"Kör \"%s --help\" för en komplett lista över tillgängliga kommandoradsflaggor.\n"
+
 #. Translators: %s is the totem version number
-#: ../src/totem-object.c:471
+#: ../src/totem-object.c:547
 #, c-format
 msgid "Totem %s"
 msgstr "Totem %s"
 
-#: ../src/totem-object.c:1047
-#: ../browser-plugin/totem-plugin-viewer.c:367
-msgid "Playing"
-msgstr "Spelar upp"
-
-#: ../src/totem-object.c:1049
+#: ../src/totem-object.c:1118
 #: ../src/totem-options.c:52
 msgid "Pause"
 msgstr "Gör paus"
 
-#: ../src/totem-object.c:1054
-#: ../browser-plugin/totem-plugin-viewer.c:363
-msgid "Paused"
-msgstr "Gör paus"
-
-#: ../src/totem-object.c:1056
-#: ../src/totem-object.c:1066
-#: ../src/totem-options.c:51
-msgid "Play"
-msgstr "Spela upp"
-
-#: ../src/totem-object.c:1061
-#: ../src/totem-object.c:1659
-#: ../src/totem-statusbar.c:115
-#: ../browser-plugin/totem-plugin-viewer.c:351
-msgid "Stopped"
-msgstr "Stoppad"
-
-#: ../src/totem-object.c:1142
-#: ../src/totem-object.c:1169
-#: ../src/totem-object.c:1799
-#: ../src/totem-object.c:1963
-#, c-format
-msgid "Totem could not play '%s'."
-msgstr "Totem kunde inte spela upp \"%s\"."
-
-#: ../src/totem-object.c:1246
-#, c-format
-msgid "Totem could not play this media (%s) although a plugin is present to handle it."
-msgstr "Totem kunde inte spela upp detta media (%s) trots att en insticksmodul som hanterar den är installerad."
-
-#: ../src/totem-object.c:1247
-msgid "You might want to check that a disc is present in the drive and that it is correctly configured."
-msgstr "Du bör kontrollera om det finns en skiva i enheten och att den är korrekt konfigurerad."
-
-#: ../src/totem-object.c:1255
-msgid "More information about media plugins"
-msgstr "Mer information om mediainsticksmoduler"
-
-#: ../src/totem-object.c:1256
-msgid "Please install the necessary plugins and restart Totem to be able to play this media."
-msgstr "Installera de insticksmoduler som krävs och starta om Totem för att kunna spela upp denna typ av media."
-
-#: ../src/totem-object.c:1258
-#, c-format
-msgid "Totem cannot play this type of media (%s) because it does not have the appropriate plugins to be able to read from the disc."
-msgstr "Totem kan inte spela upp denna typ av media (%s) därför att lämpliga insticksmoduler saknas för att kunna läsa från skivan."
-
-#: ../src/totem-object.c:1260
-#, c-format
-msgid "Totem cannot play this type of media (%s) because you do not have the appropriate plugins to handle it."
-msgstr "Totem kan inte spela upp denna typ av media (%s) eftersom du saknar lämpliga insticksmoduler för att hantera den."
-
-#: ../src/totem-object.c:1263
-#, c-format
-msgid "Totem cannot play this type of media (%s) because it is not supported."
-msgstr "Totem kan inte spela upp denna typ av media (%s) eftersom den inte stöds."
-
-#: ../src/totem-object.c:1264
-msgid "Please insert another disc to play back."
-msgstr "Mata in en annan skiva att spela upp."
-
-#: ../src/totem-object.c:1300
-msgid "Totem was not able to play this disc."
-msgstr "Totem kunde inte spela upp den här skivan."
-
-#: ../src/totem-object.c:1301
-#: ../src/totem-object.c:4229
-msgid "No reason."
-msgstr "Ingen orsak."
+#: ../src/totem-object.c:1125
+#: ../src/totem-object.c:1135
+#: ../src/totem-options.c:51
+msgid "Play"
+msgstr "Spela upp"
 
-#: ../src/totem-object.c:1315
-msgid "Totem does not support playback of Audio CDs"
-msgstr "Totem saknar stöd för uppspelning av ljud-cd-skivor"
-
-#: ../src/totem-object.c:1316
-msgid "Please consider using a music player or a CD extractor to play this CD"
-msgstr "Överväg att använda en musikspelare eller en cd-extraherare för att spela upp denna skiva"
+#: ../src/totem-object.c:1211
+#: ../src/totem-object.c:1238
+#: ../src/totem-object.c:1723
+#: ../src/totem-object.c:1887
+#, c-format
+msgid "Totem could not play '%s'."
+msgstr "Totem kunde inte spela upp \"%s\"."
 
-#: ../src/totem-object.c:1805
+#: ../src/totem-object.c:1729
 msgid "No error message"
 msgstr "Inget felmeddelande"
 
-#: ../src/totem-object.c:2154
+#: ../src/totem-object.c:2078
 msgid "Totem could not display the help contents."
 msgstr "Totem kunde inte visa hjälpinnehållet."
 
-#: ../src/totem-object.c:2493
-#: ../src/totem-object.c:2495
-#: ../browser-plugin/totem-plugin-viewer.c:1417
-msgid "An error occurred"
-msgstr "Ett fel inträffade"
-
-#: ../src/totem-object.c:4064
-#: ../src/totem-object.c:4066
+#: ../src/totem-object.c:3959
+#: ../src/totem-object.c:3961
 msgid "Previous Chapter/Movie"
 msgstr "Föregående kapitel/film"
 
-#: ../src/totem-object.c:4073
-#: ../src/totem-object.c:4075
+#: ../src/totem-object.c:3968
+#: ../src/totem-object.c:3970
 msgid "Play / Pause"
 msgstr "Spela upp / Gör paus"
 
-#: ../src/totem-object.c:4083
-#: ../src/totem-object.c:4085
+#: ../src/totem-object.c:3978
+#: ../src/totem-object.c:3980
 msgid "Next Chapter/Movie"
 msgstr "Nästa kapitel/film"
 
-#. Translators: this is the tooltip text for the fullscreen button in the controls box in Totem's main window.
 #. Translators: this is the accessibility text for the fullscreen button in the controls box in Totem's main window.
-#: ../src/totem-object.c:4097
-#: ../src/totem-object.c:4099
+#: ../src/totem-object.c:3991
+#: ../src/totem-object.c:3993
 msgid "Fullscreen"
 msgstr "Helskärm"
 
-#: ../src/totem-object.c:4229
+#: ../src/totem-object.c:4124
 msgid "Totem could not startup."
 msgstr "Totem kunde inte starta."
 
+#: ../src/totem-object.c:4124
+msgid "No reason."
+msgstr "Ingen orsak."
+
 #: ../src/totem-open-location.c:182
 msgid "Open Location..."
 msgstr "Öppna plats..."
@@ -1376,7 +1353,11 @@
 msgid "Movies to play"
 msgstr "Filmer att spela upp"
 
-#: ../src/totem-options.c:117
+#: ../src/totem-options.c:79
+msgid "- Play movies and songs"
+msgstr "- Spela upp filmer och låtar"
+
+#: ../src/totem-options.c:142
 msgid "Can't enqueue and replace at the same time"
 msgstr "Kan inte kölägga och ersätta samtidigt"
 
@@ -1415,25 +1396,25 @@
 #. translators: Playlist is the default saved playlist filename,
 #. * without the suffix
 #: ../src/totem-playlist.c:1033
-#: ../src/totem-playlist.c:1264
-#: ../src/totem-sidebar.c:142
+#: ../src/totem-playlist.c:1262
+#: ../src/totem-sidebar.c:145
 msgid "Playlist"
 msgstr "Spellista"
 
-#: ../src/totem-playlist.c:1857
+#: ../src/totem-playlist.c:1855
 #, c-format
 msgid "The playlist '%s' could not be parsed. It might be damaged."
 msgstr "Spellistan \"%s\" kunde inte tolkas. Den kan vara skadad."
 
-#: ../src/totem-playlist.c:1858
+#: ../src/totem-playlist.c:1856
 msgid "Playlist error"
 msgstr "Fel i spellista"
 
-#: ../src/totem-preferences.c:295
+#: ../src/totem-preferences.c:297
 msgid "Preferences"
 msgstr "Inställningar"
 
-#: ../src/totem-preferences.c:451
+#: ../src/totem-preferences.c:445
 msgid "Select Subtitle Font"
 msgstr "Välj typsnitt för undertext"
 
@@ -1478,17 +1459,6 @@
 msgid "N/A"
 msgstr "-"
 
-# Eventuellt använda "Flerkanalsljud"
-#: ../src/totem-properties-view.c:224
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5589
-msgid "Surround"
-msgstr "Surround"
-
-#: ../src/totem-properties-view.c:226
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5591
-msgid "Mono"
-msgstr "Mono"
-
 #: ../src/totem-properties-view.c:236
 msgctxt "Number of audio channels"
 msgid "N/A"
@@ -1706,197 +1676,93 @@
 msgid "Vietnamese"
 msgstr "Vietnamesisk"
 
-#: ../src/totem-video-list.c:330
-msgid "No video URI"
-msgstr "Ingen video-URI"
-
-#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
-#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
-#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
-#: ../src/totem-video-thumbnailer.c:872
-#, c-format
-msgid ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-msgstr ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-
-#: ../src/totem-video-thumbnailer.c:873
-msgid "Filename"
-msgstr "Filnamn"
-
-#: ../src/totem-video-thumbnailer.c:875
-msgid "Resolution"
-msgstr "Upplösning"
-
-#: ../src/totem-video-thumbnailer.c:878
-msgid "Duration"
-msgstr "Speltid"
-
-#: ../src/totem-uri.c:506
+#: ../src/totem-uri.c:339
 #: ../src/plugins/chapters/totem-chapters.c:998
 msgid "All files"
 msgstr "Alla filer"
 
-#: ../src/totem-uri.c:511
+#: ../src/totem-uri.c:344
 #: ../src/plugins/chapters/totem-chapters.c:995
 msgid "Supported files"
 msgstr "Filer som stöds"
 
-#: ../src/totem-uri.c:523
+#: ../src/totem-uri.c:356
 msgid "Audio files"
 msgstr "Ljudfiler"
 
-#: ../src/totem-uri.c:531
+#: ../src/totem-uri.c:364
 msgid "Video files"
 msgstr "Videofiler"
 
-#: ../src/totem-uri.c:541
+#: ../src/totem-uri.c:374
 msgid "Subtitle files"
 msgstr "Undertextfiler"
 
-#: ../src/totem-uri.c:593
+#: ../src/totem-uri.c:426
 msgid "Select Text Subtitles"
 msgstr "Välj undertexter"
 
-#: ../src/totem-uri.c:656
+#: ../src/totem-uri.c:491
 msgid "Select Movies or Playlists"
 msgstr "Välj filmer eller spellistor"
 
-#. Options parsing
-#: ../src/totem.c:201
-msgid "- Play movies and songs"
-msgstr "- Spela upp filmer och låtar"
+#: ../src/totem-uri.c:495
+msgid "Add Directory"
+msgstr "Lägg till katalog"
+
+#: ../src/totem-video-list.c:330
+msgid "No video URI"
+msgstr "Ingen video-URI"
 
-#: ../src/totem.c:212
+#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
+#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
+#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
+#: ../src/totem-video-thumbnailer.c:873
 #, c-format
 msgid ""
-"%s\n"
-"Run '%s --help' to see a full list of available command line options.\n"
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 msgstr ""
-"%s\n"
-"Kör \"%s --help\" för en komplett lista över tillgängliga kommandoradsflaggor.\n"
-
-#: ../src/totem.c:254
-#: ../src/totem.c:265
-#: ../browser-plugin/totem-plugin-viewer.c:663
-#: ../browser-plugin/totem-plugin-viewer.c:1793
-msgid "Totem Movie Player"
-msgstr "Filmuppspelaren Totem"
-
-#: ../src/totem.c:255
-#: ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Could not initialize the thread-safe libraries."
-msgstr "Kunde inte initiera de trådsäkra biblioteken."
-
-#: ../src/totem.c:255
-msgid "Verify your system installation. Totem will now exit."
-msgstr "Kontrollera din systeminstallation. Totem kommer nu att avslutas."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:1589
-msgid "Password requested for RTSP server"
-msgstr "Lösenord begärdes för RTSP-server"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2858
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2862
-#, c-format
-msgid "Audio Track #%d"
-msgstr "Ljudspår nr. %d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2890
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2894
-#, c-format
-msgid "Subtitle #%d"
-msgstr "Undertext nr. %d"
-
-# FIXME: Bör ha punkt på slutet.
-# http://bugzilla.gnome.org/show_bug.cgi?id=318817
-#
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3298
-msgid "The requested audio output was not found. Please select another audio output in the Multimedia Systems Selector."
-msgstr "Den begärda ljudutgången hittades inte. Välj en annan ljudutgång i väljaren för multimediasystem."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3303
-msgid "Location not found."
-msgstr "Platsen hittades inte."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3307
-msgid "Could not open location; you might not have permission to open the file."
-msgstr "Kunde inte öppna platsen; du kanske inte har rättighet att öppna filen."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3318
-msgid "The video output is in use by another application. Please close other video applications, or select another video output in the Multimedia Systems Selector."
-msgstr "Videoutgången används av ett annat program. Stäng andra videoprogram eller välj en annan videoutgång i väljaren för multimediasystem."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3324
-msgid "The audio output is in use by another application. Please select another audio output in the Multimedia Systems Selector. You may want to consider using a sound server."
-msgstr "Ljudutgången används av ett annat program. Välj en annan ljudutgång i väljaren för multimediasystem. Du kanske bör överväga att använda en ljudserver."
-
-#. should be exactly one missing thing (source or converter)
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3342
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3348
-#, c-format
-msgid "The playback of this movie requires a %s plugin which is not installed."
-msgid_plural ""
-"The playback of this movie requires the following decoders which are not installed:\n"
-"\n"
-"%s"
-msgstr[0] "Uppspelningen av denna film kräver en %s-insticksmodul som inte är installerad."
-msgstr[1] ""
-"Uppspelningen av denna film kräver följande avkodare som inte är installerade:\n"
-"\n"
-"%s"
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3374
-msgid "Cannot play this file over the network. Try downloading it to disk first."
-msgstr "Kan inte spela upp den här filen över nätverket. Försök hämta ner den till disk först."
+#: ../src/totem-video-thumbnailer.c:874
+msgid "Filename"
+msgstr "Filnamn"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5878
-msgid "Media contains no supported video streams."
-msgstr "Mediet innehåller inga videoströmmar som stöds."
+#: ../src/totem-video-thumbnailer.c:876
+msgid "Resolution"
+msgstr "Upplösning"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6052
-msgid "Failed to create a GStreamer play object. Please check your GStreamer installation."
-msgstr "Misslyckades med att skapa ett GStreamer-spelobjekt. Kontrollera din installation av GStreamer."
+#: ../src/totem-video-thumbnailer.c:879
+msgid "Duration"
+msgstr "Speltid"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6172
-msgid "Failed to open audio output. You may not have permission to open the sound device, or the sound server may not be running. Please select another audio output in the Multimedia Systems Selector."
-msgstr "Misslyckades med att öppna ljudutgången. Du kanske inte har rättigheter att öppna ljudutgången, eller så kanske inte ljudservern körs. Välj en annan ljudutgång i väljaren för multimediasystem."
-
-# FIXME: Bör ha punkt på slutet.
-# http://bugzilla.gnome.org/show_bug.cgi?id=318817
-#
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6192
-msgid "Could not find the audio output. You may need to install additional GStreamer plugins, or select another audio output in the Multimedia Systems Selector."
-msgstr "Kunde inte hitta ljudutgången. Du kanske behöver installera ytterligare insticksmoduler för GStreamer eller välja en annan ljudutgång i väljaren för multimediasystem."
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:1
+msgid "Apple Trailers"
+msgstr "Apple-trailers"
+
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:2
+msgid "Sets the user agent for the Apple Trailers site"
+msgstr "Ställer in User-Agent för webbplatsen Apple-trailers"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:1
+msgid "Autoload Subtitles"
+msgstr "Läs automatiskt in undertexter"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:2
+msgid "Autoloads text subtitles"
+msgstr "Läser automatiskt in undertexter"
 
-#. hour:minutes:seconds
-#. Translators: This is a time format, like "9:05:02" for 9
-#. * hours, 5 minutes, and 2 seconds. You may change ":" to
-#. * the separator that your locale uses or use "%Id" instead
-#. * of "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:83
-#: ../src/plugins/skipto/totem-time-entry.c:57
-#, c-format
-msgctxt "long time format"
-msgid "%d:%02d:%02d"
-msgstr "%d:%02d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
+msgid "Video Disc Recorder"
+msgstr "Videoskivsinspelare"
 
-#. minutes:seconds
-#. Translators: This is a time format, like "5:02" for 5
-#. * minutes and 2 seconds. You may change ":" to the
-#. * separator that your locale uses or use "%Id" instead of
-#. * "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:92
-#, c-format
-msgctxt "short time format"
-msgid "%d:%02d"
-msgstr "%d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
+msgid "Records (S)VCDs or video DVDs"
+msgstr "Spelar in (s)vcd eller video-dvd"
 
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:65
 msgid "_Create Video Disc..."
@@ -1922,38 +1788,21 @@
 msgid "Copy the currently playing (S)VCD"
 msgstr "Kopiera för närvarande spelande (s)vcd"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:129
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:136
 msgid "The video disc could not be duplicated."
 msgstr "Videoskivan kunde inte kopieras."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:131
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:276
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:138
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:283
 msgid "The movie could not be recorded."
 msgstr "Filmen kunde inte spelas in."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:157
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:167
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:263
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:164
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:174
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:270
 msgid "Unable to write a project."
 msgstr "Kunde inte skriva ett projekt."
 
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
-msgid "Video Disc Recorder"
-msgstr "Videoskivsinspelare"
-
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
-msgid "Records (S)VCDs or video DVDs"
-msgstr "Spelar in (s)vcd eller video-dvd"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:1
-#: ../src/plugins/chapters/totem-chapters.c:1139
-msgid "Chapters"
-msgstr "Kapitel"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:2
-msgid "Support chapter markers in movies."
-msgstr "Aktivera stöd för kapitelmarkörer i filmer."
-
 #: ../src/plugins/chapters/chapters-edit.ui.h:1
 msgid "Name for new chapter:"
 msgstr "Namn för nytt kapitel:"
@@ -2010,6 +1859,15 @@
 msgid "Create a new chapter list for the movie"
 msgstr "Skapa en ny kapitellista för filmen"
 
+#: ../src/plugins/chapters/chapters.plugin.in.h:1
+#: ../src/plugins/chapters/totem-chapters.c:1139
+msgid "Chapters"
+msgstr "Kapitel"
+
+#: ../src/plugins/chapters/chapters.plugin.in.h:2
+msgid "Support chapter markers in movies"
+msgstr "Stöd för kapitelmarkörer i filmer"
+
 #: ../src/plugins/chapters/totem-chapters.c:56
 #, c-format
 msgid ""
@@ -2110,13 +1968,39 @@
 msgid "The URI ‘%s’ is not supported."
 msgstr "URI:n \"%s\" stöds inte."
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
-msgid "Instant Messenger status"
-msgstr "Status för snabbmeddelande"
+#: ../src/plugins/grilo/grilo.plugin.in.h:1
+msgid "Grilo Browser"
+msgstr "Grilo-bläddrare"
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
-msgid "Set your Instant Messenger status to away when a movie is playing"
-msgstr "Ställ in status för din snabbmeddelandeklient till frånvarande under tiden en film spelas upp"
+#: ../src/plugins/grilo/grilo.plugin.in.h:2
+msgid "A plugin to let you browse media content from various sources"
+msgstr "En insticksmodul som låter dig bläddra bland mediainnehåll från olika källor"
+
+#: ../src/plugins/grilo/grilo.ui.h:1
+msgid "Add to Playlist"
+msgstr "Lägg till i spellista"
+
+#: ../src/plugins/grilo/grilo.ui.h:2
+msgid "Copy Location"
+msgstr "Kopiera plats"
+
+#: ../src/plugins/grilo/grilo.ui.h:3
+#: ../src/plugins/grilo/totem-grilo.c:1235
+msgid "Browse"
+msgstr "Bläddra"
+
+#: ../src/plugins/grilo/grilo.ui.h:4
+#: ../src/plugins/grilo/totem-grilo.c:1301
+msgid "Search"
+msgstr "Sök"
+
+#: ../src/plugins/grilo/totem-grilo.c:452
+msgid "Browse Error"
+msgstr "Bläddringsfel"
+
+#: ../src/plugins/grilo/totem-grilo.c:608
+msgid "Search Error"
+msgstr "Sökfel"
 
 #: ../src/plugins/gromit/gromit.plugin.in.h:1
 msgid "Gromit Annotations"
@@ -2130,6 +2014,23 @@
 msgid "The gromit binary was not found."
 msgstr "Binären gromit hittades inte."
 
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
+msgid "Instant Messenger Status"
+msgstr "Status för snabbmeddelanden"
+
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
+msgid "Set your Instant Messenger status to away when a movie is playing"
+msgstr "Ställ in status för din snabbmeddelandeklient till frånvarande under tiden en film spelas upp"
+
+#: ../src/plugins/iplayer/iplayer2.py:298
+msgid ""
+msgstr ""
+
+#: ../src/plugins/iplayer/iplayer2.py:299
+#, python-format
+msgid "Programme unavailable (\"%s\")"
+msgstr "Programmet är inte tillgängligt (\"%s\")"
+
 #. Add the interface to Totem's sidebar
 #: ../src/plugins/iplayer/iplayer.plugin.in.h:1
 #: ../src/plugins/iplayer/iplayer.py:46
@@ -2137,8 +2038,8 @@
 msgstr "BBC iPlayer"
 
 #: ../src/plugins/iplayer/iplayer.plugin.in.h:2
-msgid "Stream BBC programs from the last 7 days from the BBC iPlayer service."
-msgstr "Strömma BBC-program för de senaste 7 dagar från tjänsten BBC iPlayer."
+msgid "Stream BBC programs from the last 7 days from the BBC iPlayer service"
+msgstr "Strömma BBC-program för de senaste 7 dagar från tjänsten BBC iPlayer"
 
 #: ../src/plugins/iplayer/iplayer.py:72
 msgid "Error listing channel categories"
@@ -2165,15 +2066,6 @@
 msgid "There was an error getting the list of programmes for this channel and category combination."
 msgstr "Det uppstod ett fel vid hämtning av programlistan för denna kanal och kategorikombination."
 
-#: ../src/plugins/iplayer/iplayer2.py:298
-msgid ""
-msgstr ""
-
-#: ../src/plugins/iplayer/iplayer2.py:299
-#, python-format
-msgid "Programme unavailable (\"%s\")"
-msgstr "Programmet är inte tillgängligt (\"%s\")"
-
 #: ../src/plugins/lirc/lirc.plugin.in.h:1
 msgid "Infrared Remote Control"
 msgstr "Infraröd fjärrkontroll"
@@ -2190,25 +2082,29 @@
 msgid "Couldn't read lirc configuration."
 msgstr "Kunde inte läsa lirc-konfiguration."
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
-msgid "Download Movie Subtitles"
-msgstr "Hämta filmundertexter"
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:1
+msgid "Media Player Keys"
+msgstr "Mediaspelarknappar"
+
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:2
+msgid "Support additional media player keys"
+msgstr "Stöd för ytterligare mediaspelarknappar"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
-msgid "Subtitle _language:"
-msgstr "Språ_k för undertext:"
+#: ../src/plugins/ontop/ontop.plugin.in.h:1
+msgid "Always On Top"
+msgstr "Alltid överst"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
-msgid "_Play with Subtitle"
-msgstr "_Spela upp med undertext"
+#: ../src/plugins/ontop/ontop.plugin.in.h:2
+msgid "Keep the main window on top when playing a movie"
+msgstr "Behåll huvudfönstret överst när en film spelas upp"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:1
 msgid "Subtitle Downloader"
 msgstr "Hämta undertexter"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:2
-msgid "Look for subtitles for the currently playing movie."
-msgstr "Leta efter undertexter för den uppspelade filmen."
+msgid "Look for subtitles for the currently playing movie"
+msgstr "Leta efter undertexter för den uppspelade filmen"
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:42
 msgid "Brazilian Portuguese"
@@ -2264,6 +2160,18 @@
 msgid "Searching subtitles…"
 msgstr "Söker efter undertexter..."
 
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
+msgid "Download Movie Subtitles"
+msgstr "Hämta filmundertexter"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
+msgid "Subtitle _language:"
+msgstr "Språ_k för undertext:"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
+msgid "_Play with Subtitle"
+msgstr "_Spela upp med undertext"
+
 #: ../src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in.h:1
 msgid "Subtitle language"
 msgstr "Undertextspråk"
@@ -2272,67 +2180,18 @@
 msgid "The language to search for subtitles for movies in."
 msgstr "Det språk att söka efter filmundertexter i."
 
-#: ../src/plugins/ontop/ontop.plugin.in.h:1
-msgid "Always On Top"
-msgstr "Alltid överst"
-
-#: ../src/plugins/ontop/ontop.plugin.in.h:2
-msgid "Keep the main window on top when playing a movie"
-msgstr "Behåll huvudfönstret överst när en film spelas upp"
+#: ../src/plugins/properties/movie-properties.plugin.in.h:1
+msgid "Movie Properties"
+msgstr "Filmegenskaper"
+
+#: ../src/plugins/properties/movie-properties.plugin.in.h:2
+msgid "Adds movie properties to the sidebar"
+msgstr "Lägger till filmegenskaper till sidopanelen"
 
 #: ../src/plugins/properties/totem-movie-properties.c:246
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:1
-msgid "Publisher protocol to use"
-msgstr "Publiceringsprotokoll att använda"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:2
-msgid "The transport protocol to use when publishing playlists over the network."
-msgstr "Transportprotokollet att använda när spellistor publiceras över nätverket."
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:3
-msgid "Format for network service name"
-msgstr "Format för nätverkstjänstnamn"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:5
-#, no-c-format
-msgid "A format string used to build the network service name used when publishing playlists over the network. The following format placeholders can be used: • %a: the program name as returned by g_get_application_name() • %h: the machine's host name in title case • %u: the user's login name in title case • %U: the user's real name • %%: the percent sign"
-msgstr "En formatsträng som används för att bygga nätverkstjänstnamnet som används vid publicering av spellistor över nätverket. Följande formatplatshållare kan användas: • %a: programnamnet som returneras av g_get_application_name() • %h: maskinens värdnamn med inledande versal • %u: användarens inloggningsnamn med inledande versal • %U: användarens riktiga namn • %%: procenttecknet"
-
-#. Translators: computers on the local network which are publishing their playlists over the network
-#: ../src/plugins/publish/totem-publish.c:552
-msgid "Neighbors"
-msgstr "Grannar"
-
-#: ../src/plugins/publish/publish.plugin.in.h:1
-msgid "Publish Playlist"
-msgstr "Publicera spellista"
-
-#: ../src/plugins/publish/publish.plugin.in.h:2
-msgid "Share the current playlist via HTTP"
-msgstr "Dela ut aktuell spellista via HTTP"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:1
-msgid "Service _Name:"
-msgstr "Tjänste_namn:"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:3
-#, no-c-format
-msgid ""
-"The name used for announcing the playlist service on the network.\n"
-"All occurrences of the string %u will be replaced by your name,\n"
-"and %h will be replaced by your computer's host name."
-msgstr ""
-"Namnet som används för att annonsera spellistetjänsten på nätverket.\n"
-"Alla förekomster av strängen %u kommer att ersättas med ditt namn\n"
-"och %h kommer att ersättas med din dators värdnamn."
-
-#: ../src/plugins/publish/publish-plugin.ui.h:6
-msgid "Use _encrypted transport protocol (HTTPS)"
-msgstr "Använd _krypterat transportprotokoll (HTTPS)"
-
 #: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:1
 msgid "rpdb2 password"
 msgstr "rpdb2-lösenord"
@@ -2341,13 +2200,59 @@
 msgid "A password to protect the rpdb2 server for debugging Totem from unauthorized remote access. If this is empty, a default of 'totem' will be used."
 msgstr "Ett lösenord för att skydda rpdb2-servern för felsökning av Totem från oauktoriserad fjärråtkomst. Om denna är tom så kommer standardvärdet \"totem\" att användas."
 
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
+msgid "Python Console"
+msgstr "Python-konsoll"
+
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
+msgid "Interactive Python console"
+msgstr "Interaktiv Python-konsoll"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:88
+msgid "Python Console Menu"
+msgstr "Meny för Python-konsoll"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:93
+msgid "_Python Console"
+msgstr "_Python-konsoll"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:94
+msgid "Show Totem's Python console"
+msgstr "Visa Totems Python-konsoll"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:100
+msgid "Python Debugger"
+msgstr "Python-felsökare"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:101
+msgid "Enable remote Python debugging with rpdb2"
+msgstr "Aktivera fjärrfelsökning för Python med rpdb2"
+
+#. pylint: disable-msg=E1101
+#: ../src/plugins/pythonconsole/pythonconsole.py:125
+#, python-format
+msgid ""
+"You can access the Totem.Object through 'totem_object' :\\n"
+"%s"
+msgstr ""
+"Du kan komma åt Totem.Object genom \"totem_object\" :\\n"
+"%s"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:129
+msgid "Totem Python Console"
+msgstr "Totem Python-konsoll"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:139
+msgid "After you press OK, Totem will wait until you connect to it with winpdb or rpdb2. If you have not set a debugger password in DConf, it will use the default password ('totem')."
+msgstr "Efter att du har tryckt på OK så kommer Totem att vänta tills du ansluter till den med winpdb eller rpdb2. Om du inte har ställt in ett felsökningslösenord i DConf så kommer den att använda standardlösenordet (\"totem\")."
+
 #: ../src/plugins/rotation/rotation.plugin.in.h:1
 msgid "Rotation Plugin"
 msgstr "Instick för rotering"
 
 #: ../src/plugins/rotation/rotation.plugin.in.h:2
-msgid "Allows videos to be rotated if they're in the wrong orientation."
-msgstr "Tillåter att videor roteras om de är i fel orientering."
+msgid "Allows videos to be rotated if they are in the wrong orientation"
+msgstr "Tillåter att videor roteras om de är i fel orientering"
 
 #: ../src/plugins/rotation/totem-rotation-plugin.vala:60
 msgid "_Rotate Clockwise"
@@ -2357,6 +2262,14 @@
 msgid "Rotate Counterc_lockwise"
 msgstr "Rotera motso_ls"
 
+#: ../src/plugins/save-file/save-file.plugin.in.h:1
+msgid "Save Copy"
+msgstr "Spara kopia"
+
+#: ../src/plugins/save-file/save-file.plugin.in.h:2
+msgid "Save a copy of the currently playing movie"
+msgstr "Spara en kopia av uppspelade filmen"
+
 #: ../src/plugins/save-file/totem-save-file.c:63
 msgid "Save a Copy..."
 msgstr "Spara en kopia..."
@@ -2379,10 +2292,13 @@
 msgid "Movie stream"
 msgstr "Filmström"
 
-#: ../src/plugins/screensaver/totem-screensaver.c:116
-#: ../browser-plugin/totem-plugin-viewer.c:1891
-msgid "Playing a movie"
-msgstr "Spelar upp en film"
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:1
+msgid "Screen Saver"
+msgstr "Skärmsläckare"
+
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:2
+msgid "Deactivates the screen saver when a movie is playing"
+msgstr "Inaktiverar skärmsläckaren när en film spelas upp"
 
 #: ../src/plugins/screenshot/gallery.ui.h:1
 msgid "Screenshot width (in pixels):"
@@ -2414,6 +2330,14 @@
 msgid "Screenshot.png"
 msgstr "Skärmbild.png"
 
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:1
+msgid "Screenshot"
+msgstr "Skärmbild"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:2
+msgid "Allows screenshots and galleries to be taken of videos"
+msgstr "Tillåter att skärmbilder och gallerier tas från videor"
+
 #: ../src/plugins/screenshot/totem-gallery.c:91
 msgid "Save Gallery"
 msgstr "Spara galleri"
@@ -2453,31 +2377,44 @@
 msgid "Screenshot-%s-%d.png"
 msgstr "Skärmbild-%s-%d.png"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:88
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:84
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:91
 msgid "Totem could not get a screenshot of the video."
 msgstr "Totem kunde inte ta en skärmbild av filmen."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:91
 msgid "This is not supposed to happen; please file a bug report."
 msgstr "Detta ska inte hända; skicka en felrapport."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:191
 msgid "Take _Screenshot..."
 msgstr "Ta _skärmbild..."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:191
 msgid "Take a screenshot"
 msgstr "Ta en skärmbild"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:192
 msgid "Create Screenshot _Gallery..."
 msgstr "Skapa skärmbilds_galleri..."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:192
 msgid "Create a gallery of screenshots"
 msgstr "Skapa ett galleri av skärmbilder"
 
+#: ../src/plugins/skipto/skipto.plugin.in.h:1
+#: ../src/plugins/skipto/totem-skipto.c:197
+msgid "Skip To"
+msgstr "Hoppa till"
+
+#: ../src/plugins/skipto/skipto.plugin.in.h:2
+msgid "Provides the \"Skip to\" dialog"
+msgstr "Tillhandahåller dialogrutan \"Hoppa till\""
+
+#: ../src/plugins/skipto/skipto.ui.h:1
+msgid "_Skip to:"
+msgstr "_Hoppa till:"
+
 #. Update the "seconds" label so that it always has the correct singular/plural form
 #. Translators: label for the seconds selector in the "Skip to" dialogue
 #: ../src/plugins/skipto/totem-skipto.c:160
@@ -2495,10 +2432,6 @@
 msgid "7"
 msgstr "7"
 
-#: ../src/plugins/skipto/totem-skipto.c:197
-msgid "Skip To"
-msgstr "Hoppa till"
-
 #: ../src/plugins/skipto/totem-skipto-plugin.c:182
 msgid "_Skip To..."
 msgstr "_Hoppa till..."
@@ -2507,515 +2440,148 @@
 msgid "Skip to a specific time"
 msgstr "Hoppa till en specifik tid"
 
-#: ../src/plugins/skipto/skipto.ui.h:1
-msgid "_Skip to:"
-msgstr "_Hoppa till:"
-
-#: ../browser-plugin/totem-plugin-viewer.c:431
-msgid "No URI to play"
-msgstr "Ingen uri att spela upp"
-
-#. translators: this is:
-#. * Open With ApplicationName
-#. * as in nautilus' right-click menu
-#: ../browser-plugin/totem-plugin-viewer.c:1107
-#, c-format
-msgid "_Open with \"%s\""
-msgstr "_Öppna med \"%s\""
-
-#: ../browser-plugin/totem-plugin-viewer.c:2136
-msgid "No playlist or playlist empty"
-msgstr "Ingen spellist eller att spellistan är tom"
-
-#: ../browser-plugin/totem-plugin-viewer.c:2235
-msgid "Movie browser plugin"
-msgstr "Insticksmodul för filmbläddrare"
-
-#: ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Verify your system installation. The Totem plugin will now exit."
-msgstr "Kontrollera din systeminstallation. Totem-insticksmodulen kommer nu att avslutas."
-
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
-msgid "Python Console"
-msgstr "Python-konsoll"
-
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
-msgid "Interactive Python console."
-msgstr "Interaktiv Python-konsoll."
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:88
-msgid "Python Console Menu"
-msgstr "Meny för Python-konsoll"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:93
-msgid "_Python Console"
-msgstr "_Python-konsoll"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:94
-msgid "Show Totem's Python console"
-msgstr "Visa Totems Python-konsoll"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:100
-msgid "Python Debugger"
-msgstr "Python-felsökare"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:101
-msgid "Enable remote Python debugging with rpdb2"
-msgstr "Aktivera fjärrfelsökning för Python med rpdb2"
-
-#. pylint: disable-msg=E1101
-#: ../src/plugins/pythonconsole/pythonconsole.py:125
-#, python-format
-msgid ""
-"You can access the Totem.Object through 'totem_object' :\\n"
-"%s"
-msgstr ""
-"Du kan komma åt Totem.Object genom \"totem_object\" :\\n"
-"%s"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:129
-msgid "Totem Python Console"
-msgstr "Totem Python-konsoll"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:139
-msgid "After you press OK, Totem will wait until you connect to it with winpdb or rpdb2. If you have not set a debugger password in DConf, it will use the default password ('totem')."
-msgstr "Efter att du har tryckt på OK så kommer Totem att vänta tills du ansluter till den med winpdb eller rpdb2. Om du inte har ställt in ett felsökningslösenord i DConf så kommer den att använda standardlösenordet (\"totem\")."
-
-#: ../src/plugins/grilo/grilo.plugin.in.h:1
-msgid "Grilo Browser"
-msgstr "Grilo-bläddrare"
-
-#: ../src/plugins/grilo/grilo.plugin.in.h:2
-msgid "A plugin to let you browse media content from various sources."
-msgstr "En insticksmodul som låter dig bläddra bland mediainnehåll på olika platser."
-
-#: ../src/plugins/grilo/totem-grilo.c:452
-msgid "Browse Error"
-msgstr "Bläddringsfel"
-
-#: ../src/plugins/grilo/totem-grilo.c:599
-msgid "Search Error"
-msgstr "Sökfel"
-
-#: ../src/plugins/grilo/totem-grilo.c:1219
-#: ../src/plugins/grilo/grilo.ui.h:3
-msgid "Browse"
-msgstr "Bläddra"
-
-#: ../src/plugins/grilo/totem-grilo.c:1285
-#: ../src/plugins/grilo/grilo.ui.h:4
-msgid "Search"
-msgstr "Sök"
-
-#: ../src/plugins/grilo/grilo.ui.h:1
-msgid "Add to Playlist"
-msgstr "Lägg till i spellista"
-
-#: ../src/plugins/grilo/grilo.ui.h:2
-msgid "Copy Location"
-msgstr "Kopiera plats"
-
-#~ msgid "0 frames per second"
-#~ msgstr "0 bildrutor per sekund"
-
-#~ msgid "0 kbps"
-#~ msgstr "0 kb/s"
-
-#~ msgid "0 x 0"
-#~ msgstr "0 × 0"
-
-#~ msgid "Bemused"
-#~ msgstr "Bemused"
-
-#~ msgid "Control Totem through a mobile phone with a Bemused client"
-#~ msgstr "Styr Totem genom en mobiltelefon med en Bemused-klient"
-
-#~ msgid "Untitled %d"
-#~ msgstr "Namnlös %d"
-
-#~ msgid "Totem Bemused Server"
-#~ msgstr "Totem Bemused Server"
-
-#~ msgid "Totem Bemused Server version 1.0"
-#~ msgstr "Totem Bemused Server version 1.0"
-
-#~ msgid "A plugin to let you browse YouTube videos."
-#~ msgstr "En insticksmodul som låter dig bläddra bland videoklipp på YouTube."
-
-#~ msgid "YouTube Browser"
-#~ msgstr "YouTube-bläddrare"
-
-#~ msgid "Related Videos"
-#~ msgstr "Relaterade videoklipp"
-
-#~ msgid "Search Results"
-#~ msgstr "Sökresultat"
-
-#~ msgid "Videos"
-#~ msgstr "Videoklipp"
-
-#~ msgid "_Open in Web Browser"
-#~ msgstr "_Öppna i webbläsare"
-
-#~ msgid "Open the video in your web browser"
-#~ msgstr "Öppna video i din webbläsare"
-
-#~ msgid "YouTube"
-#~ msgstr "YouTube"
-
-#~ msgid "Cancelling query…"
-#~ msgstr "Avbryter fråga…"
-
-#~ msgid "Error Searching for Videos"
-#~ msgstr "Fel vid sökning efter videoklipp"
-
-#~ msgid ""
-#~ "The response from the server could not be understood. Please check you "
-#~ "are running the latest version of libgdata."
-#~ msgstr ""
-#~ "Svaret från servern kunde inte förstås. Kontrollera att du kör den "
-#~ "senaste versionen av libgdata."
-
-#~ msgid "Fetching search results…"
-#~ msgstr "Hämtar sökresultat..."
-
-#~ msgid "Fetching related videos…"
-#~ msgstr "Hämtar relaterade videoklipp..."
-
-#~ msgid "Error Opening Video in Web Browser"
-#~ msgstr "Fel vid öppning av videon i webbläsare"
+#~ msgid "Play movies and songs"
+#~ msgstr "Spela upp filmer och låtar"
 
-#~ msgid "Fetching more videos…"
-#~ msgstr "Hämtar fler videoklipp..."
+#~ msgid "Open a file"
+#~ msgstr "Öppna en fil"
 
-#~ msgid "Video Format Not Supported"
-#~ msgstr "Videoformatet stöds inte"
+#~ msgid "Open a non-local file"
+#~ msgstr "Öppna en icke-lokal fil"
 
-#~ msgid ""
-#~ "This video is not available in any formats which Totem supports. Would "
-#~ "you like to open it in your web browser instead?"
-#~ msgstr ""
-#~ "Denna video finns inte tillgänglig i något format som Totem har stöd för. "
-#~ "Vill du öppna den i din webbläsare istället?"
-
-#~ msgid "%s"
-#~ msgstr "%s"
-
-#~ msgid ""
-#~ "The playback of this movie requires the following decoders which are not "
-#~ "installed:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Uppspelningen av den här filmen kräver följande avkodare som inte är "
-#~ "installerade:\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid "By artist"
-#~ msgstr "Efter artist"
-
-#~ msgid "By tag"
-#~ msgstr "Efter tagg"
+#~ msgid "Quit the program"
+#~ msgstr "Avsluta programmet"
 
-#~ msgid "Jamendo Album Page"
-#~ msgstr "Jamendos albumsida"
+#~ msgid "Configure the application"
+#~ msgstr "Konfigurera programmet"
 
-#~ msgid "Latest Releases"
-#~ msgstr "Senaste utgåvor"
+#~ msgid "Switch to fullscreen"
+#~ msgstr "Växla till helskärmsläge"
 
-#~ msgid "Number of albums to _retrieve:"
-#~ msgstr "Antal album att _hämta:"
+#~ msgid "Set the repeat mode"
+#~ msgstr "Ställ in upprepningsläget"
 
-#~ msgid "Popular"
-#~ msgstr "Populär"
+#~ msgid "Set the shuffle mode"
+#~ msgstr "Ställ in blandningsläget"
 
-#~ msgid "Preferred audio _format:"
-#~ msgstr "Föredraget ljud_format:"
+#~ msgid "14.4 Kbps Modem"
+#~ msgstr "14.4 Kbps Modem"
 
-#~ msgid "_Open Jamendo Album Page in Browser"
-#~ msgstr "_Öppna Jamendos albumsida i webbläsare"
+#~ msgid "19.2 Kbps Modem"
+#~ msgstr "19.2 Kbps Modem"
 
-#~ msgid "Jamendo"
-#~ msgstr "Jamendo"
+#~ msgid "28.8 Kbps Modem"
+#~ msgstr "28.8 Kbps Modem"
 
-#~ msgid ""
-#~ "Listen to the large collection of Creative Commons licensed music on "
-#~ "Jamendo."
-#~ msgstr ""
-#~ "Lyssna på den stora samlingen av Creative Commons-licensierad musik på "
-#~ "Jamendo."
+#~ msgid "33.6 Kbps Modem"
+#~ msgstr "33.6 Kbps Modem"
 
-#~ msgid "You need to install the Python simplejson module."
-#~ msgstr "Du måste installera Python-modulen simplejson."
+#~ msgid "34.4 Kbps Modem"
+#~ msgstr "34.4 Kbps Modem"
 
-#~ msgid "Artist: %s"
-#~ msgstr "Artist: %s"
+#~ msgid "56 Kbps Modem/ISDN"
+#~ msgstr "56 Kbps Modem/ISDN"
 
-#~ msgid "%Y-%m-%d"
-#~ msgstr "%Y-%m-%d"
+#~ msgid "112 Kbps Dual ISDN/DSL"
+#~ msgstr "112 Kbps Dubbelkanalig ISDN/DSL"
 
-#~ msgid "%x"
-#~ msgstr "%x"
+#~ msgid "256 Kbps DSL/Cable"
+#~ msgstr "256 Kbps DSL/Kabel"
 
-#~ msgid "Genre: %s"
-#~ msgstr "Genre: %s"
+#~ msgid "384 Kbps DSL/Cable"
+#~ msgstr "384 Kbps DSL/Kabel"
 
-#~ msgid "Released on: %s"
-#~ msgstr "Utgiven den: %s"
+#~ msgid "512 Kbps DSL/Cable"
+#~ msgstr "512 Kbps DSL/Kabel"
 
-#~ msgid "License: %s"
-#~ msgstr "Licens: %s"
+#~ msgid "1.5 Mbps T1/Intranet/LAN"
+#~ msgstr "1.5 Mbps T1/Intranet/LAN"
 
-#~ msgid "%02d. %s"
-#~ msgstr "%02d. %s"
+#~ msgid "Intranet/LAN"
+#~ msgstr "Intranet/LAN"
 
-#~ msgid "Album: %s"
-#~ msgstr "Album: %s"
+#~ msgid "Networking"
+#~ msgstr "Nätverk"
 
-#~ msgid "Duration: %s"
-#~ msgstr "Speltid: %s"
+#~ msgid "Connection _speed:"
+#~ msgstr "Anslutnings_hastighet:"
 
-#~ msgid "Fetching albums, please wait…"
-#~ msgstr "Hämtar album, vänta..."
+#~ msgid "Network connection speed"
+#~ msgstr "Anslutningshastighet"
 
 #~ msgid ""
-#~ "Failed to connect to Jamendo server.\n"
-#~ "%s."
+#~ "Approximate network connection speed, used to select quality on media "
+#~ "over the network."
 #~ msgstr ""
-#~ "Misslyckades med att ansluta till Jamendo-servern.\n"
-#~ "%s."
-
-#~ msgid "The Jamendo server returned code %s."
-#~ msgstr "Jamendo-servern returnerade koden %s."
-
-#~ msgid "An error occurred while fetching albums."
-#~ msgstr "Ett fel inträffade vid hämtning av album."
-
-#~ msgid "%H:%M:%S"
-#~ msgstr "%H:%M:%S"
-
-#~ msgid "%M:%S"
-#~ msgstr "%M:%S"
-
-#~ msgid "en"
-#~ msgstr "en"
+#~ "Ungefärlig hastighet för nätverksanslutningen. Används för att välja "
+#~ "kvalitet på media över nätverket."
 
-#~ msgid "Audio format to download from Jamendo"
-#~ msgstr "Ljudformat att hämta från Jamendo"
+#~ msgid "Play Image '%s'"
+#~ msgstr "Spela upp avbildningen \"%s\""
 
-#~ msgid "Number of results per page"
-#~ msgstr "Antal resultat per sida"
+#~ msgid "device%d"
+#~ msgstr "enhet%d"
 
-#~ msgid ""
-#~ "The number of Jamendo search results to display in each page of results."
-#~ msgstr "Antalet Jamendo-sökresultat att visa i varje resultatsida."
-
-#~ msgid "The preferred audio format to download tracks from Jamendo in."
-#~ msgstr "Det föredragna ljudformatet att hämta spår från Jamendo i."
-
-#~ msgid "Could not connect to Tracker"
-#~ msgstr "Kunde inte ansluta till Tracker"
-
-#~ msgid "No results"
-#~ msgstr "Inga resultat"
-
-#~ msgid "Showing %i - %i of %i match"
-
-#~ msgid_plural "Showing %i - %i of %i matches"
-#~ msgstr[0] "Visar %i - %i av %i sökträff"
-#~ msgstr[1] "Visar %i - %i av %i sökträffar"
-
-#~ msgid "Page"
-#~ msgstr "Sida"
-
-#~ msgid "Search for local videos using Tracker"
-#~ msgstr "Sök efter lokala videor med Tracker"
+#~ msgid "Play Disc '%s'"
+#~ msgstr "Spela upp skivan \"%s\""
 
-#~ msgid "Browser Plugin using %s"
-#~ msgstr "Webbläsarinstick som använder %s"
-
-#~ msgid "Totem Browser Plugin"
-#~ msgstr "Totem-insticksmodul för webbläsare"
-
-#~ msgid "Zoom Out"
-#~ msgstr "Zooma ut"
-
-#~ msgid "Zoom Reset"
-#~ msgstr "Återställ zoom"
-
-#~ msgid "Zoom out"
-#~ msgstr "Zooma ut"
-
-#~ msgid "Zoom reset"
-#~ msgstr "Återställ zoom"
-
-#~ msgid "Media file could not be played."
-#~ msgstr "Mediafilen kunde inte spelas upp."
-
-#~ msgid "Too old version of GStreamer installed."
-#~ msgstr "En för gammal version av GStreamer är installerad."
+#~ msgid "Movie Player using %s"
+#~ msgstr "Filmuppspelare som använder %s"
 
 #~ msgid ""
-#~ "Failed to open video output. It may not be available. Please select "
-#~ "another video output in the Multimedia Systems Selector."
+#~ "Totem could not play this media (%s) although a plugin is present to "
+#~ "handle it."
 #~ msgstr ""
-#~ "Misslyckades med att öppna videoutgången. Den kanske inte är tillgänglig. "
-#~ "Välj en annan videoutgång i väljaren för multimediasystem."
+#~ "Totem kunde inte spela upp detta media (%s) trots att en insticksmodul "
+#~ "som hanterar den är installerad."
 
 #~ msgid ""
-#~ "Could not find the video output. You may need to install additional "
-#~ "GStreamer plugins, or select another video output in the Multimedia "
-#~ "Systems Selector."
-#~ msgstr ""
-#~ "Kunde inte hitta videoutgången. Du kanske behöver installera ytterligare "
-#~ "insticksmoduler för GStreamer eller välja en annan videoutgång i väljaren "
-#~ "för multimediasystem."
-
-#~ msgid "Delete"
-#~ msgstr "Ta bort"
-
-#~ msgid "Coherence DLNA/UPnP Client"
-#~ msgstr "Coherence DLNA/UPnP-klient"
-
-#~ msgid "A DLNA/UPnP client for Totem powered by Coherence"
-#~ msgstr "En DLNA/UPnP-klient för Totem som drivs av Coherence"
-
-#~ msgid "Language"
-#~ msgstr "Språk"
-
-#~ msgid "Set the window icon to the thumbnail of the playing movie"
+#~ "You might want to check that a disc is present in the drive and that it "
+#~ "is correctly configured."
 #~ msgstr ""
-#~ "Ställ in fönsterikonen till miniatyrbilder för den film som spelas upp"
-
-#~ msgid "Thumbnail"
-#~ msgstr "Miniatyrbild"
+#~ "Du bör kontrollera om det finns en skiva i enheten och att den är korrekt "
+#~ "konfigurerad."
 
-#~ msgid "Enable visual effects?"
-#~ msgstr "Aktivera visuella effekter?"
+#~ msgid "More information about media plugins"
+#~ msgstr "Mer information om mediainsticksmoduler"
 
 #~ msgid ""
-#~ "It seems you are running Totem remotely.\n"
-#~ "Are you sure you want to enable the visual effects?"
+#~ "Please install the necessary plugins and restart Totem to be able to play "
+#~ "this media."
 #~ msgstr ""
-#~ "Det verkar som om du kör Totem från en annan dator.\n"
-#~ "Är du säker på att du vill aktivera de visuella effekterna?"
-
-#~ msgid "Error loading Galago plugin"
-#~ msgstr "Fel vid inläsning av Galago-insticksmodul"
-
-#~ msgid "Could not connect to the Galago daemon."
-#~ msgstr "Kunde inte ansluta till Galago-demonen."
-
-#~ msgid "seconds"
-#~ msgstr "sekunder"
-
-#~ msgid "Could not get name and thumbnail for %s: %s"
-#~ msgstr "Kunde inte hämta namn och miniatyrbild för %s: %s"
-
-#~ msgid "Error Looking Up Video URI"
-#~ msgstr "Fel vid uppslag av video-URI"
+#~ "Installera de insticksmoduler som krävs och starta om Totem för att kunna "
+#~ "spela upp denna typ av media."
 
 #~ msgid ""
-#~ "Approximate network connection speed, used to select quality on media "
-#~ "over the network: \"0\" for 14.4 Kbps Modem, \"1\" for 19.2 Kbps Modem, "
-#~ "\"2\" for 28.8 Kbps Modem, \"3\" for 33.6 Kbps Modem, \"4\" for 34.4 Kbps "
-#~ "Modem, \"5\" for 56 Kbps Modem/ISDN, \"6\" for 112 Kbps Dual ISDN/DSL, "
-#~ "\"7\" for 256 Kbps DSL/Cable, \"8\" for 384 Kbps DSL/Cable, \"9\" for 512 "
-#~ "Kbps DSL/Cable, \"10\" for 1.5 Mbps T1/Intranet/LAN, \"11\" for Intranet/"
-#~ "LAN."
+#~ "Totem cannot play this type of media (%s) because it does not have the "
+#~ "appropriate plugins to be able to read from the disc."
 #~ msgstr ""
-#~ "Ungefärlig anslutningshastighet till nätverket. Används för att välja "
-#~ "kvalitet på media över nätverket: \"0\" för 14.4 Kbps modem, \"1\" för "
-#~ "19.2 Kbps modem, \"2\" för 28.8 Kbps modem, \"3\" för 33.6 Kbps modem, "
-#~ "\"4\" för 34.4 Kbps modem, \"5\" för 56 Kbps modem/ISDN, \"6\" för 112 "
-#~ "Kbps Dual ISDN/DSL, \"7\" för 256 Kbps DSL/Kabel, \"8\" för 384 Kbps DSL/"
-#~ "Kabel, \"9\" för 512 Kbps DSL/Kabel, \"10\" för 1.5 Mbps T1/Intranet/LAN, "
-#~ "\"11\" för Intranet/LAN."
+#~ "Totem kan inte spela upp denna typ av media (%s) därför att lämpliga "
+#~ "insticksmoduler saknas för att kunna läsa från skivan."
 
 #~ msgid ""
-#~ "Quality settings for the audio visualization: \"0\" for small, \"1\" for "
-#~ "normal, \"2\" for large, \"3\" for extra large."
+#~ "Totem cannot play this type of media (%s) because you do not have the "
+#~ "appropriate plugins to handle it."
 #~ msgstr ""
-#~ "Kvalitetsinställningar för ljudvisualisering: \"0\" för liten, \"1\" för "
-#~ "normal, \"2\" för stor, \"3\" för extra stor."
+#~ "Totem kan inte spela upp denna typ av media (%s) eftersom du saknar "
+#~ "lämpliga insticksmoduler för att hantera den."
 
 #~ msgid ""
-#~ "Type of audio output to use: \"0\" for stereo, \"1\" for 4-channel "
-#~ "output, \"2\" for 5.0 channel output, \"3\" for 5.1 channel output, \"4\" "
-#~ "for AC3 Passthrough."
+#~ "Totem cannot play this type of media (%s) because it is not supported."
 #~ msgstr ""
-#~ "Typ av ljudutmatning som ska användas: \"0\" för stereo, \"1\" för 4-"
-#~ "kanalsutmatning, \"2\" för 5.0-kanalsutmatning, \"3\" för 5.1-"
-#~ "kanalsutmatning, \"4\" för AC3-genomsläppning."
-
-#~ msgid "UTF-8"
-#~ msgstr "UTF-8"
-
-#~ msgid "Whether to autoload external chapter files when a movie is loaded."
-#~ msgstr ""
-#~ "Huruvida kapitelfiler automatiskt ska läsas in när en film läses in."
-
-#~ msgid "Don't connect to an already-running instance"
-#~ msgstr "Anslut inte till en redan körande instans"
+#~ "Totem kan inte spela upp denna typ av media (%s) eftersom den inte stöds."
 
-#~ msgid "Could not open link"
-#~ msgstr "Kunde inte öppna länk"
+#~ msgid "Please insert another disc to play back."
+#~ msgstr "Mata in en annan skiva att spela upp."
 
-#~ msgid "Totem could not initialize the configuration engine."
-#~ msgstr "Totem kunde inte initiera konfigurationsmotorn."
+#~ msgid "Totem was not able to play this disc."
+#~ msgstr "Totem kunde inte spela upp den här skivan."
 
-#~ msgid "Make sure that GNOME is properly installed."
-#~ msgstr "Försäkra dig om att GNOME är korrekt installerat."
-
-#~ msgid "Chapters support"
-#~ msgstr "Kapitelstöd"
-
-#~ msgid "Continue to watch movie without loaded chapters"
-#~ msgstr "Fortsätt att se filmen utan inlästa kapitel"
-
-#~ msgid "_Go to"
-#~ msgstr "_Gå till"
-
-#~ msgid "Please check you rights and free space"
-#~ msgstr "Kontrollera din behörighet och ledigt utrymme"
-
-#~ msgid "Recordings"
-#~ msgstr "Inspelningar"
-
-#~ msgid "MythTV Recordings"
-#~ msgstr "MythTV-inspelningar"
-
-#~ msgid "MythTV LiveTV"
-#~ msgstr "MythTV LiveTV"
-
-#~ msgid "_Download Movie Subtitles..."
-#~ msgstr "_Hämta filmundertexter..."
+#~ msgid "Totem does not support playback of Audio CDs"
+#~ msgstr "Totem saknar stöd för uppspelning av ljud-cd-skivor"
 
 #~ msgid ""
-#~ "Changing the visuals effect type will require a restart to take effect."
+#~ "Please consider using a music player or a CD extractor to play this CD"
 #~ msgstr ""
-#~ "Att ändra typen av visuella effekter kommer att kräva en omstart för att "
-#~ "börja gälla."
-
-#~ msgid ""
-#~ "The change of audio output type will only take effect when Totem is "
-#~ "restarted."
-#~ msgstr ""
-#~ "Ändringen av denna inställning kommer att börja gälla först när Totem "
-#~ "startats om."
-
-#~ msgid "Author:"
-#~ msgstr "Upphovsman:"
-
-#~ msgid "C_onfigure..."
-#~ msgstr "K_onfigurera..."
-
-#~ msgid "Copyright:"
-#~ msgstr "Copyright:"
-
-#~ msgid "Description:"
-#~ msgstr "Beskrivning:"
-
-#~ msgid "Site:"
-#~ msgstr "Plats:"
+#~ "Överväg att använda en musikspelare eller en cd-extraherare för att spela "
+#~ "upp denna skiva"
diff -Nru totem-3.4.3/po/te.po totem-3.6.2/po/te.po
--- totem-3.4.3/po/te.po	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/po/te.po	2012-08-29 23:07:45.000000000 +0000
@@ -1,12 +1,13 @@
 # Telugu translation of totem
 # Copyright (C) 2005 Free Software Foundation, Andhra Pradesh.
-# Copyright (C) 2011 Swecha Telugu Localisation Team .
+# Copyright (C) 2011,2012 Swecha Telugu Localisation Team .
 # This file is distributed under the same license as the totem package.
 #
 #
 # Prajasakti Localisation Team , 2005.
 # Krishna Babu K , 2009, 2010.
 # Hari Krishna , 2011.
+# Sasi Bhushan Boddepalli , 2012
 # Praveen Illa , 2011, 2012.
 #
 msgid ""
@@ -14,8 +15,8 @@
 "Project-Id-Version: totem\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=totem&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-03-23 06:07+0000\n"
-"PO-Revision-Date: 2012-03-23 11:43+0530\n"
+"POT-Creation-Date: 2012-07-15 18:41+0000\n"
+"PO-Revision-Date: 2012-07-26 23:57+0530\n"
 "Last-Translator: Praveen Illa \n"
 "Language-Team: Telugu \n"
 "Language: \n"
@@ -24,21 +25,227 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
+#: ../browser-plugin/totem-plugin-viewer.c:352 ../src/totem-object.c:1180
+#: ../src/totem-object.c:1650 ../src/totem-statusbar.c:115
+msgid "Stopped"
+msgstr "ఆపివేయబడింది"
+
+#: ../browser-plugin/totem-plugin-viewer.c:364 ../src/totem-object.c:1173
+msgid "Paused"
+msgstr "నిలిపివేయబడింది"
+
+#: ../browser-plugin/totem-plugin-viewer.c:368 ../src/totem-object.c:1166
+msgid "Playing"
+msgstr "ప్రదర్శిస్తుంది"
+
+#: ../browser-plugin/totem-plugin-viewer.c:386
+#: ../src/plugins/screensaver/totem-screensaver.c:97
+msgid "Playing a movie"
+msgstr "చలనచిత్రమును ఆడిస్తున్నది"
+
+#: ../browser-plugin/totem-plugin-viewer.c:443
+msgid "No URI to play"
+msgstr "ఆడించుటకు ఏ URI లేదు"
+
+#: ../browser-plugin/totem-plugin-viewer.c:676
+#: ../browser-plugin/totem-plugin-viewer.c:1700
+msgid "Totem Movie Player"
+msgstr "టొటెమ్ చలనచిత్ర ప్రదర్శకం"
+
+#. translators: this is:
+#. * Open With ApplicationName
+#. * as in nautilus' right-click menu
+#: ../browser-plugin/totem-plugin-viewer.c:1120
+#, c-format
+msgid "_Open with \"%s\""
+msgstr "\"%s\"తో తెరువు (_O)"
+
+#: ../browser-plugin/totem-plugin-viewer.c:1341 ../src/totem-object.c:2475
+msgid "An error occurred"
+msgstr "ఒక దోషం ఎదురైంది"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2033
+msgid "No playlist or playlist empty"
+msgstr "ప్రదర్శనజాబితా లేదు లేదా ప్రదర్శనజాబితా ఖాళీగావుంది"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2128
+msgid "Movie browser plugin"
+msgstr "చలనచిత్ర విహారకం చొప్పింత"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144 ../src/totem.c:239
+msgid "Could not initialize the thread-safe libraries."
+msgstr "సురక్షిత మార్గ గ్రంథాలయాలను సంసిద్ధపరచలేకపోయింది."
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144
+msgid "Verify your system installation. The Totem plugin will now exit."
+msgstr "మీ వ్యవస్థ స్థాపనను సరిచూసుకోండి. టోటెమ్ ప్లగిన్ ఇప్పుడు నిష్క్రమిస్తున్నది."
+
 #: ../data/fullscreen.ui.h:1
 msgid "Leave Fullscreen"
-msgstr "పూర్తితెరను వదిలివెళ్లుము"
+msgstr "పూర్తితెరను వదిలివెళ్లండి"
 
-#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:144
+#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:81
 msgid "Time:"
 msgstr "సమయం:"
 
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
+msgid "Allow the screensaver to activate when playing audio"
+msgstr "ఆడియో ప్లే అవుచున్నప్పుడు స్క్రీన్‌సేవర్‌ క్రియాశీలము అగుటకు అనుమతించు"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
+msgid ""
+"Allow the screensaver to activate when playing audio. Disable if you have "
+"monitor-powered speakers."
+msgstr ""
+"ఆడియో ప్లే అవుచున్నప్పుడు స్క్రీన్‌సేవర్‌ క్రియాశీలము అగుటకు అనుమతించు. మీకు మానిటర్-స్పీకర్లు వుంటే "
+"అచేతనము చేయి."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
+msgid "Show visual effects when no video is displayed"
+msgstr "ఎటువంటి వీడియో ప్రదర్శించబడనప్పుడు దృశ్యనీయ ప్రభావాలను చూపించు"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
+msgid "Show visual effects when playing an audio only file."
+msgstr "ఆడియో దస్త్రం ఆడుతున్నపుడు మాత్రమే దృశ్యనీయ ప్రభావాలను చూపించు"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
+msgid "Name of the visual effects plugin"
+msgstr "దృశ్యత ప్రభావాల చొప్పింత యొక్క పేరు"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
+msgid "The brightness of the video"
+msgstr "వీడియో యొక్క కాంతిప్రకాశము"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
+msgid "The contrast of the video"
+msgstr "వీడియో యొక్క మంధ్రత"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
+msgid "The hue of the video"
+msgstr "వీడియో యొక్క హ్యూ"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
+msgid "The saturation of the video"
+msgstr "వీడియోయొక్క సాట్యురేషన్"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
+msgid "Resize the canvas automatically on file load"
+msgstr "దస్త్రం లోడునందు పటము(కాన్వాసు)ను స్వయంచాలకంగా పునఃపరిమాణం చేయి"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
+msgid "Repeat mode"
+msgstr "పునరావృత విధము"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
+msgid "Shuffle mode"
+msgstr "యాదృచ్ఛిక విధం"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
+msgid "Whether to disable deinterlacing for interlaced movies"
+msgstr "అంతర్వల్లుకోబడిన చలనచిత్రాలకు విజాలీకరణను అచేతనము చేయవలెనావద్దా"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
+msgid "Whether to enable debug for the playback engine"
+msgstr "ప్లేబ్యాక్ యంత్రం కొరకు డీబగ్‌ను చేతనము చేయవలెనావద్దా"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
+msgid "Type of audio output to use"
+msgstr "ఉపయోగించుటకు ఆడియో అవుట్‌పుట్ యొక్క రకము"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
+msgid "Visualization quality setting"
+msgstr "దృశ్యనీయ నాణ్యతా అమరిక"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
+msgid "Quality setting for the audio visualization."
+msgstr "ఆడియో దృశ్యమానతకు నాణ్యతా అమరిక."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
+msgid "Network buffering threshold"
+msgstr "నెట్‌వర్కు బఫరింగ్ త్రెష్‌హోల్డ్"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
+msgid ""
+"Amount of data to buffer for network streams before starting to display the "
+"stream (in seconds)."
+msgstr ""
+"ప్రవాహాన్ని ప్రదర్శించుటకు ముందు నెట్‌వర్కు ప్రవాహాల కొరకు బఫర్ చేయవలసిన డేటా మొత్తం (సెకనులలో)."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
+msgid "Subtitle font"
+msgstr "ఉపశీర్షిక ఖతి"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
+msgid "Pango font description for subtitle rendering."
+msgstr "ఉపశీర్షిక రెండరింగు కొరకు పాంగో ఖతి వివరణ."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
+msgid "Subtitle encoding"
+msgstr "ఉపశీర్షిక ఎన్కోడింగ్"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
+msgid "Encoding character set for subtitle."
+msgstr "ఉపశీర్షిక కొరకు అక్షరసమితి ఎన్కోడింగు."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
+msgid "Default location for the \"Open...\" dialogs"
+msgstr "\"తెరువు...\" డైలాగుల కొరకు అప్రమేయ స్థానం"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
+msgid ""
+"Default location for the \"Open...\" dialogs. Default is the current "
+"directory."
+msgstr "\"తెరువు...\" సంభాషణల కొరకు అప్రమేయ స్థానం, ప్రస్తుత డైరెక్టరీ అప్రమేయం."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
+msgid "Default location for the \"Take Screenshot\" dialogs"
+msgstr "\"తెరపట్టు తీయి\" డైలాగ్స్ కొరకు అప్రమేయ స్థానం"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
+msgid ""
+"Default location for the \"Take Screenshot\" dialogs. Default is the "
+"Pictures directory."
+msgstr "\"తెరపట్టును తీయి\" సంభాషణలకు అప్రమేయ స్థానం. చిత్రాల డైరెక్టరీ అప్రమేయం."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
+msgid "Whether to disable the plugins in the user's home directory"
+msgstr "వాడుకరి నివాస సంచయంలోని ప్లగిన్లు అచేతనము చేయవలెనా వద్దా"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
+msgid "Whether to disable the keyboard shortcuts"
+msgstr "కీబోర్డు అడ్డదారులను అచేతనం చేయలా వద్దా"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
+msgid "Whether to autoload text subtitle files when a movie is loaded"
+msgstr "చలనచిత్రము లోడైనప్పుడు పాఠ్య ఉపశీర్షిక దస్త్రాలు స్వయంచాలకంగా లోడవ్వాలా వద్దా"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
+msgid "Whether to autoload external chapter files when a movie is loaded"
+msgstr "చలనచిత్రము లోడైనప్పుడు బాహ్య అధ్యాయ దస్త్రాలను స్వయంచాలకంగా లోడవ్వాలా వద్దా"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
+msgid ""
+"Whether to remember the position of played audio/video files when pausing or "
+"closing them"
+msgstr "ఆడియో/వీడియో దస్త్రాలను నిలిపివేసినప్పుడు లేదా మూసివేసినప్పుడు వాటి స్థానమును గుర్తుంచుకొనవలెనా"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
+msgid "Active plugins list"
+msgstr "క్రియాశీల ప్లగిన్ల జాబితా"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+msgid ""
+"A list of the names of the plugins which are currently active (loaded and "
+"running)."
+msgstr "ప్రస్తుతం క్రియాశీలకంగా ఉన్న ప్లగిన్ల యొక్క పేర్ల జాబితా (లోడైనవి మరియు నడుస్తున్నవి)."
+
 #: ../data/playlist.ui.h:1
 msgid "_Remove"
 msgstr "తీసివేయి (_R)"
 
 #: ../data/playlist.ui.h:2
 msgid "Remove file from playlist"
-msgstr "ప్రదర్శనజాబితా నుండి ఫైలును తీసివేయి"
+msgstr "ప్రదర్శనజాబితా నుండి దస్త్రాన్ని తీసివేయి"
 
 #: ../data/playlist.ui.h:3 ../data/video-list.ui.h:3
 msgid "_Copy Location"
@@ -48,13 +255,13 @@
 msgid "Copy the location to the clipboard"
 msgstr "స్థానమును క్లిప్‌బోర్డుకు నకలుతీయి"
 
-#: ../data/playlist.ui.h:5 ../data/totem.ui.h:78
+#: ../data/playlist.ui.h:5 ../data/totem.ui.h:71
 msgid "_Select Text Subtitles..."
 msgstr "పాఠ్య ఉపశీర్షికలను ఎంచుకోండి...(_S)"
 
-#: ../data/playlist.ui.h:6 ../data/totem.ui.h:79
+#: ../data/playlist.ui.h:6 ../data/totem.ui.h:72
 msgid "Select a file to use for text subtitles"
-msgstr "పాఠ్య ఉపశీర్షికల కొరకు వాడుటకు ఒక ఫైలును ఎంచుకోండి"
+msgstr "పాఠ్య ఉపశీర్షికల కొరకు వాడుటకు ఒక దస్త్రాన్ని ఎంచుకోండి"
 
 #: ../data/playlist.ui.h:7
 msgid "Add..."
@@ -76,10 +283,165 @@
 msgid "Move Down"
 msgstr "క్రిందకు జరుపు"
 
-#: ../data/properties.ui.h:1 ../data/totem.ui.h:122
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:2
+msgid "Normal"
+msgstr "సాధారణం"
+
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:4
+msgid "Large"
+msgstr "పెద్ద"
+
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:6
+msgid "Extra Large"
+msgstr "మరీ పెద్దది"
+
+#: ../data/preferences.ui.h:7 ../src/backend/bacon-video-widget.c:5479
+#: ../src/totem-properties-view.c:231
+msgid "Stereo"
+msgstr "స్టీరియో"
+
+#: ../data/preferences.ui.h:8
+msgid "4-channel"
+msgstr "4-ఛానల్"
+
+#: ../data/preferences.ui.h:9
+msgid "4.1-channel"
+msgstr "4.1-ఛానల్"
+
+#: ../data/preferences.ui.h:10
+msgid "5.0-channel"
+msgstr "5.0-ఛానల్"
+
+#: ../data/preferences.ui.h:11
+msgid "5.1-channel"
+msgstr "5.1-ఛానల్"
+
+#: ../data/preferences.ui.h:12
+msgid "AC3 Passthrough"
+msgstr "AC3 Passthrough"
+
+#: ../data/preferences.ui.h:13
+msgid "Totem Preferences"
+msgstr "టోటెమ్ ప్రాధాన్యతలు"
+
+#: ../data/preferences.ui.h:14
+msgid "Playback"
+msgstr "ప్లేబాక్"
+
+#: ../data/preferences.ui.h:15
+msgid "Start playing files from last position"
+msgstr "చివరి స్థానము నుండి దస్త్రాలను ఆడించు"
+
+#: ../data/preferences.ui.h:16
+msgid "Text Subtitles"
+msgstr "పాఠ్య ఉపశీర్షికలు"
+
+#: ../data/preferences.ui.h:17
+msgid "_Load subtitle files when movie is loaded"
+msgstr "చలనచిత్రం లోడైనప్పుడు ఉపశీర్షిక దస్త్రాలను లోడుచేయి (_L)"
+
+#: ../data/preferences.ui.h:18
+msgid "_Font:"
+msgstr "ఫాంటు (_F):"
+
+#: ../data/preferences.ui.h:19
+msgid "_Encoding:"
+msgstr "ఎన్కోడింగ్ (_E):"
+
+#: ../data/preferences.ui.h:20
+msgid "External Chapters"
+msgstr "బాహ్య అధ్యాయాలు"
+
+#: ../data/preferences.ui.h:21
+msgid "Load _chapter files when movie is loaded"
+msgstr "చలనచిత్రం లోడైనప్పుడు అధ్యాయ దస్త్రాలను లోడుచేయి (_c)"
+
+#: ../data/preferences.ui.h:22 ../data/properties.ui.h:1
 msgid "General"
 msgstr "సాధారణం"
 
+#. Tab label in the Preferences dialogue
+#: ../data/preferences.ui.h:24
+msgid "Display"
+msgstr "ప్రదర్శించు"
+
+#: ../data/preferences.ui.h:25
+msgid "_Resize the window when a new video is loaded"
+msgstr "ఒక కొత్త వీడియో లోడైనప్పుడు విండో పరిమాణం మార్చు (_R)"
+
+#: ../data/preferences.ui.h:26
+msgid "Disable _deinterlacing of interlaced videos"
+msgstr "అంతర్వల్లిక వీడియోల యొక్క విజాలీకరణను అచేతనపరుచు (_d)"
+
+#: ../data/preferences.ui.h:27
+msgid "Disable screensaver when playing "
+msgstr "ఆడుతున్నపుడు తెరకాపరిని అచేతపరుచు"
+
+#: ../data/preferences.ui.h:28 ../data/properties.ui.h:9
+#: ../src/totem-properties-view.c:273
+msgid "Video"
+msgstr "వీడియో"
+
+#: ../data/preferences.ui.h:29
+msgid "Video or Audio"
+msgstr "ఆడియో లేదా వీడియో"
+
+#: ../data/preferences.ui.h:30
+msgid "Visual Effects"
+msgstr "దృశ్య ప్రభావాలు"
+
+#: ../data/preferences.ui.h:31
+msgid "Show _visual effects when an audio file is played"
+msgstr "ఆడియో దస్త్రాలను ఆడిస్తున్నపుడు దృశ్య ప్రభావాలను చూపించు (_v)"
+
+#: ../data/preferences.ui.h:32
+msgid "_Type of visualization:"
+msgstr "దృశ్యనీయత యొక్క రకము (_T):"
+
+#: ../data/preferences.ui.h:33
+msgid "Visualization _size:"
+msgstr "దృశ్యనీయత పరిమాణము (_s):"
+
+#: ../data/preferences.ui.h:34
+msgid "Color Balance"
+msgstr "వర్ణ సమతుల్యత"
+
+#: ../data/preferences.ui.h:35
+msgid "_Brightness:"
+msgstr "ప్రకాశత (_B):"
+
+#: ../data/preferences.ui.h:36
+msgid "Co_ntrast:"
+msgstr "వ్యత్యాసం (_n):"
+
+#: ../data/preferences.ui.h:37
+msgid "Sat_uration:"
+msgstr "సాచురేషన్ (_u):"
+
+#: ../data/preferences.ui.h:38
+msgid "_Hue:"
+msgstr "లేతఛాయ (_H):"
+
+#: ../data/preferences.ui.h:39
+msgid "Reset to _Defaults"
+msgstr "అప్రమేయాలకు తిరిగివుంచు (_D)"
+
+#: ../data/preferences.ui.h:40
+msgid "Audio Output"
+msgstr "ఆడియో అవుట్‌పుట్"
+
+#: ../data/preferences.ui.h:41
+msgid "_Audio output type:"
+msgstr "ఆడియో అవుట్‌పుట్ రకము (_A):"
+
+#: ../data/preferences.ui.h:42 ../data/properties.ui.h:14
+#: ../src/totem-properties-view.c:271
+msgid "Audio"
+msgstr "ఆడియో"
+
 #: ../data/properties.ui.h:2
 msgid "Title:"
 msgstr "శీర్షిక"
@@ -108,11 +470,6 @@
 msgid "Container:"
 msgstr "కంటైనర్:"
 
-#: ../data/properties.ui.h:9 ../data/totem.ui.h:128
-#: ../src/totem-properties-view.c:270
-msgid "Video"
-msgstr "వీడియో"
-
 #: ../data/properties.ui.h:10
 msgid "Dimensions:"
 msgstr "కొలతలు:"
@@ -129,11 +486,6 @@
 msgid "Bitrate:"
 msgstr "బిట్‌రేట్:"
 
-#: ../data/properties.ui.h:14 ../data/totem.ui.h:142
-#: ../src/totem-properties-view.c:268
-msgid "Audio"
-msgstr "ఆడియో"
-
 #: ../data/properties.ui.h:15
 msgid "Sample rate:"
 msgstr "మాదిరి రేటు:"
@@ -142,741 +494,448 @@
 msgid "Channels:"
 msgstr "ఛానళ్ళు:"
 
-#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
-msgid "_Add to Playlist"
-msgstr "ప్రదర్శనజాబితాకు జతచేయి (_A)"
-
-#: ../data/video-list.ui.h:2
-msgid "Add the video to the playlist"
-msgstr "వీడియోను ప్రదర్శనజాబితాకు జతచేయి"
-
 #. Title
-#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:143
-#: ../src/totem-object.c:1667
-msgid "Movie Player"
-msgstr "చలనచిత్ర ప్రదర్శకం"
+#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:80 ../src/totem.c:238
+#: ../src/totem.c:247 ../src/totem-menu.c:790 ../src/totem-object.c:1658
+msgid "Videos"
+msgstr "వీడియోలు"
 
 #: ../data/totem.desktop.in.in.in.h:2
-msgid "Play movies and songs"
-msgstr "చలనచిత్రాలను మరియు పాటలను ఆడించండి"
+msgid "Play movies"
+msgstr "చలనచిత్రాలను ప్రదర్శించు"
+
+#: ../data/totem.desktop.in.in.in.h:3
+msgid "Video;Movie;Film;Clip;Series;Player;DVD;TV;Disc;"
+msgstr "వీడియో; సినిమా; సినిమా; క్లిప్; సిరీస్; ప్లేయర్; డివిడి; టి.వి; డిస్క్;"
 
 #: ../data/totem.ui.h:1
-msgid "_Movie"
-msgstr "చలనచిత్రం (_M)"
+msgid "_Open"
+msgstr "తెరువు(_O)"
 
 #: ../data/totem.ui.h:2
-msgid "_Open..."
-msgstr "తెరువు...(_O)"
+msgid "Open _Location"
+msgstr "స్థానమును తెరువు(_L)"
 
 #: ../data/totem.ui.h:3
-msgid "Open a file"
-msgstr "ఒక ఫైలుని తెరువు"
+msgid "_Fullscreen"
+msgstr "పూర్తితెర (_F)"
 
 #: ../data/totem.ui.h:4
-msgid "Open _Location..."
-msgstr "స్థానమును తెరువు...(_L)"
+msgid "Prefere_nces"
+msgstr "ప్రాధాన్యతలు (_n)"
 
 #: ../data/totem.ui.h:5
-msgid "Open a non-local file"
-msgstr "స్థానికం-కాని ఫైలును తెరువు"
+msgid "Shuff_le"
+msgstr "యాదృచ్ఛిక రీతి (_l)"
 
 #: ../data/totem.ui.h:6
+msgid "_Repeat"
+msgstr "పునరావృతము(_R)"
+
+#: ../data/totem.ui.h:7
+msgid "_Quit"
+msgstr "నిష్క్రమించు (_Q)"
+
+#: ../data/totem.ui.h:8
+msgid "_Movie"
+msgstr "చలనచిత్రం (_M)"
+
+#: ../data/totem.ui.h:9
 msgid "_Eject"
 msgstr "బయటకునెట్టు (_E)"
 
-#: ../data/totem.ui.h:7
+#: ../data/totem.ui.h:10
 msgid "Eject the current disc"
 msgstr "ప్రస్తుత డిస్కును బయటకునెట్టు"
 
-#: ../data/totem.ui.h:8
+#: ../data/totem.ui.h:11
 msgid "_Properties"
 msgstr "లక్షణాలు (_P)"
 
-#: ../data/totem.ui.h:9
+#: ../data/totem.ui.h:12
 msgid "View the properties of the current stream"
 msgstr "ప్రస్తుత ప్రవాహం యొక్క లక్షణములను చూడు"
 
-#: ../data/totem.ui.h:10
+#: ../data/totem.ui.h:13
 msgid "Play / P_ause"
 msgstr "ఆడించు / నిలిపివేయి (_a)"
 
-#: ../data/totem.ui.h:11
+#: ../data/totem.ui.h:14
 msgid "Play or pause the movie"
 msgstr "చలనచిత్రమును ఆడించు లేదా నిలిపివేయి"
 
-#: ../data/totem.ui.h:12
-msgid "_Quit"
-msgstr "నిష్క్రమించు (_Q)"
-
-#: ../data/totem.ui.h:13
-msgid "Quit the program"
-msgstr "ఈ కార్యక్రమమును నిష్క్రమించు"
-
-#: ../data/totem.ui.h:14
+#: ../data/totem.ui.h:15
 msgid "_Edit"
 msgstr "సవరణ (_E)"
 
-#: ../data/totem.ui.h:15
+#: ../data/totem.ui.h:16
 msgid "_Clear Playlist"
 msgstr "ప్రదర్శనజాబితాను శుభ్రపరుచు (_C)"
 
-#: ../data/totem.ui.h:16
+#: ../data/totem.ui.h:17
 msgid "Clear the playlist"
 msgstr "ప్రదర్శనజాబితాను శుభ్రపరుచు"
 
-#: ../data/totem.ui.h:17
-msgid "Prefere_nces"
-msgstr "ప్రాధాన్యతలు (_n)"
-
 #: ../data/totem.ui.h:18
-msgid "Configure the application"
-msgstr "అనువర్తనమును స్వరూపించు"
-
-#: ../data/totem.ui.h:19
 msgid "Plugins..."
-msgstr "ప్లగిన్లు..."
+msgstr "చొప్పింతలు..."
 
-#: ../data/totem.ui.h:20
+#: ../data/totem.ui.h:19
 msgid "Configure plugins to extend the application"
 msgstr "అనువర్తనమును విస్తరించుటకు ప్లగిన్లను స్వరూపించు"
 
-#: ../data/totem.ui.h:21
+#: ../data/totem.ui.h:20
 msgid "_View"
 msgstr "వీక్షణం (_V)"
 
-#: ../data/totem.ui.h:22
-msgid "_Fullscreen"
-msgstr "నిండుతెర (_F)"
-
-#: ../data/totem.ui.h:23
-msgid "Switch to fullscreen"
-msgstr "నిండుతెరకు మారు"
-
-#: ../data/totem.ui.h:24
+#: ../data/totem.ui.h:21
 msgid "Fit Window to Movie"
 msgstr "విండోను చలనచిత్రమనకు అమర్చు"
 
-#: ../data/totem.ui.h:25
+#: ../data/totem.ui.h:22
 msgid "_Resize 1:2"
 msgstr "పునఃపరిమాణం 1:2 (_R)"
 
-#: ../data/totem.ui.h:26
+#: ../data/totem.ui.h:23
 msgid "Resize to half the original video size"
 msgstr "అసలు వీడియో పరిమాణమును సగానికి పరిమాణం మార్చు"
 
-#: ../data/totem.ui.h:27
+#: ../data/totem.ui.h:24
 msgid "Resize _1:1"
 msgstr "పునఃపరిమాణం _1:1"
 
-#: ../data/totem.ui.h:28
+#: ../data/totem.ui.h:25
 msgid "Resize to the original video size"
 msgstr "అసలు వీడియో పరిమాణముకు మార్చు"
 
-#: ../data/totem.ui.h:29
+#: ../data/totem.ui.h:26
 msgid "Resize _2:1"
 msgstr "పునఃపరిమాణం _2:1"
 
-#: ../data/totem.ui.h:30
+#: ../data/totem.ui.h:27
 msgid "Resize to double the original video size"
 msgstr "అసలు వీడియో పరిమాణమును రెండింతలు పరిమాణం మార్చు"
 
-#: ../data/totem.ui.h:31
+#: ../data/totem.ui.h:28
 msgid "_Aspect Ratio"
 msgstr "రూప నిష్పత్తి (_A)"
 
-#: ../data/totem.ui.h:32
+#: ../data/totem.ui.h:29
 msgid "Switch An_gles"
 msgstr "కోణములు మార్చు (_g)"
 
-#: ../data/totem.ui.h:33
+#: ../data/totem.ui.h:30
 msgid "Switch camera angles"
 msgstr "కెమేరా కోణములు మార్చు"
 
-#: ../data/totem.ui.h:34
+#: ../data/totem.ui.h:31
 msgid "_Go"
 msgstr "వెళ్ళు (_G)"
 
-#: ../data/totem.ui.h:35
+#: ../data/totem.ui.h:32
 msgid "_DVD Menu"
 msgstr "డీవీడీ మెనూ (_D)"
 
-#: ../data/totem.ui.h:36
+#: ../data/totem.ui.h:33
 msgid "Go to the DVD menu"
 msgstr "డీవీడీ మెనూకు వెళ్ళు"
 
-#: ../data/totem.ui.h:37
+#: ../data/totem.ui.h:34
 msgid "_Title Menu"
 msgstr "శీర్షిక మెనూ (_T)"
 
-#: ../data/totem.ui.h:38
+#: ../data/totem.ui.h:35
 msgid "Go to the title menu"
 msgstr "శీర్షిక మెనూకు వెళ్ళు"
 
-#: ../data/totem.ui.h:39
+#: ../data/totem.ui.h:36
 msgid "A_udio Menu"
 msgstr "ఆడియో మెనూ (_u)"
 
-#: ../data/totem.ui.h:40
+#: ../data/totem.ui.h:37
 msgid "Go to the audio menu"
 msgstr "ఆడియో మెనూకు వెళ్ళు"
 
-#: ../data/totem.ui.h:41
+#: ../data/totem.ui.h:38
 msgid "_Angle Menu"
 msgstr "కోణము మెనూ (_A)"
 
-#: ../data/totem.ui.h:42
+#: ../data/totem.ui.h:39
 msgid "Go to the angle menu"
 msgstr "కోణం మెనూకు వెళ్ళు"
 
-#: ../data/totem.ui.h:43
+#: ../data/totem.ui.h:40
 msgid "_Chapter Menu"
 msgstr "అధ్యాయం మెనూ (_C)"
 
-#: ../data/totem.ui.h:44
+#: ../data/totem.ui.h:41
 msgid "Go to the chapter menu"
 msgstr "అధ్యాయ మెనూకు వెళ్ళు"
 
-#: ../data/totem.ui.h:45
+#: ../data/totem.ui.h:42
 msgid "_Next Chapter/Movie"
 msgstr "తరువాతి అధ్యాయము/చలనచిత్రము (_N)"
 
-#: ../data/totem.ui.h:46
+#: ../data/totem.ui.h:43
 msgid "Next chapter or movie"
 msgstr "తరువాతి అధ్యాయము లేదా చలనచిత్రం"
 
-#: ../data/totem.ui.h:47
+#: ../data/totem.ui.h:44
 msgid "_Previous Chapter/Movie"
 msgstr "మునుపటి అధ్యాయము/చలనచిత్రము (_P)"
 
-#: ../data/totem.ui.h:48
+#: ../data/totem.ui.h:45
 msgid "Previous chapter or movie"
 msgstr "మునుపటి అధ్యాయము లేదా చలనచిత్రం"
 
-#: ../data/totem.ui.h:49
+#: ../data/totem.ui.h:46
 msgid "_Sound"
 msgstr "శబ్దం (_S)"
 
-#: ../data/totem.ui.h:50
+#: ../data/totem.ui.h:47
 msgid "Volume _Up"
 msgstr "ధ్వని పెంచు (_U)"
 
-#: ../data/totem.ui.h:51
+#: ../data/totem.ui.h:48
 msgid "Increase volume"
 msgstr "ధ్వని పెంచు"
 
-#: ../data/totem.ui.h:52
+#: ../data/totem.ui.h:49
 msgid "Volume _Down"
 msgstr "ధ్వని తగ్గించు (_D)"
 
-#: ../data/totem.ui.h:53
+#: ../data/totem.ui.h:50
 msgid "Decrease volume"
 msgstr "ధ్వని తగ్గించు"
 
-#: ../data/totem.ui.h:54
+#: ../data/totem.ui.h:51
 msgid "_Help"
 msgstr "సహాయం (_H)"
 
-#: ../data/totem.ui.h:55
+#: ../data/totem.ui.h:52
 msgid "_Contents"
 msgstr "విషయసూచిక (_C)"
 
-#: ../data/totem.ui.h:56
+#: ../data/totem.ui.h:53
 msgid "Help contents"
 msgstr "సహాయ అంశాలు"
 
-#: ../data/totem.ui.h:57
+#: ../data/totem.ui.h:54
 msgid "_About"
 msgstr "గురించి (_A)"
 
-#: ../data/totem.ui.h:58
-msgid "About this application"
-msgstr "ఈ అనువర్తనము గురించి"
-
-#: ../data/totem.ui.h:59
-msgid "_Repeat Mode"
-msgstr "పునరావృత విధము (_R)"
-
-#: ../data/totem.ui.h:60
-msgid "Set the repeat mode"
-msgstr "పునరావృత రీతిని అమర్చు"
-
-#: ../data/totem.ui.h:61
-msgid "Shuff_le Mode"
-msgstr "యదృచ్ఛిక రీతి (_l)"
-
-#: ../data/totem.ui.h:62
-msgid "Set the shuffle mode"
-msgstr "యాదృచ్ఛిక రీతిని అమర్చు"
-
-#: ../data/totem.ui.h:63
-msgid "Show _Controls"
-msgstr "నియంత్రణలను చూపించు (_C)"
-
-#: ../data/totem.ui.h:64
-msgid "Show controls"
-msgstr "నియంత్రణలను చూపించు"
-
-#: ../data/totem.ui.h:65
-msgid "S_idebar"
-msgstr "ప్రక్కపట్టీ (_i)"
-
-#: ../data/totem.ui.h:66
-msgid "Show or hide the sidebar"
-msgstr "ప్రక్కపట్టీను చూపించు లేదా దాయి"
-
-#: ../data/totem.ui.h:67
-msgctxt "Aspect ratio"
-msgid "Auto"
-msgstr "స్వయం"
-
-#: ../data/totem.ui.h:68
-msgid "Sets automatic aspect ratio"
-msgstr "స్వయంచాలక రూప నిష్పత్తికి అమర్చుతుంది"
-
-#: ../data/totem.ui.h:69
-msgid "Square"
-msgstr "చతురస్రం"
-
-#: ../data/totem.ui.h:70
-msgid "Sets square aspect ratio"
-msgstr "చతురస్త్ర రూప నిష్పత్తికి అమర్చుతుంది"
-
-#: ../data/totem.ui.h:71
-msgid "4:3 (TV)"
-msgstr "4:3 (టివి)"
-
-#: ../data/totem.ui.h:72
-msgid "Sets 4:3 (TV) aspect ratio"
-msgstr "4:3 (TV) రూప నిష్పత్తికి అమర్చును"
-
-#: ../data/totem.ui.h:73
-msgid "16:9 (Widescreen)"
-msgstr "16:9 (విస్తృతతెర)"
-
-#: ../data/totem.ui.h:74
-msgid "Sets 16:9 (widescreen) aspect ratio"
-msgstr "16:9 (విస్తృతతెర) రూప నిష్పత్తికి అమర్చును"
-
-#: ../data/totem.ui.h:75
-msgid "2.11:1 (DVB)"
-msgstr "2.11:1 (DVB)"
-
-#: ../data/totem.ui.h:76
-msgid "Sets 2.11:1 (DVB) aspect ratio"
-msgstr "2.11:1 (DVB) రూప నిష్పత్తికి అమర్చును"
-
-#: ../data/totem.ui.h:77
-msgid "S_ubtitles"
-msgstr "ఉపశీర్షికలు (_u)"
-
-#: ../data/totem.ui.h:80
-msgid "_Languages"
-msgstr "భాషలు (_L)"
-
-#: ../data/totem.ui.h:81
-msgid "Zoom In"
-msgstr "జూమ్ పెంచు"
-
-#: ../data/totem.ui.h:82
-msgid "Zoom in"
-msgstr "జూమ్ పెంచు"
-
-#: ../data/totem.ui.h:83
-msgid "Skip _Forward"
-msgstr "ముందుకు దాటవేయి (_F)"
-
-#: ../data/totem.ui.h:84
-msgid "Skip forward"
-msgstr "ముందుకు దాటవేయి"
-
-#: ../data/totem.ui.h:85
-msgid "Skip _Backwards"
-msgstr "వెనుకకు దాటవేయి (_B)"
-
-#: ../data/totem.ui.h:86
-msgid "Skip backwards"
-msgstr "వెనకకు దాటవేయి"
-
-#: ../data/totem.ui.h:87
-msgid "14.4 Kbps Modem"
-msgstr "14.4 Kbps మోడెమ్"
-
-#: ../data/totem.ui.h:88
-msgid "19.2 Kbps Modem"
-msgstr "19.2 Kbps మోడెమ్"
-
-#: ../data/totem.ui.h:89
-msgid "28.8 Kbps Modem"
-msgstr "28.8 Kbps మోడెమ్"
-
-#: ../data/totem.ui.h:90
-msgid "33.6 Kbps Modem"
-msgstr "33.6 Kbps మోడెమ్"
-
-#: ../data/totem.ui.h:91
-msgid "34.4 Kbps Modem"
-msgstr "34.4 Kbps మోడెమ్"
-
-#: ../data/totem.ui.h:92
-msgid "56 Kbps Modem/ISDN"
-msgstr "56 Kbps Modem/ISDN"
-
-#: ../data/totem.ui.h:93
-msgid "112 Kbps Dual ISDN/DSL"
-msgstr "112 Kbps Dual ISDN/DSL"
-
-#: ../data/totem.ui.h:94
-msgid "256 Kbps DSL/Cable"
-msgstr "256 Kbps DSL/Cable"
-
-#: ../data/totem.ui.h:95
-msgid "384 Kbps DSL/Cable"
-msgstr "384 Kbps DSL/Cable"
-
-#: ../data/totem.ui.h:96
-msgid "512 Kbps DSL/Cable"
-msgstr "512 Kbps DSL/Cable"
-
-#: ../data/totem.ui.h:97
-msgid "1.5 Mbps T1/Intranet/LAN"
-msgstr "1.5 Mbps T1/Intranet/LAN"
-
-#: ../data/totem.ui.h:98
-msgid "Intranet/LAN"
-msgstr "ఇంట్రానెట్/LAN"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:100
-msgid "Normal"
-msgstr "సాధారణం"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:102
-msgid "Large"
-msgstr "పెద్ద"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:104
-msgid "Extra Large"
-msgstr "మరీ పెద్దది"
-
-#: ../data/totem.ui.h:105 ../src/totem-properties-view.c:228
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5593
-msgid "Stereo"
-msgstr "స్టీరియో"
-
-#: ../data/totem.ui.h:106
-msgid "4-channel"
-msgstr "4-ఛానల్"
-
-#: ../data/totem.ui.h:107
-msgid "4.1-channel"
-msgstr "4.1-ఛానల్"
-
-#: ../data/totem.ui.h:108
-msgid "5.0-channel"
-msgstr "5.0-ఛానల్"
-
-#: ../data/totem.ui.h:109
-msgid "5.1-channel"
-msgstr "5.1-ఛానల్"
-
-#: ../data/totem.ui.h:110
-msgid "AC3 Passthrough"
-msgstr "AC3 Passthrough"
-
-#: ../data/totem.ui.h:111
-msgid "Totem Preferences"
-msgstr "టోటెమ్ ప్రాధాన్యతలు"
-
-#: ../data/totem.ui.h:112
-msgid "Playback"
-msgstr "ప్లేబాక్"
-
-#: ../data/totem.ui.h:113
-msgid "Start playing files from last position"
-msgstr "చివరి స్థానము నుండి ఫైళ్ళను ఆడించు"
-
-#: ../data/totem.ui.h:114
-msgid "Networking"
-msgstr "నెట్‌వర్కింగ్"
-
-#: ../data/totem.ui.h:115
-msgid "Connection _speed:"
-msgstr "అనుసంధానం వేగము (_s):"
-
-#: ../data/totem.ui.h:116
-msgid "Text Subtitles"
-msgstr "పాఠ్య ఉపశీర్షికలు"
-
-#: ../data/totem.ui.h:117
-msgid "_Load subtitle files when movie is loaded"
-msgstr "చలనచిత్రం లోడైనప్పుడు ఉపశీర్షిక ఫైళ్ళను లోడుచేయి (_L)"
-
-#: ../data/totem.ui.h:118
-msgid "_Font:"
-msgstr "ఫాంటు (_F):"
-
-#: ../data/totem.ui.h:119
-msgid "_Encoding:"
-msgstr "ఎన్కోడింగ్ (_E):"
-
-#: ../data/totem.ui.h:120
-msgid "External Chapters"
-msgstr "బాహ్య అధ్యాయాలు"
-
-#: ../data/totem.ui.h:121
-msgid "Load _chapter files when movie is loaded"
-msgstr "చలనచిత్రం లోడైనప్పుడు అధ్యాయ ఫైళ్ళను లోడుచేయి (_c)"
-
-#. Tab label in the Preferences dialogue
-#: ../data/totem.ui.h:124
-msgid "Display"
-msgstr "ప్రదర్శించు"
-
-#: ../data/totem.ui.h:125
-msgid "_Resize the window when a new video is loaded"
-msgstr "ఒక కొత్త వీడియో లోడైనప్పుడు విండో పరిమాణం మార్చు (_R)"
-
-#: ../data/totem.ui.h:126
-msgid "Disable _deinterlacing of interlaced videos"
-msgstr "అంతర్వల్లిక వీడియోల యొక్క విజాలీకరణను అచేతనపరుచు (_d)"
-
-#: ../data/totem.ui.h:127
-msgid "Disable screensaver when playing "
-msgstr "ఆడుతున్నపుడు తెరకాపరిని అచేతపరుచు"
-
-#: ../data/totem.ui.h:129
-msgid "Video or Audio"
-msgstr "ఆడియో లేదా వీడియో"
-
-#: ../data/totem.ui.h:130
-msgid "Visual Effects"
-msgstr "దృశ్య ప్రభావాలు"
-
-#: ../data/totem.ui.h:131
-msgid "Show _visual effects when an audio file is played"
-msgstr "ఆడియో ఫైళ్ళను ఆడిస్తున్నపుడు దృశ్య ప్రభావాలను చూపించు (_v)"
-
-#: ../data/totem.ui.h:132
-msgid "_Type of visualization:"
-msgstr "దృశ్యనీయత యొక్క రకము (_T):"
-
-#: ../data/totem.ui.h:133
-msgid "Visualization _size:"
-msgstr "దృశ్యనీయత పరిమాణము (_s):"
-
-#: ../data/totem.ui.h:134
-msgid "Color Balance"
-msgstr "వర్ణ సమతుల్యత"
-
-#: ../data/totem.ui.h:135
-msgid "_Brightness:"
-msgstr "ప్రకాశత (_B):"
-
-#: ../data/totem.ui.h:136
-msgid "Co_ntrast:"
-msgstr "వ్యత్యాసం (_n):"
-
-#: ../data/totem.ui.h:137
-msgid "Sat_uration:"
-msgstr "సాచురేషన్ (_u):"
-
-#: ../data/totem.ui.h:138
-msgid "_Hue:"
-msgstr "లేతఛాయ (_H):"
-
-#: ../data/totem.ui.h:139
-msgid "Reset to _Defaults"
-msgstr "అప్రమేయాలకు తిరిగివుంచు (_D)"
-
-#: ../data/totem.ui.h:140
-msgid "Audio Output"
-msgstr "ఆడియో అవుట్‌పుట్"
-
-#: ../data/totem.ui.h:141
-msgid "_Audio output type:"
-msgstr "ఆడియో అవుట్‌పుట్ రకము (_A):"
-
-#: ../data/totem.ui.h:145
-msgid "Time seek bar"
-msgstr "సమయం చూపు పట్టీ"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
-msgid "Allow the screensaver to activate when playing audio"
-msgstr "ఆడియో ప్లే అవుచున్నప్పుడు స్క్రీన్‌సేవర్‌ క్రియాశీలము అగుటకు అనుమతించు"
+#: ../data/totem.ui.h:55
+msgid "About this application"
+msgstr "ఈ అనువర్తనము గురించి"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
-msgid ""
-"Allow the screensaver to activate when playing audio. Disable if you have "
-"monitor-powered speakers."
-msgstr ""
-"ఆడియో ప్లే అవుచున్నప్పుడు స్క్రీన్‌సేవర్‌ క్రియాశీలము అగుటకు అనుమతించు. మీకు మానిటర్-స్పీకర్లు వుంటే "
-"అచేతనము చేయి."
+#: ../data/totem.ui.h:56
+msgid "Show _Controls"
+msgstr "నియంత్రణలను చూపించు (_C)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
-msgid "Show visual effects when no video is displayed"
-msgstr "ఎటువంటి వీడియో ప్రదర్శించబడనప్పుడు దృశ్యనీయ ప్రభావాలను చూపించు"
+#: ../data/totem.ui.h:57
+msgid "Show controls"
+msgstr "నియంత్రణలను చూపించు"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
-msgid "Show visual effects when playing an audio only file."
-msgstr "ఆడియో ఫైల్ ఆడుతున్నపుడు మాత్రమే దృశ్యనీయ ప్రభావాలను చూపించు"
+#: ../data/totem.ui.h:58
+msgid "S_idebar"
+msgstr "ప్రక్కపట్టీ (_i)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
-msgid "Name of the visual effects plugin"
-msgstr "దృశ్యత ప్రభావాల ప్లగిన్ యొక్క పేరు"
+#: ../data/totem.ui.h:59
+msgid "Show or hide the sidebar"
+msgstr "ప్రక్కపట్టీను చూపించు లేదా దాయి"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
-msgid "The brightness of the video"
-msgstr "వీడియో యొక్క కాంతిప్రకాశము"
+#: ../data/totem.ui.h:60
+msgctxt "Aspect ratio"
+msgid "Auto"
+msgstr "స్వయం"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
-msgid "The contrast of the video"
-msgstr "వీడియో యొక్క మంధ్రత"
+#: ../data/totem.ui.h:61
+msgid "Sets automatic aspect ratio"
+msgstr "స్వయంచాలక రూప నిష్పత్తికి అమర్చుతుంది"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
-msgid "The hue of the video"
-msgstr "వీడియో యొక్క హ్యూ"
+#: ../data/totem.ui.h:62
+msgid "Square"
+msgstr "చతురస్రం"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
-msgid "The saturation of the video"
-msgstr "వీడియోయొక్క సాట్యురేషన్"
+#: ../data/totem.ui.h:63
+msgid "Sets square aspect ratio"
+msgstr "చతురస్త్ర రూప నిష్పత్తికి అమర్చుతుంది"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
-msgid "Resize the canvas automatically on file load"
-msgstr "ఫైల్ లోడునందు పటము(కాన్వాసు)ను స్వయంచాలకంగా పునఃపరిమాణం చేయి"
+#: ../data/totem.ui.h:64
+msgid "4:3 (TV)"
+msgstr "4:3 (టివి)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
-msgid "Network connection speed"
-msgstr "నెట్‌వర్కు అనుసంధానం వేగం"
+#: ../data/totem.ui.h:65
+msgid "Sets 4:3 (TV) aspect ratio"
+msgstr "4:3 (TV) రూప నిష్పత్తికి అమర్చును"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
-msgid ""
-"Approximate network connection speed, used to select quality on media over "
-"the network."
-msgstr ""
-"ఇంచుమించు నెట్‌వర్క్ అనుసంధాన వేగం, నెట్‌వర్క్ నందు మాధ్యమ నాణ్యతను ఎంపికచేయుటకు వాడబడుతుంది."
+#: ../data/totem.ui.h:66
+msgid "16:9 (Widescreen)"
+msgstr "16:9 (విస్తృతతెర)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
-msgid "Repeat mode"
-msgstr "పునరావృత విధము"
+#: ../data/totem.ui.h:67
+msgid "Sets 16:9 (widescreen) aspect ratio"
+msgstr "16:9 (విస్తృతతెర) రూప నిష్పత్తికి అమర్చును"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
-msgid "Shuffle mode"
-msgstr "యాదృచ్ఛిక విధం"
+#: ../data/totem.ui.h:68
+msgid "2.11:1 (DVB)"
+msgstr "2.11:1 (DVB)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
-msgid "Whether to disable deinterlacing for interlaced movies"
-msgstr "అంతర్వల్లుకోబడిన చలనచిత్రాలకు విజాలీకరణను అచేతనము చేయవలెనావద్దా"
+#: ../data/totem.ui.h:69
+msgid "Sets 2.11:1 (DVB) aspect ratio"
+msgstr "2.11:1 (DVB) రూప నిష్పత్తికి అమర్చును"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
-msgid "Whether to enable debug for the playback engine"
-msgstr "ప్లేబ్యాక్ యంత్రం కొరకు డీబగ్‌ను చేతనము చేయవలెనావద్దా"
+#: ../data/totem.ui.h:70
+msgid "S_ubtitles"
+msgstr "ఉపశీర్షికలు (_u)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
-msgid "Type of audio output to use"
-msgstr "ఉపయోగించుటకు ఆడియో అవుట్‌పుట్ యొక్క రకము"
+#: ../data/totem.ui.h:73
+msgid "_Languages"
+msgstr "భాషలు (_L)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
-msgid "Visualization quality setting"
-msgstr "దృశ్యనీయ నాణ్యతా అమరిక"
+#: ../data/totem.ui.h:74
+msgid "Zoom In"
+msgstr "అతిరూపించు"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
-msgid "Quality setting for the audio visualization."
-msgstr "ఆడియో దృశ్యమానతకు నాణ్యతా అమరిక."
+#: ../data/totem.ui.h:75
+msgid "Zoom in"
+msgstr "అతిరూపించు"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
-msgid "Network buffering threshold"
-msgstr "నెట్‌వర్కు బఫరింగ్ త్రెష్‌హోల్డ్"
+#: ../data/totem.ui.h:76
+msgid "Skip _Forward"
+msgstr "ముందుకు దాటవేయి (_F)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
-msgid ""
-"Amount of data to buffer for network streams before starting to display the "
-"stream (in seconds)."
-msgstr ""
-"ప్రవాహాన్ని ప్రదర్శించుటకు ముందు నెట్‌వర్కు ప్రవాహాల కొరకు బఫర్ చేయవలసిన డేటా మొత్తం (సెకనులలో)."
+#: ../data/totem.ui.h:77
+msgid "Skip forward"
+msgstr "ముందుకు దాటవేయి"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
-msgid "Subtitle font"
-msgstr "ఉపశీర్షిక ఫాంటు"
+#: ../data/totem.ui.h:78
+msgid "Skip _Backwards"
+msgstr "వెనుకకు దాటవేయి (_B)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
-msgid "Pango font description for subtitle rendering."
-msgstr "ఉపశీర్షిక రెండరింగు కొరకు పాంగో ఫాంటు వివరణ."
+#: ../data/totem.ui.h:79
+msgid "Skip backwards"
+msgstr "వెనకకు దాటవేయి"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
-msgid "Subtitle encoding"
-msgstr "ఉపశీర్షిక ఎన్కోడింగ్"
+#: ../data/totem.ui.h:82
+msgid "Time seek bar"
+msgstr "సమయం చూపు పట్టీ"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
-msgid "Encoding character set for subtitle."
-msgstr "ఉపశీర్షిక కొరకు అక్షరసమితి ఎన్కోడింగు."
+#: ../data/uri.ui.h:1
+msgid "Enter the _address of the file you would like to open:"
+msgstr "మీరు తెరువాలనుకుంటున్న దస్త్రము యొక్క చిరునామాను ప్రవేశపెట్టండి (_a):"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
-msgid "Default location for the \"Open...\" dialogs"
-msgstr "\"తెరువు...\" డైలాగుల కొరకు అప్రమేయ స్థానం"
+#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
+msgid "_Add to Playlist"
+msgstr "ప్రదర్శనజాబితాకు జతచేయి (_A)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
-msgid ""
-"Default location for the \"Open...\" dialogs. Default is the current "
-"directory."
-msgstr "\"తెరువు...\" సంభాషణల కొరకు అప్రమేయ స్థానం, ప్రస్తుత డైరెక్టరీ అప్రమేయం."
+#: ../data/video-list.ui.h:2
+msgid "Add the video to the playlist"
+msgstr "వీడియోను ప్రదర్శనజాబితాకు జతచేయి"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
-msgid "Default location for the \"Take Screenshot\" dialogs"
-msgstr "\"తెరపట్టు తీయి\" డైలాగ్స్ కొరకు అప్రమేయ స్థానం"
+#: ../src/backend/bacon-video-widget.c:1641
+msgid "Password requested for RTSP server"
+msgstr "RTSP సేవకం కొరకు సంకేతపదమును అభ్యర్థించింది"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
-msgid ""
-"Default location for the \"Take Screenshot\" dialogs. Default is the "
-"Pictures directory."
-msgstr "\"తెరపట్టును తీయి\" సంభాషణలకు అప్రమేయ స్థానం. చిత్రాల డైరెక్టరీ అప్రమేయం."
+#: ../src/backend/bacon-video-widget.c:2927
+#, c-format
+msgid "Audio Track #%d"
+msgstr "ఆడియో ట్రాక్ #%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
-msgid "Whether to disable the plugins in the user's home directory"
-msgstr "వాడుకరి నివాస సంచయంలోని ప్లగిన్లు అచేతనము చేయవలెనా వద్దా"
+#: ../src/backend/bacon-video-widget.c:2931
+#, c-format
+msgid "Subtitle #%d"
+msgstr "ఉపశీర్షిక #%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
-msgid "Whether to disable the keyboard shortcuts"
-msgstr "కీబోర్డు అడ్డదారులను అచేతనం చేయలా వద్దా"
+#: ../src/backend/bacon-video-widget.c:3328
+msgid "The server you are trying to connect to is not known."
+msgstr "మీరు అనుసంధానించుటకు ప్రయత్నిస్తున్న సేవకం తెలియదు."
+
+#: ../src/backend/bacon-video-widget.c:3331
+msgid "The connection to this server was refused."
+msgstr "ఈ సేవకానికి అనుసంధానము తిరస్కరించబడింది."
+
+#: ../src/backend/bacon-video-widget.c:3334
+msgid "The specified movie could not be found."
+msgstr "పేర్కొన్న చలనచిత్రం కనపడలేదు."
+
+#: ../src/backend/bacon-video-widget.c:3341
+msgid "The server refused access to this file or stream."
+msgstr "సేవకము ఈ దస్త్రం లేదా ప్రవాహం ప్రాప్తిని నిరాకరించింది."
+
+#: ../src/backend/bacon-video-widget.c:3347
+msgid "Authentication is required to access this file or stream."
+msgstr "ఈ దస్త్రాన్ని లేక ప్రవాహాన్ని ప్రాప్తించుటకై ధృవీకరణ అవసరం."
+
+#: ../src/backend/bacon-video-widget.c:3354
+msgid "You are not allowed to open this file."
+msgstr "ఈ దస్త్రాన్ని ఆడించుటకు మీకు అనుమతిలేదు."
+
+#: ../src/backend/bacon-video-widget.c:3359
+msgid "This location is not a valid one."
+msgstr "స్థానము సరియైనది కాదు."
+
+#: ../src/backend/bacon-video-widget.c:3367
+msgid "The movie could not be read."
+msgstr "చలనచిత్రము చదువుట వీలుకాదు."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
-msgid "Whether to autoload text subtitle files when a movie is loaded"
-msgstr "చలనచిత్రము లోడైనప్పుడు పాఠ్య ఉపశీర్షిక ఫైళ్ళు స్వయంచాలకంగా లోడవ్వాలా వద్దా"
+#. should be exactly one missing thing (source or converter)
+#: ../src/backend/bacon-video-widget.c:3390
+#: ../src/backend/bacon-video-widget.c:3398
+#, c-format
+msgid "The playback of this movie requires a %s plugin which is not installed."
+msgid_plural ""
+"The playback of this movie requires the following decoders which are not "
+"installed:\n"
+"\n"
+"%s"
+msgstr[0] "ఈ చలనచిత్ర ప్లేబ్యాక్‌కు %s ప్లగిన్ అవసరము కాని అది స్థాపించిలేదు."
+msgstr[1] ""
+"ఈ చలనచిత్ర ప్లేబ్యాక్‌కు క్రింది పేర్కొన్న డీకోడర్లు అవసరము కాని అవి స్థాపించిలేవు:\n"
+"\n"
+"%s"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
-msgid "Whether to autoload external chapter files when a movie is loaded"
-msgstr "చలనచిత్రము లోడైనప్పుడు బాహ్య అధ్యాయ ఫైళ్ళను స్వయంచాలకంగా లోడవ్వాలా వద్దా"
+#: ../src/backend/bacon-video-widget.c:3409
+msgid ""
+"An audio or video stream is not handled due to missing codecs. You might "
+"need to install additional plugins to be able to play some types of movies"
+msgstr ""
+"తప్పిపోయిన కోడెక్ల వలన ఆడియో లేదా వీడియో ప్రవాహం సంభాలించలేము. మీరు కొన్ని రకాల సినిమాలను ఆడించాలంటే అదనపు "
+"చొప్పంతలు స్థాపించాలి"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+#: ../src/backend/bacon-video-widget.c:3419
 msgid ""
-"Whether to remember the position of played audio/video files when pausing or "
-"closing them"
-msgstr "ఆడియో/వీడియో ఫైళ్ళను నిలిపివేసినప్పుడు లేదా మూసివేసినప్పుడు వాటి స్థానమును గుర్తుంచుకొనవలెనా"
+"This file cannot be played over the network. Try downloading it locally "
+"first."
+msgstr "ఈ దస్త్రాన్ని నెట్‌వర్కుపై ఆడించలేదు.  దీనిని ముందు డిస్కునకు దించుకుని ప్రయత్నించండి."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:35
-msgid "Active plugins list"
-msgstr "క్రియాశీల ప్లగిన్ల జాబితా"
+#: ../src/backend/bacon-video-widget.c:5475 ../src/totem-properties-view.c:227
+msgid "Surround"
+msgstr "చుట్టూ"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:36
-msgid ""
-"A list of the names of the plugins which are currently active (loaded and "
-"running)."
-msgstr "ప్రస్తుతం క్రియాశీలకంగా ఉన్న ప్లగిన్ల యొక్క పేర్ల జాబితా (లోడైనవి మరియు నడుస్తున్నవి)."
+#: ../src/backend/bacon-video-widget.c:5477 ../src/totem-properties-view.c:229
+msgid "Mono"
+msgstr "ఒంటరి"
 
-#: ../data/uri.ui.h:1
-msgid "Enter the _address of the file you would like to open:"
-msgstr "మీరు తెరువాలనుకుంటున్న ఫైల్ యొక్క చిరునామాను ప్రవేశపెట్టండి (_a):"
+#: ../src/backend/bacon-video-widget.c:5762
+msgid "Media contains no supported video streams."
+msgstr "మాధ్యమం యెటువంటి మద్దతిచ్చు వీడియో స్ట్రీమ్సును కలిగిలేదు."
+
+#: ../src/backend/bacon-video-widget.c:5944
+msgid ""
+"Some necessary plug-ins are missing. Make sure that the program is correctly "
+"installed."
+msgstr "కొన్ని అవసరమైన చొప్పింతలు తప్పిపోయినవి. కార్యక్రమం సరిగ్గా స్థాపించబడితే నిర్ధారించుకోండి."
 
 #: ../src/eggdesktopfile.c:165
 #, c-format
 msgid "File is not a valid .desktop file"
-msgstr "ఫైల్ సరైన .desktop ఫైల్ కాదు"
+msgstr "దస్త్రం సరైన .desktop దస్త్రము కాదు"
 
 #: ../src/eggdesktopfile.c:188
 #, c-format
 msgid "Unrecognized desktop file Version '%s'"
-msgstr "గుర్తించబడని డెస్కుటాపు ఫైలు వర్షన్ '%s'"
+msgstr "గుర్తించబడని డెస్కుటాపు దస్త్ర రూపాంతరము '%s'"
 
 #: ../src/eggdesktopfile.c:968
 #, c-format
@@ -906,15 +965,15 @@
 #: ../src/eggfileformatchooser.c:240
 #, c-format
 msgid "File _Format: %s"
-msgstr "ఫైల్ ఫార్మేట్ (_F): %s"
+msgstr "దస్త్ర ఆకృతి (_F): %s"
 
 #: ../src/eggfileformatchooser.c:379
 msgid "All Files"
-msgstr "అన్ని ఫైళ్ళు"
+msgstr "అన్ని దస్త్రాలు"
 
 #: ../src/eggfileformatchooser.c:380
 msgid "All Supported Files"
-msgstr "అన్ని మద్దతునిచ్చు ఫైళ్ళు"
+msgstr "అన్ని మద్దతునిచ్చు దస్త్రాలు"
 
 #: ../src/eggfileformatchooser.c:389
 msgid "By Extension"
@@ -922,7 +981,7 @@
 
 #: ../src/eggfileformatchooser.c:404
 msgid "File Format"
-msgstr "ఫైల్ ఫార్మేట్"
+msgstr "దస్త్ర ఆకృతి"
 
 #: ../src/eggfileformatchooser.c:422
 msgid "Extension(s)"
@@ -936,13 +995,13 @@
 "%s'. Please make sure to use a known extension for that file or manually "
 "choose a file format from the list below."
 msgstr ""
-"`%s' కొరకు మీరు వుపయోగించాలని అనుకొనుచున్న ఫైలు ఫార్మేట్లను ఈ ప్రోగ్రామ్ గుర్తించలేదు. దయచేసి ఆ "
-"ఫైలుకు తెలిసిన పొడిగింతను ఉపయోగించునట్లు చూడండి లేదా మానవీయంగా ఫైలు ఫార్మేట్‌ను క్రింది జాబితా నుండి "
+"`%s' కొరకు మీరు వుపయోగించాలని అనుకొనుచున్న దస్త్ర ఆకృతులను ఈ కార్యక్రమం గుర్తించలేదు. దయచేసి ఆ "
+"దస్త్రానికి తెలిసిన పొడిగింతను ఉపయోగించునట్లు చూడండి లేదా మానవీయంగా దస్త్ర ఆకృతిని క్రింది జాబితా నుండి "
 "ఎంచుకోండి."
 
 #: ../src/eggfileformatchooser.c:664
 msgid "File format not recognized"
-msgstr "ఫైలు ఫార్మేట్ గుర్తించబడలేదు"
+msgstr "దస్త్ర ఆకృతి గుర్తించబడలేదు"
 
 #: ../src/eggsmclient.c:226
 msgid "Disable connection to session manager"
@@ -950,7 +1009,7 @@
 
 #: ../src/eggsmclient.c:229
 msgid "Specify file containing saved configuration"
-msgstr "దాచివున్న స్వరూపణను కలిగివున్న ఫైలు తెలియజేయి"
+msgstr "దాచివున్న స్వరూపణను కలిగివున్న దస్త్రము తెలియజేయి"
 
 #: ../src/eggsmclient.c:229
 msgid "FILE"
@@ -972,6 +1031,31 @@
 msgid "Show session management options"
 msgstr "సెషన్ నిర్వహణా ఐచ్చికాలను చూపించు"
 
+#. hour:minutes:seconds
+#. Translators: This is a time format, like "9:05:02" for 9
+#. * hours, 5 minutes, and 2 seconds. You may change ":" to
+#. * the separator that your locale uses or use "%Id" instead
+#. * of "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:56
+#: ../src/plugins/skipto/totem-time-entry.c:57
+#, c-format
+msgctxt "long time format"
+msgid "%d:%02d:%02d"
+msgstr "%d:%02d:%02d"
+
+#. minutes:seconds
+#. Translators: This is a time format, like "5:02" for 5
+#. * minutes and 2 seconds. You may change ":" to the
+#. * separator that your locale uses or use "%Id" instead of
+#. * "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:65
+#, c-format
+msgctxt "short time format"
+msgid "%d:%02d"
+msgstr "%d:%02d"
+
 #. Title
 #. Artist
 #. Album
@@ -1076,10 +1160,14 @@
 msgstr[0] "సెకనుకు %d  చట్రం"
 msgstr[1] "సెకనుకు %d చట్రములు"
 
-#: ../src/totem-audio-preview.c:168
+#: ../src/totem-audio-preview.c:137
 msgid "Audio Preview"
 msgstr "ఆడియో మునుజూపు"
 
+#: ../src/totem.c:239
+msgid "Verify your system installation. Totem will now exit."
+msgstr " మీ  నెలకొల్పిన వ్యవస్థను పరీక్షించండి. టోటెమ్ బయటకుపోతొంది"
+
 #: ../src/totem-cell-renderer-video.c:126
 msgid "Unknown video"
 msgstr "తెలియని వీడియో"
@@ -1092,9 +1180,9 @@
 msgid "Cancel"
 msgstr "రద్దుచేయి"
 
-#: ../src/totem-fullscreen.c:616
+#: ../src/totem-fullscreen.c:573
 msgid "No File"
-msgstr "ఫైల్ లేదు"
+msgstr "దస్త్రం లేదు"
 
 #: ../src/totem-interface.c:181 ../src/totem-interface.c:224
 #, c-format
@@ -1103,14 +1191,14 @@
 
 #: ../src/totem-interface.c:181
 msgid "The file does not exist."
-msgstr "ఫైల్ ఉనికిలో లేదు."
+msgstr "దస్త్రం ఉనికిలో లేదు."
 
 #: ../src/totem-interface.c:183 ../src/totem-interface.c:185
 #: ../src/totem-interface.c:226 ../src/totem-interface.c:228
 msgid "Make sure that Totem is properly installed."
 msgstr "టోటెమ్ సక్రమంగా స్థాపించబడిందో లేదో సరిచూడండి."
 
-#: ../src/totem-interface.c:347
+#: ../src/totem-interface.c:357
 msgid ""
 "Totem 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 "
@@ -1120,7 +1208,7 @@
 "టోటెమ్ ఒక ఉచిత సాఫ్ట్‍వేర్; మీరు దానిని మరలపంచవచ్చు ఫ్రీ సాఫ్ట్‍వేర్ ఫౌండేషన్ వెలువరిచిన గ్నూ సర్వసామన్యమైన "
 "ప్రజా లైసెన్సు వివరణం 2 లైసెన్సు లేదా వేరే (మీ ఐచ్చికం వద్ద) వివరణల ప్రకారం మార్చవచ్చు."
 
-#: ../src/totem-interface.c:351
+#: ../src/totem-interface.c:361
 msgid ""
 "Totem is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -1130,7 +1218,7 @@
 "టోటెమ్ ఉపయోగపడుతుందనే నమ్మకంతో పంపిణీచేయబడుతోంది, అయితే ఏ హామీ లేకుండా; వ్యాపారసంబందంగా కాని లేదా ఒక "
 "నిర్దిష్ట అవసరానికిచెందినదని కాని హామీ లేదు. ఎక్కువ సమాచారం కొరకు GNU జనరల్ పబ్లిక్ లైసెన్స్ ను చూడండి."
 
-#: ../src/totem-interface.c:355
+#: ../src/totem-interface.c:365
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Totem; if not, write to the Free Software Foundation, Inc., 59 Temple Place, "
@@ -1140,200 +1228,104 @@
 "Software Foundation, Inc., 59 Temple place, Suite 330, Boston, MA  "
 "02111-1307  USA కి వ్రాయండి."
 
-#: ../src/totem-interface.c:358
+#: ../src/totem-interface.c:368
 msgid ""
 "Totem contains an exception to allow the use of proprietary GStreamer "
 "plugins."
 msgstr "యాజమాన్య జిస్ట్రీమర్ ప్లగిన్ల వాడకం అనుమతించుటకు టోటెమ్ మినహాయింపు కలిగివుంటుంది."
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:190
+#: ../src/totem-menu.c:291
 msgid "None"
 msgstr "ఏదీకాదు"
 
-#. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:195
-msgctxt "Language"
-msgid "Auto"
-msgstr "స్వయం"
-
-#. Translators:
-#. * This is not a JPEG image, but a disc image, for example,
-#. * an ISO file
-#: ../src/totem-menu.c:765
-#, c-format
-msgid "Play Image '%s'"
-msgstr "'%s' బొమ్మను ఆడించు"
-
-#: ../src/totem-menu.c:768 ../src/totem-menu.c:851
-#, c-format
-msgid "device%d"
-msgstr "పరికరము%d"
-
-#: ../src/totem-menu.c:848
-#, c-format
-msgid "Play Disc '%s'"
-msgstr "'%s' డిస్కు ఆడించు"
-
-#. This lists the back-end type and version, such as
-#. * Movie Player using GStreamer 0.10.1
-#: ../src/totem-menu.c:1189
-#, c-format
-msgid "Movie Player using %s"
-msgstr "చలనచిత్ర ప్రదర్శకం %s వాడుతున్నది"
+#. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
+#: ../src/totem-menu.c:296
+msgctxt "Language"
+msgid "Auto"
+msgstr "స్వయం"
 
-#: ../src/totem-menu.c:1193
+#: ../src/totem-menu.c:789
 msgid "Copyright © 2002-2009 Bastien Nocera"
 msgstr "నకలుహక్కు © 2002-2009 బాస్టియన్ నొసెరా"
 
-#: ../src/totem-menu.c:1198
+#: ../src/totem-menu.c:794
 msgid "translator-credits"
 msgstr ""
 "Prajasakti Localisation Team \n"
-"Praveen Illa , 2011."
+"Praveen Illa , 2011-12."
 
-#: ../src/totem-menu.c:1202
+#: ../src/totem-menu.c:798
 msgid "Totem Website"
 msgstr "టోటెమ్ వెబ్‌సైట్"
 
-#: ../src/totem-menu.c:1236
+#: ../src/totem-menu.c:829
 msgid "Configure Plugins"
-msgstr "ప్లగిన్లను స్వరూపించు"
+msgstr "చొప్పింతలను స్వరూపించు"
+
+#: ../src/totem-object.c:162
+#, c-format
+msgid ""
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"%s\n"
+"అందుబాటులోవున్న మొత్తం ఆదేశ వరుస ఐచ్చికముల జాబితాకొరకు '%s --help' నడుపండి.\n"
 
 #. Translators: %s is the totem version number
-#: ../src/totem-object.c:471
+#: ../src/totem-object.c:591
 #, c-format
 msgid "Totem %s"
 msgstr "టోటెమ్ %s"
 
-#: ../src/totem-object.c:1047 ../browser-plugin/totem-plugin-viewer.c:367
-msgid "Playing"
-msgstr "ఆడుతుంది"
-
-#: ../src/totem-object.c:1049 ../src/totem-options.c:52
+#: ../src/totem-object.c:1168 ../src/totem-options.c:52
 msgid "Pause"
 msgstr "నిలిపివేయి"
 
-#: ../src/totem-object.c:1054 ../browser-plugin/totem-plugin-viewer.c:363
-msgid "Paused"
-msgstr "నిలిపివేయబడింది"
-
-#: ../src/totem-object.c:1056 ../src/totem-object.c:1066
+#: ../src/totem-object.c:1175 ../src/totem-object.c:1185
 #: ../src/totem-options.c:51
 msgid "Play"
 msgstr "ఆడించు"
 
-#: ../src/totem-object.c:1061 ../src/totem-object.c:1659
-#: ../src/totem-statusbar.c:115 ../browser-plugin/totem-plugin-viewer.c:351
-msgid "Stopped"
-msgstr "ఆపివేయబడింది"
-
-#: ../src/totem-object.c:1142 ../src/totem-object.c:1169
-#: ../src/totem-object.c:1799 ../src/totem-object.c:1963
+#: ../src/totem-object.c:1267 ../src/totem-object.c:1294
+#: ../src/totem-object.c:1787 ../src/totem-object.c:1942
 #, c-format
 msgid "Totem could not play '%s'."
 msgstr "'%s'ను టోటెమ్ ఆడించలేదు."
 
-#: ../src/totem-object.c:1246
-#, c-format
-msgid ""
-"Totem could not play this media (%s) although a plugin is present to handle "
-"it."
-msgstr "ఈ మాధ్యమం (%s)ను వ్యవహరించుటకు ప్లగిన్ ఉన్నపట్టికి టోటెమ్ ఆడించలేదు."
-
-#: ../src/totem-object.c:1247
-msgid ""
-"You might want to check that a disc is present in the drive and that it is "
-"correctly configured."
-msgstr "ఈ డ్రైవులో డిస్కు ఉందా మరియూ అది సరిగ్గ రూపకరణ చేయబడ్డదా తనిఖీ చేయదలిచారా."
-
-#: ../src/totem-object.c:1255
-msgid "More information about media plugins"
-msgstr "మాధ్యమం ప్లగిన్ల గురించి మరింత సమాచారము"
-
-#: ../src/totem-object.c:1256
-msgid ""
-"Please install the necessary plugins and restart Totem to be able to play "
-"this media."
-msgstr "ఈ మాద్యమమును ఆడించుటకు అవసరమైన ప్లగిన్ లను నెలకొల్పి టోటెమ్ నుపునఃప్రారంబించండి"
-
-#: ../src/totem-object.c:1258
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because it does not have the "
-"appropriate plugins to be able to read from the disc."
-msgstr ""
-"టోటెమ్ (%s) రకం మాధ్యమాని ఆడించలేదు ఎందుకంటే దీనివద్ద డిస్కునుండి చదువగల్గుటకు సరిపోవు ప్లగ్‌యిన్సు "
-"లేవు."
-
-#: ../src/totem-object.c:1260
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because you do not have the "
-"appropriate plugins to handle it."
-msgstr ""
-"టోటెమ్ (%s)ఈ రకం మాద్యమమును ఆడించలేదు ఎందుకంటె మీ వద్ద ఇది చెపట్టుటకు సరైన ప్లగిన్ లు లేవు "
-
-#: ../src/totem-object.c:1263
-#, c-format
-msgid "Totem cannot play this type of media (%s) because it is not supported."
-msgstr "టోటెమ్ (%s) రకం మాద్యమమును ఆడించలేదు ఎందుకంటె అది మద్దతునీయదు."
-
-#: ../src/totem-object.c:1264
-msgid "Please insert another disc to play back."
-msgstr "ప్లే బ్యాక్‌ కొరకు మరియొక డిస్కును ప్రవేశపెట్టండి."
-
-#: ../src/totem-object.c:1300
-msgid "Totem was not able to play this disc."
-msgstr "టోటెమ్ ఈ డిస్కును ఆడించలేకపోతుంది."
-
-#: ../src/totem-object.c:1301 ../src/totem-object.c:4229
-msgid "No reason."
-msgstr "కారణం లేదు"
-
-#: ../src/totem-object.c:1315
-msgid "Totem does not support playback of Audio CDs"
-msgstr "టోటెమ్ అనునది ఆడియో CDల ప్లే బ్యాక్‌కు మద్దతీయదు"
-
-#: ../src/totem-object.c:1316
-msgid "Please consider using a music player or a CD extractor to play this CD"
-msgstr "ఈ CD ఆడించుటకు దయచేసి సంగీత ప్రదర్శకాన్ని లేదా CD ఎక్స్‍ట్రాక్టర్‌ను వాడండి"
-
-#: ../src/totem-object.c:1805
+#: ../src/totem-object.c:1793
 msgid "No error message"
 msgstr "ఎటువంటి దోష సందేశములేదు"
 
-#: ../src/totem-object.c:2154
+#: ../src/totem-object.c:2133
 msgid "Totem could not display the help contents."
 msgstr "టోటెమ్ సహాయ సారంను ప్రదర్శించలేకపోయింది."
 
-#: ../src/totem-object.c:2493 ../src/totem-object.c:2495
-#: ../browser-plugin/totem-plugin-viewer.c:1417
-msgid "An error occurred"
-msgstr "ఒక దోషం ఎదురైంది"
-
-#: ../src/totem-object.c:4064 ../src/totem-object.c:4066
+#: ../src/totem-object.c:4019 ../src/totem-object.c:4021
 msgid "Previous Chapter/Movie"
 msgstr "మునుపటి అధ్యాయం/చలనచిత్రము"
 
-#: ../src/totem-object.c:4073 ../src/totem-object.c:4075
+#: ../src/totem-object.c:4028 ../src/totem-object.c:4030
 msgid "Play / Pause"
 msgstr "నడుపు / నిలిపివుంచు"
 
-#: ../src/totem-object.c:4083 ../src/totem-object.c:4085
+#: ../src/totem-object.c:4038 ../src/totem-object.c:4040
 msgid "Next Chapter/Movie"
 msgstr "తరువాతి అధ్యాయం/చలనచిత్రము"
 
-#. Translators: this is the tooltip text for the fullscreen button in the controls box in Totem's main window.
 #. Translators: this is the accessibility text for the fullscreen button in the controls box in Totem's main window.
-#: ../src/totem-object.c:4097 ../src/totem-object.c:4099
+#: ../src/totem-object.c:4051 ../src/totem-object.c:4053
 msgid "Fullscreen"
 msgstr "నిండుతెర"
 
-#: ../src/totem-object.c:4229
+#: ../src/totem-object.c:4184
 msgid "Totem could not startup."
 msgstr "టోటెమ్ ప్రారంభించలేకపోయింది."
 
+#: ../src/totem-object.c:4184
+msgid "No reason."
+msgstr "కారణం లేదు"
+
 #: ../src/totem-open-location.c:182
 msgid "Open Location..."
 msgstr "స్థానమును తెరువు..."
@@ -1407,117 +1399,111 @@
 msgid "Movies to play"
 msgstr "ఆడబోయే చలనచిత్రాలు"
 
-#: ../src/totem-options.c:117
+#: ../src/totem-options.c:79
+msgid "- Play movies and songs"
+msgstr "- చలనచిత్రములను మరియు పాటలను ఆడించండి"
+
+#: ../src/totem-options.c:142
 msgid "Can't enqueue and replace at the same time"
 msgstr "వరుసలో చేర్చుట మరియు ఒకే సమయంలో ప్రతిస్థాపించుట కుదరదు"
 
 #. By extension entry
-#: ../src/totem-playlist.c:161
+#: ../src/totem-playlist.c:162
 msgid "MP3 ShoutCast playlist"
 msgstr "MP3 ShoutCast ప్రదర్శనజాబితా"
 
-#: ../src/totem-playlist.c:162
+#: ../src/totem-playlist.c:163
 msgid "MP3 audio (streamed)"
 msgstr "ఎంపీ3 ఆడియో (streamed)"
 
-#: ../src/totem-playlist.c:163
+#: ../src/totem-playlist.c:164
 msgid "MP3 audio (streamed, DOS format)"
 msgstr "MP3 audio (streamed, DOS format)"
 
-#: ../src/totem-playlist.c:164
+#: ../src/totem-playlist.c:165
 msgid "XML Shareable Playlist"
 msgstr "XML పంచుకోదగిన ప్రదర్శనజాబితా"
 
 #. This is "Title 3", where title is a DVD title
 #. * Note: NOT a DVD chapter
-#: ../src/totem-playlist.c:347
+#: ../src/totem-playlist.c:348
 #, c-format
 msgid "Title %d"
 msgstr "శీర్షిక %d"
 
-#: ../src/totem-playlist.c:446
+#: ../src/totem-playlist.c:447
 msgid "Could not save the playlist"
 msgstr "ప్రదర్శనజాబితాను దాచలేకపోయింది"
 
-#: ../src/totem-playlist.c:1021
+#: ../src/totem-playlist.c:1022
 msgid "Save Playlist"
 msgstr "ప్రదర్శనజాబితాను భద్రపరుచు"
 
 #. translators: Playlist is the default saved playlist filename,
 #. * without the suffix
-#: ../src/totem-playlist.c:1033 ../src/totem-playlist.c:1264
-#: ../src/totem-sidebar.c:142
+#: ../src/totem-playlist.c:1034 ../src/totem-playlist.c:1263
+#: ../src/totem-sidebar.c:145
 msgid "Playlist"
 msgstr "ప్రదర్శనజాబితా"
 
-#: ../src/totem-playlist.c:1857
+#: ../src/totem-playlist.c:1862
 #, c-format
 msgid "The playlist '%s' could not be parsed. It might be damaged."
 msgstr "ప్రదర్శనజాబితా '%s' పార్స్ చేయలేకపోయింది, బహుశా అది పాడైవుండవచ్చు."
 
-#: ../src/totem-playlist.c:1858
+#: ../src/totem-playlist.c:1863
 msgid "Playlist error"
 msgstr "ప్రదర్శనజాబితాలో దోషం"
 
-#: ../src/totem-preferences.c:295
+#: ../src/totem-preferences.c:297
 msgid "Preferences"
 msgstr "ప్రాధాన్యతలు"
 
-#: ../src/totem-preferences.c:451
+#: ../src/totem-preferences.c:445
 msgid "Select Subtitle Font"
 msgstr "ఉపశీర్షిక ఫాంటును ఎంచుకొను"
 
-#: ../src/totem-properties-main.c:115 ../src/totem-properties-view.c:266
+#: ../src/totem-properties-main.c:116 ../src/totem-properties-view.c:269
 msgid "Audio/Video"
 msgstr "ఆడియో/వీడియో"
 
-#: ../src/totem-properties-view.c:128
+#: ../src/totem-properties-view.c:131
 msgid "N/A"
 msgstr "వర్తించదు"
 
-#: ../src/totem-properties-view.c:157
+#: ../src/totem-properties-view.c:160
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 msgctxt "Stream bit rate"
 msgid "N/A"
 msgstr "వర్తించదు"
 
-#: ../src/totem-properties-view.c:160
+#: ../src/totem-properties-view.c:163
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: ../src/totem-properties-view.c:177
+#: ../src/totem-properties-view.c:180
 #: ../src/plugins/properties/totem-movie-properties.c:149
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../src/totem-properties-view.c:209
+#: ../src/totem-properties-view.c:212
 #: ../src/plugins/properties/totem-movie-properties.c:166
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: ../src/totem-properties-view.c:216
+#: ../src/totem-properties-view.c:219
 #: ../src/plugins/properties/totem-movie-properties.c:166
 msgctxt "Sample rate"
 msgid "N/A"
 msgstr "వర్తించదు"
 
-#: ../src/totem-properties-view.c:224
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5589
-msgid "Surround"
-msgstr "చుట్టూ"
-
-#: ../src/totem-properties-view.c:226
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5591
-msgid "Mono"
-msgstr "ఒంటరి"
-
-#: ../src/totem-properties-view.c:236
+#: ../src/totem-properties-view.c:239
 msgctxt "Number of audio channels"
 msgid "N/A"
 msgstr "వర్తించదు"
@@ -1552,8 +1538,8 @@
 #. eg: 75 %
 #: ../src/totem-statusbar.c:250
 #, c-format
-msgid "%d %%"
-msgstr "%d %%"
+msgid "%lf %%"
+msgstr "%lf %%"
 
 #. eg: Paused, 0:32 / 1:05
 #: ../src/totem-statusbar.c:325
@@ -1564,8 +1550,8 @@
 #. eg: Buffering, 75 %
 #: ../src/totem-statusbar.c:330
 #, c-format
-msgid "%s, %d %%"
-msgstr "%s, %d %%"
+msgid "%s, %f %%"
+msgstr "%s, %f %%"
 
 #: ../src/totem-subtitle-encoding.c:156
 msgid "Current Locale"
@@ -1708,216 +1694,91 @@
 msgid "Vietnamese"
 msgstr "వియత్నామీస్"
 
-#: ../src/totem-video-list.c:330
-msgid "No video URI"
-msgstr "ఏ వీడియో URI లేదు"
-
-#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
-#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
-#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
-#: ../src/totem-video-thumbnailer.c:872
-#, c-format
-msgid ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-msgstr ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-
-#: ../src/totem-video-thumbnailer.c:873
-msgid "Filename"
-msgstr "ఫైల్‌పేరు"
-
-#: ../src/totem-video-thumbnailer.c:875
-msgid "Resolution"
-msgstr "విభాజకత"
-
-#: ../src/totem-video-thumbnailer.c:878
-msgid "Duration"
-msgstr "వ్యవధి"
-
-#: ../src/totem-uri.c:506 ../src/plugins/chapters/totem-chapters.c:998
+#: ../src/totem-uri.c:343 ../src/plugins/chapters/totem-chapters.c:998
 msgid "All files"
-msgstr "అన్ని ఫైళ్ళు"
+msgstr "అన్ని దస్త్రాలు"
 
-#: ../src/totem-uri.c:511 ../src/plugins/chapters/totem-chapters.c:995
+#: ../src/totem-uri.c:348 ../src/plugins/chapters/totem-chapters.c:995
 msgid "Supported files"
-msgstr "సహకార ఫైళ్ళు"
+msgstr "సహకార దస్త్రాలు"
 
-#: ../src/totem-uri.c:523
+#: ../src/totem-uri.c:360
 msgid "Audio files"
-msgstr "ఆడియో ఫైళ్ళు"
+msgstr "ఆడియో దస్త్రాలు"
 
-#: ../src/totem-uri.c:531
+#: ../src/totem-uri.c:368
 msgid "Video files"
-msgstr "వీడియో ఫైళ్ళు"
+msgstr "వీడియో దస్త్రాలు"
 
-#: ../src/totem-uri.c:541
+#: ../src/totem-uri.c:378
 msgid "Subtitle files"
-msgstr "ఉపశీర్షిక ఫైళ్ళు"
+msgstr "ఉపశీర్షిక దస్త్రాలు"
 
-#: ../src/totem-uri.c:593
+#: ../src/totem-uri.c:430
 msgid "Select Text Subtitles"
 msgstr "పాఠ్య ఉపశీర్షికలను ఎంచుకోండి"
 
-#: ../src/totem-uri.c:656
+#: ../src/totem-uri.c:495
 msgid "Select Movies or Playlists"
 msgstr "చలనచిత్రాలు లేక ప్రదర్శనజాబితాను ఎంచుకోండి"
 
-#. Options parsing
-#: ../src/totem.c:201
-msgid "- Play movies and songs"
-msgstr "- చలనచిత్రములను మరియు పాటలను ఆడించండి"
-
-#: ../src/totem.c:212
-#, c-format
-msgid ""
-"%s\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"%s\n"
-"అందుబాటులోవున్న మొత్తం ఆదేశ వరుస ఐచ్చికముల జాబితాకొరకు '%s --help' నడుపండి.\n"
-
-#: ../src/totem.c:254 ../src/totem.c:265
-#: ../browser-plugin/totem-plugin-viewer.c:663
-#: ../browser-plugin/totem-plugin-viewer.c:1793
-msgid "Totem Movie Player"
-msgstr "టొటెమ్ చలనచిత్ర ప్రదర్శకం"
-
-#: ../src/totem.c:255 ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Could not initialize the thread-safe libraries."
-msgstr "సురక్షిత మార్గ గ్రంథాలయాలను సంసిద్ధపరచలేకపోయింది."
-
-#: ../src/totem.c:255
-msgid "Verify your system installation. Totem will now exit."
-msgstr " మీ  నెలకొల్పిన వ్యవస్థను పరీక్షించండి. టోటెమ్ బయటకుపోతొంది"
+#: ../src/totem-uri.c:499
+msgid "Add Directory"
+msgstr "సంచయాన్ని జతచేయి"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:1589
-msgid "Password requested for RTSP server"
-msgstr "RTSP సేవకం కొరకు సంకేతపదమును అభ్యర్థించింది"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2858
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2862
-#, c-format
-msgid "Audio Track #%d"
-msgstr "ఆడియో ట్రాక్ #%d"
+#: ../src/totem-video-list.c:330
+msgid "No video URI"
+msgstr "ఏ వీడియో URI లేదు"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2890
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2894
+#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
+#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
+#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
+#: ../src/totem-video-thumbnailer.c:841
 #, c-format
-msgid "Subtitle #%d"
-msgstr "ఉపశీర్షిక #%d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3298
-msgid ""
-"The requested audio output was not found. Please select another audio output "
-"in the Multimedia Systems Selector."
-msgstr ""
-"కావలసిన ఆడియో అవుట్పుట్ కనబడలేదు. మల్టీమీడియా సిస్టమ్సు యెంపికదారినందు దయచేసి వేరొక ఆడియో అవుట్పుట్‌ను "
-"యెంపికచేయుము."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3303
-msgid "Location not found."
-msgstr "స్థానము కనబడలేదు."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3307
-msgid ""
-"Could not open location; you might not have permission to open the file."
-msgstr "స్థానమును తెరువలేక పోయింది; ఈ దస్త్రమును తెరువుటకు మీరు అనుమతిని కలిగివుండక పోవచ్చును."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3318
-msgid ""
-"The video output is in use by another application. Please close other video "
-"applications, or select another video output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"వీడియో అవుట్పుట్ వేరొక అనువర్తనము చేత వుపయోగించబడుతోంది. దయచేసి యితక వీడియో అనువర్తనములను "
-"మూయుము, లేదా మల్టీమీడియా సిస్టమ్సు యెంపికదారి నందలి వేరొక వీడియో అవుట్పుట్‌ను యెంపికచేయుము."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3324
 msgid ""
-"The audio output is in use by another application. Please select another "
-"audio output in the Multimedia Systems Selector. You may want to consider "
-"using a sound server."
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 msgstr ""
-"ఆడియో అవుట్పుట్ వేరొక అనువర్తనముచేత వుపయోగంలో వుంది. దయచేసి మల్టీమీడియా సిస్టమ్సు యెంపికదారి నందలి వేరొక "
-"ఆడియో అవుట్పుట్‌ను యెంపికచేయండి. మీరు శబ్ధ సేవికను వుపయోగించవలసి వుంటుంది."
-
-#. should be exactly one missing thing (source or converter)
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3342
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3348
-#, c-format
-msgid "The playback of this movie requires a %s plugin which is not installed."
-msgid_plural ""
-"The playback of this movie requires the following decoders which are not "
-"installed:\n"
-"\n"
-"%s"
-msgstr[0] "ఈ చలనచిత్ర ప్లేబ్యాక్‌కు %s ప్లగిన్ అవసరము కాని అది స్థాపించిలేదు."
-msgstr[1] ""
-"ఈ చలనచిత్ర ప్లేబ్యాక్‌కు క్రింది పేర్కొన్న డీకోడర్లు అవసరము కాని అవి స్థాపించిలేవు:\n"
-"\n"
-"%s"
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3374
-msgid ""
-"Cannot play this file over the network. Try downloading it to disk first."
-msgstr "ఈ ఫైలును నెట్‌వర్కునందు ఆడించలేదు. దీనిని ముందు డిస్కునకు దించుకుని ప్రయత్నించండి."
+#: ../src/totem-video-thumbnailer.c:842
+msgid "Filename"
+msgstr "దస్త్రంపేరు"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5878
-msgid "Media contains no supported video streams."
-msgstr "మాధ్యమం యెటువంటి మద్దతిచ్చు వీడియో స్ట్రీమ్సును కలిగిలేదు."
+#: ../src/totem-video-thumbnailer.c:844
+msgid "Resolution"
+msgstr "విభాజకత"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6052
-msgid ""
-"Failed to create a GStreamer play object. Please check your GStreamer "
-"installation."
-msgstr "జిస్ట్రీమర్ ఆట ఆబ్జక్టును సృష్టించుటలో విఫలమైంది. దయచేసి మీ జిస్ట్రీమర్ స్థాపనను సరిచూసుకోండి."
+#: ../src/totem-video-thumbnailer.c:847
+msgid "Duration"
+msgstr "వ్యవధి"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6172
-msgid ""
-"Failed to open audio output. You may not have permission to open the sound "
-"device, or the sound server may not be running. Please select another audio "
-"output in the Multimedia Systems Selector."
-msgstr ""
-"ఆడియో అవుట్పుట్ తెరువుటకు విఫలమైంది. శబ్ధపు పరికరమును తెరువుటకు మీరు అనుమతిని "
-"కలిగివుండకపోవచ్చు, లేదా సౌండు సేవిక నడుచుచుండక పోవచ్చును. దయచేసి వేరొక ఆడియో అవుట్పుట్‌ను మల్టీమీడియా "
-"సిస్టమ్సు యెంపికదారినందు యెంపికచేయవచ్చును."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6192
-msgid ""
-"Could not find the audio output. You may need to install additional "
-"GStreamer plugins, or select another audio output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"ఆడియో అవుట్‌పుట్‌ను కనుగొనలేక పోయింది. మీరు అదనపు జిస్ట్రీమర్ ప్లగిన్సును స్థాపించవలసి రావచ్చును, లేదా "
-"బహుళమాధ్యమ వ్యవస్థల ఎంపికరి నందలి ఆడియో అవుట్‌పుట్ ఎంపికచేయండి."
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:1
+msgid "Apple Trailers"
+msgstr "ఆపిల్ ట్రైలర్లు"
+
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:2
+msgid "Sets the user agent for the Apple Trailers site"
+msgstr "ఆపిల్ ట్రైలర్ల సైటుకు వాడుకరి ఏజెంటుని అమర్చును"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:1
+msgid "Autoload Subtitles"
+msgstr "ఉపశీర్షికలను స్వయంగా నింపు"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:2
+msgid "Autoloads text subtitles"
+msgstr "పాఠ్య ఉపశీర్షికలను స్వయంగా నింపు"
 
-#. hour:minutes:seconds
-#. Translators: This is a time format, like "9:05:02" for 9
-#. * hours, 5 minutes, and 2 seconds. You may change ":" to
-#. * the separator that your locale uses or use "%Id" instead
-#. * of "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:83 ../src/plugins/skipto/totem-time-entry.c:57
-#, c-format
-msgctxt "long time format"
-msgid "%d:%02d:%02d"
-msgstr "%d:%02d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
+msgid "Video Disc Recorder"
+msgstr "వీడియో డిస్కు రికార్డర్"
 
-#. minutes:seconds
-#. Translators: This is a time format, like "5:02" for 5
-#. * minutes and 2 seconds. You may change ":" to the
-#. * separator that your locale uses or use "%Id" instead of
-#. * "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:92
-#, c-format
-msgctxt "short time format"
-msgid "%d:%02d"
-msgstr "%d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
+msgid "Records (S)VCDs or video DVDs"
+msgstr "(S)VCDs లేదా వీడియో DVDs రికార్డు చేయి"
 
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:65
 msgid "_Create Video Disc..."
@@ -1943,38 +1804,21 @@
 msgid "Copy the currently playing (S)VCD"
 msgstr "ప్రస్తుతం ఆడుతున్న (S)VCDను నకలుతీయండి"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:129
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:136
 msgid "The video disc could not be duplicated."
 msgstr "వీడియో డిస్కు నకిలీ చేయబడలేకపోయింది."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:131
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:276
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:138
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:283
 msgid "The movie could not be recorded."
 msgstr "చలనచిత్రం రికార్డు కాలేక పోయింది."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:157
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:167
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:263
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:164
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:174
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:270
 msgid "Unable to write a project."
 msgstr "ప్రోజెక్టును వ్రాయలేకపోయింది."
 
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
-msgid "Video Disc Recorder"
-msgstr "వీడియో డిస్కు రికార్డర్"
-
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
-msgid "Records (S)VCDs or video DVDs"
-msgstr "(S)VCDs లేదా వీడియో DVDs రికార్డు చేయి"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:1
-#: ../src/plugins/chapters/totem-chapters.c:1139
-msgid "Chapters"
-msgstr "అధ్యాయాలు"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:2
-msgid "Support chapter markers in movies."
-msgstr "చలనచిత్రాలలో అధ్యాయ మార్కర్లను సహకరించు."
-
 #: ../src/plugins/chapters/chapters-edit.ui.h:1
 msgid "Name for new chapter:"
 msgstr "కొత్త అధ్యాయానికి పేరు:"
@@ -2021,7 +1865,7 @@
 
 #: ../src/plugins/chapters/chapters-list.ui.h:11
 msgid "Load chapters from an external CMML file"
-msgstr "ఒక బాహ్య CMML ఫైల్ నుండి అధ్యాయాలను నింపు"
+msgstr "ఒక బాహ్య CMML దస్త్రం నుండి అధ్యాయాలను నింపు"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:12
 msgid "Add New Chapters"
@@ -2031,6 +1875,15 @@
 msgid "Create a new chapter list for the movie"
 msgstr "చలనచిత్రం కొరకు ఒక కొత్త అధ్యాయం జాబితాను సృష్టించు"
 
+#: ../src/plugins/chapters/chapters.plugin.in.h:1
+#: ../src/plugins/chapters/totem-chapters.c:1139
+msgid "Chapters"
+msgstr "అధ్యాయాలు"
+
+#: ../src/plugins/chapters/chapters.plugin.in.h:2
+msgid "Support chapter markers in movies"
+msgstr "చలనచిత్రాలలో అధ్యాయ మార్కర్లను సహకరించును"
+
 #: ../src/plugins/chapters/totem-chapters.c:56
 #, c-format
 msgid ""
@@ -2042,7 +1895,7 @@
 
 #: ../src/plugins/chapters/totem-chapters.c:328
 msgid "Error while reading file with chapters"
-msgstr "అధ్యాయాలతో ఫైలును చదువుతున్నపుడు దోషం"
+msgstr "అధ్యాయాలతో దస్త్రాన్ని చదువుతున్నపుడు దోషం"
 
 #: ../src/plugins/chapters/totem-chapters.c:543
 msgid "Chapter with the same time already exists"
@@ -2054,7 +1907,7 @@
 
 #: ../src/plugins/chapters/totem-chapters.c:717
 msgid "Error while writing file with chapters"
-msgstr "అధ్యాయాలతో ఫైలును వ్రాయునపుడు దోషం"
+msgstr "అధ్యాయాలతో దస్త్రాన్ని వ్రాయునపుడు దోషం"
 
 #: ../src/plugins/chapters/totem-chapters.c:842
 msgid "Error occurred while saving chapters"
@@ -2067,7 +1920,7 @@
 
 #: ../src/plugins/chapters/totem-chapters.c:976
 msgid "Open Chapter File"
-msgstr "అధ్యాయం ఫైలుని తెరువు"
+msgstr "అధ్యాయం దస్త్రాన్ని తెరువు"
 
 #: ../src/plugins/chapters/totem-chapters.c:1093
 msgid "Chapter Screenshot"
@@ -2097,7 +1950,7 @@
 
 #: ../src/plugins/chapters/totem-cmml-parser.c:651
 msgid "Failed to parse CMML file"
-msgstr "CMML ఫైలును పార్శ్ చేయుటలో విఫలమైంది"
+msgstr "CMML దస్త్రాన్ని పార్శ్ చేయుటలో విఫలమైంది"
 
 #: ../src/plugins/chapters/totem-edit-chapter.c:95
 msgid "Add Chapter"
@@ -2134,13 +1987,37 @@
 msgid "The URI ‘%s’ is not supported."
 msgstr "URI ‘%s’ సహకరించుటలేదు."
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
-msgid "Instant Messenger status"
-msgstr "సత్వర సందేశకం స్థితి"
+#: ../src/plugins/grilo/grilo.plugin.in.h:1
+msgid "Grilo Browser"
+msgstr "గ్రిలో విహారకం"
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
-msgid "Set your Instant Messenger status to away when a movie is playing"
-msgstr "చలనచిత్రము ప్లే అవతున్నప్పుడు మీ సత్వర సందేశకి స్థితిని దురంకు అమర్చండి"
+#: ../src/plugins/grilo/grilo.plugin.in.h:2
+msgid "A plugin to let you browse media content from various sources"
+msgstr "వివిధ వనరుల నుండి మాధ్యమ అంశాలను మిమ్మల్ని విహరింపచేయు చొప్పింత"
+
+#: ../src/plugins/grilo/grilo.ui.h:1
+msgid "Add to Playlist"
+msgstr "ప్రదర్శనజాబితాకు జతచేయి"
+
+#: ../src/plugins/grilo/grilo.ui.h:2
+msgid "Copy Location"
+msgstr "స్థానమును నకలుచేయి"
+
+#: ../src/plugins/grilo/grilo.ui.h:3 ../src/plugins/grilo/totem-grilo.c:1184
+msgid "Browse"
+msgstr "విహరించు"
+
+#: ../src/plugins/grilo/grilo.ui.h:4 ../src/plugins/grilo/totem-grilo.c:1227
+msgid "Search"
+msgstr "శోధించు"
+
+#: ../src/plugins/grilo/totem-grilo.c:454
+msgid "Browse Error"
+msgstr "విహార దోషము"
+
+#: ../src/plugins/grilo/totem-grilo.c:609
+msgid "Search Error"
+msgstr "శోధన దోషము"
 
 #: ../src/plugins/gromit/gromit.plugin.in.h:1
 msgid "Gromit Annotations"
@@ -2154,6 +2031,23 @@
 msgid "The gromit binary was not found."
 msgstr "gromit బైనరీ కనుగొనబడింది"
 
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
+msgid "Instant Messenger Status"
+msgstr "సత్వర సందేశకం స్థితి"
+
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
+msgid "Set your Instant Messenger status to away when a movie is playing"
+msgstr "చలనచిత్రము ప్లే అవతున్నప్పుడు మీ సత్వర సందేశకి స్థితిని దురంకు అమర్చండి"
+
+#: ../src/plugins/iplayer/iplayer2.py:298
+msgid ""
+msgstr "<ఏ కారణం ఇవ్వలేదు>"
+
+#: ../src/plugins/iplayer/iplayer2.py:299
+#, python-format
+msgid "Programme unavailable (\"%s\")"
+msgstr "ప్రోగ్రామి అందుబాటులోలేదు (\"%s\")"
+
 #. Add the interface to Totem's sidebar
 #: ../src/plugins/iplayer/iplayer.plugin.in.h:1
 #: ../src/plugins/iplayer/iplayer.py:46
@@ -2161,8 +2055,8 @@
 msgstr "BBC iPlayer"
 
 #: ../src/plugins/iplayer/iplayer.plugin.in.h:2
-msgid "Stream BBC programs from the last 7 days from the BBC iPlayer service."
-msgstr "BBC iPlayer సేవనుండి గత 7 రోజుల ప్రోగ్రాములను స్ట్రీమ్ చేయుము."
+msgid "Stream BBC programs from the last 7 days from the BBC iPlayer service"
+msgstr "BBC iPlayer సేవనుండి గత 7 రోజుల కార్యక్రమాలను స్ట్రీమ్ చేయును"
 
 #: ../src/plugins/iplayer/iplayer.py:72
 msgid "Error listing channel categories"
@@ -2194,15 +2088,6 @@
 "category combination."
 msgstr "ఈ ఛానల్ మరియు వర్గీకరణ మేళనముకు కార్యక్రమాల జాబితాను పొందుటలో ఒక తెలియని దోషము ఎదురైంది."
 
-#: ../src/plugins/iplayer/iplayer2.py:298
-msgid ""
-msgstr "<ఏ కారణం ఇవ్వలేదు>"
-
-#: ../src/plugins/iplayer/iplayer2.py:299
-#, python-format
-msgid "Programme unavailable (\"%s\")"
-msgstr "ప్రోగ్రామి అందుబాటులోలేదు (\"%s\")"
-
 #: ../src/plugins/lirc/lirc.plugin.in.h:1
 msgid "Infrared Remote Control"
 msgstr "ఇన్ఫ్రారెడ్ సుదూర నియంత్రణ"
@@ -2219,25 +2104,29 @@
 msgid "Couldn't read lirc configuration."
 msgstr "lirc ఆకృతీకరణను చదువలేక పోయింది."
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
-msgid "Download Movie Subtitles"
-msgstr "చలనచిత్ర ఉపశీర్షికలను దింపుకోండి"
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:1
+msgid "Media Player Keys"
+msgstr "మాధ్యమ ప్రదర్శకం మీటలు"
+
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:2
+msgid "Support additional media player keys"
+msgstr "అదనపు మాధ్యమ ప్రదర్శకపు మీటల తోడ్పాటు"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
-msgid "Subtitle _language:"
-msgstr "ఉపశీర్షిక భాష (_l):"
+#: ../src/plugins/ontop/ontop.plugin.in.h:1
+msgid "Always On Top"
+msgstr "ఎల్లప్పుడూ పైనే"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
-msgid "_Play with Subtitle"
-msgstr "ఉపశీర్షికతో ఆడించు (_P)"
+#: ../src/plugins/ontop/ontop.plugin.in.h:2
+msgid "Keep the main window on top when playing a movie"
+msgstr "చలనచిత్రమును ప్రదర్శిస్తున్నపుడు ప్రధానవిండోను పైన ఉంచు"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:1
 msgid "Subtitle Downloader"
 msgstr "ఉపశీర్షికలు దింపునది"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:2
-msgid "Look for subtitles for the currently playing movie."
-msgstr "ప్రస్తుతం ప్లే అవుతున్న చలనచిత్రము వుపశీర్షికల కొరకు చూస్తున్నది."
+msgid "Look for subtitles for the currently playing movie"
+msgstr "ప్రస్తుతం ప్రదర్శితమవుతున్న చలనచిత్రము ఉపశీర్షికల కొరకు చూస్తుంది"
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:42
 msgid "Brazilian Portuguese"
@@ -2273,7 +2162,7 @@
 #. This is the file-type of the subtitle file detected
 #: ../src/plugins/opensubtitles/opensubtitles.py:484
 msgid "Format"
-msgstr "ఫార్మేటు"
+msgstr "ఆకృతి"
 
 #. translators comment:
 #. This is a rating of the quality of the subtitle
@@ -2293,6 +2182,18 @@
 msgid "Searching subtitles…"
 msgstr "ఉపశీర్షికలను శోధించుచున్నది"
 
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
+msgid "Download Movie Subtitles"
+msgstr "చలనచిత్ర ఉపశీర్షికలను దింపుకోండి"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
+msgid "Subtitle _language:"
+msgstr "ఉపశీర్షిక భాష (_l):"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
+msgid "_Play with Subtitle"
+msgstr "ఉపశీర్షికతో ఆడించు (_P)"
+
 #: ../src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in.h:1
 msgid "Subtitle language"
 msgstr "ఉపశీర్షిక భాష"
@@ -2301,78 +2202,18 @@
 msgid "The language to search for subtitles for movies in."
 msgstr "చలనచిత్రాల ఉపశీర్షికల కొరకు శోధించవలసిన భాష."
 
-#: ../src/plugins/ontop/ontop.plugin.in.h:1
-msgid "Always On Top"
-msgstr "ఎల్లప్పుడూ పైనే"
-
-#: ../src/plugins/ontop/ontop.plugin.in.h:2
-msgid "Keep the main window on top when playing a movie"
-msgstr "చలనచిత్రమును ప్రదర్శిస్తున్నపుడు ప్రధానవిండోను పైన ఉంచు"
+#: ../src/plugins/properties/movie-properties.plugin.in.h:1
+msgid "Movie Properties"
+msgstr "చలనచిత్ర లక్షణాలు"
+
+#: ../src/plugins/properties/movie-properties.plugin.in.h:2
+msgid "Adds movie properties to the sidebar"
+msgstr "చలనచిత్ర లక్షణాలను ప్రక్కపట్టీకీ జతచేయును"
 
 #: ../src/plugins/properties/totem-movie-properties.c:246
 msgid "Properties"
 msgstr "లక్షణాలు"
 
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:1
-msgid "Publisher protocol to use"
-msgstr "వాడాల్సిన ప్రచురణకర్త ప్రోటోకాల్"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:2
-msgid ""
-"The transport protocol to use when publishing playlists over the network."
-msgstr "నెట్‌వర్క్ నందు ప్రదర్శనజాబితాలను ప్రచురిస్తున్నపుడు వాడాల్సిన ట్రాన్సుపోర్టు ప్రోటోకాల్."
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:3
-msgid "Format for network service name"
-msgstr "నెట్‌వర్క్ సేవ పేరుకు ఫార్మేట్"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:5
-#, no-c-format
-msgid ""
-"A format string used to build the network service name used when publishing "
-"playlists over the network. The following format placeholders can be used: • "
-"%a: the program name as returned by g_get_application_name() • %h: the "
-"machine's host name in title case • %u: the user's login name in title case "
-"• %U: the user's real name • %%: the percent sign"
-msgstr ""
-"నెట్‌వర్క్ పై ప్రదర్శనజాబితా ప్రచురించునపుడు నెట్‌వర్క్ సేవ పేరును నిర్మించుటకు వాడే ఫార్మేట్ పదబంధం. ఈ "
-"క్రింది ప్లేస్ హోల్దర్ల ఫార్మేట్ ఉపయోగించవచ్చును: \n"
-"• %a:  g_get_application_name() చే తిరిగివ్వబడన కార్యక్రమం పేరు • %h: శీర్షికలో యంత్రం యొక్క "
-"యొక్క హొస్ట్ పేరు • %u: శీర్షిక నందు వాడుకరి ప్రవేశ నామం \n"
-"• %U: వాడుకరి అసలు పేరు • %%: శాతం చిహ్నము"
-
-#. Translators: computers on the local network which are publishing their playlists over the network
-#: ../src/plugins/publish/totem-publish.c:552
-msgid "Neighbors"
-msgstr "పొరుగునవున్నవి"
-
-#: ../src/plugins/publish/publish.plugin.in.h:1
-msgid "Publish Playlist"
-msgstr "ప్రదర్శనజాబితాను ప్రచురించు"
-
-#: ../src/plugins/publish/publish.plugin.in.h:2
-msgid "Share the current playlist via HTTP"
-msgstr "ప్రస్తుత ప్రదర్శనజాబితాను HTTP ద్వారా పంచుకోండి"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:1
-msgid "Service _Name:"
-msgstr "సేవ పేరు (_N):"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:3
-#, no-c-format
-msgid ""
-"The name used for announcing the playlist service on the network.\n"
-"All occurrences of the string %u will be replaced by your name,\n"
-"and %h will be replaced by your computer's host name."
-msgstr ""
-"ప్రదర్శనజాబితా సేవను నెట్‌వర్కునందు ప్రకటించుటకు వాడబడే పేరు.\n"
-"పదబంధం %u యొక్క అన్ని సంభవములు మీ పేరుతో ప్రతిస్థాపించబడతాయి,\n"
-"మరియు %h మీ కంప్యూటర్ అతిధేయ పేరుతో ప్రతిస్థాపించబడుతుంది."
-
-#: ../src/plugins/publish/publish-plugin.ui.h:6
-msgid "Use _encrypted transport protocol (HTTPS)"
-msgstr "ఎన్క్రిప్టెడ్ బదిలీకరణ నియమాన్ని వుపయోగించుము (_e) (HTTPS)"
-
 #: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:1
 msgid "rpdb2 password"
 msgstr "rpdb2 సంకేతపదం"
@@ -2385,22 +2226,86 @@
 "అనుమతిలేని దూరస్థ వాడుక నుండి టోటెమ్ దోషశుద్ధి rpdb2 సేవకాన్ని రక్షించుటకు ఒక సంకేతపదం. ఒకవేళ ఇది "
 "ఖాళీగా ఉంటే, ఒక అప్రమేయంగా 'టోటెమ్' వాడబడును."
 
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
+msgid "Python Console"
+msgstr "పైథాన్ కన్సోల్"
+
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
+msgid "Interactive Python console"
+msgstr "ఇంటరాక్టివ్ పైథాన్ కన్సోల్"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:88
+msgid "Python Console Menu"
+msgstr "పైథాన్ కన్సోల్ మెనూ"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:93
+msgid "_Python Console"
+msgstr "పైథాన్ కన్సోల్ (_P)"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:94
+msgid "Show Totem's Python console"
+msgstr "టోటెమ్ యొక్క పైథాన్ కన్సోల్ చూపించు"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:100
+msgid "Python Debugger"
+msgstr "పైథాన్ డీబగ్గర్"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:101
+msgid "Enable remote Python debugging with rpdb2"
+msgstr "సుదూర పైథాన్ డీబగ్గింగ్‌ను rpdb2తో చేతనముచేయండి"
+
+#. pylint: disable-msg=E1101
+#: ../src/plugins/pythonconsole/pythonconsole.py:125
+#, python-format
+msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
+msgstr "మీరు టోటెమ్‌ను ఆబ్జక్టు 'totem_object' ద్వారా వాడగలరు :\\n%s"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:129
+msgid "Totem Python Console"
+msgstr "టోటెమ్ పైథాన్ కన్సోల్"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:139
+msgid ""
+"After you press OK, Totem will wait until you connect to it with winpdb or "
+"rpdb2. If you have not set a debugger password in DConf, it will use the "
+"default password ('totem')."
+msgstr ""
+"మీరు సరే నొక్కిన తర్వాత, మీరు winpdb లేదా rpdb2తో అనుసంధానం అగునంతవరకు టోటెమ్ వేచివుంటుంది. "
+"ఒకవేళ మీరు డీబగ్గర్ సంకేతపదమును GConfనందు అమర్చివుండకపోతే, అది అప్రమేయ సంకేతపదమయిన ('totem')"
+"ను ఉపయోగిస్తుంది."
+
+#: ../src/plugins/recent/recent.plugin.in.h:1
+msgid "Recent files"
+msgstr "ఇటీవలి దస్త్రాలు"
+
+#: ../src/plugins/recent/recent.plugin.in.h:2
+msgid "Adds files that have been played to recent files"
+msgstr "దస్త్రాలను ఇటీవలి ప్రదర్శించబడిన దస్త్రాలకు జోడిస్తుంది"
+
 #: ../src/plugins/rotation/rotation.plugin.in.h:1
 msgid "Rotation Plugin"
-msgstr "పరిభ్రమించే ప్లగిన్"
+msgstr "పరిభ్రమించే చొప్పింత"
 
 #: ../src/plugins/rotation/rotation.plugin.in.h:2
-msgid "Allows videos to be rotated if they're in the wrong orientation."
-msgstr "ఒకవేళ వీడియోలు తప్పుడు దగ్విన్యాసంలో ఉంటే వాటిని సరైన స్థితిలో ఉంచుటకు అనుమతిస్తుంది."
+msgid "Allows videos to be rotated if they are in the wrong orientation"
+msgstr "ఒకవేళ వీడియోలు తప్పుడు దగ్విన్యాసంలో ఉంటే వాటిని సరైన స్థితిలో ఉంచుటకు అనుమతిస్తుంది"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:60
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:50
 msgid "_Rotate Clockwise"
 msgstr "సవ్యదిశలో త్రిప్పు (_R)"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:62
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:52
 msgid "Rotate Counterc_lockwise"
 msgstr "అపసవ్యదిశలో త్రిప్పు (_l)"
 
+#: ../src/plugins/save-file/save-file.plugin.in.h:1
+msgid "Save Copy"
+msgstr "నకలును భద్రపరుచు"
+
+#: ../src/plugins/save-file/save-file.plugin.in.h:2
+msgid "Save a copy of the currently playing movie"
+msgstr "ప్రస్తుతం ప్రదర్శించబడుతున్న చలనచిత్రపు నకలును భద్రపరుచు"
+
 #: ../src/plugins/save-file/totem-save-file.c:63
 msgid "Save a Copy..."
 msgstr "ఒక నకలును భద్రపరుచు..."
@@ -2423,14 +2328,17 @@
 msgid "Movie stream"
 msgstr "చలనచిత్ర ప్రవాహం"
 
-#: ../src/plugins/screensaver/totem-screensaver.c:116
-#: ../browser-plugin/totem-plugin-viewer.c:1891
-msgid "Playing a movie"
-msgstr "చలనచిత్రమును ఆడిస్తున్నది"
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:1
+msgid "Screen Saver"
+msgstr "తెర కాపరి"
+
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:2
+msgid "Deactivates the screen saver when a movie is playing"
+msgstr "చలనచిత్రం ప్రదర్శించబడుతున్నపుడు తెరకాపరిని అచేతపరుచును"
 
 #: ../src/plugins/screenshot/gallery.ui.h:1
 msgid "Screenshot width (in pixels):"
-msgstr "తెరపట్టు వెడల్పు (పిక్సెళ్ళలో):"
+msgstr "తెరపట్టు వెడల్పు (చిణువులలో):"
 
 #: ../src/plugins/screenshot/gallery.ui.h:2
 msgid "Calculate the number of screenshots"
@@ -2440,23 +2348,28 @@
 msgid "Number of screenshots:"
 msgstr "తెరపట్టుల సంఖ్య:"
 
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:1
-msgid "_Name:"
-msgstr "పేరు (_N):"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:2
-msgid "Save in _folder:"
-msgstr "సంచయంలో భద్రపరుచు (_f):"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:3
-msgid "Select a folder"
-msgstr "ఒక సంచయమును ఎంచుకోండి"
-
-#. Write the screenshot to the temporary file
-#: ../src/plugins/screenshot/gnome-screenshot-widget.c:385
-#: ../src/plugins/screenshot/totem-screenshot.c:64
-msgid "Screenshot.png"
-msgstr "తెరపట్టు.png"
+#. translators: this is the name of the file that gets made up
+#. * with the screenshot if the entire screen is taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:147
+#, c-format
+msgid "Screenshot from %s.png"
+msgstr "%s తెరపట్టు.png"
+
+#. translators: this is the name of the file that gets
+#. * made up with the screenshot if the entire screen is
+#. * taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:154
+#, c-format
+msgid "Screenshot from %s - %d.png"
+msgstr "%s-%d నుండి తెరపట్టు.png"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:1
+msgid "Screenshot"
+msgstr "తెరపట్టు"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:2
+msgid "Allows screenshots and galleries to be taken of videos"
+msgstr "తెరపట్టులు మరియు చిత్రశాలలు వీడియోలు ద్వారా తీసుకొనుటకు అనుమతిస్తుంది"
 
 #: ../src/plugins/screenshot/totem-gallery.c:91
 msgid "Save Gallery"
@@ -2482,49 +2395,47 @@
 msgid "Saving gallery as \"%s\""
 msgstr "చిత్రశాలను \"%s\"వలె భద్రపరుస్తున్నది"
 
-#: ../src/plugins/screenshot/totem-screenshot.c:113
-msgid "There was an error saving the screenshot."
-msgstr "తెరపట్టును భద్రపరుచుటలో అక్కడ ఒక దోషం ఉన్నది."
-
-#: ../src/plugins/screenshot/totem-screenshot.c:139
-msgid "Save Screenshot"
-msgstr "తెరపట్టును భద్రపరుచు"
-
-#. Create the screenshot widget
-#. Translators: %s is the movie title and %d is an auto-incrementing number to make filename unique
-#: ../src/plugins/screenshot/totem-screenshot.c:160
-#, c-format
-msgid "Screenshot-%s-%d.png"
-msgstr "తెరపట్టు-%s-%d.png"
-
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:88
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:220
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "Totem could not get a screenshot of the video."
 msgstr "టోటెమ్ వీడియో యొక్క తెరపట్టును పొందలేకపోయింది."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "This is not supposed to happen; please file a bug report."
 msgstr "ఇది జరుగవలిసింది కాదు; దయచేసి బగ్ నమోదు చేయండి."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
-msgid "Take _Screenshot..."
-msgstr "తెరపట్టు తీయి...(_S)"
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
+msgid "Take _Screenshot"
+msgstr "తెరపట్టు తీయి (_S)"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
 msgid "Take a screenshot"
 msgstr "ఒక తెరపట్టు తీయి"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create Screenshot _Gallery..."
 msgstr "తెరపట్టు చిత్రశాలను సృష్టించు...(_G)"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create a gallery of screenshots"
 msgstr "తెరపట్టుల చిత్రశాలను సృష్టించు"
 
+#: ../src/plugins/skipto/skipto.plugin.in.h:1
+#: ../src/plugins/skipto/totem-skipto.c:196
+msgid "Skip To"
+msgstr "ఇక్కడకు దాటవేయి"
+
+#: ../src/plugins/skipto/skipto.plugin.in.h:2
+msgid "Provides the \"Skip to\" dialog"
+msgstr "\"Skip to\" సంవాదాన్ని సమకూర్చును."
+
+#: ../src/plugins/skipto/skipto.ui.h:1
+msgid "_Skip to:"
+msgstr "ఇక్కడకు దాటవేయి (_S):"
+
 #. Update the "seconds" label so that it always has the correct singular/plural form
 #. Translators: label for the seconds selector in the "Skip to" dialogue
-#: ../src/plugins/skipto/totem-skipto.c:160
+#: ../src/plugins/skipto/totem-skipto.c:159
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "సెకను"
@@ -2534,15 +2445,11 @@
 #. Translators: you should translate this string to a number (written in digits) which corresponds to the longer character length of the
 #. * translations for "second" and "seconds", as translated elsewhere in this file. For example, in English, "second" is 6 characters long and
 #. * "seconds" is 7 characters long, so this string should be translated to "7". See: bgo#639398
-#: ../src/plugins/skipto/totem-skipto.c:190
+#: ../src/plugins/skipto/totem-skipto.c:189
 msgctxt "Skip To label length"
 msgid "7"
 msgstr "7"
 
-#: ../src/plugins/skipto/totem-skipto.c:197
-msgid "Skip To"
-msgstr "ఇక్కడకు దాటవేయి"
-
 #: ../src/plugins/skipto/totem-skipto-plugin.c:182
 msgid "_Skip To..."
 msgstr "ఇక్కడకు దాటవేయి...(_S)"
@@ -2551,113 +2458,256 @@
 msgid "Skip to a specific time"
 msgstr "ఒక నిర్దిష్ట సమయానికి దాటవేయి"
 
-#: ../src/plugins/skipto/skipto.ui.h:1
-msgid "_Skip to:"
-msgstr "ఇక్కడకు దాటవేయి (_S):"
+#~ msgid "Play movies and songs"
+#~ msgstr "చలనచిత్రాలను మరియు పాటలను ఆడించండి"
 
-#: ../browser-plugin/totem-plugin-viewer.c:431
-msgid "No URI to play"
-msgstr "ఆడించుటకు ఏ URI లేదు"
+#~ msgid "14.4 Kbps Modem"
+#~ msgstr "14.4 Kbps మోడెమ్"
 
-#. translators: this is:
-#. * Open With ApplicationName
-#. * as in nautilus' right-click menu
-#: ../browser-plugin/totem-plugin-viewer.c:1107
-#, c-format
-msgid "_Open with \"%s\""
-msgstr "\"%s\"తో తెరువు (_O)"
+#~ msgid "19.2 Kbps Modem"
+#~ msgstr "19.2 Kbps మోడెమ్"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2136
-msgid "No playlist or playlist empty"
-msgstr "ప్రదర్శనజాబితా లేదు లేదా ప్రదర్శనజాబితా ఖాళీగావుంది"
+#~ msgid "28.8 Kbps Modem"
+#~ msgstr "28.8 Kbps మోడెమ్"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2235
-msgid "Movie browser plugin"
-msgstr "చలనచిత్ర విహారకం ప్లగిన్"
+#~ msgid "33.6 Kbps Modem"
+#~ msgstr "33.6 Kbps మోడెమ్"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Verify your system installation. The Totem plugin will now exit."
-msgstr "మీ వ్యవస్థ స్థాపనను సరిచూసుకోండి. టోటెమ్ ప్లగిన్ ఇప్పుడు నిష్క్రమిస్తున్నది."
+#~ msgid "34.4 Kbps Modem"
+#~ msgstr "34.4 Kbps మోడెమ్"
 
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
-msgid "Python Console"
-msgstr "పైథాన్ కన్సోల్"
+#~ msgid "56 Kbps Modem/ISDN"
+#~ msgstr "56 Kbps Modem/ISDN"
 
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
-msgid "Interactive Python console."
-msgstr "ఇంటరాక్టివ్ పైథాన్ కన్సోల్."
+#~ msgid "112 Kbps Dual ISDN/DSL"
+#~ msgstr "112 Kbps Dual ISDN/DSL"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:88
-msgid "Python Console Menu"
-msgstr "పైథాన్ కన్సోల్ మెనూ"
+#~ msgid "256 Kbps DSL/Cable"
+#~ msgstr "256 Kbps DSL/Cable"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:93
-msgid "_Python Console"
-msgstr "పైథాన్ కన్సోల్ (_P)"
+#~ msgid "384 Kbps DSL/Cable"
+#~ msgstr "384 Kbps DSL/Cable"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:94
-msgid "Show Totem's Python console"
-msgstr "టోటెమ్ యొక్క పైథాన్ కన్సోల్ చూపించు"
+#~ msgid "512 Kbps DSL/Cable"
+#~ msgstr "512 Kbps DSL/Cable"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:100
-msgid "Python Debugger"
-msgstr "పైథాన్ డీబగ్గర్"
+#~ msgid "1.5 Mbps T1/Intranet/LAN"
+#~ msgstr "1.5 Mbps T1/Intranet/LAN"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:101
-msgid "Enable remote Python debugging with rpdb2"
-msgstr "సుదూర పైథాన్ డీబగ్గింగ్‌ను rpdb2తో చేతనముచేయండి"
+#~ msgid "Intranet/LAN"
+#~ msgstr "ఇంట్రానెట్/LAN"
 
-#. pylint: disable-msg=E1101
-#: ../src/plugins/pythonconsole/pythonconsole.py:125
-#, python-format
-msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
-msgstr "మీరు టోటెమ్‌ను ఆబ్జక్టు 'totem_object' ద్వారా వాడగలరు :\\n%s"
+#~ msgid "Networking"
+#~ msgstr "నెట్‌వర్కింగ్"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:129
-msgid "Totem Python Console"
-msgstr "టోటెమ్ పైథాన్ కన్సోల్"
+#~ msgid "Connection _speed:"
+#~ msgstr "అనుసంధానం వేగము (_s):"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:139
-msgid ""
-"After you press OK, Totem will wait until you connect to it with winpdb or "
-"rpdb2. If you have not set a debugger password in DConf, it will use the "
-"default password ('totem')."
-msgstr ""
-"మీరు సరే నొక్కిన తర్వాత, మీరు winpdb లేదా rpdb2తో అనుసంధానం అగునంతవరకు టోటెమ్ వేచివుంటుంది. "
-"ఒకవేళ మీరు డీబగ్గర్ సంకేతపదమును GConfనందు అమర్చివుండకపోతే, అది అప్రమేయ సంకేతపదమయిన ('totem')"
-"ను ఉపయోగిస్తుంది."
+#~ msgid "Network connection speed"
+#~ msgstr "నెట్‌వర్కు అనుసంధానం వేగం"
 
-#: ../src/plugins/grilo/grilo.plugin.in.h:1
-msgid "Grilo Browser"
-msgstr "గ్రిలో విహారకం"
+#~ msgid ""
+#~ "Approximate network connection speed, used to select quality on media "
+#~ "over the network."
+#~ msgstr ""
+#~ "ఇంచుమించు నెట్‌వర్క్ అనుసంధాన వేగం, నెట్‌వర్క్ నందు మాధ్యమ నాణ్యతను ఎంపికచేయుటకు వాడబడుతుంది."
 
-#: ../src/plugins/grilo/grilo.plugin.in.h:2
-msgid "A plugin to let you browse media content from various sources."
-msgstr "వివిధ వనరుల నుండి మాధ్యమ అంశాలను మిమ్మల్ని విహరింపచేయు ప్లగిన్."
+#~ msgid "Movie Player using %s"
+#~ msgstr "చలనచిత్ర ప్రదర్శకం %s వాడుతున్నది"
 
-#: ../src/plugins/grilo/totem-grilo.c:452
-msgid "Browse Error"
-msgstr "విహార దోషము"
+#~ msgid "%d %%"
+#~ msgstr "%d %%"
 
-#: ../src/plugins/grilo/totem-grilo.c:599
-msgid "Search Error"
-msgstr "శోధన దోషము"
+#~ msgid "Location not found."
+#~ msgstr "స్థానము కనబడలేదు."
 
-#: ../src/plugins/grilo/totem-grilo.c:1219 ../src/plugins/grilo/grilo.ui.h:3
-msgid "Browse"
-msgstr "విహరించు"
+#~ msgid ""
+#~ "Could not open location; you might not have permission to open the file."
+#~ msgstr ""
+#~ "స్థానమును తెరువలేక పోయింది; ఈ దస్త్రమును తెరువుటకు మీరు అనుమతిని కలిగివుండక పోవచ్చును."
 
-#: ../src/plugins/grilo/totem-grilo.c:1285 ../src/plugins/grilo/grilo.ui.h:4
-msgid "Search"
-msgstr "శోధించు"
+#~ msgid ""
+#~ "Failed to create a GStreamer play object. Please check your GStreamer "
+#~ "installation."
+#~ msgstr ""
+#~ "జిస్ట్రీమర్ ఆట ఆబ్జక్టును సృష్టించుటలో విఫలమైంది. దయచేసి మీ జిస్ట్రీమర్ స్థాపనను సరిచూసుకోండి."
 
-#: ../src/plugins/grilo/grilo.ui.h:1
-msgid "Add to Playlist"
-msgstr "ప్రదర్శనజాబితాకు జతచేయి"
+#~ msgid "_Name:"
+#~ msgstr "పేరు (_N):"
 
-#: ../src/plugins/grilo/grilo.ui.h:2
-msgid "Copy Location"
-msgstr "స్థానమును నకలుచేయి"
+#~ msgid "Save in _folder:"
+#~ msgstr "సంచయంలో భద్రపరుచు (_f):"
+
+#~ msgid "Select a folder"
+#~ msgstr "ఒక సంచయమును ఎంచుకోండి"
+
+#~ msgid "There was an error saving the screenshot."
+#~ msgstr "తెరపట్టును భద్రపరుచుటలో అక్కడ ఒక దోషం ఉన్నది."
+
+#~ msgid "Save Screenshot"
+#~ msgstr "తెరపట్టును భద్రపరుచు"
+
+#~ msgid "Open a file"
+#~ msgstr "ఒక ఫైలుని తెరువు"
+
+#~ msgid "Open a non-local file"
+#~ msgstr "స్థానికం-కాని ఫైలును తెరువు"
+
+#~ msgid "Quit the program"
+#~ msgstr "ఈ కార్యక్రమమును నిష్క్రమించు"
+
+#~ msgid "Configure the application"
+#~ msgstr "అనువర్తనమును స్వరూపించు"
+
+#~ msgid "Switch to fullscreen"
+#~ msgstr "నిండుతెరకు మారు"
+
+#~ msgid "Set the repeat mode"
+#~ msgstr "పునరావృత రీతిని అమర్చు"
+
+#~ msgid "Set the shuffle mode"
+#~ msgstr "యాదృచ్ఛిక రీతిని అమర్చు"
+
+#~ msgid "Play Image '%s'"
+#~ msgstr "'%s' బొమ్మను ఆడించు"
+
+#~ msgid "device%d"
+#~ msgstr "పరికరము%d"
+
+#~ msgid "Play Disc '%s'"
+#~ msgstr "'%s' డిస్కు ఆడించు"
+
+#~ msgid ""
+#~ "Totem could not play this media (%s) although a plugin is present to "
+#~ "handle it."
+#~ msgstr "ఈ మాధ్యమం (%s)ను వ్యవహరించుటకు ప్లగిన్ ఉన్నపట్టికి టోటెమ్ ఆడించలేదు."
+
+#~ msgid ""
+#~ "You might want to check that a disc is present in the drive and that it "
+#~ "is correctly configured."
+#~ msgstr "ఈ డ్రైవులో డిస్కు ఉందా మరియూ అది సరిగ్గ రూపకరణ చేయబడ్డదా తనిఖీ చేయదలిచారా."
+
+#~ msgid "More information about media plugins"
+#~ msgstr "మాధ్యమం ప్లగిన్ల గురించి మరింత సమాచారము"
+
+#~ msgid ""
+#~ "Please install the necessary plugins and restart Totem to be able to play "
+#~ "this media."
+#~ msgstr "ఈ మాద్యమమును ఆడించుటకు అవసరమైన ప్లగిన్ లను నెలకొల్పి టోటెమ్ నుపునఃప్రారంబించండి"
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it does not have the "
+#~ "appropriate plugins to be able to read from the disc."
+#~ msgstr ""
+#~ "టోటెమ్ (%s) రకం మాధ్యమాని ఆడించలేదు ఎందుకంటే దీనివద్ద డిస్కునుండి చదువగల్గుటకు సరిపోవు "
+#~ "ప్లగ్‌యిన్సు లేవు."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because you do not have the "
+#~ "appropriate plugins to handle it."
+#~ msgstr ""
+#~ "టోటెమ్ (%s)ఈ రకం మాద్యమమును ఆడించలేదు ఎందుకంటె మీ వద్ద ఇది చెపట్టుటకు సరైన ప్లగిన్ లు లేవు "
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it is not supported."
+#~ msgstr "టోటెమ్ (%s) రకం మాద్యమమును ఆడించలేదు ఎందుకంటె అది మద్దతునీయదు."
+
+#~ msgid "Please insert another disc to play back."
+#~ msgstr "ప్లే బ్యాక్‌ కొరకు మరియొక డిస్కును ప్రవేశపెట్టండి."
+
+#~ msgid "Totem does not support playback of Audio CDs"
+#~ msgstr "టోటెమ్ అనునది ఆడియో CDల ప్లే బ్యాక్‌కు మద్దతీయదు"
+
+#~ msgid ""
+#~ "Please consider using a music player or a CD extractor to play this CD"
+#~ msgstr "ఈ CD ఆడించుటకు దయచేసి సంగీత ప్రదర్శకాన్ని లేదా CD ఎక్స్‍ట్రాక్టర్‌ను వాడండి"
+
+#~ msgid ""
+#~ "The requested audio output was not found. Please select another audio "
+#~ "output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "కావలసిన ఆడియో అవుట్పుట్ కనబడలేదు. మల్టీమీడియా సిస్టమ్సు యెంపికదారినందు దయచేసి వేరొక ఆడియో "
+#~ "అవుట్పుట్‌ను యెంపికచేయుము."
+
+#~ msgid ""
+#~ "The video output is in use by another application. Please close other "
+#~ "video applications, or select another video output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "వీడియో అవుట్పుట్ వేరొక అనువర్తనము చేత వుపయోగించబడుతోంది. దయచేసి యితక వీడియో అనువర్తనములను "
+#~ "మూయుము, లేదా మల్టీమీడియా సిస్టమ్సు యెంపికదారి నందలి వేరొక వీడియో అవుట్పుట్‌ను యెంపికచేయుము."
+
+#~ msgid ""
+#~ "The audio output is in use by another application. Please select another "
+#~ "audio output in the Multimedia Systems Selector. You may want to consider "
+#~ "using a sound server."
+#~ msgstr ""
+#~ "ఆడియో అవుట్పుట్ వేరొక అనువర్తనముచేత వుపయోగంలో వుంది. దయచేసి మల్టీమీడియా సిస్టమ్సు యెంపికదారి నందలి "
+#~ "వేరొక ఆడియో అవుట్పుట్‌ను యెంపికచేయండి. మీరు శబ్ధ సేవికను వుపయోగించవలసి వుంటుంది."
+
+#~ msgid ""
+#~ "Failed to open audio output. You may not have permission to open the "
+#~ "sound device, or the sound server may not be running. Please select "
+#~ "another audio output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "ఆడియో అవుట్పుట్ తెరువుటకు విఫలమైంది. శబ్ధపు పరికరమును తెరువుటకు మీరు అనుమతిని "
+#~ "కలిగివుండకపోవచ్చు, లేదా సౌండు సేవిక నడుచుచుండక పోవచ్చును. దయచేసి వేరొక ఆడియో అవుట్పుట్‌ను "
+#~ "మల్టీమీడియా సిస్టమ్సు యెంపికదారినందు యెంపికచేయవచ్చును."
+
+#~ msgid ""
+#~ "Could not find the audio output. You may need to install additional "
+#~ "GStreamer plugins, or select another audio output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "ఆడియో అవుట్‌పుట్‌ను కనుగొనలేక పోయింది. మీరు అదనపు జిస్ట్రీమర్ ప్లగిన్సును స్థాపించవలసి రావచ్చును, "
+#~ "లేదా బహుళమాధ్యమ వ్యవస్థల ఎంపికరి నందలి ఆడియో అవుట్‌పుట్ ఎంపికచేయండి."
+
+#~ msgid "Publisher protocol to use"
+#~ msgstr "వాడాల్సిన ప్రచురణకర్త ప్రోటోకాల్"
+
+#~ msgid ""
+#~ "The transport protocol to use when publishing playlists over the network."
+#~ msgstr "నెట్‌వర్క్ నందు ప్రదర్శనజాబితాలను ప్రచురిస్తున్నపుడు వాడాల్సిన ట్రాన్సుపోర్టు ప్రోటోకాల్."
+
+#~ msgid "Format for network service name"
+#~ msgstr "నెట్‌వర్క్ సేవ పేరుకు ఫార్మేట్"
+
+#~ msgid ""
+#~ "A format string used to build the network service name used when "
+#~ "publishing playlists over the network. The following format placeholders "
+#~ "can be used: • %a: the program name as returned by g_get_application_name"
+#~ "() • %h: the machine's host name in title case • %u: the user's login "
+#~ "name in title case • %U: the user's real name • %%: the percent sign"
+#~ msgstr ""
+#~ "నెట్‌వర్క్ పై ప్రదర్శనజాబితా ప్రచురించునపుడు నెట్‌వర్క్ సేవ పేరును నిర్మించుటకు వాడే ఫార్మేట్ పదబంధం. "
+#~ "ఈ క్రింది ప్లేస్ హోల్దర్ల ఫార్మేట్ ఉపయోగించవచ్చును: \n"
+#~ "• %a:  g_get_application_name() చే తిరిగివ్వబడన కార్యక్రమం పేరు • %h: శీర్షికలో యంత్రం "
+#~ "యొక్క యొక్క హొస్ట్ పేరు • %u: శీర్షిక నందు వాడుకరి ప్రవేశ నామం \n"
+#~ "• %U: వాడుకరి అసలు పేరు • %%: శాతం చిహ్నము"
+
+#~ msgid "Neighbors"
+#~ msgstr "పొరుగునవున్నవి"
+
+#~ msgid "Publish Playlist"
+#~ msgstr "ప్రదర్శనజాబితాను ప్రచురించు"
+
+#~ msgid "Share the current playlist via HTTP"
+#~ msgstr "ప్రస్తుత ప్రదర్శనజాబితాను HTTP ద్వారా పంచుకోండి"
+
+#~ msgid "Service _Name:"
+#~ msgstr "సేవ పేరు (_N):"
+
+#~ msgid ""
+#~ "The name used for announcing the playlist service on the network.\n"
+#~ "All occurrences of the string %u will be replaced by your name,\n"
+#~ "and %h will be replaced by your computer's host name."
+#~ msgstr ""
+#~ "ప్రదర్శనజాబితా సేవను నెట్‌వర్కునందు ప్రకటించుటకు వాడబడే పేరు.\n"
+#~ "పదబంధం %u యొక్క అన్ని సంభవములు మీ పేరుతో ప్రతిస్థాపించబడతాయి,\n"
+#~ "మరియు %h మీ కంప్యూటర్ అతిధేయ పేరుతో ప్రతిస్థాపించబడుతుంది."
+
+#~ msgid "Use _encrypted transport protocol (HTTPS)"
+#~ msgstr "ఎన్క్రిప్టెడ్ బదిలీకరణ నియమాన్ని వుపయోగించుము (_e) (HTTPS)"
 
 #~ msgid "Bemused"
 #~ msgstr "మందకొడి"
@@ -2686,9 +2736,6 @@
 #~ msgid "Search Results"
 #~ msgstr "శోధన ఫలితాలు"
 
-#~ msgid "Videos"
-#~ msgstr "వీడియోలు"
-
 #~ msgid "_Open in Web Browser"
 #~ msgstr "జాల విహారకంలో తెరువు (_O)"
 
@@ -3106,8 +3153,5 @@
 #~ msgid "Screenshot%d.jpg"
 #~ msgstr "Screenshot%d.jpg"
 
-#~ msgid "Could not load the \"Skip to\" dialog interface."
-#~ msgstr "\"Skip to\" డైలాగ్ యింటర్ఫేస్‌ను లోడుచేయలేక పోయింది."
-
 #~ msgid "Totem could not play '%s'"
 #~ msgstr "టోటెమ్ '%s'ను ఆడించలేదు."
diff -Nru totem-3.4.3/po/th.po totem-3.6.2/po/th.po
--- totem-3.4.3/po/th.po	2012-01-10 16:10:04.000000000 +0000
+++ totem-3.6.2/po/th.po	2012-10-09 15:42:00.000000000 +0000
@@ -1,8 +1,8 @@
 # Thai translation of totem.
-# Copyright (C) 2005-2011 Free Software Foundation, Inc.
+# Copyright (C) 2005-2012 Free Software Foundation, Inc.
 # This file is distributed under the same license as the totem package.
 # Isriya Paireepairit , 2005.
-# Theppitak Karoonboonyanan , 2005-2011.
+# Theppitak Karoonboonyanan , 2005-2012.
 #
 #
 msgid ""
@@ -10,854 +10,913 @@
 "Project-Id-Version: totem\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=totem&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-08-30 09:17+0000\n"
-"PO-Revision-Date: 2011-09-21 21:42+0700\n"
+"POT-Creation-Date: 2012-09-10 15:48+0000\n"
+"PO-Revision-Date: 2012-09-11 15:10+0700\n"
 "Last-Translator: Theppitak Karoonboonyanan \n"
 "Language-Team: Thai \n"
+"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../data/fullscreen.ui.h:1
-msgid "Leave Fullscreen"
-msgstr "เ_ลิกแสดงเต็มจอ"
+#: ../browser-plugin/totem-plugin-viewer.c:352 ../src/totem-object.c:1180
+#: ../src/totem-object.c:1650 ../src/totem-statusbar.c:115
+msgid "Stopped"
+msgstr "หยุด"
 
-#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:102
-msgid "Time:"
-msgstr "เวลา:"
+#: ../browser-plugin/totem-plugin-viewer.c:364 ../src/totem-object.c:1173
+msgid "Paused"
+msgstr "กำลังพัก"
 
-#: ../data/playlist.ui.h:1
-msgid "Add..."
-msgstr "เพิ่ม..."
+#: ../browser-plugin/totem-plugin-viewer.c:368 ../src/totem-object.c:1166
+msgid "Playing"
+msgstr "กำลังเล่น"
 
-#: ../data/playlist.ui.h:2 ../data/video-list.ui.h:2
-msgid "Copy the location to the clipboard"
-msgstr "คัดลอกตำแหน่งเข้าคลิปบอร์ด"
+#: ../browser-plugin/totem-plugin-viewer.c:386
+#: ../src/plugins/screensaver/totem-screensaver.c:97
+msgid "Playing a movie"
+msgstr "กำลังเล่นภาพยนตร์"
 
-#: ../data/playlist.ui.h:3
-msgid "Move Down"
-msgstr "ย้ายลง"
+#: ../browser-plugin/totem-plugin-viewer.c:443
+msgid "No URI to play"
+msgstr "ไม่มี URI ที่จะเล่น"
 
-#: ../data/playlist.ui.h:4
-msgid "Move Up"
-msgstr "ย้ายขึ้น"
+#: ../browser-plugin/totem-plugin-viewer.c:676
+#: ../browser-plugin/totem-plugin-viewer.c:1700
+msgid "Totem Movie Player"
+msgstr "Totem: โปรแกรมเล่นภาพยนตร์"
 
-#: ../data/playlist.ui.h:5
-msgid "Remove"
-msgstr "ลบออก"
+#. translators: this is:
+#. * Open With ApplicationName
+#. * as in nautilus' right-click menu
+#: ../browser-plugin/totem-plugin-viewer.c:1120
+#, c-format
+msgid "_Open with \"%s\""
+msgstr "เ_ปิดด้วย \"%s\""
 
-#: ../data/playlist.ui.h:6
-msgid "Remove file from playlist"
-msgstr "ลบแฟ้มออกจากรายการการเล่น"
+#: ../browser-plugin/totem-plugin-viewer.c:1341 ../src/totem-object.c:2475
+msgid "An error occurred"
+msgstr "เกิดปัญหา"
 
-#: ../data/playlist.ui.h:7
-msgid "Save Playlist..."
-msgstr "บันทึกรายการการเล่น..."
+#: ../browser-plugin/totem-plugin-viewer.c:2033
+msgid "No playlist or playlist empty"
+msgstr "ไม่มีรายการการเล่น หรือรายการการเล่นว่างเปล่า"
 
-#: ../data/playlist.ui.h:8 ../data/totem.ui.h:77
-msgid "Select a file to use for text subtitles"
-msgstr "เลือกแฟ้มที่จะใช้เป็นบทบรรยาย"
+#: ../browser-plugin/totem-plugin-viewer.c:2128
+msgid "Movie browser plugin"
+msgstr "ปลั๊กอินท่องดูภาพยนตร์"
 
-#: ../data/playlist.ui.h:9 ../data/video-list.ui.h:4
-msgid "_Copy Location"
-msgstr "_คัดลอกตำแหน่ง"
+#: ../browser-plugin/totem-plugin-viewer.c:2144 ../src/totem.c:240
+msgid "Could not initialize the thread-safe libraries."
+msgstr "ไม่สามารถเริ่มใช้ไลบรารีสำหรับการใช้งานเธรดอย่างปลอดภัย"
 
-#: ../data/playlist.ui.h:10
-msgid "_Remove"
-msgstr "_ลบออก"
+#: ../browser-plugin/totem-plugin-viewer.c:2144
+msgid "Verify your system installation. The Totem plugin will now exit."
+msgstr "กรุณาตรวจสอบการติดตั้งของระบบ ปลั๊กอิน Totem จะเลิกทำงาน"
 
-#: ../data/playlist.ui.h:11 ../data/totem.ui.h:141
-msgid "_Select Text Subtitles..."
-msgstr "เ_ลือกบทบรรยาย..."
+#: ../data/fullscreen.ui.h:1
+msgid "Leave Fullscreen"
+msgstr "เ_ลิกแสดงเต็มจอ"
 
-#: ../data/properties.ui.h:1
-msgid "Album:"
-msgstr "อัลบั้ม:"
+#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:81
+msgid "Time:"
+msgstr "เวลา:"
 
-#: ../data/properties.ui.h:2
-msgid "Artist:"
-msgstr "ศิลปิน:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
+msgid "Allow the screensaver to activate when playing audio"
+msgstr "ให้โปรแกรมรักษาหน้าจอทำงานได้ขณะเล่นเพลง"
 
-#: ../data/properties.ui.h:3 ../data/totem.ui.h:23
-#: ../src/totem-properties-view.c:254
-msgid "Audio"
-msgstr "เสียง"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
+msgid ""
+"Allow the screensaver to activate when playing audio. Disable if you have "
+"monitor-powered speakers."
+msgstr "ให้โปรแกรมรักษาหน้าจอทำงานได้ขณะเล่นเพลง ปิดค่านี้ถ้าคุณใช้ลำโพงในจอภาพ"
 
-#: ../data/properties.ui.h:4
-msgid "Bitrate:"
-msgstr "อัตราบิต:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
+msgid "Show visual effects when no video is displayed"
+msgstr "แสดงเอ็ฟเฟ็กต์ภาพเมื่อไม่มีภาพจากภาพยนตร์"
 
-#: ../data/properties.ui.h:5
-msgid "Channels:"
-msgstr "ช่องสัญญาณ:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
+msgid "Show visual effects when playing an audio only file."
+msgstr "แสดงเอ็ฟเฟ็กต์ภาพเมื่อเล่นแฟ้มเพลงเท่านั้น"
 
-#: ../data/properties.ui.h:6
-msgid "Codec:"
-msgstr "รูปแบบรหัส:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
+msgid "Name of the visual effects plugin"
+msgstr "ชื่อของปลั๊กอินเอ็ฟเฟ็กต์ภาพ"
 
-#: ../data/properties.ui.h:7
-msgid "Comment:"
-msgstr "หมายเหตุ:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
+msgid "The brightness of the video"
+msgstr "ความสว่างภาพ"
 
-#: ../data/properties.ui.h:8
-msgid "Container:"
-msgstr "บรรจุภัณฑ์:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
+msgid "The contrast of the video"
+msgstr "ความต่างระดับสีของภาพ"
 
-#: ../data/properties.ui.h:9
-msgid "Dimensions:"
-msgstr "ขนาด:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
+msgid "The hue of the video"
+msgstr "สีของภาพ"
 
-#: ../data/properties.ui.h:10
-msgid "Duration:"
-msgstr "ความยาว:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
+msgid "The saturation of the video"
+msgstr "ความสดของสีภาพ"
 
-#: ../data/properties.ui.h:11
-msgid "Framerate:"
-msgstr "อัตราเฟรม:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
+msgid "Resize the canvas automatically on file load"
+msgstr "ปรับขนาดอัตโนมัติเมื่อเริ่มเล่น"
 
-#: ../data/properties.ui.h:12 ../data/totem.ui.h:41
-msgid "General"
-msgstr "ทั่วไป"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
+msgid "Repeat mode"
+msgstr "เล่นซ้ำ"
 
-#: ../data/properties.ui.h:13
-msgid "Sample rate:"
-msgstr "อัตราสุ่มสัญญาณ:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
+msgid "Shuffle mode"
+msgstr "เล่นสุ่ม"
 
-#: ../data/properties.ui.h:14
-msgid "Title:"
-msgstr "ชื่อ:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
+msgid "Whether to disable deinterlacing for interlaced movies"
+msgstr "กำหนดว่าจะปิดการถอดเส้นสลับสำหรับวีดิทัศน์ที่สลับเส้นภาพมาหรือไม่"
 
-#: ../data/properties.ui.h:15 ../data/totem.ui.h:104
-#: ../src/totem-properties-view.c:256
-msgid "Video"
-msgstr "วีดิทัศน์"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
+msgid "Whether to enable debug for the playback engine"
+msgstr "กำหนดว่าจะเปิดการดีบั๊กเครื่องเล่นสื่อหรือไม่"
 
-#: ../data/properties.ui.h:16
-msgid "Year:"
-msgstr "ปี:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
+msgid "Type of audio output to use"
+msgstr "ชนิดของเอาต์พุตเสียง"
 
-#: ../data/video-list.ui.h:1
-msgid "Add the video to the playlist"
-msgstr "เพิ่มวีดิทัศน์ในรายการการเล่น"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
+msgid "Visualization quality setting"
+msgstr "คุณภาพของภาพเอ็ฟเฟ็กต์ของเสียง"
 
-#: ../data/video-list.ui.h:3 ../src/totem-dnd-menu.c:97
-msgid "_Add to Playlist"
-msgstr "เ_พิ่มในรายการการเล่น"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
+msgid "Quality setting for the audio visualization."
+msgstr "คุณภาพของภาพเอ็ฟเฟ็กต์ของเสียง"
 
-#. Title
-#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:53
-#: ../src/totem-object.c:1663
-msgid "Movie Player"
-msgstr "โปรแกรมเล่นภาพยนตร์"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
+msgid "Network buffering threshold"
+msgstr "บัฟเฟอร์เครือข่ายขั้นต่ำ"
 
-#: ../data/totem.desktop.in.in.in.h:2
-msgid "Play movies and songs"
-msgstr "เล่นภาพยนตร์และเพลง"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
+msgid ""
+"Amount of data to buffer for network streams before starting to display the "
+"stream (in seconds)."
+msgstr "ปริมาณข้อมูลสตรีมเครือข่ายที่จะเก็บในบัฟเฟอร์ก่อนเริ่มแสดงผล (เป็นวินาที)"
 
-#: ../data/totem.ui.h:1
-msgid "1.5 Mbps T1/Intranet/LAN"
-msgstr "1.5 Mbps - T1/อินทราเน็ต/แลน"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
+msgid "Subtitle font"
+msgstr "แบบอักษรสำหรับบทบรรยาย"
 
-#: ../data/totem.ui.h:2
-msgid "112 Kbps Dual ISDN/DSL"
-msgstr "112 Kbps - ISDN/DSL ควบ"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
+msgid "Pango font description for subtitle rendering."
+msgstr "ข้อกำหนดแบบอักษร Pango สำหรับใช้แสดงบทบรรยาย"
 
-#: ../data/totem.ui.h:3
-msgid "14.4 Kbps Modem"
-msgstr "14.4 Kbps - โมเด็ม"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
+msgid "Subtitle encoding"
+msgstr "รหัสอักขระสำหรับบทบรรยาย"
 
-#: ../data/totem.ui.h:4
-msgid "16:9 (Widescreen)"
-msgstr "16:9 (จอกว้าง)"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
+msgid "Encoding character set for subtitle."
+msgstr "รหัสอักขระสำหรับบทบรรยาย"
 
-#: ../data/totem.ui.h:5
-msgid "19.2 Kbps Modem"
-msgstr "19.2 Kbps - โมเด็ม"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
+msgid "Default location for the \"Open...\" dialogs"
+msgstr "ตำแหน่งปริยายในกล่องโต้ตอบ \"เปิด...\""
 
-#: ../data/totem.ui.h:6
-msgid "2.11:1 (DVB)"
-msgstr "2.11:1 (DVB)"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
+msgid ""
+"Default location for the \"Open...\" dialogs. Default is the current "
+"directory."
+msgstr "ตำแหน่งปริยายในกล่องโต้ตอบ \"เปิด...\" ค่าปริยายคือไดเรกทอรีปัจจุบัน"
 
-#: ../data/totem.ui.h:7
-msgid "256 Kbps DSL/Cable"
-msgstr "256 Kbps - DSL/เคเบิล"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
+msgid "Default location for the \"Take Screenshot\" dialogs"
+msgstr "ตำแหน่งปริยายในกล่องโต้ตอบ \"เก็บภาพหน้าจอ\""
 
-#: ../data/totem.ui.h:8
-msgid "28.8 Kbps Modem"
-msgstr "28.8 Kbps - โมเด็ม"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
+msgid ""
+"Default location for the \"Take Screenshot\" dialogs. Default is the "
+"Pictures directory."
+msgstr "ตำแหน่งปริยายในกล่องโต้ตอบ \"เก็บภาพหน้าจอ\" ค่าปริยายคือไดเรกทอรี Pictures"
 
-#: ../data/totem.ui.h:9
-msgid "33.6 Kbps Modem"
-msgstr "33.6 Kbps - โมเด็ม"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
+msgid "Whether to disable the plugins in the user's home directory"
+msgstr "กำหนดว่าจะปิดใช้ปลั๊กอินในไดเรกทอรีบ้านของผู้ใช้หรือไม่"
 
-#: ../data/totem.ui.h:10
-msgid "34.4 Kbps Modem"
-msgstr "34.4 Kbps - โมเด็ม"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
+msgid "Whether to disable the keyboard shortcuts"
+msgstr "กำหนดว่าจะปิดใช้ปุ่มลัดแป้นพิมพ์หรือไม่"
 
-#: ../data/totem.ui.h:11
-msgid "384 Kbps DSL/Cable"
-msgstr "384 Kbps DSL/เคเบิล"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
+msgid "Whether to autoload text subtitle files when a movie is loaded"
+msgstr "กำหนดว่าจะเปิดแฟ้มบทบรรยายโดยอัตโนมัติพร้อมกับภาพยนตร์หรือไม่"
 
-#: ../data/totem.ui.h:12
-msgid "4-channel"
-msgstr "4 ช่องสัญญาณ"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
+msgid "Whether to autoload external chapter files when a movie is loaded"
+msgstr "กำหนดว่าจะเปิดแฟ้มการแบ่งตอนโดยอัตโนมัติพร้อมกับภาพยนตร์หรือไม่"
 
-#: ../data/totem.ui.h:13
-msgid "4.1-channel"
-msgstr "4.1 ช่องสัญญาณ"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
+msgid ""
+"Whether to remember the position of played audio/video files when pausing or "
+"closing them"
+msgstr "กำหนดว่าจะจำตำแหน่งการเล่นของแฟ้มเสียง/วีดิทัศน์หรือไม่เมื่อสั่งพักหรือปิดแฟ้ม"
 
-#: ../data/totem.ui.h:14
-msgid "4:3 (TV)"
-msgstr "4:3 (TV)"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
+msgid "Active plugins list"
+msgstr "รายชื่อปลั๊กอินที่ใช้งานอยู่"
 
-#: ../data/totem.ui.h:15
-msgid "5.0-channel"
-msgstr "5.0 ช่องสัญญาณ"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+msgid ""
+"A list of the names of the plugins which are currently active (loaded and "
+"running)."
+msgstr "รายชื่อของปลั๊กอินที่กำลังใช้งานอยู่ (โหลดและทำงานอยู่)"
 
-#: ../data/totem.ui.h:16
-msgid "5.1-channel"
-msgstr "5.1 ช่องสัญญาณ"
+#: ../data/playlist.ui.h:1
+msgid "_Remove"
+msgstr "_ลบออก"
 
-#: ../data/totem.ui.h:17
-msgid "512 Kbps DSL/Cable"
-msgstr "512 Kbps - DSL/เคเบิล"
+#: ../data/playlist.ui.h:2
+msgid "Remove file from playlist"
+msgstr "ลบแฟ้มออกจากรายการการเล่น"
 
-#: ../data/totem.ui.h:18
-msgid "56 Kbps Modem/ISDN"
-msgstr "56 Kbps - โมเด็ม/ISDN"
+#: ../data/playlist.ui.h:3 ../data/video-list.ui.h:3
+msgid "_Copy Location"
+msgstr "_คัดลอกตำแหน่ง"
 
-#: ../data/totem.ui.h:19
-msgid "AC3 Passthrough"
-msgstr "AC3 Passthrough"
+#: ../data/playlist.ui.h:4 ../data/video-list.ui.h:4
+msgid "Copy the location to the clipboard"
+msgstr "คัดลอกตำแหน่งเข้าคลิปบอร์ด"
 
-#: ../data/totem.ui.h:20
-msgid "A_udio Menu"
-msgstr "เมนูเ_สียง"
+#: ../data/playlist.ui.h:5 ../data/totem.ui.h:71
+msgid "_Select Text Subtitles..."
+msgstr "เ_ลือกบทบรรยาย..."
 
-#: ../data/totem.ui.h:21
-msgid "About this application"
-msgstr "เกี่ยวกับโปรแกรมนี้"
+#: ../data/playlist.ui.h:6 ../data/totem.ui.h:72
+msgid "Select a file to use for text subtitles"
+msgstr "เลือกแฟ้มที่จะใช้เป็นบทบรรยาย"
 
-#: ../data/totem.ui.h:22
-msgctxt "Aspect ratio"
-msgid "Auto"
-msgstr "อัตโนมัติ"
+#: ../data/playlist.ui.h:7
+msgid "Add..."
+msgstr "เพิ่ม..."
 
-#: ../data/totem.ui.h:24
-msgid "Audio Output"
-msgstr "เสียงออก"
+#: ../data/playlist.ui.h:8
+msgid "Remove"
+msgstr "ลบออก"
 
-#: ../data/totem.ui.h:25
-msgid "Clear the playlist"
-msgstr "ล้างรายการการเล่น"
+#: ../data/playlist.ui.h:9
+msgid "Save Playlist..."
+msgstr "บันทึกรายการการเล่น..."
 
-#: ../data/totem.ui.h:26
-msgid "Co_ntrast:"
-msgstr "ความ_ต่างระดับสี:"
+#: ../data/playlist.ui.h:10
+msgid "Move Up"
+msgstr "ย้ายขึ้น"
 
-#: ../data/totem.ui.h:27
-msgid "Color Balance"
-msgstr "ความสมดุลของสี"
+#: ../data/playlist.ui.h:11
+msgid "Move Down"
+msgstr "ย้ายลง"
 
-#: ../data/totem.ui.h:28
-msgid "Configure plugins to extend the application"
-msgstr "ตั้งค่าปลั๊กอินเพื่อขยายความสามารถของโปรแกรม"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:2
+msgid "Normal"
+msgstr "ปกติ"
 
-#: ../data/totem.ui.h:29
-msgid "Configure the application"
-msgstr "ตั้งค่าโปรแกรม"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:4
+msgid "Large"
+msgstr "ใหญ่"
 
-#: ../data/totem.ui.h:30
-msgid "Connection _speed:"
-msgstr "ความเ_ร็วการเชื่อมต่อ:"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:6
+msgid "Extra Large"
+msgstr "ใหญ่มาก"
 
-#: ../data/totem.ui.h:31
-msgid "Decrease volume"
-msgstr "หรี่เสียง"
+#: ../data/preferences.ui.h:7 ../src/backend/bacon-video-widget.c:5498
+#: ../src/totem-properties-view.c:231
+msgid "Stereo"
+msgstr "สเตริโอ"
 
-#: ../data/totem.ui.h:32
-msgid "Disable _deinterlacing of interlaced videos"
-msgstr "ปิดการ_ถอดเส้นสลับสำหรับวีดิทัศน์ที่สลับเส้นภาพมา"
+#: ../data/preferences.ui.h:8
+msgid "4-channel"
+msgstr "4 ช่องสัญญาณ"
 
-#: ../data/totem.ui.h:33
-msgid "Disable screensaver when playing "
-msgstr "ปิดโปรแกรมรักษาหน้าจอเมื่อเล่น"
+#: ../data/preferences.ui.h:9
+msgid "4.1-channel"
+msgstr "4.1 ช่องสัญญาณ"
 
-#. Tab label in the Preferences dialogue
-#: ../data/totem.ui.h:35
-msgid "Display"
-msgstr "การแสดงผล"
+#: ../data/preferences.ui.h:10
+msgid "5.0-channel"
+msgstr "5.0 ช่องสัญญาณ"
 
-#: ../data/totem.ui.h:36
-msgid "Eject the current disc"
-msgstr "ดันแผ่นปัจจุบันออก"
+#: ../data/preferences.ui.h:11
+msgid "5.1-channel"
+msgstr "5.1 ช่องสัญญาณ"
 
-#: ../data/totem.ui.h:37
-msgid "External Chapters"
-msgstr "ตอนภายนอก"
+#: ../data/preferences.ui.h:12
+msgid "AC3 Passthrough"
+msgstr "AC3 Passthrough"
 
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:39
-msgid "Extra Large"
-msgstr "ใหญ่มาก"
+#: ../data/preferences.ui.h:13
+msgid "Totem Preferences"
+msgstr "ปรับแต่ง Totem"
 
-#: ../data/totem.ui.h:40
-msgid "Fit Window to Movie"
-msgstr "ปรับขนาดตามภาพยนตร์"
+#: ../data/preferences.ui.h:14
+msgid "Playback"
+msgstr "เล่น"
 
-#: ../data/totem.ui.h:42
-msgid "Go to the DVD menu"
-msgstr "ไปยังเมนูดีวีดี"
+#: ../data/preferences.ui.h:15
+msgid "Start playing files from last position"
+msgstr "เริ่มเล่นแฟ้มต่างๆ ต่อจากตำแหน่งล่าสุด"
 
-#: ../data/totem.ui.h:43
-msgid "Go to the angle menu"
-msgstr "ไปยังเมนูมุมกล้อง"
+#: ../data/preferences.ui.h:16
+msgid "Text Subtitles"
+msgstr "บทบรรยาย"
 
-#: ../data/totem.ui.h:44
-msgid "Go to the audio menu"
-msgstr "ไปยังเมนูเสียง"
+#: ../data/preferences.ui.h:17
+msgid "_Load subtitle files when movie is loaded"
+msgstr "เปิดแฟ้ม_บทบรรยายพร้อมกับภาพยนตร์"
 
-#: ../data/totem.ui.h:45
-msgid "Go to the chapter menu"
-msgstr "ไปยังเมนูตอน"
+#: ../data/preferences.ui.h:18
+msgid "_Font:"
+msgstr "แ_บบอักษร:"
 
-#: ../data/totem.ui.h:46
-msgid "Go to the title menu"
-msgstr "ไปยังเมนูหลัก"
+#: ../data/preferences.ui.h:19
+msgid "_Encoding:"
+msgstr "_รหัสอักขระ:"
 
-#: ../data/totem.ui.h:47
-msgid "Help contents"
-msgstr "เนื้อหาวิธีใช้"
+#: ../data/preferences.ui.h:20
+msgid "External Chapters"
+msgstr "ตอนภายนอก"
 
-#: ../data/totem.ui.h:48
-msgid "Increase volume"
-msgstr "เร่งเสียง"
+#: ../data/preferences.ui.h:21
+msgid "Load _chapter files when movie is loaded"
+msgstr "โหลดแฟ้มการแบ่ง_ตอน พร้อมกับภาพยนตร์"
 
-#: ../data/totem.ui.h:49
-msgid "Intranet/LAN"
-msgstr "อินทราเน็ต/LAN"
+#: ../data/preferences.ui.h:22 ../data/properties.ui.h:1
+msgid "General"
+msgstr "ทั่วไป"
 
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:51
-msgid "Large"
-msgstr "ใหญ่"
+#. Tab label in the Preferences dialogue
+#: ../data/preferences.ui.h:24
+msgid "Display"
+msgstr "การแสดงผล"
 
-#: ../data/totem.ui.h:52
-msgid "Load _chapter files when movie is loaded"
-msgstr "โหลดแฟ้มการแบ่ง_ตอน พร้อมกับภาพยนตร์"
+#: ../data/preferences.ui.h:25
+msgid "_Resize the window when a new video is loaded"
+msgstr "ปรับ_ขนาดหน้าต่างเมื่อเล่นแฟ้มใหม่"
 
-#: ../data/totem.ui.h:54
-msgid "Networking"
-msgstr "เครือข่าย"
+#: ../data/preferences.ui.h:26
+msgid "Disable _deinterlacing of interlaced videos"
+msgstr "ปิดการ_ถอดเส้นสลับสำหรับวีดิทัศน์ที่สลับเส้นภาพมา"
 
-#: ../data/totem.ui.h:55
-msgid "Next chapter or movie"
-msgstr "ไปยังตอนหรือเรื่องถัดไป"
+#: ../data/preferences.ui.h:27
+msgid "Disable screensaver when playing "
+msgstr "ปิดโปรแกรมรักษาหน้าจอเมื่อเล่น"
 
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:57
-msgid "Normal"
-msgstr "ปกติ"
+#: ../data/preferences.ui.h:28 ../data/properties.ui.h:9
+#: ../src/totem-properties-view.c:273
+msgid "Video"
+msgstr "วีดิทัศน์"
 
-#: ../data/totem.ui.h:58
-msgid "Open _Location..."
-msgstr "เปิด_ตำแหน่ง..."
+#: ../data/preferences.ui.h:29
+msgid "Video or Audio"
+msgstr "วีดิทัศน์หรือเสียง"
 
-#: ../data/totem.ui.h:59
-msgid "Open a file"
-msgstr "เปิดแฟ้ม"
+#: ../data/preferences.ui.h:30
+msgid "Visual Effects"
+msgstr "เอ็ฟเฟ็กต์ภาพ"
 
-#: ../data/totem.ui.h:60
-msgid "Open a non-local file"
-msgstr "เปิดแฟ้มจากเครื่องอื่น"
+#: ../data/preferences.ui.h:31
+msgid "Show _visual effects when an audio file is played"
+msgstr "แสดงเ_อ็ฟเฟ็กต์ภาพ เมื่อเล่นแฟ้มเพลง"
 
-#: ../data/totem.ui.h:61
-msgid "Play / P_ause"
-msgstr "เ_ล่น / พัก"
+#: ../data/preferences.ui.h:32
+msgid "_Type of visualization:"
+msgstr "_ชนิดของเอ็ฟเฟกต์ภาพ:"
 
-#: ../data/totem.ui.h:62
-msgid "Play or pause the movie"
-msgstr "เล่นหรือพักภาพยนตร์"
+#: ../data/preferences.ui.h:33
+msgid "Visualization _size:"
+msgstr "ขนาดของ_ภาพเอ็ฟเฟ็กต์:"
 
-#: ../data/totem.ui.h:63
-msgid "Playback"
-msgstr "เล่น"
+#: ../data/preferences.ui.h:34
+msgid "Color Balance"
+msgstr "ความสมดุลของสี"
 
-#: ../data/totem.ui.h:64
-msgid "Plugins..."
-msgstr "ปลั๊กอิน..."
+#: ../data/preferences.ui.h:35
+msgid "_Brightness:"
+msgstr "ความส_ว่าง:"
 
-#: ../data/totem.ui.h:65
-msgid "Prefere_nces"
-msgstr "_ปรับแต่ง"
+#: ../data/preferences.ui.h:36
+msgid "Co_ntrast:"
+msgstr "ความ_ต่างระดับสี:"
 
-#: ../data/totem.ui.h:66
-msgid "Previous chapter or movie"
-msgstr "ตอนหรือเรื่องก่อนหน้า"
+#: ../data/preferences.ui.h:37
+msgid "Sat_uration:"
+msgstr "_ความสดของสี:"
 
-#: ../data/totem.ui.h:67
-msgid "Quit the program"
-msgstr "ออกจากโปรแกรม"
+#: ../data/preferences.ui.h:38
+msgid "_Hue:"
+msgstr "_สี:"
 
-#: ../data/totem.ui.h:68
+#: ../data/preferences.ui.h:39
 msgid "Reset to _Defaults"
 msgstr "ค่า_ปริยาย"
 
-#: ../data/totem.ui.h:69
-msgid "Resize _1:1"
-msgstr "ปรับขนาด _1:1"
+#: ../data/preferences.ui.h:40
+msgid "Audio Output"
+msgstr "เสียงออก"
 
-#: ../data/totem.ui.h:70
-msgid "Resize _2:1"
-msgstr "ปรับขนาด _2:1"
+#: ../data/preferences.ui.h:41
+msgid "_Audio output type:"
+msgstr "_ชนิดของเอาต์พุตเสียง:"
 
-#: ../data/totem.ui.h:71
-msgid "Resize to double the original video size"
-msgstr "ปรับขนาดให้เป็นสองเท่าของขนาดต้นฉบับ"
+#: ../data/preferences.ui.h:42 ../data/properties.ui.h:14
+#: ../src/totem-properties-view.c:271
+msgid "Audio"
+msgstr "เสียง"
 
-#: ../data/totem.ui.h:72
-msgid "Resize to half the original video size"
-msgstr "ปรับขนาดให้เหลือครึ่งเดียวของขนาดต้นฉบับ"
+#: ../data/properties.ui.h:2
+msgid "Title:"
+msgstr "ชื่อ:"
 
-#: ../data/totem.ui.h:73
-msgid "Resize to the original video size"
-msgstr "ปรับขนาดให้เท่าขนาดต้นฉบับ"
+#: ../data/properties.ui.h:3
+msgid "Artist:"
+msgstr "ศิลปิน:"
 
-#: ../data/totem.ui.h:74
-msgid "S_idebar"
-msgstr "แ_ถบข้าง"
+#: ../data/properties.ui.h:4
+msgid "Duration:"
+msgstr "ความยาว:"
 
-#: ../data/totem.ui.h:75
-msgid "S_ubtitles"
-msgstr "บทบ_รรยาย"
+#: ../data/properties.ui.h:5
+msgid "Year:"
+msgstr "ปี:"
 
-#: ../data/totem.ui.h:76
-msgid "Sat_uration:"
-msgstr "_ความสดของสี:"
+#: ../data/properties.ui.h:6
+msgid "Album:"
+msgstr "อัลบั้ม:"
 
-#: ../data/totem.ui.h:78
-msgid "Set the repeat mode"
-msgstr "ตั้งให้เล่นซ้ำ"
+#: ../data/properties.ui.h:7
+msgid "Comment:"
+msgstr "หมายเหตุ:"
 
-#: ../data/totem.ui.h:79
-msgid "Set the shuffle mode"
-msgstr "ตั้งให้เล่นแบบสุ่ม"
+#: ../data/properties.ui.h:8
+msgid "Container:"
+msgstr "บรรจุภัณฑ์:"
 
-#: ../data/totem.ui.h:80
-msgid "Sets 16:9 (widescreen) aspect ratio"
-msgstr "ปรับอัตราส่วนเป็น 16:9 (จอกว้าง)"
+#: ../data/properties.ui.h:10
+msgid "Dimensions:"
+msgstr "ขนาด:"
 
-#: ../data/totem.ui.h:81
-msgid "Sets 2.11:1 (DVB) aspect ratio"
-msgstr "ปรับอัตราส่วนเป็น 2.11:1 (DVB)"
+#: ../data/properties.ui.h:11
+msgid "Codec:"
+msgstr "รูปแบบรหัส:"
 
-#: ../data/totem.ui.h:82
-msgid "Sets 4:3 (TV) aspect ratio"
-msgstr "ปรับอัตราส่วนเป็น 4:3 (TV)"
+#: ../data/properties.ui.h:12
+msgid "Framerate:"
+msgstr "อัตราเฟรม:"
 
-#: ../data/totem.ui.h:83
-msgid "Sets automatic aspect ratio"
-msgstr "ปรับอัตราส่วนอัตโนมัติ"
+#: ../data/properties.ui.h:13
+msgid "Bitrate:"
+msgstr "อัตราบิต:"
 
-#: ../data/totem.ui.h:84
-msgid "Sets square aspect ratio"
-msgstr "ปรับอัตราส่วนแบบจัตุรัส"
+#: ../data/properties.ui.h:15
+msgid "Sample rate:"
+msgstr "อัตราสุ่มสัญญาณ:"
 
-#: ../data/totem.ui.h:85
-msgid "Show _Controls"
-msgstr "แสดง_ปุ่มควบคุม"
+#: ../data/properties.ui.h:16
+msgid "Channels:"
+msgstr "ช่องสัญญาณ:"
 
-#: ../data/totem.ui.h:86
-msgid "Show _visual effects when an audio file is played"
-msgstr "แสดงเ_อ็ฟเฟ็กต์ภาพ เมื่อเล่นแฟ้มเพลง"
+#. Title
+#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:80 ../src/totem.c:239
+#: ../src/totem.c:248 ../src/totem-menu.c:790 ../src/totem-object.c:1658
+msgid "Videos"
+msgstr "วีดิทัศน์"
 
-#: ../data/totem.ui.h:87
-msgid "Show controls"
-msgstr "แสดงปุ่มควบคุม"
+#: ../data/totem.desktop.in.in.in.h:2
+msgid "Play movies"
+msgstr "เล่นภาพยนตร์"
 
-#: ../data/totem.ui.h:88
-msgid "Show or hide the sidebar"
-msgstr "แสดงหรือซ่อนแถบข้าง"
+#: ../data/totem.desktop.in.in.in.h:3
+msgid "Video;Movie;Film;Clip;Series;Player;DVD;TV;Disc;"
+msgstr "วิดีโอ;วิดีทัศน์;ภาพยนตร์;หนัง;คลิป;เครื่องเล่น;ดีวีดี;ทีวี;แผ่น;"
 
-#: ../data/totem.ui.h:89
-msgid "Shuff_le Mode"
-msgstr "เล่น_สุ่ม"
+#: ../data/totem.ui.h:1
+msgid "_Open"
+msgstr "_เปิด"
 
-#: ../data/totem.ui.h:90
-msgid "Skip _Backwards"
-msgstr "_ถอยหลัง"
+#: ../data/totem.ui.h:2
+msgid "Open _Location"
+msgstr "เปิด_ตำแหน่ง"
 
-#: ../data/totem.ui.h:91
-msgid "Skip _Forward"
-msgstr "เดิน_หน้า"
+#: ../data/totem.ui.h:3
+msgid "_Fullscreen"
+msgstr "เต็ม_จอ"
 
-#: ../data/totem.ui.h:92
-msgid "Skip backwards"
-msgstr "ข้ามถอยหลัง"
+#: ../data/totem.ui.h:4
+msgid "Prefere_nces"
+msgstr "_ปรับแต่ง"
 
-#: ../data/totem.ui.h:93
-msgid "Skip forward"
-msgstr "ข้ามไปข้างหน้า"
+#: ../data/totem.ui.h:5
+msgid "Shuff_le"
+msgstr "เล่นสุ่_ม"
 
-#: ../data/totem.ui.h:94
-msgid "Square"
-msgstr "จัตุรัส"
+#: ../data/totem.ui.h:6
+msgid "_Repeat"
+msgstr "เล่_นซ้ำ"
 
-#: ../data/totem.ui.h:95
-msgid "Start playing files from last position"
-msgstr "เริ่มเล่นแฟ้มต่างๆ ต่อจากตำแหน่งล่าสุด"
+#: ../data/totem.ui.h:7
+msgid "_Quit"
+msgstr "_ออก"
 
-#: ../data/totem.ui.h:96 ../src/totem-properties-view.c:214
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5551
-msgid "Stereo"
-msgstr "สเตริโอ"
+#: ../data/totem.ui.h:8
+msgid "_Movie"
+msgstr "_ภาพยนตร์"
 
-#: ../data/totem.ui.h:97
-msgid "Switch An_gles"
-msgstr "เปลี่ยนมุ_มกล้อง"
+#: ../data/totem.ui.h:9
+msgid "_Eject"
+msgstr "_ดันแผ่นออก"
 
-#: ../data/totem.ui.h:98
-msgid "Switch camera angles"
-msgstr "เปลี่ยนมุมกล้อง"
+#: ../data/totem.ui.h:10
+msgid "Eject the current disc"
+msgstr "ดันแผ่นปัจจุบันออก"
 
-#: ../data/totem.ui.h:99
-msgid "Switch to fullscreen"
-msgstr "ดูแบบเต็มจอ"
+#: ../data/totem.ui.h:11
+msgid "_Properties"
+msgstr "คุณ_สมบัติ"
 
-#: ../data/totem.ui.h:100
-msgid "Text Subtitles"
-msgstr "บทบรรยาย"
+#: ../data/totem.ui.h:12
+msgid "View the properties of the current stream"
+msgstr "ดูคุณสมบัติของสตรีมปัจจุบัน"
 
-#: ../data/totem.ui.h:101
-msgid "Time seek bar"
-msgstr "แถบเลื่อนเวลา"
+#: ../data/totem.ui.h:13
+msgid "Play / P_ause"
+msgstr "เ_ล่น / พัก"
 
-#: ../data/totem.ui.h:103
-msgid "Totem Preferences"
-msgstr "ปรับแต่ง Totem"
+#: ../data/totem.ui.h:14
+msgid "Play or pause the movie"
+msgstr "เล่นหรือพักภาพยนตร์"
 
-#: ../data/totem.ui.h:105
-msgid "Video or Audio"
-msgstr "วีดิทัศน์หรือเสียง"
+#: ../data/totem.ui.h:15
+msgid "_Edit"
+msgstr "แ_ก้ไข"
 
-#: ../data/totem.ui.h:106
-msgid "View the properties of the current stream"
-msgstr "ดูคุณสมบัติของสตรีมปัจจุบัน"
+#: ../data/totem.ui.h:16
+msgid "_Clear Playlist"
+msgstr "_ล้างรายการการเล่น"
 
-#: ../data/totem.ui.h:107
-msgid "Visual Effects"
-msgstr "เอ็ฟเฟ็กต์ภาพ"
+#: ../data/totem.ui.h:17
+msgid "Clear the playlist"
+msgstr "ล้างรายการการเล่น"
 
-#: ../data/totem.ui.h:108
-msgid "Visualization _size:"
-msgstr "ขนาดของ_ภาพเอ็ฟเฟ็กต์:"
+#: ../data/totem.ui.h:18
+msgid "Plugins..."
+msgstr "ปลั๊กอิน..."
 
-#: ../data/totem.ui.h:109
-msgid "Volume _Down"
-msgstr "_หรี่เสียง"
+#: ../data/totem.ui.h:19
+msgid "Configure plugins to extend the application"
+msgstr "ตั้งค่าปลั๊กอินเพื่อขยายความสามารถของโปรแกรม"
 
-#: ../data/totem.ui.h:110
-msgid "Volume _Up"
-msgstr "เ_ร่งเสียง"
+#: ../data/totem.ui.h:20
+msgid "_View"
+msgstr "มุ_มมอง"
 
-#: ../data/totem.ui.h:111
-msgid "Zoom In"
-msgstr "ขยายเข้า"
+#: ../data/totem.ui.h:21
+msgid "Fit Window to Movie"
+msgstr "ปรับขนาดตามภาพยนตร์"
 
-#: ../data/totem.ui.h:112
-msgid "Zoom in"
-msgstr "ขยายเข้า"
+#: ../data/totem.ui.h:22
+msgid "_Resize 1:2"
+msgstr "_ปรับขนาด 1:2"
 
-#: ../data/totem.ui.h:113
-msgid "_About"
-msgstr "เ_กี่ยวกับ"
+#: ../data/totem.ui.h:23
+msgid "Resize to half the original video size"
+msgstr "ปรับขนาดให้เหลือครึ่งเดียวของขนาดต้นฉบับ"
 
-#: ../data/totem.ui.h:114
-msgid "_Angle Menu"
-msgstr "เมนูมุ_มกล้อง"
+#: ../data/totem.ui.h:24
+msgid "Resize _1:1"
+msgstr "ปรับขนาด _1:1"
 
-#: ../data/totem.ui.h:115
-msgid "_Aspect Ratio"
-msgstr "_สัดส่วนภาพ"
+#: ../data/totem.ui.h:25
+msgid "Resize to the original video size"
+msgstr "ปรับขนาดให้เท่าขนาดต้นฉบับ"
 
-#: ../data/totem.ui.h:116
-msgid "_Audio output type:"
-msgstr "_ชนิดของเอาต์พุตเสียง:"
+#: ../data/totem.ui.h:26
+msgid "Resize _2:1"
+msgstr "ปรับขนาด _2:1"
 
-#: ../data/totem.ui.h:117
-msgid "_Brightness:"
-msgstr "ความส_ว่าง:"
+#: ../data/totem.ui.h:27
+msgid "Resize to double the original video size"
+msgstr "ปรับขนาดให้เป็นสองเท่าของขนาดต้นฉบับ"
 
-#: ../data/totem.ui.h:118
-msgid "_Chapter Menu"
-msgstr "เมนู_ตอน"
+#: ../data/totem.ui.h:28
+msgid "_Aspect Ratio"
+msgstr "_สัดส่วนภาพ"
 
-#: ../data/totem.ui.h:119
-msgid "_Clear Playlist"
-msgstr "_ล้างรายการการเล่น"
+#: ../data/totem.ui.h:29
+msgid "Switch An_gles"
+msgstr "เปลี่ยนมุ_มกล้อง"
 
-#: ../data/totem.ui.h:120
-msgid "_Contents"
-msgstr "เนื้อ_หา"
+#: ../data/totem.ui.h:30
+msgid "Switch camera angles"
+msgstr "เปลี่ยนมุมกล้อง"
+
+#: ../data/totem.ui.h:31
+msgid "_Go"
+msgstr "ไ_ป"
 
-#: ../data/totem.ui.h:121
+#: ../data/totem.ui.h:32
 msgid "_DVD Menu"
 msgstr "เมนู_ดีวีดี"
 
-#: ../data/totem.ui.h:122
-msgid "_Edit"
-msgstr "แ_ก้ไข"
-
-#: ../data/totem.ui.h:123
-msgid "_Eject"
-msgstr "_ดันแผ่นออก"
-
-#: ../data/totem.ui.h:124
-msgid "_Encoding:"
-msgstr "_รหัสอักขระ:"
+#: ../data/totem.ui.h:33
+msgid "Go to the DVD menu"
+msgstr "ไปยังเมนูดีวีดี"
 
-#: ../data/totem.ui.h:125
-msgid "_Font:"
-msgstr "แ_บบอักษร:"
+#: ../data/totem.ui.h:34
+msgid "_Title Menu"
+msgstr "เมนู_หลัก"
 
-#: ../data/totem.ui.h:126
-msgid "_Fullscreen"
-msgstr "เต็ม_จอ"
+#: ../data/totem.ui.h:35
+msgid "Go to the title menu"
+msgstr "ไปยังเมนูหลัก"
 
-#: ../data/totem.ui.h:127
-msgid "_Go"
-msgstr "ไ_ป"
+#: ../data/totem.ui.h:36
+msgid "A_udio Menu"
+msgstr "เมนูเ_สียง"
 
-#: ../data/totem.ui.h:128
-msgid "_Help"
-msgstr "_วิธีใช้"
+#: ../data/totem.ui.h:37
+msgid "Go to the audio menu"
+msgstr "ไปยังเมนูเสียง"
 
-#: ../data/totem.ui.h:129
-msgid "_Hue:"
-msgstr "_สี:"
+#: ../data/totem.ui.h:38
+msgid "_Angle Menu"
+msgstr "เมนูมุ_มกล้อง"
 
-#: ../data/totem.ui.h:130
-msgid "_Languages"
-msgstr "_ภาษา"
+#: ../data/totem.ui.h:39
+msgid "Go to the angle menu"
+msgstr "ไปยังเมนูมุมกล้อง"
 
-#: ../data/totem.ui.h:131
-msgid "_Load subtitle files when movie is loaded"
-msgstr "เปิดแฟ้ม_บทบรรยายพร้อมกับภาพยนตร์"
+#: ../data/totem.ui.h:40
+msgid "_Chapter Menu"
+msgstr "เมนู_ตอน"
 
-#: ../data/totem.ui.h:132
-msgid "_Movie"
-msgstr "_ภาพยนตร์"
+#: ../data/totem.ui.h:41
+msgid "Go to the chapter menu"
+msgstr "ไปยังเมนูตอน"
 
-#: ../data/totem.ui.h:133
+#: ../data/totem.ui.h:42
 msgid "_Next Chapter/Movie"
 msgstr "ตอน/เรื่อง_ถัดไป"
 
-#: ../data/totem.ui.h:134
-msgid "_Open..."
-msgstr "_เปิด..."
+#: ../data/totem.ui.h:43
+msgid "Next chapter or movie"
+msgstr "ไปยังตอนหรือเรื่องถัดไป"
 
-#: ../data/totem.ui.h:135
+#: ../data/totem.ui.h:44
 msgid "_Previous Chapter/Movie"
 msgstr "ตอน/เรื่อง_ก่อนหน้า"
 
-#: ../data/totem.ui.h:136
-msgid "_Properties"
-msgstr "คุณ_สมบัติ"
+#: ../data/totem.ui.h:45
+msgid "Previous chapter or movie"
+msgstr "ตอนหรือเรื่องก่อนหน้า"
 
-#: ../data/totem.ui.h:137
-msgid "_Quit"
-msgstr "_ออก"
+#: ../data/totem.ui.h:46
+msgid "_Sound"
+msgstr "เสีย_ง"
 
-#: ../data/totem.ui.h:138
-msgid "_Repeat Mode"
-msgstr "เล่น_ซ้ำ"
+#: ../data/totem.ui.h:47
+msgid "Volume _Up"
+msgstr "เ_ร่งเสียง"
 
-#: ../data/totem.ui.h:139
-msgid "_Resize 1:2"
-msgstr "_ปรับขนาด 1:2"
+#: ../data/totem.ui.h:48
+msgid "Increase volume"
+msgstr "เร่งเสียง"
 
-#: ../data/totem.ui.h:140
-msgid "_Resize the window when a new video is loaded"
-msgstr "ปรับ_ขนาดหน้าต่างเมื่อเล่นแฟ้มใหม่"
+#: ../data/totem.ui.h:49
+msgid "Volume _Down"
+msgstr "_หรี่เสียง"
 
-#: ../data/totem.ui.h:142
-msgid "_Sound"
-msgstr "เสีย_ง"
+#: ../data/totem.ui.h:50
+msgid "Decrease volume"
+msgstr "หรี่เสียง"
 
-#: ../data/totem.ui.h:143
-msgid "_Title Menu"
-msgstr "เมนู_หลัก"
+#: ../data/totem.ui.h:51
+msgid "_Help"
+msgstr "_วิธีใช้"
 
-#: ../data/totem.ui.h:144
-msgid "_Type of visualization:"
-msgstr "_ชนิดของเอ็ฟเฟกต์ภาพ:"
+#: ../data/totem.ui.h:52
+msgid "_Contents"
+msgstr "เนื้อ_หา"
 
-#: ../data/totem.ui.h:145
-msgid "_View"
-msgstr "มุ_มมอง"
+#: ../data/totem.ui.h:53
+msgid "Help contents"
+msgstr "เนื้อหาวิธีใช้"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
-msgid ""
-"A list of the names of the plugins which are currently active (loaded and "
-"running)."
-msgstr "รายชื่อของปลั๊กอินที่กำลังใช้งานอยู่ (โหลดและทำงานอยู่)"
+#: ../data/totem.ui.h:54
+msgid "_About"
+msgstr "เ_กี่ยวกับ"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
-msgid "Active plugins list"
-msgstr "รายชื่อปลั๊กอินที่ใช้งานอยู่"
+#: ../data/totem.ui.h:55
+msgid "About this application"
+msgstr "เกี่ยวกับโปรแกรมนี้"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
-msgid "Allow the screensaver to activate when playing audio"
-msgstr "ให้โปรแกรมรักษาหน้าจอทำงานได้ขณะเล่นเพลง"
+#: ../data/totem.ui.h:56
+msgid "Show _Controls"
+msgstr "แสดง_ปุ่มควบคุม"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
-msgid ""
-"Allow the screensaver to activate when playing audio. Disable if you have "
-"monitor-powered speakers."
-msgstr "ให้โปรแกรมรักษาหน้าจอทำงานได้ขณะเล่นเพลง ปิดค่านี้ถ้าคุณใช้ลำโพงในจอภาพ"
+#: ../data/totem.ui.h:57
+msgid "Show controls"
+msgstr "แสดงปุ่มควบคุม"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
-msgid ""
-"Amount of data to buffer for network streams before starting to display the "
-"stream (in seconds)."
-msgstr "ปริมาณข้อมูลสตรีมเครือข่ายที่จะเก็บในบัฟเฟอร์ก่อนเริ่มแสดงผล (เป็นวินาที)"
+#: ../data/totem.ui.h:58
+msgid "S_idebar"
+msgstr "แ_ถบข้าง"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
-msgid ""
-"Approximate network connection speed, used to select quality on media over "
-"the network."
-msgstr "ความเร็วของการเชื่อมต่อเครือข่ายโดยประมาณ ใช้สำหรับเลือกระดับคุณภาพของสื่อในเครือข่าย"
+#: ../data/totem.ui.h:59
+msgid "Show or hide the sidebar"
+msgstr "แสดงหรือซ่อนแถบข้าง"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
-msgid "Default location for the \"Open...\" dialogs"
-msgstr "ตำแหน่งปริยายในกล่องโต้ตอบ \"เปิด...\""
+#: ../data/totem.ui.h:60
+msgctxt "Aspect ratio"
+msgid "Auto"
+msgstr "อัตโนมัติ"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
-msgid ""
-"Default location for the \"Open...\" dialogs. Default is the current "
-"directory."
-msgstr "ตำแหน่งปริยายในกล่องโต้ตอบ \"เปิด...\" ค่าปริยายคือไดเรกทอรีปัจจุบัน"
+#: ../data/totem.ui.h:61
+msgid "Sets automatic aspect ratio"
+msgstr "ปรับอัตราส่วนอัตโนมัติ"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
-msgid "Default location for the \"Take Screenshot\" dialogs"
-msgstr "ตำแหน่งปริยายในกล่องโต้ตอบ \"เก็บภาพหน้าจอ\""
+#: ../data/totem.ui.h:62
+msgid "Square"
+msgstr "จัตุรัส"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
-msgid ""
-"Default location for the \"Take Screenshot\" dialogs. Default is the "
-"Pictures directory."
-msgstr "ตำแหน่งปริยายในกล่องโต้ตอบ \"เก็บภาพหน้าจอ\" ค่าปริยายคือไดเรกทอรี Pictures"
+#: ../data/totem.ui.h:63
+msgid "Sets square aspect ratio"
+msgstr "ปรับอัตราส่วนแบบจัตุรัส"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
-msgid "Encoding character set for subtitle."
-msgstr "รหัสอักขระสำหรับบทบรรยาย"
+#: ../data/totem.ui.h:64
+msgid "4:3 (TV)"
+msgstr "4:3 (ทีวี)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
-msgid "Name of the visual effects plugin"
-msgstr "ชื่อของปลั๊กอินเอ็ฟเฟ็กต์ภาพ"
+#: ../data/totem.ui.h:65
+msgid "Sets 4:3 (TV) aspect ratio"
+msgstr "ปรับอัตราส่วนเป็น 4:3 (ทีวี)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
-msgid "Network buffering threshold"
-msgstr "บัฟเฟอร์เครือข่ายขั้นต่ำ"
+#: ../data/totem.ui.h:66
+msgid "16:9 (Widescreen)"
+msgstr "16:9 (จอกว้าง)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
-msgid "Network connection speed"
-msgstr "ความเร็วการเชื่อมต่อเครือข่าย"
+#: ../data/totem.ui.h:67
+msgid "Sets 16:9 (widescreen) aspect ratio"
+msgstr "ปรับอัตราส่วนเป็น 16:9 (จอกว้าง)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
-msgid "Pango font description for subtitle rendering."
-msgstr "ข้อกำหนดแบบอักษร Pango สำหรับใช้แสดงบทบรรยาย"
+#: ../data/totem.ui.h:68
+msgid "2.11:1 (DVB)"
+msgstr "2.11:1 (DVB)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
-msgid "Quality setting for the audio visualization."
-msgstr "คุณภาพของภาพเอ็ฟเฟ็กต์ของเสียง"
+#: ../data/totem.ui.h:69
+msgid "Sets 2.11:1 (DVB) aspect ratio"
+msgstr "ปรับอัตราส่วนเป็น 2.11:1 (DVB)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
-msgid "Repeat mode"
-msgstr "เล่นซ้ำ"
+#: ../data/totem.ui.h:70
+msgid "S_ubtitles"
+msgstr "บทบ_รรยาย"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
-msgid "Resize the canvas automatically on file load"
-msgstr "ปรับขนาดอัตโนมัติเมื่อเริ่มเล่น"
+#: ../data/totem.ui.h:73
+msgid "_Languages"
+msgstr "_ภาษา"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
-msgid "Show visual effects when no video is displayed"
-msgstr "แสดงเอ็ฟเฟ็กต์ภาพเมื่อไม่มีภาพจากภาพยนตร์"
+#: ../data/totem.ui.h:74
+msgid "Zoom In"
+msgstr "ขยายเข้า"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
-msgid "Show visual effects when playing an audio only file."
-msgstr "แสดงเอ็ฟเฟ็กต์ภาพเมื่อเล่นแฟ้มเพลงเท่านั้น"
+#: ../data/totem.ui.h:75
+msgid "Zoom in"
+msgstr "ขยายเข้า"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
-msgid "Shuffle mode"
-msgstr "เล่นสุ่ม"
+#: ../data/totem.ui.h:76
+msgid "Skip _Forward"
+msgstr "เดิน_หน้า"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
-msgid "Subtitle encoding"
-msgstr "รหัสอักขระสำหรับบทบรรยาย"
+#: ../data/totem.ui.h:77
+msgid "Skip forward"
+msgstr "ข้ามไปข้างหน้า"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
-msgid "Subtitle font"
-msgstr "แบบอักษรสำหรับบทบรรยาย"
+#: ../data/totem.ui.h:78
+msgid "Skip _Backwards"
+msgstr "_ถอยหลัง"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
-msgid "The brightness of the video"
-msgstr "ความสว่างภาพ"
+#: ../data/totem.ui.h:79
+msgid "Skip backwards"
+msgstr "ข้ามถอยหลัง"
+
+#: ../data/totem.ui.h:82
+msgid "Time seek bar"
+msgstr "แถบเลื่อนเวลา"
+
+#: ../data/uri.ui.h:1
+msgid "Enter the _address of the file you would like to open:"
+msgstr "ป้อน_ที่อยู่ของแฟ้มที่ต้องการเปิด:"
+
+#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
+msgid "_Add to Playlist"
+msgstr "เ_พิ่มในรายการการเล่น"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
-msgid "The contrast of the video"
-msgstr "ความต่างระดับสีของภาพ"
+#: ../data/video-list.ui.h:2
+msgid "Add the video to the playlist"
+msgstr "เพิ่มวีดิทัศน์ในรายการการเล่น"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
-msgid "The hue of the video"
-msgstr "สีของภาพ"
+#: ../src/backend/bacon-video-widget.c:1643
+msgid "Password requested for RTSP server"
+msgstr "มีการถามรหัสผ่านสำหรับเซิร์ฟเวอร์ RTSP"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
-msgid "The saturation of the video"
-msgstr "ความสดของสีภาพ"
+#: ../src/backend/bacon-video-widget.c:2944
+#, c-format
+msgid "Audio Track #%d"
+msgstr "ร่องเสียง #%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
-msgid "Type of audio output to use"
-msgstr "ชนิดของเอาต์พุตเสียง"
+#: ../src/backend/bacon-video-widget.c:2948
+#, c-format
+msgid "Subtitle #%d"
+msgstr "บทบรรยาย #%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
-msgid "Visualization quality setting"
-msgstr "คุณภาพของภาพเอ็ฟเฟ็กต์ของเสียง"
+#: ../src/backend/bacon-video-widget.c:3345
+msgid "The server you are trying to connect to is not known."
+msgstr "ไม่รู้จักเซิร์ฟเวอร์ที่เรียก"
+
+#: ../src/backend/bacon-video-widget.c:3348
+msgid "The connection to this server was refused."
+msgstr "การติดต่อถูกปฎิเสธ"
+
+#: ../src/backend/bacon-video-widget.c:3351
+msgid "The specified movie could not be found."
+msgstr "ไม่พบภาพยนตร์ที่เรียก"
+
+#: ../src/backend/bacon-video-widget.c:3358
+msgid "The server refused access to this file or stream."
+msgstr "เซิร์ฟเวอร์ปฎิเสธการเข้าถึงแฟ้มหรือสตรีมนี้"
+
+#: ../src/backend/bacon-video-widget.c:3364
+msgid "Authentication is required to access this file or stream."
+msgstr "ต้องมีการยืนยันตัวบุคคลก่อนจะเข้าใช้แฟ้มหรือสตรีมนี้"
+
+#: ../src/backend/bacon-video-widget.c:3371
+msgid "You are not allowed to open this file."
+msgstr "คุณไม่มีสิทธิ์เปิดแฟ้มนี้"
+
+#: ../src/backend/bacon-video-widget.c:3376
+msgid "This location is not a valid one."
+msgstr "ตำแหน่งไม่ถูกต้อง"
+
+#: ../src/backend/bacon-video-widget.c:3384
+msgid "The movie could not be read."
+msgstr "ไม่สามารถอ่านภาพยนตร์ได้"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
-msgid "Whether to autoload external chapter files when a movie is loaded"
-msgstr "กำหนดว่าจะเปิดแฟ้มการแบ่งตอนโดยอัตโนมัติพร้อมกับภาพยนตร์หรือไม่"
+#. should be exactly one missing thing (source or converter)
+#: ../src/backend/bacon-video-widget.c:3407
+#: ../src/backend/bacon-video-widget.c:3415
+#, c-format
+msgid "The playback of this movie requires a %s plugin which is not installed."
+msgid_plural ""
+"The playback of this movie requires the following decoders which are not "
+"installed:\n"
+"\n"
+"%s"
+msgstr[0] ""
+"การเล่นภาพยนตร์นี้ต้องใช้ตัวอ่านรหัสต่อไปนี้ซึ่งไม่ได้ติดตั้งไว้:\n"
+"\n"
+"%s"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
-msgid "Whether to autoload text subtitle files when a movie is loaded"
-msgstr "กำหนดว่าจะเปิดแฟ้มบทบรรยายโดยอัตโนมัติพร้อมกับภาพยนตร์หรือไม่"
+#: ../src/backend/bacon-video-widget.c:3426
+msgid ""
+"An audio or video stream is not handled due to missing codecs. You might "
+"need to install additional plugins to be able to play some types of movies"
+msgstr ""
+"มีสตรีมเสียงหรือวีดิทัศน์ที่ไม่รองรับเนื่องจากขาดตัวอ่านรหัส คุณอาจต้องติดตั้งปลั๊กอินเพิ่มเติม "
+"เพื่อจะเล่นภาพยนตร์บางชนิดได้"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
-msgid "Whether to disable deinterlacing for interlaced movies"
-msgstr "กำหนดว่าจะปิดการถอดเส้นสลับสำหรับวีดิทัศน์ที่สลับเส้นภาพมาหรือไม่"
+#: ../src/backend/bacon-video-widget.c:3436
+msgid ""
+"This file cannot be played over the network. Try downloading it locally "
+"first."
+msgstr "ไม่สามารถเล่นแฟ้มนี้ผ่านเครือข่ายได้ ลองดาวน์โหลดลงดิสก์ก่อนสิ"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
-msgid "Whether to disable the keyboard shortcuts"
-msgstr "กำหนดว่าจะปิดใช้ปุ่มลัดแป้นพิมพ์หรือไม่"
+#: ../src/backend/bacon-video-widget.c:5494 ../src/totem-properties-view.c:227
+msgid "Surround"
+msgstr "รอบทิศทาง"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
-msgid "Whether to disable the plugins in the user's home directory"
-msgstr "กำหนดว่าจะปิดใช้ปลั๊กอินในไดเรกทอรีบ้านของผู้ใช้หรือไม่"
+#: ../src/backend/bacon-video-widget.c:5496 ../src/totem-properties-view.c:229
+msgid "Mono"
+msgstr "โมโน"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:35
-msgid "Whether to enable debug for the playback engine"
-msgstr "กำหนดว่าจะเปิดการดีบั๊กเครื่องเล่นสื่อหรือไม่"
+#: ../src/backend/bacon-video-widget.c:5781
+msgid "Media contains no supported video streams."
+msgstr "สื่อไม่มีสตรีมวิดีโอที่รองรับ"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:36
+#: ../src/backend/bacon-video-widget.c:5963
 msgid ""
-"Whether to remember the position of played audio/video files when pausing or "
-"closing them"
-msgstr "กำหนดว่าจะจำตำแหน่งการเล่นของแฟ้มเสียง/วีดิทัศน์หรือไม่เมื่อสั่งพักหรือปิดแฟ้ม"
-
-#: ../data/uri.ui.h:1
-msgid "Enter the _address of the file you would like to open:"
-msgstr "ป้อน_ที่อยู่ของแฟ้มที่ต้องการเปิด:"
+"Some necessary plug-ins are missing. Make sure that the program is correctly "
+"installed."
+msgstr "ขาดปลั๊กอินบางตัวที่จำเป็น กรุณาตรวจสอบการติดตั้งของโปรแกรม"
 
 #: ../src/eggdesktopfile.c:165
 #, c-format
@@ -923,8 +982,8 @@
 #: ../src/eggfileformatchooser.c:657
 #, c-format
 msgid ""
-"The program was not able to find out the file format you want to use for `%"
-"s'. Please make sure to use a known extension for that file or manually "
+"The program was not able to find out the file format you want to use for `"
+"%s'. Please make sure to use a known extension for that file or manually "
 "choose a file format from the list below."
 msgstr ""
 "โปรแกรมไม่สามารถพิจารณาฟอร์แมตแฟ้มที่คุณต้องการใช้สำหรับ `%s' ได้ "
@@ -963,6 +1022,31 @@
 msgid "Show session management options"
 msgstr "แสดงตัวเลือกเกี่ยวกับการจัดการวาระ"
 
+#. hour:minutes:seconds
+#. Translators: This is a time format, like "9:05:02" for 9
+#. * hours, 5 minutes, and 2 seconds. You may change ":" to
+#. * the separator that your locale uses or use "%Id" instead
+#. * of "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:56
+#: ../src/plugins/skipto/totem-time-entry.c:57
+#, c-format
+msgctxt "long time format"
+msgid "%d:%02d:%02d"
+msgstr "%d:%02d:%02d"
+
+#. minutes:seconds
+#. Translators: This is a time format, like "5:02" for 5
+#. * minutes and 2 seconds. You may change ":" to the
+#. * separator that your locale uses or use "%Id" instead of
+#. * "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:65
+#, c-format
+msgctxt "short time format"
+msgid "%d:%02d"
+msgstr "%d:%02d"
+
 #. Title
 #. Artist
 #. Album
@@ -1063,10 +1147,14 @@
 msgid_plural "%d frames per second"
 msgstr[0] "%d เฟรมต่อวินาที"
 
-#: ../src/totem-audio-preview.c:166
+#: ../src/totem-audio-preview.c:137
 msgid "Audio Preview"
 msgstr "เล่นตัวอย่างแฟ้มเสียง"
 
+#: ../src/totem.c:240
+msgid "Verify your system installation. Totem will now exit."
+msgstr "กรุณาตรวจสอบการติดตั้งของระบบ Totem จะเลิกทำงาน"
+
 #: ../src/totem-cell-renderer-video.c:126
 msgid "Unknown video"
 msgstr "วีดิทัศน์ไม่ทราบชื่อ"
@@ -1079,7 +1167,7 @@
 msgid "Cancel"
 msgstr "ยกเลิก"
 
-#: ../src/totem-fullscreen.c:621
+#: ../src/totem-fullscreen.c:573
 msgid "No File"
 msgstr "ไม่มีแฟ้ม"
 
@@ -1097,7 +1185,7 @@
 msgid "Make sure that Totem is properly installed."
 msgstr "กรุณาตรวจสอบติดตั้ง Totem ว่าเรียบร้อยดีหรือไม่"
 
-#: ../src/totem-interface.c:347
+#: ../src/totem-interface.c:357
 msgid ""
 "Totem 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 "
@@ -1108,7 +1196,7 @@
 "GNU General Public License ที่เผยแพร่โดยมูลนิธิซอฟต์แวร์เสรี ไม่ว่าจะเป็นสัญญาอนุญาตรุ่นที่ 2 "
 "หรือรุ่นถัดมา (ตามแต่คุณจะเลือก)"
 
-#: ../src/totem-interface.c:351
+#: ../src/totem-interface.c:361
 msgid ""
 "Totem is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -1120,7 +1208,7 @@
 "*ความเหมาะสมสำหรับวัตถุประสงค์เฉพาะกิจใดๆ* กรุณาอ่าน GNU General Public License "
 "เพื่อดูรายละเอียดเพิ่มเติม"
 
-#: ../src/totem-interface.c:355
+#: ../src/totem-interface.c:365
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Totem; if not, write to the Free Software Foundation, Inc., 59 Temple Place, "
@@ -1130,198 +1218,105 @@
 "กรุณาติดต่อไปที่ Free Software Foundation, Inc., 59 Temple Place, Suite 330, "
 "Boston, MA  02111-1307  USA"
 
-#: ../src/totem-interface.c:358
+#: ../src/totem-interface.c:368
 msgid ""
 "Totem contains an exception to allow the use of proprietary GStreamer "
 "plugins."
 msgstr "Totem มีข้อยกเว้นเพื่อให้สามารถใช้ปลั๊กอินเชิงพาณิชย์สำหรับ GStreamer ได้"
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:190
+#: ../src/totem-menu.c:291
 msgid "None"
 msgstr "ไม่มี"
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:195
+#: ../src/totem-menu.c:296
 msgctxt "Language"
 msgid "Auto"
 msgstr "อัตโนมัติ"
 
-#. Translators:
-#. * This is not a JPEG image, but a disc image, for example,
-#. * an ISO file
-#: ../src/totem-menu.c:765
-#, c-format
-msgid "Play Image '%s'"
-msgstr "เล่นอิมเมจ '%s'"
-
-#: ../src/totem-menu.c:768 ../src/totem-menu.c:851
-#, c-format
-msgid "device%d"
-msgstr "อุปกรณ์%d"
-
-#: ../src/totem-menu.c:848
-#, c-format
-msgid "Play Disc '%s'"
-msgstr "เล่นแผ่น '%s'"
-
-#. This lists the back-end type and version, such as
-#. * Movie Player using GStreamer 0.10.1
-#: ../src/totem-menu.c:1189
-#, c-format
-msgid "Movie Player using %s"
-msgstr "โปรแกรมเล่นภาพยนตร์โดยใช้ %s"
-
-#: ../src/totem-menu.c:1193
+#: ../src/totem-menu.c:789
 msgid "Copyright © 2002-2009 Bastien Nocera"
 msgstr "Copyright © 2002-2009 Bastien Nocera"
 
-#: ../src/totem-menu.c:1198
+#: ../src/totem-menu.c:794
 msgid "translator-credits"
 msgstr ""
 "อิสริยะ ไพรีพ่ายฤทธิ์ \n"
 "เทพพิทักษ์ การุญบุญญานันท์ \n"
 "aka.ape "
 
-#: ../src/totem-menu.c:1202
+#: ../src/totem-menu.c:798
 msgid "Totem Website"
 msgstr "เว็บไซต์ Totem"
 
-#: ../src/totem-menu.c:1236
+#: ../src/totem-menu.c:829
 msgid "Configure Plugins"
 msgstr "ตั้งค่าปลั๊กอิน"
 
+#: ../src/totem-object.c:162
+#, c-format
+msgid ""
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"%s\n"
+"เรียก '%s --help' เพื่อดูตัวเลือกทั้งหมดของบรรทัดคำสั่ง\n"
+
 #. Translators: %s is the totem version number
-#: ../src/totem-object.c:471
+#: ../src/totem-object.c:591
 #, c-format
 msgid "Totem %s"
 msgstr "Totem %s"
 
-#: ../src/totem-object.c:1043 ../browser-plugin/totem-plugin-viewer.c:366
-msgid "Playing"
-msgstr "กำลังเล่น"
-
-#: ../src/totem-object.c:1045 ../src/totem-options.c:52
+#: ../src/totem-object.c:1168 ../src/totem-options.c:52
 msgid "Pause"
 msgstr "พัก"
 
-#: ../src/totem-object.c:1050 ../browser-plugin/totem-plugin-viewer.c:362
-msgid "Paused"
-msgstr "กำลังพัก"
-
-#: ../src/totem-object.c:1052 ../src/totem-object.c:1062
+#: ../src/totem-object.c:1175 ../src/totem-object.c:1185
 #: ../src/totem-options.c:51
 msgid "Play"
 msgstr "เล่น"
 
-#: ../src/totem-object.c:1057 ../src/totem-object.c:1655
-#: ../src/totem-statusbar.c:115 ../browser-plugin/totem-plugin-viewer.c:350
-msgid "Stopped"
-msgstr "หยุด"
-
-#: ../src/totem-object.c:1138 ../src/totem-object.c:1165
-#: ../src/totem-object.c:1795 ../src/totem-object.c:1959
+#: ../src/totem-object.c:1267 ../src/totem-object.c:1294
+#: ../src/totem-object.c:1787 ../src/totem-object.c:1942
 #, c-format
 msgid "Totem could not play '%s'."
 msgstr "Totem ไม่สามารถเล่น '%s'"
 
-#: ../src/totem-object.c:1242
-#, c-format
-msgid ""
-"Totem could not play this media (%s) although a plugin is present to handle "
-"it."
-msgstr "Totem ไม่สามารถเล่นสื่อนี้ (%s) ถึงแม้จะมีปลั๊กอินสำหรับเล่น"
-
-#: ../src/totem-object.c:1243
-msgid ""
-"You might want to check that a disc is present in the drive and that it is "
-"correctly configured."
-msgstr "คุณอาจตรวจสอบว่าได้ใส่แผ่นในไดรว์หรือไม่ และได้ตั้งค่าไดรว์ไว้ถูกต้องหรือไม่"
-
-#: ../src/totem-object.c:1251
-msgid "More information about media plugins"
-msgstr "ข้อมูลเพิ่มเติมเกี่ยวกับปลั๊กอินเล่นสื่อ"
-
-#: ../src/totem-object.c:1252
-msgid ""
-"Please install the necessary plugins and restart Totem to be able to play "
-"this media."
-msgstr "กรุณาติดตั้งปลั๊กอินที่จำเป็น และเรียกใช้ Totem ใหม่ เพื่อเล่นสื่อนี้"
-
-#: ../src/totem-object.c:1254
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because it does not have the "
-"appropriate plugins to be able to read from the disc."
-msgstr "Totem ไม่สามารถเล่นสื่อชนิดนี้ (%s) เพราะไม่มีปลั๊กอินที่เหมาะสมสำหรับการอ่านจากแผ่น"
-
-#: ../src/totem-object.c:1256
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because you do not have the "
-"appropriate plugins to handle it."
-msgstr "Totem ไม่สามารถเล่นสื่อชนิดนี้ (%s) เพราะไม่มีปลั๊กอินที่เหมาะสม"
-
-#: ../src/totem-object.c:1259
-#, c-format
-msgid "Totem cannot play this type of media (%s) because it is not supported."
-msgstr "Totem ไม่สามารถเล่นสื่อชนิดนี้ (%s) เพราะไม่รองรับ"
-
-#: ../src/totem-object.c:1260
-msgid "Please insert another disc to play back."
-msgstr "กรุณาใส่แผ่นอื่น"
-
-#: ../src/totem-object.c:1296
-msgid "Totem was not able to play this disc."
-msgstr "Totem ไม่สามารถเล่นแผ่นนี้ได้"
-
-#: ../src/totem-object.c:1297 ../src/totem-object.c:4225
-msgid "No reason."
-msgstr "ไม่ทราบสาเหตุ"
-
-#: ../src/totem-object.c:1311
-msgid "Totem does not support playback of Audio CDs"
-msgstr "Totem ไม่รองรับการเล่นซีดีเพลง"
-
-#: ../src/totem-object.c:1312
-msgid "Please consider using a music player or a CD extractor to play this CD"
-msgstr "กรุณาใช้โปรแกรมเล่นเพลง หรือโปรแกรมคัดลอกเพลงจากซีดี เพื่อเล่นซีดีนี้แทน"
-
-#: ../src/totem-object.c:1801
+#: ../src/totem-object.c:1793
 msgid "No error message"
 msgstr "ไม่มีข้อมูลเกี่ยวกับข้อผิดพลาดที่เกิดขึ้น"
 
-#: ../src/totem-object.c:2150
+#: ../src/totem-object.c:2133
 msgid "Totem could not display the help contents."
 msgstr "Totem ไม่สามารถแสดงวิธีใช้"
 
-#: ../src/totem-object.c:2489 ../src/totem-object.c:2491
-#: ../browser-plugin/totem-plugin-viewer.c:1410
-msgid "An error occurred"
-msgstr "เกิดปัญหา"
-
-#: ../src/totem-object.c:4060 ../src/totem-object.c:4062
+#: ../src/totem-object.c:4019 ../src/totem-object.c:4021
 msgid "Previous Chapter/Movie"
 msgstr "ตอน/เรื่องก่อนหน้า"
 
-#: ../src/totem-object.c:4069 ../src/totem-object.c:4071
+#: ../src/totem-object.c:4028 ../src/totem-object.c:4030
 msgid "Play / Pause"
 msgstr "เล่น / พัก"
 
-#: ../src/totem-object.c:4079 ../src/totem-object.c:4081
+#: ../src/totem-object.c:4038 ../src/totem-object.c:4040
 msgid "Next Chapter/Movie"
 msgstr "ตอน/เรื่องถัดไป"
 
-#. Translators: this is the tooltip text for the fullscreen button in the controls box in Totem's main window.
 #. Translators: this is the accessibility text for the fullscreen button in the controls box in Totem's main window.
-#: ../src/totem-object.c:4093 ../src/totem-object.c:4095
+#: ../src/totem-object.c:4051 ../src/totem-object.c:4053
 msgid "Fullscreen"
 msgstr "เต็มจอ"
 
-#: ../src/totem-object.c:4225
+#: ../src/totem-object.c:4184
 msgid "Totem could not startup."
 msgstr "Totem ไม่สามารถเริ่มทำงาน"
 
+#: ../src/totem-object.c:4184
+msgid "No reason."
+msgstr "ไม่ทราบสาเหตุ"
+
 #: ../src/totem-open-location.c:182
 msgid "Open Location..."
 msgstr "เปิดตำแหน่ง..."
@@ -1395,117 +1390,111 @@
 msgid "Movies to play"
 msgstr "ภาพยนตร์ที่จะเล่น"
 
-#: ../src/totem-options.c:117
+#: ../src/totem-options.c:79
+msgid "- Play movies and songs"
+msgstr "- เล่นภาพยนตร์และเพลง"
+
+#: ../src/totem-options.c:142
 msgid "Can't enqueue and replace at the same time"
 msgstr "ไม่สามารถทั้งเข้าคิวและแทนที่ในเวลาเดียวกัน"
 
 #. By extension entry
-#: ../src/totem-playlist.c:161
+#: ../src/totem-playlist.c:162
 msgid "MP3 ShoutCast playlist"
 msgstr "รายการการเล่น ShoutCast MP3"
 
-#: ../src/totem-playlist.c:162
+#: ../src/totem-playlist.c:163
 msgid "MP3 audio (streamed)"
 msgstr "เพลง MP3 (ผ่านสตรีม)"
 
-#: ../src/totem-playlist.c:163
+#: ../src/totem-playlist.c:164
 msgid "MP3 audio (streamed, DOS format)"
 msgstr "เพลง MP3 (ผ่านสตรีม, ฟอร์แมตแบบดอส)"
 
-#: ../src/totem-playlist.c:164
+#: ../src/totem-playlist.c:165
 msgid "XML Shareable Playlist"
 msgstr "รายการการเล่นแบบ XML ซึ่งแบ่งปันได้"
 
 #. This is "Title 3", where title is a DVD title
 #. * Note: NOT a DVD chapter
-#: ../src/totem-playlist.c:347
+#: ../src/totem-playlist.c:348
 #, c-format
 msgid "Title %d"
 msgstr "ชื่อ %d"
 
-#: ../src/totem-playlist.c:446
+#: ../src/totem-playlist.c:447
 msgid "Could not save the playlist"
 msgstr "ไม่สามารถบันทึกรายการการเล่น"
 
-#: ../src/totem-playlist.c:1021
+#: ../src/totem-playlist.c:1022
 msgid "Save Playlist"
 msgstr "บันทึกรายการการเล่น"
 
 #. translators: Playlist is the default saved playlist filename,
 #. * without the suffix
-#: ../src/totem-playlist.c:1033 ../src/totem-playlist.c:1264
-#: ../src/totem-sidebar.c:142
+#: ../src/totem-playlist.c:1034 ../src/totem-playlist.c:1263
+#: ../src/totem-sidebar.c:145
 msgid "Playlist"
 msgstr "รายการการเล่น"
 
-#: ../src/totem-playlist.c:1857
+#: ../src/totem-playlist.c:1862
 #, c-format
 msgid "The playlist '%s' could not be parsed. It might be damaged."
 msgstr "รายการการเล่น '%s' ไม่สามารถแจงได้ ข้อมูลอาจเสียอยู่"
 
-#: ../src/totem-playlist.c:1858
+#: ../src/totem-playlist.c:1863
 msgid "Playlist error"
 msgstr "รายการการเล่นมีปัญหา"
 
-#: ../src/totem-preferences.c:295
+#: ../src/totem-preferences.c:297
 msgid "Preferences"
 msgstr "ปรับแต่ง"
 
-#: ../src/totem-preferences.c:451
+#: ../src/totem-preferences.c:445
 msgid "Select Subtitle Font"
 msgstr "เลือกแบบอักษรสำหรับบทบรรยาย"
 
-#: ../src/totem-properties-main.c:115 ../src/totem-properties-view.c:252
+#: ../src/totem-properties-main.c:116 ../src/totem-properties-view.c:269
 msgid "Audio/Video"
 msgstr "ภาพ/เสียง"
 
-#: ../src/totem-properties-view.c:117
+#: ../src/totem-properties-view.c:131
 msgid "N/A"
 msgstr "ไม่ปรากฏ"
 
-#: ../src/totem-properties-view.c:146
+#: ../src/totem-properties-view.c:160
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 msgctxt "Stream bit rate"
 msgid "N/A"
 msgstr "ไม่ปรากฏ"
 
-#: ../src/totem-properties-view.c:149
+#: ../src/totem-properties-view.c:163
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: ../src/totem-properties-view.c:166
+#: ../src/totem-properties-view.c:180
 #: ../src/plugins/properties/totem-movie-properties.c:149
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../src/totem-properties-view.c:195
+#: ../src/totem-properties-view.c:212
 #: ../src/plugins/properties/totem-movie-properties.c:166
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: ../src/totem-properties-view.c:202
+#: ../src/totem-properties-view.c:219
 #: ../src/plugins/properties/totem-movie-properties.c:166
 msgctxt "Sample rate"
 msgid "N/A"
 msgstr "ไม่ปรากฏ"
 
-#: ../src/totem-properties-view.c:210
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5547
-msgid "Surround"
-msgstr "รอบทิศทาง"
-
-#: ../src/totem-properties-view.c:212
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5549
-msgid "Mono"
-msgstr "โมโน"
-
-#: ../src/totem-properties-view.c:222
+#: ../src/totem-properties-view.c:239
 msgctxt "Number of audio channels"
 msgid "N/A"
 msgstr "ไม่ปรากฏ"
@@ -1538,8 +1527,8 @@
 #. eg: 75 %
 #: ../src/totem-statusbar.c:250
 #, c-format
-msgid "%d %%"
-msgstr "%d %%"
+msgid "%lf %%"
+msgstr "%lf %%"
 
 #. eg: Paused, 0:32 / 1:05
 #: ../src/totem-statusbar.c:325
@@ -1550,8 +1539,8 @@
 #. eg: Buffering, 75 %
 #: ../src/totem-statusbar.c:330
 #, c-format
-msgid "%s, %d %%"
-msgstr "%s, %d %%"
+msgid "%s, %f %%"
+msgstr "%s, %f %%"
 
 #: ../src/totem-subtitle-encoding.c:156
 msgid "Current Locale"
@@ -1694,236 +1683,91 @@
 msgid "Vietnamese"
 msgstr "เวียดนาม"
 
-#: ../src/totem-video-list.c:330
-msgid "No video URI"
-msgstr "ไม่มี URI ของวีดิทัศน์"
-
-#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
-#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
-#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
-#: ../src/totem-video-thumbnailer.c:872
-#, c-format
-msgid ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-msgstr ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-
-#: ../src/totem-video-thumbnailer.c:873
-msgid "Filename"
-msgstr "ชื่อแฟ้ม"
-
-#: ../src/totem-video-thumbnailer.c:875
-msgid "Resolution"
-msgstr "ความละเอียด"
-
-#: ../src/totem-video-thumbnailer.c:878
-msgid "Duration"
-msgstr "ความยาว"
-
-#: ../src/totem-uri.c:504 ../src/plugins/chapters/totem-chapters.c:998
+#: ../src/totem-uri.c:343 ../src/plugins/chapters/totem-chapters.c:998
 msgid "All files"
 msgstr "ทุกแฟ้ม"
 
-#: ../src/totem-uri.c:509 ../src/plugins/chapters/totem-chapters.c:995
+#: ../src/totem-uri.c:348 ../src/plugins/chapters/totem-chapters.c:995
 msgid "Supported files"
 msgstr "แฟ้มที่รองรับ"
 
-#: ../src/totem-uri.c:521
+#: ../src/totem-uri.c:360
 msgid "Audio files"
 msgstr "แฟ้มเสียงทั้งหมด"
 
-#: ../src/totem-uri.c:529
+#: ../src/totem-uri.c:368
 msgid "Video files"
 msgstr "แฟ้มวิดีโอทั้งหมด"
 
-#: ../src/totem-uri.c:539
-msgid "Subtitle files"
-msgstr "แฟ้มบทบรรยาย"
-
-#: ../src/totem-uri.c:591
-msgid "Select Text Subtitles"
-msgstr "เลือกบทบรรยาย"
-
-#: ../src/totem-uri.c:654
-msgid "Select Movies or Playlists"
-msgstr "เลือกภาพยนตร์หรือรายการเล่น"
-
-#. Options parsing
-#: ../src/totem.c:201
-msgid "- Play movies and songs"
-msgstr "- เล่นภาพยนตร์และเพลง"
-
-#: ../src/totem.c:212
-#, c-format
-msgid ""
-"%s\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"%s\n"
-"เรียก '%s --help' เพื่อดูตัวเลือกทั้งหมดของบรรทัดคำสั่ง\n"
-
-#: ../src/totem.c:254 ../src/totem.c:263
-#: ../browser-plugin/totem-plugin-viewer.c:661
-#: ../browser-plugin/totem-plugin-viewer.c:1786
-msgid "Totem Movie Player"
-msgstr "Totem: โปรแกรมเล่นภาพยนตร์"
-
-#: ../src/totem.c:255 ../browser-plugin/totem-plugin-viewer.c:2233
-msgid "Could not initialize the thread-safe libraries."
-msgstr "ไม่สามารถเริ่มใช้ไลบรารีสำหรับการใช้งานเธรดอย่างปลอดภัย"
-
-#: ../src/totem.c:255
-msgid "Verify your system installation. Totem will now exit."
-msgstr "กรุณาตรวจสอบการติดตั้งของระบบ Totem จะเลิกทำงาน"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:1579
-msgid "Password requested for RTSP server"
-msgstr "มีการถามรหัสผ่านสำหรับเซิร์ฟเวอร์ RTSP"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2836
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2840
-#, c-format
-msgid "Audio Track #%d"
-msgstr "ร่องเสียง #%d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2868
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2872
-#, c-format
-msgid "Subtitle #%d"
-msgstr "บทบรรยาย #%d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3276
-msgid ""
-"The requested audio output was not found. Please select another audio output "
-"in the Multimedia Systems Selector."
-msgstr "ไม่พบเอาต์พุตเสียงที่ร้องขอ กรุณาเลือกเอาต์พุตเสียงช่องอื่นในตัวเลือกระบบสื่อผสม"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3281
-msgid "Location not found."
-msgstr "หาตำแหน่งที่กำหนดไม่พบ"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3285
-msgid ""
-"Could not open location; you might not have permission to open the file."
-msgstr "ไม่สามารถเปิดตำแหน่งได้ คุณอาจไม่ได้รับอนุญาตให้เปิดแฟ้มดังกล่าว"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3296
-msgid ""
-"The video output is in use by another application. Please close other video "
-"applications, or select another video output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"มีโปรแกรมอื่นใช้เอาต์พุตภาพอยู่ กรุณาปิดโปรแกรมวิดีโออื่น "
-"หรือเลือกเอาต์พุตภาพช่องอื่นในตัวเลือกระบบสื่อผสม"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3302
-msgid ""
-"The audio output is in use by another application. Please select another "
-"audio output in the Multimedia Systems Selector. You may want to consider "
-"using a sound server."
-msgstr ""
-"มีโปรแกรมอื่นใช้เอาต์พุตเสียงอยู่ กรุณาเลือกเอาต์พุตเสียงช่องอื่นในตัวเลือกระบบสื่อผสม "
-"และคุณอาจพิจารณาใช้เซิร์ฟเวอร์เสียง"
-
-#. should be exactly one missing thing (source or converter)
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3320
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3326
-#, c-format
-msgid "The playback of this movie requires a %s plugin which is not installed."
-msgid_plural ""
-"The playback of this movie requires the following decoders which are not "
-"installed:\n"
-"\n"
-"%s"
-msgstr[0] ""
-"การเล่นภาพยนตร์นี้ต้องใช้ตัวอ่านรหัสต่อไปนี้ซึ่งไม่ได้ติดตั้งไว้:\n"
-"\n"
-"%s"
+#: ../src/totem-uri.c:378
+msgid "Subtitle files"
+msgstr "แฟ้มบทบรรยาย"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3352
-msgid ""
-"Cannot play this file over the network. Try downloading it to disk first."
-msgstr "ไม่สามารถเล่นแฟ้มนี้ผ่านเครือข่ายได้ ลองดาวน์โหลดลงดิสก์ก่อนสิ"
+#: ../src/totem-uri.c:430
+msgid "Select Text Subtitles"
+msgstr "เลือกบทบรรยาย"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5834
-msgid "Media contains no supported video streams."
-msgstr "สื่อไม่มีสตรีมวิดีโอที่รองรับ"
+#: ../src/totem-uri.c:495
+msgid "Select Movies or Playlists"
+msgstr "เลือกภาพยนตร์หรือรายการเล่น"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6008
-msgid ""
-"Failed to create a GStreamer play object. Please check your GStreamer "
-"installation."
-msgstr ""
-"ไม่สามารถสร้างอ็อบเจกต์สำหรับเล่นสื่อของ GStreamer กรุณาตรวจสอบการติดตั้ง GStreamer ของคุณ"
+#: ../src/totem-uri.c:499
+msgid "Add Directory"
+msgstr "เพิ่มไดเรกทอรี"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6128
-msgid ""
-"Failed to open audio output. You may not have permission to open the sound "
-"device, or the sound server may not be running. Please select another audio "
-"output in the Multimedia Systems Selector."
-msgstr ""
-"ไม่สามารถเปิดเอาต์พุตเสียงได้ คุณอาจไม่ได้รับอนุญาตให้เปิดอุปกรณ์เสียง "
-"หรือเซิร์ฟเวอร์เสียงอาจไม่ได้ทำงานอยู่ กรุณาเลือกเอาต์พุตเสียงช่องอื่นในตัวเลือกระบบสื่อผสม"
+#: ../src/totem-video-list.c:330
+msgid "No video URI"
+msgstr "ไม่มี URI ของวีดิทัศน์"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6148
+#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
+#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
+#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
+#: ../src/totem-video-thumbnailer.c:841
+#, c-format
 msgid ""
-"Could not find the audio output. You may need to install additional "
-"GStreamer plugins, or select another audio output in the Multimedia Systems "
-"Selector."
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 msgstr ""
-"ไม่พบเอาต์พุตเสียงที่ร้องขอ คุณอาจต้องติดตั้งปลั๊กอิน GStreamer เพิ่มเติม "
-"หรือเลือกเอาต์พุตเสียงช่องอื่นในตัวเลือกระบบสื่อผสม"
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 
-#. hour:minutes:seconds
-#. Translators: This is a time format, like "9:05:02" for 9
-#. * hours, 5 minutes, and 2 seconds. You may change ":" to
-#. * the separator that your locale uses or use "%Id" instead
-#. * of "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:91 ../src/plugins/skipto/totem-time-entry.c:57
-#, c-format
-msgctxt "long time format"
-msgid "%d:%02d:%02d"
-msgstr "%d:%02d:%02d"
+#: ../src/totem-video-thumbnailer.c:842
+msgid "Filename"
+msgstr "ชื่อแฟ้ม"
 
-#. minutes:seconds
-#. Translators: This is a time format, like "5:02" for 5
-#. * minutes and 2 seconds. You may change ":" to the
-#. * separator that your locale uses or use "%Id" instead of
-#. * "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:100
-#, c-format
-msgctxt "short time format"
-msgid "%d:%02d"
-msgstr "%d:%02d"
+#: ../src/totem-video-thumbnailer.c:844
+msgid "Resolution"
+msgstr "ความละเอียด"
+
+#: ../src/totem-video-thumbnailer.c:847
+msgid "Duration"
+msgstr "ความยาว"
+
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:1
+msgid "Apple Trailers"
+msgstr "หนังตัวอย่างจากแอปเปิล"
+
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:2
+msgid "Sets the user agent for the Apple Trailers site"
+msgstr "ตั้งโปรแกรมฝั่งผู้ใช้สำหรับใช้กับไซต์หนังตัวอย่างจากแอปเปิล"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:1
+msgid "Autoload Subtitles"
+msgstr "ดาวน์โหลดบทบรรยายอัตโนมัติ"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:2
+msgid "Autoloads text subtitles"
+msgstr "ดาวน์โหลดข้อความบทบรรยายโดยอัตโนมัติ"
+
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
+msgid "Video Disc Recorder"
+msgstr "เครื่องอัดแผ่นภาพยนตร์"
 
-#: ../src/plugins/bemused/bemused.plugin.in.h:1
-msgid "Bemused"
-msgstr "Bemused"
-
-#: ../src/plugins/bemused/bemused.plugin.in.h:2
-msgid "Control Totem through a mobile phone with a Bemused client"
-msgstr "ควบคุม Totem ผ่านโทรศัพท์มือถือด้วยลูกข่าย Bemused"
-
-#. Translators: the parameter is a number used to identify this playlist entry
-#: ../src/plugins/bemused/totem-bemused.c:171
-#, c-format
-msgid "Untitled %d"
-msgstr "ไม่มีชื่อ %d"
-
-#: ../src/plugins/bemused/totem-bemused.c:597
-msgid "Totem Bemused Server"
-msgstr "เซิร์ฟเวอร์ Totem Bemused"
-
-#. FIXME version
-#: ../src/plugins/bemused/totem-bemused.c:599
-msgid "Totem Bemused Server version 1.0"
-msgstr "เซิร์ฟเวอร์ Totem Bemused รุ่น 1.0"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
+msgid "Records (S)VCDs or video DVDs"
+msgstr "อัด (S)VCD หรือ DVD ภาพยนตร์"
 
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:65
 msgid "_Create Video Disc..."
@@ -1949,93 +1793,85 @@
 msgid "Copy the currently playing (S)VCD"
 msgstr "คัดลอก (S)VCD ภาพยนตร์ที่กำลังเล่นอยู่"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:129
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:136
 msgid "The video disc could not be duplicated."
 msgstr "ไม่สามารถทำซ้ำแผ่นภาพยนตร์ได้"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:131
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:276
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:138
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:283
 msgid "The movie could not be recorded."
 msgstr "ไม่สามารถอัดภาพยนตร์ได้"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:157
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:167
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:263
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:164
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:174
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:270
 msgid "Unable to write a project."
 msgstr "ไม่สามารถเขียนแฟ้มโครงการได้"
 
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
-msgid "Records (S)VCDs or video DVDs"
-msgstr "อัด (S)VCD หรือ DVD ภาพยนตร์"
-
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
-msgid "Video Disc Recorder"
-msgstr "เครื่องอัดแผ่นภาพยนตร์"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:1
-#: ../src/plugins/chapters/totem-chapters.c:1139
-msgid "Chapters"
-msgstr "แบ่งตอน"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:2
-msgid "Support chapter markers in movies."
-msgstr "ทำเครื่องหมายตอนต่างๆ ในภาพยนตร์"
-
 #: ../src/plugins/chapters/chapters-edit.ui.h:1
 msgid "Name for new chapter:"
 msgstr "ชื่อตอน:"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:1
-msgid "Add Chapter..."
-msgstr "เพิ่มตอน..."
+msgid "_Remove Chapter"
+msgstr "_ลบตอนออก"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:2
-msgid "Add New Chapters"
-msgstr "เพิ่มรายชื่อตอนใหม่"
+msgid "Remove the chapter from the list"
+msgstr "ลบตอนออกจากรายชื่อ"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:3
-msgid "Create a new chapter list for the movie"
-msgstr "สร้างรายชื่อตอนอันใหม่ของภาพยนตร์"
+msgid "_Go to Chapter"
+msgstr "ไ_ปยังตอน"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:4
-msgid "Go to Chapter"
-msgstr "ไปยังตอนที่ต้องการ"
-
-#: ../src/plugins/chapters/chapters-list.ui.h:5
 msgid "Go to the chapter in the movie"
 msgstr "ไปยังตอนที่ต้องการในภาพยนตร์"
 
+#: ../src/plugins/chapters/chapters-list.ui.h:5
+msgid "Add Chapter..."
+msgstr "เพิ่มตอน..."
+
 #: ../src/plugins/chapters/chapters-list.ui.h:6
-msgid "Load Chapters..."
-msgstr "โหลดรายชื่อตอน..."
+msgid "Remove Chapter"
+msgstr "ลบตอนออก"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:7
-msgid "Load chapters from an external CMML file"
-msgstr "โหลดรายชื่อตอนจากแฟ้ม CMML ภายนอก"
+msgid "Go to Chapter"
+msgstr "ไปยังตอนที่ต้องการ"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:8
-msgid "No chapter data"
-msgstr "ไม่มีข้อมูลรายชื่อตอน"
+msgid "Save Changes"
+msgstr "บันทึกการเปลี่ยนแปลง"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:9
-msgid "Remove Chapter"
-msgstr "ลบตอนออก"
+msgid "No chapter data"
+msgstr "ไม่มีข้อมูลรายชื่อตอน"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:10
-msgid "Remove the chapter from the list"
-msgstr "ลบตอนออกจากรายชื่อ"
+msgid "Load Chapters..."
+msgstr "โหลดรายชื่อตอน..."
 
 #: ../src/plugins/chapters/chapters-list.ui.h:11
-msgid "Save Changes"
-msgstr "บันทึกการเปลี่ยนแปลง"
+msgid "Load chapters from an external CMML file"
+msgstr "โหลดรายชื่อตอนจากแฟ้ม CMML ภายนอก"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:12
-msgid "_Go to Chapter"
-msgstr "ไ_ปยังตอน"
+msgid "Add New Chapters"
+msgstr "เพิ่มรายชื่อตอนใหม่"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:13
-msgid "_Remove Chapter"
-msgstr "_ลบตอนออก"
+msgid "Create a new chapter list for the movie"
+msgstr "สร้างรายชื่อตอนอันใหม่ของภาพยนตร์"
+
+#: ../src/plugins/chapters/chapters.plugin.in.h:1
+#: ../src/plugins/chapters/totem-chapters.c:1139
+msgid "Chapters"
+msgstr "แบ่งตอน"
+
+#: ../src/plugins/chapters/chapters.plugin.in.h:2
+msgid "Support chapter markers in movies"
+msgstr "ทำเครื่องหมายตอนต่างๆ ในภาพยนตร์"
 
 #: ../src/plugins/chapters/totem-chapters.c:56
 #, c-format
@@ -2106,6 +1942,10 @@
 msgid "Failed to parse CMML file"
 msgstr "แจงแฟ้ม CMML ไม่สำเร็จ"
 
+#: ../src/plugins/chapters/totem-edit-chapter.c:95
+msgid "Add Chapter"
+msgstr "เพิ่มตอน"
+
 #: ../src/plugins/dbusservice/dbusservice.plugin.in.h:1
 msgid "D-Bus Service"
 msgstr "บริการ D-Bus"
@@ -2137,13 +1977,37 @@
 msgid "The URI ‘%s’ is not supported."
 msgstr "ไม่รองรับ URI ‘%s’"
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
-msgid "Instant Messenger status"
-msgstr "สถานะโปรแกรมข้อความด่วน"
+#: ../src/plugins/grilo/grilo.plugin.in.h:1
+msgid "Grilo Browser"
+msgstr "ท่องดูด้วย Grilo"
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
-msgid "Set your Instant Messenger status to away when a movie is playing"
-msgstr "กำหนดสถานะโปรแกรมข้อความด่วนของคุณเป็นไม่อยู่ในระหว่างเล่นภาพยนตร์"
+#: ../src/plugins/grilo/grilo.plugin.in.h:2
+msgid "A plugin to let you browse media content from various sources"
+msgstr "ปลั๊กอินสำหรับเรียกดูสื่อจากหลายแหล่ง"
+
+#: ../src/plugins/grilo/grilo.ui.h:1
+msgid "Add to Playlist"
+msgstr "เพิ่มในรายการการเล่น"
+
+#: ../src/plugins/grilo/grilo.ui.h:2
+msgid "Copy Location"
+msgstr "คัดลอกตำแหน่ง"
+
+#: ../src/plugins/grilo/grilo.ui.h:3 ../src/plugins/grilo/totem-grilo.c:1184
+msgid "Browse"
+msgstr "ท่องดู"
+
+#: ../src/plugins/grilo/grilo.ui.h:4 ../src/plugins/grilo/totem-grilo.c:1227
+msgid "Search"
+msgstr "ค้นหา"
+
+#: ../src/plugins/grilo/totem-grilo.c:454
+msgid "Browse Error"
+msgstr "ข้อผิดพลาดในการท่องดู"
+
+#: ../src/plugins/grilo/totem-grilo.c:609
+msgid "Search Error"
+msgstr "ข้อผิดพลาดของการค้นหา"
 
 #: ../src/plugins/gromit/gromit.plugin.in.h:1
 msgid "Gromit Annotations"
@@ -2157,53 +2021,13 @@
 msgid "The gromit binary was not found."
 msgstr "ไม่พบโปรแกรม gromit"
 
-#. Add the interface to Totem's sidebar
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:1
-#: ../src/plugins/iplayer/iplayer.py:46
-msgid "BBC iPlayer"
-msgstr "iPlayer ของ BBC"
-
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:2
-msgid "Stream BBC programs from the last 7 days from the BBC iPlayer service."
-msgstr "เล่นสตรีมของรายการ BBC ย้อนหลัง 7 วันจากบริการ iPlayer ของ BBC"
-
-#: ../src/plugins/iplayer/iplayer.py:72
-msgid "Error listing channel categories"
-msgstr "เกิดข้อผิดพลาดขณะอ่านรายชื่อหมวดของช่องต่างๆ"
-
-#: ../src/plugins/iplayer/iplayer.py:73
-msgid ""
-"There was an unknown error getting the list of television channels available "
-"on BBC iPlayer."
-msgstr "เกิดข้อผิดพลาดไม่ทราบสาเหตุขณะอ่านรายชื่อช่องทีวีจาก iPlayer ของ BBC"
-
-#. Append a dummy child row so that the expander's visible; we can
-#. then queue off the expander to load the programme listing for this
-#. category
-#: ../src/plugins/iplayer/iplayer.py:84
-msgid "Loading…"
-msgstr "กำลังโหลด…"
-
-#. Translators: the "programme feed" is the list of TV shows
-#. available to watch online
-#: ../src/plugins/iplayer/iplayer.py:136
-msgid "Error getting programme feed"
-msgstr "เกิดข้อผิดพลาดขณะอ่านข่าวป้อนของรายการทีวี"
-
-#: ../src/plugins/iplayer/iplayer.py:137
-msgid ""
-"There was an error getting the list of programmes for this channel and "
-"category combination."
-msgstr "เกิดข้อผิดพลาดขณะอ่านรายชื่อของรายการในช่องและหมวดนี้"
-
-#: ../src/plugins/iplayer/iplayer2.py:297
-msgid ""
-msgstr "<ไม่ทราบสาเหตุ>"
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
+msgid "Instant Messenger Status"
+msgstr "สถานะโปรแกรมข้อความทันใจ"
 
-#: ../src/plugins/iplayer/iplayer2.py:298
-#, python-format
-msgid "Programme unavailable (\"%s\")"
-msgstr "ไม่มีรายการ (\"%s\")"
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
+msgid "Set your Instant Messenger status to away when a movie is playing"
+msgstr "กำหนดสถานะโปรแกรมข้อความทันใจของคุณเป็นไม่อยู่ในระหว่างเล่นภาพยนตร์"
 
 #: ../src/plugins/lirc/lirc.plugin.in.h:1
 msgid "Infrared Remote Control"
@@ -2221,26 +2045,30 @@
 msgid "Couldn't read lirc configuration."
 msgstr "ไม่สามารถอ่านค่าตั้งของ lirc"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
-msgid "Download Movie Subtitles"
-msgstr "ดาวน์โหลดบทบรรยายภาพยนตร์"
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:1
+msgid "Media Player Keys"
+msgstr "ปุ่มเล่นสื่อ"
+
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:2
+msgid "Support additional media player keys"
+msgstr "รองรับปุ่มเล่นสื่อเพิ่มเติมบนแป้นพิมพ์"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
-msgid "Subtitle _language:"
-msgstr "_ภาษาของบทบรรยาย:"
+#: ../src/plugins/ontop/ontop.plugin.in.h:1
+msgid "Always On Top"
+msgstr "อยู่บนสุด"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
-msgid "_Play with Subtitle"
-msgstr "เ_ล่นพร้อมบทบรรยาย"
+#: ../src/plugins/ontop/ontop.plugin.in.h:2
+msgid "Keep the main window on top when playing a movie"
+msgstr "ให้หน้าต่างหลักอยู่บนสุดเสมอขณะเล่นภาพยนตร์"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:1
-msgid "Look for subtitles for the currently playing movie."
-msgstr "ค้นหาบทบรรยายของภาพยนตร์ที่กำลังเล่นอยู่"
-
-#: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:2
 msgid "Subtitle Downloader"
 msgstr "เครื่องมือดาวน์โหลดบทบรรยาย"
 
+#: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:2
+msgid "Look for subtitles for the currently playing movie"
+msgstr "ค้นหาบทบรรยายของภาพยนตร์ที่กำลังเล่นอยู่"
+
 #: ../src/plugins/opensubtitles/opensubtitles.py:42
 msgid "Brazilian Portuguese"
 msgstr "โปรตุเกสบราซิล"
@@ -2250,7 +2078,7 @@
 msgstr "กำลังค้นหาบทบรรยาย…"
 
 #: ../src/plugins/opensubtitles/opensubtitles.py:225
-#: ../src/plugins/opensubtitles/opensubtitles.py:644
+#: ../src/plugins/opensubtitles/opensubtitles.py:645
 msgid "Downloading the subtitles…"
 msgstr "กำลังดาวน์โหลดบทบรรยาย…"
 
@@ -2267,34 +2095,46 @@
 msgid "No results found."
 msgstr "ไม่พบรายการ"
 
-#: ../src/plugins/opensubtitles/opensubtitles.py:477
+#: ../src/plugins/opensubtitles/opensubtitles.py:478
 msgid "Subtitles"
 msgstr "บทบรรยาย"
 
 #. translators comment:
 #. This is the file-type of the subtitle file detected
-#: ../src/plugins/opensubtitles/opensubtitles.py:483
+#: ../src/plugins/opensubtitles/opensubtitles.py:484
 msgid "Format"
 msgstr "ฟอร์แมต"
 
 #. translators comment:
 #. This is a rating of the quality of the subtitle
-#: ../src/plugins/opensubtitles/opensubtitles.py:488
+#: ../src/plugins/opensubtitles/opensubtitles.py:489
 msgid "Rating"
 msgstr "ความนิยม"
 
-#: ../src/plugins/opensubtitles/opensubtitles.py:524
+#: ../src/plugins/opensubtitles/opensubtitles.py:525
 msgid "Download movie subtitles from OpenSubtitles"
 msgstr "ดาวน์โหลดบทบรรยายภาพยนตร์จาก OpenSubtitles"
 
-#: ../src/plugins/opensubtitles/opensubtitles.py:526
+#: ../src/plugins/opensubtitles/opensubtitles.py:527
 msgid "_Download Movie Subtitles…"
 msgstr "_ดาวน์โหลดบทบรรยายภาพยนตร์…"
 
-#: ../src/plugins/opensubtitles/opensubtitles.py:588
+#: ../src/plugins/opensubtitles/opensubtitles.py:589
 msgid "Searching subtitles…"
 msgstr "กำลังค้นหาบทบรรยาย…"
 
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
+msgid "Download Movie Subtitles"
+msgstr "ดาวน์โหลดบทบรรยายภาพยนตร์"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
+msgid "Subtitle _language:"
+msgstr "_ภาษาของบทบรรยาย:"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
+msgid "_Play with Subtitle"
+msgstr "เ_ล่นพร้อมบทบรรยาย"
+
 #: ../src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in.h:1
 msgid "Subtitle language"
 msgstr "ภาษาของบทบรรยาย"
@@ -2303,78 +2143,23 @@
 msgid "The language to search for subtitles for movies in."
 msgstr "ภาษาของบทบรรยายภาพยนตร์ที่จะค้นหา"
 
-#: ../src/plugins/ontop/ontop.plugin.in.h:1
-msgid "Always On Top"
-msgstr "อยู่บนสุด"
-
-#: ../src/plugins/ontop/ontop.plugin.in.h:2
-msgid "Keep the main window on top when playing a movie"
-msgstr "ให้หน้าต่างหลักอยู่บนสุดเสมอขณะเล่นภาพยนตร์"
+#: ../src/plugins/properties/movie-properties.plugin.in.h:1
+msgid "Movie Properties"
+msgstr "ข้อมูลภาพยนตร์"
+
+#: ../src/plugins/properties/movie-properties.plugin.in.h:2
+msgid "Adds movie properties to the sidebar"
+msgstr "แสดงข้อมูลของภาพยนตร์ในแถบข้าง"
 
 #: ../src/plugins/properties/totem-movie-properties.c:246
 msgid "Properties"
 msgstr "คุณสมบัติ"
 
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:2
-#, no-c-format
-msgid ""
-"A format string used to build the network service name used when publishing "
-"playlists over the network. The following format placeholders can be used: • "
-"%a: the program name as returned by g_get_application_name() • %h: the "
-"machine's host name in title case • %u: the user's login name in title case "
-"• %U: the user's real name • %%: the percent sign"
-msgstr ""
-"สตริงรูปแบบข้อความที่จะใช้สร้างเป็นชื่อบริการเครือข่ายเมื่อจะประกาศรายการการเล่นในเครือข่าย "
-"โดยสามารถตัวแปรต่อไปนี้ได้: %a: ชื่อโปรแกรมตามที่ได้จาก g_get_application_name() • %h: "
-"ชื่อโฮสต์ของเครื่องขึ้นต้นด้วยตัวพิมพ์ใหญ่ • %u: ชื่อเข้าระบบของผู้ใช้ขึ้นต้นด้วยตัวพิมพ์ใหญ่ • %U: "
-"ชื่อจริงของผู้ใช้ • %%: เครื่องหมายเปอร์เซ็นต์"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:3
-msgid "Format for network service name"
-msgstr "รูปแบบของชื่อบริการเครือข่าย"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:4
-msgid "Publisher protocol to use"
-msgstr "โพรโทคอลที่จะใช้ประกาศ"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:5
-msgid ""
-"The transport protocol to use when publishing playlists over the network."
-msgstr "โพรโทคอลถ่ายโอนที่จะใช้เมื่อประกาศรายการการเล่นในเครือข่าย"
-
-#. Translators: computers on the local network which are publishing their playlists over the network
-#: ../src/plugins/publish/totem-publish.c:552
-msgid "Neighbors"
-msgstr "เพื่อนร่วมเครือข่าย"
-
-#: ../src/plugins/publish/publish.plugin.in.h:1
-msgid "Publish Playlist"
-msgstr "ประกาศรายการการเล่น"
-
-#: ../src/plugins/publish/publish.plugin.in.h:2
-msgid "Share the current playlist via HTTP"
-msgstr "เปิดรายการการเล่นปัจจุบันให้ผู้อื่นใช้ร่วม ผ่าน HTTP"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:1
-msgid "Service _Name:"
-msgstr "_ชื่อบริการ:"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:3
-#, no-c-format
-msgid ""
-"The name used for announcing the playlist service on the network.\n"
-"All occurrences of the string %u will be replaced by your name,\n"
-"and %h will be replaced by your computer's host name."
-msgstr ""
-"ชื่อที่จะใช้ประกาศบริการรายการการเล่นออกไปในเครือข่าย\n"
-"ข้อความ %u ทั้งหมดจะถูกแทนที่ด้วยชื่อของคุณ\n"
-"และ %h จะถูกแทนที่โดยชื่อโฮสต์ของคอมพิวเตอร์ของคุณ"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:6
-msgid "Use _encrypted transport protocol (HTTPS)"
-msgstr "ใช้โพรโทคอลถ่ายโอนข้อมูลแบบเข้ารหัส_ลับ (HTTPS)"
-
 #: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:1
+msgid "rpdb2 password"
+msgstr "รหัสผ่าน rpdb2"
+
+#: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:2
 msgid ""
 "A password to protect the rpdb2 server for debugging Totem from unauthorized "
 "remote access. If this is empty, a default of 'totem' will be used."
@@ -2382,26 +2167,85 @@
 "รหัสผ่านที่จะใช้ปกป้องเซิร์ฟเวอร์ rpdb2 ที่ใช้ดีบั๊ก Totem "
 "จากการเข้าใช้จากเครื่องอื่นโดยไม่ได้รับอนุญาต ถ้าค่านี้ว่างเปล่า ก็จะใช้ค่าปริยาย 'totem'"
 
-#: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:2
-msgid "rpdb2 password"
-msgstr "รหัสผ่าน rpdb2"
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
+msgid "Python Console"
+msgstr "คอนโซลภาษาไพธอน"
+
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
+msgid "Interactive Python console"
+msgstr "คอนโซลโต้ตอบภาษาไพธอน"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:88
+msgid "Python Console Menu"
+msgstr "เมนูคอนโซลภาษาไพธอน"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:93
+msgid "_Python Console"
+msgstr "คอนโซลภาษาไ_พธอน"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:94
+msgid "Show Totem's Python console"
+msgstr "แสดงคอนโซลภาษาไพธอนของ Totem"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:100
+msgid "Python Debugger"
+msgstr "โปรแกรมดีบั๊กภาษาไพธอน"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:101
+msgid "Enable remote Python debugging with rpdb2"
+msgstr "เปิดใช้การดีบั๊กระยะไกลสำหรับภาษาไพธอน โดยใช้ rpdb2"
+
+#. pylint: disable-msg=E1101
+#: ../src/plugins/pythonconsole/pythonconsole.py:125
+#, python-format
+msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
+msgstr "คุณสามารถเข้าถึงอ็อบเจกต์ของ totem ผ่าน 'totem_object' :\\n%s"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:129
+msgid "Totem Python Console"
+msgstr "คอนโซลภาษาไพธอนของ Totem"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:139
+msgid ""
+"After you press OK, Totem will wait until you connect to it with winpdb or "
+"rpdb2. If you have not set a debugger password in DConf, it will use the "
+"default password ('totem')."
+msgstr ""
+"หลังจากที่คุณกด \"ตกลง\" Totem จะรอจนกว่าคุณจะเชื่อมต่อเข้ามาโดยใช้ winpdb หรือ rpdb2 "
+"ถ้าคุณยังไม่ได้ตั้งรหัสผ่านสำหรับโปรแกรมดีบั๊กใน DConf ก็จะใช้รหัสผ่านปริยาย ('totem')"
+
+#: ../src/plugins/recent/recent.plugin.in.h:1
+msgid "Recent files"
+msgstr "แฟ้มล่าสุด"
+
+#: ../src/plugins/recent/recent.plugin.in.h:2
+msgid "Adds files that have been played to recent files"
+msgstr "เพิ่มแฟ้มที่มีการเล่นเข้าในรายชื่อแฟ้มใช้งานล่าสุด"
 
 #: ../src/plugins/rotation/rotation.plugin.in.h:1
-msgid "Allows videos to be rotated if they're in the wrong orientation."
-msgstr "หมุนภาพวีดิทัศน์ถ้าภาพอยู่ในแนววางที่ไม่ถูกต้อง"
-
-#: ../src/plugins/rotation/rotation.plugin.in.h:2
 msgid "Rotation Plugin"
 msgstr "ปลั๊กอินหมุนจอ"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:60
+#: ../src/plugins/rotation/rotation.plugin.in.h:2
+msgid "Allows videos to be rotated if they are in the wrong orientation"
+msgstr "หมุนภาพวีดิทัศน์ถ้าภาพอยู่ในแนววางที่ไม่ถูกต้อง"
+
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:50
 msgid "_Rotate Clockwise"
 msgstr "หมุน_ตามเข็มนาฬิกา"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:62
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:52
 msgid "Rotate Counterc_lockwise"
 msgstr "หมุน_ทวนเข็มนาฬิกา"
 
+#: ../src/plugins/save-file/save-file.plugin.in.h:1
+msgid "Save Copy"
+msgstr "บันทึกสำเนา"
+
+#: ../src/plugins/save-file/save-file.plugin.in.h:2
+msgid "Save a copy of the currently playing movie"
+msgstr "บันทึกสำเนาของภาพยนตร์ที่กำลังเล่นอยู่"
+
 #: ../src/plugins/save-file/totem-save-file.c:63
 msgid "Save a Copy..."
 msgstr "บันทึกสำเนา..."
@@ -2424,40 +2268,48 @@
 msgid "Movie stream"
 msgstr "สตรีมภาพยนตร์"
 
-#: ../src/plugins/screensaver/totem-screensaver.c:116
-#: ../browser-plugin/totem-plugin-viewer.c:1884
-msgid "Playing a movie"
-msgstr "กำลังเล่นภาพยนตร์"
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:1
+msgid "Screen Saver"
+msgstr "โปรแกรมรักษาหน้าจอ"
+
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:2
+msgid "Deactivates the screen saver when a movie is playing"
+msgstr "ปิดโปรแกรมรักษาหน้าจอขณะเล่นภาพยนตร์"
 
 #: ../src/plugins/screenshot/gallery.ui.h:1
+msgid "Screenshot width (in pixels):"
+msgstr "ความกว้างของภาพหน้าจอ (เป็นพิกเซล):"
+
+#: ../src/plugins/screenshot/gallery.ui.h:2
 msgid "Calculate the number of screenshots"
 msgstr "คำนวณจำนวนภาพหน้าจอ"
 
-#: ../src/plugins/screenshot/gallery.ui.h:2
+#: ../src/plugins/screenshot/gallery.ui.h:3
 msgid "Number of screenshots:"
 msgstr "จำนวนภาพหน้าจอ:"
 
-#: ../src/plugins/screenshot/gallery.ui.h:3
-msgid "Screenshot width (in pixels):"
-msgstr "ความกว้างของภาพหน้าจอ (เป็นพิกเซล):"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:1
-msgid "Save in _folder:"
-msgstr "บันทึกในโ_ฟลเดอร์:"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:2
-msgid "Select a folder"
-msgstr "เลือกโฟลเดอร์"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:3
-msgid "_Name:"
-msgstr "_ชื่อ:"
-
-#. Write the screenshot to the temporary file
-#: ../src/plugins/screenshot/gnome-screenshot-widget.c:385
-#: ../src/plugins/screenshot/totem-screenshot.c:64
-msgid "Screenshot.png"
-msgstr "Screenshot.png"
+#. translators: this is the name of the file that gets made up
+#. * with the screenshot if the entire screen is taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:147
+#, c-format
+msgid "Screenshot from %s.png"
+msgstr "Screenshot from %s.png"
+
+#. translators: this is the name of the file that gets
+#. * made up with the screenshot if the entire screen is
+#. * taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:154
+#, c-format
+msgid "Screenshot from %s - %d.png"
+msgstr "Screenshot from %s - %d.png"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:1
+msgid "Screenshot"
+msgstr "จับภาพหน้าจอ"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:2
+msgid "Allows screenshots and galleries to be taken of videos"
+msgstr "ช่วยจับภาพหน้าจอและสร้างห้องภาพจากวีดิทัศน์"
 
 #: ../src/plugins/screenshot/totem-gallery.c:91
 msgid "Save Gallery"
@@ -2483,49 +2335,47 @@
 msgid "Saving gallery as \"%s\""
 msgstr "กำลังบันทึกห้องภาพในชื่อ \"%s\""
 
-#: ../src/plugins/screenshot/totem-screenshot.c:113
-msgid "There was an error saving the screenshot."
-msgstr "เกิดข้อผิดพลาดขณะบันทึกภาพหน้าจอ"
-
-#: ../src/plugins/screenshot/totem-screenshot.c:139
-msgid "Save Screenshot"
-msgstr "บันทึกภาพหน้าจอ"
-
-#. Create the screenshot widget
-#. Translators: %s is the movie title and %d is an auto-incrementing number to make filename unique
-#: ../src/plugins/screenshot/totem-screenshot.c:160
-#, c-format
-msgid "Screenshot-%s-%d.png"
-msgstr "Screenshot-%s-%d.png"
-
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:88
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:220
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "Totem could not get a screenshot of the video."
 msgstr "Totem ไม่สามารถจับหน้าจอของภาพยนตร์ได้"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "This is not supposed to happen; please file a bug report."
 msgstr "เหตุการณ์นี้ไม่น่าจะเกิด กรุณารายงานข้อผิดพลาดนี้"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
-msgid "Take _Screenshot..."
-msgstr "เก็บภาพหน้า_จอ..."
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
+msgid "Take _Screenshot"
+msgstr "จับภาพหน้า_จอ"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
 msgid "Take a screenshot"
-msgstr "เก็บภาพหน้าจอ"
+msgstr "จับภาพหน้าจอ"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create Screenshot _Gallery..."
 msgstr "สร้าง_ห้องภาพหน้าจอ..."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create a gallery of screenshots"
 msgstr "สร้างห้องภาพสำหรับเก็บภาพหน้าจอ"
 
+#: ../src/plugins/skipto/skipto.plugin.in.h:1
+#: ../src/plugins/skipto/totem-skipto.c:196
+msgid "Skip To"
+msgstr "ข้ามไปยัง"
+
+#: ../src/plugins/skipto/skipto.plugin.in.h:2
+msgid "Provides the \"Skip to\" dialog"
+msgstr "ใช้กล่องโต้ตอบ \"ข้ามไปยัง\""
+
+#: ../src/plugins/skipto/skipto.ui.h:1
+msgid "_Skip to:"
+msgstr "_ข้ามไปยัง:"
+
 #. Update the "seconds" label so that it always has the correct singular/plural form
 #. Translators: label for the seconds selector in the "Skip to" dialogue
-#: ../src/plugins/skipto/totem-skipto.c:160
+#: ../src/plugins/skipto/totem-skipto.c:159
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "วินาที"
@@ -2534,15 +2384,11 @@
 #. Translators: you should translate this string to a number (written in digits) which corresponds to the longer character length of the
 #. * translations for "second" and "seconds", as translated elsewhere in this file. For example, in English, "second" is 6 characters long and
 #. * "seconds" is 7 characters long, so this string should be translated to "7". See: bgo#639398
-#: ../src/plugins/skipto/totem-skipto.c:190
+#: ../src/plugins/skipto/totem-skipto.c:189
 msgctxt "Skip To label length"
 msgid "7"
 msgstr "4"
 
-#: ../src/plugins/skipto/totem-skipto.c:197
-msgid "Skip To"
-msgstr "ข้ามไปยัง"
-
 #: ../src/plugins/skipto/totem-skipto-plugin.c:182
 msgid "_Skip To..."
 msgstr "_ข้ามไปยัง..."
@@ -2551,186 +2397,350 @@
 msgid "Skip to a specific time"
 msgstr "ข้ามแบบระบุเวลา"
 
-#: ../src/plugins/skipto/skipto.ui.h:1
-msgid "_Skip to:"
-msgstr "_ข้ามไปตำแหน่ง:"
+#~ msgid "Movie Player"
+#~ msgstr "โปรแกรมเล่นภาพยนตร์"
 
-#: ../src/plugins/youtube/youtube.plugin.in.h:1
-msgid "A plugin to let you browse YouTube videos."
-msgstr "ปลั๊กอินสำหรับเรียกดูวีดิทัศน์จาก YouTube"
+#~ msgid "Play movies and songs"
+#~ msgstr "เล่นภาพยนตร์และเพลง"
 
-#: ../src/plugins/youtube/youtube.plugin.in.h:2
-msgid "YouTube Browser"
-msgstr "ท่องดู YouTube"
+#~ msgid "1.5 Mbps T1/Intranet/LAN"
+#~ msgstr "1.5 Mbps - T1/อินทราเน็ต/แลน"
 
-#: ../src/plugins/youtube/youtube.ui.h:1
-msgid "Related Videos"
-msgstr "วีดิทัศน์ที่เกี่ยวข้อง"
+#~ msgid "112 Kbps Dual ISDN/DSL"
+#~ msgstr "112 Kbps - ISDN/DSL ควบ"
 
-#: ../src/plugins/youtube/youtube.ui.h:2
-msgid "Search Results"
-msgstr "ผลการค้นหา"
+#~ msgid "14.4 Kbps Modem"
+#~ msgstr "14.4 Kbps - โมเด็ม"
 
-#: ../src/plugins/youtube/youtube.ui.h:3
-msgid "Videos"
-msgstr "วีดิทัศน์"
+#~ msgid "19.2 Kbps Modem"
+#~ msgstr "19.2 Kbps - โมเด็ม"
 
-#: ../src/plugins/youtube/totem-youtube.c:144
-#: ../src/plugins/youtube/totem-youtube.c:819
-msgid "_Open in Web Browser"
-msgstr "เ_ปิดในเว็บเบราว์เซอร์"
-
-#: ../src/plugins/youtube/totem-youtube.c:144
-msgid "Open the video in your web browser"
-msgstr "เปิดวีดิทัศน์ในเว็บเบราว์เซอร์"
-
-#. Add the sidebar page
-#: ../src/plugins/youtube/totem-youtube.c:195
-msgid "YouTube"
-msgstr "YouTube"
-
-#: ../src/plugins/youtube/totem-youtube.c:279
-msgid "Cancelling query…"
-msgstr "กำลังยกเลิกการค้น…"
-
-#. Hide the ugly technical message libgdata gives behind a nice one telling them it's out of date (which it likely is
-#. * if we're receiving a protocol error).
-#. Spew out the error message as provided
-#: ../src/plugins/youtube/totem-youtube.c:424
-#: ../src/plugins/youtube/totem-youtube.c:429
-msgid "Error Searching for Videos"
-msgstr "เกิดข้อผิดพลาดขณะค้นหาวีดิทัศน์"
-
-#: ../src/plugins/youtube/totem-youtube.c:425
-msgid ""
-"The response from the server could not be understood. Please check you are "
-"running the latest version of libgdata."
-msgstr "ไม่เข้าใจคำตอบจากเซิร์ฟเวอร์ กรุณาตรวจสอบว่าคุณได้ใช้ libgdata รุ่นล่าสุดหรือไม่"
-
-#. Update the UI
-#: ../src/plugins/youtube/totem-youtube.c:630
-msgid "Fetching search results…"
-msgstr "กำลังดึงผลการค้นหา…"
-
-#. Update the UI
-#: ../src/plugins/youtube/totem-youtube.c:696
-msgid "Fetching related videos…"
-msgstr "กำลังดึงวีดิทัศน์ที่เกี่ยวข้อง…"
-
-#: ../src/plugins/youtube/totem-youtube.c:748
-msgid "Error Opening Video in Web Browser"
-msgstr "เกิดข้อผิดพลาดขณะเปิดวีดิทัศน์ในเว็บเบราว์เซอร์"
-
-#: ../src/plugins/youtube/totem-youtube.c:768
-msgid "Fetching more videos…"
-msgstr "กำลังดึงวีดิทัศน์เพิ่มเติม…"
-
-#: ../src/plugins/youtube/totem-youtube.c:813
-msgid "Video Format Not Supported"
-msgstr "ไม่รองรับรูปแบบวีดิทัศน์นี้"
+#~ msgid "256 Kbps DSL/Cable"
+#~ msgstr "256 Kbps - DSL/เคเบิล"
 
-#: ../src/plugins/youtube/totem-youtube.c:815
-msgid ""
-"This video is not available in any formats which Totem supports. Would you "
-"like to open it in your web browser instead?"
-msgstr ""
-"รูปแบบวีดิทัศน์นี้ไม่อยู่ในรายการใดที่ Totem รองรับเลย "
-"คุณต้องการจะเปิดวีดิทัศน์ในเว็บเบราว์เซอร์แทนหรือไม่?"
+#~ msgid "28.8 Kbps Modem"
+#~ msgstr "28.8 Kbps - โมเด็ม"
 
-#: ../browser-plugin/totem-plugin-viewer.c:429
-msgid "No URI to play"
-msgstr "ไม่มี URI ที่จะเล่น"
+#~ msgid "33.6 Kbps Modem"
+#~ msgstr "33.6 Kbps - โมเด็ม"
 
-#. translators: this is:
-#. * Open With ApplicationName
-#. * as in nautilus' right-click menu
-#: ../browser-plugin/totem-plugin-viewer.c:1100
-#, c-format
-msgid "_Open with \"%s\""
-msgstr "เ_ปิดด้วย \"%s\""
+#~ msgid "34.4 Kbps Modem"
+#~ msgstr "34.4 Kbps - โมเด็ม"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2123
-msgid "No playlist or playlist empty"
-msgstr "ไม่มีรายการการเล่น หรือรายการการเล่นว่างเปล่า"
+#~ msgid "384 Kbps DSL/Cable"
+#~ msgstr "384 Kbps DSL/เคเบิล"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2217
-msgid "Movie browser plugin"
-msgstr "ปลั๊กอินท่องดูภาพยนตร์"
+#~ msgid "512 Kbps DSL/Cable"
+#~ msgstr "512 Kbps - DSL/เคเบิล"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2233
-msgid "Verify your system installation. The Totem plugin will now exit."
-msgstr "กรุณาตรวจสอบการติดตั้งของระบบ ปลั๊กอิน Totem จะเลิกทำงาน"
+#~ msgid "56 Kbps Modem/ISDN"
+#~ msgstr "56 Kbps - โมเด็ม/ISDN"
 
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
-msgid "Interactive Python console."
-msgstr "คอนโซลโต้ตอบภาษาไพธอน"
+#~ msgid "Configure the application"
+#~ msgstr "ตั้งค่าโปรแกรม"
 
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
-msgid "Python Console"
-msgstr "คอนโซลภาษาไพธอน"
+#~ msgid "Connection _speed:"
+#~ msgstr "ความเ_ร็วการเชื่อมต่อ:"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:88
-msgid "Python Console Menu"
-msgstr "เมนูคอนโซลภาษาไพธอน"
+#~ msgid "Intranet/LAN"
+#~ msgstr "อินทราเน็ต/LAN"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:93
-msgid "_Python Console"
-msgstr "คอนโซลภาษาไ_พธอน"
+#~ msgid "Networking"
+#~ msgstr "เครือข่าย"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:94
-msgid "Show Totem's Python console"
-msgstr "แสดงคอนโซลภาษาไพธอนของ Totem"
+#~ msgid "Open _Location..."
+#~ msgstr "เปิด_ตำแหน่ง..."
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:100
-msgid "Python Debugger"
-msgstr "โปรแกรมดีบั๊กภาษาไพธอน"
+#~ msgid "Open a file"
+#~ msgstr "เปิดแฟ้ม"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:101
-msgid "Enable remote Python debugging with rpdb2"
-msgstr "เปิดใช้การดีบั๊กระยะไกลสำหรับภาษาไพธอน โดยใช้ rpdb2"
+#~ msgid "Open a non-local file"
+#~ msgstr "เปิดแฟ้มจากเครื่องอื่น"
 
-#. pylint: disable-msg=E1101
-#: ../src/plugins/pythonconsole/pythonconsole.py:125
-#, python-format
-msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
-msgstr "คุณสามารถเข้าถึงอ็อบเจกต์ของ totem ผ่าน 'totem_object' :\\n%s"
+#~ msgid "Quit the program"
+#~ msgstr "ออกจากโปรแกรม"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:129
-msgid "Totem Python Console"
-msgstr "คอนโซลภาษาไพธอนของ Totem"
+#~ msgid "Set the repeat mode"
+#~ msgstr "ตั้งให้เล่นซ้ำ"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:139
-msgid ""
-"After you press OK, Totem will wait until you connect to it with winpdb or "
-"rpdb2. If you have not set a debugger password in DConf, it will use the "
-"default password ('totem')."
-msgstr ""
-"หลังจากที่คุณกด \"ตกลง\" Totem จะรอจนกว่าคุณจะเชื่อมต่อเข้ามาโดยใช้ winpdb หรือ rpdb2 "
-"ถ้าคุณยังไม่ได้ตั้งรหัสผ่านสำหรับโปรแกรมดีบั๊กใน DConf ก็จะใช้รหัสผ่านปริยาย ('totem')"
+#~ msgid "Set the shuffle mode"
+#~ msgstr "ตั้งให้เล่นแบบสุ่ม"
 
-#: ../src/plugins/grilo/grilo.plugin.in.h:1
-msgid "A plugin to let you browse media content from various sources."
-msgstr "ปลั๊กอินสำหรับเรียกดูสื่อจากหลายแหล่ง"
+#~ msgid "Switch to fullscreen"
+#~ msgstr "ดูแบบเต็มจอ"
 
-#: ../src/plugins/grilo/grilo.plugin.in.h:2
-msgid "Grilo Browser"
-msgstr "ท่องดูด้วย Grilo"
+#~ msgid ""
+#~ "Approximate network connection speed, used to select quality on media "
+#~ "over the network."
+#~ msgstr ""
+#~ "ความเร็วของการเชื่อมต่อเครือข่ายโดยประมาณ ใช้สำหรับเลือกระดับคุณภาพของสื่อในเครือข่าย"
 
-#: ../src/plugins/grilo/totem-grilo.c:452
-msgid "Browse Error"
-msgstr "ข้อผิดพลาดในการท่องดู"
+#~ msgid "Network connection speed"
+#~ msgstr "ความเร็วการเชื่อมต่อเครือข่าย"
 
-#: ../src/plugins/grilo/totem-grilo.c:599
-msgid "Search Error"
-msgstr "ข้อผิดพลาดของการค้นหา"
+#~ msgid "Play Image '%s'"
+#~ msgstr "เล่นอิมเมจ '%s'"
 
-#: ../src/plugins/grilo/totem-grilo.c:1219 ../src/plugins/grilo/grilo.ui.h:1
-msgid "Browse"
-msgstr "ท่องดู"
+#~ msgid "device%d"
+#~ msgstr "อุปกรณ์%d"
 
-#: ../src/plugins/grilo/totem-grilo.c:1285 ../src/plugins/grilo/grilo.ui.h:2
-msgid "Search"
-msgstr "ค้นหา"
+#~ msgid "Play Disc '%s'"
+#~ msgstr "เล่นแผ่น '%s'"
+
+#~ msgid "Movie Player using %s"
+#~ msgstr "โปรแกรมเล่นภาพยนตร์โดยใช้ %s"
+
+#~ msgid ""
+#~ "Totem could not play this media (%s) although a plugin is present to "
+#~ "handle it."
+#~ msgstr "Totem ไม่สามารถเล่นสื่อนี้ (%s) ถึงแม้จะมีปลั๊กอินสำหรับเล่น"
+
+#~ msgid ""
+#~ "You might want to check that a disc is present in the drive and that it "
+#~ "is correctly configured."
+#~ msgstr "คุณอาจตรวจสอบว่าได้ใส่แผ่นในไดรว์หรือไม่ และได้ตั้งค่าไดรว์ไว้ถูกต้องหรือไม่"
+
+#~ msgid "More information about media plugins"
+#~ msgstr "ข้อมูลเพิ่มเติมเกี่ยวกับปลั๊กอินเล่นสื่อ"
+
+#~ msgid ""
+#~ "Please install the necessary plugins and restart Totem to be able to play "
+#~ "this media."
+#~ msgstr "กรุณาติดตั้งปลั๊กอินที่จำเป็น และเรียกใช้ Totem ใหม่ เพื่อเล่นสื่อนี้"
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it does not have the "
+#~ "appropriate plugins to be able to read from the disc."
+#~ msgstr "Totem ไม่สามารถเล่นสื่อชนิดนี้ (%s) เพราะไม่มีปลั๊กอินที่เหมาะสมสำหรับการอ่านจากแผ่น"
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because you do not have the "
+#~ "appropriate plugins to handle it."
+#~ msgstr "Totem ไม่สามารถเล่นสื่อชนิดนี้ (%s) เพราะไม่มีปลั๊กอินที่เหมาะสม"
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it is not supported."
+#~ msgstr "Totem ไม่สามารถเล่นสื่อชนิดนี้ (%s) เพราะไม่รองรับ"
+
+#~ msgid "Please insert another disc to play back."
+#~ msgstr "กรุณาใส่แผ่นอื่น"
+
+#~ msgid "Totem was not able to play this disc."
+#~ msgstr "Totem ไม่สามารถเล่นแผ่นนี้ได้"
+
+#~ msgid "Totem does not support playback of Audio CDs"
+#~ msgstr "Totem ไม่รองรับการเล่นซีดีเพลง"
+
+#~ msgid ""
+#~ "Please consider using a music player or a CD extractor to play this CD"
+#~ msgstr "กรุณาใช้โปรแกรมเล่นเพลง หรือโปรแกรมคัดลอกเพลงจากซีดี เพื่อเล่นซีดีนี้แทน"
+
+#~ msgid ""
+#~ "The requested audio output was not found. Please select another audio "
+#~ "output in the Multimedia Systems Selector."
+#~ msgstr "ไม่พบเอาต์พุตเสียงที่ร้องขอ กรุณาเลือกเอาต์พุตเสียงช่องอื่นในตัวเลือกระบบสื่อผสม"
+
+#~ msgid "Location not found."
+#~ msgstr "หาตำแหน่งที่กำหนดไม่พบ"
+
+#~ msgid ""
+#~ "Could not open location; you might not have permission to open the file."
+#~ msgstr "ไม่สามารถเปิดตำแหน่งได้ คุณอาจไม่ได้รับอนุญาตให้เปิดแฟ้มดังกล่าว"
+
+#~ msgid ""
+#~ "The video output is in use by another application. Please close other "
+#~ "video applications, or select another video output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "มีโปรแกรมอื่นใช้เอาต์พุตภาพอยู่ กรุณาปิดโปรแกรมวิดีโออื่น "
+#~ "หรือเลือกเอาต์พุตภาพช่องอื่นในตัวเลือกระบบสื่อผสม"
+
+#~ msgid ""
+#~ "The audio output is in use by another application. Please select another "
+#~ "audio output in the Multimedia Systems Selector. You may want to consider "
+#~ "using a sound server."
+#~ msgstr ""
+#~ "มีโปรแกรมอื่นใช้เอาต์พุตเสียงอยู่ กรุณาเลือกเอาต์พุตเสียงช่องอื่นในตัวเลือกระบบสื่อผสม "
+#~ "และคุณอาจพิจารณาใช้เซิร์ฟเวอร์เสียง"
+
+#~ msgid ""
+#~ "Failed to create a GStreamer play object. Please check your GStreamer "
+#~ "installation."
+#~ msgstr ""
+#~ "ไม่สามารถสร้างอ็อบเจกต์สำหรับเล่นสื่อของ GStreamer กรุณาตรวจสอบการติดตั้ง GStreamer "
+#~ "ของคุณ"
+
+#~ msgid ""
+#~ "Failed to open audio output. You may not have permission to open the "
+#~ "sound device, or the sound server may not be running. Please select "
+#~ "another audio output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "ไม่สามารถเปิดเอาต์พุตเสียงได้ คุณอาจไม่ได้รับอนุญาตให้เปิดอุปกรณ์เสียง "
+#~ "หรือเซิร์ฟเวอร์เสียงอาจไม่ได้ทำงานอยู่ กรุณาเลือกเอาต์พุตเสียงช่องอื่นในตัวเลือกระบบสื่อผสม"
+
+#~ msgid ""
+#~ "Could not find the audio output. You may need to install additional "
+#~ "GStreamer plugins, or select another audio output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "ไม่พบเอาต์พุตเสียงที่ร้องขอ คุณอาจต้องติดตั้งปลั๊กอิน GStreamer เพิ่มเติม "
+#~ "หรือเลือกเอาต์พุตเสียงช่องอื่นในตัวเลือกระบบสื่อผสม"
+
+#~ msgid "Control Totem through a mobile phone with a Bemused client"
+#~ msgstr "ควบคุม Totem ผ่านโทรศัพท์มือถือด้วยลูกข่าย Bemused"
+
+#~ msgid "Untitled %d"
+#~ msgstr "ไม่มีชื่อ %d"
+
+#~ msgid "Totem Bemused Server"
+#~ msgstr "เซิร์ฟเวอร์ Totem Bemused"
+
+#~ msgid "Totem Bemused Server version 1.0"
+#~ msgstr "เซิร์ฟเวอร์ Totem Bemused รุ่น 1.0"
+
+#~ msgid "BBC iPlayer"
+#~ msgstr "iPlayer ของ BBC"
+
+#~ msgid ""
+#~ "Stream BBC programs from the last 7 days from the BBC iPlayer service."
+#~ msgstr "เล่นสตรีมของรายการ BBC ย้อนหลัง 7 วันจากบริการ iPlayer ของ BBC"
+
+#~ msgid "Error listing channel categories"
+#~ msgstr "เกิดข้อผิดพลาดขณะอ่านรายชื่อหมวดของช่องต่างๆ"
+
+#~ msgid ""
+#~ "There was an unknown error getting the list of television channels "
+#~ "available on BBC iPlayer."
+#~ msgstr "เกิดข้อผิดพลาดไม่ทราบสาเหตุขณะอ่านรายชื่อช่องทีวีจาก iPlayer ของ BBC"
+
+#~ msgid "Loading…"
+#~ msgstr "กำลังโหลด…"
+
+#~ msgid "Error getting programme feed"
+#~ msgstr "เกิดข้อผิดพลาดขณะอ่านข่าวป้อนของรายการทีวี"
+
+#~ msgid ""
+#~ "There was an error getting the list of programmes for this channel and "
+#~ "category combination."
+#~ msgstr "เกิดข้อผิดพลาดขณะอ่านรายชื่อของรายการในช่องและหมวดนี้"
+
+#~ msgid ""
+#~ msgstr "<ไม่ทราบสาเหตุ>"
+
+#~ msgid "Programme unavailable (\"%s\")"
+#~ msgstr "ไม่มีรายการ (\"%s\")"
+
+#~ msgid ""
+#~ "A format string used to build the network service name used when "
+#~ "publishing playlists over the network. The following format placeholders "
+#~ "can be used: • %a: the program name as returned by g_get_application_name"
+#~ "() • %h: the machine's host name in title case • %u: the user's login "
+#~ "name in title case • %U: the user's real name • %%: the percent sign"
+#~ msgstr ""
+#~ "สตริงรูปแบบข้อความที่จะใช้สร้างเป็นชื่อบริการเครือข่ายเมื่อจะประกาศรายการการเล่นในเครือข่าย "
+#~ "โดยสามารถตัวแปรต่อไปนี้ได้: %a: ชื่อโปรแกรมตามที่ได้จาก g_get_application_name() • "
+#~ "%h: ชื่อโฮสต์ของเครื่องขึ้นต้นด้วยตัวพิมพ์ใหญ่ • %u: ชื่อเข้าระบบของผู้ใช้ขึ้นต้นด้วยตัวพิมพ์ใหญ่ • "
+#~ "%U: ชื่อจริงของผู้ใช้ • %%: เครื่องหมายเปอร์เซ็นต์"
+
+#~ msgid "Format for network service name"
+#~ msgstr "รูปแบบของชื่อบริการเครือข่าย"
+
+#~ msgid "Publisher protocol to use"
+#~ msgstr "โพรโทคอลที่จะใช้ประกาศ"
+
+#~ msgid ""
+#~ "The transport protocol to use when publishing playlists over the network."
+#~ msgstr "โพรโทคอลถ่ายโอนที่จะใช้เมื่อประกาศรายการการเล่นในเครือข่าย"
+
+#~ msgid "Neighbors"
+#~ msgstr "เพื่อนร่วมเครือข่าย"
+
+#~ msgid "Publish Playlist"
+#~ msgstr "ประกาศรายการการเล่น"
+
+#~ msgid "Share the current playlist via HTTP"
+#~ msgstr "เปิดรายการการเล่นปัจจุบันให้ผู้อื่นใช้ร่วม ผ่าน HTTP"
+
+#~ msgid "Service _Name:"
+#~ msgstr "_ชื่อบริการ:"
+
+#~ msgid ""
+#~ "The name used for announcing the playlist service on the network.\n"
+#~ "All occurrences of the string %u will be replaced by your name,\n"
+#~ "and %h will be replaced by your computer's host name."
+#~ msgstr ""
+#~ "ชื่อที่จะใช้ประกาศบริการรายการการเล่นออกไปในเครือข่าย\n"
+#~ "ข้อความ %u ทั้งหมดจะถูกแทนที่ด้วยชื่อของคุณ\n"
+#~ "และ %h จะถูกแทนที่โดยชื่อโฮสต์ของคอมพิวเตอร์ของคุณ"
+
+#~ msgid "Use _encrypted transport protocol (HTTPS)"
+#~ msgstr "ใช้โพรโทคอลถ่ายโอนข้อมูลแบบเข้ารหัส_ลับ (HTTPS)"
+
+#~ msgid "Save in _folder:"
+#~ msgstr "บันทึกในโ_ฟลเดอร์:"
+
+#~ msgid "Select a folder"
+#~ msgstr "เลือกโฟลเดอร์"
+
+#~ msgid "_Name:"
+#~ msgstr "_ชื่อ:"
+
+#~ msgid "There was an error saving the screenshot."
+#~ msgstr "เกิดข้อผิดพลาดขณะบันทึกภาพหน้าจอ"
+
+#~ msgid "Save Screenshot"
+#~ msgstr "บันทึกภาพหน้าจอ"
+
+#~ msgid "A plugin to let you browse YouTube videos."
+#~ msgstr "ปลั๊กอินสำหรับเรียกดูวีดิทัศน์จาก YouTube"
+
+#~ msgid "YouTube Browser"
+#~ msgstr "ท่องดู YouTube"
+
+#~ msgid "Related Videos"
+#~ msgstr "วีดิทัศน์ที่เกี่ยวข้อง"
+
+#~ msgid "Search Results"
+#~ msgstr "ผลการค้นหา"
+
+#~ msgid "_Open in Web Browser"
+#~ msgstr "เ_ปิดในเว็บเบราว์เซอร์"
+
+#~ msgid "Open the video in your web browser"
+#~ msgstr "เปิดวีดิทัศน์ในเว็บเบราว์เซอร์"
+
+#~ msgid "Cancelling query…"
+#~ msgstr "กำลังยกเลิกการค้น…"
+
+#~ msgid "Error Searching for Videos"
+#~ msgstr "เกิดข้อผิดพลาดขณะค้นหาวีดิทัศน์"
+
+#~ msgid ""
+#~ "The response from the server could not be understood. Please check you "
+#~ "are running the latest version of libgdata."
+#~ msgstr "ไม่เข้าใจคำตอบจากเซิร์ฟเวอร์ กรุณาตรวจสอบว่าคุณได้ใช้ libgdata รุ่นล่าสุดหรือไม่"
+
+#~ msgid "Fetching search results…"
+#~ msgstr "กำลังดึงผลการค้นหา…"
+
+#~ msgid "Fetching related videos…"
+#~ msgstr "กำลังดึงวีดิทัศน์ที่เกี่ยวข้อง…"
+
+#~ msgid "Error Opening Video in Web Browser"
+#~ msgstr "เกิดข้อผิดพลาดขณะเปิดวีดิทัศน์ในเว็บเบราว์เซอร์"
+
+#~ msgid "Fetching more videos…"
+#~ msgstr "กำลังดึงวีดิทัศน์เพิ่มเติม…"
+
+#~ msgid "Video Format Not Supported"
+#~ msgstr "ไม่รองรับรูปแบบวีดิทัศน์นี้"
+
+#~ msgid ""
+#~ "This video is not available in any formats which Totem supports. Would "
+#~ "you like to open it in your web browser instead?"
+#~ msgstr ""
+#~ "รูปแบบวีดิทัศน์นี้ไม่อยู่ในรายการใดที่ Totem รองรับเลย "
+#~ "คุณต้องการจะเปิดวีดิทัศน์ในเว็บเบราว์เซอร์แทนหรือไม่?"
 
 #~ msgid "Author:"
 #~ msgstr "ผู้เขียน:"
@@ -2750,12 +2760,6 @@
 #~ msgid "0 frames per second"
 #~ msgstr "0 เฟรมต่อวินาที"
 
-#~ msgid "0 kbps"
-#~ msgstr "0 kbps"
-
-#~ msgid "0 x 0"
-#~ msgstr "0 x 0"
-
 #~ msgid "Deinterlace"
 #~ msgstr "Deinterlace"
 
@@ -2771,25 +2775,22 @@
 #~ msgid "Zoom reset"
 #~ msgstr "ขนาดปกติ"
 
-#~ msgid "_Deinterlace"
-#~ msgstr "_Deinterlace"
-
 #~ msgid ""
 #~ "Approximate network connection speed, used to select quality on media "
 #~ "over the network: \"0\" for 14.4 Kbps Modem, \"1\" for 19.2 Kbps Modem, "
 #~ "\"2\" for 28.8 Kbps Modem, \"3\" for 33.6 Kbps Modem, \"4\" for 34.4 Kbps "
-#~ "Modem, \"5\" for 56 Kbps Modem/ISDN, \"6\" for 112 Kbps Dual ISDN/DSL, \"7"
-#~ "\" for 256 Kbps DSL/Cable, \"8\" for 384 Kbps DSL/Cable, \"9\" for 512 "
+#~ "Modem, \"5\" for 56 Kbps Modem/ISDN, \"6\" for 112 Kbps Dual ISDN/DSL, "
+#~ "\"7\" for 256 Kbps DSL/Cable, \"8\" for 384 Kbps DSL/Cable, \"9\" for 512 "
 #~ "Kbps DSL/Cable, \"10\" for 1.5 Mbps T1/Intranet/LAN, \"11\" for Intranet/"
 #~ "LAN."
 #~ msgstr ""
-#~ "ความเร็วโดยประมาณของการเชื่อมต่อเครือข่าย ใช้สำหรับเลือกคุณภาพของสื่อผ่านเครือข่าย: \"0"
-#~ "\" สำหรับ โมเด็ม 14.4 Kbps, \"1\" สำหรับ โมเด็ม 19.2 Kbps, \"2\" สำหรับ โมเด็ม "
-#~ "28.8 Kbps, \"3\" สำหรับ โมเด็ม 33.6 Kbps, \"4\" สำหรับ โมเด็ม 34.4 Kbps, \"5"
-#~ "\" สำหรับ โมเด็ม 56 Kbps / ISDN, \"6\" สำหรับ ISDN/DSL ควบ 112 Kbps, \"7\" "
-#~ "สำหรับ DSL/เคเบิล 256 Kbps, \"8\" สำหรับ DSL/เคเบิล 384 Kbps, \"9\" สำหรับ DSL/"
-#~ "เคเบิล 512 Kbps, \"10\" สำหรับ T1/อินทราเน็ต/แลน 1.5 Mbps, \"11\" สำหรับ "
-#~ "อินทราเน็ต/แลน"
+#~ "ความเร็วโดยประมาณของการเชื่อมต่อเครือข่าย ใช้สำหรับเลือกคุณภาพของสื่อผ่านเครือข่าย: "
+#~ "\"0\" สำหรับ โมเด็ม 14.4 Kbps, \"1\" สำหรับ โมเด็ม 19.2 Kbps, \"2\" สำหรับ "
+#~ "โมเด็ม 28.8 Kbps, \"3\" สำหรับ โมเด็ม 33.6 Kbps, \"4\" สำหรับ โมเด็ม 34.4 "
+#~ "Kbps, \"5\" สำหรับ โมเด็ม 56 Kbps / ISDN, \"6\" สำหรับ ISDN/DSL ควบ 112 "
+#~ "Kbps, \"7\" สำหรับ DSL/เคเบิล 256 Kbps, \"8\" สำหรับ DSL/เคเบิล 384 Kbps, "
+#~ "\"9\" สำหรับ DSL/เคเบิล 512 Kbps, \"10\" สำหรับ T1/อินทราเน็ต/แลน 1.5 Mbps, "
+#~ "\"11\" สำหรับ อินทราเน็ต/แลน"
 
 #~ msgid "Buffer size"
 #~ msgstr "ขนาดบัฟเฟอร์"
@@ -2804,8 +2805,8 @@
 #~ "Quality settings for the audio visualization: \"0\" for small, \"1\" for "
 #~ "normal, \"2\" for large, \"3\" for extra large."
 #~ msgstr ""
-#~ "คุณภาพของภาพเอ็ฟเฟ็กต์ของเสียง: \"0\" สำหรับขนาดเล็ก, \"1\" สำหรับขนาดธรรมดา, \"2"
-#~ "\" สำหรับขนาดใหญ่, \"3\" สำหรับขนาดใหญ่มาก"
+#~ "คุณภาพของภาพเอ็ฟเฟ็กต์ของเสียง: \"0\" สำหรับขนาดเล็ก, \"1\" สำหรับขนาดธรรมดา, "
+#~ "\"2\" สำหรับขนาดใหญ่, \"3\" สำหรับขนาดใหญ่มาก"
 
 #~ msgid ""
 #~ "Type of audio output to use: \"0\" for stereo, \"1\" for 4-channel "
@@ -2898,9 +2899,6 @@
 #~ "ไม่พบเอาต์พุตภาพที่ร้องขอ คุณอาจต้องติดตั้งปลั๊กอิน GStreamer เพิ่มเติม "
 #~ "หรือเลือกเอาต์พุตภาพช่องอื่นในตัวเลือกระบบสื่อผสม"
 
-#~ msgid "%s"
-#~ msgstr "%s"
-
 #~ msgid "Plugin"
 #~ msgstr "ปลั๊กอิน"
 
@@ -2959,9 +2957,6 @@
 #~ msgid "_Open Jamendo Album Page in Browser"
 #~ msgstr "เ_ปิดหน้าอัลบั้ม Jamendo ในเว็บเบราว์เซอร์"
 
-#~ msgid "Jamendo"
-#~ msgstr "Jamendo"
-
 #~ msgid ""
 #~ "Listen to the large collection of Creative Commons licensed music on "
 #~ "Jamendo."
@@ -2973,12 +2968,6 @@
 #~ msgid "Artist: %s"
 #~ msgstr "ศิลปิน: %s"
 
-#~ msgid "%Y-%m-%d"
-#~ msgstr "%Y-%m-%d"
-
-#~ msgid "%x"
-#~ msgstr "%x"
-
 #~ msgid "Genre: %s"
 #~ msgstr "แนวเพลง: %s"
 
@@ -2988,9 +2977,6 @@
 #~ msgid "License: %s"
 #~ msgstr "สัญญาอนุญาต: %s"
 
-#~ msgid "%02d. %s"
-#~ msgstr "%02d. %s"
-
 #~ msgid "Album: %s"
 #~ msgstr "อัลบั้ม: %s"
 
@@ -3016,9 +3002,6 @@
 #~ msgid "%M:%S"
 #~ msgstr "%M:%S"
 
-#~ msgid "en"
-#~ msgstr "en"
-
 #~ msgid "Recordings"
 #~ msgstr "สิ่งบันทึก"
 
@@ -3150,32 +3133,18 @@
 #~ "กรุณาตรวจสอบดูว่าไดรเวอร์ไม่ได้ถูกใช้งานอยู่"
 
 #~ msgid ""
-#~ "No video output is available. Make sure that the program is correctly "
-#~ "installed."
-#~ msgstr "ไม่มีเอาต์พุตภาพ ตรวจสอบว่าเอาต์พุตภาพถูกติดตั้งแล้ว"
-
-#~ msgid ""
 #~ "The TV adapter could not tune into the channel. Please check your "
 #~ "hardware setup and channel configuration."
 #~ msgstr ""
 #~ "ตัวรับทีวีไม่สามารถปรับเข้าช่องสัญญาณได้ กรุณาตรวจสอบการตั้งฮาร์ดแวร์ของคุณ "
 #~ "และค่าตั้งช่องสัญญาณ"
 
-#~ msgid "The server you are trying to connect to is not known."
-#~ msgstr "ไม่รู้จักเซิร์ฟเวอร์ที่เรียก"
-
 #~ msgid "The device name you specified (%s) seems to be invalid."
 #~ msgstr "อุปกรณ์ (%s) ที่เรียกไม่ถูกต้อง"
 
 #~ msgid "The server you are trying to connect to (%s) is unreachable."
 #~ msgstr "ไม่สามารถติดต่อกับเซิร์ฟเวอร์ (%s) ได้"
 
-#~ msgid "The connection to this server was refused."
-#~ msgstr "การติดต่อถูกปฎิเสธ"
-
-#~ msgid "The specified movie could not be found."
-#~ msgstr "ไม่พบภาพยนตร์ที่เรียก"
-
 #~ msgid ""
 #~ "The source seems encrypted and can't be read. Are you trying to play an "
 #~ "encrypted DVD without libdvdcss?"
@@ -3183,9 +3152,6 @@
 #~ "ดูเหมือนข้อมูลจะมีการเข้ารหัสลับไว้ และไม่สามารถอ่านได้ "
 #~ "คุณกำลังพยายามเล่นดีวีดีที่มีการเข้ารหัสลับโดยไม่มี libdvdcss หรือ?"
 
-#~ msgid "The movie could not be read."
-#~ msgstr "ไม่สามารถอ่านภาพยนตร์ได้"
-
 #~ msgid "A problem occurred while loading a library or a decoder (%s)."
 #~ msgstr "เกิดปัญหาเมื่อโหลดไลบรารีหรือตัวอ่านรหัส (%s)"
 
@@ -3201,15 +3167,6 @@
 #~ msgid "Authentication is required to access this file."
 #~ msgstr "ต้องมีการยืนยันตัวบุคคลก่อนจะเข้าใช้แฟ้มนี้"
 
-#~ msgid "Authentication is required to access this file or stream."
-#~ msgstr "ต้องมีการยืนยันตัวบุคคลก่อนจะเข้าใช้แฟ้มหรือสตรีมนี้"
-
-#~ msgid "You are not allowed to open this file."
-#~ msgstr "คุณไม่มีสิทธิ์เปิดแฟ้มนี้"
-
-#~ msgid "The server refused access to this file or stream."
-#~ msgstr "เซิร์ฟเวอร์ปฎิเสธการเข้าถึงแฟ้มหรือสตรีมนี้"
-
 #~ msgid "The file you tried to play is an empty file."
 #~ msgstr "แฟ้มที่คุณพยายามจะเล่นเป็นแฟ้มเปล่า"
 
@@ -3222,9 +3179,6 @@
 #~ msgid "This movie is broken and can not be played further."
 #~ msgstr "ภาพยนตร์นี้มีปัญหาและไม่สามารถเล่นต่อได้"
 
-#~ msgid "This location is not a valid one."
-#~ msgstr "ตำแหน่งไม่ถูกต้อง"
-
 #~ msgid "This movie could not be opened."
 #~ msgstr "ไม่สามารถเปิดภาพยนตร์ได้"
 
@@ -3234,12 +3188,6 @@
 #~ msgstr ""
 #~ "ไม่รองรับการอ่านรหัสวีดิทัศน์ '%s' คุณอาจต้องติดตั้งปลั๊กอินเพิ่มเติม เพื่อจะเล่นภาพยนตร์บางชนิดได้"
 
-#~ msgid ""
-#~ "Audio codec '%s' is not handled. You might need to install additional "
-#~ "plugins to be able to play some types of movies"
-#~ msgstr ""
-#~ "ไม่รองรับการอ่านรหัสเสียง '%s' คุณต้องติดตั้งปลั๊กอินเพิ่มเติม เพื่อจะเล่นภาพยนตร์บางชนิดได้"
-
 #~ msgid "This is an audio-only file and there is no audio output available."
 #~ msgstr "แฟ้มนี้เป็นแฟ้มเสียงอย่างเดียว แต่ไม่มีช่องทางสำหรับเสียงออก"
 
@@ -3258,9 +3206,6 @@
 #~ msgid "Could not initialise the thread-safe libraries."
 #~ msgstr "ไม่สามารถเริ่มใช้ไลบรารีสำหรับการใช้งานเธรดอย่างปลอดภัย"
 
-#~ msgid "TV-Out"
-#~ msgstr "TV-Out"
-
 #~ msgid "TV-out in fullscreen by Nvidia (NTSC)"
 #~ msgstr "TV-out แบบเต็มจอโดย Nvidia (NTSC)"
 
@@ -3281,24 +3226,12 @@
 #~ "when Totem is restarted."
 #~ msgstr "การเปลี่ยนค่านี้จะเริ่มมีผลสำหรับภาพยนตร์เรื่องถัดไป หรือเมื่อเรียกใช้ totem ใหม่"
 
-#~ msgid "long time format|%d:%02d:%02d"
-#~ msgstr "%d:%02d:%02d"
-
-#~ msgid "short time format|%d:%02d"
-#~ msgstr "%d:%02d"
-
 #~ msgid "Search YouTube"
 #~ msgstr "ค้น YouTube"
 
 #~ msgid "_Sidebar"
 #~ msgstr "แ_ถบข้าง"
 
-#~ msgid "GTK+"
-#~ msgstr "GTK+"
-
-#~ msgid "GNOME"
-#~ msgstr "GNOME"
-
 #~ msgid "Totem could not parse the command-line options"
 #~ msgstr "Totem ไม่สามารถแจงตัวเลือกบรรทัดคำสั่ง"
 
@@ -3362,24 +3295,6 @@
 #~ msgid "Couldn't write parser: %s"
 #~ msgstr "ไม่สามารถเขียนไปยังตัวแจง: %s"
 
-#~ msgid "Media Player Keys"
-#~ msgstr "ปุ่มเล่นสื่อ"
-
-#~ msgid "Support additional media player keys"
-#~ msgstr "รองรับปุ่มเล่นสื่อเพิ่มเติมบนแป้นพิมพ์"
-
-#~ msgid "Adds movie properties to the sidebar"
-#~ msgstr "แสดงข้อมูลของภาพยนตร์ในแถบข้าง"
-
-#~ msgid "Movie Properties"
-#~ msgstr "ข้อมูลภาพยนตร์"
-
-#~ msgid "Screensaver"
-#~ msgstr "โปรแกรมรักษาหน้าจอ"
-
-#~ msgid "Provides the \"Skip to\" dialog."
-#~ msgstr "ใช้กล่องโต้ตอบ \"ข้ามไปยัง\""
-
 #~ msgid "Skipto"
 #~ msgstr "ข้ามไปยัง"
 
@@ -3394,33 +3309,9 @@
 #~ "ใหญ่\n"
 #~ "ใหญ่มาก"
 
-#~ msgid ""
-#~ "Stereo\n"
-#~ "4-channel\n"
-#~ "4.1-channel\n"
-#~ "5.0-channel\n"
-#~ "5.1-channel\n"
-#~ "AC3 Passthrough"
-#~ msgstr ""
-#~ "Stereo\n"
-#~ "4-channel\n"
-#~ "4.1-channel\n"
-#~ "5.0-channel\n"
-#~ "5.1-channel\n"
-#~ "AC3 Passthrough"
-
-#~ msgid "Open Location"
-#~ msgstr "เปิดตำแหน่ง"
-
 #~ msgid "Volume"
 #~ msgstr "ความดัง"
 
-#~ msgid "+"
-#~ msgstr "+"
-
-#~ msgid "-"
-#~ msgstr "-"
-
 #~ msgid "Full Volume"
 #~ msgstr "ความดังเต็มที่"
 
@@ -3532,9 +3423,6 @@
 #~ msgid "Webcam utility using %s"
 #~ msgstr "โปรแกรมเว็บแคมซึ่งใช้ %s"
 
-#~ msgid "Copyright © 2002-2005 Bastien Nocera"
-#~ msgstr "Copyright © 2002-2005 Bastien Nocera"
-
 #~ msgid ""
 #~ "Vanity could not startup:\n"
 #~ "%s"
@@ -3591,12 +3479,6 @@
 #~ msgid "Failed to read symbolic link %s: %s"
 #~ msgstr "ไม่สามารถเปิดลิงก์ %s: %s"
 
-#~ msgid "    "
-#~ msgstr "    "
-
-#~ msgid "*"
-#~ msgstr "*"
-
 #~ msgid "No Language Selection Available"
 #~ msgstr "ไม่มีภาษาให้เลือก"
 
@@ -3665,9 +3547,6 @@
 #~ msgid "Unexpected/unknown cd type 0x%x (%s)"
 #~ msgstr "ไม่รู้จักชนิดของซีดี 0x%x (%s)"
 
-#~ msgid "_DXR3 TV-out"
-#~ msgstr "_DXR3 TV-out"
-
 #~ msgid "Totem Video Window"
 #~ msgstr "หน้าต่างวิดีโอ Totem"
 
diff -Nru totem-3.4.3/po/uk.po totem-3.6.2/po/uk.po
--- totem-3.4.3/po/uk.po	2012-04-02 14:15:40.000000000 +0000
+++ totem-3.6.2/po/uk.po	2012-10-25 13:15:32.000000000 +0000
@@ -9,9 +9,9 @@
 msgstr ""
 "Project-Id-Version: totem\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-24 09:20+0200\n"
-"PO-Revision-Date: 2012-03-24 09:22+0300\n"
-"Last-Translator: Korostil Daniel \n"
+"POT-Creation-Date: 2012-09-11 20:48+0300\n"
+"PO-Revision-Date: 2012-09-11 16:29-0700\n"
+"Last-Translator: Daniel \n"
 "Language-Team: translation@linux.org.ua\n"
 "Language: uk\n"
 "MIME-Version: 1.0\n"
@@ -19,921 +19,987 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Virtaal 0.7.1\n"
+"X-Generator: Virtaal 0.7.0\n"
 
-#: ../data/fullscreen.ui.h:1
+#: ../browser-plugin/totem-plugin-viewer.c:352 ../src/totem-object.c:1180
+#: ../src/totem-object.c:1650 ../src/totem-statusbar.c:115
+msgid "Stopped"
+msgstr "Зупинено"
+
+#: ../browser-plugin/totem-plugin-viewer.c:364 ../src/totem-object.c:1173
+msgid "Paused"
+msgstr "Призупинено"
+
+#: ../browser-plugin/totem-plugin-viewer.c:368 ../src/totem-object.c:1166
+msgid "Playing"
+msgstr "Відтворення"
+
+#: ../browser-plugin/totem-plugin-viewer.c:386
+#: ../src/plugins/screensaver/totem-screensaver.c:97
+msgid "Playing a movie"
+msgstr "Відтворення відео"
+
+#: ../browser-plugin/totem-plugin-viewer.c:443
+msgid "No URI to play"
+msgstr "Немає URI для відтворення"
+
+#: ../browser-plugin/totem-plugin-viewer.c:676
+#: ../browser-plugin/totem-plugin-viewer.c:1700
+msgid "Totem Movie Player"
+msgstr "Мультимедійний програвач Totem"
+
+#. translators: this is:
+#. * Open With ApplicationName
+#. * as in nautilus' right-click menu
+#: ../browser-plugin/totem-plugin-viewer.c:1120
+#, c-format
+msgid "_Open with \"%s\""
+msgstr "Відкрити _у програмі «%s»"
+
+#: ../browser-plugin/totem-plugin-viewer.c:1341 ../src/totem-object.c:2475
+msgid "An error occurred"
+msgstr "Виникла помилка"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2033
+msgid "No playlist or playlist empty"
+msgstr "Немає списку відтворення, або список відтворення порожній"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2128
+msgid "Movie browser plugin"
+msgstr "Додаток перегляду відео"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144 ../src/totem.c:240
+msgid "Could not initialize the thread-safe libraries."
+msgstr "Неможливо ініціалізувати безпечну бібліотеку потоків виконання."
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144
+msgid "Verify your system installation. The Totem plugin will now exit."
+msgstr "Перевірте встановлення системи. Тотем завершується."
+
+#: ../data/fullscreen.ui.h:1
 msgid "Leave Fullscreen"
 msgstr "Вийти з повноекранного режиму"
 
-#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:144
+#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:81
 msgid "Time:"
 msgstr "Час:"
 
-#: ../data/playlist.ui.h:1
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
+msgid "Allow the screensaver to activate when playing audio"
+msgstr "Дозволяти збереження екрану при відтворенні аудіо"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
+msgid ""
+"Allow the screensaver to activate when playing audio. Disable if you have "
+"monitor-powered speakers."
+msgstr ""
+"Дозволяти запуск збереження екрану при відтворенні аудіо. Слід вимкнути, "
+"якщо використовуються динаміки, що живляться від монітора."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
+msgid "Show visual effects when no video is displayed"
+msgstr "Показувати ефекти візуалізації, коли відтворюється не відео"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
+msgid "Show visual effects when playing an audio only file."
+msgstr "Показувати ефекти візуалізації, коли відтворюється звуковий файл."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
+msgid "Name of the visual effects plugin"
+msgstr "Назва додатка візуальних ефектів"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
+msgid "The brightness of the video"
+msgstr "Яскравість зображення"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
+msgid "The contrast of the video"
+msgstr "Контраст зображення"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
+msgid "The hue of the video"
+msgstr "Яскравість відео"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
+msgid "The saturation of the video"
+msgstr "Насиченість відео"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
+msgid "Resize the canvas automatically on file load"
+msgstr "Автоматично змінювати розміри площини показу після відкриття файла"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
+msgid "Repeat mode"
+msgstr "Режим повтору"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
+msgid "Shuffle mode"
+msgstr "У випадковому порядку"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
+msgid "Whether to disable deinterlacing for interlaced movies"
+msgstr "Чи ввімкнути черезрядковість для відео"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
+msgid "Whether to enable debug for the playback engine"
+msgstr "Чи увімкнути налагодження механізму відтворення"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
+msgid "Type of audio output to use"
+msgstr "Тип аудіовиходу"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
+msgid "Visualization quality setting"
+msgstr "Якість візуалізації"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
+msgid "Quality setting for the audio visualization."
+msgstr "Налаштування якості для візуалізації аудіо."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
+msgid "Network buffering threshold"
+msgstr "Поріг буферизації мережі"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
+msgid ""
+"Amount of data to buffer for network streams before starting to display the "
+"stream (in seconds)."
+msgstr ""
+"Кількість даних, що накопичуються у буфері для мережевих потоків, перед "
+"початком показу потоку (у секундах)."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
+msgid "Subtitle font"
+msgstr "Шрифт субтитрів"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
+msgid "Pango font description for subtitle rendering."
+msgstr "Опис шрифту Pango для відтворення субтитрів."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
+msgid "Subtitle encoding"
+msgstr "Кодування субтитрів"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
+msgid "Encoding character set for subtitle."
+msgstr "Вказане кодування для субтитрів."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
+msgid "Default location for the \"Open...\" dialogs"
+msgstr "Типова адреса для діалогу \"Відрити...\""
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
+msgid ""
+"Default location for the \"Open...\" dialogs. Default is the current "
+"directory."
+msgstr "Типова адреса для «Відкрити…». Типово — теперішній каталог."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
+msgid "Default location for the \"Take Screenshot\" dialogs"
+msgstr "Типова адреса для діалогу \"Зберегти кадр...\""
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
+msgid ""
+"Default location for the \"Take Screenshot\" dialogs. Default is the "
+"Pictures directory."
+msgstr "Типова адреса для «Зробити знімок…». Типово — каталог малюнків."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
+msgid "Whether to disable the plugins in the user's home directory"
+msgstr "Чи вимикати модулі у домашньому каталозі користувача"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
+msgid "Whether to disable the keyboard shortcuts"
+msgstr "Чи вимикати комбінації клавіш"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
+msgid "Whether to autoload text subtitle files when a movie is loaded"
+msgstr "Чи завантажувати субтитри при відтворенні фільмів"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
+msgid "Whether to autoload external chapter files when a movie is loaded"
+msgstr "Чи завантажувати субтитри автоматично при відтворенні фільмів"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
+msgid ""
+"Whether to remember the position of played audio/video files when pausing or "
+"closing them"
+msgstr ""
+"Чи пам'ятати позицію відтворення аудіо/відеофайлів при паузі або їх "
+"закриванні."
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
+msgid "Active plugins list"
+msgstr "Перелік активних додатків"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+msgid ""
+"A list of the names of the plugins which are currently active (loaded and "
+"running)."
+msgstr ""
+"Перелічити назви додатків, які тепер увімкнено (завантажено та запущено)."
+
+#: ../data/playlist.ui.h:1
 msgid "_Remove"
 msgstr "В_илучити"
 
-#: ../data/playlist.ui.h:2
+#: ../data/playlist.ui.h:2
 msgid "Remove file from playlist"
 msgstr "Вилучити файл зі списку відтворення"
 
-#: ../data/playlist.ui.h:3 ../data/video-list.ui.h:3
+#: ../data/playlist.ui.h:3 ../data/video-list.ui.h:3
 msgid "_Copy Location"
 msgstr "_Копіювати адресу"
 
-#: ../data/playlist.ui.h:4 ../data/video-list.ui.h:4
+#: ../data/playlist.ui.h:4 ../data/video-list.ui.h:4
 msgid "Copy the location to the clipboard"
 msgstr "Копіювати адресу в буфер обміну"
 
-#: ../data/playlist.ui.h:5 ../data/totem.ui.h:78
+#: ../data/playlist.ui.h:5 ../data/totem.ui.h:71
 msgid "_Select Text Subtitles..."
 msgstr "_Виберіть текстові субтитри…"
 
-#: ../data/playlist.ui.h:6 ../data/totem.ui.h:79
+#: ../data/playlist.ui.h:6 ../data/totem.ui.h:72
 msgid "Select a file to use for text subtitles"
 msgstr "Виберіть файл текстових субтитрів"
 
-#: ../data/playlist.ui.h:7
+#: ../data/playlist.ui.h:7
 msgid "Add..."
 msgstr "Додати…"
 
-#: ../data/playlist.ui.h:8
+#: ../data/playlist.ui.h:8
 msgid "Remove"
 msgstr "Вилучити"
 
-#: ../data/playlist.ui.h:9
+#: ../data/playlist.ui.h:9
 msgid "Save Playlist..."
 msgstr "Зберегти список відтворення…"
 
-#: ../data/playlist.ui.h:10
+#: ../data/playlist.ui.h:10
 msgid "Move Up"
 msgstr "Перемістити вгору"
 
-#: ../data/playlist.ui.h:11
+#: ../data/playlist.ui.h:11
 msgid "Move Down"
 msgstr "Перемістити вниз"
 
-#: ../data/properties.ui.h:1 ../data/totem.ui.h:122
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:2
+msgid "Normal"
+msgstr "Звичайний"
+
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:4
+msgid "Large"
+msgstr "Великий"
+
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:6
+msgid "Extra Large"
+msgstr "Дуже високий"
+
+#: ../data/preferences.ui.h:7 ../src/backend/bacon-video-widget.c:5498
+#: ../src/totem-properties-view.c:231
+msgid "Stereo"
+msgstr "Стерео"
+
+#: ../data/preferences.ui.h:8
+msgid "4-channel"
+msgstr "4 канальний"
+
+#: ../data/preferences.ui.h:9
+msgid "4.1-channel"
+msgstr "4.1 канальний"
+
+#: ../data/preferences.ui.h:10
+msgid "5.0-channel"
+msgstr "5.0 канальний"
+
+#: ../data/preferences.ui.h:11
+msgid "5.1-channel"
+msgstr "5.1 канальний"
+
+#: ../data/preferences.ui.h:12
+msgid "AC3 Passthrough"
+msgstr "Пропускати AC3"
+
+#: ../data/preferences.ui.h:13
+msgid "Totem Preferences"
+msgstr "Параметри Totem"
+
+#: ../data/preferences.ui.h:14
+msgid "Playback"
+msgstr "Відтворення"
+
+#: ../data/preferences.ui.h:15
+msgid "Start playing files from last position"
+msgstr "Запустити відтворення файлів з останньої позиції"
+
+#: ../data/preferences.ui.h:16
+msgid "Text Subtitles"
+msgstr "Текстові субтитри"
+
+#: ../data/preferences.ui.h:17
+msgid "_Load subtitle files when movie is loaded"
+msgstr "_Завантажувати файли субтитрів при завантаженому відео"
+
+#: ../data/preferences.ui.h:18
+msgid "_Font:"
+msgstr "_Шрифт:"
+
+#: ../data/preferences.ui.h:19
+msgid "_Encoding:"
+msgstr "_Кодування:"
+
+#: ../data/preferences.ui.h:20
+msgid "External Chapters"
+msgstr "Зовнішні розділи"
+
+#: ../data/preferences.ui.h:21
+msgid "Load _chapter files when movie is loaded"
+msgstr "Завантажувати файли _розділу при завантаженому відео"
+
+#: ../data/preferences.ui.h:22 ../data/properties.ui.h:1
 msgid "General"
 msgstr "Загальне"
 
-#: ../data/properties.ui.h:2
+#. Tab label in the Preferences dialogue
+#: ../data/preferences.ui.h:24
+msgid "Display"
+msgstr "Екран"
+
+#: ../data/preferences.ui.h:25
+msgid "_Resize the window when a new video is loaded"
+msgstr "_Автоматично змінювати розміри вікна після завантаження нового відео"
+
+#: ../data/preferences.ui.h:26
+msgid "Disable _deinterlacing of interlaced videos"
+msgstr "Увімкнути _черезрядковість для відео"
+
+#: ../data/preferences.ui.h:27
+msgid "Disable screensaver when playing "
+msgstr "Вимкнути зберігання екрана при програванні"
+
+#: ../data/preferences.ui.h:28 ../data/properties.ui.h:9
+#: ../src/totem-properties-view.c:273
+msgid "Video"
+msgstr "Відео"
+
+#: ../data/preferences.ui.h:29
+msgid "Video or Audio"
+msgstr "Відео або Аудіо"
+
+#: ../data/preferences.ui.h:30
+msgid "Visual Effects"
+msgstr "Відео ефекти"
+
+#: ../data/preferences.ui.h:31
+msgid "Show _visual effects when an audio file is played"
+msgstr "Показувати візуальні _ефекти під час відтворення звуку"
+
+#: ../data/preferences.ui.h:32
+msgid "_Type of visualization:"
+msgstr "_Тип візуалізації:"
+
+#: ../data/preferences.ui.h:33
+msgid "Visualization _size:"
+msgstr "_Розмір візуалізації"
+
+#: ../data/preferences.ui.h:34
+msgid "Color Balance"
+msgstr "Баланс кольорів"
+
+#: ../data/preferences.ui.h:35
+msgid "_Brightness:"
+msgstr "_Яскравість:"
+
+#: ../data/preferences.ui.h:36
+msgid "Co_ntrast:"
+msgstr "_Контраст:"
+
+#: ../data/preferences.ui.h:37
+msgid "Sat_uration:"
+msgstr "_Насиченість:"
+
+#: ../data/preferences.ui.h:38
+msgid "_Hue:"
+msgstr "_Відтінок:"
+
+#: ../data/preferences.ui.h:39
+msgid "Reset to _Defaults"
+msgstr "_Відновити типові параметри"
+
+#: ../data/preferences.ui.h:40
+msgid "Audio Output"
+msgstr "Вивід звуку"
+
+#: ../data/preferences.ui.h:41
+msgid "_Audio output type:"
+msgstr "Тип з_вукового виходу:"
+
+#: ../data/preferences.ui.h:42 ../data/properties.ui.h:14
+#: ../src/totem-properties-view.c:271
+msgid "Audio"
+msgstr "Звук"
+
+#: ../data/properties.ui.h:2
 msgid "Title:"
 msgstr "Назва:"
 
-#: ../data/properties.ui.h:3
+#: ../data/properties.ui.h:3
 msgid "Artist:"
 msgstr "Виконавець:"
 
-#: ../data/properties.ui.h:4
+#: ../data/properties.ui.h:4
 msgid "Duration:"
 msgstr "Тривалість:"
 
-#: ../data/properties.ui.h:5
+#: ../data/properties.ui.h:5
 msgid "Year:"
 msgstr "Рік:"
 
-#: ../data/properties.ui.h:6
+#: ../data/properties.ui.h:6
 msgid "Album:"
 msgstr "Альбом:"
 
-#: ../data/properties.ui.h:7
+#: ../data/properties.ui.h:7
 msgid "Comment:"
 msgstr "Коментар:"
 
-#: ../data/properties.ui.h:8
+#: ../data/properties.ui.h:8
 msgid "Container:"
 msgstr "Контейнер:"
 
-#: ../data/properties.ui.h:9 ../data/totem.ui.h:128
-#: ../src/totem-properties-view.c:270
-msgid "Video"
-msgstr "Відео"
-
-#: ../data/properties.ui.h:10
+#: ../data/properties.ui.h:10
 msgid "Dimensions:"
 msgstr "Розміри:"
 
-#: ../data/properties.ui.h:11
+#: ../data/properties.ui.h:11
 msgid "Codec:"
 msgstr "Кодек:"
 
-#: ../data/properties.ui.h:12
+#: ../data/properties.ui.h:12
 msgid "Framerate:"
 msgstr "Частота кадрів:"
 
-#: ../data/properties.ui.h:13
+#: ../data/properties.ui.h:13
 msgid "Bitrate:"
 msgstr "Швидкість потоку:"
 
-#: ../data/properties.ui.h:14 ../data/totem.ui.h:142
-#: ../src/totem-properties-view.c:268
-msgid "Audio"
-msgstr "Звук"
-
-#: ../data/properties.ui.h:15
+#: ../data/properties.ui.h:15
 msgid "Sample rate:"
 msgstr "Частота дискретизації:"
 
-#: ../data/properties.ui.h:16
+#: ../data/properties.ui.h:16
 msgid "Channels:"
 msgstr "Канали:"
 
-#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
-msgid "_Add to Playlist"
-msgstr "_Додати до списку відтворення"
+#. Title
+#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:80 ../src/totem.c:239
+#: ../src/totem.c:248 ../src/totem-menu.c:790 ../src/totem-object.c:1658
+msgid "Videos"
+msgstr "Відео"
+
+#: ../data/totem.desktop.in.in.in.h:2
+msgid "Play movies"
+msgstr "Відтворити відеозапис"
+
+#: ../data/totem.desktop.in.in.in.h:3
+msgid "Video;Movie;Film;Clip;Series;Player;DVD;TV;Disc;"
+msgstr "Відео;Фільм;Серія;Програвач;Відеозапис;Кліп;Плеєр;DVD;ТБ;Диск;"
+
+#: ../data/totem.ui.h:1
+msgid "_Open"
+msgstr "_Відкрити"
+
+#: ../data/totem.ui.h:2
+msgid "Open _Location"
+msgstr "Відкрити _адресу"
+
+#: ../data/totem.ui.h:3
+msgid "_Fullscreen"
+msgstr "На весь _екран"
+
+#: ../data/totem.ui.h:4
+msgid "Prefere_nces"
+msgstr "П_араметри"
 
-#: ../data/video-list.ui.h:2
-msgid "Add the video to the playlist"
-msgstr "Додати відео до списку відтворення"
+#: ../data/totem.ui.h:5
+msgid "Shuff_le"
+msgstr "Пере_мішати"
+
+#: ../data/totem.ui.h:6
+msgid "_Repeat"
+msgstr "_Повторити"
 
-#. Title
-#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:143
-#: ../src/totem-object.c:1667
-msgid "Movie Player"
-msgstr "Відеопрогравач"
-
-#: ../data/totem.desktop.in.in.in.h:2
-msgid "Play movies and songs"
-msgstr "Відтворення відео і звуку"
+#: ../data/totem.ui.h:7
+msgid "_Quit"
+msgstr "Ви_йти"
 
-#: ../data/totem.ui.h:1
+#: ../data/totem.ui.h:8
 msgid "_Movie"
 msgstr "В_ідео"
 
-#: ../data/totem.ui.h:2
-msgid "_Open..."
-msgstr "_Відкрити…"
-
-#: ../data/totem.ui.h:3
-msgid "Open a file"
-msgstr "Відкрити файл"
-
-#: ../data/totem.ui.h:4
-msgid "Open _Location..."
-msgstr "Відкрити _адресу..."
-
-#: ../data/totem.ui.h:5
-msgid "Open a non-local file"
-msgstr "Відкрити зовнішній файл"
-
-#: ../data/totem.ui.h:6
+#: ../data/totem.ui.h:9
 msgid "_Eject"
 msgstr "Ви_йняти"
 
-#: ../data/totem.ui.h:7
+#: ../data/totem.ui.h:10
 msgid "Eject the current disc"
 msgstr "Вийняти поточний диск"
 
-#: ../data/totem.ui.h:8
+#: ../data/totem.ui.h:11
 msgid "_Properties"
 msgstr "В_ластивості"
 
-#: ../data/totem.ui.h:9
+#: ../data/totem.ui.h:12
 msgid "View the properties of the current stream"
 msgstr "Перегляд властивостей поточного потоку"
 
-#: ../data/totem.ui.h:10
+#: ../data/totem.ui.h:13
 msgid "Play / P_ause"
 msgstr "Відтворення / _пауза"
 
-#: ../data/totem.ui.h:11
+#: ../data/totem.ui.h:14
 msgid "Play or pause the movie"
 msgstr "Відтворення/призупинення фільму"
 
-#: ../data/totem.ui.h:12
-msgid "_Quit"
-msgstr "Ви_йти"
-
-#: ../data/totem.ui.h:13
-msgid "Quit the program"
-msgstr "Вийти з програми"
-
-#: ../data/totem.ui.h:14
+#: ../data/totem.ui.h:15
 msgid "_Edit"
 msgstr "З_міни"
 
-#: ../data/totem.ui.h:15
+#: ../data/totem.ui.h:16
 msgid "_Clear Playlist"
 msgstr "О_чистити список відтворення"
 
-#: ../data/totem.ui.h:16
+#: ../data/totem.ui.h:17
 msgid "Clear the playlist"
 msgstr "Очистити список відтворення"
 
-#: ../data/totem.ui.h:17
-msgid "Prefere_nces"
-msgstr "П_араметри"
-
-#: ../data/totem.ui.h:18
-msgid "Configure the application"
-msgstr "Налаштувати програми"
-
-#: ../data/totem.ui.h:19
+#: ../data/totem.ui.h:18
 msgid "Plugins..."
 msgstr "Додатки…"
 
-#: ../data/totem.ui.h:20
+#: ../data/totem.ui.h:19
 msgid "Configure plugins to extend the application"
 msgstr "Налаштувати додатки для зовнішньої програми"
 
-#: ../data/totem.ui.h:21
+#: ../data/totem.ui.h:20
 msgid "_View"
 msgstr "П_ерегляд"
 
-#: ../data/totem.ui.h:22
-msgid "_Fullscreen"
-msgstr "На весь _екран"
-
-#: ../data/totem.ui.h:23
-msgid "Switch to fullscreen"
-msgstr "Перемикає на повноекранний режим"
-
-#: ../data/totem.ui.h:24
+#: ../data/totem.ui.h:21
 msgid "Fit Window to Movie"
 msgstr "Вікно за розміром фільму"
 
-#: ../data/totem.ui.h:25
+#: ../data/totem.ui.h:22
 msgid "_Resize 1:2"
 msgstr "_Масштаб 1:2"
 
-#: ../data/totem.ui.h:26
+#: ../data/totem.ui.h:23
 msgid "Resize to half the original video size"
 msgstr "Зробити розмір вікна відповідним половині розміру відео"
 
-#: ../data/totem.ui.h:27
+#: ../data/totem.ui.h:24
 msgid "Resize _1:1"
 msgstr "Масштаб _1:1"
 
-#: ../data/totem.ui.h:28
+#: ../data/totem.ui.h:25
 msgid "Resize to the original video size"
 msgstr "Зробити розмір вікна відповідним розміру відео"
 
-#: ../data/totem.ui.h:29
+#: ../data/totem.ui.h:26
 msgid "Resize _2:1"
 msgstr "Масштаб _2:1"
 
-#: ../data/totem.ui.h:30
+#: ../data/totem.ui.h:27
 msgid "Resize to double the original video size"
 msgstr "Зробити розмір вікна відповідним подвоєному розміру відео"
 
-#: ../data/totem.ui.h:31
+#: ../data/totem.ui.h:28
 msgid "_Aspect Ratio"
 msgstr "_Співвідношення сторін"
 
-#: ../data/totem.ui.h:32
+#: ../data/totem.ui.h:29
 msgid "Switch An_gles"
 msgstr "Перемкнути к_ути"
 
-#: ../data/totem.ui.h:33
+#: ../data/totem.ui.h:30
 msgid "Switch camera angles"
 msgstr "Перемкнути кути камери"
 
-#: ../data/totem.ui.h:34
+#: ../data/totem.ui.h:31
 msgid "_Go"
 msgstr "Пере_хід"
 
-#: ../data/totem.ui.h:35
+#: ../data/totem.ui.h:32
 msgid "_DVD Menu"
 msgstr "Меню _DVD"
 
-#: ../data/totem.ui.h:36
+#: ../data/totem.ui.h:33
 msgid "Go to the DVD menu"
 msgstr "Меню DVD"
 
-#: ../data/totem.ui.h:37
+#: ../data/totem.ui.h:34
 msgid "_Title Menu"
 msgstr "Меню _епізоду"
 
-#: ../data/totem.ui.h:38
+#: ../data/totem.ui.h:35
 msgid "Go to the title menu"
 msgstr "Перейти до меню заголовку"
 
-#: ../data/totem.ui.h:39
+#: ../data/totem.ui.h:36
 msgid "A_udio Menu"
 msgstr "Меню _звуку"
 
-#: ../data/totem.ui.h:40
+#: ../data/totem.ui.h:37
 msgid "Go to the audio menu"
 msgstr "Перейти до меню звуку"
 
-#: ../data/totem.ui.h:41
+#: ../data/totem.ui.h:38
 msgid "_Angle Menu"
 msgstr "_Кутове меню"
 
-#: ../data/totem.ui.h:42
+#: ../data/totem.ui.h:39
 msgid "Go to the angle menu"
 msgstr "Перейти до кутового меню"
 
-#: ../data/totem.ui.h:43
+#: ../data/totem.ui.h:40
 msgid "_Chapter Menu"
 msgstr "Меню _фрагментів"
 
-#: ../data/totem.ui.h:44
+#: ../data/totem.ui.h:41
 msgid "Go to the chapter menu"
 msgstr "Перейти до меню розділу"
 
-#: ../data/totem.ui.h:45
+#: ../data/totem.ui.h:42
 msgid "_Next Chapter/Movie"
 msgstr "Н_аступний фрагмент/фільм"
 
-#: ../data/totem.ui.h:46
+#: ../data/totem.ui.h:43
 msgid "Next chapter or movie"
 msgstr "Наступний фрагмент або фільм"
 
-#: ../data/totem.ui.h:47
+#: ../data/totem.ui.h:44
 msgid "_Previous Chapter/Movie"
 msgstr "П_опередній фрагмент/фільм"
 
-#: ../data/totem.ui.h:48
+#: ../data/totem.ui.h:45
 msgid "Previous chapter or movie"
 msgstr "Попередній розділ/фільм"
 
-#: ../data/totem.ui.h:49
+#: ../data/totem.ui.h:46
 msgid "_Sound"
 msgstr "_Звук"
 
-#: ../data/totem.ui.h:50
+#: ../data/totem.ui.h:47
 msgid "Volume _Up"
 msgstr "З_більшити гучність"
 
-#: ../data/totem.ui.h:51
+#: ../data/totem.ui.h:48
 msgid "Increase volume"
 msgstr "Збільшити гучність"
 
-#: ../data/totem.ui.h:52
+#: ../data/totem.ui.h:49
 msgid "Volume _Down"
 msgstr "З_меншити гучність"
 
-#: ../data/totem.ui.h:53
+#: ../data/totem.ui.h:50
 msgid "Decrease volume"
 msgstr "Зменшити гучність"
 
-#: ../data/totem.ui.h:54
+#: ../data/totem.ui.h:51
 msgid "_Help"
 msgstr "_Довідка"
 
-#: ../data/totem.ui.h:55
+#: ../data/totem.ui.h:52
 msgid "_Contents"
 msgstr "_Зміст"
 
-#: ../data/totem.ui.h:56
+#: ../data/totem.ui.h:53
 msgid "Help contents"
 msgstr "Зміст довідки"
 
-#: ../data/totem.ui.h:57
+#: ../data/totem.ui.h:54
 msgid "_About"
 msgstr "_Про програму"
 
-#: ../data/totem.ui.h:58
+#: ../data/totem.ui.h:55
 msgid "About this application"
 msgstr "Про програму"
 
-#: ../data/totem.ui.h:59
-msgid "_Repeat Mode"
-msgstr "Режим _повтору"
-
-#: ../data/totem.ui.h:60
-msgid "Set the repeat mode"
-msgstr "Встановлює режим повтору"
-
-#: ../data/totem.ui.h:61
-msgid "Shuff_le Mode"
-msgstr "У _випадковому порядку"
-
-#: ../data/totem.ui.h:62
-msgid "Set the shuffle mode"
-msgstr "Встановлює режим перетасовування"
-
-#: ../data/totem.ui.h:63
+#: ../data/totem.ui.h:56
 msgid "Show _Controls"
 msgstr "Показувати панель _керування"
 
-#: ../data/totem.ui.h:64
+#: ../data/totem.ui.h:57
 msgid "Show controls"
 msgstr "Показує панель керування"
 
-#: ../data/totem.ui.h:65
+#: ../data/totem.ui.h:58
 msgid "S_idebar"
 msgstr "_Бічна панель"
 
-#: ../data/totem.ui.h:66
+#: ../data/totem.ui.h:59
 msgid "Show or hide the sidebar"
 msgstr "Показати чи сховати бічну панель"
 
-#: ../data/totem.ui.h:67
+#: ../data/totem.ui.h:60
 msgctxt "Aspect ratio"
 msgid "Auto"
 msgstr "Автоматично"
 
-#: ../data/totem.ui.h:68
+#: ../data/totem.ui.h:61
 msgid "Sets automatic aspect ratio"
 msgstr "Встановлює співвідношення сторін автоматично"
 
-#: ../data/totem.ui.h:69
+#: ../data/totem.ui.h:62
 msgid "Square"
 msgstr "Квадрат"
 
-#: ../data/totem.ui.h:70
+#: ../data/totem.ui.h:63
 msgid "Sets square aspect ratio"
 msgstr "Встановлює співвідношення сторін 1:1"
 
-#: ../data/totem.ui.h:71
+#: ../data/totem.ui.h:64
 msgid "4:3 (TV)"
 msgstr "4:3 (ТБ)"
 
-#: ../data/totem.ui.h:72
+#: ../data/totem.ui.h:65
 msgid "Sets 4:3 (TV) aspect ratio"
 msgstr "Встановлює співвідношення сторін 4:3 (ТБ)"
 
-#: ../data/totem.ui.h:73
+#: ../data/totem.ui.h:66
 msgid "16:9 (Widescreen)"
 msgstr "16:9 (широкий екран)"
 
-#: ../data/totem.ui.h:74
+#: ../data/totem.ui.h:67
 msgid "Sets 16:9 (widescreen) aspect ratio"
 msgstr "Встановлює співвідношення сторін 16:9 (широкоекранне)"
 
-#: ../data/totem.ui.h:75
+#: ../data/totem.ui.h:68
 msgid "2.11:1 (DVB)"
 msgstr "2.11:1 (DVB)"
 
-#: ../data/totem.ui.h:76
+#: ../data/totem.ui.h:69
 msgid "Sets 2.11:1 (DVB) aspect ratio"
 msgstr "Встановлює співвідношення сторін 2.11:1 (DVB)"
 
-#: ../data/totem.ui.h:77
+#: ../data/totem.ui.h:70
 msgid "S_ubtitles"
 msgstr "С_убтитри"
 
-#: ../data/totem.ui.h:80
+#: ../data/totem.ui.h:73
 msgid "_Languages"
 msgstr "М_ови"
 
-#: ../data/totem.ui.h:81
+#: ../data/totem.ui.h:74
 msgid "Zoom In"
 msgstr "Збільшити"
 
-#: ../data/totem.ui.h:82
+#: ../data/totem.ui.h:75
 msgid "Zoom in"
 msgstr "Збільшити"
 
-#: ../data/totem.ui.h:83
+#: ../data/totem.ui.h:76
 msgid "Skip _Forward"
 msgstr "Перейти _вперед"
 
-#: ../data/totem.ui.h:84
+#: ../data/totem.ui.h:77
 msgid "Skip forward"
 msgstr "Перейти вперед"
 
-#: ../data/totem.ui.h:85
+#: ../data/totem.ui.h:78
 msgid "Skip _Backwards"
 msgstr "Перейти _назад"
 
-#: ../data/totem.ui.h:86
+#: ../data/totem.ui.h:79
 msgid "Skip backwards"
 msgstr "Перейти назад"
 
-#: ../data/totem.ui.h:87
-msgid "14.4 Kbps Modem"
-msgstr "14.4 кбіт/c модем"
-
-#: ../data/totem.ui.h:88
-msgid "19.2 Kbps Modem"
-msgstr "19.2 кбіт/c модем"
-
-#: ../data/totem.ui.h:89
-msgid "28.8 Kbps Modem"
-msgstr "28.8 кбіт/c модем"
-
-#: ../data/totem.ui.h:90
-msgid "33.6 Kbps Modem"
-msgstr "33.6 кбіт/c модем"
-
-#: ../data/totem.ui.h:91
-msgid "34.4 Kbps Modem"
-msgstr "34.4 кбіт/c модем"
-
-#: ../data/totem.ui.h:92
-msgid "56 Kbps Modem/ISDN"
-msgstr "56 Кбіт/c модем/ISDN"
-
-#: ../data/totem.ui.h:93
-msgid "112 Kbps Dual ISDN/DSL"
-msgstr "112 кбіт/c Dual ISDN/DSL"
-
-#: ../data/totem.ui.h:94
-msgid "256 Kbps DSL/Cable"
-msgstr "256 кбіт/c DSL/кабель"
-
-#: ../data/totem.ui.h:95
-msgid "384 Kbps DSL/Cable"
-msgstr "384 кбіт/c DSL/кабель"
-
-#: ../data/totem.ui.h:96
-msgid "512 Kbps DSL/Cable"
-msgstr "512 кбіт/c DSL/кабель"
-
-#: ../data/totem.ui.h:97
-msgid "1.5 Mbps T1/Intranet/LAN"
-msgstr "1.5 Мбіт/c T1/Intranet/LAN"
-
-#: ../data/totem.ui.h:98
-msgid "Intranet/LAN"
-msgstr "Intranet/Локальна мережа"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:100
-msgid "Normal"
-msgstr "Звичайний"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:102
-msgid "Large"
-msgstr "Великий"
-
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:104
-msgid "Extra Large"
-msgstr "Дуже високий"
-
-#: ../data/totem.ui.h:105 ../src/totem-properties-view.c:228
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5593
-msgid "Stereo"
-msgstr "Стерео"
-
-#: ../data/totem.ui.h:106
-msgid "4-channel"
-msgstr "4 канальний"
-
-#: ../data/totem.ui.h:107
-msgid "4.1-channel"
-msgstr "4.1 канальний"
-
-#: ../data/totem.ui.h:108
-msgid "5.0-channel"
-msgstr "5.0 канальний"
-
-#: ../data/totem.ui.h:109
-msgid "5.1-channel"
-msgstr "5.1 канальний"
-
-#: ../data/totem.ui.h:110
-msgid "AC3 Passthrough"
-msgstr "Пропускати AC3"
-
-#: ../data/totem.ui.h:111
-msgid "Totem Preferences"
-msgstr "Параметри Totem"
-
-#: ../data/totem.ui.h:112
-msgid "Playback"
-msgstr "Відтворення"
-
-#: ../data/totem.ui.h:113
-msgid "Start playing files from last position"
-msgstr "Запустити відтворення файлів з останньої позиції"
-
-#: ../data/totem.ui.h:114
-msgid "Networking"
-msgstr "Мережа"
-
-#: ../data/totem.ui.h:115
-msgid "Connection _speed:"
-msgstr "_Швидкість з'єднання:"
-
-#: ../data/totem.ui.h:116
-msgid "Text Subtitles"
-msgstr "Текстові субтитри"
-
-#: ../data/totem.ui.h:117
-msgid "_Load subtitle files when movie is loaded"
-msgstr "_Завантажувати файли субтитрів при завантаженому відео"
-
-#: ../data/totem.ui.h:118
-msgid "_Font:"
-msgstr "_Шрифт:"
-
-#: ../data/totem.ui.h:119
-msgid "_Encoding:"
-msgstr "_Кодування:"
-
-#: ../data/totem.ui.h:120
-msgid "External Chapters"
-msgstr "Зовнішні розділи"
-
-#: ../data/totem.ui.h:121
-msgid "Load _chapter files when movie is loaded"
-msgstr "Завантажувати файли _розділу при завантаженому відео"
-
-#. Tab label in the Preferences dialogue
-#: ../data/totem.ui.h:124
-msgid "Display"
-msgstr "Екран"
-
-#: ../data/totem.ui.h:125
-msgid "_Resize the window when a new video is loaded"
-msgstr "_Автоматично змінювати розміри вікна після завантаження нового відео"
-
-#: ../data/totem.ui.h:126
-msgid "Disable _deinterlacing of interlaced videos"
-msgstr "Увімкнути _черезрядковість для відео"
-
-#: ../data/totem.ui.h:127
-msgid "Disable screensaver when playing "
-msgstr "Вимкнути зберігання екрана при програванні"
-
-#: ../data/totem.ui.h:129
-msgid "Video or Audio"
-msgstr "Відео або Аудіо"
-
-#: ../data/totem.ui.h:130
-msgid "Visual Effects"
-msgstr "Відео ефекти"
-
-#: ../data/totem.ui.h:131
-msgid "Show _visual effects when an audio file is played"
-msgstr "Показувати візуальні _ефекти під час відтворення звуку"
-
-#: ../data/totem.ui.h:132
-msgid "_Type of visualization:"
-msgstr "_Тип візуалізації:"
-
-#: ../data/totem.ui.h:133
-msgid "Visualization _size:"
-msgstr "_Розмір візуалізації"
-
-#: ../data/totem.ui.h:134
-msgid "Color Balance"
-msgstr "Баланс кольорів"
-
-#: ../data/totem.ui.h:135
-msgid "_Brightness:"
-msgstr "_Яскравість:"
-
-#: ../data/totem.ui.h:136
-msgid "Co_ntrast:"
-msgstr "_Контраст:"
-
-#: ../data/totem.ui.h:137
-msgid "Sat_uration:"
-msgstr "_Насиченість:"
-
-#: ../data/totem.ui.h:138
-msgid "_Hue:"
-msgstr "_Відтінок:"
-
-#: ../data/totem.ui.h:139
-msgid "Reset to _Defaults"
-msgstr "_Відновити типові параметри"
-
-#: ../data/totem.ui.h:140
-msgid "Audio Output"
-msgstr "Вивід звуку"
-
-#: ../data/totem.ui.h:141
-msgid "_Audio output type:"
-msgstr "Тип з_вукового виходу:"
-
-#: ../data/totem.ui.h:145
+#: ../data/totem.ui.h:82
 msgid "Time seek bar"
 msgstr "Повзунок часу"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
-msgid "Allow the screensaver to activate when playing audio"
-msgstr "Дозволяти збереження екрану при відтворенні аудіо"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
-msgid ""
-"Allow the screensaver to activate when playing audio. Disable if you have "
-"monitor-powered speakers."
-msgstr ""
-"Дозволяти запуск збереження екрану при відтворенні аудіо. Слід вимкнути, "
-"якщо використовуються динаміки, що живляться від монітора."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
-msgid "Show visual effects when no video is displayed"
-msgstr "Показувати ефекти візуалізації, коли відтворюється не відео"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
-msgid "Show visual effects when playing an audio only file."
-msgstr "Показувати ефекти візуалізації, коли відтворюється звуковий файл."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
-msgid "Name of the visual effects plugin"
-msgstr "Назва додатка візуальних ефектів"
+#: ../data/uri.ui.h:1
+msgid "Enter the _address of the file you would like to open:"
+msgstr "Введіть _адресу файла, який треба відкрити:"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
-msgid "The brightness of the video"
-msgstr "Яскравість зображення"
+#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
+msgid "_Add to Playlist"
+msgstr "_Додати до списку відтворення"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
-msgid "The contrast of the video"
-msgstr "Контраст зображення"
+#: ../data/video-list.ui.h:2
+msgid "Add the video to the playlist"
+msgstr "Додати відео до списку відтворення"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
-msgid "The hue of the video"
-msgstr "Яскравість відео"
+#: ../src/backend/bacon-video-widget.c:1643
+msgid "Password requested for RTSP server"
+msgstr "Запит пароля для сервера RTSP"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
-msgid "The saturation of the video"
-msgstr "Насиченість відео"
+#: ../src/backend/bacon-video-widget.c:2944
+#, c-format
+msgid "Audio Track #%d"
+msgstr "Аудіо доріжка #%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
-msgid "Resize the canvas automatically on file load"
-msgstr "Автоматично змінювати розміри площини показу після відкриття файла"
+#: ../src/backend/bacon-video-widget.c:2948
+#, c-format
+msgid "Subtitle #%d"
+msgstr "Субтитри №%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
-msgid "Network connection speed"
-msgstr "Швидкість з'єднання"
+#: ../src/backend/bacon-video-widget.c:3345
+msgid "The server you are trying to connect to is not known."
+msgstr "Сервер, з яким ви намагаєтесь з'єднатись, невідомий."
+
+#: ../src/backend/bacon-video-widget.c:3348
+msgid "The connection to this server was refused."
+msgstr "Відмовлено у з'єднанні з цим сервером."
+
+#: ../src/backend/bacon-video-widget.c:3351
+msgid "The specified movie could not be found."
+msgstr "Вказаний відеозапис неможливо знайти."
+
+#: ../src/backend/bacon-video-widget.c:3358
+msgid "The server refused access to this file or stream."
+msgstr "Сервер відмовив доступитися до цього файла або потоку."
+
+#: ../src/backend/bacon-video-widget.c:3364
+msgid "Authentication is required to access this file or stream."
+msgstr "Потрібна автентифікація, щоб доступитися до цього файла або потоку."
+
+#: ../src/backend/bacon-video-widget.c:3371
+msgid "You are not allowed to open this file."
+msgstr "Вам не дозволено відкривати цей файл."
+
+#: ../src/backend/bacon-video-widget.c:3376
+msgid "This location is not a valid one."
+msgstr "Це адреса не є правильною."
+
+#: ../src/backend/bacon-video-widget.c:3384
+msgid "The movie could not be read."
+msgstr "Відеозапис неможливо прочитати."
+
+#. should be exactly one missing thing (source or converter)
+#: ../src/backend/bacon-video-widget.c:3407
+#: ../src/backend/bacon-video-widget.c:3415
+#, c-format
+msgid "The playback of this movie requires a %s plugin which is not installed."
+msgid_plural ""
+"The playback of this movie requires the following decoders which are not "
+"installed:\n"
+"\n"
+"%s"
+msgstr[0] ""
+"Для відтворення цього відео потрібно додаток %s, який не встановлено."
+msgstr[1] ""
+"Для відтворення цього відео потрібно такі декодери, які не встановлено:\n"
+"\n"
+"%s"
+msgstr[2] ""
+"Для відтворення цього відео потрібно такі декодери, які не встановлено:\n"
+"\n"
+"%s"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
+#: ../src/backend/bacon-video-widget.c:3426
 msgid ""
-"Approximate network connection speed, used to select quality on media over "
-"the network."
+"An audio or video stream is not handled due to missing codecs. You might "
+"need to install additional plugins to be able to play some types of movies"
 msgstr ""
-"Приблизна швидкість мережевого з'єднання, що визначає якість відтворення "
-"матеріалу через мережу."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
-msgid "Repeat mode"
-msgstr "Режим повтору"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
-msgid "Shuffle mode"
-msgstr "У випадковому порядку"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
-msgid "Whether to disable deinterlacing for interlaced movies"
-msgstr "Чи ввімкнути черезрядковість для відео"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
-msgid "Whether to enable debug for the playback engine"
-msgstr "Чи увімкнути налагодження механізму відтворення"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
-msgid "Type of audio output to use"
-msgstr "Тип аудіовиходу"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
-msgid "Visualization quality setting"
-msgstr "Якість візуалізації"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
-msgid "Quality setting for the audio visualization."
-msgstr "Налаштування якості для візуалізації аудіо."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
-msgid "Network buffering threshold"
-msgstr "Поріг буферизації мережі"
+"Звуковий або відеопотік не оброблено через брак кодеків. Можливо, потрібно "
+"встановити додатки, щоб програти деякі типи відеозаписів"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
+#: ../src/backend/bacon-video-widget.c:3436
 msgid ""
-"Amount of data to buffer for network streams before starting to display the "
-"stream (in seconds)."
+"This file cannot be played over the network. Try downloading it locally "
+"first."
 msgstr ""
-"Кількість даних, що накопичуються у буфері для мережевих потоків, перед "
-"початком показу потоку (у секундах)."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
-msgid "Subtitle font"
-msgstr "Шрифт субтитрів"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
-msgid "Pango font description for subtitle rendering."
-msgstr "Опис шрифту Pango для відтворення субтитрів."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
-msgid "Subtitle encoding"
-msgstr "Кодування субтитрів"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
-msgid "Encoding character set for subtitle."
-msgstr "Вказане кодування для субтитрів."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
-msgid "Default location for the \"Open...\" dialogs"
-msgstr "Типова адреса для діалогу \"Відрити...\""
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
-msgid ""
-"Default location for the \"Open...\" dialogs. Default is the current "
-"directory."
-msgstr "Типова адреса для «Відкрити…». Типово — теперішній каталог."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
-msgid "Default location for the \"Take Screenshot\" dialogs"
-msgstr "Типова адреса для діалогу \"Зберегти кадр...\""
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
-msgid ""
-"Default location for the \"Take Screenshot\" dialogs. Default is the "
-"Pictures directory."
-msgstr "Типова адреса для «Зробити знімок…». Типово — каталог малюнків."
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
-msgid "Whether to disable the plugins in the user's home directory"
-msgstr "Чи вимикати модулі у домашньому каталозі користувача"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
-msgid "Whether to disable the keyboard shortcuts"
-msgstr "Чи вимикати комбінації клавіш"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
-msgid "Whether to autoload text subtitle files when a movie is loaded"
-msgstr "Чи завантажувати субтитри при відтворенні фільмів"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
-msgid "Whether to autoload external chapter files when a movie is loaded"
-msgstr "Чи завантажувати субтитри автоматично при відтворенні фільмів"
+"Неможливо відтворити цей файл з мережі. Спробуйте спочатку звантажити його "
+"локально."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
-msgid ""
-"Whether to remember the position of played audio/video files when pausing or "
-"closing them"
-msgstr ""
-"Чи пам'ятати позицію відтворення аудіо/відеофайлів при паузі або їх "
-"закриванні."
+#: ../src/backend/bacon-video-widget.c:5494 ../src/totem-properties-view.c:227
+msgid "Surround"
+msgstr "Об'ємний"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:35
-msgid "Active plugins list"
-msgstr "Перелік активних додатків"
+#: ../src/backend/bacon-video-widget.c:5496 ../src/totem-properties-view.c:229
+msgid "Mono"
+msgstr "Моно"
+
+#: ../src/backend/bacon-video-widget.c:5781
+msgid "Media contains no supported video streams."
+msgstr "Не знайдено підтримуваних потоків відео."
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:36
+#: ../src/backend/bacon-video-widget.c:5963
 msgid ""
-"A list of the names of the plugins which are currently active (loaded and "
-"running)."
+"Some necessary plug-ins are missing. Make sure that the program is correctly "
+"installed."
 msgstr ""
-"Перелічити назви додатків, які тепер увімкнено (завантажено та запущено)."
+"Деяких потрібних додатків бракує. Переконайтесь, що програму встановлено "
+"правильно."
 
-#: ../data/uri.ui.h:1
-msgid "Enter the _address of the file you would like to open:"
-msgstr "Введіть _адресу файла, який треба відкрити:"
-
-#: ../src/eggdesktopfile.c:165
-#, c-format
+#: ../src/eggdesktopfile.c:165
+#, c-format
 msgid "File is not a valid .desktop file"
 msgstr "Файл не є коректним файлом .desktop"
 
-#: ../src/eggdesktopfile.c:188
-#, c-format
+#: ../src/eggdesktopfile.c:188
+#, c-format
 msgid "Unrecognized desktop file Version '%s'"
 msgstr "Файл .desktop невідомої версії «%s»"
 
-#: ../src/eggdesktopfile.c:968
-#, c-format
+#: ../src/eggdesktopfile.c:968
+#, c-format
 msgid "Starting %s"
 msgstr "Запуск %s"
 
-#: ../src/eggdesktopfile.c:1110
-#, c-format
+#: ../src/eggdesktopfile.c:1110
+#, c-format
 msgid "Application does not accept documents on command line"
 msgstr "Програма не підтримує відкривання документів через командний рядок"
 
-#: ../src/eggdesktopfile.c:1178
-#, c-format
+#: ../src/eggdesktopfile.c:1178
+#, c-format
 msgid "Unrecognized launch option: %d"
 msgstr "Невідомий параметр запуску: %d"
 
-#: ../src/eggdesktopfile.c:1383
-#, c-format
+#: ../src/eggdesktopfile.c:1383
+#, c-format
 msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
 msgstr ""
 "Не вдалось передати URI документа елементові робочого столу, він є посиланням"
 
-#: ../src/eggdesktopfile.c:1404
-#, c-format
+#: ../src/eggdesktopfile.c:1404
+#, c-format
 msgid "Not a launchable item"
 msgstr "Елемент неможливо запустити"
 
-#: ../src/eggfileformatchooser.c:240
-#, c-format
+#: ../src/eggfileformatchooser.c:240
+#, c-format
 msgid "File _Format: %s"
 msgstr "_Формат файла: %s"
 
-#: ../src/eggfileformatchooser.c:379
+#: ../src/eggfileformatchooser.c:379
 msgid "All Files"
 msgstr "Усі файли"
 
-#: ../src/eggfileformatchooser.c:380
+#: ../src/eggfileformatchooser.c:380
 msgid "All Supported Files"
 msgstr "Усі підтримувані файли"
 
-#: ../src/eggfileformatchooser.c:389
+#: ../src/eggfileformatchooser.c:389
 msgid "By Extension"
 msgstr "За розширенням"
 
-#: ../src/eggfileformatchooser.c:404
+#: ../src/eggfileformatchooser.c:404
 msgid "File Format"
 msgstr "Формат файла"
 
-#: ../src/eggfileformatchooser.c:422
+#: ../src/eggfileformatchooser.c:422
 msgid "Extension(s)"
 msgstr "Розширення"
 
-#. Translators: the parameter is a filename
-#: ../src/eggfileformatchooser.c:657
-#, c-format
+#. Translators: the parameter is a filename
+#: ../src/eggfileformatchooser.c:657
+#, c-format
 msgid ""
 "The program was not able to find out the file format you want to use for `"
 "%s'. Please make sure to use a known extension for that file or manually "
@@ -942,181 +1008,210 @@
 "Програма не може визначити формат файла для «%s». Вкажіть відоме розширення "
 "в назві файла, або вручну вкажіть формат файла зі списку."
 
-#: ../src/eggfileformatchooser.c:664
+#: ../src/eggfileformatchooser.c:664
 msgid "File format not recognized"
 msgstr "Невідомий формат файла"
 
-#: ../src/eggsmclient.c:226
+#: ../src/eggsmclient.c:226
 msgid "Disable connection to session manager"
 msgstr "Не з'єднуватись з менеджером сеансів"
 
-#: ../src/eggsmclient.c:229
+#: ../src/eggsmclient.c:229
 msgid "Specify file containing saved configuration"
 msgstr "Вказати файл із збереженими налаштуваннями"
 
-#: ../src/eggsmclient.c:229
+#: ../src/eggsmclient.c:229
 msgid "FILE"
 msgstr "ФАЙЛ"
 
-#: ../src/eggsmclient.c:232
+#: ../src/eggsmclient.c:232
 msgid "Specify session management ID"
 msgstr "Вказати ідентифікатор сеансу"
 
-#: ../src/eggsmclient.c:232
+#: ../src/eggsmclient.c:232
 msgid "ID"
 msgstr "ІДЕНТИФІКАТОР"
 
-#: ../src/eggsmclient.c:253
+#: ../src/eggsmclient.c:253
 msgid "Session management options:"
 msgstr "Параметри сеансу:"
 
-#: ../src/eggsmclient.c:254
+#: ../src/eggsmclient.c:254
 msgid "Show session management options"
 msgstr "Показати параметри керування сеансом"
 
-#. Title
-#. Artist
-#. Album
-#. Year
-#. Container
-#: ../src/properties/bacon-video-widget-properties.c:107
-#: ../src/properties/bacon-video-widget-properties.c:109
-#: ../src/properties/bacon-video-widget-properties.c:111
-#: ../src/properties/bacon-video-widget-properties.c:113
-#: ../src/properties/bacon-video-widget-properties.c:119
+#. hour:minutes:seconds
+#. Translators: This is a time format, like "9:05:02" for 9
+#. * hours, 5 minutes, and 2 seconds. You may change ":" to
+#. * the separator that your locale uses or use "%Id" instead
+#. * of "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:56
+#: ../src/plugins/skipto/totem-time-entry.c:57
+#, c-format
+msgctxt "long time format"
+msgid "%d:%02d:%02d"
+msgstr "%d:%02d:%02d"
+
+#. minutes:seconds
+#. Translators: This is a time format, like "5:02" for 5
+#. * minutes and 2 seconds. You may change ":" to the
+#. * separator that your locale uses or use "%Id" instead of
+#. * "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:65
+#, c-format
+msgctxt "short time format"
+msgid "%d:%02d"
+msgstr "%d:%02d"
+
+#. Title
+#. Artist
+#. Album
+#. Year
+#. Container
+#: ../src/properties/bacon-video-widget-properties.c:107
+#: ../src/properties/bacon-video-widget-properties.c:109
+#: ../src/properties/bacon-video-widget-properties.c:111
+#: ../src/properties/bacon-video-widget-properties.c:113
+#: ../src/properties/bacon-video-widget-properties.c:119
 msgid "Unknown"
 msgstr "Невідомо"
 
-#. Dimensions
-#: ../src/properties/bacon-video-widget-properties.c:122
+#. Dimensions
+#: ../src/properties/bacon-video-widget-properties.c:122
 msgctxt "Dimensions"
 msgid "N/A"
 msgstr "Н/Д"
 
-#. Video Codec
-#: ../src/properties/bacon-video-widget-properties.c:124
+#. Video Codec
+#: ../src/properties/bacon-video-widget-properties.c:124
 msgctxt "Video codec"
 msgid "N/A"
 msgstr "Н/Д"
 
-#: ../src/properties/bacon-video-widget-properties.c:127
+#: ../src/properties/bacon-video-widget-properties.c:127
 msgctxt "Video bit rate"
 msgid "N/A"
 msgstr "Н/Д"
 
-#: ../src/properties/bacon-video-widget-properties.c:130
-#: ../src/properties/bacon-video-widget-properties.c:240
+#: ../src/properties/bacon-video-widget-properties.c:130
+#: ../src/properties/bacon-video-widget-properties.c:240
 msgctxt "Frame rate"
 msgid "N/A"
 msgstr "Н/Д"
 
-#: ../src/properties/bacon-video-widget-properties.c:134
+#: ../src/properties/bacon-video-widget-properties.c:134
 msgctxt "Audio bit rate"
 msgid "N/A"
 msgstr "Н/Д"
 
-#. Audio Codec
-#: ../src/properties/bacon-video-widget-properties.c:136
+#. Audio Codec
+#: ../src/properties/bacon-video-widget-properties.c:136
 msgctxt "Audio codec"
 msgid "N/A"
 msgstr "Н/Д"
 
-#. Sample rate
-#: ../src/properties/bacon-video-widget-properties.c:138
+#. Sample rate
+#: ../src/properties/bacon-video-widget-properties.c:138
 msgid "0 Hz"
 msgstr "0 Гц"
 
-#. Channels
-#: ../src/properties/bacon-video-widget-properties.c:140
+#. Channels
+#: ../src/properties/bacon-video-widget-properties.c:140
 msgid "0 Channels"
 msgstr "0 каналів"
 
-#: ../src/properties/bacon-video-widget-properties.c:156
-#, c-format
+#: ../src/properties/bacon-video-widget-properties.c:156
+#, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d година"
 msgstr[1] "%d години"
 msgstr[2] "%d годин"
 
-#: ../src/properties/bacon-video-widget-properties.c:158
-#, c-format
+#: ../src/properties/bacon-video-widget-properties.c:158
+#, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d хвилина"
 msgstr[1] "%d хвилини"
 msgstr[2] "%d хвилин"
 
-#: ../src/properties/bacon-video-widget-properties.c:161
-#, c-format
+#: ../src/properties/bacon-video-widget-properties.c:161
+#, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d секунда"
 msgstr[1] "%d секунди"
 msgstr[2] "%d секунд"
 
-#. 5 hours 2 minutes 12 seconds
-#: ../src/properties/bacon-video-widget-properties.c:167
-#, c-format
+#. 5 hours 2 minutes 12 seconds
+#: ../src/properties/bacon-video-widget-properties.c:167
+#, c-format
 msgctxt "time"
 msgid "%s %s %s"
 msgstr "%s %s %s"
 
-#. 2 minutes 12 seconds
-#: ../src/properties/bacon-video-widget-properties.c:170
-#, c-format
+#. 2 minutes 12 seconds
+#: ../src/properties/bacon-video-widget-properties.c:170
+#, c-format
 msgctxt "time"
 msgid "%s %s"
 msgstr "%s %s"
 
-#. 0 seconds
-#: ../src/properties/bacon-video-widget-properties.c:176
+#. 0 seconds
+#: ../src/properties/bacon-video-widget-properties.c:176
 msgid "0 seconds"
 msgstr "0 секунд"
 
-#: ../src/properties/bacon-video-widget-properties.c:237
-#, c-format
+#: ../src/properties/bacon-video-widget-properties.c:237
+#, c-format
 msgid "%d frame per second"
 msgid_plural "%d frames per second"
 msgstr[0] "%d кадр за секунду"
 msgstr[1] "%d кадри за секунду"
 msgstr[2] "%d кадрів за секунду"
 
-#: ../src/totem-audio-preview.c:168
+#: ../src/totem-audio-preview.c:137
 msgid "Audio Preview"
 msgstr "Попереднє відтворення звукових файлів"
 
-#: ../src/totem-cell-renderer-video.c:126
+#: ../src/totem.c:240
+msgid "Verify your system installation. Totem will now exit."
+msgstr "Перевірте систему. Totem завершується."
+
+#: ../src/totem-cell-renderer-video.c:126
 msgid "Unknown video"
 msgstr "Невідоме відео"
 
-#: ../src/totem-dnd-menu.c:94
+#: ../src/totem-dnd-menu.c:94
 msgid "_Play Now"
 msgstr "_Відтворити"
 
-#: ../src/totem-dnd-menu.c:103
+#: ../src/totem-dnd-menu.c:103
 msgid "Cancel"
 msgstr "Скасувати"
 
-#: ../src/totem-fullscreen.c:616
+#: ../src/totem-fullscreen.c:573
 msgid "No File"
 msgstr "Немає файла"
 
-#: ../src/totem-interface.c:181 ../src/totem-interface.c:224
-#, c-format
+#: ../src/totem-interface.c:181 ../src/totem-interface.c:224
+#, c-format
 msgid "Couldn't load the '%s' interface. %s"
 msgstr "Не вдалось завантажити інтерфейс «%s». %s"
 
-#: ../src/totem-interface.c:181
+#: ../src/totem-interface.c:181
 msgid "The file does not exist."
 msgstr "Файл не існує."
 
-#: ../src/totem-interface.c:183 ../src/totem-interface.c:185
-#: ../src/totem-interface.c:226 ../src/totem-interface.c:228
+#: ../src/totem-interface.c:183 ../src/totem-interface.c:185
+#: ../src/totem-interface.c:226 ../src/totem-interface.c:228
 msgid "Make sure that Totem is properly installed."
 msgstr "Переконайтесь, що Totem встановлено коректно."
 
-#: ../src/totem-interface.c:347
+#: ../src/totem-interface.c:357
 msgid ""
 "Totem 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 "
@@ -1126,7 +1221,7 @@
 "Totem — вільна програма; ви можете розповсюджувати її та/або змінювати на "
 "умовах Загальної громадської ліцензії GNU версії 2 або більш пізньої."
 
-#: ../src/totem-interface.c:351
+#: ../src/totem-interface.c:361
 msgid ""
 "Totem is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -1137,7 +1232,7 @@
 "ГАРАНТІЙ; навіть без неявної гарантії ПРИДАТНОСТІ ДО ПРОДАЖУ чи "
 "ВІДПОВІДНОСТІ ПЕВНІЙ МЕТІ.  Докладніше дивіться GNU General Public License."
 
-#: ../src/totem-interface.c:355
+#: ../src/totem-interface.c:365
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Totem; if not, write to the Free Software Foundation, Inc., 59 Temple Place, "
@@ -1147,54 +1242,29 @@
 "програмою; якщо у Вас її все ж немає, напишіть до Free Software Foundation, "
 "Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA"
 
-#: ../src/totem-interface.c:358
+#: ../src/totem-interface.c:368
 msgid ""
 "Totem contains an exception to allow the use of proprietary GStreamer "
 "plugins."
 msgstr ""
 "Тотем містить виняток, що дозволяє використовувати закриті додатки GStreamer."
 
-#. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:190
+#. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
+#: ../src/totem-menu.c:291
 msgid "None"
 msgstr "Немає"
 
-#. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:195
+#. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
+#: ../src/totem-menu.c:296
 msgctxt "Language"
 msgid "Auto"
 msgstr "Автоматично"
 
-#. Translators:
-#. * This is not a JPEG image, but a disc image, for example,
-#. * an ISO file
-#: ../src/totem-menu.c:765
-#, c-format
-msgid "Play Image '%s'"
-msgstr "Відтворити образ «%s»"
-
-#: ../src/totem-menu.c:768 ../src/totem-menu.c:851
-#, c-format
-msgid "device%d"
-msgstr "пристрій%d"
-
-#: ../src/totem-menu.c:848
-#, c-format
-msgid "Play Disc '%s'"
-msgstr "Відтворити диск «%s»"
-
-#. This lists the back-end type and version, such as
-#. * Movie Player using GStreamer 0.10.1
-#: ../src/totem-menu.c:1189
-#, c-format
-msgid "Movie Player using %s"
-msgstr "Мультимедійний програвач використовує %s"
-
-#: ../src/totem-menu.c:1193
+#: ../src/totem-menu.c:789
 msgid "Copyright © 2002-2009 Bastien Nocera"
 msgstr "Авторські права © 2002-2009 Bastien Nocera"
 
-#: ../src/totem-menu.c:1198
+#: ../src/totem-menu.c:794
 msgid "translator-credits"
 msgstr ""
 "Юрій Сирота \n"
@@ -1202,869 +1272,638 @@
 "Daniel Korostil \n"
 "Юрій Булка "
 
-#: ../src/totem-menu.c:1202
+#: ../src/totem-menu.c:798
 msgid "Totem Website"
 msgstr "Сайт Totem"
 
-#: ../src/totem-menu.c:1236
+#: ../src/totem-menu.c:829
 msgid "Configure Plugins"
 msgstr "Налаштувати додатки"
 
-#. Translators: %s is the totem version number
-#: ../src/totem-object.c:471
-#, c-format
+#: ../src/totem-object.c:162
+#, c-format
+msgid ""
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"%s\n"
+"Запустіть '%s --help' для перегляду списку доступних параметрів командного "
+"рядка.\n"
+
+#. Translators: %s is the totem version number
+#: ../src/totem-object.c:591
+#, c-format
 msgid "Totem %s"
 msgstr "Totem %s"
 
-#: ../src/totem-object.c:1047 ../browser-plugin/totem-plugin-viewer.c:367
-msgid "Playing"
-msgstr "Відтворення"
-
-#: ../src/totem-object.c:1049 ../src/totem-options.c:52
+#: ../src/totem-object.c:1168 ../src/totem-options.c:52
 msgid "Pause"
 msgstr "Пауза"
 
-#: ../src/totem-object.c:1054 ../browser-plugin/totem-plugin-viewer.c:363
-msgid "Paused"
-msgstr "Призупинено"
-
-#: ../src/totem-object.c:1056 ../src/totem-object.c:1066
-#: ../src/totem-options.c:51
+#: ../src/totem-object.c:1175 ../src/totem-object.c:1185
+#: ../src/totem-options.c:51
 msgid "Play"
 msgstr "Відтворення"
 
-#: ../src/totem-object.c:1061 ../src/totem-object.c:1659
-#: ../src/totem-statusbar.c:115 ../browser-plugin/totem-plugin-viewer.c:351
-msgid "Stopped"
-msgstr "Зупинено"
-
-# c-format
-#: ../src/totem-object.c:1142 ../src/totem-object.c:1169
-#: ../src/totem-object.c:1799 ../src/totem-object.c:1963
-#, c-format
+# c-format
+#: ../src/totem-object.c:1267 ../src/totem-object.c:1294
+#: ../src/totem-object.c:1787 ../src/totem-object.c:1942
+#, c-format
 msgid "Totem could not play '%s'."
 msgstr "Не вдалось відтворити «%s»."
 
-#: ../src/totem-object.c:1246
-#, c-format
-msgid ""
-"Totem could not play this media (%s) although a plugin is present to handle "
-"it."
-msgstr ""
-"Totem не може відтворити цей тип носія (%s), хоча додаток, який повинен його "
-"обробляти, встановлено."
-
-#: ../src/totem-object.c:1247
-msgid ""
-"You might want to check that a disc is present in the drive and that it is "
-"correctly configured."
-msgstr ""
-"Можливо, слід перевірити, чи знаходиться диск у пристрої, та чи коректно "
-"налаштовано пристрій."
-
-#: ../src/totem-object.c:1255
-msgid "More information about media plugins"
-msgstr "Докладніша інформація про мультимедійні модулі"
-
-#: ../src/totem-object.c:1256
-msgid ""
-"Please install the necessary plugins and restart Totem to be able to play "
-"this media."
-msgstr "Встановіть потрібні модулі та перезапустіть Totem."
-
-#: ../src/totem-object.c:1258
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because it does not have the "
-"appropriate plugins to be able to read from the disc."
-msgstr ""
-"Totem не може відтворити цей тип носія (%s), через відсутність модуля, який "
-"може читати дані з нього."
-
-#: ../src/totem-object.c:1260
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because you do not have the "
-"appropriate plugins to handle it."
-msgstr ""
-"Totem не може відтворити цей тип носія (%s), через відсутність модуля, який "
-"може його обробляти."
-
-#: ../src/totem-object.c:1263
-#, c-format
-msgid "Totem cannot play this type of media (%s) because it is not supported."
-msgstr ""
-"Totem не може відтворити цей тип носія (%s), оскільки він не підтримується."
-
-#: ../src/totem-object.c:1264
-msgid "Please insert another disc to play back."
-msgstr "Будь ласка, вставте інший носій."
-
-#: ../src/totem-object.c:1300
-msgid "Totem was not able to play this disc."
-msgstr "Totem не може відтворити цей диск."
-
-#: ../src/totem-object.c:1301 ../src/totem-object.c:4229
-msgid "No reason."
-msgstr "Причина невідома."
-
-#: ../src/totem-object.c:1315
-msgid "Totem does not support playback of Audio CDs"
-msgstr "Totem не підтримує відтворення звукових компакт-дисків"
-
-#: ../src/totem-object.c:1316
-msgid "Please consider using a music player or a CD extractor to play this CD"
-msgstr ""
-"Для відтворення цього диску користуйтесь музичним програвачем або програмою "
-"копіювання звуку із звукових дисків"
-
-#: ../src/totem-object.c:1805
+#: ../src/totem-object.c:1793
 msgid "No error message"
 msgstr "Повідомлення про помилку відсутнє"
 
-#: ../src/totem-object.c:2154
+#: ../src/totem-object.c:2133
 msgid "Totem could not display the help contents."
 msgstr "Неможливо показати вміст довідки."
 
-#: ../src/totem-object.c:2493 ../src/totem-object.c:2495
-#: ../browser-plugin/totem-plugin-viewer.c:1417
-msgid "An error occurred"
-msgstr "Виникла помилка"
-
-#: ../src/totem-object.c:4064 ../src/totem-object.c:4066
+#: ../src/totem-object.c:4019 ../src/totem-object.c:4021
 msgid "Previous Chapter/Movie"
 msgstr "Попередній фрагмент/фільм"
 
-#: ../src/totem-object.c:4073 ../src/totem-object.c:4075
+#: ../src/totem-object.c:4028 ../src/totem-object.c:4030
 msgid "Play / Pause"
 msgstr "Відтворення / _пауза"
 
-#: ../src/totem-object.c:4083 ../src/totem-object.c:4085
+#: ../src/totem-object.c:4038 ../src/totem-object.c:4040
 msgid "Next Chapter/Movie"
 msgstr "Наступний фрагмент/фільм"
 
-#. Translators: this is the tooltip text for the fullscreen button in the controls box in Totem's main window.
-#. Translators: this is the accessibility text for the fullscreen button in the controls box in Totem's main window.
-#: ../src/totem-object.c:4097 ../src/totem-object.c:4099
+#. Translators: this is the accessibility text for the fullscreen button in the controls box in Totem's main window.
+#: ../src/totem-object.c:4051 ../src/totem-object.c:4053
 msgid "Fullscreen"
 msgstr "На весь екран"
 
-#: ../src/totem-object.c:4229
+#: ../src/totem-object.c:4184
 msgid "Totem could not startup."
 msgstr "Не вдалось запустити Totem."
 
-#: ../src/totem-open-location.c:182
+#: ../src/totem-object.c:4184
+msgid "No reason."
+msgstr "Причина невідома."
+
+#: ../src/totem-open-location.c:182
 msgid "Open Location..."
 msgstr "Відкрити адресу..."
 
-#: ../src/totem-options.c:49
+#: ../src/totem-options.c:49
 msgid "Enable debug"
 msgstr "Увімкнути налагодження"
 
-#: ../src/totem-options.c:50
+#: ../src/totem-options.c:50
 msgid "Play/Pause"
 msgstr "Відтворення/пауза"
 
-#: ../src/totem-options.c:53
+#: ../src/totem-options.c:53
 msgid "Next"
 msgstr "Наступний"
 
-#: ../src/totem-options.c:54
+#: ../src/totem-options.c:54
 msgid "Previous"
 msgstr "Попередній"
 
-#: ../src/totem-options.c:55
+#: ../src/totem-options.c:55
 msgid "Seek Forwards"
 msgstr "Перейти вперед"
 
-#: ../src/totem-options.c:56
+#: ../src/totem-options.c:56
 msgid "Seek Backwards"
 msgstr "Перейти назад"
 
-#: ../src/totem-options.c:57
+#: ../src/totem-options.c:57
 msgid "Volume Up"
 msgstr "Збільшити гучність"
 
-#: ../src/totem-options.c:58
+#: ../src/totem-options.c:58
 msgid "Volume Down"
 msgstr "Зменшити гучність"
 
-#: ../src/totem-options.c:59
+#: ../src/totem-options.c:59
 msgid "Mute sound"
 msgstr "Вимкнути звук"
 
-#: ../src/totem-options.c:60
+#: ../src/totem-options.c:60
 msgid "Toggle Fullscreen"
 msgstr "Перемикнути повний екран"
 
-#: ../src/totem-options.c:61
+#: ../src/totem-options.c:61
 msgid "Show/Hide Controls"
 msgstr "Показати/сховати панель керування"
 
-#: ../src/totem-options.c:62
+#: ../src/totem-options.c:62
 msgid "Quit"
 msgstr "Вийти"
 
-#: ../src/totem-options.c:63
+#: ../src/totem-options.c:63
 msgid "Enqueue"
 msgstr "Поставити у чергу"
 
-#: ../src/totem-options.c:64
+#: ../src/totem-options.c:64
 msgid "Replace"
 msgstr "Замінити"
 
-#: ../src/totem-options.c:65
+#: ../src/totem-options.c:65
 msgid "Seek"
 msgstr "Пошук"
 
-#. Translators: help for a (hidden) command line option to specify (the zero-based index of) a playlist entry to start playing once Totem's finished loading
-#: ../src/totem-options.c:67
+#. Translators: help for a (hidden) command line option to specify (the zero-based index of) a playlist entry to start playing once Totem's finished loading
+#: ../src/totem-options.c:67
 msgid "Playlist index"
 msgstr "Індекс списку відтворення"
 
-#: ../src/totem-options.c:69
+#: ../src/totem-options.c:69
 msgid "Movies to play"
 msgstr "Фільми для відтворення"
 
-#: ../src/totem-options.c:117
+#: ../src/totem-options.c:79
+msgid "- Play movies and songs"
+msgstr "- відтворює відеофільми та звукозаписи"
+
+#: ../src/totem-options.c:142
 msgid "Can't enqueue and replace at the same time"
 msgstr "Неможливо поставити в чергу і замінити одночасно"
 
-#. By extension entry
-#: ../src/totem-playlist.c:161
+#. By extension entry
+#: ../src/totem-playlist.c:162
 msgid "MP3 ShoutCast playlist"
 msgstr "Список відтворення MP3 ShoutCast"
 
-#: ../src/totem-playlist.c:162
+#: ../src/totem-playlist.c:163
 msgid "MP3 audio (streamed)"
 msgstr "MP3 аудіо (потік)"
 
-#: ../src/totem-playlist.c:163
+#: ../src/totem-playlist.c:164
 msgid "MP3 audio (streamed, DOS format)"
 msgstr "MP3 аудіо (потік, формат DOS)"
 
-#: ../src/totem-playlist.c:164
+#: ../src/totem-playlist.c:165
 msgid "XML Shareable Playlist"
 msgstr "Список відтворення XML Shareable"
 
-#. This is "Title 3", where title is a DVD title
-#. * Note: NOT a DVD chapter
-#: ../src/totem-playlist.c:347
-#, c-format
+#. This is "Title 3", where title is a DVD title
+#. * Note: NOT a DVD chapter
+#: ../src/totem-playlist.c:348
+#, c-format
 msgid "Title %d"
 msgstr "Заголовок %d"
 
-#: ../src/totem-playlist.c:446
+#: ../src/totem-playlist.c:447
 msgid "Could not save the playlist"
 msgstr "Не вдалось зберегти список відтворення"
 
-#: ../src/totem-playlist.c:1021
+#: ../src/totem-playlist.c:1022
 msgid "Save Playlist"
 msgstr "Збереження списку відтворення"
 
-#. translators: Playlist is the default saved playlist filename,
-#. * without the suffix
-#: ../src/totem-playlist.c:1033 ../src/totem-playlist.c:1264
-#: ../src/totem-sidebar.c:142
+#. translators: Playlist is the default saved playlist filename,
+#. * without the suffix
+#: ../src/totem-playlist.c:1034 ../src/totem-playlist.c:1263
+#: ../src/totem-sidebar.c:145
 msgid "Playlist"
 msgstr "Список відтворення"
 
-#: ../src/totem-playlist.c:1857
-#, c-format
+#: ../src/totem-playlist.c:1862
+#, c-format
 msgid "The playlist '%s' could not be parsed. It might be damaged."
 msgstr ""
 "Список відтворення «%s» неможливо проаналізувати. Можливо, його пошкоджено."
 
-#: ../src/totem-playlist.c:1858
+#: ../src/totem-playlist.c:1863
 msgid "Playlist error"
 msgstr "Помилка списку відтворення"
 
-#: ../src/totem-preferences.c:295
+#: ../src/totem-preferences.c:297
 msgid "Preferences"
 msgstr "Параметри"
 
-#: ../src/totem-preferences.c:451
+#: ../src/totem-preferences.c:445
 msgid "Select Subtitle Font"
 msgstr "Вибір шрифту субтитрів"
 
-#: ../src/totem-properties-main.c:115 ../src/totem-properties-view.c:266
+#: ../src/totem-properties-main.c:116 ../src/totem-properties-view.c:269
 msgid "Audio/Video"
 msgstr "Звук/Відео"
 
-#: ../src/totem-properties-view.c:128
+#: ../src/totem-properties-view.c:131
 msgid "N/A"
 msgstr "Н/Д"
 
-#: ../src/totem-properties-view.c:157
-#: ../src/plugins/properties/totem-movie-properties.c:152
-#: ../src/plugins/properties/totem-movie-properties.c:163
+#: ../src/totem-properties-view.c:160
+#: ../src/plugins/properties/totem-movie-properties.c:152
+#: ../src/plugins/properties/totem-movie-properties.c:163
 msgctxt "Stream bit rate"
 msgid "N/A"
 msgstr "Н/Д"
 
-#: ../src/totem-properties-view.c:160
-#: ../src/plugins/properties/totem-movie-properties.c:152
-#: ../src/plugins/properties/totem-movie-properties.c:163
-#, c-format
+#: ../src/totem-properties-view.c:163
+#: ../src/plugins/properties/totem-movie-properties.c:152
+#: ../src/plugins/properties/totem-movie-properties.c:163
+#, c-format
 msgid "%d kbps"
 msgstr "%d кбіт/с"
 
-#: ../src/totem-properties-view.c:177
-#: ../src/plugins/properties/totem-movie-properties.c:149
-#, c-format
+#: ../src/totem-properties-view.c:180
+#: ../src/plugins/properties/totem-movie-properties.c:149
+#, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../src/totem-properties-view.c:209
-#: ../src/plugins/properties/totem-movie-properties.c:166
-#, c-format
+#: ../src/totem-properties-view.c:212
+#: ../src/plugins/properties/totem-movie-properties.c:166
+#, c-format
 msgid "%d Hz"
 msgstr "%d Гц"
 
-#: ../src/totem-properties-view.c:216
-#: ../src/plugins/properties/totem-movie-properties.c:166
+#: ../src/totem-properties-view.c:219
+#: ../src/plugins/properties/totem-movie-properties.c:166
 msgctxt "Sample rate"
 msgid "N/A"
 msgstr "Н/Д"
 
-#: ../src/totem-properties-view.c:224
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5589
-msgid "Surround"
-msgstr "Об'ємний"
-
-#: ../src/totem-properties-view.c:226
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5591
-msgid "Mono"
-msgstr "Моно"
-
-#: ../src/totem-properties-view.c:236
+#: ../src/totem-properties-view.c:239
 msgctxt "Number of audio channels"
 msgid "N/A"
 msgstr "Н/Д"
 
-#: ../src/totem-statusbar.c:110
+#: ../src/totem-statusbar.c:110
 msgid "0:00 / 0:00"
 msgstr "0:00 / 0:00"
 
-#: ../src/totem-statusbar.c:133
-#, c-format
+#: ../src/totem-statusbar.c:133
+#, c-format
 msgid "%s (Streaming)"
 msgstr "%s (встановлення потоку)"
 
-#. Elapsed / Total Length
-#: ../src/totem-statusbar.c:140 ../src/totem-time-label.c:64
-#, c-format
+#. Elapsed / Total Length
+#: ../src/totem-statusbar.c:140 ../src/totem-time-label.c:64
+#, c-format
 msgid "%s / %s"
 msgstr "%s / %s"
 
-#. Seeking to Time / Total Length
-#: ../src/totem-statusbar.c:143 ../src/totem-time-label.c:67
-#, c-format
+#. Seeking to Time / Total Length
+#: ../src/totem-statusbar.c:143 ../src/totem-time-label.c:67
+#, c-format
 msgid "Seek to %s / %s"
 msgstr "Перехід до %s / %s"
 
-#: ../src/totem-statusbar.c:239
+#: ../src/totem-statusbar.c:239
 msgid "Buffering"
 msgstr "Буферування"
 
-#. eg: 75 %
-#: ../src/totem-statusbar.c:250
-#, c-format
-msgid "%d %%"
-msgstr "%d %%"
-
-#. eg: Paused, 0:32 / 1:05
-#: ../src/totem-statusbar.c:325
-#, c-format
+#. eg: 75 %
+#: ../src/totem-statusbar.c:250
+#, c-format
+msgid "%lf %%"
+msgstr "%lf %%"
+
+#. eg: Paused, 0:32 / 1:05
+#: ../src/totem-statusbar.c:325
+#, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#. eg: Buffering, 75 %
-#: ../src/totem-statusbar.c:330
+#. eg: Buffering, 75 %
+#: ../src/totem-statusbar.c:330
 #, c-format
-msgid "%s, %d %%"
-msgstr "%s, %d %%"
+msgid "%s, %f %%"
+msgstr "%s, %f %%"
 
-#: ../src/totem-subtitle-encoding.c:156
+#: ../src/totem-subtitle-encoding.c:156
 msgid "Current Locale"
 msgstr "Поточна локаль"
 
-#: ../src/totem-subtitle-encoding.c:159 ../src/totem-subtitle-encoding.c:161
-#: ../src/totem-subtitle-encoding.c:163 ../src/totem-subtitle-encoding.c:165
+#: ../src/totem-subtitle-encoding.c:159 ../src/totem-subtitle-encoding.c:161
+#: ../src/totem-subtitle-encoding.c:163 ../src/totem-subtitle-encoding.c:165
 msgid "Arabic"
 msgstr "Арабське"
 
-#: ../src/totem-subtitle-encoding.c:168
+#: ../src/totem-subtitle-encoding.c:168
 msgid "Armenian"
 msgstr "Вірменське"
 
-#: ../src/totem-subtitle-encoding.c:171 ../src/totem-subtitle-encoding.c:173
-#: ../src/totem-subtitle-encoding.c:175
+#: ../src/totem-subtitle-encoding.c:171 ../src/totem-subtitle-encoding.c:173
+#: ../src/totem-subtitle-encoding.c:175
 msgid "Baltic"
 msgstr "Балтійське"
 
-#: ../src/totem-subtitle-encoding.c:178
+#: ../src/totem-subtitle-encoding.c:178
 msgid "Celtic"
 msgstr "Кельтське"
 
-#: ../src/totem-subtitle-encoding.c:181 ../src/totem-subtitle-encoding.c:183
-#: ../src/totem-subtitle-encoding.c:185 ../src/totem-subtitle-encoding.c:187
+#: ../src/totem-subtitle-encoding.c:181 ../src/totem-subtitle-encoding.c:183
+#: ../src/totem-subtitle-encoding.c:185 ../src/totem-subtitle-encoding.c:187
 msgid "Central European"
 msgstr "Центральноєвропейське"
 
-#: ../src/totem-subtitle-encoding.c:190 ../src/totem-subtitle-encoding.c:192
-#: ../src/totem-subtitle-encoding.c:194 ../src/totem-subtitle-encoding.c:196
+#: ../src/totem-subtitle-encoding.c:190 ../src/totem-subtitle-encoding.c:192
+#: ../src/totem-subtitle-encoding.c:194 ../src/totem-subtitle-encoding.c:196
 msgid "Chinese Simplified"
 msgstr "Спрощене китайське"
 
-#: ../src/totem-subtitle-encoding.c:199 ../src/totem-subtitle-encoding.c:201
-#: ../src/totem-subtitle-encoding.c:203
+#: ../src/totem-subtitle-encoding.c:199 ../src/totem-subtitle-encoding.c:201
+#: ../src/totem-subtitle-encoding.c:203
 msgid "Chinese Traditional"
 msgstr "Традиційне китайське"
 
-#: ../src/totem-subtitle-encoding.c:206
+#: ../src/totem-subtitle-encoding.c:206
 msgid "Croatian"
 msgstr "Хорватське"
 
-#: ../src/totem-subtitle-encoding.c:209 ../src/totem-subtitle-encoding.c:211
-#: ../src/totem-subtitle-encoding.c:213 ../src/totem-subtitle-encoding.c:215
-#: ../src/totem-subtitle-encoding.c:217 ../src/totem-subtitle-encoding.c:219
+#: ../src/totem-subtitle-encoding.c:209 ../src/totem-subtitle-encoding.c:211
+#: ../src/totem-subtitle-encoding.c:213 ../src/totem-subtitle-encoding.c:215
+#: ../src/totem-subtitle-encoding.c:217 ../src/totem-subtitle-encoding.c:219
 msgid "Cyrillic"
 msgstr "Кириличне"
 
-#: ../src/totem-subtitle-encoding.c:222
+#: ../src/totem-subtitle-encoding.c:222
 msgid "Cyrillic/Russian"
 msgstr "Кирилиця/Росія"
 
-#: ../src/totem-subtitle-encoding.c:225 ../src/totem-subtitle-encoding.c:227
+#: ../src/totem-subtitle-encoding.c:225 ../src/totem-subtitle-encoding.c:227
 msgid "Cyrillic/Ukrainian"
 msgstr "Кирилиця/Україна"
 
-#: ../src/totem-subtitle-encoding.c:230
+#: ../src/totem-subtitle-encoding.c:230
 msgid "Georgian"
 msgstr "Грузинське"
 
-#: ../src/totem-subtitle-encoding.c:233 ../src/totem-subtitle-encoding.c:235
-#: ../src/totem-subtitle-encoding.c:237
+#: ../src/totem-subtitle-encoding.c:233 ../src/totem-subtitle-encoding.c:235
+#: ../src/totem-subtitle-encoding.c:237
 msgid "Greek"
 msgstr "Грецьке"
 
-#: ../src/totem-subtitle-encoding.c:240
+#: ../src/totem-subtitle-encoding.c:240
 msgid "Gujarati"
 msgstr "Гуяраті"
 
-#: ../src/totem-subtitle-encoding.c:243
+#: ../src/totem-subtitle-encoding.c:243
 msgid "Gurmukhi"
 msgstr "Гурмукхі"
 
-#: ../src/totem-subtitle-encoding.c:246 ../src/totem-subtitle-encoding.c:248
-#: ../src/totem-subtitle-encoding.c:250 ../src/totem-subtitle-encoding.c:252
+#: ../src/totem-subtitle-encoding.c:246 ../src/totem-subtitle-encoding.c:248
+#: ../src/totem-subtitle-encoding.c:250 ../src/totem-subtitle-encoding.c:252
 msgid "Hebrew"
 msgstr "Іврит"
 
-#: ../src/totem-subtitle-encoding.c:255
+#: ../src/totem-subtitle-encoding.c:255
 msgid "Hebrew Visual"
 msgstr "Єврейське візуальне"
 
-#: ../src/totem-subtitle-encoding.c:258
+#: ../src/totem-subtitle-encoding.c:258
 msgid "Hindi"
 msgstr "Гінді"
 
-#: ../src/totem-subtitle-encoding.c:261
+#: ../src/totem-subtitle-encoding.c:261
 msgid "Icelandic"
 msgstr "Ісландська"
 
-#: ../src/totem-subtitle-encoding.c:264 ../src/totem-subtitle-encoding.c:266
-#: ../src/totem-subtitle-encoding.c:268
+#: ../src/totem-subtitle-encoding.c:264 ../src/totem-subtitle-encoding.c:266
+#: ../src/totem-subtitle-encoding.c:268
 msgid "Japanese"
 msgstr "Японська"
 
-#: ../src/totem-subtitle-encoding.c:271 ../src/totem-subtitle-encoding.c:273
-#: ../src/totem-subtitle-encoding.c:275 ../src/totem-subtitle-encoding.c:277
+#: ../src/totem-subtitle-encoding.c:271 ../src/totem-subtitle-encoding.c:273
+#: ../src/totem-subtitle-encoding.c:275 ../src/totem-subtitle-encoding.c:277
 msgid "Korean"
 msgstr "Корейська"
 
-#: ../src/totem-subtitle-encoding.c:280
+#: ../src/totem-subtitle-encoding.c:280
 msgid "Nordic"
 msgstr "Північне"
 
-#: ../src/totem-subtitle-encoding.c:283
+#: ../src/totem-subtitle-encoding.c:283
 msgid "Persian"
 msgstr "Персидське"
 
-#: ../src/totem-subtitle-encoding.c:286 ../src/totem-subtitle-encoding.c:288
+#: ../src/totem-subtitle-encoding.c:286 ../src/totem-subtitle-encoding.c:288
 msgid "Romanian"
 msgstr "Румунське"
 
-#: ../src/totem-subtitle-encoding.c:291
+#: ../src/totem-subtitle-encoding.c:291
 msgid "South European"
 msgstr "Південноєвропейське"
 
-#: ../src/totem-subtitle-encoding.c:294
+#: ../src/totem-subtitle-encoding.c:294
 msgid "Thai"
 msgstr "Тайське"
 
-#: ../src/totem-subtitle-encoding.c:297 ../src/totem-subtitle-encoding.c:299
-#: ../src/totem-subtitle-encoding.c:301 ../src/totem-subtitle-encoding.c:303
+#: ../src/totem-subtitle-encoding.c:297 ../src/totem-subtitle-encoding.c:299
+#: ../src/totem-subtitle-encoding.c:301 ../src/totem-subtitle-encoding.c:303
 msgid "Turkish"
 msgstr "Турецьке"
 
-#: ../src/totem-subtitle-encoding.c:306 ../src/totem-subtitle-encoding.c:308
-#: ../src/totem-subtitle-encoding.c:310 ../src/totem-subtitle-encoding.c:312
-#: ../src/totem-subtitle-encoding.c:314
+#: ../src/totem-subtitle-encoding.c:306 ../src/totem-subtitle-encoding.c:308
+#: ../src/totem-subtitle-encoding.c:310 ../src/totem-subtitle-encoding.c:312
+#: ../src/totem-subtitle-encoding.c:314
 msgid "Unicode"
 msgstr "Унікод"
 
-#: ../src/totem-subtitle-encoding.c:317 ../src/totem-subtitle-encoding.c:319
-#: ../src/totem-subtitle-encoding.c:321 ../src/totem-subtitle-encoding.c:323
-#: ../src/totem-subtitle-encoding.c:325
+#: ../src/totem-subtitle-encoding.c:317 ../src/totem-subtitle-encoding.c:319
+#: ../src/totem-subtitle-encoding.c:321 ../src/totem-subtitle-encoding.c:323
+#: ../src/totem-subtitle-encoding.c:325
 msgid "Western"
 msgstr "Західне"
 
-#: ../src/totem-subtitle-encoding.c:328 ../src/totem-subtitle-encoding.c:330
-#: ../src/totem-subtitle-encoding.c:332
+#: ../src/totem-subtitle-encoding.c:328 ../src/totem-subtitle-encoding.c:330
+#: ../src/totem-subtitle-encoding.c:332
 msgid "Vietnamese"
 msgstr "В'єтнамське"
 
-#: ../src/totem-video-list.c:330
-msgid "No video URI"
-msgstr "Нема URI для відео"
-
-#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
-#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
-#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
-#: ../src/totem-video-thumbnailer.c:872
-#, c-format
-msgid ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-msgstr ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-
-#: ../src/totem-video-thumbnailer.c:873
-msgid "Filename"
-msgstr "Файл"
-
-#: ../src/totem-video-thumbnailer.c:875
-msgid "Resolution"
-msgstr "Роздільна здатність"
-
-#: ../src/totem-video-thumbnailer.c:878
-msgid "Duration"
-msgstr "Тривалість"
-
-#: ../src/totem-uri.c:506 ../src/plugins/chapters/totem-chapters.c:998
+#: ../src/totem-uri.c:343 ../src/plugins/chapters/totem-chapters.c:998
 msgid "All files"
 msgstr "Усі файли"
 
-#: ../src/totem-uri.c:511 ../src/plugins/chapters/totem-chapters.c:995
+#: ../src/totem-uri.c:348 ../src/plugins/chapters/totem-chapters.c:995
 msgid "Supported files"
 msgstr "Підтримувані файли"
 
-#: ../src/totem-uri.c:523
+#: ../src/totem-uri.c:360
 msgid "Audio files"
 msgstr "Звукові файли"
 
-#: ../src/totem-uri.c:531
+#: ../src/totem-uri.c:368
 msgid "Video files"
 msgstr "Відеофайли"
 
-#: ../src/totem-uri.c:541
+#: ../src/totem-uri.c:378
 msgid "Subtitle files"
 msgstr "Файли субтитрів"
 
-#: ../src/totem-uri.c:593
+#: ../src/totem-uri.c:430
 msgid "Select Text Subtitles"
 msgstr "Вибір текстових субтитрів"
 
-#: ../src/totem-uri.c:656
+#: ../src/totem-uri.c:495
 msgid "Select Movies or Playlists"
 msgstr "Вибір відеофайлів чи списків відтворення"
 
-#. Options parsing
-#: ../src/totem.c:201
-msgid "- Play movies and songs"
-msgstr "- відтворює відеофільми та звукозаписи"
-
-#: ../src/totem.c:212
-#, c-format
-msgid ""
-"%s\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"%s\n"
-"Запустіть '%s --help' для перегляду списку доступних параметрів командного "
-"рядка.\n"
-
-#: ../src/totem.c:254 ../src/totem.c:265
-#: ../browser-plugin/totem-plugin-viewer.c:663
-#: ../browser-plugin/totem-plugin-viewer.c:1793
-msgid "Totem Movie Player"
-msgstr "Мультимедійний програвач Totem"
-
-#: ../src/totem.c:255 ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Could not initialize the thread-safe libraries."
-msgstr "Неможливо ініціалізувати безпечну бібліотеку потоків виконання."
-
-#: ../src/totem.c:255
-msgid "Verify your system installation. Totem will now exit."
-msgstr "Перевірте систему. Totem завершується."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:1589
-msgid "Password requested for RTSP server"
-msgstr "Запит пароля для сервера RTSP"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2858
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2862
-#, c-format
-msgid "Audio Track #%d"
-msgstr "Аудіо доріжка #%d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2890
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2894
-#, c-format
-msgid "Subtitle #%d"
-msgstr "Субтитри №%d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3298
-msgid ""
-"The requested audio output was not found. Please select another audio output "
-"in the Multimedia Systems Selector."
-msgstr ""
-"Не знайдено необхідну систему виводу звуку. Виберіть іншу систему виводу "
-"звуку в параметрах робочого середовища."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3303
-msgid "Location not found."
-msgstr "Адресу не знайдено."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3307
-msgid ""
-"Could not open location; you might not have permission to open the file."
-msgstr ""
-"Не вдалось відкрити адресу; можливо, немає прав на відкривання цього файла."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3318
-msgid ""
-"The video output is in use by another application. Please close other video "
-"applications, or select another video output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"Вивід відео використовується іншою програмою. Закрийте іншу відеопрограму, "
-"або виберіть інший вивід відео у селекторі мультимедійних систем."
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3324
-msgid ""
-"The audio output is in use by another application. Please select another "
-"audio output in the Multimedia Systems Selector. You may want to consider "
-"using a sound server."
-msgstr ""
-"Вивід звуку використовується іншою програмою. Ви можете закрити ту програму, "
-"або вибрати інший вивід звуку у селекторі мультимедійних систем. Якщо Вам "
-"потрібно використовувати кілька звукових програм одночасно, "
-"рекомендуєтьсявикористовувати звуковий сервер."
+#: ../src/totem-uri.c:499
+msgid "Add Directory"
+msgstr "Додати каталог"
 
-#. should be exactly one missing thing (source or converter)
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3342
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3348
-#, c-format
-msgid "The playback of this movie requires a %s plugin which is not installed."
-msgid_plural ""
-"The playback of this movie requires the following decoders which are not "
-"installed:\n"
-"\n"
-"%s"
-msgstr[0] ""
-"Для відтворення цього відео потрібно додаток %s, який не встановлено."
-msgstr[1] ""
-"Для відтворення цього відео потрібно такі декодери, які не встановлено:\n"
-"\n"
-"%s"
-msgstr[2] ""
-"Для відтворення цього відео потрібно такі декодери, які не встановлено:\n"
-"\n"
-"%s"
+#: ../src/totem-video-list.c:330
+msgid "No video URI"
+msgstr "Нема URI для відео"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3374
+#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
+#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
+#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
+#: ../src/totem-video-thumbnailer.c:841
+#, c-format
 msgid ""
-"Cannot play this file over the network. Try downloading it to disk first."
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 msgstr ""
-"Неможливо відтворити цей файл з мережі. Спробуйте спочатку звантажити його "
-"на локальний диск."
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5878
-msgid "Media contains no supported video streams."
-msgstr "Не знайдено підтримуваних потоків відео."
+#: ../src/totem-video-thumbnailer.c:842
+msgid "Filename"
+msgstr "Файл"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6052
-msgid ""
-"Failed to create a GStreamer play object. Please check your GStreamer "
-"installation."
-msgstr ""
-"Не вдалось створити об'єкт відтворення GStreamer. Перевірте встановлення "
-"GStreamer."
+#: ../src/totem-video-thumbnailer.c:844
+msgid "Resolution"
+msgstr "Роздільна здатність"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6172
-msgid ""
-"Failed to open audio output. You may not have permission to open the sound "
-"device, or the sound server may not be running. Please select another audio "
-"output in the Multimedia Systems Selector."
-msgstr ""
-"Не вдалось відкрити вивід звуку. Можливо, у вас немає прав для відкривання "
-"звукового пристрою, або звуковий сервер не запущений. Виберіть інший вивід "
-"звуку у селекторі мультимедійних систем."
+#: ../src/totem-video-thumbnailer.c:847
+msgid "Duration"
+msgstr "Тривалість"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6192
-msgid ""
-"Could not find the audio output. You may need to install additional "
-"GStreamer plugins, or select another audio output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"Не вдалось відкрити систему виводу звуку. Можливо, необхідно встановити "
-"додаткові втулки GStreamer. Також можна вибрати іншу систему виводу звуку у "
-"селекторі мультимедійних систем."
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:1
+msgid "Apple Trailers"
+msgstr "Apple Trailers"
+
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:2
+msgid "Sets the user agent for the Apple Trailers site"
+msgstr "Вказує агента для сайту Apple Trailers"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:1
+msgid "Autoload Subtitles"
+msgstr "Автоматично завантажувати субтитри"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:2
+msgid "Autoloads text subtitles"
+msgstr "Автоматично завантажувати текстові субтитри"
 
-#. hour:minutes:seconds
-#. Translators: This is a time format, like "9:05:02" for 9
-#. * hours, 5 minutes, and 2 seconds. You may change ":" to
-#. * the separator that your locale uses or use "%Id" instead
-#. * of "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:83 ../src/plugins/skipto/totem-time-entry.c:57
-#, c-format
-msgctxt "long time format"
-msgid "%d:%02d:%02d"
-msgstr "%d:%02d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
+msgid "Video Disc Recorder"
+msgstr "Запис відеодисків"
 
-#. minutes:seconds
-#. Translators: This is a time format, like "5:02" for 5
-#. * minutes and 2 seconds. You may change ":" to the
-#. * separator that your locale uses or use "%Id" instead of
-#. * "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:92
-#, c-format
-msgctxt "short time format"
-msgid "%d:%02d"
-msgstr "%d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
+msgid "Records (S)VCDs or video DVDs"
+msgstr "Записує (S)VCD чи відео DVD"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:65
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:65
 msgid "_Create Video Disc..."
 msgstr "_Створити відеодиск..."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:66
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:66
 msgid "Create a video DVD or a (S)VCD from the currently opened movie"
 msgstr "Створити відео DVD чи (S)VCD з відритого фільму"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:68
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:68
 msgid "Copy Vide_o DVD..."
 msgstr "Копіювати в_ідео DVD..."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:69
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:69
 msgid "Copy the currently playing video DVD"
 msgstr "Копіювати відео DVD, що відтворюється"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:71
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:71
 msgid "Copy (S)VCD..."
 msgstr "Копіювати в_ідео (S)VCD..."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:72
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:72
 msgid "Copy the currently playing (S)VCD"
 msgstr "Копіювати (S)VCD, що відтворюється"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:129
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:136
 msgid "The video disc could not be duplicated."
 msgstr "Не вдалось скопіювати відеодиск."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:131
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:276
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:138
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:283
 msgid "The movie could not be recorded."
 msgstr "Не вдалось записати фільм."
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:157
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:167
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:263
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:164
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:174
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:270
 msgid "Unable to write a project."
 msgstr "Не вдалось записати проект."
 
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
-msgid "Video Disc Recorder"
-msgstr "Запис відеодисків"
-
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
-msgid "Records (S)VCDs or video DVDs"
-msgstr "Записує (S)VCD чи відео DVD"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:1
-#: ../src/plugins/chapters/totem-chapters.c:1139
-msgid "Chapters"
-msgstr "Розділи"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:2
-msgid "Support chapter markers in movies."
-msgstr "Підтримка заголовків розділу у відео."
-
-#: ../src/plugins/chapters/chapters-edit.ui.h:1
+#: ../src/plugins/chapters/chapters-edit.ui.h:1
 msgid "Name for new chapter:"
 msgstr "Назва наступного розділу:"
 
-#: ../src/plugins/chapters/chapters-list.ui.h:1
+#: ../src/plugins/chapters/chapters-list.ui.h:1
 msgid "_Remove Chapter"
 msgstr "В_илучити розділ"
 
-#: ../src/plugins/chapters/chapters-list.ui.h:2
+#: ../src/plugins/chapters/chapters-list.ui.h:2
 msgid "Remove the chapter from the list"
 msgstr "Вилучити розділ зі списку"
 
-#: ../src/plugins/chapters/chapters-list.ui.h:3
+#: ../src/plugins/chapters/chapters-list.ui.h:3
 msgid "_Go to Chapter"
 msgstr "_Перейти до розділу"
 
-#: ../src/plugins/chapters/chapters-list.ui.h:4
+#: ../src/plugins/chapters/chapters-list.ui.h:4
 msgid "Go to the chapter in the movie"
 msgstr "Перейти до розділу в фільмі"
 
-#: ../src/plugins/chapters/chapters-list.ui.h:5
+#: ../src/plugins/chapters/chapters-list.ui.h:5
 msgid "Add Chapter..."
 msgstr "Додати розділ…"
 
-#: ../src/plugins/chapters/chapters-list.ui.h:6
+#: ../src/plugins/chapters/chapters-list.ui.h:6
 msgid "Remove Chapter"
 msgstr "Вилучити розділ"
 
-#: ../src/plugins/chapters/chapters-list.ui.h:7
+#: ../src/plugins/chapters/chapters-list.ui.h:7
 msgid "Go to Chapter"
 msgstr "Перейти до розділу"
 
-#: ../src/plugins/chapters/chapters-list.ui.h:8
+#: ../src/plugins/chapters/chapters-list.ui.h:8
 msgid "Save Changes"
 msgstr "Зберегти зміни"
 
-#: ../src/plugins/chapters/chapters-list.ui.h:9
+#: ../src/plugins/chapters/chapters-list.ui.h:9
 msgid "No chapter data"
 msgstr "Нема даних розділів"
 
-#: ../src/plugins/chapters/chapters-list.ui.h:10
+#: ../src/plugins/chapters/chapters-list.ui.h:10
 msgid "Load Chapters..."
 msgstr "Завантажити розділи…"
 
-#: ../src/plugins/chapters/chapters-list.ui.h:11
+#: ../src/plugins/chapters/chapters-list.ui.h:11
 msgid "Load chapters from an external CMML file"
 msgstr "Завантажити розділи з зовнішнього файла CMML"
 
-#: ../src/plugins/chapters/chapters-list.ui.h:12
+#: ../src/plugins/chapters/chapters-list.ui.h:12
 msgid "Add New Chapters"
 msgstr "Додати нові розділи"
 
-#: ../src/plugins/chapters/chapters-list.ui.h:13
+#: ../src/plugins/chapters/chapters-list.ui.h:13
 msgid "Create a new chapter list for the movie"
 msgstr "Створити новий перелік розділів для фільму"
 
-#: ../src/plugins/chapters/totem-chapters.c:56
-#, c-format
+#: ../src/plugins/chapters/chapters.plugin.in.h:1
+#: ../src/plugins/chapters/totem-chapters.c:1139
+msgid "Chapters"
+msgstr "Розділи"
+
+#: ../src/plugins/chapters/chapters.plugin.in.h:2
+msgid "Support chapter markers in movies"
+msgstr "Підтримування позначок розділу у відеозаписах"
+
+#: ../src/plugins/chapters/totem-chapters.c:56
+#, c-format
 msgid ""
 "Title: %s\n"
 "Start time: %s"
@@ -2072,75 +1911,75 @@
 "Назва: %s\n"
 "Початок: %s"
 
-#: ../src/plugins/chapters/totem-chapters.c:328
+#: ../src/plugins/chapters/totem-chapters.c:328
 msgid "Error while reading file with chapters"
 msgstr "Помилка читання файла розділів"
 
-#: ../src/plugins/chapters/totem-chapters.c:543
+#: ../src/plugins/chapters/totem-chapters.c:543
 msgid "Chapter with the same time already exists"
 msgstr "Розділ з таким же часом вже існує"
 
-#: ../src/plugins/chapters/totem-chapters.c:544
+#: ../src/plugins/chapters/totem-chapters.c:544
 msgid "Try another name or remove an existing chapter."
 msgstr "Спробуйте іншу назву або вилучіть наявний розділ."
 
-#: ../src/plugins/chapters/totem-chapters.c:717
+#: ../src/plugins/chapters/totem-chapters.c:717
 msgid "Error while writing file with chapters"
 msgstr "Помилка при записі файла з розділами"
 
-#: ../src/plugins/chapters/totem-chapters.c:842
+#: ../src/plugins/chapters/totem-chapters.c:842
 msgid "Error occurred while saving chapters"
 msgstr "Трапилась помилка при збереженні розділів"
 
-#: ../src/plugins/chapters/totem-chapters.c:843
+#: ../src/plugins/chapters/totem-chapters.c:843
 msgid ""
 "Please check you have permission to write to the folder containing the movie."
 msgstr ""
 "Будь ласка, перевірте, чи ви маєте право на запис до теки, що містить відео."
 
-#: ../src/plugins/chapters/totem-chapters.c:976
+#: ../src/plugins/chapters/totem-chapters.c:976
 msgid "Open Chapter File"
 msgstr "Відкрити файл розділу"
 
-#: ../src/plugins/chapters/totem-chapters.c:1093
+#: ../src/plugins/chapters/totem-chapters.c:1093
 msgid "Chapter Screenshot"
 msgstr "Знімок екрана розділу"
 
-#: ../src/plugins/chapters/totem-chapters.c:1104
+#: ../src/plugins/chapters/totem-chapters.c:1104
 msgid "Chapter Title"
 msgstr "Назву розділу"
 
-#: ../src/plugins/chapters/totem-chapters.c:1184
+#: ../src/plugins/chapters/totem-chapters.c:1184
 msgid "Save changes to chapter list before closing?"
 msgstr "Зберегти зміни в перелік розділів перед закриттям?"
 
-#. Translators: close Totem without saving changes to the chapter list of the current movie.
-#: ../src/plugins/chapters/totem-chapters.c:1189
+#. Translators: close Totem without saving changes to the chapter list of the current movie.
+#: ../src/plugins/chapters/totem-chapters.c:1189
 msgid "Close without Saving"
 msgstr "Закрити без збереження"
 
-#. Translators: save changes to the chapter list of the current movie before closing Totem.
-#: ../src/plugins/chapters/totem-chapters.c:1191
+#. Translators: save changes to the chapter list of the current movie before closing Totem.
+#: ../src/plugins/chapters/totem-chapters.c:1191
 msgid "Save"
 msgstr "Зберегти"
 
-#: ../src/plugins/chapters/totem-chapters.c:1194
+#: ../src/plugins/chapters/totem-chapters.c:1194
 msgid "If you don't save, changes to the chapter list will be lost."
 msgstr "Якщо ви не збережете, зміни в переліку розділів буде втрачено."
 
-#: ../src/plugins/chapters/totem-cmml-parser.c:651
+#: ../src/plugins/chapters/totem-cmml-parser.c:651
 msgid "Failed to parse CMML file"
 msgstr "Не вдалось проаналізувати файл CMML"
 
-#: ../src/plugins/chapters/totem-edit-chapter.c:95
+#: ../src/plugins/chapters/totem-edit-chapter.c:95
 msgid "Add Chapter"
 msgstr "Додати розділ"
 
-#: ../src/plugins/dbusservice/dbusservice.plugin.in.h:1
+#: ../src/plugins/dbusservice/dbusservice.plugin.in.h:1
 msgid "D-Bus Service"
 msgstr "Служба D-Bus"
 
-#: ../src/plugins/dbusservice/dbusservice.plugin.in.h:2
+#: ../src/plugins/dbusservice/dbusservice.plugin.in.h:2
 msgid ""
 "Plugin for sending notifications of currently playing movies to the D-Bus "
 "subsystem."
@@ -2148,276 +1987,212 @@
 "Модуль для надсилання сповіщень про поточні відтворювані фільми до системи D-"
 "Bus."
 
-#: ../src/plugins/dbusservice/dbusservice.py:213
-#: ../src/plugins/dbusservice/dbusservice.py:243
-#, python-format
+#: ../src/plugins/dbusservice/dbusservice.py:213
+#: ../src/plugins/dbusservice/dbusservice.py:243
+#, python-format
 msgid "The MediaPlayer2 object does not implement the ‘%s’ interface"
 msgstr "В об'єкті MediaPlayer2 не реалізовано інтерфейс «%s»"
 
-#: ../src/plugins/dbusservice/dbusservice.py:222
-#, python-format
+#: ../src/plugins/dbusservice/dbusservice.py:222
+#, python-format
 msgid "The property ‘%s’ is not writeable."
 msgstr "Властивість «%s» неможливо записати."
 
-#: ../src/plugins/dbusservice/dbusservice.py:238
-#, python-format
+#: ../src/plugins/dbusservice/dbusservice.py:238
+#, python-format
 msgid "Unknown property ‘%s’ requested of a MediaPlayer 2 object"
 msgstr "Невідома властивість «%s» потрібна для об'єкта MediaPlayer"
 
-#: ../src/plugins/dbusservice/dbusservice.py:341
-#, python-format
+#: ../src/plugins/dbusservice/dbusservice.py:341
+#, python-format
 msgid "The URI ‘%s’ is not supported."
 msgstr "URI «%s» не підтримується."
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
-msgid "Instant Messenger status"
-msgstr "Стан у клієнті обміну миттєвими повідомленнями"
+#: ../src/plugins/grilo/grilo.plugin.in.h:1
+msgid "Grilo Browser"
+msgstr "Переглядач Grilo"
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
-msgid "Set your Instant Messenger status to away when a movie is playing"
-msgstr ""
-"Встановлює статус у клієнті обміну миттєвими повідомленнями під час "
-"перегляду фільму"
+#: ../src/plugins/grilo/grilo.plugin.in.h:2
+msgid "A plugin to let you browse media content from various sources"
+msgstr "Додаток, що дозволяє переглядати мультимедійний вміст з різних джерел"
+
+#: ../src/plugins/grilo/grilo.ui.h:1
+msgid "Add to Playlist"
+msgstr "Додати до списку композицій"
+
+#: ../src/plugins/grilo/grilo.ui.h:2
+msgid "Copy Location"
+msgstr "Копіювати адресу"
+
+#: ../src/plugins/grilo/grilo.ui.h:3 ../src/plugins/grilo/totem-grilo.c:1184
+msgid "Browse"
+msgstr "Перегляд"
+
+#: ../src/plugins/grilo/grilo.ui.h:4 ../src/plugins/grilo/totem-grilo.c:1227
+msgid "Search"
+msgstr "Пошук"
+
+#: ../src/plugins/grilo/totem-grilo.c:454
+msgid "Browse Error"
+msgstr "Помилка перегляду"
+
+#: ../src/plugins/grilo/totem-grilo.c:609
+msgid "Search Error"
+msgstr "Помилка пошуку"
 
-#: ../src/plugins/gromit/gromit.plugin.in.h:1
+#: ../src/plugins/gromit/gromit.plugin.in.h:1
 msgid "Gromit Annotations"
 msgstr "Анотації у Gromit"
 
-#: ../src/plugins/gromit/gromit.plugin.in.h:2
+#: ../src/plugins/gromit/gromit.plugin.in.h:2
 msgid "Presentation helper to make annotations on screen"
 msgstr "Підтримка анотацій на різних частинах робочого столу"
 
-#: ../src/plugins/gromit/totem-gromit.c:231
+#: ../src/plugins/gromit/totem-gromit.c:231
 msgid "The gromit binary was not found."
 msgstr "Виконуваний файл gromit не знайдено."
 
-#. Add the interface to Totem's sidebar
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:1
-#: ../src/plugins/iplayer/iplayer.py:46
-msgid "BBC iPlayer"
-msgstr "BBC iPlayer"
-
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:2
-msgid "Stream BBC programs from the last 7 days from the BBC iPlayer service."
-msgstr "Потокова доставка програм BBC за останні 7 днів з сервісу BBC iPlayer."
-
-#: ../src/plugins/iplayer/iplayer.py:72
-msgid "Error listing channel categories"
-msgstr "Помилка при переліченні категорій каналів"
-
-#: ../src/plugins/iplayer/iplayer.py:73
-msgid ""
-"There was an unknown error getting the list of television channels available "
-"on BBC iPlayer."
-msgstr ""
-"Невідома помилка при отриманні списку телевізійних каналів, доступних на BBC "
-"iPlayer."
-
-#. Append a dummy child row so that the expander's visible; we can
-#. then queue off the expander to load the programme listing for this
-#. category
-#: ../src/plugins/iplayer/iplayer.py:84
-msgid "Loading…"
-msgstr "Завантаження"
-
-#. Translators: the "programme feed" is the list of TV shows
-#. available to watch online
-#: ../src/plugins/iplayer/iplayer.py:136
-msgid "Error getting programme feed"
-msgstr "Помилка при отриманні списку програм каналу"
-
-#: ../src/plugins/iplayer/iplayer.py:137
-msgid ""
-"There was an error getting the list of programmes for this channel and "
-"category combination."
-msgstr ""
-"Виникла невідома помилка при отриманні списку програм для цього каналу та "
-"їхніх комбінацій категорій."
-
-#: ../src/plugins/iplayer/iplayer2.py:298
-msgid ""
-msgstr "<причини не подано>"
-
-#: ../src/plugins/iplayer/iplayer2.py:299
-#, python-format
-msgid "Programme unavailable (\"%s\")"
-msgstr "Програма недоступна (\"%s\")"
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
+msgid "Instant Messenger Status"
+msgstr "Стан у клієнті обміну миттєвими повідомленнями"
+
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
+msgid "Set your Instant Messenger status to away when a movie is playing"
+msgstr ""
+"Встановлює статус у клієнті обміну миттєвими повідомленнями під час "
+"перегляду фільму"
 
-#: ../src/plugins/lirc/lirc.plugin.in.h:1
+#: ../src/plugins/lirc/lirc.plugin.in.h:1
 msgid "Infrared Remote Control"
 msgstr "Інфрачервоне віддалене керування"
 
-#: ../src/plugins/lirc/lirc.plugin.in.h:2
+#: ../src/plugins/lirc/lirc.plugin.in.h:2
 msgid "Support infrared remote control"
 msgstr "Підтримка інфрачервоного віддаленого керування"
 
-#: ../src/plugins/lirc/totem-lirc.c:242
+#: ../src/plugins/lirc/totem-lirc.c:242
 msgid "Couldn't initialize lirc."
 msgstr "Неможливо запустити службу lirc."
 
-#: ../src/plugins/lirc/totem-lirc.c:254
+#: ../src/plugins/lirc/totem-lirc.c:254
 msgid "Couldn't read lirc configuration."
 msgstr "Не вдалось прочитати конфігурацію lirc"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
-msgid "Download Movie Subtitles"
-msgstr "Завантаження субтитрів до фільму"
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:1
+msgid "Media Player Keys"
+msgstr "Мультимедійні клавіші"
+
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:2
+msgid "Support additional media player keys"
+msgstr "Підтримування додаткових мультимедійних клавіш"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
-msgid "Subtitle _language:"
-msgstr "_Мова субтитрів"
+#: ../src/plugins/ontop/ontop.plugin.in.h:1
+msgid "Always On Top"
+msgstr "Завжди згори"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
-msgid "_Play with Subtitle"
-msgstr "_Відтворити із субтитрами"
+#: ../src/plugins/ontop/ontop.plugin.in.h:2
+msgid "Keep the main window on top when playing a movie"
+msgstr "Головне вікно залишається над іншими вікнами при відтворенні відео"
 
-#: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:1
+#: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:1
 msgid "Subtitle Downloader"
 msgstr "Звантаження субтитрів"
 
-#: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:2
-msgid "Look for subtitles for the currently playing movie."
+#: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:2
+msgid "Look for subtitles for the currently playing movie"
 msgstr "Пошук субтитрів для відтворюваного наразі фільму"
 
-#: ../src/plugins/opensubtitles/opensubtitles.py:42
+#: ../src/plugins/opensubtitles/opensubtitles.py:42
 msgid "Brazilian Portuguese"
 msgstr "Бразильська португальська"
 
-#: ../src/plugins/opensubtitles/opensubtitles.py:177
+#: ../src/plugins/opensubtitles/opensubtitles.py:177
 msgid "Searching for subtitles…"
 msgstr "Пошук субтитрів…"
 
-#: ../src/plugins/opensubtitles/opensubtitles.py:225
-#: ../src/plugins/opensubtitles/opensubtitles.py:645
+#: ../src/plugins/opensubtitles/opensubtitles.py:225
+#: ../src/plugins/opensubtitles/opensubtitles.py:645
 msgid "Downloading the subtitles…"
 msgstr "Звантаження субтитрів…"
 
-#: ../src/plugins/opensubtitles/opensubtitles.py:290
+#: ../src/plugins/opensubtitles/opensubtitles.py:290
 msgid "Could not contact the OpenSubtitles website"
 msgstr "Не вдалось з'єднатися із сервером OpenSubtitles"
 
-#: ../src/plugins/opensubtitles/opensubtitles.py:323
-#: ../src/plugins/opensubtitles/opensubtitles.py:341
+#: ../src/plugins/opensubtitles/opensubtitles.py:323
+#: ../src/plugins/opensubtitles/opensubtitles.py:341
 msgid "Could not contact the OpenSubtitles website."
 msgstr "Неможливо з'єднатись із сайтом OpenSubtitles."
 
-#: ../src/plugins/opensubtitles/opensubtitles.py:329
+#: ../src/plugins/opensubtitles/opensubtitles.py:329
 msgid "No results found."
 msgstr "Нічого не знайдено"
 
-#: ../src/plugins/opensubtitles/opensubtitles.py:478
+#: ../src/plugins/opensubtitles/opensubtitles.py:478
 msgid "Subtitles"
 msgstr "Субтитри"
 
-#. translators comment:
-#. This is the file-type of the subtitle file detected
-#: ../src/plugins/opensubtitles/opensubtitles.py:484
+#. translators comment:
+#. This is the file-type of the subtitle file detected
+#: ../src/plugins/opensubtitles/opensubtitles.py:484
 msgid "Format"
 msgstr "Формат"
 
-#. translators comment:
-#. This is a rating of the quality of the subtitle
-#: ../src/plugins/opensubtitles/opensubtitles.py:489
+#. translators comment:
+#. This is a rating of the quality of the subtitle
+#: ../src/plugins/opensubtitles/opensubtitles.py:489
 msgid "Rating"
 msgstr "Оцінка"
 
-#: ../src/plugins/opensubtitles/opensubtitles.py:525
+#: ../src/plugins/opensubtitles/opensubtitles.py:525
 msgid "Download movie subtitles from OpenSubtitles"
 msgstr "Звантажити субтитри до фільму з OpenSubtitles"
 
-#: ../src/plugins/opensubtitles/opensubtitles.py:527
+#: ../src/plugins/opensubtitles/opensubtitles.py:527
 msgid "_Download Movie Subtitles…"
 msgstr "_Завантажити субтитри до фільму…"
 
-#: ../src/plugins/opensubtitles/opensubtitles.py:589
+#: ../src/plugins/opensubtitles/opensubtitles.py:589
 msgid "Searching subtitles…"
 msgstr "Пошук субтитрів…"
 
-#: ../src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in.h:1
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
+msgid "Download Movie Subtitles"
+msgstr "Завантаження субтитрів до фільму"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
+msgid "Subtitle _language:"
+msgstr "_Мова субтитрів"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
+msgid "_Play with Subtitle"
+msgstr "_Відтворити із субтитрами"
+
+#: ../src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in.h:1
 msgid "Subtitle language"
 msgstr "Мова субтитрів"
 
-#: ../src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in.h:2
+#: ../src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in.h:2
 msgid "The language to search for subtitles for movies in."
 msgstr "Мова, за якою шукатимуть субтитри для фільму."
 
-#: ../src/plugins/ontop/ontop.plugin.in.h:1
-msgid "Always On Top"
-msgstr "Завжди згори"
-
-#: ../src/plugins/ontop/ontop.plugin.in.h:2
-msgid "Keep the main window on top when playing a movie"
-msgstr "Головне вікно залишається над іншими вікнами при відтворенні відео"
+#: ../src/plugins/properties/movie-properties.plugin.in.h:1
+msgid "Movie Properties"
+msgstr "Властивості відеозапису"
+
+#: ../src/plugins/properties/movie-properties.plugin.in.h:2
+msgid "Adds movie properties to the sidebar"
+msgstr "Додає властивості відеозапису до бокової панелі"
 
-#: ../src/plugins/properties/totem-movie-properties.c:246
+#: ../src/plugins/properties/totem-movie-properties.c:246
 msgid "Properties"
 msgstr "Властивості"
 
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:1
-msgid "Publisher protocol to use"
-msgstr "Протокол оприлюднення"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:2
-msgid ""
-"The transport protocol to use when publishing playlists over the network."
-msgstr "Протокол переміщення при оприлюдненні у мережі."
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:3
-msgid "Format for network service name"
-msgstr "Формат для назви мережевої служби"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:5
-#, no-c-format
-msgid ""
-"A format string used to build the network service name used when publishing "
-"playlists over the network. The following format placeholders can be used: • "
-"%a: the program name as returned by g_get_application_name() • %h: the "
-"machine's host name in title case • %u: the user's login name in title case "
-"• %U: the user's real name • %%: the percent sign"
-msgstr ""
-"Формати рядка для побудови назви мережевої служби, яка використовується для "
-"оприлюднення списку композицій за мережею. Можна використовувати такі "
-"формати: • %a: назва програми, яка повертається через g_get_application_name"
-"() • %h: назва вузла машини з великої букви • %u: користувач з великої букви "
-"• %U: справжнє ім'я користувача • %%: відсотки"
-
-#. Translators: computers on the local network which are publishing their playlists over the network
-#: ../src/plugins/publish/totem-publish.c:552
-msgid "Neighbors"
-msgstr "Сусіди"
-
-#: ../src/plugins/publish/publish.plugin.in.h:1
-msgid "Publish Playlist"
-msgstr "Опублікувати список відтворення"
-
-#: ../src/plugins/publish/publish.plugin.in.h:2
-msgid "Share the current playlist via HTTP"
-msgstr "Забезпечує загальний доступ до поточного списку відтворення через HTTP"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:1
-msgid "Service _Name:"
-msgstr "Назва _сервісу:"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:3
-#, no-c-format
-msgid ""
-"The name used for announcing the playlist service on the network.\n"
-"All occurrences of the string %u will be replaced by your name,\n"
-"and %h will be replaced by your computer's host name."
-msgstr ""
-"Назва, що використовується для анонсу списку композицій у мережі.\n"
-"Усі рядки %u буде замінено на ваше ім'я,\n"
-"а %h на назву вузла комп'ютера."
-
-#: ../src/plugins/publish/publish-plugin.ui.h:6
-msgid "Use _encrypted transport protocol (HTTPS)"
-msgstr "Використовувати _шифрований транспортний протокол (HTTPS)"
-
-#: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:1
+#: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:1
 msgid "rpdb2 password"
 msgstr "Пароль rpdb2"
 
-#: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:2
+#: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:2
 msgid ""
 "A password to protect the rpdb2 server for debugging Totem from unauthorized "
 "remote access. If this is empty, a default of 'totem' will be used."
@@ -2425,280 +2200,543 @@
 "Пароль для захисту сервера rpdb2, налагодження Totem через неавторизований "
 "віддалений доступ. Якщо це порожнє, буде використано типовий «totem»."
 
-#: ../src/plugins/rotation/rotation.plugin.in.h:1
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
+msgid "Python Console"
+msgstr "Консоль Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
+msgid "Interactive Python console"
+msgstr "Інтерактивна консоль Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:88
+msgid "Python Console Menu"
+msgstr "Меню консолі Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:93
+msgid "_Python Console"
+msgstr "_Консоль Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:94
+msgid "Show Totem's Python console"
+msgstr "Показати консоль Python програвача Totem"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:100
+msgid "Python Debugger"
+msgstr "Зневадження Python"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:101
+msgid "Enable remote Python debugging with rpdb2"
+msgstr "Увімкнути віддалене налагодження Python за допомогою rpdb2"
+
+#. pylint: disable-msg=E1101
+#: ../src/plugins/pythonconsole/pythonconsole.py:125
+#, python-format
+msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
+msgstr "Можна отримати доступ до Totem.Object через «totem_object» :\\n%s"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:129
+msgid "Totem Python Console"
+msgstr "Консоль Python програвача Totem"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:139
+msgid ""
+"After you press OK, Totem will wait until you connect to it with winpdb or "
+"rpdb2. If you have not set a debugger password in DConf, it will use the "
+"default password ('totem')."
+msgstr ""
+"Після того, як ви натиснете Гаразд, Totem чекатиме на з’єднання від winpdb "
+"або rpdb2. Якщо пароль налагоджувача у GConf не вказано, буде використано "
+"типовий пароль ('totem')."
+
+#: ../src/plugins/recent/recent.plugin.in.h:1
+msgid "Recent files"
+msgstr "Нещодавні файли"
+
+#: ../src/plugins/recent/recent.plugin.in.h:2
+msgid "Adds files that have been played to recent files"
+msgstr "Додає файли, які вже програно, до нещодавніх файлів"
+
+#: ../src/plugins/rotation/rotation.plugin.in.h:1
 msgid "Rotation Plugin"
 msgstr "Додаток обертання"
 
-#: ../src/plugins/rotation/rotation.plugin.in.h:2
-msgid "Allows videos to be rotated if they're in the wrong orientation."
-msgstr "Дозволяє відео обертатись, якщо воно у неправильній орієнтації."
+#: ../src/plugins/rotation/rotation.plugin.in.h:2
+msgid "Allows videos to be rotated if they are in the wrong orientation"
+msgstr "Дозволяє відеозапису обертатись, якщо воно у неправильній орієнтації"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:60
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:50
 msgid "_Rotate Clockwise"
 msgstr "Обернути _за годинниковою стрілкою"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:62
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:52
 msgid "Rotate Counterc_lockwise"
 msgstr "Обернути _проти годинникової стрілки"
 
-#: ../src/plugins/save-file/totem-save-file.c:63
+#: ../src/plugins/save-file/save-file.plugin.in.h:1
+msgid "Save Copy"
+msgstr "Зберегти копію"
+
+#: ../src/plugins/save-file/save-file.plugin.in.h:2
+msgid "Save a copy of the currently playing movie"
+msgstr "Зберегти копію поточного відеозапису"
+
+#: ../src/plugins/save-file/totem-save-file.c:63
 msgid "Save a Copy..."
 msgstr "Зберегти копію…"
 
-#: ../src/plugins/save-file/totem-save-file.c:64
+#: ../src/plugins/save-file/totem-save-file.c:64
 msgid "Save a copy of the movie"
 msgstr "Зберегти копію відеозапису"
 
-#: ../src/plugins/save-file/totem-save-file.c:129
+#: ../src/plugins/save-file/totem-save-file.c:129
 msgid "Save a Copy"
 msgstr "Зберегти копію"
 
-#. translators: Movie is the default saved movie filename,
-#. * without the suffix
-#: ../src/plugins/save-file/totem-save-file.c:161
+#. translators: Movie is the default saved movie filename,
+#. * without the suffix
+#: ../src/plugins/save-file/totem-save-file.c:161
 msgid "Movie"
 msgstr "В_ідео"
 
-#: ../src/plugins/save-file/totem-save-file.c:183
+#: ../src/plugins/save-file/totem-save-file.c:183
 msgid "Movie stream"
 msgstr "Потік відео"
 
-#: ../src/plugins/screensaver/totem-screensaver.c:116
-#: ../browser-plugin/totem-plugin-viewer.c:1891
-msgid "Playing a movie"
-msgstr "Відтворення відео"
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:1
+msgid "Screen Saver"
+msgstr "Зберігач екрана"
+
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:2
+msgid "Deactivates the screen saver when a movie is playing"
+msgstr "Вимкнути зберігання екрана протягом програвання"
 
-#: ../src/plugins/screenshot/gallery.ui.h:1
+#: ../src/plugins/screenshot/gallery.ui.h:1
 msgid "Screenshot width (in pixels):"
 msgstr "Ширина знімку екрану (в точках растра):"
 
-#: ../src/plugins/screenshot/gallery.ui.h:2
+#: ../src/plugins/screenshot/gallery.ui.h:2
 msgid "Calculate the number of screenshots"
 msgstr "Розрахувати кількість знімків екрану"
 
-#: ../src/plugins/screenshot/gallery.ui.h:3
+#: ../src/plugins/screenshot/gallery.ui.h:3
 msgid "Number of screenshots:"
 msgstr "Кількість знімків екрану:"
 
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:1
-msgid "_Name:"
-msgstr "_Назва:"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:2
-msgid "Save in _folder:"
-msgstr "Зберегти у _теці:"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:3
-msgid "Select a folder"
-msgstr "Вибрати теку"
-
-#. Write the screenshot to the temporary file
-#: ../src/plugins/screenshot/gnome-screenshot-widget.c:385
-#: ../src/plugins/screenshot/totem-screenshot.c:64
-msgid "Screenshot.png"
-msgstr "Знімок.png"
+#. translators: this is the name of the file that gets made up
+#. * with the screenshot if the entire screen is taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:147
+#, c-format
+msgid "Screenshot from %s.png"
+msgstr "Знімок з %s.png"
+
+#. translators: this is the name of the file that gets
+#. * made up with the screenshot if the entire screen is
+#. * taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:154
+#, c-format
+msgid "Screenshot from %s - %d.png"
+msgstr "Знімок з %s - %d.png"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:1
+msgid "Screenshot"
+msgstr "Знімок"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:2
+msgid "Allows screenshots and galleries to be taken of videos"
+msgstr "Дозволяє робити знімки і галереї з відеозаписів "
 
-#: ../src/plugins/screenshot/totem-gallery.c:91
+#: ../src/plugins/screenshot/totem-gallery.c:91
 msgid "Save Gallery"
 msgstr "Зберегти серію знімків екрана"
 
-#. Translators: The first argument is the movie title. The second
-#. * argument is a number which is used to prevent overwriting files.
-#. * Just translate "Gallery", and not the ".jpg". Example:
-#. * "Galerie-%s-%d.jpg".
-#: ../src/plugins/screenshot/totem-gallery.c:115
-#, c-format
+#. Translators: The first argument is the movie title. The second
+#. * argument is a number which is used to prevent overwriting files.
+#. * Just translate "Gallery", and not the ".jpg". Example:
+#. * "Galerie-%s-%d.jpg".
+#: ../src/plugins/screenshot/totem-gallery.c:115
+#, c-format
 msgid "Gallery-%s-%d.jpg"
 msgstr "Галерея-%s-%d.jpg"
 
-#. Set up the window
-#: ../src/plugins/screenshot/totem-gallery-progress.c:101
+#. Set up the window
+#: ../src/plugins/screenshot/totem-gallery-progress.c:101
 msgid "Creating Gallery..."
 msgstr "Створення серії знімків екрана…"
 
-#. Set the progress label
-#: ../src/plugins/screenshot/totem-gallery-progress.c:107
-#, c-format
+#. Set the progress label
+#: ../src/plugins/screenshot/totem-gallery-progress.c:107
+#, c-format
 msgid "Saving gallery as \"%s\""
 msgstr "Збереження серії знімків екрана в «%s»"
 
-#: ../src/plugins/screenshot/totem-screenshot.c:113
-msgid "There was an error saving the screenshot."
-msgstr "Виникла помилка під час збереження знімку."
-
-#: ../src/plugins/screenshot/totem-screenshot.c:139
-msgid "Save Screenshot"
-msgstr "Зберегти знімок"
-
-#. Create the screenshot widget
-#. Translators: %s is the movie title and %d is an auto-incrementing number to make filename unique
-#: ../src/plugins/screenshot/totem-screenshot.c:160
-#, c-format
-msgid "Screenshot-%s-%d.png"
-msgstr "Знімок-%s-%d.png"
-
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:88
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:220
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "Totem could not get a screenshot of the video."
 msgstr "Не вдалось отримати кадр цього фільму."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "This is not supposed to happen; please file a bug report."
 msgstr "Цього не повинно було трапитись, надішліть звіт про помилку."
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
-msgid "Take _Screenshot..."
-msgstr "Зберегти _кадр…"
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
+msgid "Take _Screenshot"
+msgstr "Зробити з_німок"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
 msgid "Take a screenshot"
 msgstr "Зробити знімок вікна"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create Screenshot _Gallery..."
 msgstr "Створити знімки _галереї…"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create a gallery of screenshots"
 msgstr "Створити серію знімків екрана"
 
-#. Update the "seconds" label so that it always has the correct singular/plural form
-#. Translators: label for the seconds selector in the "Skip to" dialogue
-#: ../src/plugins/skipto/totem-skipto.c:160
+#: ../src/plugins/skipto/skipto.plugin.in.h:1
+#: ../src/plugins/skipto/totem-skipto.c:196
+msgid "Skip To"
+msgstr "Перескочити до"
+
+#: ../src/plugins/skipto/skipto.plugin.in.h:2
+msgid "Provides the \"Skip to\" dialog"
+msgstr "Забезпечує вікно  «Перескочити до»"
+
+#: ../src/plugins/skipto/skipto.ui.h:1
+msgid "_Skip to:"
+msgstr "_Перескочити до:"
+
+#. Update the "seconds" label so that it always has the correct singular/plural form
+#. Translators: label for the seconds selector in the "Skip to" dialogue
+#: ../src/plugins/skipto/totem-skipto.c:159
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "секунда"
 msgstr[1] "секунди"
 msgstr[2] "секунд"
 
-#. Fix the label width at the maximum necessary for the plural labels, to prevent it changing size when we change the spinner value
-#. Translators: you should translate this string to a number (written in digits) which corresponds to the longer character length of the
-#. * translations for "second" and "seconds", as translated elsewhere in this file. For example, in English, "second" is 6 characters long and
-#. * "seconds" is 7 characters long, so this string should be translated to "7". See: bgo#639398
-#: ../src/plugins/skipto/totem-skipto.c:190
+#. Fix the label width at the maximum necessary for the plural labels, to prevent it changing size when we change the spinner value
+#. Translators: you should translate this string to a number (written in digits) which corresponds to the longer character length of the
+#. * translations for "second" and "seconds", as translated elsewhere in this file. For example, in English, "second" is 6 characters long and
+#. * "seconds" is 7 characters long, so this string should be translated to "7". See: bgo#639398
+#: ../src/plugins/skipto/totem-skipto.c:189
 msgctxt "Skip To label length"
 msgid "7"
 msgstr "6"
 
-#: ../src/plugins/skipto/totem-skipto.c:197
-msgid "Skip To"
-msgstr "Перескочити до"
-
-#: ../src/plugins/skipto/totem-skipto-plugin.c:182
+#: ../src/plugins/skipto/totem-skipto-plugin.c:182
 msgid "_Skip To..."
 msgstr "_Перескочити до…"
 
-#: ../src/plugins/skipto/totem-skipto-plugin.c:182
+#: ../src/plugins/skipto/totem-skipto-plugin.c:182
 msgid "Skip to a specific time"
 msgstr "Перескочити до вказаного часу"
 
-#: ../src/plugins/skipto/skipto.ui.h:1
-msgid "_Skip to:"
-msgstr "_Перескочити до:"
+#~ msgid "Play movies and songs"
+#~ msgstr "Відтворення відео і звуку"
 
-#: ../browser-plugin/totem-plugin-viewer.c:431
-msgid "No URI to play"
-msgstr "Немає URI для відтворення"
+#~ msgid "Open a file"
+#~ msgstr "Відкрити файл"
 
-#. translators: this is:
-#. * Open With ApplicationName
-#. * as in nautilus' right-click menu
-#: ../browser-plugin/totem-plugin-viewer.c:1107
-#, c-format
-msgid "_Open with \"%s\""
-msgstr "Відкрити _у програмі «%s»"
+#~ msgid "Open a non-local file"
+#~ msgstr "Відкрити зовнішній файл"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2136
-msgid "No playlist or playlist empty"
-msgstr "Немає списку відтворення, або список відтворення порожній"
+#~ msgid "Quit the program"
+#~ msgstr "Вийти з програми"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2235
-msgid "Movie browser plugin"
-msgstr "Додаток перегляду відео"
+#~ msgid "Configure the application"
+#~ msgstr "Налаштувати програми"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Verify your system installation. The Totem plugin will now exit."
-msgstr "Перевірте встановлення системи. Тотем завершується."
+#~ msgid "Switch to fullscreen"
+#~ msgstr "Перемикає на повноекранний режим"
 
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
-msgid "Python Console"
-msgstr "Консоль Python"
+#~ msgid "Set the repeat mode"
+#~ msgstr "Встановлює режим повтору"
 
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
-msgid "Interactive Python console."
-msgstr "Інтерактивна консоль Python."
+#~ msgid "Set the shuffle mode"
+#~ msgstr "Встановлює режим перетасовування"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:88
-msgid "Python Console Menu"
-msgstr "Меню консолі Python"
+#~ msgid "14.4 Kbps Modem"
+#~ msgstr "14.4 кбіт/c модем"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:93
-msgid "_Python Console"
-msgstr "_Консоль Python"
+#~ msgid "19.2 Kbps Modem"
+#~ msgstr "19.2 кбіт/c модем"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:94
-msgid "Show Totem's Python console"
-msgstr "Показати консоль Python програвача Totem"
+#~ msgid "28.8 Kbps Modem"
+#~ msgstr "28.8 кбіт/c модем"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:100
-msgid "Python Debugger"
-msgstr "Зневадження Python"
+#~ msgid "33.6 Kbps Modem"
+#~ msgstr "33.6 кбіт/c модем"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:101
-msgid "Enable remote Python debugging with rpdb2"
-msgstr "Увімкнути віддалене налагодження Python за допомогою rpdb2"
+#~ msgid "34.4 Kbps Modem"
+#~ msgstr "34.4 кбіт/c модем"
 
-#. pylint: disable-msg=E1101
-#: ../src/plugins/pythonconsole/pythonconsole.py:125
-#, python-format
-msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
-msgstr "Можна отримати доступ до Totem.Object через «totem_object» :\\n%s"
+#~ msgid "56 Kbps Modem/ISDN"
+#~ msgstr "56 Кбіт/c модем/ISDN"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:129
-msgid "Totem Python Console"
-msgstr "Консоль Python програвача Totem"
+#~ msgid "112 Kbps Dual ISDN/DSL"
+#~ msgstr "112 кбіт/c Dual ISDN/DSL"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:139
-msgid ""
-"After you press OK, Totem will wait until you connect to it with winpdb or "
-"rpdb2. If you have not set a debugger password in DConf, it will use the "
-"default password ('totem')."
-msgstr ""
-"Після того, як ви натиснете Гаразд, Totem чекатиме на з’єднання від winpdb "
-"або rpdb2. Якщо пароль налагоджувача у GConf не вказано, буде використано "
-"типовий пароль ('totem')."
+#~ msgid "256 Kbps DSL/Cable"
+#~ msgstr "256 кбіт/c DSL/кабель"
 
-#: ../src/plugins/grilo/grilo.plugin.in.h:1
-msgid "Grilo Browser"
-msgstr "Переглядач Grilo"
+#~ msgid "384 Kbps DSL/Cable"
+#~ msgstr "384 кбіт/c DSL/кабель"
 
-#: ../src/plugins/grilo/grilo.plugin.in.h:2
-msgid "A plugin to let you browse media content from various sources."
-msgstr "Додаток, що дозволяє переглядати мультимедійний вміст з різних джерел."
+#~ msgid "512 Kbps DSL/Cable"
+#~ msgstr "512 кбіт/c DSL/кабель"
 
-#: ../src/plugins/grilo/totem-grilo.c:452
-msgid "Browse Error"
-msgstr "Помилка перегляду"
+#~ msgid "1.5 Mbps T1/Intranet/LAN"
+#~ msgstr "1.5 Мбіт/c T1/Intranet/LAN"
 
-#: ../src/plugins/grilo/totem-grilo.c:599
-msgid "Search Error"
-msgstr "Помилка пошуку"
+#~ msgid "Intranet/LAN"
+#~ msgstr "Intranet/Локальна мережа"
 
-#: ../src/plugins/grilo/totem-grilo.c:1219 ../src/plugins/grilo/grilo.ui.h:3
-msgid "Browse"
-msgstr "Перегляд"
+#~ msgid "Networking"
+#~ msgstr "Мережа"
 
-#: ../src/plugins/grilo/totem-grilo.c:1285 ../src/plugins/grilo/grilo.ui.h:4
-msgid "Search"
-msgstr "Пошук"
+#~ msgid "Connection _speed:"
+#~ msgstr "_Швидкість з'єднання:"
 
-#: ../src/plugins/grilo/grilo.ui.h:1
-msgid "Add to Playlist"
-msgstr "Додати до списку композицій"
+#~ msgid "Network connection speed"
+#~ msgstr "Швидкість з'єднання"
 
-#: ../src/plugins/grilo/grilo.ui.h:2
-msgid "Copy Location"
-msgstr "Копіювати адресу"
+#~ msgid ""
+#~ "Approximate network connection speed, used to select quality on media "
+#~ "over the network."
+#~ msgstr ""
+#~ "Приблизна швидкість мережевого з'єднання, що визначає якість відтворення "
+#~ "матеріалу через мережу."
+
+#~ msgid "Play Image '%s'"
+#~ msgstr "Відтворити образ «%s»"
+
+#~ msgid "device%d"
+#~ msgstr "пристрій%d"
+
+#~ msgid "Play Disc '%s'"
+#~ msgstr "Відтворити диск «%s»"
+
+#~ msgid "Movie Player using %s"
+#~ msgstr "Мультимедійний програвач використовує %s"
+
+#~ msgid ""
+#~ "Totem could not play this media (%s) although a plugin is present to "
+#~ "handle it."
+#~ msgstr ""
+#~ "Totem не може відтворити цей тип носія (%s), хоча додаток, який повинен "
+#~ "його обробляти, встановлено."
+
+#~ msgid ""
+#~ "You might want to check that a disc is present in the drive and that it "
+#~ "is correctly configured."
+#~ msgstr ""
+#~ "Можливо, слід перевірити, чи знаходиться диск у пристрої, та чи коректно "
+#~ "налаштовано пристрій."
+
+#~ msgid "More information about media plugins"
+#~ msgstr "Докладніша інформація про мультимедійні модулі"
+
+#~ msgid ""
+#~ "Please install the necessary plugins and restart Totem to be able to play "
+#~ "this media."
+#~ msgstr "Встановіть потрібні модулі та перезапустіть Totem."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it does not have the "
+#~ "appropriate plugins to be able to read from the disc."
+#~ msgstr ""
+#~ "Totem не може відтворити цей тип носія (%s), через відсутність модуля, "
+#~ "який може читати дані з нього."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because you do not have the "
+#~ "appropriate plugins to handle it."
+#~ msgstr ""
+#~ "Totem не може відтворити цей тип носія (%s), через відсутність модуля, "
+#~ "який може його обробляти."
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it is not supported."
+#~ msgstr ""
+#~ "Totem не може відтворити цей тип носія (%s), оскільки він не "
+#~ "підтримується."
+
+#~ msgid "Please insert another disc to play back."
+#~ msgstr "Будь ласка, вставте інший носій."
+
+#~ msgid "Totem does not support playback of Audio CDs"
+#~ msgstr "Totem не підтримує відтворення звукових компакт-дисків"
+
+#~ msgid ""
+#~ "Please consider using a music player or a CD extractor to play this CD"
+#~ msgstr ""
+#~ "Для відтворення цього диску користуйтесь музичним програвачем або "
+#~ "програмою копіювання звуку із звукових дисків"
+
+#~ msgid "%d %%"
+#~ msgstr "%d %%"
+
+#~ msgid ""
+#~ "The requested audio output was not found. Please select another audio "
+#~ "output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "Не знайдено необхідну систему виводу звуку. Виберіть іншу систему виводу "
+#~ "звуку в параметрах робочого середовища."
+
+#~ msgid "Location not found."
+#~ msgstr "Адресу не знайдено."
+
+#~ msgid ""
+#~ "Could not open location; you might not have permission to open the file."
+#~ msgstr ""
+#~ "Не вдалось відкрити адресу; можливо, немає прав на відкривання цього "
+#~ "файла."
+
+#~ msgid ""
+#~ "The video output is in use by another application. Please close other "
+#~ "video applications, or select another video output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "Вивід відео використовується іншою програмою. Закрийте іншу "
+#~ "відеопрограму, або виберіть інший вивід відео у селекторі мультимедійних "
+#~ "систем."
+
+#~ msgid ""
+#~ "The audio output is in use by another application. Please select another "
+#~ "audio output in the Multimedia Systems Selector. You may want to consider "
+#~ "using a sound server."
+#~ msgstr ""
+#~ "Вивід звуку використовується іншою програмою. Ви можете закрити ту "
+#~ "програму, або вибрати інший вивід звуку у селекторі мультимедійних "
+#~ "систем. Якщо Вам потрібно використовувати кілька звукових програм "
+#~ "одночасно, рекомендуєтьсявикористовувати звуковий сервер."
+
+#~ msgid ""
+#~ "Failed to create a GStreamer play object. Please check your GStreamer "
+#~ "installation."
+#~ msgstr ""
+#~ "Не вдалось створити об'єкт відтворення GStreamer. Перевірте встановлення "
+#~ "GStreamer."
+
+#~ msgid ""
+#~ "Failed to open audio output. You may not have permission to open the "
+#~ "sound device, or the sound server may not be running. Please select "
+#~ "another audio output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "Не вдалось відкрити вивід звуку. Можливо, у вас немає прав для "
+#~ "відкривання звукового пристрою, або звуковий сервер не запущений. "
+#~ "Виберіть інший вивід звуку у селекторі мультимедійних систем."
+
+#~ msgid ""
+#~ "Could not find the audio output. You may need to install additional "
+#~ "GStreamer plugins, or select another audio output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "Не вдалось відкрити систему виводу звуку. Можливо, необхідно встановити "
+#~ "додаткові втулки GStreamer. Також можна вибрати іншу систему виводу звуку "
+#~ "у селекторі мультимедійних систем."
+
+#~ msgid "BBC iPlayer"
+#~ msgstr "BBC iPlayer"
+
+#~ msgid ""
+#~ "Stream BBC programs from the last 7 days from the BBC iPlayer service."
+#~ msgstr ""
+#~ "Потокова доставка програм BBC за останні 7 днів з сервісу BBC iPlayer."
+
+#~ msgid "Error listing channel categories"
+#~ msgstr "Помилка при переліченні категорій каналів"
+
+#~ msgid ""
+#~ "There was an unknown error getting the list of television channels "
+#~ "available on BBC iPlayer."
+#~ msgstr ""
+#~ "Невідома помилка при отриманні списку телевізійних каналів, доступних на "
+#~ "BBC iPlayer."
+
+#~ msgid "Loading…"
+#~ msgstr "Завантаження"
+
+#~ msgid "Error getting programme feed"
+#~ msgstr "Помилка при отриманні списку програм каналу"
+
+#~ msgid ""
+#~ "There was an error getting the list of programmes for this channel and "
+#~ "category combination."
+#~ msgstr ""
+#~ "Виникла невідома помилка при отриманні списку програм для цього каналу та "
+#~ "їхніх комбінацій категорій."
+
+#~ msgid ""
+#~ msgstr "<причини не подано>"
+
+#~ msgid "Programme unavailable (\"%s\")"
+#~ msgstr "Програма недоступна (\"%s\")"
+
+#~ msgid "Publisher protocol to use"
+#~ msgstr "Протокол оприлюднення"
+
+#~ msgid ""
+#~ "The transport protocol to use when publishing playlists over the network."
+#~ msgstr "Протокол переміщення при оприлюдненні у мережі."
+
+#~ msgid "Format for network service name"
+#~ msgstr "Формат для назви мережевої служби"
+
+#~ msgid ""
+#~ "A format string used to build the network service name used when "
+#~ "publishing playlists over the network. The following format placeholders "
+#~ "can be used: • %a: the program name as returned by g_get_application_name"
+#~ "() • %h: the machine's host name in title case • %u: the user's login "
+#~ "name in title case • %U: the user's real name • %%: the percent sign"
+#~ msgstr ""
+#~ "Формати рядка для побудови назви мережевої служби, яка використовується "
+#~ "для оприлюднення списку композицій за мережею. Можна використовувати такі "
+#~ "формати: • %a: назва програми, яка повертається через "
+#~ "g_get_application_name() • %h: назва вузла машини з великої букви • %u: "
+#~ "користувач з великої букви • %U: справжнє ім'я користувача • %%: відсотки"
+
+#~ msgid "Neighbors"
+#~ msgstr "Сусіди"
+
+#~ msgid "Publish Playlist"
+#~ msgstr "Опублікувати список відтворення"
+
+#~ msgid "Share the current playlist via HTTP"
+#~ msgstr ""
+#~ "Забезпечує загальний доступ до поточного списку відтворення через HTTP"
+
+#~ msgid "Service _Name:"
+#~ msgstr "Назва _сервісу:"
+
+#~ msgid ""
+#~ "The name used for announcing the playlist service on the network.\n"
+#~ "All occurrences of the string %u will be replaced by your name,\n"
+#~ "and %h will be replaced by your computer's host name."
+#~ msgstr ""
+#~ "Назва, що використовується для анонсу списку композицій у мережі.\n"
+#~ "Усі рядки %u буде замінено на ваше ім'я,\n"
+#~ "а %h на назву вузла комп'ютера."
+
+#~ msgid "Use _encrypted transport protocol (HTTPS)"
+#~ msgstr "Використовувати _шифрований транспортний протокол (HTTPS)"
+
+#~ msgid "_Name:"
+#~ msgstr "_Назва:"
+
+#~ msgid "Save in _folder:"
+#~ msgstr "Зберегти у _теці:"
+
+#~ msgid "Select a folder"
+#~ msgstr "Вибрати теку"
+
+#~ msgid "There was an error saving the screenshot."
+#~ msgstr "Виникла помилка під час збереження знімку."
+
+#~ msgid "Save Screenshot"
+#~ msgstr "Зберегти знімок"
 
 #~ msgid "Bemused"
 #~ msgstr "Bemused"
@@ -2727,9 +2765,6 @@
 #~ msgid "Search Results"
 #~ msgstr "Результати пошуку"
 
-#~ msgid "Videos"
-#~ msgstr "Відео"
-
 #~ msgid "_Open in Web Browser"
 #~ msgstr "_Відкрити у веб-переглядачі"
 
@@ -3133,9 +3168,6 @@
 #~ msgid "_Download Movie Subtitles..."
 #~ msgstr "_Завантажити субтитри для фільму..."
 
-#~ msgid "Could not load the \"Skip to\" dialog interface."
-#~ msgstr "Не вдалось завантажити інтерфейс діалогу «Пропустити до».."
-
 #~ msgid "Could not get name and thumbnail for %s: %s"
 #~ msgstr "Не вдалось отримати назву та мініатюру для %s: %s"
 
diff -Nru totem-3.4.3/po/zh_CN.po totem-3.6.2/po/zh_CN.po
--- totem-3.4.3/po/zh_CN.po	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/po/zh_CN.po	2012-10-09 15:42:00.000000000 +0000
@@ -11,33 +11,239 @@
 # arccos ，2009.
 # Lele Long , 2011.
 # Aron Xu , 2009, 2011.
+# tuhaihe <1132321739qq@gmail.com>, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: totem master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=totem&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-03-23 06:16+0000\n"
-"PO-Revision-Date: 2012-03-23 16:34+0800\n"
-"Last-Translator: tuhaihe \n"
+"POT-Creation-Date: 2012-09-10 14:11+0000\n"
+"PO-Revision-Date: 2012-08-28 12:53+0800\n"
+"Last-Translator: Wylmer Wang \n"
 "Language-Team: Chinese (simplified) \n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ../browser-plugin/totem-plugin-viewer.c:352 ../src/totem-object.c:1180
+#: ../src/totem-object.c:1650 ../src/totem-statusbar.c:115
+msgid "Stopped"
+msgstr "已停止"
+
+#: ../browser-plugin/totem-plugin-viewer.c:364 ../src/totem-object.c:1173
+msgid "Paused"
+msgstr "已暂停"
+
+#: ../browser-plugin/totem-plugin-viewer.c:368 ../src/totem-object.c:1166
+msgid "Playing"
+msgstr "播放中"
+
+#: ../browser-plugin/totem-plugin-viewer.c:386
+#: ../src/plugins/screensaver/totem-screensaver.c:97
+msgid "Playing a movie"
+msgstr "播放电影"
+
+#: ../browser-plugin/totem-plugin-viewer.c:443
+msgid "No URI to play"
+msgstr "无可播放的 URI"
+
+#: ../browser-plugin/totem-plugin-viewer.c:676
+#: ../browser-plugin/totem-plugin-viewer.c:1700
+msgid "Totem Movie Player"
+msgstr "Totem 电影播放器"
+
+#. translators: this is:
+#. * Open With ApplicationName
+#. * as in nautilus' right-click menu
+#: ../browser-plugin/totem-plugin-viewer.c:1120
+#, c-format
+msgid "_Open with \"%s\""
+msgstr "用“%s”打开(_O)"
+
+#: ../browser-plugin/totem-plugin-viewer.c:1341 ../src/totem-object.c:2475
+msgid "An error occurred"
+msgstr "发生了一个错误"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2033
+msgid "No playlist or playlist empty"
+msgstr "无播放列表或播放列表为空"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2128
+msgid "Movie browser plugin"
+msgstr "Totem 浏览器插件"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144 ../src/totem.c:241
+msgid "Could not initialize the thread-safe libraries."
+msgstr "无法初始化线程安全库。"
+
+#: ../browser-plugin/totem-plugin-viewer.c:2144
+msgid "Verify your system installation. The Totem plugin will now exit."
+msgstr "请检查您的系统安装。Totem 插件现将退出。"
+
 #: ../data/fullscreen.ui.h:1
 msgid "Leave Fullscreen"
 msgstr "退出全屏"
 
-#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:144
+#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:81
 msgid "Time:"
 msgstr "时间："
 
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
+msgid "Allow the screensaver to activate when playing audio"
+msgstr "播放音频时允许启动屏保"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
+msgid ""
+"Allow the screensaver to activate when playing audio. Disable if you have "
+"monitor-powered speakers."
+msgstr ""
+"允许在只播放音频时启动屏保。如果您使用依靠显示器供电的喇叭，请禁用此项。"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
+msgid "Show visual effects when no video is displayed"
+msgstr "不显示视频时显示视觉效果"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
+msgid "Show visual effects when playing an audio only file."
+msgstr "播放纯音频文件时显示视觉效果。"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
+msgid "Name of the visual effects plugin"
+msgstr "视觉效果插件名称"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
+msgid "The brightness of the video"
+msgstr "视频亮度"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
+msgid "The contrast of the video"
+msgstr "视频对比度"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
+msgid "The hue of the video"
+msgstr "视频色调"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
+msgid "The saturation of the video"
+msgstr "视频饱和度"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
+msgid "Resize the canvas automatically on file load"
+msgstr "文件加载时自动更改画布大小"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
+msgid "Repeat mode"
+msgstr "重复模式"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
+msgid "Shuffle mode"
+msgstr "乱序模式"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
+msgid "Whether to disable deinterlacing for interlaced movies"
+msgstr "是否为隔行扫描的电影禁用逐行扫描"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
+msgid "Whether to enable debug for the playback engine"
+msgstr "是否启用回放引擎的调试功能"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
+msgid "Type of audio output to use"
+msgstr "使用的音频输出类型"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
+msgid "Visualization quality setting"
+msgstr "视觉效果质量设定"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
+msgid "Quality setting for the audio visualization."
+msgstr "音频可视化效果的质量设置。"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
+msgid "Network buffering threshold"
+msgstr "网络缓冲区阀值"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
+msgid ""
+"Amount of data to buffer for network streams before starting to display the "
+"stream (in seconds)."
+msgstr "网络流媒体开始显示之前要缓存的数据量(以秒计)。"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
+msgid "Subtitle font"
+msgstr "字幕字体"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
+msgid "Pango font description for subtitle rendering."
+msgstr "字幕渲染所用的 Pango 字体描述。"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
+msgid "Subtitle encoding"
+msgstr "字幕编码"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
+msgid "Encoding character set for subtitle."
+msgstr "字幕的编码字符集。"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
+msgid "Default location for the \"Open...\" dialogs"
+msgstr "“打开...”对话框的默认位置"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
+msgid ""
+"Default location for the \"Open...\" dialogs. Default is the current "
+"directory."
+msgstr "“打开...”对话框的默认位置，默认为当前目录。"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
+msgid "Default location for the \"Take Screenshot\" dialogs"
+msgstr "“抓取屏幕截图” 对话框的默认位置"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
+msgid ""
+"Default location for the \"Take Screenshot\" dialogs. Default is the "
+"Pictures directory."
+msgstr "“抓取屏幕截图”对话框的默认位置，默认为图片目录。"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
+msgid "Whether to disable the plugins in the user's home directory"
+msgstr "是否禁用用户主目录中的插件"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
+msgid "Whether to disable the keyboard shortcuts"
+msgstr "是否禁用键盘快捷键"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
+msgid "Whether to autoload text subtitle files when a movie is loaded"
+msgstr "在载入电影时是否自动加载字幕文件"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
+msgid "Whether to autoload external chapter files when a movie is loaded"
+msgstr "在加载电影时是否自动加载外部章节文件"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
+msgid ""
+"Whether to remember the position of played audio/video files when pausing or "
+"closing them"
+msgstr "是否在暂停或关闭音频/视频文件时记住播放的位置"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
+msgid "Active plugins list"
+msgstr "活动插件列表"
+
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+msgid ""
+"A list of the names of the plugins which are currently active (loaded and "
+"running)."
+msgstr "当前使用中的(已加载和运行中的)插件名称列表。"
+
+# 统一翻译
 #: ../data/playlist.ui.h:1
 msgid "_Remove"
-msgstr "删除(_R)"
+msgstr "移除(_R)"
 
 #: ../data/playlist.ui.h:2
 msgid "Remove file from playlist"
@@ -51,11 +257,11 @@
 msgid "Copy the location to the clipboard"
 msgstr "将位置复制到剪贴板"
 
-#: ../data/playlist.ui.h:5 ../data/totem.ui.h:78
+#: ../data/playlist.ui.h:5 ../data/totem.ui.h:71
 msgid "_Select Text Subtitles..."
 msgstr "选择文本字幕(_S)..."
 
-#: ../data/playlist.ui.h:6 ../data/totem.ui.h:79
+#: ../data/playlist.ui.h:6 ../data/totem.ui.h:72
 msgid "Select a file to use for text subtitles"
 msgstr "选择用于字幕的文件"
 
@@ -79,897 +285,776 @@
 msgid "Move Down"
 msgstr "下移"
 
-#: ../data/properties.ui.h:1 ../data/totem.ui.h:122
-msgid "General"
-msgstr "常规"
-
-#: ../data/properties.ui.h:2
-msgid "Title:"
-msgstr "标题："
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:2
+msgid "Normal"
+msgstr "正常"
 
-#: ../data/properties.ui.h:3
-msgid "Artist:"
-msgstr "艺术家："
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:4
+msgid "Large"
+msgstr "大"
 
-#: ../data/properties.ui.h:4
-msgid "Duration:"
-msgstr "持续时间："
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:6
+msgid "Extra Large"
+msgstr "甚大"
 
-#: ../data/properties.ui.h:5
-msgid "Year:"
-msgstr "年份："
+#: ../data/preferences.ui.h:7 ../src/backend/bacon-video-widget.c:5522
+#: ../src/totem-properties-view.c:232
+msgid "Stereo"
+msgstr "立体声"
 
-#: ../data/properties.ui.h:6
-msgid "Album:"
-msgstr "唱片："
+#: ../data/preferences.ui.h:8
+msgid "4-channel"
+msgstr "4 声道"
 
-#: ../data/properties.ui.h:7
-msgid "Comment:"
-msgstr "注释："
+#: ../data/preferences.ui.h:9
+msgid "4.1-channel"
+msgstr "4.1 声道"
 
-#: ../data/properties.ui.h:8
-msgid "Container:"
-msgstr "容器："
+#: ../data/preferences.ui.h:10
+msgid "5.0-channel"
+msgstr "5.0 声道"
 
-#: ../data/properties.ui.h:9 ../data/totem.ui.h:128
-#: ../src/totem-properties-view.c:270
-msgid "Video"
-msgstr "视频"
+#: ../data/preferences.ui.h:11
+msgid "5.1-channel"
+msgstr "5.1 声道"
 
-#: ../data/properties.ui.h:10
-msgid "Dimensions:"
-msgstr "尺寸："
+#: ../data/preferences.ui.h:12
+msgid "AC3 Passthrough"
+msgstr "AC3 输出"
 
-#: ../data/properties.ui.h:11
-msgid "Codec:"
-msgstr "编解码器："
+#: ../data/preferences.ui.h:13
+msgid "Totem Preferences"
+msgstr "Totem 首选项"
 
-#: ../data/properties.ui.h:12
-msgid "Framerate:"
-msgstr "帧率："
+#: ../data/preferences.ui.h:14
+msgid "Playback"
+msgstr "回放"
 
-#: ../data/properties.ui.h:13
-msgid "Bitrate:"
-msgstr "比特率："
+#: ../data/preferences.ui.h:15
+msgid "Start playing files from last position"
+msgstr "从上次结束位置开始播放文件"
 
-#: ../data/properties.ui.h:14 ../data/totem.ui.h:142
-#: ../src/totem-properties-view.c:268
-msgid "Audio"
-msgstr "音频"
+#: ../data/preferences.ui.h:16
+msgid "Text Subtitles"
+msgstr "文本字幕"
 
-#: ../data/properties.ui.h:15
-msgid "Sample rate:"
-msgstr "采样率："
+#: ../data/preferences.ui.h:17
+msgid "_Load subtitle files when movie is loaded"
+msgstr "加载视频时自动载入字幕文件(_L)"
+
+#: ../data/preferences.ui.h:18
+msgid "_Font:"
+msgstr "字体(_F)："
+
+#: ../data/preferences.ui.h:19
+msgid "_Encoding:"
+msgstr "编码(_E)："
+
+#: ../data/preferences.ui.h:20
+msgid "External Chapters"
+msgstr "外部章节"
+
+#: ../data/preferences.ui.h:21
+msgid "Load _chapter files when movie is loaded"
+msgstr "加载视频时载入章节文件(_C)"
+
+#: ../data/preferences.ui.h:22 ../data/properties.ui.h:1
+msgid "General"
+msgstr "常规"
+
+#. Tab label in the Preferences dialogue
+#: ../data/preferences.ui.h:24
+msgid "Display"
+msgstr "显示"
+
+#: ../data/preferences.ui.h:25
+msgid "_Resize the window when a new video is loaded"
+msgstr "加载新视频时自动缩放窗口(_R)"
+
+#: ../data/preferences.ui.h:26
+msgid "Disable _deinterlacing of interlaced videos"
+msgstr "为隔行扫描的视频禁用逐行扫描(_D)"
+
+#: ../data/preferences.ui.h:27
+msgid "Disable screensaver when playing "
+msgstr "播放时关闭屏幕保护"
+
+#: ../data/preferences.ui.h:28 ../data/properties.ui.h:9
+#: ../src/totem-properties-view.c:275
+msgid "Video"
+msgstr "视频"
+
+#: ../data/preferences.ui.h:29
+msgid "Video or Audio"
+msgstr "视频或音频"
+
+#: ../data/preferences.ui.h:30
+msgid "Visual Effects"
+msgstr "视觉效果"
+
+#: ../data/preferences.ui.h:31
+msgid "Show _visual effects when an audio file is played"
+msgstr "播放音频文件时显示视觉效果(_V)"
+
+#: ../data/preferences.ui.h:32
+msgid "_Type of visualization:"
+msgstr "可视化类型(_T)："
+
+#: ../data/preferences.ui.h:33
+msgid "Visualization _size:"
+msgstr "视觉效果大小(_S)："
+
+#: ../data/preferences.ui.h:34
+msgid "Color Balance"
+msgstr "颜色平衡"
+
+#: ../data/preferences.ui.h:35
+msgid "_Brightness:"
+msgstr "亮度(_B)："
+
+#: ../data/preferences.ui.h:36
+msgid "Co_ntrast:"
+msgstr "对比度(_N)："
+
+#: ../data/preferences.ui.h:37
+msgid "Sat_uration:"
+msgstr "饱和度(_U)："
+
+#: ../data/preferences.ui.h:38
+msgid "_Hue:"
+msgstr "色调(_H)："
+
+#: ../data/preferences.ui.h:39
+msgid "Reset to _Defaults"
+msgstr "重设为默认值(_D)"
+
+#: ../data/preferences.ui.h:40
+msgid "Audio Output"
+msgstr "音频输出"
+
+#: ../data/preferences.ui.h:41
+msgid "_Audio output type:"
+msgstr "音频输出类型(_A)："
+
+#: ../data/preferences.ui.h:42 ../data/properties.ui.h:14
+#: ../src/totem-properties-view.c:273
+msgid "Audio"
+msgstr "音频"
+
+#: ../data/properties.ui.h:2
+msgid "Title:"
+msgstr "标题："
+
+#: ../data/properties.ui.h:3
+msgid "Artist:"
+msgstr "艺术家："
+
+#: ../data/properties.ui.h:4
+msgid "Duration:"
+msgstr "持续时间："
+
+#: ../data/properties.ui.h:5
+msgid "Year:"
+msgstr "年份："
+
+#: ../data/properties.ui.h:6
+msgid "Album:"
+msgstr "唱片："
+
+#: ../data/properties.ui.h:7
+msgid "Comment:"
+msgstr "注释："
+
+#: ../data/properties.ui.h:8
+msgid "Container:"
+msgstr "容器："
+
+#: ../data/properties.ui.h:10
+msgid "Dimensions:"
+msgstr "尺寸："
+
+#: ../data/properties.ui.h:11
+msgid "Codec:"
+msgstr "编解码器："
+
+#: ../data/properties.ui.h:12
+msgid "Framerate:"
+msgstr "帧率："
+
+#: ../data/properties.ui.h:13
+msgid "Bitrate:"
+msgstr "比特率："
+
+#: ../data/properties.ui.h:15
+msgid "Sample rate:"
+msgstr "采样率："
 
 #: ../data/properties.ui.h:16
 msgid "Channels:"
 msgstr "声道："
 
-#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
-msgid "_Add to Playlist"
-msgstr "添加到播放列表(_A)"
-
-#: ../data/video-list.ui.h:2
-msgid "Add the video to the playlist"
-msgstr "将此视频添加到播放列表"
-
 #. Title
-#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:143
-#: ../src/totem-object.c:1667
-msgid "Movie Player"
-msgstr "电影播放机"
+#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:80 ../src/totem.c:240
+#: ../src/totem.c:249 ../src/totem-menu.c:789 ../src/totem-object.c:1658
+msgid "Videos"
+msgstr "视频"
 
 #: ../data/totem.desktop.in.in.in.h:2
-msgid "Play movies and songs"
-msgstr "播放电影和歌曲"
+msgid "Play movies"
+msgstr "播放电影"
+
+#: ../data/totem.desktop.in.in.in.h:3
+msgid "Video;Movie;Film;Clip;Series;Player;DVD;TV;Disc;"
+msgstr ""
+"Video;Movie;Film;Clip;Series;Player;DVD;TV;Disc;视频;电影;影片;剪辑;系列节目;"
+"播放器;DVD;电视;唱片;"
 
 #: ../data/totem.ui.h:1
-msgid "_Movie"
-msgstr "电影(_M)"
+msgid "_Open"
+msgstr "打开(_O)"
 
 #: ../data/totem.ui.h:2
-msgid "_Open..."
-msgstr "打开(_O)..."
+msgid "Open _Location"
+msgstr "打开位置(_L)"
 
 #: ../data/totem.ui.h:3
-msgid "Open a file"
-msgstr "打开文件"
+msgid "_Fullscreen"
+msgstr "全屏(_F)"
 
 #: ../data/totem.ui.h:4
-msgid "Open _Location..."
-msgstr "打开位置(_L)..."
+msgid "Prefere_nces"
+msgstr "首选项(_N)"
 
 #: ../data/totem.ui.h:5
-msgid "Open a non-local file"
-msgstr "打开非本地文件"
+msgid "Shuff_le"
+msgstr "乱序(_L)"
 
 #: ../data/totem.ui.h:6
+msgid "_Repeat"
+msgstr "重复(_R)"
+
+#: ../data/totem.ui.h:7
+msgid "_Quit"
+msgstr "退出(_Q)"
+
+#: ../data/totem.ui.h:8
+msgid "_Movie"
+msgstr "电影(_M)"
+
+#: ../data/totem.ui.h:9
 msgid "_Eject"
 msgstr "弹出(_E)"
 
-#: ../data/totem.ui.h:7
+#: ../data/totem.ui.h:10
 msgid "Eject the current disc"
 msgstr "弹出当前光盘"
 
-#: ../data/totem.ui.h:8
+#: ../data/totem.ui.h:11
 msgid "_Properties"
 msgstr "属性(_P)"
 
-#: ../data/totem.ui.h:9
+#: ../data/totem.ui.h:12
 msgid "View the properties of the current stream"
 msgstr "查看当前文件流属性"
 
-#: ../data/totem.ui.h:10
+#: ../data/totem.ui.h:13
 msgid "Play / P_ause"
 msgstr "播放/暂停(_A)"
 
-#: ../data/totem.ui.h:11
+#: ../data/totem.ui.h:14
 msgid "Play or pause the movie"
 msgstr "播放或暂停电影"
 
-#: ../data/totem.ui.h:12
-msgid "_Quit"
-msgstr "退出(_Q)"
-
-#: ../data/totem.ui.h:13
-msgid "Quit the program"
-msgstr "退出程序"
-
-#: ../data/totem.ui.h:14
+#: ../data/totem.ui.h:15
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: ../data/totem.ui.h:15
+#: ../data/totem.ui.h:16
 msgid "_Clear Playlist"
-msgstr "清除播放列表(_C)"
+msgstr "清空播放列表(_C)"
 
-#: ../data/totem.ui.h:16
+# 统一下翻译
+#: ../data/totem.ui.h:17
 msgid "Clear the playlist"
 msgstr "清空播放列表"
 
-#: ../data/totem.ui.h:17
-msgid "Prefere_nces"
-msgstr "首选项(_N)"
-
 #: ../data/totem.ui.h:18
-msgid "Configure the application"
-msgstr "配置程序"
-
-#: ../data/totem.ui.h:19
 msgid "Plugins..."
 msgstr "插件..."
 
-#: ../data/totem.ui.h:20
+#: ../data/totem.ui.h:19
 msgid "Configure plugins to extend the application"
 msgstr "配置插件以扩展此程序功能"
 
-#: ../data/totem.ui.h:21
+#: ../data/totem.ui.h:20
 msgid "_View"
 msgstr "查看(_V)"
 
-#: ../data/totem.ui.h:22
-msgid "_Fullscreen"
-msgstr "全屏(_F)"
-
-#: ../data/totem.ui.h:23
-msgid "Switch to fullscreen"
-msgstr "切换到全屏幕"
-
-#: ../data/totem.ui.h:24
+#: ../data/totem.ui.h:21
 msgid "Fit Window to Movie"
 msgstr "窗口适合影片"
 
-#: ../data/totem.ui.h:25
+#: ../data/totem.ui.h:22
 msgid "_Resize 1:2"
 msgstr "1:2 缩小(_R)"
 
-#: ../data/totem.ui.h:26
+#: ../data/totem.ui.h:23
 msgid "Resize to half the original video size"
 msgstr "缩小到原视频一半大小"
 
-#: ../data/totem.ui.h:27
+#: ../data/totem.ui.h:24
 msgid "Resize _1:1"
 msgstr "原始大小(_1)"
 
-#: ../data/totem.ui.h:28
+#: ../data/totem.ui.h:25
 msgid "Resize to the original video size"
 msgstr "恢复原视频大小"
 
-#: ../data/totem.ui.h:29
+#: ../data/totem.ui.h:26
 msgid "Resize _2:1"
 msgstr "_2:1 放大"
 
-#: ../data/totem.ui.h:30
+#: ../data/totem.ui.h:27
 msgid "Resize to double the original video size"
 msgstr "放大到原视频两倍大小"
 
-#: ../data/totem.ui.h:31
+#: ../data/totem.ui.h:28
 msgid "_Aspect Ratio"
 msgstr "纵横比(_A)"
 
-#: ../data/totem.ui.h:32
+#: ../data/totem.ui.h:29
 msgid "Switch An_gles"
 msgstr "切换角度(_G)"
 
-#: ../data/totem.ui.h:33
+#: ../data/totem.ui.h:30
 msgid "Switch camera angles"
 msgstr "切换镜头角度"
 
-#: ../data/totem.ui.h:34
+#: ../data/totem.ui.h:31
 msgid "_Go"
 msgstr "转到(_G)"
 
-#: ../data/totem.ui.h:35
+#: ../data/totem.ui.h:32
 msgid "_DVD Menu"
 msgstr "DVD 菜单(_D)"
 
-#: ../data/totem.ui.h:36
+#: ../data/totem.ui.h:33
 msgid "Go to the DVD menu"
 msgstr "转到 DVD 菜单"
 
-#: ../data/totem.ui.h:37
+#: ../data/totem.ui.h:34
 msgid "_Title Menu"
 msgstr "标题菜单(_T)"
 
-#: ../data/totem.ui.h:38
+#: ../data/totem.ui.h:35
 msgid "Go to the title menu"
 msgstr "转到标题菜单"
 
-#: ../data/totem.ui.h:39
+#: ../data/totem.ui.h:36
 msgid "A_udio Menu"
 msgstr "音频菜单(_U)"
 
-#: ../data/totem.ui.h:40
+#: ../data/totem.ui.h:37
 msgid "Go to the audio menu"
 msgstr "转到音频菜单"
 
-#: ../data/totem.ui.h:41
+#: ../data/totem.ui.h:38
 msgid "_Angle Menu"
 msgstr "角度菜单(_A)"
 
-#: ../data/totem.ui.h:42
+#: ../data/totem.ui.h:39
 msgid "Go to the angle menu"
 msgstr "转到角度菜单"
 
-#: ../data/totem.ui.h:43
+#: ../data/totem.ui.h:40
 msgid "_Chapter Menu"
 msgstr "章节菜单(_C)"
 
-#: ../data/totem.ui.h:44
+#: ../data/totem.ui.h:41
 msgid "Go to the chapter menu"
 msgstr "转到章节菜单"
 
-#: ../data/totem.ui.h:45
+#: ../data/totem.ui.h:42
 msgid "_Next Chapter/Movie"
 msgstr "下一章/电影(_N)"
 
-#: ../data/totem.ui.h:46
+#: ../data/totem.ui.h:43
 msgid "Next chapter or movie"
-msgstr "下一章或下一部电影"
+msgstr "下一章节/电影"
 
-#: ../data/totem.ui.h:47
+#: ../data/totem.ui.h:44
 msgid "_Previous Chapter/Movie"
 msgstr "上一章/电影(_P)"
 
-#: ../data/totem.ui.h:48
+#: ../data/totem.ui.h:45
 msgid "Previous chapter or movie"
-msgstr "上一章节或上一部电影"
+msgstr "上一章节/电影"
 
-#: ../data/totem.ui.h:49
+#: ../data/totem.ui.h:46
 msgid "_Sound"
 msgstr "声音(_S)"
 
-#: ../data/totem.ui.h:50
+#: ../data/totem.ui.h:47
 msgid "Volume _Up"
 msgstr "增大音量(_U)"
 
-#: ../data/totem.ui.h:51
+#: ../data/totem.ui.h:48
 msgid "Increase volume"
 msgstr "升高音量"
 
-#: ../data/totem.ui.h:52
+#: ../data/totem.ui.h:49
 msgid "Volume _Down"
 msgstr "减小音量(_D)"
 
-#: ../data/totem.ui.h:53
+#: ../data/totem.ui.h:50
 msgid "Decrease volume"
 msgstr "降低音量"
 
-#: ../data/totem.ui.h:54
+#: ../data/totem.ui.h:51
 msgid "_Help"
 msgstr "帮助(_H)"
 
-#: ../data/totem.ui.h:55
+#: ../data/totem.ui.h:52
 msgid "_Contents"
-msgstr "目录(_C)"
+msgstr "内容(_C)"
 
-#: ../data/totem.ui.h:56
+#: ../data/totem.ui.h:53
 msgid "Help contents"
-msgstr "帮助目录"
+msgstr "帮助内容"
 
-#: ../data/totem.ui.h:57
+#: ../data/totem.ui.h:54
 msgid "_About"
 msgstr "关于(_A)"
 
-#: ../data/totem.ui.h:58
+#: ../data/totem.ui.h:55
 msgid "About this application"
 msgstr "关于此程序"
 
-#: ../data/totem.ui.h:59
-msgid "_Repeat Mode"
-msgstr "重复模式(_R)"
-
-#: ../data/totem.ui.h:60
-msgid "Set the repeat mode"
-msgstr "设置重复模式"
-
-#: ../data/totem.ui.h:61
-msgid "Shuff_le Mode"
-msgstr "乱序模式(_L)"
-
-#: ../data/totem.ui.h:62
-msgid "Set the shuffle mode"
-msgstr "设置乱序模式"
-
-#: ../data/totem.ui.h:63
+#: ../data/totem.ui.h:56
 msgid "Show _Controls"
 msgstr "显示控制(_C)"
 
-#: ../data/totem.ui.h:64
+#: ../data/totem.ui.h:57
 msgid "Show controls"
 msgstr "显示控制"
 
-#: ../data/totem.ui.h:65
+#: ../data/totem.ui.h:58
 msgid "S_idebar"
 msgstr "侧边栏(_I)"
 
-#: ../data/totem.ui.h:66
+#: ../data/totem.ui.h:59
 msgid "Show or hide the sidebar"
 msgstr "显示或隐藏侧边栏"
 
-#: ../data/totem.ui.h:67
+#: ../data/totem.ui.h:60
 msgctxt "Aspect ratio"
 msgid "Auto"
 msgstr "自动"
 
-#: ../data/totem.ui.h:68
+#: ../data/totem.ui.h:61
 msgid "Sets automatic aspect ratio"
 msgstr "设为自动纵横比"
 
-#: ../data/totem.ui.h:69
+#: ../data/totem.ui.h:62
 msgid "Square"
 msgstr "方形"
 
-#: ../data/totem.ui.h:70
+#: ../data/totem.ui.h:63
 msgid "Sets square aspect ratio"
 msgstr "设为方形纵横比"
 
-#: ../data/totem.ui.h:71
+#: ../data/totem.ui.h:64
 msgid "4:3 (TV)"
 msgstr "4:3 (电视)"
 
-#: ../data/totem.ui.h:72
+#: ../data/totem.ui.h:65
 msgid "Sets 4:3 (TV) aspect ratio"
 msgstr "设为 4:3 (TV) 纵横比"
 
-#: ../data/totem.ui.h:73
+#: ../data/totem.ui.h:66
 msgid "16:9 (Widescreen)"
 msgstr "16:9 (宽屏幕)"
 
-#: ../data/totem.ui.h:74
+#: ../data/totem.ui.h:67
 msgid "Sets 16:9 (widescreen) aspect ratio"
 msgstr "设为 16:9 (宽屏幕) 纵横比"
 
-#: ../data/totem.ui.h:75
+#: ../data/totem.ui.h:68
 msgid "2.11:1 (DVB)"
 msgstr "2.11:1 (DVB)"
 
-#: ../data/totem.ui.h:76
+#: ../data/totem.ui.h:69
 msgid "Sets 2.11:1 (DVB) aspect ratio"
 msgstr "设为 2.11:1 (DVB) 纵横比"
 
-#: ../data/totem.ui.h:77
+#: ../data/totem.ui.h:70
 msgid "S_ubtitles"
 msgstr "字幕(_U)"
 
-#: ../data/totem.ui.h:80
+#: ../data/totem.ui.h:73
 msgid "_Languages"
 msgstr "语言(_L)"
 
-#: ../data/totem.ui.h:81
+#: ../data/totem.ui.h:74
 msgid "Zoom In"
 msgstr "放大"
 
-#: ../data/totem.ui.h:82
+#: ../data/totem.ui.h:75
 msgid "Zoom in"
 msgstr "放大"
 
-#: ../data/totem.ui.h:83
+#: ../data/totem.ui.h:76
 msgid "Skip _Forward"
 msgstr "快进(_F)"
 
-#: ../data/totem.ui.h:84
+#: ../data/totem.ui.h:77
 msgid "Skip forward"
 msgstr "快进"
 
-#: ../data/totem.ui.h:85
+#: ../data/totem.ui.h:78
 msgid "Skip _Backwards"
 msgstr "快退(_B)"
 
-#: ../data/totem.ui.h:86
+#: ../data/totem.ui.h:79
 msgid "Skip backwards"
 msgstr "快退"
 
-#: ../data/totem.ui.h:87
-msgid "14.4 Kbps Modem"
-msgstr "14.4 Kbps 调制解调器"
-
-#: ../data/totem.ui.h:88
-msgid "19.2 Kbps Modem"
-msgstr "19.2 Kbps 调制解调器"
-
-#: ../data/totem.ui.h:89
-msgid "28.8 Kbps Modem"
-msgstr "28.8 Kbps 调制解调器"
-
-#: ../data/totem.ui.h:90
-msgid "33.6 Kbps Modem"
-msgstr "33.6 Kbps 调制解调器"
-
-#: ../data/totem.ui.h:91
-msgid "34.4 Kbps Modem"
-msgstr "34.4 Kbps 调制解调器"
-
-#: ../data/totem.ui.h:92
-msgid "56 Kbps Modem/ISDN"
-msgstr "56 Kbps 调制解调器/ISDN"
-
-#: ../data/totem.ui.h:93
-msgid "112 Kbps Dual ISDN/DSL"
-msgstr "112 Kbps 双 ISDN/DSL"
-
-#: ../data/totem.ui.h:94
-msgid "256 Kbps DSL/Cable"
-msgstr "256 Kbps DSL/有线"
-
-#: ../data/totem.ui.h:95
-msgid "384 Kbps DSL/Cable"
-msgstr "384 Kbps DSL/有线"
-
-#: ../data/totem.ui.h:96
-msgid "512 Kbps DSL/Cable"
-msgstr "512 Kbps DSL/有线"
-
-#: ../data/totem.ui.h:97
-msgid "1.5 Mbps T1/Intranet/LAN"
-msgstr "1.5 Mbps T1/Intranet/LAN"
-
-#: ../data/totem.ui.h:98
-msgid "Intranet/LAN"
-msgstr "Intranet/LAN"
+#: ../data/totem.ui.h:82
+msgid "Time seek bar"
+msgstr "时间搜索条"
 
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:100
-msgid "Normal"
-msgstr "正常"
+#: ../data/uri.ui.h:1
+msgid "Enter the _address of the file you would like to open:"
+msgstr "输入您想要打开的文件的地址(_A)："
 
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:102
-msgid "Large"
-msgstr "大"
+#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
+msgid "_Add to Playlist"
+msgstr "添加到播放列表(_A)"
 
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:104
-msgid "Extra Large"
-msgstr "甚大"
+#: ../data/video-list.ui.h:2
+msgid "Add the video to the playlist"
+msgstr "将此视频添加到播放列表"
 
-#: ../data/totem.ui.h:105 ../src/totem-properties-view.c:228
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5593
-msgid "Stereo"
-msgstr "立体声"
+#: ../src/backend/bacon-video-widget.c:1643
+msgid "Password requested for RTSP server"
+msgstr "RTSP 服务器需要密码"
 
-#: ../data/totem.ui.h:106
-msgid "4-channel"
-msgstr "4 声道"
+#: ../src/backend/bacon-video-widget.c:2944
+#, c-format
+msgid "Audio Track #%d"
+msgstr "音轨 #%d"
 
-#: ../data/totem.ui.h:107
-msgid "4.1-channel"
-msgstr "4.1 声道："
+#: ../src/backend/bacon-video-widget.c:2948
+#, c-format
+msgid "Subtitle #%d"
+msgstr "字幕 #%d"
 
-#: ../data/totem.ui.h:108
-msgid "5.0-channel"
-msgstr "5.0 声道"
+#: ../src/backend/bacon-video-widget.c:3345
+msgid "The server you are trying to connect to is not known."
+msgstr "您试图连接的服务器未知。"
+
+#: ../src/backend/bacon-video-widget.c:3348
+msgid "The connection to this server was refused."
+msgstr "到此服务器的连接被拒绝。"
+
+#: ../src/backend/bacon-video-widget.c:3351
+msgid "The specified movie could not be found."
+msgstr "找不到指定电影。"
+
+#: ../src/backend/bacon-video-widget.c:3358
+msgid "The server refused access to this file or stream."
+msgstr "此服务器拒绝访问此文件或流。"
+
+#: ../src/backend/bacon-video-widget.c:3364
+msgid "Authentication is required to access this file or stream."
+msgstr "读取此文件或流需要权限认证。"
+
+#: ../src/backend/bacon-video-widget.c:3371
+msgid "You are not allowed to open this file."
+msgstr "您无权打开此文件。"
+
+#: ../src/backend/bacon-video-widget.c:3376
+msgid "This location is not a valid one."
+msgstr "此地址无效。"
+
+#: ../src/backend/bacon-video-widget.c:3384
+msgid "The movie could not be read."
+msgstr "无法读取电影。"
 
-#: ../data/totem.ui.h:109
-msgid "5.1-channel"
-msgstr "5.1 声道"
+#. should be exactly one missing thing (source or converter)
+#: ../src/backend/bacon-video-widget.c:3407
+#: ../src/backend/bacon-video-widget.c:3415
+#, c-format
+msgid "The playback of this movie requires a %s plugin which is not installed."
+msgid_plural ""
+"The playback of this movie requires the following decoders which are not "
+"installed:\n"
+"\n"
+"%s"
+msgstr[0] "回放此电影需要 %s 插件，但尚未安装。"
 
-#: ../data/totem.ui.h:110
-msgid "AC3 Passthrough"
-msgstr "AC3 输出"
+#: ../src/backend/bacon-video-widget.c:3426
+msgid ""
+"An audio or video stream is not handled due to missing codecs. You might "
+"need to install additional plugins to be able to play some types of movies"
+msgstr ""
+"因缺少编解码器无法处理音频/视频流。您可能需要安装额外的插件才能播放某些类型的"
+"电影"
 
-#: ../data/totem.ui.h:111
-msgid "Totem Preferences"
-msgstr "Totem 首选项"
+#: ../src/backend/bacon-video-widget.c:3436
+msgid ""
+"This file cannot be played over the network. Try downloading it locally "
+"first."
+msgstr "该文件无法通过网络播放。请先尝试先将它下载到本地。"
 
-#: ../data/totem.ui.h:112
-msgid "Playback"
-msgstr "回放"
+#: ../src/backend/bacon-video-widget.c:5518 ../src/totem-properties-view.c:228
+msgid "Surround"
+msgstr "环绕声"
 
-#: ../data/totem.ui.h:113
-msgid "Start playing files from last position"
-msgstr "从上次结束位置开始播放文件"
+#: ../src/backend/bacon-video-widget.c:5520 ../src/totem-properties-view.c:230
+msgid "Mono"
+msgstr "单声道"
 
-#: ../data/totem.ui.h:114
-msgid "Networking"
-msgstr "网络"
-
-#: ../data/totem.ui.h:115
-msgid "Connection _speed:"
-msgstr "连接速度(_S)："
+#: ../src/backend/bacon-video-widget.c:5805
+msgid "Media contains no supported video streams."
+msgstr "媒体不包含支持的视频流。"
 
-#: ../data/totem.ui.h:116
-msgid "Text Subtitles"
-msgstr "文本字幕"
+#: ../src/backend/bacon-video-widget.c:5987
+msgid ""
+"Some necessary plug-ins are missing. Make sure that the program is correctly "
+"installed."
+msgstr "缺少必要的插件。请确保程序已正确安装。"
 
-#: ../data/totem.ui.h:117
-msgid "_Load subtitle files when movie is loaded"
-msgstr "加载视频时自动载入字幕文件(_L)"
+#: ../src/eggdesktopfile.c:165
+#, c-format
+msgid "File is not a valid .desktop file"
+msgstr "不是一个有效的 .desktop 文件"
 
-#: ../data/totem.ui.h:118
-msgid "_Font:"
-msgstr "字体(_F)："
+#: ../src/eggdesktopfile.c:188
+#, c-format
+msgid "Unrecognized desktop file Version '%s'"
+msgstr "不能识别的桌面文件版本“%s”"
 
-#: ../data/totem.ui.h:119
-msgid "_Encoding:"
-msgstr "编码(_E)："
+#: ../src/eggdesktopfile.c:968
+#, c-format
+msgid "Starting %s"
+msgstr "正在启动 %s"
 
-#: ../data/totem.ui.h:120
-msgid "External Chapters"
-msgstr "外部章节"
+#: ../src/eggdesktopfile.c:1110
+#, c-format
+msgid "Application does not accept documents on command line"
+msgstr "程序在命令行中不接收文档"
 
-#: ../data/totem.ui.h:121
-msgid "Load _chapter files when movie is loaded"
-msgstr "加载视频时载入章节文件(_C)"
+#: ../src/eggdesktopfile.c:1178
+#, c-format
+msgid "Unrecognized launch option: %d"
+msgstr "不认识的启动选项：%d"
 
-#. Tab label in the Preferences dialogue
-#: ../data/totem.ui.h:124
-msgid "Display"
-msgstr "显示"
+#: ../src/eggdesktopfile.c:1383
+#, c-format
+msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
+msgstr "无法传递文档 URIs 到 '类型=链接' 的桌面入口"
 
-#: ../data/totem.ui.h:125
-msgid "_Resize the window when a new video is loaded"
-msgstr "加载新视频时自动缩放窗口(_R)"
+#: ../src/eggdesktopfile.c:1404
+#, c-format
+msgid "Not a launchable item"
+msgstr "不是一个可启动项目"
 
-#: ../data/totem.ui.h:126
-msgid "Disable _deinterlacing of interlaced videos"
-msgstr "为隔行扫描的视频禁用逐行扫描(_D)"
+#: ../src/eggfileformatchooser.c:240
+#, c-format
+msgid "File _Format: %s"
+msgstr "文件格式(_F)：%s"
 
-#: ../data/totem.ui.h:127
-msgid "Disable screensaver when playing "
-msgstr "播放时关闭屏幕保护"
+#: ../src/eggfileformatchooser.c:379
+msgid "All Files"
+msgstr "全部文件"
 
-#: ../data/totem.ui.h:129
-msgid "Video or Audio"
-msgstr "视频或音频"
+#: ../src/eggfileformatchooser.c:380
+msgid "All Supported Files"
+msgstr "所有支持的文件"
 
-#: ../data/totem.ui.h:130
-msgid "Visual Effects"
-msgstr "视觉效果"
+#: ../src/eggfileformatchooser.c:389
+msgid "By Extension"
+msgstr "按照扩展名"
 
-#: ../data/totem.ui.h:131
-msgid "Show _visual effects when an audio file is played"
-msgstr "播放音频文件时显示视觉效果(_V)"
+#: ../src/eggfileformatchooser.c:404
+msgid "File Format"
+msgstr "文件格式"
 
-#: ../data/totem.ui.h:132
-msgid "_Type of visualization:"
-msgstr "可视化类型(_T)："
+#: ../src/eggfileformatchooser.c:422
+msgid "Extension(s)"
+msgstr "扩展名"
 
-#: ../data/totem.ui.h:133
-msgid "Visualization _size:"
-msgstr "视觉效果大小(_S)："
+#. Translators: the parameter is a filename
+#: ../src/eggfileformatchooser.c:657
+#, c-format
+msgid ""
+"The program was not able to find out the file format you want to use for `"
+"%s'. Please make sure to use a known extension for that file or manually "
+"choose a file format from the list below."
+msgstr ""
+"程序无法找到您想应用“%s”选项的文件格式。请确定使用为文件使用已知的格式或手动"
+"在下表中选择一种文件格式。"
 
-#: ../data/totem.ui.h:134
-msgid "Color Balance"
-msgstr "颜色平衡"
+#: ../src/eggfileformatchooser.c:664
+msgid "File format not recognized"
+msgstr "文件格式无法识别"
 
-#: ../data/totem.ui.h:135
-msgid "_Brightness:"
-msgstr "亮度(_B)："
+#: ../src/eggsmclient.c:226
+msgid "Disable connection to session manager"
+msgstr "禁止连接到会话管理器"
 
-#: ../data/totem.ui.h:136
-msgid "Co_ntrast:"
-msgstr "对比度(_N)："
+#: ../src/eggsmclient.c:229
+msgid "Specify file containing saved configuration"
+msgstr "指定包含有已保存配置的文件"
 
-#: ../data/totem.ui.h:137
-msgid "Sat_uration:"
-msgstr "饱和度(_U)："
+#: ../src/eggsmclient.c:229
+msgid "FILE"
+msgstr "文件"
 
-#: ../data/totem.ui.h:138
-msgid "_Hue:"
-msgstr "色调(_H)："
+#: ../src/eggsmclient.c:232
+msgid "Specify session management ID"
+msgstr "指定会话管理 ID"
 
-#: ../data/totem.ui.h:139
-msgid "Reset to _Defaults"
-msgstr "重设为默认值(_D)"
+#: ../src/eggsmclient.c:232
+msgid "ID"
+msgstr "ID"
 
-#: ../data/totem.ui.h:140
-msgid "Audio Output"
-msgstr "音频输出"
+#: ../src/eggsmclient.c:253
+msgid "Session management options:"
+msgstr "会话管理选项："
 
-#: ../data/totem.ui.h:141
-msgid "_Audio output type:"
-msgstr "音频输出类型(_A)："
+#: ../src/eggsmclient.c:254
+msgid "Show session management options"
+msgstr "显示会话管理选项"
 
-#: ../data/totem.ui.h:145
-msgid "Time seek bar"
-msgstr "时间搜索条"
+#. hour:minutes:seconds
+#. Translators: This is a time format, like "9:05:02" for 9
+#. * hours, 5 minutes, and 2 seconds. You may change ":" to
+#. * the separator that your locale uses or use "%Id" instead
+#. * of "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:56
+#: ../src/plugins/skipto/totem-time-entry.c:57
+#, c-format
+msgctxt "long time format"
+msgid "%d:%02d:%02d"
+msgstr "%d:%02d:%02d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
-msgid "Allow the screensaver to activate when playing audio"
-msgstr "播放音频时允许启动屏保"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
-msgid ""
-"Allow the screensaver to activate when playing audio. Disable if you have "
-"monitor-powered speakers."
-msgstr ""
-"允许在只播放音频时启动屏保。如果您使用依靠显示器供电的喇叭，请禁用此项。"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
-msgid "Show visual effects when no video is displayed"
-msgstr "不显示视频时显示视觉效果"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
-msgid "Show visual effects when playing an audio only file."
-msgstr "播放纯音频文件时显示视觉效果。"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
-msgid "Name of the visual effects plugin"
-msgstr "视觉效果插件名称"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
-msgid "The brightness of the video"
-msgstr "视频亮度"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
-msgid "The contrast of the video"
-msgstr "视频对比度"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
-msgid "The hue of the video"
-msgstr "视频色调"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
-msgid "The saturation of the video"
-msgstr "视频饱和度"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
-msgid "Resize the canvas automatically on file load"
-msgstr "文件装入后自动更改画布大小"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
-msgid "Network connection speed"
-msgstr "网络连接速度"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
-msgid ""
-"Approximate network connection speed, used to select quality on media over "
-"the network."
-msgstr "大概的网速，用于选择网络媒体质量。"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
-msgid "Repeat mode"
-msgstr "重复模式"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
-msgid "Shuffle mode"
-msgstr "乱序模式"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
-msgid "Whether to disable deinterlacing for interlaced movies"
-msgstr "是否为隔行扫描的电影禁用逐行扫描"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
-msgid "Whether to enable debug for the playback engine"
-msgstr "是否启用回放引擎的调试功能"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
-msgid "Type of audio output to use"
-msgstr "使用的音频输出类型"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
-msgid "Visualization quality setting"
-msgstr "视觉效果质量设定"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
-msgid "Quality setting for the audio visualization."
-msgstr "音频可视化效果的质量设置。"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
-msgid "Network buffering threshold"
-msgstr "网络缓冲区阀值"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
-msgid ""
-"Amount of data to buffer for network streams before starting to display the "
-"stream (in seconds)."
-msgstr "网络流媒体开始显示之前要缓存的数据量(以秒计)。"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
-msgid "Subtitle font"
-msgstr "字幕字体"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
-msgid "Pango font description for subtitle rendering."
-msgstr "字幕渲染所用的 Pango 字体描述。"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
-msgid "Subtitle encoding"
-msgstr "字幕编码"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
-msgid "Encoding character set for subtitle."
-msgstr "字幕的编码字符集。"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
-msgid "Default location for the \"Open...\" dialogs"
-msgstr "“打开...”对话框的默认位置"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
-msgid ""
-"Default location for the \"Open...\" dialogs. Default is the current "
-"directory."
-msgstr "“打开...”对话框的默认位置，默认为当前目录"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
-msgid "Default location for the \"Take Screenshot\" dialogs"
-msgstr "“抓取屏幕快照” 对话框的默认位置"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
-msgid ""
-"Default location for the \"Take Screenshot\" dialogs. Default is the "
-"Pictures directory."
-msgstr "“抓取屏幕快照”对话框的默认位置，默认为图片目录"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
-msgid "Whether to disable the plugins in the user's home directory"
-msgstr "是否禁用用户主目录中的插件"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
-msgid "Whether to disable the keyboard shortcuts"
-msgstr "是否禁用键盘快捷键"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
-msgid "Whether to autoload text subtitle files when a movie is loaded"
-msgstr "在载入电影时是否自动载入字幕文件"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
-msgid "Whether to autoload external chapter files when a movie is loaded"
-msgstr "在载入电影时是否自动载入外部章节文件"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
-msgid ""
-"Whether to remember the position of played audio/video files when pausing or "
-"closing them"
-msgstr "是否在暂停或关闭音频/视频文件时记住播放的位置"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:35
-msgid "Active plugins list"
-msgstr "活动插件列表"
-
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:36
-msgid ""
-"A list of the names of the plugins which are currently active (loaded and "
-"running)."
-msgstr "当前使用中的(已加载和运行中的)插件名称列表。"
-
-#: ../data/uri.ui.h:1
-msgid "Enter the _address of the file you would like to open:"
-msgstr "输入您想要打开的文件的地址(_A)："
-
-#: ../src/eggdesktopfile.c:165
-#, c-format
-msgid "File is not a valid .desktop file"
-msgstr "不是一个有效的 .desktop 文件"
-
-#: ../src/eggdesktopfile.c:188
-#, c-format
-msgid "Unrecognized desktop file Version '%s'"
-msgstr "不能识别的桌面文件版本 '%s'"
-
-#: ../src/eggdesktopfile.c:968
-#, c-format
-msgid "Starting %s"
-msgstr "正在启动 %s"
-
-#: ../src/eggdesktopfile.c:1110
-#, c-format
-msgid "Application does not accept documents on command line"
-msgstr "程序在命令行中不接收文档"
-
-#: ../src/eggdesktopfile.c:1178
-#, c-format
-msgid "Unrecognized launch option: %d"
-msgstr "不认识的启动选项：%d"
-
-#: ../src/eggdesktopfile.c:1383
-#, c-format
-msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
-msgstr "无法传递文档 URIs 到 '类型=链接' 的桌面入口"
-
-#: ../src/eggdesktopfile.c:1404
-#, c-format
-msgid "Not a launchable item"
-msgstr "不是一个可启动项目"
-
-#: ../src/eggfileformatchooser.c:240
-#, c-format
-msgid "File _Format: %s"
-msgstr "文件格式(_F)：%s"
-
-#: ../src/eggfileformatchooser.c:379
-msgid "All Files"
-msgstr "全部文件"
-
-#: ../src/eggfileformatchooser.c:380
-msgid "All Supported Files"
-msgstr "支持的文件"
-
-#: ../src/eggfileformatchooser.c:389
-msgid "By Extension"
-msgstr "按照扩展名"
-
-#: ../src/eggfileformatchooser.c:404
-msgid "File Format"
-msgstr "文件格式"
-
-#: ../src/eggfileformatchooser.c:422
-msgid "Extension(s)"
-msgstr "扩展名"
-
-#. Translators: the parameter is a filename
-#: ../src/eggfileformatchooser.c:657
-#, c-format
-msgid ""
-"The program was not able to find out the file format you want to use for `%"
-"s'. Please make sure to use a known extension for that file or manually "
-"choose a file format from the list below."
-msgstr ""
-"程序无法找到您想应用\"%s\"选项的文件格式。请确定使用为文件使用已知的格式或手"
-"动在下表中选择一种文件格式"
-
-#: ../src/eggfileformatchooser.c:664
-msgid "File format not recognized"
-msgstr "文件格式无法识别"
-
-#: ../src/eggsmclient.c:226
-msgid "Disable connection to session manager"
-msgstr "禁止连接到会话管理器"
-
-#: ../src/eggsmclient.c:229
-msgid "Specify file containing saved configuration"
-msgstr "指定包含有已保存配置的文件"
-
-#: ../src/eggsmclient.c:229
-msgid "FILE"
-msgstr "文件"
-
-#: ../src/eggsmclient.c:232
-msgid "Specify session management ID"
-msgstr "指定会话管理 ID"
-
-#: ../src/eggsmclient.c:232
-msgid "ID"
-msgstr "ID"
-
-#: ../src/eggsmclient.c:253
-msgid "Session management options:"
-msgstr "会话管理选项："
-
-#: ../src/eggsmclient.c:254
-msgid "Show session management options"
-msgstr "显示会话管理选项"
+#. minutes:seconds
+#. Translators: This is a time format, like "5:02" for 5
+#. * minutes and 2 seconds. You may change ":" to the
+#. * separator that your locale uses or use "%Id" instead of
+#. * "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:65
+#, c-format
+msgctxt "short time format"
+msgid "%d:%02d"
+msgstr "%d:%02d"
 
 #. Title
 #. Artist
@@ -1069,12 +1154,16 @@
 #, c-format
 msgid "%d frame per second"
 msgid_plural "%d frames per second"
-msgstr[0] "每秒 %d 帧"
+msgstr[0] "%d 帧/秒"
 
-#: ../src/totem-audio-preview.c:168
+#: ../src/totem-audio-preview.c:137
 msgid "Audio Preview"
 msgstr "音频预听"
 
+#: ../src/totem.c:241
+msgid "Verify your system installation. Totem will now exit."
+msgstr "请检查您的系统安装。Totem 现将退出。"
+
 #: ../src/totem-cell-renderer-video.c:126
 msgid "Unknown video"
 msgstr "未知视频"
@@ -1087,14 +1176,14 @@
 msgid "Cancel"
 msgstr "取消"
 
-#: ../src/totem-fullscreen.c:616
+#: ../src/totem-fullscreen.c:573
 msgid "No File"
 msgstr "无文件"
 
 #: ../src/totem-interface.c:181 ../src/totem-interface.c:224
 #, c-format
 msgid "Couldn't load the '%s' interface. %s"
-msgstr "无法装入“%s”界面。%s"
+msgstr "无法加载“%s”界面。%s"
 
 #: ../src/totem-interface.c:181
 msgid "The file does not exist."
@@ -1105,7 +1194,7 @@
 msgid "Make sure that Totem is properly installed."
 msgstr "请确保 Totem 已正确安装。"
 
-#: ../src/totem-interface.c:347
+#: ../src/totem-interface.c:357
 msgid ""
 "Totem 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 "
@@ -1115,7 +1204,7 @@
 "Totem 是自由软件；您可以在自由软件基金会发布的 GNU 公共许可证的条目下重新发布"
 "或修改它；许可证应当是第二版或由您选择的更高版本。"
 
-#: ../src/totem-interface.c:351
+#: ../src/totem-interface.c:361
 msgid ""
 "Totem is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -1125,7 +1214,7 @@
 "Totem 发布是希望它有用，但没有任何担保；即使是商业性应用或其它任何目的。参见 "
 "GNU 公共许可证以获得更多细节。"
 
-#: ../src/totem-interface.c:355
+#: ../src/totem-interface.c:365
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Totem; if not, write to the Free Software Foundation, Inc., 59 Temple Place, "
@@ -1135,53 +1224,28 @@
 "软件基金会写信，地址是：59 Temple Place, Suite 330, Boston, MA  02111-1307  "
 "USA"
 
-#: ../src/totem-interface.c:358
+#: ../src/totem-interface.c:368
 msgid ""
 "Totem contains an exception to allow the use of proprietary GStreamer "
 "plugins."
 msgstr "Totem 包含允许使用 GStreamer 私有插件的例外。"
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:190
+#: ../src/totem-menu.c:291
 msgid "None"
 msgstr "无"
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:195
+#: ../src/totem-menu.c:296
 msgctxt "Language"
 msgid "Auto"
 msgstr "自动"
 
-#. Translators:
-#. * This is not a JPEG image, but a disc image, for example,
-#. * an ISO file
-#: ../src/totem-menu.c:765
-#, c-format
-msgid "Play Image '%s'"
-msgstr "播放映像“%s”"
-
-#: ../src/totem-menu.c:768 ../src/totem-menu.c:851
-#, c-format
-msgid "device%d"
-msgstr "设备 %d"
-
-#: ../src/totem-menu.c:848
-#, c-format
-msgid "Play Disc '%s'"
-msgstr "播放碟片“%s”"
-
-#. This lists the back-end type and version, such as
-#. * Movie Player using GStreamer 0.10.1
-#: ../src/totem-menu.c:1189
-#, c-format
-msgid "Movie Player using %s"
-msgstr "使用 %s 的电影播放器"
-
-#: ../src/totem-menu.c:1193
+#: ../src/totem-menu.c:788
 msgid "Copyright © 2002-2009 Bastien Nocera"
 msgstr "版权所有 © 2002-2009 Bastien Nocera"
 
-#: ../src/totem-menu.c:1198
+#: ../src/totem-menu.c:792
 msgid "translator-credits"
 msgstr ""
 "开源软件国际化简体中文组(http://i18n.linux.net.cn)\n"
@@ -1191,147 +1255,80 @@
 "甘露(Gan Lu) , 2008, 2009.\n"
 "Zhang Miao , 2009\n"
 "Aron Xu , 2009\n"
-"arccos "
+"arccos \n"
+"tuhaihe <1132321739qq@gmail.com>, 2012"
 
-#: ../src/totem-menu.c:1202
+#: ../src/totem-menu.c:796
 msgid "Totem Website"
 msgstr "Totem 网站"
 
-#: ../src/totem-menu.c:1236
+#: ../src/totem-menu.c:827
 msgid "Configure Plugins"
 msgstr "配置插件"
 
-#. Translators: %s is the totem version number
-#: ../src/totem-object.c:471
+#: ../src/totem-object.c:162
 #, c-format
-msgid "Totem %s"
-msgstr "Totem %s"
+msgid ""
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"%s\n"
+"请运行“%s --help”查看完整的命令行选项列表。\n"
 
-#: ../src/totem-object.c:1047 ../browser-plugin/totem-plugin-viewer.c:367
-msgid "Playing"
-msgstr "播放中"
+#. Translators: %s is the totem version number
+#: ../src/totem-object.c:591
+#, c-format
+msgid "Totem %s"
+msgstr "Totem %s"
 
-#: ../src/totem-object.c:1049 ../src/totem-options.c:52
+#: ../src/totem-object.c:1168 ../src/totem-options.c:52
 msgid "Pause"
 msgstr "暂停"
 
-#: ../src/totem-object.c:1054 ../browser-plugin/totem-plugin-viewer.c:363
-msgid "Paused"
-msgstr "已暂停"
-
-#: ../src/totem-object.c:1056 ../src/totem-object.c:1066
+#: ../src/totem-object.c:1175 ../src/totem-object.c:1185
 #: ../src/totem-options.c:51
 msgid "Play"
 msgstr "播放"
 
-#: ../src/totem-object.c:1061 ../src/totem-object.c:1659
-#: ../src/totem-statusbar.c:115 ../browser-plugin/totem-plugin-viewer.c:351
-msgid "Stopped"
-msgstr "已停止"
-
-#: ../src/totem-object.c:1142 ../src/totem-object.c:1169
-#: ../src/totem-object.c:1799 ../src/totem-object.c:1963
+#: ../src/totem-object.c:1267 ../src/totem-object.c:1294
+#: ../src/totem-object.c:1787 ../src/totem-object.c:1942
 #, c-format
 msgid "Totem could not play '%s'."
 msgstr "Totem 无法播放“%s”。"
 
-#: ../src/totem-object.c:1246
-#, c-format
-msgid ""
-"Totem could not play this media (%s) although a plugin is present to handle "
-"it."
-msgstr "Totem 不能播放此媒体(%s)，虽然有可以处理它的插件。"
-
-#: ../src/totem-object.c:1247
-msgid ""
-"You might want to check that a disc is present in the drive and that it is "
-"correctly configured."
-msgstr "您可能需要检查盘片是否位于驱动器中，以及配置是否正确。"
-
-#: ../src/totem-object.c:1255
-msgid "More information about media plugins"
-msgstr "更多的关于媒体插件的信息"
-
-#: ../src/totem-object.c:1256
-msgid ""
-"Please install the necessary plugins and restart Totem to be able to play "
-"this media."
-msgstr "请按装必需的插件，然后重新启动 Totem，这样才能播放此介质。"
-
-#: ../src/totem-object.c:1258
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because it does not have the "
-"appropriate plugins to be able to read from the disc."
-msgstr "Totem 无法播放此介质类型(%s)，原因是它没有正确的可以读取磁盘的插件。"
-
-#: ../src/totem-object.c:1260
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because you do not have the "
-"appropriate plugins to handle it."
-msgstr "Totem 无法播放此介质类型(%s)，原因是您没有可处理该类型的适当插件。"
-
-#: ../src/totem-object.c:1263
-#, c-format
-msgid "Totem cannot play this type of media (%s) because it is not supported."
-msgstr "Totem 无法播放此介质类型(%s)，原因是它不被支持。"
-
-#: ../src/totem-object.c:1264
-msgid "Please insert another disc to play back."
-msgstr "请插入另一张盘以播放。"
-
-#: ../src/totem-object.c:1300
-msgid "Totem was not able to play this disc."
-msgstr "Totem 无法播放此碟片。"
-
-#: ../src/totem-object.c:1301 ../src/totem-object.c:4229
-msgid "No reason."
-msgstr "无原因。"
-
-#: ../src/totem-object.c:1315
-msgid "Totem does not support playback of Audio CDs"
-msgstr "Totem 不能播放音乐 CD。"
-
-#: ../src/totem-object.c:1316
-msgid "Please consider using a music player or a CD extractor to play this CD"
-msgstr "请考虑使用音乐播放器或 CD 播放器来播放这张 CD"
-
-#: ../src/totem-object.c:1805
+#: ../src/totem-object.c:1793
 msgid "No error message"
 msgstr "无错误消息"
 
-#: ../src/totem-object.c:2154
+#: ../src/totem-object.c:2133
 msgid "Totem could not display the help contents."
-msgstr "Totem 无法显示帮助目录。"
+msgstr "Totem 无法显示帮助内容。"
 
-#: ../src/totem-object.c:2493 ../src/totem-object.c:2495
-#: ../browser-plugin/totem-plugin-viewer.c:1417
-msgid "An error occurred"
-msgstr "发生了一个错误"
-
-#: ../src/totem-object.c:4064 ../src/totem-object.c:4066
+#: ../src/totem-object.c:4019 ../src/totem-object.c:4021
 msgid "Previous Chapter/Movie"
 msgstr "上一章/电影"
 
-#: ../src/totem-object.c:4073 ../src/totem-object.c:4075
+#: ../src/totem-object.c:4028 ../src/totem-object.c:4030
 msgid "Play / Pause"
 msgstr "播放/暂停"
 
-#: ../src/totem-object.c:4083 ../src/totem-object.c:4085
+#: ../src/totem-object.c:4038 ../src/totem-object.c:4040
 msgid "Next Chapter/Movie"
 msgstr "下一章/电影"
 
-#. Translators: this is the tooltip text for the fullscreen button in the controls box in Totem's main window.
 #. Translators: this is the accessibility text for the fullscreen button in the controls box in Totem's main window.
-#: ../src/totem-object.c:4097 ../src/totem-object.c:4099
+#: ../src/totem-object.c:4051 ../src/totem-object.c:4053
 msgid "Fullscreen"
 msgstr "全屏"
 
-#: ../src/totem-object.c:4229
+#: ../src/totem-object.c:4184
 msgid "Totem could not startup."
 msgstr "Totem 无法启动。"
 
+#: ../src/totem-object.c:4184
+msgid "No reason."
+msgstr "无原因。"
+
 #: ../src/totem-open-location.c:182
 msgid "Open Location..."
 msgstr "打开位置..."
@@ -1405,117 +1402,111 @@
 msgid "Movies to play"
 msgstr "要播放的电影"
 
-#: ../src/totem-options.c:117
+#: ../src/totem-options.c:79
+msgid "- Play movies and songs"
+msgstr "- 播放电影和歌曲"
+
+#: ../src/totem-options.c:142
 msgid "Can't enqueue and replace at the same time"
 msgstr "不能同时添加到队列和替换"
 
 #. By extension entry
-#: ../src/totem-playlist.c:161
+#: ../src/totem-playlist.c:162
 msgid "MP3 ShoutCast playlist"
-msgstr "MP3 ShoutCast 播放清单"
+msgstr "MP3 ShoutCast 播放列表"
 
-#: ../src/totem-playlist.c:162
+#: ../src/totem-playlist.c:163
 msgid "MP3 audio (streamed)"
 msgstr "MP3 音频(流媒体)"
 
-#: ../src/totem-playlist.c:163
+#: ../src/totem-playlist.c:164
 msgid "MP3 audio (streamed, DOS format)"
 msgstr "MP3 音频(流媒体，DOS 格式)"
 
-#: ../src/totem-playlist.c:164
+#: ../src/totem-playlist.c:165
 msgid "XML Shareable Playlist"
 msgstr "可共享 XML 播放列表"
 
 #. This is "Title 3", where title is a DVD title
 #. * Note: NOT a DVD chapter
-#: ../src/totem-playlist.c:347
+#: ../src/totem-playlist.c:348
 #, c-format
 msgid "Title %d"
 msgstr "标题 %d"
 
-#: ../src/totem-playlist.c:446
+#: ../src/totem-playlist.c:447
 msgid "Could not save the playlist"
-msgstr "无法存储播放列表"
+msgstr "无法保存播放列表"
 
-#: ../src/totem-playlist.c:1021
+#: ../src/totem-playlist.c:1022
 msgid "Save Playlist"
 msgstr "保存播放列表"
 
 #. translators: Playlist is the default saved playlist filename,
 #. * without the suffix
-#: ../src/totem-playlist.c:1033 ../src/totem-playlist.c:1264
-#: ../src/totem-sidebar.c:142
+#: ../src/totem-playlist.c:1034 ../src/totem-playlist.c:1263
+#: ../src/totem-sidebar.c:145
 msgid "Playlist"
 msgstr "播放列表"
 
-#: ../src/totem-playlist.c:1857
+#: ../src/totem-playlist.c:1862
 #, c-format
 msgid "The playlist '%s' could not be parsed. It might be damaged."
 msgstr "无法解析播放列表“%s”，该文件可能已损坏。"
 
-#: ../src/totem-playlist.c:1858
+#: ../src/totem-playlist.c:1863
 msgid "Playlist error"
 msgstr "播放列表错误"
 
-#: ../src/totem-preferences.c:295
+#: ../src/totem-preferences.c:297
 msgid "Preferences"
 msgstr "首选项"
 
-#: ../src/totem-preferences.c:451
+#: ../src/totem-preferences.c:445
 msgid "Select Subtitle Font"
 msgstr "选择字幕字体"
 
-#: ../src/totem-properties-main.c:115 ../src/totem-properties-view.c:266
+#: ../src/totem-properties-main.c:116 ../src/totem-properties-view.c:271
 msgid "Audio/Video"
 msgstr "音频/视频"
 
-#: ../src/totem-properties-view.c:128
+#: ../src/totem-properties-view.c:131
 msgid "N/A"
 msgstr "不可用"
 
-#: ../src/totem-properties-view.c:157
+#: ../src/totem-properties-view.c:160
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 msgctxt "Stream bit rate"
 msgid "N/A"
 msgstr "不可用"
 
-#: ../src/totem-properties-view.c:160
+#: ../src/totem-properties-view.c:163
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: ../src/totem-properties-view.c:177
+#: ../src/totem-properties-view.c:180
 #: ../src/plugins/properties/totem-movie-properties.c:149
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../src/totem-properties-view.c:209
+#: ../src/totem-properties-view.c:212
 #: ../src/plugins/properties/totem-movie-properties.c:166
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: ../src/totem-properties-view.c:216
+#: ../src/totem-properties-view.c:220
 #: ../src/plugins/properties/totem-movie-properties.c:166
 msgctxt "Sample rate"
 msgid "N/A"
 msgstr "不可用"
 
-#: ../src/totem-properties-view.c:224
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5589
-msgid "Surround"
-msgstr "环绕声"
-
-#: ../src/totem-properties-view.c:226
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5591
-msgid "Mono"
-msgstr "单声道"
-
-#: ../src/totem-properties-view.c:236
+#: ../src/totem-properties-view.c:241
 msgctxt "Number of audio channels"
 msgid "N/A"
 msgstr "不可用"
@@ -1548,8 +1539,8 @@
 #. eg: 75 %
 #: ../src/totem-statusbar.c:250
 #, c-format
-msgid "%d %%"
-msgstr "%d %%"
+msgid "%lf %%"
+msgstr "%lf %%"
 
 #. eg: Paused, 0:32 / 1:05
 #: ../src/totem-statusbar.c:325
@@ -1560,8 +1551,8 @@
 #. eg: Buffering, 75 %
 #: ../src/totem-statusbar.c:330
 #, c-format
-msgid "%s, %d %%"
-msgstr "%s, %d %%"
+msgid "%s, %f %%"
+msgstr "%s，%f %%"
 
 #: ../src/totem-subtitle-encoding.c:156
 msgid "Current Locale"
@@ -1623,1645 +1614,821 @@
 msgstr "乔治亚语"
 
 #: ../src/totem-subtitle-encoding.c:233 ../src/totem-subtitle-encoding.c:235
-#: ../src/totem-subtitle-encoding.c:237
-msgid "Greek"
-msgstr "希腊语"
-
-#: ../src/totem-subtitle-encoding.c:240
-msgid "Gujarati"
-msgstr "古吉拉特语"
-
-#: ../src/totem-subtitle-encoding.c:243
-msgid "Gurmukhi"
-msgstr "旁遮普语"
-
-#: ../src/totem-subtitle-encoding.c:246 ../src/totem-subtitle-encoding.c:248
-#: ../src/totem-subtitle-encoding.c:250 ../src/totem-subtitle-encoding.c:252
-msgid "Hebrew"
-msgstr "希伯来语"
-
-#: ../src/totem-subtitle-encoding.c:255
-msgid "Hebrew Visual"
-msgstr "希伯来语视觉"
-
-#: ../src/totem-subtitle-encoding.c:258
-msgid "Hindi"
-msgstr "印地语"
-
-#: ../src/totem-subtitle-encoding.c:261
-msgid "Icelandic"
-msgstr "冰岛语"
-
-#: ../src/totem-subtitle-encoding.c:264 ../src/totem-subtitle-encoding.c:266
-#: ../src/totem-subtitle-encoding.c:268
-msgid "Japanese"
-msgstr "日语"
-
-#: ../src/totem-subtitle-encoding.c:271 ../src/totem-subtitle-encoding.c:273
-#: ../src/totem-subtitle-encoding.c:275 ../src/totem-subtitle-encoding.c:277
-msgid "Korean"
-msgstr "韩语"
-
-#: ../src/totem-subtitle-encoding.c:280
-msgid "Nordic"
-msgstr "北欧"
-
-#: ../src/totem-subtitle-encoding.c:283
-msgid "Persian"
-msgstr "波斯语"
-
-#: ../src/totem-subtitle-encoding.c:286 ../src/totem-subtitle-encoding.c:288
-msgid "Romanian"
-msgstr "罗马尼亚语"
-
-#: ../src/totem-subtitle-encoding.c:291
-msgid "South European"
-msgstr "南欧"
-
-#: ../src/totem-subtitle-encoding.c:294
-msgid "Thai"
-msgstr "泰语"
-
-#: ../src/totem-subtitle-encoding.c:297 ../src/totem-subtitle-encoding.c:299
-#: ../src/totem-subtitle-encoding.c:301 ../src/totem-subtitle-encoding.c:303
-msgid "Turkish"
-msgstr "土耳其语"
-
-#: ../src/totem-subtitle-encoding.c:306 ../src/totem-subtitle-encoding.c:308
-#: ../src/totem-subtitle-encoding.c:310 ../src/totem-subtitle-encoding.c:312
-#: ../src/totem-subtitle-encoding.c:314
-msgid "Unicode"
-msgstr "Unicode"
-
-#: ../src/totem-subtitle-encoding.c:317 ../src/totem-subtitle-encoding.c:319
-#: ../src/totem-subtitle-encoding.c:321 ../src/totem-subtitle-encoding.c:323
-#: ../src/totem-subtitle-encoding.c:325
-msgid "Western"
-msgstr "西方"
-
-#: ../src/totem-subtitle-encoding.c:328 ../src/totem-subtitle-encoding.c:330
-#: ../src/totem-subtitle-encoding.c:332
-msgid "Vietnamese"
-msgstr "越南语"
-
-#: ../src/totem-video-list.c:330
-msgid "No video URI"
-msgstr "没有视频 URI"
-
-#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
-#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
-#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
-#: ../src/totem-video-thumbnailer.c:872
-#, c-format
-msgid ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-msgstr ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-
-#: ../src/totem-video-thumbnailer.c:873
-msgid "Filename"
-msgstr "文件名"
-
-#: ../src/totem-video-thumbnailer.c:875
-msgid "Resolution"
-msgstr "分辨率"
-
-#: ../src/totem-video-thumbnailer.c:878
-msgid "Duration"
-msgstr "持续时间"
-
-#: ../src/totem-uri.c:506 ../src/plugins/chapters/totem-chapters.c:998
-msgid "All files"
-msgstr "全部文件"
-
-#: ../src/totem-uri.c:511 ../src/plugins/chapters/totem-chapters.c:995
-msgid "Supported files"
-msgstr "支持的文件"
-
-#: ../src/totem-uri.c:523
-msgid "Audio files"
-msgstr "音频文件"
-
-#: ../src/totem-uri.c:531
-msgid "Video files"
-msgstr "视频文件"
-
-#: ../src/totem-uri.c:541
-msgid "Subtitle files"
-msgstr "字幕文件"
-
-#: ../src/totem-uri.c:593
-msgid "Select Text Subtitles"
-msgstr "选择文本字幕"
-
-#: ../src/totem-uri.c:656
-msgid "Select Movies or Playlists"
-msgstr "选择电影或播放列表"
-
-#. Options parsing
-#: ../src/totem.c:201
-msgid "- Play movies and songs"
-msgstr "- 播放电影和歌曲"
-
-#: ../src/totem.c:212
-#, c-format
-msgid ""
-"%s\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"%s\n"
-"请运行 “%s --help”查看完整的命令行选项列表。\n"
-
-#: ../src/totem.c:254 ../src/totem.c:265
-#: ../browser-plugin/totem-plugin-viewer.c:663
-#: ../browser-plugin/totem-plugin-viewer.c:1793
-msgid "Totem Movie Player"
-msgstr "Totem 电影播放机"
-
-#: ../src/totem.c:255 ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Could not initialize the thread-safe libraries."
-msgstr "无法初始化线程安全库。"
-
-#: ../src/totem.c:255
-msgid "Verify your system installation. Totem will now exit."
-msgstr "请检查您的系统安装。Totem 现将退出。"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:1589
-msgid "Password requested for RTSP server"
-msgstr "RTSP 服务器需要密码"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2858
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2862
-#, c-format
-msgid "Audio Track #%d"
-msgstr "音轨 #%d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2890
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2894
-#, c-format
-msgid "Subtitle #%d"
-msgstr "字幕 #%d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3298
-msgid ""
-"The requested audio output was not found. Please select another audio output "
-"in the Multimedia Systems Selector."
-msgstr "所请求的音频输出未找到。请在多媒体系统选择器中选择另外一个音频输出。"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3303
-msgid "Location not found."
-msgstr "位置未找到。"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3307
-msgid ""
-"Could not open location; you might not have permission to open the file."
-msgstr "无法打开位置；您可能没有权限打开该文件。"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3318
-msgid ""
-"The video output is in use by another application. Please close other video "
-"applications, or select another video output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"视频输出正被另外一个应用程序使用。请关闭其它视频应用程序，或者在多媒体系统选"
-"择器中选择另外一个视频输出。"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3324
-msgid ""
-"The audio output is in use by another application. Please select another "
-"audio output in the Multimedia Systems Selector. You may want to consider "
-"using a sound server."
-msgstr ""
-"音频输出正被另外一个应用程序使用。请在多媒体系统选择器中选择另外一个音频输"
-"出。您可能需要考虑使用另外一个声音服务器。"
-
-#. should be exactly one missing thing (source or converter)
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3342
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3348
-#, c-format
-msgid "The playback of this movie requires a %s plugin which is not installed."
-msgid_plural ""
-"The playback of this movie requires the following decoders which are not "
-"installed:\n"
-"\n"
-"%s"
-msgstr[0] "回放此电影需要 %s 插件，但尚未安装。"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3374
-msgid ""
-"Cannot play this file over the network. Try downloading it to disk first."
-msgstr "无法在网络上播放此文件。请尝试先下载此文件。"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5878
-msgid "Media contains no supported video streams."
-msgstr "媒体不包含支持的视频流。"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6052
-msgid ""
-"Failed to create a GStreamer play object. Please check your GStreamer "
-"installation."
-msgstr "创建 GStreamer 播放对象失败。请检查您的 GStreamer 安装。"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6172
-msgid ""
-"Failed to open audio output. You may not have permission to open the sound "
-"device, or the sound server may not be running. Please select another audio "
-"output in the Multimedia Systems Selector."
-msgstr ""
-"打开视频输出失败。您可能没有权限打开声音设备，或者声音服务器未运行。请在多媒"
-"体系统选择器中选择另外一个音频输出。"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6192
-msgid ""
-"Could not find the audio output. You may need to install additional "
-"GStreamer plugins, or select another audio output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"找不到音频输出。您可能需要安装额外的 GStreamer 插件，或者从多媒体系统选择器中"
-"选择另外一个音频输出。"
-
-#. hour:minutes:seconds
-#. Translators: This is a time format, like "9:05:02" for 9
-#. * hours, 5 minutes, and 2 seconds. You may change ":" to
-#. * the separator that your locale uses or use "%Id" instead
-#. * of "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:83 ../src/plugins/skipto/totem-time-entry.c:57
-#, c-format
-msgctxt "long time format"
-msgid "%d:%02d:%02d"
-msgstr "%d:%02d:%02d"
-
-#. minutes:seconds
-#. Translators: This is a time format, like "5:02" for 5
-#. * minutes and 2 seconds. You may change ":" to the
-#. * separator that your locale uses or use "%Id" instead of
-#. * "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:92
-#, c-format
-msgctxt "short time format"
-msgid "%d:%02d"
-msgstr "%d:%02d"
-
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:65
-msgid "_Create Video Disc..."
-msgstr "创建视频光盘(_C)..."
-
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:66
-msgid "Create a video DVD or a (S)VCD from the currently opened movie"
-msgstr "从当前已打开的电影创建视频 DVD 或 (S)VCD"
-
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:68
-msgid "Copy Vide_o DVD..."
-msgstr "复制视频 DVD(_O)..."
-
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:69
-msgid "Copy the currently playing video DVD"
-msgstr "复制当前正在播放的视频 DVD"
-
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:71
-msgid "Copy (S)VCD..."
-msgstr "复制视频 (S)VCD..."
-
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:72
-msgid "Copy the currently playing (S)VCD"
-msgstr "复制正在播放的 (S)VCD"
-
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:129
-msgid "The video disc could not be duplicated."
-msgstr "无法复制视频光盘。"
-
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:131
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:276
-msgid "The movie could not be recorded."
-msgstr "电影无法录制。"
-
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:157
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:167
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:263
-msgid "Unable to write a project."
-msgstr "无法写入项目。"
-
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
-msgid "Video Disc Recorder"
-msgstr "视频光盘录制"
-
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
-msgid "Records (S)VCDs or video DVDs"
-msgstr "录制 (S)VCD 或视频 DVD"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:1
-#: ../src/plugins/chapters/totem-chapters.c:1139
-msgid "Chapters"
-msgstr "章节"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:2
-msgid "Support chapter markers in movies."
-msgstr "支持在电影中使用章节标记。"
-
-#: ../src/plugins/chapters/chapters-edit.ui.h:1
-msgid "Name for new chapter:"
-msgstr "新章节的名称："
-
-#: ../src/plugins/chapters/chapters-list.ui.h:1
-msgid "_Remove Chapter"
-msgstr "移除章节(_R)"
-
-#: ../src/plugins/chapters/chapters-list.ui.h:2
-msgid "Remove the chapter from the list"
-msgstr "从列表中移除该章节"
-
-#: ../src/plugins/chapters/chapters-list.ui.h:3
-msgid "_Go to Chapter"
-msgstr "转到章节(_G)"
-
-#: ../src/plugins/chapters/chapters-list.ui.h:4
-msgid "Go to the chapter in the movie"
-msgstr "转到电影中该章节"
-
-#: ../src/plugins/chapters/chapters-list.ui.h:5
-msgid "Add Chapter..."
-msgstr "添加章节..."
-
-#: ../src/plugins/chapters/chapters-list.ui.h:6
-msgid "Remove Chapter"
-msgstr "移除章节"
-
-#: ../src/plugins/chapters/chapters-list.ui.h:7
-msgid "Go to Chapter"
-msgstr "转到章节"
-
-#: ../src/plugins/chapters/chapters-list.ui.h:8
-msgid "Save Changes"
-msgstr "保存更改"
-
-#: ../src/plugins/chapters/chapters-list.ui.h:9
-msgid "No chapter data"
-msgstr "没有章节数据"
-
-#: ../src/plugins/chapters/chapters-list.ui.h:10
-msgid "Load Chapters..."
-msgstr "加载章节..."
-
-#: ../src/plugins/chapters/chapters-list.ui.h:11
-msgid "Load chapters from an external CMML file"
-msgstr "从外部 CMML 文件中加载章节"
-
-#: ../src/plugins/chapters/chapters-list.ui.h:12
-msgid "Add New Chapters"
-msgstr "添加新章节"
-
-#: ../src/plugins/chapters/chapters-list.ui.h:13
-msgid "Create a new chapter list for the movie"
-msgstr "为该电影创建新的章节"
-
-#: ../src/plugins/chapters/totem-chapters.c:56
-#, c-format
-msgid ""
-"Title: %s\n"
-"Start time: %s"
-msgstr ""
-"标题： %s\n"
-"起始时间：%s"
-
-#: ../src/plugins/chapters/totem-chapters.c:328
-msgid "Error while reading file with chapters"
-msgstr "使用章节读取文件时出错"
-
-#: ../src/plugins/chapters/totem-chapters.c:543
-msgid "Chapter with the same time already exists"
-msgstr "有同样的时间的章节已经存在"
-
-#: ../src/plugins/chapters/totem-chapters.c:544
-msgid "Try another name or remove an existing chapter."
-msgstr "尝试其它名称或移除已经存在的章节。"
-
-#: ../src/plugins/chapters/totem-chapters.c:717
-msgid "Error while writing file with chapters"
-msgstr "使用章节写入文件时出错"
-
-#: ../src/plugins/chapters/totem-chapters.c:842
-msgid "Error occurred while saving chapters"
-msgstr "保存章节时发生一个错误。"
-
-#: ../src/plugins/chapters/totem-chapters.c:843
-msgid ""
-"Please check you have permission to write to the folder containing the movie."
-msgstr "请检查您是否对包含电影的目录拥有写权限。"
-
-#: ../src/plugins/chapters/totem-chapters.c:976
-msgid "Open Chapter File"
-msgstr "打开章节文件"
-
-#: ../src/plugins/chapters/totem-chapters.c:1093
-msgid "Chapter Screenshot"
-msgstr "章节截图"
-
-#: ../src/plugins/chapters/totem-chapters.c:1104
-msgid "Chapter Title"
-msgstr "章节标题"
-
-#: ../src/plugins/chapters/totem-chapters.c:1184
-msgid "Save changes to chapter list before closing?"
-msgstr "是否在关闭前保存章节列表的更改？"
-
-#. Translators: close Totem without saving changes to the chapter list of the current movie.
-#: ../src/plugins/chapters/totem-chapters.c:1189
-msgid "Close without Saving"
-msgstr "关闭但不保存"
-
-#. Translators: save changes to the chapter list of the current movie before closing Totem.
-#: ../src/plugins/chapters/totem-chapters.c:1191
-msgid "Save"
-msgstr "保存"
-
-#: ../src/plugins/chapters/totem-chapters.c:1194
-msgid "If you don't save, changes to the chapter list will be lost."
-msgstr "如果您放弃保存，对章节列表所做的更改将会丢失。"
-
-#: ../src/plugins/chapters/totem-cmml-parser.c:651
-msgid "Failed to parse CMML file"
-msgstr "解析 CMML 文件失败"
-
-#: ../src/plugins/chapters/totem-edit-chapter.c:95
-msgid "Add Chapter"
-msgstr "添加章节"
-
-#: ../src/plugins/dbusservice/dbusservice.plugin.in.h:1
-msgid "D-Bus Service"
-msgstr "D-Bus 服务"
-
-#: ../src/plugins/dbusservice/dbusservice.plugin.in.h:2
-msgid ""
-"Plugin for sending notifications of currently playing movies to the D-Bus "
-"subsystem."
-msgstr "向 D-Bus 子系统传送当前播放的视频的通知插件"
-
-#: ../src/plugins/dbusservice/dbusservice.py:213
-#: ../src/plugins/dbusservice/dbusservice.py:243
-#, python-format
-msgid "The MediaPlayer2 object does not implement the ‘%s’ interface"
-msgstr "MediaPlayer2 对象未实现“%s”接口"
-
-#: ../src/plugins/dbusservice/dbusservice.py:222
-#, python-format
-msgid "The property ‘%s’ is not writeable."
-msgstr "“%s”属性不可写。"
-
-#: ../src/plugins/dbusservice/dbusservice.py:238
-#, python-format
-msgid "Unknown property ‘%s’ requested of a MediaPlayer 2 object"
-msgstr "请求了未知的 MediaPlayer 2 对象的“%s”属性"
-
-#: ../src/plugins/dbusservice/dbusservice.py:341
-#, python-format
-msgid "The URI ‘%s’ is not supported."
-msgstr "不支持 URI “%s”。"
-
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
-msgid "Instant Messenger status"
-msgstr "即时通讯状态"
-
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
-msgid "Set your Instant Messenger status to away when a movie is playing"
-msgstr "播放电影时将您的即时通讯软件状态设定为离开"
-
-#: ../src/plugins/gromit/gromit.plugin.in.h:1
-msgid "Gromit Annotations"
-msgstr "Gromit 批注"
-
-#: ../src/plugins/gromit/gromit.plugin.in.h:2
-msgid "Presentation helper to make annotations on screen"
-msgstr "在屏幕上作批注的演示助手程序"
-
-#: ../src/plugins/gromit/totem-gromit.c:231
-msgid "The gromit binary was not found."
-msgstr "Gromit 二进制文件未找到。"
-
-#. Add the interface to Totem's sidebar
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:1
-#: ../src/plugins/iplayer/iplayer.py:46
-msgid "BBC iPlayer"
-msgstr "BBC iPlayer"
-
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:2
-msgid "Stream BBC programs from the last 7 days from the BBC iPlayer service."
-msgstr "最近七天内来自 BBC iPlayer 服务的 Stream BBC 节目"
-
-#: ../src/plugins/iplayer/iplayer.py:72
-msgid "Error listing channel categories"
-msgstr "列出频道类别时出错"
-
-#: ../src/plugins/iplayer/iplayer.py:73
-msgid ""
-"There was an unknown error getting the list of television channels available "
-"on BBC iPlayer."
-msgstr "接收 BBC iPlayer 可用的电视频道时出现未知错误"
-
-#. Append a dummy child row so that the expander's visible; we can
-#. then queue off the expander to load the programme listing for this
-#. category
-#: ../src/plugins/iplayer/iplayer.py:84
-msgid "Loading…"
-msgstr "载入..."
-
-#. Translators: the "programme feed" is the list of TV shows
-#. available to watch online
-#: ../src/plugins/iplayer/iplayer.py:136
-msgid "Error getting programme feed"
-msgstr "接收节目定阅单时出错"
-
-#: ../src/plugins/iplayer/iplayer.py:137
-msgid ""
-"There was an error getting the list of programmes for this channel and "
-"category combination."
-msgstr "获取此频道和分类的列表是出错。"
-
-#: ../src/plugins/iplayer/iplayer2.py:298
-msgid ""
-msgstr "<未给出原因>"
-
-#: ../src/plugins/iplayer/iplayer2.py:299
-#, python-format
-msgid "Programme unavailable (\"%s\")"
-msgstr "节目不可用(“%s“)"
-
-#: ../src/plugins/lirc/lirc.plugin.in.h:1
-msgid "Infrared Remote Control"
-msgstr "红外遥控"
-
-#: ../src/plugins/lirc/lirc.plugin.in.h:2
-msgid "Support infrared remote control"
-msgstr "支持红外遥控"
-
-#: ../src/plugins/lirc/totem-lirc.c:242
-msgid "Couldn't initialize lirc."
-msgstr "无法初始化 lirc。"
-
-#: ../src/plugins/lirc/totem-lirc.c:254
-msgid "Couldn't read lirc configuration."
-msgstr "无法读取 lirc 配置。"
-
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
-msgid "Download Movie Subtitles"
-msgstr "下载影片字幕"
-
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
-msgid "Subtitle _language:"
-msgstr "字幕语言(_l)："
-
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
-msgid "_Play with Subtitle"
-msgstr "随字幕播放(_P)"
-
-#: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:1
-msgid "Subtitle Downloader"
-msgstr "字幕下载器"
-
-#: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:2
-msgid "Look for subtitles for the currently playing movie."
-msgstr "为当前播放的影片查找字幕。"
-
-#: ../src/plugins/opensubtitles/opensubtitles.py:42
-msgid "Brazilian Portuguese"
-msgstr "巴西葡萄牙语"
-
-#: ../src/plugins/opensubtitles/opensubtitles.py:177
-msgid "Searching for subtitles…"
-msgstr "正在搜索字幕..."
-
-#: ../src/plugins/opensubtitles/opensubtitles.py:225
-#: ../src/plugins/opensubtitles/opensubtitles.py:645
-msgid "Downloading the subtitles…"
-msgstr "正在下载字幕..."
-
-#: ../src/plugins/opensubtitles/opensubtitles.py:290
-msgid "Could not contact the OpenSubtitles website"
-msgstr "无法连接 OpenSubtitles 网站"
-
-#: ../src/plugins/opensubtitles/opensubtitles.py:323
-#: ../src/plugins/opensubtitles/opensubtitles.py:341
-msgid "Could not contact the OpenSubtitles website."
-msgstr "无法连接 OpenSubtitles 网站。"
-
-#: ../src/plugins/opensubtitles/opensubtitles.py:329
-msgid "No results found."
-msgstr "没有找到结果。"
-
-#: ../src/plugins/opensubtitles/opensubtitles.py:478
-msgid "Subtitles"
-msgstr "字幕"
-
-#. translators comment:
-#. This is the file-type of the subtitle file detected
-#: ../src/plugins/opensubtitles/opensubtitles.py:484
-msgid "Format"
-msgstr "格式"
-
-#. translators comment:
-#. This is a rating of the quality of the subtitle
-#: ../src/plugins/opensubtitles/opensubtitles.py:489
-msgid "Rating"
-msgstr "评分"
-
-#: ../src/plugins/opensubtitles/opensubtitles.py:525
-msgid "Download movie subtitles from OpenSubtitles"
-msgstr "从 OpenSubtitles 下载影片字幕"
-
-#: ../src/plugins/opensubtitles/opensubtitles.py:527
-msgid "_Download Movie Subtitles…"
-msgstr "下载影片字幕(_D)"
-
-#: ../src/plugins/opensubtitles/opensubtitles.py:589
-msgid "Searching subtitles…"
-msgstr "正在搜索字幕..."
-
-#: ../src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in.h:1
-msgid "Subtitle language"
-msgstr "字幕语言"
-
-#: ../src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in.h:2
-msgid "The language to search for subtitles for movies in."
-msgstr "搜索的影片字幕所使用的语言。"
-
-#: ../src/plugins/ontop/ontop.plugin.in.h:1
-msgid "Always On Top"
-msgstr "总是位于顶端"
-
-#: ../src/plugins/ontop/ontop.plugin.in.h:2
-msgid "Keep the main window on top when playing a movie"
-msgstr "播放电影时将主窗口置于顶端"
-
-#: ../src/plugins/properties/totem-movie-properties.c:246
-msgid "Properties"
-msgstr "属性"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:1
-msgid "Publisher protocol to use"
-msgstr "要使用的发布协议"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:2
-msgid ""
-"The transport protocol to use when publishing playlists over the network."
-msgstr "在通过网络发布播放列表时使用的传送协议。"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:3
-msgid "Format for network service name"
-msgstr "网络服务名称格式"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:5
-#, no-c-format
-msgid ""
-"A format string used to build the network service name used when publishing "
-"playlists over the network. The following format placeholders can be used: • "
-"%a: the program name as returned by g_get_application_name() • %h: the "
-"machine's host name in title case • %u: the user's login name in title case "
-"• %U: the user's real name • %%: the percent sign"
-msgstr ""
-"在网络发布播放列表时用于构建网络服务名称的格式字符串。可以使用以下格式占位"
-"符：• %a：g_get_application_name() 返回的程序名称 • %h：这台计算机的主机名，"
-"使用标题大写形式 • %u：用户的登录名，使用标题大写形式 • %U：用户的真实姓名 • "
-"%%：百分号"
-
-#. Translators: computers on the local network which are publishing their playlists over the network
-#: ../src/plugins/publish/totem-publish.c:552
-msgid "Neighbors"
-msgstr "邻居"
-
-#: ../src/plugins/publish/publish.plugin.in.h:1
-msgid "Publish Playlist"
-msgstr "发布播放列表"
-
-#: ../src/plugins/publish/publish.plugin.in.h:2
-msgid "Share the current playlist via HTTP"
-msgstr "通过 HTTP 共享当前的播放列表"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:1
-msgid "Service _Name:"
-msgstr "服务器名称(_N)"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:3
-#, no-c-format
-msgid ""
-"The name used for announcing the playlist service on the network.\n"
-"All occurrences of the string %u will be replaced by your name,\n"
-"and %h will be replaced by your computer's host name."
-msgstr ""
-"用于在网络播放列表服务上公布的名称。\n"
-"所有出现的字符串 %u 都将替换为您的名称，\n"
-"并且 %h 将被替换为您的主机名。"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:6
-msgid "Use _encrypted transport protocol (HTTPS)"
-msgstr "使用加密协议HTTPS(_E)"
-
-#: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:1
-msgid "rpdb2 password"
-msgstr "rpdb2 密码"
-
-#: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:2
-msgid ""
-"A password to protect the rpdb2 server for debugging Totem from unauthorized "
-"remote access. If this is empty, a default of 'totem' will be used."
-msgstr ""
-"一个防止调试 Totem 用的 rpdb2 服务器遭受未授权网络访问的密码。如果不设，将默"
-"认使用 totem 作为密码。"
-
-#: ../src/plugins/rotation/rotation.plugin.in.h:1
-msgid "Rotation Plugin"
-msgstr "旋转插件"
-
-#: ../src/plugins/rotation/rotation.plugin.in.h:2
-msgid "Allows videos to be rotated if they're in the wrong orientation."
-msgstr "允许旋转方向错误的视频。"
-
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:60
-msgid "_Rotate Clockwise"
-msgstr "顺时针旋转(_R)"
-
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:62
-msgid "Rotate Counterc_lockwise"
-msgstr "逆时针旋转(_L)"
-
-#: ../src/plugins/save-file/totem-save-file.c:63
-msgid "Save a Copy..."
-msgstr "保存副本..."
-
-#: ../src/plugins/save-file/totem-save-file.c:64
-msgid "Save a copy of the movie"
-msgstr "保存电影副本"
-
-#: ../src/plugins/save-file/totem-save-file.c:129
-msgid "Save a Copy"
-msgstr "保存副本"
-
-#. translators: Movie is the default saved movie filename,
-#. * without the suffix
-#: ../src/plugins/save-file/totem-save-file.c:161
-msgid "Movie"
-msgstr "电影"
-
-#: ../src/plugins/save-file/totem-save-file.c:183
-msgid "Movie stream"
-msgstr "流媒体电影"
-
-#: ../src/plugins/screensaver/totem-screensaver.c:116
-#: ../browser-plugin/totem-plugin-viewer.c:1891
-msgid "Playing a movie"
-msgstr "播放电影"
-
-#: ../src/plugins/screenshot/gallery.ui.h:1
-msgid "Screenshot width (in pixels):"
-msgstr "屏幕快照宽度(像素单位)："
-
-#: ../src/plugins/screenshot/gallery.ui.h:2
-msgid "Calculate the number of screenshots"
-msgstr "计算屏幕快照的数量"
-
-#: ../src/plugins/screenshot/gallery.ui.h:3
-msgid "Number of screenshots:"
-msgstr "屏幕快照数量："
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:1
-msgid "_Name:"
-msgstr "名称(_N)："
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:2
-msgid "Save in _folder:"
-msgstr "储存于文件夹(_F)"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:3
-msgid "Select a folder"
-msgstr "请选择一个文件夹"
-
-#. Write the screenshot to the temporary file
-#: ../src/plugins/screenshot/gnome-screenshot-widget.c:385
-#: ../src/plugins/screenshot/totem-screenshot.c:64
-msgid "Screenshot.png"
-msgstr "屏幕快照.png"
-
-#: ../src/plugins/screenshot/totem-gallery.c:91
-msgid "Save Gallery"
-msgstr "保存画册"
-
-#. Translators: The first argument is the movie title. The second
-#. * argument is a number which is used to prevent overwriting files.
-#. * Just translate "Gallery", and not the ".jpg". Example:
-#. * "Galerie-%s-%d.jpg".
-#: ../src/plugins/screenshot/totem-gallery.c:115
-#, c-format
-msgid "Gallery-%s-%d.jpg"
-msgstr "图库-%s-%d.jpg"
-
-#. Set up the window
-#: ../src/plugins/screenshot/totem-gallery-progress.c:101
-msgid "Creating Gallery..."
-msgstr "正在创建画册..."
-
-#. Set the progress label
-#: ../src/plugins/screenshot/totem-gallery-progress.c:107
-#, c-format
-msgid "Saving gallery as \"%s\""
-msgstr "另存画册为“%s”"
-
-#: ../src/plugins/screenshot/totem-screenshot.c:113
-msgid "There was an error saving the screenshot."
-msgstr "保存屏幕快照出错。"
-
-#: ../src/plugins/screenshot/totem-screenshot.c:139
-msgid "Save Screenshot"
-msgstr "保存屏幕快照"
-
-#. Create the screenshot widget
-#. Translators: %s is the movie title and %d is an auto-incrementing number to make filename unique
-#: ../src/plugins/screenshot/totem-screenshot.c:160
-#, c-format
-msgid "Screenshot-%s-%d.png"
-msgstr "屏幕截图-%s-%d.png"
-
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:88
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
-msgid "Totem could not get a screenshot of the video."
-msgstr "Totem 无法获取该视频的屏幕快照。"
-
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
-msgid "This is not supposed to happen; please file a bug report."
-msgstr "不应该发生这种情况；请提交错误报告。"
-
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
-msgid "Take _Screenshot..."
-msgstr "抓取屏幕快照(_S)..."
-
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
-msgid "Take a screenshot"
-msgstr "抓取一个屏幕快照"
-
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
-msgid "Create Screenshot _Gallery..."
-msgstr "创建屏幕快照画册(_G)..."
-
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
-msgid "Create a gallery of screenshots"
-msgstr "创建一个画册的屏幕快照"
-
-#. Update the "seconds" label so that it always has the correct singular/plural form
-#. Translators: label for the seconds selector in the "Skip to" dialogue
-#: ../src/plugins/skipto/totem-skipto.c:160
-msgid "second"
-msgid_plural "seconds"
-msgstr[0] "秒"
-
-#. Fix the label width at the maximum necessary for the plural labels, to prevent it changing size when we change the spinner value
-#. Translators: you should translate this string to a number (written in digits) which corresponds to the longer character length of the
-#. * translations for "second" and "seconds", as translated elsewhere in this file. For example, in English, "second" is 6 characters long and
-#. * "seconds" is 7 characters long, so this string should be translated to "7". See: bgo#639398
-#: ../src/plugins/skipto/totem-skipto.c:190
-msgctxt "Skip To label length"
-msgid "7"
-msgstr "7"
-
-#: ../src/plugins/skipto/totem-skipto.c:197
-msgid "Skip To"
-msgstr "跳至"
-
-#: ../src/plugins/skipto/totem-skipto-plugin.c:182
-msgid "_Skip To..."
-msgstr "跳至(_S)..."
-
-#: ../src/plugins/skipto/totem-skipto-plugin.c:182
-msgid "Skip to a specific time"
-msgstr "跳到指定时间"
-
-#: ../src/plugins/skipto/skipto.ui.h:1
-msgid "_Skip to:"
-msgstr "跳至(_S)："
-
-#: ../browser-plugin/totem-plugin-viewer.c:431
-msgid "No URI to play"
-msgstr "无可播放的 URI"
-
-#. translators: this is:
-#. * Open With ApplicationName
-#. * as in nautilus' right-click menu
-#: ../browser-plugin/totem-plugin-viewer.c:1107
-#, c-format
-msgid "_Open with \"%s\""
-msgstr "用“%s”打开(_O)"
-
-#: ../browser-plugin/totem-plugin-viewer.c:2136
-msgid "No playlist or playlist empty"
-msgstr "没有播放列表或者播放列表为空"
-
-#: ../browser-plugin/totem-plugin-viewer.c:2235
-msgid "Movie browser plugin"
-msgstr "Totem 浏览器插件"
-
-#: ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Verify your system installation. The Totem plugin will now exit."
-msgstr "请检查您的系统安装。Totem 插件现将退出。"
-
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
-msgid "Python Console"
-msgstr "Python 控制台"
-
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
-msgid "Interactive Python console."
-msgstr "交互式 Python 控制台。"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:88
-msgid "Python Console Menu"
-msgstr "Python 控制台菜单"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:93
-msgid "_Python Console"
-msgstr "Python 控制台(_P)"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:94
-msgid "Show Totem's Python console"
-msgstr "显示 Totem 的 python 控制台"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:100
-msgid "Python Debugger"
-msgstr "Python 调试器"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:101
-msgid "Enable remote Python debugging with rpdb2"
-msgstr "允许使用 rpdb2 进行远程 Python 调试"
-
-#. pylint: disable-msg=E1101
-#: ../src/plugins/pythonconsole/pythonconsole.py:125
-#, python-format
-msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
-msgstr "您可以通过“totem_object”访问 totem 对象：\\n%s"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:129
-msgid "Totem Python Console"
-msgstr "Totem Python 控制台"
-
-#: ../src/plugins/pythonconsole/pythonconsole.py:139
-msgid ""
-"After you press OK, Totem will wait until you connect to it with winpdb or "
-"rpdb2. If you have not set a debugger password in DConf, it will use the "
-"default password ('totem')."
-msgstr ""
-"在您点击确定之后，Totem 将一直等到您连接到 winpdb 或 rpdb2。如果您没有在 "
-"GConf 中设置调试器密码，将使用默认密码(“totem”)。"
-
-#: ../src/plugins/grilo/grilo.plugin.in.h:1
-msgid "Grilo Browser"
-msgstr "Grilo 浏览器"
-
-#: ../src/plugins/grilo/grilo.plugin.in.h:2
-msgid "A plugin to let you browse media content from various sources."
-msgstr "一个可以浏览各种来源的多媒体内容的插件。"
-
-#: ../src/plugins/grilo/totem-grilo.c:452
-msgid "Browse Error"
-msgstr "浏览错误"
-
-#: ../src/plugins/grilo/totem-grilo.c:599
-msgid "Search Error"
-msgstr "搜索错误"
-
-#: ../src/plugins/grilo/totem-grilo.c:1219 ../src/plugins/grilo/grilo.ui.h:3
-msgid "Browse"
-msgstr "浏览"
-
-#: ../src/plugins/grilo/totem-grilo.c:1285 ../src/plugins/grilo/grilo.ui.h:4
-msgid "Search"
-msgstr "搜索"
-
-#: ../src/plugins/grilo/grilo.ui.h:1
-msgid "Add to Playlist"
-msgstr "添加到播放列表"
-
-#: ../src/plugins/grilo/grilo.ui.h:2
-msgid "Copy Location"
-msgstr "复制位置"
+#: ../src/totem-subtitle-encoding.c:237
+msgid "Greek"
+msgstr "希腊语"
 
-#~ msgid "Bemused"
-#~ msgstr "Bemused"
+#: ../src/totem-subtitle-encoding.c:240
+msgid "Gujarati"
+msgstr "古吉拉特语"
 
-#~ msgid "Control Totem through a mobile phone with a Bemused client"
-#~ msgstr "通过移动电话或蓝牙客户端(Bemused)控制 Totem"
+#: ../src/totem-subtitle-encoding.c:243
+msgid "Gurmukhi"
+msgstr "旁遮普语"
 
-#~ msgid "Untitled %d"
-#~ msgstr "无标题 %d"
+#: ../src/totem-subtitle-encoding.c:246 ../src/totem-subtitle-encoding.c:248
+#: ../src/totem-subtitle-encoding.c:250 ../src/totem-subtitle-encoding.c:252
+msgid "Hebrew"
+msgstr "希伯来语"
 
-#~ msgid "Totem Bemused Server"
-#~ msgstr "Totem Bemused 服务器"
+#: ../src/totem-subtitle-encoding.c:255
+msgid "Hebrew Visual"
+msgstr "希伯来语视觉"
 
-#~ msgid "Totem Bemused Server version 1.0"
-#~ msgstr "Totem Bemused 服务器 版本 1.0"
+#: ../src/totem-subtitle-encoding.c:258
+msgid "Hindi"
+msgstr "印地语"
 
-#~ msgid "A plugin to let you browse YouTube videos."
-#~ msgstr "一个可以浏览 YouTube 视频的插件"
+#: ../src/totem-subtitle-encoding.c:261
+msgid "Icelandic"
+msgstr "冰岛语"
 
-#~ msgid "YouTube Browser"
-#~ msgstr "YouTube 浏览器"
+#: ../src/totem-subtitle-encoding.c:264 ../src/totem-subtitle-encoding.c:266
+#: ../src/totem-subtitle-encoding.c:268
+msgid "Japanese"
+msgstr "日语"
 
-#~ msgid "Related Videos"
-#~ msgstr "相关视频"
+#: ../src/totem-subtitle-encoding.c:271 ../src/totem-subtitle-encoding.c:273
+#: ../src/totem-subtitle-encoding.c:275 ../src/totem-subtitle-encoding.c:277
+msgid "Korean"
+msgstr "韩语"
 
-#~ msgid "Search Results"
-#~ msgstr "搜索结果"
+#: ../src/totem-subtitle-encoding.c:280
+msgid "Nordic"
+msgstr "北欧"
 
-#~ msgid "Videos"
-#~ msgstr "所有视频"
+#: ../src/totem-subtitle-encoding.c:283
+msgid "Persian"
+msgstr "波斯语"
 
-#~ msgid "_Open in Web Browser"
-#~ msgstr "在浏览器中打开(_O)"
+#: ../src/totem-subtitle-encoding.c:286 ../src/totem-subtitle-encoding.c:288
+msgid "Romanian"
+msgstr "罗马尼亚语"
 
-#~ msgid "Open the video in your web browser"
-#~ msgstr "在您的浏览器中打开"
+#: ../src/totem-subtitle-encoding.c:291
+msgid "South European"
+msgstr "南欧"
 
-#~ msgid "YouTube"
-#~ msgstr "YouTube"
+#: ../src/totem-subtitle-encoding.c:294
+msgid "Thai"
+msgstr "泰语"
 
-#~ msgid "Cancelling query…"
-#~ msgstr "取消请求..."
+#: ../src/totem-subtitle-encoding.c:297 ../src/totem-subtitle-encoding.c:299
+#: ../src/totem-subtitle-encoding.c:301 ../src/totem-subtitle-encoding.c:303
+msgid "Turkish"
+msgstr "土耳其语"
 
-#~ msgid "Error Searching for Videos"
-#~ msgstr "获取视频时出错"
+#: ../src/totem-subtitle-encoding.c:306 ../src/totem-subtitle-encoding.c:308
+#: ../src/totem-subtitle-encoding.c:310 ../src/totem-subtitle-encoding.c:312
+#: ../src/totem-subtitle-encoding.c:314
+msgid "Unicode"
+msgstr "Unicode"
 
-#~ msgid ""
-#~ "The response from the server could not be understood. Please check you "
-#~ "are running the latest version of libgdata."
-#~ msgstr "服务器返回值无法解析。请检查您是否在运行 libgdata 的最新版本。"
+#: ../src/totem-subtitle-encoding.c:317 ../src/totem-subtitle-encoding.c:319
+#: ../src/totem-subtitle-encoding.c:321 ../src/totem-subtitle-encoding.c:323
+#: ../src/totem-subtitle-encoding.c:325
+msgid "Western"
+msgstr "西方"
 
-#~ msgid "Fetching search results…"
-#~ msgstr "正在获取搜索结果..."
+#: ../src/totem-subtitle-encoding.c:328 ../src/totem-subtitle-encoding.c:330
+#: ../src/totem-subtitle-encoding.c:332
+msgid "Vietnamese"
+msgstr "越南语"
 
-#~ msgid "Fetching related videos…"
-#~ msgstr "正在获取相关视频..."
+#: ../src/totem-uri.c:343 ../src/plugins/chapters/totem-chapters.c:998
+msgid "All files"
+msgstr "全部文件"
 
-#~ msgid "Error Opening Video in Web Browser"
-#~ msgstr "在浏览器中打开时出错"
+#: ../src/totem-uri.c:348 ../src/plugins/chapters/totem-chapters.c:995
+msgid "Supported files"
+msgstr "支持的文件"
 
-#~ msgid "Fetching more videos…"
-#~ msgstr "正在获取更多视频..."
+#: ../src/totem-uri.c:360
+msgid "Audio files"
+msgstr "音频文件"
 
-#~ msgid "Video Format Not Supported"
-#~ msgstr "不支持的视频格式"
+#: ../src/totem-uri.c:368
+msgid "Video files"
+msgstr "视频文件"
 
-#~ msgid ""
-#~ "This video is not available in any formats which Totem supports. Would "
-#~ "you like to open it in your web browser instead?"
-#~ msgstr "该视频不是 Totem 支持格式。您是希望尝试在网页浏览器中打开它？"
+#: ../src/totem-uri.c:378
+msgid "Subtitle files"
+msgstr "字幕文件"
 
-#~ msgid "0 frames per second"
-#~ msgstr "0 帧每秒"
+#: ../src/totem-uri.c:430
+msgid "Select Text Subtitles"
+msgstr "选择文本字幕"
 
-#~ msgid "0 kbps"
-#~ msgstr "0 kbps"
+#: ../src/totem-uri.c:495
+msgid "Select Movies or Playlists"
+msgstr "选择电影或播放列表"
 
-#~ msgid "0 x 0"
-#~ msgstr "0 x 0"
+#: ../src/totem-uri.c:499
+msgid "Add Directory"
+msgstr "添加目录"
 
-#~ msgid "Zoom Out"
-#~ msgstr "缩小"
+#: ../src/totem-video-list.c:330
+msgid "No video URI"
+msgstr "没有视频 URI"
 
-#~ msgid "Zoom Reset"
-#~ msgstr "缩放重置"
+#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
+#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
+#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
+#: ../src/totem-video-thumbnailer.c:841
+#, c-format
+msgid ""
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
+msgstr ""
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 
-#~ msgid "Zoom out"
-#~ msgstr "缩小"
+#: ../src/totem-video-thumbnailer.c:842
+msgid "Filename"
+msgstr "文件名"
 
-#~ msgid "Zoom reset"
-#~ msgstr "缩放重置"
+#: ../src/totem-video-thumbnailer.c:844
+msgid "Resolution"
+msgstr "分辨率"
 
-#~ msgid "Enable visual effects?"
-#~ msgstr "启用视觉效果吗？"
+#: ../src/totem-video-thumbnailer.c:847
+msgid "Duration"
+msgstr "持续时间"
 
-#~ msgid ""
-#~ "It seems you are running Totem remotely.\n"
-#~ "Are you sure you want to enable the visual effects?"
-#~ msgstr ""
-#~ "似乎您正从远程运行 Totem。\n"
-#~ "您确实想要启用视觉效果吗？"
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:1
+msgid "Apple Trailers"
+msgstr "苹果预告片"
+
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:2
+msgid "Sets the user agent for the Apple Trailers site"
+msgstr "为苹果预告片站点设置用户代理"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:1
+msgid "Autoload Subtitles"
+msgstr "自动加载字幕"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:2
+msgid "Autoloads text subtitles"
+msgstr "自动加载文本字幕"
 
-#~ msgid ""
-#~ "The playback of this movie requires the following decoders which are not "
-#~ "installed:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "此电影的回放需要下列解码器，但这些解码器尚未安装：\n"
-#~ "\n"
-#~ "%s"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
+msgid "Video Disc Recorder"
+msgstr "视频光盘录制工具"
 
-#~ msgid "Media file could not be played."
-#~ msgstr "无法播放媒体文件。"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
+msgid "Records (S)VCDs or video DVDs"
+msgstr "录制 (S)VCD 或视频 DVD"
 
-#~ msgid "Too old version of GStreamer installed."
-#~ msgstr "安装的 GStreamer 版本太旧。"
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:65
+msgid "_Create Video Disc..."
+msgstr "创建视频光盘(_C)..."
 
-#~ msgid ""
-#~ "Failed to open video output. It may not be available. Please select "
-#~ "another video output in the Multimedia Systems Selector."
-#~ msgstr ""
-#~ "打开视频输出失败。该输出可能不可用。请在多媒体系统选择器中选择另外一个视频"
-#~ "输出。"
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:66
+msgid "Create a video DVD or a (S)VCD from the currently opened movie"
+msgstr "从当前已打开的电影创建视频 DVD 或 (S)VCD"
 
-#~ msgid ""
-#~ "Could not find the video output. You may need to install additional "
-#~ "GStreamer plugins, or select another video output in the Multimedia "
-#~ "Systems Selector."
-#~ msgstr ""
-#~ "找不到视频输出。您可能需要安装额外的 GStreamer 插件，或者多媒体系统选择器"
-#~ "中选择另外一个视频输出。"
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:68
+msgid "Copy Vide_o DVD..."
+msgstr "复制视频 DVD(_O)..."
 
-#~ msgid "%s"
-#~ msgstr "%s"
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:69
+msgid "Copy the currently playing video DVD"
+msgstr "复制当前正在播放的视频 DVD"
 
-#~ msgid "Delete"
-#~ msgstr "删除"
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:71
+msgid "Copy (S)VCD..."
+msgstr "复制视频 (S)VCD..."
 
-#~ msgid "Coherence DLNA/UPnP Client"
-#~ msgstr "Coherence DLNA/UPnP 客户端"
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:72
+msgid "Copy the currently playing (S)VCD"
+msgstr "复制正在播放的 (S)VCD"
 
-#~ msgid "A DLNA/UPnP client for Totem powered by Coherence"
-#~ msgstr "由 Coherence 支持的 Totem 下的DLNA/UPnP 客户端"
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:136
+msgid "The video disc could not be duplicated."
+msgstr "无法复制视频光盘。"
 
-#~ msgid "By artist"
-#~ msgstr "按照艺术家"
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:138
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:283
+msgid "The movie could not be recorded."
+msgstr "电影无法录制。"
 
-#~ msgid "By tag"
-#~ msgstr "按照标签"
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:164
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:174
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:270
+msgid "Unable to write a project."
+msgstr "无法写入项目。"
 
-#~ msgid "Jamendo Album Page"
-#~ msgstr "Jamendo 专辑页面"
+#: ../src/plugins/chapters/chapters-edit.ui.h:1
+msgid "Name for new chapter:"
+msgstr "新章节的名称："
 
-#~ msgid "Latest Releases"
-#~ msgstr "最近发行"
+#: ../src/plugins/chapters/chapters-list.ui.h:1
+msgid "_Remove Chapter"
+msgstr "移除章节(_R)"
 
-#~ msgid "Number of albums to _retrieve:"
-#~ msgstr "要检索的专辑数量(_R)："
+#: ../src/plugins/chapters/chapters-list.ui.h:2
+msgid "Remove the chapter from the list"
+msgstr "从列表中移除该章节"
 
-#~ msgid "Popular"
-#~ msgstr "流行的"
+#: ../src/plugins/chapters/chapters-list.ui.h:3
+msgid "_Go to Chapter"
+msgstr "转到章节(_G)"
 
-#~ msgid "Preferred audio _format:"
-#~ msgstr "首选音频格式(_F)"
+#: ../src/plugins/chapters/chapters-list.ui.h:4
+msgid "Go to the chapter in the movie"
+msgstr "转到电影中该章节"
 
-#~ msgid "_Open Jamendo Album Page in Browser"
-#~ msgstr "在浏览器中打开 Jamendo 专辑页面(_O)"
+#: ../src/plugins/chapters/chapters-list.ui.h:5
+msgid "Add Chapter..."
+msgstr "添加章节..."
 
-#~ msgid "Jamendo"
-#~ msgstr "Jamendo"
+#: ../src/plugins/chapters/chapters-list.ui.h:6
+msgid "Remove Chapter"
+msgstr "移除章节"
 
-#~ msgid ""
-#~ "Listen to the large collection of Creative Commons licensed music on "
-#~ "Jamendo."
-#~ msgstr "收听 Jamendo 收集的在创作共用许可下发布的大量音乐。"
+#: ../src/plugins/chapters/chapters-list.ui.h:7
+msgid "Go to Chapter"
+msgstr "转到章节"
 
-#~ msgid "You need to install the Python simplejson module."
-#~ msgstr "您需要安装 python simplejson 模块。"
+#: ../src/plugins/chapters/chapters-list.ui.h:8
+msgid "Save Changes"
+msgstr "保存更改"
 
-#~ msgid "Artist: %s"
-#~ msgstr "艺术家：%s"
+#: ../src/plugins/chapters/chapters-list.ui.h:9
+msgid "No chapter data"
+msgstr "没有章节数据"
 
-#~ msgid "%Y-%m-%d"
-#~ msgstr "%Y-%m-%d"
+#: ../src/plugins/chapters/chapters-list.ui.h:10
+msgid "Load Chapters..."
+msgstr "加载章节..."
 
-#~ msgid "%x"
-#~ msgstr "%x"
+#: ../src/plugins/chapters/chapters-list.ui.h:11
+msgid "Load chapters from an external CMML file"
+msgstr "从外部 CMML 文件中加载章节"
 
-#~ msgid "Genre: %s"
-#~ msgstr "流派：%s"
+#: ../src/plugins/chapters/chapters-list.ui.h:12
+msgid "Add New Chapters"
+msgstr "添加新章节"
 
-#~ msgid "Released on: %s"
-#~ msgstr "发行于：%s"
+#: ../src/plugins/chapters/chapters-list.ui.h:13
+msgid "Create a new chapter list for the movie"
+msgstr "为该电影创建新的章节列表"
 
-#~ msgid "License: %s"
-#~ msgstr "许可证：%s"
+#: ../src/plugins/chapters/chapters.plugin.in.h:1
+#: ../src/plugins/chapters/totem-chapters.c:1139
+msgid "Chapters"
+msgstr "章节"
 
-#~ msgid "%02d. %s"
-#~ msgstr "%02d. %s"
+#: ../src/plugins/chapters/chapters.plugin.in.h:2
+msgid "Support chapter markers in movies"
+msgstr "支持在电影中使用章节标记"
 
-#~ msgid "Album: %s"
-#~ msgstr "专辑：%s"
+#: ../src/plugins/chapters/totem-chapters.c:56
+#, c-format
+msgid ""
+"Title: %s\n"
+"Start time: %s"
+msgstr ""
+"标题： %s\n"
+"起始时间：%s"
 
-#~ msgid "Duration: %s"
-#~ msgstr "时长：%s"
+#: ../src/plugins/chapters/totem-chapters.c:328
+msgid "Error while reading file with chapters"
+msgstr "使用章节读取文件时出错"
 
-#~ msgid "Fetching albums, please wait…"
-#~ msgstr "正在获取专辑，请等待..."
+#: ../src/plugins/chapters/totem-chapters.c:543
+msgid "Chapter with the same time already exists"
+msgstr "有相同时间的章节已经存在"
 
-#~ msgid ""
-#~ "Failed to connect to Jamendo server.\n"
-#~ "%s."
-#~ msgstr ""
-#~ "无法连接到 Jamendo 服务器。\n"
-#~ "%s."
+#: ../src/plugins/chapters/totem-chapters.c:544
+msgid "Try another name or remove an existing chapter."
+msgstr "尝试其它名称或移除已经存在的章节。"
 
-#~ msgid "The Jamendo server returned code %s."
-#~ msgstr "Jamendo 服务器返回代码 %s"
+#: ../src/plugins/chapters/totem-chapters.c:717
+msgid "Error while writing file with chapters"
+msgstr "使用章节写入文件时出错"
 
-#~ msgid "An error occurred while fetching albums."
-#~ msgstr "获取专辑时发生一个错误。"
+#: ../src/plugins/chapters/totem-chapters.c:842
+msgid "Error occurred while saving chapters"
+msgstr "保存章节时发生错误"
 
-#~ msgid "%H:%M:%S"
-#~ msgstr "%H:%M:%S"
+#: ../src/plugins/chapters/totem-chapters.c:843
+msgid ""
+"Please check you have permission to write to the folder containing the movie."
+msgstr "请检查您是否对包含电影的目录拥有写权限。"
 
-#~ msgid "%M:%S"
-#~ msgstr "%M:%S"
+#: ../src/plugins/chapters/totem-chapters.c:976
+msgid "Open Chapter File"
+msgstr "打开章节文件"
 
-#~ msgid "en"
-#~ msgstr "zh"
+#: ../src/plugins/chapters/totem-chapters.c:1093
+msgid "Chapter Screenshot"
+msgstr "章节截图"
 
-#~ msgid "Audio format to download from Jamendo"
-#~ msgstr "从 Jamendo 下载的音频格式"
+#: ../src/plugins/chapters/totem-chapters.c:1104
+msgid "Chapter Title"
+msgstr "章节标题"
 
-#~ msgid "Number of results per page"
-#~ msgstr "每页结果数"
+#: ../src/plugins/chapters/totem-chapters.c:1184
+msgid "Save changes to chapter list before closing?"
+msgstr "是否在关闭前保存章节列表的更改？"
 
-#~ msgid ""
-#~ "The number of Jamendo search results to display in each page of results."
-#~ msgstr "每页中显示 Jamendo 搜索结果的数量。"
+#. Translators: close Totem without saving changes to the chapter list of the current movie.
+#: ../src/plugins/chapters/totem-chapters.c:1189
+msgid "Close without Saving"
+msgstr "关闭但不保存"
 
-#~ msgid "The preferred audio format to download tracks from Jamendo in."
-#~ msgstr "从 Jamendo 中下载音频优先使用的音频格式。"
+#. Translators: save changes to the chapter list of the current movie before closing Totem.
+#: ../src/plugins/chapters/totem-chapters.c:1191
+msgid "Save"
+msgstr "保存"
 
-#~ msgid "Language"
-#~ msgstr "语言"
+#: ../src/plugins/chapters/totem-chapters.c:1194
+msgid "If you don't save, changes to the chapter list will be lost."
+msgstr "如果您放弃保存，对章节列表所做的更改将会丢失。"
 
-#~ msgid "Could not connect to Tracker"
-#~ msgstr "无法连接到 Tracker"
+#: ../src/plugins/chapters/totem-cmml-parser.c:651
+msgid "Failed to parse CMML file"
+msgstr "解析 CMML 文件失败"
 
-#~ msgid "No results"
-#~ msgstr "无结果"
+#: ../src/plugins/chapters/totem-edit-chapter.c:95
+msgid "Add Chapter"
+msgstr "添加章节"
 
-#~ msgid "Showing %i - %i of %i match"
-#~ msgid_plural "Showing %i - %i of %i matches"
-#~ msgstr[0] "显示 %i - %i 项，共有 %i 项匹配"
+#: ../src/plugins/dbusservice/dbusservice.plugin.in.h:1
+msgid "D-Bus Service"
+msgstr "D-Bus 服务"
 
-#~ msgid "Page"
-#~ msgstr "页面"
+#: ../src/plugins/dbusservice/dbusservice.plugin.in.h:2
+msgid ""
+"Plugin for sending notifications of currently playing movies to the D-Bus "
+"subsystem."
+msgstr "向 D-Bus 子系统传送当前播放的视频的通知插件。"
 
-#~ msgid "Set the window icon to the thumbnail of the playing movie"
-#~ msgstr "设置窗口图标为当前播放电影的缩略图"
+#: ../src/plugins/dbusservice/dbusservice.py:213
+#: ../src/plugins/dbusservice/dbusservice.py:243
+#, python-format
+msgid "The MediaPlayer2 object does not implement the ‘%s’ interface"
+msgstr "MediaPlayer2 对象未实现“%s”接口"
 
-#~ msgid "Thumbnail"
-#~ msgstr "缩略图"
+#: ../src/plugins/dbusservice/dbusservice.py:222
+#, python-format
+msgid "The property ‘%s’ is not writeable."
+msgstr "“%s”属性不可写。"
 
-#~ msgid "Search for local videos using Tracker"
-#~ msgstr "使用 Tracker 搜索本地视频"
+#: ../src/plugins/dbusservice/dbusservice.py:238
+#, python-format
+msgid "Unknown property ‘%s’ requested of a MediaPlayer 2 object"
+msgstr "请求了 MediaPlayer 2 对象的未知属性“%s”"
 
-#~ msgid "Browser Plugin using %s"
-#~ msgstr "使用 %s 的浏览器插件"
+#: ../src/plugins/dbusservice/dbusservice.py:341
+#, python-format
+msgid "The URI ‘%s’ is not supported."
+msgstr "不支持 URI “%s”。"
 
-#~ msgid "Totem Browser Plugin"
-#~ msgstr "Totem 浏览器插件"
+#: ../src/plugins/grilo/grilo.plugin.in.h:1
+msgid "Grilo Browser"
+msgstr "Grilo 浏览器"
 
-#~ msgid "Error loading Galago plugin"
-#~ msgstr "加载 Galago 插件出错"
+#: ../src/plugins/grilo/grilo.plugin.in.h:2
+msgid "A plugin to let you browse media content from various sources"
+msgstr "一个可以浏览各种来源的多媒体内容的插件"
 
-#~ msgid "Could not connect to the Galago daemon."
-#~ msgstr "无法连接到 Galago 守护程序"
+#: ../src/plugins/grilo/grilo.ui.h:1
+msgid "Add to Playlist"
+msgstr "添加到播放列表"
 
-#~ msgid "Don't connect to an already-running instance"
-#~ msgstr "不要连接正在运行的实例"
+#: ../src/plugins/grilo/grilo.ui.h:2
+msgid "Copy Location"
+msgstr "复制位置"
 
-#~ msgid "Could not open link"
-#~ msgstr "无法打开链接"
+#: ../src/plugins/grilo/grilo.ui.h:3 ../src/plugins/grilo/totem-grilo.c:1186
+msgid "Browse"
+msgstr "浏览"
 
-#~ msgid "Totem could not initialize the configuration engine."
-#~ msgstr "Totem 无法初始化配置引擎。"
+#: ../src/plugins/grilo/grilo.ui.h:4 ../src/plugins/grilo/totem-grilo.c:1229
+msgid "Search"
+msgstr "搜索"
 
-#~ msgid "Make sure that GNOME is properly installed."
-#~ msgstr "请确认 GNOME 安装正确。"
+#: ../src/plugins/grilo/totem-grilo.c:454
+msgid "Browse Error"
+msgstr "浏览错误"
 
-#~ msgid "Chapters support"
-#~ msgstr "章节支持"
+#: ../src/plugins/grilo/totem-grilo.c:609
+msgid "Search Error"
+msgstr "搜索错误"
 
-#~ msgid "Continue to watch movie without loaded chapters"
-#~ msgstr "不使用已加载的章节，继续观看电影"
+#: ../src/plugins/gromit/gromit.plugin.in.h:1
+msgid "Gromit Annotations"
+msgstr "Gromit 批注"
 
-#~ msgid "_Go to"
-#~ msgstr "转到(_G)"
+#: ../src/plugins/gromit/gromit.plugin.in.h:2
+msgid "Presentation helper to make annotations on screen"
+msgstr "在屏幕上作批注的演示助手程序"
 
-#~ msgid "Please check you rights and free space"
-#~ msgstr "请检查您的权限和剩余空间"
+#: ../src/plugins/gromit/totem-gromit.c:231
+msgid "The gromit binary was not found."
+msgstr "Gromit 二进制文件未找到。"
 
-#~ msgid "Recordings"
-#~ msgstr "录制节目"
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
+msgid "Instant Messenger Status"
+msgstr "即时通讯状态"
 
-#~ msgid "MythTV Recordings"
-#~ msgstr "MythTV 录制节目"
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
+msgid "Set your Instant Messenger status to away when a movie is playing"
+msgstr "播放电影时将您的即时通讯软件状态设定为离开"
 
-#~ msgid "MythTV LiveTV"
-#~ msgstr "MythTV LiveTV"
+#: ../src/plugins/lirc/lirc.plugin.in.h:1
+msgid "Infrared Remote Control"
+msgstr "红外遥控"
 
-#~ msgid "_Download Movie Subtitles..."
-#~ msgstr "下载影片字幕(_D)..."
+#: ../src/plugins/lirc/lirc.plugin.in.h:2
+msgid "Support infrared remote control"
+msgstr "支持红外遥控"
 
-#~ msgid "seconds"
-#~ msgstr "秒"
+#: ../src/plugins/lirc/totem-lirc.c:242
+msgid "Couldn't initialize lirc."
+msgstr "无法初始化 lirc。"
 
-#~ msgid "Could not get name and thumbnail for %s: %s"
-#~ msgstr "无法从%s：%s获取文件名和缩略图"
+#: ../src/plugins/lirc/totem-lirc.c:254
+msgid "Couldn't read lirc configuration."
+msgstr "无法读取 lirc 配置。"
 
-#~ msgid "Error Looking Up Video URI"
-#~ msgstr "锁定视频 URI 时出错"
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:1
+msgid "Media Player Keys"
+msgstr "媒体播放器按键"
+
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:2
+msgid "Support additional media player keys"
+msgstr "支持附加的媒体播放器按键"
 
-#~ msgid "Author:"
-#~ msgstr "作者："
+#: ../src/plugins/ontop/ontop.plugin.in.h:1
+msgid "Always On Top"
+msgstr "总是位于顶端"
 
-#~ msgid "C_onfigure..."
-#~ msgstr "配置(_O)..."
+#: ../src/plugins/ontop/ontop.plugin.in.h:2
+msgid "Keep the main window on top when playing a movie"
+msgstr "播放电影时将主窗口置于顶端"
 
-#~ msgid "Copyright:"
-#~ msgstr "版权："
+#: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:1
+msgid "Subtitle Downloader"
+msgstr "字幕下载器"
 
-#~ msgid "Description:"
-#~ msgstr "描述："
+#: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:2
+msgid "Look for subtitles for the currently playing movie"
+msgstr "为当前播放的影片查找字幕"
 
-#~ msgid "Site:"
-#~ msgstr "网站："
+#: ../src/plugins/opensubtitles/opensubtitles.py:42
+msgid "Brazilian Portuguese"
+msgstr "巴西葡萄牙语"
 
-#~ msgid ""
-#~ "Approximate network connection speed, used to select quality on media "
-#~ "over the network: \"0\" for 14.4 Kbps Modem, \"1\" for 19.2 Kbps Modem, "
-#~ "\"2\" for 28.8 Kbps Modem, \"3\" for 33.6 Kbps Modem, \"4\" for 34.4 Kbps "
-#~ "Modem, \"5\" for 56 Kbps Modem/ISDN, \"6\" for 112 Kbps Dual ISDN/DSL, \"7"
-#~ "\" for 256 Kbps DSL/Cable, \"8\" for 384 Kbps DSL/Cable, \"9\" for 512 "
-#~ "Kbps DSL/Cable, \"10\" for 1.5 Mbps T1/Intranet/LAN, \"11\" for Intranet/"
-#~ "LAN."
-#~ msgstr ""
-#~ "大致的网络连接速度，用于选择网络上的媒介质量：\"0\" 适合 14.4 Kbps Modem, "
-#~ "\"1\" 适合 19.2 Kbps Modem, \"2\" 适合 28.8 Kbps Modem, \"3\" 适合 33.6 "
-#~ "Kbps Modem, \"4\" 适合 34.4 Kbps Modem, \"5\" 适合56 Kbps Modem/ISDN, \"6"
-#~ "\" 适合 112 Kbps Dual ISDN/DSL, \"7\" 适合 256 Kbps DSL/Cable, \"8\" 适合 "
-#~ "384 Kbps DSL/Cable, \"9\" 适合 512 Kbps DSL/Cable, \"10\" 适合 1.5 Mbps "
-#~ "T1/Intranet/LAN, \"11\" 适合 Intranet/LAN."
+#: ../src/plugins/opensubtitles/opensubtitles.py:177
+msgid "Searching for subtitles…"
+msgstr "正在搜索字幕..."
 
-#~ msgid ""
-#~ "Quality settings for the audio visualization: \"0\" for small, \"1\" for "
-#~ "normal, \"2\" for large, \"3\" for extra large."
-#~ msgstr "音频可视化的质量设定：“0”为小，“1”为正常，“2”为大，“3” 为极大。"
+#: ../src/plugins/opensubtitles/opensubtitles.py:225
+#: ../src/plugins/opensubtitles/opensubtitles.py:645
+msgid "Downloading the subtitles…"
+msgstr "正在下载字幕..."
 
-#~ msgid ""
-#~ "Type of audio output to use: \"0\" for stereo, \"1\" for 4-channel "
-#~ "output, \"2\" for 5.0 channel output, \"3\" for 5.1 channel output, \"4\" "
-#~ "for AC3 Passthrough."
-#~ msgstr ""
-#~ "使用的音频输出类型：“0”为立体声，“1”为 4 声道输出，“2”为 5.0 声道输"
-#~ "出，“3”为 5.1 声道输出，“4”为通过 AC3 输出。"
+#: ../src/plugins/opensubtitles/opensubtitles.py:290
+msgid "Could not contact the OpenSubtitles website"
+msgstr "无法连接 OpenSubtitles 网站"
 
-#~ msgid "UTF-8"
-#~ msgstr "GBK"
+#: ../src/plugins/opensubtitles/opensubtitles.py:323
+#: ../src/plugins/opensubtitles/opensubtitles.py:341
+msgid "Could not contact the OpenSubtitles website."
+msgstr "无法连接 OpenSubtitles 网站。"
 
-#~ msgid "Whether to autoload external chapter files when a movie is loaded."
-#~ msgstr "在载入电影时是否自动载入外部章节文件。"
+#: ../src/plugins/opensubtitles/opensubtitles.py:329
+msgid "No results found."
+msgstr "没有找到结果。"
 
-#~ msgid ""
-#~ "Changing the visuals effect type will require a restart to take effect."
-#~ msgstr "更改视觉效果类型需要重新启动才能生效。"
+#: ../src/plugins/opensubtitles/opensubtitles.py:478
+msgid "Subtitles"
+msgstr "字幕"
 
-#~ msgid ""
-#~ "The change of audio output type will only take effect when Totem is "
-#~ "restarted."
-#~ msgstr "对此设置的更改将会在下部电影或 Totem 重新启动后生效。"
+#. translators comment:
+#. This is the file-type of the subtitle file detected
+#: ../src/plugins/opensubtitles/opensubtitles.py:484
+msgid "Format"
+msgstr "格式"
 
-#~ msgid "Plugin"
-#~ msgstr "插件"
+#. translators comment:
+#. This is a rating of the quality of the subtitle
+#: ../src/plugins/opensubtitles/opensubtitles.py:489
+msgid "Rating"
+msgstr "评分"
 
-#~ msgid "Enabled"
-#~ msgstr "启用"
+#: ../src/plugins/opensubtitles/opensubtitles.py:525
+msgid "Download movie subtitles from OpenSubtitles"
+msgstr "从 OpenSubtitles 下载影片字幕"
 
-#~ msgid ""
-#~ "Unable to activate plugin %s.\n"
-#~ "%s"
-#~ msgstr ""
-#~ "无法激活插件 %s 。\n"
-#~ "%s"
+#: ../src/plugins/opensubtitles/opensubtitles.py:527
+msgid "_Download Movie Subtitles…"
+msgstr "下载影片字幕(_D)..."
 
-#~ msgid "Unable to activate plugin %s"
-#~ msgstr "无法激活插件 %s"
+#: ../src/plugins/opensubtitles/opensubtitles.py:589
+msgid "Searching subtitles…"
+msgstr "正在搜索字幕..."
 
-#~ msgid "Plugin Error"
-#~ msgstr "插件错误"
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
+msgid "Download Movie Subtitles"
+msgstr "下载影片字幕"
 
-#~ msgid "Jamendo Plugin Configuration"
-#~ msgstr "Jamendo 插件配置"
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
+msgid "Subtitle _language:"
+msgstr "字幕语言(_L)："
 
-#~ msgid "Could not load the \"Skip to\" dialog interface."
-#~ msgstr "无法载入“跳至” 对话框界面。"
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
+msgid "_Play with Subtitle"
+msgstr "随字幕播放(_P)"
 
-#~ msgid "Deinterlace"
-#~ msgstr "去隔行扫描"
+#: ../src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in.h:1
+msgid "Subtitle language"
+msgstr "字幕语言"
 
-#~ msgid "_Deinterlace"
-#~ msgstr "隔行扫描(_D)"
+#: ../src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in.h:2
+msgid "The language to search for subtitles for movies in."
+msgstr "搜索影片字幕所使用的语言。"
 
-#~ msgid "Enable deinterlacing"
-#~ msgstr "启用隔行扫描"
+#: ../src/plugins/properties/movie-properties.plugin.in.h:1
+msgid "Movie Properties"
+msgstr "电影属性"
+
+#: ../src/plugins/properties/movie-properties.plugin.in.h:2
+msgid "Adds movie properties to the sidebar"
+msgstr "将电影属性添加到侧边栏"
 
-#~ msgid "Whether the main window should stay on top"
-#~ msgstr "是否主窗口显示在最前端"
+#: ../src/plugins/properties/totem-movie-properties.c:246
+msgid "Properties"
+msgstr "属性"
 
-#~ msgid "Whether the main window should stay on top of the other ones"
-#~ msgstr "是否主窗口显示在别的窗口前面。"
+#: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:1
+msgid "rpdb2 password"
+msgstr "rpdb2 密码"
 
-#~ msgid "Buffer size"
-#~ msgstr "缓冲大小"
+#: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:2
+msgid ""
+"A password to protect the rpdb2 server for debugging Totem from unauthorized "
+"remote access. If this is empty, a default of 'totem' will be used."
+msgstr ""
+"一个防止调试 Totem 用的 rpdb2 服务器遭受未授权网络访问的密码。如果留空，将默"
+"认使用 totem 作为密码。"
 
-#~ msgid "Maximum amount of data to decode ahead of display (in seconds)"
-#~ msgstr "数据解码的提前量最大值(以秒计)"
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
+msgid "Python Console"
+msgstr "Python 控制台"
 
-#~ msgid "Could not launch URL \"%s\": %s"
-#~ msgstr "无法启动 URL “%s”：%s"
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
+msgid "Interactive Python console"
+msgstr "交互式 Python 控制台"
 
-#~ msgid "Default browser not configured"
-#~ msgstr "尚未配置默认浏览器"
+#: ../src/plugins/pythonconsole/pythonconsole.py:88
+msgid "Python Console Menu"
+msgstr "Python 控制台菜单"
 
-#~ msgid "Error launching URI"
-#~ msgstr "启动 URI 出错"
+#: ../src/plugins/pythonconsole/pythonconsole.py:93
+msgid "_Python Console"
+msgstr "Python 控制台(_P)"
 
-#~ msgid "DVB Adapter %u"
-#~ msgstr "DVB 适配器 %u"
+#: ../src/plugins/pythonconsole/pythonconsole.py:94
+msgid "Show Totem's Python console"
+msgstr "显示 Totem 的 Python 控制台"
 
-#~ msgid "Watch TV on '%s'"
-#~ msgstr "观看“%s”上的电视节目"
+#: ../src/plugins/pythonconsole/pythonconsole.py:100
+msgid "Python Debugger"
+msgstr "Python 调试器"
 
-#~ msgid ""
-#~ "Totem cannot play TV, because no TV adapters are present or they are not "
-#~ "supported."
-#~ msgstr "Totem 无法播放电视，原因是没有电视适配器或者该适配器不被支持。"
+#: ../src/plugins/pythonconsole/pythonconsole.py:101
+msgid "Enable remote Python debugging with rpdb2"
+msgstr "允许使用 rpdb2 进行远程 Python 调试"
 
-#~ msgid "Please insert a supported TV adapter."
-#~ msgstr "请插入一个被支持的电视适配器。"
+#. pylint: disable-msg=E1101
+#: ../src/plugins/pythonconsole/pythonconsole.py:125
+#, python-format
+msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
+msgstr "您可以通过“totem_object”访问 totem 对象：\\n%s"
 
-#~ msgid "More information about watching TV"
-#~ msgstr "更多的看电视的信息"
+#: ../src/plugins/pythonconsole/pythonconsole.py:129
+msgid "Totem Python Console"
+msgstr "Totem Python 控制台"
 
-#~ msgid "Totem is missing a channels listing to be able to tune the receiver."
-#~ msgstr "Totem 缺少用以调节接收器的频道列表。"
+#: ../src/plugins/pythonconsole/pythonconsole.py:139
+msgid ""
+"After you press OK, Totem will wait until you connect to it with winpdb or "
+"rpdb2. If you have not set a debugger password in DConf, it will use the "
+"default password ('totem')."
+msgstr ""
+"在您点击确定之后，Totem 将一直等到您连接到 winpdb 或 rpdb2。如果您没有在 "
+"DConf 中设置调试器密码，将使用默认密码(“totem”)。"
 
-#~ msgid ""
-#~ "Please follow the instructions provided in the link to create a channels "
-#~ "listing."
-#~ msgstr "请按照链接中提供的指示创建一个频道列表。"
+#: ../src/plugins/recent/recent.plugin.in.h:1
+msgid "Recent files"
+msgstr "最近的文件"
+
+#: ../src/plugins/recent/recent.plugin.in.h:2
+msgid "Adds files that have been played to recent files"
+msgstr "将播放过的文件列入最近的文件"
 
-#~ msgid ""
-#~ "Totem cannot play this type of media (%s) because the TV device is busy."
-#~ msgstr "Totem 无法播放此介质类型(%s)，原因是电视设备处于忙碌状态。"
+#: ../src/plugins/rotation/rotation.plugin.in.h:1
+msgid "Rotation Plugin"
+msgstr "旋转插件"
 
-#~ msgid "Please try again later."
-#~ msgstr "请稍后再试。"
+#: ../src/plugins/rotation/rotation.plugin.in.h:2
+msgid "Allows videos to be rotated if they are in the wrong orientation"
+msgstr "允许旋转方向错误的视频"
 
-#~ msgid "TV signal lost"
-#~ msgstr "电视信号丢失"
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:50
+msgid "_Rotate Clockwise"
+msgstr "顺时针旋转(_R)"
 
-#~ msgid "Please verify your hardware setup."
-#~ msgstr "请检查您的硬件安装是否正确。"
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:52
+msgid "Rotate Counterc_lockwise"
+msgstr "逆时针旋转(_L)"
 
-#~ msgid "Totem could not play '%s'"
-#~ msgstr "Totem 无法播放“%s”"
+#: ../src/plugins/save-file/save-file.plugin.in.h:1
+msgid "Save Copy"
+msgstr "保存副本"
 
-#~ msgid "Sets 16:9 (Anamorphic) aspect ratio"
-#~ msgstr "设置 16:9(变形) 纵横比"
+#: ../src/plugins/save-file/save-file.plugin.in.h:2
+msgid "Save a copy of the currently playing movie"
+msgstr "保存正在播放电影的一个副本"
 
-#~ msgid "Screenshot%d.jpg"
-#~ msgstr "屏幕快照%d.jpg"
+#: ../src/plugins/save-file/totem-save-file.c:63
+msgid "Save a Copy..."
+msgstr "保存副本..."
 
-#~ msgid "Sound volume"
-#~ msgstr "音量"
+#: ../src/plugins/save-file/totem-save-file.c:64
+msgid "Save a copy of the movie"
+msgstr "保存电影副本"
 
-#~ msgid "Sound volume, in percent, between 0 and 100"
-#~ msgstr "音量百分比，在 0 到 100 之间"
+#: ../src/plugins/save-file/totem-save-file.c:129
+msgid "Save a Copy"
+msgstr "保存副本"
 
-#~ msgid "_Allow the screensaver to activate even when audio-only is playing"
-#~ msgstr "在只播放音频时允许启动屏保(_A)"
+#. translators: Movie is the default saved movie filename,
+#. * without the suffix
+#: ../src/plugins/save-file/totem-save-file.c:161
+msgid "Movie"
+msgstr "电影"
 
-#~ msgid "Print playing movie"
-#~ msgstr "打印正在播放的电影"
+#: ../src/plugins/save-file/totem-save-file.c:183
+msgid "Movie stream"
+msgstr "流媒体电影"
 
-#~ msgid "Failed to retrieve working directory"
-#~ msgstr "获取工作目录失败"
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:1
+msgid "Screen Saver"
+msgstr "屏幕保护程序"
+
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:2
+msgid "Deactivates the screen saver when a movie is playing"
+msgstr "当播放电影时停用屏幕保护程序"
 
-#~ msgid ""
-#~ "Couldn't load the '%s' audio driver\n"
-#~ "Check that the device is not busy."
-#~ msgstr ""
-#~ "无法装入“%s”音频驱动程序\n"
-#~ "请检查设备是否处于空闲。"
+#: ../src/plugins/screenshot/gallery.ui.h:1
+msgid "Screenshot width (in pixels):"
+msgstr "屏幕截图宽度(像素单位)："
 
-#~ msgid ""
-#~ "No video output is available. Make sure that the program is correctly "
-#~ "installed."
-#~ msgstr "没有可用的视频输出。请确保程序安装正确。"
+#: ../src/plugins/screenshot/gallery.ui.h:2
+msgid "Calculate the number of screenshots"
+msgstr "计算屏幕截图的数量"
 
-#~ msgid ""
-#~ "The TV adapter could not tune into the channel. Please check your "
-#~ "hardware setup and channel configuration."
-#~ msgstr "电视适配器无法连接声道，请检查您的硬件安装和声道设置。"
+#: ../src/plugins/screenshot/gallery.ui.h:3
+msgid "Number of screenshots:"
+msgstr "屏幕截图数量："
 
-#~ msgid "The server you are trying to connect to is not known."
-#~ msgstr "您试图连接的服务器未知。"
+#. translators: this is the name of the file that gets made up
+#. * with the screenshot if the entire screen is taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:147
+#, c-format
+msgid "Screenshot from %s.png"
+msgstr "屏幕截图-%s.png"
 
-#~ msgid "The device name you specified (%s) seems to be invalid."
-#~ msgstr "您指定的设备名称(%s)似乎无效。"
+#. translators: this is the name of the file that gets
+#. * made up with the screenshot if the entire screen is
+#. * taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:154
+#, c-format
+msgid "Screenshot from %s - %d.png"
+msgstr "屏幕截图-%s-%d.png"
 
-#~ msgid "The server you are trying to connect to (%s) is unreachable."
-#~ msgstr "您试图连接的服务器(%s)无法接通。"
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:1
+msgid "Screenshot"
+msgstr "屏幕截图"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:2
+msgid "Allows screenshots and galleries to be taken of videos"
+msgstr "允许抓取视频屏幕截图和画册"
 
-#~ msgid "The connection to this server was refused."
-#~ msgstr "到此服务器的连接被拒绝。"
+#: ../src/plugins/screenshot/totem-gallery.c:91
+msgid "Save Gallery"
+msgstr "保存画册"
 
-#~ msgid "The specified movie could not be found."
-#~ msgstr "找不到指定电影。"
+# 与其他翻译“画册”统一
+#. Translators: The first argument is the movie title. The second
+#. * argument is a number which is used to prevent overwriting files.
+#. * Just translate "Gallery", and not the ".jpg". Example:
+#. * "Galerie-%s-%d.jpg".
+#: ../src/plugins/screenshot/totem-gallery.c:115
+#, c-format
+msgid "Gallery-%s-%d.jpg"
+msgstr "画册-%s-%d.jpg"
 
-#~ msgid ""
-#~ "The source seems encrypted and can't be read. Are you trying to play an "
-#~ "encrypted DVD without libdvdcss?"
-#~ msgstr ""
-#~ "节目源似乎被加密，所以无法读取。您是否尝试在没有 libdvdcss 的情况下播放加"
-#~ "密 DVD？"
+#. Set up the window
+#: ../src/plugins/screenshot/totem-gallery-progress.c:101
+msgid "Creating Gallery..."
+msgstr "正在创建画册..."
 
-#~ msgid "The movie could not be read."
-#~ msgstr "无法读取电影。"
+#. Set the progress label
+#: ../src/plugins/screenshot/totem-gallery-progress.c:107
+#, c-format
+msgid "Saving gallery as \"%s\""
+msgstr "另存画册为“%s”"
 
-#~ msgid "A problem occurred while loading a library or a decoder (%s)."
-#~ msgstr "装入库或解码器(%s)时发生问题。"
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:220
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
+msgid "Totem could not get a screenshot of the video."
+msgstr "Totem 无法获取该视频的屏幕截图。"
 
-#~ msgid "This file is encrypted and cannot be played back."
-#~ msgstr "此文件是加密的，无法继续播放。"
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
+msgid "This is not supposed to happen; please file a bug report."
+msgstr "不应该发生这种情况；请提交错误报告。"
 
-#~ msgid "For security reasons, this movie can not be played back."
-#~ msgstr "基于安全原因，不能播放电影。"
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
+msgid "Take _Screenshot"
+msgstr "抓取屏幕截图(_S)"
 
-#~ msgid "The audio device is busy. Is another application using it?"
-#~ msgstr "音频设备忙。是否正有其它程序在使用该设备？"
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
+msgid "Take a screenshot"
+msgstr "抓取屏幕截图"
 
-#~ msgid "Authentication is required to access this file."
-#~ msgstr "读取此文件需要认证。"
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
+msgid "Create Screenshot _Gallery..."
+msgstr "创建屏幕截图画册(_G)..."
 
-#~ msgid "Authentication is required to access this file or stream."
-#~ msgstr "读取此文件或流需要权限认证。"
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
+msgid "Create a gallery of screenshots"
+msgstr "创建一个屏幕截图画册"
 
-#~ msgid "You are not allowed to open this file."
-#~ msgstr "您无权打开此文件。"
+#: ../src/plugins/skipto/skipto.plugin.in.h:1
+#: ../src/plugins/skipto/totem-skipto.c:196
+msgid "Skip To"
+msgstr "跳至"
 
-#~ msgid "The server refused access to this file or stream."
-#~ msgstr "此服务器拒绝访问此文件或流。"
+#: ../src/plugins/skipto/skipto.plugin.in.h:2
+msgid "Provides the \"Skip to\" dialog"
+msgstr "提供“跳至”对话框"
 
-#~ msgid "The file you tried to play is an empty file."
-#~ msgstr "您试图播放的文件是空文件。"
+#: ../src/plugins/skipto/skipto.ui.h:1
+msgid "_Skip to:"
+msgstr "跳至(_S)："
 
-#~ msgid "There is no input plugin to handle the location of this movie"
-#~ msgstr "没有可处理此电影位置的输入插件。"
+#. Update the "seconds" label so that it always has the correct singular/plural form
+#. Translators: label for the seconds selector in the "Skip to" dialogue
+#: ../src/plugins/skipto/totem-skipto.c:159
+msgid "second"
+msgid_plural "seconds"
+msgstr[0] "秒"
 
-#~ msgid "There is no plugin to handle this movie."
-#~ msgstr "没有可处理此电影的插件。"
+#. Fix the label width at the maximum necessary for the plural labels, to prevent it changing size when we change the spinner value
+#. Translators: you should translate this string to a number (written in digits) which corresponds to the longer character length of the
+#. * translations for "second" and "seconds", as translated elsewhere in this file. For example, in English, "second" is 6 characters long and
+#. * "seconds" is 7 characters long, so this string should be translated to "7". See: bgo#639398
+#: ../src/plugins/skipto/totem-skipto.c:189
+msgctxt "Skip To label length"
+msgid "7"
+msgstr "7"
 
-#~ msgid "This movie is broken and can not be played further."
-#~ msgstr "此电影已损坏，无法继续播放。"
+#: ../src/plugins/skipto/totem-skipto-plugin.c:182
+msgid "_Skip To..."
+msgstr "跳至(_S)..."
 
-#~ msgid "This location is not a valid one."
-#~ msgstr "此地址无效。"
+#: ../src/plugins/skipto/totem-skipto-plugin.c:182
+msgid "Skip to a specific time"
+msgstr "跳到指定时间"
 
-#~ msgid "This movie could not be opened."
-#~ msgstr "无法打开此电影。"
+#~ msgid "Location not found."
+#~ msgstr "位置未找到。"
 
 #~ msgid ""
-#~ "Video codec '%s' is not handled. You might need to install additional "
-#~ "plugins to be able to play some types of movies"
-#~ msgstr ""
-#~ "视频编解码器“%s”未处理。您可能需要安装额外的插件才能播放某些类型的电影"
+#~ "Could not open location; you might not have permission to open the file."
+#~ msgstr "无法打开位置；您可能没有权限打开该文件。"
 
 #~ msgid ""
-#~ "Audio codec '%s' is not handled. You might need to install additional "
-#~ "plugins to be able to play some types of movies"
-#~ msgstr ""
-#~ "音频编解码器“%s”未处理。您可能需要安装额外的插件才能播放某些类型的电影"
-
-#~ msgid "This is an audio-only file and there is no audio output available."
-#~ msgstr "这是纯音频文件，而没有可用的音频输出。"
-
-#~ msgid "Language %d"
-#~ msgstr "语言 %d"
-
-#~ msgid "No video to capture."
-#~ msgstr "没有可抓取的视频。"
-
-#~ msgid "Video codec is not handled."
-#~ msgstr "视频编解码器未处理。"
+#~ "Failed to create a GStreamer play object. Please check your GStreamer "
+#~ "installation."
+#~ msgstr "创建 GStreamer 播放对象失败。请检查您的 GStreamer 安装。"
 
-#~ msgid "Movie is not playing."
-#~ msgstr "电影未在播放。"
+#~ msgid "%d %%"
+#~ msgstr "%d %%"
 
-#~ msgid "Language"
-#~ msgstr "语言"
+#~ msgid ""
+#~ msgstr "<未给出原因>"
 
-#~ msgid "The Totem plugin could not be started."
-#~ msgstr "Totem 插件无法启动。"
+#~ msgid "Programme unavailable (\"%s\")"
+#~ msgstr "节目不可用(“%s“)"
 
-#~ msgid "Could not initialise the thread-safe libraries."
-#~ msgstr "无法初始化线程安全库。"
+#~ msgid "BBC iPlayer"
+#~ msgstr "BBC iPlayer"
diff -Nru totem-3.4.3/po/zh_HK.po totem-3.6.2/po/zh_HK.po
--- totem-3.4.3/po/zh_HK.po	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/po/zh_HK.po	2012-10-25 13:15:32.000000000 +0000
@@ -6,14 +6,15 @@
 # H45 , 2008.
 # Chao-Hsiung Liao , 2009, 2010.
 # Wei-Lun Chao , 2010.
+# Cheng-Chia Tseng , 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: totem 3.3.92\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-25 08:12+0800\n"
-"PO-Revision-Date: 2012-03-25 08:12+0800\n"
-"Last-Translator: Cheng-Chia Tseng \n"
+"POT-Creation-Date: 2012-09-15 12:59+0800\n"
+"PO-Revision-Date: 2012-09-15 12:59+0800\n"
+"Last-Translator: Chao-Hsiung Liao \n"
 "Language-Team: Chinese (Hong Kong) \n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
@@ -22,848 +23,904 @@
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Virtaal 0.4.0\n"
 
-#: ../data/fullscreen.ui.h:1
-msgid "Leave Fullscreen"
-msgstr "離開全螢幕"
-
-#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:102
-msgid "Time:"
-msgstr "時間："
-
-#: ../data/playlist.ui.h:1
-msgid "Add..."
-msgstr "加入…"
-
-#: ../data/playlist.ui.h:2 ../data/video-list.ui.h:2
-msgid "Copy the location to the clipboard"
-msgstr "複製位置到剪貼薄"
+#: ../browser-plugin/totem-plugin-viewer.c:352 ../src/totem-object.c:1180
+#: ../src/totem-object.c:1650 ../src/totem-statusbar.c:115
+msgid "Stopped"
+msgstr "已停止"
 
-#: ../data/playlist.ui.h:3
-msgid "Move Down"
-msgstr "下移"
+#: ../browser-plugin/totem-plugin-viewer.c:364 ../src/totem-object.c:1173
+msgid "Paused"
+msgstr "已暫停"
 
-#: ../data/playlist.ui.h:4
-msgid "Move Up"
-msgstr "上移"
+#: ../browser-plugin/totem-plugin-viewer.c:368 ../src/totem-object.c:1166
+msgid "Playing"
+msgstr "播放"
 
-#: ../data/playlist.ui.h:5
-msgid "Remove"
-msgstr "移除"
+#: ../browser-plugin/totem-plugin-viewer.c:386
+#: ../src/plugins/screensaver/totem-screensaver.c:97
+msgid "Playing a movie"
+msgstr "播放影片"
 
-#: ../data/playlist.ui.h:6
-msgid "Remove file from playlist"
-msgstr "從播放清單中移除檔案"
+#: ../browser-plugin/totem-plugin-viewer.c:443
+msgid "No URI to play"
+msgstr "沒有要播放的 URI"
 
-#: ../data/playlist.ui.h:7
-msgid "Save Playlist..."
-msgstr "儲存播放清單…"
+#: ../browser-plugin/totem-plugin-viewer.c:676
+#: ../browser-plugin/totem-plugin-viewer.c:1700
+msgid "Totem Movie Player"
+msgstr "Totem 影片播放器"
 
-#: ../data/playlist.ui.h:8 ../data/totem.ui.h:77
-msgid "Select a file to use for text subtitles"
-msgstr "選擇要做為字幕的檔案"
+#. translators: this is:
+#. * Open With ApplicationName
+#. * as in nautilus' right-click menu
+#: ../browser-plugin/totem-plugin-viewer.c:1120
+#, c-format
+msgid "_Open with \"%s\""
+msgstr "以「%s」開啟(_O)"
 
-#: ../data/playlist.ui.h:9 ../data/video-list.ui.h:4
-msgid "_Copy Location"
-msgstr "複製位置(_C)"
+#: ../browser-plugin/totem-plugin-viewer.c:1341 ../src/totem-object.c:2475
+msgid "An error occurred"
+msgstr "發生錯誤"
 
-#: ../data/playlist.ui.h:10
-msgid "_Remove"
-msgstr "移除(_R)"
+#: ../browser-plugin/totem-plugin-viewer.c:2033
+msgid "No playlist or playlist empty"
+msgstr "沒有播放清單或清單空白"
 
-#: ../data/playlist.ui.h:11 ../data/totem.ui.h:141
-msgid "_Select Text Subtitles..."
-msgstr "選擇文字字幕(_S)…"
+#: ../browser-plugin/totem-plugin-viewer.c:2128
+msgid "Movie browser plugin"
+msgstr "影片瀏覽器外掛程式"
 
-#: ../data/properties.ui.h:1
-msgid "Album:"
-msgstr "專輯："
+#: ../browser-plugin/totem-plugin-viewer.c:2144 ../src/totem.c:240
+msgid "Could not initialize the thread-safe libraries."
+msgstr "無法起動 thread-safe libraries。"
 
-#: ../data/properties.ui.h:2
-msgid "Artist:"
-msgstr "演出者："
+#: ../browser-plugin/totem-plugin-viewer.c:2144
+msgid "Verify your system installation. The Totem plugin will now exit."
+msgstr "請檢查安裝時有沒有問題。Totem 會立刻結束。"
 
-#: ../data/properties.ui.h:3 ../data/totem.ui.h:23
-#: ../src/totem-properties-view.c:268
-msgid "Audio"
-msgstr "音效"
+#: ../data/fullscreen.ui.h:1
+msgid "Leave Fullscreen"
+msgstr "離開全螢幕"
 
-#: ../data/properties.ui.h:4
-msgid "Bitrate:"
-msgstr "位元率："
+#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:81
+msgid "Time:"
+msgstr "時間："
 
-#: ../data/properties.ui.h:5
-msgid "Channels:"
-msgstr "聲道："
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
+msgid "Allow the screensaver to activate when playing audio"
+msgstr "允許螢幕保護程式在播放音樂時作用"
 
-#: ../data/properties.ui.h:6
-msgid "Codec:"
-msgstr "編碼："
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
+msgid ""
+"Allow the screensaver to activate when playing audio. Disable if you have "
+"monitor-powered speakers."
+msgstr "允許螢幕保護程式在播放音樂時作用。如果你使用螢幕內附的喇叭則停用它。"
 
-#: ../data/properties.ui.h:7
-msgid "Comment:"
-msgstr "註解:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
+msgid "Show visual effects when no video is displayed"
+msgstr "當不是播放影片時顯示視覺效果"
 
-#: ../data/properties.ui.h:8
-msgid "Container:"
-msgstr "容器："
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
+msgid "Show visual effects when playing an audio only file."
+msgstr "當播放音樂時顯示視覺效果。"
 
-#: ../data/properties.ui.h:9
-msgid "Dimensions:"
-msgstr "尺寸："
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
+msgid "Name of the visual effects plugin"
+msgstr "視覺效果外掛程式的名稱"
 
-#: ../data/properties.ui.h:10
-msgid "Duration:"
-msgstr "時間長度："
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
+msgid "The brightness of the video"
+msgstr "影片畫面的亮度"
 
-#: ../data/properties.ui.h:11
-msgid "Framerate:"
-msgstr "幀率："
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
+msgid "The contrast of the video"
+msgstr "影片畫面的反差度"
 
-#: ../data/properties.ui.h:12 ../data/totem.ui.h:41
-msgid "General"
-msgstr "一般"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
+msgid "The hue of the video"
+msgstr "影片畫面的亮度"
 
-#: ../data/properties.ui.h:13
-msgid "Sample rate:"
-msgstr "取樣率："
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
+msgid "The saturation of the video"
+msgstr "影片畫面的飽和度"
 
-#: ../data/properties.ui.h:14
-msgid "Title:"
-msgstr "標題："
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
+msgid "Resize the canvas automatically on file load"
+msgstr "當載入檔案時自動調整視窗大小"
 
-#: ../data/properties.ui.h:15 ../data/totem.ui.h:104
-#: ../src/totem-properties-view.c:270
-msgid "Video"
-msgstr "影片"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
+msgid "Repeat mode"
+msgstr "循環播放"
 
-#: ../data/properties.ui.h:16
-msgid "Year:"
-msgstr "年份："
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
+msgid "Shuffle mode"
+msgstr "隨機次序播放"
 
-#: ../data/video-list.ui.h:1
-msgid "Add the video to the playlist"
-msgstr "將影片加入至播放清單"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
+msgid "Whether to disable deinterlacing for interlaced movies"
+msgstr "是否停用交錯式影片的去交錯"
 
-#: ../data/video-list.ui.h:3 ../src/totem-dnd-menu.c:97
-msgid "_Add to Playlist"
-msgstr "加入至播放清單(_A)"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
+msgid "Whether to enable debug for the playback engine"
+msgstr "應否顯示播放引擎的偵錯訊息"
 
-#. Title
-#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:53
-#: ../src/totem-object.c:1667
-msgid "Movie Player"
-msgstr "影片播放器"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
+msgid "Type of audio output to use"
+msgstr "音效輸出方式"
 
-#: ../data/totem.desktop.in.in.in.h:2
-msgid "Play movies and songs"
-msgstr "播放影片及音樂"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
+msgid "Visualization quality setting"
+msgstr "視覺效果品質設定值"
 
-#: ../data/totem.ui.h:1
-msgid "1.5 Mbps T1/Intranet/LAN"
-msgstr "1.5 Mbps T1/Intranet/LAN"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
+msgid "Quality setting for the audio visualization."
+msgstr "音效視覺化的品質設定值。"
 
-#: ../data/totem.ui.h:2
-msgid "112 Kbps Dual ISDN/DSL"
-msgstr "112 Kbps 雙 ISDN/DSL"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
+msgid "Network buffering threshold"
+msgstr "網絡緩衝區界限"
 
-#: ../data/totem.ui.h:3
-msgid "14.4 Kbps Modem"
-msgstr "14.4 Kbps 數據機"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
+msgid ""
+"Amount of data to buffer for network streams before starting to display the "
+"stream (in seconds)."
+msgstr "在顯示串流前網絡串流資料緩衝的大小（秒）。"
 
-#: ../data/totem.ui.h:4
-msgid "16:9 (Widescreen)"
-msgstr "16:9（寬螢幕）"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
+msgid "Subtitle font"
+msgstr "字幕字型"
 
-#: ../data/totem.ui.h:5
-msgid "19.2 Kbps Modem"
-msgstr "19.2 Kbps 數據機"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
+msgid "Pango font description for subtitle rendering."
+msgstr "描繪字幕的 Pango 字型描述。"
 
-#: ../data/totem.ui.h:6
-msgid "2.11:1 (DVB)"
-msgstr "2.11:1 (DVB)"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
+msgid "Subtitle encoding"
+msgstr "字幕編碼"
 
-#: ../data/totem.ui.h:7
-msgid "256 Kbps DSL/Cable"
-msgstr "256 Kbps DSL/Cable"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
+msgid "Encoding character set for subtitle."
+msgstr "字幕的編碼字符集。"
 
-#: ../data/totem.ui.h:8
-msgid "28.8 Kbps Modem"
-msgstr "28.8 Kbps 數據機"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
+msgid "Default location for the \"Open...\" dialogs"
+msgstr "「開啟…」對話視窗的預設位置"
 
-#: ../data/totem.ui.h:9
-msgid "33.6 Kbps Modem"
-msgstr "33.6 Kbps 數據機"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
+msgid ""
+"Default location for the \"Open...\" dialogs. Default is the current "
+"directory."
+msgstr "「開啟...」對話視窗的預設位置。預設是目前的資料夾。"
 
-#: ../data/totem.ui.h:10
-msgid "34.4 Kbps Modem"
-msgstr "34.4 Kbps 數據機"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
+msgid "Default location for the \"Take Screenshot\" dialogs"
+msgstr "\"擷取畫面快照\" 對話視窗的預設位置"
 
-#: ../data/totem.ui.h:11
-msgid "384 Kbps DSL/Cable"
-msgstr "384 Kbps DSL/Cable"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
+msgid ""
+"Default location for the \"Take Screenshot\" dialogs. Default is the "
+"Pictures directory."
+msgstr "「擷取螢幕截圖」對話視窗的預設位置。預設是圖片資料夾。"
 
-#: ../data/totem.ui.h:12
-msgid "4-channel"
-msgstr "4-聲道"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
+msgid "Whether to disable the plugins in the user's home directory"
+msgstr "是否在使用者的家目錄裏停用該外掛程式"
 
-#: ../data/totem.ui.h:13
-msgid "4.1-channel"
-msgstr "4.1-聲道"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
+msgid "Whether to disable the keyboard shortcuts"
+msgstr "是否停用捷徑鍵"
 
-#: ../data/totem.ui.h:14
-msgid "4:3 (TV)"
-msgstr "4:3（電視）"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
+msgid "Whether to autoload text subtitle files when a movie is loaded"
+msgstr "載入影片時是否自動讀取字幕檔"
 
-#: ../data/totem.ui.h:15
-msgid "5.0-channel"
-msgstr "5.0-聲道"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
+msgid "Whether to autoload external chapter files when a movie is loaded"
+msgstr "載入影片時是否自動讀取外部章節檔"
 
-#: ../data/totem.ui.h:16
-msgid "5.1-channel"
-msgstr "5.1--聲道"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
+msgid ""
+"Whether to remember the position of played audio/video files when pausing or "
+"closing them"
+msgstr "是否在暫停或關閉播放的音樂/影片時記住它們的位置"
 
-#: ../data/totem.ui.h:17
-msgid "512 Kbps DSL/Cable"
-msgstr "512 Kbps DSL/Cable"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
+msgid "Active plugins list"
+msgstr "使用中外掛程式清單"
 
-#: ../data/totem.ui.h:18
-msgid "56 Kbps Modem/ISDN"
-msgstr "56 Kbps 數據機/ISDN"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+msgid ""
+"A list of the names of the plugins which are currently active (loaded and "
+"running)."
+msgstr "目前使用中外掛程式名單（已載入並在執行）。"
 
-#: ../data/totem.ui.h:19
-msgid "AC3 Passthrough"
-msgstr "AC3 Passthrough"
+#: ../data/playlist.ui.h:1
+msgid "_Remove"
+msgstr "移除(_R)"
 
-#: ../data/totem.ui.h:20
-msgid "A_udio Menu"
-msgstr "音效選單(_U)"
+#: ../data/playlist.ui.h:2
+msgid "Remove file from playlist"
+msgstr "從播放清單中移除檔案"
 
-#: ../data/totem.ui.h:21
-msgid "About this application"
-msgstr "關於此程式"
+#: ../data/playlist.ui.h:3 ../data/video-list.ui.h:3
+msgid "_Copy Location"
+msgstr "複製位置(_C)"
 
-#: ../data/totem.ui.h:22
-msgctxt "Aspect ratio"
-msgid "Auto"
-msgstr "自動"
+#: ../data/playlist.ui.h:4 ../data/video-list.ui.h:4
+msgid "Copy the location to the clipboard"
+msgstr "複製位置到剪貼薄"
 
-#: ../data/totem.ui.h:24
-msgid "Audio Output"
-msgstr "音效輸出"
+#: ../data/playlist.ui.h:5 ../data/totem.ui.h:71
+msgid "_Select Text Subtitles..."
+msgstr "選擇文字字幕(_S)…"
 
-#: ../data/totem.ui.h:25
-msgid "Clear the playlist"
-msgstr "清除播放清單"
+#: ../data/playlist.ui.h:6 ../data/totem.ui.h:72
+msgid "Select a file to use for text subtitles"
+msgstr "選擇要做為字幕的檔案"
 
-#: ../data/totem.ui.h:26
-msgid "Co_ntrast:"
-msgstr "反差(_N):"
+#: ../data/playlist.ui.h:7
+msgid "Add..."
+msgstr "加入…"
 
-#: ../data/totem.ui.h:27
-msgid "Color Balance"
-msgstr "色彩平衡"
+#: ../data/playlist.ui.h:8
+msgid "Remove"
+msgstr "移除"
 
-#: ../data/totem.ui.h:28
-msgid "Configure plugins to extend the application"
-msgstr "設定用來擴充此應用程式的外掛程式"
+#: ../data/playlist.ui.h:9
+msgid "Save Playlist..."
+msgstr "儲存播放清單…"
 
-#: ../data/totem.ui.h:29
-msgid "Configure the application"
-msgstr "設定應用程式"
+#: ../data/playlist.ui.h:10
+msgid "Move Up"
+msgstr "上移"
 
-#: ../data/totem.ui.h:30
-msgid "Connection _speed:"
-msgstr "連線速度(_S):"
+#: ../data/playlist.ui.h:11
+msgid "Move Down"
+msgstr "下移"
 
-#: ../data/totem.ui.h:31
-msgid "Decrease volume"
-msgstr "減少音量"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:2
+msgid "Normal"
+msgstr "一般"
 
-#: ../data/totem.ui.h:32
-msgid "Disable _deinterlacing of interlaced videos"
-msgstr "停用交錯式影片的去交錯(_D)"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:4
+msgid "Large"
+msgstr "大"
 
-#: ../data/totem.ui.h:33
-msgid "Disable screensaver when playing "
-msgstr "播放音樂時停用螢幕保護程式"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:6
+msgid "Extra Large"
+msgstr "特大"
 
-#. Tab label in the Preferences dialogue
-#: ../data/totem.ui.h:35
-msgid "Display"
-msgstr "顯示"
+#: ../data/preferences.ui.h:7 ../src/backend/bacon-video-widget.c:5498
+#: ../src/totem-properties-view.c:231
+msgid "Stereo"
+msgstr "立體聲"
 
-#: ../data/totem.ui.h:36
-msgid "Eject the current disc"
-msgstr "退出目前的光碟"
+#: ../data/preferences.ui.h:8
+msgid "4-channel"
+msgstr "4-聲道"
 
-#: ../data/totem.ui.h:37
-msgid "External Chapters"
-msgstr "外部章節"
+#: ../data/preferences.ui.h:9
+msgid "4.1-channel"
+msgstr "4.1-聲道"
 
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:39
-msgid "Extra Large"
-msgstr "特大"
+#: ../data/preferences.ui.h:10
+msgid "5.0-channel"
+msgstr "5.0-聲道"
 
-#: ../data/totem.ui.h:40
-msgid "Fit Window to Movie"
-msgstr "調整視窗大小至影片大小"
+#: ../data/preferences.ui.h:11
+msgid "5.1-channel"
+msgstr "5.1--聲道"
 
-#: ../data/totem.ui.h:42
-msgid "Go to the DVD menu"
-msgstr "前往 DVD 選單"
+#: ../data/preferences.ui.h:12
+msgid "AC3 Passthrough"
+msgstr "AC3 Passthrough"
 
-#: ../data/totem.ui.h:43
-msgid "Go to the angle menu"
-msgstr "前往角度選單"
+#: ../data/preferences.ui.h:13
+msgid "Totem Preferences"
+msgstr "Totem 偏好設定"
 
-#: ../data/totem.ui.h:44
-msgid "Go to the audio menu"
-msgstr "前往音效選單"
+#: ../data/preferences.ui.h:14
+msgid "Playback"
+msgstr "播放"
 
-#: ../data/totem.ui.h:45
-msgid "Go to the chapter menu"
-msgstr "前往章節選單"
+#: ../data/preferences.ui.h:15
+msgid "Start playing files from last position"
+msgstr "從上次位置開始播放檔案"
 
-#: ../data/totem.ui.h:46
-msgid "Go to the title menu"
-msgstr "前往標題選單"
+#: ../data/preferences.ui.h:16
+msgid "Text Subtitles"
+msgstr "字幕文字"
 
-#: ../data/totem.ui.h:47
-msgid "Help contents"
-msgstr "求助內容"
+#: ../data/preferences.ui.h:17
+msgid "_Load subtitle files when movie is loaded"
+msgstr "載入影片後讀取字幕檔案(_L)"
 
-#: ../data/totem.ui.h:48
-msgid "Increase volume"
-msgstr "增加音量"
+#: ../data/preferences.ui.h:18
+msgid "_Font:"
+msgstr "字型(_F):"
 
-#: ../data/totem.ui.h:49
-msgid "Intranet/LAN"
-msgstr "Intranet/LAN"
+#: ../data/preferences.ui.h:19
+msgid "_Encoding:"
+msgstr "編碼(_E):"
 
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:51
-msgid "Large"
-msgstr "大"
+#: ../data/preferences.ui.h:20
+msgid "External Chapters"
+msgstr "外部章節"
 
-#: ../data/totem.ui.h:52
+#: ../data/preferences.ui.h:21
 msgid "Load _chapter files when movie is loaded"
 msgstr "載入影片後讀取章節檔案(_C)"
 
-#: ../data/totem.ui.h:54
-msgid "Networking"
-msgstr "網絡"
+#: ../data/preferences.ui.h:22 ../data/properties.ui.h:1
+msgid "General"
+msgstr "一般"
 
-#: ../data/totem.ui.h:55
-msgid "Next chapter or movie"
-msgstr "下一章或下一齣影片"
+#. Tab label in the Preferences dialogue
+#: ../data/preferences.ui.h:24
+msgid "Display"
+msgstr "顯示"
 
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:57
-msgid "Normal"
-msgstr "一般"
+#: ../data/preferences.ui.h:25
+msgid "_Resize the window when a new video is loaded"
+msgstr "載入新影片後自動調整視窗大小(_R)"
 
-#: ../data/totem.ui.h:58
-msgid "Open _Location..."
-msgstr "開啟位置(_L)…"
+#: ../data/preferences.ui.h:26
+msgid "Disable _deinterlacing of interlaced videos"
+msgstr "停用交錯式影片的去交錯(_D)"
 
-#: ../data/totem.ui.h:59
-msgid "Open a file"
-msgstr "開啟檔案"
+#: ../data/preferences.ui.h:27
+msgid "Disable screensaver when playing "
+msgstr "播放音樂時停用螢幕保護程式"
 
-#: ../data/totem.ui.h:60
-msgid "Open a non-local file"
-msgstr "開啟不是在本機的檔案"
+#: ../data/preferences.ui.h:28 ../data/properties.ui.h:9
+#: ../src/totem-properties-view.c:273
+msgid "Video"
+msgstr "影片"
 
-#: ../data/totem.ui.h:61
-msgid "Play / P_ause"
-msgstr "播放/暫停(_A)"
+#: ../data/preferences.ui.h:29
+msgid "Video or Audio"
+msgstr "視像或音訊"
 
-#: ../data/totem.ui.h:62
-msgid "Play or pause the movie"
-msgstr "播放或暫停播放影片"
+#: ../data/preferences.ui.h:30
+msgid "Visual Effects"
+msgstr "視覺效果"
 
-#: ../data/totem.ui.h:63
-msgid "Playback"
-msgstr "播放"
+#: ../data/preferences.ui.h:31
+msgid "Show _visual effects when an audio file is played"
+msgstr "播放音樂時顯示視覺效果(_V)"
 
-#: ../data/totem.ui.h:64
-msgid "Plugins..."
-msgstr "外掛程式…"
+#: ../data/preferences.ui.h:32
+msgid "_Type of visualization:"
+msgstr "視覺效果類型(_T):"
 
-#: ../data/totem.ui.h:65
-msgid "Prefere_nces"
-msgstr "偏好設定(_N)"
+#: ../data/preferences.ui.h:33
+msgid "Visualization _size:"
+msgstr "播放視覺效果的視窗大小(_S):"
 
-#: ../data/totem.ui.h:66
-msgid "Previous chapter or movie"
-msgstr "上一章或上一齣影片"
+#: ../data/preferences.ui.h:34
+msgid "Color Balance"
+msgstr "色彩平衡"
 
-#: ../data/totem.ui.h:67
-msgid "Quit the program"
-msgstr "結束程式"
+#: ../data/preferences.ui.h:35
+msgid "_Brightness:"
+msgstr "亮度(_B):"
 
-#: ../data/totem.ui.h:68
+#: ../data/preferences.ui.h:36
+msgid "Co_ntrast:"
+msgstr "反差(_N):"
+
+#: ../data/preferences.ui.h:37
+msgid "Sat_uration:"
+msgstr "飽和度(_U):"
+
+#: ../data/preferences.ui.h:38
+msgid "_Hue:"
+msgstr "色調(_H):"
+
+#: ../data/preferences.ui.h:39
 msgid "Reset to _Defaults"
 msgstr "重置為預設值(_D)"
 
-#: ../data/totem.ui.h:69
-msgid "Resize _1:1"
-msgstr "原始大小 _1:1"
+#: ../data/preferences.ui.h:40
+msgid "Audio Output"
+msgstr "音效輸出"
 
-#: ../data/totem.ui.h:70
-msgid "Resize _2:1"
-msgstr "兩倍大小 _2:1"
+#: ../data/preferences.ui.h:41
+msgid "_Audio output type:"
+msgstr "音效輸出類型(_A):"
 
-#: ../data/totem.ui.h:71
-msgid "Resize to double the original video size"
-msgstr "將畫面放大為原始大小的兩倍"
+#: ../data/preferences.ui.h:42 ../data/properties.ui.h:14
+#: ../src/totem-properties-view.c:271
+msgid "Audio"
+msgstr "音效"
 
-#: ../data/totem.ui.h:72
-msgid "Resize to half the original video size"
-msgstr "將畫面縮小為原始大小的一半"
+#: ../data/properties.ui.h:2
+msgid "Title:"
+msgstr "標題："
 
-#: ../data/totem.ui.h:73
-msgid "Resize to the original video size"
-msgstr "將畫面還原為原始大小"
+#: ../data/properties.ui.h:3
+msgid "Artist:"
+msgstr "演出者："
 
-#: ../data/totem.ui.h:74
-msgid "S_idebar"
-msgstr "側面窗格(_I)"
+#: ../data/properties.ui.h:4
+msgid "Duration:"
+msgstr "時間長度："
 
-#: ../data/totem.ui.h:75
-msgid "S_ubtitles"
-msgstr "字幕(_U)"
+#: ../data/properties.ui.h:5
+msgid "Year:"
+msgstr "年份："
 
-#: ../data/totem.ui.h:76
-msgid "Sat_uration:"
-msgstr "飽和度(_U):"
+#: ../data/properties.ui.h:6
+msgid "Album:"
+msgstr "專輯："
 
-#: ../data/totem.ui.h:78
-msgid "Set the repeat mode"
-msgstr "切換是否循環播放影片"
+#: ../data/properties.ui.h:7
+msgid "Comment:"
+msgstr "註解:"
 
-#: ../data/totem.ui.h:79
-msgid "Set the shuffle mode"
-msgstr "切換是否以隨機的次序播放影片"
+#: ../data/properties.ui.h:8
+msgid "Container:"
+msgstr "容器："
 
-# anamorphic has discriminating meaning in chinese. -- Abel
-#: ../data/totem.ui.h:80
-msgid "Sets 16:9 (widescreen) aspect ratio"
-msgstr "設置為 16:9 (寬螢幕)長寬比"
+#: ../data/properties.ui.h:10
+msgid "Dimensions:"
+msgstr "尺寸："
 
-#: ../data/totem.ui.h:81
-msgid "Sets 2.11:1 (DVB) aspect ratio"
-msgstr "設置為 2.11:1 (DVB) 長寬比"
+#: ../data/properties.ui.h:11
+msgid "Codec:"
+msgstr "編碼："
 
-#: ../data/totem.ui.h:82
-msgid "Sets 4:3 (TV) aspect ratio"
-msgstr "設置為 4:3（電視）長寬比"
+#: ../data/properties.ui.h:12
+msgid "Framerate:"
+msgstr "幀率："
 
-#: ../data/totem.ui.h:83
-msgid "Sets automatic aspect ratio"
-msgstr "自動切換長寬比"
+#: ../data/properties.ui.h:13
+msgid "Bitrate:"
+msgstr "位元率："
 
-#: ../data/totem.ui.h:84
-msgid "Sets square aspect ratio"
-msgstr "設置為 1:1 長寬比"
+#: ../data/properties.ui.h:15
+msgid "Sample rate:"
+msgstr "取樣率："
 
-#: ../data/totem.ui.h:85
-msgid "Show _Controls"
-msgstr "顯示控制介面(_C)"
+#: ../data/properties.ui.h:16
+msgid "Channels:"
+msgstr "聲道："
 
-#: ../data/totem.ui.h:86
-msgid "Show _visual effects when an audio file is played"
-msgstr "播放音樂時顯示視覺效果(_V)"
+#. Title
+#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:80 ../src/totem.c:239
+#: ../src/totem.c:248 ../src/totem-menu.c:790 ../src/totem-object.c:1658
+msgid "Videos"
+msgstr "影片"
 
-#: ../data/totem.ui.h:87
-msgid "Show controls"
-msgstr "顯示控制介面"
+#: ../data/totem.desktop.in.in.in.h:2
+msgid "Play movies"
+msgstr "播放影片"
 
-#: ../data/totem.ui.h:88
-msgid "Show or hide the sidebar"
-msgstr "顯示或隱藏側面窗格"
+#: ../data/totem.desktop.in.in.in.h:3
+msgid "Video;Movie;Film;Clip;Series;Player;DVD;TV;Disc;"
+msgstr "Video;Movie;Film;Clip;Series;Player;DVD;TV;Disc;視像;影片;影片;剪輯;系列;影集;播放器;光碟;"
 
-#: ../data/totem.ui.h:89
-msgid "Shuff_le Mode"
-msgstr "隨機播放模式(_L)"
+#: ../data/totem.ui.h:1
+msgid "_Open"
+msgstr "開啟(_O)"
 
-#: ../data/totem.ui.h:90
-msgid "Skip _Backwards"
-msgstr "往後(_B)"
+#: ../data/totem.ui.h:2
+msgid "Open _Location"
+msgstr "開啟位置(_L)"
 
-#: ../data/totem.ui.h:91
-msgid "Skip _Forward"
-msgstr "往前(_F)"
+#: ../data/totem.ui.h:3
+msgid "_Fullscreen"
+msgstr "全螢幕(_F)"
 
-#: ../data/totem.ui.h:92
-msgid "Skip backwards"
-msgstr "往後"
+#: ../data/totem.ui.h:4
+msgid "Prefere_nces"
+msgstr "偏好設定(_N)"
 
-#: ../data/totem.ui.h:93
-msgid "Skip forward"
-msgstr "往前"
+#: ../data/totem.ui.h:5
+msgid "Shuff_le"
+msgstr "隨機播放(_L)"
 
-#: ../data/totem.ui.h:94
-msgid "Square"
-msgstr "正方形"
+#: ../data/totem.ui.h:6
+msgid "_Repeat"
+msgstr "重複(_R)"
 
-#: ../data/totem.ui.h:95
-msgid "Start playing files from last position"
-msgstr "從上次位置開始播放檔案"
+#: ../data/totem.ui.h:7
+msgid "_Quit"
+msgstr "結束(_Q)"
 
-#: ../data/totem.ui.h:96 ../src/totem-properties-view.c:228
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5593
-msgid "Stereo"
-msgstr "立體聲"
+# Following German team's practice (_Movie -> _File), since totem can play
+# audio as well -- Abel
+#: ../data/totem.ui.h:8
+msgid "_Movie"
+msgstr "檔案(_F)"
+
+#: ../data/totem.ui.h:9
+msgid "_Eject"
+msgstr "退出(_E)"
+
+#: ../data/totem.ui.h:10
+msgid "Eject the current disc"
+msgstr "退出目前的光碟"
+
+#: ../data/totem.ui.h:11
+msgid "_Properties"
+msgstr "屬性(_P)"
 
-#: ../data/totem.ui.h:97
-msgid "Switch An_gles"
-msgstr "切換角度(_G)"
+#: ../data/totem.ui.h:12
+msgid "View the properties of the current stream"
+msgstr "檢視目前串流的屬性"
 
-#: ../data/totem.ui.h:98
-msgid "Switch camera angles"
-msgstr "切換攝影機角度"
+#: ../data/totem.ui.h:13
+msgid "Play / P_ause"
+msgstr "播放/暫停(_A)"
 
-#: ../data/totem.ui.h:99
-msgid "Switch to fullscreen"
-msgstr "切換至全螢幕"
+#: ../data/totem.ui.h:14
+msgid "Play or pause the movie"
+msgstr "播放或暫停播放影片"
 
-#: ../data/totem.ui.h:100
-msgid "Text Subtitles"
-msgstr "字幕文字"
+#: ../data/totem.ui.h:15
+msgid "_Edit"
+msgstr "編輯(_E)"
 
-#: ../data/totem.ui.h:101
-msgid "Time seek bar"
-msgstr "時間搜尋列"
+#: ../data/totem.ui.h:16
+msgid "_Clear Playlist"
+msgstr "消除播放清單(_C)"
 
-#: ../data/totem.ui.h:103
-msgid "Totem Preferences"
-msgstr "Totem 偏好設定"
+#: ../data/totem.ui.h:17
+msgid "Clear the playlist"
+msgstr "清除播放清單"
 
-#: ../data/totem.ui.h:105
-msgid "Video or Audio"
-msgstr "視像或音訊"
+#: ../data/totem.ui.h:18
+msgid "Plugins..."
+msgstr "外掛程式…"
 
-#: ../data/totem.ui.h:106
-msgid "View the properties of the current stream"
-msgstr "檢視目前串流的屬性"
+#: ../data/totem.ui.h:19
+msgid "Configure plugins to extend the application"
+msgstr "設定用來擴充此應用程式的外掛程式"
 
-#: ../data/totem.ui.h:107
-msgid "Visual Effects"
-msgstr "視覺效果"
+#: ../data/totem.ui.h:20
+msgid "_View"
+msgstr "檢視(_V)"
 
-#: ../data/totem.ui.h:108
-msgid "Visualization _size:"
-msgstr "播放視覺效果的視窗大小(_S):"
+#: ../data/totem.ui.h:21
+msgid "Fit Window to Movie"
+msgstr "調整視窗大小至影片大小"
 
-#: ../data/totem.ui.h:109
-msgid "Volume _Down"
-msgstr "調低音量(_D)"
+#: ../data/totem.ui.h:22
+msgid "_Resize 1:2"
+msgstr "一半大小 1:2(_R)"
 
-#: ../data/totem.ui.h:110
-msgid "Volume _Up"
-msgstr "調高音量(_U)"
+#: ../data/totem.ui.h:23
+msgid "Resize to half the original video size"
+msgstr "將畫面縮小為原始大小的一半"
 
-#: ../data/totem.ui.h:111
-msgid "Zoom In"
-msgstr "拉近"
+#: ../data/totem.ui.h:24
+msgid "Resize _1:1"
+msgstr "原始大小 _1:1"
 
-#: ../data/totem.ui.h:112
-msgid "Zoom in"
-msgstr "拉近"
+#: ../data/totem.ui.h:25
+msgid "Resize to the original video size"
+msgstr "將畫面還原為原始大小"
 
-#: ../data/totem.ui.h:113
-msgid "_About"
-msgstr "關於(_A)"
+#: ../data/totem.ui.h:26
+msgid "Resize _2:1"
+msgstr "兩倍大小 _2:1"
 
-#: ../data/totem.ui.h:114
-msgid "_Angle Menu"
-msgstr "角度選單(_A)"
+#: ../data/totem.ui.h:27
+msgid "Resize to double the original video size"
+msgstr "將畫面放大為原始大小的兩倍"
 
-#: ../data/totem.ui.h:115
+#: ../data/totem.ui.h:28
 msgid "_Aspect Ratio"
 msgstr "長寬比(_A)"
 
-#: ../data/totem.ui.h:116
-msgid "_Audio output type:"
-msgstr "音效輸出類型(_A):"
-
-#: ../data/totem.ui.h:117
-msgid "_Brightness:"
-msgstr "亮度(_B):"
-
-#: ../data/totem.ui.h:118
-msgid "_Chapter Menu"
-msgstr "章節選單(_C)"
+#: ../data/totem.ui.h:29
+msgid "Switch An_gles"
+msgstr "切換角度(_G)"
 
-#: ../data/totem.ui.h:119
-msgid "_Clear Playlist"
-msgstr "消除播放清單(_C)"
+#: ../data/totem.ui.h:30
+msgid "Switch camera angles"
+msgstr "切換攝影機角度"
 
-#: ../data/totem.ui.h:120
-msgid "_Contents"
-msgstr "內容(_C)"
+#: ../data/totem.ui.h:31
+msgid "_Go"
+msgstr "前往(_G)"
 
-#: ../data/totem.ui.h:121
+#: ../data/totem.ui.h:32
 msgid "_DVD Menu"
 msgstr "_DVD 選單"
 
-#: ../data/totem.ui.h:122
-msgid "_Edit"
-msgstr "編輯(_E)"
-
-#: ../data/totem.ui.h:123
-msgid "_Eject"
-msgstr "退出(_E)"
-
-#: ../data/totem.ui.h:124
-msgid "_Encoding:"
-msgstr "編碼(_E):"
+#: ../data/totem.ui.h:33
+msgid "Go to the DVD menu"
+msgstr "前往 DVD 選單"
 
-#: ../data/totem.ui.h:125
-msgid "_Font:"
-msgstr "字型(_F):"
+#: ../data/totem.ui.h:34
+msgid "_Title Menu"
+msgstr "標題選單(_T)"
 
-#: ../data/totem.ui.h:126
-msgid "_Fullscreen"
-msgstr "全螢幕(_F)"
+#: ../data/totem.ui.h:35
+msgid "Go to the title menu"
+msgstr "前往標題選單"
 
-#: ../data/totem.ui.h:127
-msgid "_Go"
-msgstr "前往(_G)"
+#: ../data/totem.ui.h:36
+msgid "A_udio Menu"
+msgstr "音效選單(_U)"
 
-#: ../data/totem.ui.h:128
-msgid "_Help"
-msgstr "求助(_H)"
+#: ../data/totem.ui.h:37
+msgid "Go to the audio menu"
+msgstr "前往音效選單"
 
-#: ../data/totem.ui.h:129
-msgid "_Hue:"
-msgstr "色調(_H):"
+#: ../data/totem.ui.h:38
+msgid "_Angle Menu"
+msgstr "角度選單(_A)"
 
-#: ../data/totem.ui.h:130
-msgid "_Languages"
-msgstr "語言(_L)"
+#: ../data/totem.ui.h:39
+msgid "Go to the angle menu"
+msgstr "前往角度選單"
 
-#: ../data/totem.ui.h:131
-msgid "_Load subtitle files when movie is loaded"
-msgstr "載入影片後讀取字幕檔案(_L)"
+#: ../data/totem.ui.h:40
+msgid "_Chapter Menu"
+msgstr "章節選單(_C)"
 
-# Following German team's practice (_Movie -> _File), since totem can play
-# audio as well -- Abel
-#: ../data/totem.ui.h:132
-msgid "_Movie"
-msgstr "檔案(_F)"
+#: ../data/totem.ui.h:41
+msgid "Go to the chapter menu"
+msgstr "前往章節選單"
 
-#: ../data/totem.ui.h:133
+#: ../data/totem.ui.h:42
 msgid "_Next Chapter/Movie"
 msgstr "下一章/下一齣影片(_N)"
 
-#: ../data/totem.ui.h:134
-msgid "_Open..."
-msgstr "開啟(_O)…"
+#: ../data/totem.ui.h:43
+msgid "Next chapter or movie"
+msgstr "下一章或下一齣影片"
 
-#: ../data/totem.ui.h:135
+#: ../data/totem.ui.h:44
 msgid "_Previous Chapter/Movie"
 msgstr "上一章/上一齣影片(_P)"
 
-#: ../data/totem.ui.h:136
-msgid "_Properties"
-msgstr "屬性(_P)"
+#: ../data/totem.ui.h:45
+msgid "Previous chapter or movie"
+msgstr "上一章或上一齣影片"
 
-#: ../data/totem.ui.h:137
-msgid "_Quit"
-msgstr "結束(_Q)"
+#: ../data/totem.ui.h:46
+msgid "_Sound"
+msgstr "音效(_S)"
 
-#: ../data/totem.ui.h:138
-msgid "_Repeat Mode"
-msgstr "循環播放(_R)"
+#: ../data/totem.ui.h:47
+msgid "Volume _Up"
+msgstr "調高音量(_U)"
 
-#: ../data/totem.ui.h:139
-msgid "_Resize 1:2"
-msgstr "一半大小 1:2(_R)"
+#: ../data/totem.ui.h:48
+msgid "Increase volume"
+msgstr "增加音量"
 
-#: ../data/totem.ui.h:140
-msgid "_Resize the window when a new video is loaded"
-msgstr "載入新影片後自動調整視窗大小(_R)"
+#: ../data/totem.ui.h:49
+msgid "Volume _Down"
+msgstr "調低音量(_D)"
 
-#: ../data/totem.ui.h:142
-msgid "_Sound"
-msgstr "音效(_S)"
+#: ../data/totem.ui.h:50
+msgid "Decrease volume"
+msgstr "減少音量"
 
-#: ../data/totem.ui.h:143
-msgid "_Title Menu"
-msgstr "標題選單(_T)"
+#: ../data/totem.ui.h:51
+msgid "_Help"
+msgstr "求助(_H)"
 
-#: ../data/totem.ui.h:144
-msgid "_Type of visualization:"
-msgstr "視覺效果類型(_T):"
+#: ../data/totem.ui.h:52
+msgid "_Contents"
+msgstr "內容(_C)"
 
-#: ../data/totem.ui.h:145
-msgid "_View"
-msgstr "檢視(_V)"
+#: ../data/totem.ui.h:53
+msgid "Help contents"
+msgstr "求助內容"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
-msgid ""
-"A list of the names of the plugins which are currently active (loaded and "
-"running)."
-msgstr "目前使用中外掛程式名單（已載入並在執行）。"
+#: ../data/totem.ui.h:54
+msgid "_About"
+msgstr "關於(_A)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
-msgid "Active plugins list"
-msgstr "使用中外掛程式清單"
+#: ../data/totem.ui.h:55
+msgid "About this application"
+msgstr "關於此程式"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
-msgid "Allow the screensaver to activate when playing audio"
-msgstr "允許螢幕保護程式在播放音樂時作用"
+#: ../data/totem.ui.h:56
+msgid "Show _Controls"
+msgstr "顯示控制介面(_C)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
-msgid ""
-"Allow the screensaver to activate when playing audio. Disable if you have "
-"monitor-powered speakers."
-msgstr "允許螢幕保護程式在播放音樂時作用。如果你使用螢幕內附的喇叭則停用它。"
+#: ../data/totem.ui.h:57
+msgid "Show controls"
+msgstr "顯示控制介面"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
-msgid ""
-"Amount of data to buffer for network streams before starting to display the "
-"stream (in seconds)."
-msgstr "在顯示串流前網絡串流資料緩衝的大小（秒）。"
+#: ../data/totem.ui.h:58
+msgid "S_idebar"
+msgstr "側面窗格(_I)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
-msgid ""
-"Approximate network connection speed, used to select quality on media over "
-"the network."
-msgstr "大約的網絡連線速度，用來選擇透過網絡傳輸的媒體品質。"
+#: ../data/totem.ui.h:59
+msgid "Show or hide the sidebar"
+msgstr "顯示或隱藏側邊列"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
-msgid "Default location for the \"Open...\" dialogs"
-msgstr "「開啟…」對話視窗的預設位置"
+#: ../data/totem.ui.h:60
+msgctxt "Aspect ratio"
+msgid "Auto"
+msgstr "自動"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
-msgid ""
-"Default location for the \"Open...\" dialogs. Default is the current "
-"directory."
-msgstr "「開啟...」對話視窗的預設位置。預設是目前的資料夾。"
+#: ../data/totem.ui.h:61
+msgid "Sets automatic aspect ratio"
+msgstr "自動切換長寬比"
+
+#: ../data/totem.ui.h:62
+msgid "Square"
+msgstr "正方形"
+
+#: ../data/totem.ui.h:63
+msgid "Sets square aspect ratio"
+msgstr "設置為 1:1 長寬比"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
-msgid "Default location for the \"Take Screenshot\" dialogs"
-msgstr "\"擷取畫面快照\" 對話視窗的預設位置"
+#: ../data/totem.ui.h:64
+msgid "4:3 (TV)"
+msgstr "4:3（電視）"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
-msgid ""
-"Default location for the \"Take Screenshot\" dialogs. Default is the "
-"Pictures directory."
-msgstr "「擷取螢幕截圖」對話視窗的預設位置。預設是圖片資料夾。"
+#: ../data/totem.ui.h:65
+msgid "Sets 4:3 (TV) aspect ratio"
+msgstr "設置為 4:3（電視）長寬比"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
-msgid "Encoding character set for subtitle."
-msgstr "字幕的編碼字符集。"
+#: ../data/totem.ui.h:66
+msgid "16:9 (Widescreen)"
+msgstr "16:9（寬螢幕）"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
-msgid "Name of the visual effects plugin"
-msgstr "視覺效果外掛程式的名稱"
+# anamorphic has discriminating meaning in chinese. -- Abel
+#: ../data/totem.ui.h:67
+msgid "Sets 16:9 (widescreen) aspect ratio"
+msgstr "設置為 16:9 (寬螢幕)長寬比"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
-msgid "Network buffering threshold"
-msgstr "網絡緩衝區界限"
+#: ../data/totem.ui.h:68
+msgid "2.11:1 (DVB)"
+msgstr "2.11:1 (DVB)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
-msgid "Network connection speed"
-msgstr "連線連線速度"
+#: ../data/totem.ui.h:69
+msgid "Sets 2.11:1 (DVB) aspect ratio"
+msgstr "設置為 2.11:1 (DVB) 長寬比"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
-msgid "Pango font description for subtitle rendering."
-msgstr "描繪字幕的 Pango 字型描述。"
+#: ../data/totem.ui.h:70
+msgid "S_ubtitles"
+msgstr "字幕(_U)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
-msgid "Quality setting for the audio visualization."
-msgstr "音效視覺化的品質設定值。"
+#: ../data/totem.ui.h:73
+msgid "_Languages"
+msgstr "語言(_L)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
-msgid "Repeat mode"
-msgstr "循環播放"
+#: ../data/totem.ui.h:74
+msgid "Zoom In"
+msgstr "拉近"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
-msgid "Resize the canvas automatically on file load"
-msgstr "當載入檔案時自動調整視窗大小"
+#: ../data/totem.ui.h:75
+msgid "Zoom in"
+msgstr "拉近"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
-msgid "Show visual effects when no video is displayed"
-msgstr "當不是播放影片時顯示視覺效果"
+#: ../data/totem.ui.h:76
+msgid "Skip _Forward"
+msgstr "往前(_F)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
-msgid "Show visual effects when playing an audio only file."
-msgstr "當播放音樂時顯示視覺效果。"
+#: ../data/totem.ui.h:77
+msgid "Skip forward"
+msgstr "往前"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
-msgid "Shuffle mode"
-msgstr "隨機次序播放"
+#: ../data/totem.ui.h:78
+msgid "Skip _Backwards"
+msgstr "往後(_B)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
-msgid "Subtitle encoding"
-msgstr "字幕編碼"
+#: ../data/totem.ui.h:79
+msgid "Skip backwards"
+msgstr "往後"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
-msgid "Subtitle font"
-msgstr "字幕字型"
+#: ../data/totem.ui.h:82
+msgid "Time seek bar"
+msgstr "時間搜尋列"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
-msgid "The brightness of the video"
-msgstr "影片畫面的亮度"
+#: ../data/uri.ui.h:1
+msgid "Enter the _address of the file you would like to open:"
+msgstr "請輸入你要開啟檔案的位置(_A):"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
-msgid "The contrast of the video"
-msgstr "影片畫面的反差度"
+#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
+msgid "_Add to Playlist"
+msgstr "加入至播放清單(_A)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
-msgid "The hue of the video"
-msgstr "影片畫面的亮度"
+#: ../data/video-list.ui.h:2
+msgid "Add the video to the playlist"
+msgstr "將影片加入至播放清單"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
-msgid "The saturation of the video"
-msgstr "影片畫面的飽和度"
+#: ../src/backend/bacon-video-widget.c:1643
+msgid "Password requested for RTSP server"
+msgstr "RTSP 伺服器要求的密碼 "
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
-msgid "Type of audio output to use"
-msgstr "音效輸出方式"
+#: ../src/backend/bacon-video-widget.c:2944
+#, c-format
+msgid "Audio Track #%d"
+msgstr "音樂音軌 #%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
-msgid "Visualization quality setting"
-msgstr "視覺效果品質設定值"
+#: ../src/backend/bacon-video-widget.c:2948
+#, c-format
+msgid "Subtitle #%d"
+msgstr "字幕 #%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
-msgid "Whether to autoload external chapter files when a movie is loaded"
-msgstr "載入影片時是否自動讀取外部章節檔"
+#: ../src/backend/bacon-video-widget.c:3345
+msgid "The server you are trying to connect to is not known."
+msgstr "你嘗試連線的伺服器不明。"
+
+#: ../src/backend/bacon-video-widget.c:3348
+msgid "The connection to this server was refused."
+msgstr "連接到此伺服器被拒絕。"
+
+#: ../src/backend/bacon-video-widget.c:3351
+msgid "The specified movie could not be found."
+msgstr "找不到指定的影片。"
+
+#: ../src/backend/bacon-video-widget.c:3358
+msgid "The server refused access to this file or stream."
+msgstr "伺服器拒絕存取這個檔案或串流。"
+
+#: ../src/backend/bacon-video-widget.c:3364
+msgid "Authentication is required to access this file or stream."
+msgstr "需要驗證才能存取這個檔案或串流。"
+
+#: ../src/backend/bacon-video-widget.c:3371
+msgid "You are not allowed to open this file."
+msgstr "你不被允許開啟此檔案。"
+
+#: ../src/backend/bacon-video-widget.c:3376
+msgid "This location is not a valid one."
+msgstr "此位置不是有效的。"
+
+#: ../src/backend/bacon-video-widget.c:3384
+msgid "The movie could not be read."
+msgstr "無法讀取影片。"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
-msgid "Whether to autoload text subtitle files when a movie is loaded"
-msgstr "載入影片時是否自動讀取字幕檔"
+#. should be exactly one missing thing (source or converter)
+#: ../src/backend/bacon-video-widget.c:3407
+#: ../src/backend/bacon-video-widget.c:3415
+#, c-format
+msgid "The playback of this movie requires a %s plugin which is not installed."
+msgid_plural ""
+"The playback of this movie requires the following decoders which are not "
+"installed:\n"
+"\n"
+"%s"
+msgstr[0] ""
+"播放此影片需要下列解碼器，但尚未安裝：\n"
+"\n"
+"%s"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
-msgid "Whether to disable deinterlacing for interlaced movies"
-msgstr "是否停用交錯式影片的去交錯"
+#: ../src/backend/bacon-video-widget.c:3426
+msgid ""
+"An audio or video stream is not handled due to missing codecs. You might "
+"need to install additional plugins to be able to play some types of movies"
+msgstr "有音樂或影片串流沒有處理，因為缺變編解碼器。你可能需要安裝額外的外掛程式才能播放某些類型的影片"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
-msgid "Whether to disable the keyboard shortcuts"
-msgstr "是否停用捷徑鍵"
+#: ../src/backend/bacon-video-widget.c:3436
+msgid ""
+"This file cannot be played over the network. Try downloading it locally "
+"first."
+msgstr "無法透過網絡播放此檔案。先下載到磁碟後再試。"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
-msgid "Whether to disable the plugins in the user's home directory"
-msgstr "是否在使用者的家目錄裏停用該外掛程式"
+#: ../src/backend/bacon-video-widget.c:5494 ../src/totem-properties-view.c:227
+msgid "Surround"
+msgstr "環繞"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:35
-msgid "Whether to enable debug for the playback engine"
-msgstr "應否顯示播放引擎的偵錯訊息"
+#: ../src/backend/bacon-video-widget.c:5496 ../src/totem-properties-view.c:229
+msgid "Mono"
+msgstr "單聲道"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:36
-msgid ""
-"Whether to remember the position of played audio/video files when pausing or "
-"closing them"
-msgstr "是否在暫停或關閉播放的音樂/影片時記住它們的位置"
+#: ../src/backend/bacon-video-widget.c:5781
+msgid "Media contains no supported video streams."
+msgstr "媒體包含不支援的視像串流。"
 
-#: ../data/uri.ui.h:1
-msgid "Enter the _address of the file you would like to open:"
-msgstr "請輸入你要開啟檔案的位置(_A):"
+#: ../src/backend/bacon-video-widget.c:5963
+msgid ""
+"Some necessary plug-ins are missing. Make sure that the program is correctly "
+"installed."
+msgstr "缺少某些必須的外掛程式，請確定目前已安裝程式。"
 
 #: ../src/eggdesktopfile.c:165
 #, c-format
@@ -966,6 +1023,31 @@
 msgid "Show session management options"
 msgstr "顯示作業階段管理選項"
 
+#. hour:minutes:seconds
+#. Translators: This is a time format, like "9:05:02" for 9
+#. * hours, 5 minutes, and 2 seconds. You may change ":" to
+#. * the separator that your locale uses or use "%Id" instead
+#. * of "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:56
+#: ../src/plugins/skipto/totem-time-entry.c:57
+#, c-format
+msgctxt "long time format"
+msgid "%d:%02d:%02d"
+msgstr "%d:%02d:%02d"
+
+#. minutes:seconds
+#. Translators: This is a time format, like "5:02" for 5
+#. * minutes and 2 seconds. You may change ":" to the
+#. * separator that your locale uses or use "%Id" instead of
+#. * "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:65
+#, c-format
+msgctxt "short time format"
+msgid "%d:%02d"
+msgstr "%d:%02d"
+
 #. Title
 #. Artist
 #. Album
@@ -1066,10 +1148,14 @@
 msgid_plural "%d frames per second"
 msgstr[0] "每秒 %d 格"
 
-#: ../src/totem-audio-preview.c:168
+#: ../src/totem-audio-preview.c:137
 msgid "Audio Preview"
 msgstr "音樂試聽"
 
+#: ../src/totem.c:240
+msgid "Verify your system installation. Totem will now exit."
+msgstr "請先確認安裝時有沒有問題。Totem 會立刻結束。"
+
 #: ../src/totem-cell-renderer-video.c:126
 msgid "Unknown video"
 msgstr "不明的影片"
@@ -1082,7 +1168,7 @@
 msgid "Cancel"
 msgstr "取消"
 
-#: ../src/totem-fullscreen.c:616
+#: ../src/totem-fullscreen.c:573
 msgid "No File"
 msgstr "沒有檔案"
 
@@ -1100,7 +1186,7 @@
 msgid "Make sure that Totem is properly installed."
 msgstr "請檢查 Totem 是否已正確安裝。"
 
-#: ../src/totem-interface.c:347
+#: ../src/totem-interface.c:357
 msgid ""
 "Totem 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 "
@@ -1108,7 +1194,7 @@
 "version."
 msgstr "Totem 為自由軟件；你可根據據自由軟件基金會所發表的 GNU 通用公共授權條款規定，就本程式再為散布與／或修改；無論你根據據的是本授權的第二版或（你自行選擇的）任一日後發行的版本。"
 
-#: ../src/totem-interface.c:351
+#: ../src/totem-interface.c:361
 msgid ""
 "Totem is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -1116,60 +1202,35 @@
 "details."
 msgstr "Totem 係基於使用目的而加以散布，然而不負任何擔保責任；亦無對適售性或特定目的適用性所為的默示性擔保。詳情請參照 GNU 通用公共授權。"
 
-#: ../src/totem-interface.c:355
+#: ../src/totem-interface.c:365
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Totem; if not, write to the Free Software Foundation, Inc., 59 Temple Place, "
 "Suite 330, Boston, MA  02111-1307  USA"
 msgstr "你應已收到附隨於本程式的 GNU 通用公共授權的副本；如無，請寫信至自由軟件基金會：59 Temple Place Suite 330, Boston, MA 02111-1307  USA"
 
-#: ../src/totem-interface.c:358
+#: ../src/totem-interface.c:368
 msgid ""
 "Totem contains an exception to allow the use of proprietary GStreamer "
 "plugins."
 msgstr "Totem 例外允許使用專屬的 GStreamer 外掛程式。"
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:190
+#: ../src/totem-menu.c:291
 msgid "None"
 msgstr "無"
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:195
+#: ../src/totem-menu.c:296
 msgctxt "Language"
 msgid "Auto"
 msgstr "自動"
 
-#. Translators:
-#. * This is not a JPEG image, but a disc image, for example,
-#. * an ISO file
-#: ../src/totem-menu.c:765
-#, c-format
-msgid "Play Image '%s'"
-msgstr "播放映像檔「%s」"
-
-#: ../src/totem-menu.c:768 ../src/totem-menu.c:851
-#, c-format
-msgid "device%d"
-msgstr "裝置%d"
-
-#: ../src/totem-menu.c:848
-#, c-format
-msgid "Play Disc '%s'"
-msgstr "播放碟片‘%s’"
-
-#. This lists the back-end type and version, such as
-#. * Movie Player using GStreamer 0.10.1
-#: ../src/totem-menu.c:1189
-#, c-format
-msgid "Movie Player using %s"
-msgstr "使用 %s 的影片播放器"
-
-#: ../src/totem-menu.c:1193
+#: ../src/totem-menu.c:789
 msgid "Copyright © 2002-2009 Bastien Nocera"
 msgstr "版權所有 © 2002-2009 Bastien Nocera"
 
-#: ../src/totem-menu.c:1198
+#: ../src/totem-menu.c:794
 msgid "translator-credits"
 msgstr ""
 "如對翻譯有任何意見，請送一封電子郵件給\n"
@@ -1181,145 +1242,77 @@
 "Woodman Tuen , 2004-07\n"
 "Abel Cheung , 2003"
 
-#: ../src/totem-menu.c:1202
+#: ../src/totem-menu.c:798
 msgid "Totem Website"
 msgstr "Totem 網站"
 
-#: ../src/totem-menu.c:1236
+#: ../src/totem-menu.c:829
 msgid "Configure Plugins"
 msgstr "設定外掛程式"
 
+#: ../src/totem-object.c:162
+#, c-format
+msgid ""
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"%s\n"
+"執行「%s --help」可列出命令列中可用的完整選項。\n"
+
 #. Translators: %s is the totem version number
-#: ../src/totem-object.c:471
+#: ../src/totem-object.c:591
 #, c-format
 msgid "Totem %s"
 msgstr "Totem %s"
 
-#: ../src/totem-object.c:1047 ../browser-plugin/totem-plugin-viewer.c:367
-msgid "Playing"
-msgstr "播放"
-
-#: ../src/totem-object.c:1049 ../src/totem-options.c:52
+#: ../src/totem-object.c:1168 ../src/totem-options.c:52
 msgid "Pause"
 msgstr "暫停"
 
-#: ../src/totem-object.c:1054 ../browser-plugin/totem-plugin-viewer.c:363
-msgid "Paused"
-msgstr "已暫停"
-
-#: ../src/totem-object.c:1056 ../src/totem-object.c:1066
+#: ../src/totem-object.c:1175 ../src/totem-object.c:1185
 #: ../src/totem-options.c:51
 msgid "Play"
 msgstr "播放"
 
-#: ../src/totem-object.c:1061 ../src/totem-object.c:1659
-#: ../src/totem-statusbar.c:115 ../browser-plugin/totem-plugin-viewer.c:351
-msgid "Stopped"
-msgstr "已停止"
-
-#: ../src/totem-object.c:1142 ../src/totem-object.c:1169
-#: ../src/totem-object.c:1799 ../src/totem-object.c:1963
+#: ../src/totem-object.c:1267 ../src/totem-object.c:1294
+#: ../src/totem-object.c:1787 ../src/totem-object.c:1942
 #, c-format
 msgid "Totem could not play '%s'."
 msgstr "Totem 無法播放‘%s’。"
 
-#: ../src/totem-object.c:1246
-#, c-format
-msgid ""
-"Totem could not play this media (%s) although a plugin is present to handle "
-"it."
-msgstr "即使適當的外掛程式已經存在，Totem 仍然無法播放這個媒體 (%s)。"
-
-#: ../src/totem-object.c:1247
-msgid ""
-"You might want to check that a disc is present in the drive and that it is "
-"correctly configured."
-msgstr "你可能要檢查一下光碟是否已在光碟機內，和是否已經設置好。"
-
-#: ../src/totem-object.c:1255
-msgid "More information about media plugins"
-msgstr "更多關於多媒體外掛的資訊"
-
-#: ../src/totem-object.c:1256
-msgid ""
-"Please install the necessary plugins and restart Totem to be able to play "
-"this media."
-msgstr "請安裝適當的外掛程式，然後重新啟動 Totem，方可播放這個媒體。"
-
-#: ../src/totem-object.c:1258
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because it does not have the "
-"appropriate plugins to be able to read from the disc."
-msgstr "因為沒有適當的外掛程式來讀取音碟，Totem 無法播放這個媒體 (%s)。"
-
-#: ../src/totem-object.c:1260
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because you do not have the "
-"appropriate plugins to handle it."
-msgstr "因為沒有適當的外掛程式，Totem 無法播放這個媒體 (%s)。"
-
-#: ../src/totem-object.c:1263
-#, c-format
-msgid "Totem cannot play this type of media (%s) because it is not supported."
-msgstr "因為沒有支援該媒體類型，Totem 無法播放這個媒體 (%s)。"
-
-#: ../src/totem-object.c:1264
-msgid "Please insert another disc to play back."
-msgstr "請插入另一個光碟片以播放。"
-
-#: ../src/totem-object.c:1300
-msgid "Totem was not able to play this disc."
-msgstr "Totem 無法播放此碟片。"
-
-#: ../src/totem-object.c:1301 ../src/totem-object.c:4229
-msgid "No reason."
-msgstr "沒有原因。"
-
-#: ../src/totem-object.c:1315
-msgid "Totem does not support playback of Audio CDs"
-msgstr "Totem 不支援播放音樂 CD"
-
-#: ../src/totem-object.c:1316
-msgid "Please consider using a music player or a CD extractor to play this CD"
-msgstr "請改用音樂播放程式或 CD 擷取程式來播放這張 CD"
-
-#: ../src/totem-object.c:1805
+#: ../src/totem-object.c:1793
 msgid "No error message"
 msgstr "沒有錯誤訊息"
 
-#: ../src/totem-object.c:2154
+#: ../src/totem-object.c:2133
 msgid "Totem could not display the help contents."
 msgstr "Totem 無法顯示求助內容。"
 
-#: ../src/totem-object.c:2493 ../src/totem-object.c:2495
-#: ../browser-plugin/totem-plugin-viewer.c:1417
-msgid "An error occurred"
-msgstr "發生錯誤"
-
-#: ../src/totem-object.c:4064 ../src/totem-object.c:4066
+#: ../src/totem-object.c:4019 ../src/totem-object.c:4021
 msgid "Previous Chapter/Movie"
 msgstr "上一章/上一齣影片"
 
-#: ../src/totem-object.c:4073 ../src/totem-object.c:4075
+#: ../src/totem-object.c:4028 ../src/totem-object.c:4030
 msgid "Play / Pause"
 msgstr "播放/暫停"
 
-#: ../src/totem-object.c:4083 ../src/totem-object.c:4085
+#: ../src/totem-object.c:4038 ../src/totem-object.c:4040
 msgid "Next Chapter/Movie"
 msgstr "下一章/下一齣影片"
 
-#. Translators: this is the tooltip text for the fullscreen button in the controls box in Totem's main window.
 #. Translators: this is the accessibility text for the fullscreen button in the controls box in Totem's main window.
-#: ../src/totem-object.c:4097 ../src/totem-object.c:4099
+#: ../src/totem-object.c:4051 ../src/totem-object.c:4053
 msgid "Fullscreen"
 msgstr "全螢幕"
 
-#: ../src/totem-object.c:4229
+#: ../src/totem-object.c:4184
 msgid "Totem could not startup."
 msgstr "Totem 無法啟動"
 
+#: ../src/totem-object.c:4184
+msgid "No reason."
+msgstr "沒有原因。"
+
 #: ../src/totem-open-location.c:182
 msgid "Open Location..."
 msgstr "開啟位置…"
@@ -1393,117 +1386,111 @@
 msgid "Movies to play"
 msgstr "要播放的影片"
 
-#: ../src/totem-options.c:117
+#: ../src/totem-options.c:79
+msgid "- Play movies and songs"
+msgstr "- 播放影片及音樂"
+
+#: ../src/totem-options.c:142
 msgid "Can't enqueue and replace at the same time"
 msgstr "不能同時加入佇列和取代"
 
 #. By extension entry
-#: ../src/totem-playlist.c:161
+#: ../src/totem-playlist.c:162
 msgid "MP3 ShoutCast playlist"
 msgstr "MP3 ShoutCast 播放清單"
 
-#: ../src/totem-playlist.c:162
+#: ../src/totem-playlist.c:163
 msgid "MP3 audio (streamed)"
 msgstr "MP3 音樂 (串流)"
 
-#: ../src/totem-playlist.c:163
+#: ../src/totem-playlist.c:164
 msgid "MP3 audio (streamed, DOS format)"
 msgstr "MP3 音樂（串流式，DOS 格式）"
 
-#: ../src/totem-playlist.c:164
+#: ../src/totem-playlist.c:165
 msgid "XML Shareable Playlist"
 msgstr "XML 共享式播放清單"
 
 #. This is "Title 3", where title is a DVD title
 #. * Note: NOT a DVD chapter
-#: ../src/totem-playlist.c:347
+#: ../src/totem-playlist.c:348
 #, c-format
 msgid "Title %d"
 msgstr "影片 %d"
 
-#: ../src/totem-playlist.c:446
+#: ../src/totem-playlist.c:447
 msgid "Could not save the playlist"
 msgstr "無法儲存播放清單"
 
-#: ../src/totem-playlist.c:1021
+#: ../src/totem-playlist.c:1022
 msgid "Save Playlist"
 msgstr "儲存播放清單"
 
 #. translators: Playlist is the default saved playlist filename,
 #. * without the suffix
-#: ../src/totem-playlist.c:1033 ../src/totem-playlist.c:1264
-#: ../src/totem-sidebar.c:142
+#: ../src/totem-playlist.c:1034 ../src/totem-playlist.c:1263
+#: ../src/totem-sidebar.c:145
 msgid "Playlist"
 msgstr "播放清單"
 
-#: ../src/totem-playlist.c:1857
+#: ../src/totem-playlist.c:1862
 #, c-format
 msgid "The playlist '%s' could not be parsed. It might be damaged."
 msgstr "無法解析播放清單「%s」。它可能已經損壞。"
 
-#: ../src/totem-playlist.c:1858
+#: ../src/totem-playlist.c:1863
 msgid "Playlist error"
 msgstr "播放清單錯誤"
 
-#: ../src/totem-preferences.c:295
+#: ../src/totem-preferences.c:297
 msgid "Preferences"
 msgstr "偏好設定"
 
-#: ../src/totem-preferences.c:451
+#: ../src/totem-preferences.c:445
 msgid "Select Subtitle Font"
 msgstr "選取字幕字型"
 
-#: ../src/totem-properties-main.c:115 ../src/totem-properties-view.c:266
+#: ../src/totem-properties-main.c:116 ../src/totem-properties-view.c:269
 msgid "Audio/Video"
 msgstr "音效/視像"
 
-#: ../src/totem-properties-view.c:128
+#: ../src/totem-properties-view.c:131
 msgid "N/A"
 msgstr "N/A"
 
-#: ../src/totem-properties-view.c:157
+#: ../src/totem-properties-view.c:160
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 msgctxt "Stream bit rate"
 msgid "N/A"
 msgstr "N/A"
 
-#: ../src/totem-properties-view.c:160
+#: ../src/totem-properties-view.c:163
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: ../src/totem-properties-view.c:177
+#: ../src/totem-properties-view.c:180
 #: ../src/plugins/properties/totem-movie-properties.c:149
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../src/totem-properties-view.c:209
+#: ../src/totem-properties-view.c:212
 #: ../src/plugins/properties/totem-movie-properties.c:166
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: ../src/totem-properties-view.c:216
+#: ../src/totem-properties-view.c:219
 #: ../src/plugins/properties/totem-movie-properties.c:166
 msgctxt "Sample rate"
 msgid "N/A"
 msgstr "N/A"
 
-#: ../src/totem-properties-view.c:224
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5589
-msgid "Surround"
-msgstr "環繞"
-
-#: ../src/totem-properties-view.c:226
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5591
-msgid "Mono"
-msgstr "單聲道"
-
-#: ../src/totem-properties-view.c:236
+#: ../src/totem-properties-view.c:239
 msgctxt "Number of audio channels"
 msgid "N/A"
 msgstr "N/A"
@@ -1536,8 +1523,8 @@
 #. eg: 75 %
 #: ../src/totem-statusbar.c:250
 #, c-format
-msgid "%d %%"
-msgstr "%d %%"
+msgid "%lf %%"
+msgstr "%lf %%"
 
 #. eg: Paused, 0:32 / 1:05
 #: ../src/totem-statusbar.c:325
@@ -1548,8 +1535,8 @@
 #. eg: Buffering, 75 %
 #: ../src/totem-statusbar.c:330
 #, c-format
-msgid "%s, %d %%"
-msgstr "%s，%d %%"
+msgid "%s, %f %%"
+msgstr "%s，%f %%"
 
 #: ../src/totem-subtitle-encoding.c:156
 msgid "Current Locale"
@@ -1692,204 +1679,91 @@
 msgid "Vietnamese"
 msgstr "越南語"
 
-#: ../src/totem-video-list.c:330
-msgid "No video URI"
-msgstr "沒有影片 URI"
-
-#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
-#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
-#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
-#: ../src/totem-video-thumbnailer.c:872
-#, c-format
-msgid ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-msgstr ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-
-#: ../src/totem-video-thumbnailer.c:873
-msgid "Filename"
-msgstr "檔案名稱"
-
-#: ../src/totem-video-thumbnailer.c:875
-msgid "Resolution"
-msgstr "解像度"
-
-#: ../src/totem-video-thumbnailer.c:878
-msgid "Duration"
-msgstr "持續時間"
-
-#: ../src/totem-uri.c:506 ../src/plugins/chapters/totem-chapters.c:998
+#: ../src/totem-uri.c:343 ../src/plugins/chapters/totem-chapters.c:998
 msgid "All files"
 msgstr "所有檔案"
 
-#: ../src/totem-uri.c:511 ../src/plugins/chapters/totem-chapters.c:995
+#: ../src/totem-uri.c:348 ../src/plugins/chapters/totem-chapters.c:995
 msgid "Supported files"
 msgstr "支援的檔案"
 
-#: ../src/totem-uri.c:523
+#: ../src/totem-uri.c:360
 msgid "Audio files"
 msgstr "音效檔案"
 
-#: ../src/totem-uri.c:531
+#: ../src/totem-uri.c:368
 msgid "Video files"
 msgstr "視像檔案"
 
-#: ../src/totem-uri.c:541
+#: ../src/totem-uri.c:378
 msgid "Subtitle files"
 msgstr "字幕檔案"
 
-#: ../src/totem-uri.c:593
+#: ../src/totem-uri.c:430
 msgid "Select Text Subtitles"
 msgstr "選擇文字字幕"
 
-#: ../src/totem-uri.c:656
+#: ../src/totem-uri.c:495
 msgid "Select Movies or Playlists"
 msgstr "選取影片或播放清單"
 
-#. Options parsing
-#: ../src/totem.c:201
-msgid "- Play movies and songs"
-msgstr "- 播放影片及音樂"
-
-#: ../src/totem.c:212
-#, c-format
-msgid ""
-"%s\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"%s\n"
-"執行「%s --help」可列出命令列中可用的完整選項。\n"
-
-#: ../src/totem.c:254 ../src/totem.c:265
-#: ../browser-plugin/totem-plugin-viewer.c:663
-#: ../browser-plugin/totem-plugin-viewer.c:1793
-msgid "Totem Movie Player"
-msgstr "Totem 影片播放器"
-
-#: ../src/totem.c:255 ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Could not initialize the thread-safe libraries."
-msgstr "無法起動 thread-safe libraries。"
-
-#: ../src/totem.c:255
-msgid "Verify your system installation. Totem will now exit."
-msgstr "請先確認安裝時有沒有問題。Totem 會立刻結束。"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:1589
-msgid "Password requested for RTSP server"
-msgstr "RTSP 伺服器要求的密碼 "
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2858
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2862
-#, c-format
-msgid "Audio Track #%d"
-msgstr "音樂音軌 #%d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2890
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2894
-#, c-format
-msgid "Subtitle #%d"
-msgstr "字幕 #%d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3298
-msgid ""
-"The requested audio output was not found. Please select another audio output "
-"in the Multimedia Systems Selector."
-msgstr "找不到所要求的音效輸出。請在多媒體系統選取程式中選擇其它的音效輸出。"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3303
-msgid "Location not found."
-msgstr "找不到位置。"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3307
-msgid ""
-"Could not open location; you might not have permission to open the file."
-msgstr "無法開啟位置，可能你沒有開啟該檔案的權限。"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3318
-msgid ""
-"The video output is in use by another application. Please close other video "
-"applications, or select another video output in the Multimedia Systems "
-"Selector."
-msgstr "其它的應用程式正在使用視像輸出。請關閉其它的視像輸出，或是在多媒體系統選取程式中選擇其它的音效輸出。"
+#: ../src/totem-uri.c:499
+msgid "Add Directory"
+msgstr "加入目錄"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3324
-msgid ""
-"The audio output is in use by another application. Please select another "
-"audio output in the Multimedia Systems Selector. You may want to consider "
-"using a sound server."
-msgstr "其它的應用程式正在使用音效輸出。請在多媒體系統選取程式中選擇其它的音效輸出。或者你要考慮一下使用音效伺服器。"
+#: ../src/totem-video-list.c:330
+msgid "No video URI"
+msgstr "沒有影片 URI"
 
-#. should be exactly one missing thing (source or converter)
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3342
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3348
+#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
+#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
+#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
+#: ../src/totem-video-thumbnailer.c:841
 #, c-format
-msgid "The playback of this movie requires a %s plugin which is not installed."
-msgid_plural ""
-"The playback of this movie requires the following decoders which are not "
-"installed:\n"
-"\n"
-"%s"
-msgstr[0] ""
-"播放此影片需要下列解碼器，但尚未安裝：\n"
-"\n"
-"%s"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3374
 msgid ""
-"Cannot play this file over the network. Try downloading it to disk first."
-msgstr "無法透過網絡播放此檔案。先下載到磁碟後再試。。"
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
+msgstr ""
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5878
-msgid "Media contains no supported video streams."
-msgstr "媒體包含不支援的視像串流。"
+#: ../src/totem-video-thumbnailer.c:842
+msgid "Filename"
+msgstr "檔案名稱"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6052
-msgid ""
-"Failed to create a GStreamer play object. Please check your GStreamer "
-"installation."
-msgstr "無法建立 GStreamer 播放對像。請檢查 GStreamer 的安裝是否正確。"
+#: ../src/totem-video-thumbnailer.c:844
+msgid "Resolution"
+msgstr "解像度"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6172
-msgid ""
-"Failed to open audio output. You may not have permission to open the sound "
-"device, or the sound server may not be running. Please select another audio "
-"output in the Multimedia Systems Selector."
-msgstr "無法開啟音效輸出。你沒有足夠的權限開啟音效裝置，或是音效伺服器沒有執行。請在多媒體系統選取程式中選擇其它的音效輸出。"
+#: ../src/totem-video-thumbnailer.c:847
+msgid "Duration"
+msgstr "持續時間"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6192
-msgid ""
-"Could not find the audio output. You may need to install additional "
-"GStreamer plugins, or select another audio output in the Multimedia Systems "
-"Selector."
-msgstr "無法找到音效輸出。你可能需要安裝附加的 GStreamer 外掛程式，或在多媒體系統選取程式中選擇其它的音效輸出。"
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:1
+msgid "Apple Trailers"
+msgstr "Apple 預告片"
+
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:2
+msgid "Sets the user agent for the Apple Trailers site"
+msgstr "請定用於 Apple Trailers 網站的使用者代理"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:1
+msgid "Autoload Subtitles"
+msgstr "自動載入字幕"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:2
+msgid "Autoloads text subtitles"
+msgstr "自動載入文字字幕"
 
-#. hour:minutes:seconds
-#. Translators: This is a time format, like "9:05:02" for 9
-#. * hours, 5 minutes, and 2 seconds. You may change ":" to
-#. * the separator that your locale uses or use "%Id" instead
-#. * of "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:83 ../src/plugins/skipto/totem-time-entry.c:57
-#, c-format
-msgctxt "long time format"
-msgid "%d:%02d:%02d"
-msgstr "%d:%02d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
+msgid "Video Disc Recorder"
+msgstr "影片光碟燒錄程式"
 
-#. minutes:seconds
-#. Translators: This is a time format, like "5:02" for 5
-#. * minutes and 2 seconds. You may change ":" to the
-#. * separator that your locale uses or use "%Id" instead of
-#. * "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:92
-#, c-format
-msgctxt "short time format"
-msgid "%d:%02d"
-msgstr "%d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
+msgid "Records (S)VCDs or video DVDs"
+msgstr "錄製 (S)VCD 或影片 DVD"
 
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:65
 msgid "_Create Video Disc..."
@@ -1915,93 +1789,85 @@
 msgid "Copy the currently playing (S)VCD"
 msgstr "複製目前播放的 (S)VCD"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:129
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:136
 msgid "The video disc could not be duplicated."
 msgstr "該影片光碟無法被重製。"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:131
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:276
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:138
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:283
 msgid "The movie could not be recorded."
 msgstr "該影片無法被錄製。"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:157
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:167
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:263
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:164
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:174
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:270
 msgid "Unable to write a project."
 msgstr "無法寫入為專案。"
 
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
-msgid "Records (S)VCDs or video DVDs"
-msgstr "錄製 (S)VCD 或影片 DVD"
-
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
-msgid "Video Disc Recorder"
-msgstr "影片光碟燒錄程式"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:1
-#: ../src/plugins/chapters/totem-chapters.c:1139
-msgid "Chapters"
-msgstr "章節"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:2
-msgid "Support chapter markers in movies."
-msgstr "支援影片的章節標記。"
-
 #: ../src/plugins/chapters/chapters-edit.ui.h:1
 msgid "Name for new chapter:"
 msgstr "新章節的名稱："
 
 #: ../src/plugins/chapters/chapters-list.ui.h:1
-msgid "Add Chapter..."
-msgstr "加入章節…"
+msgid "_Remove Chapter"
+msgstr "移除章節(_R)"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:2
-msgid "Add New Chapters"
-msgstr "加入新的章節"
+msgid "Remove the chapter from the list"
+msgstr "從清單中移除章節"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:3
-msgid "Create a new chapter list for the movie"
-msgstr "建立影片的新章節清單"
+msgid "_Go to Chapter"
+msgstr "前往章節(_G)"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:4
-msgid "Go to Chapter"
-msgstr "前往章節"
-
-#: ../src/plugins/chapters/chapters-list.ui.h:5
 msgid "Go to the chapter in the movie"
 msgstr "前往影片中的章節"
 
+#: ../src/plugins/chapters/chapters-list.ui.h:5
+msgid "Add Chapter..."
+msgstr "加入章節…"
+
 #: ../src/plugins/chapters/chapters-list.ui.h:6
-msgid "Load Chapters..."
-msgstr "載入章節…"
+msgid "Remove Chapter"
+msgstr "移除章節"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:7
-msgid "Load chapters from an external CMML file"
-msgstr "從外部的 CMML 檔案載入章節"
+msgid "Go to Chapter"
+msgstr "前往章節"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:8
-msgid "No chapter data"
-msgstr "沒有章節資料"
+msgid "Save Changes"
+msgstr "儲存更改"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:9
-msgid "Remove Chapter"
-msgstr "移除章節"
+msgid "No chapter data"
+msgstr "沒有章節資料"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:10
-msgid "Remove the chapter from the list"
-msgstr "從清單中移除章節"
+msgid "Load Chapters..."
+msgstr "載入章節…"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:11
-msgid "Save Changes"
-msgstr "儲存更改"
+msgid "Load chapters from an external CMML file"
+msgstr "從外部的 CMML 檔案載入章節"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:12
-msgid "_Go to Chapter"
-msgstr "前往章節(_G)"
+msgid "Add New Chapters"
+msgstr "加入新的章節"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:13
-msgid "_Remove Chapter"
-msgstr "移除章節(_R)"
+msgid "Create a new chapter list for the movie"
+msgstr "建立影片的新章節清單"
+
+#: ../src/plugins/chapters/chapters.plugin.in.h:1
+#: ../src/plugins/chapters/totem-chapters.c:1139
+msgid "Chapters"
+msgstr "章節"
+
+#: ../src/plugins/chapters/chapters.plugin.in.h:2
+msgid "Support chapter markers in movies"
+msgstr "支援影片的章節標記"
 
 #: ../src/plugins/chapters/totem-chapters.c:56
 #, c-format
@@ -2106,13 +1972,37 @@
 msgid "The URI ‘%s’ is not supported."
 msgstr "URI「%s」尚未支援。"
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
-msgid "Instant Messenger status"
-msgstr "即時通訊狀態"
+#: ../src/plugins/grilo/grilo.plugin.in.h:1
+msgid "Grilo Browser"
+msgstr "Grilo 瀏覽器"
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
-msgid "Set your Instant Messenger status to away when a movie is playing"
-msgstr "當電影播放時設定你的即時通訊狀態為離開"
+#: ../src/plugins/grilo/grilo.plugin.in.h:2
+msgid "A plugin to let you browse media content from various sources"
+msgstr "讓你觀看多種來源媒體內容的外掛程式"
+
+#: ../src/plugins/grilo/grilo.ui.h:1
+msgid "Add to Playlist"
+msgstr "加入至播放清單"
+
+#: ../src/plugins/grilo/grilo.ui.h:2
+msgid "Copy Location"
+msgstr "複製位置"
+
+#: ../src/plugins/grilo/grilo.ui.h:3 ../src/plugins/grilo/totem-grilo.c:1184
+msgid "Browse"
+msgstr "瀏覽"
+
+#: ../src/plugins/grilo/grilo.ui.h:4 ../src/plugins/grilo/totem-grilo.c:1227
+msgid "Search"
+msgstr "搜尋"
+
+#: ../src/plugins/grilo/totem-grilo.c:454
+msgid "Browse Error"
+msgstr "瀏覽器錯誤"
+
+#: ../src/plugins/grilo/totem-grilo.c:609
+msgid "Search Error"
+msgstr "搜尋錯誤"
 
 #: ../src/plugins/gromit/gromit.plugin.in.h:1
 msgid "Gromit Annotations"
@@ -2126,53 +2016,13 @@
 msgid "The gromit binary was not found."
 msgstr "找不到 Gromit 的二進位檔。"
 
-#. Add the interface to Totem's sidebar
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:1
-#: ../src/plugins/iplayer/iplayer.py:46
-msgid "BBC iPlayer"
-msgstr "BBC iPlayer"
-
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:2
-msgid "Stream BBC programs from the last 7 days from the BBC iPlayer service."
-msgstr "從 BBC iPlayer 服務最新 7 天的串流 BBC 節目。"
-
-#: ../src/plugins/iplayer/iplayer.py:72
-msgid "Error listing channel categories"
-msgstr "列出頻道分類時發生錯誤"
-
-#: ../src/plugins/iplayer/iplayer.py:73
-msgid ""
-"There was an unknown error getting the list of television channels available "
-"on BBC iPlayer."
-msgstr "從 BBC iPlayer 取得可用的電視頻道清單時發生不明的錯誤。"
-
-#. Append a dummy child row so that the expander's visible; we can
-#. then queue off the expander to load the programme listing for this
-#. category
-#: ../src/plugins/iplayer/iplayer.py:84
-msgid "Loading…"
-msgstr "載入中…"
-
-#. Translators: the "programme feed" is the list of TV shows
-#. available to watch online
-#: ../src/plugins/iplayer/iplayer.py:136
-msgid "Error getting programme feed"
-msgstr "取得節目表餵送時發生錯誤"
-
-#: ../src/plugins/iplayer/iplayer.py:137
-msgid ""
-"There was an error getting the list of programmes for this channel and "
-"category combination."
-msgstr "取得這個頻道和分類組合的節目清單時發生錯誤。"
-
-#: ../src/plugins/iplayer/iplayer2.py:298
-msgid ""
-msgstr "<沒有指定原因>"
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
+msgid "Instant Messenger Status"
+msgstr "即時通訊狀態"
 
-#: ../src/plugins/iplayer/iplayer2.py:299
-#, python-format
-msgid "Programme unavailable (\"%s\")"
-msgstr "節目表無法使用 (\"%s\")"
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
+msgid "Set your Instant Messenger status to away when a movie is playing"
+msgstr "當影片播放時設定你的即時通訊狀態為離開"
 
 #: ../src/plugins/lirc/lirc.plugin.in.h:1
 msgid "Infrared Remote Control"
@@ -2190,26 +2040,30 @@
 msgid "Couldn't read lirc configuration."
 msgstr "無法讀取 lirc 的設定。"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
-msgid "Download Movie Subtitles"
-msgstr "下載影片字幕"
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:1
+msgid "Media Player Keys"
+msgstr "多媒體播放器按鍵"
+
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:2
+msgid "Support additional media player keys"
+msgstr "支援額外的媒體播放器鍵"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
-msgid "Subtitle _language:"
-msgstr "字幕語言(_L):"
+#: ../src/plugins/ontop/ontop.plugin.in.h:1
+msgid "Always On Top"
+msgstr "永遠在最上層"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
-msgid "_Play with Subtitle"
-msgstr "播放時加字幕(_P)"
+#: ../src/plugins/ontop/ontop.plugin.in.h:2
+msgid "Keep the main window on top when playing a movie"
+msgstr "播放影片時將主視窗維持在最上層"
 
 #: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:1
-msgid "Look for subtitles for the currently playing movie."
-msgstr "尋找目前播放影片的字幕。"
-
-#: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:2
 msgid "Subtitle Downloader"
 msgstr "字幕下載程式"
 
+#: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:2
+msgid "Look for subtitles for the currently playing movie"
+msgstr "尋找目前播放影片的字幕"
+
 #: ../src/plugins/opensubtitles/opensubtitles.py:42
 msgid "Brazilian Portuguese"
 msgstr "巴西葡萄牙文"
@@ -2264,6 +2118,18 @@
 msgid "Searching subtitles…"
 msgstr "正在搜尋字幕…"
 
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
+msgid "Download Movie Subtitles"
+msgstr "下載影片字幕"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
+msgid "Subtitle _language:"
+msgstr "字幕語言(_L):"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
+msgid "_Play with Subtitle"
+msgstr "播放時加字幕(_P)"
+
 #: ../src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in.h:1
 msgid "Subtitle language"
 msgstr "字幕語言"
@@ -2272,99 +2138,107 @@
 msgid "The language to search for subtitles for movies in."
 msgstr "要搜尋影片字幕語言。"
 
-#: ../src/plugins/ontop/ontop.plugin.in.h:1
-msgid "Always On Top"
-msgstr "永遠在最上層"
-
-#: ../src/plugins/ontop/ontop.plugin.in.h:2
-msgid "Keep the main window on top when playing a movie"
-msgstr "播放電影時將主視窗維持在最上層"
+#: ../src/plugins/properties/movie-properties.plugin.in.h:1
+msgid "Movie Properties"
+msgstr "影片屬性"
+
+#: ../src/plugins/properties/movie-properties.plugin.in.h:2
+msgid "Adds movie properties to the sidebar"
+msgstr "加入影片屬性到側邊列"
 
 #: ../src/plugins/properties/totem-movie-properties.c:246
 msgid "Properties"
 msgstr "屬性"
 
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:2
-#, no-c-format
-msgid ""
-"A format string used to build the network service name used when publishing "
-"playlists over the network. The following format placeholders can be used: • "
-"%a: the program name as returned by g_get_application_name() • %h: the "
-"machine's host name in title case • %u: the user's login name in title case "
-"• %U: the user's real name • %%: the percent sign"
-msgstr "用來建立透過網絡發布播放清單時使用的網絡服務名稱的格式字串。可以使用下列格式佔位符：• %a：由 g_get_application_name() 傳回的程式名稱• %h：電腦的大寫主機名稱• %u：使用者的大寫登入名稱 • %U：使用者的真實姓名 • %%：百分比符號"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:3
-msgid "Format for network service name"
-msgstr "網絡服務名稱的格式"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:4
-msgid "Publisher protocol to use"
-msgstr "要使用的發布通訊協定"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:5
-msgid ""
-"The transport protocol to use when publishing playlists over the network."
-msgstr "當透過互聯網發布播放清單時要使用的傳輸格式。"
-
-#. Translators: computers on the local network which are publishing their playlists over the network
-#: ../src/plugins/publish/totem-publish.c:552
-msgid "Neighbors"
-msgstr "鄰居"
-
-#: ../src/plugins/publish/publish.plugin.in.h:1
-msgid "Publish Playlist"
-msgstr "發布播放清單"
-
-#: ../src/plugins/publish/publish.plugin.in.h:2
-msgid "Share the current playlist via HTTP"
-msgstr "透過 HTTP 分享目前的播放清單"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:1
-msgid "Service _Name:"
-msgstr "服務名稱(_N):"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:3
-#, no-c-format
-msgid ""
-"The name used for announcing the playlist service on the network.\n"
-"All occurrences of the string %u will be replaced by your name,\n"
-"and %h will be replaced by your computer's host name."
-msgstr ""
-"在網絡上發布此播放清單服器所使用的名稱。\n"
-"所有的字串 %u 會以你的名字取代，\n"
-"而 %h 會以你電腦的主機名稱取代。"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:6
-msgid "Use _encrypted transport protocol (HTTPS)"
-msgstr "使用加密的傳輸通訊協定[HTTPS](_E)"
-
 #: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:1
+msgid "rpdb2 password"
+msgstr "rpdb2 密碼"
+
+#: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:2
 msgid ""
 "A password to protect the rpdb2 server for debugging Totem from unauthorized "
 "remote access. If this is empty, a default of 'totem' will be used."
 msgstr "對 Totem 未授權遠端存取除錯用來保護 rpdb2 伺服器的密碼。如果此項為空白，就會使用預設密碼 'totem'"
 
-#: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:2
-msgid "rpdb2 password"
-msgstr "rpdb2 密碼"
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
+msgid "Python Console"
+msgstr "Python 主控臺"
 
-#: ../src/plugins/rotation/rotation.plugin.in.h:1
-msgid "Allows videos to be rotated if they're in the wrong orientation."
-msgstr "如果影片的方向錯誤則允許它們旋轉。"
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
+msgid "Interactive Python console"
+msgstr "互動式 Python 主控臺"
 
-#: ../src/plugins/rotation/rotation.plugin.in.h:2
+#: ../src/plugins/pythonconsole/pythonconsole.py:88
+msgid "Python Console Menu"
+msgstr "Python 主控臺選單"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:93
+msgid "_Python Console"
+msgstr "_Python 主控臺"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:94
+msgid "Show Totem's Python console"
+msgstr "顯示 Totem 的 Python 主控臺"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:100
+msgid "Python Debugger"
+msgstr "Python 除錯器"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:101
+msgid "Enable remote Python debugging with rpdb2"
+msgstr "啟用使用 rpdb2 的遠端 Python 除錯"
+
+#. pylint: disable-msg=E1101
+#: ../src/plugins/pythonconsole/pythonconsole.py:125
+#, python-format
+msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
+msgstr ""
+"你可以透過「totem_object」存取 Totem 物件：\\n"
+"%s"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:129
+msgid "Totem Python Console"
+msgstr "Totem Python 主控臺"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:139
+msgid ""
+"After you press OK, Totem will wait until you connect to it with winpdb or "
+"rpdb2. If you have not set a debugger password in DConf, it will use the "
+"default password ('totem')."
+msgstr "在你按下確定後，Totem 會等待你以 winpdb 或 rpdb2 連線。如果你尚未在 GConf 中設定除錯器密碼，它會使用預設的密碼('totem')。"
+
+#: ../src/plugins/recent/recent.plugin.in.h:1
+msgid "Recent files"
+msgstr "最近開啟檔案"
+
+#: ../src/plugins/recent/recent.plugin.in.h:2
+msgid "Adds files that have been played to recent files"
+msgstr "將播放過的檔案加入最近開啟檔案"
+
+#: ../src/plugins/rotation/rotation.plugin.in.h:1
 msgid "Rotation Plugin"
 msgstr "旋轉外掛程式"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:60
+#: ../src/plugins/rotation/rotation.plugin.in.h:2
+msgid "Allows videos to be rotated if they are in the wrong orientation"
+msgstr "如果影片的方向錯誤則允許它們旋轉"
+
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:50
 msgid "_Rotate Clockwise"
 msgstr "順時針方向旋轉(_R)"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:62
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:52
 msgid "Rotate Counterc_lockwise"
 msgstr "逆時針方向旋轉(_L)"
 
+#: ../src/plugins/save-file/save-file.plugin.in.h:1
+msgid "Save Copy"
+msgstr "儲存副本"
+
+#: ../src/plugins/save-file/save-file.plugin.in.h:2
+msgid "Save a copy of the currently playing movie"
+msgstr "儲存目前放映中影片的副本"
+
 #: ../src/plugins/save-file/totem-save-file.c:63
 msgid "Save a Copy..."
 msgstr "儲存副本…"
@@ -2389,40 +2263,48 @@
 msgid "Movie stream"
 msgstr "影片串流"
 
-#: ../src/plugins/screensaver/totem-screensaver.c:116
-#: ../browser-plugin/totem-plugin-viewer.c:1891
-msgid "Playing a movie"
-msgstr "播放影片"
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:1
+msgid "Screen Saver"
+msgstr "螢幕保護程式"
+
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:2
+msgid "Deactivates the screen saver when a movie is playing"
+msgstr "播放影片時停用螢幕保護程式"
 
 #: ../src/plugins/screenshot/gallery.ui.h:1
+msgid "Screenshot width (in pixels):"
+msgstr "畫面快照闊度(以像素計):"
+
+#: ../src/plugins/screenshot/gallery.ui.h:2
 msgid "Calculate the number of screenshots"
 msgstr "計算畫面快照的數量"
 
-#: ../src/plugins/screenshot/gallery.ui.h:2
+#: ../src/plugins/screenshot/gallery.ui.h:3
 msgid "Number of screenshots:"
 msgstr "畫面快照的數量:"
 
-#: ../src/plugins/screenshot/gallery.ui.h:3
-msgid "Screenshot width (in pixels):"
-msgstr "畫面快照闊度(以像素計):"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:1
-msgid "Save in _folder:"
-msgstr "儲存於資料夾(_F):"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:2
-msgid "Select a folder"
-msgstr "選擇一個資料夾"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:3
-msgid "_Name:"
-msgstr "名稱(_N):"
-
-#. Write the screenshot to the temporary file
-#: ../src/plugins/screenshot/gnome-screenshot-widget.c:385
-#: ../src/plugins/screenshot/totem-screenshot.c:64
-msgid "Screenshot.png"
-msgstr "Screenshot.png"
+#. translators: this is the name of the file that gets made up
+#. * with the screenshot if the entire screen is taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:147
+#, c-format
+msgid "Screenshot from %s.png"
+msgstr "螢幕截圖來自 %s.png"
+
+#. translators: this is the name of the file that gets
+#. * made up with the screenshot if the entire screen is
+#. * taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:154
+#, c-format
+msgid "Screenshot from %s - %d.png"
+msgstr "螢幕截圖來自 %s - %d.png"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:1
+msgid "Screenshot"
+msgstr "畫面快照"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:2
+msgid "Allows screenshots and galleries to be taken of videos"
+msgstr "允許影片使用螢幕截圖和藝廊"
 
 #: ../src/plugins/screenshot/totem-gallery.c:91
 msgid "Save Gallery"
@@ -2448,49 +2330,47 @@
 msgid "Saving gallery as \"%s\""
 msgstr "將藝廊儲存為「%s」"
 
-#: ../src/plugins/screenshot/totem-screenshot.c:113
-msgid "There was an error saving the screenshot."
-msgstr "儲存畫面快照時出現錯誤。"
-
-#: ../src/plugins/screenshot/totem-screenshot.c:139
-msgid "Save Screenshot"
-msgstr "儲存畫面快照"
-
-#. Create the screenshot widget
-#. Translators: %s is the movie title and %d is an auto-incrementing number to make filename unique
-#: ../src/plugins/screenshot/totem-screenshot.c:160
-#, c-format
-msgid "Screenshot-%s-%d.png"
-msgstr "畫面截圖-%s-%d.png"
-
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:88
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:220
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "Totem could not get a screenshot of the video."
 msgstr "Totem 無法為該影片擷取畫面快照。"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "This is not supposed to happen; please file a bug report."
 msgstr "預設這是不會發生的，請報告錯誤。"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
-msgid "Take _Screenshot..."
-msgstr "拍攝畫面快照(_S)…"
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
+msgid "Take _Screenshot"
+msgstr "拍攝畫面快照(_S)"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
 msgid "Take a screenshot"
 msgstr "擷取畫面快照"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create Screenshot _Gallery..."
 msgstr "建立畫面快照藝廊(_G)…"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create a gallery of screenshots"
 msgstr "建立畫面快照的藝廊"
 
+#: ../src/plugins/skipto/skipto.plugin.in.h:1
+#: ../src/plugins/skipto/totem-skipto.c:196
+msgid "Skip To"
+msgstr "跳至"
+
+#: ../src/plugins/skipto/skipto.plugin.in.h:2
+msgid "Provides the \"Skip to\" dialog"
+msgstr "提供「忽略到」對話盒"
+
+#: ../src/plugins/skipto/skipto.ui.h:1
+msgid "_Skip to:"
+msgstr "跳至(_S):"
+
 #. Update the "seconds" label so that it always has the correct singular/plural form
 #. Translators: label for the seconds selector in the "Skip to" dialogue
-#: ../src/plugins/skipto/totem-skipto.c:160
+#: ../src/plugins/skipto/totem-skipto.c:159
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "秒"
@@ -2499,15 +2379,11 @@
 #. Translators: you should translate this string to a number (written in digits) which corresponds to the longer character length of the
 #. * translations for "second" and "seconds", as translated elsewhere in this file. For example, in English, "second" is 6 characters long and
 #. * "seconds" is 7 characters long, so this string should be translated to "7". See: bgo#639398
-#: ../src/plugins/skipto/totem-skipto.c:190
+#: ../src/plugins/skipto/totem-skipto.c:189
 msgctxt "Skip To label length"
 msgid "7"
 msgstr "7"
 
-#: ../src/plugins/skipto/totem-skipto.c:197
-msgid "Skip To"
-msgstr "跳至"
-
 #: ../src/plugins/skipto/totem-skipto-plugin.c:182
 msgid "_Skip To..."
 msgstr "跳至(_S)…"
@@ -2516,112 +2392,278 @@
 msgid "Skip to a specific time"
 msgstr "跳往指定時間"
 
-#: ../src/plugins/skipto/skipto.ui.h:1
-msgid "_Skip to:"
-msgstr "跳至(_S):"
+#~ msgid ""
+#~ msgstr "<沒有指定原因>"
 
-#: ../browser-plugin/totem-plugin-viewer.c:431
-msgid "No URI to play"
-msgstr "沒有要播放的 URI"
+#~ msgid "Programme unavailable (\"%s\")"
+#~ msgstr "節目表無法使用 (\"%s\")"
 
-#. translators: this is:
-#. * Open With ApplicationName
-#. * as in nautilus' right-click menu
-#: ../browser-plugin/totem-plugin-viewer.c:1107
-#, c-format
-msgid "_Open with \"%s\""
-msgstr "以「%s」開啟(_O)"
+#~ msgid "BBC iPlayer"
+#~ msgstr "BBC iPlayer"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2136
-msgid "No playlist or playlist empty"
-msgstr "沒有播放清單或清單空白"
+#~ msgid ""
+#~ "Stream BBC programs from the last 7 days from the BBC iPlayer service"
+#~ msgstr "從 BBC iPlayer 服務最新 7 天的串流 BBC 節目"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2235
-msgid "Movie browser plugin"
-msgstr "影片瀏覽器外掛程式"
+#~ msgid "Error listing channel categories"
+#~ msgstr "列出頻道分類時發生錯誤"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Verify your system installation. The Totem plugin will now exit."
-msgstr "請檢查安裝時有沒有問題。Totem 會立刻結束。"
+#~ msgid ""
+#~ "There was an unknown error getting the list of television channels "
+#~ "available on BBC iPlayer."
+#~ msgstr "從 BBC iPlayer 取得可用的電視頻道清單時發生不明的錯誤。"
 
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
-msgid "Interactive Python console."
-msgstr "互動式 Python 主控臺。"
+#~ msgid "Loading…"
+#~ msgstr "載入中…"
 
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
-msgid "Python Console"
-msgstr "Python 主控臺"
+#~ msgid "Error getting programme feed"
+#~ msgstr "取得節目表餵送時發生錯誤"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:88
-msgid "Python Console Menu"
-msgstr "Python 主控臺選單"
+#~ msgid ""
+#~ "There was an error getting the list of programmes for this channel and "
+#~ "category combination."
+#~ msgstr "取得這個頻道和分類組合的節目清單時發生錯誤。"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:93
-msgid "_Python Console"
-msgstr "_Python 主控臺"
+#~ msgid "%d %%"
+#~ msgstr "%d %%"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:94
-msgid "Show Totem's Python console"
-msgstr "顯示 Totem 的 Python 主控臺"
+#~ msgid "Play movies and songs"
+#~ msgstr "播放影片及音樂"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:100
-msgid "Python Debugger"
-msgstr "Python 除錯器"
+#~ msgid "1.5 Mbps T1/Intranet/LAN"
+#~ msgstr "1.5 Mbps T1/Intranet/LAN"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:101
-msgid "Enable remote Python debugging with rpdb2"
-msgstr "啟用使用 rpdb2 的遠端 Python 除錯"
+#~ msgid "112 Kbps Dual ISDN/DSL"
+#~ msgstr "112 Kbps 雙 ISDN/DSL"
 
-#. pylint: disable-msg=E1101
-#: ../src/plugins/pythonconsole/pythonconsole.py:125
-#, python-format
-msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
-msgstr ""
-"你可以透過「totem_object」存取 Totem 物件：\\n"
-"%s"
+#~ msgid "14.4 Kbps Modem"
+#~ msgstr "14.4 Kbps 數據機"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:129
-msgid "Totem Python Console"
-msgstr "Totem Python 主控臺"
+#~ msgid "19.2 Kbps Modem"
+#~ msgstr "19.2 Kbps 數據機"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:139
-msgid ""
-"After you press OK, Totem will wait until you connect to it with winpdb or "
-"rpdb2. If you have not set a debugger password in DConf, it will use the "
-"default password ('totem')."
-msgstr "在你按下確定後，Totem 會等待你以 winpdb 或 rpdb2 連線。如果你尚未在 GConf 中設定除錯器密碼，它會使用預設的密碼('totem')。"
+#~ msgid "256 Kbps DSL/Cable"
+#~ msgstr "256 Kbps DSL/Cable"
 
-#: ../src/plugins/grilo/grilo.plugin.in.h:1
-msgid "A plugin to let you browse media content from various sources."
-msgstr "讓你觀看多種來源媒體內容的外掛程式。"
+#~ msgid "28.8 Kbps Modem"
+#~ msgstr "28.8 Kbps 數據機"
 
-#: ../src/plugins/grilo/grilo.plugin.in.h:2
-msgid "Grilo Browser"
-msgstr "Grilo 瀏覽器"
+#~ msgid "33.6 Kbps Modem"
+#~ msgstr "33.6 Kbps 數據機"
 
-#: ../src/plugins/grilo/totem-grilo.c:452
-msgid "Browse Error"
-msgstr "瀏覽器錯誤"
+#~ msgid "34.4 Kbps Modem"
+#~ msgstr "34.4 Kbps 數據機"
 
-#: ../src/plugins/grilo/totem-grilo.c:599
-msgid "Search Error"
-msgstr "搜尋錯誤"
+#~ msgid "384 Kbps DSL/Cable"
+#~ msgstr "384 Kbps DSL/Cable"
 
-#: ../src/plugins/grilo/totem-grilo.c:1219 ../src/plugins/grilo/grilo.ui.h:2
-msgid "Browse"
-msgstr "瀏覽"
+#~ msgid "512 Kbps DSL/Cable"
+#~ msgstr "512 Kbps DSL/Cable"
 
-#: ../src/plugins/grilo/totem-grilo.c:1285 ../src/plugins/grilo/grilo.ui.h:4
-msgid "Search"
-msgstr "搜尋"
+#~ msgid "56 Kbps Modem/ISDN"
+#~ msgstr "56 Kbps 數據機/ISDN"
 
-#: ../src/plugins/grilo/grilo.ui.h:1
-msgid "Add to Playlist"
-msgstr "加入至播放清單"
+#~ msgid "Connection _speed:"
+#~ msgstr "連線速度(_S):"
 
-#: ../src/plugins/grilo/grilo.ui.h:3
-msgid "Copy Location"
-msgstr "複製位置"
+#~ msgid "Intranet/LAN"
+#~ msgstr "Intranet/LAN"
+
+#~ msgid "Networking"
+#~ msgstr "網路"
+
+#~ msgid ""
+#~ "Approximate network connection speed, used to select quality on media "
+#~ "over the network."
+#~ msgstr "大約的網路連線速度，用來選擇透過網路傳輸的媒體品質。"
+
+#~ msgid "Network connection speed"
+#~ msgstr "連線連線速度"
+
+#~ msgid "Movie Player using %s"
+#~ msgstr "使用 %s 的影片播放器"
+
+#~ msgid "Location not found."
+#~ msgstr "找不到位置。"
+
+#~ msgid ""
+#~ "Could not open location; you might not have permission to open the file."
+#~ msgstr "無法開啟位置，可能您沒有開啟該檔案的權限。"
+
+#~ msgid ""
+#~ "Failed to create a GStreamer play object. Please check your GStreamer "
+#~ "installation."
+#~ msgstr "無法建立 GStreamer 播放對像。請檢查 GStreamer 的安裝是否正確。"
+
+#~ msgid "Save in _folder:"
+#~ msgstr "儲存於資料夾(_F):"
+
+#~ msgid "Select a folder"
+#~ msgstr "選擇一個資料夾"
+
+#~ msgid "_Name:"
+#~ msgstr "名稱(_N):"
+
+#~ msgid "There was an error saving the screenshot."
+#~ msgstr "儲存畫面快照時出現錯誤。"
+
+#~ msgid "Save Screenshot"
+#~ msgstr "儲存畫面快照"
+
+#~ msgid "Configure the application"
+#~ msgstr "設定應用程式"
+
+#~ msgid "Open a file"
+#~ msgstr "開啟檔案"
+
+#~ msgid "Open a non-local file"
+#~ msgstr "開啟不是在本機的檔案"
+
+#~ msgid "Quit the program"
+#~ msgstr "結束程式"
+
+#~ msgid "Set the repeat mode"
+#~ msgstr "切換是否循環播放影片"
+
+#~ msgid "Set the shuffle mode"
+#~ msgstr "切換是否以隨機的次序播放影片"
+
+#~ msgid "Switch to fullscreen"
+#~ msgstr "切換至全螢幕"
+
+#~ msgid "Play Image '%s'"
+#~ msgstr "播放映像檔「%s」"
+
+#~ msgid "device%d"
+#~ msgstr "裝置%d"
+
+#~ msgid "Play Disc '%s'"
+#~ msgstr "播放碟片‘%s’"
+
+#~ msgid ""
+#~ "Totem could not play this media (%s) although a plugin is present to "
+#~ "handle it."
+#~ msgstr "即使適當的外掛程式已經存在，Totem 仍然無法播放這個媒體 (%s)。"
+
+#~ msgid ""
+#~ "You might want to check that a disc is present in the drive and that it "
+#~ "is correctly configured."
+#~ msgstr "您可能要檢查一下光碟是否已在光碟機內，和是否已經設置好。"
+
+#~ msgid "More information about media plugins"
+#~ msgstr "更多關於多媒體外掛的資訊"
+
+#~ msgid ""
+#~ "Please install the necessary plugins and restart Totem to be able to play "
+#~ "this media."
+#~ msgstr "請安裝適當的外掛程式，然後重新啟動 Totem，方可播放這個媒體。"
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it does not have the "
+#~ "appropriate plugins to be able to read from the disc."
+#~ msgstr "因為沒有適當的外掛程式來讀取音碟，Totem 無法播放這個媒體 (%s)。"
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because you do not have the "
+#~ "appropriate plugins to handle it."
+#~ msgstr "因為沒有適當的外掛程式，Totem 無法播放這個媒體 (%s)。"
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it is not supported."
+#~ msgstr "因為沒有支援該媒體類型，Totem 無法播放這個媒體 (%s)。"
+
+#~ msgid "Please insert another disc to play back."
+#~ msgstr "請插入另一個光碟片以播放。"
+
+#~ msgid "Totem does not support playback of Audio CDs"
+#~ msgstr "Totem 不支援播放音樂 CD"
+
+#~ msgid ""
+#~ "Please consider using a music player or a CD extractor to play this CD"
+#~ msgstr "請改用音樂播放程式或 CD 擷取程式來播放這張 CD"
+
+#~ msgid ""
+#~ "The requested audio output was not found. Please select another audio "
+#~ "output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "找不到所要求的音效輸出。請在多媒體系統選取程式中選擇其它的音效輸出。"
+
+#~ msgid ""
+#~ "The video output is in use by another application. Please close other "
+#~ "video applications, or select another video output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "其它的應用程式正在使用視訊輸出。請關閉其它的視訊輸出，或是在多媒體系統選取"
+#~ "程式中選擇其它的音效輸出。"
+
+#~ msgid ""
+#~ "The audio output is in use by another application. Please select another "
+#~ "audio output in the Multimedia Systems Selector. You may want to consider "
+#~ "using a sound server."
+#~ msgstr ""
+#~ "其它的應用程式正在使用音效輸出。請在多媒體系統選取程式中選擇其它的音效輸"
+#~ "出。或者您要考慮一下使用音效伺服器。"
+
+#~ msgid ""
+#~ "Failed to open audio output. You may not have permission to open the "
+#~ "sound device, or the sound server may not be running. Please select "
+#~ "another audio output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "無法開啟音效輸出。您沒有足夠的權限開啟音效裝置，或是音效伺服器沒有執行。請"
+#~ "在多媒體系統選取程式中選擇其它的音效輸出。"
+
+#~ msgid ""
+#~ "Could not find the audio output. You may need to install additional "
+#~ "GStreamer plugins, or select another audio output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "無法找到音效輸出。您可能需要安裝附加的 GStreamer 外掛程式，或在多媒體系統"
+#~ "選取程式中選擇其它的音效輸出。"
+
+#~ msgid ""
+#~ "A format string used to build the network service name used when "
+#~ "publishing playlists over the network. The following format placeholders "
+#~ "can be used: • %a: the program name as returned by g_get_application_name"
+#~ "() • %h: the machine's host name in title case • %u: the user's login "
+#~ "name in title case • %U: the user's real name • %%: the percent sign"
+#~ msgstr ""
+#~ "用來建立透過網路發布播放清單時使用的網路服務名稱的格式字串。可以使用下列格"
+#~ "式佔位符：• %a：由 g_get_application_name() 傳回的程式名稱• %h：電腦的大寫"
+#~ "主機名稱• %u：使用者的大寫登入名稱 • %U：使用者的真實姓名 • %%：百分比符號"
+
+#~ msgid "Format for network service name"
+#~ msgstr "網路服務名稱的格式"
+
+#~ msgid "Publisher protocol to use"
+#~ msgstr "要使用的發布通訊協定"
+
+#~ msgid ""
+#~ "The transport protocol to use when publishing playlists over the network."
+#~ msgstr "當透過網際網路發布播放清單時要使用的傳輸格式。"
+
+#~ msgid "Neighbors"
+#~ msgstr "鄰居"
+
+#~ msgid "Publish Playlist"
+#~ msgstr "發布播放清單"
+
+#~ msgid "Share the current playlist via HTTP"
+#~ msgstr "透過 HTTP 分享目前的播放清單"
+
+#~ msgid "Service _Name:"
+#~ msgstr "服務名稱(_N):"
+
+#~ msgid ""
+#~ "The name used for announcing the playlist service on the network.\n"
+#~ "All occurrences of the string %u will be replaced by your name,\n"
+#~ "and %h will be replaced by your computer's host name."
+#~ msgstr ""
+#~ "在網路上發布此播放清單服器所使用的名稱。\n"
+#~ "所有的字串 %u 會以您的名字取代，\n"
+#~ "而 %h 會以您電腦的主機名稱取代。"
+
+#~ msgid "Use _encrypted transport protocol (HTTPS)"
+#~ msgstr "使用加密的傳輸通訊協定[HTTPS](_E)"
 
 #~ msgid "Bemused"
 #~ msgstr "Bemused"
@@ -2650,9 +2692,6 @@
 #~ msgid "Search Results"
 #~ msgstr "搜尋結果"
 
-#~ msgid "Videos"
-#~ msgstr "影片"
-
 #~ msgid "_Open in Web Browser"
 #~ msgstr "在網頁瀏覽器中開啟(_O)"
 
@@ -2874,7 +2913,7 @@
 #~ msgstr "頁"
 
 #~ msgid "Set the window icon to the thumbnail of the playing movie"
-#~ msgstr "將視窗圖示設為播放電影的縮圖"
+#~ msgstr "將視窗圖示設為播放影片的縮圖"
 
 #~ msgid "Thumbnail"
 #~ msgstr "縮圖"
diff -Nru totem-3.4.3/po/zh_TW.po totem-3.6.2/po/zh_TW.po
--- totem-3.4.3/po/zh_TW.po	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/po/zh_TW.po	2012-10-25 13:15:32.000000000 +0000
@@ -6,14 +6,15 @@
 # H45 , 2008.
 # Chao-Hsiung Liao , 2009, 2010.
 # Wei-Lun Chao , 2010.
+# Cheng-Chia Tseng , 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: totem 3.3.92\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-25 08:12+0800\n"
-"PO-Revision-Date: 2012-03-23 11:38+0800\n"
-"Last-Translator: Cheng-Chia Tseng \n"
+"POT-Creation-Date: 2012-09-15 12:59+0800\n"
+"PO-Revision-Date: 2012-09-12 20:18+0800\n"
+"Last-Translator: Chao-Hsiung Liao \n"
 "Language-Team: Chinese (traditional)\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
@@ -22,848 +23,908 @@
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Virtaal 0.4.0\n"
 
-#: ../data/fullscreen.ui.h:1
-msgid "Leave Fullscreen"
-msgstr "離開全螢幕"
-
-#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:102
-msgid "Time:"
-msgstr "時間："
-
-#: ../data/playlist.ui.h:1
-msgid "Add..."
-msgstr "加入…"
-
-#: ../data/playlist.ui.h:2 ../data/video-list.ui.h:2
-msgid "Copy the location to the clipboard"
-msgstr "複製位置到剪貼薄"
+#: ../browser-plugin/totem-plugin-viewer.c:352 ../src/totem-object.c:1180
+#: ../src/totem-object.c:1650 ../src/totem-statusbar.c:115
+msgid "Stopped"
+msgstr "已停止"
 
-#: ../data/playlist.ui.h:3
-msgid "Move Down"
-msgstr "下移"
+#: ../browser-plugin/totem-plugin-viewer.c:364 ../src/totem-object.c:1173
+msgid "Paused"
+msgstr "已暫停"
 
-#: ../data/playlist.ui.h:4
-msgid "Move Up"
-msgstr "上移"
+#: ../browser-plugin/totem-plugin-viewer.c:368 ../src/totem-object.c:1166
+msgid "Playing"
+msgstr "播放"
 
-#: ../data/playlist.ui.h:5
-msgid "Remove"
-msgstr "移除"
+#: ../browser-plugin/totem-plugin-viewer.c:386
+#: ../src/plugins/screensaver/totem-screensaver.c:97
+msgid "Playing a movie"
+msgstr "播放影片"
 
-#: ../data/playlist.ui.h:6
-msgid "Remove file from playlist"
-msgstr "從播放清單中移除檔案"
+#: ../browser-plugin/totem-plugin-viewer.c:443
+msgid "No URI to play"
+msgstr "沒有要播放的 URI"
 
-#: ../data/playlist.ui.h:7
-msgid "Save Playlist..."
-msgstr "儲存播放清單…"
+#: ../browser-plugin/totem-plugin-viewer.c:676
+#: ../browser-plugin/totem-plugin-viewer.c:1700
+msgid "Totem Movie Player"
+msgstr "Totem 影片播放器"
 
-#: ../data/playlist.ui.h:8 ../data/totem.ui.h:77
-msgid "Select a file to use for text subtitles"
-msgstr "選擇要做為字幕的檔案"
+#. translators: this is:
+#. * Open With ApplicationName
+#. * as in nautilus' right-click menu
+#: ../browser-plugin/totem-plugin-viewer.c:1120
+#, c-format
+msgid "_Open with \"%s\""
+msgstr "以「%s」開啟(_O)"
 
-#: ../data/playlist.ui.h:9 ../data/video-list.ui.h:4
-msgid "_Copy Location"
-msgstr "複製位置(_C)"
+#: ../browser-plugin/totem-plugin-viewer.c:1341 ../src/totem-object.c:2475
+msgid "An error occurred"
+msgstr "發生錯誤"
 
-#: ../data/playlist.ui.h:10
-msgid "_Remove"
-msgstr "移除(_R)"
+#: ../browser-plugin/totem-plugin-viewer.c:2033
+msgid "No playlist or playlist empty"
+msgstr "沒有播放清單或清單空白"
 
-#: ../data/playlist.ui.h:11 ../data/totem.ui.h:141
-msgid "_Select Text Subtitles..."
-msgstr "選擇文字字幕(_S)…"
+#: ../browser-plugin/totem-plugin-viewer.c:2128
+msgid "Movie browser plugin"
+msgstr "影片瀏覽器外掛程式"
 
-#: ../data/properties.ui.h:1
-msgid "Album:"
-msgstr "專輯："
+#: ../browser-plugin/totem-plugin-viewer.c:2144 ../src/totem.c:240
+msgid "Could not initialize the thread-safe libraries."
+msgstr "無法起動 thread-safe libraries。"
 
-#: ../data/properties.ui.h:2
-msgid "Artist:"
-msgstr "演出者："
+#: ../browser-plugin/totem-plugin-viewer.c:2144
+msgid "Verify your system installation. The Totem plugin will now exit."
+msgstr "請檢查安裝時有沒有問題。Totem 會立刻結束。"
 
-#: ../data/properties.ui.h:3 ../data/totem.ui.h:23
-#: ../src/totem-properties-view.c:268
-msgid "Audio"
-msgstr "音效"
+#: ../data/fullscreen.ui.h:1
+msgid "Leave Fullscreen"
+msgstr "離開全螢幕"
 
-#: ../data/properties.ui.h:4
-msgid "Bitrate:"
-msgstr "位元率："
+#: ../data/fullscreen.ui.h:2 ../data/totem.ui.h:81
+msgid "Time:"
+msgstr "時間："
 
-#: ../data/properties.ui.h:5
-msgid "Channels:"
-msgstr "聲道："
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
+msgid "Allow the screensaver to activate when playing audio"
+msgstr "允許螢幕保護程式在播放音樂時作用"
 
-#: ../data/properties.ui.h:6
-msgid "Codec:"
-msgstr "編碼："
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
+msgid ""
+"Allow the screensaver to activate when playing audio. Disable if you have "
+"monitor-powered speakers."
+msgstr "允許螢幕保護程式在播放音樂時作用。如果您使用螢幕內附的喇叭則停用它。"
 
-#: ../data/properties.ui.h:7
-msgid "Comment:"
-msgstr "註解:"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
+msgid "Show visual effects when no video is displayed"
+msgstr "當不是播放影片時顯示視覺效果"
 
-#: ../data/properties.ui.h:8
-msgid "Container:"
-msgstr "容器："
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
+msgid "Show visual effects when playing an audio only file."
+msgstr "當播放音樂時顯示視覺效果。"
 
-#: ../data/properties.ui.h:9
-msgid "Dimensions:"
-msgstr "尺寸："
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
+msgid "Name of the visual effects plugin"
+msgstr "視覺效果外掛程式的名稱"
 
-#: ../data/properties.ui.h:10
-msgid "Duration:"
-msgstr "時間長度："
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
+msgid "The brightness of the video"
+msgstr "影片畫面的亮度"
 
-#: ../data/properties.ui.h:11
-msgid "Framerate:"
-msgstr "幀率："
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
+msgid "The contrast of the video"
+msgstr "影片畫面的反差度"
 
-#: ../data/properties.ui.h:12 ../data/totem.ui.h:41
-msgid "General"
-msgstr "一般"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
+msgid "The hue of the video"
+msgstr "影片畫面的亮度"
 
-#: ../data/properties.ui.h:13
-msgid "Sample rate:"
-msgstr "取樣率："
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
+msgid "The saturation of the video"
+msgstr "影片畫面的飽和度"
 
-#: ../data/properties.ui.h:14
-msgid "Title:"
-msgstr "標題："
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
+msgid "Resize the canvas automatically on file load"
+msgstr "當載入檔案時自動調整視窗大小"
 
-#: ../data/properties.ui.h:15 ../data/totem.ui.h:104
-#: ../src/totem-properties-view.c:270
-msgid "Video"
-msgstr "影片"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
+msgid "Repeat mode"
+msgstr "循環播放"
 
-#: ../data/properties.ui.h:16
-msgid "Year:"
-msgstr "年份："
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
+msgid "Shuffle mode"
+msgstr "隨機次序播放"
 
-#: ../data/video-list.ui.h:1
-msgid "Add the video to the playlist"
-msgstr "將影片加入至播放清單"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
+msgid "Whether to disable deinterlacing for interlaced movies"
+msgstr "是否停用交錯式影片的去交錯"
 
-#: ../data/video-list.ui.h:3 ../src/totem-dnd-menu.c:97
-msgid "_Add to Playlist"
-msgstr "加入至播放清單(_A)"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
+msgid "Whether to enable debug for the playback engine"
+msgstr "應否顯示播放引擎的偵錯訊息"
 
-#. Title
-#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:53
-#: ../src/totem-object.c:1667
-msgid "Movie Player"
-msgstr "影片播放器"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
+msgid "Type of audio output to use"
+msgstr "音效輸出方式"
 
-#: ../data/totem.desktop.in.in.in.h:2
-msgid "Play movies and songs"
-msgstr "播放影片及音樂"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
+msgid "Visualization quality setting"
+msgstr "視覺效果品質設定值"
 
-#: ../data/totem.ui.h:1
-msgid "1.5 Mbps T1/Intranet/LAN"
-msgstr "1.5 Mbps T1/Intranet/LAN"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
+msgid "Quality setting for the audio visualization."
+msgstr "音效視覺化的品質設定值。"
 
-#: ../data/totem.ui.h:2
-msgid "112 Kbps Dual ISDN/DSL"
-msgstr "112 Kbps 雙 ISDN/DSL"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
+msgid "Network buffering threshold"
+msgstr "網路緩衝區界限"
 
-#: ../data/totem.ui.h:3
-msgid "14.4 Kbps Modem"
-msgstr "14.4 Kbps 數據機"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
+msgid ""
+"Amount of data to buffer for network streams before starting to display the "
+"stream (in seconds)."
+msgstr "在顯示串流前網路串流資料緩衝的大小（秒）。"
 
-#: ../data/totem.ui.h:4
-msgid "16:9 (Widescreen)"
-msgstr "16:9（寬螢幕）"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
+msgid "Subtitle font"
+msgstr "字幕字型"
 
-#: ../data/totem.ui.h:5
-msgid "19.2 Kbps Modem"
-msgstr "19.2 Kbps 數據機"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
+msgid "Pango font description for subtitle rendering."
+msgstr "描繪字幕的 Pango 字型描述。"
 
-#: ../data/totem.ui.h:6
-msgid "2.11:1 (DVB)"
-msgstr "2.11:1 (DVB)"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
+msgid "Subtitle encoding"
+msgstr "字幕編碼"
 
-#: ../data/totem.ui.h:7
-msgid "256 Kbps DSL/Cable"
-msgstr "256 Kbps DSL/Cable"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
+msgid "Encoding character set for subtitle."
+msgstr "字幕的編碼字元集。"
 
-#: ../data/totem.ui.h:8
-msgid "28.8 Kbps Modem"
-msgstr "28.8 Kbps 數據機"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
+msgid "Default location for the \"Open...\" dialogs"
+msgstr "「開啟…」對話視窗的預設位置"
 
-#: ../data/totem.ui.h:9
-msgid "33.6 Kbps Modem"
-msgstr "33.6 Kbps 數據機"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
+msgid ""
+"Default location for the \"Open...\" dialogs. Default is the current "
+"directory."
+msgstr "「開啟...」對話視窗的預設位置。預設是目前的資料夾。"
 
-#: ../data/totem.ui.h:10
-msgid "34.4 Kbps Modem"
-msgstr "34.4 Kbps 數據機"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
+msgid "Default location for the \"Take Screenshot\" dialogs"
+msgstr "\"擷取畫面快照\" 對話視窗的預設位置"
 
-#: ../data/totem.ui.h:11
-msgid "384 Kbps DSL/Cable"
-msgstr "384 Kbps DSL/Cable"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
+msgid ""
+"Default location for the \"Take Screenshot\" dialogs. Default is the "
+"Pictures directory."
+msgstr "「擷取螢幕截圖」對話視窗的預設位置。預設是圖片資料夾。"
 
-#: ../data/totem.ui.h:12
-msgid "4-channel"
-msgstr "4-聲道"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
+msgid "Whether to disable the plugins in the user's home directory"
+msgstr "是否在使用者的家目錄裡停用該外掛程式"
 
-#: ../data/totem.ui.h:13
-msgid "4.1-channel"
-msgstr "4.1-聲道"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
+msgid "Whether to disable the keyboard shortcuts"
+msgstr "是否停用捷徑鍵"
 
-#: ../data/totem.ui.h:14
-msgid "4:3 (TV)"
-msgstr "4:3（電視）"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
+msgid "Whether to autoload text subtitle files when a movie is loaded"
+msgstr "載入影片時是否自動讀取字幕檔"
 
-#: ../data/totem.ui.h:15
-msgid "5.0-channel"
-msgstr "5.0-聲道"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
+msgid "Whether to autoload external chapter files when a movie is loaded"
+msgstr "載入影片時是否自動讀取外部章節檔"
 
-#: ../data/totem.ui.h:16
-msgid "5.1-channel"
-msgstr "5.1--聲道"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
+msgid ""
+"Whether to remember the position of played audio/video files when pausing or "
+"closing them"
+msgstr "是否在暫停或關閉播放的音樂/影片時記住它們的位置"
 
-#: ../data/totem.ui.h:17
-msgid "512 Kbps DSL/Cable"
-msgstr "512 Kbps DSL/Cable"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
+msgid "Active plugins list"
+msgstr "使用中外掛程式清單"
 
-#: ../data/totem.ui.h:18
-msgid "56 Kbps Modem/ISDN"
-msgstr "56 Kbps 數據機/ISDN"
+#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
+msgid ""
+"A list of the names of the plugins which are currently active (loaded and "
+"running)."
+msgstr "目前使用中外掛程式名單（已載入並在執行）。"
 
-#: ../data/totem.ui.h:19
-msgid "AC3 Passthrough"
-msgstr "AC3 Passthrough"
+#: ../data/playlist.ui.h:1
+msgid "_Remove"
+msgstr "移除(_R)"
 
-#: ../data/totem.ui.h:20
-msgid "A_udio Menu"
-msgstr "音效選單(_U)"
+#: ../data/playlist.ui.h:2
+msgid "Remove file from playlist"
+msgstr "從播放清單中移除檔案"
 
-#: ../data/totem.ui.h:21
-msgid "About this application"
-msgstr "關於此程式"
+#: ../data/playlist.ui.h:3 ../data/video-list.ui.h:3
+msgid "_Copy Location"
+msgstr "複製位置(_C)"
 
-#: ../data/totem.ui.h:22
-msgctxt "Aspect ratio"
-msgid "Auto"
-msgstr "自動"
+#: ../data/playlist.ui.h:4 ../data/video-list.ui.h:4
+msgid "Copy the location to the clipboard"
+msgstr "複製位置到剪貼薄"
 
-#: ../data/totem.ui.h:24
-msgid "Audio Output"
-msgstr "音效輸出"
+#: ../data/playlist.ui.h:5 ../data/totem.ui.h:71
+msgid "_Select Text Subtitles..."
+msgstr "選擇文字字幕(_S)…"
 
-#: ../data/totem.ui.h:25
-msgid "Clear the playlist"
-msgstr "清除播放清單"
+#: ../data/playlist.ui.h:6 ../data/totem.ui.h:72
+msgid "Select a file to use for text subtitles"
+msgstr "選擇要做為字幕的檔案"
 
-#: ../data/totem.ui.h:26
-msgid "Co_ntrast:"
-msgstr "反差(_N):"
+#: ../data/playlist.ui.h:7
+msgid "Add..."
+msgstr "加入…"
 
-#: ../data/totem.ui.h:27
-msgid "Color Balance"
-msgstr "色彩平衡"
+#: ../data/playlist.ui.h:8
+msgid "Remove"
+msgstr "移除"
 
-#: ../data/totem.ui.h:28
-msgid "Configure plugins to extend the application"
-msgstr "設定用來擴充此應用程式的外掛程式"
+#: ../data/playlist.ui.h:9
+msgid "Save Playlist..."
+msgstr "儲存播放清單…"
 
-#: ../data/totem.ui.h:29
-msgid "Configure the application"
-msgstr "設定應用程式"
+#: ../data/playlist.ui.h:10
+msgid "Move Up"
+msgstr "上移"
 
-#: ../data/totem.ui.h:30
-msgid "Connection _speed:"
-msgstr "連線速度(_S):"
+#: ../data/playlist.ui.h:11
+msgid "Move Down"
+msgstr "下移"
 
-#: ../data/totem.ui.h:31
-msgid "Decrease volume"
-msgstr "減少音量"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:2
+msgid "Normal"
+msgstr "一般"
 
-#: ../data/totem.ui.h:32
-msgid "Disable _deinterlacing of interlaced videos"
-msgstr "停用交錯式影片的去交錯(_D)"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:4
+msgid "Large"
+msgstr "大"
 
-#: ../data/totem.ui.h:33
-msgid "Disable screensaver when playing "
-msgstr "播放音樂時停用螢幕保護程式"
+#. Audio visualization dimensions
+#: ../data/preferences.ui.h:6
+msgid "Extra Large"
+msgstr "特大"
 
-#. Tab label in the Preferences dialogue
-#: ../data/totem.ui.h:35
-msgid "Display"
-msgstr "顯示"
+#: ../data/preferences.ui.h:7 ../src/backend/bacon-video-widget.c:5498
+#: ../src/totem-properties-view.c:231
+msgid "Stereo"
+msgstr "立體聲"
 
-#: ../data/totem.ui.h:36
-msgid "Eject the current disc"
-msgstr "退出目前的光碟"
+#: ../data/preferences.ui.h:8
+msgid "4-channel"
+msgstr "4-聲道"
 
-#: ../data/totem.ui.h:37
-msgid "External Chapters"
-msgstr "外部章節"
+#: ../data/preferences.ui.h:9
+msgid "4.1-channel"
+msgstr "4.1-聲道"
 
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:39
-msgid "Extra Large"
-msgstr "特大"
+#: ../data/preferences.ui.h:10
+msgid "5.0-channel"
+msgstr "5.0-聲道"
 
-#: ../data/totem.ui.h:40
-msgid "Fit Window to Movie"
-msgstr "調整視窗大小至影片大小"
+#: ../data/preferences.ui.h:11
+msgid "5.1-channel"
+msgstr "5.1--聲道"
 
-#: ../data/totem.ui.h:42
-msgid "Go to the DVD menu"
-msgstr "前往 DVD 選單"
+#: ../data/preferences.ui.h:12
+msgid "AC3 Passthrough"
+msgstr "AC3 Passthrough"
 
-#: ../data/totem.ui.h:43
-msgid "Go to the angle menu"
-msgstr "前往角度選單"
+#: ../data/preferences.ui.h:13
+msgid "Totem Preferences"
+msgstr "Totem 偏好設定"
 
-#: ../data/totem.ui.h:44
-msgid "Go to the audio menu"
-msgstr "前往音效選單"
+#: ../data/preferences.ui.h:14
+msgid "Playback"
+msgstr "播放"
 
-#: ../data/totem.ui.h:45
-msgid "Go to the chapter menu"
-msgstr "前往章節選單"
+#: ../data/preferences.ui.h:15
+msgid "Start playing files from last position"
+msgstr "從上次位置開始播放檔案"
 
-#: ../data/totem.ui.h:46
-msgid "Go to the title menu"
-msgstr "前往標題選單"
+#: ../data/preferences.ui.h:16
+msgid "Text Subtitles"
+msgstr "字幕文字"
 
-#: ../data/totem.ui.h:47
-msgid "Help contents"
-msgstr "求助內容"
+#: ../data/preferences.ui.h:17
+msgid "_Load subtitle files when movie is loaded"
+msgstr "載入影片後讀取字幕檔案(_L)"
 
-#: ../data/totem.ui.h:48
-msgid "Increase volume"
-msgstr "增加音量"
+#: ../data/preferences.ui.h:18
+msgid "_Font:"
+msgstr "字型(_F):"
 
-#: ../data/totem.ui.h:49
-msgid "Intranet/LAN"
-msgstr "Intranet/LAN"
+#: ../data/preferences.ui.h:19
+msgid "_Encoding:"
+msgstr "編碼(_E):"
 
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:51
-msgid "Large"
-msgstr "大"
+#: ../data/preferences.ui.h:20
+msgid "External Chapters"
+msgstr "外部章節"
 
-#: ../data/totem.ui.h:52
+#: ../data/preferences.ui.h:21
 msgid "Load _chapter files when movie is loaded"
 msgstr "載入影片後讀取章節檔案(_C)"
 
-#: ../data/totem.ui.h:54
-msgid "Networking"
-msgstr "網路"
+#: ../data/preferences.ui.h:22 ../data/properties.ui.h:1
+msgid "General"
+msgstr "一般"
 
-#: ../data/totem.ui.h:55
-msgid "Next chapter or movie"
-msgstr "下一章或下一齣影片"
+#. Tab label in the Preferences dialogue
+#: ../data/preferences.ui.h:24
+msgid "Display"
+msgstr "顯示"
 
-#. Audio visualization dimensions
-#: ../data/totem.ui.h:57
-msgid "Normal"
-msgstr "一般"
+#: ../data/preferences.ui.h:25
+msgid "_Resize the window when a new video is loaded"
+msgstr "載入新影片後自動調整視窗大小(_R)"
 
-#: ../data/totem.ui.h:58
-msgid "Open _Location..."
-msgstr "開啟位置(_L)…"
+#: ../data/preferences.ui.h:26
+msgid "Disable _deinterlacing of interlaced videos"
+msgstr "停用交錯式影片的去交錯(_D)"
 
-#: ../data/totem.ui.h:59
-msgid "Open a file"
-msgstr "開啟檔案"
+#: ../data/preferences.ui.h:27
+msgid "Disable screensaver when playing "
+msgstr "播放音樂時停用螢幕保護程式"
 
-#: ../data/totem.ui.h:60
-msgid "Open a non-local file"
-msgstr "開啟不是在本機的檔案"
+#: ../data/preferences.ui.h:28 ../data/properties.ui.h:9
+#: ../src/totem-properties-view.c:273
+msgid "Video"
+msgstr "影片"
 
-#: ../data/totem.ui.h:61
-msgid "Play / P_ause"
-msgstr "播放/暫停(_A)"
+#: ../data/preferences.ui.h:29
+msgid "Video or Audio"
+msgstr "視訊或音訊"
 
-#: ../data/totem.ui.h:62
-msgid "Play or pause the movie"
-msgstr "播放或暫停播放影片"
+#: ../data/preferences.ui.h:30
+msgid "Visual Effects"
+msgstr "視覺效果"
 
-#: ../data/totem.ui.h:63
-msgid "Playback"
-msgstr "播放"
+#: ../data/preferences.ui.h:31
+msgid "Show _visual effects when an audio file is played"
+msgstr "播放音樂時顯示視覺效果(_V)"
 
-#: ../data/totem.ui.h:64
-msgid "Plugins..."
-msgstr "外掛程式…"
+#: ../data/preferences.ui.h:32
+msgid "_Type of visualization:"
+msgstr "視覺效果類型(_T):"
 
-#: ../data/totem.ui.h:65
-msgid "Prefere_nces"
-msgstr "偏好設定(_N)"
+#: ../data/preferences.ui.h:33
+msgid "Visualization _size:"
+msgstr "播放視覺效果的視窗大小(_S):"
 
-#: ../data/totem.ui.h:66
-msgid "Previous chapter or movie"
-msgstr "上一章或上一齣影片"
+#: ../data/preferences.ui.h:34
+msgid "Color Balance"
+msgstr "色彩平衡"
 
-#: ../data/totem.ui.h:67
-msgid "Quit the program"
-msgstr "結束程式"
+#: ../data/preferences.ui.h:35
+msgid "_Brightness:"
+msgstr "亮度(_B):"
 
-#: ../data/totem.ui.h:68
+#: ../data/preferences.ui.h:36
+msgid "Co_ntrast:"
+msgstr "反差(_N):"
+
+#: ../data/preferences.ui.h:37
+msgid "Sat_uration:"
+msgstr "飽和度(_U):"
+
+#: ../data/preferences.ui.h:38
+msgid "_Hue:"
+msgstr "色調(_H):"
+
+#: ../data/preferences.ui.h:39
 msgid "Reset to _Defaults"
 msgstr "重置為預設值(_D)"
 
-#: ../data/totem.ui.h:69
-msgid "Resize _1:1"
-msgstr "原始大小 _1:1"
+#: ../data/preferences.ui.h:40
+msgid "Audio Output"
+msgstr "音效輸出"
 
-#: ../data/totem.ui.h:70
-msgid "Resize _2:1"
-msgstr "兩倍大小 _2:1"
+#: ../data/preferences.ui.h:41
+msgid "_Audio output type:"
+msgstr "音效輸出類型(_A):"
 
-#: ../data/totem.ui.h:71
-msgid "Resize to double the original video size"
-msgstr "將畫面放大為原始大小的兩倍"
+#: ../data/preferences.ui.h:42 ../data/properties.ui.h:14
+#: ../src/totem-properties-view.c:271
+msgid "Audio"
+msgstr "音效"
 
-#: ../data/totem.ui.h:72
-msgid "Resize to half the original video size"
-msgstr "將畫面縮小為原始大小的一半"
+#: ../data/properties.ui.h:2
+msgid "Title:"
+msgstr "標題："
 
-#: ../data/totem.ui.h:73
-msgid "Resize to the original video size"
-msgstr "將畫面還原為原始大小"
+#: ../data/properties.ui.h:3
+msgid "Artist:"
+msgstr "演出者："
 
-#: ../data/totem.ui.h:74
-msgid "S_idebar"
-msgstr "側面窗格(_I)"
+#: ../data/properties.ui.h:4
+msgid "Duration:"
+msgstr "時間長度："
 
-#: ../data/totem.ui.h:75
-msgid "S_ubtitles"
-msgstr "字幕(_U)"
+#: ../data/properties.ui.h:5
+msgid "Year:"
+msgstr "年份："
 
-#: ../data/totem.ui.h:76
-msgid "Sat_uration:"
-msgstr "飽和度(_U):"
+#: ../data/properties.ui.h:6
+msgid "Album:"
+msgstr "專輯："
 
-#: ../data/totem.ui.h:78
-msgid "Set the repeat mode"
-msgstr "切換是否循環播放影片"
+#: ../data/properties.ui.h:7
+msgid "Comment:"
+msgstr "註解:"
 
-#: ../data/totem.ui.h:79
-msgid "Set the shuffle mode"
-msgstr "切換是否以隨機的次序播放影片"
+#: ../data/properties.ui.h:8
+msgid "Container:"
+msgstr "容器："
 
-# anamorphic has discriminating meaning in chinese. -- Abel
-#: ../data/totem.ui.h:80
-msgid "Sets 16:9 (widescreen) aspect ratio"
-msgstr "設置為 16:9 (寬螢幕)長寬比"
+#: ../data/properties.ui.h:10
+msgid "Dimensions:"
+msgstr "尺寸："
 
-#: ../data/totem.ui.h:81
-msgid "Sets 2.11:1 (DVB) aspect ratio"
-msgstr "設置為 2.11:1 (DVB) 長寬比"
+#: ../data/properties.ui.h:11
+msgid "Codec:"
+msgstr "編碼："
 
-#: ../data/totem.ui.h:82
-msgid "Sets 4:3 (TV) aspect ratio"
-msgstr "設置為 4:3（電視）長寬比"
+#: ../data/properties.ui.h:12
+msgid "Framerate:"
+msgstr "幀率："
 
-#: ../data/totem.ui.h:83
-msgid "Sets automatic aspect ratio"
-msgstr "自動切換長寬比"
+#: ../data/properties.ui.h:13
+msgid "Bitrate:"
+msgstr "位元率："
 
-#: ../data/totem.ui.h:84
-msgid "Sets square aspect ratio"
-msgstr "設置為 1:1 長寬比"
+#: ../data/properties.ui.h:15
+msgid "Sample rate:"
+msgstr "取樣率："
 
-#: ../data/totem.ui.h:85
-msgid "Show _Controls"
-msgstr "顯示控制介面(_C)"
+#: ../data/properties.ui.h:16
+msgid "Channels:"
+msgstr "聲道："
 
-#: ../data/totem.ui.h:86
-msgid "Show _visual effects when an audio file is played"
-msgstr "播放音樂時顯示視覺效果(_V)"
+#. Title
+#: ../data/totem.desktop.in.in.in.h:1 ../data/totem.ui.h:80 ../src/totem.c:239
+#: ../src/totem.c:248 ../src/totem-menu.c:790 ../src/totem-object.c:1658
+msgid "Videos"
+msgstr "影片"
 
-#: ../data/totem.ui.h:87
-msgid "Show controls"
-msgstr "顯示控制介面"
+#: ../data/totem.desktop.in.in.in.h:2
+msgid "Play movies"
+msgstr "播放影片"
 
-#: ../data/totem.ui.h:88
-msgid "Show or hide the sidebar"
-msgstr "顯示或隱藏側面窗格"
+#: ../data/totem.desktop.in.in.in.h:3
+msgid "Video;Movie;Film;Clip;Series;Player;DVD;TV;Disc;"
+msgstr ""
+"Video;Movie;Film;Clip;Series;Player;DVD;TV;Disc;視訊;影片;影片;剪輯;系列;影"
+"集;播放器;光碟;"
 
-#: ../data/totem.ui.h:89
-msgid "Shuff_le Mode"
-msgstr "隨機播放模式(_L)"
+#: ../data/totem.ui.h:1
+msgid "_Open"
+msgstr "開啟(_O)"
 
-#: ../data/totem.ui.h:90
-msgid "Skip _Backwards"
-msgstr "往後(_B)"
+#: ../data/totem.ui.h:2
+msgid "Open _Location"
+msgstr "開啟位置(_L)"
 
-#: ../data/totem.ui.h:91
-msgid "Skip _Forward"
-msgstr "往前(_F)"
+#: ../data/totem.ui.h:3
+msgid "_Fullscreen"
+msgstr "全螢幕(_F)"
 
-#: ../data/totem.ui.h:92
-msgid "Skip backwards"
-msgstr "往後"
+#: ../data/totem.ui.h:4
+msgid "Prefere_nces"
+msgstr "偏好設定(_N)"
 
-#: ../data/totem.ui.h:93
-msgid "Skip forward"
-msgstr "往前"
+#: ../data/totem.ui.h:5
+msgid "Shuff_le"
+msgstr "隨機播放(_L)"
 
-#: ../data/totem.ui.h:94
-msgid "Square"
-msgstr "正方形"
+#: ../data/totem.ui.h:6
+msgid "_Repeat"
+msgstr "重複(_R)"
 
-#: ../data/totem.ui.h:95
-msgid "Start playing files from last position"
-msgstr "從上次位置開始播放檔案"
+#: ../data/totem.ui.h:7
+msgid "_Quit"
+msgstr "結束(_Q)"
 
-#: ../data/totem.ui.h:96 ../src/totem-properties-view.c:228
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5593
-msgid "Stereo"
-msgstr "立體聲"
+# Following German team's practice (_Movie -> _File), since totem can play
+# audio as well -- Abel
+#: ../data/totem.ui.h:8
+msgid "_Movie"
+msgstr "檔案(_F)"
 
-#: ../data/totem.ui.h:97
-msgid "Switch An_gles"
-msgstr "切換角度(_G)"
+#: ../data/totem.ui.h:9
+msgid "_Eject"
+msgstr "退出(_E)"
 
-#: ../data/totem.ui.h:98
-msgid "Switch camera angles"
-msgstr "切換攝影機角度"
+#: ../data/totem.ui.h:10
+msgid "Eject the current disc"
+msgstr "退出目前的光碟"
+
+#: ../data/totem.ui.h:11
+msgid "_Properties"
+msgstr "屬性(_P)"
 
-#: ../data/totem.ui.h:99
-msgid "Switch to fullscreen"
-msgstr "切換至全螢幕"
+#: ../data/totem.ui.h:12
+msgid "View the properties of the current stream"
+msgstr "檢視目前串流的屬性"
 
-#: ../data/totem.ui.h:100
-msgid "Text Subtitles"
-msgstr "字幕文字"
+#: ../data/totem.ui.h:13
+msgid "Play / P_ause"
+msgstr "播放/暫停(_A)"
+
+#: ../data/totem.ui.h:14
+msgid "Play or pause the movie"
+msgstr "播放或暫停播放影片"
+
+#: ../data/totem.ui.h:15
+msgid "_Edit"
+msgstr "編輯(_E)"
 
-#: ../data/totem.ui.h:101
-msgid "Time seek bar"
-msgstr "時間搜尋列"
+#: ../data/totem.ui.h:16
+msgid "_Clear Playlist"
+msgstr "消除播放清單(_C)"
 
-#: ../data/totem.ui.h:103
-msgid "Totem Preferences"
-msgstr "Totem 偏好設定"
+#: ../data/totem.ui.h:17
+msgid "Clear the playlist"
+msgstr "清除播放清單"
 
-#: ../data/totem.ui.h:105
-msgid "Video or Audio"
-msgstr "視訊或音訊"
+#: ../data/totem.ui.h:18
+msgid "Plugins..."
+msgstr "外掛程式…"
 
-#: ../data/totem.ui.h:106
-msgid "View the properties of the current stream"
-msgstr "檢視目前串流的屬性"
+#: ../data/totem.ui.h:19
+msgid "Configure plugins to extend the application"
+msgstr "設定用來擴充此應用程式的外掛程式"
 
-#: ../data/totem.ui.h:107
-msgid "Visual Effects"
-msgstr "視覺效果"
+#: ../data/totem.ui.h:20
+msgid "_View"
+msgstr "檢視(_V)"
 
-#: ../data/totem.ui.h:108
-msgid "Visualization _size:"
-msgstr "播放視覺效果的視窗大小(_S):"
+#: ../data/totem.ui.h:21
+msgid "Fit Window to Movie"
+msgstr "調整視窗大小至影片大小"
 
-#: ../data/totem.ui.h:109
-msgid "Volume _Down"
-msgstr "調低音量(_D)"
+#: ../data/totem.ui.h:22
+msgid "_Resize 1:2"
+msgstr "一半大小 1:2(_R)"
 
-#: ../data/totem.ui.h:110
-msgid "Volume _Up"
-msgstr "調高音量(_U)"
+#: ../data/totem.ui.h:23
+msgid "Resize to half the original video size"
+msgstr "將畫面縮小為原始大小的一半"
 
-#: ../data/totem.ui.h:111
-msgid "Zoom In"
-msgstr "拉近"
+#: ../data/totem.ui.h:24
+msgid "Resize _1:1"
+msgstr "原始大小 _1:1"
 
-#: ../data/totem.ui.h:112
-msgid "Zoom in"
-msgstr "拉近"
+#: ../data/totem.ui.h:25
+msgid "Resize to the original video size"
+msgstr "將畫面還原為原始大小"
 
-#: ../data/totem.ui.h:113
-msgid "_About"
-msgstr "關於(_A)"
+#: ../data/totem.ui.h:26
+msgid "Resize _2:1"
+msgstr "兩倍大小 _2:1"
 
-#: ../data/totem.ui.h:114
-msgid "_Angle Menu"
-msgstr "角度選單(_A)"
+#: ../data/totem.ui.h:27
+msgid "Resize to double the original video size"
+msgstr "將畫面放大為原始大小的兩倍"
 
-#: ../data/totem.ui.h:115
+#: ../data/totem.ui.h:28
 msgid "_Aspect Ratio"
 msgstr "長寬比(_A)"
 
-#: ../data/totem.ui.h:116
-msgid "_Audio output type:"
-msgstr "音效輸出類型(_A):"
-
-#: ../data/totem.ui.h:117
-msgid "_Brightness:"
-msgstr "亮度(_B):"
-
-#: ../data/totem.ui.h:118
-msgid "_Chapter Menu"
-msgstr "章節選單(_C)"
+#: ../data/totem.ui.h:29
+msgid "Switch An_gles"
+msgstr "切換角度(_G)"
 
-#: ../data/totem.ui.h:119
-msgid "_Clear Playlist"
-msgstr "消除播放清單(_C)"
+#: ../data/totem.ui.h:30
+msgid "Switch camera angles"
+msgstr "切換攝影機角度"
 
-#: ../data/totem.ui.h:120
-msgid "_Contents"
-msgstr "內容(_C)"
+#: ../data/totem.ui.h:31
+msgid "_Go"
+msgstr "前往(_G)"
 
-#: ../data/totem.ui.h:121
+#: ../data/totem.ui.h:32
 msgid "_DVD Menu"
 msgstr "_DVD 選單"
 
-#: ../data/totem.ui.h:122
-msgid "_Edit"
-msgstr "編輯(_E)"
-
-#: ../data/totem.ui.h:123
-msgid "_Eject"
-msgstr "退出(_E)"
-
-#: ../data/totem.ui.h:124
-msgid "_Encoding:"
-msgstr "編碼(_E):"
+#: ../data/totem.ui.h:33
+msgid "Go to the DVD menu"
+msgstr "前往 DVD 選單"
 
-#: ../data/totem.ui.h:125
-msgid "_Font:"
-msgstr "字型(_F):"
+#: ../data/totem.ui.h:34
+msgid "_Title Menu"
+msgstr "標題選單(_T)"
 
-#: ../data/totem.ui.h:126
-msgid "_Fullscreen"
-msgstr "全螢幕(_F)"
+#: ../data/totem.ui.h:35
+msgid "Go to the title menu"
+msgstr "前往標題選單"
 
-#: ../data/totem.ui.h:127
-msgid "_Go"
-msgstr "前往(_G)"
+#: ../data/totem.ui.h:36
+msgid "A_udio Menu"
+msgstr "音效選單(_U)"
 
-#: ../data/totem.ui.h:128
-msgid "_Help"
-msgstr "求助(_H)"
+#: ../data/totem.ui.h:37
+msgid "Go to the audio menu"
+msgstr "前往音效選單"
 
-#: ../data/totem.ui.h:129
-msgid "_Hue:"
-msgstr "色調(_H):"
+#: ../data/totem.ui.h:38
+msgid "_Angle Menu"
+msgstr "角度選單(_A)"
 
-#: ../data/totem.ui.h:130
-msgid "_Languages"
-msgstr "語言(_L)"
+#: ../data/totem.ui.h:39
+msgid "Go to the angle menu"
+msgstr "前往角度選單"
 
-#: ../data/totem.ui.h:131
-msgid "_Load subtitle files when movie is loaded"
-msgstr "載入影片後讀取字幕檔案(_L)"
+#: ../data/totem.ui.h:40
+msgid "_Chapter Menu"
+msgstr "章節選單(_C)"
 
-# Following German team's practice (_Movie -> _File), since totem can play
-# audio as well -- Abel
-#: ../data/totem.ui.h:132
-msgid "_Movie"
-msgstr "檔案(_F)"
+#: ../data/totem.ui.h:41
+msgid "Go to the chapter menu"
+msgstr "前往章節選單"
 
-#: ../data/totem.ui.h:133
+#: ../data/totem.ui.h:42
 msgid "_Next Chapter/Movie"
 msgstr "下一章/下一齣影片(_N)"
 
-#: ../data/totem.ui.h:134
-msgid "_Open..."
-msgstr "開啟(_O)…"
+#: ../data/totem.ui.h:43
+msgid "Next chapter or movie"
+msgstr "下一章或下一齣影片"
 
-#: ../data/totem.ui.h:135
+#: ../data/totem.ui.h:44
 msgid "_Previous Chapter/Movie"
 msgstr "上一章/上一齣影片(_P)"
 
-#: ../data/totem.ui.h:136
-msgid "_Properties"
-msgstr "屬性(_P)"
+#: ../data/totem.ui.h:45
+msgid "Previous chapter or movie"
+msgstr "上一章或上一齣影片"
 
-#: ../data/totem.ui.h:137
-msgid "_Quit"
-msgstr "結束(_Q)"
+#: ../data/totem.ui.h:46
+msgid "_Sound"
+msgstr "音效(_S)"
 
-#: ../data/totem.ui.h:138
-msgid "_Repeat Mode"
-msgstr "循環播放(_R)"
+#: ../data/totem.ui.h:47
+msgid "Volume _Up"
+msgstr "調高音量(_U)"
 
-#: ../data/totem.ui.h:139
-msgid "_Resize 1:2"
-msgstr "一半大小 1:2(_R)"
+#: ../data/totem.ui.h:48
+msgid "Increase volume"
+msgstr "增加音量"
 
-#: ../data/totem.ui.h:140
-msgid "_Resize the window when a new video is loaded"
-msgstr "載入新影片後自動調整視窗大小(_R)"
+#: ../data/totem.ui.h:49
+msgid "Volume _Down"
+msgstr "調低音量(_D)"
 
-#: ../data/totem.ui.h:142
-msgid "_Sound"
-msgstr "音效(_S)"
+#: ../data/totem.ui.h:50
+msgid "Decrease volume"
+msgstr "減少音量"
 
-#: ../data/totem.ui.h:143
-msgid "_Title Menu"
-msgstr "標題選單(_T)"
+#: ../data/totem.ui.h:51
+msgid "_Help"
+msgstr "求助(_H)"
 
-#: ../data/totem.ui.h:144
-msgid "_Type of visualization:"
-msgstr "視覺效果類型(_T):"
+#: ../data/totem.ui.h:52
+msgid "_Contents"
+msgstr "內容(_C)"
 
-#: ../data/totem.ui.h:145
-msgid "_View"
-msgstr "檢視(_V)"
+#: ../data/totem.ui.h:53
+msgid "Help contents"
+msgstr "求助內容"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:1
-msgid ""
-"A list of the names of the plugins which are currently active (loaded and "
-"running)."
-msgstr "目前使用中外掛程式名單（已載入並在執行）。"
+#: ../data/totem.ui.h:54
+msgid "_About"
+msgstr "關於(_A)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:2
-msgid "Active plugins list"
-msgstr "使用中外掛程式清單"
+#: ../data/totem.ui.h:55
+msgid "About this application"
+msgstr "關於此程式"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:3
-msgid "Allow the screensaver to activate when playing audio"
-msgstr "允許螢幕保護程式在播放音樂時作用"
+#: ../data/totem.ui.h:56
+msgid "Show _Controls"
+msgstr "顯示控制介面(_C)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:4
-msgid ""
-"Allow the screensaver to activate when playing audio. Disable if you have "
-"monitor-powered speakers."
-msgstr "允許螢幕保護程式在播放音樂時作用。如果您使用螢幕內附的喇叭則停用它。"
+#: ../data/totem.ui.h:57
+msgid "Show controls"
+msgstr "顯示控制介面"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:5
-msgid ""
-"Amount of data to buffer for network streams before starting to display the "
-"stream (in seconds)."
-msgstr "在顯示串流前網路串流資料緩衝的大小（秒）。"
+#: ../data/totem.ui.h:58
+msgid "S_idebar"
+msgstr "側面窗格(_I)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:6
-msgid ""
-"Approximate network connection speed, used to select quality on media over "
-"the network."
-msgstr "大約的網路連線速度，用來選擇透過網路傳輸的媒體品質。"
+#: ../data/totem.ui.h:59
+msgid "Show or hide the sidebar"
+msgstr "顯示或隱藏側邊列"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:7
-msgid "Default location for the \"Open...\" dialogs"
-msgstr "「開啟…」對話視窗的預設位置"
+#: ../data/totem.ui.h:60
+msgctxt "Aspect ratio"
+msgid "Auto"
+msgstr "自動"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:8
-msgid ""
-"Default location for the \"Open...\" dialogs. Default is the current "
-"directory."
-msgstr "「開啟...」對話視窗的預設位置。預設是目前的資料夾。"
+#: ../data/totem.ui.h:61
+msgid "Sets automatic aspect ratio"
+msgstr "自動切換長寬比"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:9
-msgid "Default location for the \"Take Screenshot\" dialogs"
-msgstr "\"擷取畫面快照\" 對話視窗的預設位置"
+#: ../data/totem.ui.h:62
+msgid "Square"
+msgstr "正方形"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:10
-msgid ""
-"Default location for the \"Take Screenshot\" dialogs. Default is the "
-"Pictures directory."
-msgstr "「擷取螢幕截圖」對話視窗的預設位置。預設是圖片資料夾。"
+#: ../data/totem.ui.h:63
+msgid "Sets square aspect ratio"
+msgstr "設置為 1:1 長寬比"
+
+#: ../data/totem.ui.h:64
+msgid "4:3 (TV)"
+msgstr "4:3（電視）"
+
+#: ../data/totem.ui.h:65
+msgid "Sets 4:3 (TV) aspect ratio"
+msgstr "設置為 4:3（電視）長寬比"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:11
-msgid "Encoding character set for subtitle."
-msgstr "字幕的編碼字元集。"
+#: ../data/totem.ui.h:66
+msgid "16:9 (Widescreen)"
+msgstr "16:9（寬螢幕）"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:12
-msgid "Name of the visual effects plugin"
-msgstr "視覺效果外掛程式的名稱"
+# anamorphic has discriminating meaning in chinese. -- Abel
+#: ../data/totem.ui.h:67
+msgid "Sets 16:9 (widescreen) aspect ratio"
+msgstr "設置為 16:9 (寬螢幕)長寬比"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:13
-msgid "Network buffering threshold"
-msgstr "網路緩衝區界限"
+#: ../data/totem.ui.h:68
+msgid "2.11:1 (DVB)"
+msgstr "2.11:1 (DVB)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:14
-msgid "Network connection speed"
-msgstr "連線連線速度"
+#: ../data/totem.ui.h:69
+msgid "Sets 2.11:1 (DVB) aspect ratio"
+msgstr "設置為 2.11:1 (DVB) 長寬比"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:15
-msgid "Pango font description for subtitle rendering."
-msgstr "描繪字幕的 Pango 字型描述。"
+#: ../data/totem.ui.h:70
+msgid "S_ubtitles"
+msgstr "字幕(_U)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:16
-msgid "Quality setting for the audio visualization."
-msgstr "音效視覺化的品質設定值。"
+#: ../data/totem.ui.h:73
+msgid "_Languages"
+msgstr "語言(_L)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:17
-msgid "Repeat mode"
-msgstr "循環播放"
+#: ../data/totem.ui.h:74
+msgid "Zoom In"
+msgstr "拉近"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:18
-msgid "Resize the canvas automatically on file load"
-msgstr "當載入檔案時自動調整視窗大小"
+#: ../data/totem.ui.h:75
+msgid "Zoom in"
+msgstr "拉近"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:19
-msgid "Show visual effects when no video is displayed"
-msgstr "當不是播放影片時顯示視覺效果"
+#: ../data/totem.ui.h:76
+msgid "Skip _Forward"
+msgstr "往前(_F)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:20
-msgid "Show visual effects when playing an audio only file."
-msgstr "當播放音樂時顯示視覺效果。"
+#: ../data/totem.ui.h:77
+msgid "Skip forward"
+msgstr "往前"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:21
-msgid "Shuffle mode"
-msgstr "隨機次序播放"
+#: ../data/totem.ui.h:78
+msgid "Skip _Backwards"
+msgstr "往後(_B)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:22
-msgid "Subtitle encoding"
-msgstr "字幕編碼"
+#: ../data/totem.ui.h:79
+msgid "Skip backwards"
+msgstr "往後"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:23
-msgid "Subtitle font"
-msgstr "字幕字型"
+#: ../data/totem.ui.h:82
+msgid "Time seek bar"
+msgstr "時間搜尋列"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:24
-msgid "The brightness of the video"
-msgstr "影片畫面的亮度"
+#: ../data/uri.ui.h:1
+msgid "Enter the _address of the file you would like to open:"
+msgstr "請輸入您要開啟檔案的位置(_A):"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:25
-msgid "The contrast of the video"
-msgstr "影片畫面的反差度"
+#: ../data/video-list.ui.h:1 ../src/totem-dnd-menu.c:97
+msgid "_Add to Playlist"
+msgstr "加入至播放清單(_A)"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:26
-msgid "The hue of the video"
-msgstr "影片畫面的亮度"
+#: ../data/video-list.ui.h:2
+msgid "Add the video to the playlist"
+msgstr "將影片加入至播放清單"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:27
-msgid "The saturation of the video"
-msgstr "影片畫面的飽和度"
+#: ../src/backend/bacon-video-widget.c:1643
+msgid "Password requested for RTSP server"
+msgstr "RTSP 伺服器要求的密碼 "
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:28
-msgid "Type of audio output to use"
-msgstr "音效輸出方式"
+#: ../src/backend/bacon-video-widget.c:2944
+#, c-format
+msgid "Audio Track #%d"
+msgstr "音樂音軌 #%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:29
-msgid "Visualization quality setting"
-msgstr "視覺效果品質設定值"
+#: ../src/backend/bacon-video-widget.c:2948
+#, c-format
+msgid "Subtitle #%d"
+msgstr "字幕 #%d"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:30
-msgid "Whether to autoload external chapter files when a movie is loaded"
-msgstr "載入影片時是否自動讀取外部章節檔"
+#: ../src/backend/bacon-video-widget.c:3345
+msgid "The server you are trying to connect to is not known."
+msgstr "您嘗試連線的伺服器不明。"
+
+#: ../src/backend/bacon-video-widget.c:3348
+msgid "The connection to this server was refused."
+msgstr "連接到此伺服器被拒絕。"
+
+#: ../src/backend/bacon-video-widget.c:3351
+msgid "The specified movie could not be found."
+msgstr "找不到指定的影片。"
+
+#: ../src/backend/bacon-video-widget.c:3358
+msgid "The server refused access to this file or stream."
+msgstr "伺服器拒絕存取這個檔案或串流。"
+
+#: ../src/backend/bacon-video-widget.c:3364
+msgid "Authentication is required to access this file or stream."
+msgstr "需要驗證才能存取這個檔案或串流。"
+
+#: ../src/backend/bacon-video-widget.c:3371
+msgid "You are not allowed to open this file."
+msgstr "您不被允許開啟此檔案。"
+
+#: ../src/backend/bacon-video-widget.c:3376
+msgid "This location is not a valid one."
+msgstr "此位置不是有效的。"
+
+#: ../src/backend/bacon-video-widget.c:3384
+msgid "The movie could not be read."
+msgstr "無法讀取影片。"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:31
-msgid "Whether to autoload text subtitle files when a movie is loaded"
-msgstr "載入影片時是否自動讀取字幕檔"
+#. should be exactly one missing thing (source or converter)
+#: ../src/backend/bacon-video-widget.c:3407
+#: ../src/backend/bacon-video-widget.c:3415
+#, c-format
+msgid "The playback of this movie requires a %s plugin which is not installed."
+msgid_plural ""
+"The playback of this movie requires the following decoders which are not "
+"installed:\n"
+"\n"
+"%s"
+msgstr[0] ""
+"播放此影片需要下列解碼器，但尚未安裝：\n"
+"\n"
+"%s"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:32
-msgid "Whether to disable deinterlacing for interlaced movies"
-msgstr "是否停用交錯式影片的去交錯"
+#: ../src/backend/bacon-video-widget.c:3426
+msgid ""
+"An audio or video stream is not handled due to missing codecs. You might "
+"need to install additional plugins to be able to play some types of movies"
+msgstr ""
+"有音樂或影片串流沒有處理，因為缺變編解碼器。您可能需要安裝額外的外掛程式才能"
+"播放某些類型的影片"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:33
-msgid "Whether to disable the keyboard shortcuts"
-msgstr "是否停用捷徑鍵"
+#: ../src/backend/bacon-video-widget.c:3436
+msgid ""
+"This file cannot be played over the network. Try downloading it locally "
+"first."
+msgstr "無法透過網路播放此檔案。先下載到磁碟後再試。"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:34
-msgid "Whether to disable the plugins in the user's home directory"
-msgstr "是否在使用者的家目錄裡停用該外掛程式"
+#: ../src/backend/bacon-video-widget.c:5494 ../src/totem-properties-view.c:227
+msgid "Surround"
+msgstr "環繞"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:35
-msgid "Whether to enable debug for the playback engine"
-msgstr "應否顯示播放引擎的偵錯訊息"
+#: ../src/backend/bacon-video-widget.c:5496 ../src/totem-properties-view.c:229
+msgid "Mono"
+msgstr "單聲道"
 
-#: ../data/org.gnome.totem.gschema.xml.in.in.h:36
-msgid ""
-"Whether to remember the position of played audio/video files when pausing or "
-"closing them"
-msgstr "是否在暫停或關閉播放的音樂/影片時記住它們的位置"
+#: ../src/backend/bacon-video-widget.c:5781
+msgid "Media contains no supported video streams."
+msgstr "媒體包含不支援的視訊串流。"
 
-#: ../data/uri.ui.h:1
-msgid "Enter the _address of the file you would like to open:"
-msgstr "請輸入您要開啟檔案的位置(_A):"
+#: ../src/backend/bacon-video-widget.c:5963
+msgid ""
+"Some necessary plug-ins are missing. Make sure that the program is correctly "
+"installed."
+msgstr "缺少某些必須的外掛程式，請確定目前已安裝程式。"
 
 #: ../src/eggdesktopfile.c:165
 #, c-format
@@ -968,6 +1029,31 @@
 msgid "Show session management options"
 msgstr "顯示作業階段管理選項"
 
+#. hour:minutes:seconds
+#. Translators: This is a time format, like "9:05:02" for 9
+#. * hours, 5 minutes, and 2 seconds. You may change ":" to
+#. * the separator that your locale uses or use "%Id" instead
+#. * of "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:56
+#: ../src/plugins/skipto/totem-time-entry.c:57
+#, c-format
+msgctxt "long time format"
+msgid "%d:%02d:%02d"
+msgstr "%d:%02d:%02d"
+
+#. minutes:seconds
+#. Translators: This is a time format, like "5:02" for 5
+#. * minutes and 2 seconds. You may change ":" to the
+#. * separator that your locale uses or use "%Id" instead of
+#. * "%d" if your locale uses localized digits.
+#.
+#: ../src/gst/totem-time-helpers.c:65
+#, c-format
+msgctxt "short time format"
+msgid "%d:%02d"
+msgstr "%d:%02d"
+
 #. Title
 #. Artist
 #. Album
@@ -1068,10 +1154,14 @@
 msgid_plural "%d frames per second"
 msgstr[0] "每秒 %d 格"
 
-#: ../src/totem-audio-preview.c:168
+#: ../src/totem-audio-preview.c:137
 msgid "Audio Preview"
 msgstr "音樂試聽"
 
+#: ../src/totem.c:240
+msgid "Verify your system installation. Totem will now exit."
+msgstr "請先確認安裝時有沒有問題。Totem 會立刻結束。"
+
 #: ../src/totem-cell-renderer-video.c:126
 msgid "Unknown video"
 msgstr "不明的影片"
@@ -1084,7 +1174,7 @@
 msgid "Cancel"
 msgstr "取消"
 
-#: ../src/totem-fullscreen.c:616
+#: ../src/totem-fullscreen.c:573
 msgid "No File"
 msgstr "沒有檔案"
 
@@ -1102,7 +1192,7 @@
 msgid "Make sure that Totem is properly installed."
 msgstr "請檢查 Totem 是否已正確安裝。"
 
-#: ../src/totem-interface.c:347
+#: ../src/totem-interface.c:357
 msgid ""
 "Totem 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 "
@@ -1113,7 +1203,7 @@
 "本程式再為散布與／或修改；無論您依據的是本授權的第二版或（您自行選擇的）任一"
 "日後發行的版本。"
 
-#: ../src/totem-interface.c:351
+#: ../src/totem-interface.c:361
 msgid ""
 "Totem is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -1123,7 +1213,7 @@
 "Totem 係基於使用目的而加以散布，然而不負任何擔保責任；亦無對適售性或特定目的"
 "適用性所為的默示性擔保。詳情請參照 GNU 通用公共授權。"
 
-#: ../src/totem-interface.c:355
+#: ../src/totem-interface.c:365
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Totem; if not, write to the Free Software Foundation, Inc., 59 Temple Place, "
@@ -1132,53 +1222,28 @@
 "您應已收到附隨於本程式的 GNU 通用公共授權的副本；如無，請寫信至自由軟體基金"
 "會：59 Temple Place Suite 330, Boston, MA 02111-1307  USA"
 
-#: ../src/totem-interface.c:358
+#: ../src/totem-interface.c:368
 msgid ""
 "Totem contains an exception to allow the use of proprietary GStreamer "
 "plugins."
 msgstr "Totem 例外允許使用專屬的 GStreamer 外掛程式。"
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:190
+#: ../src/totem-menu.c:291
 msgid "None"
 msgstr "無"
 
 #. Translators: an entry in the "Languages" menu, used to choose the audio language of a DVD
-#: ../src/totem-menu.c:195
+#: ../src/totem-menu.c:296
 msgctxt "Language"
 msgid "Auto"
 msgstr "自動"
 
-#. Translators:
-#. * This is not a JPEG image, but a disc image, for example,
-#. * an ISO file
-#: ../src/totem-menu.c:765
-#, c-format
-msgid "Play Image '%s'"
-msgstr "播放映像檔「%s」"
-
-#: ../src/totem-menu.c:768 ../src/totem-menu.c:851
-#, c-format
-msgid "device%d"
-msgstr "裝置%d"
-
-#: ../src/totem-menu.c:848
-#, c-format
-msgid "Play Disc '%s'"
-msgstr "播放碟片‘%s’"
-
-#. This lists the back-end type and version, such as
-#. * Movie Player using GStreamer 0.10.1
-#: ../src/totem-menu.c:1189
-#, c-format
-msgid "Movie Player using %s"
-msgstr "使用 %s 的影片播放器"
-
-#: ../src/totem-menu.c:1193
+#: ../src/totem-menu.c:789
 msgid "Copyright © 2002-2009 Bastien Nocera"
 msgstr "版權所有 © 2002-2009 Bastien Nocera"
 
-#: ../src/totem-menu.c:1198
+#: ../src/totem-menu.c:794
 msgid "translator-credits"
 msgstr ""
 "如對翻譯有任何意見，請送一封電子郵件給\n"
@@ -1190,145 +1255,77 @@
 "Woodman Tuen , 2004-07\n"
 "Abel Cheung , 2003"
 
-#: ../src/totem-menu.c:1202
+#: ../src/totem-menu.c:798
 msgid "Totem Website"
 msgstr "Totem 網站"
 
-#: ../src/totem-menu.c:1236
+#: ../src/totem-menu.c:829
 msgid "Configure Plugins"
 msgstr "設定外掛程式"
 
+#: ../src/totem-object.c:162
+#, c-format
+msgid ""
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"%s\n"
+"執行「%s --help」可列出命令列中可用的完整選項。\n"
+
 #. Translators: %s is the totem version number
-#: ../src/totem-object.c:471
+#: ../src/totem-object.c:591
 #, c-format
 msgid "Totem %s"
 msgstr "Totem %s"
 
-#: ../src/totem-object.c:1047 ../browser-plugin/totem-plugin-viewer.c:367
-msgid "Playing"
-msgstr "播放"
-
-#: ../src/totem-object.c:1049 ../src/totem-options.c:52
+#: ../src/totem-object.c:1168 ../src/totem-options.c:52
 msgid "Pause"
 msgstr "暫停"
 
-#: ../src/totem-object.c:1054 ../browser-plugin/totem-plugin-viewer.c:363
-msgid "Paused"
-msgstr "已暫停"
-
-#: ../src/totem-object.c:1056 ../src/totem-object.c:1066
+#: ../src/totem-object.c:1175 ../src/totem-object.c:1185
 #: ../src/totem-options.c:51
 msgid "Play"
 msgstr "播放"
 
-#: ../src/totem-object.c:1061 ../src/totem-object.c:1659
-#: ../src/totem-statusbar.c:115 ../browser-plugin/totem-plugin-viewer.c:351
-msgid "Stopped"
-msgstr "已停止"
-
-#: ../src/totem-object.c:1142 ../src/totem-object.c:1169
-#: ../src/totem-object.c:1799 ../src/totem-object.c:1963
+#: ../src/totem-object.c:1267 ../src/totem-object.c:1294
+#: ../src/totem-object.c:1787 ../src/totem-object.c:1942
 #, c-format
 msgid "Totem could not play '%s'."
 msgstr "Totem 無法播放‘%s’。"
 
-#: ../src/totem-object.c:1246
-#, c-format
-msgid ""
-"Totem could not play this media (%s) although a plugin is present to handle "
-"it."
-msgstr "即使適當的外掛程式已經存在，Totem 仍然無法播放這個媒體 (%s)。"
-
-#: ../src/totem-object.c:1247
-msgid ""
-"You might want to check that a disc is present in the drive and that it is "
-"correctly configured."
-msgstr "您可能要檢查一下光碟是否已在光碟機內，和是否已經設置好。"
-
-#: ../src/totem-object.c:1255
-msgid "More information about media plugins"
-msgstr "更多關於多媒體外掛的資訊"
-
-#: ../src/totem-object.c:1256
-msgid ""
-"Please install the necessary plugins and restart Totem to be able to play "
-"this media."
-msgstr "請安裝適當的外掛程式，然後重新啟動 Totem，方可播放這個媒體。"
-
-#: ../src/totem-object.c:1258
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because it does not have the "
-"appropriate plugins to be able to read from the disc."
-msgstr "因為沒有適當的外掛程式來讀取音碟，Totem 無法播放這個媒體 (%s)。"
-
-#: ../src/totem-object.c:1260
-#, c-format
-msgid ""
-"Totem cannot play this type of media (%s) because you do not have the "
-"appropriate plugins to handle it."
-msgstr "因為沒有適當的外掛程式，Totem 無法播放這個媒體 (%s)。"
-
-#: ../src/totem-object.c:1263
-#, c-format
-msgid "Totem cannot play this type of media (%s) because it is not supported."
-msgstr "因為沒有支援該媒體類型，Totem 無法播放這個媒體 (%s)。"
-
-#: ../src/totem-object.c:1264
-msgid "Please insert another disc to play back."
-msgstr "請插入另一個光碟片以播放。"
-
-#: ../src/totem-object.c:1300
-msgid "Totem was not able to play this disc."
-msgstr "Totem 無法播放此碟片。"
-
-#: ../src/totem-object.c:1301 ../src/totem-object.c:4229
-msgid "No reason."
-msgstr "沒有原因。"
-
-#: ../src/totem-object.c:1315
-msgid "Totem does not support playback of Audio CDs"
-msgstr "Totem 不支援播放音樂 CD"
-
-#: ../src/totem-object.c:1316
-msgid "Please consider using a music player or a CD extractor to play this CD"
-msgstr "請改用音樂播放程式或 CD 擷取程式來播放這張 CD"
-
-#: ../src/totem-object.c:1805
+#: ../src/totem-object.c:1793
 msgid "No error message"
 msgstr "沒有錯誤訊息"
 
-#: ../src/totem-object.c:2154
+#: ../src/totem-object.c:2133
 msgid "Totem could not display the help contents."
 msgstr "Totem 無法顯示求助內容。"
 
-#: ../src/totem-object.c:2493 ../src/totem-object.c:2495
-#: ../browser-plugin/totem-plugin-viewer.c:1417
-msgid "An error occurred"
-msgstr "發生錯誤"
-
-#: ../src/totem-object.c:4064 ../src/totem-object.c:4066
+#: ../src/totem-object.c:4019 ../src/totem-object.c:4021
 msgid "Previous Chapter/Movie"
 msgstr "上一章/上一齣影片"
 
-#: ../src/totem-object.c:4073 ../src/totem-object.c:4075
+#: ../src/totem-object.c:4028 ../src/totem-object.c:4030
 msgid "Play / Pause"
 msgstr "播放/暫停"
 
-#: ../src/totem-object.c:4083 ../src/totem-object.c:4085
+#: ../src/totem-object.c:4038 ../src/totem-object.c:4040
 msgid "Next Chapter/Movie"
 msgstr "下一章/下一齣影片"
 
-#. Translators: this is the tooltip text for the fullscreen button in the controls box in Totem's main window.
 #. Translators: this is the accessibility text for the fullscreen button in the controls box in Totem's main window.
-#: ../src/totem-object.c:4097 ../src/totem-object.c:4099
+#: ../src/totem-object.c:4051 ../src/totem-object.c:4053
 msgid "Fullscreen"
 msgstr "全螢幕"
 
-#: ../src/totem-object.c:4229
+#: ../src/totem-object.c:4184
 msgid "Totem could not startup."
 msgstr "Totem 無法啟動"
 
+#: ../src/totem-object.c:4184
+msgid "No reason."
+msgstr "沒有原因。"
+
 #: ../src/totem-open-location.c:182
 msgid "Open Location..."
 msgstr "開啟位置…"
@@ -1402,117 +1399,111 @@
 msgid "Movies to play"
 msgstr "要播放的影片"
 
-#: ../src/totem-options.c:117
+#: ../src/totem-options.c:79
+msgid "- Play movies and songs"
+msgstr "- 播放影片及音樂"
+
+#: ../src/totem-options.c:142
 msgid "Can't enqueue and replace at the same time"
 msgstr "不能同時加入佇列和取代"
 
 #. By extension entry
-#: ../src/totem-playlist.c:161
+#: ../src/totem-playlist.c:162
 msgid "MP3 ShoutCast playlist"
 msgstr "MP3 ShoutCast 播放清單"
 
-#: ../src/totem-playlist.c:162
+#: ../src/totem-playlist.c:163
 msgid "MP3 audio (streamed)"
 msgstr "MP3 音樂 (串流)"
 
-#: ../src/totem-playlist.c:163
+#: ../src/totem-playlist.c:164
 msgid "MP3 audio (streamed, DOS format)"
 msgstr "MP3 音樂（串流式，DOS 格式）"
 
-#: ../src/totem-playlist.c:164
+#: ../src/totem-playlist.c:165
 msgid "XML Shareable Playlist"
 msgstr "XML 共享式播放清單"
 
 #. This is "Title 3", where title is a DVD title
 #. * Note: NOT a DVD chapter
-#: ../src/totem-playlist.c:347
+#: ../src/totem-playlist.c:348
 #, c-format
 msgid "Title %d"
 msgstr "影片 %d"
 
-#: ../src/totem-playlist.c:446
+#: ../src/totem-playlist.c:447
 msgid "Could not save the playlist"
 msgstr "無法儲存播放清單"
 
-#: ../src/totem-playlist.c:1021
+#: ../src/totem-playlist.c:1022
 msgid "Save Playlist"
 msgstr "儲存播放清單"
 
 #. translators: Playlist is the default saved playlist filename,
 #. * without the suffix
-#: ../src/totem-playlist.c:1033 ../src/totem-playlist.c:1264
-#: ../src/totem-sidebar.c:142
+#: ../src/totem-playlist.c:1034 ../src/totem-playlist.c:1263
+#: ../src/totem-sidebar.c:145
 msgid "Playlist"
 msgstr "播放清單"
 
-#: ../src/totem-playlist.c:1857
+#: ../src/totem-playlist.c:1862
 #, c-format
 msgid "The playlist '%s' could not be parsed. It might be damaged."
 msgstr "無法解析播放清單「%s」。它可能已經損壞。"
 
-#: ../src/totem-playlist.c:1858
+#: ../src/totem-playlist.c:1863
 msgid "Playlist error"
 msgstr "播放清單錯誤"
 
-#: ../src/totem-preferences.c:295
+#: ../src/totem-preferences.c:297
 msgid "Preferences"
 msgstr "偏好設定"
 
-#: ../src/totem-preferences.c:451
+#: ../src/totem-preferences.c:445
 msgid "Select Subtitle Font"
 msgstr "選取字幕字型"
 
-#: ../src/totem-properties-main.c:115 ../src/totem-properties-view.c:266
+#: ../src/totem-properties-main.c:116 ../src/totem-properties-view.c:269
 msgid "Audio/Video"
 msgstr "音效/視像"
 
-#: ../src/totem-properties-view.c:128
+#: ../src/totem-properties-view.c:131
 msgid "N/A"
 msgstr "N/A"
 
-#: ../src/totem-properties-view.c:157
+#: ../src/totem-properties-view.c:160
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 msgctxt "Stream bit rate"
 msgid "N/A"
 msgstr "N/A"
 
-#: ../src/totem-properties-view.c:160
+#: ../src/totem-properties-view.c:163
 #: ../src/plugins/properties/totem-movie-properties.c:152
 #: ../src/plugins/properties/totem-movie-properties.c:163
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: ../src/totem-properties-view.c:177
+#: ../src/totem-properties-view.c:180
 #: ../src/plugins/properties/totem-movie-properties.c:149
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../src/totem-properties-view.c:209
+#: ../src/totem-properties-view.c:212
 #: ../src/plugins/properties/totem-movie-properties.c:166
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: ../src/totem-properties-view.c:216
-#: ../src/plugins/properties/totem-movie-properties.c:166
-msgctxt "Sample rate"
-msgid "N/A"
-msgstr "N/A"
-
-#: ../src/totem-properties-view.c:224
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5589
-msgid "Surround"
-msgstr "環繞"
-
-#: ../src/totem-properties-view.c:226
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5591
-msgid "Mono"
-msgstr "單聲道"
-
-#: ../src/totem-properties-view.c:236
+#: ../src/totem-properties-view.c:219
+#: ../src/plugins/properties/totem-movie-properties.c:166
+msgctxt "Sample rate"
+msgid "N/A"
+msgstr "N/A"
+
+#: ../src/totem-properties-view.c:239
 msgctxt "Number of audio channels"
 msgid "N/A"
 msgstr "N/A"
@@ -1545,8 +1536,8 @@
 #. eg: 75 %
 #: ../src/totem-statusbar.c:250
 #, c-format
-msgid "%d %%"
-msgstr "%d %%"
+msgid "%lf %%"
+msgstr "%lf %%"
 
 #. eg: Paused, 0:32 / 1:05
 #: ../src/totem-statusbar.c:325
@@ -1557,8 +1548,8 @@
 #. eg: Buffering, 75 %
 #: ../src/totem-statusbar.c:330
 #, c-format
-msgid "%s, %d %%"
-msgstr "%s，%d %%"
+msgid "%s, %f %%"
+msgstr "%s，%f %%"
 
 #: ../src/totem-subtitle-encoding.c:156
 msgid "Current Locale"
@@ -1701,212 +1692,91 @@
 msgid "Vietnamese"
 msgstr "越南語"
 
-#: ../src/totem-video-list.c:330
-msgid "No video URI"
-msgstr "沒有影片 URI"
-
-#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
-#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
-#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
-#: ../src/totem-video-thumbnailer.c:872
-#, c-format
-msgid ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-msgstr ""
-"%s: %s\n"
-"%s: %d×%d\n"
-"%s: %s"
-
-#: ../src/totem-video-thumbnailer.c:873
-msgid "Filename"
-msgstr "檔案名稱"
-
-#: ../src/totem-video-thumbnailer.c:875
-msgid "Resolution"
-msgstr "解析度"
-
-#: ../src/totem-video-thumbnailer.c:878
-msgid "Duration"
-msgstr "持續時間"
-
-#: ../src/totem-uri.c:506 ../src/plugins/chapters/totem-chapters.c:998
+#: ../src/totem-uri.c:343 ../src/plugins/chapters/totem-chapters.c:998
 msgid "All files"
 msgstr "所有檔案"
 
-#: ../src/totem-uri.c:511 ../src/plugins/chapters/totem-chapters.c:995
+#: ../src/totem-uri.c:348 ../src/plugins/chapters/totem-chapters.c:995
 msgid "Supported files"
 msgstr "支援的檔案"
 
-#: ../src/totem-uri.c:523
+#: ../src/totem-uri.c:360
 msgid "Audio files"
 msgstr "音效檔案"
 
-#: ../src/totem-uri.c:531
+#: ../src/totem-uri.c:368
 msgid "Video files"
 msgstr "視訊檔案"
 
-#: ../src/totem-uri.c:541
+#: ../src/totem-uri.c:378
 msgid "Subtitle files"
 msgstr "字幕檔案"
 
-#: ../src/totem-uri.c:593
+#: ../src/totem-uri.c:430
 msgid "Select Text Subtitles"
 msgstr "選擇文字字幕"
 
-#: ../src/totem-uri.c:656
+#: ../src/totem-uri.c:495
 msgid "Select Movies or Playlists"
 msgstr "選取影片或播放清單"
 
-#. Options parsing
-#: ../src/totem.c:201
-msgid "- Play movies and songs"
-msgstr "- 播放影片及音樂"
-
-#: ../src/totem.c:212
-#, c-format
-msgid ""
-"%s\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"%s\n"
-"執行「%s --help」可列出命令列中可用的完整選項。\n"
-
-#: ../src/totem.c:254 ../src/totem.c:265
-#: ../browser-plugin/totem-plugin-viewer.c:663
-#: ../browser-plugin/totem-plugin-viewer.c:1793
-msgid "Totem Movie Player"
-msgstr "Totem 影片播放器"
-
-#: ../src/totem.c:255 ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Could not initialize the thread-safe libraries."
-msgstr "無法起動 thread-safe libraries。"
-
-#: ../src/totem.c:255
-msgid "Verify your system installation. Totem will now exit."
-msgstr "請先確認安裝時有沒有問題。Totem 會立刻結束。"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:1589
-msgid "Password requested for RTSP server"
-msgstr "RTSP 伺服器要求的密碼 "
+#: ../src/totem-uri.c:499
+msgid "Add Directory"
+msgstr "加入目錄"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2858
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2862
-#, c-format
-msgid "Audio Track #%d"
-msgstr "音樂音軌 #%d"
+#: ../src/totem-video-list.c:330
+msgid "No video URI"
+msgstr "沒有影片 URI"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2890
-#: ../src/backend/bacon-video-widget-gst-0.10.c:2894
+#. Translators: The first string is "Filename" (as translated); the second is an actual filename.
+#. The third string is "Resolution" (as translated); the fourth and fifth are screenshot height and width, respectively.
+#. The sixth string is "Duration" (as translated); the seventh is the movie duration in words.
+#: ../src/totem-video-thumbnailer.c:841
 #, c-format
-msgid "Subtitle #%d"
-msgstr "字幕 #%d"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3298
-msgid ""
-"The requested audio output was not found. Please select another audio output "
-"in the Multimedia Systems Selector."
-msgstr "找不到所要求的音效輸出。請在多媒體系統選取程式中選擇其它的音效輸出。"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3303
-msgid "Location not found."
-msgstr "找不到位置。"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3307
-msgid ""
-"Could not open location; you might not have permission to open the file."
-msgstr "無法開啟位置，可能您沒有開啟該檔案的權限。"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3318
-msgid ""
-"The video output is in use by another application. Please close other video "
-"applications, or select another video output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"其它的應用程式正在使用視訊輸出。請關閉其它的視訊輸出，或是在多媒體系統選取程"
-"式中選擇其它的音效輸出。"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3324
 msgid ""
-"The audio output is in use by another application. Please select another "
-"audio output in the Multimedia Systems Selector. You may want to consider "
-"using a sound server."
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 msgstr ""
-"其它的應用程式正在使用音效輸出。請在多媒體系統選取程式中選擇其它的音效輸出。"
-"或者您要考慮一下使用音效伺服器。"
-
-#. should be exactly one missing thing (source or converter)
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3342
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3348
-#, c-format
-msgid "The playback of this movie requires a %s plugin which is not installed."
-msgid_plural ""
-"The playback of this movie requires the following decoders which are not "
-"installed:\n"
-"\n"
-"%s"
-msgstr[0] ""
-"播放此影片需要下列解碼器，但尚未安裝：\n"
-"\n"
-"%s"
-
-#: ../src/backend/bacon-video-widget-gst-0.10.c:3374
-msgid ""
-"Cannot play this file over the network. Try downloading it to disk first."
-msgstr "無法透過網路播放此檔案。先下載到磁碟後再試。。"
+"%s: %s\n"
+"%s: %d×%d\n"
+"%s: %s"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:5878
-msgid "Media contains no supported video streams."
-msgstr "媒體包含不支援的視訊串流。"
+#: ../src/totem-video-thumbnailer.c:842
+msgid "Filename"
+msgstr "檔案名稱"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6052
-msgid ""
-"Failed to create a GStreamer play object. Please check your GStreamer "
-"installation."
-msgstr "無法建立 GStreamer 播放對像。請檢查 GStreamer 的安裝是否正確。"
+#: ../src/totem-video-thumbnailer.c:844
+msgid "Resolution"
+msgstr "解析度"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6172
-msgid ""
-"Failed to open audio output. You may not have permission to open the sound "
-"device, or the sound server may not be running. Please select another audio "
-"output in the Multimedia Systems Selector."
-msgstr ""
-"無法開啟音效輸出。您沒有足夠的權限開啟音效裝置，或是音效伺服器沒有執行。請在"
-"多媒體系統選取程式中選擇其它的音效輸出。"
+#: ../src/totem-video-thumbnailer.c:847
+msgid "Duration"
+msgstr "持續時間"
 
-#: ../src/backend/bacon-video-widget-gst-0.10.c:6192
-msgid ""
-"Could not find the audio output. You may need to install additional "
-"GStreamer plugins, or select another audio output in the Multimedia Systems "
-"Selector."
-msgstr ""
-"無法找到音效輸出。您可能需要安裝附加的 GStreamer 外掛程式，或在多媒體系統選取"
-"程式中選擇其它的音效輸出。"
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:1
+msgid "Apple Trailers"
+msgstr "Apple 預告片"
+
+#: ../src/plugins/apple-trailers/apple-trailers.plugin.in.h:2
+msgid "Sets the user agent for the Apple Trailers site"
+msgstr "請定用於 Apple Trailers 網站的使用者代理"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:1
+msgid "Autoload Subtitles"
+msgstr "自動載入字幕"
+
+#: ../src/plugins/autoload-subtitles/autoload-subtitles.plugin.in.h:2
+msgid "Autoloads text subtitles"
+msgstr "自動載入文字字幕"
 
-#. hour:minutes:seconds
-#. Translators: This is a time format, like "9:05:02" for 9
-#. * hours, 5 minutes, and 2 seconds. You may change ":" to
-#. * the separator that your locale uses or use "%Id" instead
-#. * of "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:83 ../src/plugins/skipto/totem-time-entry.c:57
-#, c-format
-msgctxt "long time format"
-msgid "%d:%02d:%02d"
-msgstr "%d:%02d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
+msgid "Video Disc Recorder"
+msgstr "影片光碟燒錄程式"
 
-#. minutes:seconds
-#. Translators: This is a time format, like "5:02" for 5
-#. * minutes and 2 seconds. You may change ":" to the
-#. * separator that your locale uses or use "%Id" instead of
-#. * "%d" if your locale uses localized digits.
-#.
-#: ../src/backend/video-utils.c:92
-#, c-format
-msgctxt "short time format"
-msgid "%d:%02d"
-msgstr "%d:%02d"
+#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
+msgid "Records (S)VCDs or video DVDs"
+msgstr "錄製 (S)VCD 或影片 DVD"
 
 #: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:65
 msgid "_Create Video Disc..."
@@ -1932,93 +1802,85 @@
 msgid "Copy the currently playing (S)VCD"
 msgstr "複製目前播放的 (S)VCD"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:129
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:136
 msgid "The video disc could not be duplicated."
 msgstr "該影片光碟無法被重製。"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:131
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:276
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:138
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:283
 msgid "The movie could not be recorded."
 msgstr "該影片無法被錄製。"
 
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:157
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:167
-#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:263
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:164
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:174
+#: ../src/plugins/brasero-disc-recorder/totem-disc-recorder.c:270
 msgid "Unable to write a project."
 msgstr "無法寫入為專案。"
 
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:1
-msgid "Records (S)VCDs or video DVDs"
-msgstr "錄製 (S)VCD 或影片 DVD"
-
-#: ../src/plugins/brasero-disc-recorder/brasero-disc-recorder.plugin.in.h:2
-msgid "Video Disc Recorder"
-msgstr "影片光碟燒錄程式"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:1
-#: ../src/plugins/chapters/totem-chapters.c:1139
-msgid "Chapters"
-msgstr "章節"
-
-#: ../src/plugins/chapters/chapters.plugin.in.h:2
-msgid "Support chapter markers in movies."
-msgstr "支援影片的章節標記。"
-
 #: ../src/plugins/chapters/chapters-edit.ui.h:1
 msgid "Name for new chapter:"
 msgstr "新章節的名稱："
 
 #: ../src/plugins/chapters/chapters-list.ui.h:1
-msgid "Add Chapter..."
-msgstr "加入章節…"
+msgid "_Remove Chapter"
+msgstr "移除章節(_R)"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:2
-msgid "Add New Chapters"
-msgstr "加入新的章節"
+msgid "Remove the chapter from the list"
+msgstr "從清單中移除章節"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:3
-msgid "Create a new chapter list for the movie"
-msgstr "建立影片的新章節清單"
+msgid "_Go to Chapter"
+msgstr "前往章節(_G)"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:4
-msgid "Go to Chapter"
-msgstr "前往章節"
-
-#: ../src/plugins/chapters/chapters-list.ui.h:5
 msgid "Go to the chapter in the movie"
 msgstr "前往影片中的章節"
 
+#: ../src/plugins/chapters/chapters-list.ui.h:5
+msgid "Add Chapter..."
+msgstr "加入章節…"
+
 #: ../src/plugins/chapters/chapters-list.ui.h:6
-msgid "Load Chapters..."
-msgstr "載入章節…"
+msgid "Remove Chapter"
+msgstr "移除章節"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:7
-msgid "Load chapters from an external CMML file"
-msgstr "從外部的 CMML 檔案載入章節"
+msgid "Go to Chapter"
+msgstr "前往章節"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:8
-msgid "No chapter data"
-msgstr "沒有章節資料"
+msgid "Save Changes"
+msgstr "儲存變更"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:9
-msgid "Remove Chapter"
-msgstr "移除章節"
+msgid "No chapter data"
+msgstr "沒有章節資料"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:10
-msgid "Remove the chapter from the list"
-msgstr "從清單中移除章節"
+msgid "Load Chapters..."
+msgstr "載入章節…"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:11
-msgid "Save Changes"
-msgstr "儲存變更"
+msgid "Load chapters from an external CMML file"
+msgstr "從外部的 CMML 檔案載入章節"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:12
-msgid "_Go to Chapter"
-msgstr "前往章節(_G)"
+msgid "Add New Chapters"
+msgstr "加入新的章節"
 
 #: ../src/plugins/chapters/chapters-list.ui.h:13
-msgid "_Remove Chapter"
-msgstr "移除章節(_R)"
+msgid "Create a new chapter list for the movie"
+msgstr "建立影片的新章節清單"
+
+#: ../src/plugins/chapters/chapters.plugin.in.h:1
+#: ../src/plugins/chapters/totem-chapters.c:1139
+msgid "Chapters"
+msgstr "章節"
+
+#: ../src/plugins/chapters/chapters.plugin.in.h:2
+msgid "Support chapter markers in movies"
+msgstr "支援影片的章節標記"
 
 #: ../src/plugins/chapters/totem-chapters.c:56
 #, c-format
@@ -2123,13 +1985,37 @@
 msgid "The URI ‘%s’ is not supported."
 msgstr "URI「%s」尚未支援。"
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
-msgid "Instant Messenger status"
-msgstr "即時通訊狀態"
+#: ../src/plugins/grilo/grilo.plugin.in.h:1
+msgid "Grilo Browser"
+msgstr "Grilo 瀏覽器"
 
-#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
-msgid "Set your Instant Messenger status to away when a movie is playing"
-msgstr "當電影播放時設定您的即時通訊狀態為離開"
+#: ../src/plugins/grilo/grilo.plugin.in.h:2
+msgid "A plugin to let you browse media content from various sources"
+msgstr "讓您觀看多種來源媒體內容的外掛程式"
+
+#: ../src/plugins/grilo/grilo.ui.h:1
+msgid "Add to Playlist"
+msgstr "加入至播放清單"
+
+#: ../src/plugins/grilo/grilo.ui.h:2
+msgid "Copy Location"
+msgstr "複製位置"
+
+#: ../src/plugins/grilo/grilo.ui.h:3 ../src/plugins/grilo/totem-grilo.c:1184
+msgid "Browse"
+msgstr "瀏覽"
+
+#: ../src/plugins/grilo/grilo.ui.h:4 ../src/plugins/grilo/totem-grilo.c:1227
+msgid "Search"
+msgstr "搜尋"
+
+#: ../src/plugins/grilo/totem-grilo.c:454
+msgid "Browse Error"
+msgstr "瀏覽器錯誤"
+
+#: ../src/plugins/grilo/totem-grilo.c:609
+msgid "Search Error"
+msgstr "搜尋錯誤"
 
 #: ../src/plugins/gromit/gromit.plugin.in.h:1
 msgid "Gromit Annotations"
@@ -2143,53 +2029,13 @@
 msgid "The gromit binary was not found."
 msgstr "找不到 Gromit 的二進位檔。"
 
-#. Add the interface to Totem's sidebar
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:1
-#: ../src/plugins/iplayer/iplayer.py:46
-msgid "BBC iPlayer"
-msgstr "BBC iPlayer"
-
-#: ../src/plugins/iplayer/iplayer.plugin.in.h:2
-msgid "Stream BBC programs from the last 7 days from the BBC iPlayer service."
-msgstr "從 BBC iPlayer 服務最新 7 天的串流 BBC 節目。"
-
-#: ../src/plugins/iplayer/iplayer.py:72
-msgid "Error listing channel categories"
-msgstr "列出頻道分類時發生錯誤"
-
-#: ../src/plugins/iplayer/iplayer.py:73
-msgid ""
-"There was an unknown error getting the list of television channels available "
-"on BBC iPlayer."
-msgstr "從 BBC iPlayer 取得可用的電視頻道清單時發生不明的錯誤。"
-
-#. Append a dummy child row so that the expander's visible; we can
-#. then queue off the expander to load the programme listing for this
-#. category
-#: ../src/plugins/iplayer/iplayer.py:84
-msgid "Loading…"
-msgstr "載入中…"
-
-#. Translators: the "programme feed" is the list of TV shows
-#. available to watch online
-#: ../src/plugins/iplayer/iplayer.py:136
-msgid "Error getting programme feed"
-msgstr "取得節目表餵送時發生錯誤"
-
-#: ../src/plugins/iplayer/iplayer.py:137
-msgid ""
-"There was an error getting the list of programmes for this channel and "
-"category combination."
-msgstr "取得這個頻道和分類組合的節目清單時發生錯誤。"
-
-#: ../src/plugins/iplayer/iplayer2.py:298
-msgid ""
-msgstr "<沒有指定原因>"
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:1
+msgid "Instant Messenger Status"
+msgstr "即時通訊狀態"
 
-#: ../src/plugins/iplayer/iplayer2.py:299
-#, python-format
-msgid "Programme unavailable (\"%s\")"
-msgstr "節目表無法使用 (\"%s\")"
+#: ../src/plugins/im-status/totem-im-status.plugin.in.h:2
+msgid "Set your Instant Messenger status to away when a movie is playing"
+msgstr "當影片播放時設定您的即時通訊狀態為離開"
 
 #: ../src/plugins/lirc/lirc.plugin.in.h:1
 msgid "Infrared Remote Control"
@@ -2207,26 +2053,30 @@
 msgid "Couldn't read lirc configuration."
 msgstr "無法讀取 lirc 的設定。"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
-msgid "Download Movie Subtitles"
-msgstr "下載影片字幕"
-
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
-msgid "Subtitle _language:"
-msgstr "字幕語言(_L):"
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:1
+msgid "Media Player Keys"
+msgstr "多媒體播放器按鍵"
+
+#: ../src/plugins/media-player-keys/media-player-keys.plugin.in.h:2
+msgid "Support additional media player keys"
+msgstr "支援額外的媒體播放器鍵"
 
-#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
-msgid "_Play with Subtitle"
-msgstr "播放時加字幕(_P)"
+#: ../src/plugins/ontop/ontop.plugin.in.h:1
+msgid "Always On Top"
+msgstr "永遠在最上層"
 
-#: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:1
-msgid "Look for subtitles for the currently playing movie."
-msgstr "尋找目前播放影片的字幕。"
+#: ../src/plugins/ontop/ontop.plugin.in.h:2
+msgid "Keep the main window on top when playing a movie"
+msgstr "播放影片時將主視窗維持在最上層"
 
-#: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:2
+#: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:1
 msgid "Subtitle Downloader"
 msgstr "字幕下載程式"
 
+#: ../src/plugins/opensubtitles/opensubtitles.plugin.in.h:2
+msgid "Look for subtitles for the currently playing movie"
+msgstr "尋找目前播放影片的字幕"
+
 #: ../src/plugins/opensubtitles/opensubtitles.py:42
 msgid "Brazilian Portuguese"
 msgstr "巴西葡萄牙文"
@@ -2281,6 +2131,18 @@
 msgid "Searching subtitles…"
 msgstr "正在搜尋字幕…"
 
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:1
+msgid "Download Movie Subtitles"
+msgstr "下載影片字幕"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:2
+msgid "Subtitle _language:"
+msgstr "字幕語言(_L):"
+
+#: ../src/plugins/opensubtitles/opensubtitles.ui.h:3
+msgid "_Play with Subtitle"
+msgstr "播放時加字幕(_P)"
+
 #: ../src/plugins/opensubtitles/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in.h:1
 msgid "Subtitle language"
 msgstr "字幕語言"
@@ -2289,77 +2151,23 @@
 msgid "The language to search for subtitles for movies in."
 msgstr "要搜尋影片字幕語言。"
 
-#: ../src/plugins/ontop/ontop.plugin.in.h:1
-msgid "Always On Top"
-msgstr "永遠在最上層"
-
-#: ../src/plugins/ontop/ontop.plugin.in.h:2
-msgid "Keep the main window on top when playing a movie"
-msgstr "播放電影時將主視窗維持在最上層"
+#: ../src/plugins/properties/movie-properties.plugin.in.h:1
+msgid "Movie Properties"
+msgstr "影片屬性"
+
+#: ../src/plugins/properties/movie-properties.plugin.in.h:2
+msgid "Adds movie properties to the sidebar"
+msgstr "加入影片屬性到側邊列"
 
 #: ../src/plugins/properties/totem-movie-properties.c:246
 msgid "Properties"
 msgstr "屬性"
 
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:2
-#, no-c-format
-msgid ""
-"A format string used to build the network service name used when publishing "
-"playlists over the network. The following format placeholders can be used: • "
-"%a: the program name as returned by g_get_application_name() • %h: the "
-"machine's host name in title case • %u: the user's login name in title case "
-"• %U: the user's real name • %%: the percent sign"
-msgstr ""
-"用來建立透過網路發布播放清單時使用的網路服務名稱的格式字串。可以使用下列格式"
-"佔位符：• %a：由 g_get_application_name() 傳回的程式名稱• %h：電腦的大寫主機"
-"名稱• %u：使用者的大寫登入名稱 • %U：使用者的真實姓名 • %%：百分比符號"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:3
-msgid "Format for network service name"
-msgstr "網路服務名稱的格式"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:4
-msgid "Publisher protocol to use"
-msgstr "要使用的發布通訊協定"
-
-#: ../src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in.h:5
-msgid ""
-"The transport protocol to use when publishing playlists over the network."
-msgstr "當透過網際網路發布播放清單時要使用的傳輸格式。"
-
-#. Translators: computers on the local network which are publishing their playlists over the network
-#: ../src/plugins/publish/totem-publish.c:552
-msgid "Neighbors"
-msgstr "鄰居"
-
-#: ../src/plugins/publish/publish.plugin.in.h:1
-msgid "Publish Playlist"
-msgstr "發布播放清單"
-
-#: ../src/plugins/publish/publish.plugin.in.h:2
-msgid "Share the current playlist via HTTP"
-msgstr "透過 HTTP 分享目前的播放清單"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:1
-msgid "Service _Name:"
-msgstr "服務名稱(_N):"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:3
-#, no-c-format
-msgid ""
-"The name used for announcing the playlist service on the network.\n"
-"All occurrences of the string %u will be replaced by your name,\n"
-"and %h will be replaced by your computer's host name."
-msgstr ""
-"在網路上發布此播放清單服器所使用的名稱。\n"
-"所有的字串 %u 會以您的名字取代，\n"
-"而 %h 會以您電腦的主機名稱取代。"
-
-#: ../src/plugins/publish/publish-plugin.ui.h:6
-msgid "Use _encrypted transport protocol (HTTPS)"
-msgstr "使用加密的傳輸通訊協定[HTTPS](_E)"
-
 #: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:1
+msgid "rpdb2 password"
+msgstr "rpdb2 密碼"
+
+#: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:2
 msgid ""
 "A password to protect the rpdb2 server for debugging Totem from unauthorized "
 "remote access. If this is empty, a default of 'totem' will be used."
@@ -2367,26 +2175,85 @@
 "對 Totem 未授權遠端存取除錯用來保護 rpdb2 伺服器的密碼。如果此項為空白，就會"
 "使用預設密碼 'totem'"
 
-#: ../src/plugins/pythonconsole/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in.h:2
-msgid "rpdb2 password"
-msgstr "rpdb2 密碼"
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
+msgid "Python Console"
+msgstr "Python 主控臺"
 
-#: ../src/plugins/rotation/rotation.plugin.in.h:1
-msgid "Allows videos to be rotated if they're in the wrong orientation."
-msgstr "如果影片的方向錯誤則允許它們旋轉。"
+#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
+msgid "Interactive Python console"
+msgstr "互動式 Python 主控臺"
 
-#: ../src/plugins/rotation/rotation.plugin.in.h:2
+#: ../src/plugins/pythonconsole/pythonconsole.py:88
+msgid "Python Console Menu"
+msgstr "Python 主控臺選單"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:93
+msgid "_Python Console"
+msgstr "_Python 主控臺"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:94
+msgid "Show Totem's Python console"
+msgstr "顯示 Totem 的 Python 主控臺"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:100
+msgid "Python Debugger"
+msgstr "Python 除錯器"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:101
+msgid "Enable remote Python debugging with rpdb2"
+msgstr "啟用使用 rpdb2 的遠端 Python 除錯"
+
+#. pylint: disable-msg=E1101
+#: ../src/plugins/pythonconsole/pythonconsole.py:125
+#, python-format
+msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
+msgstr "您可以透過「totem_object」存取 Totem 物件：\\n%s"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:129
+msgid "Totem Python Console"
+msgstr "Totem Python 主控臺"
+
+#: ../src/plugins/pythonconsole/pythonconsole.py:139
+msgid ""
+"After you press OK, Totem will wait until you connect to it with winpdb or "
+"rpdb2. If you have not set a debugger password in DConf, it will use the "
+"default password ('totem')."
+msgstr ""
+"在您按下確定後，Totem 會等待您以 winpdb 或 rpdb2 連線。如果您尚未在 GConf 中"
+"設定除錯器密碼，它會使用預設的密碼('totem')。"
+
+#: ../src/plugins/recent/recent.plugin.in.h:1
+msgid "Recent files"
+msgstr "最近開啟檔案"
+
+#: ../src/plugins/recent/recent.plugin.in.h:2
+msgid "Adds files that have been played to recent files"
+msgstr "將播放過的檔案加入最近開啟檔案"
+
+#: ../src/plugins/rotation/rotation.plugin.in.h:1
 msgid "Rotation Plugin"
 msgstr "旋轉外掛程式"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:60
+#: ../src/plugins/rotation/rotation.plugin.in.h:2
+msgid "Allows videos to be rotated if they are in the wrong orientation"
+msgstr "如果影片的方向錯誤則允許它們旋轉"
+
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:50
 msgid "_Rotate Clockwise"
 msgstr "順時針方向旋轉(_R)"
 
-#: ../src/plugins/rotation/totem-rotation-plugin.vala:62
+#: ../src/plugins/rotation/totem-rotation-plugin.vala:52
 msgid "Rotate Counterc_lockwise"
 msgstr "逆時針方向旋轉(_L)"
 
+#: ../src/plugins/save-file/save-file.plugin.in.h:1
+msgid "Save Copy"
+msgstr "儲存副本"
+
+#: ../src/plugins/save-file/save-file.plugin.in.h:2
+msgid "Save a copy of the currently playing movie"
+msgstr "儲存目前放映中影片的副本"
+
 #: ../src/plugins/save-file/totem-save-file.c:63
 msgid "Save a Copy..."
 msgstr "儲存副本…"
@@ -2411,40 +2278,48 @@
 msgid "Movie stream"
 msgstr "影片串流"
 
-#: ../src/plugins/screensaver/totem-screensaver.c:116
-#: ../browser-plugin/totem-plugin-viewer.c:1891
-msgid "Playing a movie"
-msgstr "播放影片"
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:1
+msgid "Screen Saver"
+msgstr "螢幕保護程式"
+
+#: ../src/plugins/screensaver/screensaver.plugin.in.h:2
+msgid "Deactivates the screen saver when a movie is playing"
+msgstr "播放影片時停用螢幕保護程式"
 
 #: ../src/plugins/screenshot/gallery.ui.h:1
+msgid "Screenshot width (in pixels):"
+msgstr "畫面快照寬度(以像素計):"
+
+#: ../src/plugins/screenshot/gallery.ui.h:2
 msgid "Calculate the number of screenshots"
 msgstr "計算畫面快照的數量"
 
-#: ../src/plugins/screenshot/gallery.ui.h:2
+#: ../src/plugins/screenshot/gallery.ui.h:3
 msgid "Number of screenshots:"
 msgstr "畫面快照的數量:"
 
-#: ../src/plugins/screenshot/gallery.ui.h:3
-msgid "Screenshot width (in pixels):"
-msgstr "畫面快照寬度(以像素計):"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:1
-msgid "Save in _folder:"
-msgstr "儲存於資料夾(_F):"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:2
-msgid "Select a folder"
-msgstr "選擇一個資料夾"
-
-#: ../src/plugins/screenshot/gnome-screenshot.ui.h:3
-msgid "_Name:"
-msgstr "名稱(_N):"
-
-#. Write the screenshot to the temporary file
-#: ../src/plugins/screenshot/gnome-screenshot-widget.c:385
-#: ../src/plugins/screenshot/totem-screenshot.c:64
-msgid "Screenshot.png"
-msgstr "Screenshot.png"
+#. translators: this is the name of the file that gets made up
+#. * with the screenshot if the entire screen is taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:147
+#, c-format
+msgid "Screenshot from %s.png"
+msgstr "螢幕截圖來自 %s.png"
+
+#. translators: this is the name of the file that gets
+#. * made up with the screenshot if the entire screen is
+#. * taken
+#: ../src/plugins/screenshot/screenshot-filename-builder.c:154
+#, c-format
+msgid "Screenshot from %s - %d.png"
+msgstr "螢幕截圖來自 %s - %d.png"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:1
+msgid "Screenshot"
+msgstr "畫面快照"
+
+#: ../src/plugins/screenshot/screenshot.plugin.in.h:2
+msgid "Allows screenshots and galleries to be taken of videos"
+msgstr "允許影片使用螢幕截圖和藝廊"
 
 #: ../src/plugins/screenshot/totem-gallery.c:91
 msgid "Save Gallery"
@@ -2470,49 +2345,47 @@
 msgid "Saving gallery as \"%s\""
 msgstr "將藝廊儲存為「%s」"
 
-#: ../src/plugins/screenshot/totem-screenshot.c:113
-msgid "There was an error saving the screenshot."
-msgstr "儲存畫面快照時出現錯誤。"
-
-#: ../src/plugins/screenshot/totem-screenshot.c:139
-msgid "Save Screenshot"
-msgstr "儲存畫面快照"
-
-#. Create the screenshot widget
-#. Translators: %s is the movie title and %d is an auto-incrementing number to make filename unique
-#: ../src/plugins/screenshot/totem-screenshot.c:160
-#, c-format
-msgid "Screenshot-%s-%d.png"
-msgstr "畫面截圖-%s-%d.png"
-
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:88
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:220
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "Totem could not get a screenshot of the video."
 msgstr "Totem 無法為該影片擷取畫面快照。"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:95
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:229
 msgid "This is not supposed to happen; please file a bug report."
 msgstr "預設這是不會發生的，請報告錯誤。"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
-msgid "Take _Screenshot..."
-msgstr "拍攝畫面快照(_S)…"
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
+msgid "Take _Screenshot"
+msgstr "拍攝畫面快照(_S)"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:197
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:333
 msgid "Take a screenshot"
 msgstr "擷取畫面快照"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create Screenshot _Gallery..."
 msgstr "建立畫面快照藝廊(_G)…"
 
-#: ../src/plugins/screenshot/totem-screenshot-plugin.c:198
+#: ../src/plugins/screenshot/totem-screenshot-plugin.c:334
 msgid "Create a gallery of screenshots"
 msgstr "建立畫面快照的藝廊"
 
+#: ../src/plugins/skipto/skipto.plugin.in.h:1
+#: ../src/plugins/skipto/totem-skipto.c:196
+msgid "Skip To"
+msgstr "跳至"
+
+#: ../src/plugins/skipto/skipto.plugin.in.h:2
+msgid "Provides the \"Skip to\" dialog"
+msgstr "提供「忽略到」對話盒"
+
+#: ../src/plugins/skipto/skipto.ui.h:1
+msgid "_Skip to:"
+msgstr "跳至(_S):"
+
 #. Update the "seconds" label so that it always has the correct singular/plural form
 #. Translators: label for the seconds selector in the "Skip to" dialogue
-#: ../src/plugins/skipto/totem-skipto.c:160
+#: ../src/plugins/skipto/totem-skipto.c:159
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "秒"
@@ -2521,15 +2394,11 @@
 #. Translators: you should translate this string to a number (written in digits) which corresponds to the longer character length of the
 #. * translations for "second" and "seconds", as translated elsewhere in this file. For example, in English, "second" is 6 characters long and
 #. * "seconds" is 7 characters long, so this string should be translated to "7". See: bgo#639398
-#: ../src/plugins/skipto/totem-skipto.c:190
+#: ../src/plugins/skipto/totem-skipto.c:189
 msgctxt "Skip To label length"
 msgid "7"
 msgstr "7"
 
-#: ../src/plugins/skipto/totem-skipto.c:197
-msgid "Skip To"
-msgstr "跳至"
-
 #: ../src/plugins/skipto/totem-skipto-plugin.c:182
 msgid "_Skip To..."
 msgstr "跳至(_S)…"
@@ -2538,112 +2407,278 @@
 msgid "Skip to a specific time"
 msgstr "跳往指定時間"
 
-#: ../src/plugins/skipto/skipto.ui.h:1
-msgid "_Skip to:"
-msgstr "跳至(_S):"
+#~ msgid ""
+#~ msgstr "<沒有指定原因>"
 
-#: ../browser-plugin/totem-plugin-viewer.c:431
-msgid "No URI to play"
-msgstr "沒有要播放的 URI"
+#~ msgid "Programme unavailable (\"%s\")"
+#~ msgstr "節目表無法使用 (\"%s\")"
 
-#. translators: this is:
-#. * Open With ApplicationName
-#. * as in nautilus' right-click menu
-#: ../browser-plugin/totem-plugin-viewer.c:1107
-#, c-format
-msgid "_Open with \"%s\""
-msgstr "以「%s」開啟(_O)"
+#~ msgid "BBC iPlayer"
+#~ msgstr "BBC iPlayer"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2136
-msgid "No playlist or playlist empty"
-msgstr "沒有播放清單或清單空白"
+#~ msgid ""
+#~ "Stream BBC programs from the last 7 days from the BBC iPlayer service"
+#~ msgstr "從 BBC iPlayer 服務最新 7 天的串流 BBC 節目"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2235
-msgid "Movie browser plugin"
-msgstr "影片瀏覽器外掛程式"
+#~ msgid "Error listing channel categories"
+#~ msgstr "列出頻道分類時發生錯誤"
 
-#: ../browser-plugin/totem-plugin-viewer.c:2251
-msgid "Verify your system installation. The Totem plugin will now exit."
-msgstr "請檢查安裝時有沒有問題。Totem 會立刻結束。"
+#~ msgid ""
+#~ "There was an unknown error getting the list of television channels "
+#~ "available on BBC iPlayer."
+#~ msgstr "從 BBC iPlayer 取得可用的電視頻道清單時發生不明的錯誤。"
 
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:1
-msgid "Interactive Python console."
-msgstr "互動式 Python 主控臺。"
+#~ msgid "Loading…"
+#~ msgstr "載入中…"
 
-#: ../src/plugins/pythonconsole/pythonconsole.plugin.in.h:2
-msgid "Python Console"
-msgstr "Python 主控臺"
+#~ msgid "Error getting programme feed"
+#~ msgstr "取得節目表餵送時發生錯誤"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:88
-msgid "Python Console Menu"
-msgstr "Python 主控臺選單"
+#~ msgid ""
+#~ "There was an error getting the list of programmes for this channel and "
+#~ "category combination."
+#~ msgstr "取得這個頻道和分類組合的節目清單時發生錯誤。"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:93
-msgid "_Python Console"
-msgstr "_Python 主控臺"
+#~ msgid "%d %%"
+#~ msgstr "%d %%"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:94
-msgid "Show Totem's Python console"
-msgstr "顯示 Totem 的 Python 主控臺"
+#~ msgid "Play movies and songs"
+#~ msgstr "播放影片及音樂"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:100
-msgid "Python Debugger"
-msgstr "Python 除錯器"
+#~ msgid "1.5 Mbps T1/Intranet/LAN"
+#~ msgstr "1.5 Mbps T1/Intranet/LAN"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:101
-msgid "Enable remote Python debugging with rpdb2"
-msgstr "啟用使用 rpdb2 的遠端 Python 除錯"
+#~ msgid "112 Kbps Dual ISDN/DSL"
+#~ msgstr "112 Kbps 雙 ISDN/DSL"
 
-#. pylint: disable-msg=E1101
-#: ../src/plugins/pythonconsole/pythonconsole.py:125
-#, python-format
-msgid "You can access the Totem.Object through 'totem_object' :\\n%s"
-msgstr "您可以透過「totem_object」存取 Totem 物件：\\n%s"
+#~ msgid "14.4 Kbps Modem"
+#~ msgstr "14.4 Kbps 數據機"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:129
-msgid "Totem Python Console"
-msgstr "Totem Python 主控臺"
+#~ msgid "19.2 Kbps Modem"
+#~ msgstr "19.2 Kbps 數據機"
 
-#: ../src/plugins/pythonconsole/pythonconsole.py:139
-msgid ""
-"After you press OK, Totem will wait until you connect to it with winpdb or "
-"rpdb2. If you have not set a debugger password in DConf, it will use the "
-"default password ('totem')."
-msgstr ""
-"在您按下確定後，Totem 會等待您以 winpdb 或 rpdb2 連線。如果您尚未在 GConf 中"
-"設定除錯器密碼，它會使用預設的密碼('totem')。"
+#~ msgid "256 Kbps DSL/Cable"
+#~ msgstr "256 Kbps DSL/Cable"
 
-#: ../src/plugins/grilo/grilo.plugin.in.h:1
-msgid "A plugin to let you browse media content from various sources."
-msgstr "讓您觀看多種來源媒體內容的外掛程式。"
+#~ msgid "28.8 Kbps Modem"
+#~ msgstr "28.8 Kbps 數據機"
 
-#: ../src/plugins/grilo/grilo.plugin.in.h:2
-msgid "Grilo Browser"
-msgstr "Grilo 瀏覽器"
+#~ msgid "33.6 Kbps Modem"
+#~ msgstr "33.6 Kbps 數據機"
 
-#: ../src/plugins/grilo/totem-grilo.c:452
-msgid "Browse Error"
-msgstr "瀏覽器錯誤"
+#~ msgid "34.4 Kbps Modem"
+#~ msgstr "34.4 Kbps 數據機"
 
-#: ../src/plugins/grilo/totem-grilo.c:599
-msgid "Search Error"
-msgstr "搜尋錯誤"
+#~ msgid "384 Kbps DSL/Cable"
+#~ msgstr "384 Kbps DSL/Cable"
 
-#: ../src/plugins/grilo/totem-grilo.c:1219 ../src/plugins/grilo/grilo.ui.h:2
-msgid "Browse"
-msgstr "瀏覽"
+#~ msgid "512 Kbps DSL/Cable"
+#~ msgstr "512 Kbps DSL/Cable"
 
-#: ../src/plugins/grilo/totem-grilo.c:1285 ../src/plugins/grilo/grilo.ui.h:4
-msgid "Search"
-msgstr "搜尋"
+#~ msgid "56 Kbps Modem/ISDN"
+#~ msgstr "56 Kbps 數據機/ISDN"
 
-#: ../src/plugins/grilo/grilo.ui.h:1
-msgid "Add to Playlist"
-msgstr "加入至播放清單"
+#~ msgid "Connection _speed:"
+#~ msgstr "連線速度(_S):"
 
-#: ../src/plugins/grilo/grilo.ui.h:3
-msgid "Copy Location"
-msgstr "複製位置"
+#~ msgid "Intranet/LAN"
+#~ msgstr "Intranet/LAN"
+
+#~ msgid "Networking"
+#~ msgstr "網路"
+
+#~ msgid ""
+#~ "Approximate network connection speed, used to select quality on media "
+#~ "over the network."
+#~ msgstr "大約的網路連線速度，用來選擇透過網路傳輸的媒體品質。"
+
+#~ msgid "Network connection speed"
+#~ msgstr "連線連線速度"
+
+#~ msgid "Movie Player using %s"
+#~ msgstr "使用 %s 的影片播放器"
+
+#~ msgid "Location not found."
+#~ msgstr "找不到位置。"
+
+#~ msgid ""
+#~ "Could not open location; you might not have permission to open the file."
+#~ msgstr "無法開啟位置，可能您沒有開啟該檔案的權限。"
+
+#~ msgid ""
+#~ "Failed to create a GStreamer play object. Please check your GStreamer "
+#~ "installation."
+#~ msgstr "無法建立 GStreamer 播放對像。請檢查 GStreamer 的安裝是否正確。"
+
+#~ msgid "Save in _folder:"
+#~ msgstr "儲存於資料夾(_F):"
+
+#~ msgid "Select a folder"
+#~ msgstr "選擇一個資料夾"
+
+#~ msgid "_Name:"
+#~ msgstr "名稱(_N):"
+
+#~ msgid "There was an error saving the screenshot."
+#~ msgstr "儲存畫面快照時出現錯誤。"
+
+#~ msgid "Save Screenshot"
+#~ msgstr "儲存畫面快照"
+
+#~ msgid "Configure the application"
+#~ msgstr "設定應用程式"
+
+#~ msgid "Open a file"
+#~ msgstr "開啟檔案"
+
+#~ msgid "Open a non-local file"
+#~ msgstr "開啟不是在本機的檔案"
+
+#~ msgid "Quit the program"
+#~ msgstr "結束程式"
+
+#~ msgid "Set the repeat mode"
+#~ msgstr "切換是否循環播放影片"
+
+#~ msgid "Set the shuffle mode"
+#~ msgstr "切換是否以隨機的次序播放影片"
+
+#~ msgid "Switch to fullscreen"
+#~ msgstr "切換至全螢幕"
+
+#~ msgid "Play Image '%s'"
+#~ msgstr "播放映像檔「%s」"
+
+#~ msgid "device%d"
+#~ msgstr "裝置%d"
+
+#~ msgid "Play Disc '%s'"
+#~ msgstr "播放碟片‘%s’"
+
+#~ msgid ""
+#~ "Totem could not play this media (%s) although a plugin is present to "
+#~ "handle it."
+#~ msgstr "即使適當的外掛程式已經存在，Totem 仍然無法播放這個媒體 (%s)。"
+
+#~ msgid ""
+#~ "You might want to check that a disc is present in the drive and that it "
+#~ "is correctly configured."
+#~ msgstr "您可能要檢查一下光碟是否已在光碟機內，和是否已經設置好。"
+
+#~ msgid "More information about media plugins"
+#~ msgstr "更多關於多媒體外掛的資訊"
+
+#~ msgid ""
+#~ "Please install the necessary plugins and restart Totem to be able to play "
+#~ "this media."
+#~ msgstr "請安裝適當的外掛程式，然後重新啟動 Totem，方可播放這個媒體。"
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it does not have the "
+#~ "appropriate plugins to be able to read from the disc."
+#~ msgstr "因為沒有適當的外掛程式來讀取音碟，Totem 無法播放這個媒體 (%s)。"
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because you do not have the "
+#~ "appropriate plugins to handle it."
+#~ msgstr "因為沒有適當的外掛程式，Totem 無法播放這個媒體 (%s)。"
+
+#~ msgid ""
+#~ "Totem cannot play this type of media (%s) because it is not supported."
+#~ msgstr "因為沒有支援該媒體類型，Totem 無法播放這個媒體 (%s)。"
+
+#~ msgid "Please insert another disc to play back."
+#~ msgstr "請插入另一個光碟片以播放。"
+
+#~ msgid "Totem does not support playback of Audio CDs"
+#~ msgstr "Totem 不支援播放音樂 CD"
+
+#~ msgid ""
+#~ "Please consider using a music player or a CD extractor to play this CD"
+#~ msgstr "請改用音樂播放程式或 CD 擷取程式來播放這張 CD"
+
+#~ msgid ""
+#~ "The requested audio output was not found. Please select another audio "
+#~ "output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "找不到所要求的音效輸出。請在多媒體系統選取程式中選擇其它的音效輸出。"
+
+#~ msgid ""
+#~ "The video output is in use by another application. Please close other "
+#~ "video applications, or select another video output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "其它的應用程式正在使用視訊輸出。請關閉其它的視訊輸出，或是在多媒體系統選取"
+#~ "程式中選擇其它的音效輸出。"
+
+#~ msgid ""
+#~ "The audio output is in use by another application. Please select another "
+#~ "audio output in the Multimedia Systems Selector. You may want to consider "
+#~ "using a sound server."
+#~ msgstr ""
+#~ "其它的應用程式正在使用音效輸出。請在多媒體系統選取程式中選擇其它的音效輸"
+#~ "出。或者您要考慮一下使用音效伺服器。"
+
+#~ msgid ""
+#~ "Failed to open audio output. You may not have permission to open the "
+#~ "sound device, or the sound server may not be running. Please select "
+#~ "another audio output in the Multimedia Systems Selector."
+#~ msgstr ""
+#~ "無法開啟音效輸出。您沒有足夠的權限開啟音效裝置，或是音效伺服器沒有執行。請"
+#~ "在多媒體系統選取程式中選擇其它的音效輸出。"
+
+#~ msgid ""
+#~ "Could not find the audio output. You may need to install additional "
+#~ "GStreamer plugins, or select another audio output in the Multimedia "
+#~ "Systems Selector."
+#~ msgstr ""
+#~ "無法找到音效輸出。您可能需要安裝附加的 GStreamer 外掛程式，或在多媒體系統"
+#~ "選取程式中選擇其它的音效輸出。"
+
+#~ msgid ""
+#~ "A format string used to build the network service name used when "
+#~ "publishing playlists over the network. The following format placeholders "
+#~ "can be used: • %a: the program name as returned by g_get_application_name"
+#~ "() • %h: the machine's host name in title case • %u: the user's login "
+#~ "name in title case • %U: the user's real name • %%: the percent sign"
+#~ msgstr ""
+#~ "用來建立透過網路發布播放清單時使用的網路服務名稱的格式字串。可以使用下列格"
+#~ "式佔位符：• %a：由 g_get_application_name() 傳回的程式名稱• %h：電腦的大寫"
+#~ "主機名稱• %u：使用者的大寫登入名稱 • %U：使用者的真實姓名 • %%：百分比符號"
+
+#~ msgid "Format for network service name"
+#~ msgstr "網路服務名稱的格式"
+
+#~ msgid "Publisher protocol to use"
+#~ msgstr "要使用的發布通訊協定"
+
+#~ msgid ""
+#~ "The transport protocol to use when publishing playlists over the network."
+#~ msgstr "當透過網際網路發布播放清單時要使用的傳輸格式。"
+
+#~ msgid "Neighbors"
+#~ msgstr "鄰居"
+
+#~ msgid "Publish Playlist"
+#~ msgstr "發布播放清單"
+
+#~ msgid "Share the current playlist via HTTP"
+#~ msgstr "透過 HTTP 分享目前的播放清單"
+
+#~ msgid "Service _Name:"
+#~ msgstr "服務名稱(_N):"
+
+#~ msgid ""
+#~ "The name used for announcing the playlist service on the network.\n"
+#~ "All occurrences of the string %u will be replaced by your name,\n"
+#~ "and %h will be replaced by your computer's host name."
+#~ msgstr ""
+#~ "在網路上發布此播放清單服器所使用的名稱。\n"
+#~ "所有的字串 %u 會以您的名字取代，\n"
+#~ "而 %h 會以您電腦的主機名稱取代。"
+
+#~ msgid "Use _encrypted transport protocol (HTTPS)"
+#~ msgstr "使用加密的傳輸通訊協定[HTTPS](_E)"
 
 #~ msgid "Bemused"
 #~ msgstr "Bemused"
@@ -2672,9 +2707,6 @@
 #~ msgid "Search Results"
 #~ msgstr "搜尋結果"
 
-#~ msgid "Videos"
-#~ msgstr "影片"
-
 #~ msgid "_Open in Web Browser"
 #~ msgstr "在網頁瀏覽器中開啟(_O)"
 
@@ -2896,7 +2928,7 @@
 #~ msgstr "頁"
 
 #~ msgid "Set the window icon to the thumbnail of the playing movie"
-#~ msgstr "將視窗圖示設為播放電影的縮圖"
+#~ msgstr "將視窗圖示設為播放影片的縮圖"
 
 #~ msgid "Thumbnail"
 #~ msgstr "縮圖"
diff -Nru totem-3.4.3/src/Makefile.am totem-3.6.2/src/Makefile.am
--- totem-3.4.3/src/Makefile.am	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/Makefile.am	2012-10-25 13:15:32.000000000 +0000
@@ -41,20 +41,21 @@
 	totem-interface.c	\
 	totem-fullscreen.c	\
 	totem-fullscreen.h	\
-	gsd-media-keys-window.c	\
-	gsd-media-keys-window.h	\
-	gsd-osd-window.c	\
-	gsd-osd-window.h	\
+	gd-fullscreen-filter.c	\
+	gd-fullscreen-filter.h	\
 	totem-time-label.c	\
 	totem-time-label.h
 
-libtotem_player_la_CPPFLAGS = \
+libtotem_player_la_CPPFLAGS =		\
 	-DG_LOG_DOMAIN=\""Totem"\"	\
 	$(AM_CPPFLAGS)
 
-libtotem_player_la_LIBADD = $(DEPENDENCY_LIBS)
-libtotem_player_la_CFLAGS = \
-	$(DEPENDENCY_CFLAGS)	\
+libtotem_player_la_LIBADD =	\
+	$(PLAYER_LIBS)		\
+	gst/libtotemtimehelpers.la
+libtotem_player_la_CFLAGS =	\
+	$(LIBPLAYER_CFLAGS)	\
+	-I$(srcdir)/gst/	\
 	$(AM_CFLAGS)
 
 # Totem main library (used for main player; separate to allow gtk-doc to be used)
@@ -99,9 +100,7 @@
 	$(AM_CPPFLAGS)
 
 libtotem_la_CFLAGS = \
-	$(DEPENDENCY_CFLAGS)		\
-	$(PEAS_CFLAGS)			\
-	$(PEASGTK_CFLAGS)		\
+	$(PLAYER_CFLAGS)		\
 	$(AM_CFLAGS)
 
 libtotem_la_LDFLAGS = \
@@ -112,9 +111,7 @@
 libtotem_la_LIBADD = \
 	libtotem_player.la		\
 	backend/libbaconvideowidget.la	\
-	$(PEAS_LIBS)			\
-	$(PEASGTK_LIBS)			\
-	$(DEPENDENCY_LIBS)
+	$(PLAYER_LIBS)
 
 if WITH_SMCLIENT
 libtotem_la_SOURCES += \
@@ -172,16 +169,13 @@
 	-DG_LOG_DOMAIN=\""Totem"\"	\
 	$(AM_CPPFLAGS)
 
-totem_CFLAGS = \
-	$(PEAS_CFLAGS)		\
-	$(DEPENDENCY_CFLAGS)	\
+totem_CFLAGS =			\
+	$(PLAYER_CFLAGS)	\
 	$(AM_CFLAGS)
 
-totem_LDADD = \
-	libtotem.la		\
-	$(DEPENDENCY_LIBS)	\
-	$(X_LIBS)	\
-	$(PEAS_LIBS)
+totem_LDADD =		\
+	libtotem.la	\
+	$(PLAYER_LIBS)
 
 # Totem video thumbnailer
 totem_video_thumbnailer_SOURCES = \
@@ -193,13 +187,16 @@
 	-DG_LOG_DOMAIN=\""TotemVideoThumbnailer"\"	\
 	$(AM_CPPFLAGS)
 
-totem_video_thumbnailer_CFLAGS = \
-	$(DEPENDENCY_CFLAGS)	\
+totem_video_thumbnailer_CFLAGS =	\
+	$(THUMBNAILER_CFLAGS)		\
 	$(AM_CFLAGS)
 
-totem_video_thumbnailer_LDADD = \
-	backend/libbaconvideowidget.la		\
-	$(DEPENDENCY_LIBS)
+totem_video_thumbnailer_LDADD =		\
+	$(THUMBNAILER_LIBS)		\
+	gst/libtotemgstpixbufhelpers.la	\
+	gst/libtotemgsthelpers.la	\
+	gst/libtotemtimehelpers.la	\
+	-lm
 
 # Nautilus Property Page
 if HAVE_NAUTILUS
@@ -217,20 +214,17 @@
 	-DG_LOG_DOMAIN=\""TotemPropertiesPage"\"\
 	$(AM_CPPFLAGS)
 
-libtotem_properties_page_la_CFLAGS = \
-	$(DEPENDENCY_CFLAGS)	\
-	$(NAUTILUS_CFLAGS)	\
+libtotem_properties_page_la_CFLAGS =	\
+	$(NAUTILUS_CFLAGS)		\
 	$(AM_CFLAGS)
 
 libtotem_properties_page_la_LDFLAGS = \
 	-export_dynamic -avoid-version -module -no-undefined	\
 	$(AM_LDFLAGS)
 
-libtotem_properties_page_la_LIBADD = \
-	backend/libbaconvideowidget.la				\
+libtotem_properties_page_la_LIBADD =				\
 	properties/libbaconvideowidgetproperties.la		\
 	libtotem_player.la					\
-	$(DEPENDENCY_LIBS)					\
 	$(NAUTILUS_LIBS)
 
 noinst_PROGRAMS = test-properties-page
@@ -246,8 +240,7 @@
 	-I$(top_srcdir)/src/properties		\
 	$(AM_CPPFLAGS)
 
-test_properties_page_CFLAGS = \
-	$(DEPENDENCY_CFLAGS)	\
+test_properties_page_CFLAGS =	\
 	$(NAUTILUS_CFLAGS)	\
 	$(AM_CFLAGS)
 
@@ -255,7 +248,6 @@
 	backend/libbaconvideowidget.la				\
 	properties/libbaconvideowidgetproperties.la		\
 	libtotem_player.la					\
-	$(DEPENDENCY_LIBS)					\
 	$(NAUTILUS_LIBS)
 endif # HAVE_NAUTILUS
 
@@ -271,14 +263,13 @@
 	-DG_LOG_DOMAIN=\""TotemAudioPreview"\"	\
 	$(AM_CPPFLAGS)
 
-totem_audio_preview_CFLAGS = \
-	$(DEPENDENCY_CFLAGS)	\
+totem_audio_preview_CFLAGS =	\
+	$(PREVIEW_CFLAGS)	\
 	$(AM_CFLAGS)
 
 totem_audio_preview_LDADD =			\
 	gst/libtotemgsthelpers.la		\
-	backend/libbaconvideowidget.la		\
-	$(DEPENDENCY_LIBS)
+	$(PREVIEW_LIBS)
 
 # Introspection
 -include $(INTROSPECTION_MAKEFILE)
@@ -295,9 +286,8 @@
 Totem-1.0.gir: libtotem.la
 Totem_1_0_gir_INCLUDES = GLib-2.0 GObject-2.0 Gtk-3.0 TotemPlParser-1.0
 Totem_1_0_gir_SCANNERFLAGS = --c-include=totem.h --pkg-export=totem
-Totem_1_0_gir_CFLAGS = \
-	$(DEPENDENCY_CFLAGS)	\
-	$(PEAS_CFLAGS)		\
+Totem_1_0_gir_CFLAGS =		\
+	$(PLAYER_CFLAGS)	\
 	$(libtotem_la_CPPFLAGS)
 Totem_1_0_gir_LIBS = libtotem.la
 Totem_1_0_gir_FILES = $(introspection_sources)
diff -Nru totem-3.4.3/src/Makefile.in totem-3.6.2/src/Makefile.in
--- totem-3.4.3/src/Makefile.in	2012-07-04 09:54:48.000000000 +0000
+++ totem-3.6.2/src/Makefile.in	2012-10-25 13:36:20.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.12.2 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -18,6 +17,23 @@
 
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -58,12 +74,10 @@
 @HAVE_INTROSPECTION_TRUE@am__append_8 = Totem-1.0.gir
 @HAVE_INTROSPECTION_TRUE@am__append_9 = $(gir_DATA) $(typelib_DATA)
 subdir = src
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -103,11 +117,8 @@
 LTLIBRARIES = $(lib_LTLIBRARIES) $(nautilus_LTLIBRARIES) \
 	$(noinst_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-@HAVE_NAUTILUS_TRUE@libtotem_properties_page_la_DEPENDENCIES =  \
-@HAVE_NAUTILUS_TRUE@	backend/libbaconvideowidget.la \
-@HAVE_NAUTILUS_TRUE@	properties/libbaconvideowidgetproperties.la \
-@HAVE_NAUTILUS_TRUE@	libtotem_player.la $(am__DEPENDENCIES_1) \
-@HAVE_NAUTILUS_TRUE@	$(am__DEPENDENCIES_1)
+@HAVE_NAUTILUS_TRUE@libtotem_properties_page_la_DEPENDENCIES = properties/libbaconvideowidgetproperties.la \
+@HAVE_NAUTILUS_TRUE@	libtotem_player.la $(am__DEPENDENCIES_1)
 am__libtotem_properties_page_la_SOURCES_DIST =  \
 	totem-properties-main.c totem-properties-view.c \
 	totem-properties-view.h
@@ -118,6 +129,7 @@
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 libtotem_properties_page_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(libtotem_properties_page_la_CFLAGS) $(CFLAGS) \
@@ -127,7 +139,6 @@
 @WITH_SMCLIENT_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
 libtotem_la_DEPENDENCIES = libtotem_player.la \
 	backend/libbaconvideowidget.la $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_2)
 am__libtotem_la_SOURCES_DIST = totemobject-marshal.c \
 	totemobject-marshal.h totemplaylist-marshal.c \
@@ -152,7 +163,6 @@
 	libtotem_la-totemplaylist-marshal.lo \
 	libtotem_la-totemvideolist-marshal.lo
 am__objects_2 =
-am__dirstamp = $(am__leading_dot)dirstamp
 @WITH_SMCLIENT_TRUE@am__objects_3 = libtotem_la-eggsmclient.lo
 @WITH_SMCLIENT_TRUE@@WITH_SMCLIENT_XSMP_TRUE@am__objects_4 = libtotem_la-eggdesktopfile.lo \
 @WITH_SMCLIENT_TRUE@@WITH_SMCLIENT_XSMP_TRUE@	libtotem_la-eggsmclient-xsmp.lo
@@ -169,20 +179,20 @@
 	libtotem_la-totem-open-location.lo libtotem_la-totem-menu.lo \
 	libtotem_la-totem-uri.lo \
 	libtotem_la-totem-subtitle-encoding.lo \
-	plugins/libtotem_la-totem-plugins-engine.lo \
-	plugins/libtotem_la-totem-dirs.lo $(am__objects_3) \
-	$(am__objects_4) $(am__objects_5) $(am__objects_6)
+	libtotem_la-totem-plugins-engine.lo libtotem_la-totem-dirs.lo \
+	$(am__objects_3) $(am__objects_4) $(am__objects_5) \
+	$(am__objects_6)
 libtotem_la_OBJECTS = $(am_libtotem_la_OBJECTS)
 libtotem_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libtotem_la_CFLAGS) \
 	$(CFLAGS) $(libtotem_la_LDFLAGS) $(LDFLAGS) -o $@
-libtotem_player_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+libtotem_player_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	gst/libtotemtimehelpers.la
 am_libtotem_player_la_OBJECTS = $(am__objects_2) \
 	libtotem_player_la-totem-statusbar.lo \
 	libtotem_player_la-totem-interface.lo \
 	libtotem_player_la-totem-fullscreen.lo \
-	libtotem_player_la-gsd-media-keys-window.lo \
-	libtotem_player_la-gsd-osd-window.lo \
+	libtotem_player_la-gd-fullscreen-filter.lo \
 	libtotem_player_la-totem-time-label.lo
 libtotem_player_la_OBJECTS = $(am_libtotem_player_la_OBJECTS)
 libtotem_player_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
@@ -200,16 +210,14 @@
 @HAVE_NAUTILUS_TRUE@test_properties_page_DEPENDENCIES =  \
 @HAVE_NAUTILUS_TRUE@	backend/libbaconvideowidget.la \
 @HAVE_NAUTILUS_TRUE@	properties/libbaconvideowidgetproperties.la \
-@HAVE_NAUTILUS_TRUE@	libtotem_player.la $(am__DEPENDENCIES_1) \
-@HAVE_NAUTILUS_TRUE@	$(am__DEPENDENCIES_1)
+@HAVE_NAUTILUS_TRUE@	libtotem_player.la $(am__DEPENDENCIES_1)
 test_properties_page_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(test_properties_page_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
 am_totem_OBJECTS = totem-totem.$(OBJEXT)
 totem_OBJECTS = $(am_totem_OBJECTS)
-totem_DEPENDENCIES = libtotem.la $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+totem_DEPENDENCIES = libtotem.la $(am__DEPENDENCIES_1)
 totem_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(totem_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -218,7 +226,7 @@
 	totem_audio_preview-totem-resources.$(OBJEXT)
 totem_audio_preview_OBJECTS = $(am_totem_audio_preview_OBJECTS)
 totem_audio_preview_DEPENDENCIES = gst/libtotemgsthelpers.la \
-	backend/libbaconvideowidget.la $(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1)
 totem_audio_preview_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(totem_audio_preview_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
@@ -228,12 +236,25 @@
 	totem_video_thumbnailer-totem-resources.$(OBJEXT)
 totem_video_thumbnailer_OBJECTS =  \
 	$(am_totem_video_thumbnailer_OBJECTS)
-totem_video_thumbnailer_DEPENDENCIES = backend/libbaconvideowidget.la \
-	$(am__DEPENDENCIES_1)
+totem_video_thumbnailer_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	gst/libtotemgstpixbufhelpers.la gst/libtotemgsthelpers.la \
+	gst/libtotemtimehelpers.la
 totem_video_thumbnailer_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(totem_video_thumbnailer_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -246,20 +267,16 @@
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(libtotem_properties_page_la_SOURCES) \
 	$(libtotem_la_SOURCES) $(libtotem_player_la_SOURCES) \
 	$(test_properties_page_SOURCES) $(totem_SOURCES) \
@@ -277,6 +294,11 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 DATA = $(gir_DATA) $(header_DATA) $(typelib_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
@@ -341,6 +363,10 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BACKEND_CFLAGS = @BACKEND_CFLAGS@
+BACKEND_LIBS = @BACKEND_LIBS@
+BACKEND_TEST_CFLAGS = @BACKEND_TEST_CFLAGS@
+BACKEND_TEST_LIBS = @BACKEND_TEST_LIBS@
 BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
 BROWSER_PLUGIN_DIR = @BROWSER_PLUGIN_DIR@
 BROWSER_PLUGIN_LIBS = @BROWSER_PLUGIN_LIBS@
@@ -362,8 +388,6 @@
 DBUS_LIBS = @DBUS_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DEPENDENCY_CFLAGS = @DEPENDENCY_CFLAGS@
-DEPENDENCY_LIBS = @DEPENDENCY_LIBS@
 DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DISC_RECORDER_CFLAGS = @DISC_RECORDER_CFLAGS@
 DISC_RECORDER_LIBS = @DISC_RECORDER_LIBS@
@@ -377,7 +401,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-EXTRA_BACKEND_LIBS = @EXTRA_BACKEND_LIBS@
 FGREP = @FGREP@
 FULL_LIBEXECDIR = @FULL_LIBEXECDIR@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
@@ -385,19 +408,21 @@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GLIB_REQS = @GLIB_REQS@
+GLOW_BUTTON_CFLAGS = @GLOW_BUTTON_CFLAGS@
+GLOW_BUTTON_LIBS = @GLOW_BUTTON_LIBS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
-GST_CFLAGS = @GST_CFLAGS@
-GST_LIBS = @GST_LIBS@
+GST_PLUGINS_BAD_CFLAGS = @GST_PLUGINS_BAD_CFLAGS@
+GST_PLUGINS_BAD_LIBS = @GST_PLUGINS_BAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
 GTK_REQS = @GTK_REQS@
+HELPER_CFLAGS = @HELPER_CFLAGS@
+HELPER_LIBS = @HELPER_LIBS@
 HELP_DIR = @HELP_DIR@
 HTML_DIR = @HTML_DIR@
 INSTALL = @INSTALL@
@@ -423,11 +448,11 @@
 INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBEPC_CFLAGS = @LIBEPC_CFLAGS@
-LIBEPC_LIBS = @LIBEPC_LIBS@
 LIBGRILO_CFLAGS = @LIBGRILO_CFLAGS@
 LIBGRILO_LIBS = @LIBGRILO_LIBS@
 LIBOBJS = @LIBOBJS@
+LIBPLAYER_CFLAGS = @LIBPLAYER_CFLAGS@
+LIBPLAYER_LIBS = @LIBPLAYER_LIBS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBZEITGEIST_CFLAGS = @LIBZEITGEIST_CFLAGS@
@@ -444,8 +469,6 @@
 MISSING_PLUGINS_CFLAGS = @MISSING_PLUGINS_CFLAGS@
 MISSING_PLUGINS_LIBS = @MISSING_PLUGINS_LIBS@
 MKDIR_P = @MKDIR_P@
-MM_CFLAGS = @MM_CFLAGS@
-MM_LIBS = @MM_LIBS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 NAUTILUSDIR = @NAUTILUSDIR@
@@ -466,15 +489,21 @@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PEASGTK_CFLAGS = @PEASGTK_CFLAGS@
-PEASGTK_LIBS = @PEASGTK_LIBS@
-PEAS_CFLAGS = @PEAS_CFLAGS@
-PEAS_LIBS = @PEAS_LIBS@
+PIXBUF_HELPER_CFLAGS = @PIXBUF_HELPER_CFLAGS@
+PIXBUF_HELPER_LIBS = @PIXBUF_HELPER_LIBS@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLAYER_CFLAGS = @PLAYER_CFLAGS@
+PLAYER_LIBS = @PLAYER_LIBS@
 PLUGINDIR = @PLUGINDIR@
 PLUGINS = @PLUGINS@
+PLUGIN_VIEWER_CFLAGS = @PLUGIN_VIEWER_CFLAGS@
+PLUGIN_VIEWER_LIBS = @PLUGIN_VIEWER_LIBS@
+PREVIEW_CFLAGS = @PREVIEW_CFLAGS@
+PREVIEW_LIBS = @PREVIEW_LIBS@
+PROPERTIES_CFLAGS = @PROPERTIES_CFLAGS@
+PROPERTIES_LIBS = @PROPERTIES_LIBS@
 PYGOBJECT_CFLAGS = @PYGOBJECT_CFLAGS@
 PYGOBJECT_LIBS = @PYGOBJECT_LIBS@
 PYLINT = @PYLINT@
@@ -494,6 +523,10 @@
 SMCLIENT_CFLAGS = @SMCLIENT_CFLAGS@
 SMCLIENT_LIBS = @SMCLIENT_LIBS@
 STRIP = @STRIP@
+THUMBNAILER_CFLAGS = @THUMBNAILER_CFLAGS@
+THUMBNAILER_LIBS = @THUMBNAILER_LIBS@
+TIME_HELPER_CFLAGS = @TIME_HELPER_CFLAGS@
+TIME_HELPER_LIBS = @TIME_HELPER_LIBS@
 TOTEM_API_VERSION = @TOTEM_API_VERSION@
 TOTEM_PLPARSER_REQS = @TOTEM_PLPARSER_REQS@
 TOTEM_VERSION_MAJOR = @TOTEM_VERSION_MAJOR@
@@ -505,9 +538,6 @@
 WARN_CFLAGS = @WARN_CFLAGS@
 WARN_CXXFLAGS = @WARN_CXXFLAGS@
 XGETTEXT = @XGETTEXT@
-XMKMF = @XMKMF@
-XTEST_LIBS = @XTEST_LIBS@
-X_LIBS = @X_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -592,10 +622,8 @@
 	totem-interface.c	\
 	totem-fullscreen.c	\
 	totem-fullscreen.h	\
-	gsd-media-keys-window.c	\
-	gsd-media-keys-window.h	\
-	gsd-osd-window.c	\
-	gsd-osd-window.h	\
+	gd-fullscreen-filter.c	\
+	gd-fullscreen-filter.h	\
 	totem-time-label.c	\
 	totem-time-label.h
 
@@ -603,9 +631,13 @@
 	-DG_LOG_DOMAIN=\""Totem"\"	\
 	$(AM_CPPFLAGS)
 
-libtotem_player_la_LIBADD = $(DEPENDENCY_LIBS)
+libtotem_player_la_LIBADD = \
+	$(PLAYER_LIBS)		\
+	gst/libtotemtimehelpers.la
+
 libtotem_player_la_CFLAGS = \
-	$(DEPENDENCY_CFLAGS)	\
+	$(LIBPLAYER_CFLAGS)	\
+	-I$(srcdir)/gst/	\
 	$(AM_CFLAGS)
 
 
@@ -626,16 +658,14 @@
 	$(am__append_7)
 libtotem_la_CPPFLAGS = -I$(top_builddir)/data \
 	-DG_LOG_DOMAIN=\""Totem"\" $(AM_CPPFLAGS) $(am__append_5)
-libtotem_la_CFLAGS = $(DEPENDENCY_CFLAGS) $(PEAS_CFLAGS) \
-	$(PEASGTK_CFLAGS) $(AM_CFLAGS) $(am__append_2)
+libtotem_la_CFLAGS = $(PLAYER_CFLAGS) $(AM_CFLAGS) $(am__append_2)
 libtotem_la_LDFLAGS = \
 	-export-dynamic	\
 	-no-undefined \
 	$(AM_LDFLAGS)
 
 libtotem_la_LIBADD = libtotem_player.la backend/libbaconvideowidget.la \
-	$(PEAS_LIBS) $(PEASGTK_LIBS) $(DEPENDENCY_LIBS) \
-	$(am__append_3)
+	$(PLAYER_LIBS) $(am__append_3)
 
 # Marshal files
 TOTEM_MARSHAL_FILES = \
@@ -657,15 +687,12 @@
 	$(AM_CPPFLAGS)
 
 totem_CFLAGS = \
-	$(PEAS_CFLAGS)		\
-	$(DEPENDENCY_CFLAGS)	\
+	$(PLAYER_CFLAGS)	\
 	$(AM_CFLAGS)
 
 totem_LDADD = \
-	libtotem.la		\
-	$(DEPENDENCY_LIBS)	\
-	$(X_LIBS)	\
-	$(PEAS_LIBS)
+	libtotem.la	\
+	$(PLAYER_LIBS)
 
 
 # Totem video thumbnailer
@@ -679,12 +706,15 @@
 	$(AM_CPPFLAGS)
 
 totem_video_thumbnailer_CFLAGS = \
-	$(DEPENDENCY_CFLAGS)	\
+	$(THUMBNAILER_CFLAGS)		\
 	$(AM_CFLAGS)
 
 totem_video_thumbnailer_LDADD = \
-	backend/libbaconvideowidget.la		\
-	$(DEPENDENCY_LIBS)
+	$(THUMBNAILER_LIBS)		\
+	gst/libtotemgstpixbufhelpers.la	\
+	gst/libtotemgsthelpers.la	\
+	gst/libtotemtimehelpers.la	\
+	-lm
 
 
 # Nautilus Property Page
@@ -702,8 +732,7 @@
 @HAVE_NAUTILUS_TRUE@	$(AM_CPPFLAGS)
 
 @HAVE_NAUTILUS_TRUE@libtotem_properties_page_la_CFLAGS = \
-@HAVE_NAUTILUS_TRUE@	$(DEPENDENCY_CFLAGS)	\
-@HAVE_NAUTILUS_TRUE@	$(NAUTILUS_CFLAGS)	\
+@HAVE_NAUTILUS_TRUE@	$(NAUTILUS_CFLAGS)		\
 @HAVE_NAUTILUS_TRUE@	$(AM_CFLAGS)
 
 @HAVE_NAUTILUS_TRUE@libtotem_properties_page_la_LDFLAGS = \
@@ -711,10 +740,8 @@
 @HAVE_NAUTILUS_TRUE@	$(AM_LDFLAGS)
 
 @HAVE_NAUTILUS_TRUE@libtotem_properties_page_la_LIBADD = \
-@HAVE_NAUTILUS_TRUE@	backend/libbaconvideowidget.la				\
 @HAVE_NAUTILUS_TRUE@	properties/libbaconvideowidgetproperties.la		\
 @HAVE_NAUTILUS_TRUE@	libtotem_player.la					\
-@HAVE_NAUTILUS_TRUE@	$(DEPENDENCY_LIBS)					\
 @HAVE_NAUTILUS_TRUE@	$(NAUTILUS_LIBS)
 
 @HAVE_NAUTILUS_TRUE@test_properties_page_SOURCES = \
@@ -729,7 +756,6 @@
 @HAVE_NAUTILUS_TRUE@	$(AM_CPPFLAGS)
 
 @HAVE_NAUTILUS_TRUE@test_properties_page_CFLAGS = \
-@HAVE_NAUTILUS_TRUE@	$(DEPENDENCY_CFLAGS)	\
 @HAVE_NAUTILUS_TRUE@	$(NAUTILUS_CFLAGS)	\
 @HAVE_NAUTILUS_TRUE@	$(AM_CFLAGS)
 
@@ -737,7 +763,6 @@
 @HAVE_NAUTILUS_TRUE@	backend/libbaconvideowidget.la				\
 @HAVE_NAUTILUS_TRUE@	properties/libbaconvideowidgetproperties.la		\
 @HAVE_NAUTILUS_TRUE@	libtotem_player.la					\
-@HAVE_NAUTILUS_TRUE@	$(DEPENDENCY_LIBS)					\
 @HAVE_NAUTILUS_TRUE@	$(NAUTILUS_LIBS)
 
 
@@ -754,13 +779,12 @@
 	$(AM_CPPFLAGS)
 
 totem_audio_preview_CFLAGS = \
-	$(DEPENDENCY_CFLAGS)	\
+	$(PREVIEW_CFLAGS)	\
 	$(AM_CFLAGS)
 
 totem_audio_preview_LDADD = \
 	gst/libtotemgsthelpers.la		\
-	backend/libbaconvideowidget.la		\
-	$(DEPENDENCY_LIBS)
+	$(PREVIEW_LIBS)
 
 INTROSPECTION_GIRS = $(am__append_8)
 INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --warn-all
@@ -769,8 +793,7 @@
 @HAVE_INTROSPECTION_TRUE@Totem_1_0_gir_INCLUDES = GLib-2.0 GObject-2.0 Gtk-3.0 TotemPlParser-1.0
 @HAVE_INTROSPECTION_TRUE@Totem_1_0_gir_SCANNERFLAGS = --c-include=totem.h --pkg-export=totem
 @HAVE_INTROSPECTION_TRUE@Totem_1_0_gir_CFLAGS = \
-@HAVE_INTROSPECTION_TRUE@	$(DEPENDENCY_CFLAGS)	\
-@HAVE_INTROSPECTION_TRUE@	$(PEAS_CFLAGS)		\
+@HAVE_INTROSPECTION_TRUE@	$(PLAYER_CFLAGS)	\
 @HAVE_INTROSPECTION_TRUE@	$(libtotem_la_CPPFLAGS)
 
 @HAVE_INTROSPECTION_TRUE@Totem_1_0_gir_LIBS = libtotem.la
@@ -816,7 +839,6 @@
 $(am__aclocal_m4_deps):
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
@@ -824,6 +846,8 @@
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
 	}
@@ -839,15 +863,16 @@
 
 clean-libLTLIBRARIES:
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(lib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
 install-nautilusLTLIBRARIES: $(nautilus_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(nautilusdir)" || $(MKDIR_P) "$(DESTDIR)$(nautilusdir)"
 	@list='$(nautilus_LTLIBRARIES)'; test -n "$(nautilusdir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
@@ -855,6 +880,8 @@
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(nautilusdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(nautilusdir)" || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(nautilusdir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(nautilusdir)"; \
 	}
@@ -870,41 +897,38 @@
 
 clean-nautilusLTLIBRARIES:
 	-test -z "$(nautilus_LTLIBRARIES)" || rm -f $(nautilus_LTLIBRARIES)
-	@list='$(nautilus_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(nautilus_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(noinst_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
 libtotem-properties-page.la: $(libtotem_properties_page_la_OBJECTS) $(libtotem_properties_page_la_DEPENDENCIES) $(EXTRA_libtotem_properties_page_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libtotem_properties_page_la_LINK) $(am_libtotem_properties_page_la_rpath) $(libtotem_properties_page_la_OBJECTS) $(libtotem_properties_page_la_LIBADD) $(LIBS)
-plugins/$(am__dirstamp):
-	@$(MKDIR_P) plugins
-	@: > plugins/$(am__dirstamp)
-plugins/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) plugins/$(DEPDIR)
-	@: > plugins/$(DEPDIR)/$(am__dirstamp)
-plugins/libtotem_la-totem-plugins-engine.lo: plugins/$(am__dirstamp) \
-	plugins/$(DEPDIR)/$(am__dirstamp)
-plugins/libtotem_la-totem-dirs.lo: plugins/$(am__dirstamp) \
-	plugins/$(DEPDIR)/$(am__dirstamp)
 libtotem.la: $(libtotem_la_OBJECTS) $(libtotem_la_DEPENDENCIES) $(EXTRA_libtotem_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libtotem_la_LINK) -rpath $(libdir) $(libtotem_la_OBJECTS) $(libtotem_la_LIBADD) $(LIBS)
 libtotem_player.la: $(libtotem_player_la_OBJECTS) $(libtotem_player_la_DEPENDENCIES) $(EXTRA_libtotem_player_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libtotem_player_la_LINK)  $(libtotem_player_la_OBJECTS) $(libtotem_player_la_LIBADD) $(LIBS)
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
 	while read p p1; do if test -f $$p || test -f $$p1; \
@@ -968,10 +992,6 @@
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
-	-rm -f plugins/libtotem_la-totem-dirs.$(OBJEXT)
-	-rm -f plugins/libtotem_la-totem-dirs.lo
-	-rm -f plugins/libtotem_la-totem-plugins-engine.$(OBJEXT)
-	-rm -f plugins/libtotem_la-totem-plugins-engine.lo
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -983,12 +1003,14 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_la-eggsmclient-xsmp.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_la-eggsmclient.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_la-totem-cell-renderer-video.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_la-totem-dirs.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_la-totem-dnd-menu.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_la-totem-menu.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_la-totem-object.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_la-totem-open-location.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_la-totem-options.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_la-totem-playlist.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_la-totem-plugins-engine.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_la-totem-preferences.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_la-totem-session.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_la-totem-sidebar.Plo@am__quote@
@@ -998,8 +1020,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_la-totemobject-marshal.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_la-totemplaylist-marshal.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_la-totemvideolist-marshal.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_player_la-gsd-media-keys-window.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_player_la-gsd-osd-window.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_player_la-gd-fullscreen-filter.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_player_la-totem-fullscreen.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_player_la-totem-interface.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_player_la-totem-statusbar.Plo@am__quote@
@@ -1014,29 +1035,24 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/totem_audio_preview-totem-resources.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/totem_video_thumbnailer-totem-resources.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/totem_video_thumbnailer-totem-video-thumbnailer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@plugins/$(DEPDIR)/libtotem_la-totem-dirs.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@plugins/$(DEPDIR)/libtotem_la-totem-plugins-engine.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
@@ -1174,19 +1190,19 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_la_CFLAGS) $(CFLAGS) -c -o libtotem_la-totem-subtitle-encoding.lo `test -f 'totem-subtitle-encoding.c' || echo '$(srcdir)/'`totem-subtitle-encoding.c
 
-plugins/libtotem_la-totem-plugins-engine.lo: plugins/totem-plugins-engine.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_la_CFLAGS) $(CFLAGS) -MT plugins/libtotem_la-totem-plugins-engine.lo -MD -MP -MF plugins/$(DEPDIR)/libtotem_la-totem-plugins-engine.Tpo -c -o plugins/libtotem_la-totem-plugins-engine.lo `test -f 'plugins/totem-plugins-engine.c' || echo '$(srcdir)/'`plugins/totem-plugins-engine.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) plugins/$(DEPDIR)/libtotem_la-totem-plugins-engine.Tpo plugins/$(DEPDIR)/libtotem_la-totem-plugins-engine.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='plugins/totem-plugins-engine.c' object='plugins/libtotem_la-totem-plugins-engine.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_la_CFLAGS) $(CFLAGS) -c -o plugins/libtotem_la-totem-plugins-engine.lo `test -f 'plugins/totem-plugins-engine.c' || echo '$(srcdir)/'`plugins/totem-plugins-engine.c
-
-plugins/libtotem_la-totem-dirs.lo: plugins/totem-dirs.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_la_CFLAGS) $(CFLAGS) -MT plugins/libtotem_la-totem-dirs.lo -MD -MP -MF plugins/$(DEPDIR)/libtotem_la-totem-dirs.Tpo -c -o plugins/libtotem_la-totem-dirs.lo `test -f 'plugins/totem-dirs.c' || echo '$(srcdir)/'`plugins/totem-dirs.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) plugins/$(DEPDIR)/libtotem_la-totem-dirs.Tpo plugins/$(DEPDIR)/libtotem_la-totem-dirs.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='plugins/totem-dirs.c' object='plugins/libtotem_la-totem-dirs.lo' libtool=yes @AMDEPBACKSLASH@
+libtotem_la-totem-plugins-engine.lo: plugins/totem-plugins-engine.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_la_CFLAGS) $(CFLAGS) -MT libtotem_la-totem-plugins-engine.lo -MD -MP -MF $(DEPDIR)/libtotem_la-totem-plugins-engine.Tpo -c -o libtotem_la-totem-plugins-engine.lo `test -f 'plugins/totem-plugins-engine.c' || echo '$(srcdir)/'`plugins/totem-plugins-engine.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtotem_la-totem-plugins-engine.Tpo $(DEPDIR)/libtotem_la-totem-plugins-engine.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='plugins/totem-plugins-engine.c' object='libtotem_la-totem-plugins-engine.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_la_CFLAGS) $(CFLAGS) -c -o libtotem_la-totem-plugins-engine.lo `test -f 'plugins/totem-plugins-engine.c' || echo '$(srcdir)/'`plugins/totem-plugins-engine.c
+
+libtotem_la-totem-dirs.lo: plugins/totem-dirs.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_la_CFLAGS) $(CFLAGS) -MT libtotem_la-totem-dirs.lo -MD -MP -MF $(DEPDIR)/libtotem_la-totem-dirs.Tpo -c -o libtotem_la-totem-dirs.lo `test -f 'plugins/totem-dirs.c' || echo '$(srcdir)/'`plugins/totem-dirs.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtotem_la-totem-dirs.Tpo $(DEPDIR)/libtotem_la-totem-dirs.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='plugins/totem-dirs.c' object='libtotem_la-totem-dirs.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_la_CFLAGS) $(CFLAGS) -c -o plugins/libtotem_la-totem-dirs.lo `test -f 'plugins/totem-dirs.c' || echo '$(srcdir)/'`plugins/totem-dirs.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_la_CFLAGS) $(CFLAGS) -c -o libtotem_la-totem-dirs.lo `test -f 'plugins/totem-dirs.c' || echo '$(srcdir)/'`plugins/totem-dirs.c
 
 libtotem_la-eggsmclient.lo: eggsmclient.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_la_CFLAGS) $(CFLAGS) -MT libtotem_la-eggsmclient.lo -MD -MP -MF $(DEPDIR)/libtotem_la-eggsmclient.Tpo -c -o libtotem_la-eggsmclient.lo `test -f 'eggsmclient.c' || echo '$(srcdir)/'`eggsmclient.c
@@ -1244,19 +1260,12 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_player_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_player_la_CFLAGS) $(CFLAGS) -c -o libtotem_player_la-totem-fullscreen.lo `test -f 'totem-fullscreen.c' || echo '$(srcdir)/'`totem-fullscreen.c
 
-libtotem_player_la-gsd-media-keys-window.lo: gsd-media-keys-window.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_player_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_player_la_CFLAGS) $(CFLAGS) -MT libtotem_player_la-gsd-media-keys-window.lo -MD -MP -MF $(DEPDIR)/libtotem_player_la-gsd-media-keys-window.Tpo -c -o libtotem_player_la-gsd-media-keys-window.lo `test -f 'gsd-media-keys-window.c' || echo '$(srcdir)/'`gsd-media-keys-window.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtotem_player_la-gsd-media-keys-window.Tpo $(DEPDIR)/libtotem_player_la-gsd-media-keys-window.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gsd-media-keys-window.c' object='libtotem_player_la-gsd-media-keys-window.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_player_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_player_la_CFLAGS) $(CFLAGS) -c -o libtotem_player_la-gsd-media-keys-window.lo `test -f 'gsd-media-keys-window.c' || echo '$(srcdir)/'`gsd-media-keys-window.c
-
-libtotem_player_la-gsd-osd-window.lo: gsd-osd-window.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_player_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_player_la_CFLAGS) $(CFLAGS) -MT libtotem_player_la-gsd-osd-window.lo -MD -MP -MF $(DEPDIR)/libtotem_player_la-gsd-osd-window.Tpo -c -o libtotem_player_la-gsd-osd-window.lo `test -f 'gsd-osd-window.c' || echo '$(srcdir)/'`gsd-osd-window.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtotem_player_la-gsd-osd-window.Tpo $(DEPDIR)/libtotem_player_la-gsd-osd-window.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gsd-osd-window.c' object='libtotem_player_la-gsd-osd-window.lo' libtool=yes @AMDEPBACKSLASH@
+libtotem_player_la-gd-fullscreen-filter.lo: gd-fullscreen-filter.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_player_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_player_la_CFLAGS) $(CFLAGS) -MT libtotem_player_la-gd-fullscreen-filter.lo -MD -MP -MF $(DEPDIR)/libtotem_player_la-gd-fullscreen-filter.Tpo -c -o libtotem_player_la-gd-fullscreen-filter.lo `test -f 'gd-fullscreen-filter.c' || echo '$(srcdir)/'`gd-fullscreen-filter.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtotem_player_la-gd-fullscreen-filter.Tpo $(DEPDIR)/libtotem_player_la-gd-fullscreen-filter.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gd-fullscreen-filter.c' object='libtotem_player_la-gd-fullscreen-filter.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_player_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_player_la_CFLAGS) $(CFLAGS) -c -o libtotem_player_la-gsd-osd-window.lo `test -f 'gsd-osd-window.c' || echo '$(srcdir)/'`gsd-osd-window.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_player_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_player_la_CFLAGS) $(CFLAGS) -c -o libtotem_player_la-gd-fullscreen-filter.lo `test -f 'gd-fullscreen-filter.c' || echo '$(srcdir)/'`gd-fullscreen-filter.c
 
 libtotem_player_la-totem-time-label.lo: totem-time-label.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_player_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_player_la_CFLAGS) $(CFLAGS) -MT libtotem_player_la-totem-time-label.lo -MD -MP -MF $(DEPDIR)/libtotem_player_la-totem-time-label.Tpo -c -o libtotem_player_la-totem-time-label.lo `test -f 'totem-time-label.c' || echo '$(srcdir)/'`totem-time-label.c
@@ -1382,11 +1391,13 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-	-rm -rf plugins/.libs plugins/_libs
 install-girDATA: $(gir_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(girdir)" || $(MKDIR_P) "$(DESTDIR)$(girdir)"
 	@list='$(gir_DATA)'; test -n "$(girdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(girdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(girdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -1403,8 +1414,11 @@
 	dir='$(DESTDIR)$(girdir)'; $(am__uninstall_files_from_dir)
 install-headerDATA: $(header_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(headerdir)" || $(MKDIR_P) "$(DESTDIR)$(headerdir)"
 	@list='$(header_DATA)'; test -n "$(headerdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(headerdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(headerdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -1421,8 +1435,11 @@
 	dir='$(DESTDIR)$(headerdir)'; $(am__uninstall_files_from_dir)
 install-typelibDATA: $(typelib_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(typelibdir)" || $(MKDIR_P) "$(DESTDIR)$(typelibdir)"
 	@list='$(typelib_DATA)'; test -n "$(typelibdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(typelibdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(typelibdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -1439,12 +1456,12 @@
 	dir='$(DESTDIR)$(typelibdir)'; $(am__uninstall_files_from_dir)
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS):
 	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -1454,7 +1471,11 @@
 	done; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -1468,37 +1489,6 @@
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
-
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
@@ -1507,6 +1497,10 @@
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
+cscopelist-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \
+	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -1570,6 +1564,20 @@
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
 
+cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP)
+	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
@@ -1605,13 +1613,10 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -1668,8 +1673,6 @@
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-	-rm -f plugins/$(DEPDIR)/$(am__dirstamp)
-	-rm -f plugins/$(am__dirstamp)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -1681,7 +1684,7 @@
 	clean-noinstLTLIBRARIES clean-noinstPROGRAMS mostlyclean-am
 
 distclean: distclean-recursive
-	-rm -rf ./$(DEPDIR) plugins/$(DEPDIR)
+	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -1728,7 +1731,7 @@
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
-	-rm -rf ./$(DEPDIR) plugins/$(DEPDIR)
+	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -1749,27 +1752,28 @@
 	uninstall-headerDATA uninstall-libLTLIBRARIES \
 	uninstall-nautilusLTLIBRARIES uninstall-typelibDATA
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-strip tags-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \
+	cscopelist-recursive ctags-recursive install-am install-strip \
+	tags-recursive
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am check check-am clean clean-binPROGRAMS \
 	clean-generic clean-libLTLIBRARIES clean-libtool \
 	clean-nautilusLTLIBRARIES clean-noinstLTLIBRARIES \
-	clean-noinstPROGRAMS ctags ctags-recursive distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-binPROGRAMS install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-girDATA install-headerDATA \
-	install-html install-html-am install-info install-info-am \
-	install-libLTLIBRARIES install-man install-nautilusLTLIBRARIES \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip install-typelibDATA installcheck installcheck-am \
-	installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am \
+	clean-noinstPROGRAMS cscopelist cscopelist-recursive ctags \
+	ctags-recursive distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-binPROGRAMS \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-girDATA \
+	install-headerDATA install-html install-html-am install-info \
+	install-info-am install-libLTLIBRARIES install-man \
+	install-nautilusLTLIBRARIES install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip install-typelibDATA \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
 	uninstall-binPROGRAMS uninstall-girDATA uninstall-headerDATA \
 	uninstall-libLTLIBRARIES uninstall-nautilusLTLIBRARIES \
 	uninstall-typelibDATA
diff -Nru totem-3.4.3/src/backend/Makefile.am totem-3.6.2/src/backend/Makefile.am
--- totem-3.4.3/src/backend/Makefile.am	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/backend/Makefile.am	2012-08-29 23:07:45.000000000 +0000
@@ -7,18 +7,17 @@
 bvw_test_CPPFLAGS = \
 	-DDATADIR=\"$(pkgdatadir)\"	\
 	-DLOGO_PATH=DATADIR\"\"G_DIR_SEPARATOR_S\"totem\"G_DIR_SEPARATOR_S\"totem_logo.png\"	\
+	-DG_LOG_DOMAIN="\"bvw-test\"" \
 	$(DISABLE_DEPRECATED)		\
 	$(AM_CPPFLAGS)
 
-bvw_test_CFLAGS = \
-	$(DEPENDENCY_CFLAGS)	\
-	$(MM_CFLAGS)		\
+bvw_test_CFLAGS =		\
+	$(BACKEND_CFLAGS)	\
 	$(AM_CFLAGS)
 
-bvw_test_LDADD = \
+bvw_test_LDADD =		\
 	libbaconvideowidget.la	\
-	$(DEPENDENCY_LIBS)	\
-	$(XTEST_LIBS)
+	$(BACKEND_LIBS)
 
 # Marshallers
 BVW_MARSHAL_FILES = baconvideowidget-marshal.c baconvideowidget-marshal.h
@@ -52,11 +51,16 @@
 	$(BVW_ENUM_FILES)				\
 	bacon-video-widget.h				\
 	video-utils.c video-utils.h			\
-	bacon-video-widget-gst-0.10.c			\
+	bacon-video-widget.c				\
 	bacon-video-widget-gst-missing-plugins.c	\
 	bacon-video-widget-gst-missing-plugins.h	\
 	totem-aspect-frame.h				\
-	totem-aspect-frame.c
+	totem-aspect-frame.c				\
+	gsd-osd-window.c				\
+	gsd-osd-window.h				\
+	gsd-osd-window-private.h			\
+	bacon-video-osd-actor.c				\
+	bacon-video-osd-actor.h
 
 libbaconvideowidget_la_CPPFLAGS = \
 	-D_REENTRANT				\
@@ -65,19 +69,14 @@
 	$(DISABLE_DEPRECATED)			\
 	$(AM_CPPFLAGS)
 
-libbaconvideowidget_la_CFLAGS = \
-	$(DEPENDENCY_CFLAGS)		\
-	$(MM_CFLAGS)			\
-	$(MISSING_PLUGINS_CFLAGS)	\
+libbaconvideowidget_la_CFLAGS =	\
+	$(BACKEND_CFLAGS)	\
 	$(AM_CFLAGS)
 
-libbaconvideowidget_la_LIBADD =				\
-	$(top_builddir)/src/gst/libtotemgsthelpers.la	\
-	$(MM_LIBS)					\
-	$(GST_LIBS)					\
-	$(EXTRA_BACKEND_LIBS)				\
-	$(X_LIBS)					\
-	$(MISSING_PLUGINS_LIBS)				\
+libbaconvideowidget_la_LIBADD =					\
+	$(top_builddir)/src/gst/libtotemgsthelpers.la		\
+	$(top_builddir)/src/gst/libtotemgstpixbufhelpers.la	\
+	$(BACKEND_LIBS)						\
 	-lm
 
 libbaconvideowidget_la_LDFLAGS= \
diff -Nru totem-3.4.3/src/backend/Makefile.in totem-3.6.2/src/backend/Makefile.in
--- totem-3.4.3/src/backend/Makefile.in	2012-07-04 09:54:48.000000000 +0000
+++ totem-3.6.2/src/backend/Makefile.in	2012-10-25 13:36:20.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.12.2 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,6 +16,23 @@
 
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -37,12 +53,10 @@
 host_triplet = @host@
 noinst_PROGRAMS = bvw-test$(EXEEXT)
 subdir = src/backend
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -53,20 +67,22 @@
 am__DEPENDENCIES_1 =
 libbaconvideowidget_la_DEPENDENCIES =  \
 	$(top_builddir)/src/gst/libtotemgsthelpers.la \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(top_builddir)/src/gst/libtotemgstpixbufhelpers.la \
 	$(am__DEPENDENCIES_1)
 am__objects_1 = libbaconvideowidget_la-baconvideowidget-marshal.lo
 am__objects_2 = libbaconvideowidget_la-bacon-video-widget-enums.lo
 am_libbaconvideowidget_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
 	libbaconvideowidget_la-video-utils.lo \
-	libbaconvideowidget_la-bacon-video-widget-gst-0.10.lo \
+	libbaconvideowidget_la-bacon-video-widget.lo \
 	libbaconvideowidget_la-bacon-video-widget-gst-missing-plugins.lo \
-	libbaconvideowidget_la-totem-aspect-frame.lo
+	libbaconvideowidget_la-totem-aspect-frame.lo \
+	libbaconvideowidget_la-gsd-osd-window.lo \
+	libbaconvideowidget_la-bacon-video-osd-actor.lo
 libbaconvideowidget_la_OBJECTS = $(am_libbaconvideowidget_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 libbaconvideowidget_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(libbaconvideowidget_la_CFLAGS) $(CFLAGS) \
@@ -74,11 +90,22 @@
 PROGRAMS = $(noinst_PROGRAMS)
 am_bvw_test_OBJECTS = bvw_test-bvw-test.$(OBJEXT)
 bvw_test_OBJECTS = $(am_bvw_test_OBJECTS)
-bvw_test_DEPENDENCIES = libbaconvideowidget.la $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
+bvw_test_DEPENDENCIES = libbaconvideowidget.la $(am__DEPENDENCIES_1)
 bvw_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(bvw_test_CFLAGS) \
 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -91,22 +118,23 @@
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(libbaconvideowidget_la_SOURCES) $(bvw_test_SOURCES)
 DIST_SOURCES = $(libbaconvideowidget_la_SOURCES) $(bvw_test_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -125,6 +153,10 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BACKEND_CFLAGS = @BACKEND_CFLAGS@
+BACKEND_LIBS = @BACKEND_LIBS@
+BACKEND_TEST_CFLAGS = @BACKEND_TEST_CFLAGS@
+BACKEND_TEST_LIBS = @BACKEND_TEST_LIBS@
 BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
 BROWSER_PLUGIN_DIR = @BROWSER_PLUGIN_DIR@
 BROWSER_PLUGIN_LIBS = @BROWSER_PLUGIN_LIBS@
@@ -146,8 +178,6 @@
 DBUS_LIBS = @DBUS_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DEPENDENCY_CFLAGS = @DEPENDENCY_CFLAGS@
-DEPENDENCY_LIBS = @DEPENDENCY_LIBS@
 DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DISC_RECORDER_CFLAGS = @DISC_RECORDER_CFLAGS@
 DISC_RECORDER_LIBS = @DISC_RECORDER_LIBS@
@@ -161,7 +191,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-EXTRA_BACKEND_LIBS = @EXTRA_BACKEND_LIBS@
 FGREP = @FGREP@
 FULL_LIBEXECDIR = @FULL_LIBEXECDIR@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
@@ -169,19 +198,21 @@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GLIB_REQS = @GLIB_REQS@
+GLOW_BUTTON_CFLAGS = @GLOW_BUTTON_CFLAGS@
+GLOW_BUTTON_LIBS = @GLOW_BUTTON_LIBS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
-GST_CFLAGS = @GST_CFLAGS@
-GST_LIBS = @GST_LIBS@
+GST_PLUGINS_BAD_CFLAGS = @GST_PLUGINS_BAD_CFLAGS@
+GST_PLUGINS_BAD_LIBS = @GST_PLUGINS_BAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
 GTK_REQS = @GTK_REQS@
+HELPER_CFLAGS = @HELPER_CFLAGS@
+HELPER_LIBS = @HELPER_LIBS@
 HELP_DIR = @HELP_DIR@
 HTML_DIR = @HTML_DIR@
 INSTALL = @INSTALL@
@@ -207,11 +238,11 @@
 INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBEPC_CFLAGS = @LIBEPC_CFLAGS@
-LIBEPC_LIBS = @LIBEPC_LIBS@
 LIBGRILO_CFLAGS = @LIBGRILO_CFLAGS@
 LIBGRILO_LIBS = @LIBGRILO_LIBS@
 LIBOBJS = @LIBOBJS@
+LIBPLAYER_CFLAGS = @LIBPLAYER_CFLAGS@
+LIBPLAYER_LIBS = @LIBPLAYER_LIBS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBZEITGEIST_CFLAGS = @LIBZEITGEIST_CFLAGS@
@@ -228,8 +259,6 @@
 MISSING_PLUGINS_CFLAGS = @MISSING_PLUGINS_CFLAGS@
 MISSING_PLUGINS_LIBS = @MISSING_PLUGINS_LIBS@
 MKDIR_P = @MKDIR_P@
-MM_CFLAGS = @MM_CFLAGS@
-MM_LIBS = @MM_LIBS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 NAUTILUSDIR = @NAUTILUSDIR@
@@ -250,15 +279,21 @@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PEASGTK_CFLAGS = @PEASGTK_CFLAGS@
-PEASGTK_LIBS = @PEASGTK_LIBS@
-PEAS_CFLAGS = @PEAS_CFLAGS@
-PEAS_LIBS = @PEAS_LIBS@
+PIXBUF_HELPER_CFLAGS = @PIXBUF_HELPER_CFLAGS@
+PIXBUF_HELPER_LIBS = @PIXBUF_HELPER_LIBS@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLAYER_CFLAGS = @PLAYER_CFLAGS@
+PLAYER_LIBS = @PLAYER_LIBS@
 PLUGINDIR = @PLUGINDIR@
 PLUGINS = @PLUGINS@
+PLUGIN_VIEWER_CFLAGS = @PLUGIN_VIEWER_CFLAGS@
+PLUGIN_VIEWER_LIBS = @PLUGIN_VIEWER_LIBS@
+PREVIEW_CFLAGS = @PREVIEW_CFLAGS@
+PREVIEW_LIBS = @PREVIEW_LIBS@
+PROPERTIES_CFLAGS = @PROPERTIES_CFLAGS@
+PROPERTIES_LIBS = @PROPERTIES_LIBS@
 PYGOBJECT_CFLAGS = @PYGOBJECT_CFLAGS@
 PYGOBJECT_LIBS = @PYGOBJECT_LIBS@
 PYLINT = @PYLINT@
@@ -278,6 +313,10 @@
 SMCLIENT_CFLAGS = @SMCLIENT_CFLAGS@
 SMCLIENT_LIBS = @SMCLIENT_LIBS@
 STRIP = @STRIP@
+THUMBNAILER_CFLAGS = @THUMBNAILER_CFLAGS@
+THUMBNAILER_LIBS = @THUMBNAILER_LIBS@
+TIME_HELPER_CFLAGS = @TIME_HELPER_CFLAGS@
+TIME_HELPER_LIBS = @TIME_HELPER_LIBS@
 TOTEM_API_VERSION = @TOTEM_API_VERSION@
 TOTEM_PLPARSER_REQS = @TOTEM_PLPARSER_REQS@
 TOTEM_VERSION_MAJOR = @TOTEM_VERSION_MAJOR@
@@ -289,9 +328,6 @@
 WARN_CFLAGS = @WARN_CFLAGS@
 WARN_CXXFLAGS = @WARN_CXXFLAGS@
 XGETTEXT = @XGETTEXT@
-XMKMF = @XMKMF@
-XTEST_LIBS = @XTEST_LIBS@
-X_LIBS = @X_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -357,18 +393,17 @@
 bvw_test_CPPFLAGS = \
 	-DDATADIR=\"$(pkgdatadir)\"	\
 	-DLOGO_PATH=DATADIR\"\"G_DIR_SEPARATOR_S\"totem\"G_DIR_SEPARATOR_S\"totem_logo.png\"	\
+	-DG_LOG_DOMAIN="\"bvw-test\"" \
 	$(DISABLE_DEPRECATED)		\
 	$(AM_CPPFLAGS)
 
 bvw_test_CFLAGS = \
-	$(DEPENDENCY_CFLAGS)	\
-	$(MM_CFLAGS)		\
+	$(BACKEND_CFLAGS)	\
 	$(AM_CFLAGS)
 
 bvw_test_LDADD = \
 	libbaconvideowidget.la	\
-	$(DEPENDENCY_LIBS)	\
-	$(XTEST_LIBS)
+	$(BACKEND_LIBS)
 
 
 # Marshallers
@@ -381,11 +416,16 @@
 	$(BVW_ENUM_FILES)				\
 	bacon-video-widget.h				\
 	video-utils.c video-utils.h			\
-	bacon-video-widget-gst-0.10.c			\
+	bacon-video-widget.c				\
 	bacon-video-widget-gst-missing-plugins.c	\
 	bacon-video-widget-gst-missing-plugins.h	\
 	totem-aspect-frame.h				\
-	totem-aspect-frame.c
+	totem-aspect-frame.c				\
+	gsd-osd-window.c				\
+	gsd-osd-window.h				\
+	gsd-osd-window-private.h			\
+	bacon-video-osd-actor.c				\
+	bacon-video-osd-actor.h
 
 libbaconvideowidget_la_CPPFLAGS = \
 	-D_REENTRANT				\
@@ -395,18 +435,13 @@
 	$(AM_CPPFLAGS)
 
 libbaconvideowidget_la_CFLAGS = \
-	$(DEPENDENCY_CFLAGS)		\
-	$(MM_CFLAGS)			\
-	$(MISSING_PLUGINS_CFLAGS)	\
+	$(BACKEND_CFLAGS)	\
 	$(AM_CFLAGS)
 
 libbaconvideowidget_la_LIBADD = \
-	$(top_builddir)/src/gst/libtotemgsthelpers.la	\
-	$(MM_LIBS)					\
-	$(GST_LIBS)					\
-	$(EXTRA_BACKEND_LIBS)				\
-	$(X_LIBS)					\
-	$(MISSING_PLUGINS_LIBS)				\
+	$(top_builddir)/src/gst/libtotemgsthelpers.la		\
+	$(top_builddir)/src/gst/libtotemgstpixbufhelpers.la	\
+	$(BACKEND_LIBS)						\
 	-lm
 
 libbaconvideowidget_la_LDFLAGS = \
@@ -456,12 +491,14 @@
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(noinst_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
 libbaconvideowidget.la: $(libbaconvideowidget_la_OBJECTS) $(libbaconvideowidget_la_DEPENDENCIES) $(EXTRA_libbaconvideowidget_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libbaconvideowidget_la_LINK)  $(libbaconvideowidget_la_OBJECTS) $(libbaconvideowidget_la_LIBADD) $(LIBS)
 
@@ -484,33 +521,32 @@
 	-rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bvw_test-bvw-test.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libbaconvideowidget_la-bacon-video-osd-actor.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libbaconvideowidget_la-bacon-video-widget-enums.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libbaconvideowidget_la-bacon-video-widget-gst-0.10.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libbaconvideowidget_la-bacon-video-widget-gst-missing-plugins.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libbaconvideowidget_la-bacon-video-widget.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libbaconvideowidget_la-baconvideowidget-marshal.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libbaconvideowidget_la-gsd-osd-window.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libbaconvideowidget_la-totem-aspect-frame.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libbaconvideowidget_la-video-utils.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
@@ -536,12 +572,12 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbaconvideowidget_la_CPPFLAGS) $(CPPFLAGS) $(libbaconvideowidget_la_CFLAGS) $(CFLAGS) -c -o libbaconvideowidget_la-video-utils.lo `test -f 'video-utils.c' || echo '$(srcdir)/'`video-utils.c
 
-libbaconvideowidget_la-bacon-video-widget-gst-0.10.lo: bacon-video-widget-gst-0.10.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbaconvideowidget_la_CPPFLAGS) $(CPPFLAGS) $(libbaconvideowidget_la_CFLAGS) $(CFLAGS) -MT libbaconvideowidget_la-bacon-video-widget-gst-0.10.lo -MD -MP -MF $(DEPDIR)/libbaconvideowidget_la-bacon-video-widget-gst-0.10.Tpo -c -o libbaconvideowidget_la-bacon-video-widget-gst-0.10.lo `test -f 'bacon-video-widget-gst-0.10.c' || echo '$(srcdir)/'`bacon-video-widget-gst-0.10.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libbaconvideowidget_la-bacon-video-widget-gst-0.10.Tpo $(DEPDIR)/libbaconvideowidget_la-bacon-video-widget-gst-0.10.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='bacon-video-widget-gst-0.10.c' object='libbaconvideowidget_la-bacon-video-widget-gst-0.10.lo' libtool=yes @AMDEPBACKSLASH@
+libbaconvideowidget_la-bacon-video-widget.lo: bacon-video-widget.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbaconvideowidget_la_CPPFLAGS) $(CPPFLAGS) $(libbaconvideowidget_la_CFLAGS) $(CFLAGS) -MT libbaconvideowidget_la-bacon-video-widget.lo -MD -MP -MF $(DEPDIR)/libbaconvideowidget_la-bacon-video-widget.Tpo -c -o libbaconvideowidget_la-bacon-video-widget.lo `test -f 'bacon-video-widget.c' || echo '$(srcdir)/'`bacon-video-widget.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libbaconvideowidget_la-bacon-video-widget.Tpo $(DEPDIR)/libbaconvideowidget_la-bacon-video-widget.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='bacon-video-widget.c' object='libbaconvideowidget_la-bacon-video-widget.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbaconvideowidget_la_CPPFLAGS) $(CPPFLAGS) $(libbaconvideowidget_la_CFLAGS) $(CFLAGS) -c -o libbaconvideowidget_la-bacon-video-widget-gst-0.10.lo `test -f 'bacon-video-widget-gst-0.10.c' || echo '$(srcdir)/'`bacon-video-widget-gst-0.10.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbaconvideowidget_la_CPPFLAGS) $(CPPFLAGS) $(libbaconvideowidget_la_CFLAGS) $(CFLAGS) -c -o libbaconvideowidget_la-bacon-video-widget.lo `test -f 'bacon-video-widget.c' || echo '$(srcdir)/'`bacon-video-widget.c
 
 libbaconvideowidget_la-bacon-video-widget-gst-missing-plugins.lo: bacon-video-widget-gst-missing-plugins.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbaconvideowidget_la_CPPFLAGS) $(CPPFLAGS) $(libbaconvideowidget_la_CFLAGS) $(CFLAGS) -MT libbaconvideowidget_la-bacon-video-widget-gst-missing-plugins.lo -MD -MP -MF $(DEPDIR)/libbaconvideowidget_la-bacon-video-widget-gst-missing-plugins.Tpo -c -o libbaconvideowidget_la-bacon-video-widget-gst-missing-plugins.lo `test -f 'bacon-video-widget-gst-missing-plugins.c' || echo '$(srcdir)/'`bacon-video-widget-gst-missing-plugins.c
@@ -557,6 +593,20 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbaconvideowidget_la_CPPFLAGS) $(CPPFLAGS) $(libbaconvideowidget_la_CFLAGS) $(CFLAGS) -c -o libbaconvideowidget_la-totem-aspect-frame.lo `test -f 'totem-aspect-frame.c' || echo '$(srcdir)/'`totem-aspect-frame.c
 
+libbaconvideowidget_la-gsd-osd-window.lo: gsd-osd-window.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbaconvideowidget_la_CPPFLAGS) $(CPPFLAGS) $(libbaconvideowidget_la_CFLAGS) $(CFLAGS) -MT libbaconvideowidget_la-gsd-osd-window.lo -MD -MP -MF $(DEPDIR)/libbaconvideowidget_la-gsd-osd-window.Tpo -c -o libbaconvideowidget_la-gsd-osd-window.lo `test -f 'gsd-osd-window.c' || echo '$(srcdir)/'`gsd-osd-window.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libbaconvideowidget_la-gsd-osd-window.Tpo $(DEPDIR)/libbaconvideowidget_la-gsd-osd-window.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gsd-osd-window.c' object='libbaconvideowidget_la-gsd-osd-window.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbaconvideowidget_la_CPPFLAGS) $(CPPFLAGS) $(libbaconvideowidget_la_CFLAGS) $(CFLAGS) -c -o libbaconvideowidget_la-gsd-osd-window.lo `test -f 'gsd-osd-window.c' || echo '$(srcdir)/'`gsd-osd-window.c
+
+libbaconvideowidget_la-bacon-video-osd-actor.lo: bacon-video-osd-actor.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbaconvideowidget_la_CPPFLAGS) $(CPPFLAGS) $(libbaconvideowidget_la_CFLAGS) $(CFLAGS) -MT libbaconvideowidget_la-bacon-video-osd-actor.lo -MD -MP -MF $(DEPDIR)/libbaconvideowidget_la-bacon-video-osd-actor.Tpo -c -o libbaconvideowidget_la-bacon-video-osd-actor.lo `test -f 'bacon-video-osd-actor.c' || echo '$(srcdir)/'`bacon-video-osd-actor.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libbaconvideowidget_la-bacon-video-osd-actor.Tpo $(DEPDIR)/libbaconvideowidget_la-bacon-video-osd-actor.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='bacon-video-osd-actor.c' object='libbaconvideowidget_la-bacon-video-osd-actor.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbaconvideowidget_la_CPPFLAGS) $(CPPFLAGS) $(libbaconvideowidget_la_CFLAGS) $(CFLAGS) -c -o libbaconvideowidget_la-bacon-video-osd-actor.lo `test -f 'bacon-video-osd-actor.c' || echo '$(srcdir)/'`bacon-video-osd-actor.c
+
 bvw_test-bvw-test.o: bvw-test.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(bvw_test_CPPFLAGS) $(CPPFLAGS) $(bvw_test_CFLAGS) $(CFLAGS) -MT bvw_test-bvw-test.o -MD -MP -MF $(DEPDIR)/bvw_test-bvw-test.Tpo -c -o bvw_test-bvw-test.o `test -f 'bvw-test.c' || echo '$(srcdir)/'`bvw-test.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/bvw_test-bvw-test.Tpo $(DEPDIR)/bvw_test-bvw-test.Po
@@ -626,6 +676,20 @@
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
 
+cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
+	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
@@ -769,7 +833,7 @@
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-noinstLTLIBRARIES clean-noinstPROGRAMS \
-	ctags distclean distclean-compile distclean-generic \
+	cscopelist ctags distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
 	install-data-am install-dvi install-dvi-am install-exec \
diff -Nru totem-3.4.3/src/backend/bacon-video-osd-actor.c totem-3.6.2/src/backend/bacon-video-osd-actor.c
--- totem-3.4.3/src/backend/bacon-video-osd-actor.c	1970-01-01 00:00:00.000000000 +0000
+++ totem-3.6.2/src/backend/bacon-video-osd-actor.c	2012-08-29 23:07:45.000000000 +0000
@@ -0,0 +1,254 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * On-screen-display (OSD) for Totem's video widget
+ *
+ * Copyright (C) 2012 Red Hat, Inc.
+ *
+ * Authors:
+ *   Bastien Nocera 
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2, 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 Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include "config.h"
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include "bacon-video-osd-actor.h"
+#include "gsd-osd-window.h"
+#include "gsd-osd-window-private.h"
+
+#define BACON_VIDEO_OSD_ACTOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), BACON_TYPE_VIDEO_OSD_ACTOR, BaconVideoOsdActorPrivate))
+
+struct BaconVideoOsdActorPrivate
+{
+	ClutterCanvas     *canvas;
+	char              *icon_name;
+	GtkStyleContext   *style;
+	GsdOsdDrawContext *ctx;
+
+        guint              hide_timeout_id;
+        guint              fade_timeout_id;
+        double             fade_out_alpha;
+};
+
+G_DEFINE_TYPE (BaconVideoOsdActor, bacon_video_osd_actor, CLUTTER_TYPE_ACTOR);
+
+static gboolean
+fade_timeout (BaconVideoOsdActor *osd)
+{
+        if (osd->priv->fade_out_alpha <= 0.0) {
+		bacon_video_osd_actor_hide (osd);
+                return FALSE;
+        } else {
+                clutter_actor_set_opacity (CLUTTER_ACTOR (osd),
+                			   0xff * osd->priv->fade_out_alpha);
+                osd->priv->fade_out_alpha -= 0.10;
+        }
+
+        return TRUE;
+}
+
+static gboolean
+hide_timeout (BaconVideoOsdActor *osd)
+{
+	osd->priv->hide_timeout_id = 0;
+	osd->priv->fade_timeout_id = g_timeout_add (FADE_FRAME_TIMEOUT,
+						    (GSourceFunc) fade_timeout,
+						    osd);
+
+        return FALSE;
+}
+
+static void
+remove_hide_timeout (BaconVideoOsdActor *osd)
+{
+        if (osd->priv->hide_timeout_id != 0) {
+                g_source_remove (osd->priv->hide_timeout_id);
+                osd->priv->hide_timeout_id = 0;
+        }
+
+        if (osd->priv->fade_timeout_id != 0) {
+                g_source_remove (osd->priv->fade_timeout_id);
+                osd->priv->fade_timeout_id = 0;
+                osd->priv->fade_out_alpha = 1.0;
+        }
+}
+
+static void
+add_hide_timeout (BaconVideoOsdActor *osd)
+{
+        osd->priv->hide_timeout_id = g_timeout_add (DIALOG_FADE_TIMEOUT,
+                                                    (GSourceFunc) hide_timeout,
+                                                    osd);
+}
+
+static void
+bacon_video_osd_actor_finalize (GObject *object)
+{
+	BaconVideoOsdActor *osd;
+
+	osd = BACON_VIDEO_OSD_ACTOR (object);
+	if (osd->priv->ctx) {
+		g_free (osd->priv->ctx);
+		osd->priv->ctx = NULL;
+	}
+	if (osd->priv->style) {
+		g_object_unref (osd->priv->style);
+		osd->priv->style = NULL;
+	}
+
+	g_free (osd->priv->icon_name);
+	osd->priv->icon_name = NULL;
+
+	G_OBJECT_CLASS (bacon_video_osd_actor_parent_class)->finalize (object);
+}
+
+static void
+bacon_video_osd_actor_class_init (BaconVideoOsdActorClass *klass)
+{
+        GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+
+//        gobject_class->constructor = bacon_video_osd_actor_constructor;
+        gobject_class->finalize = bacon_video_osd_actor_finalize;
+
+        g_type_class_add_private (klass, sizeof (BaconVideoOsdActorPrivate));
+}
+
+static gboolean
+bacon_video_osd_actor_draw (ClutterCanvas      *canvas,
+			    cairo_t            *cr,
+			    int                 width,
+			    int                 height,
+			    BaconVideoOsdActor *osd)
+{
+	GsdOsdDrawContext *ctx;
+
+	g_return_val_if_fail (osd->priv->icon_name != NULL, FALSE);
+
+	ctx = osd->priv->ctx;
+
+	cairo_save (cr);
+	cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR);
+	cairo_paint (cr);
+
+	cairo_restore (cr);
+	cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
+
+	ctx->size = MIN(width, height);
+	ctx->icon_name = osd->priv->icon_name;
+
+	gsd_osd_window_draw (ctx, cr);
+
+	return FALSE;
+}
+
+static void
+bacon_video_osd_actor_init (BaconVideoOsdActor *osd)
+{
+	ClutterActor *self;
+	GtkWidgetPath *widget_path;
+
+	self = CLUTTER_ACTOR (osd);
+        osd->priv = BACON_VIDEO_OSD_ACTOR_GET_PRIVATE (osd);
+
+	osd->priv->canvas = CLUTTER_CANVAS (clutter_canvas_new ());
+	g_object_bind_property (self, "width",
+				osd->priv->canvas, "width",
+				G_BINDING_DEFAULT);
+	g_object_bind_property (self, "height",
+				osd->priv->canvas, "height",
+				G_BINDING_DEFAULT);
+	clutter_actor_set_content (self, CLUTTER_CONTENT (osd->priv->canvas));
+	g_object_unref (osd->priv->canvas);
+
+	osd->priv->icon_name = g_strdup ("media-playback-pause-symbolic");
+
+	osd->priv->ctx = g_new0 (GsdOsdDrawContext, 1);
+
+	widget_path = gtk_widget_path_new ();
+	gtk_widget_path_append_type (widget_path, GTK_TYPE_WINDOW);
+	osd->priv->style = gtk_style_context_new ();
+	gtk_style_context_set_path (osd->priv->style, widget_path);
+	gtk_widget_path_free (widget_path);
+
+	osd->priv->ctx->direction = clutter_get_default_text_direction ();
+	osd->priv->ctx->theme = gtk_icon_theme_get_default ();
+	osd->priv->ctx->action = GSD_OSD_WINDOW_ACTION_CUSTOM;
+	osd->priv->ctx->style = osd->priv->style;
+
+	g_signal_connect (osd->priv->canvas, "draw", G_CALLBACK (bacon_video_osd_actor_draw), osd);
+        osd->priv->fade_out_alpha = 1.0;
+}
+
+ClutterActor *
+bacon_video_osd_actor_new (void)
+{
+        return g_object_new (BACON_TYPE_VIDEO_OSD_ACTOR, NULL);
+}
+
+void
+bacon_video_osd_actor_set_icon_name (BaconVideoOsdActor *osd,
+				     const char         *icon_name)
+{
+	g_return_if_fail (BACON_IS_VIDEO_OSD_ACTOR (osd));
+
+	g_free (osd->priv->icon_name);
+	osd->priv->icon_name = g_strdup (icon_name);
+
+	if (icon_name != NULL)
+		clutter_content_invalidate (CLUTTER_CONTENT (osd->priv->canvas));
+}
+
+void
+bacon_video_osd_actor_hide (BaconVideoOsdActor *osd)
+{
+	g_return_if_fail (BACON_IS_VIDEO_OSD_ACTOR (osd));
+
+	clutter_actor_hide (CLUTTER_ACTOR (osd));
+
+	/* Reset it for the next time */
+	osd->priv->fade_out_alpha = 1.0;
+	osd->priv->fade_timeout_id = 0;
+}
+
+void
+bacon_video_osd_actor_show (BaconVideoOsdActor *osd)
+{
+	g_return_if_fail (BACON_IS_VIDEO_OSD_ACTOR (osd));
+
+	remove_hide_timeout (osd);
+	clutter_actor_set_opacity (CLUTTER_ACTOR (osd), 0xff);
+	clutter_actor_show (CLUTTER_ACTOR (osd));
+}
+
+void
+bacon_video_osd_actor_show_and_fade (BaconVideoOsdActor *osd)
+{
+	g_return_if_fail (BACON_IS_VIDEO_OSD_ACTOR (osd));
+
+	remove_hide_timeout (osd);
+	clutter_actor_set_opacity (CLUTTER_ACTOR (osd), 0xff);
+	clutter_actor_show (CLUTTER_ACTOR (osd));
+	add_hide_timeout (osd);
+}
diff -Nru totem-3.4.3/src/backend/bacon-video-osd-actor.h totem-3.6.2/src/backend/bacon-video-osd-actor.h
--- totem-3.4.3/src/backend/bacon-video-osd-actor.h	1970-01-01 00:00:00.000000000 +0000
+++ totem-3.6.2/src/backend/bacon-video-osd-actor.h	2012-08-29 23:07:45.000000000 +0000
@@ -0,0 +1,70 @@
+/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 8; tab-width: 8 -*-
+ *
+ * On-screen-display (OSD) window for gnome-settings-daemon's plugins
+ *
+ * Copyright (C) 2006 William Jon McCann  
+ * Copyright (C) 2009 Novell, Inc
+ *
+ * Authors:
+ *   William Jon McCann 
+ *   Federico Mena-Quintero 
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2, 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 Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ */
+
+#ifndef BACON_VIDEO_OSD_ACTOR_H
+#define BACON_VIDEO_OSD_ACTOR_H
+
+#include 
+#include 
+
+G_BEGIN_DECLS
+
+#define BACON_TYPE_VIDEO_OSD_ACTOR            (bacon_video_osd_actor_get_type ())
+#define BACON_VIDEO_OSD_ACTOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj),  BACON_TYPE_VIDEO_OSD_ACTOR, BaconVideoOsdActor))
+#define BACON_VIDEO_OSD_ACTOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),   BACON_TYPE_VIDEO_OSD_ACTOR, BaconVideoOsdActorClass))
+#define BACON_IS_VIDEO_OSD_ACTOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj),  BACON_TYPE_VIDEO_OSD_ACTOR))
+#define BACON_IS_VIDEO_OSD_ACTOR_CLASS(klass) (G_TYPE_INSTANCE_GET_CLASS ((klass), BACON_TYPE_VIDEO_OSD_ACTOR))
+#define BACON_VIDEO_OSD_ACTOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), BACON_TYPE_VIDEO_OSD_ACTOR, BaconVideoOsdActorClass))
+
+typedef struct BaconVideoOsdActor                   BaconVideoOsdActor;
+typedef struct BaconVideoOsdActorClass              BaconVideoOsdActorClass;
+typedef struct BaconVideoOsdActorPrivate            BaconVideoOsdActorPrivate;
+
+struct BaconVideoOsdActor {
+        ClutterActor                parent;
+
+        BaconVideoOsdActorPrivate  *priv;
+};
+
+struct BaconVideoOsdActorClass {
+        ClutterActorClass parent_class;
+};
+
+GType                 bacon_video_osd_actor_get_type          (void);
+
+ClutterActor *        bacon_video_osd_actor_new               (void);
+void                  bacon_video_osd_actor_set_icon_name     (BaconVideoOsdActor *osd,
+							       const char         *icon_name);
+void                  bacon_video_osd_actor_hide              (BaconVideoOsdActor *osd);
+void                  bacon_video_osd_actor_show              (BaconVideoOsdActor *osd);
+void                  bacon_video_osd_actor_show_and_fade     (BaconVideoOsdActor *osd);
+
+G_END_DECLS
+
+#endif
diff -Nru totem-3.4.3/src/backend/bacon-video-widget-enums.c totem-3.6.2/src/backend/bacon-video-widget-enums.c
--- totem-3.4.3/src/backend/bacon-video-widget-enums.c	2012-07-04 09:55:14.000000000 +0000
+++ totem-3.6.2/src/backend/bacon-video-widget-enums.c	2012-10-25 13:47:11.000000000 +0000
@@ -11,10 +11,7 @@
   static GType etype = 0;
   if (etype == 0) {
     static const GEnumValue values[] = {
-      { BVW_ERROR_AUDIO_PLUGIN, "BVW_ERROR_AUDIO_PLUGIN", "audio-plugin" },
       { BVW_ERROR_NO_PLUGIN_FOR_FILE, "BVW_ERROR_NO_PLUGIN_FOR_FILE", "no-plugin-for-file" },
-      { BVW_ERROR_VIDEO_PLUGIN, "BVW_ERROR_VIDEO_PLUGIN", "video-plugin" },
-      { BVW_ERROR_AUDIO_BUSY, "BVW_ERROR_AUDIO_BUSY", "audio-busy" },
       { BVW_ERROR_BROKEN_FILE, "BVW_ERROR_BROKEN_FILE", "broken-file" },
       { BVW_ERROR_FILE_GENERIC, "BVW_ERROR_FILE_GENERIC", "file-generic" },
       { BVW_ERROR_FILE_PERMISSION, "BVW_ERROR_FILE_PERMISSION", "file-permission" },
@@ -22,14 +19,12 @@
       { BVW_ERROR_FILE_NOT_FOUND, "BVW_ERROR_FILE_NOT_FOUND", "file-not-found" },
       { BVW_ERROR_DVD_ENCRYPTED, "BVW_ERROR_DVD_ENCRYPTED", "dvd-encrypted" },
       { BVW_ERROR_INVALID_DEVICE, "BVW_ERROR_INVALID_DEVICE", "invalid-device" },
-      { BVW_ERROR_DEVICE_BUSY, "BVW_ERROR_DEVICE_BUSY", "device-busy" },
       { BVW_ERROR_UNKNOWN_HOST, "BVW_ERROR_UNKNOWN_HOST", "unknown-host" },
       { BVW_ERROR_NETWORK_UNREACHABLE, "BVW_ERROR_NETWORK_UNREACHABLE", "network-unreachable" },
       { BVW_ERROR_CONNECTION_REFUSED, "BVW_ERROR_CONNECTION_REFUSED", "connection-refused" },
       { BVW_ERROR_INVALID_LOCATION, "BVW_ERROR_INVALID_LOCATION", "invalid-location" },
       { BVW_ERROR_GENERIC, "BVW_ERROR_GENERIC", "generic" },
       { BVW_ERROR_CODEC_NOT_HANDLED, "BVW_ERROR_CODEC_NOT_HANDLED", "codec-not-handled" },
-      { BVW_ERROR_AUDIO_ONLY, "BVW_ERROR_AUDIO_ONLY", "audio-only" },
       { BVW_ERROR_CANNOT_CAPTURE, "BVW_ERROR_CANNOT_CAPTURE", "cannot-capture" },
       { BVW_ERROR_READ_ERROR, "BVW_ERROR_READ_ERROR", "read-error" },
       { BVW_ERROR_PLUGIN_LOAD, "BVW_ERROR_PLUGIN_LOAD", "plugin-load" },
@@ -41,30 +36,6 @@
   return etype;
 }
 GType
-bvw_connection_speed_get_type (void)
-{
-  static GType etype = 0;
-  if (etype == 0) {
-    static const GEnumValue values[] = {
-      { BVW_SPEED_14_4_MODEM, "BVW_SPEED_14_4_MODEM", "14-4-modem" },
-      { BVW_SPEED_19_2_MODEM, "BVW_SPEED_19_2_MODEM", "19-2-modem" },
-      { BVW_SPEED_28_8_MODEM, "BVW_SPEED_28_8_MODEM", "28-8-modem" },
-      { BVW_SPEED_33_6_MODEM, "BVW_SPEED_33_6_MODEM", "33-6-modem" },
-      { BVW_SPEED_34_4_MODEM, "BVW_SPEED_34_4_MODEM", "34-4-modem" },
-      { BVW_SPEED_56_ISDN, "BVW_SPEED_56_ISDN", "56-isdn" },
-      { BVW_SPEED_112_ISDN, "BVW_SPEED_112_ISDN", "112-isdn" },
-      { BVW_SPEED_256_DSL, "BVW_SPEED_256_DSL", "256-dsl" },
-      { BVW_SPEED_384_DSL, "BVW_SPEED_384_DSL", "384-dsl" },
-      { BVW_SPEED_512_DSL, "BVW_SPEED_512_DSL", "512-dsl" },
-      { BVW_SPEED_1500_T1, "BVW_SPEED_1500_T1", "1500-t1" },
-      { BVW_SPEED_LAN, "BVW_SPEED_LAN", "lan" },
-      { 0, NULL, NULL }
-    };
-    etype = g_enum_register_static ("BvwConnectionSpeed", values);
-  }
-  return etype;
-}
-GType
 bvw_metadata_type_get_type (void)
 {
   static GType etype = 0;
@@ -160,6 +131,22 @@
   return etype;
 }
 GType
+bvw_rotation_get_type (void)
+{
+  static GType etype = 0;
+  if (etype == 0) {
+    static const GEnumValue values[] = {
+      { BVW_ROTATION_R_ZERO, "BVW_ROTATION_R_ZERO", "zero" },
+      { BVW_ROTATION_R_90R, "BVW_ROTATION_R_90R", "90r" },
+      { BVW_ROTATION_R_180, "BVW_ROTATION_R_180", "180" },
+      { BVW_ROTATION_R_90L, "BVW_ROTATION_R_90L", "90l" },
+      { 0, NULL, NULL }
+    };
+    etype = g_enum_register_static ("BvwRotation", values);
+  }
+  return etype;
+}
+GType
 bvw_dvd_event_get_type (void)
 {
   static GType etype = 0;
diff -Nru totem-3.4.3/src/backend/bacon-video-widget-enums.h totem-3.6.2/src/backend/bacon-video-widget-enums.h
--- totem-3.4.3/src/backend/bacon-video-widget-enums.h	2012-07-04 09:55:14.000000000 +0000
+++ totem-3.6.2/src/backend/bacon-video-widget-enums.h	2012-10-25 13:47:11.000000000 +0000
@@ -10,8 +10,6 @@
 /* enumerations from "./bacon-video-widget.h" */
 GType bvw_error_get_type (void) G_GNUC_CONST;
 #define BVW_TYPE_ERROR (bvw_error_get_type())
-GType bvw_connection_speed_get_type (void) G_GNUC_CONST;
-#define BVW_TYPE_CONNECTION_SPEED (bvw_connection_speed_get_type())
 GType bvw_metadata_type_get_type (void) G_GNUC_CONST;
 #define BVW_TYPE_METADATA_TYPE (bvw_metadata_type_get_type())
 GType bvw_visualization_quality_get_type (void) G_GNUC_CONST;
@@ -22,6 +20,8 @@
 #define BVW_TYPE_ASPECT_RATIO (bvw_aspect_ratio_get_type())
 GType bvw_zoom_mode_get_type (void) G_GNUC_CONST;
 #define BVW_TYPE_ZOOM_MODE (bvw_zoom_mode_get_type())
+GType bvw_rotation_get_type (void) G_GNUC_CONST;
+#define BVW_TYPE_ROTATION (bvw_rotation_get_type())
 GType bvw_dvd_event_get_type (void) G_GNUC_CONST;
 #define BVW_TYPE_DVD_EVENT (bvw_dvd_event_get_type())
 GType bvw_audio_output_type_get_type (void) G_GNUC_CONST;
diff -Nru totem-3.4.3/src/backend/bacon-video-widget-gst-0.10.c totem-3.6.2/src/backend/bacon-video-widget-gst-0.10.c
--- totem-3.4.3/src/backend/bacon-video-widget-gst-0.10.c	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/backend/bacon-video-widget-gst-0.10.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,6274 +0,0 @@
-/* 
- * Copyright (C) 2003-2007 the GStreamer project
- *      Julien Moutte 
- *      Ronald Bultje 
- * Copyright (C) 2005-2008 Tim-Philipp Müller 
- * Copyright (C) 2009 Sebastian Dröge 
- * Copyright © 2009 Christian Persch
- *
- * 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 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
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
- *
- * The Totem project hereby grant permission for non-gpl compatible GStreamer
- * plugins to be used and distributed together with GStreamer and Totem. This
- * permission is above and beyond the permissions granted by the GPL license
- * Totem is covered by.
- *
- * Monday 7th February 2005: Christian Schaller: Add exception clause.
- * See license_change file for details.
- *
- */
-
-/**
- * SECTION:bacon-video-widget
- * @short_description: video playing widget and abstraction
- * @stability: Unstable
- * @include: bacon-video-widget.h
- *
- * #BaconVideoWidget is a widget to play audio or video streams, with support for visualisations for audio-only streams. It has a GStreamer
- * backend, and abstracts away the differences to provide a simple interface to the functionality required by Totem. It handles all the low-level
- * audio and video work for Totem (or passes the work off to the backend).
- **/
-
-#include 
-
-#include 
-
-/* GStreamer Interfaces */
-#include 
-#include 
-/* for detecting sources of errors */
-#include 
-#include 
-#include 
-/* for pretty multichannel strings */
-#include 
-/* for the volume property */
-#include 
-
-/* for missing decoder/demuxer detection */
-#include 
-
-/* for the cover metadata info */
-#include 
-
-#include 
-#include 
-#include "totem-aspect-frame.h"
-
-/* system */
-#include 
-#include 
-#include 
-#include 
-#include 
-
-/* gtk+/gnome */
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include "totem-gst-helpers.h"
-#include "bacon-video-widget.h"
-#include "bacon-video-widget-gst-missing-plugins.h"
-#include "baconvideowidget-marshal.h"
-#include "bacon-video-widget-enums.h"
-#include "video-utils.h"
-
-#define DEFAULT_USER_AGENT "Totem/"VERSION
-
-#define FORWARD_RATE 1.0
-#define REVERSE_RATE -1.0
-/* Maximum size of the logo */
-#define LOGO_SIZE 256
-#define NANOSECS_IN_SEC 1000000000
-#define SEEK_TIMEOUT NANOSECS_IN_SEC / 10
-
-#define is_error(e, d, c) \
-  (e->domain == GST_##d##_ERROR && \
-   e->code == GST_##d##_ERROR_##c)
-
-#define I_(string) (g_intern_static_string (string))
-
-G_DEFINE_TYPE (BaconVideoWidget, bacon_video_widget, GTK_CLUTTER_TYPE_EMBED)
-
-/* Signals */
-enum
-{
-  SIGNAL_ERROR,
-  SIGNAL_EOS,
-  SIGNAL_REDIRECT,
-  SIGNAL_CHANNELS_CHANGE,
-  SIGNAL_TICK,
-  SIGNAL_GOT_METADATA,
-  SIGNAL_BUFFERING,
-  SIGNAL_MISSING_PLUGINS,
-  SIGNAL_DOWNLOAD_BUFFERING,
-  LAST_SIGNAL
-};
-
-/* Properties */
-enum
-{
-  PROP_0,
-  PROP_LOGO_MODE,
-  PROP_POSITION,
-  PROP_CURRENT_TIME,
-  PROP_STREAM_LENGTH,
-  PROP_PLAYING,
-  PROP_REFERRER,
-  PROP_SEEKABLE,
-  PROP_SHOW_CURSOR,
-  PROP_SHOW_VISUALIZATIONS,
-  PROP_USER_AGENT,
-  PROP_VOLUME,
-  PROP_DOWNLOAD_FILENAME,
-  PROP_AUTO_RESIZE,
-  PROP_DEINTERLACING,
-  PROP_CONNECTION_SPEED,
-  PROP_VISUALIZATION_QUALITY,
-  PROP_BRIGHTNESS,
-  PROP_CONTRAST,
-  PROP_SATURATION,
-  PROP_HUE,
-  PROP_AUDIO_OUTPUT_TYPE
-};
-
-static const gchar *video_props_str[4] = {
-  "brightness",
-  "contrast",
-  "saturation",
-  "hue"
-};
-
-struct BaconVideoWidgetPrivate
-{
-  char                        *user_agent;
-
-  char                        *referrer;
-  char                        *mrl;
-  BvwAspectRatio               ratio_type;
-
-  GstElement                  *play;
-  GstElement                  *source;
-  GstColorBalance             *balance;
-  GstNavigation               *navigation;
-
-  guint                        update_id;
-  guint                        fill_id;
-  guint                        ready_idle_id;
-
-  GdkPixbuf                   *logo_pixbuf;
-  GdkPixbuf                   *cover_pixbuf; /* stream-specific image */
-
-  gboolean                     media_has_video;
-  gboolean                     media_has_audio;
-  gint                         seekable; /* -1 = don't know, FALSE = no */
-  gint64                       stream_length;
-  gint64                       current_time;
-  gdouble                      current_position;
-  gboolean                     is_live;
-
-  GstTagList                  *tagcache;
-  GstTagList                  *audiotags;
-  GstTagList                  *videotags;
-
-  GAsyncQueue                 *tag_update_queue;
-  guint                        tag_update_id;
-
-  gboolean                     got_redirect;
-
-  ClutterActor                *stage;
-  ClutterActor                *texture;
-  ClutterActor                *frame;
-
-  ClutterActor                *logo_frame;
-  ClutterActor                *logo;
-
-  GdkCursor                   *cursor;
-
-  /* Visual effects */
-  GList                       *vis_plugins_list;
-  gboolean                     show_vfx;
-  BvwVisualizationQuality      visq;
-  gchar                       *vis_element_name;
-  GstElement                  *audio_capsfilter;
-
-  /* Other stuff */
-  gboolean                     logo_mode;
-  gboolean                     cursor_shown;
-  gboolean                     fullscreen_mode;
-  gboolean                     auto_resize;
-  gboolean                     uses_audio_fakesink;
-  gdouble                      volume;
-  gboolean                     is_menu;
-  gboolean                     has_angles;
-  
-  gint                         video_width; /* Movie width */
-  gint                         video_height; /* Movie height */
-  gboolean                     window_resized; /* Whether the window has already been resized
-						  for this media */
-  gint                         movie_par_n; /* Movie pixel aspect ratio numerator */
-  gint                         movie_par_d; /* Movie pixel aspect ratio denominator */
-  gint                         video_width_pixels; /* Scaled movie width */
-  gint                         video_height_pixels; /* Scaled movie height */
-  gint                         video_fps_n;
-  gint                         video_fps_d;
-
-  gchar                       *media_device;
-
-  BvwAudioOutputType           speakersetup;
-  gint                         connection_speed;
-
-  GstBus                      *bus;
-  gulong                       sig_bus_async;
-
-  gint                         eos_id;
-
-  /* When seeking, queue up the seeks if they happen before
-   * the previous one finished */
-#if GLIB_CHECK_VERSION (2, 31, 0)
-  GMutex                       seek_mutex;
-#else
-  GMutex                      *seek_mutex;
-#endif
-  GstClock                    *clock;
-  GstClockTime                 seek_req_time;
-  gint64                       seek_time;
-  /* state we want to be in, as opposed to actual pipeline state
-   * which may change asynchronously or during buffering */
-  GstState                     target_state;
-  gboolean                     buffering;
-  gboolean                     download_buffering;
-  GstElement                  *download_buffering_element;
-  char                        *download_filename;
-  /* used to compute when the download buffer has gone far
-   * enough to start playback */
-  gint64                       buffering_left;
-
-  /* for easy codec installation */
-  GList                       *missing_plugins;   /* GList of GstMessages */
-  gboolean                     plugin_install_in_progress;
-
-  /* for mounting locations if necessary */
-  GCancellable                *mount_cancellable;
-  gboolean                     mount_in_progress;
-
-  /* for auth */
-  GMountOperation             *auth_dialog;
-  GMountOperationResult        auth_last_result;
-  char                        *user_id, *user_pw;
-
-  /* for stepping */
-  float                        rate;
-};
-
-static void bacon_video_widget_set_property (GObject * object,
-                                             guint property_id,
-                                             const GValue * value,
-                                             GParamSpec * pspec);
-static void bacon_video_widget_get_property (GObject * object,
-                                             guint property_id,
-                                             GValue * value,
-                                             GParamSpec * pspec);
-
-static void bacon_video_widget_finalize (GObject * object);
-
-static void setup_vis (BaconVideoWidget * bvw);
-static GList * get_visualization_features (void);
-static void size_changed_cb (GdkScreen *screen, BaconVideoWidget *bvw);
-static void bvw_stop_play_pipeline (BaconVideoWidget * bvw);
-static GError* bvw_error_from_gst_error (BaconVideoWidget *bvw, GstMessage *m);
-static gboolean bvw_check_for_cover_pixbuf (BaconVideoWidget * bvw);
-static const GdkPixbuf * bvw_get_logo_pixbuf (BaconVideoWidget * bvw);
-static gboolean bvw_set_playback_direction (BaconVideoWidget *bvw, gboolean forward);
-static gboolean bacon_video_widget_seek_time_no_lock (BaconVideoWidget *bvw,
-						      gint64 _time,
-						      GstSeekFlags flag,
-						      GError **error);
-
-typedef struct {
-  GstTagList *tags;
-  const gchar *type;
-} UpdateTagsDelayedData;
-
-static void update_tags_delayed_data_destroy (UpdateTagsDelayedData *data);
-
-static GtkWidgetClass *parent_class = NULL;
-
-static int bvw_signals[LAST_SIGNAL] = { 0 };
-
-GST_DEBUG_CATEGORY (_totem_gst_debug_cat);
-#define GST_CAT_DEFAULT _totem_gst_debug_cat
-
-typedef gchar * (* MsgToStrFunc) (GstMessage * msg);
-
-static const gchar *
-get_type_name (GType class_type, int type)
-{
-  GEnumClass *eclass;
-  GEnumValue *value;
-
-  eclass = G_ENUM_CLASS (g_type_class_peek (class_type));
-  value = g_enum_get_value (eclass, type);
-
-  if (value == NULL)
-    return "unknown";
-
-  return value->value_nick;
-}
-
-static gchar **
-bvw_get_missing_plugins_foo (const GList * missing_plugins, MsgToStrFunc func)
-{
-  GPtrArray *arr = g_ptr_array_new ();
-
-  while (missing_plugins != NULL) {
-    g_ptr_array_add (arr, func (GST_MESSAGE (missing_plugins->data)));
-    missing_plugins = missing_plugins->next;
-  }
-  g_ptr_array_add (arr, NULL);
-  return (gchar **) g_ptr_array_free (arr, FALSE);
-}
-
-static gchar **
-bvw_get_missing_plugins_details (const GList * missing_plugins)
-{
-  return bvw_get_missing_plugins_foo (missing_plugins,
-      gst_missing_plugin_message_get_installer_detail);
-}
-
-static gchar **
-bvw_get_missing_plugins_descriptions (const GList * missing_plugins)
-{
-  return bvw_get_missing_plugins_foo (missing_plugins,
-      gst_missing_plugin_message_get_description);
-}
-
-static void
-bvw_clear_missing_plugins_messages (BaconVideoWidget * bvw)
-{
-  g_list_foreach (bvw->priv->missing_plugins,
-                  (GFunc) gst_mini_object_unref, NULL);
-  g_list_free (bvw->priv->missing_plugins);
-  bvw->priv->missing_plugins = NULL;
-}
-
-static void
-bvw_check_if_video_decoder_is_missing (BaconVideoWidget * bvw)
-{
-  GList *l;
-
-  if (bvw->priv->media_has_video || bvw->priv->missing_plugins == NULL)
-    return;
-
-  for (l = bvw->priv->missing_plugins; l != NULL; l = l->next) {
-    GstMessage *msg = GST_MESSAGE (l->data);
-    gchar *d, *f;
-
-    if ((d = gst_missing_plugin_message_get_installer_detail (msg))) {
-      if ((f = strstr (d, "|decoder-")) && strstr (f, "video")) {
-        GError *err;
-
-        /* create a fake GStreamer error so we get a nice warning message */
-        err = g_error_new (GST_CORE_ERROR, GST_CORE_ERROR_MISSING_PLUGIN, "x");
-        msg = gst_message_new_error (GST_OBJECT (bvw->priv->play), err, NULL);
-        g_error_free (err);
-        err = bvw_error_from_gst_error (bvw, msg);
-        gst_message_unref (msg);
-        g_signal_emit (bvw, bvw_signals[SIGNAL_ERROR], 0, err->message, FALSE, FALSE);
-        g_error_free (err);
-        g_free (d);
-        break;
-      }
-      g_free (d);
-    }
-  }
-}
-
-static void
-set_display_pixel_aspect_ratio (GdkScreen *screen,
-				GValue    *value)
-{
-  static const gint par[][2] = {
-    {1, 1},                     /* regular screen */
-    {16, 15},                   /* PAL TV */
-    {11, 10},                   /* 525 line Rec.601 video */
-    {54, 59},                   /* 625 line Rec.601 video */
-    {64, 45},                   /* 1280x1024 on 16:9 display */
-    {5, 3},                     /* 1280x1024 on 4:3 display */
-    {4, 3}                      /*  800x600 on 16:9 display */
-  };
-  guint i;
-  gint par_index;
-  gdouble ratio;
-  gdouble delta;
-
-#define DELTA(idx) (ABS (ratio - ((gdouble) par[idx][0] / par[idx][1])))
-
-  /* first calculate the "real" ratio based on the X values;
-   *    * which is the "physical" w/h divided by the w/h in pixels of the display */
-  ratio = (gdouble) (gdk_screen_get_width_mm (screen) * gdk_screen_get_height (screen))
-    / (gdk_screen_get_height_mm (screen) * gdk_screen_get_width (screen));
-
-  GST_DEBUG ("calculated pixel aspect ratio: %f", ratio);
-  /* now find the one from par[][2] with the lowest delta to the real one */
-  delta = DELTA (0);
-  par_index = 0;
-
-  for (i = 1; i < sizeof (par) / (sizeof (gint) * 2); ++i) {
-    gdouble this_delta = DELTA (i);
-
-    if (this_delta < delta) {
-      par_index = i;
-      delta = this_delta;
-    }
-  }
-
-  GST_DEBUG ("Decided on index %d (%d/%d)", par_index,
-	     par[par_index][0], par[par_index][1]);
-  gst_value_set_fraction (value, par[par_index][0], par[par_index][1]);
-}
-
-static void
-get_media_size (BaconVideoWidget *bvw, gint *width, gint *height)
-{
-  if (bvw->priv->logo_mode) {
-    const GdkPixbuf *pixbuf;
-
-    pixbuf = bvw_get_logo_pixbuf (bvw);
-    if (pixbuf) {
-      *width = gdk_pixbuf_get_width (pixbuf);
-      *height = gdk_pixbuf_get_height (pixbuf);
-      if (*width == *height) {
-	/* The icons will be square, so lie so we get a 16:9
-	 * ratio */
-	*width = (int) ((float) *height / 9. * 16.);
-      }
-    } else {
-      *width = 0;
-      *height = 0;
-    }
-  } else {
-    if (bvw->priv->media_has_video) {
-      GValue disp_par = {0, };
-      guint movie_par_n, movie_par_d, disp_par_n, disp_par_d, num, den;
-
-      /* Create and init the fraction value */
-      g_value_init (&disp_par, GST_TYPE_FRACTION);
-
-      /* Square pixel is our default */
-      gst_value_set_fraction (&disp_par, 1, 1);
-
-      /* Now try getting display's pixel aspect ratio */
-      if (gtk_widget_get_realized (GTK_WIDGET (bvw)))
-	set_display_pixel_aspect_ratio (gtk_widget_get_screen (GTK_WIDGET (bvw)), &disp_par);
-
-      disp_par_n = gst_value_get_fraction_numerator (&disp_par);
-      disp_par_d = gst_value_get_fraction_denominator (&disp_par);
-
-      GST_DEBUG ("display PAR is %d/%d", disp_par_n, disp_par_d);
-
-      /* If movie pixel aspect ratio is enforced, use that */
-      if (bvw->priv->ratio_type != BVW_RATIO_AUTO) {
-        switch (bvw->priv->ratio_type) {
-          case BVW_RATIO_SQUARE:
-            movie_par_n = 1;
-            movie_par_d = 1;
-            break;
-          case BVW_RATIO_FOURBYTHREE:
-            movie_par_n = 4 * bvw->priv->video_height;
-            movie_par_d = 3 * bvw->priv->video_width;
-            break;
-          case BVW_RATIO_ANAMORPHIC:
-            movie_par_n = 16 * bvw->priv->video_height;
-            movie_par_d = 9 * bvw->priv->video_width;
-            break;
-          case BVW_RATIO_DVB:
-            movie_par_n = 20 * bvw->priv->video_height;
-            movie_par_d = 9 * bvw->priv->video_width;
-            break;
-          /* handle these to avoid compiler warnings */
-          case BVW_RATIO_AUTO:
-          default:
-            movie_par_n = 0;
-            movie_par_d = 0;
-            g_assert_not_reached ();
-        }
-      } else {
-        /* Use the movie pixel aspect ratio if any */
-        movie_par_n = bvw->priv->movie_par_n;
-        movie_par_d = bvw->priv->movie_par_d;
-      }
-
-      GST_DEBUG ("movie PAR is %d/%d", movie_par_n, movie_par_d);
-
-      if (bvw->priv->video_width == 0 || bvw->priv->video_height == 0) {
-        GST_DEBUG ("width and/or height 0, assuming 1/1 ratio");
-        num = 1;
-        den = 1;
-      } else if (!gst_video_calculate_display_ratio (&num, &den,
-          bvw->priv->video_width, bvw->priv->video_height,
-          movie_par_n, movie_par_d, disp_par_n, disp_par_d)) {
-        GST_WARNING ("overflow calculating display aspect ratio!");
-        num = 1;   /* FIXME: what values to use here? */
-        den = 1;
-      }
-
-      GST_DEBUG ("calculated scaling ratio %d/%d for video %dx%d", num, den,
-          bvw->priv->video_width, bvw->priv->video_height);
-      
-      /* now find a width x height that respects this display ratio.
-       * prefer those that have one of w/h the same as the incoming video
-       * using wd / hd = num / den */
-    
-      /* start with same height, because of interlaced video */
-      /* check hd / den is an integer scale factor, and scale wd with the PAR */
-      if (bvw->priv->video_height % den == 0) {
-        GST_DEBUG ("keeping video height");
-        bvw->priv->video_width_pixels =
-            (guint) gst_util_uint64_scale (bvw->priv->video_height, num, den);
-        bvw->priv->video_height_pixels = bvw->priv->video_height;
-      } else if (bvw->priv->video_width % num == 0) {
-        GST_DEBUG ("keeping video width");
-        bvw->priv->video_width_pixels = bvw->priv->video_width;
-        bvw->priv->video_height_pixels =
-            (guint) gst_util_uint64_scale (bvw->priv->video_width, den, num);
-      } else {
-        GST_DEBUG ("approximating while keeping video height");
-        bvw->priv->video_width_pixels =
-            (guint) gst_util_uint64_scale (bvw->priv->video_height, num, den);
-        bvw->priv->video_height_pixels = bvw->priv->video_height;
-      }
-      GST_DEBUG ("scaling to %dx%d", bvw->priv->video_width_pixels,
-          bvw->priv->video_height_pixels);
-      
-      *width = bvw->priv->video_width_pixels;
-      *height = bvw->priv->video_height_pixels;
-      
-      /* Free the PAR fraction */
-      g_value_unset (&disp_par);
-    }
-    else {
-      *width = 0;
-      *height = 0;
-    }
-  }
-}
-
-static void
-bacon_video_widget_realize (GtkWidget * widget)
-{
-  BaconVideoWidget *bvw = BACON_VIDEO_WIDGET (widget);
-  GtkWidget *toplevel;
-
-  GTK_WIDGET_CLASS (parent_class)->realize (widget);
-
-  gtk_widget_set_realized (widget, TRUE);
-
-  /* get screen size changes */
-  g_signal_connect (G_OBJECT (gtk_widget_get_screen (widget)),
-		    "size-changed", G_CALLBACK (size_changed_cb), bvw);
-
-  /* setup the toplevel, ready to be resized */
-  toplevel = gtk_widget_get_toplevel (widget);
-  if (gtk_widget_is_toplevel (toplevel) &&
-      gtk_widget_get_parent (widget) != toplevel &&
-      !GTK_IS_PLUG(toplevel))
-    gtk_window_set_geometry_hints (GTK_WINDOW (toplevel), widget, NULL, 0);
-
-  bacon_video_widget_gst_missing_plugins_setup (bvw);
-}
-
-static void
-size_changed_cb (GdkScreen *screen, BaconVideoWidget *bvw)
-{
-  /* FIXME */
-  setup_vis (bvw);
-}
-
-static void
-set_current_actor (BaconVideoWidget *bvw)
-{
-  gboolean draw_logo;
-
-  if (bvw->priv->stage == NULL)
-    return;
-
-  /* If there's only audio and no visualisation, draw the logo as well.
-   * If we have a cover image to display, we display it regardless of whether we're
-   * doing visualisations. */
-  draw_logo = bvw->priv->media_has_audio &&
-      !bvw->priv->media_has_video && (!bvw->priv->show_vfx || bvw->priv->cover_pixbuf);
-
-  if (bvw->priv->logo_mode || draw_logo) {
-    const GdkPixbuf *pixbuf;
-
-    pixbuf = bvw_get_logo_pixbuf (bvw);
-    if (pixbuf != NULL) {
-      gboolean ret;
-      GError *err = NULL;
-
-      ret = clutter_texture_set_from_rgb_data (CLUTTER_TEXTURE (bvw->priv->logo),
-					       gdk_pixbuf_get_pixels (pixbuf),
-					       gdk_pixbuf_get_has_alpha (pixbuf),
-					       gdk_pixbuf_get_width (pixbuf),
-					       gdk_pixbuf_get_height (pixbuf),
-					       gdk_pixbuf_get_rowstride (pixbuf),
-					       gdk_pixbuf_get_has_alpha (pixbuf) ? 4 : 3,
-					       CLUTTER_TEXTURE_NONE, &err);
-      if (ret == FALSE) {
-	g_message ("clutter_texture_set_from_rgb_data failed %s", err->message);
-	g_error_free (err);
-      } else {
-	clutter_actor_show (CLUTTER_ACTOR (bvw->priv->logo_frame));
-	clutter_actor_hide (CLUTTER_ACTOR (bvw->priv->frame));
-	return;
-      }
-    }
-  }
-
-  clutter_actor_show (CLUTTER_ACTOR (bvw->priv->frame));
-  clutter_actor_hide (CLUTTER_ACTOR (bvw->priv->logo_frame));
-}
-
-/* need to use gstnavigation interface for these vmethods, to allow for the sink
-   to map screen coordinates to video coordinates in the presence of e.g.
-   hardware scaling */
-
-static gboolean
-bacon_video_widget_motion_notify (GtkWidget *widget, GdkEventMotion *event)
-{
-  gboolean res = FALSE;
-  BaconVideoWidget *bvw = BACON_VIDEO_WIDGET (widget);
-
-  g_return_val_if_fail (bvw->priv->play != NULL, FALSE);
-
-  if (!bvw->priv->logo_mode)
-    gst_navigation_send_mouse_event (bvw->priv->navigation, "mouse-move", 0, event->x, event->y);
-
-  if (GTK_WIDGET_CLASS (parent_class)->motion_notify_event)
-    res |= GTK_WIDGET_CLASS (parent_class)->motion_notify_event (widget, event);
-
-  return res;
-}
-
-static gboolean
-bacon_video_widget_button_press (GtkWidget *widget, GdkEventButton *event)
-{
-  gboolean res = FALSE;
-  BaconVideoWidget *bvw = BACON_VIDEO_WIDGET (widget);
-
-  g_return_val_if_fail (bvw->priv->play != NULL, FALSE);
-
-  if (!bvw->priv->logo_mode) {
-    gst_navigation_send_mouse_event (bvw->priv->navigation,
-				     "mouse-button-press", event->button, event->x, event->y);
-
-    /* FIXME need to check whether the backend will have handled
-     * the button press
-     res = TRUE; */
-  }
-
-  if (GTK_WIDGET_CLASS (parent_class)->button_press_event)
-    res |= GTK_WIDGET_CLASS (parent_class)->button_press_event (widget, event);
-
-  return res;
-}
-
-static gboolean
-bacon_video_widget_button_release (GtkWidget *widget, GdkEventButton *event)
-{
-  gboolean res = FALSE;
-  BaconVideoWidget *bvw = BACON_VIDEO_WIDGET (widget);
-
-  g_return_val_if_fail (bvw->priv->play != NULL, FALSE);
-
-  if (!bvw->priv->logo_mode) {
-    gst_navigation_send_mouse_event (bvw->priv->navigation,
-				     "mouse-button-release", event->button, event->x, event->y);
-
-    res = TRUE;
-  }
-
-  if (GTK_WIDGET_CLASS (parent_class)->button_release_event)
-    res |= GTK_WIDGET_CLASS (parent_class)->button_release_event (widget, event);
-
-  return res;
-}
-
-static void
-bacon_video_widget_get_preferred_width (GtkWidget *widget,
-                                        gint      *minimum,
-                                        gint      *natural)
-{
-  *minimum = *natural = 240;
-}
-
-static void
-bacon_video_widget_get_preferred_height (GtkWidget *widget,
-                                         gint      *minimum,
-                                         gint      *natural)
-{
-  *minimum = *natural = 180;
-}
-
-static gboolean
-bvw_boolean_handled_accumulator (GSignalInvocationHint * ihint,
-    GValue * return_accu, const GValue * handler_return, gpointer foobar)
-{
-  gboolean continue_emission;
-  gboolean signal_handled;
-  
-  signal_handled = g_value_get_boolean (handler_return);
-  g_value_set_boolean (return_accu, signal_handled);
-  continue_emission = !signal_handled;
-  
-  return continue_emission;
-}
-
-static void
-bacon_video_widget_class_init (BaconVideoWidgetClass * klass)
-{
-  GObjectClass *object_class;
-  GtkWidgetClass *widget_class;
-
-  object_class = (GObjectClass *) klass;
-  widget_class = (GtkWidgetClass *) klass;
-
-  parent_class = g_type_class_peek_parent (klass);
-
-  g_type_class_add_private (object_class, sizeof (BaconVideoWidgetPrivate));
-
-  /* GtkWidget */
-  widget_class->get_preferred_width = bacon_video_widget_get_preferred_width;
-  widget_class->get_preferred_height = bacon_video_widget_get_preferred_height;
-  widget_class->realize = bacon_video_widget_realize;
-
-  /* FIXME: Remove those when GtkClutterEmbedded passes on GDK XI 1.2
-   * events properly */
-  widget_class->motion_notify_event = bacon_video_widget_motion_notify;
-  widget_class->button_press_event = bacon_video_widget_button_press;
-  widget_class->button_release_event = bacon_video_widget_button_release;
-
-  /* GObject */
-  object_class->set_property = bacon_video_widget_set_property;
-  object_class->get_property = bacon_video_widget_get_property;
-  object_class->finalize = bacon_video_widget_finalize;
-
-  /* Properties */
-  /**
-   * BaconVideoWidget:logo-mode:
-   *
-   * Whether the logo should be displayed when no stream is loaded, or the widget
-   * should take up no space.
-   **/
-  g_object_class_install_property (object_class, PROP_LOGO_MODE,
-                                   g_param_spec_boolean ("logo-mode", "Logo mode?",
-                                                         "Whether the logo should be displayed when no stream is loaded.", FALSE,
-                                                         G_PARAM_READWRITE |
-                                                         G_PARAM_STATIC_STRINGS));
-
-  /**
-   * BaconVideoWidget:position:
-   *
-   * The current position in the stream, as a percentage between 0 and 1.
-   **/
-  g_object_class_install_property (object_class, PROP_POSITION,
-                                   g_param_spec_double ("position", "Position", "The current position in the stream.",
-							0, 1.0, 0,
-							G_PARAM_READABLE |
-                                                        G_PARAM_STATIC_STRINGS));
-
-  /**
-   * BaconVideoWidget:stream-length:
-   *
-   * The length of the current stream, in milliseconds.
-   **/
-  g_object_class_install_property (object_class, PROP_STREAM_LENGTH,
-	                           g_param_spec_int64 ("stream-length", "Stream length",
-                                                     "The length of the current stream, in milliseconds.", 0, G_MAXINT64, 0,
-                                                     G_PARAM_READABLE |
-                                                     G_PARAM_STATIC_STRINGS));
-
-  /**
-   * BaconVideoWidget:playing:
-   *
-   * Whether a stream is currently playing.
-   **/
-  g_object_class_install_property (object_class, PROP_PLAYING,
-                                   g_param_spec_boolean ("playing", "Playing?",
-                                                         "Whether a stream is currently playing.", FALSE,
-                                                         G_PARAM_READABLE |
-                                                         G_PARAM_STATIC_STRINGS));
-
-  /**
-   * BaconVideoWidget:seekable:
-   *
-   * Whether the current stream can be seeked.
-   **/
-  g_object_class_install_property (object_class, PROP_SEEKABLE,
-                                   g_param_spec_boolean ("seekable", "Seekable?",
-                                                         "Whether the current stream can be seeked.", FALSE,
-                                                         G_PARAM_READABLE |
-                                                         G_PARAM_STATIC_STRINGS));
-
-  /**
-   * BaconVideoWidget:volume:
-   *
-   * The current volume level, as a percentage between 0 and 1.
-   **/
-  g_object_class_install_property (object_class, PROP_VOLUME,
-	                           g_param_spec_double ("volume", "Volume", "The current volume level.",
-	                                                0.0, 1.0, 0.0,
-	                                                G_PARAM_READWRITE |
-                                                        G_PARAM_STATIC_STRINGS));
-
-  /**
-   * BaconVideoWidget:show-cursor:
-   *
-   * Whether the cursor should be shown, or should be invisible, when it is over
-   * the video widget.
-   **/
-  g_object_class_install_property (object_class, PROP_SHOW_CURSOR,
-                                   g_param_spec_boolean ("show-cursor", "Show cursor?",
-                                                         "Whether the cursor should be shown.", FALSE,
-                                                         G_PARAM_READWRITE |
-                                                         G_PARAM_STATIC_STRINGS));
-
-  /**
-   * BaconVideoWidget:show-visualizations:
-   *
-   * Whether visualisations should be shown for audio-only streams.
-   **/
-  g_object_class_install_property (object_class, PROP_SHOW_VISUALIZATIONS,
-                                   g_param_spec_boolean ("show-visualizations", "Show visualizations?",
-                                                         "Whether visualisations should be shown for audio-only streams.", FALSE,
-                                                         G_PARAM_WRITABLE |
-                                                         G_PARAM_STATIC_STRINGS));
-
-  /**
-   * BaconVideoWidget:referrer:
-   *
-   * The HTTP referrer URI.
-   **/
-  g_object_class_install_property (object_class, PROP_REFERRER,
-                                   g_param_spec_string ("referrer", "Referrer URI", "The HTTP referrer URI.",
-                                                        NULL,
-                                                        G_PARAM_READWRITE |
-                                                        G_PARAM_STATIC_STRINGS));
-
-  /**
-   * BaconVideoWidget:user-agent:
-   *
-   * The HTTP user agent string to use.
-   **/
-  g_object_class_install_property (object_class, PROP_USER_AGENT,
-                                   g_param_spec_string ("user-agent", "User agent", "The HTTP user agent string to use.",
-                                                        NULL,
-                                                        G_PARAM_READWRITE |
-                                                        G_PARAM_STATIC_STRINGS));
-
-  /**
-   * BaconVideoWidget:download-filename:
-   *
-   * The filename of the fully downloaded stream when using
-   * download buffering.
-   **/
-  g_object_class_install_property (object_class, PROP_DOWNLOAD_FILENAME,
-                                   g_param_spec_string ("download-filename", "Download filename.", "The filename of the fully downloaded stream.",
-                                                        NULL,
-                                                        G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-  /**
-   * BaconVideoWidget:auto-resize:
-   *
-   * Whether to automatically resize the video widget to the video size when loading a new video.
-   **/
-  g_object_class_install_property (object_class, PROP_AUTO_RESIZE,
-                                   g_param_spec_boolean ("auto-resize", "Auto resize?",
-                                                         "Whether to automatically resize the video widget to the video size.", FALSE,
-                                                         G_PARAM_READWRITE |
-                                                         G_PARAM_STATIC_STRINGS));
-
-  /**
-   * BaconVideoWidget:deinterlacing:
-   *
-   * Whether to automatically deinterlace videos.
-   **/
-  g_object_class_install_property (object_class, PROP_DEINTERLACING,
-                                   g_param_spec_boolean ("deinterlacing", "Deinterlacing?",
-                                                         "Whether to automatically deinterlace videos.", FALSE,
-                                                         G_PARAM_READWRITE |
-                                                         G_PARAM_STATIC_STRINGS));
-
-  /**
-   * BaconVideoWidget:connection-speed:
-   *
-   * The connection speed to use when calculating how much of a network stream to buffer.
-   **/
-  g_object_class_install_property (object_class, PROP_CONNECTION_SPEED,
-                                   g_param_spec_enum ("connection-speed", "Connection speed",
-                                                      "The connection speed to use in calculating buffering streams.", BVW_TYPE_CONNECTION_SPEED,
-                                                      BVW_SPEED_LAN,
-                                                      G_PARAM_READWRITE |
-                                                      G_PARAM_STATIC_STRINGS));
-
-  /**
-   * BaconVideoWidget:visualization-quality:
-   *
-   * The size of the visualizations to display when playing audio.
-   **/
-  g_object_class_install_property (object_class, PROP_VISUALIZATION_QUALITY,
-                                   g_param_spec_enum ("visualization-quality", "Visualization quality",
-                                                      "The size of the visualizations to display when playing audio.", BVW_TYPE_VISUALIZATION_QUALITY,
-                                                      BVW_VISUALIZATION_SMALL,
-                                                      G_PARAM_READWRITE |
-                                                      G_PARAM_STATIC_STRINGS));
-
-  /**
-   * BaconVideoWidget:brightness:
-   *
-   * The brightness of the video display.
-   **/
-  g_object_class_install_property (object_class, PROP_BRIGHTNESS,
-                                   g_param_spec_int ("brightness", "Brightness",
-                                                      "The brightness of the video display.", 0, 65535, 32768,
-                                                      G_PARAM_READWRITE |
-                                                      G_PARAM_STATIC_STRINGS));
-
-  /**
-   * BaconVideoWidget:contrast:
-   *
-   * The contrast of the video display.
-   **/
-  g_object_class_install_property (object_class, PROP_CONTRAST,
-                                   g_param_spec_int ("contrast", "Contrast",
-                                                      "The contrast of the video display.", 0, 65535, 32768,
-                                                      G_PARAM_READWRITE |
-                                                      G_PARAM_STATIC_STRINGS));
-
-  /**
-   * BaconVideoWidget:saturation:
-   *
-   * The saturation of the video display.
-   **/
-  g_object_class_install_property (object_class, PROP_SATURATION,
-                                   g_param_spec_int ("saturation", "Saturation",
-                                                      "The saturation of the video display.", 0, 65535, 32768,
-                                                      G_PARAM_READWRITE |
-                                                      G_PARAM_STATIC_STRINGS));
-
-  /**
-   * BaconVideoWidget:hue:
-   *
-   * The hue of the video display.
-   **/
-  g_object_class_install_property (object_class, PROP_HUE,
-                                   g_param_spec_int ("hue", "Hue",
-                                                      "The hue of the video display.", 0, 65535, 32768,
-                                                      G_PARAM_READWRITE |
-                                                      G_PARAM_STATIC_STRINGS));
-
-  /**
-   * BaconVideoWidget:audio-output-type:
-   *
-   * The type of audio output to use (e.g. the number of channels).
-   **/
-  g_object_class_install_property (object_class, PROP_AUDIO_OUTPUT_TYPE,
-                                   g_param_spec_enum ("audio-output-type", "Audio output type",
-                                                      "The type of audio output to use.", BVW_TYPE_AUDIO_OUTPUT_TYPE,
-                                                      BVW_AUDIO_SOUND_STEREO,
-                                                      G_PARAM_READWRITE |
-                                                      G_PARAM_STATIC_STRINGS));
-
-  /* Signals */
-  /**
-   * BaconVideoWidget::error:
-   * @message: the error message
-   * @playback_stopped: %TRUE if playback has stopped due to the error, %FALSE otherwise
-   * @fatal: %TRUE if the error was fatal to playback, %FALSE otherwise
-   *
-   * Emitted when the backend wishes to asynchronously report an error. If @fatal is %TRUE,
-   * playback of this stream cannot be restarted.
-   **/
-  bvw_signals[SIGNAL_ERROR] =
-    g_signal_new (I_("error"),
-                  G_TYPE_FROM_CLASS (object_class),
-                  G_SIGNAL_RUN_LAST,
-                  G_STRUCT_OFFSET (BaconVideoWidgetClass, error),
-                  NULL, NULL,
-                  baconvideowidget_marshal_VOID__STRING_BOOLEAN_BOOLEAN,
-                  G_TYPE_NONE, 3, G_TYPE_STRING,
-                  G_TYPE_BOOLEAN, G_TYPE_BOOLEAN);
-
-  /**
-   * BaconVideoWidget::eos:
-   *
-   * Emitted when the end of the current stream is reached.
-   **/
-  bvw_signals[SIGNAL_EOS] =
-    g_signal_new (I_("eos"),
-                  G_TYPE_FROM_CLASS (object_class),
-                  G_SIGNAL_RUN_LAST,
-                  G_STRUCT_OFFSET (BaconVideoWidgetClass, eos),
-                  NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-
-  /**
-   * BaconVideoWidget::got-metadata:
-   *
-   * Emitted when the widget has updated the metadata of the current stream. This
-   * will typically happen just after opening a stream.
-   *
-   * Call bacon_video_widget_get_metadata() to query the updated metadata.
-   **/
-  bvw_signals[SIGNAL_GOT_METADATA] =
-    g_signal_new (I_("got-metadata"),
-                  G_TYPE_FROM_CLASS (object_class),
-                  G_SIGNAL_RUN_LAST,
-                  G_STRUCT_OFFSET (BaconVideoWidgetClass, got_metadata),
-                  NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-
-  /**
-   * BaconVideoWidget::got-redirect:
-   * @new_mrl: the new MRL
-   *
-   * Emitted when a redirect response is received from a stream's server.
-   **/
-  bvw_signals[SIGNAL_REDIRECT] =
-    g_signal_new (I_("got-redirect"),
-                  G_TYPE_FROM_CLASS (object_class),
-                  G_SIGNAL_RUN_LAST,
-                  G_STRUCT_OFFSET (BaconVideoWidgetClass, got_redirect),
-                  NULL, NULL, g_cclosure_marshal_VOID__STRING,
-                  G_TYPE_NONE, 1, G_TYPE_STRING);
-
-  /**
-   * BaconVideoWidget::channels-change:
-   *
-   * Emitted when the number of audio languages available changes, or when the
-   * selected audio language is changed.
-   *
-   * Query the new list of audio languages with bacon_video_widget_get_languages().
-   **/
-  bvw_signals[SIGNAL_CHANNELS_CHANGE] =
-    g_signal_new (I_("channels-change"),
-                  G_TYPE_FROM_CLASS (object_class),
-                  G_SIGNAL_RUN_LAST,
-                  G_STRUCT_OFFSET (BaconVideoWidgetClass, channels_change),
-                  NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-
-  /**
-   * BaconVideoWidget::tick:
-   * @current_time: the current position in the stream, in milliseconds since the beginning of the stream
-   * @stream_length: the length of the stream, in milliseconds
-   * @current_position: the current position in the stream, as a percentage between 0 and 1
-   * @seekable: %TRUE if the stream can be seeked, %FALSE otherwise
-   *
-   * Emitted every time an important time event happens, or at regular intervals when playing a stream.
-   **/
-  bvw_signals[SIGNAL_TICK] =
-    g_signal_new (I_("tick"),
-                  G_TYPE_FROM_CLASS (object_class),
-                  G_SIGNAL_RUN_LAST,
-                  G_STRUCT_OFFSET (BaconVideoWidgetClass, tick),
-                  NULL, NULL,
-                  baconvideowidget_marshal_VOID__INT64_INT64_DOUBLE_BOOLEAN,
-                  G_TYPE_NONE, 4, G_TYPE_INT64, G_TYPE_INT64, G_TYPE_DOUBLE,
-                  G_TYPE_BOOLEAN);
-
-  /**
-   * BaconVideoWidget::buffering:
-   * @percentage: the percentage of buffering completed, between 0 and 1
-   *
-   * Emitted regularly when a network stream is being buffered, to provide status updates on the buffering
-   * progress.
-   **/
-  bvw_signals[SIGNAL_BUFFERING] =
-    g_signal_new (I_("buffering"),
-                  G_TYPE_FROM_CLASS (object_class),
-                  G_SIGNAL_RUN_LAST,
-                  G_STRUCT_OFFSET (BaconVideoWidgetClass, buffering),
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT);
-
-  /**
-   * BaconVideoWidget::missing-plugins:
-   * @details: a %NULL-terminated array of missing plugin details for use when installing the plugins with libgimme-codec
-   * @descriptions: a %NULL-terminated array of missing plugin descriptions for display to the user
-   * @playing: %TRUE if the stream could be played even without these plugins, %FALSE otherwise
-   *
-   * Emitted when plugins required to play the current stream are not found. This allows the application
-   * to request the user install them before proceeding to try and play the stream again.
-   *
-   * Note that this signal is only available for the GStreamer backend.
-   *
-   * Return value: %TRUE if the signal was handled and some action was taken, %FALSE otherwise
-   **/
-  bvw_signals[SIGNAL_MISSING_PLUGINS] =
-    g_signal_new (I_("missing-plugins"),
-                  G_TYPE_FROM_CLASS (object_class),
-                  G_SIGNAL_RUN_LAST,
-                  0, /* signal is enough, we don't need a vfunc */
-                  bvw_boolean_handled_accumulator, NULL,
-                  baconvideowidget_marshal_BOOLEAN__BOXED_BOXED_BOOLEAN,
-                  G_TYPE_BOOLEAN, 3, G_TYPE_STRV, G_TYPE_STRV, G_TYPE_BOOLEAN);
-
-  /**
-   * BaconVideoWidget::download-buffering:
-   * @percentage: the percentage of download buffering completed, between 0 and 1
-   *
-   * Emitted regularly when a network stream is being cached on disk, to provide status
-   *  updates on the buffering level of the stream.
-   **/
-  bvw_signals[SIGNAL_DOWNLOAD_BUFFERING] =
-    g_signal_new ("download-buffering",
-                  G_TYPE_FROM_CLASS (object_class),
-                  G_SIGNAL_RUN_LAST,
-                  G_STRUCT_OFFSET (BaconVideoWidgetClass, download_buffering),
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__DOUBLE, G_TYPE_NONE, 1, G_TYPE_DOUBLE);
-}
-
-static void
-bacon_video_widget_init (BaconVideoWidget * bvw)
-{
-  BaconVideoWidgetPrivate *priv;
-
-  gtk_widget_set_can_focus (GTK_WIDGET (bvw), TRUE);
-
-  g_type_class_ref (BVW_TYPE_METADATA_TYPE);
-  g_type_class_ref (BVW_TYPE_DVD_EVENT);
-
-  bvw->priv = priv = G_TYPE_INSTANCE_GET_PRIVATE (bvw, BACON_TYPE_VIDEO_WIDGET, BaconVideoWidgetPrivate);
-
-  priv->update_id = 0;
-  priv->tagcache = NULL;
-  priv->audiotags = NULL;
-  priv->videotags = NULL;
-  priv->volume = -1.0;
-  priv->movie_par_n = priv->movie_par_d = 1;
-  priv->rate = FORWARD_RATE;
-
-  priv->tag_update_queue = g_async_queue_new_full ((GDestroyNotify) update_tags_delayed_data_destroy);
-  priv->tag_update_id = 0;
-
-#if GLIB_CHECK_VERSION (2, 31, 0)
-  g_mutex_init (&priv->seek_mutex);
-#else
-  priv->seek_mutex = g_mutex_new ();
-#endif
-  priv->clock = gst_system_clock_obtain ();
-  priv->seek_req_time = GST_CLOCK_TIME_NONE;
-  priv->seek_time = -1;
-
-  priv->missing_plugins = NULL;
-  priv->plugin_install_in_progress = FALSE;
-
-  priv->mount_cancellable = NULL;
-  priv->mount_in_progress = FALSE;
-  priv->auth_last_result = G_MOUNT_OPERATION_HANDLED;
-  priv->auth_dialog = NULL;
-
-  bacon_video_widget_gst_missing_plugins_blacklist ();
-}
-
-static gboolean bvw_query_timeout (BaconVideoWidget *bvw);
-static gboolean bvw_query_buffering_timeout (BaconVideoWidget *bvw);
-static void parse_stream_info (BaconVideoWidget *bvw);
-
-static void
-bvw_update_stream_info (BaconVideoWidget *bvw)
-{
-  parse_stream_info (bvw);
-
-  g_signal_emit (bvw, bvw_signals[SIGNAL_GOT_METADATA], 0, NULL);
-  g_signal_emit (bvw, bvw_signals[SIGNAL_CHANNELS_CHANGE], 0);
-}
-
-static void
-bvw_handle_application_message (BaconVideoWidget *bvw, GstMessage *msg)
-{
-  const gchar *msg_name;
-
-  msg_name = gst_structure_get_name (msg->structure);
-  g_return_if_fail (msg_name != NULL);
-
-  GST_DEBUG ("Handling application message: %" GST_PTR_FORMAT, msg->structure);
-
-  if (strcmp (msg_name, "stream-changed") == 0) {
-    bvw_update_stream_info (bvw);
-  }
-  else if (strcmp (msg_name, "video-size") == 0) {
-    int w, h;
-
-    g_signal_emit (bvw, bvw_signals[SIGNAL_GOT_METADATA], 0, NULL);
-
-    /* This is necessary for the pixel-aspect-ratio of the
-     * display to be taken into account. */
-    get_media_size (bvw, &w, &h);
-    clutter_actor_set_size (bvw->priv->texture, w, h);
-
-    if (bvw->priv->auto_resize
-	&& !bvw->priv->fullscreen_mode
-	&& !bvw->priv->window_resized) {
-      bacon_video_widget_set_scale_ratio (bvw, 0.0);
-    }
-    bvw->priv->window_resized = TRUE;
-    set_current_actor (bvw);
-  } else {
-    g_message ("Unhandled application message %s", msg_name);
-  }
-}
-
-static gboolean
-bvw_do_navigation_query (BaconVideoWidget * bvw, GstQuery *query)
-{
-  return gst_element_query (GST_ELEMENT_CAST (bvw->priv->navigation), query);
-}
-
-static void
-mount_cb (GObject *obj, GAsyncResult *res, gpointer user_data)
-{
-  BaconVideoWidget * bvw = user_data;
-  gboolean ret;
-  gchar *uri;
-  GError *error = NULL;
-
-  ret = g_file_mount_enclosing_volume_finish (G_FILE (obj), res, &error);
-
-  g_object_unref (bvw->priv->mount_cancellable);
-  bvw->priv->mount_cancellable = NULL;
-  bvw->priv->mount_in_progress = FALSE;
-
-  g_object_get (G_OBJECT (bvw->priv->play), "uri", &uri, NULL);
-
-  if (ret) {
-
-    GST_DEBUG ("Mounting location '%s' successful", GST_STR_NULL (uri));
-    if (bvw->priv->target_state == GST_STATE_PLAYING)
-      bacon_video_widget_play (bvw, NULL);
-  } else {
-    GError *err = NULL;
-    GstMessage *msg;
-
-    GST_DEBUG ("Mounting location '%s' failed: %s", GST_STR_NULL (uri), error->message);
-
-    /* create a fake GStreamer error so we get a nice warning message */
-    err = g_error_new_literal (GST_RESOURCE_ERROR, GST_RESOURCE_ERROR_OPEN_READ, error->message);
-    msg = gst_message_new_error (GST_OBJECT (bvw->priv->play), err, error->message);
-    g_error_free (err);
-    g_error_free (error);
-    err = bvw_error_from_gst_error (bvw, msg);
-    gst_message_unref (msg);
-    g_signal_emit (bvw, bvw_signals[SIGNAL_ERROR], 0, err->message, FALSE, FALSE);
-    g_error_free (err);
-  }
-
-  g_free (uri);
-}
-
-static void
-bvw_handle_element_message (BaconVideoWidget *bvw, GstMessage *msg)
-{
-  const gchar *type_name = NULL;
-  gchar *src_name;
-
-  src_name = gst_object_get_name (msg->src);
-  if (msg->structure)
-    type_name = gst_structure_get_name (msg->structure);
-
-  GST_DEBUG ("from %s: %" GST_PTR_FORMAT, src_name, msg->structure);
-
-  if (type_name == NULL)
-    goto unhandled;
-
-  if (strcmp (type_name, "redirect") == 0) {
-    const gchar *new_location;
-
-    new_location = gst_structure_get_string (msg->structure, "new-location");
-    GST_DEBUG ("Got redirect to '%s'", GST_STR_NULL (new_location));
-
-    if (new_location && *new_location) {
-      g_signal_emit (bvw, bvw_signals[SIGNAL_REDIRECT], 0, new_location);
-      goto done;
-    }
-  } else if (strcmp (type_name, "progress") == 0) {
-    /* this is similar to buffering messages, but shouldn't affect pipeline
-     * state; qtdemux emits those when headers are after movie data and
-     * it is in streaming mode and has to receive all the movie data first */
-    if (!bvw->priv->buffering) {
-      gint percent = 0;
-
-      if (gst_structure_get_int (msg->structure, "percent", &percent))
-        g_signal_emit (bvw, bvw_signals[SIGNAL_BUFFERING], 0, percent);
-    }
-    goto done;
-  } else if (gst_is_missing_plugin_message (msg)) {
-    bvw->priv->missing_plugins =
-      g_list_prepend (bvw->priv->missing_plugins, gst_message_ref (msg));
-    goto done;
-  } else if (strcmp (type_name, "not-mounted") == 0) {
-    const GValue *val;
-    GFile *file;
-    GMountOperation *mount_op;
-    GtkWidget *toplevel;
-    gchar *uri;
-
-    g_object_get (G_OBJECT (bvw->priv->play), "uri", &uri, NULL);
-
-    if (bvw->priv->mount_in_progress) {
-      g_cancellable_cancel (bvw->priv->mount_cancellable);
-      g_object_unref (bvw->priv->mount_cancellable);
-      bvw->priv->mount_cancellable = NULL;
-      bvw->priv->mount_in_progress = FALSE;
-    }
-
-    GST_DEBUG ("Trying to mount location '%s'", GST_STR_NULL (uri));
-    g_free (uri);
-    
-    toplevel = gtk_widget_get_toplevel (GTK_WIDGET (bvw));
-    if (toplevel == GTK_WIDGET (bvw) || !GTK_IS_WINDOW (toplevel))
-      toplevel = NULL;
-
-    val = gst_structure_get_value (msg->structure, "file");
-    if (val == NULL)
-      goto done;
-      
-    file = G_FILE (g_value_get_object (val));
-    if (file == NULL)
-      goto done;
-
-    bacon_video_widget_stop (bvw);
-
-    mount_op = gtk_mount_operation_new (toplevel ? GTK_WINDOW (toplevel) : NULL);
-    bvw->priv->mount_in_progress = TRUE;
-    bvw->priv->mount_cancellable = g_cancellable_new ();
-    g_file_mount_enclosing_volume (file, G_MOUNT_MOUNT_NONE,
-        mount_op, bvw->priv->mount_cancellable, mount_cb, bvw);
-
-    g_object_unref (mount_op);
-    goto done;
-  } else {
-    GstNavigationMessageType nav_msg_type =
-        gst_navigation_message_get_type (msg);
-
-    switch (nav_msg_type) {
-      case GST_NAVIGATION_MESSAGE_MOUSE_OVER: {
-        gint active;
-        if (!gst_navigation_message_parse_mouse_over (msg, &active))
-          break;
-        if (active) {
-          if (bvw->priv->cursor == NULL) {
-            bvw->priv->cursor = gdk_cursor_new (GDK_HAND2);
-          }
-        } else {
-          if (bvw->priv->cursor != NULL) {
-            g_object_unref (bvw->priv->cursor);
-            bvw->priv->cursor = NULL;
-          }
-        }
-        gdk_window_set_cursor (gtk_widget_get_window (GTK_WIDGET(bvw)),
-            bvw->priv->cursor);
-        goto done;
-      }
-      case GST_NAVIGATION_MESSAGE_COMMANDS_CHANGED: {
-        GstQuery *cmds_q = gst_navigation_query_new_commands();
-        gboolean res = bvw_do_navigation_query (bvw, cmds_q);
-
-        if (res) {
-          gboolean is_menu = FALSE;
-	  gboolean has_angles = FALSE;
-          guint i, n;
-
-          if (gst_navigation_query_parse_commands_length (cmds_q, &n)) {
-            for (i = 0; i < n; i++) {
-              GstNavigationCommand cmd;
-              if (!gst_navigation_query_parse_commands_nth (cmds_q, i, &cmd))
-                break;
-              is_menu |= (cmd == GST_NAVIGATION_COMMAND_ACTIVATE);
-              is_menu |= (cmd == GST_NAVIGATION_COMMAND_LEFT);
-              is_menu |= (cmd == GST_NAVIGATION_COMMAND_RIGHT);
-              is_menu |= (cmd == GST_NAVIGATION_COMMAND_UP);
-              is_menu |= (cmd == GST_NAVIGATION_COMMAND_DOWN);
-
-	      has_angles |= (cmd == GST_NAVIGATION_COMMAND_PREV_ANGLE);
-	      has_angles |= (cmd == GST_NAVIGATION_COMMAND_NEXT_ANGLE);
-            }
-          }
-	  /* Are we in a menu now? */
-	  if (bvw->priv->is_menu != is_menu) {
-	    bvw->priv->is_menu = is_menu;
-	    g_object_notify (G_OBJECT (bvw), "seekable");
-	  }
-	  /* Do we have angle switching now? */
-	  if (bvw->priv->has_angles != has_angles) {
-	    bvw->priv->has_angles = has_angles;
-	    g_signal_emit (bvw, bvw_signals[SIGNAL_CHANNELS_CHANGE], 0);
-	  }
-        }
-
-        gst_query_unref (cmds_q);
-        goto done;
-      }
-      case GST_NAVIGATION_MESSAGE_ANGLES_CHANGED:
-      case GST_NAVIGATION_MESSAGE_INVALID:
-        goto unhandled;
-      default:
-        break;
-    }
-  }
-
-unhandled:
-  GST_WARNING ("Unhandled element message %s from %s: %" GST_PTR_FORMAT,
-      GST_STR_NULL (type_name), GST_STR_NULL (src_name), msg);
-
-done:
-  g_free (src_name);
-}
-
-/* This is a hack to avoid doing poll_for_state_change() indirectly
- * from the bus message callback (via EOS => totem => close => wait for READY)
- * and deadlocking there. We need something like a
- * gst_bus_set_auto_flushing(bus, FALSE) ... */
-static gboolean
-bvw_signal_eos_delayed (gpointer user_data)
-{
-  BaconVideoWidget *bvw = BACON_VIDEO_WIDGET (user_data);
-
-  g_signal_emit (bvw, bvw_signals[SIGNAL_EOS], 0, NULL);
-  bvw->priv->eos_id = 0;
-  return FALSE;
-}
-
-static void
-bvw_reconfigure_tick_timeout (BaconVideoWidget *bvw, guint msecs)
-{
-  if (bvw->priv->update_id != 0) {
-    GST_DEBUG ("removing tick timeout");
-    g_source_remove (bvw->priv->update_id);
-    bvw->priv->update_id = 0;
-  }
-  if (msecs > 0) {
-    GST_DEBUG ("adding tick timeout (at %ums)", msecs);
-    bvw->priv->update_id =
-      g_timeout_add (msecs, (GSourceFunc) bvw_query_timeout, bvw);
-  }
-}
-
-static void
-bvw_reconfigure_fill_timeout (BaconVideoWidget *bvw, guint msecs)
-{
-  if (bvw->priv->fill_id != 0) {
-    GST_DEBUG ("removing fill timeout");
-    g_source_remove (bvw->priv->fill_id);
-    bvw->priv->fill_id = 0;
-  }
-  if (msecs > 0) {
-    GST_DEBUG ("adding fill timeout (at %ums)", msecs);
-    bvw->priv->fill_id =
-      g_timeout_add (msecs, (GSourceFunc) bvw_query_buffering_timeout, bvw);
-  }
-}
-
-/* returns TRUE if the error/signal has been handled and should be ignored */
-static gboolean
-bvw_emit_missing_plugins_signal (BaconVideoWidget * bvw, gboolean prerolled)
-{
-  gboolean handled = FALSE;
-  gchar **descriptions, **details;
-
-  details = bvw_get_missing_plugins_details (bvw->priv->missing_plugins);
-  descriptions = bvw_get_missing_plugins_descriptions (bvw->priv->missing_plugins);
-
-  GST_LOG ("emitting missing-plugins signal (prerolled=%d)", prerolled);
-
-  g_signal_emit (bvw, bvw_signals[SIGNAL_MISSING_PLUGINS], 0,
-      details, descriptions, prerolled, &handled);
-  GST_DEBUG ("missing-plugins signal was %shandled", (handled) ? "" : "not ");
-
-  g_strfreev (descriptions);
-  g_strfreev (details);
-
-  if (handled) {
-    bvw->priv->plugin_install_in_progress = TRUE;
-    bvw_clear_missing_plugins_messages (bvw);
-  }
-
-  /* if it wasn't handled, we might need the list of missing messages again
-   * later to create a proper error message with details of what's missing */
-
-  return handled;
-}
-
-static void
-bvw_auth_reply_cb (GMountOperation      *op,
-		   GMountOperationResult result,
-		   BaconVideoWidget     *bvw)
-{
-  GST_DEBUG ("Got authentication reply %d", result);
-  bvw->priv->auth_last_result = result;
-
-  if (result == G_MOUNT_OPERATION_HANDLED) {
-    bvw->priv->user_id = g_strdup (g_mount_operation_get_username (op));
-    bvw->priv->user_pw = g_strdup (g_mount_operation_get_password (op));
-  }
-
-  g_object_unref (bvw->priv->auth_dialog);
-  bvw->priv->auth_dialog = NULL;
-
-  if (bvw->priv->target_state == GST_STATE_PLAYING) {
-    GST_DEBUG ("Starting deferred playback after authentication");
-    bacon_video_widget_play (bvw, NULL);
-  }
-}
-
-/* returns TRUE if the error should be ignored */
-static gboolean
-bvw_check_missing_auth (BaconVideoWidget * bvw, GstMessage * err_msg)
-{
-  gboolean retval;
-
-  retval = FALSE;
-
-  if (gtk_widget_get_realized (GTK_WIDGET (bvw)) == FALSE)
-    return retval;
-
-  /* The user already tried, and we aborted */
-  if (bvw->priv->auth_last_result == G_MOUNT_OPERATION_ABORTED) {
-    GST_DEBUG ("Not authenticating, the user aborted the last auth attempt");
-    return retval;
-  }
-  /* There's already an auth on-going, ignore */
-  if (bvw->priv->auth_dialog != NULL) {
-    GST_DEBUG ("Ignoring error, we're doing authentication");
-    return TRUE;
-  }
-
-  /* RTSP or HTTP source with user-id property ? */
-  if ((g_strcmp0 ("GstRTSPSrc", G_OBJECT_TYPE_NAME (err_msg->src)) == 0 ||
-       g_strcmp0 ("GstSoupHTTPSrc", G_OBJECT_TYPE_NAME (err_msg->src)) == 0) &&
-      g_object_class_find_property (G_OBJECT_GET_CLASS (err_msg->src), "user-id") != NULL) {
-    GError *err = NULL;
-    gchar *dbg = NULL;
-
-    gst_message_parse_error (err_msg, &err, &dbg);
-
-    /* Urgh! Check whether this is an auth error */
-    if (err != NULL && dbg != NULL &&
-	is_error (err, RESOURCE, READ) &&
-	strstr (dbg, "401") != NULL) {
-      GtkWidget *toplevel;
-      GMountOperationClass *klass;
-
-      GST_DEBUG ("Trying to get auth for location '%s'", GST_STR_NULL (bvw->priv->mrl));
-
-      if (bvw->priv->auth_dialog == NULL) {
-	toplevel = gtk_widget_get_toplevel (GTK_WIDGET (bvw));
-	bvw->priv->auth_dialog = gtk_mount_operation_new (GTK_WINDOW (toplevel));
-	g_signal_connect (G_OBJECT (bvw->priv->auth_dialog), "reply",
-			  G_CALLBACK (bvw_auth_reply_cb), bvw);
-      }
-
-      /* And popup the dialogue! */
-      klass = (GMountOperationClass *) G_OBJECT_GET_CLASS (bvw->priv->auth_dialog);
-      klass->ask_password (bvw->priv->auth_dialog,
-			   _("Password requested for RTSP server"),
-			   g_get_user_name (),
-			   NULL,
-			   G_ASK_PASSWORD_NEED_PASSWORD | G_ASK_PASSWORD_NEED_USERNAME);
-      retval = TRUE;
-    }
-    if (err != NULL)
-      g_error_free (err);
-    g_free (dbg);
-  }
-
-  return retval;
-}
-
-/* returns TRUE if the error has been handled and should be ignored */
-static gboolean
-bvw_check_missing_plugins_error (BaconVideoWidget * bvw, GstMessage * err_msg)
-{
-  gboolean error_src_is_playbin;
-  gboolean ret = FALSE;
-  GError *err = NULL;
-
-  if (bvw->priv->missing_plugins == NULL) {
-    GST_DEBUG ("no missing-plugin messages");
-    return FALSE;
-  }
-
-  gst_message_parse_error (err_msg, &err, NULL);
-
-  error_src_is_playbin = (err_msg->src == GST_OBJECT_CAST (bvw->priv->play));
-
-  /* If we get a WRONG_TYPE error from playbin itself it's most likely because
-   * there is a subtitle stream we can decode, but no video stream to overlay
-   * it on. Since there were missing-plugins messages, we'll assume this is
-   * because we cannot decode the video stream (this should probably be fixed
-   * in playbin, but for now we'll work around it here) */
-  if (is_error (err, CORE, MISSING_PLUGIN) ||
-      is_error (err, STREAM, CODEC_NOT_FOUND) ||
-      (is_error (err, STREAM, WRONG_TYPE) && error_src_is_playbin)) {
-    ret = bvw_emit_missing_plugins_signal (bvw, FALSE);
-    if (ret) {
-      /* If it was handled, stop playback to make sure we're not processing any
-       * other error messages that might also be on the bus */
-      bacon_video_widget_stop (bvw);
-    }
-  } else {
-    GST_DEBUG ("not an error code we are looking for, doing nothing");
-  }
-
-  g_error_free (err);
-  return ret;
-}
-
-/* returns TRUE if the error/signal has been handled and should be ignored */
-static gboolean
-bvw_check_missing_plugins_on_preroll (BaconVideoWidget * bvw)
-{
-  if (bvw->priv->missing_plugins == NULL) {
-    GST_DEBUG ("no missing-plugin messages");
-    return FALSE;
-  }
-
-  return bvw_emit_missing_plugins_signal (bvw, TRUE); 
-}
-
-static void
-bvw_update_tags (BaconVideoWidget * bvw, GstTagList *tag_list, const gchar *type)
-{
-  GstTagList **cache = NULL;
-  GstTagList *result;
-
-  GST_DEBUG ("Tags: %" GST_PTR_FORMAT, tag_list);
-
-  /* all tags (replace previous tags, title/artist/etc. might change
-   * in the middle of a stream, e.g. with radio streams) */
-  result = gst_tag_list_merge (bvw->priv->tagcache, tag_list,
-                                   GST_TAG_MERGE_REPLACE);
-  if (bvw->priv->tagcache)
-    gst_tag_list_free (bvw->priv->tagcache);
-  bvw->priv->tagcache = result;
-
-  /* media-type-specific tags */
-  if (!strcmp (type, "video")) {
-    cache = &bvw->priv->videotags;
-  } else if (!strcmp (type, "audio")) {
-    cache = &bvw->priv->audiotags;
-  }
-
-  if (cache) {
-    result = gst_tag_list_merge (*cache, tag_list, GST_TAG_MERGE_REPLACE);
-    if (*cache)
-      gst_tag_list_free (*cache);
-    *cache = result;
-  }
-
-  /* clean up */
-  if (tag_list)
-    gst_tag_list_free (tag_list);
-
-  bvw_check_for_cover_pixbuf (bvw);
-
-  g_signal_emit (bvw, bvw_signals[SIGNAL_GOT_METADATA], 0);
-
-  set_current_actor (bvw);
-}
-
-static void
-update_tags_delayed_data_destroy (UpdateTagsDelayedData *data)
-{
-  g_slice_free (UpdateTagsDelayedData, data);
-}
-
-static gboolean
-bvw_update_tags_dispatcher (BaconVideoWidget *self)
-{
-  UpdateTagsDelayedData *data;
-
-  /* If we take the queue's lock for the entire function call, we can use it to protect tag_update_id too */
-  g_async_queue_lock (self->priv->tag_update_queue);
-
-  while ((data = g_async_queue_try_pop_unlocked (self->priv->tag_update_queue)) != NULL) {
-    bvw_update_tags (self, data->tags, data->type);
-    update_tags_delayed_data_destroy (data);
-  }
-
-  self->priv->tag_update_id = 0;
-  g_async_queue_unlock (self->priv->tag_update_queue);
-
-  return FALSE;
-}
-
-/* Marshal the changed tags to the main thread for updating the GUI
- * and sending the BVW signals */
-static void
-bvw_update_tags_delayed (BaconVideoWidget *bvw, GstTagList *tags, const gchar *type) {
-  UpdateTagsDelayedData *data = g_slice_new0 (UpdateTagsDelayedData);
-
-  data->tags = tags;
-  data->type = type;
-
-  g_async_queue_lock (bvw->priv->tag_update_queue);
-  g_async_queue_push_unlocked (bvw->priv->tag_update_queue, data);
-
-  if (bvw->priv->tag_update_id == 0)
-    bvw->priv->tag_update_id = g_idle_add ((GSourceFunc) bvw_update_tags_dispatcher, bvw);
-
-  g_async_queue_unlock (bvw->priv->tag_update_queue);
-}
-
-static void
-video_tags_changed_cb (GstElement *playbin2, gint stream_id, gpointer user_data)
-{
-  BaconVideoWidget *bvw = (BaconVideoWidget *) user_data;
-  GstTagList *tags = NULL;
-  gint current_stream_id = 0;
-
-  g_object_get (G_OBJECT (bvw->priv->play), "current-video", ¤t_stream_id, NULL);
-
-  /* Only get the updated tags if it's for our current stream id */
-  if (current_stream_id != stream_id)
-    return;
-
-  g_signal_emit_by_name (G_OBJECT (bvw->priv->play), "get-video-tags", stream_id, &tags);
-
-  if (tags)
-    bvw_update_tags_delayed (bvw, tags, "video");
-}
-
-static void
-audio_tags_changed_cb (GstElement *playbin2, gint stream_id, gpointer user_data)
-{
-  BaconVideoWidget *bvw = (BaconVideoWidget *) user_data;
-  GstTagList *tags = NULL;
-  gint current_stream_id = 0;
-
-  g_object_get (G_OBJECT (bvw->priv->play), "current-audio", ¤t_stream_id, NULL);
-
-  /* Only get the updated tags if it's for our current stream id */
-  if (current_stream_id != stream_id)
-    return;
-
-  g_signal_emit_by_name (G_OBJECT (bvw->priv->play), "get-audio-tags", stream_id, &tags);
-
-  if (tags)
-    bvw_update_tags_delayed (bvw, tags, "audio");
-}
-
-static void
-text_tags_changed_cb (GstElement *playbin2, gint stream_id, gpointer user_data)
-{
-  BaconVideoWidget *bvw = (BaconVideoWidget *) user_data;
-  GstTagList *tags = NULL;
-  gint current_stream_id = 0;
-
-  g_object_get (G_OBJECT (bvw->priv->play), "current-text", ¤t_stream_id, NULL);
-
-  /* Only get the updated tags if it's for our current stream id */
-  if (current_stream_id != stream_id)
-    return;
-
-  g_signal_emit_by_name (G_OBJECT (bvw->priv->play), "get-text-tags", stream_id, &tags);
-
-  if (tags)
-    bvw_update_tags_delayed (bvw, tags, "text");
-}
-
-static gboolean
-bvw_download_buffering_done (BaconVideoWidget *bvw)
-{
-  /* When we set buffering left to 0, that means it's ready to play */
-  if (bvw->priv->buffering_left == 0) {
-    GST_DEBUG ("Buffering left is 0, so buffering done");
-    return TRUE;
-  }
-  if (bvw->priv->stream_length <= 0)
-    return FALSE;
-  /* When queue2 doesn't implement buffering-left, always think
-   * it's ready to go */
-  if (bvw->priv->buffering_left < 0) {
-    GST_DEBUG ("Buffering left not implemented, so buffering done");
-    return TRUE;
-  }
-
-  if (bvw->priv->buffering_left * 1.1 < bvw->priv->stream_length) {
-    GST_DEBUG ("Buffering left: %lld * 1.1 = %lld < %lld",
-	       bvw->priv->buffering_left, bvw->priv->buffering_left * 1.1,
-	       bvw->priv->stream_length);
-    return TRUE;
-  }
-  return FALSE;
-}
-
-static void
-bvw_handle_buffering_message (GstMessage * message, BaconVideoWidget *bvw)
-{
-  GstBufferingMode mode;
-  gint percent = 0;
-
-   gst_message_parse_buffering_stats (message, &mode, NULL, NULL, NULL);
-   if (mode == GST_BUFFERING_DOWNLOAD) {
-     if (bvw->priv->download_buffering == FALSE) {
-       bvw->priv->download_buffering = TRUE;
-
-       /* We're not ready to play yet, so pause the stream */
-       GST_DEBUG ("Pausing because we're not ready to play the buffer yet");
-       gst_element_set_state (GST_ELEMENT (bvw->priv->play), GST_STATE_PAUSED);
-
-       bvw_reconfigure_fill_timeout (bvw, 200);
-     }
-     bvw->priv->download_buffering_element = g_object_ref (message->src);
-
-     return;
-   }
-
-   /* We switched from download mode to normal buffering */
-   if (bvw->priv->download_buffering != FALSE) {
-     bvw_reconfigure_fill_timeout (bvw, 0);
-     bvw->priv->download_buffering = FALSE;
-     g_free (bvw->priv->download_filename);
-     bvw->priv->download_filename = NULL;
-   }
-
-   /* Live, timeshift and stream buffering modes */
-  gst_message_parse_buffering (message, &percent);
-  g_signal_emit (bvw, bvw_signals[SIGNAL_BUFFERING], 0, percent);
-
-  if (percent >= 100) {
-    /* a 100% message means buffering is done */
-    bvw->priv->buffering = FALSE;
-    /* if the desired state is playing, go back */
-    if (bvw->priv->target_state == GST_STATE_PLAYING) {
-      GST_DEBUG ("Buffering done, setting pipeline back to PLAYING");
-      bacon_video_widget_play (bvw, NULL);
-    } else {
-      GST_DEBUG ("Buffering done, keeping pipeline PAUSED");
-    }
-  } else if (bvw->priv->target_state == GST_STATE_PLAYING) {
-    GstState cur_state;
-
-    gst_element_get_state (bvw->priv->play, &cur_state, NULL, 0);
-    if (cur_state != GST_STATE_PAUSED) {
-      GST_DEBUG ("Buffering ... temporarily pausing playback");
-      gst_element_set_state (bvw->priv->play, GST_STATE_PAUSED);
-    } else {
-      GST_LOG ("Buffering (already paused) ... %d", percent);
-    }
-    bvw->priv->buffering = TRUE;
-  } else {
-    GST_LOG ("Buffering ... %d", percent);
-  }
-}
-
-static void
-bvw_bus_message_cb (GstBus * bus, GstMessage * message, gpointer data)
-{
-  BaconVideoWidget *bvw = (BaconVideoWidget *) data;
-  GstMessageType msg_type;
-
-  g_return_if_fail (bvw != NULL);
-  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
-
-  msg_type = GST_MESSAGE_TYPE (message);
-
-  if (msg_type != GST_MESSAGE_STATE_CHANGED) {
-    gchar *src_name = gst_object_get_name (message->src);
-    GST_LOG ("Handling %s message from element %s",
-        gst_message_type_get_name (msg_type), src_name);
-    g_free (src_name);
-  }
-
-  switch (msg_type) {
-    case GST_MESSAGE_ERROR: {
-      totem_gst_message_print (message, bvw->priv->play, "totem-error");
-
-      if (!bvw_check_missing_plugins_error (bvw, message) &&
-	  !bvw_check_missing_auth (bvw, message)) {
-        GError *error;
-
-        error = bvw_error_from_gst_error (bvw, message);
-
-        bvw->priv->target_state = GST_STATE_NULL;
-        if (bvw->priv->play)
-          gst_element_set_state (bvw->priv->play, GST_STATE_NULL);
-
-        bvw->priv->buffering = FALSE;
-
-        g_signal_emit (bvw, bvw_signals[SIGNAL_ERROR], 0,
-                       error->message, TRUE, FALSE);
-
-        g_error_free (error);
-      }
-      break;
-    }
-    case GST_MESSAGE_WARNING: {
-      GST_WARNING ("Warning message: %" GST_PTR_FORMAT, message);
-      break;
-    }
-    case GST_MESSAGE_TAG: 
-      /* Ignore TAG messages, we get updated tags from the
-       * {audio,video,text}-tags-changed signals of playbin2
-       */
-      break;
-    case GST_MESSAGE_EOS:
-      GST_DEBUG ("EOS message");
-      /* update slider one last time */
-      bvw_query_timeout (bvw);
-      if (bvw->priv->eos_id == 0)
-        bvw->priv->eos_id = g_idle_add (bvw_signal_eos_delayed, bvw);
-      break;
-    case GST_MESSAGE_BUFFERING:
-      bvw_handle_buffering_message (message, bvw);
-      break;
-    case GST_MESSAGE_APPLICATION: {
-      bvw_handle_application_message (bvw, message);
-      break;
-    }
-    case GST_MESSAGE_STATE_CHANGED: {
-      GstState old_state, new_state;
-      gchar *src_name;
-
-      gst_message_parse_state_changed (message, &old_state, &new_state, NULL);
-
-      if (old_state == new_state)
-        break;
-
-      /* we only care about playbin (pipeline) state changes */
-      if (GST_MESSAGE_SRC (message) != GST_OBJECT (bvw->priv->play))
-        break;
-
-      src_name = gst_object_get_name (message->src);
-      GST_DEBUG ("%s changed state from %s to %s", src_name,
-          gst_element_state_get_name (old_state),
-          gst_element_state_get_name (new_state));
-      g_free (src_name);
-
-      /* now do stuff */
-      if (new_state <= GST_STATE_PAUSED) {
-        bvw_query_timeout (bvw);
-        bvw_reconfigure_tick_timeout (bvw, 0);
-      } else if (new_state > GST_STATE_PAUSED) {
-        bvw_reconfigure_tick_timeout (bvw, 200);
-      }
-
-      if (old_state == GST_STATE_READY && new_state == GST_STATE_PAUSED) {
-        GST_DEBUG_BIN_TO_DOT_FILE (GST_BIN_CAST (bvw->priv->play),
-            GST_DEBUG_GRAPH_SHOW_ALL ^ GST_DEBUG_GRAPH_SHOW_NON_DEFAULT_PARAMS,
-            "totem-prerolled");
-	bacon_video_widget_get_stream_length (bvw);
-        bvw_update_stream_info (bvw);
-        if (!bvw_check_missing_plugins_on_preroll (bvw)) {
-          /* show a non-fatal warning message if we can't decode the video */
-          bvw_check_if_video_decoder_is_missing (bvw);
-        }
-	/* Now that we have the length, check whether we wanted
-	 * to pause or to stop the pipeline */
-        if (bvw->priv->target_state == GST_STATE_PAUSED)
-	  bacon_video_widget_pause (bvw);
-      } else if (old_state == GST_STATE_PAUSED && new_state == GST_STATE_READY) {
-        bvw->priv->media_has_video = FALSE;
-        bvw->priv->media_has_audio = FALSE;
-
-        /* clean metadata cache */
-        if (bvw->priv->tagcache) {
-          gst_tag_list_free (bvw->priv->tagcache);
-          bvw->priv->tagcache = NULL;
-        }
-        if (bvw->priv->audiotags) {
-          gst_tag_list_free (bvw->priv->audiotags);
-          bvw->priv->audiotags = NULL;
-        }
-        if (bvw->priv->videotags) {
-          gst_tag_list_free (bvw->priv->videotags);
-          bvw->priv->videotags = NULL;
-        }
-
-        bvw->priv->video_width = 0;
-        bvw->priv->video_height = 0;
-      }
-      break;
-    }
-    case GST_MESSAGE_ELEMENT:{
-      bvw_handle_element_message (bvw, message);
-      break;
-    }
-
-    case GST_MESSAGE_DURATION: {
-      /* force _get_stream_length() to do new duration query */
-      bvw->priv->stream_length = 0;
-      if (bacon_video_widget_get_stream_length (bvw) == 0) {
-        GST_DEBUG ("Failed to query duration after DURATION message?!");
-      }
-      break;
-    }
-
-    case GST_MESSAGE_ASYNC_DONE: {
-	gint64 _time;
-	/* When a seek has finished, set the playing state again */
-#if GLIB_CHECK_VERSION (2, 31, 0)
-	g_mutex_lock (&bvw->priv->seek_mutex);
-#else
-	g_mutex_lock (bvw->priv->seek_mutex);
-#endif
-
-	bvw->priv->seek_req_time = gst_clock_get_internal_time (bvw->priv->clock);
-	_time = bvw->priv->seek_time;
-	bvw->priv->seek_time = -1;
-
-#if GLIB_CHECK_VERSION (2, 31, 0)
-	g_mutex_unlock (&bvw->priv->seek_mutex);
-#else
-	g_mutex_unlock (bvw->priv->seek_mutex);
-#endif
-
-	if (_time >= 0) {
-	  GST_DEBUG ("Have an old seek to schedule, doing it now");
-	  bacon_video_widget_seek_time_no_lock (bvw, _time, 0, NULL);
-	}
-      break;
-    }
-
-    /* FIXME: at some point we might want to handle CLOCK_LOST and set the
-     * pipeline back to PAUSED and then PLAYING again to select a different
-     * clock (this seems to trip up rtspsrc though so has to wait until
-     * rtspsrc gets fixed) */
-    case GST_MESSAGE_CLOCK_PROVIDE:
-    case GST_MESSAGE_CLOCK_LOST:
-    case GST_MESSAGE_NEW_CLOCK:
-    case GST_MESSAGE_STATE_DIRTY:
-    case GST_MESSAGE_STREAM_STATUS:
-      break;
-
-    case GST_MESSAGE_UNKNOWN:
-    case GST_MESSAGE_INFO:
-    case GST_MESSAGE_STEP_DONE:
-    case GST_MESSAGE_STRUCTURE_CHANGE:
-    case GST_MESSAGE_SEGMENT_START:
-    case GST_MESSAGE_SEGMENT_DONE:
-    case GST_MESSAGE_LATENCY:
-    case GST_MESSAGE_ASYNC_START:
-    case GST_MESSAGE_REQUEST_STATE:
-    case GST_MESSAGE_STEP_START:
-    case GST_MESSAGE_QOS:
-    case GST_MESSAGE_PROGRESS:
-    case GST_MESSAGE_ANY:
-    default:
-      GST_LOG ("Unhandled message: %" GST_PTR_FORMAT, message);
-      break;
-  }
-}
-
-static void
-got_video_size (BaconVideoWidget * bvw)
-{
-  GstMessage *msg;
-
-  g_return_if_fail (bvw != NULL);
-  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
-
-  msg = gst_message_new_application (GST_OBJECT (bvw->priv->play),
-      gst_structure_new ("video-size", "width", G_TYPE_INT,
-          bvw->priv->video_width, "height", G_TYPE_INT,
-          bvw->priv->video_height, NULL));
-  gst_element_post_message (bvw->priv->play, msg);
-}
-
-static void
-got_time_tick (GstElement * play, gint64 time_nanos, BaconVideoWidget * bvw)
-{
-  gboolean seekable;
-
-  g_return_if_fail (bvw != NULL);
-  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
-
-  bvw->priv->current_time = (gint64) time_nanos / GST_MSECOND;
-
-  if (bvw->priv->stream_length == 0) {
-    bvw->priv->current_position = 0;
-  } else {
-    bvw->priv->current_position =
-      (gdouble) bvw->priv->current_time / bvw->priv->stream_length;
-  }
-
-  if (bvw->priv->stream_length == 0) {
-    seekable = bacon_video_widget_is_seekable (bvw);
-  } else {
-    if (bvw->priv->seekable == -1)
-      g_object_notify (G_OBJECT (bvw), "seekable");
-    seekable = TRUE;
-  }
-
-  bvw->priv->is_live = (bvw->priv->stream_length == 0);
-
-/*
-  GST_DEBUG ("%" GST_TIME_FORMAT ",%" GST_TIME_FORMAT " %s",
-      GST_TIME_ARGS (bvw->priv->current_time),
-      GST_TIME_ARGS (bvw->priv->stream_length),
-      (seekable) ? "TRUE" : "FALSE");
-*/
-  
-  g_signal_emit (bvw, bvw_signals[SIGNAL_TICK], 0,
-                 bvw->priv->current_time, bvw->priv->stream_length,
-                 bvw->priv->current_position,
-                 seekable);
-}
-
-static void
-bvw_set_device_on_element (BaconVideoWidget * bvw, GstElement * element)
-{
-  if (bvw->priv->media_device == NULL)
-    return;
-
-  if (g_object_class_find_property (G_OBJECT_GET_CLASS (element), "device")) {
-    GST_DEBUG ("Setting device to '%s'", bvw->priv->media_device);
-    g_object_set (element, "device", bvw->priv->media_device, NULL);
-  }
-}
-
-static void
-bvw_set_user_agent_on_element (BaconVideoWidget * bvw, GstElement * element)
-{
-  BaconVideoWidgetPrivate *priv = bvw->priv;
-  const char *user_agent;
-
-  if (g_object_class_find_property (G_OBJECT_GET_CLASS (element), "user-agent") == NULL)
-    return;
-
-  user_agent = priv->user_agent ? priv->user_agent : DEFAULT_USER_AGENT;
-  GST_DEBUG ("Setting HTTP user-agent to '%s'", user_agent);
-  g_object_set (element, "user-agent", user_agent, NULL);
-}
-
-static void
-bvw_set_auth_on_element (BaconVideoWidget * bvw, GstElement * element)
-{
-  if (g_object_class_find_property (G_OBJECT_GET_CLASS (element), "user-id") == NULL)
-    return;
-  if (bvw->priv->auth_last_result != G_MOUNT_OPERATION_HANDLED)
-    return;
-  if (bvw->priv->user_id == NULL || bvw->priv->user_pw == NULL)
-    return;
-
-  GST_DEBUG ("Setting username and password");
-  g_object_set (element,
-		"user-id", bvw->priv->user_id,
-		"user-pw", bvw->priv->user_pw,
-		NULL);
-
-  g_free (bvw->priv->user_id);
-  bvw->priv->user_id = NULL;
-  g_free (bvw->priv->user_pw);
-  bvw->priv->user_pw = NULL;
-}
-
-static void
-bvw_set_referrer_on_element (BaconVideoWidget * bvw, GstElement * element)
-{
-  BaconVideoWidgetPrivate *priv = bvw->priv;
-  GstStructure *extra_headers = NULL;
-
-  if (g_object_class_find_property (G_OBJECT_GET_CLASS (element), "extra-headers") == NULL)
-    return;
-
-  GST_DEBUG ("Setting HTTP referrer to '%s'", priv->referrer ? priv->referrer : "none");
-
-  g_object_get (element, "extra-headers", &extra_headers, NULL);
-  if (extra_headers == NULL) {
-    extra_headers = gst_structure_empty_new ("extra-headers");
-  }
-  g_assert (GST_IS_STRUCTURE (extra_headers));
-
-  if (priv->referrer != NULL) {
-    gst_structure_set (extra_headers,
-                       "Referer" /* not a typo! */,
-                       G_TYPE_STRING,
-                       priv->referrer,
-                       NULL);
-  } else {
-    gst_structure_remove_field (extra_headers,
-                                "Referer" /* not a typo! */);
-  }
-
-  g_object_set (element, "extra-headers", extra_headers, NULL);
-  gst_structure_free (extra_headers);
-}
-
-static void
-playbin_source_notify_cb (GObject *play, GParamSpec *p, BaconVideoWidget *bvw)
-{
-  BaconVideoWidgetPrivate *priv = bvw->priv;
-  GstElement *source = NULL;
-
-  g_object_get (play, "source", &source, NULL);
-
-  if (priv->source != NULL) {
-    g_object_unref (priv->source);
-  }
-
-  priv->source = source;
-  if (source == NULL)
-    return;
-
-  GST_DEBUG ("Got source of type %s", G_OBJECT_TYPE_NAME (source));
-  bvw_set_device_on_element (bvw, source);
-  bvw_set_user_agent_on_element (bvw, source);
-  bvw_set_referrer_on_element (bvw, source);
-  bvw_set_auth_on_element (bvw, source);
-}
-
-static void
-playbin_deep_notify_cb (GstObject  *gstobject,
-			GstObject  *prop_object,
-			GParamSpec *prop,
-			BaconVideoWidget *bvw)
-{
-  if (g_str_equal (prop->name, "temp-location") == FALSE)
-    return;
-
-  g_free (bvw->priv->download_filename);
-  bvw->priv->download_filename = NULL;
-  g_object_get (G_OBJECT (prop_object),
-		"temp-location", &bvw->priv->download_filename,
-		NULL);
-}
-
-static gboolean
-bvw_query_timeout (BaconVideoWidget *bvw)
-{
-  GstFormat fmt = GST_FORMAT_TIME;
-  gint64 pos = -1, len = -1;
-
-  /* check length/pos of stream */
-  if (gst_element_query_duration (bvw->priv->play, &fmt, &len)) {
-    if (len != -1 && fmt == GST_FORMAT_TIME)
-      bvw->priv->stream_length = len / GST_MSECOND;
-  } else {
-    GST_DEBUG ("could not get duration");
-  }
-
-  if (gst_element_query_position (bvw->priv->play, &fmt, &pos)) {
-    if (pos != -1 && fmt == GST_FORMAT_TIME) {
-      got_time_tick (GST_ELEMENT (bvw->priv->play), pos, bvw);
-    }
-  } else {
-    GST_DEBUG ("could not get position");
-  }
-
-  return TRUE;
-}
-
-static gboolean
-bvw_query_buffering_timeout (BaconVideoWidget *bvw)
-{
-  GstQuery *query;
-  GstElement *element;
-
-  element = bvw->priv->download_buffering_element;
-  if (element == NULL)
-    element = bvw->priv->play;
-
-  query = gst_query_new_buffering (GST_FORMAT_PERCENT);
-  if (gst_element_query (element, query)) {
-    gint64 start, stop;
-    GstFormat format;
-    gdouble fill;
-    gboolean busy;
-    gint percent;
-
-    gst_query_parse_buffering_stats (query, NULL, NULL, NULL, &bvw->priv->buffering_left);
-    gst_query_parse_buffering_percent (query, &busy, &percent);
-    gst_query_parse_buffering_range (query, &format, &start, &stop, NULL);
-
-    GST_DEBUG ("start %" G_GINT64_FORMAT ", stop %" G_GINT64_FORMAT
-	       ", buffering left %" G_GINT64_FORMAT ", percent %d%%",
-	       start, stop, bvw->priv->buffering_left, percent);
-
-    if (stop != -1)
-      fill = (gdouble) stop / GST_FORMAT_PERCENT_MAX;
-    else
-      fill = -1.0;
-
-    GST_DEBUG ("download buffer filled up to %f%% (element: %s)", fill * 100.0,
-	       G_OBJECT_TYPE_NAME (element));
-
-    g_signal_emit (bvw, bvw_signals[SIGNAL_DOWNLOAD_BUFFERING], 0, fill);
-
-    /* Nothing left to buffer when fill is 100% */
-    if (fill == 1.0)
-      bvw->priv->buffering_left = 0;
-
-    /* Start playing when we've downloaded enough */
-    if (bvw_download_buffering_done (bvw) != FALSE &&
-	bvw->priv->target_state == GST_STATE_PLAYING) {
-      GST_DEBUG ("Starting playback because the download buffer is filled enough");
-      bacon_video_widget_play (bvw, NULL);
-    }
-
-    /* Finished buffering, so don't run the timeout anymore */
-    if (fill == 1.0) {
-      bvw->priv->fill_id = 0;
-      gst_query_unref (query);
-      if (bvw->priv->download_buffering_element != NULL) {
-	g_object_unref (bvw->priv->download_buffering_element);
-	bvw->priv->download_buffering_element = NULL;
-      }
-
-      /* Tell the front-end about the downloaded file */
-      g_object_notify (G_OBJECT (bvw), "download-filename");
-
-      return FALSE;
-    }
-  }
-  gst_query_unref (query);
-
-  return TRUE;
-}
-
-static void
-caps_set (GObject * obj,
-    GParamSpec * pspec, BaconVideoWidget * bvw)
-{
-  GstPad *pad = GST_PAD (obj);
-  GstStructure *s;
-  GstCaps *caps;
-
-  if (!(caps = gst_pad_get_negotiated_caps (pad)))
-    return;
-
-  /* Get video decoder caps */
-  s = gst_caps_get_structure (caps, 0);
-  if (s) {
-    const GValue *movie_par;
-
-    /* We need at least width/height and framerate */
-    if (!(gst_structure_get_fraction (s, "framerate", &bvw->priv->video_fps_n, 
-          &bvw->priv->video_fps_d) &&
-          gst_structure_get_int (s, "width", &bvw->priv->video_width) &&
-          gst_structure_get_int (s, "height", &bvw->priv->video_height)))
-      return;
-    
-    /* Get the movie PAR if available */
-    movie_par = gst_structure_get_value (s, "pixel-aspect-ratio");
-    if (movie_par) {
-      bvw->priv->movie_par_n = gst_value_get_fraction_numerator (movie_par);
-      bvw->priv->movie_par_d = gst_value_get_fraction_denominator (movie_par);
-    }
-    else {
-      /* Square pixels */
-      bvw->priv->movie_par_n = 1;
-      bvw->priv->movie_par_d = 1;
-    }
-    
-    /* Now set for real */
-    bacon_video_widget_set_aspect_ratio (bvw, bvw->priv->ratio_type);
-  }
-
-  gst_caps_unref (caps);
-}
-
-static void get_visualization_size (BaconVideoWidget *bvw,
-                                    int *w, int *h, gint *fps_n, gint *fps_d);
-
-static void
-parse_stream_info (BaconVideoWidget *bvw)
-{
-  GstPad *videopad = NULL;
-  gint n_audio, n_video;
-
-  g_object_get (G_OBJECT (bvw->priv->play), "n-audio", &n_audio,
-      "n-video", &n_video, NULL);
-
-  bvw_check_for_cover_pixbuf (bvw);
-
-  bvw->priv->media_has_video = FALSE;
-  if (n_video > 0) {
-    gint i;
-
-    bvw->priv->media_has_video = TRUE;
-
-    for (i = 0; i < n_video && videopad == NULL; i++)
-      g_signal_emit_by_name (bvw->priv->play, "get-video-pad", i, &videopad);
-  }
-
-  bvw->priv->media_has_audio = FALSE;
-  if (n_audio > 0) {
-    bvw->priv->media_has_audio = TRUE;
-    if (!bvw->priv->media_has_video) {
-      gint flags;
-
-      g_object_get (bvw->priv->play, "flags", &flags, NULL);
-      if (bvw->priv->show_vfx && !bvw->priv->cover_pixbuf)
-	flags |= GST_PLAY_FLAG_VIS;
-      else
-	flags &= ~GST_PLAY_FLAG_VIS;
-      g_object_set (bvw->priv->play, "flags", flags, NULL);
-    }
-  }
-
-  if (videopad) {
-    GstCaps *caps;
-
-    if ((caps = gst_pad_get_negotiated_caps (videopad))) {
-      caps_set (G_OBJECT (videopad), NULL, bvw);
-      gst_caps_unref (caps);
-    }
-    g_signal_connect (videopad, "notify::caps",
-        G_CALLBACK (caps_set), bvw);
-    gst_object_unref (videopad);
-  } else if (bvw->priv->show_vfx) {
-    get_visualization_size (bvw, &bvw->priv->video_width,
-        &bvw->priv->video_height, NULL, NULL);
-  }
-
-  set_current_actor (bvw);
-}
-
-static void
-playbin_stream_changed_cb (GstElement * obj, gpointer data)
-{
-  BaconVideoWidget *bvw = BACON_VIDEO_WIDGET (data);
-  GstMessage *msg;
-
-  /* we're being called from the streaming thread, so don't do anything here */
-  GST_LOG ("streams have changed");
-  msg = gst_message_new_application (GST_OBJECT (bvw->priv->play),
-      gst_structure_new ("stream-changed", NULL));
-  gst_element_post_message (bvw->priv->play, msg);
-}
-
-static void
-bacon_video_widget_finalize (GObject * object)
-{
-  BaconVideoWidget *bvw = (BaconVideoWidget *) object;
-
-  GST_DEBUG ("finalizing");
-
-  g_type_class_unref (g_type_class_peek (BVW_TYPE_METADATA_TYPE));
-  g_type_class_unref (g_type_class_peek (BVW_TYPE_DVD_EVENT));
-
-  if (bvw->priv->bus) {
-    /* make bus drop all messages to make sure none of our callbacks is ever
-     * called again (main loop might be run again to display error dialog) */
-    gst_bus_set_flushing (bvw->priv->bus, TRUE);
-
-    if (bvw->priv->sig_bus_async)
-      g_signal_handler_disconnect (bvw->priv->bus, bvw->priv->sig_bus_async);
-
-    gst_object_unref (bvw->priv->bus);
-    bvw->priv->bus = NULL;
-  }
-
-  g_free (bvw->priv->user_agent);
-  bvw->priv->user_agent = NULL;
-
-  g_free (bvw->priv->media_device);
-  bvw->priv->media_device = NULL;
-
-  g_free (bvw->priv->referrer);
-  bvw->priv->referrer = NULL;
-
-  g_free (bvw->priv->mrl);
-  bvw->priv->mrl = NULL;
-
-  g_free (bvw->priv->vis_element_name);
-  bvw->priv->vis_element_name = NULL;
-
-  if (bvw->priv->clock) {
-    g_object_unref (bvw->priv->clock);
-    bvw->priv->clock = NULL;
-  }
-
-  if (bvw->priv->vis_plugins_list) {
-    g_list_free (bvw->priv->vis_plugins_list);
-    bvw->priv->vis_plugins_list = NULL;
-  }
-
-  if (bvw->priv->source != NULL) {
-    g_object_unref (bvw->priv->source);
-    bvw->priv->source = NULL;
-  }
-
-  if (bvw->priv->ready_idle_id) {
-    g_source_remove (bvw->priv->ready_idle_id);
-    bvw->priv->ready_idle_id = 0;
-  }
-
-  if (bvw->priv->play != NULL && GST_IS_ELEMENT (bvw->priv->play)) {
-    gst_element_set_state (bvw->priv->play, GST_STATE_NULL);
-    gst_object_unref (bvw->priv->play);
-    bvw->priv->play = NULL;
-  }
-
-  if (bvw->priv->update_id) {
-    g_source_remove (bvw->priv->update_id);
-    bvw->priv->update_id = 0;
-  }
-
-  if (bvw->priv->tagcache) {
-    gst_tag_list_free (bvw->priv->tagcache);
-    bvw->priv->tagcache = NULL;
-  }
-  if (bvw->priv->audiotags) {
-    gst_tag_list_free (bvw->priv->audiotags);
-    bvw->priv->audiotags = NULL;
-  }
-  if (bvw->priv->videotags) {
-    gst_tag_list_free (bvw->priv->videotags);
-    bvw->priv->videotags = NULL;
-  }
-
-  if (bvw->priv->tag_update_id != 0)
-    g_source_remove (bvw->priv->tag_update_id);
-  g_async_queue_unref (bvw->priv->tag_update_queue);
-
-  if (bvw->priv->eos_id != 0)
-    g_source_remove (bvw->priv->eos_id);
-
-  if (bvw->priv->cursor != NULL) {
-    g_object_unref (bvw->priv->cursor);
-    bvw->priv->cursor = NULL;
-  }
-
-  if (bvw->priv->mount_cancellable) {
-    g_cancellable_cancel (bvw->priv->mount_cancellable);
-    g_object_unref (bvw->priv->mount_cancellable);
-    bvw->priv->mount_cancellable = NULL;
-  }
-
-#if GLIB_CHECK_VERSION (2, 31, 0)
-  g_mutex_clear (&bvw->priv->seek_mutex);
-#else
-  g_mutex_free (bvw->priv->seek_mutex);
-#endif
-
-  G_OBJECT_CLASS (parent_class)->finalize (object);
-}
-
-static void
-bacon_video_widget_set_property (GObject * object, guint property_id,
-                                 const GValue * value, GParamSpec * pspec)
-{
-  BaconVideoWidget *bvw;
-
-  bvw = BACON_VIDEO_WIDGET (object);
-
-  switch (property_id) {
-    case PROP_LOGO_MODE:
-      bacon_video_widget_set_logo_mode (bvw,
-      g_value_get_boolean (value));
-      break;
-    case PROP_REFERRER:
-      bacon_video_widget_set_referrer (bvw,
-      g_value_get_string (value));
-      break;
-    case PROP_SHOW_CURSOR:
-      bacon_video_widget_set_show_cursor (bvw,
-      g_value_get_boolean (value));
-      break;
-    case PROP_SHOW_VISUALIZATIONS:
-      bacon_video_widget_set_show_visualizations (bvw,
-      g_value_get_boolean (value));
-      break;
-    case PROP_USER_AGENT:
-      bacon_video_widget_set_user_agent (bvw,
-      g_value_get_string (value));
-      break;
-    case PROP_VOLUME:
-      bacon_video_widget_set_volume (bvw, g_value_get_double (value));
-      break;
-    case PROP_AUTO_RESIZE:
-      bacon_video_widget_set_auto_resize (bvw, g_value_get_boolean (value));
-      break;
-    case PROP_DEINTERLACING:
-      bacon_video_widget_set_deinterlacing (bvw, g_value_get_boolean (value));
-      break;
-    case PROP_CONNECTION_SPEED:
-      bacon_video_widget_set_connection_speed (bvw, g_value_get_enum (value));
-      break;
-    case PROP_VISUALIZATION_QUALITY:
-      bacon_video_widget_set_visualization_quality (bvw, g_value_get_enum (value));
-      break;
-    case PROP_BRIGHTNESS:
-      bacon_video_widget_set_video_property (bvw, BVW_VIDEO_BRIGHTNESS, g_value_get_int (value));
-      break;
-    case PROP_CONTRAST:
-      bacon_video_widget_set_video_property (bvw, BVW_VIDEO_CONTRAST, g_value_get_int (value));
-      break;
-    case PROP_SATURATION:
-      bacon_video_widget_set_video_property (bvw, BVW_VIDEO_SATURATION, g_value_get_int (value));
-      break;
-    case PROP_HUE:
-      bacon_video_widget_set_video_property (bvw, BVW_VIDEO_HUE, g_value_get_int (value));
-      break;
-    case PROP_AUDIO_OUTPUT_TYPE:
-      bacon_video_widget_set_audio_output_type (bvw, g_value_get_enum (value));
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-      break;
-  }
-}
-
-static void
-bacon_video_widget_get_property (GObject * object, guint property_id,
-                                 GValue * value, GParamSpec * pspec)
-{
-  BaconVideoWidget *bvw;
-
-  bvw = BACON_VIDEO_WIDGET (object);
-
-  switch (property_id) {
-    case PROP_LOGO_MODE:
-      g_value_set_boolean (value,
-      bacon_video_widget_get_logo_mode (bvw));
-      break;
-    case PROP_POSITION:
-      g_value_set_double (value, bacon_video_widget_get_position (bvw));
-      break;
-    case PROP_STREAM_LENGTH:
-      g_value_set_int64 (value,
-      bacon_video_widget_get_stream_length (bvw));
-      break;
-    case PROP_PLAYING:
-      g_value_set_boolean (value,
-      bacon_video_widget_is_playing (bvw));
-      break;
-    case PROP_REFERRER:
-      g_value_set_string (value, bvw->priv->referrer);
-      break;
-    case PROP_SEEKABLE:
-      g_value_set_boolean (value,
-      bacon_video_widget_is_seekable (bvw));
-      break;
-    case PROP_SHOW_CURSOR:
-      g_value_set_boolean (value,
-      bacon_video_widget_get_show_cursor (bvw));
-      break;
-    case PROP_USER_AGENT:
-      g_value_set_string (value, bvw->priv->user_agent);
-      break;
-    case PROP_VOLUME:
-      g_value_set_double (value, bvw->priv->volume);
-      break;
-    case PROP_DOWNLOAD_FILENAME:
-      g_value_set_string (value, bvw->priv->download_filename);
-      break;
-    case PROP_AUTO_RESIZE:
-      g_value_set_boolean (value, bvw->priv->auto_resize);
-      break;
-    case PROP_DEINTERLACING:
-      g_value_set_boolean (value, bacon_video_widget_get_deinterlacing (bvw));
-      break;
-    case PROP_CONNECTION_SPEED:
-      g_value_set_enum (value, bvw->priv->connection_speed);
-      break;
-    case PROP_VISUALIZATION_QUALITY:
-      g_value_set_enum (value, bvw->priv->visq);
-      break;
-    case PROP_BRIGHTNESS:
-      g_value_set_int (value, bacon_video_widget_get_video_property (bvw, BVW_VIDEO_BRIGHTNESS));
-      break;
-    case PROP_CONTRAST:
-      g_value_set_int (value, bacon_video_widget_get_video_property (bvw, BVW_VIDEO_CONTRAST));
-      break;
-    case PROP_SATURATION:
-      g_value_set_int (value, bacon_video_widget_get_video_property (bvw, BVW_VIDEO_SATURATION));
-      break;
-    case PROP_HUE:
-      g_value_set_int (value, bacon_video_widget_get_video_property (bvw, BVW_VIDEO_HUE));
-      break;
-    case PROP_AUDIO_OUTPUT_TYPE:
-      g_value_set_enum (value, bacon_video_widget_get_audio_output_type (bvw));
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-      break;
-  }
-}
-
-/* ============================================================= */
-/*                                                               */
-/*                       Public Methods                          */
-/*                                                               */
-/* ============================================================= */
-
-/**
- * bacon_video_widget_get_backend_name:
- * @bvw: a #BaconVideoWidget
- *
- * Returns the name string for @bvw. For the GStreamer backend, it is the output
- * of gst_version_string(). *
- * Return value: the backend's name; free with g_free()
- **/
-char *
-bacon_video_widget_get_backend_name (BaconVideoWidget * bvw)
-{
-  return gst_version_string ();
-}
-
-/**
- * bacon_video_widget_get_subtitle:
- * @bvw: a #BaconVideoWidget
- *
- * Returns the index of the current subtitles.
- *
- * If the widget is not playing, -2 will be returned. If no subtitles are
- * being used, -1 is returned.
- *
- * Return value: the subtitle index
- **/
-int
-bacon_video_widget_get_subtitle (BaconVideoWidget * bvw)
-{
-  int subtitle = -1;
-  gint flags;
-
-  g_return_val_if_fail (bvw != NULL, -2);
-  g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), -2);
-  g_return_val_if_fail (bvw->priv->play != NULL, -2);
-
-  g_object_get (bvw->priv->play, "flags", &flags, NULL);
-
-  if ((flags & GST_PLAY_FLAG_TEXT) == 0)
-    return -2;
-
-  g_object_get (G_OBJECT (bvw->priv->play), "current-text", &subtitle, NULL);
-
-  return subtitle;
-}
-
-/**
- * bacon_video_widget_set_subtitle:
- * @bvw: a #BaconVideoWidget
- * @subtitle: a subtitle index
- *
- * Sets the subtitle index for @bvw. If @subtitle is -1, no subtitles will
- * be used.
- **/
-void
-bacon_video_widget_set_subtitle (BaconVideoWidget * bvw, int subtitle)
-{
-  GstTagList *tags;
-  gint flags;
-
-  g_return_if_fail (bvw != NULL);
-  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
-  g_return_if_fail (bvw->priv->play != NULL);
-
-  g_object_get (bvw->priv->play, "flags", &flags, NULL);
-
-  if (subtitle == -2) {
-    flags &= ~GST_PLAY_FLAG_TEXT;
-    subtitle = -1;
-  } else {
-    flags |= GST_PLAY_FLAG_TEXT;
-  }
-  
-  g_object_set (bvw->priv->play, "flags", flags, "current-text", subtitle, NULL);
-  
-  if (flags & GST_PLAY_FLAG_TEXT) {
-    g_object_get (bvw->priv->play, "current-text", &subtitle, NULL);
-
-    g_signal_emit_by_name (G_OBJECT (bvw->priv->play), "get-text-tags", subtitle, &tags);
-    bvw_update_tags (bvw, tags, "text");
-  }
-}
-
-/**
- * bacon_video_widget_has_next_track:
- * @bvw: a #BaconVideoWidget
- *
- * Determines whether there is another track after the current one, typically
- * as a chapter on a DVD.
- *
- * Return value: %TRUE if there is another track, %FALSE otherwise
- **/
-gboolean
-bacon_video_widget_has_next_track (BaconVideoWidget *bvw)
-{
-  //FIXME
-  return TRUE;
-}
-
-/**
- * bacon_video_widget_has_previous_track:
- * @bvw: a #BaconVideoWidget
- *
- * Determines whether there is another track before the current one, typically
- * as a chapter on a DVD.
- *
- * Return value: %TRUE if there is another track, %FALSE otherwise
- **/
-gboolean
-bacon_video_widget_has_previous_track (BaconVideoWidget *bvw)
-{
-  //FIXME
-  return TRUE;
-}
-
-static GList *
-get_lang_list_for_type (BaconVideoWidget * bvw, const gchar * type_name)
-{
-  GList *ret = NULL;
-  gint num = 1;
-
-  if (g_str_equal (type_name, "AUDIO")) {
-    gint i, n;
-
-    g_object_get (G_OBJECT (bvw->priv->play), "n-audio", &n, NULL);
-    if (n == 0)
-      return NULL;
-
-    for (i = 0; i < n; i++) {
-      GstTagList *tags = NULL;
-
-      g_signal_emit_by_name (G_OBJECT (bvw->priv->play), "get-audio-tags",
-          i, &tags);
-
-      if (tags) {
-        gchar *lc = NULL, *cd = NULL;
-
-	gst_tag_list_get_string (tags, GST_TAG_LANGUAGE_CODE, &lc);
-	gst_tag_list_get_string (tags, GST_TAG_CODEC, &cd);
-
-        if (lc) {
-	  ret = g_list_prepend (ret, lc);
-	  g_free (cd);
-	} else if (cd) {
-	  ret = g_list_prepend (ret, cd);
-	} else {
-	  ret = g_list_prepend (ret, g_strdup_printf (_("Audio Track #%d"), num++));
-	}
-	gst_tag_list_free (tags);
-      } else {
-	ret = g_list_prepend (ret, g_strdup_printf (_("Audio Track #%d"), num++));
-      }
-    }
-  } else if (g_str_equal (type_name, "TEXT")) {
-    gint i, n = 0;
-
-    g_object_get (G_OBJECT (bvw->priv->play), "n-text", &n, NULL);
-    if (n == 0)
-      return NULL;
-
-    for (i = 0; i < n; i++) {
-      GstTagList *tags = NULL;
-
-      g_signal_emit_by_name (G_OBJECT (bvw->priv->play), "get-text-tags",
-          i, &tags);
-
-      if (tags) {
-        gchar *lc = NULL, *cd = NULL;
-
-	gst_tag_list_get_string (tags, GST_TAG_LANGUAGE_CODE, &lc);
-	gst_tag_list_get_string (tags, GST_TAG_CODEC, &cd);
-
-        if (lc) {
-	  ret = g_list_prepend (ret, lc);
-	  g_free (cd);
-	} else if (cd) {
-	  ret = g_list_prepend (ret, cd);
-	} else {
-	  ret = g_list_prepend (ret, g_strdup_printf (_("Subtitle #%d"), num++));
-	}
-	gst_tag_list_free (tags);
-      } else {
-	ret = g_list_prepend (ret, g_strdup_printf (_("Subtitle #%d"), num++));
-      }
-    }
-  } else {
-    g_critical ("Invalid stream type '%s'", type_name);
-    return NULL;
-  }
-
-  return g_list_reverse (ret);
-}
-
-/**
- * bacon_video_widget_get_subtitles:
- * @bvw: a #BaconVideoWidget
- *
- * Returns a list of subtitle tags, each in the form TEXT x,
- * where x is the subtitle index.
- *
- * Return value: a #GList of subtitle tags, or %NULL; free each element with g_free() and the list with g_list_free()
- **/
-GList *
-bacon_video_widget_get_subtitles (BaconVideoWidget * bvw)
-{
-  GList *list;
-
-  g_return_val_if_fail (bvw != NULL, NULL);
-  g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), NULL);
-  g_return_val_if_fail (bvw->priv->play != NULL, NULL);
-
-  list = get_lang_list_for_type (bvw, "TEXT");
-
-  return list;
-}
-
-/**
- * bacon_video_widget_get_languages:
- * @bvw: a #BaconVideoWidget
- *
- * Returns a list of audio language tags, each in the form AUDIO x,
- * where x is the language index.
- *
- * Return value: a #GList of audio language tags, or %NULL; free each element with g_free() and the list with g_list_free()
- **/
-GList *
-bacon_video_widget_get_languages (BaconVideoWidget * bvw)
-{
-  GList *list;
-
-  g_return_val_if_fail (bvw != NULL, NULL);
-  g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), NULL);
-  g_return_val_if_fail (bvw->priv->play != NULL, NULL);
-
-  list = get_lang_list_for_type (bvw, "AUDIO");
-
-  /* When we have only one language, we don't need to show
-   * any languages, we default to the only track */
-  if (g_list_length (list) == 1) {
-    g_free (list->data);
-    g_list_free (list);
-    list = NULL;
-  }
-
-  return list;
-}
-
-/**
- * bacon_video_widget_get_language:
- * @bvw: a #BaconVideoWidget
- *
- * Returns the index of the current audio language.
- *
- * If the widget is not playing, or the default language is in use, -1 will be returned.
- *
- * Return value: the audio language index
- **/
-int
-bacon_video_widget_get_language (BaconVideoWidget * bvw)
-{
-  int language = -1;
-
-  g_return_val_if_fail (bvw != NULL, -1);
-  g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), -1);
-  g_return_val_if_fail (bvw->priv->play != NULL, -1);
-
-  g_object_get (G_OBJECT (bvw->priv->play), "current-audio", &language, NULL);
-
-  return language;
-}
-
-/**
- * bacon_video_widget_set_language:
- * @bvw: a #BaconVideoWidget
- * @language: an audio language index
- *
- * Sets the audio language index for @bvw. If @language is -1, the default language will
- * be used.
- **/
-void
-bacon_video_widget_set_language (BaconVideoWidget * bvw, int language)
-{
-  GstTagList *tags;
-
-  g_return_if_fail (bvw != NULL);
-  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
-  g_return_if_fail (bvw->priv->play != NULL);
-
-  if (language == -1)
-    language = 0;
-  else if (language == -2)
-    language = -1;
-
-  GST_DEBUG ("setting language to %d", language);
-
-  g_object_set (bvw->priv->play, "current-audio", language, NULL);
-
-  g_object_get (bvw->priv->play, "current-audio", &language, NULL);
-  GST_DEBUG ("current-audio now: %d", language);
-
-  g_signal_emit_by_name (G_OBJECT (bvw->priv->play), "get-audio-tags", language, &tags);
-  bvw_update_tags (bvw, tags, "audio");
-
-  /* so it updates its metadata for the newly-selected stream */
-  g_signal_emit (bvw, bvw_signals[SIGNAL_GOT_METADATA], 0, NULL);
-  g_signal_emit (bvw, bvw_signals[SIGNAL_CHANNELS_CHANGE], 0);
-}
-
-static guint
-connection_speed_enum_to_kbps (gint speed)
-{
-  static const guint conv_table[] = { 14400, 19200, 28800, 33600, 34400, 56000,
-      112000, 256000, 384000, 512000, 1536000, 10752000 };
-
-  g_return_val_if_fail (speed >= 0 && (guint) speed < G_N_ELEMENTS (conv_table), 0);
-
-  /* must round up so that the correct streams are chosen and not ignored
-   * due to rounding errors when doing kbps <=> bps */
-  return (conv_table[speed] / 1000) +
-    (((conv_table[speed] % 1000) != 0) ? 1 : 0);
-}
-
-/**
- * bacon_video_widget_get_connection_speed:
- * @bvw: a #BaconVideoWidget
- *
- * Returns the current connection speed, where 0 is the lowest speed
- * and 11 is the highest.
- *
- * Return value: the connection speed index
- **/
-int
-bacon_video_widget_get_connection_speed (BaconVideoWidget * bvw)
-{
-  g_return_val_if_fail (bvw != NULL, 0);
-  g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), 0);
-
-  return bvw->priv->connection_speed;
-}
-
-/**
- * bacon_video_widget_set_connection_speed:
- * @bvw: a #BaconVideoWidget
- * @speed: the connection speed index
- *
- * Sets the connection speed from the given @speed index, where 0 is the lowest speed
- * and 11 is the highest.
- **/
-void
-bacon_video_widget_set_connection_speed (BaconVideoWidget * bvw, int speed)
-{
-  g_return_if_fail (bvw != NULL);
-  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
-
-  if (bvw->priv->connection_speed != speed) {
-    bvw->priv->connection_speed = speed;
-    g_object_notify (G_OBJECT (bvw), "connection-speed");
-  }
-
-  if (bvw->priv->play != NULL &&
-      g_object_class_find_property (G_OBJECT_GET_CLASS (bvw->priv->play), "connection-speed")) {
-    guint kbps = connection_speed_enum_to_kbps (speed);
-
-    GST_LOG ("Setting connection speed %d (= %d kbps)", speed, kbps);
-    g_object_set (bvw->priv->play, "connection-speed", kbps, NULL);
-  }
-}
-
-/**
- * bacon_video_widget_set_deinterlacing:
- * @bvw: a #BaconVideoWidget
- * @deinterlace: %TRUE if videos should be automatically deinterlaced, %FALSE otherwise
- *
- * Sets whether the widget should deinterlace videos.
- **/
-void
-bacon_video_widget_set_deinterlacing (BaconVideoWidget * bvw,
-                                      gboolean deinterlace)
-{
-  gint flags;
-
-  g_return_if_fail (bvw != NULL);
-  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
-  g_return_if_fail (GST_IS_ELEMENT (bvw->priv->play));
-
-  g_object_get (bvw->priv->play, "flags", &flags, NULL);
-  if (deinterlace)
-    flags |= GST_PLAY_FLAG_DEINTERLACE;
-  else
-    flags &= ~GST_PLAY_FLAG_DEINTERLACE;
-  g_object_set (bvw->priv->play, "flags", flags, NULL);
-
-  g_object_notify (G_OBJECT (bvw), "deinterlacing");
-}
-
-/**
- * bacon_video_widget_get_deinterlacing:
- * @bvw: a #BaconVideoWidget
- *
- * Returns whether deinterlacing of videos is enabled for this widget.
- *
- * Return value: %TRUE if automatic deinterlacing is enabled, %FALSE otherwise
- **/
-gboolean
-bacon_video_widget_get_deinterlacing (BaconVideoWidget * bvw)
-{
-  gint flags;
-
-  g_return_val_if_fail (bvw != NULL, FALSE);
-  g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), FALSE);
-  g_return_val_if_fail (GST_IS_ELEMENT (bvw->priv->play), FALSE);
-
-  g_object_get (bvw->priv->play, "flags", &flags, NULL);
-
-  return !!(flags & GST_PLAY_FLAG_DEINTERLACE);
-}
-
-static gint
-get_num_audio_channels (BaconVideoWidget * bvw)
-{
-  gint channels;
-
-  switch (bvw->priv->speakersetup) {
-    case BVW_AUDIO_SOUND_STEREO:
-      channels = 2;
-      break;
-    case BVW_AUDIO_SOUND_4CHANNEL:
-      channels = 4;
-      break;
-    case BVW_AUDIO_SOUND_5CHANNEL:
-      channels = 5;
-      break;
-    case BVW_AUDIO_SOUND_41CHANNEL:
-      /* so alsa has this as 5.1, but empty center speaker. We don't really
-       * do that yet. ;-). So we'll take the placebo approach. */
-    case BVW_AUDIO_SOUND_51CHANNEL:
-      channels = 6;
-      break;
-    case BVW_AUDIO_SOUND_AC3PASSTHRU:
-    default:
-      g_return_val_if_reached (-1);
-  }
-
-  return channels;
-}
-
-static GstCaps *
-fixate_to_num (const GstCaps * in_caps, gint channels)
-{
-  gint n, count;
-  GstStructure *s;
-  const GValue *v;
-  GstCaps *out_caps;
-
-  out_caps = gst_caps_copy (in_caps);
-
-  count = gst_caps_get_size (out_caps);
-  for (n = 0; n < count; n++) {
-    s = gst_caps_get_structure (out_caps, n);
-    v = gst_structure_get_value (s, "channels");
-    if (!v)
-      continue;
-
-    /* get channel count (or list of ~) */
-    gst_structure_fixate_field_nearest_int (s, "channels", channels);
-  }
-
-  return out_caps;
-}
-
-static void
-set_audio_filter (BaconVideoWidget *bvw)
-{
-  gint channels;
-  GstCaps *caps, *res;
-  GstPad *pad;
-
-  /* reset old */
-  g_object_set (bvw->priv->audio_capsfilter, "caps", NULL, NULL);
-
-  /* construct possible caps to filter down to our chosen caps */
-  /* Start with what the audio sink supports, but limit the allowed
-   * channel count to our speaker output configuration */
-  pad = gst_element_get_static_pad (bvw->priv->audio_capsfilter, "src");
-  caps = gst_pad_peer_get_caps (pad);        
-  gst_object_unref (pad);
-
-  if ((channels = get_num_audio_channels (bvw)) == -1)
-    return;
-
-  res = fixate_to_num (caps, channels);
-  gst_caps_unref (caps);
-
-  /* set */
-  if (res && gst_caps_is_empty (res)) {
-    gst_caps_unref (res);
-    res = NULL;
-  }
-  g_object_set (bvw->priv->audio_capsfilter, "caps", res, NULL);
-
-  if (res) {
-    gst_caps_unref (res);
-  }
-
-  /* reset */
-  pad = gst_element_get_static_pad (bvw->priv->audio_capsfilter, "src");
-  gst_pad_set_caps (pad, NULL);
-  gst_object_unref (pad);
-}
-
-/**
- * bacon_video_widget_get_audio_output_type:
- * @bvw: a #BaconVideoWidget
- *
- * Returns the current audio output type (e.g. how many speaker channels)
- * from #BvwAudioOutputType.
- *
- * Return value: the audio output type, or -1
- **/
-BvwAudioOutputType
-bacon_video_widget_get_audio_output_type (BaconVideoWidget *bvw)
-{
-  g_return_val_if_fail (bvw != NULL, -1);
-  g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), -1);
-
-  return bvw->priv->speakersetup;
-}
-
-/**
- * bacon_video_widget_set_audio_output_type:
- * @bvw: a #BaconVideoWidget
- * @type: the new audio output type
- *
- * Sets the audio output type (number of speaker channels) in the video widget.
- **/
-void
-bacon_video_widget_set_audio_output_type (BaconVideoWidget *bvw,
-                                          BvwAudioOutputType type)
-{
-  g_return_if_fail (bvw != NULL);
-  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
-
-  if (type == bvw->priv->speakersetup)
-    return;
-  else if (type == BVW_AUDIO_SOUND_AC3PASSTHRU)
-    return;
-
-  bvw->priv->speakersetup = type;
-  g_object_notify (G_OBJECT (bvw), "audio-output-type");
-
-  set_audio_filter (bvw);
-}
-
-/* =========================================== */
-/*                                             */
-/*               Play/Pause, Stop              */
-/*                                             */
-/* =========================================== */
-
-static GError*
-bvw_error_from_gst_error (BaconVideoWidget *bvw, GstMessage * err_msg)
-{
-  const gchar *src_typename;
-  GError *ret = NULL;
-  GError *e = NULL;
-
-  GST_LOG ("resolving error message %" GST_PTR_FORMAT, err_msg);
-
-  src_typename = (err_msg->src) ? G_OBJECT_TYPE_NAME (err_msg->src) : NULL;
-
-  gst_message_parse_error (err_msg, &e, NULL);
-
-  if (is_error (e, RESOURCE, NOT_FOUND) ||
-      is_error (e, RESOURCE, OPEN_READ)) {
-#if 0
-    if (strchr (mrl, ':') &&
-        (g_str_has_prefix (mrl, "dvd") ||
-         g_str_has_prefix (mrl, "cd") ||
-         g_str_has_prefix (mrl, "vcd"))) {
-      ret = g_error_new_literal (BVW_ERROR, BVW_ERROR_INVALID_DEVICE,
-                                 e->message);
-    } else {
-#endif
-      if (e->code == GST_RESOURCE_ERROR_NOT_FOUND) {
-        if (GST_IS_BASE_AUDIO_SINK (err_msg->src)) {
-          ret = g_error_new_literal (BVW_ERROR, BVW_ERROR_AUDIO_PLUGIN,
-              _("The requested audio output was not found. "
-                "Please select another audio output in the Multimedia "
-                "Systems Selector."));
-        } else {
-          ret = g_error_new_literal (BVW_ERROR, BVW_ERROR_FILE_NOT_FOUND,
-                                     _("Location not found."));
-        }
-      } else {
-        ret = g_error_new_literal (BVW_ERROR, BVW_ERROR_FILE_PERMISSION,
-            _("Could not open location; "
-              "you might not have permission to open the file."));
-      }
-#if 0
-    }
-#endif
-  } else if (is_error (e, RESOURCE, BUSY)) {
-    if (GST_IS_VIDEO_SINK (err_msg->src)) {
-      /* a somewhat evil check, but hey.. */
-      ret = g_error_new_literal (BVW_ERROR,
-          BVW_ERROR_VIDEO_PLUGIN,
-          _("The video output is in use by another application. "
-            "Please close other video applications, or select "
-            "another video output in the Multimedia Systems Selector."));
-    } else if (GST_IS_BASE_AUDIO_SINK (err_msg->src)) {
-      ret = g_error_new_literal (BVW_ERROR,
-          BVW_ERROR_AUDIO_BUSY,
-           _("The audio output is in use by another application. "
-             "Please select another audio output in the Multimedia Systems Selector. "
-             "You may want to consider using a sound server."));
-    }
-  } else if (e->domain == GST_RESOURCE_ERROR) {
-    ret = g_error_new_literal (BVW_ERROR, BVW_ERROR_FILE_GENERIC,
-                               e->message);
-  } else if (is_error (e, CORE, MISSING_PLUGIN) ||
-             is_error (e, STREAM, CODEC_NOT_FOUND)) {
-    if (bvw->priv->missing_plugins != NULL) {
-      gchar **descs, *msg = NULL;
-      guint num;
-
-      descs = bvw_get_missing_plugins_descriptions (bvw->priv->missing_plugins);
-      num = g_list_length (bvw->priv->missing_plugins);
-
-      if (is_error (e, CORE, MISSING_PLUGIN)) {
-        /* should be exactly one missing thing (source or converter) */
-        msg = g_strdup_printf (_("The playback of this movie requires a %s "
-          "plugin which is not installed."), descs[0]);
-      } else {
-        gchar *desc_list;
-
-        desc_list = g_strjoinv ("\n", descs);
-        msg = g_strdup_printf (g_dngettext (GETTEXT_PACKAGE, "The playback of this movie "
-            "requires a %s plugin which is not installed.", "The playback "
-            "of this movie requires the following decoders which are not "
-            "installed:\n\n%s", num), (num == 1) ? descs[0] : desc_list);
-        g_free (desc_list);
-      }
-      ret = g_error_new_literal (BVW_ERROR, BVW_ERROR_CODEC_NOT_HANDLED, msg);
-      g_free (msg);
-      g_strfreev (descs);
-    } else {
-      GST_LOG ("no missing plugin messages, posting generic error");
-      ret = g_error_new_literal (BVW_ERROR, BVW_ERROR_CODEC_NOT_HANDLED,
-          e->message);
-    }
-  } else if (is_error (e, STREAM, WRONG_TYPE) ||
-             is_error (e, STREAM, NOT_IMPLEMENTED)) {
-    if (src_typename) {
-      ret = g_error_new (BVW_ERROR, BVW_ERROR_CODEC_NOT_HANDLED, "%s: %s",
-          src_typename, e->message);
-    } else {
-      ret = g_error_new_literal (BVW_ERROR, BVW_ERROR_CODEC_NOT_HANDLED,
-          e->message);
-    }
-  } else if (is_error (e, STREAM, FAILED) &&
-             src_typename && strncmp (src_typename, "GstTypeFind", 11) == 0) {
-    ret = g_error_new_literal (BVW_ERROR, BVW_ERROR_READ_ERROR,
-        _("Cannot play this file over the network. "
-          "Try downloading it to disk first."));
-  } else {
-    /* generic error, no code; take message */
-    ret = g_error_new_literal (BVW_ERROR, BVW_ERROR_GENERIC,
-                               e->message);
-  }
-  g_error_free (e);
-  bvw_clear_missing_plugins_messages (bvw);
-
-  return ret;
-}
-
-/**
- * bacon_video_widget_open:
- * @bvw: a #BaconVideoWidget
- * @mrl: an MRL
- * @subtitle_uri: the URI of a subtitle file, or %NULL
- * @error: a #GError, or %NULL
- *
- * Opens the given @mrl in @bvw for playing. If @subtitle_uri is not %NULL, the given
- * subtitle file is also loaded. Alternatively, the subtitle URI can be passed in @mrl
- * by adding it after #subtitle:. For example:
- * http://example.com/video.mpg#subtitle:/home/user/subtitle.ass.
- *
- * If there was a filesystem error, a %BVW_ERROR_GENERIC error will be returned. Otherwise,
- * more specific #BvwError errors will be returned.
- *
- * On success, the MRL is loaded and waiting to be played with bacon_video_widget_play().
- *
- * Return value: %TRUE on success, %FALSE otherwise
- **/
-gboolean
-bacon_video_widget_open (BaconVideoWidget * bvw,
-                         const gchar * mrl, const gchar *subtitle_uri, GError ** error)
-{
-  GFile *file;
-  char *path;
-  GstBus *bus;
-
-  g_return_val_if_fail (bvw != NULL, FALSE);
-  g_return_val_if_fail (mrl != NULL, FALSE);
-  g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), FALSE);
-  g_return_val_if_fail (bvw->priv->play != NULL, FALSE);
-  
-  /* So we aren't closed yet... */
-  if (bvw->priv->mrl) {
-    bacon_video_widget_close (bvw);
-  }
-  
-  GST_DEBUG ("mrl = %s", GST_STR_NULL (mrl));
-  GST_DEBUG ("subtitle_uri = %s", GST_STR_NULL (subtitle_uri));
-  
-  /* this allows non-URI type of files in the thumbnailer and so on */
-  file = g_file_new_for_commandline_arg (mrl);
-
-  /* Only use the URI when FUSE isn't available for a file
-   * or we're trying to read from an archive or ObexFTP */
-  if (g_file_has_uri_scheme (file, "archive") != FALSE ||
-      g_file_has_uri_scheme (file, "obex") != FALSE ||
-      g_file_has_uri_scheme (file, "ftp") != FALSE)
-    path = NULL;
-  else
-    path = g_file_get_path (file);
-  if (path) {
-    bvw->priv->mrl = g_filename_to_uri (path, NULL, NULL);
-    g_free (path);
-  } else {
-    bvw->priv->mrl = g_strdup (mrl);
-  }
-
-  g_object_unref (file);
-
-  if (g_str_has_prefix (mrl, "icy:") != FALSE) {
-    /* Handle "icy://" URLs from QuickTime */
-    g_free (bvw->priv->mrl);
-    bvw->priv->mrl = g_strdup_printf ("http:%s", mrl + 4);
-  } else if (g_str_has_prefix (mrl, "icyx:") != FALSE) {
-    /* Handle "icyx://" URLs from Orban/Coding Technologies AAC/aacPlus Player */
-    g_free (bvw->priv->mrl);
-    bvw->priv->mrl = g_strdup_printf ("http:%s", mrl + 5);
-  } else if (g_str_has_prefix (mrl, "dvd:///")) {
-    /* this allows to play backups of dvds */
-    g_free (bvw->priv->mrl);
-    bvw->priv->mrl = g_strdup ("dvd://");
-    g_free (bvw->priv->media_device);
-    bvw->priv->media_device = g_strdup (mrl + strlen ("dvd://"));
-  } else if (g_str_has_prefix (mrl, "vcd:///")) {
-    /* this allows to play backups of vcds */
-    g_free (bvw->priv->mrl);
-    bvw->priv->mrl = g_strdup ("vcd://");
-    g_free (bvw->priv->media_device);
-    bvw->priv->media_device = g_strdup (mrl + strlen ("vcd://"));
-  }
-
-  bvw->priv->got_redirect = FALSE;
-  bvw->priv->media_has_video = FALSE;
-  bvw->priv->media_has_audio = FALSE;
-  bvw->priv->stream_length = 0;
-
-  if (bvw->priv->ready_idle_id) {
-    g_source_remove (bvw->priv->ready_idle_id);
-    bvw->priv->ready_idle_id = 0;
-  }
-
-  /* Flush the bus to make sure we don't get any messages
-   * from the previous URI, see bug #607224.
-   */
-  bus = gst_element_get_bus (bvw->priv->play);
-  gst_bus_set_flushing (bus, TRUE);
-
-  bvw->priv->target_state = GST_STATE_READY;
-  gst_element_set_state (bvw->priv->play, GST_STATE_READY);
-
-  gst_bus_set_flushing (bus, FALSE);
-  gst_object_unref (bus);
-
-  g_object_set (bvw->priv->play, "uri", bvw->priv->mrl,
-                "suburi", subtitle_uri, NULL);
-
-  bvw->priv->seekable = -1;
-  bvw->priv->target_state = GST_STATE_PAUSED;
-  bvw_clear_missing_plugins_messages (bvw);
-
-  gst_element_set_state (bvw->priv->play, GST_STATE_PAUSED);
-
-  g_signal_emit (bvw, bvw_signals[SIGNAL_CHANNELS_CHANGE], 0);
-
-  return TRUE;
-}
-
-/**
- * bacon_video_widget_play:
- * @bvw: a #BaconVideoWidget
- * @error: a #GError, or %NULL
- *
- * Plays the currently-loaded video in @bvw.
- *
- * Errors from the GStreamer backend will be returned asynchronously via the
- * #BaconVideoWidget::error signal, even if this function returns %TRUE.
- *
- * Return value: %TRUE on success, %FALSE otherwise
- **/
-gboolean
-bacon_video_widget_play (BaconVideoWidget * bvw, GError ** error)
-{
-  GstState cur_state;
-
-  g_return_val_if_fail (bvw != NULL, FALSE);
-  g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), FALSE);
-  g_return_val_if_fail (GST_IS_ELEMENT (bvw->priv->play), FALSE);
-  g_return_val_if_fail (bvw->priv->mrl != NULL, FALSE);
-
-  if (bvw->priv->ready_idle_id) {
-    g_source_remove (bvw->priv->ready_idle_id);
-    bvw->priv->ready_idle_id = 0;
-  }
-
-  bvw->priv->target_state = GST_STATE_PLAYING;
-
-  /* Don't try to play if we're already doing that */
-  gst_element_get_state (bvw->priv->play, &cur_state, NULL, 0);
-  if (cur_state == GST_STATE_PLAYING)
-    return TRUE;
-
-  /* Lie when trying to play a file whilst we're download buffering */
-  if (bvw->priv->download_buffering != FALSE &&
-      bvw_download_buffering_done (bvw) == FALSE) {
-    GST_DEBUG ("download buffering in progress, not playing");
-    return TRUE;
-  }
-
-  /* Or when we're buffering */
-  if (bvw->priv->buffering != FALSE) {
-    GST_DEBUG ("buffering in progress, not playing");
-    return TRUE;
-  }
-
-  /* just lie and do nothing in this case */
-  if (bvw->priv->plugin_install_in_progress && cur_state != GST_STATE_PAUSED) {
-    GST_DEBUG ("plugin install in progress and nothing to play, not playing");
-    return TRUE;
-  } else if (bvw->priv->mount_in_progress) {
-    GST_DEBUG ("Mounting in progress, not playing");
-    return TRUE;
-  } else if (bvw->priv->auth_dialog != NULL) {
-    GST_DEBUG ("Authentication in progress, not playing");
-    return TRUE;
-  }
-
-  /* Set direction to forward */
-  if (bvw_set_playback_direction (bvw, TRUE) == FALSE) {
-    GST_DEBUG ("Failed to reset direction back to forward to play");
-    return FALSE;
-  }
-
-  GST_DEBUG ("play");
-  gst_element_set_state (bvw->priv->play, GST_STATE_PLAYING);
-
-  /* will handle all errors asynchroneously */
-  return TRUE;
-}
-
-/**
- * bacon_video_widget_can_direct_seek:
- * @bvw: a #BaconVideoWidget
- *
- * Determines whether direct seeking is possible for the current stream.
- *
- * Return value: %TRUE if direct seeking is possible, %FALSE otherwise
- **/
-gboolean
-bacon_video_widget_can_direct_seek (BaconVideoWidget *bvw)
-{
-  g_return_val_if_fail (bvw != NULL, FALSE);
-  g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), FALSE);
-  g_return_val_if_fail (GST_IS_ELEMENT (bvw->priv->play), FALSE);
-
-  if (bvw->priv->mrl == NULL)
-    return FALSE;
-
-  if (bvw->priv->download_buffering != FALSE)
-    return TRUE;
-
-  /* (instant seeking only make sense with video,
-   * hence no cdda:// here) */
-  if (g_str_has_prefix (bvw->priv->mrl, "file://") ||
-      g_str_has_prefix (bvw->priv->mrl, "dvd:/") ||
-      g_str_has_prefix (bvw->priv->mrl, "vcd:/") ||
-      g_str_has_prefix (bvw->priv->mrl, "trash:/"))
-    return TRUE;
-
-  return FALSE;
-}
-
-static gboolean
-bacon_video_widget_seek_time_no_lock (BaconVideoWidget *bvw,
-				      gint64 _time,
-				      GstSeekFlags flag,
-				      GError **error)
-{
-  if (bvw_set_playback_direction (bvw, TRUE) == FALSE)
-    return FALSE;
-
-  bvw->priv->seek_time = -1;
-  bvw->priv->rate = FORWARD_RATE;
-
-  gst_element_seek (bvw->priv->play, FORWARD_RATE,
-		    GST_FORMAT_TIME, GST_SEEK_FLAG_FLUSH | flag,
-		    GST_SEEK_TYPE_SET, _time * GST_MSECOND,
-		    GST_SEEK_TYPE_NONE, GST_CLOCK_TIME_NONE);
-
-  return TRUE;
-}
-
-/**
- * bacon_video_widget_seek_time:
- * @bvw: a #BaconVideoWidget
- * @_time: the time to which to seek, in milliseconds
- * @accurate: whether to use accurate seek, an accurate seek might be slower for some formats (see GStreamer docs)
- * @error: a #GError, or %NULL
- *
- * Seeks the currently-playing stream to the absolute position @time, in milliseconds.
- *
- * Return value: %TRUE on success, %FALSE otherwise
- **/
-gboolean
-bacon_video_widget_seek_time (BaconVideoWidget *bvw, gint64 _time, gboolean accurate, GError **error)
-{
-  GstClockTime cur_time;
-  GstSeekFlags  flag;
-
-  g_return_val_if_fail (bvw != NULL, FALSE);
-  g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), FALSE);
-  g_return_val_if_fail (GST_IS_ELEMENT (bvw->priv->play), FALSE);
-
-  GST_LOG ("Seeking to %" GST_TIME_FORMAT, GST_TIME_ARGS (_time * GST_MSECOND));
-
-  if (_time > bvw->priv->stream_length
-      && bvw->priv->stream_length > 0
-      && !g_str_has_prefix (bvw->priv->mrl, "dvd:")
-      && !g_str_has_prefix (bvw->priv->mrl, "vcd:")) {
-    if (bvw->priv->eos_id == 0)
-      bvw->priv->eos_id = g_idle_add (bvw_signal_eos_delayed, bvw);
-    return TRUE;
-  }
-
-  /* Emit a time tick of where we are going, we are paused */
-  got_time_tick (bvw->priv->play, _time * GST_MSECOND, bvw);
-
-  /* Is there a pending seek? */
-#if GLIB_CHECK_VERSION (2, 31, 0)
-  g_mutex_lock (&bvw->priv->seek_mutex);
-#else
-  g_mutex_lock (bvw->priv->seek_mutex);
-#endif
-  /* If there's no pending seek, or
-   * it's been too long since the seek,
-   * or we don't have an accurate seek requested */
-  cur_time = gst_clock_get_internal_time (bvw->priv->clock);
-  if (bvw->priv->seek_req_time == GST_CLOCK_TIME_NONE ||
-      cur_time > bvw->priv->seek_req_time + SEEK_TIMEOUT ||
-      accurate) {
-    bvw->priv->seek_time = -1;
-    bvw->priv->seek_req_time = cur_time;
-#if GLIB_CHECK_VERSION (2, 31, 0)
-    g_mutex_unlock (&bvw->priv->seek_mutex);
-#else
-    g_mutex_unlock (bvw->priv->seek_mutex);
-#endif
-  } else {
-    GST_LOG ("Not long enough since last seek, queuing it");
-    bvw->priv->seek_time = _time;
-#if GLIB_CHECK_VERSION (2, 31, 0)
-    g_mutex_unlock (&bvw->priv->seek_mutex);
-#else
-    g_mutex_unlock (bvw->priv->seek_mutex);
-#endif
-    return TRUE;
-  }
-
-  if (bvw_set_playback_direction (bvw, TRUE) == FALSE)
-    return FALSE;
-
-  flag = (accurate ? GST_SEEK_FLAG_ACCURATE : GST_SEEK_FLAG_KEY_UNIT);
-  bacon_video_widget_seek_time_no_lock (bvw, _time, flag, error);
-
-  return TRUE;
-}
-
-/**
- * bacon_video_widget_seek:
- * @bvw: a #BaconVideoWidget
- * @position: the percentage of the way through the stream to which to seek
- * @error: a #GError, or %NULL
- *
- * Seeks the currently-playing stream to @position as a percentage of the total
- * stream length.
- *
- * Return value: %TRUE on success, %FALSE otherwise
- **/
-gboolean
-bacon_video_widget_seek (BaconVideoWidget *bvw, double position, GError **error)
-{
-  gint64 seek_time, length_nanos;
-
-  g_return_val_if_fail (bvw != NULL, FALSE);
-  g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), FALSE);
-  g_return_val_if_fail (GST_IS_ELEMENT (bvw->priv->play), FALSE);
-
-  length_nanos = (gint64) (bvw->priv->stream_length * GST_MSECOND);
-  seek_time = (gint64) (length_nanos * position);
-
-  GST_LOG ("Seeking to %3.2f%% %" GST_TIME_FORMAT, position,
-      GST_TIME_ARGS (seek_time));
-
-  return bacon_video_widget_seek_time (bvw, seek_time / GST_MSECOND, FALSE, error);
-}
-
-/**
- * bacon_video_widget_step:
- * @bvw: a #BaconVideoWidget
- * @forward: the direction of the frame step
- * @error: a #GError, or %NULL
- *
- * Step one frame forward, if @forward is %TRUE, or backwards, if @forward is %FALSE
- *
- * Return value: %TRUE on success, %FALSE otherwise
- **/
-gboolean
-bacon_video_widget_step (BaconVideoWidget *bvw, gboolean forward, GError **error)
-{
-  GstEvent *event;
-  gboolean retval;
-
-  if (bvw_set_playback_direction (bvw, forward) == FALSE)
-    return FALSE;
-
-  event = gst_event_new_step (GST_FORMAT_BUFFERS, 1, 1.0, TRUE, FALSE);
-
-  retval = gst_element_send_event (bvw->priv->play, event);
-
-  if (retval != FALSE)
-    bvw_query_timeout (bvw);
-
-  return retval;
-}
-
-static gboolean
-_ready_idle_cb (gpointer data)
-{
-  GstElement *playbin = GST_ELEMENT (data);
-
-  GST_DEBUG ("setting playbin to NULL");
-  gst_element_set_state (playbin, GST_STATE_NULL);
-
-  return FALSE;
-}
-
-static void
-bvw_stop_play_pipeline (BaconVideoWidget * bvw)
-{
-  GstState cur_state;
-  GstBus *bus;
-
-  bus = gst_element_get_bus (bvw->priv->play);
-  gst_element_get_state (bvw->priv->play, &cur_state, NULL, 0);
-  if (cur_state > GST_STATE_READY) {
-    GstMessage *msg;
-
-    GST_DEBUG ("stopping");
-    gst_element_set_state (bvw->priv->play, GST_STATE_READY);
-
-    /* process all remaining state-change messages so everything gets
-     * cleaned up properly (before the state change to NULL flushes them) */
-    GST_DEBUG ("processing pending state-change messages");
-    while ((msg = gst_bus_poll (bus, GST_MESSAGE_STATE_CHANGED, 0))) {
-      gst_bus_async_signal_func (bus, msg, NULL);
-      gst_message_unref (msg);
-    }
-  }
-
-  /* and now drop all following messages until we start again. The
-   * bus is set to flush=false again in bacon_video_widget_open()
-   */
-  gst_bus_set_flushing (bus, TRUE);
-  gst_object_unref (bus);
-
-  /* Now in READY or lower */
-  if (bvw->priv->ready_idle_id) {
-    g_source_remove (bvw->priv->ready_idle_id);
-    bvw->priv->ready_idle_id = 0;
-  }
-  bvw->priv->ready_idle_id = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, 10, _ready_idle_cb, gst_object_ref (bvw->priv->play), (GDestroyNotify) gst_object_unref);
-
-  bvw->priv->target_state = GST_STATE_READY;
-  bvw->priv->buffering = FALSE;
-  bvw->priv->plugin_install_in_progress = FALSE;
-  bvw->priv->download_buffering = FALSE;
-  g_free (bvw->priv->download_filename);
-  bvw->priv->download_filename = NULL;
-  bvw->priv->buffering_left = -1;
-  if (bvw->priv->download_buffering_element != NULL) {
-    g_object_unref (bvw->priv->download_buffering_element);
-    bvw->priv->download_buffering_element = NULL;
-  }
-  bvw_reconfigure_fill_timeout (bvw, 0);
-  bvw->priv->movie_par_n = bvw->priv->movie_par_d = 1;
-  if (bvw->priv->cover_pixbuf) {
-    g_object_unref (bvw->priv->cover_pixbuf);
-    bvw->priv->cover_pixbuf = NULL;
-  }
-  GST_DEBUG ("stopped");
-}
-
-/**
- * bacon_video_widget_stop:
- * @bvw: a #BaconVideoWidget
- *
- * Stops playing the current stream and resets to the first position in the stream.
- **/
-void
-bacon_video_widget_stop (BaconVideoWidget * bvw)
-{
-  g_return_if_fail (bvw != NULL);
-  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
-  g_return_if_fail (GST_IS_ELEMENT (bvw->priv->play));
-
-  GST_LOG ("Stopping");
-  bvw_stop_play_pipeline (bvw);
-
-  /* Reset position to 0 when stopping */
-  got_time_tick (GST_ELEMENT (bvw->priv->play), 0, bvw);
-}
-
-/**
- * bacon_video_widget_close:
- * @bvw: a #BaconVideoWidget
- *
- * Closes the current stream and frees the resources associated with it.
- **/
-void
-bacon_video_widget_close (BaconVideoWidget * bvw)
-{
-  g_return_if_fail (bvw != NULL);
-  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
-  g_return_if_fail (GST_IS_ELEMENT (bvw->priv->play));
-  
-  GST_LOG ("Closing");
-  bvw_stop_play_pipeline (bvw);
-
-  g_free (bvw->priv->mrl);
-  bvw->priv->mrl = NULL;
-  g_free (bvw->priv->user_id);
-  bvw->priv->user_id = NULL;
-  g_free (bvw->priv->user_pw);
-  bvw->priv->user_pw = NULL;
-
-  bvw->priv->is_live = FALSE;
-  bvw->priv->is_menu = FALSE;
-  bvw->priv->has_angles = FALSE;
-  bvw->priv->window_resized = FALSE;
-  bvw->priv->rate = FORWARD_RATE;
-
-  bvw->priv->seek_req_time = GST_CLOCK_TIME_NONE;
-  bvw->priv->seek_time = -1;
-
-  if (bvw->priv->tagcache) {
-    gst_tag_list_free (bvw->priv->tagcache);
-    bvw->priv->tagcache = NULL;
-  }
-  if (bvw->priv->audiotags) {
-    gst_tag_list_free (bvw->priv->audiotags);
-    bvw->priv->audiotags = NULL;
-  }
-  if (bvw->priv->videotags) {
-    gst_tag_list_free (bvw->priv->videotags);
-    bvw->priv->videotags = NULL;
-  }
-
-  g_object_notify (G_OBJECT (bvw), "seekable");
-  g_signal_emit (bvw, bvw_signals[SIGNAL_CHANNELS_CHANGE], 0);
-  got_time_tick (GST_ELEMENT (bvw->priv->play), 0, bvw);
-}
-
-static void
-bvw_do_navigation_command (BaconVideoWidget * bvw, GstNavigationCommand command)
-{
-  gst_navigation_send_command (bvw->priv->navigation, command);
-}
-
-/**
- * bacon_video_widget_dvd_event:
- * @bvw: a #BaconVideoWidget
- * @type: the type of DVD event to issue
- *
- * Issues a DVD navigation event to the video widget, such as one to skip to the
- * next chapter, or navigate to the DVD title menu.
- *
- * This is a no-op if the current stream is not navigable.
- **/
-void
-bacon_video_widget_dvd_event (BaconVideoWidget * bvw,
-                              BvwDVDEvent type)
-{
-  g_return_if_fail (bvw != NULL);
-  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
-  g_return_if_fail (GST_IS_ELEMENT (bvw->priv->play));
-
-  GST_DEBUG ("Sending event '%s'", get_type_name (BVW_TYPE_DVD_EVENT, type));
-
-  switch (type) {
-    case BVW_DVD_ROOT_MENU:
-      bvw_do_navigation_command (bvw, GST_NAVIGATION_COMMAND_DVD_MENU);
-      break;
-    case BVW_DVD_TITLE_MENU:
-      bvw_do_navigation_command (bvw, GST_NAVIGATION_COMMAND_DVD_TITLE_MENU);
-      break;
-    case BVW_DVD_SUBPICTURE_MENU:
-      bvw_do_navigation_command (bvw, GST_NAVIGATION_COMMAND_DVD_SUBPICTURE_MENU);
-      break;
-    case BVW_DVD_AUDIO_MENU:
-      bvw_do_navigation_command (bvw, GST_NAVIGATION_COMMAND_DVD_AUDIO_MENU);
-      break;
-    case BVW_DVD_ANGLE_MENU:
-      bvw_do_navigation_command (bvw, GST_NAVIGATION_COMMAND_DVD_ANGLE_MENU);
-      break;
-    case BVW_DVD_CHAPTER_MENU:
-      bvw_do_navigation_command (bvw, GST_NAVIGATION_COMMAND_DVD_CHAPTER_MENU);
-      break;
-    case BVW_DVD_ROOT_MENU_UP:
-      bvw_do_navigation_command (bvw, GST_NAVIGATION_COMMAND_UP);
-      break;
-    case BVW_DVD_ROOT_MENU_DOWN:
-      bvw_do_navigation_command (bvw, GST_NAVIGATION_COMMAND_DOWN);
-      break;
-    case BVW_DVD_ROOT_MENU_LEFT:
-      bvw_do_navigation_command (bvw, GST_NAVIGATION_COMMAND_LEFT);
-      break;
-    case BVW_DVD_ROOT_MENU_RIGHT:
-      bvw_do_navigation_command (bvw, GST_NAVIGATION_COMMAND_RIGHT);
-      break;
-    case BVW_DVD_ROOT_MENU_SELECT:
-      bvw_do_navigation_command (bvw, GST_NAVIGATION_COMMAND_ACTIVATE);
-      break;
-    case BVW_DVD_NEXT_CHAPTER:
-    case BVW_DVD_PREV_CHAPTER:
-    case BVW_DVD_NEXT_TITLE:
-    case BVW_DVD_PREV_TITLE: {
-      const gchar *fmt_name;
-      GstFormat fmt;
-      gint64 val;
-      gint dir;
-
-      if (type == BVW_DVD_NEXT_CHAPTER || type == BVW_DVD_NEXT_TITLE)
-        dir = 1;
-      else
-        dir = -1;
-
-      if (type == BVW_DVD_NEXT_CHAPTER || type == BVW_DVD_PREV_CHAPTER)
-        fmt_name = "chapter"; 
-      else if (type == BVW_DVD_NEXT_TITLE || type == BVW_DVD_PREV_TITLE)
-        fmt_name = "title";
-      else
-        fmt_name = "angle";
-
-      bvw_set_playback_direction (bvw, TRUE);
-
-      fmt = gst_format_get_by_nick (fmt_name);
-      if (gst_element_query_position (bvw->priv->play, &fmt, &val)) {
-        GST_DEBUG ("current %s is: %" G_GINT64_FORMAT, fmt_name, val);
-        val += dir;
-        GST_DEBUG ("seeking to %s: %" G_GINT64_FORMAT, fmt_name, val);
-        gst_element_seek (bvw->priv->play, FORWARD_RATE, fmt, GST_SEEK_FLAG_FLUSH,
-            GST_SEEK_TYPE_SET, val, GST_SEEK_TYPE_NONE, 0);
-	bvw->priv->rate = FORWARD_RATE;
-      } else {
-        GST_DEBUG ("failed to query position (%s)", fmt_name);
-      }
-      break;
-    }
-    default:
-      GST_WARNING ("unhandled type %d", type);
-      break;
-  }
-}
-
-/**
- * bacon_video_widget_set_logo:
- * @bvw: a #BaconVideoWidget
- * @name: the icon name of the logo
- *
- * Sets the logo displayed on the video widget when no stream is loaded.
- **/
-void
-bacon_video_widget_set_logo (BaconVideoWidget *bvw, const gchar *name)
-{
-  GtkIconTheme *theme;
-  GError *error = NULL;
-
-  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
-  g_return_if_fail (name != NULL);
-
-  if (bvw->priv->logo_pixbuf != NULL)
-    g_object_unref (bvw->priv->logo_pixbuf);
-
-  theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (bvw)));
-  bvw->priv->logo_pixbuf = gtk_icon_theme_load_icon (theme, name, LOGO_SIZE, 0, &error);
-
-  if (error) {
-    g_warning ("An error occurred trying to open logo %s: %s", name, error->message);
-    g_error_free (error);
-    return;
-  }
-
-  set_current_actor (bvw);
-}
-
-/**
- * bacon_video_widget_set_logo_mode:
- * @bvw: a #BaconVideoWidget
- * @logo_mode: %TRUE to display the logo, %FALSE otherwise
- *
- * Sets whether to display a logo set with @bacon_video_widget_set_logo when
- * no stream is loaded. If @logo_mode is %FALSE, nothing will be displayed
- * and the video widget will take up no space. Otherwise, the logo will be
- * displayed and will requisition a corresponding amount of space.
- **/
-void
-bacon_video_widget_set_logo_mode (BaconVideoWidget * bvw, gboolean logo_mode)
-{
-  BaconVideoWidgetPrivate *priv;
-
-  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
-  priv = bvw->priv;
-
-  logo_mode = logo_mode != FALSE;
-
-  if (priv->logo_mode != logo_mode) {
-    priv->logo_mode = logo_mode;
-
-    set_current_actor (bvw);
-
-    g_object_notify (G_OBJECT (bvw), "logo_mode");
-    g_object_notify (G_OBJECT (bvw), "seekable");
-  }
-}
-
-/**
- * bacon_video_widget_get_logo_mode
- * @bvw: a #BaconVideoWidget
- *
- * Gets whether the logo is displayed when no stream is loaded.
- *
- * Return value: %TRUE if the logo is displayed, %FALSE otherwise
- **/
-gboolean
-bacon_video_widget_get_logo_mode (BaconVideoWidget * bvw)
-{
-  g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), FALSE);
-
-  return bvw->priv->logo_mode;
-}
-
-static gboolean
-bvw_check_for_cover_pixbuf (BaconVideoWidget * bvw)
-{
-  GValue value = { 0, };
-
-  /* for efficiency reasons (decoding of encoded image into pixbuf) we assume
-   * that all potential images come in the same taglist, so once we've
-   * determined the best image/cover, we assume that's really the best one
-   * for this stream, even if more tag messages come in later (this should
-   * not be a problem in practice) */
-  if (bvw->priv->cover_pixbuf)
-    return TRUE;
-
-  bacon_video_widget_get_metadata (bvw, BVW_INFO_COVER, &value);
-  if (G_VALUE_HOLDS_OBJECT (&value)) {
-    bvw->priv->cover_pixbuf = g_value_dup_object (&value);
-    g_value_unset (&value);
-  }
-
-  if (bvw->priv->cover_pixbuf)
-    setup_vis (bvw);
-
-  return (bvw->priv->cover_pixbuf != NULL);
-}
-
-static const GdkPixbuf *
-bvw_get_logo_pixbuf (BaconVideoWidget * bvw)
-{
-  if (bvw_check_for_cover_pixbuf (bvw))
-    return bvw->priv->cover_pixbuf;
-  else
-    return bvw->priv->logo_pixbuf;
-}
-
-/**
- * bacon_video_widget_pause:
- * @bvw: a #BaconVideoWidget
- *
- * Pauses the current stream in the video widget.
- *
- * If a live stream is being played, playback is stopped entirely.
- **/
-void
-bacon_video_widget_pause (BaconVideoWidget * bvw)
-{
-  GstStateChangeReturn ret;
-  GstState state;
-
-  g_return_if_fail (bvw != NULL);
-  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
-  g_return_if_fail (GST_IS_ELEMENT (bvw->priv->play));
-  g_return_if_fail (bvw->priv->mrl != NULL);
-
-  /* Get the current state */
-  ret = gst_element_get_state (GST_ELEMENT (bvw->priv->play), &state, NULL, 0);
-
-  if (bvw->priv->is_live != FALSE &&
-      ret != GST_STATE_CHANGE_NO_PREROLL &&
-      ret != GST_STATE_CHANGE_SUCCESS &&
-      state > GST_STATE_READY) {
-    GST_LOG ("Stopping because we have a live stream");
-    bacon_video_widget_stop (bvw);
-    return;
-  }
-
-  if (bvw->priv->ready_idle_id) {
-    g_source_remove (bvw->priv->ready_idle_id);
-    bvw->priv->ready_idle_id = 0;
-  }
-
-  GST_LOG ("Pausing");
-  bvw->priv->target_state = GST_STATE_PAUSED;
-  gst_element_set_state (GST_ELEMENT (bvw->priv->play), GST_STATE_PAUSED);
-}
-
-/**
- * bacon_video_widget_set_subtitle_font:
- * @bvw: a #BaconVideoWidget
- * @font: a font description string
- *
- * Sets the font size and style in which to display subtitles.
- *
- * @font is a Pango font description string, as understood by
- * pango_font_description_from_string().
- **/
-void
-bacon_video_widget_set_subtitle_font (BaconVideoWidget * bvw,
-                                          const gchar * font)
-{
-  g_return_if_fail (bvw != NULL);
-  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
-  g_return_if_fail (GST_IS_ELEMENT (bvw->priv->play));
-
-  if (!g_object_class_find_property (G_OBJECT_GET_CLASS (bvw->priv->play), "subtitle-font-desc"))
-    return;
-  g_object_set (bvw->priv->play, "subtitle-font-desc", font, NULL);
-}
-
-/**
- * bacon_video_widget_set_subtitle_encoding:
- * @bvw: a #BaconVideoWidget
- * @encoding: an encoding system
- *
- * Sets the encoding system for the subtitles, so that they can be decoded
- * properly.
- **/
-void
-bacon_video_widget_set_subtitle_encoding (BaconVideoWidget *bvw,
-                                          const char *encoding)
-{
-  g_return_if_fail (bvw != NULL);
-  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
-  g_return_if_fail (GST_IS_ELEMENT (bvw->priv->play));
-
-  if (!g_object_class_find_property (G_OBJECT_GET_CLASS (bvw->priv->play), "subtitle-encoding"))
-    return;
-  g_object_set (bvw->priv->play, "subtitle-encoding", encoding, NULL);
-}
-
-/**
- * bacon_video_widget_set_user_agent:
- * @bvw: a #BaconVideoWidget
- * @user_agent: a HTTP user agent string, or %NULL to use the default
- *
- * Sets the HTTP user agent string to use when fetching HTTP ressources.
- **/
-void
-bacon_video_widget_set_user_agent (BaconVideoWidget *bvw,
-                                   const char *user_agent)
-{
-  BaconVideoWidgetPrivate *priv;
-
-  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
-
-  priv = bvw->priv;
-
-  if (g_strcmp0 (user_agent, priv->user_agent) == 0)
-    return;
-
-  g_free (priv->user_agent);
-  priv->user_agent = g_strdup (user_agent);
-
-  if (priv->source) {
-    bvw_set_user_agent_on_element (bvw, priv->source);
-  }
-
-  g_object_notify (G_OBJECT (bvw), "user-agent");
-}
-
-/**
- * bacon_video_widget_set_referrer:
- * @bvw: a #BaconVideoWidget
- * @referrer: a HTTP referrer URI, or %NULL
- *
- * Sets the HTTP referrer URI to use when fetching HTTP ressources.
- **/
-void
-bacon_video_widget_set_referrer (BaconVideoWidget *bvw,
-                                 const char *referrer)
-{
-  BaconVideoWidgetPrivate *priv;
-  char *frag;
-
-  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
-
-  priv = bvw->priv;
-
-  if (g_strcmp0 (referrer, priv->referrer) == 0)
-    return;
-
-  g_free (priv->referrer);
-  priv->referrer = g_strdup (referrer);
-
-  /* Referrer URIs must not have a fragment */
-  if ((frag = strchr (priv->referrer, '#')) != NULL)
-    *frag = '\0';
-
-  if (priv->source) {
-    bvw_set_referrer_on_element (bvw, priv->source);
-  }
-
-  g_object_notify (G_OBJECT (bvw), "referrer");
-}
-
-/**
- * bacon_video_widget_can_set_volume:
- * @bvw: a #BaconVideoWidget
- *
- * Returns whether the volume level can be set, given the current settings.
- *
- * The volume cannot be set if the audio output type is set to
- * %BVW_AUDIO_SOUND_AC3PASSTHRU.
- *
- * Return value: %TRUE if the volume can be set, %FALSE otherwise
- **/
-gboolean
-bacon_video_widget_can_set_volume (BaconVideoWidget * bvw)
-{
-  g_return_val_if_fail (bvw != NULL, FALSE);
-  g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), FALSE);
-  g_return_val_if_fail (GST_IS_ELEMENT (bvw->priv->play), FALSE);
-
-  if (bvw->priv->speakersetup == BVW_AUDIO_SOUND_AC3PASSTHRU)
-    return FALSE;
-
-  return !bvw->priv->uses_audio_fakesink;
-}
-
-/**
- * bacon_video_widget_set_volume:
- * @bvw: a #BaconVideoWidget
- * @volume: the new volume level, as a percentage between 0 and 1
- *
- * Sets the volume level of the stream as a percentage between 0 and 1.
- *
- * If bacon_video_widget_can_set_volume() returns %FALSE, this is a no-op.
- **/
-void
-bacon_video_widget_set_volume (BaconVideoWidget * bvw, double volume)
-{
-  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
-  g_return_if_fail (GST_IS_ELEMENT (bvw->priv->play));
-
-  if (bacon_video_widget_can_set_volume (bvw) != FALSE) {
-    volume = CLAMP (volume, 0.0, 1.0);
-    gst_stream_volume_set_volume (GST_STREAM_VOLUME (bvw->priv->play),
-                                  GST_STREAM_VOLUME_FORMAT_CUBIC,
-                                  volume);
-
-    bvw->priv->volume = volume;
-    g_object_notify (G_OBJECT (bvw), "volume");
-  }
-}
-
-/**
- * bacon_video_widget_get_volume:
- * @bvw: a #BaconVideoWidget
- *
- * Returns the current volume level, as a percentage between 0 and 1.
- *
- * Return value: the volume as a percentage between 0 and 1
- **/
-double
-bacon_video_widget_get_volume (BaconVideoWidget * bvw)
-{
-  g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), 0.0);
-  g_return_val_if_fail (GST_IS_ELEMENT (bvw->priv->play), 0.0);
-
-  return bvw->priv->volume;
-}
-
-/**
- * bacon_video_widget_set_fullscreen:
- * @bvw: a #BaconVideoWidget
- * @fullscreen: %TRUE to go fullscreen, %FALSE otherwise
- *
- * Sets whether the widget renders the stream in fullscreen mode.
- **/
-void
-bacon_video_widget_set_fullscreen (BaconVideoWidget * bvw,
-                                   gboolean fullscreen)
-{
-  g_return_if_fail (bvw != NULL);
-  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
-
-  bvw->priv->fullscreen_mode = fullscreen;
-}
-
-/**
- * bacon_video_widget_set_show_cursor:
- * @bvw: a #BaconVideoWidget
- * @show_cursor: %TRUE to show the cursor, %FALSE otherwise
- *
- * Sets whether the cursor should be shown when it is over the video
- * widget. If @show_cursor is %FALSE, the cursor will be invisible
- * when it is moved over the video widget.
- **/
-void
-bacon_video_widget_set_show_cursor (BaconVideoWidget * bvw,
-                                    gboolean show_cursor)
-{
-  GdkWindow *window;
-
-  g_return_if_fail (bvw != NULL);
-  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
-
-  bvw->priv->cursor_shown = show_cursor;
-  window = gtk_widget_get_window (GTK_WIDGET (bvw));
-
-  if (!window) {
-    return;
-  }
-
-  if (show_cursor == FALSE) {
-    totem_gdk_window_set_invisible_cursor (window);
-  } else {
-    gdk_window_set_cursor (window, bvw->priv->cursor);
-  }
-}
-
-/**
- * bacon_video_widget_get_show_cursor:
- * @bvw: a #BaconVideoWidget
- *
- * Returns whether the cursor is shown when it is over the video widget.
- *
- * Return value: %TRUE if the cursor is shown, %FALSE otherwise
- **/
-gboolean
-bacon_video_widget_get_show_cursor (BaconVideoWidget * bvw)
-{
-  g_return_val_if_fail (bvw != NULL, FALSE);
-  g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), FALSE);
-
-  return bvw->priv->cursor_shown;
-}
-
-static struct {
-	int height;
-	int fps;
-} const vis_qualities[] = {
-	{ 240, 15 }, /* BVW_VISUALIZATION_SMALL */
-	{ 320, 25 }, /* BVW_VISUALIZATION_NORMAL */
-	{ 480, 25 }, /* BVW_VISUALIZATION_LARGE */
-	{ 600, 30 }  /* BVW_VISUALIZATION_EXTRA_LARGE */
-};
-
-static void
-get_visualization_size (BaconVideoWidget *bvw,
-                        int *w, int *h, gint *fps_n, gint *fps_d)
-{
-  GdkScreen *screen;
-  int new_fps_n;
-
-  g_return_if_fail (h != NULL);
-  g_return_if_fail (bvw->priv->visq < G_N_ELEMENTS (vis_qualities));
-
-  if (gtk_widget_get_realized (GTK_WIDGET (bvw)) == FALSE) {
-    if (fps_n)
-      *fps_n = 1;
-    if (fps_d)
-      *fps_d = 1;
-    return;
-  }
-
-  *h = vis_qualities[bvw->priv->visq].height;
-  new_fps_n = vis_qualities[bvw->priv->visq].fps;
-
-  screen = gtk_widget_get_screen (GTK_WIDGET (bvw));
-  *w = *h * gdk_screen_get_width (screen) / gdk_screen_get_height (screen);
-
-  if (fps_n)
-    *fps_n = new_fps_n;
-  if (fps_d)
-    *fps_d = 1;
-}
-
-static GstElementFactory *
-setup_vis_find_factory (BaconVideoWidget * bvw, const gchar * vis_name)
-{
-  GstElementFactory *fac = NULL;
-  GList *l, *features;
-
-  features = get_visualization_features ();
-
-  /* find element factory using long name */
-  for (l = features; l != NULL; l = l->next) {
-    GstElementFactory *f = GST_ELEMENT_FACTORY (l->data);
-       
-    if (f && strcmp (vis_name, gst_element_factory_get_longname (f)) == 0) {
-      fac = f;
-      goto done;
-    }
-  }
-
-  /* if nothing was found, try the short name (the default schema uses this) */
-  for (l = features; l != NULL; l = l->next) {
-    GstElementFactory *f = GST_ELEMENT_FACTORY (l->data);
-
-    /* set to long name as key so that the preferences dialog gets it right */
-    if (f && strcmp (vis_name, GST_PLUGIN_FEATURE_NAME (f)) == 0) {
-      bacon_video_widget_set_visualization (bvw, gst_element_factory_get_longname (f));
-      fac = f;
-      goto done;
-    }
-  }
-
-done:
-  g_list_free (features);
-  return fac;
-}
-
-static void
-setup_vis (BaconVideoWidget * bvw)
-{
-  GstElement *vis_bin = NULL;
-
-  GST_DEBUG ("setup_vis called, show_vfx %d, vis element %s",
-      bvw->priv->show_vfx, bvw->priv->vis_element_name);
-
-  /* Check to see if we have an embedded cover image. If we do, don't show visualisations.
-   * FIXME probably wrong now, hide that and use an OSD instead */
-  bvw_check_for_cover_pixbuf (bvw);
-
-  if (bvw->priv->show_vfx && !bvw->priv->cover_pixbuf && bvw->priv->vis_element_name) {
-    GstElement *vis_element = NULL, *vis_capsfilter = NULL;
-    GstPad *pad = NULL;
-    GstCaps *caps = NULL;
-    GstElementFactory *fac = NULL;
-    
-    fac = setup_vis_find_factory (bvw, bvw->priv->vis_element_name);
-    if (!fac) {
-      GST_DEBUG ("Could not find element factory for visualisation '%s'",
-          GST_STR_NULL (bvw->priv->vis_element_name));
-      /* use goom as fallback, better than nothing */
-      fac = setup_vis_find_factory (bvw, "goom");
-      if (fac == NULL) {
-        goto beach;
-      } else {
-        GST_DEBUG ("Falling back on 'goom' for visualisation");
-      }     
-    }
-    
-    vis_element = gst_element_factory_create (fac, "vis_element");
-    if (!GST_IS_ELEMENT (vis_element)) {
-      GST_DEBUG ("failed creating visualisation element");
-      goto beach;
-    }
-    
-    vis_capsfilter = gst_element_factory_make ("capsfilter",
-        "vis_capsfilter");
-    if (!GST_IS_ELEMENT (vis_capsfilter)) {
-      GST_DEBUG ("failed creating visualisation capsfilter element");
-      gst_object_unref (vis_element);
-      goto beach;
-    }
-    
-    vis_bin = gst_bin_new ("vis_bin");
-    if (!GST_IS_ELEMENT (vis_bin)) {
-      GST_DEBUG ("failed creating visualisation bin");
-      gst_object_unref (vis_element);
-      gst_object_unref (vis_capsfilter);
-      goto beach;
-    }
-    /* We created the bin, now ref and sink to make sure we own it */
-    gst_object_ref (vis_bin);
-    gst_object_sink (vis_bin);
-    
-    gst_bin_add_many (GST_BIN (vis_bin), vis_element, vis_capsfilter, NULL);
-    
-    /* Sink ghostpad */
-    pad = gst_element_get_static_pad (vis_element, "sink");
-    gst_element_add_pad (vis_bin, gst_ghost_pad_new ("sink", pad));
-    gst_object_unref (pad);
-
-    /* Source ghostpad, link with vis_element */
-    pad = gst_element_get_static_pad (vis_capsfilter, "src");
-    gst_element_add_pad (vis_bin, gst_ghost_pad_new ("src", pad));
-    gst_element_link_pads (vis_element, "src", vis_capsfilter, "sink");
-    gst_object_unref (pad);
-
-    /* Get allowed output caps from visualisation element */
-    pad = gst_element_get_static_pad (vis_element, "src");
-    caps = gst_pad_get_allowed_caps (pad);
-    gst_object_unref (pad);
-    
-    GST_DEBUG ("allowed caps: %" GST_PTR_FORMAT, caps);
-    
-    /* Can we fixate ? */
-    if (caps && !gst_caps_is_fixed (caps)) {
-      guint i;
-      gint w, h, fps_n, fps_d;
-
-      caps = gst_caps_make_writable (caps);
-
-      /* Get visualization size */
-      get_visualization_size (bvw, &w, &h, &fps_n, &fps_d);
-
-      for (i = 0; i < gst_caps_get_size (caps); ++i) {
-        GstStructure *s = gst_caps_get_structure (caps, i);
-      
-        /* Fixate */
-        gst_structure_fixate_field_nearest_int (s, "width", w);
-        gst_structure_fixate_field_nearest_int (s, "height", h);
-        gst_structure_fixate_field_nearest_fraction (s, "framerate", fps_n,
-            fps_d);
-      }
-
-      /* set this */
-      g_object_set (vis_capsfilter, "caps", caps, NULL);
-    }
-
-    GST_DEBUG ("visualisation caps: %" GST_PTR_FORMAT, caps);
-    
-    if (GST_IS_CAPS (caps)) {
-      gst_caps_unref (caps);
-    }
-  }
-
-  if (bvw->priv->media_has_audio &&
-      !bvw->priv->media_has_video) {
-    gint flags;
-
-    g_object_get (bvw->priv->play, "flags", &flags, NULL);
-    if (bvw->priv->show_vfx && !bvw->priv->cover_pixbuf) {
-      flags |= GST_PLAY_FLAG_VIS;
-    } else {
-      flags &= ~GST_PLAY_FLAG_VIS;
-    }
-    g_object_set (bvw->priv->play, "flags", flags, NULL);
-  }
-
-beach:
-  g_object_set (bvw->priv->play, "vis-plugin", vis_bin, NULL);
-  if (vis_bin)
-    gst_object_unref (vis_bin);
-  
-  return;
-}
-
-/**
- * bacon_video_widget_set_show_visualizations:
- * @bvw: a #BaconVideoWidget
- * @show_visualizations: %TRUE to show visualisations, %FALSE otherwise
- *
- * Sets whether to show visualisations when playing audio-only streams.
- **/
-void
-bacon_video_widget_set_show_visualizations (BaconVideoWidget * bvw,
-                                     gboolean show_visualizations)
-{
-  g_return_if_fail (bvw != NULL);
-  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
-  g_return_if_fail (GST_IS_ELEMENT (bvw->priv->play));
-
-  if (show_visualizations == bvw->priv->show_vfx)
-    return;
-
-  bvw->priv->show_vfx = show_visualizations;
-  setup_vis (bvw);
-  set_current_actor (bvw);
-}
-
-static gboolean
-filter_features (GstPluginFeature * feature, gpointer data)
-{
-  GstElementFactory *f;
-
-  if (!GST_IS_ELEMENT_FACTORY (feature))
-    return FALSE;
-  f = GST_ELEMENT_FACTORY (feature);
-  if (!g_strrstr (gst_element_factory_get_klass (f), "Visualization"))
-    return FALSE;
-
-  return TRUE;
-}
-
-static GList *
-get_visualization_features (void)
-{
-  return gst_registry_feature_filter (gst_registry_get_default (),
-      filter_features, FALSE, NULL);
-}
-
-static void
-add_longname (GstElementFactory *f, GList ** to)
-{
-  *to = g_list_append (*to, (gchar *) gst_element_factory_get_longname (f));
-}
-
-/**
- * bacon_video_widget_get_visualization_list:
- * @bvw: a #BaconVideoWidget
- *
- * Returns a list of the visualisations available when playing audio-only streams.
- *
- * Return value: a #GList of visualisation names; owned by @bvw
- **/
-GList *
-bacon_video_widget_get_visualization_list (BaconVideoWidget * bvw)
-{
-  GList *features, *names = NULL;
-
-  g_return_val_if_fail (bvw != NULL, NULL);
-  g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), NULL);
-  g_return_val_if_fail (GST_IS_ELEMENT (bvw->priv->play), NULL);
-
-  if (bvw->priv->vis_plugins_list) {
-    return bvw->priv->vis_plugins_list;
-  }
-
-  features = get_visualization_features ();
-  g_list_foreach (features, (GFunc) add_longname, &names);
-  g_list_free (features);
-  bvw->priv->vis_plugins_list = names;
-
-  return names;
-}
-
-/**
- * bacon_video_widget_set_visualization:
- * @bvw: a #BaconVideoWidget
- * @name: the visualisation's name, or %NULL
- *
- * Sets the visualisation to display when playing audio-only streams.
- *
- * If @name is %NULL, visualisations will be disabled. Otherwise, @name
- * should be from the list returned by bacon_video_widget_get_visualization_list().
- **/
-void
-bacon_video_widget_set_visualization (BaconVideoWidget * bvw, const char *name)
-{
-  g_return_if_fail (bvw != NULL);
-  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
-  g_return_if_fail (GST_IS_ELEMENT (bvw->priv->play));
-
-  if (bvw->priv->vis_element_name) {
-    if (strcmp (bvw->priv->vis_element_name, name) == 0) {
-      return;
-    }
-    else {
-      g_free (bvw->priv->vis_element_name);
-    }
-  }
-
-  bvw->priv->vis_element_name = g_strdup (name);
-
-  GST_DEBUG ("new visualisation element name = '%s'", GST_STR_NULL (name));
-
-  setup_vis (bvw);
-}
-
-/**
- * bacon_video_widget_set_visualization_quality:
- * @bvw: a #BaconVideoWidget
- * @quality: the visualisation quality
- *
- * Sets the quality/size of displayed visualisations.
- **/
-void
-bacon_video_widget_set_visualization_quality (BaconVideoWidget * bvw,
-                                        BvwVisualizationQuality quality)
-{
-  g_return_if_fail (bvw != NULL);
-  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
-  g_return_if_fail (GST_IS_ELEMENT (bvw->priv->play));
-
-  if (bvw->priv->visq == quality)
-    return;
-
-  bvw->priv->visq = quality;
-  
-  setup_vis (bvw);
-
-  g_object_notify (G_OBJECT (bvw), "visualization-quality");
-}
-
-/**
- * bacon_video_widget_get_auto_resize:
- * @bvw: a #BaconVideoWidget
- *
- * Returns whether the widget will automatically resize to fit videos.
- *
- * Return value: %TRUE if the widget will resize, %FALSE otherwise
- **/
-gboolean
-bacon_video_widget_get_auto_resize (BaconVideoWidget * bvw)
-{
-  g_return_val_if_fail (bvw != NULL, FALSE);
-  g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), FALSE);
-
-  return bvw->priv->auto_resize;
-}
-
-/**
- * bacon_video_widget_set_auto_resize:
- * @bvw: a #BaconVideoWidget
- * @auto_resize: %TRUE to automatically resize for new videos, %FALSE otherwise
- *
- * Sets whether the widget should automatically resize to fit to new videos when
- * they are loaded. Changes to this will take effect when the next media file is
- * loaded.
- **/
-void
-bacon_video_widget_set_auto_resize (BaconVideoWidget * bvw,
-                                    gboolean auto_resize)
-{
-  g_return_if_fail (bvw != NULL);
-  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
-
-  bvw->priv->auto_resize = auto_resize;
-
-  /* this will take effect when the next media file loads */
-  g_object_notify (G_OBJECT (bvw), "auto-resize");
-}
-
-/**
- * bacon_video_widget_set_aspect_ratio:
- * @bvw: a #BaconVideoWidget
- * @ratio: the new aspect ratio
- *
- * Sets the aspect ratio used by the widget, from #BvwAspectRatio.
- *
- * Changes to this take effect immediately.
- **/
-void
-bacon_video_widget_set_aspect_ratio (BaconVideoWidget *bvw,
-                                BvwAspectRatio ratio)
-{
-  g_return_if_fail (bvw != NULL);
-  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
-
-  bvw->priv->ratio_type = ratio;
-  got_video_size (bvw);
-}
-
-/**
- * bacon_video_widget_get_aspect_ratio:
- * @bvw: a #BaconVideoWidget
- *
- * Returns the current aspect ratio used by the widget, from
- * #BvwAspectRatio.
- *
- * Return value: the aspect ratio
- **/
-BvwAspectRatio
-bacon_video_widget_get_aspect_ratio (BaconVideoWidget *bvw)
-{
-  g_return_val_if_fail (bvw != NULL, 0);
-  g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), 0);
-
-  return bvw->priv->ratio_type;
-}
-
-/**
- * bacon_video_widget_set_scale_ratio:
- * @bvw: a #BaconVideoWidget
- * @ratio: the new scale ratio
- *
- * Sets the ratio by which the widget will scale videos when they are
- * displayed. If @ratio is set to 0, the highest ratio possible will
- * be chosen.
- **/
-void
-bacon_video_widget_set_scale_ratio (BaconVideoWidget * bvw, gfloat ratio)
-{
-  GtkWidget *toplevel;
-  gint w, h;
-
-  g_return_if_fail (bvw != NULL);
-  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
-  g_return_if_fail (GST_IS_ELEMENT (bvw->priv->play));
-
-  GST_DEBUG ("ratio = %.2f", ratio);
-
-  if (!bvw->priv->media_has_video && bvw->priv->show_vfx) {
-    get_visualization_size (bvw, &w, &h, NULL, NULL);
-  } else {
-    get_media_size (bvw, &w, &h);
-  }
-
-  if (ratio == 0.0) {
-    if (totem_ratio_fits_screen (GTK_WIDGET (bvw), w, h, 2.0))
-      ratio = 2.0;
-    else if (totem_ratio_fits_screen (GTK_WIDGET (bvw), w, h, 1.0))
-      ratio = 1.0;
-    else if (totem_ratio_fits_screen (GTK_WIDGET (bvw), w, h, 0.5))
-      ratio = 0.5;
-    else
-      return;
-  } else {
-    if (!totem_ratio_fits_screen (GTK_WIDGET (bvw), w, h, ratio)) {
-      GST_DEBUG ("movie doesn't fit on screen @ %.1fx (%dx%d)", w, h, ratio);
-      return;
-    }
-  }
-  w = (gfloat) w * ratio;
-  h = (gfloat) h * ratio;
-
-  GST_DEBUG ("setting preferred size %dx%d", w, h);
-
-  toplevel = gtk_widget_get_toplevel (GTK_WIDGET (bvw));
-  if (gtk_widget_is_toplevel (toplevel))
-    gtk_window_resize_to_geometry (GTK_WINDOW (toplevel), w, h);
-}
-
-/**
- * bacon_video_widget_set_zoom:
- * @bvw: a #BaconVideoWidget
- * @mode: the #BvwZoomMode
- *
- * Sets the zoom type applied to the video when it is displayed.
- **/
-void
-bacon_video_widget_set_zoom (BaconVideoWidget *bvw,
-                             BvwZoomMode       mode)
-{
-  g_return_if_fail (bvw != NULL);
-  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
-
-  if (bvw->priv->frame == NULL)
-    return;
-
-  totem_aspect_frame_set_expand (TOTEM_ASPECT_FRAME (bvw->priv->frame),
-			      (mode == BVW_ZOOM_EXPAND));
-}
-
-/**
- * bacon_video_widget_get_zoom:
- * @bvw: a #BaconVideoWidget
- *
- * Returns the zoom mode applied to videos displayed by the widget.
- *
- * Return value: a #BvwZoomMode
- **/
-BvwZoomMode
-bacon_video_widget_get_zoom (BaconVideoWidget *bvw)
-{
-  gboolean expand;
-
-  g_return_val_if_fail (bvw != NULL, 1.0);
-  g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), 1.0);
-
-  expand = totem_aspect_frame_get_expand (TOTEM_ASPECT_FRAME (bvw->priv->frame));
-  return expand ? BVW_ZOOM_EXPAND : BVW_ZOOM_NONE;
-}
-
-/* Search for the color balance channel corresponding to type and return it. */
-static GstColorBalanceChannel *
-bvw_get_color_balance_channel (GstColorBalance * color_balance,
-    BvwVideoProperty type)
-{
-  const GList *channels;
-
-  channels = gst_color_balance_list_channels (color_balance);
-
-  for (; channels != NULL; channels = channels->next) {
-    GstColorBalanceChannel *c = channels->data;
-
-    if (type == BVW_VIDEO_BRIGHTNESS && g_strrstr (c->label, "BRIGHTNESS"))
-      return g_object_ref (c);
-    else if (type == BVW_VIDEO_CONTRAST && g_strrstr (c->label, "CONTRAST"))
-      return g_object_ref (c);
-    else if (type == BVW_VIDEO_SATURATION && g_strrstr (c->label, "SATURATION"))
-      return g_object_ref (c);
-    else if (type == BVW_VIDEO_HUE && g_strrstr (c->label, "HUE"))
-      return g_object_ref (c);
-  }
-
-  return NULL;
-}
-
-/**
- * bacon_video_widget_get_video_property:
- * @bvw: a #BaconVideoWidget
- * @type: the type of property
- *
- * Returns the given property of the video display, such as its brightness or saturation.
- *
- * It is returned as a percentage in the full range of integer values; from 0
- * to 65535 (inclusive), where 32768 is the default.
- *
- * Return value: the property's value, in the range 0 to 65535
- **/
-int
-bacon_video_widget_get_video_property (BaconVideoWidget *bvw,
-                                       BvwVideoProperty type)
-{
-  int ret;
-
-  g_return_val_if_fail (bvw != NULL, 65535/2);
-  g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), 65535/2);
-  
-  ret = 0;
-  
-  if (bvw->priv->balance && GST_IS_COLOR_BALANCE (bvw->priv->balance))
-    {
-      GstColorBalanceChannel *found_channel = NULL;
-      
-      found_channel = bvw_get_color_balance_channel (bvw->priv->balance, type);
-      
-      if (found_channel && GST_IS_COLOR_BALANCE_CHANNEL (found_channel)) {
-        gint cur;
-
-        cur = gst_color_balance_get_value (bvw->priv->balance,
-                                           found_channel);
-
-        GST_DEBUG ("channel %s: cur=%d, min=%d, max=%d", found_channel->label,
-            cur, found_channel->min_value, found_channel->max_value);
-
-        ret = floor (0.5 +
-            ((double) cur - found_channel->min_value) * 65535 /
-            ((double) found_channel->max_value - found_channel->min_value));
-
-        GST_DEBUG ("channel %s: returning value %d", found_channel->label, ret);
-        g_object_unref (found_channel);
-        return ret;
-      } else {
-	ret = -1;
-      }
-    }
-
-  GST_DEBUG ("nothing found for type %d, returning value %d", type, ret);
-
-  return ret;
-}
-
-/**
- * bacon_video_widget_has_menus:
- * @bvw: a #BaconVideoWidget
- *
- * Returns whether the widget is currently displaying a menu,
- * such as a DVD menu.
- *
- * Return value: %TRUE if a menu is displayed, %FALSE otherwise
- **/
-gboolean
-bacon_video_widget_has_menus (BaconVideoWidget *bvw)
-{
-    g_return_val_if_fail (bvw != NULL, FALSE);
-    g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), FALSE);
-
-    if (bacon_video_widget_is_playing (bvw) == FALSE)
-        return FALSE;
-
-    return bvw->priv->is_menu;
-}
-
-/**
- * bacon_video_widget_has_angles:
- * @bvw: a #BaconVideoWidget
- *
- * Returns whether the widget is currently playing a stream with
- * multiple angles.
- *
- * Return value: %TRUE if the current video stream has multiple
- * angles, %FALSE otherwise
- **/
-gboolean
-bacon_video_widget_has_angles (BaconVideoWidget *bvw)
-{
-    guint n_video;
-
-    g_return_val_if_fail (bvw != NULL, FALSE);
-    g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), FALSE);
-
-    if (bacon_video_widget_is_playing (bvw) == FALSE)
-        return FALSE;
-
-    if (bvw->priv->has_angles)
-        return TRUE;
-
-    g_object_get (G_OBJECT (bvw->priv->play), "n-video", &n_video, NULL);
-
-    return n_video > 1;
-}
-
-/**
- * bacon_video_widget_set_next_angle:
- * @bvw: a #BaconVideoWidget
- *
- * Select the next angle, or video track in the playing stream.
- **/
-void
-bacon_video_widget_set_next_angle (BaconVideoWidget *bvw)
-{
-    guint n_video, current_video;
-
-    g_return_if_fail (bvw != NULL);
-    g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
-
-    if (bacon_video_widget_is_playing (bvw) == FALSE)
-        return;
-
-    if (bvw->priv->has_angles) {
-        GST_DEBUG ("Sending event 'next-angle'");
-        bvw_do_navigation_command (bvw, GST_NAVIGATION_COMMAND_NEXT_ANGLE);
-        return;
-    }
-
-    g_object_get (G_OBJECT (bvw->priv->play),
-		  "current-video", ¤t_video,
-		  "n-video", &n_video,
-		  NULL);
-
-    if (n_video <= 1) {
-        GST_DEBUG ("Not setting next video stream, we have %d video streams", n_video);
-	return;
-    }
-
-    current_video++;
-    if (current_video == n_video)
-      current_video = 0;
-
-    GST_DEBUG ("Setting current-video to %d/%d", current_video, n_video);
-    g_object_set (G_OBJECT (bvw->priv->play), "current-video", current_video, NULL);
-}
-
-static gboolean
-notify_volume_idle_cb (BaconVideoWidget *bvw)
-{
-  gdouble vol;
-
-  vol = gst_stream_volume_get_volume (GST_STREAM_VOLUME (bvw->priv->play),
-                                      GST_STREAM_VOLUME_FORMAT_CUBIC);
-
-  bvw->priv->volume = vol;
-
-  g_object_notify (G_OBJECT (bvw), "volume");
-
-  return FALSE;
-}
-
-static void
-notify_volume_cb (GObject             *object,
-		  GParamSpec          *pspec,
-		  BaconVideoWidget    *bvw)
-{
-  g_idle_add ((GSourceFunc) notify_volume_idle_cb, bvw);
-}
-
-/**
- * bacon_video_widget_set_video_property:
- * @bvw: a #BaconVideoWidget
- * @type: the type of property
- * @value: the property's value, in the range 0 to 65535
- *
- * Sets the given property of the video display, such as its brightness or saturation.
- *
- * It should be given as a percentage in the full range of integer values; from 0
- * to 65535 (inclusive), where 32768 is the default.
- **/
-void
-bacon_video_widget_set_video_property (BaconVideoWidget *bvw,
-                                       BvwVideoProperty type,
-                                       int value)
-{
-  g_return_if_fail (bvw != NULL);
-  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
-  
-  GST_DEBUG ("set video property type %d to value %d", type, value);
-  
-  if ( !(value <= 65535 && value >= 0) )
-    return;
-
-  if (bvw->priv->balance && GST_IS_COLOR_BALANCE (bvw->priv->balance))
-    {
-      GstColorBalanceChannel *found_channel = NULL;
-      
-      found_channel = bvw_get_color_balance_channel (bvw->priv->balance, type);
-
-      if (found_channel && GST_IS_COLOR_BALANCE_CHANNEL (found_channel))
-        {
-          int i_value;
-          
-          i_value = floor (0.5 + value * ((double) found_channel->max_value -
-              found_channel->min_value) / 65535 + found_channel->min_value);
-
-          GST_DEBUG ("channel %s: set to %d/65535", found_channel->label, value);
-
-          gst_color_balance_set_value (bvw->priv->balance, found_channel,
-                                       i_value);
-
-          GST_DEBUG ("channel %s: val=%d, min=%d, max=%d", found_channel->label,
-              i_value, found_channel->min_value, found_channel->max_value);
-
-          g_object_unref (found_channel);
-        }
-    }
-
-  /* Notify of the property change */
-  g_object_notify (G_OBJECT (bvw), video_props_str[type]);
-
-  GST_DEBUG ("setting value %d", value);
-}
-
-/**
- * bacon_video_widget_get_position:
- * @bvw: a #BaconVideoWidget
- *
- * Returns the current position in the stream, as a value between
- * 0 and 1.
- *
- * Return value: the current position, or -1
- **/
-double
-bacon_video_widget_get_position (BaconVideoWidget * bvw)
-{
-  g_return_val_if_fail (bvw != NULL, -1);
-  g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), -1);
-  return bvw->priv->current_position;
-}
-
-/**
- * bacon_video_widget_get_current_time:
- * @bvw: a #BaconVideoWidget
- *
- * Returns the current position in the stream, as the time (in milliseconds)
- * since the beginning of the stream.
- *
- * Return value: time since the beginning of the stream, in milliseconds, or -1
- **/
-gint64
-bacon_video_widget_get_current_time (BaconVideoWidget * bvw)
-{
-  g_return_val_if_fail (bvw != NULL, -1);
-  g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), -1);
-  return bvw->priv->current_time;
-}
-
-/**
- * bacon_video_widget_get_stream_length:
- * @bvw: a #BaconVideoWidget
- *
- * Returns the total length of the stream, in milliseconds.
- *
- * Return value: the stream length, in milliseconds, or -1
- **/
-gint64
-bacon_video_widget_get_stream_length (BaconVideoWidget * bvw)
-{
-  g_return_val_if_fail (bvw != NULL, -1);
-  g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), -1);
-
-  if (bvw->priv->stream_length == 0 && bvw->priv->play != NULL) {
-    GstFormat fmt = GST_FORMAT_TIME;
-    gint64 len = -1;
-
-    if (gst_element_query_duration (bvw->priv->play, &fmt, &len) && len != -1) {
-      bvw->priv->stream_length = len / GST_MSECOND;
-    }
-  }
-
-  return bvw->priv->stream_length;
-}
-
-/**
- * bacon_video_widget_is_playing:
- * @bvw: a #BaconVideoWidget
- *
- * Returns whether the widget is currently playing a stream.
- *
- * Return value: %TRUE if a stream is playing, %FALSE otherwise
- **/
-gboolean
-bacon_video_widget_is_playing (BaconVideoWidget * bvw)
-{
-  gboolean ret;
-
-  g_return_val_if_fail (bvw != NULL, FALSE);
-  g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), FALSE);
-  g_return_val_if_fail (GST_IS_ELEMENT (bvw->priv->play), FALSE);
-
-  ret = (bvw->priv->target_state == GST_STATE_PLAYING);
-  GST_LOG ("%splaying", (ret) ? "" : "not ");
-
-  return ret;
-}
-
-/**
- * bacon_video_widget_is_seekable:
- * @bvw: a #BaconVideoWidget
- *
- * Returns whether seeking is possible in the current stream.
- *
- * If no stream is loaded, %FALSE is returned.
- *
- * Return value: %TRUE if the stream is seekable, %FALSE otherwise
- **/
-gboolean
-bacon_video_widget_is_seekable (BaconVideoWidget * bvw)
-{
-  gboolean res;
-  gint old_seekable;
-
-  g_return_val_if_fail (bvw != NULL, FALSE);
-  g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), FALSE);
-  g_return_val_if_fail (GST_IS_ELEMENT (bvw->priv->play), FALSE);
-
-  if (bvw->priv->mrl == NULL)
-    return FALSE;
-
-  old_seekable = bvw->priv->seekable;
-
-  if (bvw->priv->is_menu != FALSE)
-    return FALSE;
-
-  if (bvw->priv->seekable == -1) {
-    GstQuery *query;
-
-    query = gst_query_new_seeking (GST_FORMAT_TIME);
-    if (gst_element_query (bvw->priv->play, query)) {
-      gst_query_parse_seeking (query, NULL, &res, NULL, NULL);
-      GST_DEBUG ("seeking query says the stream is%s seekable", (res) ? "" : " not");
-      bvw->priv->seekable = (res) ? 1 : 0;
-    } else {
-      GST_DEBUG ("seeking query failed");
-    }
-    gst_query_unref (query);
-  }
-
-  if (bvw->priv->seekable != -1) {
-    res = (bvw->priv->seekable != 0);
-    goto done;
-  }
-
-  /* try to guess from duration (this is very unreliable though) */
-  if (bvw->priv->stream_length == 0) {
-    res = (bacon_video_widget_get_stream_length (bvw) > 0);
-  } else {
-    res = (bvw->priv->stream_length > 0);
-  }
-
-done:
-
-  if (old_seekable != bvw->priv->seekable)
-    g_object_notify (G_OBJECT (bvw), "seekable");
-
-  GST_DEBUG ("stream is%s seekable", (res) ? "" : " not");
-  return res;
-}
-
-/**
- * bacon_video_widget_get_mrls:
- * @bvw: a #BaconVideoWidget
- * @type: the media type
- * @device: the device name
- * @error: a #GError, or %NULL
- *
- * Returns an array of MRLs available for the given @device and media @type.
- *
- * @device should typically be the number of the device (e.g. 0 for the first
- * DVD drive.
- *
- * @type can be any value from #TotemDiscMediaType, but a %BVW_ERROR_INVALID_LOCATION error
- * will be returned if @type is %MEDIA_TYPE_CDDA, as CDDA support has been removed from
- * Totem (and hence #BaconVideoWidget).
- *
- * A %BVW_ERROR_NO_PLUGIN_FOR_FILE error will be returned if the required GStreamer elements do
- * not exist for the given @type (for the GStreamer backend). *
- * If @device does not exist, a %BVW_ERROR_INVALID_DEVICE error will be returned.
- *
- * Return value: a %NULL-terminated array of MRLs, or %NULL; free with g_strfreev()
- **/
-gchar **
-bacon_video_widget_get_mrls (BaconVideoWidget * bvw,
-			     TotemDiscMediaType type,
-			     const char *device,
-			     GError **error)
-{
-  gchar **mrls;
-
-  g_return_val_if_fail (bvw != NULL, NULL);
-  g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), NULL);
-  g_return_val_if_fail (GST_IS_ELEMENT (bvw->priv->play), NULL);
-
-  GST_DEBUG ("type = %d", type);
-  GST_DEBUG ("device = %s", GST_STR_NULL (device));
-
-  switch (type) {
-    case MEDIA_TYPE_VCD: {
-	gchar *uri[] = { NULL, NULL };
-	uri[0] = g_strdup_printf ("vcd://%s", device);
-	mrls = g_strdupv (uri);
-	g_free (uri[0]);
-	break;
-      }
-    case MEDIA_TYPE_DVD: {
-      if (!gst_default_registry_check_feature_version ("rsndvdbin", 0, 10, 0)) {
-        GST_DEBUG ("Missing rsndvdbin");
-	g_set_error_literal (error, BVW_ERROR, BVW_ERROR_NO_PLUGIN_FOR_FILE,
-                             "XXX Do not use XXX");
-        return NULL;
-      } else if (!gst_default_registry_check_feature_version ("mpegpsdemux", 0, 10, 0) &&
-		 gst_default_registry_check_feature_version ("flupsdemux", 0, 10, 0) &&
-      		 !gst_default_registry_check_feature_version ("flupsdemux", 0, 10, 15)) {
-        GST_DEBUG ("flupsdemux not new enough for DVD playback");
-	g_set_error_literal (error, BVW_ERROR, BVW_ERROR_NO_PLUGIN_FOR_FILE,
-                             "XXX Do not use XXX");
-        return NULL;
-      } else {
-	gchar *uri[] = { NULL, NULL };
-	uri[0] = g_strdup_printf ("dvd://%s", device);
-	mrls = g_strdupv (uri);
-	g_free (uri[0]);
-      }
-      break;
-    }
-    case MEDIA_TYPE_CDDA:
-      g_set_error_literal (error, BVW_ERROR, BVW_ERROR_INVALID_LOCATION,
-                           "XXX Do not use XXX");
-      return NULL;
-    case MEDIA_TYPE_DATA:
-    case MEDIA_TYPE_DVB:
-    case MEDIA_TYPE_ERROR:
-    default:
-      g_assert_not_reached ();
-  }
-
-  if (mrls == NULL)
-    return NULL;
-
-  g_free (bvw->priv->media_device);
-  bvw->priv->media_device = g_strdup (device);
-
-  return mrls;
-}
-
-static gint
-bvw_get_current_stream_num (BaconVideoWidget * bvw,
-    const gchar *stream_type)
-{
-  gchar *lower, *cur_prop_str;
-  gint stream_num = -1;
-
-  if (bvw->priv->play == NULL)
-    return stream_num;
-
-  lower = g_ascii_strdown (stream_type, -1);
-  cur_prop_str = g_strconcat ("current-", lower, NULL);
-  g_object_get (bvw->priv->play, cur_prop_str, &stream_num, NULL);
-  g_free (cur_prop_str);
-  g_free (lower);
-
-  GST_LOG ("current %s stream: %d", stream_type, stream_num);
-  return stream_num;
-}
-
-static GstTagList *
-bvw_get_tags_of_current_stream (BaconVideoWidget * bvw,
-    const gchar *stream_type)
-{
-  GstTagList *tags = NULL;
-  gint stream_num = -1;
-  gchar *lower, *cur_sig_str;
-
-  stream_num = bvw_get_current_stream_num (bvw, stream_type);
-  if (stream_num < 0)
-    return NULL;
-
-  lower = g_ascii_strdown (stream_type, -1);
-  cur_sig_str = g_strconcat ("get-", lower, "-tags", NULL);
-  g_signal_emit_by_name (bvw->priv->play, cur_sig_str, stream_num, &tags);
-  g_free (cur_sig_str);
-  g_free (lower);
-
-  GST_LOG ("current %s stream tags %" GST_PTR_FORMAT, stream_type, tags);
-  return tags;
-}
-
-static GstCaps *
-bvw_get_caps_of_current_stream (BaconVideoWidget * bvw,
-    const gchar *stream_type)
-{
-  GstCaps *caps = NULL;
-  gint stream_num = -1;
-  GstPad *current;
-  gchar *lower, *cur_sig_str;
-
-  stream_num = bvw_get_current_stream_num (bvw, stream_type);
-  if (stream_num < 0)
-    return NULL;
-
-  lower = g_ascii_strdown (stream_type, -1);
-  cur_sig_str = g_strconcat ("get-", lower, "-pad", NULL);
-  g_signal_emit_by_name (bvw->priv->play, cur_sig_str, stream_num, ¤t);
-  g_free (cur_sig_str);
-  g_free (lower);
-
-  if (current != NULL) {
-    caps = gst_pad_get_negotiated_caps (current);
-    gst_object_unref (current);
-  }
-  GST_LOG ("current %s stream caps: %" GST_PTR_FORMAT, stream_type, caps);
-  return caps;
-}
-
-static gboolean
-audio_caps_have_LFE (GstStructure * s)
-{
-  GstAudioChannelPosition *positions;
-  gint i, channels;
-
-  if (!gst_structure_get_value (s, "channel-positions") ||
-      !gst_structure_get_int (s, "channels", &channels)) {
-    return FALSE;
-  }
-
-  positions = gst_audio_get_channel_positions (s);
-  if (positions == NULL)
-    return FALSE;
-
-  for (i = 0; i < channels; ++i) {
-    if (positions[i] == GST_AUDIO_CHANNEL_POSITION_LFE) {
-      g_free (positions);
-      return TRUE;
-    }
-  }
-
-  g_free (positions);
-  return FALSE;
-}
-
-static void
-bacon_video_widget_get_metadata_string (BaconVideoWidget * bvw,
-                                        BvwMetadataType type,
-                                        GValue * value)
-{
-  char *string = NULL;
-  gboolean res = FALSE;
-
-  g_value_init (value, G_TYPE_STRING);
-
-  if (bvw->priv->play == NULL) {
-    g_value_set_string (value, NULL);
-    return;
-  }
-
-  switch (type) {
-    case BVW_INFO_TITLE:
-      if (bvw->priv->tagcache != NULL) {
-        res = gst_tag_list_get_string_index (bvw->priv->tagcache,
-                                             GST_TAG_TITLE, 0, &string);
-      }
-      break;
-    case BVW_INFO_ARTIST:
-      if (bvw->priv->tagcache != NULL) {
-        res = gst_tag_list_get_string_index (bvw->priv->tagcache,
-                                             GST_TAG_ARTIST, 0, &string);
-      }
-      break;
-    case BVW_INFO_YEAR:
-      if (bvw->priv->tagcache != NULL) {
-        GDate *date;
-
-        if ((res = gst_tag_list_get_date (bvw->priv->tagcache,
-                                          GST_TAG_DATE, &date))) {
-          string = g_strdup_printf ("%d", g_date_get_year (date));
-          g_date_free (date);
-        }
-      }
-      break;
-    case BVW_INFO_COMMENT:
-      if (bvw->priv->tagcache != NULL) {
-        res = gst_tag_list_get_string_index (bvw->priv->tagcache,
-                                             GST_TAG_COMMENT, 0, &string);
-
-        /* Use the Comment; if that fails, use Description as specified by:
-         * http://xiph.org/vorbis/doc/v-comment.html */
-        if (!res) {
-          res = gst_tag_list_get_string_index (bvw->priv->tagcache,
-                                               GST_TAG_DESCRIPTION, 0, &string);
-        }
-      }
-      break;
-    case BVW_INFO_ALBUM:
-      if (bvw->priv->tagcache != NULL) {
-        res = gst_tag_list_get_string_index (bvw->priv->tagcache,
-                                             GST_TAG_ALBUM, 0, &string);
-      }
-      break;
-    case BVW_INFO_CONTAINER:
-      if (bvw->priv->tagcache != NULL) {
-        res = gst_tag_list_get_string_index (bvw->priv->tagcache,
-                                             GST_TAG_CONTAINER_FORMAT, 0, &string);
-      }
-      break;
-    case BVW_INFO_VIDEO_CODEC: {
-      GstTagList *tags;
-
-      /* try to get this from the stream info first */
-      if ((tags = bvw_get_tags_of_current_stream (bvw, "video"))) {
-        res = gst_tag_list_get_string (tags, GST_TAG_CODEC, &string);
-	gst_tag_list_free (tags);
-      }
-
-      /* if that didn't work, try the aggregated tags */
-      if (!res && bvw->priv->tagcache != NULL) {
-        res = gst_tag_list_get_string (bvw->priv->tagcache,
-            GST_TAG_VIDEO_CODEC, &string);
-      }
-      break;
-    }
-    case BVW_INFO_AUDIO_CODEC: {
-      GstTagList *tags;
-
-      /* try to get this from the stream info first */
-      if ((tags = bvw_get_tags_of_current_stream (bvw, "audio"))) {
-        res = gst_tag_list_get_string (tags, GST_TAG_CODEC, &string);
-	gst_tag_list_free (tags);
-      }
-
-      /* if that didn't work, try the aggregated tags */
-      if (!res && bvw->priv->tagcache != NULL) {
-        res = gst_tag_list_get_string (bvw->priv->tagcache,
-            GST_TAG_AUDIO_CODEC, &string);
-      }
-      break;
-    }
-    case BVW_INFO_AUDIO_CHANNELS: {
-      GstStructure *s;
-      GstCaps *caps;
-
-      caps = bvw_get_caps_of_current_stream (bvw, "audio");
-      if (caps) {
-        gint channels = 0;
-
-        s = gst_caps_get_structure (caps, 0);
-        if ((res = gst_structure_get_int (s, "channels", &channels))) {
-          /* FIXME: do something more sophisticated - but what? */
-          if (channels > 2 && audio_caps_have_LFE (s)) {
-            string = g_strdup_printf ("%s %d.1", _("Surround"), channels - 1);
-          } else if (channels == 1) {
-            string = g_strdup (_("Mono"));
-          } else if (channels == 2) {
-            string = g_strdup (_("Stereo"));
-          } else {
-            string = g_strdup_printf ("%d", channels);
-          }
-        }
-        gst_caps_unref (caps);
-      }
-      break;
-    }
-
-    case BVW_INFO_DURATION:
-    case BVW_INFO_TRACK_NUMBER:
-    case BVW_INFO_COVER:
-    case BVW_INFO_HAS_VIDEO:
-    case BVW_INFO_DIMENSION_X:
-    case BVW_INFO_DIMENSION_Y:
-    case BVW_INFO_VIDEO_BITRATE:
-    case BVW_INFO_FPS:
-    case BVW_INFO_HAS_AUDIO:
-    case BVW_INFO_AUDIO_BITRATE:
-    case BVW_INFO_AUDIO_SAMPLE_RATE:
-      /* Not strings */
-    default:
-      g_assert_not_reached ();
-    }
-
-  /* Remove line feeds */
-  if (string && strstr (string, "\n") != NULL)
-    g_strdelimit (string, "\n", ' ');
-
-  if (res && string && g_utf8_validate (string, -1, NULL)) {
-    g_value_take_string (value, string);
-    GST_DEBUG ("%s = '%s'", get_type_name (BVW_TYPE_METADATA_TYPE, type), string);
-  } else {
-    g_value_set_string (value, NULL);
-    g_free (string);
-  }
-
-  return;
-}
-
-static void
-bacon_video_widget_get_metadata_int (BaconVideoWidget * bvw,
-                                     BvwMetadataType type,
-                                     GValue * value)
-{
-  int integer = 0;
-
-  g_value_init (value, G_TYPE_INT);
-
-  if (bvw->priv->play == NULL) {
-    g_value_set_int (value, 0);
-    return;
-  }
-
-  switch (type) {
-    case BVW_INFO_DURATION:
-      integer = bacon_video_widget_get_stream_length (bvw) / 1000;
-      break;
-    case BVW_INFO_TRACK_NUMBER:
-      if (bvw->priv->tagcache == NULL)
-        break;
-      if (!gst_tag_list_get_uint (bvw->priv->tagcache,
-                                  GST_TAG_TRACK_NUMBER, (guint *) &integer))
-        integer = 0;
-      break;
-    case BVW_INFO_DIMENSION_X:
-      integer = bvw->priv->video_width;
-      break;
-    case BVW_INFO_DIMENSION_Y:
-      integer = bvw->priv->video_height;
-      break;
-    case BVW_INFO_FPS:
-      if (bvw->priv->video_fps_d > 0) {
-        /* Round up/down to the nearest integer framerate */
-        integer = (bvw->priv->video_fps_n + bvw->priv->video_fps_d/2) /
-                  bvw->priv->video_fps_d;
-      }
-      else
-        integer = 0;
-      break;
-    case BVW_INFO_AUDIO_BITRATE:
-      if (bvw->priv->audiotags == NULL)
-        break;
-      if (gst_tag_list_get_uint (bvw->priv->audiotags, GST_TAG_BITRATE,
-          (guint *)&integer) ||
-          gst_tag_list_get_uint (bvw->priv->audiotags, GST_TAG_NOMINAL_BITRATE,
-          (guint *)&integer)) {
-        integer /= 1000;
-      }
-      break;
-    case BVW_INFO_VIDEO_BITRATE:
-      if (bvw->priv->videotags == NULL)
-        break;
-      if (gst_tag_list_get_uint (bvw->priv->videotags, GST_TAG_BITRATE,
-          (guint *)&integer) ||
-          gst_tag_list_get_uint (bvw->priv->videotags, GST_TAG_NOMINAL_BITRATE,
-          (guint *)&integer)) {
-        integer /= 1000;
-      }
-      break;
-    case BVW_INFO_AUDIO_SAMPLE_RATE: {
-      GstStructure *s;
-      GstCaps *caps;
-
-      caps = bvw_get_caps_of_current_stream (bvw, "audio");
-      if (caps) {
-        s = gst_caps_get_structure (caps, 0);
-        gst_structure_get_int (s, "rate", &integer);
-        gst_caps_unref (caps);
-      }
-      break;
-    }
-
-    case BVW_INFO_TITLE:
-    case BVW_INFO_ARTIST:
-    case BVW_INFO_YEAR:
-    case BVW_INFO_COMMENT:
-    case BVW_INFO_ALBUM:
-    case BVW_INFO_COVER:
-    case BVW_INFO_CONTAINER:
-    case BVW_INFO_HAS_VIDEO:
-    case BVW_INFO_VIDEO_CODEC:
-    case BVW_INFO_HAS_AUDIO:
-    case BVW_INFO_AUDIO_CODEC:
-    case BVW_INFO_AUDIO_CHANNELS:
-      /* Not ints */
-    default:
-      g_assert_not_reached ();
-    }
-
-  g_value_set_int (value, integer);
-  GST_DEBUG ("%s = %d", get_type_name (BVW_TYPE_METADATA_TYPE, type), integer);
-
-  return;
-}
-
-static void
-bacon_video_widget_get_metadata_bool (BaconVideoWidget * bvw,
-                                      BvwMetadataType type,
-                                      GValue * value)
-{
-  gboolean boolean = FALSE;
-
-  g_value_init (value, G_TYPE_BOOLEAN);
-
-  if (bvw->priv->play == NULL) {
-    g_value_set_boolean (value, FALSE);
-    return;
-  }
-
-  GST_DEBUG ("tagcache  = %" GST_PTR_FORMAT, bvw->priv->tagcache);
-  GST_DEBUG ("videotags = %" GST_PTR_FORMAT, bvw->priv->videotags);
-  GST_DEBUG ("audiotags = %" GST_PTR_FORMAT, bvw->priv->audiotags);
-
-  switch (type)
-  {
-    case BVW_INFO_HAS_VIDEO:
-      boolean = bvw->priv->media_has_video;
-      break;
-    case BVW_INFO_HAS_AUDIO:
-      boolean = bvw->priv->media_has_audio;
-      break;
-
-    case BVW_INFO_TITLE:
-    case BVW_INFO_ARTIST:
-    case BVW_INFO_YEAR:
-    case BVW_INFO_COMMENT:
-    case BVW_INFO_ALBUM:
-    case BVW_INFO_DURATION:
-    case BVW_INFO_TRACK_NUMBER:
-    case BVW_INFO_COVER:
-    case BVW_INFO_CONTAINER:
-    case BVW_INFO_DIMENSION_X:
-    case BVW_INFO_DIMENSION_Y:
-    case BVW_INFO_VIDEO_BITRATE:
-    case BVW_INFO_VIDEO_CODEC:
-    case BVW_INFO_FPS:
-    case BVW_INFO_AUDIO_BITRATE:
-    case BVW_INFO_AUDIO_CODEC:
-    case BVW_INFO_AUDIO_SAMPLE_RATE:
-    case BVW_INFO_AUDIO_CHANNELS:
-      /* Not bools */
-    default:
-      g_assert_not_reached ();
-  }
-
-  g_value_set_boolean (value, boolean);
-  GST_DEBUG ("%s = %s", get_type_name (BVW_TYPE_METADATA_TYPE, type), (boolean) ? "yes" : "no");
-
-  return;
-}
-
-/**
- * bacon_video_widget_get_metadata:
- * @bvw: a #BaconVideoWidget
- * @type: the type of metadata to return
- * @value: a #GValue
- *
- * Provides metadata of the given @type about the current stream in @value.
- *
- * Free the #GValue with g_value_unset().
- **/
-void
-bacon_video_widget_get_metadata (BaconVideoWidget * bvw,
-                                 BvwMetadataType type,
-                                 GValue * value)
-{
-  g_return_if_fail (bvw != NULL);
-  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
-  g_return_if_fail (GST_IS_ELEMENT (bvw->priv->play));
-
-  switch (type)
-    {
-    case BVW_INFO_TITLE:
-    case BVW_INFO_ARTIST:
-    case BVW_INFO_YEAR:
-    case BVW_INFO_COMMENT:
-    case BVW_INFO_ALBUM:
-    case BVW_INFO_CONTAINER:
-    case BVW_INFO_VIDEO_CODEC:
-    case BVW_INFO_AUDIO_CODEC:
-    case BVW_INFO_AUDIO_CHANNELS:
-      bacon_video_widget_get_metadata_string (bvw, type, value);
-      break;
-    case BVW_INFO_DURATION:
-    case BVW_INFO_DIMENSION_X:
-    case BVW_INFO_DIMENSION_Y:
-    case BVW_INFO_FPS:
-    case BVW_INFO_AUDIO_BITRATE:
-    case BVW_INFO_VIDEO_BITRATE:
-    case BVW_INFO_TRACK_NUMBER:
-    case BVW_INFO_AUDIO_SAMPLE_RATE:
-      bacon_video_widget_get_metadata_int (bvw, type, value);
-      break;
-    case BVW_INFO_HAS_VIDEO:
-    case BVW_INFO_HAS_AUDIO:
-      bacon_video_widget_get_metadata_bool (bvw, type, value);
-      break;
-    case BVW_INFO_COVER:
-      {
-	GdkPixbuf *pixbuf;
-
-	if (!bvw->priv->tagcache)
-	  break;
-
-	pixbuf = totem_gst_tag_list_get_cover (bvw->priv->tagcache);
-	if (pixbuf) {
-	  g_value_init (value, GDK_TYPE_PIXBUF);
-	  g_value_take_object (value, pixbuf);
-        }
-      }
-      break;
-    default:
-      g_return_if_reached ();
-    }
-
-  return;
-}
-
-/* Screenshot functions */
-
-/**
- * bacon_video_widget_can_get_frames:
- * @bvw: a #BaconVideoWidget
- * @error: a #GError, or %NULL
- *
- * Determines whether individual frames from the current stream can
- * be returned using bacon_video_widget_get_current_frame().
- *
- * Frames cannot be returned for audio-only streams, unless visualisations
- * are enabled.
- *
- * Return value: %TRUE if frames can be captured, %FALSE otherwise
- **/
-gboolean
-bacon_video_widget_can_get_frames (BaconVideoWidget * bvw, GError ** error)
-{
-  g_return_val_if_fail (bvw != NULL, FALSE);
-  g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), FALSE);
-  g_return_val_if_fail (GST_IS_ELEMENT (bvw->priv->play), FALSE);
-
-  /* check for video */
-  if (!bvw->priv->media_has_video && !bvw->priv->show_vfx) {
-    g_set_error_literal (error, BVW_ERROR, BVW_ERROR_GENERIC,
-        _("Media contains no supported video streams."));
-    return FALSE;
-  }
-
-  return TRUE;
-}
-
-/**
- * bacon_video_widget_get_current_frame:
- * @bvw: a #BaconVideoWidget
- *
- * Returns a #GdkPixbuf containing the current frame from the playing
- * stream. This will wait for any pending seeks to complete before
- * capturing the frame.
- *
- * Return value: the current frame, or %NULL; unref with g_object_unref()
- **/
-GdkPixbuf *
-bacon_video_widget_get_current_frame (BaconVideoWidget * bvw)
-{
-  g_return_val_if_fail (bvw != NULL, NULL);
-  g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), NULL);
-  g_return_val_if_fail (GST_IS_ELEMENT (bvw->priv->play), NULL);
-
-  /* no video info */
-  if (!bvw->priv->video_width || !bvw->priv->video_height) {
-    GST_DEBUG ("Could not take screenshot: %s", "no video info");
-    g_warning ("Could not take screenshot: %s", "no video info");
-    return NULL;
-  }
-
-  return totem_gst_playbin_get_frame (bvw->priv->play);
-}
-
-/* =========================================== */
-/*                                             */
-/*          Widget typing & Creation           */
-/*                                             */
-/* =========================================== */
-
-/**
- * bacon_video_widget_get_option_group:
- *
- * Returns the #GOptionGroup containing command-line options for
- * #BaconVideoWidget.
- *
- * Applications must call either this exactly once.
- *
- * Return value: a #GOptionGroup giving command-line options for #BaconVideoWidget
- **/
-GOptionGroup*
-bacon_video_widget_get_option_group (void)
-{
-  if (gtk_clutter_init (NULL, NULL) != CLUTTER_INIT_SUCCESS)
-    return NULL;
-  return gst_init_get_option_group ();
-}
-
-GQuark
-bacon_video_widget_error_quark (void)
-{
-  static GQuark q; /* 0 */
-
-  if (G_UNLIKELY (q == 0)) {
-    q = g_quark_from_static_string ("bvw-error-quark");
-  }
-  return q;
-}
-
-static gboolean
-bvw_set_playback_direction (BaconVideoWidget *bvw, gboolean forward)
-{
-  gboolean is_forward;
-  gboolean retval;
-
-  is_forward = (bvw->priv->rate > 0.0);
-  if (forward == is_forward)
-    return TRUE;
-
-  retval = FALSE;
-
-  if (forward == FALSE) {
-    GstEvent *event;
-    GstFormat fmt;
-    gint64 cur = 0;
-
-    fmt = GST_FORMAT_TIME;
-    if (gst_element_query_position (bvw->priv->play, &fmt, &cur)) {
-      GST_DEBUG ("Setting playback direction to reverse at %"G_GINT64_FORMAT"", cur);
-      event = gst_event_new_seek (REVERSE_RATE,
-				  fmt, GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_ACCURATE,
-				  GST_SEEK_TYPE_SET, G_GINT64_CONSTANT (0),
-				  GST_SEEK_TYPE_SET, cur);
-      if (gst_element_send_event (bvw->priv->play, event) == FALSE) {
-	GST_WARNING ("Failed to set playback direction to reverse");
-      } else {
-	gst_element_get_state (bvw->priv->play, NULL, NULL, GST_CLOCK_TIME_NONE);
-	bvw->priv->rate = REVERSE_RATE;
-	retval = TRUE;
-      }
-    } else {
-      GST_LOG ("Failed to query position to set playback to reverse");
-    }
-  } else {
-    GstEvent *event;
-    GstFormat fmt;
-    gint64 cur = 0;
-
-    fmt = GST_FORMAT_TIME;
-    cur = 0;
-    if (gst_element_query_position (bvw->priv->play, &fmt, &cur)) {
-      GST_DEBUG ("Setting playback direction to forward at %"G_GINT64_FORMAT"", cur);
-      event = gst_event_new_seek (FORWARD_RATE,
-				  fmt, GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_ACCURATE,
-				  GST_SEEK_TYPE_SET, cur,
-				  GST_SEEK_TYPE_SET, GST_CLOCK_TIME_NONE);
-      if (gst_element_send_event (bvw->priv->play, event) == FALSE) {
-	GST_WARNING ("Failed to set playback direction to forward");
-      } else {
-	gst_element_get_state (bvw->priv->play, NULL, NULL, GST_CLOCK_TIME_NONE);
-	bvw->priv->rate = FORWARD_RATE;
-	retval = TRUE;
-      }
-    } else {
-      GST_LOG ("Failed to query position to set playback to forward");
-    }
-  }
-
-  return retval;
-}
-
-/**
- * bacon_video_widget_new:
- * @error: a #GError, or %NULL
- *
- * Creates a new #BaconVideoWidget.
- *
- * @width and @height give the initial or expected video height. Set them to -1 if the
- * video size is unknown. For small videos, #BaconVideoWidget will be configured differently.
- *
- * A #BvwError will be returned on error.
- *
- * Return value: a new #BaconVideoWidget, or %NULL; destroy with gtk_widget_destroy()
- **/
-GtkWidget *
-bacon_video_widget_new (GError ** error)
-{
-  BaconVideoWidget *bvw;
-  GstElement *audio_sink = NULL, *video_sink = NULL;
-  gchar *version_str;
-  GstPlayFlags flags;
-  ClutterColor black = { 0x00, 0x00, 0x00, 0xff };
-  ClutterConstraint *constraint;
-  GstElement *balance, *sink, *bin;
-  GstPad *pad, *ghostpad;
-
-#ifndef GST_DISABLE_GST_DEBUG
-  if (_totem_gst_debug_cat == NULL) {
-    GST_DEBUG_CATEGORY_INIT (_totem_gst_debug_cat, "totem", 0,
-        "Totem GStreamer Backend");
-  }
-#endif
-
-  version_str = gst_version_string ();
-  GST_DEBUG ("Initialised %s", version_str);
-  g_free (version_str);
-
-  gst_pb_utils_init ();
-
-  bvw = BACON_VIDEO_WIDGET (g_object_new
-                            (bacon_video_widget_get_type (), NULL));
-
-  bvw->priv->play = gst_element_factory_make ("playbin2", "play");
-  if (!bvw->priv->play) {
-    g_set_error_literal (error, BVW_ERROR, BVW_ERROR_PLUGIN_LOAD,
-                 _("Failed to create a GStreamer play object. "
-                   "Please check your GStreamer installation."));
-    g_object_ref_sink (bvw);
-    g_object_unref (bvw);
-    return NULL;
-  }
-
-  bvw->priv->bus = gst_element_get_bus (bvw->priv->play);
-
-  /* Add the download flag, for streaming buffering,
-   * and the deinterlace flag, for video only */
-  g_object_get (bvw->priv->play, "flags", &flags, NULL);
-  flags |= GST_PLAY_FLAG_DOWNLOAD;
-  g_object_set (bvw->priv->play, "flags", flags, NULL);
-  flags |= GST_PLAY_FLAG_DEINTERLACE;
-  g_object_set (bvw->priv->play, "flags", flags, NULL);
-
-  gst_bus_add_signal_watch (bvw->priv->bus);
-
-  bvw->priv->sig_bus_async = 
-      g_signal_connect (bvw->priv->bus, "message", 
-                        G_CALLBACK (bvw_bus_message_cb),
-                        bvw);
-
-  bvw->priv->speakersetup = BVW_AUDIO_SOUND_STEREO;
-  bvw->priv->media_device = g_strdup ("/dev/dvd");
-  bvw->priv->visq = BVW_VISUALIZATION_SMALL;
-  bvw->priv->show_vfx = FALSE;
-  bvw->priv->vis_element_name = g_strdup ("goom");
-  bvw->priv->connection_speed = 11;
-  bvw->priv->ratio_type = BVW_RATIO_AUTO;
-
-  bvw->priv->cursor_shown = TRUE;
-  bvw->priv->logo_mode = FALSE;
-  bvw->priv->auto_resize = FALSE;
-
-  audio_sink = gst_element_factory_make ("autoaudiosink", "audio-sink");
-
-
-  bvw->priv->stage = gtk_clutter_embed_get_stage (GTK_CLUTTER_EMBED (bvw));
-  clutter_stage_set_color (CLUTTER_STAGE (bvw->priv->stage), &black);
-
-  /* Bin */
-  bin = gst_bin_new ("video_sink_bin");
-
-  /* Video sink, with aspect frame */
-  bvw->priv->texture = g_object_new (CLUTTER_TYPE_TEXTURE,
-				     "disable-slicing", TRUE,
-				     NULL);
-  sink = clutter_gst_video_sink_new (CLUTTER_TEXTURE (bvw->priv->texture));
-  bvw->priv->navigation = GST_NAVIGATION (sink);
-  if (sink == NULL)
-    g_critical ("Could not create Clutter video sink");
-
-  /* The logo */
-  bvw->priv->logo_frame = totem_aspect_frame_new ();
-  clutter_actor_set_name (bvw->priv->logo_frame, "logo-frame");
-  bvw->priv->logo = clutter_texture_new ();
-  mx_bin_set_child (MX_BIN (bvw->priv->logo_frame), bvw->priv->logo);
-  clutter_container_add_actor (CLUTTER_CONTAINER (bvw->priv->stage), bvw->priv->logo_frame);
-  mx_bin_set_fill (MX_BIN (bvw->priv->logo_frame), FALSE, FALSE);
-  mx_bin_set_alignment (MX_BIN (bvw->priv->logo_frame), MX_ALIGN_MIDDLE, MX_ALIGN_MIDDLE);
-  clutter_actor_set_size (bvw->priv->logo, LOGO_SIZE, LOGO_SIZE);
-  constraint = clutter_bind_constraint_new (bvw->priv->stage, CLUTTER_BIND_SIZE, 0.0);
-  clutter_actor_add_constraint_with_name (bvw->priv->logo_frame, "size", constraint);
-  clutter_actor_hide (CLUTTER_ACTOR (bvw->priv->logo_frame));
-
-  /* The video */
-  bvw->priv->frame = totem_aspect_frame_new ();
-  clutter_actor_set_name (bvw->priv->frame, "frame");
-  mx_bin_set_child (MX_BIN (bvw->priv->frame), bvw->priv->texture);
-
-  clutter_container_add_actor (CLUTTER_CONTAINER (bvw->priv->stage), bvw->priv->frame);
-  constraint = clutter_bind_constraint_new (bvw->priv->stage, CLUTTER_BIND_SIZE, 0.0);
-  clutter_actor_add_constraint_with_name (bvw->priv->frame, "size", constraint);
-
-  clutter_actor_raise (CLUTTER_ACTOR (bvw->priv->frame),
-		       CLUTTER_ACTOR (bvw->priv->logo_frame));
-
-  gst_bin_add (GST_BIN (bin), sink);
-
-  /* Add video balance */
-  balance = gst_element_factory_make ("videobalance", "video_balance");
-  gst_bin_add (GST_BIN (bin), balance);
-  bvw->priv->balance = GST_COLOR_BALANCE (balance);
-  pad = gst_element_get_static_pad (balance, "sink");
-  ghostpad = gst_ghost_pad_new ("sink", pad);
-  gst_element_add_pad (bin, ghostpad);
-
-  gst_element_link (balance, sink);
-
-  video_sink = bin;
-  gst_element_set_state (video_sink, GST_STATE_READY);
-
-  if (audio_sink) {
-    GstStateChangeReturn ret;
-    GstBus *bus;
-
-    /* need to set bus explicitly as it's not in a bin yet and
-     * we need one to catch error messages */
-    bus = gst_bus_new ();
-    gst_element_set_bus (audio_sink, bus);
-
-    /* state change NULL => READY should always be synchronous */
-    ret = gst_element_set_state (audio_sink, GST_STATE_READY);
-    gst_element_set_bus (audio_sink, NULL);
-
-    if (ret == GST_STATE_CHANGE_FAILURE) {
-      /* doesn't work, drop this audio sink */
-      gst_element_set_state (audio_sink, GST_STATE_NULL);
-      gst_object_unref (audio_sink);
-      /* Hopefully, fakesink should always work */
-      audio_sink = gst_element_factory_make ("fakesink", "audio-sink");
-      if (audio_sink == NULL) {
-        GstMessage *err_msg;
-
-        err_msg = gst_bus_poll (bus, GST_MESSAGE_ERROR, 0);
-        if (err_msg == NULL) {
-          g_warning ("Should have gotten an error message, please file a bug.");
-          g_set_error_literal (error, BVW_ERROR, BVW_ERROR_AUDIO_PLUGIN,
-                       _("Failed to open audio output. You may not have "
-                         "permission to open the sound device, or the sound "
-                         "server may not be running. "
-                         "Please select another audio output in the Multimedia "
-                         "Systems Selector."));
-        } else if (error) {
-          *error = bvw_error_from_gst_error (bvw, err_msg);
-          gst_message_unref (err_msg);
-        }
-        gst_object_unref (bus);
-        goto sink_error;
-      }
-      /* make fakesink sync to the clock like a real sink */
-      g_object_set (audio_sink, "sync", TRUE, NULL);
-      GST_DEBUG ("audio sink doesn't work, using fakesink instead");
-      bvw->priv->uses_audio_fakesink = TRUE;
-    }
-    gst_object_unref (bus);
-  } else {
-    g_set_error_literal (error, BVW_ERROR, BVW_ERROR_AUDIO_PLUGIN,
-                 _("Could not find the audio output. "
-                   "You may need to install additional GStreamer plugins, or "
-                   "select another audio output in the Multimedia Systems "
-                   "Selector."));
-    goto sink_error;
-  }
-
-  /* set back to NULL to close device again in order to avoid interrupts
-   * being generated after startup while there's nothing to play yet
-   * FIXME not needed anymore, PulseAudio? */
-  gst_element_set_state (audio_sink, GST_STATE_NULL);
-
-  do {
-    GstElement *audio_bin;
-    GstPad *audio_pad;
-
-    bvw->priv->audio_capsfilter =
-        gst_element_factory_make ("capsfilter", "audiofilter");
-    audio_bin = gst_bin_new ("audiosinkbin");
-    gst_bin_add_many (GST_BIN (audio_bin), bvw->priv->audio_capsfilter,
-        audio_sink, NULL);
-    gst_element_link_pads (bvw->priv->audio_capsfilter, "src",
-        audio_sink, "sink");
-
-    audio_pad = gst_element_get_static_pad (bvw->priv->audio_capsfilter, "sink");
-    gst_element_add_pad (audio_bin, gst_ghost_pad_new ("sink", audio_pad));
-    gst_object_unref (audio_pad);
-
-    audio_sink = audio_bin;
-  } while (0);
-
-  /* now tell playbin */
-  g_object_set (bvw->priv->play, "video-sink", video_sink, NULL);
-  g_object_set (bvw->priv->play, "audio-sink", audio_sink, NULL);
-
-  bvw->priv->vis_plugins_list = NULL;
-
-  g_signal_connect (G_OBJECT (bvw->priv->play), "notify::volume",
-      G_CALLBACK (notify_volume_cb), bvw);
-  g_signal_connect (bvw->priv->play, "notify::source",
-      G_CALLBACK (playbin_source_notify_cb), bvw);
-  g_signal_connect (bvw->priv->play, "video-changed",
-      G_CALLBACK (playbin_stream_changed_cb), bvw);
-  g_signal_connect (bvw->priv->play, "audio-changed",
-      G_CALLBACK (playbin_stream_changed_cb), bvw);
-  g_signal_connect (bvw->priv->play, "text-changed",
-      G_CALLBACK (playbin_stream_changed_cb), bvw);
-  g_signal_connect (bvw->priv->play, "deep-notify::temp-location",
-      G_CALLBACK (playbin_deep_notify_cb), bvw);
-
-  g_signal_connect (bvw->priv->play, "video-tags-changed",
-      G_CALLBACK (video_tags_changed_cb), bvw);
-  g_signal_connect (bvw->priv->play, "audio-tags-changed",
-      G_CALLBACK (audio_tags_changed_cb), bvw);
-  g_signal_connect (bvw->priv->play, "text-tags-changed",
-      G_CALLBACK (text_tags_changed_cb), bvw);
-
-  return GTK_WIDGET (bvw);
-
-  /* errors */
-sink_error:
-  {
-    if (video_sink) {
-      gst_element_set_state (video_sink, GST_STATE_NULL);
-      gst_object_unref (video_sink);
-    }
-    if (audio_sink) {
-      gst_element_set_state (audio_sink, GST_STATE_NULL);
-      gst_object_unref (audio_sink);
-    }
-
-    g_object_ref (bvw);
-    g_object_ref_sink (G_OBJECT (bvw));
-    g_object_unref (bvw);
-
-    return NULL;
-  }
-}
-
-/*
- * vim: sw=2 ts=8 cindent noai bs=2
- */
diff -Nru totem-3.4.3/src/backend/bacon-video-widget-gst-missing-plugins.c totem-3.6.2/src/backend/bacon-video-widget-gst-missing-plugins.c
--- totem-3.4.3/src/backend/bacon-video-widget-gst-missing-plugins.c	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/backend/bacon-video-widget-gst-missing-plugins.c	2012-08-29 23:07:45.000000000 +0000
@@ -23,6 +23,8 @@
 #include "config.h"
 
 #include "bacon-video-widget-gst-missing-plugins.h"
+
+#define GST_USE_UNSTABLE_API 1
 #include  /* for gst_registry_update and functions in bacon_video_widget_gst_missing_plugins_blacklist */
 
 #ifdef ENABLE_MISSING_PLUGIN_INSTALLATION
@@ -243,6 +245,9 @@
 	TotemCodecInstallContext *ctx;
 	GstInstallPluginsReturn status;
 	guint i, num;
+#ifdef GDK_WINDOWING_X11
+	GdkDisplay *display;
+#endif
 
 	num = g_strv_length (details);
 	g_return_val_if_fail (num > 0 && g_strv_length (descriptions) == num, FALSE);
@@ -281,14 +286,18 @@
 	install_ctx = gst_install_plugins_context_new ();
 
 #ifdef GDK_WINDOWING_X11
-	if (gtk_widget_get_window (GTK_WIDGET (bvw)) != NULL && gtk_widget_get_realized (GTK_WIDGET (bvw)))
+	display = gdk_display_get_default ();
+
+	if (GDK_IS_X11_DISPLAY (display) &&
+	    gtk_widget_get_window (GTK_WIDGET (bvw)) != NULL &&
+	    gtk_widget_get_realized (GTK_WIDGET (bvw)))
 	{
 		gulong xid = 0;
 
 		xid = bacon_video_widget_gst_get_toplevel (GTK_WIDGET (bvw));
 		gst_install_plugins_context_set_xid (install_ctx, xid);
 	}
-#endif
+#endif /* GDK_WINDOWING_X11 */
 
 	status = gst_install_plugins_async (ctx->details, install_ctx,
 	                                    on_plugin_installation_done,
@@ -338,19 +347,35 @@
 #endif
 }
 
-void 
+void
 bacon_video_widget_gst_missing_plugins_blacklist (void)
 {
-	const gchar *blacklisted_elements[] = { "ffdemux_flv" };
+	struct {
+		const char *name;
+		gboolean remove;
+	} blacklisted_elements[] = {
+		{ "ffdemux_flv", 0 },
+		{ "avdemux_flv", 0 },
+		{ "dvdreadsrc" , 1 }
+	};
+	GstRegistry *registry;
 	guint i;
 
+	registry = gst_registry_get ();
+
 	for (i = 0; i < G_N_ELEMENTS (blacklisted_elements); ++i) {
 		GstPluginFeature *feature;
 
-		feature = gst_default_registry_find_feature (blacklisted_elements[i],
-							     GST_TYPE_ELEMENT_FACTORY);
-
-		if (feature)
+		feature = gst_registry_find_feature (registry,
+						     blacklisted_elements[i].name,
+						     GST_TYPE_ELEMENT_FACTORY);
+
+		if (!feature)
+			continue;
+
+		if (blacklisted_elements[i].remove)
+			gst_registry_remove_feature (registry, feature);
+		else
 			gst_plugin_feature_set_rank (feature, GST_RANK_NONE);
 	}
 }
diff -Nru totem-3.4.3/src/backend/bacon-video-widget.c totem-3.6.2/src/backend/bacon-video-widget.c
--- totem-3.4.3/src/backend/bacon-video-widget.c	1970-01-01 00:00:00.000000000 +0000
+++ totem-3.6.2/src/backend/bacon-video-widget.c	2012-10-25 13:15:47.000000000 +0000
@@ -0,0 +1,6187 @@
+/* 
+ * Copyright (C) 2003-2007 the GStreamer project
+ *      Julien Moutte 
+ *      Ronald Bultje 
+ * Copyright (C) 2005-2008 Tim-Philipp Müller 
+ * Copyright (C) 2009 Sebastian Dröge 
+ * Copyright © 2009 Christian Persch
+ *
+ * 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 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
+ *
+ * The Totem project hereby grant permission for non-gpl compatible GStreamer
+ * plugins to be used and distributed together with GStreamer and Totem. This
+ * permission is above and beyond the permissions granted by the GPL license
+ * Totem is covered by.
+ *
+ * Monday 7th February 2005: Christian Schaller: Add exception clause.
+ * See license_change file for details.
+ *
+ */
+
+/**
+ * SECTION:bacon-video-widget
+ * @short_description: video playing widget and abstraction
+ * @stability: Unstable
+ * @include: bacon-video-widget.h
+ *
+ * #BaconVideoWidget is a widget to play audio or video streams, with support for visualisations for audio-only streams. It has a GStreamer
+ * backend, and abstracts away the differences to provide a simple interface to the functionality required by Totem. It handles all the low-level
+ * audio and video work for Totem (or passes the work off to the backend).
+ **/
+
+#include 
+
+#define GST_USE_UNSTABLE_API 1
+
+#include 
+
+/* GStreamer Interfaces */
+#include 
+#include 
+/* for detecting sources of errors */
+#include 
+#include 
+#include 
+/* for pretty multichannel strings */
+#include 
+/* for the volume property */
+#include 
+
+/* for missing decoder/demuxer detection */
+#include 
+
+/* for the cover metadata info */
+#include 
+
+#include 
+#include "totem-aspect-frame.h"
+
+/* system */
+#include 
+#include 
+#include 
+#include 
+#include 
+
+/* gtk+/gnome */
+#include 
+#include 
+#include 
+#include 
+
+#ifdef GDK_WINDOWING_X11
+#include 
+#endif /* GDK_WINDOWING_X11 */
+
+#include "totem-gst-helpers.h"
+#include "totem-gst-pixbuf-helpers.h"
+#include "bacon-video-widget.h"
+#include "bacon-video-widget-gst-missing-plugins.h"
+#include "bacon-video-osd-actor.h"
+#include "baconvideowidget-marshal.h"
+#include "bacon-video-widget-enums.h"
+#include "video-utils.h"
+
+#define DEFAULT_USER_AGENT "Videos/"VERSION
+
+#define OSD_SIZE 130                           /* Size of the OSD popup */
+#define OSD_MARGIN 8                           /* Pixels from the top-left */
+#define LOGO_SIZE 256                          /* Maximum size of the logo */
+
+#define MAX_NETWORK_SPEED 10752
+#define BUFFERING_LEFT_RATIO 1.1
+
+/* Helper constants */
+#define NANOSECS_IN_SEC 1000000000
+#define SEEK_TIMEOUT NANOSECS_IN_SEC / 10
+#define FORWARD_RATE 1.0
+#define REVERSE_RATE -1.0
+
+#define is_error(e, d, c) \
+  (e->domain == GST_##d##_ERROR && \
+   e->code == GST_##d##_ERROR_##c)
+
+#define I_(string) (g_intern_static_string (string))
+
+static void bacon_video_widget_initable_iface_init (GInitableIface *iface);
+
+G_DEFINE_TYPE_WITH_CODE (BaconVideoWidget, bacon_video_widget, GTK_CLUTTER_TYPE_EMBED,
+			 G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE,
+						bacon_video_widget_initable_iface_init))
+
+/* Signals */
+enum
+{
+  SIGNAL_ERROR,
+  SIGNAL_EOS,
+  SIGNAL_REDIRECT,
+  SIGNAL_CHANNELS_CHANGE,
+  SIGNAL_TICK,
+  SIGNAL_GOT_METADATA,
+  SIGNAL_BUFFERING,
+  SIGNAL_MISSING_PLUGINS,
+  SIGNAL_DOWNLOAD_BUFFERING,
+  LAST_SIGNAL
+};
+
+/* Properties */
+enum
+{
+  PROP_0,
+  PROP_LOGO_MODE,
+  PROP_POSITION,
+  PROP_CURRENT_TIME,
+  PROP_STREAM_LENGTH,
+  PROP_PLAYING,
+  PROP_REFERRER,
+  PROP_SEEKABLE,
+  PROP_SHOW_CURSOR,
+  PROP_SHOW_VISUALIZATIONS,
+  PROP_USER_AGENT,
+  PROP_VOLUME,
+  PROP_DOWNLOAD_FILENAME,
+  PROP_AUTO_RESIZE,
+  PROP_DEINTERLACING,
+  PROP_VISUALIZATION_QUALITY,
+  PROP_BRIGHTNESS,
+  PROP_CONTRAST,
+  PROP_SATURATION,
+  PROP_HUE,
+  PROP_AUDIO_OUTPUT_TYPE,
+  PROP_AV_OFFSET
+};
+
+static const gchar *video_props_str[4] = {
+  "brightness",
+  "contrast",
+  "saturation",
+  "hue"
+};
+
+struct BaconVideoWidgetPrivate
+{
+  char                        *user_agent;
+
+  char                        *referrer;
+  char                        *mrl;
+  char                        *subtitle_uri;
+  BvwAspectRatio               ratio_type;
+
+  GstElement                  *play;
+  GstNavigation               *navigation;
+
+  guint                        update_id;
+  guint                        fill_id;
+
+  GdkPixbuf                   *logo_pixbuf;
+  GdkPixbuf                   *cover_pixbuf; /* stream-specific image */
+
+  gboolean                     media_has_video;
+  gboolean                     media_has_audio;
+  gint                         seekable; /* -1 = don't know, FALSE = no */
+  gint64                       stream_length;
+  gint64                       current_time;
+  gdouble                      current_position;
+  gboolean                     is_live;
+
+  GstTagList                  *tagcache;
+  GstTagList                  *audiotags;
+  GstTagList                  *videotags;
+
+  GAsyncQueue                 *tag_update_queue;
+  guint                        tag_update_id;
+
+  gboolean                     got_redirect;
+
+  ClutterActor                *stage;
+  ClutterActor                *texture;
+  ClutterActor                *frame;
+  ClutterActor                *osd;
+
+  ClutterActor                *logo_frame;
+  ClutterActor                *logo;
+
+  GdkCursor                   *cursor;
+
+  /* Visual effects */
+  GList                       *vis_plugins_list;
+  GHashTable                  *vis_plugins_ht;
+  gboolean                     show_vfx;
+  BvwVisualizationQuality      visq;
+  gchar                       *vis_element_name;
+  GstElement                  *audio_capsfilter;
+  GstElement                  *audio_pitchcontrol;
+
+  /* Other stuff */
+  gboolean                     logo_mode;
+  gboolean                     cursor_shown;
+  gboolean                     fullscreen_mode;
+  gboolean                     auto_resize;
+  gboolean                     uses_audio_fakesink;
+  gdouble                      volume;
+  gboolean                     is_menu;
+  gboolean                     has_angles;
+
+  BvwRotation                  rotation;
+  
+  gint                         video_width; /* Movie width */
+  gint                         video_height; /* Movie height */
+  gboolean                     window_resized; /* Whether the window has already been resized
+						  for this media */
+  gint                         movie_par_n; /* Movie pixel aspect ratio numerator */
+  gint                         movie_par_d; /* Movie pixel aspect ratio denominator */
+  gint                         video_width_pixels; /* Scaled movie width */
+  gint                         video_height_pixels; /* Scaled movie height */
+  gint                         video_fps_n;
+  gint                         video_fps_d;
+
+  BvwAudioOutputType           speakersetup;
+
+  GstBus                      *bus;
+  gulong                       sig_bus_async;
+
+  gint                         eos_id;
+
+  /* When seeking, queue up the seeks if they happen before
+   * the previous one finished */
+  GMutex                       seek_mutex;
+  GstClock                    *clock;
+  GstClockTime                 seek_req_time;
+  gint64                       seek_time;
+  /* state we want to be in, as opposed to actual pipeline state
+   * which may change asynchronously or during buffering */
+  GstState                     target_state;
+  gboolean                     buffering;
+  gboolean                     download_buffering;
+  GstElement                  *download_buffering_element;
+  char                        *download_filename;
+  /* used to compute when the download buffer has gone far
+   * enough to start playback, not "amount of buffering time left
+   * to reach 100% fill-level" */
+  gint64                       buffering_left;
+
+  /* for easy codec installation */
+  GList                       *missing_plugins;   /* GList of GstMessages */
+  gboolean                     plugin_install_in_progress;
+
+  /* for mounting locations if necessary */
+  GCancellable                *mount_cancellable;
+  gboolean                     mount_in_progress;
+
+  /* for auth */
+  GMountOperation             *auth_dialog;
+  GMountOperationResult        auth_last_result;
+  char                        *user_id, *user_pw;
+
+  /* for stepping */
+  float                        rate;
+};
+
+static void bacon_video_widget_set_property (GObject * object,
+                                             guint property_id,
+                                             const GValue * value,
+                                             GParamSpec * pspec);
+static void bacon_video_widget_get_property (GObject * object,
+                                             guint property_id,
+                                             GValue * value,
+                                             GParamSpec * pspec);
+
+static void bacon_video_widget_finalize (GObject * object);
+
+static void setup_vis (BaconVideoWidget * bvw);
+static GList * get_visualization_features (void);
+static void size_changed_cb (GdkScreen *screen, BaconVideoWidget *bvw);
+static void bvw_stop_play_pipeline (BaconVideoWidget * bvw);
+static GError* bvw_error_from_gst_error (BaconVideoWidget *bvw, GstMessage *m);
+static gboolean bvw_check_for_cover_pixbuf (BaconVideoWidget * bvw);
+static const GdkPixbuf * bvw_get_logo_pixbuf (BaconVideoWidget * bvw);
+static gboolean bvw_set_playback_direction (BaconVideoWidget *bvw, gboolean forward);
+static gboolean bacon_video_widget_seek_time_no_lock (BaconVideoWidget *bvw,
+						      gint64 _time,
+						      GstSeekFlags flag,
+						      GError **error);
+
+typedef struct {
+  GstTagList *tags;
+  const gchar *type;
+} UpdateTagsDelayedData;
+
+static void update_tags_delayed_data_destroy (UpdateTagsDelayedData *data);
+
+static GtkWidgetClass *parent_class = NULL;
+
+static int bvw_signals[LAST_SIGNAL] = { 0 };
+
+GST_DEBUG_CATEGORY (_totem_gst_debug_cat);
+#define GST_CAT_DEFAULT _totem_gst_debug_cat
+
+typedef gchar * (* MsgToStrFunc) (GstMessage * msg);
+
+static gboolean
+is_gtk_plug (GtkWidget *toplevel)
+{
+#ifdef GDK_WINDOWING_X11
+  return GTK_IS_PLUG(toplevel);
+#else
+  return FALSE;
+#endif /* GDK_WINDOWING_X11 */
+}
+
+static const gchar *
+get_type_name (GType class_type, int type)
+{
+  GEnumClass *eclass;
+  GEnumValue *value;
+
+  eclass = G_ENUM_CLASS (g_type_class_peek (class_type));
+  value = g_enum_get_value (eclass, type);
+
+  if (value == NULL)
+    return "unknown";
+
+  return value->value_nick;
+}
+
+static gchar **
+bvw_get_missing_plugins_foo (const GList * missing_plugins, MsgToStrFunc func)
+{
+  GPtrArray *arr = g_ptr_array_new ();
+
+  while (missing_plugins != NULL) {
+    g_ptr_array_add (arr, func (GST_MESSAGE (missing_plugins->data)));
+    missing_plugins = missing_plugins->next;
+  }
+  g_ptr_array_add (arr, NULL);
+  return (gchar **) g_ptr_array_free (arr, FALSE);
+}
+
+static gchar **
+bvw_get_missing_plugins_details (const GList * missing_plugins)
+{
+  return bvw_get_missing_plugins_foo (missing_plugins,
+      gst_missing_plugin_message_get_installer_detail);
+}
+
+static gchar **
+bvw_get_missing_plugins_descriptions (const GList * missing_plugins)
+{
+  return bvw_get_missing_plugins_foo (missing_plugins,
+      gst_missing_plugin_message_get_description);
+}
+
+static void
+bvw_clear_missing_plugins_messages (BaconVideoWidget * bvw)
+{
+  g_list_foreach (bvw->priv->missing_plugins,
+                  (GFunc) gst_mini_object_unref, NULL);
+  g_list_free (bvw->priv->missing_plugins);
+  bvw->priv->missing_plugins = NULL;
+}
+
+static void
+bvw_check_if_video_decoder_is_missing (BaconVideoWidget * bvw)
+{
+  GList *l;
+
+  if (bvw->priv->media_has_video || bvw->priv->missing_plugins == NULL)
+    return;
+
+  for (l = bvw->priv->missing_plugins; l != NULL; l = l->next) {
+    GstMessage *msg = GST_MESSAGE (l->data);
+    gchar *d, *f;
+
+    if ((d = gst_missing_plugin_message_get_installer_detail (msg))) {
+      if ((f = strstr (d, "|decoder-")) && strstr (f, "video")) {
+        GError *err;
+
+        /* create a fake GStreamer error so we get a nice warning message */
+        err = g_error_new (GST_CORE_ERROR, GST_CORE_ERROR_MISSING_PLUGIN, "x");
+        msg = gst_message_new_error (GST_OBJECT (bvw->priv->play), err, NULL);
+        g_error_free (err);
+        err = bvw_error_from_gst_error (bvw, msg);
+        gst_message_unref (msg);
+        g_signal_emit (bvw, bvw_signals[SIGNAL_ERROR], 0, err->message, FALSE);
+        g_error_free (err);
+        g_free (d);
+        break;
+      }
+      g_free (d);
+    }
+  }
+}
+
+static void
+set_display_pixel_aspect_ratio (GdkScreen *screen,
+				GValue    *value)
+{
+  static const gint par[][2] = {
+    {1, 1},                     /* regular screen */
+    {16, 15},                   /* PAL TV */
+    {11, 10},                   /* 525 line Rec.601 video */
+    {54, 59},                   /* 625 line Rec.601 video */
+    {64, 45},                   /* 1280x1024 on 16:9 display */
+    {5, 3},                     /* 1280x1024 on 4:3 display */
+    {4, 3}                      /*  800x600 on 16:9 display */
+  };
+  guint i;
+  gint par_index;
+  gdouble ratio;
+  gdouble delta;
+
+#define DELTA(idx) (ABS (ratio - ((gdouble) par[idx][0] / par[idx][1])))
+
+  /* first calculate the "real" ratio based on the X values;
+   *    * which is the "physical" w/h divided by the w/h in pixels of the display */
+  ratio = (gdouble) (gdk_screen_get_width_mm (screen) * gdk_screen_get_height (screen))
+    / (gdk_screen_get_height_mm (screen) * gdk_screen_get_width (screen));
+
+  GST_DEBUG ("calculated pixel aspect ratio: %f", ratio);
+  /* now find the one from par[][2] with the lowest delta to the real one */
+  delta = DELTA (0);
+  par_index = 0;
+
+  for (i = 1; i < sizeof (par) / (sizeof (gint) * 2); ++i) {
+    gdouble this_delta = DELTA (i);
+
+    if (this_delta < delta) {
+      par_index = i;
+      delta = this_delta;
+    }
+  }
+
+  GST_DEBUG ("Decided on index %d (%d/%d)", par_index,
+	     par[par_index][0], par[par_index][1]);
+  gst_value_set_fraction (value, par[par_index][0], par[par_index][1]);
+}
+
+static void
+get_media_size (BaconVideoWidget *bvw, gint *width, gint *height)
+{
+  if (bvw->priv->logo_mode) {
+    const GdkPixbuf *pixbuf;
+
+    pixbuf = bvw_get_logo_pixbuf (bvw);
+    if (pixbuf) {
+      *width = gdk_pixbuf_get_width (pixbuf);
+      *height = gdk_pixbuf_get_height (pixbuf);
+      if (*width == *height) {
+	/* The icons will be square, so lie so we get a 16:9
+	 * ratio */
+	*width = (int) ((float) *height / 9. * 16.);
+      }
+    } else {
+      *width = 0;
+      *height = 0;
+    }
+  } else {
+    if (bvw->priv->media_has_video) {
+      GValue disp_par = {0, };
+      guint movie_par_n, movie_par_d, disp_par_n, disp_par_d, num, den;
+
+      /* Create and init the fraction value */
+      g_value_init (&disp_par, GST_TYPE_FRACTION);
+
+      /* Square pixel is our default */
+      gst_value_set_fraction (&disp_par, 1, 1);
+
+      /* Now try getting display's pixel aspect ratio */
+      if (gtk_widget_get_realized (GTK_WIDGET (bvw)))
+	set_display_pixel_aspect_ratio (gtk_widget_get_screen (GTK_WIDGET (bvw)), &disp_par);
+
+      disp_par_n = gst_value_get_fraction_numerator (&disp_par);
+      disp_par_d = gst_value_get_fraction_denominator (&disp_par);
+
+      GST_DEBUG ("display PAR is %d/%d", disp_par_n, disp_par_d);
+
+      /* If movie pixel aspect ratio is enforced, use that */
+      if (bvw->priv->ratio_type != BVW_RATIO_AUTO) {
+        switch (bvw->priv->ratio_type) {
+          case BVW_RATIO_SQUARE:
+            movie_par_n = 1;
+            movie_par_d = 1;
+            break;
+          case BVW_RATIO_FOURBYTHREE:
+            movie_par_n = 4 * bvw->priv->video_height;
+            movie_par_d = 3 * bvw->priv->video_width;
+            break;
+          case BVW_RATIO_ANAMORPHIC:
+            movie_par_n = 16 * bvw->priv->video_height;
+            movie_par_d = 9 * bvw->priv->video_width;
+            break;
+          case BVW_RATIO_DVB:
+            movie_par_n = 20 * bvw->priv->video_height;
+            movie_par_d = 9 * bvw->priv->video_width;
+            break;
+          /* handle these to avoid compiler warnings */
+          case BVW_RATIO_AUTO:
+          default:
+            movie_par_n = 0;
+            movie_par_d = 0;
+            g_assert_not_reached ();
+        }
+      } else {
+        /* Use the movie pixel aspect ratio if any */
+        movie_par_n = bvw->priv->movie_par_n;
+        movie_par_d = bvw->priv->movie_par_d;
+      }
+
+      GST_DEBUG ("movie PAR is %d/%d", movie_par_n, movie_par_d);
+
+      if (bvw->priv->video_width == 0 || bvw->priv->video_height == 0) {
+        GST_DEBUG ("width and/or height 0, assuming 1/1 ratio");
+        num = 1;
+        den = 1;
+      } else if (!gst_video_calculate_display_ratio (&num, &den,
+          bvw->priv->video_width, bvw->priv->video_height,
+          movie_par_n, movie_par_d, disp_par_n, disp_par_d)) {
+        GST_WARNING ("overflow calculating display aspect ratio!");
+        num = 1;   /* FIXME: what values to use here? */
+        den = 1;
+      }
+
+      GST_DEBUG ("calculated scaling ratio %d/%d for video %dx%d", num, den,
+          bvw->priv->video_width, bvw->priv->video_height);
+      
+      /* now find a width x height that respects this display ratio.
+       * prefer those that have one of w/h the same as the incoming video
+       * using wd / hd = num / den */
+    
+      /* start with same height, because of interlaced video */
+      /* check hd / den is an integer scale factor, and scale wd with the PAR */
+      if (bvw->priv->video_height % den == 0) {
+        GST_DEBUG ("keeping video height");
+        bvw->priv->video_width_pixels =
+            (guint) gst_util_uint64_scale (bvw->priv->video_height, num, den);
+        bvw->priv->video_height_pixels = bvw->priv->video_height;
+      } else if (bvw->priv->video_width % num == 0) {
+        GST_DEBUG ("keeping video width");
+        bvw->priv->video_width_pixels = bvw->priv->video_width;
+        bvw->priv->video_height_pixels =
+            (guint) gst_util_uint64_scale (bvw->priv->video_width, den, num);
+      } else {
+        GST_DEBUG ("approximating while keeping video height");
+        bvw->priv->video_width_pixels =
+            (guint) gst_util_uint64_scale (bvw->priv->video_height, num, den);
+        bvw->priv->video_height_pixels = bvw->priv->video_height;
+      }
+      GST_DEBUG ("scaling to %dx%d", bvw->priv->video_width_pixels,
+          bvw->priv->video_height_pixels);
+      
+      *width = bvw->priv->video_width_pixels;
+      *height = bvw->priv->video_height_pixels;
+      
+      /* Free the PAR fraction */
+      g_value_unset (&disp_par);
+    }
+    else {
+      *width = 0;
+      *height = 0;
+    }
+  }
+}
+
+static void
+bacon_video_widget_realize (GtkWidget * widget)
+{
+  BaconVideoWidget *bvw = BACON_VIDEO_WIDGET (widget);
+  GtkWidget *toplevel;
+
+  GTK_WIDGET_CLASS (parent_class)->realize (widget);
+
+  gtk_widget_set_realized (widget, TRUE);
+
+  /* get screen size changes */
+  g_signal_connect (G_OBJECT (gtk_widget_get_screen (widget)),
+		    "size-changed", G_CALLBACK (size_changed_cb), bvw);
+
+  /* setup the toplevel, ready to be resized */
+  toplevel = gtk_widget_get_toplevel (widget);
+  if (gtk_widget_is_toplevel (toplevel) &&
+      gtk_widget_get_parent (widget) != toplevel &&
+      !is_gtk_plug(toplevel))
+    gtk_window_set_geometry_hints (GTK_WINDOW (toplevel), widget, NULL, 0);
+
+  bacon_video_widget_gst_missing_plugins_setup (bvw);
+}
+
+static void
+size_changed_cb (GdkScreen *screen, BaconVideoWidget *bvw)
+{
+  setup_vis (bvw);
+}
+
+static void
+set_current_actor (BaconVideoWidget *bvw)
+{
+  gboolean draw_logo;
+
+  if (bvw->priv->stage == NULL)
+    return;
+
+  /* If there's only audio and no visualisation, draw the logo as well.
+   * If we have a cover image to display, we display it regardless of whether we're
+   * doing visualisations. */
+  draw_logo = bvw->priv->media_has_audio &&
+      !bvw->priv->media_has_video && (!bvw->priv->show_vfx || bvw->priv->cover_pixbuf);
+
+  if (bvw->priv->logo_mode || draw_logo) {
+    const GdkPixbuf *pixbuf;
+
+    pixbuf = bvw_get_logo_pixbuf (bvw);
+    if (pixbuf != NULL) {
+      gboolean ret;
+      GError *err = NULL;
+
+      ret = clutter_texture_set_from_rgb_data (CLUTTER_TEXTURE (bvw->priv->logo),
+					       gdk_pixbuf_get_pixels (pixbuf),
+					       gdk_pixbuf_get_has_alpha (pixbuf),
+					       gdk_pixbuf_get_width (pixbuf),
+					       gdk_pixbuf_get_height (pixbuf),
+					       gdk_pixbuf_get_rowstride (pixbuf),
+					       gdk_pixbuf_get_has_alpha (pixbuf) ? 4 : 3,
+					       CLUTTER_TEXTURE_NONE, &err);
+      if (ret == FALSE) {
+	g_message ("clutter_texture_set_from_rgb_data failed %s", err->message);
+	g_error_free (err);
+      } else {
+	clutter_actor_show (CLUTTER_ACTOR (bvw->priv->logo_frame));
+	clutter_actor_hide (CLUTTER_ACTOR (bvw->priv->frame));
+	return;
+      }
+    }
+  }
+
+  clutter_actor_show (CLUTTER_ACTOR (bvw->priv->frame));
+  clutter_actor_hide (CLUTTER_ACTOR (bvw->priv->logo_frame));
+}
+
+/* need to use gstnavigation interface for these vmethods, to allow for the sink
+   to map screen coordinates to video coordinates in the presence of e.g.
+   hardware scaling */
+
+static gboolean
+bacon_video_widget_motion_notify (GtkWidget *widget, GdkEventMotion *event)
+{
+  gboolean res = FALSE;
+  BaconVideoWidget *bvw = BACON_VIDEO_WIDGET (widget);
+
+  g_return_val_if_fail (bvw->priv->play != NULL, FALSE);
+
+  if (bvw->priv->navigation && !bvw->priv->logo_mode)
+    gst_navigation_send_mouse_event (bvw->priv->navigation, "mouse-move", 0, event->x, event->y);
+
+  if (GTK_WIDGET_CLASS (parent_class)->motion_notify_event)
+    res |= GTK_WIDGET_CLASS (parent_class)->motion_notify_event (widget, event);
+
+  return res;
+}
+
+static gboolean
+bacon_video_widget_button_press (GtkWidget *widget, GdkEventButton *event)
+{
+  gboolean res = FALSE;
+  BaconVideoWidget *bvw = BACON_VIDEO_WIDGET (widget);
+
+  g_return_val_if_fail (bvw->priv->play != NULL, FALSE);
+
+  if (bvw->priv->navigation && !bvw->priv->logo_mode) {
+    gst_navigation_send_mouse_event (bvw->priv->navigation,
+				     "mouse-button-press", event->button, event->x, event->y);
+
+    /* FIXME need to check whether the backend will have handled
+     * the button press
+     res = TRUE; */
+  }
+
+  if (GTK_WIDGET_CLASS (parent_class)->button_press_event)
+    res |= GTK_WIDGET_CLASS (parent_class)->button_press_event (widget, event);
+
+  return res;
+}
+
+static gboolean
+bacon_video_widget_button_release (GtkWidget *widget, GdkEventButton *event)
+{
+  gboolean res = FALSE;
+  BaconVideoWidget *bvw = BACON_VIDEO_WIDGET (widget);
+
+  g_return_val_if_fail (bvw->priv->play != NULL, FALSE);
+
+  if (bvw->priv->navigation && !bvw->priv->logo_mode) {
+    gst_navigation_send_mouse_event (bvw->priv->navigation,
+				     "mouse-button-release", event->button, event->x, event->y);
+
+    res = TRUE;
+  }
+
+  if (GTK_WIDGET_CLASS (parent_class)->button_release_event)
+    res |= GTK_WIDGET_CLASS (parent_class)->button_release_event (widget, event);
+
+  return res;
+}
+
+static void
+bacon_video_widget_get_preferred_width (GtkWidget *widget,
+                                        gint      *minimum,
+                                        gint      *natural)
+{
+  *minimum = *natural = 240;
+}
+
+static void
+bacon_video_widget_get_preferred_height (GtkWidget *widget,
+                                         gint      *minimum,
+                                         gint      *natural)
+{
+  *minimum = *natural = 180;
+}
+
+static gboolean
+bvw_boolean_handled_accumulator (GSignalInvocationHint * ihint,
+    GValue * return_accu, const GValue * handler_return, gpointer foobar)
+{
+  gboolean continue_emission;
+  gboolean signal_handled;
+  
+  signal_handled = g_value_get_boolean (handler_return);
+  g_value_set_boolean (return_accu, signal_handled);
+  continue_emission = !signal_handled;
+  
+  return continue_emission;
+}
+
+static void
+bacon_video_widget_class_init (BaconVideoWidgetClass * klass)
+{
+  GObjectClass *object_class;
+  GtkWidgetClass *widget_class;
+
+  object_class = (GObjectClass *) klass;
+  widget_class = (GtkWidgetClass *) klass;
+
+  parent_class = g_type_class_peek_parent (klass);
+
+  g_type_class_add_private (object_class, sizeof (BaconVideoWidgetPrivate));
+
+  /* GtkWidget */
+  widget_class->get_preferred_width = bacon_video_widget_get_preferred_width;
+  widget_class->get_preferred_height = bacon_video_widget_get_preferred_height;
+  widget_class->realize = bacon_video_widget_realize;
+
+  /* FIXME: Remove those when GtkClutterEmbedded passes on GDK XI 1.2
+   * events properly */
+  widget_class->motion_notify_event = bacon_video_widget_motion_notify;
+  widget_class->button_press_event = bacon_video_widget_button_press;
+  widget_class->button_release_event = bacon_video_widget_button_release;
+
+  /* GObject */
+  object_class->set_property = bacon_video_widget_set_property;
+  object_class->get_property = bacon_video_widget_get_property;
+  object_class->finalize = bacon_video_widget_finalize;
+
+  /* Properties */
+  /**
+   * BaconVideoWidget:logo-mode:
+   *
+   * Whether the logo should be displayed when no stream is loaded, or the widget
+   * should take up no space.
+   **/
+  g_object_class_install_property (object_class, PROP_LOGO_MODE,
+                                   g_param_spec_boolean ("logo-mode", "Logo mode?",
+                                                         "Whether the logo should be displayed when no stream is loaded.", FALSE,
+                                                         G_PARAM_READWRITE |
+                                                         G_PARAM_STATIC_STRINGS));
+
+  /**
+   * BaconVideoWidget:position:
+   *
+   * The current position in the stream, as a percentage between 0 and 1.
+   **/
+  g_object_class_install_property (object_class, PROP_POSITION,
+                                   g_param_spec_double ("position", "Position", "The current position in the stream.",
+							0, 1.0, 0,
+							G_PARAM_READABLE |
+                                                        G_PARAM_STATIC_STRINGS));
+
+  /**
+   * BaconVideoWidget:stream-length:
+   *
+   * The length of the current stream, in milliseconds.
+   **/
+  g_object_class_install_property (object_class, PROP_STREAM_LENGTH,
+	                           g_param_spec_int64 ("stream-length", "Stream length",
+                                                     "The length of the current stream, in milliseconds.", 0, G_MAXINT64, 0,
+                                                     G_PARAM_READABLE |
+                                                     G_PARAM_STATIC_STRINGS));
+
+  /**
+   * BaconVideoWidget:playing:
+   *
+   * Whether a stream is currently playing.
+   **/
+  g_object_class_install_property (object_class, PROP_PLAYING,
+                                   g_param_spec_boolean ("playing", "Playing?",
+                                                         "Whether a stream is currently playing.", FALSE,
+                                                         G_PARAM_READABLE |
+                                                         G_PARAM_STATIC_STRINGS));
+
+  /**
+   * BaconVideoWidget:seekable:
+   *
+   * Whether the current stream can be seeked.
+   **/
+  g_object_class_install_property (object_class, PROP_SEEKABLE,
+                                   g_param_spec_boolean ("seekable", "Seekable?",
+                                                         "Whether the current stream can be seeked.", FALSE,
+                                                         G_PARAM_READABLE |
+                                                         G_PARAM_STATIC_STRINGS));
+
+  /**
+   * BaconVideoWidget:volume:
+   *
+   * The current volume level, as a percentage between 0 and 1.
+   **/
+  g_object_class_install_property (object_class, PROP_VOLUME,
+	                           g_param_spec_double ("volume", "Volume", "The current volume level.",
+	                                                0.0, 1.0, 0.0,
+	                                                G_PARAM_READWRITE |
+                                                        G_PARAM_STATIC_STRINGS));
+
+  /**
+   * BaconVideoWidget:show-cursor:
+   *
+   * Whether the cursor should be shown, or should be invisible, when it is over
+   * the video widget.
+   **/
+  g_object_class_install_property (object_class, PROP_SHOW_CURSOR,
+                                   g_param_spec_boolean ("show-cursor", "Show cursor?",
+                                                         "Whether the cursor should be shown.", FALSE,
+                                                         G_PARAM_READWRITE |
+                                                         G_PARAM_STATIC_STRINGS));
+
+  /**
+   * BaconVideoWidget:show-visualizations:
+   *
+   * Whether visualisations should be shown for audio-only streams.
+   **/
+  g_object_class_install_property (object_class, PROP_SHOW_VISUALIZATIONS,
+                                   g_param_spec_boolean ("show-visualizations", "Show visualizations?",
+                                                         "Whether visualisations should be shown for audio-only streams.", FALSE,
+                                                         G_PARAM_WRITABLE |
+                                                         G_PARAM_STATIC_STRINGS));
+
+  /**
+   * BaconVideoWidget:referrer:
+   *
+   * The HTTP referrer URI.
+   **/
+  g_object_class_install_property (object_class, PROP_REFERRER,
+                                   g_param_spec_string ("referrer", "Referrer URI", "The HTTP referrer URI.",
+                                                        NULL,
+                                                        G_PARAM_READWRITE |
+                                                        G_PARAM_STATIC_STRINGS));
+
+  /**
+   * BaconVideoWidget:user-agent:
+   *
+   * The HTTP user agent string to use.
+   **/
+  g_object_class_install_property (object_class, PROP_USER_AGENT,
+                                   g_param_spec_string ("user-agent", "User agent", "The HTTP user agent string to use.",
+                                                        NULL,
+                                                        G_PARAM_READWRITE |
+                                                        G_PARAM_STATIC_STRINGS));
+
+  /**
+   * BaconVideoWidget:download-filename:
+   *
+   * The filename of the fully downloaded stream when using
+   * download buffering.
+   **/
+  g_object_class_install_property (object_class, PROP_DOWNLOAD_FILENAME,
+                                   g_param_spec_string ("download-filename", "Download filename.", "The filename of the fully downloaded stream.",
+                                                        NULL,
+                                                        G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+  /**
+   * BaconVideoWidget:auto-resize:
+   *
+   * Whether to automatically resize the video widget to the video size when loading a new video.
+   **/
+  g_object_class_install_property (object_class, PROP_AUTO_RESIZE,
+                                   g_param_spec_boolean ("auto-resize", "Auto resize?",
+                                                         "Whether to automatically resize the video widget to the video size.", FALSE,
+                                                         G_PARAM_READWRITE |
+                                                         G_PARAM_STATIC_STRINGS));
+
+  /**
+   * BaconVideoWidget:deinterlacing:
+   *
+   * Whether to automatically deinterlace videos.
+   **/
+  g_object_class_install_property (object_class, PROP_DEINTERLACING,
+                                   g_param_spec_boolean ("deinterlacing", "Deinterlacing?",
+                                                         "Whether to automatically deinterlace videos.", FALSE,
+                                                         G_PARAM_READWRITE |
+                                                         G_PARAM_STATIC_STRINGS));
+
+  /**
+   * BaconVideoWidget:visualization-quality:
+   *
+   * The size of the visualizations to display when playing audio.
+   **/
+  g_object_class_install_property (object_class, PROP_VISUALIZATION_QUALITY,
+                                   g_param_spec_enum ("visualization-quality", "Visualization quality",
+                                                      "The size of the visualizations to display when playing audio.", BVW_TYPE_VISUALIZATION_QUALITY,
+                                                      BVW_VISUALIZATION_SMALL,
+                                                      G_PARAM_READWRITE |
+                                                      G_PARAM_STATIC_STRINGS));
+
+  /**
+   * BaconVideoWidget:brightness:
+   *
+   * The brightness of the video display.
+   **/
+  g_object_class_install_property (object_class, PROP_BRIGHTNESS,
+                                   g_param_spec_int ("brightness", "Brightness",
+                                                      "The brightness of the video display.", 0, 65535, 32768,
+                                                      G_PARAM_READWRITE |
+                                                      G_PARAM_STATIC_STRINGS));
+
+  /**
+   * BaconVideoWidget:contrast:
+   *
+   * The contrast of the video display.
+   **/
+  g_object_class_install_property (object_class, PROP_CONTRAST,
+                                   g_param_spec_int ("contrast", "Contrast",
+                                                      "The contrast of the video display.", 0, 65535, 32768,
+                                                      G_PARAM_READWRITE |
+                                                      G_PARAM_STATIC_STRINGS));
+
+  /**
+   * BaconVideoWidget:saturation:
+   *
+   * The saturation of the video display.
+   **/
+  g_object_class_install_property (object_class, PROP_SATURATION,
+                                   g_param_spec_int ("saturation", "Saturation",
+                                                      "The saturation of the video display.", 0, 65535, 32768,
+                                                      G_PARAM_READWRITE |
+                                                      G_PARAM_STATIC_STRINGS));
+
+  /**
+   * BaconVideoWidget:hue:
+   *
+   * The hue of the video display.
+   **/
+  g_object_class_install_property (object_class, PROP_HUE,
+                                   g_param_spec_int ("hue", "Hue",
+                                                      "The hue of the video display.", 0, 65535, 32768,
+                                                      G_PARAM_READWRITE |
+                                                      G_PARAM_STATIC_STRINGS));
+
+  /**
+   * BaconVideoWidget:audio-output-type:
+   *
+   * The type of audio output to use (e.g. the number of channels).
+   **/
+  g_object_class_install_property (object_class, PROP_AUDIO_OUTPUT_TYPE,
+                                   g_param_spec_enum ("audio-output-type", "Audio output type",
+                                                      "The type of audio output to use.", BVW_TYPE_AUDIO_OUTPUT_TYPE,
+                                                      BVW_AUDIO_SOUND_STEREO,
+                                                      G_PARAM_READWRITE |
+                                                      G_PARAM_STATIC_STRINGS));
+
+  /**
+   * BaconVideoWidget:av-offset:
+   *
+   * Control the synchronisation offset between the audio and video streams.
+   * Positive values make the audio ahead of the video and negative values
+   * make the audio go behind the video.
+   **/
+  g_object_class_install_property (object_class, PROP_AV_OFFSET,
+				   g_param_spec_int64 ("av-offset", "Audio/Video offset",
+						       "The synchronisation offset between audio and video in nanoseconds.",
+						       G_MININT64, G_MAXINT64,
+						       0, G_PARAM_READWRITE |
+						       G_PARAM_STATIC_STRINGS));
+
+  /* Signals */
+  /**
+   * BaconVideoWidget::error:
+   * @message: the error message
+   * @playback_stopped: %TRUE if playback has stopped due to the error, %FALSE otherwise
+   * @fatal: %TRUE if the error was fatal to playback, %FALSE otherwise
+   *
+   * Emitted when the backend wishes to asynchronously report an error. If @fatal is %TRUE,
+   * playback of this stream cannot be restarted.
+   **/
+  bvw_signals[SIGNAL_ERROR] =
+    g_signal_new (I_("error"),
+                  G_TYPE_FROM_CLASS (object_class),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (BaconVideoWidgetClass, error),
+                  NULL, NULL,
+                  baconvideowidget_marshal_VOID__STRING_BOOLEAN,
+                  G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_BOOLEAN);
+
+  /**
+   * BaconVideoWidget::eos:
+   *
+   * Emitted when the end of the current stream is reached.
+   **/
+  bvw_signals[SIGNAL_EOS] =
+    g_signal_new (I_("eos"),
+                  G_TYPE_FROM_CLASS (object_class),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (BaconVideoWidgetClass, eos),
+                  NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+
+  /**
+   * BaconVideoWidget::got-metadata:
+   *
+   * Emitted when the widget has updated the metadata of the current stream. This
+   * will typically happen just after opening a stream.
+   *
+   * Call bacon_video_widget_get_metadata() to query the updated metadata.
+   **/
+  bvw_signals[SIGNAL_GOT_METADATA] =
+    g_signal_new (I_("got-metadata"),
+                  G_TYPE_FROM_CLASS (object_class),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (BaconVideoWidgetClass, got_metadata),
+                  NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+
+  /**
+   * BaconVideoWidget::got-redirect:
+   * @new_mrl: the new MRL
+   *
+   * Emitted when a redirect response is received from a stream's server.
+   **/
+  bvw_signals[SIGNAL_REDIRECT] =
+    g_signal_new (I_("got-redirect"),
+                  G_TYPE_FROM_CLASS (object_class),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (BaconVideoWidgetClass, got_redirect),
+                  NULL, NULL, g_cclosure_marshal_VOID__STRING,
+                  G_TYPE_NONE, 1, G_TYPE_STRING);
+
+  /**
+   * BaconVideoWidget::channels-change:
+   *
+   * Emitted when the number of audio languages available changes, or when the
+   * selected audio language is changed.
+   *
+   * Query the new list of audio languages with bacon_video_widget_get_languages().
+   **/
+  bvw_signals[SIGNAL_CHANNELS_CHANGE] =
+    g_signal_new (I_("channels-change"),
+                  G_TYPE_FROM_CLASS (object_class),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (BaconVideoWidgetClass, channels_change),
+                  NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+
+  /**
+   * BaconVideoWidget::tick:
+   * @current_time: the current position in the stream, in milliseconds since the beginning of the stream
+   * @stream_length: the length of the stream, in milliseconds
+   * @current_position: the current position in the stream, as a percentage between 0 and 1
+   * @seekable: %TRUE if the stream can be seeked, %FALSE otherwise
+   *
+   * Emitted every time an important time event happens, or at regular intervals when playing a stream.
+   **/
+  bvw_signals[SIGNAL_TICK] =
+    g_signal_new (I_("tick"),
+                  G_TYPE_FROM_CLASS (object_class),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (BaconVideoWidgetClass, tick),
+                  NULL, NULL,
+                  baconvideowidget_marshal_VOID__INT64_INT64_DOUBLE_BOOLEAN,
+                  G_TYPE_NONE, 4, G_TYPE_INT64, G_TYPE_INT64, G_TYPE_DOUBLE,
+                  G_TYPE_BOOLEAN);
+
+  /**
+   * BaconVideoWidget::buffering:
+   * @percentage: the percentage of buffering completed, between 0 and 1
+   *
+   * Emitted regularly when a network stream is being buffered, to provide status updates on the buffering
+   * progress.
+   **/
+  bvw_signals[SIGNAL_BUFFERING] =
+    g_signal_new (I_("buffering"),
+                  G_TYPE_FROM_CLASS (object_class),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (BaconVideoWidgetClass, buffering),
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__DOUBLE, G_TYPE_NONE, 1, G_TYPE_DOUBLE);
+
+  /**
+   * BaconVideoWidget::missing-plugins:
+   * @details: a %NULL-terminated array of missing plugin details for use when installing the plugins with libgimme-codec
+   * @descriptions: a %NULL-terminated array of missing plugin descriptions for display to the user
+   * @playing: %TRUE if the stream could be played even without these plugins, %FALSE otherwise
+   *
+   * Emitted when plugins required to play the current stream are not found. This allows the application
+   * to request the user install them before proceeding to try and play the stream again.
+   *
+   * Note that this signal is only available for the GStreamer backend.
+   *
+   * Return value: %TRUE if the signal was handled and some action was taken, %FALSE otherwise
+   **/
+  bvw_signals[SIGNAL_MISSING_PLUGINS] =
+    g_signal_new (I_("missing-plugins"),
+                  G_TYPE_FROM_CLASS (object_class),
+                  G_SIGNAL_RUN_LAST,
+                  0, /* signal is enough, we don't need a vfunc */
+                  bvw_boolean_handled_accumulator, NULL,
+                  baconvideowidget_marshal_BOOLEAN__BOXED_BOXED_BOOLEAN,
+                  G_TYPE_BOOLEAN, 3, G_TYPE_STRV, G_TYPE_STRV, G_TYPE_BOOLEAN);
+
+  /**
+   * BaconVideoWidget::download-buffering:
+   * @percentage: the percentage of download buffering completed, between 0 and 1
+   *
+   * Emitted regularly when a network stream is being cached on disk, to provide status
+   *  updates on the buffering level of the stream.
+   **/
+  bvw_signals[SIGNAL_DOWNLOAD_BUFFERING] =
+    g_signal_new ("download-buffering",
+                  G_TYPE_FROM_CLASS (object_class),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (BaconVideoWidgetClass, download_buffering),
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__DOUBLE, G_TYPE_NONE, 1, G_TYPE_DOUBLE);
+}
+
+static void
+bacon_video_widget_init (BaconVideoWidget * bvw)
+{
+  BaconVideoWidgetPrivate *priv;
+
+  gtk_widget_set_can_focus (GTK_WIDGET (bvw), TRUE);
+
+  g_type_class_ref (BVW_TYPE_METADATA_TYPE);
+  g_type_class_ref (BVW_TYPE_DVD_EVENT);
+  g_type_class_ref (BVW_TYPE_ROTATION);
+
+  bvw->priv = priv = G_TYPE_INSTANCE_GET_PRIVATE (bvw, BACON_TYPE_VIDEO_WIDGET, BaconVideoWidgetPrivate);
+
+  priv->update_id = 0;
+  priv->tagcache = NULL;
+  priv->audiotags = NULL;
+  priv->videotags = NULL;
+  priv->volume = -1.0;
+  priv->movie_par_n = priv->movie_par_d = 1;
+  priv->rate = FORWARD_RATE;
+
+  priv->tag_update_queue = g_async_queue_new_full ((GDestroyNotify) update_tags_delayed_data_destroy);
+  priv->tag_update_id = 0;
+
+  g_mutex_init (&priv->seek_mutex);
+  priv->clock = gst_system_clock_obtain ();
+  priv->seek_req_time = GST_CLOCK_TIME_NONE;
+  priv->seek_time = -1;
+
+  priv->missing_plugins = NULL;
+  priv->plugin_install_in_progress = FALSE;
+
+  priv->mount_cancellable = NULL;
+  priv->mount_in_progress = FALSE;
+  priv->auth_last_result = G_MOUNT_OPERATION_HANDLED;
+  priv->auth_dialog = NULL;
+
+  bacon_video_widget_gst_missing_plugins_blacklist ();
+}
+
+static gboolean bvw_query_timeout (BaconVideoWidget *bvw);
+static gboolean bvw_query_buffering_timeout (BaconVideoWidget *bvw);
+static void parse_stream_info (BaconVideoWidget *bvw);
+
+static void
+bvw_update_stream_info (BaconVideoWidget *bvw)
+{
+  parse_stream_info (bvw);
+
+  g_signal_emit (bvw, bvw_signals[SIGNAL_GOT_METADATA], 0, NULL);
+  g_signal_emit (bvw, bvw_signals[SIGNAL_CHANNELS_CHANGE], 0);
+}
+
+static void
+bvw_handle_application_message (BaconVideoWidget *bvw, GstMessage *msg)
+{
+  const GstStructure *structure;
+  const gchar *msg_name;
+
+  structure = gst_message_get_structure (msg);
+  msg_name = gst_structure_get_name (structure);
+  g_return_if_fail (msg_name != NULL);
+
+  GST_DEBUG ("Handling application message: %" GST_PTR_FORMAT, structure);
+
+  if (strcmp (msg_name, "stream-changed") == 0) {
+    bvw_update_stream_info (bvw);
+  }
+  else if (strcmp (msg_name, "video-size") == 0) {
+    int w, h;
+
+    g_signal_emit (bvw, bvw_signals[SIGNAL_GOT_METADATA], 0, NULL);
+
+    /* This is necessary for the pixel-aspect-ratio of the
+     * display to be taken into account. */
+    get_media_size (bvw, &w, &h);
+    clutter_actor_set_size (bvw->priv->texture, w, h);
+
+    if (bvw->priv->auto_resize
+	&& !bvw->priv->fullscreen_mode
+	&& !bvw->priv->window_resized) {
+      bacon_video_widget_set_scale_ratio (bvw, 0.0);
+    }
+    bvw->priv->window_resized = TRUE;
+    set_current_actor (bvw);
+  } else {
+    g_debug ("Unhandled application message %s", msg_name);
+  }
+}
+
+static gboolean
+bvw_do_navigation_query (BaconVideoWidget * bvw, GstQuery *query)
+{
+  if (!bvw->priv->navigation)
+    return FALSE;
+
+  return gst_element_query (GST_ELEMENT_CAST (bvw->priv->navigation), query);
+}
+
+static void
+mount_cb (GObject *obj, GAsyncResult *res, gpointer user_data)
+{
+  BaconVideoWidget * bvw = user_data;
+  gboolean ret;
+  gchar *uri;
+  GError *error = NULL;
+
+  ret = g_file_mount_enclosing_volume_finish (G_FILE (obj), res, &error);
+
+  g_clear_object (&bvw->priv->mount_cancellable);
+  bvw->priv->mount_in_progress = FALSE;
+
+  g_object_get (G_OBJECT (bvw->priv->play), "uri", &uri, NULL);
+
+  if (ret) {
+
+    GST_DEBUG ("Mounting location '%s' successful", GST_STR_NULL (uri));
+    if (bvw->priv->target_state == GST_STATE_PLAYING)
+      bacon_video_widget_play (bvw, NULL);
+  } else {
+    GError *err = NULL;
+    GstMessage *msg;
+
+    GST_DEBUG ("Mounting location '%s' failed: %s", GST_STR_NULL (uri), error->message);
+
+    /* create a fake GStreamer error so we get a nice warning message */
+    err = g_error_new_literal (GST_RESOURCE_ERROR, GST_RESOURCE_ERROR_OPEN_READ, error->message);
+    msg = gst_message_new_error (GST_OBJECT (bvw->priv->play), err, error->message);
+    g_error_free (err);
+    g_error_free (error);
+    err = bvw_error_from_gst_error (bvw, msg);
+    gst_message_unref (msg);
+    g_signal_emit (bvw, bvw_signals[SIGNAL_ERROR], 0, err->message, FALSE);
+    g_error_free (err);
+  }
+
+  g_free (uri);
+}
+
+static void
+bvw_handle_element_message (BaconVideoWidget *bvw, GstMessage *msg)
+{
+  const GstStructure *structure;
+  const gchar *type_name = NULL;
+  gchar *src_name;
+
+  src_name = gst_object_get_name (msg->src);
+
+  structure = gst_message_get_structure (msg);
+  if (structure)
+    type_name = gst_structure_get_name (structure);
+
+  GST_DEBUG ("from %s: %" GST_PTR_FORMAT, src_name, structure);
+
+  if (type_name == NULL)
+    goto unhandled;
+
+  if (strcmp (type_name, "redirect") == 0) {
+    const gchar *new_location;
+
+    new_location = gst_structure_get_string (structure, "new-location");
+    GST_DEBUG ("Got redirect to '%s'", GST_STR_NULL (new_location));
+
+    if (new_location && *new_location) {
+      g_signal_emit (bvw, bvw_signals[SIGNAL_REDIRECT], 0, new_location);
+      goto done;
+    }
+  } else if (strcmp (type_name, "progress") == 0) {
+    /* this is similar to buffering messages, but shouldn't affect pipeline
+     * state; qtdemux emits those when headers are after movie data and
+     * it is in streaming mode and has to receive all the movie data first */
+    if (!bvw->priv->buffering) {
+      gint percent = 0;
+
+      if (gst_structure_get_int (structure, "percent", &percent)) {
+	gdouble fraction = (gdouble) percent / 100.0;
+        g_signal_emit (bvw, bvw_signals[SIGNAL_BUFFERING], 0, fraction);
+      }
+    }
+    goto done;
+  } else if (gst_is_missing_plugin_message (msg)) {
+    bvw->priv->missing_plugins =
+      g_list_prepend (bvw->priv->missing_plugins, gst_message_ref (msg));
+    goto done;
+  } else if (strcmp (type_name, "not-mounted") == 0) {
+    const GValue *val;
+    GFile *file;
+    GMountOperation *mount_op;
+    GtkWidget *toplevel;
+    gchar *uri;
+
+    g_object_get (G_OBJECT (bvw->priv->play), "uri", &uri, NULL);
+
+    if (bvw->priv->mount_in_progress) {
+      g_cancellable_cancel (bvw->priv->mount_cancellable);
+      g_clear_object (&bvw->priv->mount_cancellable);
+      bvw->priv->mount_in_progress = FALSE;
+    }
+
+    GST_DEBUG ("Trying to mount location '%s'", GST_STR_NULL (uri));
+    g_free (uri);
+    
+    toplevel = gtk_widget_get_toplevel (GTK_WIDGET (bvw));
+    if (toplevel == GTK_WIDGET (bvw) || !GTK_IS_WINDOW (toplevel))
+      toplevel = NULL;
+
+    val = gst_structure_get_value (structure, "file");
+    if (val == NULL)
+      goto done;
+      
+    file = G_FILE (g_value_get_object (val));
+    if (file == NULL)
+      goto done;
+
+    bacon_video_widget_stop (bvw);
+
+    mount_op = gtk_mount_operation_new (toplevel ? GTK_WINDOW (toplevel) : NULL);
+    bvw->priv->mount_in_progress = TRUE;
+    bvw->priv->mount_cancellable = g_cancellable_new ();
+    g_file_mount_enclosing_volume (file, G_MOUNT_MOUNT_NONE,
+        mount_op, bvw->priv->mount_cancellable, mount_cb, bvw);
+
+    g_object_unref (mount_op);
+    goto done;
+  } else {
+    GstNavigationMessageType nav_msg_type =
+        gst_navigation_message_get_type (msg);
+
+    switch (nav_msg_type) {
+      case GST_NAVIGATION_MESSAGE_MOUSE_OVER: {
+        gint active;
+        if (!gst_navigation_message_parse_mouse_over (msg, &active))
+          break;
+        if (active) {
+          if (bvw->priv->cursor == NULL) {
+            bvw->priv->cursor = gdk_cursor_new (GDK_HAND2);
+          }
+        } else {
+	  g_clear_object (&bvw->priv->cursor);
+        }
+        gdk_window_set_cursor (gtk_widget_get_window (GTK_WIDGET(bvw)),
+            bvw->priv->cursor);
+        goto done;
+      }
+      case GST_NAVIGATION_MESSAGE_COMMANDS_CHANGED: {
+        GstQuery *cmds_q = gst_navigation_query_new_commands();
+        gboolean res = bvw_do_navigation_query (bvw, cmds_q);
+
+        if (res) {
+          gboolean is_menu = FALSE;
+	  gboolean has_angles = FALSE;
+          guint i, n;
+
+          if (gst_navigation_query_parse_commands_length (cmds_q, &n)) {
+            for (i = 0; i < n; i++) {
+              GstNavigationCommand cmd;
+              if (!gst_navigation_query_parse_commands_nth (cmds_q, i, &cmd))
+                break;
+              is_menu |= (cmd == GST_NAVIGATION_COMMAND_ACTIVATE);
+              is_menu |= (cmd == GST_NAVIGATION_COMMAND_LEFT);
+              is_menu |= (cmd == GST_NAVIGATION_COMMAND_RIGHT);
+              is_menu |= (cmd == GST_NAVIGATION_COMMAND_UP);
+              is_menu |= (cmd == GST_NAVIGATION_COMMAND_DOWN);
+
+	      has_angles |= (cmd == GST_NAVIGATION_COMMAND_PREV_ANGLE);
+	      has_angles |= (cmd == GST_NAVIGATION_COMMAND_NEXT_ANGLE);
+            }
+          }
+	  /* Are we in a menu now? */
+	  if (bvw->priv->is_menu != is_menu) {
+	    bvw->priv->is_menu = is_menu;
+	    g_object_notify (G_OBJECT (bvw), "seekable");
+	  }
+	  /* Do we have angle switching now? */
+	  if (bvw->priv->has_angles != has_angles) {
+	    bvw->priv->has_angles = has_angles;
+	    g_signal_emit (bvw, bvw_signals[SIGNAL_CHANNELS_CHANGE], 0);
+	  }
+        }
+
+        gst_query_unref (cmds_q);
+        goto done;
+      }
+      case GST_NAVIGATION_MESSAGE_ANGLES_CHANGED:
+      case GST_NAVIGATION_MESSAGE_INVALID:
+        goto unhandled;
+      default:
+        break;
+    }
+  }
+
+unhandled:
+  GST_WARNING ("Unhandled element message %s from %s: %" GST_PTR_FORMAT,
+      GST_STR_NULL (type_name), GST_STR_NULL (src_name), msg);
+
+done:
+  g_free (src_name);
+}
+
+/* This is a hack to avoid doing poll_for_state_change() indirectly
+ * from the bus message callback (via EOS => totem => close => wait for READY)
+ * and deadlocking there. We need something like a
+ * gst_bus_set_auto_flushing(bus, FALSE) ... */
+static gboolean
+bvw_signal_eos_delayed (gpointer user_data)
+{
+  BaconVideoWidget *bvw = BACON_VIDEO_WIDGET (user_data);
+
+  g_signal_emit (bvw, bvw_signals[SIGNAL_EOS], 0, NULL);
+  bvw->priv->eos_id = 0;
+  return FALSE;
+}
+
+static void
+bvw_reconfigure_tick_timeout (BaconVideoWidget *bvw, guint msecs)
+{
+  if (bvw->priv->update_id != 0) {
+    GST_DEBUG ("removing tick timeout");
+    g_source_remove (bvw->priv->update_id);
+    bvw->priv->update_id = 0;
+  }
+  if (msecs > 0) {
+    GST_DEBUG ("adding tick timeout (at %ums)", msecs);
+    bvw->priv->update_id =
+      g_timeout_add (msecs, (GSourceFunc) bvw_query_timeout, bvw);
+  }
+}
+
+static void
+bvw_reconfigure_fill_timeout (BaconVideoWidget *bvw, guint msecs)
+{
+  if (bvw->priv->fill_id != 0) {
+    GST_DEBUG ("removing fill timeout");
+    g_source_remove (bvw->priv->fill_id);
+    bvw->priv->fill_id = 0;
+  }
+  if (msecs > 0) {
+    GST_DEBUG ("adding fill timeout (at %ums)", msecs);
+    bvw->priv->fill_id =
+      g_timeout_add (msecs, (GSourceFunc) bvw_query_buffering_timeout, bvw);
+  }
+}
+
+/* returns TRUE if the error/signal has been handled and should be ignored */
+static gboolean
+bvw_emit_missing_plugins_signal (BaconVideoWidget * bvw, gboolean prerolled)
+{
+  gboolean handled = FALSE;
+  gchar **descriptions, **details;
+
+  details = bvw_get_missing_plugins_details (bvw->priv->missing_plugins);
+  descriptions = bvw_get_missing_plugins_descriptions (bvw->priv->missing_plugins);
+
+  GST_LOG ("emitting missing-plugins signal (prerolled=%d)", prerolled);
+
+  g_signal_emit (bvw, bvw_signals[SIGNAL_MISSING_PLUGINS], 0,
+      details, descriptions, prerolled, &handled);
+  GST_DEBUG ("missing-plugins signal was %shandled", (handled) ? "" : "not ");
+
+  g_strfreev (descriptions);
+  g_strfreev (details);
+
+  if (handled) {
+    bvw->priv->plugin_install_in_progress = TRUE;
+    bvw_clear_missing_plugins_messages (bvw);
+  }
+
+  /* if it wasn't handled, we might need the list of missing messages again
+   * later to create a proper error message with details of what's missing */
+
+  return handled;
+}
+
+static void
+bvw_auth_reply_cb (GMountOperation      *op,
+		   GMountOperationResult result,
+		   BaconVideoWidget     *bvw)
+{
+  GST_DEBUG ("Got authentication reply %d", result);
+  bvw->priv->auth_last_result = result;
+
+  if (result == G_MOUNT_OPERATION_HANDLED) {
+    bvw->priv->user_id = g_strdup (g_mount_operation_get_username (op));
+    bvw->priv->user_pw = g_strdup (g_mount_operation_get_password (op));
+  }
+
+  g_clear_object (&bvw->priv->auth_dialog);
+
+  if (bvw->priv->target_state == GST_STATE_PLAYING) {
+    GST_DEBUG ("Starting deferred playback after authentication");
+    bacon_video_widget_play (bvw, NULL);
+  }
+}
+
+static int
+bvw_get_http_error_code (GstMessage *err_msg)
+{
+  GError *err = NULL;
+  gchar *dbg = NULL;
+  int code = -1;
+
+  if (g_strcmp0 ("GstRTSPSrc", G_OBJECT_TYPE_NAME (err_msg->src)) != 0 &&
+      g_strcmp0 ("GstSoupHTTPSrc", G_OBJECT_TYPE_NAME (err_msg->src)) != 0)
+    return code;
+
+  gst_message_parse_error (err_msg, &err, &dbg);
+
+  /* Urgh! Check whether this is an auth error */
+  if (err == NULL || dbg == NULL)
+    goto done;
+  if (!is_error (err, RESOURCE, READ) &&
+      !is_error (err, RESOURCE, OPEN_READ))
+    goto done;
+
+  /* FIXME: Need to find a better way than parsing the plain text */
+  /* Keep in sync with bvw_error_from_gst_error() */
+  if (strstr (dbg, "401") != NULL)
+    code = 401;
+  else if (strstr (dbg, "404") != NULL)
+    code = 404;
+  else if (strstr (dbg, "403") != NULL)
+    code = 403;
+
+done:
+  if (err != NULL)
+    g_error_free (err);
+  g_free (dbg);
+  return code;
+}
+
+/* returns TRUE if the error should be ignored */
+static gboolean
+bvw_check_missing_auth (BaconVideoWidget * bvw, GstMessage * err_msg)
+{
+  GtkWidget *toplevel;
+  GMountOperationClass *klass;
+  int code;
+
+  if (gtk_widget_get_realized (GTK_WIDGET (bvw)) == FALSE)
+    return FALSE;
+
+  /* The user already tried, and we aborted */
+  if (bvw->priv->auth_last_result == G_MOUNT_OPERATION_ABORTED) {
+    GST_DEBUG ("Not authenticating, the user aborted the last auth attempt");
+    return FALSE;
+  }
+  /* There's already an auth on-going, ignore */
+  if (bvw->priv->auth_dialog != NULL) {
+    GST_DEBUG ("Ignoring error, we're doing authentication");
+    return TRUE;
+  }
+
+  /* RTSP or HTTP source with user-id property ? */
+  code = bvw_get_http_error_code (err_msg);
+  if (code != 401)
+    return FALSE;
+
+  if (g_object_class_find_property (G_OBJECT_GET_CLASS (err_msg->src), "user-id") == NULL) {
+    GST_DEBUG ("HTTP error is 401, but don't have \"user-id\" property, exiting");
+    return FALSE;
+  }
+
+  GST_DEBUG ("Trying to get auth for location '%s'", GST_STR_NULL (bvw->priv->mrl));
+
+  if (bvw->priv->auth_dialog == NULL) {
+    toplevel = gtk_widget_get_toplevel (GTK_WIDGET (bvw));
+    bvw->priv->auth_dialog = gtk_mount_operation_new (GTK_WINDOW (toplevel));
+    g_signal_connect (G_OBJECT (bvw->priv->auth_dialog), "reply",
+		      G_CALLBACK (bvw_auth_reply_cb), bvw);
+  }
+
+  /* And popup the dialogue! */
+  klass = (GMountOperationClass *) G_OBJECT_GET_CLASS (bvw->priv->auth_dialog);
+  klass->ask_password (bvw->priv->auth_dialog,
+		       _("Password requested for RTSP server"),
+		       g_get_user_name (),
+		       NULL,
+		       G_ASK_PASSWORD_NEED_PASSWORD | G_ASK_PASSWORD_NEED_USERNAME);
+  return TRUE;
+}
+
+/* returns TRUE if the error has been handled and should be ignored */
+static gboolean
+bvw_check_missing_plugins_error (BaconVideoWidget * bvw, GstMessage * err_msg)
+{
+  gboolean error_src_is_playbin;
+  gboolean ret = FALSE;
+  GError *err = NULL;
+
+  if (bvw->priv->missing_plugins == NULL) {
+    GST_DEBUG ("no missing-plugin messages");
+    return FALSE;
+  }
+
+  gst_message_parse_error (err_msg, &err, NULL);
+
+  error_src_is_playbin = (err_msg->src == GST_OBJECT_CAST (bvw->priv->play));
+
+  /* If we get a WRONG_TYPE error from playbin itself it's most likely because
+   * there is a subtitle stream we can decode, but no video stream to overlay
+   * it on. Since there were missing-plugins messages, we'll assume this is
+   * because we cannot decode the video stream (this should probably be fixed
+   * in playbin, but for now we'll work around it here) */
+  if (is_error (err, CORE, MISSING_PLUGIN) ||
+      is_error (err, STREAM, CODEC_NOT_FOUND) ||
+      (is_error (err, STREAM, WRONG_TYPE) && error_src_is_playbin)) {
+    ret = bvw_emit_missing_plugins_signal (bvw, FALSE);
+    if (ret) {
+      /* If it was handled, stop playback to make sure we're not processing any
+       * other error messages that might also be on the bus */
+      bacon_video_widget_stop (bvw);
+    }
+  } else {
+    GST_DEBUG ("not an error code we are looking for, doing nothing");
+  }
+
+  g_error_free (err);
+  return ret;
+}
+
+/* returns TRUE if the error/signal has been handled and should be ignored */
+static gboolean
+bvw_check_missing_plugins_on_preroll (BaconVideoWidget * bvw)
+{
+  if (bvw->priv->missing_plugins == NULL) {
+    GST_DEBUG ("no missing-plugin messages");
+    return FALSE;
+  }
+
+  return bvw_emit_missing_plugins_signal (bvw, TRUE); 
+}
+
+static void
+bvw_update_tags (BaconVideoWidget * bvw, GstTagList *tag_list, const gchar *type)
+{
+  GstTagList **cache = NULL;
+  GstTagList *result;
+
+  GST_DEBUG ("Tags: %" GST_PTR_FORMAT, tag_list);
+
+  /* all tags (replace previous tags, title/artist/etc. might change
+   * in the middle of a stream, e.g. with radio streams) */
+  result = gst_tag_list_merge (bvw->priv->tagcache, tag_list,
+                                   GST_TAG_MERGE_REPLACE);
+  if (bvw->priv->tagcache)
+    gst_tag_list_free (bvw->priv->tagcache);
+  bvw->priv->tagcache = result;
+
+  /* media-type-specific tags */
+  if (!strcmp (type, "video")) {
+    cache = &bvw->priv->videotags;
+  } else if (!strcmp (type, "audio")) {
+    cache = &bvw->priv->audiotags;
+  }
+
+  if (cache) {
+    result = gst_tag_list_merge (*cache, tag_list, GST_TAG_MERGE_REPLACE);
+    if (*cache)
+      gst_tag_list_free (*cache);
+    *cache = result;
+  }
+
+  /* clean up */
+  if (tag_list)
+    gst_tag_list_free (tag_list);
+
+  bvw_check_for_cover_pixbuf (bvw);
+
+  g_signal_emit (bvw, bvw_signals[SIGNAL_GOT_METADATA], 0);
+
+  set_current_actor (bvw);
+}
+
+static void
+update_tags_delayed_data_destroy (UpdateTagsDelayedData *data)
+{
+  g_slice_free (UpdateTagsDelayedData, data);
+}
+
+static gboolean
+bvw_update_tags_dispatcher (BaconVideoWidget *self)
+{
+  UpdateTagsDelayedData *data;
+
+  /* If we take the queue's lock for the entire function call, we can use it to protect tag_update_id too */
+  g_async_queue_lock (self->priv->tag_update_queue);
+
+  while ((data = g_async_queue_try_pop_unlocked (self->priv->tag_update_queue)) != NULL) {
+    bvw_update_tags (self, data->tags, data->type);
+    update_tags_delayed_data_destroy (data);
+  }
+
+  self->priv->tag_update_id = 0;
+  g_async_queue_unlock (self->priv->tag_update_queue);
+
+  return FALSE;
+}
+
+/* Marshal the changed tags to the main thread for updating the GUI
+ * and sending the BVW signals */
+static void
+bvw_update_tags_delayed (BaconVideoWidget *bvw, GstTagList *tags, const gchar *type) {
+  UpdateTagsDelayedData *data = g_slice_new0 (UpdateTagsDelayedData);
+
+  data->tags = tags;
+  data->type = type;
+
+  g_async_queue_lock (bvw->priv->tag_update_queue);
+  g_async_queue_push_unlocked (bvw->priv->tag_update_queue, data);
+
+  if (bvw->priv->tag_update_id == 0)
+    bvw->priv->tag_update_id = g_idle_add ((GSourceFunc) bvw_update_tags_dispatcher, bvw);
+
+  g_async_queue_unlock (bvw->priv->tag_update_queue);
+}
+
+static void
+video_tags_changed_cb (GstElement *playbin2, gint stream_id, gpointer user_data)
+{
+  BaconVideoWidget *bvw = (BaconVideoWidget *) user_data;
+  GstTagList *tags = NULL;
+  gint current_stream_id = 0;
+
+  g_object_get (G_OBJECT (bvw->priv->play), "current-video", ¤t_stream_id, NULL);
+
+  /* Only get the updated tags if it's for our current stream id */
+  if (current_stream_id != stream_id)
+    return;
+
+  g_signal_emit_by_name (G_OBJECT (bvw->priv->play), "get-video-tags", stream_id, &tags);
+
+  if (tags)
+    bvw_update_tags_delayed (bvw, tags, "video");
+}
+
+static void
+audio_tags_changed_cb (GstElement *playbin2, gint stream_id, gpointer user_data)
+{
+  BaconVideoWidget *bvw = (BaconVideoWidget *) user_data;
+  GstTagList *tags = NULL;
+  gint current_stream_id = 0;
+
+  g_object_get (G_OBJECT (bvw->priv->play), "current-audio", ¤t_stream_id, NULL);
+
+  /* Only get the updated tags if it's for our current stream id */
+  if (current_stream_id != stream_id)
+    return;
+
+  g_signal_emit_by_name (G_OBJECT (bvw->priv->play), "get-audio-tags", stream_id, &tags);
+
+  if (tags)
+    bvw_update_tags_delayed (bvw, tags, "audio");
+}
+
+static void
+text_tags_changed_cb (GstElement *playbin2, gint stream_id, gpointer user_data)
+{
+  BaconVideoWidget *bvw = (BaconVideoWidget *) user_data;
+  GstTagList *tags = NULL;
+  gint current_stream_id = 0;
+
+  g_object_get (G_OBJECT (bvw->priv->play), "current-text", ¤t_stream_id, NULL);
+
+  /* Only get the updated tags if it's for our current stream id */
+  if (current_stream_id != stream_id)
+    return;
+
+  g_signal_emit_by_name (G_OBJECT (bvw->priv->play), "get-text-tags", stream_id, &tags);
+
+  if (tags)
+    bvw_update_tags_delayed (bvw, tags, "text");
+}
+
+static gboolean
+bvw_download_buffering_done (BaconVideoWidget *bvw)
+{
+  /* When we set buffering left to 0, that means it's ready to play */
+  if (bvw->priv->buffering_left == 0) {
+    GST_DEBUG ("Buffering left is 0, so buffering done");
+    return TRUE;
+  }
+  if (bvw->priv->stream_length <= 0)
+    return FALSE;
+  /* When queue2 doesn't implement buffering-left, always think
+   * it's ready to go */
+  if (bvw->priv->buffering_left < 0) {
+    GST_DEBUG ("Buffering left not implemented, so buffering done");
+    return TRUE;
+  }
+
+  if (bvw->priv->buffering_left * BUFFERING_LEFT_RATIO < bvw->priv->stream_length - bvw->priv->current_time) {
+    GST_DEBUG ("Buffering left: %lld * %f = %lld < %lld",
+	       bvw->priv->buffering_left, BUFFERING_LEFT_RATIO,
+	       bvw->priv->buffering_left * BUFFERING_LEFT_RATIO,
+	       bvw->priv->stream_length - bvw->priv->current_time);
+    return TRUE;
+  }
+  return FALSE;
+}
+
+static void
+bvw_handle_buffering_message (GstMessage * message, BaconVideoWidget *bvw)
+{
+  GstBufferingMode mode;
+  gint percent = 0;
+
+   gst_message_parse_buffering_stats (message, &mode, NULL, NULL, NULL);
+   if (mode == GST_BUFFERING_DOWNLOAD) {
+     if (bvw->priv->download_buffering == FALSE) {
+       bvw->priv->download_buffering = TRUE;
+
+       /* We're not ready to play yet, so pause the stream */
+       GST_DEBUG ("Pausing because we're not ready to play the buffer yet");
+       gst_element_set_state (GST_ELEMENT (bvw->priv->play), GST_STATE_PAUSED);
+
+       bvw_reconfigure_fill_timeout (bvw, 200);
+       bvw->priv->download_buffering_element = g_object_ref (message->src);
+     }
+
+     return;
+   }
+
+   /* We switched from download mode to normal buffering */
+   if (bvw->priv->download_buffering != FALSE) {
+     bvw_reconfigure_fill_timeout (bvw, 0);
+     bvw->priv->download_buffering = FALSE;
+     g_clear_pointer (&bvw->priv->download_filename, g_free);
+   }
+
+   /* Live, timeshift and stream buffering modes */
+  gst_message_parse_buffering (message, &percent);
+  g_signal_emit (bvw, bvw_signals[SIGNAL_BUFFERING], 0, (gdouble) percent / 100.0);
+
+  if (percent >= 100) {
+    /* a 100% message means buffering is done */
+    bvw->priv->buffering = FALSE;
+    /* if the desired state is playing, go back */
+    if (bvw->priv->target_state == GST_STATE_PLAYING) {
+      GST_DEBUG ("Buffering done, setting pipeline back to PLAYING");
+      bacon_video_widget_play (bvw, NULL);
+    } else {
+      GST_DEBUG ("Buffering done, keeping pipeline PAUSED");
+    }
+  } else if (bvw->priv->target_state == GST_STATE_PLAYING) {
+    GstState cur_state;
+
+    gst_element_get_state (bvw->priv->play, &cur_state, NULL, 0);
+    if (cur_state != GST_STATE_PAUSED) {
+      GST_DEBUG ("Buffering ... temporarily pausing playback %d%%", percent);
+      gst_element_set_state (bvw->priv->play, GST_STATE_PAUSED);
+    } else {
+      GST_LOG ("Buffering (already paused) ... %d%%", percent);
+    }
+    bvw->priv->buffering = TRUE;
+  } else {
+    GST_LOG ("Buffering ... %d", percent);
+  }
+}
+
+static inline void
+bvw_get_navigation_if_available (BaconVideoWidget *bvw)
+{
+  GstElement * nav;
+  nav = gst_bin_get_by_interface (GST_BIN (bvw->priv->play),
+                                        GST_TYPE_NAVIGATION);
+  g_clear_pointer (&bvw->priv->navigation, gst_object_unref);
+
+  if (nav)
+    bvw->priv->navigation = GST_NAVIGATION (nav);
+}
+
+static void
+bvw_bus_message_cb (GstBus * bus, GstMessage * message, BaconVideoWidget *bvw)
+{
+  GstMessageType msg_type;
+
+  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
+
+  msg_type = GST_MESSAGE_TYPE (message);
+
+  if (msg_type != GST_MESSAGE_STATE_CHANGED) {
+    gchar *src_name = gst_object_get_name (message->src);
+    GST_LOG ("Handling %s message from element %s",
+        gst_message_type_get_name (msg_type), src_name);
+    g_free (src_name);
+  }
+
+  switch (msg_type) {
+    case GST_MESSAGE_ERROR: {
+      totem_gst_message_print (message, bvw->priv->play, "totem-error");
+
+      if (!bvw_check_missing_plugins_error (bvw, message) &&
+	  !bvw_check_missing_auth (bvw, message)) {
+        GError *error;
+
+        error = bvw_error_from_gst_error (bvw, message);
+
+        bvw->priv->target_state = GST_STATE_NULL;
+        if (bvw->priv->play)
+          gst_element_set_state (bvw->priv->play, GST_STATE_NULL);
+
+        bvw->priv->buffering = FALSE;
+
+        g_signal_emit (bvw, bvw_signals[SIGNAL_ERROR], 0,
+                       error->message, TRUE);
+
+        g_error_free (error);
+      }
+      break;
+    }
+    case GST_MESSAGE_WARNING: {
+      GST_WARNING ("Warning message: %" GST_PTR_FORMAT, message);
+      break;
+    }
+    case GST_MESSAGE_TAG: 
+      /* Ignore TAG messages, we get updated tags from the
+       * {audio,video,text}-tags-changed signals of playbin2
+       */
+      break;
+    case GST_MESSAGE_EOS:
+      GST_DEBUG ("EOS message");
+      /* update slider one last time */
+      bvw_query_timeout (bvw);
+      if (bvw->priv->eos_id == 0)
+        bvw->priv->eos_id = g_idle_add (bvw_signal_eos_delayed, bvw);
+      break;
+    case GST_MESSAGE_BUFFERING:
+      bvw_handle_buffering_message (message, bvw);
+      break;
+    case GST_MESSAGE_APPLICATION: {
+      bvw_handle_application_message (bvw, message);
+      break;
+    }
+    case GST_MESSAGE_STATE_CHANGED: {
+      GstState old_state, new_state;
+      gchar *src_name;
+
+      gst_message_parse_state_changed (message, &old_state, &new_state, NULL);
+
+      if (old_state == new_state)
+        break;
+
+      /* we only care about playbin (pipeline) state changes */
+      if (GST_MESSAGE_SRC (message) != GST_OBJECT (bvw->priv->play))
+        break;
+
+      src_name = gst_object_get_name (message->src);
+      GST_DEBUG ("%s changed state from %s to %s", src_name,
+          gst_element_state_get_name (old_state),
+          gst_element_state_get_name (new_state));
+      g_free (src_name);
+
+      if (new_state <= GST_STATE_READY) {
+        if (bvw->priv->navigation)
+          g_clear_object (&bvw->priv->navigation);
+      }
+
+      /* now do stuff */
+      if (new_state <= GST_STATE_PAUSED) {
+        bvw_query_timeout (bvw);
+        bvw_reconfigure_tick_timeout (bvw, 0);
+      } else if (new_state > GST_STATE_PAUSED) {
+        bvw_reconfigure_tick_timeout (bvw, 200);
+      }
+
+      if (old_state == GST_STATE_READY && new_state == GST_STATE_PAUSED) {
+        GST_DEBUG_BIN_TO_DOT_FILE (GST_BIN_CAST (bvw->priv->play),
+            GST_DEBUG_GRAPH_SHOW_ALL ^ GST_DEBUG_GRAPH_SHOW_NON_DEFAULT_PARAMS,
+            "totem-prerolled");
+	bacon_video_widget_get_stream_length (bvw);
+        bvw_update_stream_info (bvw);
+        if (!bvw_check_missing_plugins_on_preroll (bvw)) {
+          /* show a non-fatal warning message if we can't decode the video */
+          bvw_check_if_video_decoder_is_missing (bvw);
+        }
+	/* Now that we have the length, check whether we wanted
+	 * to pause or to stop the pipeline */
+        if (bvw->priv->target_state == GST_STATE_PAUSED)
+	  bacon_video_widget_pause (bvw);
+      } else if (old_state == GST_STATE_PAUSED && new_state == GST_STATE_READY) {
+        bvw->priv->media_has_video = FALSE;
+        bvw->priv->media_has_audio = FALSE;
+
+        /* clean metadata cache */
+	g_clear_pointer (&bvw->priv->tagcache, gst_tag_list_unref);
+	g_clear_pointer (&bvw->priv->audiotags, gst_tag_list_unref);
+	g_clear_pointer (&bvw->priv->videotags, gst_tag_list_unref);
+
+        bvw->priv->video_width = 0;
+        bvw->priv->video_height = 0;
+      }
+      break;
+    }
+    case GST_MESSAGE_ELEMENT:{
+      bvw_handle_element_message (bvw, message);
+      break;
+    }
+
+    case GST_MESSAGE_DURATION_CHANGED: {
+      gint64 len = -1;
+      if (gst_element_query_duration (bvw->priv->play, GST_FORMAT_TIME, &len) && len != -1) {
+        bvw->priv->stream_length = len / GST_MSECOND;
+	GST_DEBUG ("got new stream length (through duration message) %" G_GINT64_FORMAT, bvw->priv->stream_length);
+      }
+      break;
+    }
+
+    case GST_MESSAGE_ASYNC_DONE: {
+	gint64 _time;
+	/* When a seek has finished, set the playing state again */
+	g_mutex_lock (&bvw->priv->seek_mutex);
+
+	bvw->priv->seek_req_time = gst_clock_get_internal_time (bvw->priv->clock);
+	_time = bvw->priv->seek_time;
+	bvw->priv->seek_time = -1;
+
+	g_mutex_unlock (&bvw->priv->seek_mutex);
+
+	if (_time >= 0) {
+	  GST_DEBUG ("Have an old seek to schedule, doing it now");
+	  bacon_video_widget_seek_time_no_lock (bvw, _time, 0, NULL);
+	} else if (bvw->priv->target_state == GST_STATE_PLAYING) {
+	  GST_DEBUG ("Maybe starting deferred playback after seek");
+	  bacon_video_widget_play (bvw, NULL);
+	}
+	bvw_get_navigation_if_available (bvw);
+	bacon_video_widget_get_stream_length (bvw);
+	bacon_video_widget_is_seekable (bvw);
+      break;
+    }
+
+    /* FIXME: at some point we might want to handle CLOCK_LOST and set the
+     * pipeline back to PAUSED and then PLAYING again to select a different
+     * clock (this seems to trip up rtspsrc though so has to wait until
+     * rtspsrc gets fixed) */
+    case GST_MESSAGE_CLOCK_PROVIDE:
+    case GST_MESSAGE_CLOCK_LOST:
+    case GST_MESSAGE_NEW_CLOCK:
+    case GST_MESSAGE_STATE_DIRTY:
+    case GST_MESSAGE_STREAM_STATUS:
+      break;
+
+    case GST_MESSAGE_UNKNOWN:
+    case GST_MESSAGE_INFO:
+    case GST_MESSAGE_STEP_DONE:
+    case GST_MESSAGE_STRUCTURE_CHANGE:
+    case GST_MESSAGE_SEGMENT_START:
+    case GST_MESSAGE_SEGMENT_DONE:
+    case GST_MESSAGE_LATENCY:
+    case GST_MESSAGE_ASYNC_START:
+    case GST_MESSAGE_REQUEST_STATE:
+    case GST_MESSAGE_STEP_START:
+    case GST_MESSAGE_QOS:
+    case GST_MESSAGE_PROGRESS:
+    case GST_MESSAGE_ANY:
+    default:
+      GST_LOG ("Unhandled message: %" GST_PTR_FORMAT, message);
+      break;
+  }
+}
+
+static void
+got_time_tick (GstElement * play, gint64 time_nanos, BaconVideoWidget * bvw)
+{
+  gboolean seekable;
+
+  bvw->priv->current_time = (gint64) time_nanos / GST_MSECOND;
+
+  if (bvw->priv->stream_length == 0) {
+    bvw->priv->current_position = 0;
+  } else {
+    bvw->priv->current_position =
+      (gdouble) bvw->priv->current_time / bvw->priv->stream_length;
+  }
+
+  if (bvw->priv->stream_length == 0) {
+    seekable = bacon_video_widget_is_seekable (bvw);
+  } else {
+    if (bvw->priv->seekable == -1)
+      g_object_notify (G_OBJECT (bvw), "seekable");
+    seekable = TRUE;
+  }
+
+  bvw->priv->is_live = (bvw->priv->stream_length == 0);
+
+/*
+  GST_DEBUG ("%" GST_TIME_FORMAT ",%" GST_TIME_FORMAT " %s",
+      GST_TIME_ARGS (bvw->priv->current_time),
+      GST_TIME_ARGS (bvw->priv->stream_length),
+      (seekable) ? "TRUE" : "FALSE");
+*/
+  
+  g_signal_emit (bvw, bvw_signals[SIGNAL_TICK], 0,
+                 bvw->priv->current_time, bvw->priv->stream_length,
+                 bvw->priv->current_position,
+                 seekable);
+}
+
+static void
+bvw_set_user_agent_on_element (BaconVideoWidget * bvw, GstElement * element)
+{
+  BaconVideoWidgetPrivate *priv = bvw->priv;
+  const char *user_agent;
+
+  if (g_object_class_find_property (G_OBJECT_GET_CLASS (element), "user-agent") == NULL)
+    return;
+
+  user_agent = priv->user_agent ? priv->user_agent : DEFAULT_USER_AGENT;
+  GST_DEBUG ("Setting HTTP user-agent to '%s'", user_agent);
+  g_object_set (element, "user-agent", user_agent, NULL);
+}
+
+static void
+bvw_set_auth_on_element (BaconVideoWidget * bvw, GstElement * element)
+{
+  if (g_object_class_find_property (G_OBJECT_GET_CLASS (element), "user-id") == NULL)
+    return;
+  if (bvw->priv->auth_last_result != G_MOUNT_OPERATION_HANDLED)
+    return;
+  if (bvw->priv->user_id == NULL || bvw->priv->user_pw == NULL)
+    return;
+
+  GST_DEBUG ("Setting username and password");
+  g_object_set (element,
+		"user-id", bvw->priv->user_id,
+		"user-pw", bvw->priv->user_pw,
+		NULL);
+
+  g_clear_pointer (&bvw->priv->user_id, g_free);
+  g_clear_pointer (&bvw->priv->user_pw, g_free);
+}
+
+static void
+bvw_set_http_proxy_on_element (BaconVideoWidget * bvw, GstElement * element)
+{
+  GSettings *settings;
+  char *url, *host = NULL, *user_id, *user_pw;
+  int port;
+  gboolean is_https;
+
+  if (g_str_has_prefix (bvw->priv->mrl, "https://"))
+    {
+      settings = g_settings_new ("org.gnome.system.proxy.https");
+      is_https = TRUE;
+    }
+  else
+    {
+      settings = g_settings_new ("org.gnome.system.proxy.http");
+      is_https = FALSE;
+    }
+
+  host = g_settings_get_string (settings, "host");
+  if (*host == '\0')
+    goto finish;
+  port = g_settings_get_int (settings, "port");
+  if (port == 0)
+    goto finish;
+
+  url = g_strdup_printf ("http://%s:%d", host, port);
+  g_object_set (element, "proxy", url, NULL);
+  g_free (url);
+
+  /* https doesn't handle authentication yet */
+  if (is_https ||
+      g_settings_get_boolean (settings, "use-authentication") == FALSE)
+    goto finish;
+
+  user_id = g_settings_get_string (settings, "authentication-user");
+  user_pw = g_settings_get_string (settings, "authentication-password");
+  g_object_set (element,
+		"proxy-id", user_id,
+		"proxy-pw", user_pw,
+		NULL);
+  g_free (user_pw);
+  g_free (user_id);
+
+finish:
+  g_free (host);
+  g_object_unref (settings);
+}
+
+static void
+bvw_set_rtsp_proxy_on_element (BaconVideoWidget * bvw, GstElement * element)
+{
+  GSettings *settings;
+  char *url, *host = NULL, *user_id, *user_pw;
+  char *enc_id, *enc_pw;
+  int port;
+
+  settings = g_settings_new ("org.gnome.system.proxy.http");
+
+  host = g_settings_get_string (settings, "host");
+  if (*host == '\0')
+    goto finish;
+  port = g_settings_get_int (settings, "port");
+  if (port == 0)
+    goto finish;
+
+  url = g_strdup_printf ("http://%s:%d", host, port);
+  g_object_set (element, "proxy", url, NULL);
+  g_free (url);
+
+  if (g_settings_get_boolean (settings, "use-authentication") == FALSE)
+    {
+      url = g_strdup_printf ("http://%s:%d", host, port);
+      g_object_set (element, "proxy", url, NULL);
+      g_free (url);
+      goto finish;
+    }
+
+  user_id = g_settings_get_string (settings, "authentication-user");
+  enc_id = g_uri_escape_string (user_id, NULL, TRUE);
+  g_free (user_id);
+  user_pw = g_settings_get_string (settings, "authentication-password");
+  enc_pw = g_uri_escape_string (user_pw, NULL, TRUE);
+  g_free (user_pw);
+
+  url = g_strdup_printf ("http://%s:%s@%s:%u",
+			 enc_id, enc_pw, host, port);
+  g_object_set (element, "proxy", url, NULL);
+  g_free (url);
+
+  g_free (enc_id);
+  g_free (enc_pw);
+
+finish:
+  g_free (host);
+  g_object_unref (settings);
+}
+
+static void
+bvw_set_proxy_on_element (BaconVideoWidget * bvw, GstElement * element)
+{
+  GSettings *settings;
+  GDesktopProxyMode mode;
+
+  if (g_object_class_find_property (G_OBJECT_GET_CLASS (element), "proxy") == NULL)
+    return;
+
+  settings = g_settings_new ("org.gnome.system.proxy");
+  mode = g_settings_get_enum (settings, "mode");
+  g_object_unref (settings);
+
+  switch (mode) {
+    case G_DESKTOP_PROXY_MODE_NONE:
+      return;
+    case G_DESKTOP_PROXY_MODE_MANUAL:
+      /* Handled below. */
+      break;
+    case G_DESKTOP_PROXY_MODE_AUTO:
+      /* FIXME: Auto proxy configuration is unhandled */
+      GST_DEBUG ("Auto proxy configuration is unhandled");
+      return;
+    default:
+      GST_DEBUG ("Proxy mode %d is unhandled", mode);
+      return;
+  }
+
+  /* The RTSP source lacks separate properties for auth ID and password:
+   * https://bugzilla.gnome.org/show_bug.cgi?id=395427#c5 */
+  if (g_object_class_find_property (G_OBJECT_GET_CLASS (element), "proxy-id") == NULL ||
+      g_object_class_find_property (G_OBJECT_GET_CLASS (element), "proxy-pw") == NULL)
+    bvw_set_rtsp_proxy_on_element (bvw, element);
+  else
+    bvw_set_http_proxy_on_element (bvw, element);
+}
+
+static void
+bvw_set_referrer_on_element (BaconVideoWidget * bvw, GstElement * element)
+{
+  BaconVideoWidgetPrivate *priv = bvw->priv;
+  GstStructure *extra_headers = NULL;
+
+  if (g_object_class_find_property (G_OBJECT_GET_CLASS (element), "extra-headers") == NULL)
+    return;
+
+  GST_DEBUG ("Setting HTTP referrer to '%s'", priv->referrer ? priv->referrer : "none");
+
+  g_object_get (element, "extra-headers", &extra_headers, NULL);
+  if (extra_headers == NULL) {
+    extra_headers = gst_structure_new_empty ("extra-headers");
+  }
+  g_assert (GST_IS_STRUCTURE (extra_headers));
+
+  if (priv->referrer != NULL) {
+    gst_structure_set (extra_headers,
+                       "Referer" /* not a typo! */,
+                       G_TYPE_STRING,
+                       priv->referrer,
+                       NULL);
+  } else {
+    gst_structure_remove_field (extra_headers,
+                                "Referer" /* not a typo! */);
+  }
+
+  g_object_set (element, "extra-headers", extra_headers, NULL);
+  gst_structure_free (extra_headers);
+}
+
+static void
+playbin_source_setup_cb (GstElement       *playbin,
+			 GstElement       *source,
+			 BaconVideoWidget *bvw)
+{
+  GST_DEBUG ("Got source of type %s", G_OBJECT_TYPE_NAME (source));
+  bvw_set_user_agent_on_element (bvw, source);
+  bvw_set_referrer_on_element (bvw, source);
+  bvw_set_auth_on_element (bvw, source);
+  bvw_set_proxy_on_element (bvw, source);
+}
+
+static void
+playbin_deep_notify_cb (GstObject  *gstobject,
+			GstObject  *prop_object,
+			GParamSpec *prop,
+			BaconVideoWidget *bvw)
+{
+  if (g_str_equal (prop->name, "temp-location") == FALSE)
+    return;
+
+  g_clear_pointer (&bvw->priv->download_filename, g_free);
+  g_object_get (G_OBJECT (prop_object),
+		"temp-location", &bvw->priv->download_filename,
+		NULL);
+}
+
+static gboolean
+bvw_query_timeout (BaconVideoWidget *bvw)
+{
+  gint64 pos = -1;
+
+  /* check pos of stream */
+  if (gst_element_query_position (bvw->priv->play, GST_FORMAT_TIME, &pos)) {
+    if (pos != -1) {
+      got_time_tick (GST_ELEMENT (bvw->priv->play), pos, bvw);
+    }
+  } else {
+    GST_DEBUG ("could not get position");
+  }
+
+  return TRUE;
+}
+
+static gboolean
+bvw_query_buffering_timeout (BaconVideoWidget *bvw)
+{
+  GstQuery *query;
+  GstElement *element;
+
+  element = bvw->priv->download_buffering_element;
+  if (element == NULL)
+    element = bvw->priv->play;
+
+  query = gst_query_new_buffering (GST_FORMAT_PERCENT);
+  if (gst_element_query (element, query)) {
+    gint64 start, stop;
+    GstFormat format;
+    gdouble fill;
+    gboolean busy;
+    gint percent;
+
+    gst_query_parse_buffering_stats (query, NULL, NULL, NULL, &bvw->priv->buffering_left);
+    gst_query_parse_buffering_percent (query, &busy, &percent);
+    gst_query_parse_buffering_range (query, &format, &start, &stop, NULL);
+
+    GST_DEBUG ("start %" G_GINT64_FORMAT ", stop %" G_GINT64_FORMAT
+	       ", buffering left %" G_GINT64_FORMAT ", percent %d%%",
+	       start, stop, bvw->priv->buffering_left, percent);
+
+#if 0
+    guint i;
+    for (i = 0; i < n_ranges; i++) {
+      gint64 n_start, n_stop;
+      gst_query_parse_nth_buffering_range (query, i, &n_start, &n_stop);
+      GST_DEBUG ("%s range %d: start %" G_GINT64_FORMAT " stop %" G_GINT64_FORMAT,
+		 n_stop == stop ? "*" : " ",
+		 i, n_start, n_stop);
+    }
+#endif
+
+    if (stop != -1)
+      fill = (gdouble) stop / GST_FORMAT_PERCENT_MAX;
+    else
+      fill = -1.0;
+
+    GST_DEBUG ("download buffer filled up to %f%% (element: %s)", fill * 100.0,
+	       G_OBJECT_TYPE_NAME (element));
+
+    g_signal_emit (bvw, bvw_signals[SIGNAL_DOWNLOAD_BUFFERING], 0, fill);
+
+    /* Nothing left to buffer when fill is 100% */
+    if (fill == 1.0)
+      bvw->priv->buffering_left = 0;
+
+    /* Start playing when we've downloaded enough */
+    if (bvw_download_buffering_done (bvw) != FALSE &&
+	bvw->priv->target_state == GST_STATE_PLAYING) {
+      GST_DEBUG ("Starting playback because the download buffer is filled enough");
+      bacon_video_widget_play (bvw, NULL);
+    }
+
+    /* Finished buffering, so don't run the timeout anymore */
+    if (fill == 1.0) {
+      bvw->priv->fill_id = 0;
+      gst_query_unref (query);
+      g_clear_object (&bvw->priv->download_buffering_element);
+
+      /* Tell the front-end about the downloaded file */
+      g_object_notify (G_OBJECT (bvw), "download-filename");
+
+      return FALSE;
+    }
+  } else {
+    g_debug ("Failed to query the source element for buffering info in percent");
+  }
+  gst_query_unref (query);
+
+  return TRUE;
+}
+
+static void
+caps_set (GObject * obj,
+    GParamSpec * pspec, BaconVideoWidget * bvw)
+{
+  GstPad *pad = GST_PAD (obj);
+  GstStructure *s;
+  GstCaps *caps;
+
+  if (!(caps = gst_pad_get_current_caps (pad)))
+    return;
+
+  /* Get video decoder caps */
+  s = gst_caps_get_structure (caps, 0);
+  if (s) {
+    const GValue *movie_par;
+
+    /* We need at least width/height and framerate */
+    if (!(gst_structure_get_fraction (s, "framerate", &bvw->priv->video_fps_n, 
+          &bvw->priv->video_fps_d) &&
+          gst_structure_get_int (s, "width", &bvw->priv->video_width) &&
+          gst_structure_get_int (s, "height", &bvw->priv->video_height)))
+      return;
+    
+    /* Get the movie PAR if available */
+    movie_par = gst_structure_get_value (s, "pixel-aspect-ratio");
+    if (movie_par) {
+      bvw->priv->movie_par_n = gst_value_get_fraction_numerator (movie_par);
+      bvw->priv->movie_par_d = gst_value_get_fraction_denominator (movie_par);
+    }
+    else {
+      /* Square pixels */
+      bvw->priv->movie_par_n = 1;
+      bvw->priv->movie_par_d = 1;
+    }
+    
+    /* Now set for real */
+    bacon_video_widget_set_aspect_ratio (bvw, bvw->priv->ratio_type);
+  }
+
+  gst_caps_unref (caps);
+}
+
+static void get_visualization_size (BaconVideoWidget *bvw,
+                                    int *w, int *h, gint *fps_n, gint *fps_d);
+
+static void
+parse_stream_info (BaconVideoWidget *bvw)
+{
+  GstPad *videopad = NULL;
+  gint n_audio, n_video;
+
+  g_object_get (G_OBJECT (bvw->priv->play), "n-audio", &n_audio,
+      "n-video", &n_video, NULL);
+
+  bvw_check_for_cover_pixbuf (bvw);
+
+  bvw->priv->media_has_video = FALSE;
+  if (n_video > 0) {
+    gint i;
+
+    bvw->priv->media_has_video = TRUE;
+
+    for (i = 0; i < n_video && videopad == NULL; i++)
+      g_signal_emit_by_name (bvw->priv->play, "get-video-pad", i, &videopad);
+  }
+
+  bvw->priv->media_has_audio = FALSE;
+  if (n_audio > 0) {
+    bvw->priv->media_has_audio = TRUE;
+    if (!bvw->priv->media_has_video) {
+      gint flags;
+
+      g_object_get (bvw->priv->play, "flags", &flags, NULL);
+      if (bvw->priv->show_vfx && !bvw->priv->cover_pixbuf)
+	flags |= GST_PLAY_FLAG_VIS;
+      else
+	flags &= ~GST_PLAY_FLAG_VIS;
+      g_object_set (bvw->priv->play, "flags", flags, NULL);
+    }
+  }
+
+  if (videopad) {
+    GstCaps *caps;
+
+    if ((caps = gst_pad_get_current_caps (videopad))) {
+      caps_set (G_OBJECT (videopad), NULL, bvw);
+      gst_caps_unref (caps);
+    }
+    g_signal_connect (videopad, "notify::caps",
+        G_CALLBACK (caps_set), bvw);
+    gst_object_unref (videopad);
+  } else if (bvw->priv->show_vfx) {
+    get_visualization_size (bvw, &bvw->priv->video_width,
+        &bvw->priv->video_height, NULL, NULL);
+  }
+
+  set_current_actor (bvw);
+}
+
+static void
+playbin_stream_changed_cb (GstElement * obj, gpointer data)
+{
+  BaconVideoWidget *bvw = BACON_VIDEO_WIDGET (data);
+  GstMessage *msg;
+
+  /* we're being called from the streaming thread, so don't do anything here */
+  GST_LOG ("streams have changed");
+  msg = gst_message_new_application (GST_OBJECT (bvw->priv->play),
+				     gst_structure_new_empty ("stream-changed"));
+  gst_element_post_message (bvw->priv->play, msg);
+}
+
+static void
+bacon_video_widget_finalize (GObject * object)
+{
+  BaconVideoWidget *bvw = (BaconVideoWidget *) object;
+
+  GST_DEBUG ("finalizing");
+
+  g_type_class_unref (g_type_class_peek (BVW_TYPE_METADATA_TYPE));
+  g_type_class_unref (g_type_class_peek (BVW_TYPE_DVD_EVENT));
+  g_type_class_unref (g_type_class_peek (BVW_TYPE_ROTATION));
+
+  if (bvw->priv->bus) {
+    /* make bus drop all messages to make sure none of our callbacks is ever
+     * called again (main loop might be run again to display error dialog) */
+    gst_bus_set_flushing (bvw->priv->bus, TRUE);
+
+    if (bvw->priv->sig_bus_async)
+      g_signal_handler_disconnect (bvw->priv->bus, bvw->priv->sig_bus_async);
+
+    g_clear_pointer (&bvw->priv->bus, gst_object_unref);
+  }
+
+  g_clear_pointer (&bvw->priv->user_agent, g_free);
+  g_clear_pointer (&bvw->priv->referrer, g_free);
+  g_clear_pointer (&bvw->priv->mrl, g_free);
+  g_clear_pointer (&bvw->priv->subtitle_uri, g_free);
+  g_clear_pointer (&bvw->priv->vis_element_name, g_free);
+
+  g_clear_object (&bvw->priv->clock);
+
+  g_clear_pointer (&bvw->priv->vis_plugins_list, g_list_free);
+  g_clear_pointer (&bvw->priv->vis_plugins_ht, g_hash_table_destroy);
+
+  if (bvw->priv->play != NULL)
+    gst_element_set_state (bvw->priv->play, GST_STATE_NULL);
+
+  g_clear_object (&bvw->priv->play);
+
+  if (bvw->priv->update_id) {
+    g_source_remove (bvw->priv->update_id);
+    bvw->priv->update_id = 0;
+  }
+
+  g_clear_pointer (&bvw->priv->tagcache, gst_tag_list_unref);
+  g_clear_pointer (&bvw->priv->audiotags, gst_tag_list_unref);
+  g_clear_pointer (&bvw->priv->videotags, gst_tag_list_unref);
+
+  if (bvw->priv->tag_update_id != 0)
+    g_source_remove (bvw->priv->tag_update_id);
+  g_async_queue_unref (bvw->priv->tag_update_queue);
+
+  if (bvw->priv->eos_id != 0) {
+    g_source_remove (bvw->priv->eos_id);
+    bvw->priv->eos_id = 0;
+  }
+
+  g_clear_object (&bvw->priv->cursor);
+
+  if (bvw->priv->mount_cancellable)
+    g_cancellable_cancel (bvw->priv->mount_cancellable);
+  g_clear_object (&bvw->priv->mount_cancellable);
+
+  g_mutex_clear (&bvw->priv->seek_mutex);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+bacon_video_widget_set_property (GObject * object, guint property_id,
+                                 const GValue * value, GParamSpec * pspec)
+{
+  BaconVideoWidget *bvw;
+
+  bvw = BACON_VIDEO_WIDGET (object);
+
+  switch (property_id) {
+    case PROP_LOGO_MODE:
+      bacon_video_widget_set_logo_mode (bvw, g_value_get_boolean (value));
+      break;
+    case PROP_REFERRER:
+      bacon_video_widget_set_referrer (bvw, g_value_get_string (value));
+      break;
+    case PROP_SHOW_CURSOR:
+      bacon_video_widget_set_show_cursor (bvw, g_value_get_boolean (value));
+      break;
+    case PROP_SHOW_VISUALIZATIONS:
+      bacon_video_widget_set_show_visualizations (bvw, g_value_get_boolean (value));
+      break;
+    case PROP_USER_AGENT:
+      bacon_video_widget_set_user_agent (bvw, g_value_get_string (value));
+      break;
+    case PROP_VOLUME:
+      bacon_video_widget_set_volume (bvw, g_value_get_double (value));
+      break;
+    case PROP_AUTO_RESIZE:
+      bacon_video_widget_set_auto_resize (bvw, g_value_get_boolean (value));
+      break;
+    case PROP_DEINTERLACING:
+      bacon_video_widget_set_deinterlacing (bvw, g_value_get_boolean (value));
+      break;
+    case PROP_VISUALIZATION_QUALITY:
+      bacon_video_widget_set_visualization_quality (bvw, g_value_get_enum (value));
+      break;
+    case PROP_BRIGHTNESS:
+      bacon_video_widget_set_video_property (bvw, BVW_VIDEO_BRIGHTNESS, g_value_get_int (value));
+      break;
+    case PROP_CONTRAST:
+      bacon_video_widget_set_video_property (bvw, BVW_VIDEO_CONTRAST, g_value_get_int (value));
+      break;
+    case PROP_SATURATION:
+      bacon_video_widget_set_video_property (bvw, BVW_VIDEO_SATURATION, g_value_get_int (value));
+      break;
+    case PROP_HUE:
+      bacon_video_widget_set_video_property (bvw, BVW_VIDEO_HUE, g_value_get_int (value));
+      break;
+    case PROP_AUDIO_OUTPUT_TYPE:
+      bacon_video_widget_set_audio_output_type (bvw, g_value_get_enum (value));
+      break;
+    case PROP_AV_OFFSET:
+      g_object_set_property (G_OBJECT (bvw->priv->play), "av-offset", value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+  }
+}
+
+static void
+bacon_video_widget_get_property (GObject * object, guint property_id,
+                                 GValue * value, GParamSpec * pspec)
+{
+  BaconVideoWidget *bvw;
+
+  bvw = BACON_VIDEO_WIDGET (object);
+
+  switch (property_id) {
+    case PROP_LOGO_MODE:
+      g_value_set_boolean (value, bacon_video_widget_get_logo_mode (bvw));
+      break;
+    case PROP_POSITION:
+      g_value_set_double (value, bacon_video_widget_get_position (bvw));
+      break;
+    case PROP_STREAM_LENGTH:
+      g_value_set_int64 (value, bacon_video_widget_get_stream_length (bvw));
+      break;
+    case PROP_PLAYING:
+      g_value_set_boolean (value, bacon_video_widget_is_playing (bvw));
+      break;
+    case PROP_REFERRER:
+      g_value_set_string (value, bvw->priv->referrer);
+      break;
+    case PROP_SEEKABLE:
+      g_value_set_boolean (value, bacon_video_widget_is_seekable (bvw));
+      break;
+    case PROP_SHOW_CURSOR:
+      g_value_set_boolean (value, bacon_video_widget_get_show_cursor (bvw));
+      break;
+    case PROP_USER_AGENT:
+      g_value_set_string (value, bvw->priv->user_agent);
+      break;
+    case PROP_VOLUME:
+      g_value_set_double (value, bvw->priv->volume);
+      break;
+    case PROP_DOWNLOAD_FILENAME:
+      g_value_set_string (value, bvw->priv->download_filename);
+      break;
+    case PROP_AUTO_RESIZE:
+      g_value_set_boolean (value, bvw->priv->auto_resize);
+      break;
+    case PROP_DEINTERLACING:
+      g_value_set_boolean (value, bacon_video_widget_get_deinterlacing (bvw));
+      break;
+    case PROP_VISUALIZATION_QUALITY:
+      g_value_set_enum (value, bvw->priv->visq);
+      break;
+    case PROP_BRIGHTNESS:
+      g_value_set_int (value, bacon_video_widget_get_video_property (bvw, BVW_VIDEO_BRIGHTNESS));
+      break;
+    case PROP_CONTRAST:
+      g_value_set_int (value, bacon_video_widget_get_video_property (bvw, BVW_VIDEO_CONTRAST));
+      break;
+    case PROP_SATURATION:
+      g_value_set_int (value, bacon_video_widget_get_video_property (bvw, BVW_VIDEO_SATURATION));
+      break;
+    case PROP_HUE:
+      g_value_set_int (value, bacon_video_widget_get_video_property (bvw, BVW_VIDEO_HUE));
+      break;
+    case PROP_AUDIO_OUTPUT_TYPE:
+      g_value_set_enum (value, bacon_video_widget_get_audio_output_type (bvw));
+      break;
+    case PROP_AV_OFFSET:
+      g_object_get_property (G_OBJECT (bvw->priv->play), "av-offset", value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+  }
+}
+
+/* ============================================================= */
+/*                                                               */
+/*                       Public Methods                          */
+/*                                                               */
+/* ============================================================= */
+
+/**
+ * bacon_video_widget_get_subtitle:
+ * @bvw: a #BaconVideoWidget
+ *
+ * Returns the index of the current subtitles.
+ *
+ * If the widget is not playing, -2 will be returned. If no subtitles are
+ * being used, -1 is returned.
+ *
+ * Return value: the subtitle index
+ **/
+int
+bacon_video_widget_get_subtitle (BaconVideoWidget * bvw)
+{
+  int subtitle = -1;
+  gint flags;
+
+  g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), -2);
+  g_return_val_if_fail (bvw->priv->play != NULL, -2);
+
+  g_object_get (bvw->priv->play, "flags", &flags, NULL);
+
+  if ((flags & GST_PLAY_FLAG_TEXT) == 0)
+    return -2;
+
+  g_object_get (G_OBJECT (bvw->priv->play), "current-text", &subtitle, NULL);
+
+  return subtitle;
+}
+
+/**
+ * bacon_video_widget_set_subtitle:
+ * @bvw: a #BaconVideoWidget
+ * @subtitle: a subtitle index
+ *
+ * Sets the subtitle index for @bvw. If @subtitle is -1, no subtitles will
+ * be used.
+ **/
+void
+bacon_video_widget_set_subtitle (BaconVideoWidget * bvw, int subtitle)
+{
+  GstTagList *tags;
+  gint flags;
+
+  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
+  g_return_if_fail (bvw->priv->play != NULL);
+
+  g_object_get (bvw->priv->play, "flags", &flags, NULL);
+
+  if (subtitle == -2) {
+    flags &= ~GST_PLAY_FLAG_TEXT;
+    subtitle = -1;
+  } else {
+    flags |= GST_PLAY_FLAG_TEXT;
+  }
+  
+  g_object_set (bvw->priv->play, "flags", flags, "current-text", subtitle, NULL);
+  
+  if (flags & GST_PLAY_FLAG_TEXT) {
+    g_object_get (bvw->priv->play, "current-text", &subtitle, NULL);
+
+    g_signal_emit_by_name (G_OBJECT (bvw->priv->play), "get-text-tags", subtitle, &tags);
+    bvw_update_tags (bvw, tags, "text");
+  }
+}
+
+/**
+ * bacon_video_widget_has_next_track:
+ * @bvw: a #BaconVideoWidget
+ *
+ * Determines whether there is another track after the current one, typically
+ * as a chapter on a DVD.
+ *
+ * Return value: %TRUE if there is another track, %FALSE otherwise
+ **/
+gboolean
+bacon_video_widget_has_next_track (BaconVideoWidget *bvw)
+{
+  g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), FALSE);
+
+  if (bvw->priv->mrl == NULL)
+    return FALSE;
+
+  if (g_str_has_prefix (bvw->priv->mrl, "dvd:/"))
+    return TRUE;
+
+  return FALSE;
+}
+
+/**
+ * bacon_video_widget_has_previous_track:
+ * @bvw: a #BaconVideoWidget
+ *
+ * Determines whether there is another track before the current one, typically
+ * as a chapter on a DVD.
+ *
+ * Return value: %TRUE if there is another track, %FALSE otherwise
+ **/
+gboolean
+bacon_video_widget_has_previous_track (BaconVideoWidget *bvw)
+{
+  GstFormat fmt;
+  gint64 val;
+
+  g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), FALSE);
+
+  if (bvw->priv->mrl == NULL)
+    return FALSE;
+
+  if (g_str_has_prefix (bvw->priv->mrl, "dvd:/"))
+    return TRUE;
+
+  fmt = gst_format_get_by_nick ("chapter");
+  /* If chapter isn't registered, then there's no chapters support */
+  if (fmt == GST_FORMAT_UNDEFINED)
+    return FALSE;
+
+  if (gst_element_query_position (bvw->priv->play, fmt, &val))
+    return (val > 0);
+
+  return FALSE;
+}
+
+static GList *
+get_lang_list_for_type (BaconVideoWidget * bvw, const gchar * type_name)
+{
+  GList *ret = NULL;
+  gint num = 1;
+  gint i, n;
+  const char *prop;
+  const char *signal;
+  const char *text;
+
+  if (g_str_equal (type_name, "AUDIO")) {
+    prop = "n-audio";
+    signal = "get-audio-tags";
+    text = N_("Audio Track #%d");
+  } else if (g_str_equal (type_name, "TEXT")) {
+    prop = "n-text";
+    signal = "get-text-tags";
+    text = N_("Subtitle #%d");
+  } else {
+    g_critical ("Invalid stream type '%s'", type_name);
+    return NULL;
+  }
+
+  n = 0;
+  g_object_get (G_OBJECT (bvw->priv->play), prop, &n, NULL);
+  if (n == 0)
+    return NULL;
+
+  for (i = 0; i < n; i++) {
+    GstTagList *tags = NULL;
+
+    g_signal_emit_by_name (G_OBJECT (bvw->priv->play), signal, i, &tags);
+
+    if (tags) {
+      gchar *lc = NULL, *cd = NULL;
+
+      gst_tag_list_get_string (tags, GST_TAG_LANGUAGE_CODE, &lc);
+      gst_tag_list_get_string (tags, GST_TAG_CODEC, &cd);
+
+      if (lc) {
+	ret = g_list_prepend (ret, lc);
+	g_free (cd);
+      } else if (cd) {
+	ret = g_list_prepend (ret, cd);
+      } else {
+	  ret = g_list_prepend (ret, g_strdup_printf (_(text), num++));
+      }
+      gst_tag_list_free (tags);
+    } else {
+      ret = g_list_prepend (ret, g_strdup_printf (_(text), num++));
+    }
+  }
+
+  return g_list_reverse (ret);
+}
+
+/**
+ * bacon_video_widget_get_subtitles:
+ * @bvw: a #BaconVideoWidget
+ *
+ * Returns a list of subtitle tags, each in the form TEXT x,
+ * where x is the subtitle index.
+ *
+ * Return value: a #GList of subtitle tags, or %NULL; free each element with g_free() and the list with g_list_free()
+ **/
+GList *
+bacon_video_widget_get_subtitles (BaconVideoWidget * bvw)
+{
+  GList *list;
+
+  g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), NULL);
+  g_return_val_if_fail (bvw->priv->play != NULL, NULL);
+
+  list = get_lang_list_for_type (bvw, "TEXT");
+
+  return list;
+}
+
+/**
+ * bacon_video_widget_get_languages:
+ * @bvw: a #BaconVideoWidget
+ *
+ * Returns a list of audio language tags, each in the form AUDIO x,
+ * where x is the language index.
+ *
+ * Return value: a #GList of audio language tags, or %NULL; free each element with g_free() and the list with g_list_free()
+ **/
+GList *
+bacon_video_widget_get_languages (BaconVideoWidget * bvw)
+{
+  GList *list;
+
+  g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), NULL);
+  g_return_val_if_fail (bvw->priv->play != NULL, NULL);
+
+  list = get_lang_list_for_type (bvw, "AUDIO");
+
+  /* When we have only one language, we don't need to show
+   * any languages, we default to the only track */
+  if (g_list_length (list) == 1) {
+    g_free (list->data);
+    g_list_free (list);
+    list = NULL;
+  }
+
+  return list;
+}
+
+/**
+ * bacon_video_widget_get_language:
+ * @bvw: a #BaconVideoWidget
+ *
+ * Returns the index of the current audio language.
+ *
+ * If the widget is not playing, or the default language is in use, -1 will be returned.
+ *
+ * Return value: the audio language index
+ **/
+int
+bacon_video_widget_get_language (BaconVideoWidget * bvw)
+{
+  int language = -1;
+
+  g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), -1);
+  g_return_val_if_fail (bvw->priv->play != NULL, -1);
+
+  g_object_get (G_OBJECT (bvw->priv->play), "current-audio", &language, NULL);
+
+  return language;
+}
+
+/**
+ * bacon_video_widget_set_language:
+ * @bvw: a #BaconVideoWidget
+ * @language: an audio language index
+ *
+ * Sets the audio language index for @bvw. If @language is -1, the default language will
+ * be used.
+ **/
+void
+bacon_video_widget_set_language (BaconVideoWidget * bvw, int language)
+{
+  GstTagList *tags;
+
+  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
+  g_return_if_fail (bvw->priv->play != NULL);
+
+  if (language == -1)
+    language = 0;
+  else if (language == -2)
+    language = -1;
+
+  GST_DEBUG ("setting language to %d", language);
+
+  g_object_set (bvw->priv->play, "current-audio", language, NULL);
+
+  g_object_get (bvw->priv->play, "current-audio", &language, NULL);
+  GST_DEBUG ("current-audio now: %d", language);
+
+  g_signal_emit_by_name (G_OBJECT (bvw->priv->play), "get-audio-tags", language, &tags);
+  bvw_update_tags (bvw, tags, "audio");
+
+  /* so it updates its metadata for the newly-selected stream */
+  g_signal_emit (bvw, bvw_signals[SIGNAL_GOT_METADATA], 0, NULL);
+  g_signal_emit (bvw, bvw_signals[SIGNAL_CHANNELS_CHANGE], 0);
+}
+
+/**
+ * bacon_video_widget_set_deinterlacing:
+ * @bvw: a #BaconVideoWidget
+ * @deinterlace: %TRUE if videos should be automatically deinterlaced, %FALSE otherwise
+ *
+ * Sets whether the widget should deinterlace videos.
+ **/
+void
+bacon_video_widget_set_deinterlacing (BaconVideoWidget * bvw,
+                                      gboolean deinterlace)
+{
+  gint flags;
+
+  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
+  g_return_if_fail (GST_IS_ELEMENT (bvw->priv->play));
+
+  g_object_get (bvw->priv->play, "flags", &flags, NULL);
+  if (deinterlace)
+    flags |= GST_PLAY_FLAG_DEINTERLACE;
+  else
+    flags &= ~GST_PLAY_FLAG_DEINTERLACE;
+  g_object_set (bvw->priv->play, "flags", flags, NULL);
+
+  g_object_notify (G_OBJECT (bvw), "deinterlacing");
+}
+
+/**
+ * bacon_video_widget_get_deinterlacing:
+ * @bvw: a #BaconVideoWidget
+ *
+ * Returns whether deinterlacing of videos is enabled for this widget.
+ *
+ * Return value: %TRUE if automatic deinterlacing is enabled, %FALSE otherwise
+ **/
+gboolean
+bacon_video_widget_get_deinterlacing (BaconVideoWidget * bvw)
+{
+  gint flags;
+
+  g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), FALSE);
+  g_return_val_if_fail (GST_IS_ELEMENT (bvw->priv->play), FALSE);
+
+  g_object_get (bvw->priv->play, "flags", &flags, NULL);
+
+  return !!(flags & GST_PLAY_FLAG_DEINTERLACE);
+}
+
+static gint
+get_num_audio_channels (BaconVideoWidget * bvw)
+{
+  gint channels;
+
+  switch (bvw->priv->speakersetup) {
+    case BVW_AUDIO_SOUND_STEREO:
+      channels = 2;
+      break;
+    case BVW_AUDIO_SOUND_4CHANNEL:
+      channels = 4;
+      break;
+    case BVW_AUDIO_SOUND_5CHANNEL:
+      channels = 5;
+      break;
+    case BVW_AUDIO_SOUND_41CHANNEL:
+      /* so alsa has this as 5.1, but empty center speaker. We don't really
+       * do that yet. ;-). So we'll take the placebo approach. */
+    case BVW_AUDIO_SOUND_51CHANNEL:
+      channels = 6;
+      break;
+    case BVW_AUDIO_SOUND_AC3PASSTHRU:
+    default:
+      g_return_val_if_reached (-1);
+  }
+
+  return channels;
+}
+
+static GstCaps *
+fixate_to_num (const GstCaps * in_caps, gint channels)
+{
+  gint n, count;
+  GstStructure *s;
+  const GValue *v;
+  GstCaps *out_caps;
+
+  out_caps = gst_caps_copy (in_caps);
+
+  count = gst_caps_get_size (out_caps);
+  for (n = 0; n < count; n++) {
+    s = gst_caps_get_structure (out_caps, n);
+    v = gst_structure_get_value (s, "channels");
+    if (!v)
+      continue;
+
+    /* get channel count (or list of ~) */
+    gst_structure_fixate_field_nearest_int (s, "channels", channels);
+  }
+
+  return out_caps;
+}
+
+static void
+set_audio_filter (BaconVideoWidget *bvw)
+{
+  gint channels;
+  GstCaps *caps, *res;
+  GstPad *pad, *peer_pad;
+
+  /* reset old */
+  g_object_set (bvw->priv->audio_capsfilter, "caps", NULL, NULL);
+
+  /* construct possible caps to filter down to our chosen caps */
+  /* Start with what the audio sink supports, but limit the allowed
+   * channel count to our speaker output configuration */
+  pad = gst_element_get_static_pad (bvw->priv->audio_capsfilter, "src");
+  peer_pad = gst_pad_get_peer (pad);
+  gst_object_unref (pad);
+
+  caps = gst_pad_get_current_caps (peer_pad);
+  gst_object_unref (peer_pad);
+
+  if ((channels = get_num_audio_channels (bvw)) == -1)
+    return;
+
+  res = fixate_to_num (caps, channels);
+  gst_caps_unref (caps);
+
+  /* set */
+  if (res && gst_caps_is_empty (res)) {
+    gst_caps_unref (res);
+    res = NULL;
+  }
+  g_object_set (bvw->priv->audio_capsfilter, "caps", res, NULL);
+
+  if (res) {
+    gst_caps_unref (res);
+  }
+
+  /* reset */
+  pad = gst_element_get_static_pad (bvw->priv->audio_capsfilter, "src");
+  gst_pad_set_caps (pad, NULL);
+  gst_object_unref (pad);
+}
+
+/**
+ * bacon_video_widget_get_audio_output_type:
+ * @bvw: a #BaconVideoWidget
+ *
+ * Returns the current audio output type (e.g. how many speaker channels)
+ * from #BvwAudioOutputType.
+ *
+ * Return value: the audio output type, or -1
+ **/
+BvwAudioOutputType
+bacon_video_widget_get_audio_output_type (BaconVideoWidget *bvw)
+{
+  g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), -1);
+
+  return bvw->priv->speakersetup;
+}
+
+/**
+ * bacon_video_widget_set_audio_output_type:
+ * @bvw: a #BaconVideoWidget
+ * @type: the new audio output type
+ *
+ * Sets the audio output type (number of speaker channels) in the video widget.
+ **/
+void
+bacon_video_widget_set_audio_output_type (BaconVideoWidget *bvw,
+                                          BvwAudioOutputType type)
+{
+  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
+
+  if (type == bvw->priv->speakersetup)
+    return;
+  else if (type == BVW_AUDIO_SOUND_AC3PASSTHRU)
+    return;
+
+  bvw->priv->speakersetup = type;
+  g_object_notify (G_OBJECT (bvw), "audio-output-type");
+
+  set_audio_filter (bvw);
+}
+
+void
+bacon_video_widget_popup_osd (BaconVideoWidget *bvw,
+			      const char       *icon_name)
+{
+  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
+
+  bacon_video_osd_actor_set_icon_name (BACON_VIDEO_OSD_ACTOR (bvw->priv->osd),
+				       icon_name);
+  bacon_video_osd_actor_show_and_fade (BACON_VIDEO_OSD_ACTOR (bvw->priv->osd));
+}
+
+/* =========================================== */
+/*                                             */
+/*               Play/Pause, Stop              */
+/*                                             */
+/* =========================================== */
+
+static GError*
+bvw_error_from_gst_error (BaconVideoWidget *bvw, GstMessage * err_msg)
+{
+  const gchar *src_typename;
+  GError *ret = NULL;
+  GError *e = NULL;
+  char *dbg = NULL;
+  int http_error_code;
+
+  GST_LOG ("resolving error message %" GST_PTR_FORMAT, err_msg);
+
+  src_typename = (err_msg->src) ? G_OBJECT_TYPE_NAME (err_msg->src) : NULL;
+
+  gst_message_parse_error (err_msg, &e, &dbg);
+
+  /* FIXME:
+   * Unemitted errors:
+   * BVW_ERROR_NETWORK_UNREACHABLE
+   * BVW_ERROR_DVD_ENCRYPTED
+   * BVW_ERROR_FILE_ENCRYPTED
+   * BVW_ERROR_EMPTY_FILE
+   * BVW_ERROR_BROKEN_FILE
+   */
+
+  /* Can't open optical disc? */
+  if (is_error (e, RESOURCE, NOT_FOUND) ||
+      is_error (e, RESOURCE, OPEN_READ)) {
+    if (g_str_has_prefix (bvw->priv->mrl, "dvd:")) {
+      ret = g_error_new_literal (BVW_ERROR, BVW_ERROR_INVALID_DEVICE,
+				 "The DVD device you specified seems to be invalid.");
+      goto done;
+    } else if (g_str_has_prefix (bvw->priv->mrl, "vcd:")) {
+      ret = g_error_new_literal (BVW_ERROR, BVW_ERROR_INVALID_DEVICE,
+				 "The VCD device you specified seems to be invalid.");
+      goto done;
+    }
+  }
+
+  /* HTTP error codes */
+  /* FIXME: bvw_get_http_error_code() calls gst_message_parse_error too */
+  http_error_code = bvw_get_http_error_code (err_msg);
+
+  if (is_error (e, RESOURCE, NOT_FOUND) ||
+      http_error_code == 404) {
+    if (strstr (e->message, "Cannot resolve hostname") != NULL) {
+      ret = g_error_new_literal (BVW_ERROR, BVW_ERROR_UNKNOWN_HOST,
+				 _("The server you are trying to connect to is not known."));
+    } else if (strstr (e->message, "Cannot connect to destination") != NULL) {
+      ret = g_error_new_literal (BVW_ERROR, BVW_ERROR_CONNECTION_REFUSED,
+				 _("The connection to this server was refused."));
+    } else {
+      ret = g_error_new_literal (BVW_ERROR, BVW_ERROR_FILE_NOT_FOUND,
+				 _("The specified movie could not be found."));
+    }
+    goto done;
+  }
+
+  if (http_error_code == 403) {
+    ret = g_error_new_literal (BVW_ERROR, BVW_ERROR_FILE_PERMISSION,
+			       _("The server refused access to this file or stream."));
+    goto done;
+  }
+
+  if (http_error_code == 401) {
+    ret = g_error_new_literal (BVW_ERROR, BVW_ERROR_FILE_PERMISSION,
+			       _("Authentication is required to access this file or stream."));
+    goto done;
+  }
+
+  if (is_error (e, RESOURCE, OPEN_READ)) {
+    if (strstr (dbg, g_strerror (EACCES)) != NULL) {
+      ret = g_error_new_literal (BVW_ERROR, BVW_ERROR_FILE_PERMISSION,
+				 _("You are not allowed to open this file."));
+      goto done;
+    }
+    if (strstr (dbg, "Error parsing URL.") != NULL) {
+      ret = g_error_new_literal (BVW_ERROR, BVW_ERROR_INVALID_LOCATION,
+				 _("This location is not a valid one."));
+      goto done;
+    }
+  }
+
+  if (is_error (e, RESOURCE, OPEN_READ) ||
+      is_error (e, RESOURCE, READ)) {
+    ret = g_error_new_literal (BVW_ERROR, BVW_ERROR_READ_ERROR,
+			       _("The movie could not be read."));
+    goto done;
+  }
+
+  if (e->domain == GST_RESOURCE_ERROR) {
+    ret = g_error_new_literal (BVW_ERROR, BVW_ERROR_FILE_GENERIC,
+                               e->message);
+    goto done;
+  }
+
+  if (is_error (e, CORE, MISSING_PLUGIN) ||
+      is_error (e, STREAM, CODEC_NOT_FOUND) ||
+      is_error (e, STREAM, WRONG_TYPE) ||
+      is_error (e, STREAM, NOT_IMPLEMENTED)) {
+    if (bvw->priv->missing_plugins != NULL) {
+      gchar **descs, *msg = NULL;
+      guint num;
+
+      descs = bvw_get_missing_plugins_descriptions (bvw->priv->missing_plugins);
+      num = g_list_length (bvw->priv->missing_plugins);
+
+      if (is_error (e, CORE, MISSING_PLUGIN)) {
+        /* should be exactly one missing thing (source or converter) */
+        msg = g_strdup_printf (_("The playback of this movie requires a %s "
+				 "plugin which is not installed."), descs[0]);
+	ret = g_error_new_literal (BVW_ERROR, BVW_ERROR_NO_PLUGIN_FOR_FILE, msg);
+	g_free (msg);
+      } else {
+        gchar *desc_list;
+
+        desc_list = g_strjoinv ("\n", descs);
+        msg = g_strdup_printf (g_dngettext (GETTEXT_PACKAGE, "The playback of this movie "
+            "requires a %s plugin which is not installed.", "The playback "
+            "of this movie requires the following decoders which are not "
+            "installed:\n\n%s", num), (num == 1) ? descs[0] : desc_list);
+        g_free (desc_list);
+	ret = g_error_new_literal (BVW_ERROR, BVW_ERROR_CODEC_NOT_HANDLED, msg);
+	g_free (msg);
+      }
+      g_strfreev (descs);
+    } else {
+      ret = g_error_new_literal (BVW_ERROR, BVW_ERROR_CODEC_NOT_HANDLED,
+				 _("An audio or video stream is not handled due to missing codecs. "
+				   "You might need to install additional plugins to be able to play some types of movies"));
+    }
+    goto done;
+  }
+
+  if (is_error (e, STREAM, FAILED) &&
+	     src_typename &&
+	     strncmp (src_typename, "GstTypeFind", 11) == 0) {
+    ret = g_error_new_literal (BVW_ERROR, BVW_ERROR_READ_ERROR,
+			       _("This file cannot be played over the network. Try downloading it locally first."));
+    goto done;
+  }
+
+  /* generic error, no code; take message */
+  ret = g_error_new_literal (BVW_ERROR, BVW_ERROR_GENERIC,
+			     e->message);
+
+done:
+  g_error_free (e);
+  g_free (dbg);
+  bvw_clear_missing_plugins_messages (bvw);
+
+  return ret;
+}
+
+static char *
+get_target_uri (GFile *file)
+{
+  GFileInfo *info;
+  char *target;
+
+  info = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_TARGET_URI, G_FILE_QUERY_INFO_NONE, NULL, NULL);
+  if (info == NULL)
+    return NULL;
+  target = g_strdup (g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_STANDARD_TARGET_URI));
+  g_object_unref (info);
+
+  return target;
+}
+
+/**
+ * bacon_video_widget_open:
+ * @bvw: a #BaconVideoWidget
+ * @mrl: an MRL
+ * @error: a #GError, or %NULL
+ *
+ * Opens the given @mrl in @bvw for playing.
+ *
+ * If there was a filesystem error, a %BVW_ERROR_GENERIC error will be returned. Otherwise,
+ * more specific #BvwError errors will be returned.
+ *
+ * On success, the MRL is loaded and waiting to be played with bacon_video_widget_play().
+ *
+ * Return value: %TRUE on success, %FALSE otherwise
+ **/
+gboolean
+bacon_video_widget_open (BaconVideoWidget * bvw,
+                         const gchar * mrl, GError ** error)
+{
+  GFile *file;
+  char *path;
+
+  g_return_val_if_fail (mrl != NULL, FALSE);
+  g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), FALSE);
+  g_return_val_if_fail (bvw->priv->play != NULL, FALSE);
+  
+  /* So we aren't closed yet... */
+  if (bvw->priv->mrl) {
+    bacon_video_widget_close (bvw);
+  }
+  
+  GST_DEBUG ("mrl = %s", GST_STR_NULL (mrl));
+
+  /* this allows non-URI type of files in the thumbnailer and so on */
+  file = g_file_new_for_commandline_arg (mrl);
+
+  /* Only use the URI when FUSE isn't available for a file
+   * or we're trying to read from an archive or ObexFTP */
+  if (g_file_has_uri_scheme (file, "archive") != FALSE ||
+      g_file_has_uri_scheme (file, "obex") != FALSE ||
+      g_file_has_uri_scheme (file, "ftp") != FALSE) {
+    path = NULL;
+  } else if (g_file_has_uri_scheme (file, "trash") != FALSE ||
+           g_file_has_uri_scheme (file, "recent") != FALSE) {
+    path = get_target_uri (file);
+    if (path == NULL)
+      path = g_file_get_path (file);
+    else
+      GST_DEBUG ("Found target location '%s' for original MRL '%s'",
+		 GST_STR_NULL (path), mrl);
+  } else {
+    path = g_file_get_path (file);
+  }
+  if (path) {
+    bvw->priv->mrl = g_filename_to_uri (path, NULL, NULL);
+    g_free (path);
+  } else {
+    bvw->priv->mrl = g_strdup (mrl);
+  }
+
+  g_object_unref (file);
+
+  bvw->priv->got_redirect = FALSE;
+  bvw->priv->media_has_video = FALSE;
+  bvw->priv->media_has_audio = FALSE;
+  bvw->priv->stream_length = 0;
+
+  /* Flush the bus to make sure we don't get any messages
+   * from the previous URI, see bug #607224.
+   */
+  gst_bus_set_flushing (bvw->priv->bus, TRUE);
+  bvw->priv->target_state = GST_STATE_READY;
+  gst_element_set_state (bvw->priv->play, GST_STATE_READY);
+  gst_bus_set_flushing (bvw->priv->bus, FALSE);
+
+  g_object_set (bvw->priv->play, "uri", bvw->priv->mrl, NULL);
+
+  bvw->priv->seekable = -1;
+  bvw->priv->target_state = GST_STATE_PAUSED;
+  bvw_clear_missing_plugins_messages (bvw);
+
+  gst_element_set_state (bvw->priv->play, GST_STATE_PAUSED);
+
+  g_signal_emit (bvw, bvw_signals[SIGNAL_CHANNELS_CHANGE], 0);
+
+  return TRUE;
+}
+
+/**
+ * bacon_video_widget_play:
+ * @bvw: a #BaconVideoWidget
+ * @error: a #GError, or %NULL
+ *
+ * Plays the currently-loaded video in @bvw.
+ *
+ * Errors from the GStreamer backend will be returned asynchronously via the
+ * #BaconVideoWidget::error signal, even if this function returns %TRUE.
+ *
+ * Return value: %TRUE on success, %FALSE otherwise
+ **/
+gboolean
+bacon_video_widget_play (BaconVideoWidget * bvw, GError ** error)
+{
+  GstState cur_state;
+
+  g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), FALSE);
+  g_return_val_if_fail (GST_IS_ELEMENT (bvw->priv->play), FALSE);
+  g_return_val_if_fail (bvw->priv->mrl != NULL, FALSE);
+
+  bvw->priv->target_state = GST_STATE_PLAYING;
+
+  /* Don't try to play if we're already doing that */
+  gst_element_get_state (bvw->priv->play, &cur_state, NULL, 0);
+  if (cur_state == GST_STATE_PLAYING)
+    return TRUE;
+
+  /* Lie when trying to play a file whilst we're download buffering */
+  if (bvw->priv->download_buffering != FALSE &&
+      bvw_download_buffering_done (bvw) == FALSE) {
+    GST_DEBUG ("download buffering in progress, not playing");
+    return TRUE;
+  }
+
+  /* Or when we're buffering */
+  if (bvw->priv->buffering != FALSE) {
+    GST_DEBUG ("buffering in progress, not playing");
+    return TRUE;
+  }
+
+  /* just lie and do nothing in this case */
+  if (bvw->priv->plugin_install_in_progress && cur_state != GST_STATE_PAUSED) {
+    GST_DEBUG ("plugin install in progress and nothing to play, not playing");
+    return TRUE;
+  } else if (bvw->priv->mount_in_progress) {
+    GST_DEBUG ("Mounting in progress, not playing");
+    return TRUE;
+  } else if (bvw->priv->auth_dialog != NULL) {
+    GST_DEBUG ("Authentication in progress, not playing");
+    return TRUE;
+  }
+
+  /* Set direction to forward */
+  if (bvw_set_playback_direction (bvw, TRUE) == FALSE) {
+    GST_DEBUG ("Failed to reset direction back to forward to play");
+    return FALSE;
+  }
+
+  GST_DEBUG ("play");
+  gst_element_set_state (bvw->priv->play, GST_STATE_PLAYING);
+
+  /* will handle all errors asynchroneously */
+  return TRUE;
+}
+
+/**
+ * bacon_video_widget_can_direct_seek:
+ * @bvw: a #BaconVideoWidget
+ *
+ * Determines whether direct seeking is possible for the current stream.
+ *
+ * Return value: %TRUE if direct seeking is possible, %FALSE otherwise
+ **/
+gboolean
+bacon_video_widget_can_direct_seek (BaconVideoWidget *bvw)
+{
+  g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), FALSE);
+  g_return_val_if_fail (GST_IS_ELEMENT (bvw->priv->play), FALSE);
+
+  if (bvw->priv->mrl == NULL)
+    return FALSE;
+
+  if (bvw->priv->download_buffering != FALSE)
+    return TRUE;
+
+  /* (instant seeking only make sense with video,
+   * hence no cdda:// here) */
+  if (g_str_has_prefix (bvw->priv->mrl, "file://") ||
+      g_str_has_prefix (bvw->priv->mrl, "dvd:/") ||
+      g_str_has_prefix (bvw->priv->mrl, "vcd:/") ||
+      g_str_has_prefix (bvw->priv->mrl, "trash:/"))
+    return TRUE;
+
+  return FALSE;
+}
+
+static gboolean
+bacon_video_widget_seek_time_no_lock (BaconVideoWidget *bvw,
+				      gint64 _time,
+				      GstSeekFlags flag,
+				      GError **error)
+{
+  if (bvw_set_playback_direction (bvw, TRUE) == FALSE)
+    return FALSE;
+
+  bvw->priv->seek_time = -1;
+
+  gst_element_set_state (bvw->priv->play, GST_STATE_PAUSED);
+
+  gst_element_seek (bvw->priv->play, bvw->priv->rate,
+		    GST_FORMAT_TIME, GST_SEEK_FLAG_FLUSH | flag,
+		    GST_SEEK_TYPE_SET, _time * GST_MSECOND,
+		    GST_SEEK_TYPE_NONE, GST_CLOCK_TIME_NONE);
+
+  return TRUE;
+}
+
+/**
+ * bacon_video_widget_seek_time:
+ * @bvw: a #BaconVideoWidget
+ * @_time: the time to which to seek, in milliseconds
+ * @accurate: whether to use accurate seek, an accurate seek might be slower for some formats (see GStreamer docs)
+ * @error: a #GError, or %NULL
+ *
+ * Seeks the currently-playing stream to the absolute position @time, in milliseconds.
+ *
+ * Return value: %TRUE on success, %FALSE otherwise
+ **/
+gboolean
+bacon_video_widget_seek_time (BaconVideoWidget *bvw, gint64 _time, gboolean accurate, GError **error)
+{
+  GstClockTime cur_time;
+  GstSeekFlags  flag;
+
+  g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), FALSE);
+  g_return_val_if_fail (GST_IS_ELEMENT (bvw->priv->play), FALSE);
+
+  GST_LOG ("Seeking to %" GST_TIME_FORMAT, GST_TIME_ARGS (_time * GST_MSECOND));
+
+  /* Don't say we'll seek past the end */
+  _time = MIN (_time, bvw->priv->stream_length);
+
+  /* Emit a time tick of where we are going, we are paused */
+  got_time_tick (bvw->priv->play, _time * GST_MSECOND, bvw);
+
+  /* Is there a pending seek? */
+  g_mutex_lock (&bvw->priv->seek_mutex);
+
+  /* If there's no pending seek, or
+   * it's been too long since the seek,
+   * or we don't have an accurate seek requested */
+  cur_time = gst_clock_get_internal_time (bvw->priv->clock);
+  if (bvw->priv->seek_req_time == GST_CLOCK_TIME_NONE ||
+      cur_time > bvw->priv->seek_req_time + SEEK_TIMEOUT ||
+      accurate) {
+    bvw->priv->seek_time = -1;
+    bvw->priv->seek_req_time = cur_time;
+    g_mutex_unlock (&bvw->priv->seek_mutex);
+  } else {
+    GST_LOG ("Not long enough since last seek, queuing it");
+    bvw->priv->seek_time = _time;
+    g_mutex_unlock (&bvw->priv->seek_mutex);
+    return TRUE;
+  }
+
+  flag = (accurate ? GST_SEEK_FLAG_ACCURATE : GST_SEEK_FLAG_NONE);
+  bacon_video_widget_seek_time_no_lock (bvw, _time, flag, error);
+
+  return TRUE;
+}
+
+/**
+ * bacon_video_widget_seek:
+ * @bvw: a #BaconVideoWidget
+ * @position: the percentage of the way through the stream to which to seek
+ * @error: a #GError, or %NULL
+ *
+ * Seeks the currently-playing stream to @position as a percentage of the total
+ * stream length.
+ *
+ * Return value: %TRUE on success, %FALSE otherwise
+ **/
+gboolean
+bacon_video_widget_seek (BaconVideoWidget *bvw, double position, GError **error)
+{
+  gint64 seek_time, length_nanos;
+
+  g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), FALSE);
+  g_return_val_if_fail (GST_IS_ELEMENT (bvw->priv->play), FALSE);
+
+  length_nanos = (gint64) (bvw->priv->stream_length * GST_MSECOND);
+  seek_time = (gint64) (length_nanos * position);
+
+  GST_LOG ("Seeking to %3.2f%% %" GST_TIME_FORMAT, position,
+      GST_TIME_ARGS (seek_time));
+
+  return bacon_video_widget_seek_time (bvw, seek_time / GST_MSECOND, FALSE, error);
+}
+
+/**
+ * bacon_video_widget_step:
+ * @bvw: a #BaconVideoWidget
+ * @forward: the direction of the frame step
+ * @error: a #GError, or %NULL
+ *
+ * Step one frame forward, if @forward is %TRUE, or backwards, if @forward is %FALSE
+ *
+ * Return value: %TRUE on success, %FALSE otherwise
+ **/
+gboolean
+bacon_video_widget_step (BaconVideoWidget *bvw, gboolean forward, GError **error)
+{
+  GstEvent *event;
+  gboolean retval;
+
+  if (bvw_set_playback_direction (bvw, forward) == FALSE)
+    return FALSE;
+
+  event = gst_event_new_step (GST_FORMAT_BUFFERS, 1, 1.0, TRUE, FALSE);
+
+  retval = gst_element_send_event (bvw->priv->play, event);
+
+  if (retval != FALSE)
+    bvw_query_timeout (bvw);
+
+  return retval;
+}
+
+static void
+bvw_stop_play_pipeline (BaconVideoWidget * bvw)
+{
+  GstState cur_state;
+
+  gst_element_get_state (bvw->priv->play, &cur_state, NULL, 0);
+  if (cur_state > GST_STATE_READY) {
+    GstMessage *msg;
+
+    GST_DEBUG ("stopping");
+    gst_element_set_state (bvw->priv->play, GST_STATE_READY);
+
+    /* process all remaining state-change messages so everything gets
+     * cleaned up properly (before the state change to NULL flushes them) */
+    GST_DEBUG ("processing pending state-change messages");
+    while ((msg = gst_bus_pop_filtered (bvw->priv->bus, GST_MESSAGE_STATE_CHANGED))) {
+      gst_bus_async_signal_func (bvw->priv->bus, msg, NULL);
+      gst_message_unref (msg);
+    }
+  }
+
+  /* and now drop all following messages until we start again. The
+   * bus is set to flush=false again in bacon_video_widget_open()
+   */
+  gst_bus_set_flushing (bvw->priv->bus, TRUE);
+
+  /* Now in READY or lower */
+  bvw->priv->target_state = GST_STATE_READY;
+
+  bvw->priv->buffering = FALSE;
+  bvw->priv->plugin_install_in_progress = FALSE;
+  bvw->priv->download_buffering = FALSE;
+  g_clear_pointer (&bvw->priv->download_filename, g_free);
+  bvw->priv->buffering_left = -1;
+  g_clear_object (&bvw->priv->download_buffering_element);
+  bvw_reconfigure_fill_timeout (bvw, 0);
+  bvw->priv->movie_par_n = bvw->priv->movie_par_d = 1;
+  g_clear_object (&bvw->priv->cover_pixbuf);
+  GST_DEBUG ("stopped");
+}
+
+/**
+ * bacon_video_widget_stop:
+ * @bvw: a #BaconVideoWidget
+ *
+ * Stops playing the current stream and resets to the first position in the stream.
+ **/
+void
+bacon_video_widget_stop (BaconVideoWidget * bvw)
+{
+  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
+  g_return_if_fail (GST_IS_ELEMENT (bvw->priv->play));
+
+  GST_LOG ("Stopping");
+  bvw_stop_play_pipeline (bvw);
+
+  /* Reset position to 0 when stopping */
+  got_time_tick (GST_ELEMENT (bvw->priv->play), 0, bvw);
+}
+
+/**
+ * bacon_video_widget_close:
+ * @bvw: a #BaconVideoWidget
+ *
+ * Closes the current stream and frees the resources associated with it.
+ **/
+void
+bacon_video_widget_close (BaconVideoWidget * bvw)
+{
+  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
+  g_return_if_fail (GST_IS_ELEMENT (bvw->priv->play));
+  
+  GST_LOG ("Closing");
+  bvw_stop_play_pipeline (bvw);
+
+  g_clear_pointer (&bvw->priv->mrl, g_free);
+  g_clear_pointer (&bvw->priv->subtitle_uri, g_free);
+  g_clear_pointer (&bvw->priv->user_id, g_free);
+  g_clear_pointer (&bvw->priv->user_pw, g_free);
+
+  bvw->priv->is_live = FALSE;
+  bvw->priv->is_menu = FALSE;
+  bvw->priv->has_angles = FALSE;
+  bvw->priv->window_resized = FALSE;
+  bvw->priv->rate = FORWARD_RATE;
+
+  bvw->priv->current_time = 0;
+  bvw->priv->seek_req_time = GST_CLOCK_TIME_NONE;
+  bvw->priv->seek_time = -1;
+
+  if (bvw->priv->eos_id != 0)
+    g_source_remove (bvw->priv->eos_id);
+
+  g_clear_pointer (&bvw->priv->tagcache, gst_tag_list_unref);
+  g_clear_pointer (&bvw->priv->audiotags, gst_tag_list_unref);
+  g_clear_pointer (&bvw->priv->videotags, gst_tag_list_unref);
+
+  g_object_notify (G_OBJECT (bvw), "seekable");
+  g_signal_emit (bvw, bvw_signals[SIGNAL_CHANNELS_CHANGE], 0);
+  got_time_tick (GST_ELEMENT (bvw->priv->play), 0, bvw);
+}
+
+static void
+bvw_do_navigation_command (BaconVideoWidget * bvw, GstNavigationCommand command)
+{
+  if (bvw->priv->navigation)
+    gst_navigation_send_command (bvw->priv->navigation, command);
+}
+
+/**
+ * bacon_video_widget_set_text_subtitle:
+ * @bvw: a #BaconVideoWidget
+ * @subtitle_uri: (allow-none): the URI of a subtitle file, or %NULL
+ *
+ * Sets the URI for the text subtitle file to be displayed alongside
+ * the current video. Use %NULL if you want to unload the current text subtitle
+ * file being used.
+ */
+void
+bacon_video_widget_set_text_subtitle (BaconVideoWidget * bvw,
+				      const gchar * subtitle_uri)
+{
+  GstState cur_state;
+
+  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
+  g_return_if_fail (GST_IS_ELEMENT (bvw->priv->play));
+  g_return_if_fail (bvw->priv->mrl != NULL);
+
+  GST_LOG ("Setting subtitle as %s", GST_STR_NULL (subtitle_uri));
+
+  if (subtitle_uri == NULL &&
+      bvw->priv->subtitle_uri == NULL)
+    return;
+
+  /* Wait for the previous state change to finish */
+  gst_element_get_state (bvw->priv->play, NULL, NULL, GST_CLOCK_TIME_NONE);
+
+  /* -> READY */
+  gst_element_get_state (bvw->priv->play, &cur_state, NULL, 0);
+  if (cur_state > GST_STATE_READY) {
+    gst_element_set_state (bvw->priv->play, GST_STATE_READY);
+    /* Block for new state */
+    gst_element_get_state (bvw->priv->play, NULL, NULL, GST_CLOCK_TIME_NONE);
+  }
+
+  g_free (bvw->priv->subtitle_uri);
+  bvw->priv->subtitle_uri = g_strdup (subtitle_uri);
+  g_object_set (G_OBJECT (bvw->priv->play), "suburi", subtitle_uri, NULL);
+
+  /* And back to the original state */
+  if (cur_state > GST_STATE_READY) {
+    gst_element_set_state (bvw->priv->play, cur_state);
+    /* Block for new state */
+    gst_element_get_state (bvw->priv->play, NULL, NULL, GST_CLOCK_TIME_NONE);
+  }
+
+  if (bvw->priv->current_time > 0)
+    bacon_video_widget_seek_time_no_lock (bvw, bvw->priv->current_time,
+					  GST_SEEK_FLAG_ACCURATE, NULL);
+}
+
+
+/**
+ * bacon_video_widget_dvd_event:
+ * @bvw: a #BaconVideoWidget
+ * @type: the type of DVD event to issue
+ *
+ * Issues a DVD navigation event to the video widget, such as one to skip to the
+ * next chapter, or navigate to the DVD title menu.
+ *
+ * This is a no-op if the current stream is not navigable.
+ **/
+void
+bacon_video_widget_dvd_event (BaconVideoWidget * bvw,
+                              BvwDVDEvent type)
+{
+  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
+  g_return_if_fail (GST_IS_ELEMENT (bvw->priv->play));
+
+  GST_DEBUG ("Sending event '%s'", get_type_name (BVW_TYPE_DVD_EVENT, type));
+
+  switch (type) {
+    case BVW_DVD_ROOT_MENU:
+      bvw_do_navigation_command (bvw, GST_NAVIGATION_COMMAND_DVD_MENU);
+      break;
+    case BVW_DVD_TITLE_MENU:
+      bvw_do_navigation_command (bvw, GST_NAVIGATION_COMMAND_DVD_TITLE_MENU);
+      break;
+    case BVW_DVD_SUBPICTURE_MENU:
+      bvw_do_navigation_command (bvw, GST_NAVIGATION_COMMAND_DVD_SUBPICTURE_MENU);
+      break;
+    case BVW_DVD_AUDIO_MENU:
+      bvw_do_navigation_command (bvw, GST_NAVIGATION_COMMAND_DVD_AUDIO_MENU);
+      break;
+    case BVW_DVD_ANGLE_MENU:
+      bvw_do_navigation_command (bvw, GST_NAVIGATION_COMMAND_DVD_ANGLE_MENU);
+      break;
+    case BVW_DVD_CHAPTER_MENU:
+      bvw_do_navigation_command (bvw, GST_NAVIGATION_COMMAND_DVD_CHAPTER_MENU);
+      break;
+    case BVW_DVD_ROOT_MENU_UP:
+      bvw_do_navigation_command (bvw, GST_NAVIGATION_COMMAND_UP);
+      break;
+    case BVW_DVD_ROOT_MENU_DOWN:
+      bvw_do_navigation_command (bvw, GST_NAVIGATION_COMMAND_DOWN);
+      break;
+    case BVW_DVD_ROOT_MENU_LEFT:
+      bvw_do_navigation_command (bvw, GST_NAVIGATION_COMMAND_LEFT);
+      break;
+    case BVW_DVD_ROOT_MENU_RIGHT:
+      bvw_do_navigation_command (bvw, GST_NAVIGATION_COMMAND_RIGHT);
+      break;
+    case BVW_DVD_ROOT_MENU_SELECT:
+      bvw_do_navigation_command (bvw, GST_NAVIGATION_COMMAND_ACTIVATE);
+      break;
+    case BVW_DVD_NEXT_CHAPTER:
+    case BVW_DVD_PREV_CHAPTER:
+    case BVW_DVD_NEXT_TITLE:
+    case BVW_DVD_PREV_TITLE: {
+      const gchar *fmt_name;
+      GstFormat fmt;
+      gint64 val;
+      gint dir;
+
+      if (type == BVW_DVD_NEXT_CHAPTER || type == BVW_DVD_NEXT_TITLE)
+        dir = 1;
+      else
+        dir = -1;
+
+      if (type == BVW_DVD_NEXT_CHAPTER || type == BVW_DVD_PREV_CHAPTER)
+        fmt_name = "chapter"; 
+      else if (type == BVW_DVD_NEXT_TITLE || type == BVW_DVD_PREV_TITLE)
+        fmt_name = "title";
+      else
+        fmt_name = "angle";
+
+      bvw_set_playback_direction (bvw, TRUE);
+
+      fmt = gst_format_get_by_nick (fmt_name);
+      if (gst_element_query_position (bvw->priv->play, fmt, &val)) {
+        GST_DEBUG ("current %s is: %" G_GINT64_FORMAT, fmt_name, val);
+        val += dir;
+        GST_DEBUG ("seeking to %s: %" G_GINT64_FORMAT, fmt_name, val);
+        gst_element_seek (bvw->priv->play, FORWARD_RATE, fmt, GST_SEEK_FLAG_FLUSH,
+            GST_SEEK_TYPE_SET, val, GST_SEEK_TYPE_NONE, G_GINT64_CONSTANT (0));
+	bvw->priv->rate = FORWARD_RATE;
+      } else {
+        GST_DEBUG ("failed to query position (%s)", fmt_name);
+      }
+      break;
+    }
+    default:
+      GST_WARNING ("unhandled type %d", type);
+      break;
+  }
+}
+
+/**
+ * bacon_video_widget_set_logo:
+ * @bvw: a #BaconVideoWidget
+ * @name: the icon name of the logo
+ *
+ * Sets the logo displayed on the video widget when no stream is loaded.
+ **/
+void
+bacon_video_widget_set_logo (BaconVideoWidget *bvw, const gchar *name)
+{
+  GtkIconTheme *theme;
+  GError *error = NULL;
+
+  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
+  g_return_if_fail (name != NULL);
+
+  if (bvw->priv->logo_pixbuf != NULL)
+    g_object_unref (bvw->priv->logo_pixbuf);
+
+  theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (bvw)));
+  bvw->priv->logo_pixbuf = gtk_icon_theme_load_icon (theme, name, LOGO_SIZE, 0, &error);
+
+  if (error) {
+    g_warning ("An error occurred trying to open logo %s: %s", name, error->message);
+    g_error_free (error);
+    return;
+  }
+
+  set_current_actor (bvw);
+}
+
+/**
+ * bacon_video_widget_set_logo_mode:
+ * @bvw: a #BaconVideoWidget
+ * @logo_mode: %TRUE to display the logo, %FALSE otherwise
+ *
+ * Sets whether to display a logo set with @bacon_video_widget_set_logo when
+ * no stream is loaded. If @logo_mode is %FALSE, nothing will be displayed
+ * and the video widget will take up no space. Otherwise, the logo will be
+ * displayed and will requisition a corresponding amount of space.
+ **/
+void
+bacon_video_widget_set_logo_mode (BaconVideoWidget * bvw, gboolean logo_mode)
+{
+  BaconVideoWidgetPrivate *priv;
+
+  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
+  priv = bvw->priv;
+
+  logo_mode = logo_mode != FALSE;
+
+  if (priv->logo_mode != logo_mode) {
+    priv->logo_mode = logo_mode;
+
+    set_current_actor (bvw);
+
+    g_object_notify (G_OBJECT (bvw), "logo-mode");
+    g_object_notify (G_OBJECT (bvw), "seekable");
+  }
+}
+
+/**
+ * bacon_video_widget_get_logo_mode
+ * @bvw: a #BaconVideoWidget
+ *
+ * Gets whether the logo is displayed when no stream is loaded.
+ *
+ * Return value: %TRUE if the logo is displayed, %FALSE otherwise
+ **/
+gboolean
+bacon_video_widget_get_logo_mode (BaconVideoWidget * bvw)
+{
+  g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), FALSE);
+
+  return bvw->priv->logo_mode;
+}
+
+static gboolean
+bvw_check_for_cover_pixbuf (BaconVideoWidget * bvw)
+{
+  GValue value = { 0, };
+
+  /* for efficiency reasons (decoding of encoded image into pixbuf) we assume
+   * that all potential images come in the same taglist, so once we've
+   * determined the best image/cover, we assume that's really the best one
+   * for this stream, even if more tag messages come in later (this should
+   * not be a problem in practice) */
+  if (bvw->priv->cover_pixbuf)
+    return TRUE;
+
+  bacon_video_widget_get_metadata (bvw, BVW_INFO_COVER, &value);
+  if (G_VALUE_HOLDS_OBJECT (&value)) {
+    bvw->priv->cover_pixbuf = g_value_dup_object (&value);
+    g_value_unset (&value);
+  }
+
+  if (bvw->priv->cover_pixbuf)
+    setup_vis (bvw);
+
+  return (bvw->priv->cover_pixbuf != NULL);
+}
+
+static const GdkPixbuf *
+bvw_get_logo_pixbuf (BaconVideoWidget * bvw)
+{
+  if (bvw_check_for_cover_pixbuf (bvw))
+    return bvw->priv->cover_pixbuf;
+  else
+    return bvw->priv->logo_pixbuf;
+}
+
+/**
+ * bacon_video_widget_pause:
+ * @bvw: a #BaconVideoWidget
+ *
+ * Pauses the current stream in the video widget.
+ *
+ * If a live stream is being played, playback is stopped entirely.
+ **/
+void
+bacon_video_widget_pause (BaconVideoWidget * bvw)
+{
+  GstStateChangeReturn ret;
+  GstState state;
+
+  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
+  g_return_if_fail (GST_IS_ELEMENT (bvw->priv->play));
+  g_return_if_fail (bvw->priv->mrl != NULL);
+
+  /* Get the current state */
+  ret = gst_element_get_state (GST_ELEMENT (bvw->priv->play), &state, NULL, 0);
+
+  if (bvw->priv->is_live != FALSE &&
+      ret != GST_STATE_CHANGE_NO_PREROLL &&
+      ret != GST_STATE_CHANGE_SUCCESS &&
+      state > GST_STATE_READY) {
+    GST_LOG ("Stopping because we have a live stream");
+    bacon_video_widget_stop (bvw);
+    return;
+  }
+
+  GST_LOG ("Pausing");
+  bvw->priv->target_state = GST_STATE_PAUSED;
+  gst_element_set_state (GST_ELEMENT (bvw->priv->play), GST_STATE_PAUSED);
+}
+
+/**
+ * bacon_video_widget_set_subtitle_font:
+ * @bvw: a #BaconVideoWidget
+ * @font: a font description string
+ *
+ * Sets the font size and style in which to display subtitles.
+ *
+ * @font is a Pango font description string, as understood by
+ * pango_font_description_from_string().
+ **/
+void
+bacon_video_widget_set_subtitle_font (BaconVideoWidget * bvw,
+                                          const gchar * font)
+{
+  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
+  g_return_if_fail (GST_IS_ELEMENT (bvw->priv->play));
+
+  if (!g_object_class_find_property (G_OBJECT_GET_CLASS (bvw->priv->play), "subtitle-font-desc"))
+    return;
+  g_object_set (bvw->priv->play, "subtitle-font-desc", font, NULL);
+}
+
+/**
+ * bacon_video_widget_set_subtitle_encoding:
+ * @bvw: a #BaconVideoWidget
+ * @encoding: an encoding system
+ *
+ * Sets the encoding system for the subtitles, so that they can be decoded
+ * properly.
+ **/
+void
+bacon_video_widget_set_subtitle_encoding (BaconVideoWidget *bvw,
+                                          const char *encoding)
+{
+  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
+  g_return_if_fail (GST_IS_ELEMENT (bvw->priv->play));
+
+  if (!g_object_class_find_property (G_OBJECT_GET_CLASS (bvw->priv->play), "subtitle-encoding"))
+    return;
+  g_object_set (bvw->priv->play, "subtitle-encoding", encoding, NULL);
+}
+
+/**
+ * bacon_video_widget_set_user_agent:
+ * @bvw: a #BaconVideoWidget
+ * @user_agent: a HTTP user agent string, or %NULL to use the default
+ *
+ * Sets the HTTP user agent string to use when fetching HTTP ressources.
+ **/
+void
+bacon_video_widget_set_user_agent (BaconVideoWidget *bvw,
+                                   const char *user_agent)
+{
+  BaconVideoWidgetPrivate *priv;
+
+  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
+
+  priv = bvw->priv;
+
+  if (g_strcmp0 (user_agent, priv->user_agent) == 0)
+    return;
+
+  g_free (priv->user_agent);
+  priv->user_agent = g_strdup (user_agent);
+
+  g_object_notify (G_OBJECT (bvw), "user-agent");
+}
+
+/**
+ * bacon_video_widget_set_referrer:
+ * @bvw: a #BaconVideoWidget
+ * @referrer: a HTTP referrer URI, or %NULL
+ *
+ * Sets the HTTP referrer URI to use when fetching HTTP ressources.
+ **/
+void
+bacon_video_widget_set_referrer (BaconVideoWidget *bvw,
+                                 const char *referrer)
+{
+  BaconVideoWidgetPrivate *priv;
+  char *frag;
+
+  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
+
+  priv = bvw->priv;
+
+  if (g_strcmp0 (referrer, priv->referrer) == 0)
+    return;
+
+  g_free (priv->referrer);
+  priv->referrer = g_strdup (referrer);
+
+  /* Referrer URIs must not have a fragment */
+  if ((frag = strchr (priv->referrer, '#')) != NULL)
+    *frag = '\0';
+
+  g_object_notify (G_OBJECT (bvw), "referrer");
+}
+
+/**
+ * bacon_video_widget_can_set_volume:
+ * @bvw: a #BaconVideoWidget
+ *
+ * Returns whether the volume level can be set, given the current settings.
+ *
+ * The volume cannot be set if the audio output type is set to
+ * %BVW_AUDIO_SOUND_AC3PASSTHRU.
+ *
+ * Return value: %TRUE if the volume can be set, %FALSE otherwise
+ **/
+gboolean
+bacon_video_widget_can_set_volume (BaconVideoWidget * bvw)
+{
+  g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), FALSE);
+  g_return_val_if_fail (GST_IS_ELEMENT (bvw->priv->play), FALSE);
+
+  if (bvw->priv->speakersetup == BVW_AUDIO_SOUND_AC3PASSTHRU)
+    return FALSE;
+
+  return !bvw->priv->uses_audio_fakesink;
+}
+
+/**
+ * bacon_video_widget_set_volume:
+ * @bvw: a #BaconVideoWidget
+ * @volume: the new volume level, as a percentage between 0 and 1
+ *
+ * Sets the volume level of the stream as a percentage between 0 and 1.
+ *
+ * If bacon_video_widget_can_set_volume() returns %FALSE, this is a no-op.
+ **/
+void
+bacon_video_widget_set_volume (BaconVideoWidget * bvw, double volume)
+{
+  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
+  g_return_if_fail (GST_IS_ELEMENT (bvw->priv->play));
+
+  if (bacon_video_widget_can_set_volume (bvw) != FALSE) {
+    volume = CLAMP (volume, 0.0, 1.0);
+    gst_stream_volume_set_volume (GST_STREAM_VOLUME (bvw->priv->play),
+                                  GST_STREAM_VOLUME_FORMAT_CUBIC,
+                                  volume);
+
+    bvw->priv->volume = volume;
+    g_object_notify (G_OBJECT (bvw), "volume");
+  }
+}
+
+/**
+ * bacon_video_widget_get_volume:
+ * @bvw: a #BaconVideoWidget
+ *
+ * Returns the current volume level, as a percentage between 0 and 1.
+ *
+ * Return value: the volume as a percentage between 0 and 1
+ **/
+double
+bacon_video_widget_get_volume (BaconVideoWidget * bvw)
+{
+  g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), 0.0);
+  g_return_val_if_fail (GST_IS_ELEMENT (bvw->priv->play), 0.0);
+
+  return bvw->priv->volume;
+}
+
+/**
+ * bacon_video_widget_set_fullscreen:
+ * @bvw: a #BaconVideoWidget
+ * @fullscreen: %TRUE to go fullscreen, %FALSE otherwise
+ *
+ * Sets whether the widget renders the stream in fullscreen mode.
+ **/
+void
+bacon_video_widget_set_fullscreen (BaconVideoWidget * bvw,
+                                   gboolean fullscreen)
+{
+  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
+
+  bvw->priv->fullscreen_mode = fullscreen;
+}
+
+/**
+ * bacon_video_widget_set_show_cursor:
+ * @bvw: a #BaconVideoWidget
+ * @show_cursor: %TRUE to show the cursor, %FALSE otherwise
+ *
+ * Sets whether the cursor should be shown when it is over the video
+ * widget. If @show_cursor is %FALSE, the cursor will be invisible
+ * when it is moved over the video widget.
+ **/
+void
+bacon_video_widget_set_show_cursor (BaconVideoWidget * bvw,
+                                    gboolean show_cursor)
+{
+  GdkWindow *window;
+
+  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
+
+  bvw->priv->cursor_shown = show_cursor;
+  window = gtk_widget_get_window (GTK_WIDGET (bvw));
+
+  if (!window) {
+    return;
+  }
+
+  if (show_cursor == FALSE) {
+    totem_gdk_window_set_invisible_cursor (window);
+  } else {
+    gdk_window_set_cursor (window, bvw->priv->cursor);
+  }
+}
+
+/**
+ * bacon_video_widget_get_show_cursor:
+ * @bvw: a #BaconVideoWidget
+ *
+ * Returns whether the cursor is shown when it is over the video widget.
+ *
+ * Return value: %TRUE if the cursor is shown, %FALSE otherwise
+ **/
+gboolean
+bacon_video_widget_get_show_cursor (BaconVideoWidget * bvw)
+{
+  g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), FALSE);
+
+  return bvw->priv->cursor_shown;
+}
+
+static struct {
+	int height;
+	int fps;
+} const vis_qualities[] = {
+	{ 240, 15 }, /* BVW_VISUALIZATION_SMALL */
+	{ 320, 25 }, /* BVW_VISUALIZATION_NORMAL */
+	{ 480, 25 }, /* BVW_VISUALIZATION_LARGE */
+	{ 600, 30 }  /* BVW_VISUALIZATION_EXTRA_LARGE */
+};
+
+static void
+get_visualization_size (BaconVideoWidget *bvw,
+                        int *w, int *h, gint *fps_n, gint *fps_d)
+{
+  GdkScreen *screen;
+  int new_fps_n;
+
+  g_return_if_fail (h != NULL);
+  g_return_if_fail (bvw->priv->visq < G_N_ELEMENTS (vis_qualities));
+
+  if (gtk_widget_get_realized (GTK_WIDGET (bvw)) == FALSE) {
+    if (fps_n)
+      *fps_n = 1;
+    if (fps_d)
+      *fps_d = 1;
+    return;
+  }
+
+  *h = vis_qualities[bvw->priv->visq].height;
+  new_fps_n = vis_qualities[bvw->priv->visq].fps;
+
+  screen = gtk_widget_get_screen (GTK_WIDGET (bvw));
+  *w = *h * gdk_screen_get_width (screen) / gdk_screen_get_height (screen);
+
+  if (fps_n)
+    *fps_n = new_fps_n;
+  if (fps_d)
+    *fps_d = 1;
+}
+
+static void
+add_longname (GstElementFactory *f, GHashTable *ht)
+{
+  g_hash_table_insert (ht,
+		       (gpointer) gst_element_factory_get_longname (f),
+		       (gpointer) gst_plugin_feature_get_name (GST_PLUGIN_FEATURE (f)));
+}
+
+static void
+ensure_vis_plugins_list (BaconVideoWidget *bvw)
+{
+  GHashTable *ht;
+  GList *features;
+
+  if (bvw->priv->vis_plugins_ht)
+    return;
+
+  features = get_visualization_features ();
+  ht = g_hash_table_new (g_str_hash, g_str_equal);
+  g_list_foreach (features, (GFunc) add_longname, ht);
+  g_list_free (features);
+
+  bvw->priv->vis_plugins_ht = ht;
+}
+
+static GstElementFactory *
+setup_vis_find_factory (BaconVideoWidget * bvw, const gchar * vis_name)
+{
+  const char *factory_name;
+
+  ensure_vis_plugins_list (bvw);
+
+  factory_name = g_hash_table_lookup (bvw->priv->vis_plugins_ht, vis_name);
+  if (factory_name == NULL)
+    return NULL;
+
+  return gst_element_factory_find (factory_name);
+}
+
+static void
+setup_vis (BaconVideoWidget * bvw)
+{
+  GstElement *vis_bin = NULL;
+
+  GST_DEBUG ("setup_vis called, show_vfx %d, vis element %s",
+      bvw->priv->show_vfx, bvw->priv->vis_element_name);
+
+  /* Check to see if we have an embedded cover image. If we do, don't show visualisations.
+   * FIXME probably wrong now, hide that and use an OSD instead */
+  bvw_check_for_cover_pixbuf (bvw);
+
+  if (bvw->priv->show_vfx && !bvw->priv->cover_pixbuf && bvw->priv->vis_element_name) {
+    GstElement *vis_element = NULL, *vis_capsfilter = NULL;
+    GstPad *pad = NULL;
+    GstCaps *caps = NULL;
+    GstElementFactory *fac = NULL;
+    
+    fac = setup_vis_find_factory (bvw, bvw->priv->vis_element_name);
+    if (!fac) {
+      GST_DEBUG ("Could not find element factory for visualisation '%s'",
+          GST_STR_NULL (bvw->priv->vis_element_name));
+      /* use goom as fallback, better than nothing */
+      fac = setup_vis_find_factory (bvw, "goom");
+      if (fac == NULL) {
+        goto beach;
+      } else {
+        GST_DEBUG ("Falling back on 'goom' for visualisation");
+      }     
+    }
+    
+    vis_element = gst_element_factory_create (fac, "vis_element");
+    if (!GST_IS_ELEMENT (vis_element)) {
+      GST_DEBUG ("failed creating visualisation element");
+      goto beach;
+    }
+    
+    vis_capsfilter = gst_element_factory_make ("capsfilter",
+        "vis_capsfilter");
+    if (!GST_IS_ELEMENT (vis_capsfilter)) {
+      GST_DEBUG ("failed creating visualisation capsfilter element");
+      gst_object_unref (vis_element);
+      goto beach;
+    }
+    
+    vis_bin = gst_bin_new ("vis_bin");
+    if (!GST_IS_ELEMENT (vis_bin)) {
+      GST_DEBUG ("failed creating visualisation bin");
+      gst_object_unref (vis_element);
+      gst_object_unref (vis_capsfilter);
+      goto beach;
+    }
+    /* We created the bin, now ref and sink to make sure we own it */
+    gst_object_ref (vis_bin);
+    gst_object_ref_sink (vis_bin);
+    
+    gst_bin_add_many (GST_BIN (vis_bin), vis_element, vis_capsfilter, NULL);
+    
+    /* Sink ghostpad */
+    pad = gst_element_get_static_pad (vis_element, "sink");
+    gst_element_add_pad (vis_bin, gst_ghost_pad_new ("sink", pad));
+    gst_object_unref (pad);
+
+    /* Source ghostpad, link with vis_element */
+    pad = gst_element_get_static_pad (vis_capsfilter, "src");
+    gst_element_add_pad (vis_bin, gst_ghost_pad_new ("src", pad));
+    gst_element_link_pads (vis_element, "src", vis_capsfilter, "sink");
+    gst_object_unref (pad);
+
+    /* Get allowed output caps from visualisation element */
+    pad = gst_element_get_static_pad (vis_element, "src");
+    caps = gst_pad_get_allowed_caps (pad);
+    gst_object_unref (pad);
+    
+    GST_DEBUG ("allowed caps: %" GST_PTR_FORMAT, caps);
+    
+    /* Can we fixate ? */
+    if (caps && !gst_caps_is_fixed (caps)) {
+      guint i;
+      gint w, h, fps_n, fps_d;
+
+      caps = gst_caps_make_writable (caps);
+
+      /* Get visualization size */
+      get_visualization_size (bvw, &w, &h, &fps_n, &fps_d);
+
+      for (i = 0; i < gst_caps_get_size (caps); ++i) {
+        GstStructure *s = gst_caps_get_structure (caps, i);
+      
+        /* Fixate */
+        gst_structure_fixate_field_nearest_int (s, "width", w);
+        gst_structure_fixate_field_nearest_int (s, "height", h);
+        gst_structure_fixate_field_nearest_fraction (s, "framerate", fps_n,
+            fps_d);
+      }
+
+      /* set this */
+      g_object_set (vis_capsfilter, "caps", caps, NULL);
+    }
+
+    GST_DEBUG ("visualisation caps: %" GST_PTR_FORMAT, caps);
+    
+    if (GST_IS_CAPS (caps)) {
+      gst_caps_unref (caps);
+    }
+  }
+
+  if (bvw->priv->media_has_audio &&
+      !bvw->priv->media_has_video) {
+    gint flags;
+
+    g_object_get (bvw->priv->play, "flags", &flags, NULL);
+    if (bvw->priv->show_vfx && !bvw->priv->cover_pixbuf) {
+      flags |= GST_PLAY_FLAG_VIS;
+    } else {
+      flags &= ~GST_PLAY_FLAG_VIS;
+    }
+    g_object_set (bvw->priv->play, "flags", flags, NULL);
+  }
+
+beach:
+  g_object_set (bvw->priv->play, "vis-plugin", vis_bin, NULL);
+  if (vis_bin)
+    gst_object_unref (vis_bin);
+  
+  return;
+}
+
+/**
+ * bacon_video_widget_set_show_visualizations:
+ * @bvw: a #BaconVideoWidget
+ * @show_visualizations: %TRUE to show visualisations, %FALSE otherwise
+ *
+ * Sets whether to show visualisations when playing audio-only streams.
+ **/
+void
+bacon_video_widget_set_show_visualizations (BaconVideoWidget * bvw,
+                                     gboolean show_visualizations)
+{
+  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
+  g_return_if_fail (GST_IS_ELEMENT (bvw->priv->play));
+
+  if (show_visualizations == bvw->priv->show_vfx)
+    return;
+
+  bvw->priv->show_vfx = show_visualizations;
+  setup_vis (bvw);
+  set_current_actor (bvw);
+}
+
+static gboolean
+filter_features (GstPluginFeature * feature, gpointer data)
+{
+  GstElementFactory *f;
+
+  if (!GST_IS_ELEMENT_FACTORY (feature))
+    return FALSE;
+  f = GST_ELEMENT_FACTORY (feature);
+  if (!g_strrstr (gst_element_factory_get_klass (f), "Visualization"))
+    return FALSE;
+
+  return TRUE;
+}
+
+static GList *
+get_visualization_features (void)
+{
+  return gst_registry_feature_filter (gst_registry_get (),
+      filter_features, FALSE, NULL);
+}
+
+/**
+ * bacon_video_widget_get_visualization_list:
+ * @bvw: a #BaconVideoWidget
+ *
+ * Returns a list of the visualisations available when playing audio-only streams.
+ *
+ * Return value: a #GList of visualisation names; owned by @bvw
+ **/
+GList *
+bacon_video_widget_get_visualization_list (BaconVideoWidget * bvw)
+{
+  g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), NULL);
+  g_return_val_if_fail (GST_IS_ELEMENT (bvw->priv->play), NULL);
+
+  if (bvw->priv->vis_plugins_list)
+    return bvw->priv->vis_plugins_list;
+
+  ensure_vis_plugins_list (bvw);
+  bvw->priv->vis_plugins_list = g_hash_table_get_keys (bvw->priv->vis_plugins_ht);
+
+  return bvw->priv->vis_plugins_list;
+}
+
+/**
+ * bacon_video_widget_set_visualization:
+ * @bvw: a #BaconVideoWidget
+ * @name: the visualisation's name, or %NULL
+ *
+ * Sets the visualisation to display when playing audio-only streams.
+ *
+ * If @name is %NULL, visualisations will be disabled. Otherwise, @name
+ * should be from the list returned by bacon_video_widget_get_visualization_list().
+ **/
+void
+bacon_video_widget_set_visualization (BaconVideoWidget * bvw, const char *name)
+{
+  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
+  g_return_if_fail (GST_IS_ELEMENT (bvw->priv->play));
+
+  if (bvw->priv->vis_element_name) {
+    if (strcmp (bvw->priv->vis_element_name, name) == 0) {
+      return;
+    }
+    else {
+      g_free (bvw->priv->vis_element_name);
+    }
+  }
+
+  bvw->priv->vis_element_name = g_strdup (name);
+
+  GST_DEBUG ("new visualisation element name = '%s'", GST_STR_NULL (name));
+
+  setup_vis (bvw);
+}
+
+/**
+ * bacon_video_widget_set_visualization_quality:
+ * @bvw: a #BaconVideoWidget
+ * @quality: the visualisation quality
+ *
+ * Sets the quality/size of displayed visualisations.
+ **/
+void
+bacon_video_widget_set_visualization_quality (BaconVideoWidget * bvw,
+                                        BvwVisualizationQuality quality)
+{
+  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
+  g_return_if_fail (GST_IS_ELEMENT (bvw->priv->play));
+
+  if (bvw->priv->visq == quality)
+    return;
+
+  bvw->priv->visq = quality;
+  
+  setup_vis (bvw);
+
+  g_object_notify (G_OBJECT (bvw), "visualization-quality");
+}
+
+/**
+ * bacon_video_widget_get_auto_resize:
+ * @bvw: a #BaconVideoWidget
+ *
+ * Returns whether the widget will automatically resize to fit videos.
+ *
+ * Return value: %TRUE if the widget will resize, %FALSE otherwise
+ **/
+gboolean
+bacon_video_widget_get_auto_resize (BaconVideoWidget * bvw)
+{
+  g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), FALSE);
+
+  return bvw->priv->auto_resize;
+}
+
+/**
+ * bacon_video_widget_set_auto_resize:
+ * @bvw: a #BaconVideoWidget
+ * @auto_resize: %TRUE to automatically resize for new videos, %FALSE otherwise
+ *
+ * Sets whether the widget should automatically resize to fit to new videos when
+ * they are loaded. Changes to this will take effect when the next media file is
+ * loaded.
+ **/
+void
+bacon_video_widget_set_auto_resize (BaconVideoWidget * bvw,
+                                    gboolean auto_resize)
+{
+  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
+
+  bvw->priv->auto_resize = auto_resize;
+
+  /* this will take effect when the next media file loads */
+  g_object_notify (G_OBJECT (bvw), "auto-resize");
+}
+
+/**
+ * bacon_video_widget_set_aspect_ratio:
+ * @bvw: a #BaconVideoWidget
+ * @ratio: the new aspect ratio
+ *
+ * Sets the aspect ratio used by the widget, from #BvwAspectRatio.
+ *
+ * Changes to this take effect immediately.
+ **/
+void
+bacon_video_widget_set_aspect_ratio (BaconVideoWidget *bvw,
+                                BvwAspectRatio ratio)
+{
+  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
+  GstMessage *msg;
+
+  bvw->priv->ratio_type = ratio;
+  msg = gst_message_new_application (GST_OBJECT (bvw->priv->play),
+      gst_structure_new ("video-size", "width", G_TYPE_INT,
+          bvw->priv->video_width, "height", G_TYPE_INT,
+          bvw->priv->video_height, NULL));
+  gst_element_post_message (bvw->priv->play, msg);
+}
+
+/**
+ * bacon_video_widget_get_aspect_ratio:
+ * @bvw: a #BaconVideoWidget
+ *
+ * Returns the current aspect ratio used by the widget, from
+ * #BvwAspectRatio.
+ *
+ * Return value: the aspect ratio
+ **/
+BvwAspectRatio
+bacon_video_widget_get_aspect_ratio (BaconVideoWidget *bvw)
+{
+  g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), 0);
+
+  return bvw->priv->ratio_type;
+}
+
+/**
+ * bacon_video_widget_set_scale_ratio:
+ * @bvw: a #BaconVideoWidget
+ * @ratio: the new scale ratio
+ *
+ * Sets the ratio by which the widget will scale videos when they are
+ * displayed. If @ratio is set to 0, the highest ratio possible will
+ * be chosen.
+ **/
+void
+bacon_video_widget_set_scale_ratio (BaconVideoWidget * bvw, gfloat ratio)
+{
+  GtkWidget *toplevel;
+  gint w, h;
+
+  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
+  g_return_if_fail (GST_IS_ELEMENT (bvw->priv->play));
+
+  GST_DEBUG ("ratio = %.2f", ratio);
+
+  if (!bvw->priv->media_has_video && bvw->priv->show_vfx) {
+    get_visualization_size (bvw, &w, &h, NULL, NULL);
+  } else {
+    get_media_size (bvw, &w, &h);
+  }
+
+  if (ratio == 0.0) {
+    if (totem_ratio_fits_screen (GTK_WIDGET (bvw), w, h, 2.0))
+      ratio = 2.0;
+    else if (totem_ratio_fits_screen (GTK_WIDGET (bvw), w, h, 1.0))
+      ratio = 1.0;
+    else if (totem_ratio_fits_screen (GTK_WIDGET (bvw), w, h, 0.5))
+      ratio = 0.5;
+    else
+      return;
+  } else {
+    if (!totem_ratio_fits_screen (GTK_WIDGET (bvw), w, h, ratio)) {
+      GST_DEBUG ("movie doesn't fit on screen @ %.1fx (%dx%d)", w, h, ratio);
+      return;
+    }
+  }
+  w = (gfloat) w * ratio;
+  h = (gfloat) h * ratio;
+
+  GST_DEBUG ("setting preferred size %dx%d", w, h);
+
+  toplevel = gtk_widget_get_toplevel (GTK_WIDGET (bvw));
+  if (gtk_widget_is_toplevel (toplevel))
+    gtk_window_resize_to_geometry (GTK_WINDOW (toplevel), w, h);
+}
+
+/**
+ * bacon_video_widget_set_zoom:
+ * @bvw: a #BaconVideoWidget
+ * @mode: the #BvwZoomMode
+ *
+ * Sets the zoom type applied to the video when it is displayed.
+ **/
+void
+bacon_video_widget_set_zoom (BaconVideoWidget *bvw,
+                             BvwZoomMode       mode)
+{
+  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
+
+  if (bvw->priv->frame == NULL)
+    return;
+
+  totem_aspect_frame_set_expand (TOTEM_ASPECT_FRAME (bvw->priv->frame),
+			      (mode == BVW_ZOOM_EXPAND));
+}
+
+/**
+ * bacon_video_widget_get_zoom:
+ * @bvw: a #BaconVideoWidget
+ *
+ * Returns the zoom mode applied to videos displayed by the widget.
+ *
+ * Return value: a #BvwZoomMode
+ **/
+BvwZoomMode
+bacon_video_widget_get_zoom (BaconVideoWidget *bvw)
+{
+  gboolean expand;
+
+  g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), 1.0);
+
+  expand = totem_aspect_frame_get_expand (TOTEM_ASPECT_FRAME (bvw->priv->frame));
+  return expand ? BVW_ZOOM_EXPAND : BVW_ZOOM_NONE;
+}
+
+/**
+ * bacon_video_widget_set_rotation:
+ * @bvw: a #BaconVideoWidget
+ * @rotation: the #BvwRotation of the video in degrees
+ *
+ * Sets the rotation to be applied to the video when it is displayed.
+ **/
+void
+bacon_video_widget_set_rotation (BaconVideoWidget *bvw,
+				 BvwRotation       rotation)
+{
+  gfloat angle;
+
+  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
+
+  if (bvw->priv->frame == NULL)
+    return;
+
+  GST_DEBUG ("Rotating to %s (%f degrees) from %s",
+	     get_type_name (BVW_TYPE_ROTATION, rotation),
+	     rotation * 90.0,
+	     get_type_name (BVW_TYPE_ROTATION, bvw->priv->rotation));
+
+  bvw->priv->rotation = rotation;
+
+  angle = rotation * 90.0;
+  totem_aspect_frame_set_rotation (TOTEM_ASPECT_FRAME (bvw->priv->frame), angle);
+}
+
+/**
+ * bacon_video_widget_get_rotation:
+ * @bvw: a #BaconVideoWidget
+ *
+ * Returns the angle of rotation of the video, in degrees.
+ *
+ * Return value: a #BvwRotation.
+ **/
+BvwRotation
+bacon_video_widget_get_rotation (BaconVideoWidget *bvw)
+{
+  g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), BVW_ROTATION_R_ZERO);
+
+  return bvw->priv->rotation;
+}
+
+/* Search for the color balance channel corresponding to type and return it. */
+static GstColorBalanceChannel *
+bvw_get_color_balance_channel (GstColorBalance * color_balance,
+    BvwVideoProperty type)
+{
+  const GList *channels;
+
+  channels = gst_color_balance_list_channels (color_balance);
+
+  for (; channels != NULL; channels = channels->next) {
+    GstColorBalanceChannel *c = channels->data;
+
+    if (type == BVW_VIDEO_BRIGHTNESS && g_strrstr (c->label, "BRIGHTNESS"))
+      return g_object_ref (c);
+    else if (type == BVW_VIDEO_CONTRAST && g_strrstr (c->label, "CONTRAST"))
+      return g_object_ref (c);
+    else if (type == BVW_VIDEO_SATURATION && g_strrstr (c->label, "SATURATION"))
+      return g_object_ref (c);
+    else if (type == BVW_VIDEO_HUE && g_strrstr (c->label, "HUE"))
+      return g_object_ref (c);
+  }
+
+  return NULL;
+}
+
+/**
+ * bacon_video_widget_get_video_property:
+ * @bvw: a #BaconVideoWidget
+ * @type: the type of property
+ *
+ * Returns the given property of the video display, such as its brightness or saturation.
+ *
+ * It is returned as a percentage in the full range of integer values; from 0
+ * to 65535 (inclusive), where 32768 is the default.
+ *
+ * Return value: the property's value, in the range 0 to 65535
+ **/
+int
+bacon_video_widget_get_video_property (BaconVideoWidget *bvw,
+                                       BvwVideoProperty type)
+{
+  GstColorBalanceChannel *found_channel = NULL;
+  int ret, cur;
+
+  g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), 65535/2);
+  g_return_val_if_fail (bvw->priv->play != NULL, 65535/2);
+
+  ret = 0;
+
+
+  found_channel = bvw_get_color_balance_channel (GST_COLOR_BALANCE (bvw->priv->play), type);
+  cur = gst_color_balance_get_value (GST_COLOR_BALANCE (bvw->priv->play), found_channel);
+
+  GST_DEBUG ("channel %s: cur=%d, min=%d, max=%d", found_channel->label,
+	     cur, found_channel->min_value, found_channel->max_value);
+
+  ret = floor (0.5 +
+	       ((double) cur - found_channel->min_value) * 65535 /
+	       ((double) found_channel->max_value - found_channel->min_value));
+
+  GST_DEBUG ("channel %s: returning value %d", found_channel->label, ret);
+  g_object_unref (found_channel);
+  return ret;
+}
+
+/**
+ * bacon_video_widget_has_menus:
+ * @bvw: a #BaconVideoWidget
+ *
+ * Returns whether the widget is currently displaying a menu,
+ * such as a DVD menu.
+ *
+ * Return value: %TRUE if a menu is displayed, %FALSE otherwise
+ **/
+gboolean
+bacon_video_widget_has_menus (BaconVideoWidget *bvw)
+{
+    g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), FALSE);
+
+    if (bacon_video_widget_is_playing (bvw) == FALSE)
+        return FALSE;
+
+    return bvw->priv->is_menu;
+}
+
+/**
+ * bacon_video_widget_has_angles:
+ * @bvw: a #BaconVideoWidget
+ *
+ * Returns whether the widget is currently playing a stream with
+ * multiple angles.
+ *
+ * Return value: %TRUE if the current video stream has multiple
+ * angles, %FALSE otherwise
+ **/
+gboolean
+bacon_video_widget_has_angles (BaconVideoWidget *bvw)
+{
+    guint n_video;
+
+    g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), FALSE);
+
+    if (bacon_video_widget_is_playing (bvw) == FALSE)
+        return FALSE;
+
+    if (bvw->priv->has_angles)
+        return TRUE;
+
+    g_object_get (G_OBJECT (bvw->priv->play), "n-video", &n_video, NULL);
+
+    return n_video > 1;
+}
+
+/**
+ * bacon_video_widget_set_next_angle:
+ * @bvw: a #BaconVideoWidget
+ *
+ * Select the next angle, or video track in the playing stream.
+ **/
+void
+bacon_video_widget_set_next_angle (BaconVideoWidget *bvw)
+{
+    guint n_video, current_video;
+
+    g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
+
+    if (bacon_video_widget_is_playing (bvw) == FALSE)
+        return;
+
+    if (bvw->priv->has_angles) {
+        GST_DEBUG ("Sending event 'next-angle'");
+        bvw_do_navigation_command (bvw, GST_NAVIGATION_COMMAND_NEXT_ANGLE);
+        return;
+    }
+
+    g_object_get (G_OBJECT (bvw->priv->play),
+		  "current-video", ¤t_video,
+		  "n-video", &n_video,
+		  NULL);
+
+    if (n_video <= 1) {
+        GST_DEBUG ("Not setting next video stream, we have %d video streams", n_video);
+	return;
+    }
+
+    current_video++;
+    if (current_video == n_video)
+      current_video = 0;
+
+    GST_DEBUG ("Setting current-video to %d/%d", current_video, n_video);
+    g_object_set (G_OBJECT (bvw->priv->play), "current-video", current_video, NULL);
+}
+
+static gboolean
+notify_volume_idle_cb (BaconVideoWidget *bvw)
+{
+  gdouble vol;
+
+  vol = gst_stream_volume_get_volume (GST_STREAM_VOLUME (bvw->priv->play),
+                                      GST_STREAM_VOLUME_FORMAT_CUBIC);
+
+  bvw->priv->volume = vol;
+
+  g_object_notify (G_OBJECT (bvw), "volume");
+
+  return FALSE;
+}
+
+static void
+notify_volume_cb (GObject             *object,
+		  GParamSpec          *pspec,
+		  BaconVideoWidget    *bvw)
+{
+  g_idle_add ((GSourceFunc) notify_volume_idle_cb, bvw);
+}
+
+/**
+ * bacon_video_widget_set_video_property:
+ * @bvw: a #BaconVideoWidget
+ * @type: the type of property
+ * @value: the property's value, in the range 0 to 65535
+ *
+ * Sets the given property of the video display, such as its brightness or saturation.
+ *
+ * It should be given as a percentage in the full range of integer values; from 0
+ * to 65535 (inclusive), where 32768 is the default.
+ **/
+void
+bacon_video_widget_set_video_property (BaconVideoWidget *bvw,
+                                       BvwVideoProperty type,
+                                       int value)
+{
+  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
+  g_return_if_fail (bvw->priv->play != NULL);
+  GstColorBalanceChannel *found_channel = NULL;
+  int i_value;
+
+  GST_DEBUG ("set video property type %d to value %d", type, value);
+
+  if ( !(value <= 65535 && value >= 0) )
+    return;
+
+  found_channel = bvw_get_color_balance_channel (GST_COLOR_BALANCE (bvw->priv->play), type);
+  i_value = floor (0.5 + value * ((double) found_channel->max_value -
+				  found_channel->min_value) / 65535 + found_channel->min_value);
+
+  GST_DEBUG ("channel %s: set to %d/65535", found_channel->label, value);
+
+  gst_color_balance_set_value (GST_COLOR_BALANCE (bvw->priv->play), found_channel, i_value);
+
+  GST_DEBUG ("channel %s: val=%d, min=%d, max=%d", found_channel->label,
+	     i_value, found_channel->min_value, found_channel->max_value);
+
+  g_object_unref (found_channel);
+
+  /* Notify of the property change */
+  g_object_notify (G_OBJECT (bvw), video_props_str[type]);
+
+  GST_DEBUG ("setting value %d", value);
+}
+
+/**
+ * bacon_video_widget_get_position:
+ * @bvw: a #BaconVideoWidget
+ *
+ * Returns the current position in the stream, as a value between
+ * 0 and 1.
+ *
+ * Return value: the current position, or -1
+ **/
+double
+bacon_video_widget_get_position (BaconVideoWidget * bvw)
+{
+  g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), -1);
+  return bvw->priv->current_position;
+}
+
+/**
+ * bacon_video_widget_get_current_time:
+ * @bvw: a #BaconVideoWidget
+ *
+ * Returns the current position in the stream, as the time (in milliseconds)
+ * since the beginning of the stream.
+ *
+ * Return value: time since the beginning of the stream, in milliseconds, or -1
+ **/
+gint64
+bacon_video_widget_get_current_time (BaconVideoWidget * bvw)
+{
+  g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), -1);
+  return bvw->priv->current_time;
+}
+
+/**
+ * bacon_video_widget_get_stream_length:
+ * @bvw: a #BaconVideoWidget
+ *
+ * Returns the total length of the stream, in milliseconds.
+ *
+ * Return value: the stream length, in milliseconds, or -1
+ **/
+gint64
+bacon_video_widget_get_stream_length (BaconVideoWidget * bvw)
+{
+  g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), -1);
+
+  if (bvw->priv->stream_length == 0 && bvw->priv->play != NULL) {
+    gint64 len = -1;
+
+    if (gst_element_query_duration (bvw->priv->play, GST_FORMAT_TIME, &len) && len != -1) {
+      bvw->priv->stream_length = len / GST_MSECOND;
+    }
+  }
+
+  return bvw->priv->stream_length;
+}
+
+/**
+ * bacon_video_widget_is_playing:
+ * @bvw: a #BaconVideoWidget
+ *
+ * Returns whether the widget is currently playing a stream.
+ *
+ * Return value: %TRUE if a stream is playing, %FALSE otherwise
+ **/
+gboolean
+bacon_video_widget_is_playing (BaconVideoWidget * bvw)
+{
+  gboolean ret;
+
+  g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), FALSE);
+  g_return_val_if_fail (GST_IS_ELEMENT (bvw->priv->play), FALSE);
+
+  ret = (bvw->priv->target_state == GST_STATE_PLAYING);
+  GST_LOG ("%splaying", (ret) ? "" : "not ");
+
+  return ret;
+}
+
+/**
+ * bacon_video_widget_is_seekable:
+ * @bvw: a #BaconVideoWidget
+ *
+ * Returns whether seeking is possible in the current stream.
+ *
+ * If no stream is loaded, %FALSE is returned.
+ *
+ * Return value: %TRUE if the stream is seekable, %FALSE otherwise
+ **/
+gboolean
+bacon_video_widget_is_seekable (BaconVideoWidget * bvw)
+{
+  gboolean res;
+  gint old_seekable;
+
+  g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), FALSE);
+  g_return_val_if_fail (GST_IS_ELEMENT (bvw->priv->play), FALSE);
+
+  if (bvw->priv->mrl == NULL)
+    return FALSE;
+
+  old_seekable = bvw->priv->seekable;
+
+  if (bvw->priv->is_menu != FALSE)
+    return FALSE;
+
+  if (bvw->priv->seekable == -1) {
+    GstQuery *query;
+
+    query = gst_query_new_seeking (GST_FORMAT_TIME);
+    if (gst_element_query (bvw->priv->play, query)) {
+      gst_query_parse_seeking (query, NULL, &res, NULL, NULL);
+      GST_DEBUG ("seeking query says the stream is%s seekable", (res) ? "" : " not");
+      bvw->priv->seekable = (res) ? 1 : 0;
+    } else {
+      GST_DEBUG ("seeking query failed");
+    }
+    gst_query_unref (query);
+  }
+
+  if (bvw->priv->seekable != -1) {
+    res = (bvw->priv->seekable != 0);
+    goto done;
+  }
+
+  /* Try to guess from duration. This is very unreliable
+   * though so don't save it */
+  if (bvw->priv->stream_length == 0) {
+    res = (bacon_video_widget_get_stream_length (bvw) > 0);
+  } else {
+    res = (bvw->priv->stream_length > 0);
+  }
+
+done:
+
+  if (old_seekable != bvw->priv->seekable)
+    g_object_notify (G_OBJECT (bvw), "seekable");
+
+  GST_DEBUG ("stream is%s seekable", (res) ? "" : " not");
+  return res;
+}
+
+static gint
+bvw_get_current_stream_num (BaconVideoWidget * bvw,
+    const gchar *stream_type)
+{
+  gchar *lower, *cur_prop_str;
+  gint stream_num = -1;
+
+  if (bvw->priv->play == NULL)
+    return stream_num;
+
+  lower = g_ascii_strdown (stream_type, -1);
+  cur_prop_str = g_strconcat ("current-", lower, NULL);
+  g_object_get (bvw->priv->play, cur_prop_str, &stream_num, NULL);
+  g_free (cur_prop_str);
+  g_free (lower);
+
+  GST_LOG ("current %s stream: %d", stream_type, stream_num);
+  return stream_num;
+}
+
+static GstTagList *
+bvw_get_tags_of_current_stream (BaconVideoWidget * bvw,
+    const gchar *stream_type)
+{
+  GstTagList *tags = NULL;
+  gint stream_num = -1;
+  gchar *lower, *cur_sig_str;
+
+  stream_num = bvw_get_current_stream_num (bvw, stream_type);
+  if (stream_num < 0)
+    return NULL;
+
+  lower = g_ascii_strdown (stream_type, -1);
+  cur_sig_str = g_strconcat ("get-", lower, "-tags", NULL);
+  g_signal_emit_by_name (bvw->priv->play, cur_sig_str, stream_num, &tags);
+  g_free (cur_sig_str);
+  g_free (lower);
+
+  GST_LOG ("current %s stream tags %" GST_PTR_FORMAT, stream_type, tags);
+  return tags;
+}
+
+static GstCaps *
+bvw_get_caps_of_current_stream (BaconVideoWidget * bvw,
+    const gchar *stream_type)
+{
+  GstCaps *caps = NULL;
+  gint stream_num = -1;
+  GstPad *current;
+  gchar *lower, *cur_sig_str;
+
+  stream_num = bvw_get_current_stream_num (bvw, stream_type);
+  if (stream_num < 0)
+    return NULL;
+
+  lower = g_ascii_strdown (stream_type, -1);
+  cur_sig_str = g_strconcat ("get-", lower, "-pad", NULL);
+  g_signal_emit_by_name (bvw->priv->play, cur_sig_str, stream_num, ¤t);
+  g_free (cur_sig_str);
+  g_free (lower);
+
+  if (current != NULL) {
+    caps = gst_pad_get_current_caps (current);
+    gst_object_unref (current);
+  }
+  GST_LOG ("current %s stream caps: %" GST_PTR_FORMAT, stream_type, caps);
+  return caps;
+}
+
+static gboolean
+audio_caps_have_LFE (GstStructure * s)
+{
+  guint64 mask;
+  int channels;
+
+  if (!gst_structure_get_int (s, "channels", &channels) ||
+      channels == 0)
+    return FALSE;
+
+  if (!gst_structure_get (s, "channel-mask", GST_TYPE_BITMASK, &mask, NULL))
+    return FALSE;
+
+  if (mask & GST_AUDIO_CHANNEL_POSITION_LFE1 ||
+      mask & GST_AUDIO_CHANNEL_POSITION_LFE2)
+    return TRUE;
+
+  return FALSE;
+}
+
+static void
+bacon_video_widget_get_metadata_string (BaconVideoWidget * bvw,
+                                        BvwMetadataType type,
+                                        GValue * value)
+{
+  char *string = NULL;
+  gboolean res = FALSE;
+
+  g_value_init (value, G_TYPE_STRING);
+
+  if (bvw->priv->play == NULL) {
+    g_value_set_string (value, NULL);
+    return;
+  }
+
+  switch (type) {
+    case BVW_INFO_TITLE:
+      if (bvw->priv->tagcache != NULL) {
+        res = gst_tag_list_get_string_index (bvw->priv->tagcache,
+                                             GST_TAG_TITLE, 0, &string);
+      }
+      break;
+    case BVW_INFO_ARTIST:
+      if (bvw->priv->tagcache != NULL) {
+        res = gst_tag_list_get_string_index (bvw->priv->tagcache,
+                                             GST_TAG_ARTIST, 0, &string);
+      }
+      break;
+    case BVW_INFO_YEAR:
+      if (bvw->priv->tagcache != NULL) {
+        GDate *date;
+
+        if ((res = gst_tag_list_get_date (bvw->priv->tagcache,
+                                          GST_TAG_DATE, &date))) {
+          string = g_strdup_printf ("%d", g_date_get_year (date));
+          g_date_free (date);
+        }
+      }
+      break;
+    case BVW_INFO_COMMENT:
+      if (bvw->priv->tagcache != NULL) {
+        res = gst_tag_list_get_string_index (bvw->priv->tagcache,
+                                             GST_TAG_COMMENT, 0, &string);
+
+        /* Use the Comment; if that fails, use Description as specified by:
+         * http://xiph.org/vorbis/doc/v-comment.html */
+        if (!res) {
+          res = gst_tag_list_get_string_index (bvw->priv->tagcache,
+                                               GST_TAG_DESCRIPTION, 0, &string);
+        }
+      }
+      break;
+    case BVW_INFO_ALBUM:
+      if (bvw->priv->tagcache != NULL) {
+        res = gst_tag_list_get_string_index (bvw->priv->tagcache,
+                                             GST_TAG_ALBUM, 0, &string);
+      }
+      break;
+    case BVW_INFO_CONTAINER:
+      if (bvw->priv->tagcache != NULL) {
+        res = gst_tag_list_get_string_index (bvw->priv->tagcache,
+                                             GST_TAG_CONTAINER_FORMAT, 0, &string);
+      }
+      break;
+    case BVW_INFO_VIDEO_CODEC: {
+      GstTagList *tags;
+
+      /* try to get this from the stream info first */
+      if ((tags = bvw_get_tags_of_current_stream (bvw, "video"))) {
+        res = gst_tag_list_get_string (tags, GST_TAG_CODEC, &string);
+	gst_tag_list_free (tags);
+      }
+
+      /* if that didn't work, try the aggregated tags */
+      if (!res && bvw->priv->tagcache != NULL) {
+        res = gst_tag_list_get_string (bvw->priv->tagcache,
+            GST_TAG_VIDEO_CODEC, &string);
+      }
+      break;
+    }
+    case BVW_INFO_AUDIO_CODEC: {
+      GstTagList *tags;
+
+      /* try to get this from the stream info first */
+      if ((tags = bvw_get_tags_of_current_stream (bvw, "audio"))) {
+        res = gst_tag_list_get_string (tags, GST_TAG_CODEC, &string);
+	gst_tag_list_free (tags);
+      }
+
+      /* if that didn't work, try the aggregated tags */
+      if (!res && bvw->priv->tagcache != NULL) {
+        res = gst_tag_list_get_string (bvw->priv->tagcache,
+            GST_TAG_AUDIO_CODEC, &string);
+      }
+      break;
+    }
+    case BVW_INFO_AUDIO_CHANNELS: {
+      GstStructure *s;
+      GstCaps *caps;
+
+      caps = bvw_get_caps_of_current_stream (bvw, "audio");
+      if (caps) {
+        gint channels = 0;
+
+        s = gst_caps_get_structure (caps, 0);
+        if ((res = gst_structure_get_int (s, "channels", &channels))) {
+          /* FIXME: do something more sophisticated - but what? */
+          if (channels > 2 && audio_caps_have_LFE (s)) {
+            string = g_strdup_printf ("%s %d.1", _("Surround"), channels - 1);
+          } else if (channels == 1) {
+            string = g_strdup (_("Mono"));
+          } else if (channels == 2) {
+            string = g_strdup (_("Stereo"));
+          } else {
+            string = g_strdup_printf ("%d", channels);
+          }
+        }
+        gst_caps_unref (caps);
+      }
+      break;
+    }
+
+    case BVW_INFO_DURATION:
+    case BVW_INFO_TRACK_NUMBER:
+    case BVW_INFO_COVER:
+    case BVW_INFO_HAS_VIDEO:
+    case BVW_INFO_DIMENSION_X:
+    case BVW_INFO_DIMENSION_Y:
+    case BVW_INFO_VIDEO_BITRATE:
+    case BVW_INFO_FPS:
+    case BVW_INFO_HAS_AUDIO:
+    case BVW_INFO_AUDIO_BITRATE:
+    case BVW_INFO_AUDIO_SAMPLE_RATE:
+      /* Not strings */
+    default:
+      g_assert_not_reached ();
+    }
+
+  /* Remove line feeds */
+  if (string && strstr (string, "\n") != NULL)
+    g_strdelimit (string, "\n", ' ');
+
+  if (res && string && g_utf8_validate (string, -1, NULL)) {
+    g_value_take_string (value, string);
+    GST_DEBUG ("%s = '%s'", get_type_name (BVW_TYPE_METADATA_TYPE, type), string);
+  } else {
+    g_value_set_string (value, NULL);
+    g_free (string);
+  }
+
+  return;
+}
+
+static void
+bacon_video_widget_get_metadata_int (BaconVideoWidget * bvw,
+                                     BvwMetadataType type,
+                                     GValue * value)
+{
+  int integer = 0;
+
+  g_value_init (value, G_TYPE_INT);
+
+  if (bvw->priv->play == NULL) {
+    g_value_set_int (value, 0);
+    return;
+  }
+
+  switch (type) {
+    case BVW_INFO_DURATION:
+      integer = bacon_video_widget_get_stream_length (bvw) / 1000;
+      break;
+    case BVW_INFO_TRACK_NUMBER:
+      if (bvw->priv->tagcache == NULL)
+        break;
+      if (!gst_tag_list_get_uint (bvw->priv->tagcache,
+                                  GST_TAG_TRACK_NUMBER, (guint *) &integer))
+        integer = 0;
+      break;
+    case BVW_INFO_DIMENSION_X:
+      integer = bvw->priv->video_width;
+      break;
+    case BVW_INFO_DIMENSION_Y:
+      integer = bvw->priv->video_height;
+      break;
+    case BVW_INFO_FPS:
+      if (bvw->priv->video_fps_d > 0) {
+        /* Round up/down to the nearest integer framerate */
+        integer = (bvw->priv->video_fps_n + bvw->priv->video_fps_d/2) /
+                  bvw->priv->video_fps_d;
+      }
+      else
+        integer = 0;
+      break;
+    case BVW_INFO_AUDIO_BITRATE:
+      if (bvw->priv->audiotags == NULL)
+        break;
+      if (gst_tag_list_get_uint (bvw->priv->audiotags, GST_TAG_BITRATE,
+          (guint *)&integer) ||
+          gst_tag_list_get_uint (bvw->priv->audiotags, GST_TAG_NOMINAL_BITRATE,
+          (guint *)&integer)) {
+        integer /= 1000;
+      }
+      break;
+    case BVW_INFO_VIDEO_BITRATE:
+      if (bvw->priv->videotags == NULL)
+        break;
+      if (gst_tag_list_get_uint (bvw->priv->videotags, GST_TAG_BITRATE,
+          (guint *)&integer) ||
+          gst_tag_list_get_uint (bvw->priv->videotags, GST_TAG_NOMINAL_BITRATE,
+          (guint *)&integer)) {
+        integer /= 1000;
+      }
+      break;
+    case BVW_INFO_AUDIO_SAMPLE_RATE: {
+      GstStructure *s;
+      GstCaps *caps;
+
+      caps = bvw_get_caps_of_current_stream (bvw, "audio");
+      if (caps) {
+        s = gst_caps_get_structure (caps, 0);
+        gst_structure_get_int (s, "rate", &integer);
+        gst_caps_unref (caps);
+      }
+      break;
+    }
+
+    case BVW_INFO_TITLE:
+    case BVW_INFO_ARTIST:
+    case BVW_INFO_YEAR:
+    case BVW_INFO_COMMENT:
+    case BVW_INFO_ALBUM:
+    case BVW_INFO_COVER:
+    case BVW_INFO_CONTAINER:
+    case BVW_INFO_HAS_VIDEO:
+    case BVW_INFO_VIDEO_CODEC:
+    case BVW_INFO_HAS_AUDIO:
+    case BVW_INFO_AUDIO_CODEC:
+    case BVW_INFO_AUDIO_CHANNELS:
+      /* Not ints */
+    default:
+      g_assert_not_reached ();
+    }
+
+  g_value_set_int (value, integer);
+  GST_DEBUG ("%s = %d", get_type_name (BVW_TYPE_METADATA_TYPE, type), integer);
+
+  return;
+}
+
+static void
+bacon_video_widget_get_metadata_bool (BaconVideoWidget * bvw,
+                                      BvwMetadataType type,
+                                      GValue * value)
+{
+  gboolean boolean = FALSE;
+
+  g_value_init (value, G_TYPE_BOOLEAN);
+
+  if (bvw->priv->play == NULL) {
+    g_value_set_boolean (value, FALSE);
+    return;
+  }
+
+  GST_DEBUG ("tagcache  = %" GST_PTR_FORMAT, bvw->priv->tagcache);
+  GST_DEBUG ("videotags = %" GST_PTR_FORMAT, bvw->priv->videotags);
+  GST_DEBUG ("audiotags = %" GST_PTR_FORMAT, bvw->priv->audiotags);
+
+  switch (type)
+  {
+    case BVW_INFO_HAS_VIDEO:
+      boolean = bvw->priv->media_has_video;
+      break;
+    case BVW_INFO_HAS_AUDIO:
+      boolean = bvw->priv->media_has_audio;
+      break;
+
+    case BVW_INFO_TITLE:
+    case BVW_INFO_ARTIST:
+    case BVW_INFO_YEAR:
+    case BVW_INFO_COMMENT:
+    case BVW_INFO_ALBUM:
+    case BVW_INFO_DURATION:
+    case BVW_INFO_TRACK_NUMBER:
+    case BVW_INFO_COVER:
+    case BVW_INFO_CONTAINER:
+    case BVW_INFO_DIMENSION_X:
+    case BVW_INFO_DIMENSION_Y:
+    case BVW_INFO_VIDEO_BITRATE:
+    case BVW_INFO_VIDEO_CODEC:
+    case BVW_INFO_FPS:
+    case BVW_INFO_AUDIO_BITRATE:
+    case BVW_INFO_AUDIO_CODEC:
+    case BVW_INFO_AUDIO_SAMPLE_RATE:
+    case BVW_INFO_AUDIO_CHANNELS:
+      /* Not bools */
+    default:
+      g_assert_not_reached ();
+  }
+
+  g_value_set_boolean (value, boolean);
+  GST_DEBUG ("%s = %s", get_type_name (BVW_TYPE_METADATA_TYPE, type), (boolean) ? "yes" : "no");
+
+  return;
+}
+
+/**
+ * bacon_video_widget_get_metadata:
+ * @bvw: a #BaconVideoWidget
+ * @type: the type of metadata to return
+ * @value: a #GValue
+ *
+ * Provides metadata of the given @type about the current stream in @value.
+ *
+ * Free the #GValue with g_value_unset().
+ **/
+void
+bacon_video_widget_get_metadata (BaconVideoWidget * bvw,
+                                 BvwMetadataType type,
+                                 GValue * value)
+{
+  g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
+  g_return_if_fail (GST_IS_ELEMENT (bvw->priv->play));
+
+  switch (type)
+    {
+    case BVW_INFO_TITLE:
+    case BVW_INFO_ARTIST:
+    case BVW_INFO_YEAR:
+    case BVW_INFO_COMMENT:
+    case BVW_INFO_ALBUM:
+    case BVW_INFO_CONTAINER:
+    case BVW_INFO_VIDEO_CODEC:
+    case BVW_INFO_AUDIO_CODEC:
+    case BVW_INFO_AUDIO_CHANNELS:
+      bacon_video_widget_get_metadata_string (bvw, type, value);
+      break;
+    case BVW_INFO_DURATION:
+    case BVW_INFO_DIMENSION_X:
+    case BVW_INFO_DIMENSION_Y:
+    case BVW_INFO_FPS:
+    case BVW_INFO_AUDIO_BITRATE:
+    case BVW_INFO_VIDEO_BITRATE:
+    case BVW_INFO_TRACK_NUMBER:
+    case BVW_INFO_AUDIO_SAMPLE_RATE:
+      bacon_video_widget_get_metadata_int (bvw, type, value);
+      break;
+    case BVW_INFO_HAS_VIDEO:
+    case BVW_INFO_HAS_AUDIO:
+      bacon_video_widget_get_metadata_bool (bvw, type, value);
+      break;
+    case BVW_INFO_COVER:
+      {
+	GdkPixbuf *pixbuf;
+
+	if (!bvw->priv->tagcache)
+	  break;
+
+	pixbuf = totem_gst_tag_list_get_cover (bvw->priv->tagcache);
+	if (pixbuf) {
+	  g_value_init (value, GDK_TYPE_PIXBUF);
+	  g_value_take_object (value, pixbuf);
+        }
+      }
+      break;
+    default:
+      g_return_if_reached ();
+    }
+
+  return;
+}
+
+/* Screenshot functions */
+
+/**
+ * bacon_video_widget_can_get_frames:
+ * @bvw: a #BaconVideoWidget
+ * @error: a #GError, or %NULL
+ *
+ * Determines whether individual frames from the current stream can
+ * be returned using bacon_video_widget_get_current_frame().
+ *
+ * Frames cannot be returned for audio-only streams, unless visualisations
+ * are enabled.
+ *
+ * Return value: %TRUE if frames can be captured, %FALSE otherwise
+ **/
+gboolean
+bacon_video_widget_can_get_frames (BaconVideoWidget * bvw, GError ** error)
+{
+  g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), FALSE);
+  g_return_val_if_fail (GST_IS_ELEMENT (bvw->priv->play), FALSE);
+
+  /* check for video */
+  if (!bvw->priv->media_has_video && !bvw->priv->show_vfx) {
+    g_set_error_literal (error, BVW_ERROR, BVW_ERROR_CANNOT_CAPTURE,
+        _("Media contains no supported video streams."));
+    return FALSE;
+  }
+
+  return TRUE;
+}
+
+/**
+ * bacon_video_widget_get_current_frame:
+ * @bvw: a #BaconVideoWidget
+ *
+ * Returns a #GdkPixbuf containing the current frame from the playing
+ * stream. This will wait for any pending seeks to complete before
+ * capturing the frame.
+ *
+ * Return value: the current frame, or %NULL; unref with g_object_unref()
+ **/
+GdkPixbuf *
+bacon_video_widget_get_current_frame (BaconVideoWidget * bvw)
+{
+  g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), NULL);
+  g_return_val_if_fail (GST_IS_ELEMENT (bvw->priv->play), NULL);
+
+  /* no video info */
+  if (!bvw->priv->video_width || !bvw->priv->video_height) {
+    GST_DEBUG ("Could not take screenshot: %s", "no video info");
+    g_warning ("Could not take screenshot: %s", "no video info");
+    return NULL;
+  }
+
+  return totem_gst_playbin_get_frame (bvw->priv->play);
+}
+
+/* =========================================== */
+/*                                             */
+/*          Widget typing & Creation           */
+/*                                             */
+/* =========================================== */
+
+/**
+ * bacon_video_widget_get_option_group:
+ *
+ * Returns the #GOptionGroup containing command-line options for
+ * #BaconVideoWidget.
+ *
+ * Applications must call either this exactly once.
+ *
+ * Return value: a #GOptionGroup giving command-line options for #BaconVideoWidget
+ **/
+GOptionGroup*
+bacon_video_widget_get_option_group (void)
+{
+  return gst_init_get_option_group ();
+}
+
+GQuark
+bacon_video_widget_error_quark (void)
+{
+  static GQuark q; /* 0 */
+
+  if (G_UNLIKELY (q == 0)) {
+    q = g_quark_from_static_string ("bvw-error-quark");
+  }
+  return q;
+}
+
+static gboolean
+bvw_set_playback_direction (BaconVideoWidget *bvw, gboolean forward)
+{
+  gboolean is_forward;
+  gboolean retval;
+
+  is_forward = (bvw->priv->rate > 0.0);
+  if (forward == is_forward)
+    return TRUE;
+
+  retval = FALSE;
+
+  if (forward == FALSE) {
+    GstEvent *event;
+    gint64 cur = 0;
+
+    if (gst_element_query_position (bvw->priv->play, GST_FORMAT_TIME, &cur)) {
+      GST_DEBUG ("Setting playback direction to reverse at %"G_GINT64_FORMAT"", cur);
+      event = gst_event_new_seek (REVERSE_RATE,
+				  GST_FORMAT_TIME, GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_ACCURATE,
+				  GST_SEEK_TYPE_SET, G_GINT64_CONSTANT (0),
+				  GST_SEEK_TYPE_SET, cur);
+      if (gst_element_send_event (bvw->priv->play, event) == FALSE) {
+	GST_WARNING ("Failed to set playback direction to reverse");
+      } else {
+	gst_element_get_state (bvw->priv->play, NULL, NULL, GST_CLOCK_TIME_NONE);
+	bvw->priv->rate = REVERSE_RATE;
+	retval = TRUE;
+      }
+    } else {
+      GST_LOG ("Failed to query position to set playback to reverse");
+    }
+  } else {
+    GstEvent *event;
+    gint64 cur = 0;
+
+    cur = 0;
+    if (gst_element_query_position (bvw->priv->play, GST_FORMAT_TIME, &cur)) {
+      GST_DEBUG ("Setting playback direction to forward at %"G_GINT64_FORMAT"", cur);
+      event = gst_event_new_seek (FORWARD_RATE,
+				  GST_FORMAT_TIME, GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_ACCURATE,
+				  GST_SEEK_TYPE_SET, cur,
+				  GST_SEEK_TYPE_SET, G_GINT64_CONSTANT (0));
+      if (gst_element_send_event (bvw->priv->play, event) == FALSE) {
+	GST_WARNING ("Failed to set playback direction to forward");
+      } else {
+	gst_element_get_state (bvw->priv->play, NULL, NULL, GST_CLOCK_TIME_NONE);
+	bvw->priv->rate = FORWARD_RATE;
+	retval = TRUE;
+      }
+    } else {
+      GST_LOG ("Failed to query position to set playback to forward");
+    }
+  }
+
+  return retval;
+}
+
+static GstElement *
+element_make_or_warn (const char *plugin,
+		      const char *name)
+{
+  GstElement *element;
+  element = gst_element_factory_make (plugin, name);
+  if (!element)
+    g_warning ("Element '%s' is missing, verify your installation", plugin);
+  return element;
+}
+
+static gboolean
+bacon_video_widget_initable_init (GInitable     *initable,
+				  GCancellable  *cancellable,
+				  GError       **error)
+{
+  BaconVideoWidget *bvw;
+  GstElement *audio_sink = NULL, *video_sink = NULL;
+  gchar *version_str;
+  GstPlayFlags flags;
+  ClutterConstraint *constraint;
+  GstElement *audio_bin;
+  GstPad *audio_pad;
+
+  bvw = BACON_VIDEO_WIDGET (initable);
+
+#ifndef GST_DISABLE_GST_DEBUG
+  if (_totem_gst_debug_cat == NULL) {
+    GST_DEBUG_CATEGORY_INIT (_totem_gst_debug_cat, "totem", 0,
+        "Totem GStreamer Backend");
+  }
+#endif
+
+  version_str = gst_version_string ();
+  GST_DEBUG ("Initialised %s", version_str);
+  g_free (version_str);
+
+  gst_pb_utils_init ();
+
+  /* Instantiate all the fallible plugins */
+  bvw->priv->play = element_make_or_warn ("playbin", "play");
+  bvw->priv->audio_pitchcontrol = element_make_or_warn ("pitch", "scaletempo");
+  video_sink = element_make_or_warn ("cluttersink", "video-sink");
+  audio_sink = element_make_or_warn ("autoaudiosink", "audio-sink");
+
+  if (!bvw->priv->play ||
+      !bvw->priv->audio_pitchcontrol ||
+      !video_sink ||
+      !audio_sink) {
+    if (video_sink)
+      g_object_ref_sink (video_sink);
+    if (audio_sink)
+      g_object_ref_sink (audio_sink);
+    g_set_error_literal (error, BVW_ERROR, BVW_ERROR_PLUGIN_LOAD,
+			 _("Some necessary plug-ins are missing. "
+			   "Make sure that the program is correctly installed."));
+    return FALSE;
+  }
+
+  bvw->priv->bus = gst_element_get_bus (bvw->priv->play);
+
+  /* Add the download flag, for streaming buffering,
+   * and the deinterlace flag, for video only */
+  g_object_get (bvw->priv->play, "flags", &flags, NULL);
+  flags |= GST_PLAY_FLAG_DOWNLOAD;
+  g_object_set (bvw->priv->play, "flags", flags, NULL);
+  flags |= GST_PLAY_FLAG_DEINTERLACE;
+  g_object_set (bvw->priv->play, "flags", flags, NULL);
+
+  gst_bus_add_signal_watch (bvw->priv->bus);
+
+  bvw->priv->sig_bus_async = 
+      g_signal_connect (bvw->priv->bus, "message", 
+                        G_CALLBACK (bvw_bus_message_cb),
+                        bvw);
+
+  bvw->priv->speakersetup = BVW_AUDIO_SOUND_STEREO;
+  bvw->priv->visq = BVW_VISUALIZATION_SMALL;
+  bvw->priv->show_vfx = FALSE;
+  bvw->priv->vis_plugins_list = NULL;
+  bvw->priv->vis_element_name = g_strdup ("goom");
+  bvw->priv->ratio_type = BVW_RATIO_AUTO;
+
+  bvw->priv->cursor_shown = TRUE;
+  bvw->priv->logo_mode = FALSE;
+  bvw->priv->auto_resize = FALSE;
+
+  bvw->priv->stage = gtk_clutter_embed_get_stage (GTK_CLUTTER_EMBED (bvw));
+  clutter_actor_set_background_color (CLUTTER_ACTOR (bvw->priv->stage), CLUTTER_COLOR_Black);
+
+  /* Video sink, with aspect frame */
+  bvw->priv->texture = g_object_new (CLUTTER_TYPE_TEXTURE,
+				     "disable-slicing", TRUE,
+				     NULL);
+  g_object_set (G_OBJECT (video_sink), "texture", bvw->priv->texture, NULL);
+
+  /* The logo */
+  bvw->priv->logo_frame = totem_aspect_frame_new ();
+  clutter_actor_set_name (bvw->priv->logo_frame, "logo-frame");
+  bvw->priv->logo = clutter_texture_new ();
+  totem_aspect_frame_set_child (TOTEM_ASPECT_FRAME (bvw->priv->logo_frame), bvw->priv->logo);
+  clutter_actor_add_child (CLUTTER_ACTOR (bvw->priv->stage), bvw->priv->logo_frame);
+  constraint = clutter_bind_constraint_new (bvw->priv->stage, CLUTTER_BIND_SIZE, 0.0);
+  clutter_actor_add_constraint_with_name (bvw->priv->logo_frame, "size", constraint);
+  clutter_actor_hide (CLUTTER_ACTOR (bvw->priv->logo_frame));
+
+  /* The video */
+  bvw->priv->frame = totem_aspect_frame_new ();
+  clutter_actor_set_name (bvw->priv->frame, "frame");
+  totem_aspect_frame_set_child (TOTEM_ASPECT_FRAME (bvw->priv->frame), bvw->priv->texture);
+
+  clutter_actor_add_child (CLUTTER_ACTOR (bvw->priv->stage), bvw->priv->frame);
+  constraint = clutter_bind_constraint_new (bvw->priv->stage, CLUTTER_BIND_SIZE, 0.0);
+  clutter_actor_add_constraint_with_name (bvw->priv->frame, "size", constraint);
+
+  clutter_actor_set_child_above_sibling (CLUTTER_ACTOR (bvw->priv->stage),
+					 CLUTTER_ACTOR (bvw->priv->logo_frame),
+					 CLUTTER_ACTOR (bvw->priv->frame));
+
+  /* The OSD */
+  bvw->priv->osd = bacon_video_osd_actor_new ();
+  clutter_actor_set_anchor_point (bvw->priv->osd, -OSD_MARGIN, -OSD_MARGIN); /* FIXME RTL */
+  clutter_actor_set_size (bvw->priv->osd, OSD_SIZE, OSD_SIZE);
+  clutter_actor_add_child (bvw->priv->stage, bvw->priv->osd);
+  clutter_actor_set_child_above_sibling (bvw->priv->stage,
+					 bvw->priv->osd,
+					 bvw->priv->frame);
+  bacon_video_osd_actor_hide (BACON_VIDEO_OSD_ACTOR (bvw->priv->osd));
+
+  /* And tell playbin */
+  g_object_set (bvw->priv->play, "video-sink", video_sink, NULL);
+
+  /* Link the audiopitch element */
+  bvw->priv->audio_capsfilter =
+    gst_element_factory_make ("capsfilter", "audiofilter");
+  audio_bin = gst_bin_new ("audiosinkbin");
+  gst_bin_add_many (GST_BIN (audio_bin), bvw->priv->audio_capsfilter,
+		    bvw->priv->audio_pitchcontrol, audio_sink, NULL);
+  gst_element_link_pads (bvw->priv->audio_capsfilter, "src",
+			 bvw->priv->audio_pitchcontrol, "sink");
+  gst_element_link_pads (bvw->priv->audio_pitchcontrol, "src",
+			 audio_sink, "sink");
+
+  audio_pad = gst_element_get_static_pad (bvw->priv->audio_capsfilter, "sink");
+  gst_element_add_pad (audio_bin, gst_ghost_pad_new ("sink", audio_pad));
+  gst_object_unref (audio_pad);
+
+  /* And tell playbin */
+  g_object_set (bvw->priv->play, "audio-sink", audio_bin, NULL);
+
+  /* Set default connection speed */
+  g_object_set (bvw->priv->play, "connection-speed", MAX_NETWORK_SPEED, NULL);
+
+  g_signal_connect (G_OBJECT (bvw->priv->play), "notify::volume",
+      G_CALLBACK (notify_volume_cb), bvw);
+  g_signal_connect (bvw->priv->play, "source-setup",
+      G_CALLBACK (playbin_source_setup_cb), bvw);
+  g_signal_connect (bvw->priv->play, "video-changed",
+      G_CALLBACK (playbin_stream_changed_cb), bvw);
+  g_signal_connect (bvw->priv->play, "audio-changed",
+      G_CALLBACK (playbin_stream_changed_cb), bvw);
+  g_signal_connect (bvw->priv->play, "text-changed",
+      G_CALLBACK (playbin_stream_changed_cb), bvw);
+  g_signal_connect (bvw->priv->play, "deep-notify::temp-location",
+      G_CALLBACK (playbin_deep_notify_cb), bvw);
+
+  g_signal_connect (bvw->priv->play, "video-tags-changed",
+      G_CALLBACK (video_tags_changed_cb), bvw);
+  g_signal_connect (bvw->priv->play, "audio-tags-changed",
+      G_CALLBACK (audio_tags_changed_cb), bvw);
+  g_signal_connect (bvw->priv->play, "text-tags-changed",
+      G_CALLBACK (text_tags_changed_cb), bvw);
+
+  return TRUE;
+}
+
+static void
+bacon_video_widget_initable_iface_init (GInitableIface *iface)
+{
+  iface->init = bacon_video_widget_initable_init;
+}
+
+/**
+ * bacon_video_widget_new:
+ * @error: a #GError, or %NULL
+ *
+ * Creates a new #BaconVideoWidget.
+ *
+ * A #BvwError will be returned on error.
+ *
+ * Return value: a new #BaconVideoWidget, or %NULL; destroy with gtk_widget_destroy()
+ **/
+GtkWidget *
+bacon_video_widget_new (GError ** error)
+{
+  return GTK_WIDGET (g_initable_new (BACON_TYPE_VIDEO_WIDGET, NULL, error, NULL));
+}
+
+/**
+ * bacon_video_widget_get_rate:
+ * @bvw: a #BaconVideoWidget
+ *
+ * Get the current playback rate, with 1.0 being normal rate.
+ *
+ * Returns: the current playback rate
+ **/
+gfloat
+bacon_video_widget_get_rate (BaconVideoWidget *bvw)
+{
+  return bvw->priv->rate;
+}
+
+/**
+ * bacon_video_widget_set_rate:
+ * @bvw: a #BaconVideoWidget
+ * @new_rate: the new playback rate
+ *
+ * Sets the current playback rate.
+ *
+ * Returns: %TRUE on success, %FALSE on failure.
+ **/
+gboolean
+bacon_video_widget_set_rate (BaconVideoWidget *bvw,
+			     gfloat            new_rate)
+{
+  GstEvent *event;
+  gboolean retval = FALSE;
+  gint64 cur;
+  gfloat pitch, ratio;
+
+  g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), FALSE);
+  g_return_val_if_fail (GST_IS_ELEMENT (bvw->priv->play), FALSE);
+
+  /* set upper and lower limit for rate */
+  if (new_rate <= 0.5)
+	return TRUE;
+  if (new_rate >= 2.0)
+	return TRUE;
+  ratio = new_rate / bvw->priv->rate;
+
+  if (gst_element_query_position (bvw->priv->play, GST_FORMAT_TIME, &cur)) {
+    GST_DEBUG ("Setting new rate at %"G_GINT64_FORMAT"", cur);
+    event = gst_event_new_seek (new_rate,
+				GST_FORMAT_TIME, GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_ACCURATE,
+				GST_SEEK_TYPE_SET, cur,
+				GST_SEEK_TYPE_SET, GST_CLOCK_TIME_NONE);
+    if (gst_element_send_event (bvw->priv->play, event) == FALSE) {
+      GST_DEBUG ("Failed to change rate");
+    } else {
+      gst_element_get_state (bvw->priv->play, NULL, NULL, GST_CLOCK_TIME_NONE);
+      bvw->priv->rate = new_rate;
+      retval = TRUE;
+    }
+  } else {
+    GST_DEBUG ("failed to query position");
+  }
+
+  return retval;
+}
+
+/*
+ * vim: sw=2 ts=8 cindent noai bs=2
+ */
diff -Nru totem-3.4.3/src/backend/bacon-video-widget.h totem-3.6.2/src/backend/bacon-video-widget.h
--- totem-3.4.3/src/backend/bacon-video-widget.h	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/backend/bacon-video-widget.h	2012-08-29 23:07:45.000000000 +0000
@@ -29,8 +29,6 @@
 #define HAVE_BACON_VIDEO_WIDGET_H
 
 #include 
-/* for optical disc enumeration type */
-#include 
 
 G_BEGIN_DECLS
 
@@ -64,25 +62,20 @@
 	/*< private >*/
 	GtkClutterEmbedClass parent_class;
 
-	void (*error) (GtkWidget *bvw, const char *message,
-                       gboolean playback_stopped, gboolean fatal);
+	void (*error) (GtkWidget *bvw, const char *message, gboolean playback_stopped);
 	void (*eos) (GtkWidget *bvw);
 	void (*got_metadata) (GtkWidget *bvw);
 	void (*got_redirect) (GtkWidget *bvw, const char *mrl);
-	void (*title_change) (GtkWidget *bvw, const char *title);
 	void (*channels_change) (GtkWidget *bvw);
 	void (*tick) (GtkWidget *bvw, gint64 current_time, gint64 stream_length,
 			double current_position, gboolean seekable);
-	void (*buffering) (GtkWidget *bvw, guint progress);
+	void (*buffering) (GtkWidget *bvw, gdouble percentage);
 	void (*download_buffering) (GtkWidget *bvw, gdouble percentage);
 } BaconVideoWidgetClass;
 
 /**
  * BvwError:
- * @BVW_ERROR_AUDIO_PLUGIN: Error loading audio output plugin or device.
- * @BVW_ERROR_NO_PLUGIN_FOR_FILE: A required GStreamer plugin or xine feature is missing.
- * @BVW_ERROR_VIDEO_PLUGIN: Error loading video output plugin or device.
- * @BVW_ERROR_AUDIO_BUSY: Audio output device is busy.
+ * @BVW_ERROR_NO_PLUGIN_FOR_FILE: A required GStreamer plugin is missing.
  * @BVW_ERROR_BROKEN_FILE: The movie file is broken and cannot be decoded.
  * @BVW_ERROR_FILE_GENERIC: A generic error for problems with movie files.
  * @BVW_ERROR_FILE_PERMISSION: Permission was refused to access the stream, or authentication was required.
@@ -90,14 +83,12 @@
  * @BVW_ERROR_FILE_NOT_FOUND: The stream cannot be found.
  * @BVW_ERROR_DVD_ENCRYPTED: The DVD is encrypted and libdvdcss is not installed.
  * @BVW_ERROR_INVALID_DEVICE: The device given in an MRL (e.g. DVD drive or DVB tuner) did not exist.
- * @BVW_ERROR_DEVICE_BUSY: The device was busy.
  * @BVW_ERROR_UNKNOWN_HOST: The host for a given stream could not be resolved.
  * @BVW_ERROR_NETWORK_UNREACHABLE: The host for a given stream could not be reached.
  * @BVW_ERROR_CONNECTION_REFUSED: The server for a given stream refused the connection.
  * @BVW_ERROR_INVALID_LOCATION: An MRL was malformed, or CDDB playback was attempted (which is now unsupported).
  * @BVW_ERROR_GENERIC: A generic error occurred.
  * @BVW_ERROR_CODEC_NOT_HANDLED: The audio or video codec required by the stream is not supported.
- * @BVW_ERROR_AUDIO_ONLY: An audio-only stream could not be played due to missing audio output support.
  * @BVW_ERROR_CANNOT_CAPTURE: Error determining frame capture support for a video with bacon_video_widget_can_get_frames().
  * @BVW_ERROR_READ_ERROR: A generic error for problems reading streams.
  * @BVW_ERROR_PLUGIN_LOAD: A library or plugin could not be loaded.
@@ -107,10 +98,7 @@
  **/
 typedef enum {
 	/* Plugins */
-	BVW_ERROR_AUDIO_PLUGIN,
 	BVW_ERROR_NO_PLUGIN_FOR_FILE,
-	BVW_ERROR_VIDEO_PLUGIN,
-	BVW_ERROR_AUDIO_BUSY,
 	/* File */
 	BVW_ERROR_BROKEN_FILE,
 	BVW_ERROR_FILE_GENERIC,
@@ -120,7 +108,6 @@
 	/* Devices */
 	BVW_ERROR_DVD_ENCRYPTED,
 	BVW_ERROR_INVALID_DEVICE,
-	BVW_ERROR_DEVICE_BUSY,
 	/* Network */
 	BVW_ERROR_UNKNOWN_HOST,
 	BVW_ERROR_NETWORK_UNREACHABLE,
@@ -129,7 +116,6 @@
 	BVW_ERROR_INVALID_LOCATION,
 	BVW_ERROR_GENERIC,
 	BVW_ERROR_CODEC_NOT_HANDLED,
-	BVW_ERROR_AUDIO_ONLY,
 	BVW_ERROR_CANNOT_CAPTURE,
 	BVW_ERROR_READ_ERROR,
 	BVW_ERROR_PLUGIN_LOAD,
@@ -142,12 +128,9 @@
 
 GtkWidget *bacon_video_widget_new		 (GError **error);
 
-char *bacon_video_widget_get_backend_name (BaconVideoWidget *bvw);
-
 /* Actions */
 gboolean bacon_video_widget_open		 (BaconVideoWidget *bvw,
 						  const char *mrl,
-						  const char *subtitle_uri,
 						  GError **error);
 gboolean bacon_video_widget_play                 (BaconVideoWidget *bvw,
 						  GError **error);
@@ -181,6 +164,8 @@
 double bacon_video_widget_get_volume             (BaconVideoWidget *bvw);
 
 /* Properties */
+void bacon_video_widget_set_text_subtitle	(BaconVideoWidget * bvw,
+						 const gchar * subtitle_uri);
 void bacon_video_widget_set_logo		 (BaconVideoWidget *bvw,
 						  const char *name);
 void  bacon_video_widget_set_logo_mode		 (BaconVideoWidget *bvw,
@@ -198,46 +183,6 @@
 void bacon_video_widget_set_auto_resize		 (BaconVideoWidget *bvw,
 						  gboolean auto_resize);
 
-/**
- * BvwConnectionSpeed:
- * @BVW_SPEED_14_4_MODEM: 14.4 Kbps Modem
- * @BVW_SPEED_19_2_MODEM: 19.2 Kbps Modem
- * @BVW_SPEED_28_8_MODEM: 28.8 Kbps Modem
- * @BVW_SPEED_33_6_MODEM: 33.6 Kbps Modem
- * @BVW_SPEED_34_4_MODEM: 34.4 Kbps Modem
- * @BVW_SPEED_56_ISDN: 56 Kbps Modem/ISDN
- * @BVW_SPEED_112_ISDN: 112 Kbps Dual ISDN/DSL
- * @BVW_SPEED_256_DSL: 256 Kbps DSL/Cable
- * @BVW_SPEED_384_DSL: 384 Kbps DSL/Cable
- * @BVW_SPEED_512_DSL: 512 Kbps DSL/Cable
- * @BVW_SPEED_1500_T1: 1.5 Mbps T1/Intranet/LAN
- * @BVW_SPEED_LAN: Intranet/LAN
- *
- * The different connection speeds understood by bacon_video_widget_set_connection_speed().
- */
-typedef enum {
-	BVW_SPEED_14_4_MODEM = 0,
-	BVW_SPEED_19_2_MODEM,
-	BVW_SPEED_28_8_MODEM,
-	BVW_SPEED_33_6_MODEM,
-	BVW_SPEED_34_4_MODEM,
-	BVW_SPEED_56_ISDN,
-	BVW_SPEED_112_ISDN,
-	BVW_SPEED_256_DSL,
-	BVW_SPEED_384_DSL,
-	BVW_SPEED_512_DSL,
-	BVW_SPEED_1500_T1,
-	BVW_SPEED_LAN
-} BvwConnectionSpeed;
-
-void bacon_video_widget_set_connection_speed     (BaconVideoWidget *bvw,
-						  int speed);
-int bacon_video_widget_get_connection_speed      (BaconVideoWidget *bvw);
-
-gchar **bacon_video_widget_get_mrls		 (BaconVideoWidget *bvw,
-						  TotemDiscMediaType type,
-						  const char *device,
-						  GError **error);
 void bacon_video_widget_set_subtitle_font	 (BaconVideoWidget *bvw,
 						  const char *font);
 void bacon_video_widget_set_subtitle_encoding	 (BaconVideoWidget *bvw,
@@ -249,6 +194,10 @@
 void bacon_video_widget_set_referrer             (BaconVideoWidget *bvw,
                                                   const char *referrer);
 
+gboolean bacon_video_widget_set_rate		 (BaconVideoWidget *bvw,
+						  gfloat new_rate);
+gfloat bacon_video_widget_get_rate		 (BaconVideoWidget *bvw);
+
 /* Metadata */
 /**
  * BvwMetadataType:
@@ -381,6 +330,23 @@
 	BVW_ZOOM_EXPAND = 1
 } BvwZoomMode;
 
+/**
+ * BvwRotation:
+ * @BVW_ROTATION_R_ZERO: No rotation
+ * @BVW_ROTATION_R_90R: Rotate 90 degrees to the right
+ * @BVW_ROTATION_R_180: Rotate 180 degrees
+ * @BVW_ROTATION_R_90L: Rotate 90 degrees to the left
+ *
+ * The rotation is used by the video widget, as set by
+ * bacon_video_widget_set_rotation().
+ **/
+typedef enum {
+	BVW_ROTATION_R_ZERO = 0,
+	BVW_ROTATION_R_90R  = 1,
+	BVW_ROTATION_R_180  = 2,
+	BVW_ROTATION_R_90L  = 3
+} BvwRotation;
+
 void bacon_video_widget_set_deinterlacing        (BaconVideoWidget *bvw,
 						  gboolean deinterlace);
 gboolean bacon_video_widget_get_deinterlacing    (BaconVideoWidget *bvw);
@@ -397,6 +363,10 @@
 						  BvwZoomMode       mode);
 BvwZoomMode bacon_video_widget_get_zoom		 (BaconVideoWidget *bvw);
 
+void bacon_video_widget_set_rotation		 (BaconVideoWidget *bvw,
+						  BvwRotation       rotation);
+BvwRotation bacon_video_widget_get_rotation	 (BaconVideoWidget *bvw);
+
 int bacon_video_widget_get_video_property        (BaconVideoWidget *bvw,
 						  BvwVideoProperty type);
 void bacon_video_widget_set_video_property       (BaconVideoWidget *bvw,
@@ -494,6 +464,10 @@
 void bacon_video_widget_set_audio_output_type    (BaconVideoWidget *bvw,
 						  BvwAudioOutputType type);
 
+/* OSD */
+void bacon_video_widget_popup_osd                 (BaconVideoWidget *bvw,
+						   const char       *icon_name);
+
 G_END_DECLS
 
 #endif				/* HAVE_BACON_VIDEO_WIDGET_H */
diff -Nru totem-3.4.3/src/backend/baconvideowidget-marshal.c totem-3.6.2/src/backend/baconvideowidget-marshal.c
--- totem-3.4.3/src/backend/baconvideowidget-marshal.c	2012-06-29 15:35:37.000000000 +0000
+++ totem-3.6.2/src/backend/baconvideowidget-marshal.c	2012-10-25 13:47:10.000000000 +0000
@@ -100,31 +100,30 @@
             data2);
 }
 
-/* VOID:STRING,BOOLEAN,BOOLEAN (./baconvideowidget-marshal.list:2) */
-extern void baconvideowidget_marshal_VOID__STRING_BOOLEAN_BOOLEAN (GClosure     *closure,
-                                                                   GValue       *return_value,
-                                                                   guint         n_param_values,
-                                                                   const GValue *param_values,
-                                                                   gpointer      invocation_hint,
-                                                                   gpointer      marshal_data);
+/* VOID:STRING,BOOLEAN (./baconvideowidget-marshal.list:2) */
+extern void baconvideowidget_marshal_VOID__STRING_BOOLEAN (GClosure     *closure,
+                                                           GValue       *return_value,
+                                                           guint         n_param_values,
+                                                           const GValue *param_values,
+                                                           gpointer      invocation_hint,
+                                                           gpointer      marshal_data);
 void
-baconvideowidget_marshal_VOID__STRING_BOOLEAN_BOOLEAN (GClosure     *closure,
-                                                       GValue       *return_value G_GNUC_UNUSED,
-                                                       guint         n_param_values,
-                                                       const GValue *param_values,
-                                                       gpointer      invocation_hint G_GNUC_UNUSED,
-                                                       gpointer      marshal_data)
+baconvideowidget_marshal_VOID__STRING_BOOLEAN (GClosure     *closure,
+                                               GValue       *return_value G_GNUC_UNUSED,
+                                               guint         n_param_values,
+                                               const GValue *param_values,
+                                               gpointer      invocation_hint G_GNUC_UNUSED,
+                                               gpointer      marshal_data)
 {
-  typedef void (*GMarshalFunc_VOID__STRING_BOOLEAN_BOOLEAN) (gpointer     data1,
-                                                             gpointer     arg_1,
-                                                             gboolean     arg_2,
-                                                             gboolean     arg_3,
-                                                             gpointer     data2);
-  register GMarshalFunc_VOID__STRING_BOOLEAN_BOOLEAN callback;
+  typedef void (*GMarshalFunc_VOID__STRING_BOOLEAN) (gpointer     data1,
+                                                     gpointer     arg_1,
+                                                     gboolean     arg_2,
+                                                     gpointer     data2);
+  register GMarshalFunc_VOID__STRING_BOOLEAN callback;
   register GCClosure *cc = (GCClosure*) closure;
   register gpointer data1, data2;
 
-  g_return_if_fail (n_param_values == 4);
+  g_return_if_fail (n_param_values == 3);
 
   if (G_CCLOSURE_SWAP_DATA (closure))
     {
@@ -136,12 +135,11 @@
       data1 = g_value_peek_pointer (param_values + 0);
       data2 = closure->data;
     }
-  callback = (GMarshalFunc_VOID__STRING_BOOLEAN_BOOLEAN) (marshal_data ? marshal_data : cc->callback);
+  callback = (GMarshalFunc_VOID__STRING_BOOLEAN) (marshal_data ? marshal_data : cc->callback);
 
   callback (data1,
             g_marshal_value_peek_string (param_values + 1),
             g_marshal_value_peek_boolean (param_values + 2),
-            g_marshal_value_peek_boolean (param_values + 3),
             data2);
 }
 
diff -Nru totem-3.4.3/src/backend/baconvideowidget-marshal.h totem-3.6.2/src/backend/baconvideowidget-marshal.h
--- totem-3.4.3/src/backend/baconvideowidget-marshal.h	2012-06-29 15:35:37.000000000 +0000
+++ totem-3.6.2/src/backend/baconvideowidget-marshal.h	2012-10-25 13:47:10.000000000 +0000
@@ -14,13 +14,13 @@
                                                                        gpointer      invocation_hint,
                                                                        gpointer      marshal_data);
 
-/* VOID:STRING,BOOLEAN,BOOLEAN (./baconvideowidget-marshal.list:2) */
-extern void baconvideowidget_marshal_VOID__STRING_BOOLEAN_BOOLEAN (GClosure     *closure,
-                                                                   GValue       *return_value,
-                                                                   guint         n_param_values,
-                                                                   const GValue *param_values,
-                                                                   gpointer      invocation_hint,
-                                                                   gpointer      marshal_data);
+/* VOID:STRING,BOOLEAN (./baconvideowidget-marshal.list:2) */
+extern void baconvideowidget_marshal_VOID__STRING_BOOLEAN (GClosure     *closure,
+                                                           GValue       *return_value,
+                                                           guint         n_param_values,
+                                                           const GValue *param_values,
+                                                           gpointer      invocation_hint,
+                                                           gpointer      marshal_data);
 
 /* BOOLEAN:BOXED,BOXED,BOOLEAN (./baconvideowidget-marshal.list:3) */
 extern void baconvideowidget_marshal_BOOLEAN__BOXED_BOXED_BOOLEAN (GClosure     *closure,
diff -Nru totem-3.4.3/src/backend/baconvideowidget-marshal.list totem-3.6.2/src/backend/baconvideowidget-marshal.list
--- totem-3.4.3/src/backend/baconvideowidget-marshal.list	2011-08-25 18:35:01.000000000 +0000
+++ totem-3.6.2/src/backend/baconvideowidget-marshal.list	2012-08-29 23:07:45.000000000 +0000
@@ -1,3 +1,3 @@
 VOID:INT64,INT64,DOUBLE,BOOLEAN
-VOID:STRING,BOOLEAN,BOOLEAN
+VOID:STRING,BOOLEAN
 BOOLEAN:BOXED,BOXED,BOOLEAN
diff -Nru totem-3.4.3/src/backend/bvw-test.c totem-3.6.2/src/backend/bvw-test.c
--- totem-3.4.3/src/backend/bvw-test.c	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/backend/bvw-test.c	2012-10-10 14:41:27.000000000 +0000
@@ -16,7 +16,7 @@
 test_bvw_set_mrl (GtkWidget *bvw, const char *path)
 {
 	mrl = g_strdup (path);
-	bacon_video_widget_open (BACON_VIDEO_WIDGET (bvw), mrl, NULL, NULL);
+	bacon_video_widget_open (BACON_VIDEO_WIDGET (bvw), mrl, NULL);
 }
 
 static void
@@ -76,14 +76,14 @@
 	GOptionGroup *baconoptiongroup;
 	GError *error = NULL;
 	GtkWidget *win, *bvw;
+	GtkSettings *gtk_settings;
 
 #ifdef GDK_WINDOWING_X11
 	XInitThreads ();
 #endif
-#if !GLIB_CHECK_VERSION (2, 31, 0)
-	g_thread_init (NULL);
-#endif
-	gdk_threads_init ();
+
+	if (gtk_clutter_init (NULL, NULL) != CLUTTER_INIT_SUCCESS)
+		g_assert_not_reached ();
 
 	context = g_option_context_new ("- Play audio and video inside a web browser");
 	baconoptiongroup = bacon_video_widget_get_option_group();
@@ -106,6 +106,9 @@
 		return 1;
 	}
 
+	gtk_settings = gtk_settings_get_default ();
+	g_object_set (G_OBJECT (gtk_settings), "gtk-application-prefer-dark-theme", TRUE, NULL);
+
 	win = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 	gtk_window_set_default_size (GTK_WINDOW (win), 500, 500);
 	g_signal_connect (G_OBJECT (win), "destroy",
diff -Nru totem-3.4.3/src/backend/gsd-osd-window-private.h totem-3.6.2/src/backend/gsd-osd-window-private.h
--- totem-3.4.3/src/backend/gsd-osd-window-private.h	1970-01-01 00:00:00.000000000 +0000
+++ totem-3.6.2/src/backend/gsd-osd-window-private.h	2012-08-29 23:07:45.000000000 +0000
@@ -0,0 +1,70 @@
+/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 8; tab-width: 8 -*-
+ *
+ * On-screen-display (OSD) window for gnome-settings-daemon's plugins
+ *
+ * Copyright (C) 2006 William Jon McCann  
+ * Copyright (C) 2009 Novell, Inc
+ *
+ * Authors:
+ *   William Jon McCann 
+ *   Federico Mena-Quintero 
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2, 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 Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ */
+
+/* GsdOsdWindow is an "on-screen-display" window (OSD).  It is the cute,
+ * semi-transparent, curved popup that appears when you press a hotkey global to
+ * the desktop, such as to change the volume, switch your monitor's parameters,
+ * etc.
+ *
+ * You can create a GsdOsdWindow and use it as a normal GtkWindow.  It will
+ * automatically center itself, figure out if it needs to be composited, etc.
+ * Just pack your widgets in it, sit back, and enjoy the ride.
+ */
+
+#ifndef GSD_OSD_WINDOW_PRIVATE_H
+#define GSD_OSD_WINDOW_PRIVATE_H
+
+#include 
+#include 
+#include 
+
+G_BEGIN_DECLS
+
+#define DIALOG_FADE_TIMEOUT 1500  /* timeout before fade starts */
+#define FADE_FRAME_TIMEOUT 10     /* timeout in ms between each frame of the fade */
+
+typedef struct {
+        int                 size;
+        GtkStyleContext    *style;
+        GtkTextDirection    direction;
+
+        GsdOsdWindowAction  action;
+        GtkIconTheme       *theme;
+        const char         *icon_name;
+
+        gboolean            show_level;
+        int                 volume_level;
+        guint               volume_muted : 1;
+} GsdOsdDrawContext;
+
+void gsd_osd_window_draw (GsdOsdDrawContext *ctx, cairo_t *cr);
+
+G_END_DECLS
+
+#endif
diff -Nru totem-3.4.3/src/backend/gsd-osd-window.c totem-3.6.2/src/backend/gsd-osd-window.c
--- totem-3.4.3/src/backend/gsd-osd-window.c	1970-01-01 00:00:00.000000000 +0000
+++ totem-3.6.2/src/backend/gsd-osd-window.c	2012-08-29 23:07:45.000000000 +0000
@@ -0,0 +1,1019 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * On-screen-display (OSD) window for gnome-settings-daemon's plugins
+ *
+ * Copyright (C) 2006-2007 William Jon McCann  
+ * Copyright (C) 2009 Novell, Inc
+ *
+ * Authors:
+ *   William Jon McCann 
+ *   Federico Mena-Quintero 
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2, 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 Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ */
+
+#include "config.h"
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include "gsd-osd-window.h"
+#include "gsd-osd-window-private.h"
+
+#define ICON_SCALE 0.50           /* size of the icon compared to the whole OSD */
+#define FG_ALPHA 1.0              /* Alpha value to be used for foreground objects drawn in an OSD window */
+
+#define GSD_OSD_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_OSD_WINDOW, GsdOsdWindowPrivate))
+
+struct GsdOsdWindowPrivate
+{
+        guint                    hide_timeout_id;
+        guint                    fade_timeout_id;
+        double                   fade_out_alpha;
+
+        gint                     screen_width;
+        gint                     screen_height;
+        gint                     primary_monitor;
+        guint                    monitors_changed_id;
+        guint                    monitor_changed : 1;
+
+        GsdOsdWindowAction       action;
+        char                    *icon_name;
+        gboolean                 show_level;
+
+        int                      volume_level;
+        guint                    volume_muted : 1;
+};
+
+G_DEFINE_TYPE (GsdOsdWindow, gsd_osd_window, GTK_TYPE_WINDOW)
+
+static void gsd_osd_window_update_and_hide (GsdOsdWindow *window);
+
+static void
+gsd_osd_window_draw_rounded_rectangle (cairo_t* cr,
+                                       gdouble  aspect,
+                                       gdouble  x,
+                                       gdouble  y,
+                                       gdouble  corner_radius,
+                                       gdouble  width,
+                                       gdouble  height)
+{
+        gdouble radius = corner_radius / aspect;
+
+        cairo_move_to (cr, x + radius, y);
+
+        cairo_line_to (cr,
+                       x + width - radius,
+                       y);
+        cairo_arc (cr,
+                   x + width - radius,
+                   y + radius,
+                   radius,
+                   -90.0f * G_PI / 180.0f,
+                   0.0f * G_PI / 180.0f);
+        cairo_line_to (cr,
+                       x + width,
+                       y + height - radius);
+        cairo_arc (cr,
+                   x + width - radius,
+                   y + height - radius,
+                   radius,
+                   0.0f * G_PI / 180.0f,
+                   90.0f * G_PI / 180.0f);
+        cairo_line_to (cr,
+                       x + radius,
+                       y + height);
+        cairo_arc (cr,
+                   x + radius,
+                   y + height - radius,
+                   radius,
+                   90.0f * G_PI / 180.0f,
+                   180.0f * G_PI / 180.0f);
+        cairo_line_to (cr,
+                       x,
+                       y + radius);
+        cairo_arc (cr,
+                   x + radius,
+                   y + radius,
+                   radius,
+                   180.0f * G_PI / 180.0f,
+                   270.0f * G_PI / 180.0f);
+        cairo_close_path (cr);
+}
+
+static gboolean
+fade_timeout (GsdOsdWindow *window)
+{
+        if (window->priv->fade_out_alpha <= 0.0) {
+                gtk_widget_hide (GTK_WIDGET (window));
+
+                /* Reset it for the next time */
+                window->priv->fade_out_alpha = 1.0;
+                window->priv->fade_timeout_id = 0;
+
+                return FALSE;
+        } else {
+                GdkRectangle rect;
+                GtkWidget *win = GTK_WIDGET (window);
+                GtkAllocation allocation;
+
+                window->priv->fade_out_alpha -= 0.10;
+
+                rect.x = 0;
+                rect.y = 0;
+                gtk_widget_get_allocation (win, &allocation);
+                rect.width = allocation.width;
+                rect.height = allocation.height;
+
+                gtk_widget_realize (win);
+                gdk_window_invalidate_rect (gtk_widget_get_window (win), &rect, FALSE);
+        }
+
+        return TRUE;
+}
+
+static gboolean
+hide_timeout (GsdOsdWindow *window)
+{
+	window->priv->hide_timeout_id = 0;
+	window->priv->fade_timeout_id = g_timeout_add (FADE_FRAME_TIMEOUT,
+						       (GSourceFunc) fade_timeout,
+						       window);
+
+        return FALSE;
+}
+
+static void
+remove_hide_timeout (GsdOsdWindow *window)
+{
+        if (window->priv->hide_timeout_id != 0) {
+                g_source_remove (window->priv->hide_timeout_id);
+                window->priv->hide_timeout_id = 0;
+        }
+
+        if (window->priv->fade_timeout_id != 0) {
+                g_source_remove (window->priv->fade_timeout_id);
+                window->priv->fade_timeout_id = 0;
+                window->priv->fade_out_alpha = 1.0;
+        }
+}
+
+static void
+add_hide_timeout (GsdOsdWindow *window)
+{
+        window->priv->hide_timeout_id = g_timeout_add (DIALOG_FADE_TIMEOUT,
+                                                       (GSourceFunc) hide_timeout,
+                                                       window);
+}
+
+static const char *
+get_image_name_for_volume (gboolean muted,
+                           int volume)
+{
+        static const char *icon_names[] = {
+                "audio-volume-muted-symbolic",
+                "audio-volume-low-symbolic",
+                "audio-volume-medium-symbolic",
+                "audio-volume-high-symbolic",
+                NULL
+        };
+        int n;
+
+        if (muted) {
+                n = 0;
+        } else {
+                /* select image */
+                n = 3 * volume / 100 + 1;
+                if (n < 1) {
+                        n = 1;
+                } else if (n > 3) {
+                        n = 3;
+                }
+        }
+
+	return icon_names[n];
+}
+
+static void
+action_changed (GsdOsdWindow *window)
+{
+        gsd_osd_window_update_and_hide (GSD_OSD_WINDOW (window));
+}
+
+static void
+volume_level_changed (GsdOsdWindow *window)
+{
+        gsd_osd_window_update_and_hide (GSD_OSD_WINDOW (window));
+}
+
+static void
+volume_muted_changed (GsdOsdWindow *window)
+{
+        gsd_osd_window_update_and_hide (GSD_OSD_WINDOW (window));
+}
+
+void
+gsd_osd_window_set_action (GsdOsdWindow      *window,
+                           GsdOsdWindowAction action)
+{
+        g_return_if_fail (GSD_IS_OSD_WINDOW (window));
+        g_return_if_fail (action == GSD_OSD_WINDOW_ACTION_VOLUME);
+
+        if (window->priv->action != action) {
+                window->priv->action = action;
+                action_changed (window);
+        } else {
+                gsd_osd_window_update_and_hide (GSD_OSD_WINDOW (window));
+        }
+}
+
+void
+gsd_osd_window_set_action_custom (GsdOsdWindow      *window,
+                                  const char        *icon_name,
+                                  gboolean           show_level)
+{
+        g_return_if_fail (GSD_IS_OSD_WINDOW (window));
+        g_return_if_fail (icon_name != NULL);
+
+        if (window->priv->action != GSD_OSD_WINDOW_ACTION_CUSTOM ||
+            g_strcmp0 (window->priv->icon_name, icon_name) != 0 ||
+            window->priv->show_level != show_level) {
+                window->priv->action = GSD_OSD_WINDOW_ACTION_CUSTOM;
+                g_free (window->priv->icon_name);
+                window->priv->icon_name = g_strdup (icon_name);
+                window->priv->show_level = show_level;
+                action_changed (window);
+        } else {
+                gsd_osd_window_update_and_hide (GSD_OSD_WINDOW (window));
+        }
+}
+
+void
+gsd_osd_window_set_volume_muted (GsdOsdWindow *window,
+                                 gboolean      muted)
+{
+        g_return_if_fail (GSD_IS_OSD_WINDOW (window));
+
+        if (window->priv->volume_muted != muted) {
+                window->priv->volume_muted = muted;
+                volume_muted_changed (window);
+        }
+}
+
+void
+gsd_osd_window_set_volume_level (GsdOsdWindow *window,
+                                 int           level)
+{
+        g_return_if_fail (GSD_IS_OSD_WINDOW (window));
+
+        if (window->priv->volume_level != level) {
+                window->priv->volume_level = level;
+                volume_level_changed (window);
+        }
+}
+
+static GdkPixbuf *
+load_pixbuf (GsdOsdDrawContext *ctx,
+             const char        *name,
+             int                icon_size)
+{
+        GtkIconInfo     *info;
+        GdkPixbuf       *pixbuf;
+
+        info = gtk_icon_theme_lookup_icon (ctx->theme,
+                                           name,
+                                           icon_size,
+                                           GTK_ICON_LOOKUP_FORCE_SIZE | GTK_ICON_LOOKUP_GENERIC_FALLBACK);
+
+        if (info == NULL) {
+                g_warning ("Failed to load '%s'", name);
+                return NULL;
+        }
+
+        pixbuf = gtk_icon_info_load_symbolic_for_context (info,
+                                                          ctx->style,
+                                                          NULL,
+                                                          NULL);
+        gtk_icon_info_free (info);
+
+        return pixbuf;
+}
+
+static void
+draw_eject (cairo_t *cr,
+            double   _x0,
+            double   _y0,
+            double   width,
+            double   height)
+{
+        int box_height;
+        int tri_height;
+        int separation;
+
+        box_height = height * 0.2;
+        separation = box_height / 3;
+        tri_height = height - box_height - separation;
+
+        cairo_rectangle (cr, _x0, _y0 + height - box_height, width, box_height);
+
+        cairo_move_to (cr, _x0, _y0 + tri_height);
+        cairo_rel_line_to (cr, width, 0);
+        cairo_rel_line_to (cr, -width / 2, -tri_height);
+        cairo_rel_line_to (cr, -width / 2, tri_height);
+        cairo_close_path (cr);
+        cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, FG_ALPHA);
+        cairo_fill_preserve (cr);
+
+        cairo_set_source_rgba (cr, 0.6, 0.6, 0.6, FG_ALPHA / 2);
+        cairo_set_line_width (cr, 2);
+        cairo_stroke (cr);
+}
+
+static void
+draw_waves (cairo_t *cr,
+            double   cx,
+            double   cy,
+            double   max_radius,
+            int      volume_level)
+{
+        const int n_waves = 3;
+        int last_wave;
+        int i;
+
+        last_wave = n_waves * volume_level / 100;
+
+        for (i = 0; i < n_waves; i++) {
+                double angle1;
+                double angle2;
+                double radius;
+                double alpha;
+
+                angle1 = -M_PI / 4;
+                angle2 = M_PI / 4;
+
+                if (i < last_wave)
+                        alpha = 1.0;
+                else if (i > last_wave)
+                        alpha = 0.1;
+                else alpha = 0.1 + 0.9 * (n_waves * volume_level % 100) / 100.0;
+
+                radius = (i + 1) * (max_radius / n_waves);
+                cairo_arc (cr, cx, cy, radius, angle1, angle2);
+                cairo_set_source_rgba (cr, 0.6, 0.6, 0.6, alpha / 2);
+                cairo_set_line_width (cr, 14);
+                cairo_set_line_cap  (cr, CAIRO_LINE_CAP_ROUND);
+                cairo_stroke_preserve (cr);
+
+                cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, alpha);
+                cairo_set_line_width (cr, 10);
+                cairo_set_line_cap  (cr, CAIRO_LINE_CAP_ROUND);
+                cairo_stroke (cr);
+        }
+}
+
+static void
+draw_cross (cairo_t *cr,
+            double   cx,
+            double   cy,
+            double   size)
+{
+        cairo_move_to (cr, cx, cy - size/2.0);
+        cairo_rel_line_to (cr, size, size);
+
+        cairo_move_to (cr, cx, cy + size/2.0);
+        cairo_rel_line_to (cr, size, -size);
+
+        cairo_set_source_rgba (cr, 0.6, 0.6, 0.6, FG_ALPHA / 2);
+        cairo_set_line_width (cr, 14);
+        cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND);
+        cairo_stroke_preserve (cr);
+
+        cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, FG_ALPHA);
+        cairo_set_line_width (cr, 10);
+        cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND);
+        cairo_stroke (cr);
+}
+
+static void
+draw_speaker (cairo_t *cr,
+              double   cx,
+              double   cy,
+              double   width,
+              double   height)
+{
+        double box_width;
+        double box_height;
+        double _x0;
+        double _y0;
+
+        box_width = width / 3;
+        box_height = height / 3;
+
+        _x0 = cx - (width / 2) + box_width;
+        _y0 = cy - box_height / 2;
+
+        cairo_move_to (cr, _x0, _y0);
+        cairo_rel_line_to (cr, - box_width, 0);
+        cairo_rel_line_to (cr, 0, box_height);
+        cairo_rel_line_to (cr, box_width, 0);
+
+        cairo_line_to (cr, cx + box_width, cy + height / 2);
+        cairo_rel_line_to (cr, 0, -height);
+        cairo_line_to (cr, _x0, _y0);
+        cairo_close_path (cr);
+
+        cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, FG_ALPHA);
+        cairo_fill_preserve (cr);
+
+        cairo_set_source_rgba (cr, 0.6, 0.6, 0.6, FG_ALPHA / 2);
+        cairo_set_line_width (cr, 2);
+        cairo_stroke (cr);
+}
+
+static gboolean
+render_speaker (GsdOsdDrawContext *ctx,
+                cairo_t           *cr,
+                double             _x0,
+                double             _y0,
+                double             width,
+                double             height)
+{
+        GdkPixbuf         *pixbuf;
+        const char        *icon_name;
+        int                icon_size;
+
+        icon_name = get_image_name_for_volume (ctx->volume_muted,
+                                               ctx->volume_level);
+
+        icon_size = (int) width;
+
+        pixbuf = load_pixbuf (ctx, icon_name, icon_size);
+
+        if (pixbuf == NULL) {
+                return FALSE;
+        }
+
+        gtk_render_icon (ctx->style, cr,
+                         pixbuf, _x0, _y0);
+
+        g_object_unref (pixbuf);
+
+        return TRUE;
+}
+
+static void
+draw_volume_boxes (GsdOsdDrawContext *ctx,
+                   cairo_t           *cr,
+                   double             percentage,
+                   double             _x0,
+                   double             _y0,
+                   double             width,
+                   double             height)
+{
+        gdouble   x1;
+        GdkRGBA  acolor;
+
+        height = round (height) - 1;
+        width = round (width) - 1;
+        x1 = round ((width - 1) * percentage);
+
+        /* bar background */
+        gtk_style_context_save (ctx->style);
+        gtk_style_context_add_class (ctx->style, GTK_STYLE_CLASS_TROUGH);
+        gtk_style_context_get_background_color (ctx->style, GTK_STATE_NORMAL, &acolor);
+
+        gsd_osd_window_draw_rounded_rectangle (cr, 1.0, _x0, _y0, height / 6, width, height);
+        gdk_cairo_set_source_rgba (cr, &acolor);
+        cairo_fill (cr);
+
+        gtk_style_context_restore (ctx->style);
+
+        /* bar progress */
+        if (percentage < 0.01)
+                return;
+        gtk_style_context_save (ctx->style);
+        gtk_style_context_add_class (ctx->style, GTK_STYLE_CLASS_PROGRESSBAR);
+        gtk_style_context_get_background_color (ctx->style, GTK_STATE_NORMAL, &acolor);
+
+        gsd_osd_window_draw_rounded_rectangle (cr, 1.0, _x0, _y0, height / 6, x1, height);
+        gdk_cairo_set_source_rgba (cr, &acolor);
+        cairo_fill (cr);
+
+        gtk_style_context_restore (ctx->style);
+}
+
+static void
+draw_action_volume (GsdOsdDrawContext *ctx,
+                    cairo_t           *cr)
+{
+        int window_width;
+        int window_height;
+        double icon_box_width;
+        double icon_box_height;
+        double icon_box_x0;
+        double icon_box_y0;
+        double volume_box_x0;
+        double volume_box_y0;
+        double volume_box_width;
+        double volume_box_height;
+        gboolean res;
+
+	window_width = window_height = ctx->size;
+
+        icon_box_width = round (window_width * ICON_SCALE);
+        icon_box_height = round (window_height * ICON_SCALE);
+        volume_box_width = icon_box_width;
+        volume_box_height = round (window_height * 0.05);
+
+        icon_box_x0 = round ((window_width - icon_box_width) / 2);
+        icon_box_y0 = round ((window_height - icon_box_height - volume_box_height) / 2 - volume_box_height);
+        volume_box_x0 = round (icon_box_x0);
+        volume_box_y0 = round (icon_box_height + icon_box_y0) + volume_box_height;
+
+#if 0
+        g_message ("icon box: w=%f h=%f _x0=%f _y0=%f",
+                   icon_box_width,
+                   icon_box_height,
+                   icon_box_x0,
+                   icon_box_y0);
+        g_message ("volume box: w=%f h=%f _x0=%f _y0=%f",
+                   volume_box_width,
+                   volume_box_height,
+                   volume_box_x0,
+                   volume_box_y0);
+#endif
+
+        res = render_speaker (ctx,
+                              cr,
+                              icon_box_x0, icon_box_y0,
+                              icon_box_width, icon_box_height);
+        if (! res) {
+                double speaker_width;
+                double speaker_height;
+                double speaker_cx;
+                double speaker_cy;
+
+                speaker_width = icon_box_width * 0.5;
+                speaker_height = icon_box_height * 0.75;
+                speaker_cx = icon_box_x0 + speaker_width / 2;
+                speaker_cy = icon_box_y0 + speaker_height / 2;
+
+#if 0
+                g_message ("speaker box: w=%f h=%f cx=%f cy=%f",
+                           speaker_width,
+                           speaker_height,
+                           speaker_cx,
+                           speaker_cy);
+#endif
+
+                /* draw speaker symbol */
+                draw_speaker (cr, speaker_cx, speaker_cy, speaker_width, speaker_height);
+
+                if (!ctx->volume_muted) {
+                        /* draw sound waves */
+                        double wave_x0;
+                        double wave_y0;
+                        double wave_radius;
+
+                        wave_x0 = window_width / 2;
+                        wave_y0 = speaker_cy;
+                        wave_radius = icon_box_width / 2;
+
+                        draw_waves (cr, wave_x0, wave_y0, wave_radius, ctx->volume_level);
+                } else {
+                        /* draw 'mute' cross */
+                        double cross_x0;
+                        double cross_y0;
+                        double cross_size;
+
+                        cross_size = speaker_width * 3 / 4;
+                        cross_x0 = icon_box_x0 + icon_box_width - cross_size;
+                        cross_y0 = speaker_cy;
+
+                        draw_cross (cr, cross_x0, cross_y0, cross_size);
+                }
+        }
+
+        /* draw volume meter */
+        draw_volume_boxes (ctx,
+                           cr,
+                           (double) ctx->volume_level / 100.0,
+                           volume_box_x0,
+                           volume_box_y0,
+                           volume_box_width,
+                           volume_box_height);
+}
+
+static gboolean
+render_custom (GsdOsdDrawContext  *ctx,
+               cairo_t            *cr,
+               double              _x0,
+               double              _y0,
+               double              width,
+               double              height)
+{
+        GdkPixbuf         *pixbuf;
+        int                icon_size;
+
+        icon_size = (int)width;
+
+        pixbuf = load_pixbuf (ctx, ctx->icon_name, icon_size);
+
+        if (pixbuf == NULL) {
+                char *name;
+                if (ctx->direction == GTK_TEXT_DIR_RTL)
+                        name = g_strdup_printf ("%s-rtl", ctx->icon_name);
+                else
+                        name = g_strdup_printf ("%s-ltr", ctx->icon_name);
+                pixbuf = load_pixbuf (ctx, name, icon_size);
+                g_free (name);
+                if (pixbuf == NULL)
+                        return FALSE;
+        }
+
+        gtk_render_icon (ctx->style, cr,
+                         pixbuf, _x0, _y0);
+
+        g_object_unref (pixbuf);
+
+        return TRUE;
+}
+
+static void
+draw_action_custom (GsdOsdDrawContext  *ctx,
+                    cairo_t            *cr)
+{
+        int window_width;
+        int window_height;
+        double icon_box_width;
+        double icon_box_height;
+        double icon_box_x0;
+        double icon_box_y0;
+        double bright_box_x0;
+        double bright_box_y0;
+        double bright_box_width;
+        double bright_box_height;
+        gboolean res;
+
+	window_width = window_height = ctx->size;
+
+        icon_box_width = round (window_width * ICON_SCALE);
+        icon_box_height = round (window_height * ICON_SCALE);
+        bright_box_width = round (icon_box_width);
+        bright_box_height = round (window_height * 0.05);
+
+        icon_box_x0 = round ((window_width - icon_box_width) / 2);
+        icon_box_y0 = round ((window_height - icon_box_height - bright_box_height) / 2 - bright_box_height);
+        bright_box_x0 = round (icon_box_x0);
+        bright_box_y0 = round (icon_box_height + icon_box_y0) + bright_box_height;
+
+#if 0
+        g_message ("icon box: w=%f h=%f _x0=%f _y0=%f",
+                   icon_box_width,
+                   icon_box_height,
+                   icon_box_x0,
+                   icon_box_y0);
+        g_message ("brightness box: w=%f h=%f _x0=%f _y0=%f",
+                   bright_box_width,
+                   bright_box_height,
+                   bright_box_x0,
+                   bright_box_y0);
+#endif
+
+        res = render_custom (ctx,
+                             cr,
+                             icon_box_x0, icon_box_y0,
+                             icon_box_width, icon_box_height);
+        if (!res && g_str_has_prefix (ctx->icon_name, "media-eject")) {
+                /* draw eject symbol */
+                draw_eject (cr,
+                            icon_box_x0, icon_box_y0,
+                            icon_box_width, icon_box_height);
+        }
+
+        if (ctx->show_level != FALSE) {
+                /* draw volume meter */
+                draw_volume_boxes (ctx,
+                                   cr,
+                                   (double) ctx->volume_level / 100.0,
+                                   bright_box_x0,
+                                   bright_box_y0,
+                                   bright_box_width,
+                                   bright_box_height);
+        }
+}
+
+void
+gsd_osd_window_draw (GsdOsdDrawContext *ctx,
+                     cairo_t           *cr)
+{
+        gdouble          corner_radius;
+        GdkRGBA          acolor;
+
+        /* draw a box */
+        corner_radius = ctx->size / 10;
+        gsd_osd_window_draw_rounded_rectangle (cr, 1.0, 0.0, 0.0, corner_radius, ctx->size - 1, ctx->size - 1);
+
+        gtk_style_context_get_background_color (ctx->style, GTK_STATE_NORMAL, &acolor);
+        gdk_cairo_set_source_rgba (cr, &acolor);
+        cairo_fill (cr);
+
+        switch (ctx->action) {
+        case GSD_OSD_WINDOW_ACTION_VOLUME:
+                draw_action_volume (ctx, cr);
+                break;
+        case GSD_OSD_WINDOW_ACTION_CUSTOM:
+                draw_action_custom (ctx, cr);
+                break;
+        default:
+                break;
+        }
+}
+
+static gboolean
+gsd_osd_window_obj_draw (GtkWidget *widget,
+                         cairo_t   *orig_cr)
+{
+        GsdOsdWindow      *window;
+        cairo_t           *cr;
+        cairo_surface_t   *surface;
+        GtkStyleContext   *context;
+        GsdOsdDrawContext  ctx;
+        int                width, height, size;
+
+        window = GSD_OSD_WINDOW (widget);
+        gtk_window_get_size (GTK_WINDOW (widget), &width, &height);
+        size = MIN (width, height);
+
+        context = gtk_widget_get_style_context (widget);
+        gtk_style_context_save (context);
+        gtk_style_context_add_class (context, "osd");
+
+        cairo_set_operator (orig_cr, CAIRO_OPERATOR_SOURCE);
+
+        surface = cairo_surface_create_similar (cairo_get_target (orig_cr),
+                                                CAIRO_CONTENT_COLOR_ALPHA,
+                                                size,
+                                                size);
+
+        if (cairo_surface_status (surface) != CAIRO_STATUS_SUCCESS) {
+                goto done;
+        }
+
+        cr = cairo_create (surface);
+        if (cairo_status (cr) != CAIRO_STATUS_SUCCESS) {
+                goto done;
+        }
+        cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, 0.0);
+        cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
+        cairo_paint (cr);
+
+        ctx.size = size;
+        ctx.style = context;
+        ctx.volume_level = window->priv->volume_level;
+        ctx.volume_muted = window->priv->volume_muted;
+        ctx.icon_name = window->priv->icon_name;
+        ctx.direction = gtk_widget_get_direction (GTK_WIDGET (window));
+        ctx.show_level = window->priv->show_level;
+        ctx.action = window->priv->action;
+        if (window != NULL && gtk_widget_has_screen (GTK_WIDGET (window))) {
+                ctx.theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (window)));
+        } else {
+                ctx.theme = gtk_icon_theme_get_default ();
+        }
+        gsd_osd_window_draw (&ctx, cr);
+
+        cairo_destroy (cr);
+        gtk_style_context_restore (context);
+
+        /* Make sure we have a transparent background */
+        cairo_rectangle (orig_cr, 0, 0, size, size);
+        cairo_set_source_rgba (orig_cr, 0.0, 0.0, 0.0, 0.0);
+        cairo_fill (orig_cr);
+
+        cairo_set_source_surface (orig_cr, surface, 0, 0);
+        cairo_paint_with_alpha (orig_cr, window->priv->fade_out_alpha);
+
+ done:
+        if (surface != NULL) {
+                cairo_surface_destroy (surface);
+        }
+
+        return FALSE;
+}
+
+static void
+gsd_osd_window_real_show (GtkWidget *widget)
+{
+        GsdOsdWindow *window;
+
+        if (GTK_WIDGET_CLASS (gsd_osd_window_parent_class)->show) {
+                GTK_WIDGET_CLASS (gsd_osd_window_parent_class)->show (widget);
+        }
+
+        window = GSD_OSD_WINDOW (widget);
+        remove_hide_timeout (window);
+        add_hide_timeout (window);
+}
+
+static void
+gsd_osd_window_real_hide (GtkWidget *widget)
+{
+        GsdOsdWindow *window;
+
+        if (GTK_WIDGET_CLASS (gsd_osd_window_parent_class)->hide) {
+                GTK_WIDGET_CLASS (gsd_osd_window_parent_class)->hide (widget);
+        }
+
+        window = GSD_OSD_WINDOW (widget);
+        remove_hide_timeout (window);
+}
+
+static void
+gsd_osd_window_real_realize (GtkWidget *widget)
+{
+        cairo_region_t *region;
+        GdkScreen *screen;
+        GdkVisual *visual;
+
+        screen = gtk_widget_get_screen (widget);
+        visual = gdk_screen_get_rgba_visual (screen);
+        if (visual == NULL) {
+                visual = gdk_screen_get_system_visual (screen);
+        }
+
+        gtk_widget_set_visual (widget, visual);
+
+        if (GTK_WIDGET_CLASS (gsd_osd_window_parent_class)->realize) {
+                GTK_WIDGET_CLASS (gsd_osd_window_parent_class)->realize (widget);
+        }
+
+        /* make the whole window ignore events */
+        region = cairo_region_create ();
+        gtk_widget_input_shape_combine_region (widget, region);
+        cairo_region_destroy (region);
+}
+
+static GObject *
+gsd_osd_window_constructor (GType                  type,
+                            guint                  n_construct_properties,
+                            GObjectConstructParam *construct_params)
+{
+        GObject *object;
+
+        object = G_OBJECT_CLASS (gsd_osd_window_parent_class)->constructor (type, n_construct_properties, construct_params);
+
+        g_object_set (object,
+                      "type", GTK_WINDOW_POPUP,
+                      "type-hint", GDK_WINDOW_TYPE_HINT_NOTIFICATION,
+                      "skip-taskbar-hint", TRUE,
+                      "skip-pager-hint", TRUE,
+                      "focus-on-map", FALSE,
+                      NULL);
+
+        return object;
+}
+
+static void
+gsd_osd_window_finalize (GObject *object)
+{
+	GsdOsdWindow *window;
+
+	window = GSD_OSD_WINDOW (object);
+	if (window->priv->icon_name) {
+		g_free (window->priv->icon_name);
+		window->priv->icon_name = NULL;
+	}
+
+	if (window->priv->monitors_changed_id > 0) {
+		GdkScreen *screen;
+		screen = gtk_widget_get_screen (GTK_WIDGET (object));
+		g_signal_handler_disconnect (G_OBJECT (screen), window->priv->monitors_changed_id);
+		window->priv->monitors_changed_id = 0;
+	}
+
+	G_OBJECT_CLASS (gsd_osd_window_parent_class)->finalize (object);
+}
+
+static void
+gsd_osd_window_class_init (GsdOsdWindowClass *klass)
+{
+        GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+        GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+        gobject_class->constructor = gsd_osd_window_constructor;
+        gobject_class->finalize = gsd_osd_window_finalize;
+
+        widget_class->show = gsd_osd_window_real_show;
+        widget_class->hide = gsd_osd_window_real_hide;
+        widget_class->realize = gsd_osd_window_real_realize;
+        widget_class->draw = gsd_osd_window_obj_draw;
+
+        g_type_class_add_private (klass, sizeof (GsdOsdWindowPrivate));
+}
+
+/**
+ * gsd_osd_window_is_valid:
+ * @window: a #GsdOsdWindow
+ *
+ * Return value: TRUE if the @window's idea of the screen geometry is the
+ * same as the current screen's.
+ */
+gboolean
+gsd_osd_window_is_valid (GsdOsdWindow *window)
+{
+	return window->priv->monitor_changed;
+}
+
+static void
+monitors_changed_cb (GdkScreen    *screen,
+		     GsdOsdWindow *window)
+{
+        gint primary_monitor;
+        GdkRectangle mon_rect;
+
+	primary_monitor = gdk_screen_get_primary_monitor (screen);
+	if (primary_monitor != window->priv->primary_monitor) {
+		window->priv->monitor_changed = TRUE;
+		return;
+	}
+
+	gdk_screen_get_monitor_geometry (screen, primary_monitor, &mon_rect);
+
+        if (window->priv->screen_width != mon_rect.width ||
+            window->priv->screen_height != mon_rect.height)
+                window->priv->monitor_changed = TRUE;
+}
+
+static void
+gsd_osd_window_init (GsdOsdWindow *window)
+{
+        GdkScreen *screen;
+        gdouble scalew, scaleh, scale;
+        GdkRectangle monitor;
+        int size;
+
+        window->priv = GSD_OSD_WINDOW_GET_PRIVATE (window);
+
+        screen = gtk_widget_get_screen (GTK_WIDGET (window));
+        window->priv->monitors_changed_id = g_signal_connect (G_OBJECT (screen), "monitors-changed",
+                                                              G_CALLBACK (monitors_changed_cb), window);
+
+        window->priv->primary_monitor = gdk_screen_get_primary_monitor (screen);
+        gdk_screen_get_monitor_geometry (screen, window->priv->primary_monitor, &monitor);
+        window->priv->screen_width = monitor.width;
+        window->priv->screen_height = monitor.height;
+
+        gtk_window_set_decorated (GTK_WINDOW (window), FALSE);
+        gtk_widget_set_app_paintable (GTK_WIDGET (window), TRUE);
+
+        /* assume 130x130 on a 640x480 display and scale from there */
+        scalew = monitor.width / 640.0;
+        scaleh = monitor.height / 480.0;
+        scale = MIN (scalew, scaleh);
+        size = 130 * MAX (1, scale);
+        gtk_window_set_default_size (GTK_WINDOW (window), size, size);
+
+        window->priv->fade_out_alpha = 1.0;
+}
+
+GtkWidget *
+gsd_osd_window_new (void)
+{
+        return g_object_new (GSD_TYPE_OSD_WINDOW, NULL);
+}
+
+/**
+ * gsd_osd_window_update_and_hide:
+ * @window: a #GsdOsdWindow
+ *
+ * Queues the @window for immediate drawing, and queues a timer to hide the window.
+ */
+static void
+gsd_osd_window_update_and_hide (GsdOsdWindow *window)
+{
+        remove_hide_timeout (window);
+        add_hide_timeout (window);
+
+        gtk_widget_queue_draw (GTK_WIDGET (window));
+}
diff -Nru totem-3.4.3/src/backend/gsd-osd-window.h totem-3.6.2/src/backend/gsd-osd-window.h
--- totem-3.4.3/src/backend/gsd-osd-window.h	1970-01-01 00:00:00.000000000 +0000
+++ totem-3.6.2/src/backend/gsd-osd-window.h	2012-08-29 23:07:45.000000000 +0000
@@ -0,0 +1,86 @@
+/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 8; tab-width: 8 -*-
+ *
+ * On-screen-display (OSD) window for gnome-settings-daemon's plugins
+ *
+ * Copyright (C) 2006 William Jon McCann  
+ * Copyright (C) 2009 Novell, Inc
+ *
+ * Authors:
+ *   William Jon McCann 
+ *   Federico Mena-Quintero 
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2, 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 Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ */
+
+/* GsdOsdWindow is an "on-screen-display" window (OSD).  It is the cute,
+ * semi-transparent, curved popup that appears when you press a hotkey global to
+ * the desktop, such as to change the volume, switch your monitor's parameters,
+ * etc.
+ */
+
+#ifndef GSD_OSD_WINDOW_H
+#define GSD_OSD_WINDOW_H
+
+#include 
+#include 
+
+G_BEGIN_DECLS
+
+#define GSD_TYPE_OSD_WINDOW            (gsd_osd_window_get_type ())
+#define GSD_OSD_WINDOW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj),  GSD_TYPE_OSD_WINDOW, GsdOsdWindow))
+#define GSD_OSD_WINDOW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),   GSD_TYPE_OSD_WINDOW, GsdOsdWindowClass))
+#define GSD_IS_OSD_WINDOW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj),  GSD_TYPE_OSD_WINDOW))
+#define GSD_IS_OSD_WINDOW_CLASS(klass) (G_TYPE_INSTANCE_GET_CLASS ((klass), GSD_TYPE_OSD_WINDOW))
+#define GSD_OSD_WINDOW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GSD_TYPE_OSD_WINDOW, GsdOsdWindowClass))
+
+typedef struct GsdOsdWindow                   GsdOsdWindow;
+typedef struct GsdOsdWindowClass              GsdOsdWindowClass;
+typedef struct GsdOsdWindowPrivate            GsdOsdWindowPrivate;
+
+struct GsdOsdWindow {
+        GtkWindow                   parent;
+
+        GsdOsdWindowPrivate  *priv;
+};
+
+struct GsdOsdWindowClass {
+        GtkWindowClass parent_class;
+};
+
+typedef enum {
+        GSD_OSD_WINDOW_ACTION_VOLUME,
+        GSD_OSD_WINDOW_ACTION_CUSTOM
+} GsdOsdWindowAction;
+
+GType                 gsd_osd_window_get_type          (void);
+
+GtkWidget *           gsd_osd_window_new               (void);
+gboolean              gsd_osd_window_is_valid          (GsdOsdWindow       *window);
+void                  gsd_osd_window_set_action        (GsdOsdWindow       *window,
+                                                        GsdOsdWindowAction  action);
+void                  gsd_osd_window_set_action_custom (GsdOsdWindow       *window,
+                                                        const char         *icon_name,
+                                                        gboolean            show_level);
+void                  gsd_osd_window_set_volume_muted  (GsdOsdWindow       *window,
+                                                        gboolean            muted);
+void                  gsd_osd_window_set_volume_level  (GsdOsdWindow       *window,
+                                                        int                 level);
+
+G_END_DECLS
+
+#endif
diff -Nru totem-3.4.3/src/backend/totem-aspect-frame.c totem-3.6.2/src/backend/totem-aspect-frame.c
--- totem-3.4.3/src/backend/totem-aspect-frame.c	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/backend/totem-aspect-frame.c	2012-08-29 23:07:45.000000000 +0000
@@ -1,8 +1,11 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 /*
- * mx-aspect-frame.c: A container that respect the aspect ratio of its child
+ * A container that respects the aspect ratio of its child
  *
  * Copyright 2010, 2011 Intel Corporation.
+ * Copyright 2012, Red Hat, Inc.
+ *
+ * Based upon mx-aspect-frame.c
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU Lesser General Public License,
@@ -19,9 +22,11 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include 
+
 #include "totem-aspect-frame.h"
 
-G_DEFINE_TYPE (TotemAspectFrame, totem_aspect_frame, MX_TYPE_BIN)
+G_DEFINE_TYPE (TotemAspectFrame, totem_aspect_frame, CLUTTER_TYPE_ACTOR)
 
 #define ASPECT_FRAME_PRIVATE(o)                         \
   (G_TYPE_INSTANCE_GET_PRIVATE ((o),                    \
@@ -33,22 +38,20 @@
   PROP_0,
 
   PROP_EXPAND,
-  PROP_RATIO
 };
 
 struct _TotemAspectFramePrivate
 {
   guint expand : 1;
-
-  gfloat ratio;
+  gdouble rotation;
 };
 
 
 static void
 totem_aspect_frame_get_property (GObject    *object,
-                               guint       property_id,
-                               GValue     *value,
-                               GParamSpec *pspec)
+                                 guint       property_id,
+                                 GValue     *value,
+                                 GParamSpec *pspec)
 {
   TotemAspectFrame *frame = TOTEM_ASPECT_FRAME (object);
 
@@ -58,10 +61,6 @@
       g_value_set_boolean (value, totem_aspect_frame_get_expand (frame));
       break;
 
-    case PROP_RATIO:
-      g_value_set_float (value, totem_aspect_frame_get_ratio (frame));
-      break;
-
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
     }
@@ -69,9 +68,9 @@
 
 static void
 totem_aspect_frame_set_property (GObject      *object,
-                               guint         property_id,
-                               const GValue *value,
-                               GParamSpec   *pspec)
+                                 guint         property_id,
+                                 const GValue *value,
+                                 GParamSpec   *pspec)
 {
   switch (property_id)
     {
@@ -80,11 +79,6 @@
                                    g_value_get_boolean (value));
       break;
 
-    case PROP_RATIO:
-      totem_aspect_frame_set_ratio (TOTEM_ASPECT_FRAME (object),
-                                  g_value_get_float (value));
-      break;
-
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
     }
@@ -104,16 +98,11 @@
 
 static void
 totem_aspect_frame_get_preferred_width (ClutterActor *actor,
-                                      gfloat        for_height,
-                                      gfloat       *min_width_p,
-                                      gfloat       *nat_width_p)
+                                        gfloat        for_height,
+                                        gfloat       *min_width_p,
+                                        gfloat       *nat_width_p)
 {
   gboolean override;
-  MxPadding padding;
-
-  mx_widget_get_padding (MX_WIDGET (actor), &padding);
-  if (for_height >= 0)
-    for_height = MAX (0, for_height - padding.top - padding.bottom);
 
   if (for_height >= 0)
     override = FALSE;
@@ -125,25 +114,15 @@
 
   CLUTTER_ACTOR_CLASS (totem_aspect_frame_parent_class)->
     get_preferred_width (actor, for_height, min_width_p, nat_width_p);
-
-  if (min_width_p)
-    *min_width_p += padding.left + padding.right;
-  if (nat_width_p)
-    *nat_width_p += padding.left + padding.right;
 }
 
 static void
 totem_aspect_frame_get_preferred_height (ClutterActor *actor,
-                                       gfloat        for_width,
-                                       gfloat       *min_height_p,
-                                       gfloat       *nat_height_p)
+                                         gfloat        for_width,
+                                         gfloat       *min_height_p,
+                                         gfloat       *nat_height_p)
 {
   gboolean override;
-  MxPadding padding;
-
-  mx_widget_get_padding (MX_WIDGET (actor), &padding);
-  if (for_width >= 0)
-    for_width = MAX (0, for_width - padding.left - padding.right);
 
   if (for_width >= 0)
     override = FALSE;
@@ -158,35 +137,82 @@
 }
 
 static void
+totem_aspect_frame_set_rotation_internal (TotemAspectFrame *frame,
+					  gdouble           rotation,
+					  gboolean          animate)
+{
+  ClutterActor *actor;
+  gfloat w, h, center_x, center_y;
+  gdouble scale;
+
+  g_return_if_fail (TOTEM_IS_ASPECT_FRAME (frame));
+
+  g_object_get (G_OBJECT (frame),
+		"width", &w,
+		"height", &h,
+		NULL);
+
+  /* So that the larger side fits the smaller side
+   * FIXME: check the angle instead */
+  if (rotation == 90.0 || rotation == 270.0)
+    {
+      if (w > h)
+        scale = h / (double) w;
+      else
+        scale = w / (double) h;
+    }
+  else
+    {
+      scale = 1.0;
+    }
+
+  center_x = w * 0.5f;
+  center_y = h * 0.5f;
+
+  actor = CLUTTER_ACTOR (frame);
+
+  if (animate)
+    {
+      clutter_actor_save_easing_state (actor);
+      clutter_actor_set_easing_duration (actor, 500);
+    }
+  /* FIXME: When animated, make sure that we go in the right direction,
+   * otherwise we'll spin in the wrong direction going back to 0 from 270 */
+  clutter_actor_set_rotation (actor, CLUTTER_Z_AXIS, rotation, center_x, center_y, 0);
+  clutter_actor_set_scale_full (actor, scale, scale, center_x, center_y);
+
+  if (animate)
+    clutter_actor_restore_easing_state (actor);
+}
+
+static void
 totem_aspect_frame_allocate (ClutterActor           *actor,
-                           const ClutterActorBox  *box,
-                           ClutterAllocationFlags  flags)
+                             const ClutterActorBox  *box,
+                             ClutterAllocationFlags  flags)
 {
-  MxPadding padding;
   ClutterActor *child;
   ClutterActorBox child_box;
   gfloat aspect, child_aspect, width, height, box_width, box_height;
+  gdouble rotation;
 
   TotemAspectFramePrivate *priv = TOTEM_ASPECT_FRAME (actor)->priv;
 
   CLUTTER_ACTOR_CLASS (totem_aspect_frame_parent_class)->
     allocate (actor, box, flags);
 
-  child = mx_bin_get_child (MX_BIN (actor));
+  child = clutter_actor_get_child_at_index (actor, 0);
   if (!child)
     return;
 
-  mx_widget_get_padding (MX_WIDGET (actor), &padding);
-
-  box_width = box->x2 - box->x1 - padding.left - padding.right;
-  box_height = box->y2 - box->y1 - padding.top - padding.bottom;
+  box_width = box->x2 - box->x1;
+  box_height = box->y2 - box->y1;
   clutter_actor_get_preferred_size (child, NULL, NULL, &width, &height);
 
+  if (width <= 0.0f || height <= 0.0f)
+    return;
+
   aspect = box_width / box_height;
-  if (priv->ratio >= 0.f)
-    child_aspect = priv->ratio;
-  else
-    child_aspect = width / height;
+  child_aspect = width / height;
 
   if ((aspect < child_aspect) ^ priv->expand)
     {
@@ -199,70 +225,43 @@
       width = box_height * child_aspect;
     }
 
-  child_box.x1 = (box_width - width) / 2 + padding.left;
-  child_box.y1 = (box_height - height) / 2 + padding.top;
+  child_box.x1 = (box_width - width) / 2;
+  child_box.y1 = (box_height - height) / 2;
   child_box.x2 = child_box.x1 + width;
   child_box.y2 = child_box.y1 + height;
 
   clutter_actor_allocate (child, &child_box, flags);
+
+  clutter_actor_save_easing_state (child);
+  clutter_actor_set_easing_duration (child, 0);
+
+  /* FIXME: We should swap height and width if the actor is on its side */
+  rotation = totem_aspect_frame_get_rotation (TOTEM_ASPECT_FRAME (actor));
+  totem_aspect_frame_set_rotation_internal (TOTEM_ASPECT_FRAME (actor),
+					    rotation,
+					    FALSE);
 }
 
 static void
 totem_aspect_frame_paint (ClutterActor *actor)
 {
-  ClutterActor *child = mx_bin_get_child (MX_BIN (actor));
+  ClutterActor *child;
   TotemAspectFramePrivate *priv = TOTEM_ASPECT_FRAME (actor)->priv;
 
+  child = clutter_actor_get_child_at_index (actor, 0);
+
   if (!child)
     return;
 
   if (priv->expand)
     {
-      MxPadding padding;
       gfloat width, height;
 
       clutter_actor_get_size (actor, &width, &height);
-      mx_widget_get_padding (MX_WIDGET (actor), &padding);
 
-      /* Special-case textures and just munge their coordinates.
-       * This avoids clipping, which can break Clutter's batching.
-       */
-      if (CLUTTER_IS_TEXTURE (child))
-        {
-          guint8 opacity;
-          gfloat x, y, tx, ty;
-          CoglHandle material;
-
-          clutter_actor_get_position (child, &x, &y);
-
-          material =
-            clutter_texture_get_cogl_material (CLUTTER_TEXTURE (child));
-          opacity = clutter_actor_get_paint_opacity (child);
-          cogl_material_set_color4ub (material,
-                                      opacity, opacity, opacity, opacity);
-          cogl_set_source (material);
-
-          x -= padding.left;
-          y -= padding.top;
-          width -= padding.left + padding.right;
-          height -= padding.top + padding.bottom;
-
-          tx = (width / (width - (x * 2.f))) / 2.f;
-          ty = (height / (height - (y * 2.f))) / 2.f;
-
-          cogl_rectangle_with_texture_coords (padding.left, padding.top,
-                                              padding.left + width,
-                                              padding.top + height,
-                                              0.5f - tx, 0.5f - ty,
-                                              0.5f + tx, 0.5f + ty);
-        }
-      else
-        {
-          cogl_clip_push_rectangle (padding.left, padding.top,
-                                    padding.left + width, padding.top + height);
-          clutter_actor_paint (child);
-          cogl_clip_pop ();
-        }
+      cogl_clip_push_rectangle (0.0, 0.0, width, height);
+      clutter_actor_paint (child);
+      cogl_clip_pop ();
     }
   else
     clutter_actor_paint (child);
@@ -270,11 +269,10 @@
 
 static void
 totem_aspect_frame_pick (ClutterActor       *actor,
-                       const ClutterColor *color)
+                         const ClutterColor *color)
 {
   ClutterActorBox box;
-
-  ClutterActor *child = mx_bin_get_child (MX_BIN (actor));
+  ClutterActor *child;
   TotemAspectFramePrivate *priv = TOTEM_ASPECT_FRAME (actor)->priv;
 
   clutter_actor_get_allocation_box (actor, &box);
@@ -283,17 +281,14 @@
                             color->blue, color->alpha);
   cogl_rectangle (box.x1, box.y1, box.x2, box.y2);
 
+  child = clutter_actor_get_child_at_index (actor, 0);
+
   if (!child)
     return;
 
   if (priv->expand)
     {
-      MxPadding padding;
-      mx_widget_get_padding (MX_WIDGET (actor), &padding);
-
-      cogl_clip_push_rectangle (padding.left, padding.top,
-                                padding.left + (box.x2 - box.x1),
-                                padding.top + (box.y2 - box.y1));
+      cogl_clip_push_rectangle (0.0, 0.0, box.x2 - box.x1, box.y2 - box.y1);
       clutter_actor_paint (child);
       cogl_clip_pop ();
     }
@@ -329,21 +324,12 @@
                                 FALSE,
                                 G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_EXPAND, pspec);
-
-  pspec = g_param_spec_float ("ratio",
-                              "Ratio",
-                              "Override the child's aspect ratio "
-                              "(width/height).",
-                              -1.f, G_MAXFLOAT, -1.f,
-                              G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
-  g_object_class_install_property (object_class, PROP_RATIO, pspec);
 }
 
 static void
 totem_aspect_frame_init (TotemAspectFrame *self)
 {
-  TotemAspectFramePrivate *priv = self->priv = ASPECT_FRAME_PRIVATE (self);
-  priv->ratio = -1.f;
+  self->priv = ASPECT_FRAME_PRIVATE (self);
 }
 
 ClutterActor *
@@ -362,8 +348,18 @@
   priv = frame->priv;
   if (priv->expand != expand)
     {
+      ClutterActor *child;
+
       priv->expand = expand;
-      clutter_actor_queue_relayout (CLUTTER_ACTOR (frame));
+      child = clutter_actor_get_child_at_index (CLUTTER_ACTOR (frame), 0);
+      if (child)
+        {
+          /* Duration will be reset in _allocate() */
+          clutter_actor_save_easing_state (child);
+          clutter_actor_set_easing_duration (child, 500);
+          clutter_actor_queue_relayout (CLUTTER_ACTOR (frame));
+        }
+
       g_object_notify (G_OBJECT (frame), "expand");
     }
 }
@@ -376,24 +372,37 @@
 }
 
 void
-totem_aspect_frame_set_ratio (TotemAspectFrame *frame, gfloat ratio)
+totem_aspect_frame_set_child   (TotemAspectFrame *frame,
+				ClutterActor     *child)
 {
-  TotemAspectFramePrivate *priv;
+  g_return_if_fail (TOTEM_IS_ASPECT_FRAME (frame));
 
+  clutter_actor_add_child (CLUTTER_ACTOR (frame), child);
+}
+
+void
+totem_aspect_frame_set_rotation (TotemAspectFrame *frame,
+				 gdouble           rotation)
+{
   g_return_if_fail (TOTEM_IS_ASPECT_FRAME (frame));
 
-  priv = frame->priv;
-  if (priv->ratio != ratio)
-    {
-      priv->ratio = ratio;
-      clutter_actor_queue_relayout (CLUTTER_ACTOR (frame));
-      g_object_notify (G_OBJECT (frame), "ratio");
-    }
+  rotation = fmod (rotation, 360.0);
+
+  g_debug ("Setting rotation to '%lf'", rotation);
+
+  frame->priv->rotation = rotation;
+  totem_aspect_frame_set_rotation_internal (frame, rotation, TRUE);
 }
 
-gfloat
-totem_aspect_frame_get_ratio (TotemAspectFrame *frame)
+gdouble
+totem_aspect_frame_get_rotation (TotemAspectFrame *frame)
 {
-  g_return_val_if_fail (TOTEM_IS_ASPECT_FRAME (frame), -1.f);
-  return frame->priv->ratio;
+  gdouble rotation;
+
+  g_return_val_if_fail (TOTEM_IS_ASPECT_FRAME (frame), 0.0);
+
+  rotation = fmod (frame->priv->rotation, 360.0);
+  g_debug ("Got rotation %lf", rotation);
+
+  return rotation;
 }
diff -Nru totem-3.4.3/src/backend/totem-aspect-frame.h totem-3.6.2/src/backend/totem-aspect-frame.h
--- totem-3.4.3/src/backend/totem-aspect-frame.h	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/backend/totem-aspect-frame.h	2012-08-29 23:07:45.000000000 +0000
@@ -25,7 +25,7 @@
 #define __TOTEM_ASPECT_FRAME_H__
 
 #include 
-#include 
+#include 
 
 G_BEGIN_DECLS
 
@@ -57,34 +57,30 @@
 
 struct _TotemAspectFrame
 {
-  MxBin parent;
+  ClutterActor parent;
 
   TotemAspectFramePrivate *priv;
 };
 
 struct _TotemAspectFrameClass
 {
-  MxBinClass parent_class;
-
-  /* padding for future expansion */
-  void (*_padding_0) (void);
-  void (*_padding_1) (void);
-  void (*_padding_2) (void);
-  void (*_padding_3) (void);
-  void (*_padding_4) (void);
+  ClutterActorClass parent_class;
 };
 
-GType           totem_aspect_frame_get_type    (void) G_GNUC_CONST;
+GType           totem_aspect_frame_get_type     (void) G_GNUC_CONST;
+
+ClutterActor *  totem_aspect_frame_new          (void);
 
-ClutterActor *  totem_aspect_frame_new         (void);
+void            totem_aspect_frame_set_child    (TotemAspectFrame *frame,
+						 ClutterActor     *child);
 
-void            totem_aspect_frame_set_expand  (TotemAspectFrame *frame,
-                                             gboolean       expand);
-gboolean        totem_aspect_frame_get_expand  (TotemAspectFrame *frame);
+void            totem_aspect_frame_set_expand   (TotemAspectFrame *frame,
+                                                 gboolean          expand);
+gboolean        totem_aspect_frame_get_expand   (TotemAspectFrame *frame);
 
-void            totem_aspect_frame_set_ratio   (TotemAspectFrame *frame,
-                                             gfloat         ratio);
-gfloat          totem_aspect_frame_get_ratio   (TotemAspectFrame *frame);
+void            totem_aspect_frame_set_rotation (TotemAspectFrame *frame,
+						 gdouble           rotation);
+gdouble         totem_aspect_frame_get_rotation (TotemAspectFrame *frame);
 
 G_END_DECLS
 
diff -Nru totem-3.4.3/src/backend/video-utils.c totem-3.6.2/src/backend/video-utils.c
--- totem-3.4.3/src/backend/video-utils.c	2012-01-10 16:10:04.000000000 +0000
+++ totem-3.6.2/src/backend/video-utils.c	2012-08-29 23:07:45.000000000 +0000
@@ -29,9 +29,6 @@
 
 #include "video-utils.h"
 
-#include 
-#include 
-
 #include 
 #include 
 #include 
@@ -60,38 +57,6 @@
 	gdk_flush ();
 }
 
-char *
-totem_time_to_string (gint64 msecs)
-{
-	int sec, min, hour, _time;
-
-	_time = (int) (msecs / 1000);
-	sec = _time % 60;
-	_time = _time - sec;
-	min = (_time % (60*60)) / 60;
-	_time = _time - (min * 60);
-	hour = _time / (60*60);
-
-	if (hour > 0)
-	{
-		/* hour:minutes:seconds */
-		/* Translators: This is a time format, like "9:05:02" for 9
-		 * hours, 5 minutes, and 2 seconds. You may change ":" to
-		 * the separator that your locale uses or use "%Id" instead
-		 * of "%d" if your locale uses localized digits.
-		 */
-		return g_strdup_printf (C_("long time format", "%d:%02d:%02d"), hour, min, sec);
-	}
-
-	/* minutes:seconds */
-	/* Translators: This is a time format, like "5:02" for 5
-	 * minutes and 2 seconds. You may change ":" to the
-	 * separator that your locale uses or use "%Id" instead of
-	 * "%d" if your locale uses localized digits.
-	 */
-	return g_strdup_printf (C_("short time format", "%d:%02d"), min, sec);
-}
-
 static gboolean
 totem_ratio_fits_screen_helper (GtkWidget *video_widget,
 				int new_w, int new_h,
diff -Nru totem-3.4.3/src/backend/video-utils.h totem-3.6.2/src/backend/video-utils.h
--- totem-3.4.3/src/backend/video-utils.h	2012-01-10 16:10:04.000000000 +0000
+++ totem-3.6.2/src/backend/video-utils.h	2012-08-29 23:07:45.000000000 +0000
@@ -31,8 +31,6 @@
 void totem_gdk_window_set_invisible_cursor (GdkWindow *window);
 void totem_gdk_window_set_waiting_cursor (GdkWindow *window);
 
-char *totem_time_to_string (gint64 msecs);
-
 gboolean totem_ratio_fits_screen (GtkWidget *widget,
 				  int video_width,
 				  int video_height,
diff -Nru totem-3.4.3/src/gd-fullscreen-filter.c totem-3.6.2/src/gd-fullscreen-filter.c
--- totem-3.4.3/src/gd-fullscreen-filter.c	1970-01-01 00:00:00.000000000 +0000
+++ totem-3.6.2/src/gd-fullscreen-filter.c	2012-08-29 23:07:45.000000000 +0000
@@ -0,0 +1,132 @@
+/*
+ * Copyright (c) 2011 Red Hat, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public 
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License 
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Author: Cosimo Cecchi 
+ *
+ */
+
+#include "gd-fullscreen-filter.h"
+
+#include 
+#include 
+
+#include 
+
+G_DEFINE_TYPE (GdFullscreenFilter, gd_fullscreen_filter, G_TYPE_OBJECT)
+
+enum {
+  MOTION_EVENT = 1,
+  NUM_SIGNALS
+};
+
+static guint signals[NUM_SIGNALS] = { 0, };
+
+struct _GdFullscreenFilterPrivate {
+  gboolean is_filtering;
+};
+
+static void
+gd_fullscreen_filter_dispose (GObject *object)
+{
+  GdFullscreenFilter *self = GD_FULLSCREEN_FILTER (object);
+
+  gd_fullscreen_filter_stop (self);
+
+  G_OBJECT_CLASS (gd_fullscreen_filter_parent_class)->dispose (object);
+}
+
+static void
+gd_fullscreen_filter_init (GdFullscreenFilter *self)
+{
+  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GD_TYPE_FULLSCREEN_FILTER,
+                                            GdFullscreenFilterPrivate);
+}
+
+static void
+gd_fullscreen_filter_class_init (GdFullscreenFilterClass *klass)
+{
+  GObjectClass *oclass = G_OBJECT_CLASS (klass);
+
+  oclass->dispose = gd_fullscreen_filter_dispose;
+
+  signals[MOTION_EVENT] =
+    g_signal_new ("motion-event",
+                  GD_TYPE_FULLSCREEN_FILTER,
+                  G_SIGNAL_RUN_LAST,
+                  0, NULL, NULL, NULL,
+                  G_TYPE_NONE, 0);
+
+  g_type_class_add_private (klass, sizeof (GdFullscreenFilterPrivate));
+}
+
+static GdkFilterReturn
+event_filter_func (GdkXEvent *gdk_xevent,
+                   GdkEvent *event,
+                   gpointer user_data)
+{
+  GdFullscreenFilter *self = user_data;
+  XEvent *xevent = (XEvent *) gdk_xevent;
+
+  if (xevent->xany.type == ButtonPress ||
+      xevent->xany.type == ButtonRelease ||
+      xevent->xany.type == MotionNotify)
+    {
+      g_signal_emit (self, signals[MOTION_EVENT], 0);
+    }
+  else if (xevent->xany.type == GenericEvent)
+    {
+        /* we just assume this is an XI2 event */
+        XIEvent *ev = (XIEvent *) xevent->xcookie.data;
+
+        if (ev->evtype == XI_Motion ||
+            ev->evtype == XI_ButtonRelease ||
+            ev->evtype == XI_ButtonPress)
+          {
+            g_signal_emit (self, signals[MOTION_EVENT], 0);
+          }
+    }
+
+  return GDK_FILTER_CONTINUE;
+}
+
+void
+gd_fullscreen_filter_start (GdFullscreenFilter *self)
+{
+  if (self->priv->is_filtering)
+    return;
+
+  self->priv->is_filtering = TRUE;
+  gdk_window_add_filter (NULL,
+                         event_filter_func, self);
+}
+
+void
+gd_fullscreen_filter_stop (GdFullscreenFilter *self)
+{
+  if (!self->priv->is_filtering)
+    return;
+
+  self->priv->is_filtering = FALSE;
+  gdk_window_remove_filter (NULL,
+                            event_filter_func, self);
+}
+
+GdFullscreenFilter *
+gd_fullscreen_filter_new (void)
+{
+  return g_object_new (GD_TYPE_FULLSCREEN_FILTER, NULL);
+}
diff -Nru totem-3.4.3/src/gd-fullscreen-filter.h totem-3.6.2/src/gd-fullscreen-filter.h
--- totem-3.4.3/src/gd-fullscreen-filter.h	1970-01-01 00:00:00.000000000 +0000
+++ totem-3.6.2/src/gd-fullscreen-filter.h	2012-08-29 23:07:45.000000000 +0000
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2011 Red Hat, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public 
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License 
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Author: Cosimo Cecchi 
+ *
+ */
+
+#ifndef __GD_FULLSCREEN_FILTER_H__
+#define __GD_FULLSCREEN_FILTER_H__
+
+#include 
+
+G_BEGIN_DECLS
+
+#define GD_TYPE_FULLSCREEN_FILTER gd_fullscreen_filter_get_type()
+
+#define GD_FULLSCREEN_FILTER(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+   GD_TYPE_FULLSCREEN_FILTER, GdFullscreenFilter))
+
+#define GD_FULLSCREEN_FILTER_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST ((klass), \
+   GD_TYPE_FULLSCREEN_FILTER, GdFullscreenFilterClass))
+
+#define GD_IS_FULLSCREEN_FILTER(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+   GD_TYPE_FULLSCREEN_FILTER))
+
+#define GD_IS_FULLSCREEN_FILTER_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE ((klass), \
+   GD_TYPE_FULLSCREEN_FILTER))
+
+#define GD_FULLSCREEN_FILTER_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), \
+   GD_TYPE_FULLSCREEN_FILTER, GdFullscreenFilterClass))
+
+typedef struct _GdFullscreenFilter GdFullscreenFilter;
+typedef struct _GdFullscreenFilterClass GdFullscreenFilterClass;
+typedef struct _GdFullscreenFilterPrivate GdFullscreenFilterPrivate;
+
+struct _GdFullscreenFilter
+{
+  GObject parent;
+
+  GdFullscreenFilterPrivate *priv;
+};
+
+struct _GdFullscreenFilterClass
+{
+  GObjectClass parent_class;
+};
+
+GType gd_fullscreen_filter_get_type (void) G_GNUC_CONST;
+
+GdFullscreenFilter *gd_fullscreen_filter_new (void);
+void gd_fullscreen_filter_start (GdFullscreenFilter *self);
+void gd_fullscreen_filter_stop (GdFullscreenFilter *self);
+
+G_END_DECLS
+
+#endif /* __GD_FULLSCREEN_FILTER_H__ */
diff -Nru totem-3.4.3/src/gsd-media-keys-window.c totem-3.6.2/src/gsd-media-keys-window.c
--- totem-3.4.3/src/gsd-media-keys-window.c	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/gsd-media-keys-window.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,710 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2006-2007 William Jon McCann 
- *
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2, 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 Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- */
-
-#include "config.h"
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include "gsd-media-keys-window.h"
-
-#define GSD_MEDIA_KEYS_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_MEDIA_KEYS_WINDOW, GsdMediaKeysWindowPrivate))
-
-struct GsdMediaKeysWindowPrivate
-{
-        GsdMediaKeysWindowAction action;
-        char                    *icon_name;
-        gboolean                 show_level;
-
-        guint                    volume_muted : 1;
-        int                      volume_level;
-
-        GtkImage                *image;
-        GtkWidget               *progress;
-};
-
-G_DEFINE_TYPE (GsdMediaKeysWindow, gsd_media_keys_window, GSD_TYPE_OSD_WINDOW)
-
-static void
-volume_controls_set_visible (GsdMediaKeysWindow *window,
-                             gboolean            visible)
-{
-        if (window->priv->progress == NULL)
-                return;
-
-        if (visible) {
-                gtk_widget_show (window->priv->progress);
-        } else {
-                gtk_widget_hide (window->priv->progress);
-        }
-}
-
-static void
-window_set_icon_name (GsdMediaKeysWindow *window,
-                      const char         *name)
-{
-        if (window->priv->image == NULL)
-                return;
-
-        gtk_image_set_from_icon_name (window->priv->image,
-                                      name, GTK_ICON_SIZE_DIALOG);
-}
-
-static void
-action_changed (GsdMediaKeysWindow *window)
-{
-        if (!gsd_osd_window_is_composited (GSD_OSD_WINDOW (window))) {
-                switch (window->priv->action) {
-                case GSD_MEDIA_KEYS_WINDOW_ACTION_VOLUME:
-                        volume_controls_set_visible (window, TRUE);
-
-                        if (window->priv->volume_muted) {
-                                window_set_icon_name (window, "audio-volume-muted");
-                        } else {
-                                window_set_icon_name (window, "audio-volume-high");
-                        }
-
-                        break;
-                case GSD_MEDIA_KEYS_WINDOW_ACTION_CUSTOM:
-                        volume_controls_set_visible (window, window->priv->show_level);
-                        window_set_icon_name (window, window->priv->icon_name);
-                        break;
-                default:
-                        g_assert_not_reached ();
-                        break;
-                }
-        }
-
-        gsd_osd_window_update_and_hide (GSD_OSD_WINDOW (window));
-}
-
-static void
-volume_level_changed (GsdMediaKeysWindow *window)
-{
-        gsd_osd_window_update_and_hide (GSD_OSD_WINDOW (window));
-
-        if (!gsd_osd_window_is_composited (GSD_OSD_WINDOW (window)) && window->priv->progress != NULL) {
-                double fraction;
-
-                fraction = (double) window->priv->volume_level / 100.0;
-
-                gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (window->priv->progress),
-                                               fraction);
-        }
-}
-
-static void
-volume_muted_changed (GsdMediaKeysWindow *window)
-{
-        gsd_osd_window_update_and_hide (GSD_OSD_WINDOW (window));
-
-        if (!gsd_osd_window_is_composited (GSD_OSD_WINDOW (window))) {
-                if (window->priv->volume_muted) {
-                        window_set_icon_name (window, "audio-volume-muted");
-                } else {
-                        window_set_icon_name (window, "audio-volume-high");
-                }
-        }
-}
-
-void
-gsd_media_keys_window_set_action (GsdMediaKeysWindow      *window,
-                                  GsdMediaKeysWindowAction action)
-{
-        g_return_if_fail (GSD_IS_MEDIA_KEYS_WINDOW (window));
-        g_return_if_fail (action == GSD_MEDIA_KEYS_WINDOW_ACTION_VOLUME);
-
-        if (window->priv->action != action) {
-                window->priv->action = action;
-                action_changed (window);
-        } else {
-                gsd_osd_window_update_and_hide (GSD_OSD_WINDOW (window));
-        }
-}
-
-void
-gsd_media_keys_window_set_action_custom (GsdMediaKeysWindow      *window,
-                                         const char              *icon_name,
-                                         gboolean                 show_level)
-{
-        g_return_if_fail (GSD_IS_MEDIA_KEYS_WINDOW (window));
-        g_return_if_fail (icon_name != NULL);
-
-        if (window->priv->action != GSD_MEDIA_KEYS_WINDOW_ACTION_CUSTOM ||
-            g_strcmp0 (window->priv->icon_name, icon_name) != 0 ||
-            window->priv->show_level != show_level) {
-                window->priv->action = GSD_MEDIA_KEYS_WINDOW_ACTION_CUSTOM;
-                g_free (window->priv->icon_name);
-                window->priv->icon_name = g_strdup (icon_name);
-                window->priv->show_level = show_level;
-                action_changed (window);
-        } else {
-                gsd_osd_window_update_and_hide (GSD_OSD_WINDOW (window));
-        }
-}
-
-void
-gsd_media_keys_window_set_volume_muted (GsdMediaKeysWindow *window,
-                                        gboolean            muted)
-{
-        g_return_if_fail (GSD_IS_MEDIA_KEYS_WINDOW (window));
-
-        if (window->priv->volume_muted != muted) {
-                window->priv->volume_muted = muted;
-                volume_muted_changed (window);
-        }
-}
-
-void
-gsd_media_keys_window_set_volume_level (GsdMediaKeysWindow *window,
-                                        int                 level)
-{
-        g_return_if_fail (GSD_IS_MEDIA_KEYS_WINDOW (window));
-
-        if (window->priv->volume_level != level) {
-                window->priv->volume_level = level;
-                volume_level_changed (window);
-        }
-}
-
-static GdkPixbuf *
-load_pixbuf (GsdMediaKeysWindow *window,
-             const char         *name,
-             int                 icon_size)
-{
-        GtkIconTheme *theme;
-        GdkPixbuf    *pixbuf;
-
-        if (window != NULL && gtk_widget_has_screen (GTK_WIDGET (window))) {
-                theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (window)));
-        } else {
-                theme = gtk_icon_theme_get_default ();
-        }
-
-        pixbuf = gtk_icon_theme_load_icon (theme,
-                                           name,
-                                           icon_size,
-                                           GTK_ICON_LOOKUP_FORCE_SIZE,
-                                           NULL);
-
-        return pixbuf;
-}
-
-static void
-draw_eject (cairo_t *cr,
-            double   _x0,
-            double   _y0,
-            double   width,
-            double   height)
-{
-        int box_height;
-        int tri_height;
-        int separation;
-
-        box_height = height * 0.2;
-        separation = box_height / 3;
-        tri_height = height - box_height - separation;
-
-        cairo_rectangle (cr, _x0, _y0 + height - box_height, width, box_height);
-
-        cairo_move_to (cr, _x0, _y0 + tri_height);
-        cairo_rel_line_to (cr, width, 0);
-        cairo_rel_line_to (cr, -width / 2, -tri_height);
-        cairo_rel_line_to (cr, -width / 2, tri_height);
-        cairo_close_path (cr);
-        cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, GSD_OSD_WINDOW_FG_ALPHA);
-        cairo_fill_preserve (cr);
-
-        cairo_set_source_rgba (cr, 0.6, 0.6, 0.6, GSD_OSD_WINDOW_FG_ALPHA / 2);
-        cairo_set_line_width (cr, 2);
-        cairo_stroke (cr);
-}
-
-static void
-draw_waves (cairo_t *cr,
-            double   cx,
-            double   cy,
-            double   max_radius,
-            int      volume_level)
-{
-        const int n_waves = 3;
-        int last_wave;
-        int i;
-
-        last_wave = n_waves * volume_level / 100;
-
-        for (i = 0; i < n_waves; i++) {
-                double angle1;
-                double angle2;
-                double radius;
-                double alpha;
-
-                angle1 = -M_PI / 4;
-                angle2 = M_PI / 4;
-
-                if (i < last_wave)
-                        alpha = 1.0;
-                else if (i > last_wave)
-                        alpha = 0.1;
-                else alpha = 0.1 + 0.9 * (n_waves * volume_level % 100) / 100.0;
-
-                radius = (i + 1) * (max_radius / n_waves);
-                cairo_arc (cr, cx, cy, radius, angle1, angle2);
-                cairo_set_source_rgba (cr, 0.6, 0.6, 0.6, alpha / 2);
-                cairo_set_line_width (cr, 14);
-                cairo_set_line_cap  (cr, CAIRO_LINE_CAP_ROUND);
-                cairo_stroke_preserve (cr);
-
-                cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, alpha);
-                cairo_set_line_width (cr, 10);
-                cairo_set_line_cap  (cr, CAIRO_LINE_CAP_ROUND);
-                cairo_stroke (cr);
-        }
-}
-
-static void
-draw_cross (cairo_t *cr,
-            double   cx,
-            double   cy,
-            double   size)
-{
-        cairo_move_to (cr, cx, cy - size/2.0);
-        cairo_rel_line_to (cr, size, size);
-
-        cairo_move_to (cr, cx, cy + size/2.0);
-        cairo_rel_line_to (cr, size, -size);
-
-        cairo_set_source_rgba (cr, 0.6, 0.6, 0.6, GSD_OSD_WINDOW_FG_ALPHA / 2);
-        cairo_set_line_width (cr, 14);
-        cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND);
-        cairo_stroke_preserve (cr);
-
-        cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, GSD_OSD_WINDOW_FG_ALPHA);
-        cairo_set_line_width (cr, 10);
-        cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND);
-        cairo_stroke (cr);
-}
-
-static void
-draw_speaker (cairo_t *cr,
-              double   cx,
-              double   cy,
-              double   width,
-              double   height)
-{
-        double box_width;
-        double box_height;
-        double _x0;
-        double _y0;
-
-        box_width = width / 3;
-        box_height = height / 3;
-
-        _x0 = cx - (width / 2) + box_width;
-        _y0 = cy - box_height / 2;
-
-        cairo_move_to (cr, _x0, _y0);
-        cairo_rel_line_to (cr, - box_width, 0);
-        cairo_rel_line_to (cr, 0, box_height);
-        cairo_rel_line_to (cr, box_width, 0);
-
-        cairo_line_to (cr, cx + box_width, cy + height / 2);
-        cairo_rel_line_to (cr, 0, -height);
-        cairo_line_to (cr, _x0, _y0);
-        cairo_close_path (cr);
-
-        cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, GSD_OSD_WINDOW_FG_ALPHA);
-        cairo_fill_preserve (cr);
-
-        cairo_set_source_rgba (cr, 0.6, 0.6, 0.6, GSD_OSD_WINDOW_FG_ALPHA / 2);
-        cairo_set_line_width (cr, 2);
-        cairo_stroke (cr);
-}
-
-static gboolean
-render_speaker (GsdMediaKeysWindow *window,
-                cairo_t            *cr,
-                double              _x0,
-                double              _y0,
-                double              width,
-                double              height)
-{
-        GdkPixbuf         *pixbuf;
-        int                icon_size;
-        int                n;
-        static const char *icon_names[] = {
-                "audio-volume-muted",
-                "audio-volume-low",
-                "audio-volume-medium",
-                "audio-volume-high",
-                NULL
-        };
-
-        if (window->priv->volume_muted) {
-                n = 0;
-        } else {
-                /* select image */
-                n = 3 * window->priv->volume_level / 100 + 1;
-                if (n < 1) {
-                        n = 1;
-                } else if (n > 3) {
-                        n = 3;
-                }
-        }
-
-        icon_size = (int)width;
-
-        pixbuf = load_pixbuf (window, icon_names[n], icon_size);
-
-        if (pixbuf == NULL) {
-                return FALSE;
-        }
-
-        gdk_cairo_set_source_pixbuf (cr, pixbuf, _x0, _y0);
-        cairo_paint_with_alpha (cr, GSD_OSD_WINDOW_FG_ALPHA);
-
-        g_object_unref (pixbuf);
-
-        return TRUE;
-}
-
-#define LIGHTNESS_MULT  1.3
-#define DARKNESS_MULT   0.7
-
-static void
-draw_volume_boxes (GsdMediaKeysWindow *window,
-                   cairo_t            *cr,
-                   double              percentage,
-                   double              _x0,
-                   double              _y0,
-                   double              width,
-                   double              height)
-{
-        gdouble   x1;
-        GtkStyleContext *context;
-        GdkRGBA  acolor;
-
-        _x0 += 0.5;
-        _y0 += 0.5;
-        height = round (height) - 1;
-        width = round (width) - 1;
-        x1 = round ((width - 1) * percentage);
-        context = gtk_widget_get_style_context (GTK_WIDGET (window));
-
-        /* bar background */
-        gtk_style_context_get_background_color (context, GTK_STATE_NORMAL, &acolor);
-        gsd_osd_window_color_shade (&acolor, DARKNESS_MULT);
-        gsd_osd_window_color_reverse (&acolor);
-        acolor.alpha = GSD_OSD_WINDOW_FG_ALPHA / 2;
-        gsd_osd_window_draw_rounded_rectangle (cr, 1.0, _x0, _y0, height / 6, width, height);
-        gdk_cairo_set_source_rgba (cr, &acolor);
-        cairo_fill_preserve (cr);
-
-        /* bar border */
-        gtk_style_context_get_background_color (context, GTK_STATE_NORMAL, &acolor);
-        gsd_osd_window_color_shade (&acolor, LIGHTNESS_MULT);
-        gsd_osd_window_color_reverse (&acolor);
-        acolor.alpha = GSD_OSD_WINDOW_FG_ALPHA / 2;
-        gdk_cairo_set_source_rgba (cr, &acolor);
-        cairo_set_line_width (cr, 1);
-        cairo_stroke (cr);
-
-        /* bar progress */
-        if (percentage < 0.01)
-                return;
-        gtk_style_context_get_background_color (context, GTK_STATE_NORMAL, &acolor);
-        acolor.alpha = GSD_OSD_WINDOW_FG_ALPHA;
-        gsd_osd_window_draw_rounded_rectangle (cr, 1.0, _x0 + 0.5, _y0 + 0.5, height / 6 - 0.5, x1, height - 1);
-        gdk_cairo_set_source_rgba (cr, &acolor);
-        cairo_fill (cr);
-}
-
-static void
-draw_action_volume (GsdMediaKeysWindow *window,
-                    cairo_t            *cr)
-{
-        int window_width;
-        int window_height;
-        double icon_box_width;
-        double icon_box_height;
-        double icon_box_x0;
-        double icon_box_y0;
-        double volume_box_x0;
-        double volume_box_y0;
-        double volume_box_width;
-        double volume_box_height;
-        gboolean res;
-
-        gtk_window_get_size (GTK_WINDOW (window), &window_width, &window_height);
-
-        icon_box_width = round (window_width * 0.65);
-        icon_box_height = round (window_height * 0.65);
-        volume_box_width = icon_box_width;
-        volume_box_height = round (window_height * 0.05);
-
-        icon_box_x0 = (window_width - icon_box_width) / 2;
-        icon_box_y0 = (window_height - icon_box_height - volume_box_height) / 2;
-        volume_box_x0 = round (icon_box_x0);
-        volume_box_y0 = round (icon_box_height + icon_box_y0);
-
-#if 0
-        g_message ("icon box: w=%f h=%f _x0=%f _y0=%f",
-                   icon_box_width,
-                   icon_box_height,
-                   icon_box_x0,
-                   icon_box_y0);
-        g_message ("volume box: w=%f h=%f _x0=%f _y0=%f",
-                   volume_box_width,
-                   volume_box_height,
-                   volume_box_x0,
-                   volume_box_y0);
-#endif
-
-        res = render_speaker (window,
-                              cr,
-                              icon_box_x0, icon_box_y0,
-                              icon_box_width, icon_box_height);
-        if (! res) {
-                double speaker_width;
-                double speaker_height;
-                double speaker_cx;
-                double speaker_cy;
-
-                speaker_width = icon_box_width * 0.5;
-                speaker_height = icon_box_height * 0.75;
-                speaker_cx = icon_box_x0 + speaker_width / 2;
-                speaker_cy = icon_box_y0 + speaker_height / 2;
-
-#if 0
-                g_message ("speaker box: w=%f h=%f cx=%f cy=%f",
-                           speaker_width,
-                           speaker_height,
-                           speaker_cx,
-                           speaker_cy);
-#endif
-
-                /* draw speaker symbol */
-                draw_speaker (cr, speaker_cx, speaker_cy, speaker_width, speaker_height);
-
-                if (! window->priv->volume_muted) {
-                        /* draw sound waves */
-                        double wave_x0;
-                        double wave_y0;
-                        double wave_radius;
-
-                        wave_x0 = window_width / 2;
-                        wave_y0 = speaker_cy;
-                        wave_radius = icon_box_width / 2;
-
-                        draw_waves (cr, wave_x0, wave_y0, wave_radius, window->priv->volume_level);
-                } else {
-                        /* draw 'mute' cross */
-                        double cross_x0;
-                        double cross_y0;
-                        double cross_size;
-
-                        cross_size = speaker_width * 3 / 4;
-                        cross_x0 = icon_box_x0 + icon_box_width - cross_size;
-                        cross_y0 = speaker_cy;
-
-                        draw_cross (cr, cross_x0, cross_y0, cross_size);
-                }
-        }
-
-        /* draw volume meter */
-        draw_volume_boxes (window,
-                           cr,
-                           (double)window->priv->volume_level / 100.0,
-                           volume_box_x0,
-                           volume_box_y0,
-                           volume_box_width,
-                           volume_box_height);
-}
-
-static gboolean
-render_custom (GsdMediaKeysWindow *window,
-               cairo_t            *cr,
-               double              _x0,
-               double              _y0,
-               double              width,
-               double              height)
-{
-        GdkPixbuf         *pixbuf;
-        int                icon_size;
-
-        icon_size = (int)width;
-
-        pixbuf = load_pixbuf (window, window->priv->icon_name, icon_size);
-
-        if (pixbuf == NULL) {
-                char *name;
-                if (gtk_widget_get_direction (GTK_WIDGET (window)) == GTK_TEXT_DIR_RTL)
-                        name = g_strdup_printf ("%s-rtl", window->priv->icon_name);
-                else
-                        name = g_strdup_printf ("%s-ltr", window->priv->icon_name);
-                pixbuf = load_pixbuf (window, name, icon_size);
-                g_free (name);
-                if (pixbuf == NULL)
-                        return FALSE;
-        }
-
-        gdk_cairo_set_source_pixbuf (cr, pixbuf, _x0, _y0);
-        cairo_paint_with_alpha (cr, GSD_OSD_WINDOW_FG_ALPHA);
-
-        g_object_unref (pixbuf);
-
-        return TRUE;
-}
-
-static void
-draw_action_custom (GsdMediaKeysWindow *window,
-                    cairo_t            *cr)
-{
-        int window_width;
-        int window_height;
-        double icon_box_width;
-        double icon_box_height;
-        double icon_box_x0;
-        double icon_box_y0;
-        double bright_box_x0;
-        double bright_box_y0;
-        double bright_box_width;
-        double bright_box_height;
-        gboolean res;
-
-        gtk_window_get_size (GTK_WINDOW (window), &window_width, &window_height);
-
-        icon_box_width = round (window_width * 0.65);
-        icon_box_height = round (window_height * 0.65);
-        bright_box_width = round (icon_box_width);
-        bright_box_height = round (window_height * 0.05);
-
-        icon_box_x0 = (window_width - icon_box_width) / 2;
-        icon_box_y0 = (window_height - icon_box_height - bright_box_height) / 2;
-        bright_box_x0 = round (icon_box_x0);
-        bright_box_y0 = round (icon_box_height + icon_box_y0);
-
-#if 0
-        g_message ("icon box: w=%f h=%f _x0=%f _y0=%f",
-                   icon_box_width,
-                   icon_box_height,
-                   icon_box_x0,
-                   icon_box_y0);
-        g_message ("brightness box: w=%f h=%f _x0=%f _y0=%f",
-                   bright_box_width,
-                   bright_box_height,
-                   bright_box_x0,
-                   bright_box_y0);
-#endif
-
-        res = render_custom (window,
-                             cr,
-                             icon_box_x0, icon_box_y0,
-                             icon_box_width, icon_box_height);
-        if (! res && g_strcmp0 (window->priv->icon_name, "media-eject") == 0) {
-                /* draw eject symbol */
-                draw_eject (cr,
-                            icon_box_x0, icon_box_y0,
-                            icon_box_width, icon_box_height);
-        }
-
-        if (window->priv->show_level != FALSE) {
-                /* draw volume meter */
-                draw_volume_boxes (window,
-                                   cr,
-                                   (double)window->priv->volume_level / 100.0,
-                                   bright_box_x0,
-                                   bright_box_y0,
-                                   bright_box_width,
-                                   bright_box_height);
-        }
-}
-
-static void
-gsd_media_keys_window_draw_when_composited (GsdOsdWindow *osd_window,
-                                            cairo_t      *cr)
-{
-        GsdMediaKeysWindow *window = GSD_MEDIA_KEYS_WINDOW (osd_window);
-
-        switch (window->priv->action) {
-        case GSD_MEDIA_KEYS_WINDOW_ACTION_VOLUME:
-                draw_action_volume (window, cr);
-                break;
-        case GSD_MEDIA_KEYS_WINDOW_ACTION_CUSTOM:
-                draw_action_custom (window, cr);
-                break;
-        default:
-                break;
-        }
-}
-
-static void
-gsd_media_keys_window_class_init (GsdMediaKeysWindowClass *klass)
-{
-        GsdOsdWindowClass *osd_window_class = GSD_OSD_WINDOW_CLASS (klass);
-
-        osd_window_class->draw_when_composited = gsd_media_keys_window_draw_when_composited;
-
-        g_type_class_add_private (klass, sizeof (GsdMediaKeysWindowPrivate));
-}
-
-static void
-gsd_media_keys_window_init (GsdMediaKeysWindow *window)
-{
-        window->priv = GSD_MEDIA_KEYS_WINDOW_GET_PRIVATE (window);
-
-        if (!gsd_osd_window_is_composited (GSD_OSD_WINDOW (window))) {
-                GtkBuilder *builder;
-                const gchar *objects[] = {"acme_box", NULL};
-                GtkWidget *box;
-
-                builder = gtk_builder_new ();
-                gtk_builder_add_objects_from_file (builder,
-                                                   GTKBUILDERDIR "/acme.ui",
-                                                   (char **) objects,
-                                                   NULL);
-
-                window->priv->image = GTK_IMAGE (gtk_builder_get_object (builder, "acme_image"));
-                window->priv->progress = GTK_WIDGET (gtk_builder_get_object (builder, "acme_volume_progressbar"));
-                box = GTK_WIDGET (gtk_builder_get_object (builder, "acme_box"));
-
-                if (box != NULL) {
-                        gtk_container_add (GTK_CONTAINER (window), box);
-                        gtk_widget_show_all (box);
-                }
-
-                /* The builder needs to stay alive until the window
-                   takes ownership of the box (and its children)  */
-                g_object_unref (builder);
-        }
-}
-
-GtkWidget *
-gsd_media_keys_window_new (void)
-{
-        return g_object_new (GSD_TYPE_MEDIA_KEYS_WINDOW, NULL);
-}
diff -Nru totem-3.4.3/src/gsd-media-keys-window.h totem-3.6.2/src/gsd-media-keys-window.h
--- totem-3.4.3/src/gsd-media-keys-window.h	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/gsd-media-keys-window.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,74 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 8; tab-width: 8 -*-
- *
- * Copyright (C) 2006 William Jon McCann 
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2, 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 Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- */
-
-#ifndef GSD_MEDIA_KEYS_WINDOW_H
-#define GSD_MEDIA_KEYS_WINDOW_H
-
-#include 
-#include 
-
-#include "gsd-osd-window.h"
-
-G_BEGIN_DECLS
-
-#define GSD_TYPE_MEDIA_KEYS_WINDOW            (gsd_media_keys_window_get_type ())
-#define GSD_MEDIA_KEYS_WINDOW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj),  GSD_TYPE_MEDIA_KEYS_WINDOW, GsdMediaKeysWindow))
-#define GSD_MEDIA_KEYS_WINDOW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),   GSD_TYPE_MEDIA_KEYS_WINDOW, GsdMediaKeysWindowClass))
-#define GSD_IS_MEDIA_KEYS_WINDOW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj),  GSD_TYPE_MEDIA_KEYS_WINDOW))
-#define GSD_IS_MEDIA_KEYS_WINDOW_CLASS(klass) (G_TYPE_INSTANCE_GET_CLASS ((klass), GSD_TYPE_MEDIA_KEYS_WINDOW))
-
-typedef struct GsdMediaKeysWindow                   GsdMediaKeysWindow;
-typedef struct GsdMediaKeysWindowClass              GsdMediaKeysWindowClass;
-typedef struct GsdMediaKeysWindowPrivate            GsdMediaKeysWindowPrivate;
-
-struct GsdMediaKeysWindow {
-        GsdOsdWindow parent;
-
-        GsdMediaKeysWindowPrivate  *priv;
-};
-
-struct GsdMediaKeysWindowClass {
-        GsdOsdWindowClass parent_class;
-};
-
-typedef enum {
-        GSD_MEDIA_KEYS_WINDOW_ACTION_VOLUME,
-        GSD_MEDIA_KEYS_WINDOW_ACTION_CUSTOM
-} GsdMediaKeysWindowAction;
-
-GType                 gsd_media_keys_window_get_type          (void);
-
-GtkWidget *           gsd_media_keys_window_new               (void);
-void                  gsd_media_keys_window_set_action        (GsdMediaKeysWindow      *window,
-                                                               GsdMediaKeysWindowAction action);
-void                  gsd_media_keys_window_set_action_custom (GsdMediaKeysWindow      *window,
-                                                               const char              *icon_name,
-                                                               gboolean                 show_level);
-void                  gsd_media_keys_window_set_volume_muted  (GsdMediaKeysWindow      *window,
-                                                               gboolean                 muted);
-void                  gsd_media_keys_window_set_volume_level  (GsdMediaKeysWindow      *window,
-                                                               int                      level);
-gboolean              gsd_media_keys_window_is_valid          (GsdMediaKeysWindow      *window);
-
-G_END_DECLS
-
-#endif
diff -Nru totem-3.4.3/src/gsd-osd-window.c totem-3.6.2/src/gsd-osd-window.c
--- totem-3.4.3/src/gsd-osd-window.c	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/gsd-osd-window.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,762 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
- *
- * On-screen-display (OSD) window for gnome-settings-daemon's plugins
- *
- * Copyright (C) 2006-2007 William Jon McCann  
- * Copyright (C) 2009 Novell, Inc
- *
- * Authors:
- *   William Jon McCann 
- *   Federico Mena-Quintero 
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2, 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 Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- */
-
-#include "config.h"
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include "gsd-osd-window.h"
-
-#define DIALOG_TIMEOUT 2000     /* dialog timeout in ms */
-#define DIALOG_FADE_TIMEOUT 1500 /* timeout before fade starts */
-#define FADE_TIMEOUT 10        /* timeout in ms between each frame of the fade */
-
-#define BG_ALPHA 0.75
-
-#define GSD_OSD_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_OSD_WINDOW, GsdOsdWindowPrivate))
-
-struct GsdOsdWindowPrivate
-{
-        guint                    is_composited : 1;
-        guint                    hide_timeout_id;
-        guint                    fade_timeout_id;
-        double                   fade_out_alpha;
-};
-
-enum {
-        DRAW_WHEN_COMPOSITED,
-        LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-G_DEFINE_TYPE (GsdOsdWindow, gsd_osd_window, GTK_TYPE_WINDOW)
-
-static gboolean
-fade_timeout (GsdOsdWindow *window)
-{
-        if (window->priv->fade_out_alpha <= 0.0) {
-                gtk_widget_hide (GTK_WIDGET (window));
-
-                /* Reset it for the next time */
-                window->priv->fade_out_alpha = 1.0;
-                window->priv->fade_timeout_id = 0;
-
-                return FALSE;
-        } else {
-                GdkRectangle rect;
-                GtkWidget *win = GTK_WIDGET (window);
-                GtkAllocation allocation;
-
-                window->priv->fade_out_alpha -= 0.10;
-
-                rect.x = 0;
-                rect.y = 0;
-                gtk_widget_get_allocation (win, &allocation);
-                rect.width = allocation.width;
-                rect.height = allocation.height;
-
-                gtk_widget_realize (win);
-                gdk_window_invalidate_rect (gtk_widget_get_window (win), &rect, FALSE);
-        }
-
-        return TRUE;
-}
-
-static gboolean
-hide_timeout (GsdOsdWindow *window)
-{
-        if (window->priv->is_composited) {
-                window->priv->hide_timeout_id = 0;
-                window->priv->fade_timeout_id = g_timeout_add (FADE_TIMEOUT,
-                                                               (GSourceFunc) fade_timeout,
-                                                               window);
-        } else {
-                gtk_widget_hide (GTK_WIDGET (window));
-        }
-
-        return FALSE;
-}
-
-static void
-remove_hide_timeout (GsdOsdWindow *window)
-{
-        if (window->priv->hide_timeout_id != 0) {
-                g_source_remove (window->priv->hide_timeout_id);
-                window->priv->hide_timeout_id = 0;
-        }
-
-        if (window->priv->fade_timeout_id != 0) {
-                g_source_remove (window->priv->fade_timeout_id);
-                window->priv->fade_timeout_id = 0;
-                window->priv->fade_out_alpha = 1.0;
-        }
-}
-
-static void
-add_hide_timeout (GsdOsdWindow *window)
-{
-        int timeout;
-
-        if (window->priv->is_composited) {
-                timeout = DIALOG_FADE_TIMEOUT;
-        } else {
-                timeout = DIALOG_TIMEOUT;
-        }
-        window->priv->hide_timeout_id = g_timeout_add (timeout,
-                                                       (GSourceFunc) hide_timeout,
-                                                       window);
-}
-
-void
-gsd_osd_window_draw_rounded_rectangle (cairo_t* cr,
-                                       gdouble  aspect,
-                                       gdouble  x,
-                                       gdouble  y,
-                                       gdouble  corner_radius,
-                                       gdouble  width,
-                                       gdouble  height)
-{
-        gdouble radius = corner_radius / aspect;
-
-        cairo_move_to (cr, x + radius, y);
-
-        cairo_line_to (cr,
-                       x + width - radius,
-                       y);
-        cairo_arc (cr,
-                   x + width - radius,
-                   y + radius,
-                   radius,
-                   -90.0f * G_PI / 180.0f,
-                   0.0f * G_PI / 180.0f);
-        cairo_line_to (cr,
-                       x + width,
-                       y + height - radius);
-        cairo_arc (cr,
-                   x + width - radius,
-                   y + height - radius,
-                   radius,
-                   0.0f * G_PI / 180.0f,
-                   90.0f * G_PI / 180.0f);
-        cairo_line_to (cr,
-                       x + radius,
-                       y + height);
-        cairo_arc (cr,
-                   x + radius,
-                   y + height - radius,
-                   radius,
-                   90.0f * G_PI / 180.0f,
-                   180.0f * G_PI / 180.0f);
-        cairo_line_to (cr,
-                       x,
-                       y + radius);
-        cairo_arc (cr,
-                   x + radius,
-                   y + radius,
-                   radius,
-                   180.0f * G_PI / 180.0f,
-                   270.0f * G_PI / 180.0f);
-        cairo_close_path (cr);
-}
-
-static void
-rgb_to_hls (gdouble *r,
-            gdouble *g,
-            gdouble *b)
-{
-        gdouble min;
-        gdouble max;
-        gdouble red;
-        gdouble green;
-        gdouble blue;
-        gdouble h, l, s;
-        gdouble delta;
-
-        red = *r;
-        green = *g;
-        blue = *b;
-
-        if (red > green)
-        {
-                if (red > blue)
-                        max = red;
-                else
-                        max = blue;
-
-                if (green < blue)
-                        min = green;
-                else
-                        min = blue;
-        }
-        else
-        {
-                if (green > blue)
-                        max = green;
-                else
-                        max = blue;
-
-                if (red < blue)
-                        min = red;
-                else
-                        min = blue;
-        }
-
-        l = (max + min) / 2;
-        s = 0;
-        h = 0;
-
-        if (max != min)
-        {
-                if (l <= 0.5)
-                        s = (max - min) / (max + min);
-                else
-                        s = (max - min) / (2 - max - min);
-
-                delta = max -min;
-                if (red == max)
-                        h = (green - blue) / delta;
-                else if (green == max)
-                        h = 2 + (blue - red) / delta;
-                else if (blue == max)
-                        h = 4 + (red - green) / delta;
-
-                h *= 60;
-                if (h < 0.0)
-                        h += 360;
-        }
-
-        *r = h;
-        *g = l;
-        *b = s;
-}
-
-static void
-hls_to_rgb (gdouble *h,
-            gdouble *l,
-            gdouble *s)
-{
-        gdouble hue;
-        gdouble lightness;
-        gdouble saturation;
-        gdouble m1, m2;
-        gdouble r, g, b;
-
-        lightness = *l;
-        saturation = *s;
-
-        if (lightness <= 0.5)
-                m2 = lightness * (1 + saturation);
-        else
-                m2 = lightness + saturation - lightness * saturation;
-        m1 = 2 * lightness - m2;
-
-        if (saturation == 0)
-        {
-                *h = lightness;
-                *l = lightness;
-                *s = lightness;
-        }
-        else
-        {
-                hue = *h + 120;
-                while (hue > 360)
-                        hue -= 360;
-                while (hue < 0)
-                        hue += 360;
-
-                if (hue < 60)
-                        r = m1 + (m2 - m1) * hue / 60;
-                else if (hue < 180)
-                        r = m2;
-                else if (hue < 240)
-                        r = m1 + (m2 - m1) * (240 - hue) / 60;
-                else
-                        r = m1;
-
-                hue = *h;
-                while (hue > 360)
-                        hue -= 360;
-                while (hue < 0)
-                        hue += 360;
-
-                if (hue < 60)
-                        g = m1 + (m2 - m1) * hue / 60;
-                else if (hue < 180)
-                        g = m2;
-                else if (hue < 240)
-                        g = m1 + (m2 - m1) * (240 - hue) / 60;
-                else
-                        g = m1;
-
-                hue = *h - 120;
-                while (hue > 360)
-                        hue -= 360;
-                while (hue < 0)
-                        hue += 360;
-
-                if (hue < 60)
-                        b = m1 + (m2 - m1) * hue / 60;
-                else if (hue < 180)
-                        b = m2;
-                else if (hue < 240)
-                        b = m1 + (m2 - m1) * (240 - hue) / 60;
-                else
-                        b = m1;
-
-                *h = r;
-                *l = g;
-                *s = b;
-        }
-}
-
-void
-gsd_osd_window_color_shade (GdkRGBA *a,
-                            gdouble   k)
-{
-        gdouble red;
-        gdouble green;
-        gdouble blue;
-
-        red = a->red;
-        green = a->green;
-        blue = a->blue;
-
-        rgb_to_hls (&red, &green, &blue);
-
-        green *= k;
-        if (green > 1.0)
-                green = 1.0;
-        else if (green < 0.0)
-                green = 0.0;
-
-        blue *= k;
-        if (blue > 1.0)
-                blue = 1.0;
-        else if (blue < 0.0)
-                blue = 0.0;
-
-        hls_to_rgb (&red, &green, &blue);
-
-        a->red = red;
-        a->green = green;
-        a->blue = blue;
-}
-
-
-void
-gsd_osd_window_color_reverse (GdkRGBA *a)
-{
-        gdouble red;
-        gdouble green;
-        gdouble blue;
-        gdouble h;
-        gdouble s;
-        gdouble v;
-
-        red = a->red;
-        green = a->green;
-        blue = a->blue;
-
-        gtk_rgb_to_hsv (red, green, blue, &h, &s, &v);
-
-        v = 0.5 + (0.5 - v);
-        if (v > 1.0)
-                v = 1.0;
-        else if (v < 0.0)
-                v = 0.0;
-
-        gtk_hsv_to_rgb (h, s, v, &red, &green, &blue);
-
-        a->red = red;
-        a->green = green;
-        a->blue = blue;
-}
-
-/* This is our draw handler when the window is in a compositing manager.
- * We draw everything by hand, using Cairo, so that we can have a nice
- * transparent/rounded look.
- */
-static void
-draw_when_composited (GtkWidget *widget, cairo_t *orig_cr)
-{
-        GsdOsdWindow    *window;
-        cairo_t         *cr;
-        cairo_surface_t *surface;
-        int              width;
-        int              height;
-        GtkStyleContext *context;
-        GdkRGBA          acolor;
-
-        window = GSD_OSD_WINDOW (widget);
-
-        context = gtk_widget_get_style_context (widget);
-        cairo_set_operator (orig_cr, CAIRO_OPERATOR_SOURCE);
-        gtk_window_get_size (GTK_WINDOW (widget), &width, &height);
-
-        surface = cairo_surface_create_similar (cairo_get_target (orig_cr),
-                                                CAIRO_CONTENT_COLOR_ALPHA,
-                                                width,
-                                                height);
-
-        if (cairo_surface_status (surface) != CAIRO_STATUS_SUCCESS) {
-                goto done;
-        }
-
-        cr = cairo_create (surface);
-        if (cairo_status (cr) != CAIRO_STATUS_SUCCESS) {
-                goto done;
-        }
-        cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, 0.0);
-        cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
-        cairo_paint (cr);
-
-        /* draw a box */
-        gsd_osd_window_draw_rounded_rectangle (cr, 1.0, 0.5, 0.5, height / 10, width-1, height-1);
-        gtk_style_context_get_background_color (context, GTK_STATE_NORMAL, &acolor);
-        gsd_osd_window_color_reverse (&acolor);
-        acolor.alpha = BG_ALPHA;
-        gdk_cairo_set_source_rgba (cr, &acolor);
-        cairo_fill_preserve (cr);
-
-        /* FIXME use &style->text_aa[GTK_STATE_NORMAL] instead? */
-        gtk_style_context_get_color (context, GTK_STATE_NORMAL, &acolor);
-        gsd_osd_window_color_reverse (&acolor);
-        acolor.alpha = BG_ALPHA / 2;
-        gdk_cairo_set_source_rgba (cr, &acolor);
-        cairo_set_line_width (cr, 1);
-        cairo_stroke (cr);
-
-        g_signal_emit (window, signals[DRAW_WHEN_COMPOSITED], 0, cr);
-
-        cairo_destroy (cr);
-
-        /* Make sure we have a transparent background */
-        cairo_rectangle (orig_cr, 0, 0, width, height);
-        cairo_set_source_rgba (orig_cr, 0.0, 0.0, 0.0, 0.0);
-        cairo_fill (orig_cr);
-
-        cairo_set_source_surface (orig_cr, surface, 0, 0);
-        cairo_paint_with_alpha (orig_cr, window->priv->fade_out_alpha);
-
- done:
-        if (surface != NULL) {
-                cairo_surface_destroy (surface);
-        }
-}
-
-/* This is our draw handler when the window is *not* in a compositing manager.
- * We just draw a rectangular frame by hand.  We do this with hardcoded drawing code,
- * instead of GtkFrame, to avoid changing the window's internal widget hierarchy:  in
- * either case (composited or non-composited), callers can assume that this works
- * identically to a GtkWindow without any intermediate widgetry.
- */
-static void
-draw_when_not_composited (GtkWidget *widget, cairo_t *cr)
-{
-        GtkStyleContext *context;
-        int width;
-        int height;
-
-        width = gtk_widget_get_allocated_width (widget);
-        height = gtk_widget_get_allocated_width (widget);
-        context = gtk_widget_get_style_context (widget);
-
-        gtk_style_context_set_state (context, GTK_STATE_FLAG_ACTIVE);
-        gtk_render_frame (context,
-                          cr,
-                          0,
-                          0,
-                          width,
-                          height);
-}
-
-static gboolean
-gsd_osd_window_draw (GtkWidget *widget,
-                     cairo_t   *cr)
-{
-        GsdOsdWindow *window;
-        GtkWidget *child;
-
-        window = GSD_OSD_WINDOW (widget);
-
-        if (window->priv->is_composited)
-                draw_when_composited (widget, cr);
-        else
-                draw_when_not_composited (widget, cr);
-
-        child = gtk_bin_get_child (GTK_BIN (window));
-        if (child)
-                gtk_container_propagate_draw (GTK_CONTAINER (window), child, cr);
-
-        return FALSE;
-}
-
-static void
-gsd_osd_window_real_show (GtkWidget *widget)
-{
-        GsdOsdWindow *window;
-
-        if (GTK_WIDGET_CLASS (gsd_osd_window_parent_class)->show) {
-                GTK_WIDGET_CLASS (gsd_osd_window_parent_class)->show (widget);
-        }
-
-        window = GSD_OSD_WINDOW (widget);
-        remove_hide_timeout (window);
-        add_hide_timeout (window);
-}
-
-static void
-gsd_osd_window_real_hide (GtkWidget *widget)
-{
-        GsdOsdWindow *window;
-
-        if (GTK_WIDGET_CLASS (gsd_osd_window_parent_class)->hide) {
-                GTK_WIDGET_CLASS (gsd_osd_window_parent_class)->hide (widget);
-        }
-
-        window = GSD_OSD_WINDOW (widget);
-        remove_hide_timeout (window);
-}
-
-static void
-gsd_osd_window_real_realize (GtkWidget *widget)
-{
-        cairo_region_t *region;
-        GdkScreen *screen;
-        GdkVisual *visual;
-
-        screen = gtk_widget_get_screen (widget);
-        visual = gdk_screen_get_rgba_visual (screen);
-        if (visual == NULL) {
-                visual = gdk_screen_get_system_visual (screen);
-        }
-
-        gtk_widget_set_visual (widget, visual);
-
-        if (GTK_WIDGET_CLASS (gsd_osd_window_parent_class)->realize) {
-                GTK_WIDGET_CLASS (gsd_osd_window_parent_class)->realize (widget);
-        }
-
-        /* make the whole window ignore events */
-        region = cairo_region_create ();
-        gtk_widget_input_shape_combine_region (widget, region);
-        cairo_region_destroy (region);
-}
-
-static void
-gsd_osd_window_style_updated (GtkWidget *widget)
-{
-        GtkStyleContext *context;
-        GtkBorder padding;
-
-        GTK_WIDGET_CLASS (gsd_osd_window_parent_class)->style_updated (widget);
-
-        /* We set our border width to 12 (per the GNOME standard), plus the
-         * thickness of the frame that we draw in our draw handler.  This will
-         * make our child be 12 pixels away from the frame.
-         */
-
-        context = gtk_widget_get_style_context (widget);
-        gtk_style_context_get_padding (context, GTK_STATE_NORMAL, &padding);
-        gtk_container_set_border_width (GTK_CONTAINER (widget), 12 + MAX (padding.left, padding.top));
-}
-
-static void
-gsd_osd_window_get_preferred_width (GtkWidget *widget,
-                                    gint      *minimum,
-                                    gint      *natural)
-{
-        GtkStyleContext *context;
-        GtkBorder padding;
-
-        GTK_WIDGET_CLASS (gsd_osd_window_parent_class)->get_preferred_width (widget, minimum, natural);
-
-        /* See the comment in gsd_osd_window_style_updated() for why we add the padding here */
-
-        context = gtk_widget_get_style_context (widget);
-        gtk_style_context_get_padding (context, GTK_STATE_NORMAL, &padding);
-
-        *minimum += padding.left;
-        *natural += padding.left;
-}
-
-static void
-gsd_osd_window_get_preferred_height (GtkWidget *widget,
-                                     gint      *minimum,
-                                     gint      *natural)
-{
-        GtkStyleContext *context;
-        GtkBorder padding;
-
-        GTK_WIDGET_CLASS (gsd_osd_window_parent_class)->get_preferred_height (widget, minimum, natural);
-
-        /* See the comment in gsd_osd_window_style_updated() for why we add the padding here */
-
-        context = gtk_widget_get_style_context (widget);
-        gtk_style_context_get_padding (context, GTK_STATE_NORMAL, &padding);
-
-        *minimum += padding.top;
-        *natural += padding.top;
-}
-
-static GObject *
-gsd_osd_window_constructor (GType                  type,
-                            guint                  n_construct_properties,
-                            GObjectConstructParam *construct_params)
-{
-        GObject *object;
-
-        object = G_OBJECT_CLASS (gsd_osd_window_parent_class)->constructor (type, n_construct_properties, construct_params);
-
-        g_object_set (object,
-                      "type", GTK_WINDOW_POPUP,
-                      "type-hint", GDK_WINDOW_TYPE_HINT_NOTIFICATION,
-                      "skip-taskbar-hint", TRUE,
-                      "skip-pager-hint", TRUE,
-                      "focus-on-map", FALSE,
-                      NULL);
-
-        return object;
-}
-
-static void
-gsd_osd_window_class_init (GsdOsdWindowClass *klass)
-{
-        GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-        GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-
-        gobject_class->constructor = gsd_osd_window_constructor;
-
-        widget_class->show = gsd_osd_window_real_show;
-        widget_class->hide = gsd_osd_window_real_hide;
-        widget_class->realize = gsd_osd_window_real_realize;
-        widget_class->style_updated = gsd_osd_window_style_updated;
-        widget_class->get_preferred_width = gsd_osd_window_get_preferred_width;
-        widget_class->get_preferred_height = gsd_osd_window_get_preferred_height;
-        widget_class->draw = gsd_osd_window_draw;
-
-        signals[DRAW_WHEN_COMPOSITED] = g_signal_new ("draw-when-composited",
-                                                      G_TYPE_FROM_CLASS (gobject_class),
-                                                      G_SIGNAL_RUN_FIRST,
-                                                      G_STRUCT_OFFSET (GsdOsdWindowClass, draw_when_composited),
-                                                      NULL, NULL,
-                                                      g_cclosure_marshal_VOID__POINTER,
-                                                      G_TYPE_NONE, 1,
-                                                      G_TYPE_POINTER);
-
-        g_type_class_add_private (klass, sizeof (GsdOsdWindowPrivate));
-}
-
-/*
- * gsd_osd_window_is_composited:
- * @window: a #GsdOsdWindow
- *
- * Return value: whether the window was created on a composited screen.
- */
-gboolean
-gsd_osd_window_is_composited (GsdOsdWindow *window)
-{
-        return window->priv->is_composited;
-}
-
-/*
- * gsd_osd_window_is_valid:
- * @window: a #GsdOsdWindow
- *
- * Return value: TRUE if the @window's idea of being composited matches whether
- * its current screen is actually composited.
- */
-gboolean
-gsd_osd_window_is_valid (GsdOsdWindow *window)
-{
-        GdkScreen *screen = gtk_widget_get_screen (GTK_WIDGET (window));
-        return gdk_screen_is_composited (screen) == window->priv->is_composited;
-}
-
-static void
-gsd_osd_window_init (GsdOsdWindow *window)
-{
-        GdkScreen *screen;
-
-        window->priv = GSD_OSD_WINDOW_GET_PRIVATE (window);
-
-        screen = gtk_widget_get_screen (GTK_WIDGET (window));
-
-        window->priv->is_composited = gdk_screen_is_composited (screen);
-
-        if (window->priv->is_composited) {
-                gdouble scalew, scaleh, scale;
-                gint size;
-
-                gtk_window_set_decorated (GTK_WINDOW (window), FALSE);
-                gtk_widget_set_app_paintable (GTK_WIDGET (window), TRUE);
-
-                /* assume 130x130 on a 640x480 display and scale from there */
-                scalew = gdk_screen_get_width (screen) / 640.0;
-                scaleh = gdk_screen_get_height (screen) / 480.0;
-                scale = MIN (scalew, scaleh);
-                size = 130 * MAX (1, scale);
-
-                gtk_window_set_default_size (GTK_WINDOW (window), size, size);
-
-                window->priv->fade_out_alpha = 1.0;
-        } else {
-                gtk_container_set_border_width (GTK_CONTAINER (window), 12);
-        }
-}
-
-GtkWidget *
-gsd_osd_window_new (void)
-{
-        return g_object_new (GSD_TYPE_OSD_WINDOW, NULL);
-}
-
-/**
- * gsd_osd_window_update_and_hide:
- * @window: a #GsdOsdWindow
- *
- * Queues the @window for immediate drawing, and queues a timer to hide the window.
- */
-void
-gsd_osd_window_update_and_hide (GsdOsdWindow *window)
-{
-        remove_hide_timeout (window);
-        add_hide_timeout (window);
-
-        if (window->priv->is_composited) {
-                gtk_widget_queue_draw (GTK_WIDGET (window));
-        }
-}
diff -Nru totem-3.4.3/src/gsd-osd-window.h totem-3.6.2/src/gsd-osd-window.h
--- totem-3.4.3/src/gsd-osd-window.h	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/gsd-osd-window.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,95 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 8; tab-width: 8 -*-
- *
- * On-screen-display (OSD) window for gnome-settings-daemon's plugins
- *
- * Copyright (C) 2006 William Jon McCann  
- * Copyright (C) 2009 Novell, Inc
- *
- * Authors:
- *   William Jon McCann 
- *   Federico Mena-Quintero 
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2, 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 Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- */
-
-/* GsdOsdWindow is an "on-screen-display" window (OSD).  It is the cute,
- * semi-transparent, curved popup that appears when you press a hotkey global to
- * the desktop, such as to change the volume, switch your monitor's parameters,
- * etc.
- *
- * You can create a GsdOsdWindow and use it as a normal GtkWindow.  It will
- * automatically center itself, figure out if it needs to be composited, etc.
- * Just pack your widgets in it, sit back, and enjoy the ride.
- */
-
-#ifndef GSD_OSD_WINDOW_H
-#define GSD_OSD_WINDOW_H
-
-#include 
-#include 
-
-G_BEGIN_DECLS
-
-/* Alpha value to be used for foreground objects drawn in an OSD window */
-#define GSD_OSD_WINDOW_FG_ALPHA 1.0
-
-#define GSD_TYPE_OSD_WINDOW            (gsd_osd_window_get_type ())
-#define GSD_OSD_WINDOW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj),  GSD_TYPE_OSD_WINDOW, GsdOsdWindow))
-#define GSD_OSD_WINDOW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),   GSD_TYPE_OSD_WINDOW, GsdOsdWindowClass))
-#define GSD_IS_OSD_WINDOW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj),  GSD_TYPE_OSD_WINDOW))
-#define GSD_IS_OSD_WINDOW_CLASS(klass) (G_TYPE_INSTANCE_GET_CLASS ((klass), GSD_TYPE_OSD_WINDOW))
-#define GSD_OSD_WINDOW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GSD_TYPE_OSD_WINDOW, GsdOsdWindowClass))
-
-typedef struct GsdOsdWindow                   GsdOsdWindow;
-typedef struct GsdOsdWindowClass              GsdOsdWindowClass;
-typedef struct GsdOsdWindowPrivate            GsdOsdWindowPrivate;
-
-struct GsdOsdWindow {
-        GtkWindow                   parent;
-
-        GsdOsdWindowPrivate  *priv;
-};
-
-struct GsdOsdWindowClass {
-        GtkWindowClass parent_class;
-
-        void (* draw_when_composited) (GsdOsdWindow *window, cairo_t *cr);
-};
-
-GType                 gsd_osd_window_get_type          (void);
-
-GtkWidget *           gsd_osd_window_new               (void);
-gboolean              gsd_osd_window_is_composited     (GsdOsdWindow      *window);
-gboolean              gsd_osd_window_is_valid          (GsdOsdWindow      *window);
-void                  gsd_osd_window_update_and_hide   (GsdOsdWindow      *window);
-
-void                  gsd_osd_window_draw_rounded_rectangle (cairo_t *cr,
-                                                             gdouble  aspect,
-                                                             gdouble  x,
-                                                             gdouble  y,
-                                                             gdouble  corner_radius,
-                                                             gdouble  width,
-                                                             gdouble  height);
-
-void                  gsd_osd_window_color_reverse          (GdkRGBA *a);
-void                  gsd_osd_window_color_shade            (GdkRGBA *a,
-                                                             gdouble  k);
-
-G_END_DECLS
-
-#endif
diff -Nru totem-3.4.3/src/gst/Makefile.am totem-3.6.2/src/gst/Makefile.am
--- totem-3.4.3/src/gst/Makefile.am	2012-01-10 16:10:04.000000000 +0000
+++ totem-3.6.2/src/gst/Makefile.am	2012-08-29 23:07:45.000000000 +0000
@@ -1,29 +1,56 @@
-noinst_LTLIBRARIES = libtotemgsthelpers.la
+noinst_LTLIBRARIES =			\
+	libtotemgsthelpers.la		\
+	libtotemgstpixbufhelpers.la	\
+	libtotemtimehelpers.la
 
-libtotemgsthelpers_la_SOURCES =				\
-	totem-gst-helpers.c				\
+libtotemgsthelpers_la_SOURCES =	\
+	totem-gst-helpers.c	\
 	totem-gst-helpers.h
 
-libtotemgsthelpers_la_CPPFLAGS = \
-	-D_REENTRANT				\
-	$(DISABLE_DEPRECATED)			\
+libtotemgsthelpers_la_CPPFLAGS =	\
+	-D_REENTRANT			\
+	$(DISABLE_DEPRECATED)		\
 	$(AM_CPPFLAGS)
 
-libtotemgsthelpers_la_CFLAGS = \
-	$(DEPENDENCY_CFLAGS)		\
-	$(MM_CFLAGS)			\
-	$(MISSING_PLUGINS_CFLAGS)	\
+libtotemgsthelpers_la_CFLAGS =	\
+	$(HELPER_CFLAGS)	\
 	$(AM_CFLAGS)
 
-libtotemgsthelpers_la_LIBADD = \
-	$(MM_LIBS)		\
-	$(GST_LIBS)		\
-	$(EXTRA_BACKEND_LIBS)	\
-	$(X_LIBS)		\
-	$(MISSING_PLUGINS_LIBS)	\
-	-lm
+libtotemgsthelpers_la_LIBADD = $(HELPER_LIBS)
+libtotemgsthelpers_la_LDFLAGS= -no-undefined
 
-libtotemgsthelpers_la_LDFLAGS= \
-	-no-undefined
+libtotemgstpixbufhelpers_la_SOURCES =	\
+	totem-gst-pixbuf-helpers.c	\
+	totem-gst-pixbuf-helpers.h
+
+libtotemgstpixbufhelpers_la_CPPFLAGS =	\
+	-D_REENTRANT			\
+	$(DISABLE_DEPRECATED)		\
+	$(AM_CPPFLAGS)
+
+libtotemgstpixbufhelpers_la_CFLAGS =	\
+	$(PIXBUF_HELPER_CFLAGS)		\
+	$(AM_CFLAGS)
+
+libtotemgstpixbufhelpers_la_LIBADD = $(PIXBUF_HELPER_LIBS)
+libtotemgstpixbufhelpers_la_LDFLAGS= -no-undefined
+
+libtotemtimehelpers_la_SOURCES =	\
+	totem-time-helpers.c		\
+	totem-time-helpers.h
+
+libtotemtimehelpers_la_CPPFLAGS =	\
+	-D_REENTRANT			\
+	$(DISABLE_DEPRECATED)		\
+	$(AM_CPPFLAGS)
+
+libtotemtimehelpers_la_CFLAGS =	\
+	$(TIME_HELPER_CFLAGS)	\
+	$(AM_CFLAGS)
+
+libtotemtimehelpers_la_LIBADD = $(TIME_HELPER_LIBS)
+libtotemtimehelpers_la_LDFLAGS= -no-undefined
+
+EXTRA_DIST = totem-time-helpers.h
 
 -include $(top_srcdir)/git.mk
diff -Nru totem-3.4.3/src/gst/Makefile.in totem-3.6.2/src/gst/Makefile.in
--- totem-3.4.3/src/gst/Makefile.in	2012-07-04 09:54:48.000000000 +0000
+++ totem-3.6.2/src/gst/Makefile.in	2012-10-25 13:36:20.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.12.2 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +15,23 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -35,12 +51,10 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = src/gst
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -49,19 +63,47 @@
 CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-libtotemgsthelpers_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+libtotemgsthelpers_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am_libtotemgsthelpers_la_OBJECTS =  \
 	libtotemgsthelpers_la-totem-gst-helpers.lo
 libtotemgsthelpers_la_OBJECTS = $(am_libtotemgsthelpers_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 libtotemgsthelpers_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(libtotemgsthelpers_la_CFLAGS) $(CFLAGS) \
 	$(libtotemgsthelpers_la_LDFLAGS) $(LDFLAGS) -o $@
+libtotemgstpixbufhelpers_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_libtotemgstpixbufhelpers_la_OBJECTS =  \
+	libtotemgstpixbufhelpers_la-totem-gst-pixbuf-helpers.lo
+libtotemgstpixbufhelpers_la_OBJECTS =  \
+	$(am_libtotemgstpixbufhelpers_la_OBJECTS)
+libtotemgstpixbufhelpers_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(libtotemgstpixbufhelpers_la_CFLAGS) $(CFLAGS) \
+	$(libtotemgstpixbufhelpers_la_LDFLAGS) $(LDFLAGS) -o $@
+libtotemtimehelpers_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_libtotemtimehelpers_la_OBJECTS =  \
+	libtotemtimehelpers_la-totem-time-helpers.lo
+libtotemtimehelpers_la_OBJECTS = $(am_libtotemtimehelpers_la_OBJECTS)
+libtotemtimehelpers_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(libtotemtimehelpers_la_CFLAGS) $(CFLAGS) \
+	$(libtotemtimehelpers_la_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -74,22 +116,27 @@
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = $(libtotemgsthelpers_la_SOURCES)
-DIST_SOURCES = $(libtotemgsthelpers_la_SOURCES)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libtotemgsthelpers_la_SOURCES) \
+	$(libtotemgstpixbufhelpers_la_SOURCES) \
+	$(libtotemtimehelpers_la_SOURCES)
+DIST_SOURCES = $(libtotemgsthelpers_la_SOURCES) \
+	$(libtotemgstpixbufhelpers_la_SOURCES) \
+	$(libtotemtimehelpers_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -108,6 +155,10 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BACKEND_CFLAGS = @BACKEND_CFLAGS@
+BACKEND_LIBS = @BACKEND_LIBS@
+BACKEND_TEST_CFLAGS = @BACKEND_TEST_CFLAGS@
+BACKEND_TEST_LIBS = @BACKEND_TEST_LIBS@
 BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
 BROWSER_PLUGIN_DIR = @BROWSER_PLUGIN_DIR@
 BROWSER_PLUGIN_LIBS = @BROWSER_PLUGIN_LIBS@
@@ -129,8 +180,6 @@
 DBUS_LIBS = @DBUS_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DEPENDENCY_CFLAGS = @DEPENDENCY_CFLAGS@
-DEPENDENCY_LIBS = @DEPENDENCY_LIBS@
 DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DISC_RECORDER_CFLAGS = @DISC_RECORDER_CFLAGS@
 DISC_RECORDER_LIBS = @DISC_RECORDER_LIBS@
@@ -144,7 +193,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-EXTRA_BACKEND_LIBS = @EXTRA_BACKEND_LIBS@
 FGREP = @FGREP@
 FULL_LIBEXECDIR = @FULL_LIBEXECDIR@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
@@ -152,19 +200,21 @@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GLIB_REQS = @GLIB_REQS@
+GLOW_BUTTON_CFLAGS = @GLOW_BUTTON_CFLAGS@
+GLOW_BUTTON_LIBS = @GLOW_BUTTON_LIBS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
-GST_CFLAGS = @GST_CFLAGS@
-GST_LIBS = @GST_LIBS@
+GST_PLUGINS_BAD_CFLAGS = @GST_PLUGINS_BAD_CFLAGS@
+GST_PLUGINS_BAD_LIBS = @GST_PLUGINS_BAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
 GTK_REQS = @GTK_REQS@
+HELPER_CFLAGS = @HELPER_CFLAGS@
+HELPER_LIBS = @HELPER_LIBS@
 HELP_DIR = @HELP_DIR@
 HTML_DIR = @HTML_DIR@
 INSTALL = @INSTALL@
@@ -190,11 +240,11 @@
 INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBEPC_CFLAGS = @LIBEPC_CFLAGS@
-LIBEPC_LIBS = @LIBEPC_LIBS@
 LIBGRILO_CFLAGS = @LIBGRILO_CFLAGS@
 LIBGRILO_LIBS = @LIBGRILO_LIBS@
 LIBOBJS = @LIBOBJS@
+LIBPLAYER_CFLAGS = @LIBPLAYER_CFLAGS@
+LIBPLAYER_LIBS = @LIBPLAYER_LIBS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBZEITGEIST_CFLAGS = @LIBZEITGEIST_CFLAGS@
@@ -211,8 +261,6 @@
 MISSING_PLUGINS_CFLAGS = @MISSING_PLUGINS_CFLAGS@
 MISSING_PLUGINS_LIBS = @MISSING_PLUGINS_LIBS@
 MKDIR_P = @MKDIR_P@
-MM_CFLAGS = @MM_CFLAGS@
-MM_LIBS = @MM_LIBS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 NAUTILUSDIR = @NAUTILUSDIR@
@@ -233,15 +281,21 @@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PEASGTK_CFLAGS = @PEASGTK_CFLAGS@
-PEASGTK_LIBS = @PEASGTK_LIBS@
-PEAS_CFLAGS = @PEAS_CFLAGS@
-PEAS_LIBS = @PEAS_LIBS@
+PIXBUF_HELPER_CFLAGS = @PIXBUF_HELPER_CFLAGS@
+PIXBUF_HELPER_LIBS = @PIXBUF_HELPER_LIBS@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLAYER_CFLAGS = @PLAYER_CFLAGS@
+PLAYER_LIBS = @PLAYER_LIBS@
 PLUGINDIR = @PLUGINDIR@
 PLUGINS = @PLUGINS@
+PLUGIN_VIEWER_CFLAGS = @PLUGIN_VIEWER_CFLAGS@
+PLUGIN_VIEWER_LIBS = @PLUGIN_VIEWER_LIBS@
+PREVIEW_CFLAGS = @PREVIEW_CFLAGS@
+PREVIEW_LIBS = @PREVIEW_LIBS@
+PROPERTIES_CFLAGS = @PROPERTIES_CFLAGS@
+PROPERTIES_LIBS = @PROPERTIES_LIBS@
 PYGOBJECT_CFLAGS = @PYGOBJECT_CFLAGS@
 PYGOBJECT_LIBS = @PYGOBJECT_LIBS@
 PYLINT = @PYLINT@
@@ -261,6 +315,10 @@
 SMCLIENT_CFLAGS = @SMCLIENT_CFLAGS@
 SMCLIENT_LIBS = @SMCLIENT_LIBS@
 STRIP = @STRIP@
+THUMBNAILER_CFLAGS = @THUMBNAILER_CFLAGS@
+THUMBNAILER_LIBS = @THUMBNAILER_LIBS@
+TIME_HELPER_CFLAGS = @TIME_HELPER_CFLAGS@
+TIME_HELPER_LIBS = @TIME_HELPER_LIBS@
 TOTEM_API_VERSION = @TOTEM_API_VERSION@
 TOTEM_PLPARSER_REQS = @TOTEM_PLPARSER_REQS@
 TOTEM_VERSION_MAJOR = @TOTEM_VERSION_MAJOR@
@@ -272,9 +330,6 @@
 WARN_CFLAGS = @WARN_CFLAGS@
 WARN_CXXFLAGS = @WARN_CXXFLAGS@
 XGETTEXT = @XGETTEXT@
-XMKMF = @XMKMF@
-XTEST_LIBS = @XTEST_LIBS@
-X_LIBS = @X_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -335,33 +390,57 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-noinst_LTLIBRARIES = libtotemgsthelpers.la
+noinst_LTLIBRARIES = \
+	libtotemgsthelpers.la		\
+	libtotemgstpixbufhelpers.la	\
+	libtotemtimehelpers.la
+
 libtotemgsthelpers_la_SOURCES = \
-	totem-gst-helpers.c				\
+	totem-gst-helpers.c	\
 	totem-gst-helpers.h
 
 libtotemgsthelpers_la_CPPFLAGS = \
-	-D_REENTRANT				\
-	$(DISABLE_DEPRECATED)			\
+	-D_REENTRANT			\
+	$(DISABLE_DEPRECATED)		\
 	$(AM_CPPFLAGS)
 
 libtotemgsthelpers_la_CFLAGS = \
-	$(DEPENDENCY_CFLAGS)		\
-	$(MM_CFLAGS)			\
-	$(MISSING_PLUGINS_CFLAGS)	\
+	$(HELPER_CFLAGS)	\
 	$(AM_CFLAGS)
 
-libtotemgsthelpers_la_LIBADD = \
-	$(MM_LIBS)		\
-	$(GST_LIBS)		\
-	$(EXTRA_BACKEND_LIBS)	\
-	$(X_LIBS)		\
-	$(MISSING_PLUGINS_LIBS)	\
-	-lm
+libtotemgsthelpers_la_LIBADD = $(HELPER_LIBS)
+libtotemgsthelpers_la_LDFLAGS = -no-undefined
+libtotemgstpixbufhelpers_la_SOURCES = \
+	totem-gst-pixbuf-helpers.c	\
+	totem-gst-pixbuf-helpers.h
+
+libtotemgstpixbufhelpers_la_CPPFLAGS = \
+	-D_REENTRANT			\
+	$(DISABLE_DEPRECATED)		\
+	$(AM_CPPFLAGS)
 
-libtotemgsthelpers_la_LDFLAGS = \
-	-no-undefined
+libtotemgstpixbufhelpers_la_CFLAGS = \
+	$(PIXBUF_HELPER_CFLAGS)		\
+	$(AM_CFLAGS)
+
+libtotemgstpixbufhelpers_la_LIBADD = $(PIXBUF_HELPER_LIBS)
+libtotemgstpixbufhelpers_la_LDFLAGS = -no-undefined
+libtotemtimehelpers_la_SOURCES = \
+	totem-time-helpers.c		\
+	totem-time-helpers.h
+
+libtotemtimehelpers_la_CPPFLAGS = \
+	-D_REENTRANT			\
+	$(DISABLE_DEPRECATED)		\
+	$(AM_CPPFLAGS)
 
+libtotemtimehelpers_la_CFLAGS = \
+	$(TIME_HELPER_CFLAGS)	\
+	$(AM_CFLAGS)
+
+libtotemtimehelpers_la_LIBADD = $(TIME_HELPER_LIBS)
+libtotemtimehelpers_la_LDFLAGS = -no-undefined
+EXTRA_DIST = totem-time-helpers.h
 all: all-am
 
 .SUFFIXES:
@@ -399,14 +478,20 @@
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(noinst_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
 libtotemgsthelpers.la: $(libtotemgsthelpers_la_OBJECTS) $(libtotemgsthelpers_la_DEPENDENCIES) $(EXTRA_libtotemgsthelpers_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libtotemgsthelpers_la_LINK)  $(libtotemgsthelpers_la_OBJECTS) $(libtotemgsthelpers_la_LIBADD) $(LIBS)
+libtotemgstpixbufhelpers.la: $(libtotemgstpixbufhelpers_la_OBJECTS) $(libtotemgstpixbufhelpers_la_DEPENDENCIES) $(EXTRA_libtotemgstpixbufhelpers_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libtotemgstpixbufhelpers_la_LINK)  $(libtotemgstpixbufhelpers_la_OBJECTS) $(libtotemgstpixbufhelpers_la_LIBADD) $(LIBS)
+libtotemtimehelpers.la: $(libtotemtimehelpers_la_OBJECTS) $(libtotemtimehelpers_la_DEPENDENCIES) $(EXTRA_libtotemtimehelpers_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libtotemtimehelpers_la_LINK)  $(libtotemtimehelpers_la_OBJECTS) $(libtotemtimehelpers_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -415,27 +500,26 @@
 	-rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotemgsthelpers_la-totem-gst-helpers.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotemgstpixbufhelpers_la-totem-gst-pixbuf-helpers.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotemtimehelpers_la-totem-time-helpers.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
@@ -447,6 +531,20 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotemgsthelpers_la_CPPFLAGS) $(CPPFLAGS) $(libtotemgsthelpers_la_CFLAGS) $(CFLAGS) -c -o libtotemgsthelpers_la-totem-gst-helpers.lo `test -f 'totem-gst-helpers.c' || echo '$(srcdir)/'`totem-gst-helpers.c
 
+libtotemgstpixbufhelpers_la-totem-gst-pixbuf-helpers.lo: totem-gst-pixbuf-helpers.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotemgstpixbufhelpers_la_CPPFLAGS) $(CPPFLAGS) $(libtotemgstpixbufhelpers_la_CFLAGS) $(CFLAGS) -MT libtotemgstpixbufhelpers_la-totem-gst-pixbuf-helpers.lo -MD -MP -MF $(DEPDIR)/libtotemgstpixbufhelpers_la-totem-gst-pixbuf-helpers.Tpo -c -o libtotemgstpixbufhelpers_la-totem-gst-pixbuf-helpers.lo `test -f 'totem-gst-pixbuf-helpers.c' || echo '$(srcdir)/'`totem-gst-pixbuf-helpers.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtotemgstpixbufhelpers_la-totem-gst-pixbuf-helpers.Tpo $(DEPDIR)/libtotemgstpixbufhelpers_la-totem-gst-pixbuf-helpers.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='totem-gst-pixbuf-helpers.c' object='libtotemgstpixbufhelpers_la-totem-gst-pixbuf-helpers.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotemgstpixbufhelpers_la_CPPFLAGS) $(CPPFLAGS) $(libtotemgstpixbufhelpers_la_CFLAGS) $(CFLAGS) -c -o libtotemgstpixbufhelpers_la-totem-gst-pixbuf-helpers.lo `test -f 'totem-gst-pixbuf-helpers.c' || echo '$(srcdir)/'`totem-gst-pixbuf-helpers.c
+
+libtotemtimehelpers_la-totem-time-helpers.lo: totem-time-helpers.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotemtimehelpers_la_CPPFLAGS) $(CPPFLAGS) $(libtotemtimehelpers_la_CFLAGS) $(CFLAGS) -MT libtotemtimehelpers_la-totem-time-helpers.lo -MD -MP -MF $(DEPDIR)/libtotemtimehelpers_la-totem-time-helpers.Tpo -c -o libtotemtimehelpers_la-totem-time-helpers.lo `test -f 'totem-time-helpers.c' || echo '$(srcdir)/'`totem-time-helpers.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtotemtimehelpers_la-totem-time-helpers.Tpo $(DEPDIR)/libtotemtimehelpers_la-totem-time-helpers.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='totem-time-helpers.c' object='libtotemtimehelpers_la-totem-time-helpers.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotemtimehelpers_la_CPPFLAGS) $(CPPFLAGS) $(libtotemtimehelpers_la_CFLAGS) $(CFLAGS) -c -o libtotemtimehelpers_la-totem-time-helpers.lo `test -f 'totem-time-helpers.c' || echo '$(srcdir)/'`totem-time-helpers.c
+
 mostlyclean-libtool:
 	-rm -f *.lo
 
@@ -502,6 +600,20 @@
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
 
+cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
+	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
@@ -643,17 +755,18 @@
 .MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am
+	clean-libtool clean-noinstLTLIBRARIES cscopelist ctags \
+	distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am
 
 
 -include $(top_srcdir)/git.mk
diff -Nru totem-3.4.3/src/gst/totem-gst-helpers.c totem-3.6.2/src/gst/totem-gst-helpers.c
--- totem-3.4.3/src/gst/totem-gst-helpers.c	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/gst/totem-gst-helpers.c	2012-08-29 23:07:45.000000000 +0000
@@ -30,9 +30,11 @@
  *
  */
 
-#include 
 #include "totem-gst-helpers.h"
 
+#include 
+#include 
+
 void
 totem_gst_message_print (GstMessage *msg,
 			 GstElement *play,
@@ -65,176 +67,11 @@
     GST_ERROR ("uri     = %s", GST_STR_NULL (uri));
     g_free (uri);
 
-    g_message ("Error: %s\n%s\n", GST_STR_NULL (err->message),
-        GST_STR_NULL (dbg));
-
     g_error_free (err);
   }
   g_free (dbg);
 }
 
-static void
-destroy_pixbuf (guchar *pix, gpointer data)
-{
-  gst_buffer_unref (GST_BUFFER (data));
-}
-
-GdkPixbuf *
-totem_gst_playbin_get_frame (GstElement *play)
-{
-  GstStructure *s;
-  GstBuffer *buf = NULL;
-  GdkPixbuf *pixbuf;
-  GstCaps *to_caps;
-  gint outwidth = 0;
-  gint outheight = 0;
-
-  g_return_val_if_fail (play != NULL, NULL);
-  g_return_val_if_fail (GST_IS_ELEMENT (play), NULL);
-
-  /* our desired output format (RGB24) */
-  to_caps = gst_caps_new_simple ("video/x-raw-rgb",
-      "bpp", G_TYPE_INT, 24,
-      "depth", G_TYPE_INT, 24,
-      /* Note: we don't ask for a specific width/height here, so that
-       * videoscale can adjust dimensions from a non-1/1 pixel aspect
-       * ratio to a 1/1 pixel-aspect-ratio. We also don't ask for a
-       * specific framerate, because the input framerate won't
-       * necessarily match the output framerate if there's a deinterlacer
-       * in the pipeline. */
-      "pixel-aspect-ratio", GST_TYPE_FRACTION, 1, 1,
-      "endianness", G_TYPE_INT, G_BIG_ENDIAN,
-      "red_mask", G_TYPE_INT, 0xff0000,
-      "green_mask", G_TYPE_INT, 0x00ff00,
-      "blue_mask", G_TYPE_INT, 0x0000ff,
-      NULL);
-
-  /* get frame */
-  g_signal_emit_by_name (play, "convert-frame", to_caps, &buf);
-  gst_caps_unref (to_caps);
-
-  if (!buf) {
-    GST_DEBUG ("Could not take screenshot: %s",
-        "failed to retrieve or convert video frame");
-    g_warning ("Could not take screenshot: %s",
-        "failed to retrieve or convert video frame");
-    return NULL;
-  }
-
-  if (!GST_BUFFER_CAPS (buf)) {
-    GST_DEBUG ("Could not take screenshot: %s", "no caps on output buffer");
-    g_warning ("Could not take screenshot: %s", "no caps on output buffer");
-    return NULL;
-  }
-
-  GST_DEBUG ("frame caps: %" GST_PTR_FORMAT, GST_BUFFER_CAPS (buf));
-
-  s = gst_caps_get_structure (GST_BUFFER_CAPS (buf), 0);
-  gst_structure_get_int (s, "width", &outwidth);
-  gst_structure_get_int (s, "height", &outheight);
-  g_return_val_if_fail (outwidth > 0 && outheight > 0, NULL);
-
-  /* create pixbuf from that - use our own destroy function */
-  pixbuf = gdk_pixbuf_new_from_data (GST_BUFFER_DATA (buf),
-      GDK_COLORSPACE_RGB, FALSE, 8, outwidth, outheight,
-      GST_ROUND_UP_4 (outwidth * 3), destroy_pixbuf, buf);
-
-  if (!pixbuf) {
-    GST_DEBUG ("Could not take screenshot: %s", "could not create pixbuf");
-    g_warning ("Could not take screenshot: %s", "could not create pixbuf");
-    gst_buffer_unref (buf);
-  }
-
-  return pixbuf;
-}
-
-static GdkPixbuf *
-totem_gst_buffer_to_pixbuf (GstBuffer *buffer)
-{
-  GdkPixbufLoader *loader;
-  GdkPixbuf *pixbuf = NULL;
-  GError *err = NULL;
-
-  loader = gdk_pixbuf_loader_new ();
-
-  if (gdk_pixbuf_loader_write (loader, buffer->data, buffer->size, &err) &&
-      gdk_pixbuf_loader_close (loader, &err)) {
-    pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
-    if (pixbuf)
-      g_object_ref (pixbuf);
-  } else {
-    GST_WARNING("could not convert tag image to pixbuf: %s", err->message);
-    g_error_free (err);
-  }
-
-  g_object_unref (loader);
-  return pixbuf;
-}
-
-static const GValue *
-totem_gst_tag_list_get_cover_real (GstTagList *tag_list)
-{
-  const GValue *cover_value = NULL;
-  guint i;
-
-  for (i = 0; ; i++) {
-    const GValue *value;
-    GstBuffer *buffer;
-    GstStructure *caps_struct;
-    int type;
-
-    value = gst_tag_list_get_value_index (tag_list,
-					  GST_TAG_IMAGE,
-					  i);
-    if (value == NULL)
-      break;
-
-    buffer = gst_value_get_buffer (value);
-
-    caps_struct = gst_caps_get_structure (buffer->caps, 0);
-    gst_structure_get_enum (caps_struct,
-			    "image-type",
-			    GST_TYPE_TAG_IMAGE_TYPE,
-			    &type);
-    if (type == GST_TAG_IMAGE_TYPE_UNDEFINED) {
-      if (cover_value == NULL)
-        cover_value = value;
-    } else if (type == GST_TAG_IMAGE_TYPE_FRONT_COVER) {
-      cover_value = value;
-      break;
-    }
-  }
-
-  return cover_value;
-}
-
-GdkPixbuf *
-totem_gst_tag_list_get_cover (GstTagList *tag_list)
-{
-  const GValue *cover_value;
-
-  g_return_val_if_fail (tag_list != NULL, FALSE);
-
-  cover_value = totem_gst_tag_list_get_cover_real (tag_list);
-  /* Fallback to preview */
-  if (!cover_value) {
-    cover_value = gst_tag_list_get_value_index (tag_list,
-						GST_TAG_PREVIEW_IMAGE,
-						0);
-  }
-
-  if (cover_value) {
-    GstBuffer *buffer;
-    GdkPixbuf *pixbuf;
-
-    buffer = gst_value_get_buffer (cover_value);
-    pixbuf = totem_gst_buffer_to_pixbuf (buffer);
-    return pixbuf;
-  }
-
-  return NULL;
-}
-
 /*
  * vim: sw=2 ts=8 cindent noai bs=2
  */
diff -Nru totem-3.4.3/src/gst/totem-gst-helpers.h totem-3.6.2/src/gst/totem-gst-helpers.h
--- totem-3.4.3/src/gst/totem-gst-helpers.h	2012-01-10 16:10:04.000000000 +0000
+++ totem-3.6.2/src/gst/totem-gst-helpers.h	2012-08-29 23:07:45.000000000 +0000
@@ -28,12 +28,13 @@
 #ifndef HAVE_TOTEM_GST_HELPERS_H
 #define HAVE_TOTEM_GST_HELPERS_H
 
+#define GST_USE_UNSTABLE_API 1
+
 #include 
-#include 
 
 G_BEGIN_DECLS
 
-/* GstPlayFlags flags from playbin2 */
+/* GstPlayFlags flags from playbin */
 typedef enum {
   GST_PLAY_FLAG_VIDEO         = (1 << 0),
   GST_PLAY_FLAG_AUDIO         = (1 << 1),
@@ -51,10 +52,6 @@
 			      GstElement *play,
 			      const char *filename);
 
-GdkPixbuf * totem_gst_playbin_get_frame (GstElement *play);
-
-GdkPixbuf * totem_gst_tag_list_get_cover (GstTagList *tag_list);
-
 G_END_DECLS
 
 #endif				/* HAVE_TOTEM_GST_HELPERS_H */
diff -Nru totem-3.4.3/src/gst/totem-gst-pixbuf-helpers.c totem-3.6.2/src/gst/totem-gst-pixbuf-helpers.c
--- totem-3.4.3/src/gst/totem-gst-pixbuf-helpers.c	1970-01-01 00:00:00.000000000 +0000
+++ totem-3.6.2/src/gst/totem-gst-pixbuf-helpers.c	2012-10-09 15:42:00.000000000 +0000
@@ -0,0 +1,215 @@
+/*
+ * Copyright (C) 2003-2007 the GStreamer project
+ *      Julien Moutte 
+ *      Ronald Bultje 
+ * Copyright (C) 2005-2008 Tim-Philipp Müller 
+ * Copyright (C) 2009 Sebastian Dröge 
+ * Copyright © 2009 Christian Persch
+ *
+ * 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 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
+ *
+ * The Totem project hereby grant permission for non-gpl compatible GStreamer
+ * plugins to be used and distributed together with GStreamer and Totem. This
+ * permission is above and beyond the permissions granted by the GPL license
+ * Totem is covered by.
+ *
+ * Monday 7th February 2005: Christian Schaller: Add exception clause.
+ * See license_change file for details.
+ *
+ */
+
+#include "totem-gst-pixbuf-helpers.h"
+
+#include 
+#include 
+
+static void
+destroy_pixbuf (guchar *pix, gpointer data)
+{
+  gst_sample_unref (GST_SAMPLE (data));
+}
+
+GdkPixbuf *
+totem_gst_playbin_get_frame (GstElement *play)
+{
+  GstStructure *s;
+  GstSample *sample = NULL;
+  GdkPixbuf *pixbuf = NULL;
+  GstCaps *to_caps, *sample_caps;
+  gint outwidth = 0;
+  gint outheight = 0;
+  GstMemory *memory;
+  GstMapInfo info;
+
+  g_return_val_if_fail (play != NULL, NULL);
+  g_return_val_if_fail (GST_IS_ELEMENT (play), NULL);
+
+  /* our desired output format (RGB24) */
+  to_caps = gst_caps_new_simple ("video/x-raw",
+      "format", G_TYPE_STRING, "RGB",
+      /* Note: we don't ask for a specific width/height here, so that
+       * videoscale can adjust dimensions from a non-1/1 pixel aspect
+       * ratio to a 1/1 pixel-aspect-ratio. We also don't ask for a
+       * specific framerate, because the input framerate won't
+       * necessarily match the output framerate if there's a deinterlacer
+       * in the pipeline. */
+      "pixel-aspect-ratio", GST_TYPE_FRACTION, 1, 1,
+      NULL);
+
+  /* get frame */
+  g_signal_emit_by_name (play, "convert-sample", to_caps, &sample);
+  gst_caps_unref (to_caps);
+
+  if (!sample) {
+    GST_DEBUG ("Could not take screenshot: %s",
+        "failed to retrieve or convert video frame");
+    g_warning ("Could not take screenshot: %s",
+        "failed to retrieve or convert video frame");
+    return NULL;
+  }
+
+  sample_caps = gst_sample_get_caps (sample);
+  if (!sample_caps) {
+    GST_DEBUG ("Could not take screenshot: %s", "no caps on output buffer");
+    g_warning ("Could not take screenshot: %s", "no caps on output buffer");
+    return NULL;
+  }
+
+  GST_DEBUG ("frame caps: %" GST_PTR_FORMAT, sample_caps);
+
+  s = gst_caps_get_structure (sample_caps, 0);
+  gst_structure_get_int (s, "width", &outwidth);
+  gst_structure_get_int (s, "height", &outheight);
+  if (outwidth <= 0 || outheight <= 0)
+    goto done;
+
+  memory = gst_buffer_get_memory (gst_sample_get_buffer (sample), 0);
+  gst_memory_map (memory, &info, GST_MAP_READ);
+
+  /* create pixbuf from that - use our own destroy function */
+  pixbuf = gdk_pixbuf_new_from_data (info.data,
+      GDK_COLORSPACE_RGB, FALSE, 8, outwidth, outheight,
+      GST_ROUND_UP_4 (outwidth * 3), destroy_pixbuf, sample);
+
+  gst_memory_unmap (memory, &info);
+
+done:
+  if (!pixbuf) {
+    GST_DEBUG ("Could not take screenshot: %s", "could not create pixbuf");
+    g_warning ("Could not take screenshot: %s", "could not create pixbuf");
+    gst_sample_unref (sample);
+  }
+
+  return pixbuf;
+}
+
+static GdkPixbuf *
+totem_gst_buffer_to_pixbuf (GstBuffer *buffer)
+{
+  GdkPixbufLoader *loader;
+  GdkPixbuf *pixbuf = NULL;
+  GError *err = NULL;
+  GstMapInfo info;
+
+  if (!gst_buffer_map (buffer, &info, GST_MAP_READ)) {
+    GST_WARNING("could not map memory buffer");
+    return NULL;
+  }
+
+  loader = gdk_pixbuf_loader_new ();
+
+  if (gdk_pixbuf_loader_write (loader, info.data, info.size, &err) &&
+      gdk_pixbuf_loader_close (loader, &err)) {
+    pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
+    if (pixbuf)
+      g_object_ref (pixbuf);
+  } else {
+    GST_WARNING("could not convert tag image to pixbuf: %s", err->message);
+    g_error_free (err);
+  }
+
+  g_object_unref (loader);
+
+  gst_buffer_unmap (buffer, &info);
+
+  return pixbuf;
+}
+
+static GstSample *
+totem_gst_tag_list_get_cover_real (GstTagList *tag_list)
+{
+  GstSample *cover_sample = NULL;
+  guint i;
+
+  for (i = 0; ; i++) {
+    GstSample *sample;
+    GstCaps *caps;
+    const GstStructure *caps_struct;
+    int type;
+
+    if (!gst_tag_list_get_sample_index (tag_list, GST_TAG_IMAGE, i, &sample))
+      break;
+
+    caps = gst_sample_get_caps (sample);
+    caps_struct = gst_caps_get_structure (caps, 0);
+    gst_structure_get_enum (caps_struct,
+			    "image-type",
+			    GST_TYPE_TAG_IMAGE_TYPE,
+			    &type);
+    if (type == GST_TAG_IMAGE_TYPE_UNDEFINED) {
+      if (cover_sample == NULL) {
+	/* take a ref here since we will continue and unref below */
+	cover_sample = gst_sample_ref (sample);
+      }
+    } else if (type == GST_TAG_IMAGE_TYPE_FRONT_COVER) {
+      cover_sample = sample;
+      break;
+    }
+    gst_sample_unref (sample);
+  }
+
+  return cover_sample;
+}
+
+GdkPixbuf *
+totem_gst_tag_list_get_cover (GstTagList *tag_list)
+{
+  GstSample *cover_sample;
+
+  g_return_val_if_fail (tag_list != NULL, FALSE);
+
+  cover_sample = totem_gst_tag_list_get_cover_real (tag_list);
+  /* Fallback to preview */
+    if (!cover_sample) {
+      gst_tag_list_get_sample_index (tag_list, GST_TAG_PREVIEW_IMAGE, 0,
+				     &cover_sample);
+    }
+
+  if (cover_sample) {
+    GstBuffer *buffer;
+    GdkPixbuf *pixbuf;
+
+    buffer = gst_sample_get_buffer (cover_sample);
+    pixbuf = totem_gst_buffer_to_pixbuf (buffer);
+    gst_sample_unref (cover_sample);
+    return pixbuf;
+  }
+
+  return NULL;
+}
+
+/*
+ * vim: sw=2 ts=8 cindent noai bs=2
+ */
diff -Nru totem-3.4.3/src/gst/totem-gst-pixbuf-helpers.h totem-3.6.2/src/gst/totem-gst-pixbuf-helpers.h
--- totem-3.4.3/src/gst/totem-gst-pixbuf-helpers.h	1970-01-01 00:00:00.000000000 +0000
+++ totem-3.6.2/src/gst/totem-gst-pixbuf-helpers.h	2012-08-29 23:07:45.000000000 +0000
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2001,2002,2003,2004,2005 Bastien Nocera 
+ *
+ * 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 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
+ *
+ * The Totem project hereby grant permission for non-gpl compatible GStreamer
+ * plugins to be used and distributed together with GStreamer and Totem. This
+ * permission are above and beyond the permissions granted by the GPL license
+ * Totem is covered by.
+ *
+ * Monday 7th February 2005: Christian Schaller: Add exception clause.
+ * See license_change file for details.
+ *
+ */
+
+#ifndef HAVE_TOTEM_GST_PIXBUF_HELPERS_H
+#define HAVE_TOTEM_GST_PIXBUF_HELPERS_H
+
+#define GST_USE_UNSTABLE_API 1
+
+#include 
+#include 
+
+G_BEGIN_DECLS
+
+GdkPixbuf * totem_gst_playbin_get_frame (GstElement *play);
+
+GdkPixbuf * totem_gst_tag_list_get_cover (GstTagList *tag_list);
+
+G_END_DECLS
+
+#endif				/* HAVE_TOTEM_GST_PIXBUF_HELPERS_H */
diff -Nru totem-3.4.3/src/gst/totem-time-helpers.c totem-3.6.2/src/gst/totem-time-helpers.c
--- totem-3.4.3/src/gst/totem-time-helpers.c	1970-01-01 00:00:00.000000000 +0000
+++ totem-3.6.2/src/gst/totem-time-helpers.c	2012-08-29 23:07:45.000000000 +0000
@@ -0,0 +1,66 @@
+/*
+ * Copyright © 2002-2012 Bastien Nocera 
+ *
+ * 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 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
+ *
+ * The Totem project hereby grant permission for non-gpl compatible GStreamer
+ * plugins to be used and distributed together with GStreamer and Totem. This
+ * permission is above and beyond the permissions granted by the GPL license
+ * Totem is covered by.
+ *
+ * Monday 7th February 2005: Christian Schaller: Add exception clause.
+ * See license_change file for details.
+ *
+ */
+
+#include 
+#include 
+
+#include "totem-time-helpers.h"
+
+
+/* FIXME: Remove
+ * See https://bugzilla.gnome.org/show_bug.cgi?id=679850 */
+char *
+totem_time_to_string (gint64 msecs)
+{
+	int sec, min, hour, _time;
+
+	_time = (int) (msecs / 1000);
+	sec = _time % 60;
+	_time = _time - sec;
+	min = (_time % (60*60)) / 60;
+	_time = _time - (min * 60);
+	hour = _time / (60*60);
+
+	if (hour > 0)
+	{
+		/* hour:minutes:seconds */
+		/* Translators: This is a time format, like "9:05:02" for 9
+		 * hours, 5 minutes, and 2 seconds. You may change ":" to
+		 * the separator that your locale uses or use "%Id" instead
+		 * of "%d" if your locale uses localized digits.
+		 */
+		return g_strdup_printf (C_("long time format", "%d:%02d:%02d"), hour, min, sec);
+	}
+
+	/* minutes:seconds */
+	/* Translators: This is a time format, like "5:02" for 5
+	 * minutes and 2 seconds. You may change ":" to the
+	 * separator that your locale uses or use "%Id" instead of
+	 * "%d" if your locale uses localized digits.
+	 */
+	return g_strdup_printf (C_("short time format", "%d:%02d"), min, sec);
+}
diff -Nru totem-3.4.3/src/gst/totem-time-helpers.h totem-3.6.2/src/gst/totem-time-helpers.h
--- totem-3.4.3/src/gst/totem-time-helpers.h	1970-01-01 00:00:00.000000000 +0000
+++ totem-3.6.2/src/gst/totem-time-helpers.h	2012-08-29 23:07:45.000000000 +0000
@@ -0,0 +1,35 @@
+/*
+ * Copyright © 2002-2012 Bastien Nocera 
+ *
+ * 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 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
+ *
+ * The Totem project hereby grant permission for non-gpl compatible GStreamer
+ * plugins to be used and distributed together with GStreamer and Totem. This
+ * permission is above and beyond the permissions granted by the GPL license
+ * Totem is covered by.
+ *
+ * Monday 7th February 2005: Christian Schaller: Add exception clause.
+ * See license_change file for details.
+ *
+ */
+
+#ifndef _TOTEM_TIME_HELPERS_H_
+#define _TOTEM_TIME_HELPERS_H_
+
+#include 
+
+char *totem_time_to_string (gint64 msecs);
+
+#endif /* _TOTEM_TIME_HELPERS_H_ */
diff -Nru totem-3.4.3/src/plugins/Makefile.in totem-3.6.2/src/plugins/Makefile.in
--- totem-3.4.3/src/plugins/Makefile.in	2012-07-04 09:54:48.000000000 +0000
+++ totem-3.6.2/src/plugins/Makefile.in	2012-10-25 13:36:20.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.12.2 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,6 +14,23 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -36,22 +52,25 @@
 subdir = src/plugins
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -61,6 +80,11 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -109,6 +133,10 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BACKEND_CFLAGS = @BACKEND_CFLAGS@
+BACKEND_LIBS = @BACKEND_LIBS@
+BACKEND_TEST_CFLAGS = @BACKEND_TEST_CFLAGS@
+BACKEND_TEST_LIBS = @BACKEND_TEST_LIBS@
 BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
 BROWSER_PLUGIN_DIR = @BROWSER_PLUGIN_DIR@
 BROWSER_PLUGIN_LIBS = @BROWSER_PLUGIN_LIBS@
@@ -130,8 +158,6 @@
 DBUS_LIBS = @DBUS_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DEPENDENCY_CFLAGS = @DEPENDENCY_CFLAGS@
-DEPENDENCY_LIBS = @DEPENDENCY_LIBS@
 DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DISC_RECORDER_CFLAGS = @DISC_RECORDER_CFLAGS@
 DISC_RECORDER_LIBS = @DISC_RECORDER_LIBS@
@@ -145,7 +171,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-EXTRA_BACKEND_LIBS = @EXTRA_BACKEND_LIBS@
 FGREP = @FGREP@
 FULL_LIBEXECDIR = @FULL_LIBEXECDIR@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
@@ -153,19 +178,21 @@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GLIB_REQS = @GLIB_REQS@
+GLOW_BUTTON_CFLAGS = @GLOW_BUTTON_CFLAGS@
+GLOW_BUTTON_LIBS = @GLOW_BUTTON_LIBS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
-GST_CFLAGS = @GST_CFLAGS@
-GST_LIBS = @GST_LIBS@
+GST_PLUGINS_BAD_CFLAGS = @GST_PLUGINS_BAD_CFLAGS@
+GST_PLUGINS_BAD_LIBS = @GST_PLUGINS_BAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
 GTK_REQS = @GTK_REQS@
+HELPER_CFLAGS = @HELPER_CFLAGS@
+HELPER_LIBS = @HELPER_LIBS@
 HELP_DIR = @HELP_DIR@
 HTML_DIR = @HTML_DIR@
 INSTALL = @INSTALL@
@@ -191,11 +218,11 @@
 INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBEPC_CFLAGS = @LIBEPC_CFLAGS@
-LIBEPC_LIBS = @LIBEPC_LIBS@
 LIBGRILO_CFLAGS = @LIBGRILO_CFLAGS@
 LIBGRILO_LIBS = @LIBGRILO_LIBS@
 LIBOBJS = @LIBOBJS@
+LIBPLAYER_CFLAGS = @LIBPLAYER_CFLAGS@
+LIBPLAYER_LIBS = @LIBPLAYER_LIBS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBZEITGEIST_CFLAGS = @LIBZEITGEIST_CFLAGS@
@@ -212,8 +239,6 @@
 MISSING_PLUGINS_CFLAGS = @MISSING_PLUGINS_CFLAGS@
 MISSING_PLUGINS_LIBS = @MISSING_PLUGINS_LIBS@
 MKDIR_P = @MKDIR_P@
-MM_CFLAGS = @MM_CFLAGS@
-MM_LIBS = @MM_LIBS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 NAUTILUSDIR = @NAUTILUSDIR@
@@ -234,15 +259,21 @@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PEASGTK_CFLAGS = @PEASGTK_CFLAGS@
-PEASGTK_LIBS = @PEASGTK_LIBS@
-PEAS_CFLAGS = @PEAS_CFLAGS@
-PEAS_LIBS = @PEAS_LIBS@
+PIXBUF_HELPER_CFLAGS = @PIXBUF_HELPER_CFLAGS@
+PIXBUF_HELPER_LIBS = @PIXBUF_HELPER_LIBS@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLAYER_CFLAGS = @PLAYER_CFLAGS@
+PLAYER_LIBS = @PLAYER_LIBS@
 PLUGINDIR = @PLUGINDIR@
 PLUGINS = @PLUGINS@
+PLUGIN_VIEWER_CFLAGS = @PLUGIN_VIEWER_CFLAGS@
+PLUGIN_VIEWER_LIBS = @PLUGIN_VIEWER_LIBS@
+PREVIEW_CFLAGS = @PREVIEW_CFLAGS@
+PREVIEW_LIBS = @PREVIEW_LIBS@
+PROPERTIES_CFLAGS = @PROPERTIES_CFLAGS@
+PROPERTIES_LIBS = @PROPERTIES_LIBS@
 PYGOBJECT_CFLAGS = @PYGOBJECT_CFLAGS@
 PYGOBJECT_LIBS = @PYGOBJECT_LIBS@
 PYLINT = @PYLINT@
@@ -262,6 +293,10 @@
 SMCLIENT_CFLAGS = @SMCLIENT_CFLAGS@
 SMCLIENT_LIBS = @SMCLIENT_LIBS@
 STRIP = @STRIP@
+THUMBNAILER_CFLAGS = @THUMBNAILER_CFLAGS@
+THUMBNAILER_LIBS = @THUMBNAILER_LIBS@
+TIME_HELPER_CFLAGS = @TIME_HELPER_CFLAGS@
+TIME_HELPER_LIBS = @TIME_HELPER_LIBS@
 TOTEM_API_VERSION = @TOTEM_API_VERSION@
 TOTEM_PLPARSER_REQS = @TOTEM_PLPARSER_REQS@
 TOTEM_VERSION_MAJOR = @TOTEM_VERSION_MAJOR@
@@ -273,9 +308,6 @@
 WARN_CFLAGS = @WARN_CFLAGS@
 WARN_CXXFLAGS = @WARN_CXXFLAGS@
 XGETTEXT = @XGETTEXT@
-XMKMF = @XMKMF@
-XTEST_LIBS = @XTEST_LIBS@
-X_LIBS = @X_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -380,12 +412,12 @@
 	-rm -rf .libs _libs
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS):
 	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -395,7 +427,11 @@
 	done; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -409,37 +445,6 @@
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
-
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
@@ -448,6 +453,10 @@
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
+cscopelist-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \
+	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -511,6 +520,20 @@
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
 
+cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP)
+	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
@@ -546,13 +569,10 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -673,22 +693,23 @@
 
 uninstall-am:
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-strip tags-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \
+	cscopelist-recursive ctags-recursive install-am install-strip \
+	tags-recursive
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am check check-am clean clean-generic clean-libtool \
-	ctags ctags-recursive distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am
+	cscopelist cscopelist-recursive ctags ctags-recursive \
+	distclean distclean-generic distclean-libtool distclean-tags \
+	distdir dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags tags-recursive uninstall uninstall-am
 
 
 -include $(top_srcdir)/git.mk
diff -Nru totem-3.4.3/src/plugins/Makefile.plugins totem-3.6.2/src/plugins/Makefile.plugins
--- totem-3.4.3/src/plugins/Makefile.plugins	2012-01-10 16:10:04.000000000 +0000
+++ totem-3.6.2/src/plugins/Makefile.plugins	2012-08-29 23:07:45.000000000 +0000
@@ -12,11 +12,11 @@
 	$(DISABLE_DEPRECATED)		\
 	-I$(top_srcdir)/		\
 	-I$(top_srcdir)/src		\
-	-I$(top_srcdir)/src/plugins
+	-I$(top_srcdir)/src/plugins	\
+	-I$(top_srcdir)/src/gst
 
-plugin_cflags = \
-	$(DEPENDENCY_CFLAGS)	\
-	$(PEAS_CFLAGS)		\
+plugin_cflags =			\
+	$(PLAYER_CFLAGS)	\
 	$(WARN_CFLAGS)
 
 plugin_ldflags = \
diff -Nru totem-3.4.3/src/plugins/apple-trailers/Makefile.am totem-3.6.2/src/plugins/apple-trailers/Makefile.am
--- totem-3.4.3/src/plugins/apple-trailers/Makefile.am	1970-01-01 00:00:00.000000000 +0000
+++ totem-3.6.2/src/plugins/apple-trailers/Makefile.am	2012-08-29 23:07:45.000000000 +0000
@@ -0,0 +1,13 @@
+include $(top_srcdir)/src/plugins/Makefile.plugins
+
+plugindir = $(PLUGINDIR)/apple-trailers
+plugin_LTLIBRARIES = libapple-trailers.la
+
+plugin_in_files = apple-trailers.plugin.in
+
+libapple_trailers_la_SOURCES = totem-apple-trailers.c
+libapple_trailers_la_LDFLAGS = $(plugin_ldflags)
+libapple_trailers_la_LIBADD = $(plugin_libadd)
+libapple_trailers_la_CFLAGS = $(plugin_cflags)
+
+-include $(top_srcdir)/git.mk
diff -Nru totem-3.4.3/src/plugins/apple-trailers/Makefile.in totem-3.6.2/src/plugins/apple-trailers/Makefile.in
--- totem-3.4.3/src/plugins/apple-trailers/Makefile.in	1970-01-01 00:00:00.000000000 +0000
+++ totem-3.6.2/src/plugins/apple-trailers/Makefile.in	2012-10-25 13:36:20.000000000 +0000
@@ -0,0 +1,817 @@
+# Makefile.in generated by automake 1.12.2 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+
+VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/depcomp \
+	$(top_srcdir)/src/plugins/Makefile.plugins
+subdir = src/plugins/apple-trailers
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"
+LTLIBRARIES = $(plugin_LTLIBRARIES)
+libapple_trailers_la_DEPENDENCIES = $(plugin_libadd)
+am_libapple_trailers_la_OBJECTS =  \
+	libapple_trailers_la-totem-apple-trailers.lo
+libapple_trailers_la_OBJECTS = $(am_libapple_trailers_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+libapple_trailers_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(libapple_trailers_la_CFLAGS) $(CFLAGS) \
+	$(libapple_trailers_la_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libapple_trailers_la_SOURCES)
+DIST_SOURCES = $(libapple_trailers_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+DATA = $(plugin_DATA)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ALL_LINGUAS = @ALL_LINGUAS@
+ALL_PLUGINS = @ALL_PLUGINS@
+AMTAR = @AMTAR@
+AM_CFLAGS = @AM_CFLAGS@
+AM_CPPFLAGS = \
+	-DG_LOG_DOMAIN=\""Totem"\"	\
+	$(DISABLE_DEPRECATED)		\
+	-I$(top_srcdir)/		\
+	-I$(top_srcdir)/src		\
+	-I$(top_srcdir)/src/plugins	\
+	-I$(top_srcdir)/src/gst
+
+AM_CXXFLAGS = @AM_CXXFLAGS@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_LDFLAGS = @AM_LDFLAGS@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BACKEND_CFLAGS = @BACKEND_CFLAGS@
+BACKEND_LIBS = @BACKEND_LIBS@
+BACKEND_TEST_CFLAGS = @BACKEND_TEST_CFLAGS@
+BACKEND_TEST_LIBS = @BACKEND_TEST_LIBS@
+BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
+BROWSER_PLUGIN_DIR = @BROWSER_PLUGIN_DIR@
+BROWSER_PLUGIN_LIBS = @BROWSER_PLUGIN_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CHAPTERS_CFLAGS = @CHAPTERS_CFLAGS@
+CHAPTERS_LIBS = @CHAPTERS_LIBS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DBUS_BIND = @DBUS_BIND@
+DBUS_CFLAGS = @DBUS_CFLAGS@
+DBUS_LIBS = @DBUS_LIBS@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
+DISC_RECORDER_CFLAGS = @DISC_RECORDER_CFLAGS@
+DISC_RECORDER_LIBS = @DISC_RECORDER_LIBS@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DLLTOOL = @DLLTOOL@
+DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+FULL_LIBEXECDIR = @FULL_LIBEXECDIR@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GLIB_REQS = @GLIB_REQS@
+GLOW_BUTTON_CFLAGS = @GLOW_BUTTON_CFLAGS@
+GLOW_BUTTON_LIBS = @GLOW_BUTTON_LIBS@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
+GST_PLUGINS_BAD_CFLAGS = @GST_PLUGINS_BAD_CFLAGS@
+GST_PLUGINS_BAD_LIBS = @GST_PLUGINS_BAD_LIBS@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+GTK_REQS = @GTK_REQS@
+HELPER_CFLAGS = @HELPER_CFLAGS@
+HELPER_LIBS = @HELPER_LIBS@
+HELP_DIR = @HELP_DIR@
+HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBGRILO_CFLAGS = @LIBGRILO_CFLAGS@
+LIBGRILO_LIBS = @LIBGRILO_LIBS@
+LIBOBJS = @LIBOBJS@
+LIBPLAYER_CFLAGS = @LIBPLAYER_CFLAGS@
+LIBPLAYER_LIBS = @LIBPLAYER_LIBS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBZEITGEIST_CFLAGS = @LIBZEITGEIST_CFLAGS@
+LIBZEITGEIST_LIBS = @LIBZEITGEIST_LIBS@
+LIPO = @LIPO@
+LIRC_LIBS = @LIRC_LIBS@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MEDIA_PLAYER_KEYS_CFLAGS = @MEDIA_PLAYER_KEYS_CFLAGS@
+MEDIA_PLAYER_KEYS_LIBS = @MEDIA_PLAYER_KEYS_LIBS@
+MISSING_PLUGINS_CFLAGS = @MISSING_PLUGINS_CFLAGS@
+MISSING_PLUGINS_LIBS = @MISSING_PLUGINS_LIBS@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGMERGE = @MSGMERGE@
+NAUTILUSDIR = @NAUTILUSDIR@
+NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+NAUTILUS_LIBS = @NAUTILUS_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OMF_DIR = @OMF_DIR@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PIXBUF_HELPER_CFLAGS = @PIXBUF_HELPER_CFLAGS@
+PIXBUF_HELPER_LIBS = @PIXBUF_HELPER_LIBS@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLAYER_CFLAGS = @PLAYER_CFLAGS@
+PLAYER_LIBS = @PLAYER_LIBS@
+PLUGINDIR = @PLUGINDIR@
+PLUGINS = @PLUGINS@
+PLUGIN_VIEWER_CFLAGS = @PLUGIN_VIEWER_CFLAGS@
+PLUGIN_VIEWER_LIBS = @PLUGIN_VIEWER_LIBS@
+PREVIEW_CFLAGS = @PREVIEW_CFLAGS@
+PREVIEW_LIBS = @PREVIEW_LIBS@
+PROPERTIES_CFLAGS = @PROPERTIES_CFLAGS@
+PROPERTIES_LIBS = @PROPERTIES_LIBS@
+PYGOBJECT_CFLAGS = @PYGOBJECT_CFLAGS@
+PYGOBJECT_LIBS = @PYGOBJECT_LIBS@
+PYLINT = @PYLINT@
+PYTHON = @PYTHON@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
+RANLIB = @RANLIB@
+SAVE_FILE_CFLAGS = @SAVE_FILE_CFLAGS@
+SAVE_FILE_CHECK_CFLAGS = @SAVE_FILE_CHECK_CFLAGS@
+SAVE_FILE_CHECK_LIBS = @SAVE_FILE_CHECK_LIBS@
+SAVE_FILE_LIBS = @SAVE_FILE_LIBS@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SMCLIENT_CFLAGS = @SMCLIENT_CFLAGS@
+SMCLIENT_LIBS = @SMCLIENT_LIBS@
+STRIP = @STRIP@
+THUMBNAILER_CFLAGS = @THUMBNAILER_CFLAGS@
+THUMBNAILER_LIBS = @THUMBNAILER_LIBS@
+TIME_HELPER_CFLAGS = @TIME_HELPER_CFLAGS@
+TIME_HELPER_LIBS = @TIME_HELPER_LIBS@
+TOTEM_API_VERSION = @TOTEM_API_VERSION@
+TOTEM_PLPARSER_REQS = @TOTEM_PLPARSER_REQS@
+TOTEM_VERSION_MAJOR = @TOTEM_VERSION_MAJOR@
+TOTEM_VERSION_MICRO = @TOTEM_VERSION_MICRO@
+TOTEM_VERSION_MINOR = @TOTEM_VERSION_MINOR@
+USE_NLS = @USE_NLS@
+VALAC = @VALAC@
+VERSION = @VERSION@
+WARN_CFLAGS = @WARN_CFLAGS@
+WARN_CXXFLAGS = @WARN_CXXFLAGS@
+XGETTEXT = @XGETTEXT@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
+CLEANFILES = $(plugin_DATA)
+DISTCLEANFILES = $(plugin_DATA)
+EXTRA_DIST = $(plugin_in_files)
+plugin_cflags = \
+	$(PLAYER_CFLAGS)	\
+	$(WARN_CFLAGS)
+
+plugin_ldflags = \
+	-export-dynamic \
+	-no-undefined \
+	-avoid-version \
+	-module
+
+plugin_libadd = \
+	$(top_builddir)/src/libtotem.la
+
+plugindir = $(PLUGINDIR)/apple-trailers
+plugin_LTLIBRARIES = libapple-trailers.la
+plugin_in_files = apple-trailers.plugin.in
+libapple_trailers_la_SOURCES = totem-apple-trailers.c
+libapple_trailers_la_LDFLAGS = $(plugin_ldflags)
+libapple_trailers_la_LIBADD = $(plugin_libadd)
+libapple_trailers_la_CFLAGS = $(plugin_cflags)
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/plugins/Makefile.plugins $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/plugins/apple-trailers/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu src/plugins/apple-trailers/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+$(top_srcdir)/src/plugins/Makefile.plugins:
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
+	list2=; for p in $$list; do \
+	  if test -f $$p; then \
+	    list2="$$list2 $$p"; \
+	  else :; fi; \
+	done; \
+	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
+	}
+
+uninstall-pluginLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$f"; \
+	done
+
+clean-pluginLTLIBRARIES:
+	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
+	@list='$(plugin_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+libapple-trailers.la: $(libapple_trailers_la_OBJECTS) $(libapple_trailers_la_DEPENDENCIES) $(EXTRA_libapple_trailers_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libapple_trailers_la_LINK) -rpath $(plugindir) $(libapple_trailers_la_OBJECTS) $(libapple_trailers_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libapple_trailers_la-totem-apple-trailers.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+libapple_trailers_la-totem-apple-trailers.lo: totem-apple-trailers.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libapple_trailers_la_CFLAGS) $(CFLAGS) -MT libapple_trailers_la-totem-apple-trailers.lo -MD -MP -MF $(DEPDIR)/libapple_trailers_la-totem-apple-trailers.Tpo -c -o libapple_trailers_la-totem-apple-trailers.lo `test -f 'totem-apple-trailers.c' || echo '$(srcdir)/'`totem-apple-trailers.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libapple_trailers_la-totem-apple-trailers.Tpo $(DEPDIR)/libapple_trailers_la-totem-apple-trailers.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='totem-apple-trailers.c' object='libapple_trailers_la-totem-apple-trailers.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libapple_trailers_la_CFLAGS) $(CFLAGS) -c -o libapple_trailers_la-totem-apple-trailers.lo `test -f 'totem-apple-trailers.c' || echo '$(srcdir)/'`totem-apple-trailers.c
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-pluginDATA: $(plugin_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(plugindir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(plugindir)" || exit $$?; \
+	done
+
+uninstall-pluginDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	set x; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+
+cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
+	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES) $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-pluginDATA install-pluginLTLIBRARIES
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pluginLTLIBRARIES cscopelist ctags \
+	distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pluginDATA install-pluginLTLIBRARIES install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-pluginDATA uninstall-pluginLTLIBRARIES
+
+%.plugin: %.plugin.in
+	$(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+
+# Checking rules for Python plugins
+# Execute pylint on all the requisite files individually, returning non-zero
+# iff any of the calls to pylint returned non-zero.
+check-pylint: $(plugin_PYTHON)
+@ENABLE_PYTHON_TRUE@	@exitstatus=0; \
+@ENABLE_PYTHON_TRUE@	for py in $^; do \
+@ENABLE_PYTHON_TRUE@		$(PYLINT) -i y -d C0111 -d W0511 -d F0401 $$py; \
+@ENABLE_PYTHON_TRUE@		\
+@ENABLE_PYTHON_TRUE@		newexitstatus=$$?; \
+@ENABLE_PYTHON_TRUE@		if [ $$exitstatus == 0 ]; then \
+@ENABLE_PYTHON_TRUE@			exitstatus=$$newexitstatus; \
+@ENABLE_PYTHON_TRUE@		fi; \
+@ENABLE_PYTHON_TRUE@	done; \
+@ENABLE_PYTHON_TRUE@	exit $$exitstatus
+
+check: check-pylint
+
+.PHONY: check-pylint
+
+-include $(top_srcdir)/git.mk
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -Nru totem-3.4.3/src/plugins/apple-trailers/apple-trailers.plugin.in totem-3.6.2/src/plugins/apple-trailers/apple-trailers.plugin.in
--- totem-3.4.3/src/plugins/apple-trailers/apple-trailers.plugin.in	1970-01-01 00:00:00.000000000 +0000
+++ totem-3.6.2/src/plugins/apple-trailers/apple-trailers.plugin.in	2012-08-29 23:07:45.000000000 +0000
@@ -0,0 +1,9 @@
+[Plugin]
+Module=apple-trailers
+IAge=1
+Builtin=true
+_Name=Apple Trailers
+_Description=Sets the user agent for the Apple Trailers site
+Authors=Bastien Nocera
+Copyright=Copyright © 2012 Bastien Nocera
+Website=http://www.gnome.org/projects/totem/
diff -Nru totem-3.4.3/src/plugins/apple-trailers/totem-apple-trailers.c totem-3.6.2/src/plugins/apple-trailers/totem-apple-trailers.c
--- totem-3.4.3/src/plugins/apple-trailers/totem-apple-trailers.c	1970-01-01 00:00:00.000000000 +0000
+++ totem-3.6.2/src/plugins/apple-trailers/totem-apple-trailers.c	2012-08-29 23:07:45.000000000 +0000
@@ -0,0 +1,81 @@
+/*
+ *  Copyright (C) 2012 Bastien Nocera 
+ *
+ *  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 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
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
+ *
+ *
+ * The Totem project hereby grant permission for non-gpl compatible GStreamer
+ * plugins to be used and distributed together with GStreamer and Totem. This
+ * permission are above and beyond the permissions granted by the GPL license
+ * Totem is covered by.
+ *
+ * Monday 7th February 2005: Christian Schaller: Add exception clause.
+ * See license_change file for details.
+ *
+ */
+
+
+#include "config.h"
+
+#include 
+
+#include "totem-plugin.h"
+#include "totem.h"
+
+#define TOTEM_TYPE_APPLE_TRAILERS_PLUGIN	(totem_apple_trailers_plugin_get_type ())
+#define TOTEM_APPLE_TRAILERS_PLUGIN(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), TOTEM_TYPE_APPLE_TRAILERS_PLUGIN, TotemAppleTrailersPlugin))
+
+typedef struct {
+	guint signal_id;
+	TotemObject *totem;
+} TotemAppleTrailersPluginPrivate;
+
+TOTEM_PLUGIN_REGISTER(TOTEM_TYPE_APPLE_TRAILERS_PLUGIN, TotemAppleTrailersPlugin, totem_apple_trailers_plugin)
+
+static char *
+get_user_agent_cb (TotemObject *totem,
+		   const char  *mrl)
+{
+	if (g_str_has_prefix (mrl, "http://movies.apple.com") ||
+	    g_str_has_prefix (mrl, "http://trailers.apple.com"))
+		return g_strdup ("Quicktime/7.2.0");
+	return NULL;
+}
+
+static void
+impl_activate (PeasActivatable *plugin)
+{
+	TotemAppleTrailersPlugin *pi = TOTEM_APPLE_TRAILERS_PLUGIN (plugin);
+
+	pi->priv->totem = g_object_ref (g_object_get_data (G_OBJECT (plugin), "object"));
+	pi->priv->signal_id = g_signal_connect (G_OBJECT (pi->priv->totem), "get-user-agent",
+						G_CALLBACK (get_user_agent_cb), NULL);
+}
+
+static void
+impl_deactivate (PeasActivatable *plugin)
+{
+	TotemAppleTrailersPlugin *pi = TOTEM_APPLE_TRAILERS_PLUGIN (plugin);
+
+	if (pi->priv->signal_id) {
+		g_signal_handler_disconnect (pi->priv->totem, pi->priv->signal_id);
+		pi->priv->signal_id = 0;
+	}
+
+	if (pi->priv->totem) {
+		g_object_unref (pi->priv->totem);
+		pi->priv->totem = NULL;
+	}
+}
diff -Nru totem-3.4.3/src/plugins/autoload-subtitles/Makefile.am totem-3.6.2/src/plugins/autoload-subtitles/Makefile.am
--- totem-3.4.3/src/plugins/autoload-subtitles/Makefile.am	1970-01-01 00:00:00.000000000 +0000
+++ totem-3.6.2/src/plugins/autoload-subtitles/Makefile.am	2012-08-29 23:07:45.000000000 +0000
@@ -0,0 +1,13 @@
+include $(top_srcdir)/src/plugins/Makefile.plugins
+
+plugindir = $(PLUGINDIR)/autoload-subtitles
+plugin_LTLIBRARIES = libautoload-subtitles.la
+
+plugin_in_files = autoload-subtitles.plugin.in
+
+libautoload_subtitles_la_SOURCES = totem-autoload-subtitles.c
+libautoload_subtitles_la_LDFLAGS = $(plugin_ldflags)
+libautoload_subtitles_la_LIBADD = $(plugin_libadd)
+libautoload_subtitles_la_CFLAGS = $(plugin_cflags)
+
+-include $(top_srcdir)/git.mk
diff -Nru totem-3.4.3/src/plugins/autoload-subtitles/Makefile.in totem-3.6.2/src/plugins/autoload-subtitles/Makefile.in
--- totem-3.4.3/src/plugins/autoload-subtitles/Makefile.in	1970-01-01 00:00:00.000000000 +0000
+++ totem-3.6.2/src/plugins/autoload-subtitles/Makefile.in	2012-10-25 13:36:21.000000000 +0000
@@ -0,0 +1,818 @@
+# Makefile.in generated by automake 1.12.2 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+
+VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/depcomp \
+	$(top_srcdir)/src/plugins/Makefile.plugins
+subdir = src/plugins/autoload-subtitles
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"
+LTLIBRARIES = $(plugin_LTLIBRARIES)
+libautoload_subtitles_la_DEPENDENCIES = $(plugin_libadd)
+am_libautoload_subtitles_la_OBJECTS =  \
+	libautoload_subtitles_la-totem-autoload-subtitles.lo
+libautoload_subtitles_la_OBJECTS =  \
+	$(am_libautoload_subtitles_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+libautoload_subtitles_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(libautoload_subtitles_la_CFLAGS) $(CFLAGS) \
+	$(libautoload_subtitles_la_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libautoload_subtitles_la_SOURCES)
+DIST_SOURCES = $(libautoload_subtitles_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+DATA = $(plugin_DATA)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ALL_LINGUAS = @ALL_LINGUAS@
+ALL_PLUGINS = @ALL_PLUGINS@
+AMTAR = @AMTAR@
+AM_CFLAGS = @AM_CFLAGS@
+AM_CPPFLAGS = \
+	-DG_LOG_DOMAIN=\""Totem"\"	\
+	$(DISABLE_DEPRECATED)		\
+	-I$(top_srcdir)/		\
+	-I$(top_srcdir)/src		\
+	-I$(top_srcdir)/src/plugins	\
+	-I$(top_srcdir)/src/gst
+
+AM_CXXFLAGS = @AM_CXXFLAGS@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_LDFLAGS = @AM_LDFLAGS@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BACKEND_CFLAGS = @BACKEND_CFLAGS@
+BACKEND_LIBS = @BACKEND_LIBS@
+BACKEND_TEST_CFLAGS = @BACKEND_TEST_CFLAGS@
+BACKEND_TEST_LIBS = @BACKEND_TEST_LIBS@
+BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
+BROWSER_PLUGIN_DIR = @BROWSER_PLUGIN_DIR@
+BROWSER_PLUGIN_LIBS = @BROWSER_PLUGIN_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CHAPTERS_CFLAGS = @CHAPTERS_CFLAGS@
+CHAPTERS_LIBS = @CHAPTERS_LIBS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DBUS_BIND = @DBUS_BIND@
+DBUS_CFLAGS = @DBUS_CFLAGS@
+DBUS_LIBS = @DBUS_LIBS@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
+DISC_RECORDER_CFLAGS = @DISC_RECORDER_CFLAGS@
+DISC_RECORDER_LIBS = @DISC_RECORDER_LIBS@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DLLTOOL = @DLLTOOL@
+DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+FULL_LIBEXECDIR = @FULL_LIBEXECDIR@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GLIB_REQS = @GLIB_REQS@
+GLOW_BUTTON_CFLAGS = @GLOW_BUTTON_CFLAGS@
+GLOW_BUTTON_LIBS = @GLOW_BUTTON_LIBS@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
+GST_PLUGINS_BAD_CFLAGS = @GST_PLUGINS_BAD_CFLAGS@
+GST_PLUGINS_BAD_LIBS = @GST_PLUGINS_BAD_LIBS@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+GTK_REQS = @GTK_REQS@
+HELPER_CFLAGS = @HELPER_CFLAGS@
+HELPER_LIBS = @HELPER_LIBS@
+HELP_DIR = @HELP_DIR@
+HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBGRILO_CFLAGS = @LIBGRILO_CFLAGS@
+LIBGRILO_LIBS = @LIBGRILO_LIBS@
+LIBOBJS = @LIBOBJS@
+LIBPLAYER_CFLAGS = @LIBPLAYER_CFLAGS@
+LIBPLAYER_LIBS = @LIBPLAYER_LIBS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBZEITGEIST_CFLAGS = @LIBZEITGEIST_CFLAGS@
+LIBZEITGEIST_LIBS = @LIBZEITGEIST_LIBS@
+LIPO = @LIPO@
+LIRC_LIBS = @LIRC_LIBS@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MEDIA_PLAYER_KEYS_CFLAGS = @MEDIA_PLAYER_KEYS_CFLAGS@
+MEDIA_PLAYER_KEYS_LIBS = @MEDIA_PLAYER_KEYS_LIBS@
+MISSING_PLUGINS_CFLAGS = @MISSING_PLUGINS_CFLAGS@
+MISSING_PLUGINS_LIBS = @MISSING_PLUGINS_LIBS@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGMERGE = @MSGMERGE@
+NAUTILUSDIR = @NAUTILUSDIR@
+NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+NAUTILUS_LIBS = @NAUTILUS_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OMF_DIR = @OMF_DIR@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PIXBUF_HELPER_CFLAGS = @PIXBUF_HELPER_CFLAGS@
+PIXBUF_HELPER_LIBS = @PIXBUF_HELPER_LIBS@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLAYER_CFLAGS = @PLAYER_CFLAGS@
+PLAYER_LIBS = @PLAYER_LIBS@
+PLUGINDIR = @PLUGINDIR@
+PLUGINS = @PLUGINS@
+PLUGIN_VIEWER_CFLAGS = @PLUGIN_VIEWER_CFLAGS@
+PLUGIN_VIEWER_LIBS = @PLUGIN_VIEWER_LIBS@
+PREVIEW_CFLAGS = @PREVIEW_CFLAGS@
+PREVIEW_LIBS = @PREVIEW_LIBS@
+PROPERTIES_CFLAGS = @PROPERTIES_CFLAGS@
+PROPERTIES_LIBS = @PROPERTIES_LIBS@
+PYGOBJECT_CFLAGS = @PYGOBJECT_CFLAGS@
+PYGOBJECT_LIBS = @PYGOBJECT_LIBS@
+PYLINT = @PYLINT@
+PYTHON = @PYTHON@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
+RANLIB = @RANLIB@
+SAVE_FILE_CFLAGS = @SAVE_FILE_CFLAGS@
+SAVE_FILE_CHECK_CFLAGS = @SAVE_FILE_CHECK_CFLAGS@
+SAVE_FILE_CHECK_LIBS = @SAVE_FILE_CHECK_LIBS@
+SAVE_FILE_LIBS = @SAVE_FILE_LIBS@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SMCLIENT_CFLAGS = @SMCLIENT_CFLAGS@
+SMCLIENT_LIBS = @SMCLIENT_LIBS@
+STRIP = @STRIP@
+THUMBNAILER_CFLAGS = @THUMBNAILER_CFLAGS@
+THUMBNAILER_LIBS = @THUMBNAILER_LIBS@
+TIME_HELPER_CFLAGS = @TIME_HELPER_CFLAGS@
+TIME_HELPER_LIBS = @TIME_HELPER_LIBS@
+TOTEM_API_VERSION = @TOTEM_API_VERSION@
+TOTEM_PLPARSER_REQS = @TOTEM_PLPARSER_REQS@
+TOTEM_VERSION_MAJOR = @TOTEM_VERSION_MAJOR@
+TOTEM_VERSION_MICRO = @TOTEM_VERSION_MICRO@
+TOTEM_VERSION_MINOR = @TOTEM_VERSION_MINOR@
+USE_NLS = @USE_NLS@
+VALAC = @VALAC@
+VERSION = @VERSION@
+WARN_CFLAGS = @WARN_CFLAGS@
+WARN_CXXFLAGS = @WARN_CXXFLAGS@
+XGETTEXT = @XGETTEXT@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
+CLEANFILES = $(plugin_DATA)
+DISTCLEANFILES = $(plugin_DATA)
+EXTRA_DIST = $(plugin_in_files)
+plugin_cflags = \
+	$(PLAYER_CFLAGS)	\
+	$(WARN_CFLAGS)
+
+plugin_ldflags = \
+	-export-dynamic \
+	-no-undefined \
+	-avoid-version \
+	-module
+
+plugin_libadd = \
+	$(top_builddir)/src/libtotem.la
+
+plugindir = $(PLUGINDIR)/autoload-subtitles
+plugin_LTLIBRARIES = libautoload-subtitles.la
+plugin_in_files = autoload-subtitles.plugin.in
+libautoload_subtitles_la_SOURCES = totem-autoload-subtitles.c
+libautoload_subtitles_la_LDFLAGS = $(plugin_ldflags)
+libautoload_subtitles_la_LIBADD = $(plugin_libadd)
+libautoload_subtitles_la_CFLAGS = $(plugin_cflags)
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/plugins/Makefile.plugins $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/plugins/autoload-subtitles/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu src/plugins/autoload-subtitles/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+$(top_srcdir)/src/plugins/Makefile.plugins:
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
+	list2=; for p in $$list; do \
+	  if test -f $$p; then \
+	    list2="$$list2 $$p"; \
+	  else :; fi; \
+	done; \
+	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
+	}
+
+uninstall-pluginLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$f"; \
+	done
+
+clean-pluginLTLIBRARIES:
+	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
+	@list='$(plugin_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+libautoload-subtitles.la: $(libautoload_subtitles_la_OBJECTS) $(libautoload_subtitles_la_DEPENDENCIES) $(EXTRA_libautoload_subtitles_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libautoload_subtitles_la_LINK) -rpath $(plugindir) $(libautoload_subtitles_la_OBJECTS) $(libautoload_subtitles_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libautoload_subtitles_la-totem-autoload-subtitles.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+libautoload_subtitles_la-totem-autoload-subtitles.lo: totem-autoload-subtitles.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libautoload_subtitles_la_CFLAGS) $(CFLAGS) -MT libautoload_subtitles_la-totem-autoload-subtitles.lo -MD -MP -MF $(DEPDIR)/libautoload_subtitles_la-totem-autoload-subtitles.Tpo -c -o libautoload_subtitles_la-totem-autoload-subtitles.lo `test -f 'totem-autoload-subtitles.c' || echo '$(srcdir)/'`totem-autoload-subtitles.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libautoload_subtitles_la-totem-autoload-subtitles.Tpo $(DEPDIR)/libautoload_subtitles_la-totem-autoload-subtitles.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='totem-autoload-subtitles.c' object='libautoload_subtitles_la-totem-autoload-subtitles.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libautoload_subtitles_la_CFLAGS) $(CFLAGS) -c -o libautoload_subtitles_la-totem-autoload-subtitles.lo `test -f 'totem-autoload-subtitles.c' || echo '$(srcdir)/'`totem-autoload-subtitles.c
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-pluginDATA: $(plugin_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(plugindir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(plugindir)" || exit $$?; \
+	done
+
+uninstall-pluginDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	set x; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+
+cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
+	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES) $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-pluginDATA install-pluginLTLIBRARIES
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pluginLTLIBRARIES cscopelist ctags \
+	distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pluginDATA install-pluginLTLIBRARIES install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-pluginDATA uninstall-pluginLTLIBRARIES
+
+%.plugin: %.plugin.in
+	$(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+
+# Checking rules for Python plugins
+# Execute pylint on all the requisite files individually, returning non-zero
+# iff any of the calls to pylint returned non-zero.
+check-pylint: $(plugin_PYTHON)
+@ENABLE_PYTHON_TRUE@	@exitstatus=0; \
+@ENABLE_PYTHON_TRUE@	for py in $^; do \
+@ENABLE_PYTHON_TRUE@		$(PYLINT) -i y -d C0111 -d W0511 -d F0401 $$py; \
+@ENABLE_PYTHON_TRUE@		\
+@ENABLE_PYTHON_TRUE@		newexitstatus=$$?; \
+@ENABLE_PYTHON_TRUE@		if [ $$exitstatus == 0 ]; then \
+@ENABLE_PYTHON_TRUE@			exitstatus=$$newexitstatus; \
+@ENABLE_PYTHON_TRUE@		fi; \
+@ENABLE_PYTHON_TRUE@	done; \
+@ENABLE_PYTHON_TRUE@	exit $$exitstatus
+
+check: check-pylint
+
+.PHONY: check-pylint
+
+-include $(top_srcdir)/git.mk
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -Nru totem-3.4.3/src/plugins/autoload-subtitles/autoload-subtitles.plugin.in totem-3.6.2/src/plugins/autoload-subtitles/autoload-subtitles.plugin.in
--- totem-3.4.3/src/plugins/autoload-subtitles/autoload-subtitles.plugin.in	1970-01-01 00:00:00.000000000 +0000
+++ totem-3.6.2/src/plugins/autoload-subtitles/autoload-subtitles.plugin.in	2012-08-29 23:07:45.000000000 +0000
@@ -0,0 +1,9 @@
+[Plugin]
+Module=autoload-subtitles
+IAge=1
+Builtin=true
+_Name=Autoload Subtitles
+_Description=Autoloads text subtitles
+Authors=Bastien Nocera
+Copyright=Copyright © 2012 Bastien Nocera
+Website=http://www.gnome.org/projects/totem/
diff -Nru totem-3.4.3/src/plugins/autoload-subtitles/totem-autoload-subtitles.c totem-3.6.2/src/plugins/autoload-subtitles/totem-autoload-subtitles.c
--- totem-3.4.3/src/plugins/autoload-subtitles/totem-autoload-subtitles.c	1970-01-01 00:00:00.000000000 +0000
+++ totem-3.6.2/src/plugins/autoload-subtitles/totem-autoload-subtitles.c	2012-08-29 23:07:45.000000000 +0000
@@ -0,0 +1,284 @@
+/*
+ *  Copyright (C) 2012 Bastien Nocera 
+ *
+ *  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 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
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
+ *
+ *
+ * The Totem project hereby grant permission for non-gpl compatible GStreamer
+ * plugins to be used and distributed together with GStreamer and Totem. This
+ * permission are above and beyond the permissions granted by the GPL license
+ * Totem is covered by.
+ *
+ * Monday 7th February 2005: Christian Schaller: Add exception clause.
+ * See license_change file for details.
+ *
+ */
+
+
+#include "config.h"
+
+#include 
+#include 
+
+#include "totem-plugin.h"
+#include "totem.h"
+
+#define TOTEM_TYPE_AUTOLOAD_SUBTITLES_PLUGIN	(totem_autoload_subtitles_plugin_get_type ())
+#define TOTEM_AUTOLOAD_SUBTITLES_PLUGIN(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), TOTEM_TYPE_AUTOLOAD_SUBTITLES_PLUGIN, TotemAutoloadSubtitlesPlugin))
+
+typedef struct {
+	guint signal_id;
+	TotemObject *totem;
+	GSettings *settings;
+	gboolean autoload_subs;
+} TotemAutoloadSubtitlesPluginPrivate;
+
+TOTEM_PLUGIN_REGISTER(TOTEM_TYPE_AUTOLOAD_SUBTITLES_PLUGIN, TotemAutoloadSubtitlesPlugin, totem_autoload_subtitles_plugin)
+
+/* List from xine-lib's demux_sputext.c.
+ * Keep in sync with the list in totem_setup_file_filters() in this file.
+ * Don't add .txt extensions, as there are too many false positives. */
+static const char subtitle_ext[][4] = {
+	"sub",
+	"srt",
+	"smi",
+	"ssa",
+	"ass",
+	"asc"
+};
+
+static gboolean
+totem_uri_exists (const char *uri)
+{
+	GFile *file = g_file_new_for_uri (uri);
+	if (file != NULL) {
+		if (g_file_query_exists (file, NULL)) {
+			g_object_unref (file);
+			return TRUE;
+		}
+		g_object_unref (file);
+	}
+	return FALSE;
+}
+
+static char *
+totem_uri_get_subtitle_for_uri (const char *uri)
+{
+	char *subtitle;
+	guint len, i;
+	gint suffix;
+
+	g_return_val_if_fail (uri != NULL, NULL);
+
+	/* Find the filename suffix delimiter */
+	len = strlen (uri);
+	for (suffix = len - 1; suffix > 0; suffix--) {
+		if (uri[suffix] == G_DIR_SEPARATOR ||
+		    (uri[suffix] == '/')) {
+			/* This filename has no extension; we'll need to add one */
+			suffix = len;
+			break;
+		}
+		if (uri[suffix] == '.') {
+			/* Found our extension marker */
+			break;
+		}
+	}
+	if (suffix < 0)
+		return NULL;
+
+	/* Generate a subtitle string with room at the end to store the
+	 * 3 character extensions for which we want to search */
+	subtitle = g_malloc0 (suffix + 4 + 1);
+	g_return_val_if_fail (subtitle != NULL, NULL);
+	g_strlcpy (subtitle, uri, suffix + 4 + 1);
+	g_strlcpy (subtitle + suffix, ".???", 5);
+
+	/* Search for any files with one of our known subtitle extensions */
+	for (i = 0; i < G_N_ELEMENTS (subtitle_ext) ; i++) {
+		char *subtitle_ext_upper;
+		memcpy (subtitle + suffix + 1, subtitle_ext[i], 3);
+
+		if (totem_uri_exists (subtitle))
+			return subtitle;
+
+		/* Check with upper-cased extension */
+		subtitle_ext_upper = g_ascii_strup (subtitle_ext[i], -1);
+		memcpy (subtitle + suffix + 1, subtitle_ext_upper, 3);
+		g_free (subtitle_ext_upper);
+
+		if (totem_uri_exists (subtitle))
+			return subtitle;
+	}
+	g_free (subtitle);
+	return NULL;
+}
+
+static char *
+totem_uri_get_subtitle_in_subdir (GFile *file, const char *subdir)
+{
+	char *filename, *subtitle, *full_path_str;
+	GFile *parent, *full_path, *directory;
+
+	/* Get the sibling directory @subdir of the file @file */
+	parent = g_file_get_parent (file);
+	directory = g_file_get_child (parent, subdir);
+	g_object_unref (parent);
+
+	/* Get the file of the same name as @file in the @subdir directory */
+	filename = g_file_get_basename (file);
+	full_path = g_file_get_child (directory, filename);
+	g_object_unref (directory);
+	g_free (filename);
+
+	/* Get the subtitles from that URI */
+	full_path_str = g_file_get_uri (full_path);
+	g_object_unref (full_path);
+	subtitle = totem_uri_get_subtitle_for_uri (full_path_str);
+	g_free (full_path_str);
+
+	return subtitle;
+}
+
+static char *
+totem_uri_get_cached_subtitle_for_uri (const char *uri)
+{
+	char *filename, *basename, *fake_filename, *fake_uri, *ret;
+
+	filename = g_filename_from_uri (uri, NULL, NULL);
+	if (filename == NULL)
+		return NULL;
+
+	basename = g_path_get_basename (filename);
+	g_free (filename);
+	if (basename == NULL || strcmp (basename, ".") == 0) {
+		g_free (basename);
+		return NULL;
+	}
+
+	fake_filename = g_build_filename (g_get_user_cache_dir (),
+				"totem",
+				"subtitles",
+				basename,
+				NULL);
+	g_free (basename);
+	fake_uri = g_filename_to_uri (fake_filename, NULL, NULL);
+	g_free (fake_filename);
+
+	ret = totem_uri_get_subtitle_for_uri (fake_uri);
+	g_free (fake_uri);
+
+	return ret;
+}
+
+static char *
+totem_uri_get_subtitle_uri (const char *uri)
+{
+	GFile *file;
+	char *subtitle;
+
+	if (g_str_has_prefix (uri, "http") != FALSE ||
+	    g_str_has_prefix (uri, "rtsp") != FALSE ||
+	    g_str_has_prefix (uri, "rtmp") != FALSE)
+		return NULL;
+
+	/* Has the user specified a subtitle file manually? */
+	if (strstr (uri, "#subtitle:") != NULL)
+		return NULL;
+
+	/* Does the file exist? */
+	file = g_file_new_for_uri (uri);
+	if (g_file_query_exists (file, NULL) != TRUE) {
+		g_object_unref (file);
+		return NULL;
+	}
+
+	/* Try in the cached subtitles directory */
+	subtitle = totem_uri_get_cached_subtitle_for_uri (uri);
+	if (subtitle != NULL) {
+		g_object_unref (file);
+		return subtitle;
+	}
+
+	/* Try in the current directory */
+	subtitle = totem_uri_get_subtitle_for_uri (uri);
+	if (subtitle != NULL) {
+		g_object_unref (file);
+		return subtitle;
+	}
+
+	subtitle = totem_uri_get_subtitle_in_subdir (file, "subtitles");
+	g_object_unref (file);
+
+	return subtitle;
+}
+
+
+
+static char *
+get_text_subtitle_cb (TotemObject                  *totem,
+		      const char                   *mrl,
+		      TotemAutoloadSubtitlesPlugin *pi)
+{
+	char *sub;
+
+	if (pi->priv->autoload_subs == FALSE)
+		return NULL;
+
+	sub = totem_uri_get_subtitle_uri (mrl);
+
+	return sub;
+}
+
+static void
+autoload_subs_changed (GSettings                *settings,
+		       char                     *key,
+		       TotemAutoloadSubtitlesPlugin *pi)
+{
+	pi->priv->autoload_subs = g_settings_get_boolean (settings, "autoload-subtitles");
+}
+
+static void
+impl_activate (PeasActivatable *plugin)
+{
+	TotemAutoloadSubtitlesPlugin *pi = TOTEM_AUTOLOAD_SUBTITLES_PLUGIN (plugin);
+
+	pi->priv->totem = g_object_ref (g_object_get_data (G_OBJECT (plugin), "object"));
+	pi->priv->settings = g_settings_new ("org.gnome.totem");
+	pi->priv->autoload_subs = g_settings_get_boolean (pi->priv->settings, "autoload-subtitles");
+	g_signal_connect (pi->priv->settings, "changed::autoload-subtitles",
+			  G_CALLBACK (autoload_subs_changed), pi);
+	pi->priv->signal_id = g_signal_connect (G_OBJECT (pi->priv->totem), "get-text-subtitle",
+						G_CALLBACK (get_text_subtitle_cb), pi);
+}
+
+static void
+impl_deactivate (PeasActivatable *plugin)
+{
+	TotemAutoloadSubtitlesPlugin *pi = TOTEM_AUTOLOAD_SUBTITLES_PLUGIN (plugin);
+
+	if (pi->priv->signal_id) {
+		g_signal_handler_disconnect (pi->priv->totem, pi->priv->signal_id);
+		pi->priv->signal_id = 0;
+	}
+	if (pi->priv->totem) {
+		g_object_unref (pi->priv->totem);
+		pi->priv->totem = NULL;
+	}
+	if (pi->priv->settings) {
+		g_object_unref (pi->priv->settings);
+		pi->priv->settings = NULL;
+	}
+}
diff -Nru totem-3.4.3/src/plugins/brasero-disc-recorder/Makefile.in totem-3.6.2/src/plugins/brasero-disc-recorder/Makefile.in
--- totem-3.4.3/src/plugins/brasero-disc-recorder/Makefile.in	2012-07-04 09:54:49.000000000 +0000
+++ totem-3.6.2/src/plugins/brasero-disc-recorder/Makefile.in	2012-10-25 13:36:21.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.12.2 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,6 +16,23 @@
 
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -36,13 +52,11 @@
 build_triplet = @build@
 host_triplet = @host@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/depcomp \
 	$(top_srcdir)/src/plugins/Makefile.plugins
 subdir = src/plugins/brasero-disc-recorder
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -88,10 +102,23 @@
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 libbrasero_disc_recorder_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(libbrasero_disc_recorder_la_CFLAGS) $(CFLAGS) \
 	$(libbrasero_disc_recorder_la_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -104,22 +131,23 @@
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(libbrasero_disc_recorder_la_SOURCES)
 DIST_SOURCES = $(libbrasero_disc_recorder_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 DATA = $(plugin_DATA)
 ETAGS = etags
 CTAGS = ctags
@@ -135,7 +163,8 @@
 	$(DISABLE_DEPRECATED)		\
 	-I$(top_srcdir)/		\
 	-I$(top_srcdir)/src		\
-	-I$(top_srcdir)/src/plugins
+	-I$(top_srcdir)/src/plugins	\
+	-I$(top_srcdir)/src/gst
 
 AM_CXXFLAGS = @AM_CXXFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -145,6 +174,10 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BACKEND_CFLAGS = @BACKEND_CFLAGS@
+BACKEND_LIBS = @BACKEND_LIBS@
+BACKEND_TEST_CFLAGS = @BACKEND_TEST_CFLAGS@
+BACKEND_TEST_LIBS = @BACKEND_TEST_LIBS@
 BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
 BROWSER_PLUGIN_DIR = @BROWSER_PLUGIN_DIR@
 BROWSER_PLUGIN_LIBS = @BROWSER_PLUGIN_LIBS@
@@ -166,8 +199,6 @@
 DBUS_LIBS = @DBUS_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DEPENDENCY_CFLAGS = @DEPENDENCY_CFLAGS@
-DEPENDENCY_LIBS = @DEPENDENCY_LIBS@
 DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DISC_RECORDER_CFLAGS = @DISC_RECORDER_CFLAGS@
 DISC_RECORDER_LIBS = @DISC_RECORDER_LIBS@
@@ -181,7 +212,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-EXTRA_BACKEND_LIBS = @EXTRA_BACKEND_LIBS@
 FGREP = @FGREP@
 FULL_LIBEXECDIR = @FULL_LIBEXECDIR@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
@@ -189,19 +219,21 @@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GLIB_REQS = @GLIB_REQS@
+GLOW_BUTTON_CFLAGS = @GLOW_BUTTON_CFLAGS@
+GLOW_BUTTON_LIBS = @GLOW_BUTTON_LIBS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
-GST_CFLAGS = @GST_CFLAGS@
-GST_LIBS = @GST_LIBS@
+GST_PLUGINS_BAD_CFLAGS = @GST_PLUGINS_BAD_CFLAGS@
+GST_PLUGINS_BAD_LIBS = @GST_PLUGINS_BAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
 GTK_REQS = @GTK_REQS@
+HELPER_CFLAGS = @HELPER_CFLAGS@
+HELPER_LIBS = @HELPER_LIBS@
 HELP_DIR = @HELP_DIR@
 HTML_DIR = @HTML_DIR@
 INSTALL = @INSTALL@
@@ -227,11 +259,11 @@
 INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBEPC_CFLAGS = @LIBEPC_CFLAGS@
-LIBEPC_LIBS = @LIBEPC_LIBS@
 LIBGRILO_CFLAGS = @LIBGRILO_CFLAGS@
 LIBGRILO_LIBS = @LIBGRILO_LIBS@
 LIBOBJS = @LIBOBJS@
+LIBPLAYER_CFLAGS = @LIBPLAYER_CFLAGS@
+LIBPLAYER_LIBS = @LIBPLAYER_LIBS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBZEITGEIST_CFLAGS = @LIBZEITGEIST_CFLAGS@
@@ -248,8 +280,6 @@
 MISSING_PLUGINS_CFLAGS = @MISSING_PLUGINS_CFLAGS@
 MISSING_PLUGINS_LIBS = @MISSING_PLUGINS_LIBS@
 MKDIR_P = @MKDIR_P@
-MM_CFLAGS = @MM_CFLAGS@
-MM_LIBS = @MM_LIBS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 NAUTILUSDIR = @NAUTILUSDIR@
@@ -270,15 +300,21 @@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PEASGTK_CFLAGS = @PEASGTK_CFLAGS@
-PEASGTK_LIBS = @PEASGTK_LIBS@
-PEAS_CFLAGS = @PEAS_CFLAGS@
-PEAS_LIBS = @PEAS_LIBS@
+PIXBUF_HELPER_CFLAGS = @PIXBUF_HELPER_CFLAGS@
+PIXBUF_HELPER_LIBS = @PIXBUF_HELPER_LIBS@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLAYER_CFLAGS = @PLAYER_CFLAGS@
+PLAYER_LIBS = @PLAYER_LIBS@
 PLUGINDIR = @PLUGINDIR@
 PLUGINS = @PLUGINS@
+PLUGIN_VIEWER_CFLAGS = @PLUGIN_VIEWER_CFLAGS@
+PLUGIN_VIEWER_LIBS = @PLUGIN_VIEWER_LIBS@
+PREVIEW_CFLAGS = @PREVIEW_CFLAGS@
+PREVIEW_LIBS = @PREVIEW_LIBS@
+PROPERTIES_CFLAGS = @PROPERTIES_CFLAGS@
+PROPERTIES_LIBS = @PROPERTIES_LIBS@
 PYGOBJECT_CFLAGS = @PYGOBJECT_CFLAGS@
 PYGOBJECT_LIBS = @PYGOBJECT_LIBS@
 PYLINT = @PYLINT@
@@ -298,6 +334,10 @@
 SMCLIENT_CFLAGS = @SMCLIENT_CFLAGS@
 SMCLIENT_LIBS = @SMCLIENT_LIBS@
 STRIP = @STRIP@
+THUMBNAILER_CFLAGS = @THUMBNAILER_CFLAGS@
+THUMBNAILER_LIBS = @THUMBNAILER_LIBS@
+TIME_HELPER_CFLAGS = @TIME_HELPER_CFLAGS@
+TIME_HELPER_LIBS = @TIME_HELPER_LIBS@
 TOTEM_API_VERSION = @TOTEM_API_VERSION@
 TOTEM_PLPARSER_REQS = @TOTEM_PLPARSER_REQS@
 TOTEM_VERSION_MAJOR = @TOTEM_VERSION_MAJOR@
@@ -309,9 +349,6 @@
 WARN_CFLAGS = @WARN_CFLAGS@
 WARN_CXXFLAGS = @WARN_CXXFLAGS@
 XGETTEXT = @XGETTEXT@
-XMKMF = @XMKMF@
-XTEST_LIBS = @XTEST_LIBS@
-X_LIBS = @X_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -377,8 +414,7 @@
 DISTCLEANFILES = $(plugin_DATA)
 EXTRA_DIST = $(plugin_in_files)
 plugin_cflags = \
-	$(DEPENDENCY_CFLAGS)	\
-	$(PEAS_CFLAGS)		\
+	$(PLAYER_CFLAGS)	\
 	$(WARN_CFLAGS)
 
 plugin_ldflags = \
@@ -440,7 +476,6 @@
 $(am__aclocal_m4_deps):
 install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
 	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
@@ -448,6 +483,8 @@
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
 	}
@@ -463,12 +500,14 @@
 
 clean-pluginLTLIBRARIES:
 	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
-	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(plugin_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
 libbrasero-disc-recorder.la: $(libbrasero_disc_recorder_la_OBJECTS) $(libbrasero_disc_recorder_la_DEPENDENCIES) $(EXTRA_libbrasero_disc_recorder_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libbrasero_disc_recorder_la_LINK) -rpath $(plugindir) $(libbrasero_disc_recorder_la_OBJECTS) $(libbrasero_disc_recorder_la_LIBADD) $(LIBS)
 
@@ -481,25 +520,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libbrasero_disc_recorder_la-totem-disc-recorder.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
@@ -518,8 +554,11 @@
 	-rm -rf .libs _libs
 install-pluginDATA: $(plugin_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
 	@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -584,6 +623,20 @@
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
 
+cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
+	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
@@ -730,19 +783,19 @@
 .MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pluginLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pluginDATA \
-	install-pluginLTLIBRARIES install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-pluginDATA uninstall-pluginLTLIBRARIES
+	clean-libtool clean-pluginLTLIBRARIES cscopelist ctags \
+	distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pluginDATA install-pluginLTLIBRARIES install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-pluginDATA uninstall-pluginLTLIBRARIES
 
 %.plugin: %.plugin.in
 	$(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
diff -Nru totem-3.4.3/src/plugins/brasero-disc-recorder/totem-disc-recorder.c totem-3.6.2/src/plugins/brasero-disc-recorder/totem-disc-recorder.c
--- totem-3.4.3/src/plugins/brasero-disc-recorder/totem-disc-recorder.c	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/plugins/brasero-disc-recorder/totem-disc-recorder.c	2012-08-29 23:07:45.000000000 +0000
@@ -80,23 +80,30 @@
 {
 	GtkWindow *main_window;
 	GdkScreen *screen;
+	GdkDisplay *display;
 	gchar *command_line;
 	GList *uris;
 	GAppInfo *info;
 	GdkAppLaunchContext *context;
 	GError *error = NULL;
-	int xid;
+	char *xid_arg;
 
-	/* Build a command line to use */
 	main_window = totem_get_main_window (pi->priv->totem);
 	screen = gtk_widget_get_screen (GTK_WIDGET (main_window));
-	xid = gdk_x11_window_get_xid (gtk_widget_get_window (GTK_WIDGET (main_window)));
+	display = gdk_display_get_default ();
+
+	/* Build a command line to use */
+	xid_arg = NULL;
+#ifdef GDK_WINDOWING_X11
+	if (GDK_IS_X11_DISPLAY (display))
+		xid_arg = g_strdup_printf ("-x %d", (int) gdk_x11_window_get_xid (gtk_widget_get_window (GTK_WIDGET (main_window))));
+#endif /* GDK_WINDOWING_X11 */
 	g_object_unref (main_window);
 
 	if (copy != FALSE)
-		command_line = g_strdup_printf ("brasero -x %d -c", xid);
+		command_line = g_strdup_printf ("brasero %s -c", xid_arg ? xid_arg : "");
 	else
-		command_line = g_strdup_printf ("brasero -x %d -r", xid);
+		command_line = g_strdup_printf ("brasero %s -r", xid_arg ? xid_arg : "");
 
 	/* Build the app info */
 	info = g_app_info_create_from_commandline (command_line, NULL,
diff -Nru totem-3.4.3/src/plugins/chapters/Makefile.in totem-3.6.2/src/plugins/chapters/Makefile.in
--- totem-3.4.3/src/plugins/chapters/Makefile.in	2012-07-04 09:54:49.000000000 +0000
+++ totem-3.6.2/src/plugins/chapters/Makefile.in	2012-10-25 13:36:21.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.12.2 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,6 +16,23 @@
 
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -36,13 +52,11 @@
 build_triplet = @build@
 host_triplet = @host@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/depcomp \
 	$(top_srcdir)/src/plugins/Makefile.plugins
 subdir = src/plugins/chapters
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -89,10 +103,23 @@
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 libchapters_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(libchapters_la_CFLAGS) $(CFLAGS) $(libchapters_la_LDFLAGS) \
 	$(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -105,22 +132,23 @@
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(libchapters_la_SOURCES)
 DIST_SOURCES = $(libchapters_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 DATA = $(plugin_DATA) $(ui_DATA)
 ETAGS = etags
 CTAGS = ctags
@@ -136,7 +164,8 @@
 	$(DISABLE_DEPRECATED)		\
 	-I$(top_srcdir)/		\
 	-I$(top_srcdir)/src		\
-	-I$(top_srcdir)/src/plugins
+	-I$(top_srcdir)/src/plugins	\
+	-I$(top_srcdir)/src/gst
 
 AM_CXXFLAGS = @AM_CXXFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -146,6 +175,10 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BACKEND_CFLAGS = @BACKEND_CFLAGS@
+BACKEND_LIBS = @BACKEND_LIBS@
+BACKEND_TEST_CFLAGS = @BACKEND_TEST_CFLAGS@
+BACKEND_TEST_LIBS = @BACKEND_TEST_LIBS@
 BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
 BROWSER_PLUGIN_DIR = @BROWSER_PLUGIN_DIR@
 BROWSER_PLUGIN_LIBS = @BROWSER_PLUGIN_LIBS@
@@ -167,8 +200,6 @@
 DBUS_LIBS = @DBUS_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DEPENDENCY_CFLAGS = @DEPENDENCY_CFLAGS@
-DEPENDENCY_LIBS = @DEPENDENCY_LIBS@
 DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DISC_RECORDER_CFLAGS = @DISC_RECORDER_CFLAGS@
 DISC_RECORDER_LIBS = @DISC_RECORDER_LIBS@
@@ -182,7 +213,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-EXTRA_BACKEND_LIBS = @EXTRA_BACKEND_LIBS@
 FGREP = @FGREP@
 FULL_LIBEXECDIR = @FULL_LIBEXECDIR@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
@@ -190,19 +220,21 @@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GLIB_REQS = @GLIB_REQS@
+GLOW_BUTTON_CFLAGS = @GLOW_BUTTON_CFLAGS@
+GLOW_BUTTON_LIBS = @GLOW_BUTTON_LIBS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
-GST_CFLAGS = @GST_CFLAGS@
-GST_LIBS = @GST_LIBS@
+GST_PLUGINS_BAD_CFLAGS = @GST_PLUGINS_BAD_CFLAGS@
+GST_PLUGINS_BAD_LIBS = @GST_PLUGINS_BAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
 GTK_REQS = @GTK_REQS@
+HELPER_CFLAGS = @HELPER_CFLAGS@
+HELPER_LIBS = @HELPER_LIBS@
 HELP_DIR = @HELP_DIR@
 HTML_DIR = @HTML_DIR@
 INSTALL = @INSTALL@
@@ -228,11 +260,11 @@
 INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBEPC_CFLAGS = @LIBEPC_CFLAGS@
-LIBEPC_LIBS = @LIBEPC_LIBS@
 LIBGRILO_CFLAGS = @LIBGRILO_CFLAGS@
 LIBGRILO_LIBS = @LIBGRILO_LIBS@
 LIBOBJS = @LIBOBJS@
+LIBPLAYER_CFLAGS = @LIBPLAYER_CFLAGS@
+LIBPLAYER_LIBS = @LIBPLAYER_LIBS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBZEITGEIST_CFLAGS = @LIBZEITGEIST_CFLAGS@
@@ -249,8 +281,6 @@
 MISSING_PLUGINS_CFLAGS = @MISSING_PLUGINS_CFLAGS@
 MISSING_PLUGINS_LIBS = @MISSING_PLUGINS_LIBS@
 MKDIR_P = @MKDIR_P@
-MM_CFLAGS = @MM_CFLAGS@
-MM_LIBS = @MM_LIBS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 NAUTILUSDIR = @NAUTILUSDIR@
@@ -271,15 +301,21 @@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PEASGTK_CFLAGS = @PEASGTK_CFLAGS@
-PEASGTK_LIBS = @PEASGTK_LIBS@
-PEAS_CFLAGS = @PEAS_CFLAGS@
-PEAS_LIBS = @PEAS_LIBS@
+PIXBUF_HELPER_CFLAGS = @PIXBUF_HELPER_CFLAGS@
+PIXBUF_HELPER_LIBS = @PIXBUF_HELPER_LIBS@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLAYER_CFLAGS = @PLAYER_CFLAGS@
+PLAYER_LIBS = @PLAYER_LIBS@
 PLUGINDIR = @PLUGINDIR@
 PLUGINS = @PLUGINS@
+PLUGIN_VIEWER_CFLAGS = @PLUGIN_VIEWER_CFLAGS@
+PLUGIN_VIEWER_LIBS = @PLUGIN_VIEWER_LIBS@
+PREVIEW_CFLAGS = @PREVIEW_CFLAGS@
+PREVIEW_LIBS = @PREVIEW_LIBS@
+PROPERTIES_CFLAGS = @PROPERTIES_CFLAGS@
+PROPERTIES_LIBS = @PROPERTIES_LIBS@
 PYGOBJECT_CFLAGS = @PYGOBJECT_CFLAGS@
 PYGOBJECT_LIBS = @PYGOBJECT_LIBS@
 PYLINT = @PYLINT@
@@ -299,6 +335,10 @@
 SMCLIENT_CFLAGS = @SMCLIENT_CFLAGS@
 SMCLIENT_LIBS = @SMCLIENT_LIBS@
 STRIP = @STRIP@
+THUMBNAILER_CFLAGS = @THUMBNAILER_CFLAGS@
+THUMBNAILER_LIBS = @THUMBNAILER_LIBS@
+TIME_HELPER_CFLAGS = @TIME_HELPER_CFLAGS@
+TIME_HELPER_LIBS = @TIME_HELPER_LIBS@
 TOTEM_API_VERSION = @TOTEM_API_VERSION@
 TOTEM_PLPARSER_REQS = @TOTEM_PLPARSER_REQS@
 TOTEM_VERSION_MAJOR = @TOTEM_VERSION_MAJOR@
@@ -310,9 +350,6 @@
 WARN_CFLAGS = @WARN_CFLAGS@
 WARN_CXXFLAGS = @WARN_CXXFLAGS@
 XGETTEXT = @XGETTEXT@
-XMKMF = @XMKMF@
-XTEST_LIBS = @XTEST_LIBS@
-X_LIBS = @X_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -378,8 +415,7 @@
 DISTCLEANFILES = $(plugin_DATA)
 EXTRA_DIST = $(plugin_in_files) $(ui_DATA)
 plugin_cflags = \
-	$(DEPENDENCY_CFLAGS)	\
-	$(PEAS_CFLAGS)		\
+	$(PLAYER_CFLAGS)	\
 	$(WARN_CFLAGS)
 
 plugin_ldflags = \
@@ -451,7 +487,6 @@
 $(am__aclocal_m4_deps):
 install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
 	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
@@ -459,6 +494,8 @@
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
 	}
@@ -474,12 +511,14 @@
 
 clean-pluginLTLIBRARIES:
 	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
-	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(plugin_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
 libchapters.la: $(libchapters_la_OBJECTS) $(libchapters_la_DEPENDENCIES) $(EXTRA_libchapters_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libchapters_la_LINK) -rpath $(plugindir) $(libchapters_la_OBJECTS) $(libchapters_la_LIBADD) $(LIBS)
 
@@ -495,25 +534,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libchapters_la-totem-edit-chapter.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
@@ -553,8 +589,11 @@
 	-rm -rf .libs _libs
 install-pluginDATA: $(plugin_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
 	@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -571,8 +610,11 @@
 	dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
 install-uiDATA: $(ui_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)"
 	@list='$(ui_DATA)'; test -n "$(uidir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -637,6 +679,20 @@
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
 
+cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
+	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
@@ -785,20 +841,20 @@
 .MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pluginLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pluginDATA \
-	install-pluginLTLIBRARIES install-ps install-ps-am \
-	install-strip install-uiDATA installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-pluginDATA uninstall-pluginLTLIBRARIES \
-	uninstall-uiDATA
+	clean-libtool clean-pluginLTLIBRARIES cscopelist ctags \
+	distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pluginDATA install-pluginLTLIBRARIES install-ps \
+	install-ps-am install-strip install-uiDATA installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-pluginDATA \
+	uninstall-pluginLTLIBRARIES uninstall-uiDATA
 
 %.plugin: %.plugin.in
 	$(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
diff -Nru totem-3.4.3/src/plugins/chapters/chapters-edit.ui totem-3.6.2/src/plugins/chapters/chapters-edit.ui
--- totem-3.4.3/src/plugins/chapters/chapters-edit.ui	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/plugins/chapters/chapters-edit.ui	2012-08-29 23:07:45.000000000 +0000
@@ -1,6 +1,6 @@
 
 
-  
+  
   
   
     True
diff -Nru totem-3.4.3/src/plugins/chapters/chapters-list.ui totem-3.6.2/src/plugins/chapters/chapters-list.ui
--- totem-3.4.3/src/plugins/chapters/chapters-list.ui	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/plugins/chapters/chapters-list.ui	2012-08-29 23:07:45.000000000 +0000
@@ -29,7 +29,7 @@
      
   
 
-  
+  
   
   
     
diff -Nru totem-3.4.3/src/plugins/chapters/chapters.plugin.in totem-3.6.2/src/plugins/chapters/chapters.plugin.in
--- totem-3.4.3/src/plugins/chapters/chapters.plugin.in	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/plugins/chapters/chapters.plugin.in	2012-08-29 23:07:45.000000000 +0000
@@ -3,7 +3,7 @@
 IAge=1
 Builtin=true
 _Name=Chapters
-_Description=Support chapter markers in movies.
+_Description=Support chapter markers in movies
 Authors=Alexander Saprykin
 Copyright=Copyright © 2010 Alexander Saprykin
 Website=http://www.gnome.org/projects/totem/
diff -Nru totem-3.4.3/src/plugins/dbusservice/Makefile.in totem-3.6.2/src/plugins/dbusservice/Makefile.in
--- totem-3.4.3/src/plugins/dbusservice/Makefile.in	2012-07-04 09:54:49.000000000 +0000
+++ totem-3.6.2/src/plugins/dbusservice/Makefile.in	2012-10-25 13:36:21.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.12.2 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +15,23 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -35,28 +51,36 @@
 build_triplet = @build@
 host_triplet = @host@
 DIST_COMMON = $(plugin_PYTHON) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.in $(top_srcdir)/py-compile \
 	$(top_srcdir)/src/plugins/Makefile.plugins
 subdir = src/plugins/dbusservice
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -100,7 +124,8 @@
 	$(DISABLE_DEPRECATED)		\
 	-I$(top_srcdir)/		\
 	-I$(top_srcdir)/src		\
-	-I$(top_srcdir)/src/plugins
+	-I$(top_srcdir)/src/plugins	\
+	-I$(top_srcdir)/src/gst
 
 AM_CXXFLAGS = @AM_CXXFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -110,6 +135,10 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BACKEND_CFLAGS = @BACKEND_CFLAGS@
+BACKEND_LIBS = @BACKEND_LIBS@
+BACKEND_TEST_CFLAGS = @BACKEND_TEST_CFLAGS@
+BACKEND_TEST_LIBS = @BACKEND_TEST_LIBS@
 BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
 BROWSER_PLUGIN_DIR = @BROWSER_PLUGIN_DIR@
 BROWSER_PLUGIN_LIBS = @BROWSER_PLUGIN_LIBS@
@@ -131,8 +160,6 @@
 DBUS_LIBS = @DBUS_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DEPENDENCY_CFLAGS = @DEPENDENCY_CFLAGS@
-DEPENDENCY_LIBS = @DEPENDENCY_LIBS@
 DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DISC_RECORDER_CFLAGS = @DISC_RECORDER_CFLAGS@
 DISC_RECORDER_LIBS = @DISC_RECORDER_LIBS@
@@ -146,7 +173,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-EXTRA_BACKEND_LIBS = @EXTRA_BACKEND_LIBS@
 FGREP = @FGREP@
 FULL_LIBEXECDIR = @FULL_LIBEXECDIR@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
@@ -154,19 +180,21 @@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GLIB_REQS = @GLIB_REQS@
+GLOW_BUTTON_CFLAGS = @GLOW_BUTTON_CFLAGS@
+GLOW_BUTTON_LIBS = @GLOW_BUTTON_LIBS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
-GST_CFLAGS = @GST_CFLAGS@
-GST_LIBS = @GST_LIBS@
+GST_PLUGINS_BAD_CFLAGS = @GST_PLUGINS_BAD_CFLAGS@
+GST_PLUGINS_BAD_LIBS = @GST_PLUGINS_BAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
 GTK_REQS = @GTK_REQS@
+HELPER_CFLAGS = @HELPER_CFLAGS@
+HELPER_LIBS = @HELPER_LIBS@
 HELP_DIR = @HELP_DIR@
 HTML_DIR = @HTML_DIR@
 INSTALL = @INSTALL@
@@ -192,11 +220,11 @@
 INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBEPC_CFLAGS = @LIBEPC_CFLAGS@
-LIBEPC_LIBS = @LIBEPC_LIBS@
 LIBGRILO_CFLAGS = @LIBGRILO_CFLAGS@
 LIBGRILO_LIBS = @LIBGRILO_LIBS@
 LIBOBJS = @LIBOBJS@
+LIBPLAYER_CFLAGS = @LIBPLAYER_CFLAGS@
+LIBPLAYER_LIBS = @LIBPLAYER_LIBS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBZEITGEIST_CFLAGS = @LIBZEITGEIST_CFLAGS@
@@ -213,8 +241,6 @@
 MISSING_PLUGINS_CFLAGS = @MISSING_PLUGINS_CFLAGS@
 MISSING_PLUGINS_LIBS = @MISSING_PLUGINS_LIBS@
 MKDIR_P = @MKDIR_P@
-MM_CFLAGS = @MM_CFLAGS@
-MM_LIBS = @MM_LIBS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 NAUTILUSDIR = @NAUTILUSDIR@
@@ -235,15 +261,21 @@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PEASGTK_CFLAGS = @PEASGTK_CFLAGS@
-PEASGTK_LIBS = @PEASGTK_LIBS@
-PEAS_CFLAGS = @PEAS_CFLAGS@
-PEAS_LIBS = @PEAS_LIBS@
+PIXBUF_HELPER_CFLAGS = @PIXBUF_HELPER_CFLAGS@
+PIXBUF_HELPER_LIBS = @PIXBUF_HELPER_LIBS@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLAYER_CFLAGS = @PLAYER_CFLAGS@
+PLAYER_LIBS = @PLAYER_LIBS@
 PLUGINDIR = @PLUGINDIR@
 PLUGINS = @PLUGINS@
+PLUGIN_VIEWER_CFLAGS = @PLUGIN_VIEWER_CFLAGS@
+PLUGIN_VIEWER_LIBS = @PLUGIN_VIEWER_LIBS@
+PREVIEW_CFLAGS = @PREVIEW_CFLAGS@
+PREVIEW_LIBS = @PREVIEW_LIBS@
+PROPERTIES_CFLAGS = @PROPERTIES_CFLAGS@
+PROPERTIES_LIBS = @PROPERTIES_LIBS@
 PYGOBJECT_CFLAGS = @PYGOBJECT_CFLAGS@
 PYGOBJECT_LIBS = @PYGOBJECT_LIBS@
 PYLINT = @PYLINT@
@@ -263,6 +295,10 @@
 SMCLIENT_CFLAGS = @SMCLIENT_CFLAGS@
 SMCLIENT_LIBS = @SMCLIENT_LIBS@
 STRIP = @STRIP@
+THUMBNAILER_CFLAGS = @THUMBNAILER_CFLAGS@
+THUMBNAILER_LIBS = @THUMBNAILER_LIBS@
+TIME_HELPER_CFLAGS = @TIME_HELPER_CFLAGS@
+TIME_HELPER_LIBS = @TIME_HELPER_LIBS@
 TOTEM_API_VERSION = @TOTEM_API_VERSION@
 TOTEM_PLPARSER_REQS = @TOTEM_PLPARSER_REQS@
 TOTEM_VERSION_MAJOR = @TOTEM_VERSION_MAJOR@
@@ -274,9 +310,6 @@
 WARN_CFLAGS = @WARN_CFLAGS@
 WARN_CXXFLAGS = @WARN_CXXFLAGS@
 XGETTEXT = @XGETTEXT@
-XMKMF = @XMKMF@
-XTEST_LIBS = @XTEST_LIBS@
-X_LIBS = @X_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -342,8 +375,7 @@
 DISTCLEANFILES = $(plugin_DATA)
 EXTRA_DIST = $(plugin_in_files)
 plugin_cflags = \
-	$(DEPENDENCY_CFLAGS)	\
-	$(PEAS_CFLAGS)		\
+	$(PLAYER_CFLAGS)	\
 	$(WARN_CFLAGS)
 
 plugin_ldflags = \
@@ -400,8 +432,11 @@
 	-rm -rf .libs _libs
 install-pluginPYTHON: $(plugin_PYTHON)
 	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
 	@list='$(plugin_PYTHON)'; dlist=; list2=; test -n "$(plugindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
 	  if test -f $$b$$p; then \
@@ -435,8 +470,11 @@
 	exit $$st
 install-pluginDATA: $(plugin_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
 	@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -457,6 +495,8 @@
 ctags: CTAGS
 CTAGS:
 
+cscope cscopelist:
+
 
 distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
diff -Nru totem-3.4.3/src/plugins/dbusservice/dbusservice.py totem-3.6.2/src/plugins/dbusservice/dbusservice.py
--- totem-3.4.3/src/plugins/dbusservice/dbusservice.py	2012-01-10 16:10:04.000000000 +0000
+++ totem-3.6.2/src/plugins/dbusservice/dbusservice.py	2012-10-25 08:53:51.000000000 +0000
@@ -57,9 +57,9 @@
         self.totem = totem
 
         self.null_metadata = {
-            'year' : '', 'tracknumber' : '', 'location' : '',
-            'title' : '', 'album' : '', 'time' : '', 'genre' : '',
-            'artist' : ''
+            'year' : u'', 'tracknumber' : '', 'location' : '',
+            'title' : u'', 'album' : u'', 'time' : u'', 'genre' : u'',
+            'artist' : u''
         }
         self.current_metadata = self.null_metadata.copy ()
         self.current_position = 0
@@ -120,11 +120,11 @@
                               title, album, num):
         self.current_metadata = self.null_metadata.copy ()
         if title:
-            self.current_metadata['title'] = title
+            self.current_metadata['title'] = unicode (title, 'utf-8')
         if artist:
-            self.current_metadata['artist'] = artist
+            self.current_metadata['artist'] = unicode (artist, 'utf-8')
         if album:
-            self.current_metadata['album'] = album
+            self.current_metadata['album'] = unicode (album, 'utf-8')
         if num:
             self.current_metadata['tracknumber'] = num
 
diff -Nru totem-3.4.3/src/plugins/grilo/Makefile.am totem-3.6.2/src/plugins/grilo/Makefile.am
--- totem-3.4.3/src/plugins/grilo/Makefile.am	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/plugins/grilo/Makefile.am	2012-08-29 23:07:45.000000000 +0000
@@ -13,15 +13,21 @@
 conf_DATA = totem-grilo.conf
 EXTRA_DIST += $(conf_DATA)
 
-libgrilo_la_SOURCES = totem-grilo.c
+libgrilo_la_SOURCES =				\
+	totem-grilo.c				\
+	gd-tagged-entry.h			\
+	gd-tagged-entry.c			\
+	totem-search-entry.c			\
+	totem-search-entry.h
+
 libgrilo_la_LDFLAGS = $(plugin_ldflags)
 libgrilo_la_LIBADD =			\
         $(plugin_libadd)	\
         $(LIBGRILO_LIBS)
 libgrilo_la_CFLAGS =			\
-        $(plugin_cflags)	\
-        $(LIBGRILO_CFLAGS)	\
-		  -I $(top_srcdir)/src/backend
+        $(plugin_cflags)		\
+        $(LIBGRILO_CFLAGS)		\
+	-I $(top_srcdir)/src/gst/
 
 -include $(top_srcdir)/git.mk
 
diff -Nru totem-3.4.3/src/plugins/grilo/Makefile.in totem-3.6.2/src/plugins/grilo/Makefile.in
--- totem-3.4.3/src/plugins/grilo/Makefile.in	2012-07-04 09:54:49.000000000 +0000
+++ totem-3.6.2/src/plugins/grilo/Makefile.in	2012-10-25 13:36:21.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.12.2 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,6 +16,23 @@
 
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -36,13 +52,11 @@
 build_triplet = @build@
 host_triplet = @host@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/depcomp \
 	$(top_srcdir)/src/plugins/Makefile.plugins
 subdir = src/plugins/grilo
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -81,14 +95,29 @@
 LTLIBRARIES = $(plugin_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 libgrilo_la_DEPENDENCIES = $(plugin_libadd) $(am__DEPENDENCIES_1)
-am_libgrilo_la_OBJECTS = libgrilo_la-totem-grilo.lo
+am_libgrilo_la_OBJECTS = libgrilo_la-totem-grilo.lo \
+	libgrilo_la-gd-tagged-entry.lo \
+	libgrilo_la-totem-search-entry.lo
 libgrilo_la_OBJECTS = $(am_libgrilo_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 libgrilo_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libgrilo_la_CFLAGS) \
 	$(CFLAGS) $(libgrilo_la_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -101,22 +130,23 @@
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(libgrilo_la_SOURCES)
 DIST_SOURCES = $(libgrilo_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 DATA = $(conf_DATA) $(plugin_DATA) $(ui_DATA)
 ETAGS = etags
 CTAGS = ctags
@@ -132,7 +162,8 @@
 	$(DISABLE_DEPRECATED)		\
 	-I$(top_srcdir)/		\
 	-I$(top_srcdir)/src		\
-	-I$(top_srcdir)/src/plugins
+	-I$(top_srcdir)/src/plugins	\
+	-I$(top_srcdir)/src/gst
 
 AM_CXXFLAGS = @AM_CXXFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -142,6 +173,10 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BACKEND_CFLAGS = @BACKEND_CFLAGS@
+BACKEND_LIBS = @BACKEND_LIBS@
+BACKEND_TEST_CFLAGS = @BACKEND_TEST_CFLAGS@
+BACKEND_TEST_LIBS = @BACKEND_TEST_LIBS@
 BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
 BROWSER_PLUGIN_DIR = @BROWSER_PLUGIN_DIR@
 BROWSER_PLUGIN_LIBS = @BROWSER_PLUGIN_LIBS@
@@ -163,8 +198,6 @@
 DBUS_LIBS = @DBUS_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DEPENDENCY_CFLAGS = @DEPENDENCY_CFLAGS@
-DEPENDENCY_LIBS = @DEPENDENCY_LIBS@
 DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DISC_RECORDER_CFLAGS = @DISC_RECORDER_CFLAGS@
 DISC_RECORDER_LIBS = @DISC_RECORDER_LIBS@
@@ -178,7 +211,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-EXTRA_BACKEND_LIBS = @EXTRA_BACKEND_LIBS@
 FGREP = @FGREP@
 FULL_LIBEXECDIR = @FULL_LIBEXECDIR@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
@@ -186,19 +218,21 @@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GLIB_REQS = @GLIB_REQS@
+GLOW_BUTTON_CFLAGS = @GLOW_BUTTON_CFLAGS@
+GLOW_BUTTON_LIBS = @GLOW_BUTTON_LIBS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
-GST_CFLAGS = @GST_CFLAGS@
-GST_LIBS = @GST_LIBS@
+GST_PLUGINS_BAD_CFLAGS = @GST_PLUGINS_BAD_CFLAGS@
+GST_PLUGINS_BAD_LIBS = @GST_PLUGINS_BAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
 GTK_REQS = @GTK_REQS@
+HELPER_CFLAGS = @HELPER_CFLAGS@
+HELPER_LIBS = @HELPER_LIBS@
 HELP_DIR = @HELP_DIR@
 HTML_DIR = @HTML_DIR@
 INSTALL = @INSTALL@
@@ -224,11 +258,11 @@
 INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBEPC_CFLAGS = @LIBEPC_CFLAGS@
-LIBEPC_LIBS = @LIBEPC_LIBS@
 LIBGRILO_CFLAGS = @LIBGRILO_CFLAGS@
 LIBGRILO_LIBS = @LIBGRILO_LIBS@
 LIBOBJS = @LIBOBJS@
+LIBPLAYER_CFLAGS = @LIBPLAYER_CFLAGS@
+LIBPLAYER_LIBS = @LIBPLAYER_LIBS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBZEITGEIST_CFLAGS = @LIBZEITGEIST_CFLAGS@
@@ -245,8 +279,6 @@
 MISSING_PLUGINS_CFLAGS = @MISSING_PLUGINS_CFLAGS@
 MISSING_PLUGINS_LIBS = @MISSING_PLUGINS_LIBS@
 MKDIR_P = @MKDIR_P@
-MM_CFLAGS = @MM_CFLAGS@
-MM_LIBS = @MM_LIBS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 NAUTILUSDIR = @NAUTILUSDIR@
@@ -267,15 +299,21 @@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PEASGTK_CFLAGS = @PEASGTK_CFLAGS@
-PEASGTK_LIBS = @PEASGTK_LIBS@
-PEAS_CFLAGS = @PEAS_CFLAGS@
-PEAS_LIBS = @PEAS_LIBS@
+PIXBUF_HELPER_CFLAGS = @PIXBUF_HELPER_CFLAGS@
+PIXBUF_HELPER_LIBS = @PIXBUF_HELPER_LIBS@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLAYER_CFLAGS = @PLAYER_CFLAGS@
+PLAYER_LIBS = @PLAYER_LIBS@
 PLUGINDIR = @PLUGINDIR@
 PLUGINS = @PLUGINS@
+PLUGIN_VIEWER_CFLAGS = @PLUGIN_VIEWER_CFLAGS@
+PLUGIN_VIEWER_LIBS = @PLUGIN_VIEWER_LIBS@
+PREVIEW_CFLAGS = @PREVIEW_CFLAGS@
+PREVIEW_LIBS = @PREVIEW_LIBS@
+PROPERTIES_CFLAGS = @PROPERTIES_CFLAGS@
+PROPERTIES_LIBS = @PROPERTIES_LIBS@
 PYGOBJECT_CFLAGS = @PYGOBJECT_CFLAGS@
 PYGOBJECT_LIBS = @PYGOBJECT_LIBS@
 PYLINT = @PYLINT@
@@ -295,6 +333,10 @@
 SMCLIENT_CFLAGS = @SMCLIENT_CFLAGS@
 SMCLIENT_LIBS = @SMCLIENT_LIBS@
 STRIP = @STRIP@
+THUMBNAILER_CFLAGS = @THUMBNAILER_CFLAGS@
+THUMBNAILER_LIBS = @THUMBNAILER_LIBS@
+TIME_HELPER_CFLAGS = @TIME_HELPER_CFLAGS@
+TIME_HELPER_LIBS = @TIME_HELPER_LIBS@
 TOTEM_API_VERSION = @TOTEM_API_VERSION@
 TOTEM_PLPARSER_REQS = @TOTEM_PLPARSER_REQS@
 TOTEM_VERSION_MAJOR = @TOTEM_VERSION_MAJOR@
@@ -306,9 +348,6 @@
 WARN_CFLAGS = @WARN_CFLAGS@
 WARN_CXXFLAGS = @WARN_CXXFLAGS@
 XGETTEXT = @XGETTEXT@
-XMKMF = @XMKMF@
-XTEST_LIBS = @XTEST_LIBS@
-X_LIBS = @X_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -374,8 +413,7 @@
 DISTCLEANFILES = $(plugin_DATA)
 EXTRA_DIST = $(plugin_in_files) $(ui_DATA) $(conf_DATA)
 plugin_cflags = \
-	$(DEPENDENCY_CFLAGS)	\
-	$(PEAS_CFLAGS)		\
+	$(PLAYER_CFLAGS)	\
 	$(WARN_CFLAGS)
 
 plugin_ldflags = \
@@ -394,16 +432,22 @@
 ui_DATA = grilo.ui
 confdir = $(plugindir)
 conf_DATA = totem-grilo.conf
-libgrilo_la_SOURCES = totem-grilo.c
+libgrilo_la_SOURCES = \
+	totem-grilo.c				\
+	gd-tagged-entry.h			\
+	gd-tagged-entry.c			\
+	totem-search-entry.c			\
+	totem-search-entry.h
+
 libgrilo_la_LDFLAGS = $(plugin_ldflags)
 libgrilo_la_LIBADD = \
         $(plugin_libadd)	\
         $(LIBGRILO_LIBS)
 
 libgrilo_la_CFLAGS = \
-        $(plugin_cflags)	\
-        $(LIBGRILO_CFLAGS)	\
-		  -I $(top_srcdir)/src/backend
+        $(plugin_cflags)		\
+        $(LIBGRILO_CFLAGS)		\
+	-I $(top_srcdir)/src/gst/
 
 all: all-am
 
@@ -442,7 +486,6 @@
 $(am__aclocal_m4_deps):
 install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
 	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
@@ -450,6 +493,8 @@
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
 	}
@@ -465,12 +510,14 @@
 
 clean-pluginLTLIBRARIES:
 	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
-	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(plugin_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
 libgrilo.la: $(libgrilo_la_OBJECTS) $(libgrilo_la_DEPENDENCIES) $(EXTRA_libgrilo_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libgrilo_la_LINK) -rpath $(plugindir) $(libgrilo_la_OBJECTS) $(libgrilo_la_LIBADD) $(LIBS)
 
@@ -480,28 +527,27 @@
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgrilo_la-gd-tagged-entry.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgrilo_la-totem-grilo.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgrilo_la-totem-search-entry.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
@@ -513,6 +559,20 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgrilo_la_CFLAGS) $(CFLAGS) -c -o libgrilo_la-totem-grilo.lo `test -f 'totem-grilo.c' || echo '$(srcdir)/'`totem-grilo.c
 
+libgrilo_la-gd-tagged-entry.lo: gd-tagged-entry.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgrilo_la_CFLAGS) $(CFLAGS) -MT libgrilo_la-gd-tagged-entry.lo -MD -MP -MF $(DEPDIR)/libgrilo_la-gd-tagged-entry.Tpo -c -o libgrilo_la-gd-tagged-entry.lo `test -f 'gd-tagged-entry.c' || echo '$(srcdir)/'`gd-tagged-entry.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgrilo_la-gd-tagged-entry.Tpo $(DEPDIR)/libgrilo_la-gd-tagged-entry.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gd-tagged-entry.c' object='libgrilo_la-gd-tagged-entry.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgrilo_la_CFLAGS) $(CFLAGS) -c -o libgrilo_la-gd-tagged-entry.lo `test -f 'gd-tagged-entry.c' || echo '$(srcdir)/'`gd-tagged-entry.c
+
+libgrilo_la-totem-search-entry.lo: totem-search-entry.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgrilo_la_CFLAGS) $(CFLAGS) -MT libgrilo_la-totem-search-entry.lo -MD -MP -MF $(DEPDIR)/libgrilo_la-totem-search-entry.Tpo -c -o libgrilo_la-totem-search-entry.lo `test -f 'totem-search-entry.c' || echo '$(srcdir)/'`totem-search-entry.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgrilo_la-totem-search-entry.Tpo $(DEPDIR)/libgrilo_la-totem-search-entry.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='totem-search-entry.c' object='libgrilo_la-totem-search-entry.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgrilo_la_CFLAGS) $(CFLAGS) -c -o libgrilo_la-totem-search-entry.lo `test -f 'totem-search-entry.c' || echo '$(srcdir)/'`totem-search-entry.c
+
 mostlyclean-libtool:
 	-rm -f *.lo
 
@@ -520,8 +580,11 @@
 	-rm -rf .libs _libs
 install-confDATA: $(conf_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(confdir)" || $(MKDIR_P) "$(DESTDIR)$(confdir)"
 	@list='$(conf_DATA)'; test -n "$(confdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(confdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(confdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -538,8 +601,11 @@
 	dir='$(DESTDIR)$(confdir)'; $(am__uninstall_files_from_dir)
 install-pluginDATA: $(plugin_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
 	@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -556,8 +622,11 @@
 	dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
 install-uiDATA: $(ui_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)"
 	@list='$(ui_DATA)'; test -n "$(uidir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -622,6 +691,20 @@
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
 
+cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
+	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
@@ -770,16 +853,16 @@
 .MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pluginLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-confDATA install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-pluginDATA install-pluginLTLIBRARIES install-ps \
-	install-ps-am install-strip install-uiDATA installcheck \
-	installcheck-am installdirs maintainer-clean \
+	clean-libtool clean-pluginLTLIBRARIES cscopelist ctags \
+	distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-confDATA \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-pluginDATA install-pluginLTLIBRARIES \
+	install-ps install-ps-am install-strip install-uiDATA \
+	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am uninstall-confDATA \
diff -Nru totem-3.4.3/src/plugins/grilo/gd-tagged-entry.c totem-3.6.2/src/plugins/grilo/gd-tagged-entry.c
--- totem-3.4.3/src/plugins/grilo/gd-tagged-entry.c	1970-01-01 00:00:00.000000000 +0000
+++ totem-3.6.2/src/plugins/grilo/gd-tagged-entry.c	2012-08-29 23:07:45.000000000 +0000
@@ -0,0 +1,1004 @@
+/*
+ * Copyright (c) 2011 Red Hat, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public 
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License 
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Author: Cosimo Cecchi 
+ *
+ */
+
+#include "gd-tagged-entry.h"
+
+#include 
+
+G_DEFINE_TYPE (GdTaggedEntry, gd_tagged_entry, GTK_TYPE_SEARCH_ENTRY)
+
+#define BUTTON_INTERNAL_SPACING 6
+
+typedef struct {
+  GdkWindow *window;
+  PangoLayout *layout;
+
+  gchar *id;
+  gchar *label;
+
+  GdkPixbuf *close_pixbuf;
+  GtkStateFlags last_button_state;
+} GdTaggedEntryTag;
+
+struct _GdTaggedEntryPrivate {
+  GList *tags;
+
+  GdTaggedEntryTag *in_child;
+  gboolean in_child_button;
+  gboolean in_child_active;
+  gboolean in_child_button_active;
+  gboolean button_visible;
+};
+
+enum {
+  SIGNAL_TAG_CLICKED,
+  SIGNAL_TAG_BUTTON_CLICKED,
+  LAST_SIGNAL
+};
+
+enum {
+  PROP_0,
+  PROP_BUTTON_VISIBLE
+};
+
+static guint signals[LAST_SIGNAL] = { 0, };
+
+static void gd_tagged_entry_get_text_area_size (GtkEntry *entry,
+                                                gint *x,
+                                                gint *y,
+                                                gint *width,
+                                                gint *height);
+static gint gd_tagged_entry_tag_get_width (GdTaggedEntryTag *tag,
+                                           GdTaggedEntry *entry);
+static GtkStyleContext * gd_tagged_entry_tag_get_context (GdTaggedEntry *entry);
+
+static void
+gd_tagged_entry_tag_get_margin (GdTaggedEntry *entry,
+                                GtkBorder *margin)
+{
+  GtkStyleContext *context;
+
+  context = gd_tagged_entry_tag_get_context (entry);
+  gtk_style_context_get_margin (context, 0, margin);
+  g_object_unref (context);
+}
+
+static void
+gd_tagged_entry_tag_ensure_close_pixbuf (GdTaggedEntryTag *tag,
+                                         GtkStyleContext *context)
+{
+  GtkIconInfo *info;
+  gint icon_size;
+
+  if (tag->close_pixbuf != NULL)
+    return;
+
+  gtk_icon_size_lookup (GTK_ICON_SIZE_MENU,
+                        &icon_size, NULL);
+
+  info = gtk_icon_theme_lookup_icon (gtk_icon_theme_get_default (),
+                                     "window-close-symbolic",
+                                     icon_size,
+                                     GTK_ICON_LOOKUP_GENERIC_FALLBACK);
+
+  tag->close_pixbuf = 
+    gtk_icon_info_load_symbolic_for_context (info, context,
+                                             NULL, NULL);
+
+  /* FIXME: we need a fallback icon in case the icon is not found */
+}
+
+static gint
+gd_tagged_entry_tag_panel_get_height (GdTaggedEntry *entry)
+{
+  GtkWidget *widget = GTK_WIDGET (entry);
+  gint height, req_height;
+  GtkRequisition requisition;
+  GtkAllocation allocation;
+  GtkBorder margin;
+
+  gtk_widget_get_allocation (widget, &allocation);
+  gtk_widget_get_preferred_size (widget, &requisition, NULL);
+  gd_tagged_entry_tag_get_margin (entry, &margin);
+
+  /* the tag panel height is the whole entry height, minus the tag margins */
+  req_height = requisition.height - gtk_widget_get_margin_top (widget) - gtk_widget_get_margin_bottom (widget);
+  height = MIN (req_height, allocation.height) - margin.top - margin.bottom;
+
+  return height;
+}
+
+static void
+gd_tagged_entry_tag_panel_get_position (GdTaggedEntry *self,
+                                        gint *x_out, 
+                                        gint *y_out)
+{
+  GtkWidget *widget = GTK_WIDGET (self);
+  gint text_x, text_y, text_width, text_height, req_height;
+  GtkAllocation allocation;
+  GtkRequisition requisition;
+  GtkBorder margin;
+
+  gtk_widget_get_allocation (widget, &allocation);
+  gtk_widget_get_preferred_size (widget, &requisition, NULL);
+  req_height = requisition.height - gtk_widget_get_margin_top (widget) - gtk_widget_get_margin_bottom (widget);
+
+  gd_tagged_entry_get_text_area_size (GTK_ENTRY (self), &text_x, &text_y, &text_width, &text_height);
+  gd_tagged_entry_tag_get_margin (self, &margin);
+
+  /* allocate the panel immediately after the text area */
+  if (x_out)
+    *x_out = allocation.x + text_x + text_width;
+  if (y_out)
+    *y_out = allocation.y + margin.top + (gint) floor ((allocation.height - req_height) / 2);
+}
+
+static gint
+gd_tagged_entry_tag_panel_get_width (GdTaggedEntry *self)
+{
+  GdTaggedEntryTag *tag;
+  gint width;
+  GList *l;
+
+  width = 0;
+
+  for (l = self->priv->tags; l != NULL; l = l->next)
+    {
+      tag = l->data;
+      width += gd_tagged_entry_tag_get_width (tag, self);
+    }
+
+  return width;
+}
+
+static void
+gd_tagged_entry_tag_ensure_layout (GdTaggedEntryTag *tag,
+                                   GdTaggedEntry *entry)
+{
+  if (tag->layout != NULL)
+    return;
+
+  tag->layout = pango_layout_new (gtk_widget_get_pango_context (GTK_WIDGET (entry)));
+  pango_layout_set_text (tag->layout, tag->label, -1);
+}
+
+static GtkStateFlags
+gd_tagged_entry_tag_get_state (GdTaggedEntryTag *tag,
+                               GdTaggedEntry *entry)
+{
+  GtkStateFlags state = GTK_STATE_FLAG_NORMAL;
+
+  if (entry->priv->in_child == tag)
+    state |= GTK_STATE_FLAG_PRELIGHT;
+
+  if (entry->priv->in_child_active)
+    state |= GTK_STATE_FLAG_ACTIVE;
+
+  return state;
+}
+
+static GtkStateFlags
+gd_tagged_entry_tag_get_button_state (GdTaggedEntryTag *tag,
+                                      GdTaggedEntry *entry)
+{
+  GtkStateFlags state = GTK_STATE_FLAG_NORMAL;
+
+  if (entry->priv->in_child == tag &&
+      entry->priv->in_child_button)
+    state |= GTK_STATE_FLAG_PRELIGHT;
+
+  if (entry->priv->in_child_button_active)
+    state |= GTK_STATE_FLAG_ACTIVE;
+
+  return state;
+}
+
+static GtkStyleContext *
+gd_tagged_entry_tag_get_context (GdTaggedEntry *entry)
+{
+  GtkWidget *widget = GTK_WIDGET (entry);
+  GtkWidgetPath *path;
+  gint pos;
+  GtkStyleContext *retval;
+
+  retval = gtk_style_context_new ();
+  path = gtk_widget_path_copy (gtk_widget_get_path (widget));
+
+  pos = gtk_widget_path_append_type (path, GD_TYPE_TAGGED_ENTRY);
+  gtk_widget_path_iter_add_class (path, pos, "documents-entry-tag");
+
+  gtk_style_context_set_path (retval, path);
+
+  gtk_widget_path_unref (path);
+
+  return retval;
+}
+
+static gint
+gd_tagged_entry_tag_get_width (GdTaggedEntryTag *tag,
+                               GdTaggedEntry *entry)
+{
+  GtkBorder button_padding, button_border, button_margin;
+  GtkStyleContext *context;
+  GtkStateFlags state;
+  gint layout_width;
+  gint button_width;
+
+  gd_tagged_entry_tag_ensure_layout (tag, entry);
+  pango_layout_get_pixel_size (tag->layout, &layout_width, NULL);
+
+  context = gd_tagged_entry_tag_get_context (entry);
+  state = gd_tagged_entry_tag_get_state (tag, entry);
+
+  gtk_style_context_get_padding (context, state, &button_padding);
+  gtk_style_context_get_border (context, state, &button_border);
+  gtk_style_context_get_margin (context, state, &button_margin);
+
+  gd_tagged_entry_tag_ensure_close_pixbuf (tag, context);
+
+  g_object_unref (context);
+
+  button_width = 0;
+  if (entry->priv->button_visible)
+    button_width += button_border.left + button_border.right +
+      button_margin.left + button_margin.right +
+      gdk_pixbuf_get_width (tag->close_pixbuf);
+
+  return layout_width + button_padding.left + button_padding.right +
+    button_width + BUTTON_INTERNAL_SPACING;
+}
+
+static void
+gd_tagged_entry_tag_get_size (GdTaggedEntryTag *tag,
+                              GdTaggedEntry *entry,
+                              gint *width_out,
+                              gint *height_out)
+{
+  gint width, panel_height;
+
+  width = gd_tagged_entry_tag_get_width (tag, entry);
+  panel_height = gd_tagged_entry_tag_panel_get_height (entry);
+
+  if (width_out)
+    *width_out = width;
+  if (height_out)
+    *height_out = panel_height;
+}
+
+static void
+gd_tagged_entry_tag_get_relative_allocations (GdTaggedEntryTag *tag,
+                                              GdTaggedEntry *entry,
+                                              GtkStyleContext *context,
+                                              GtkAllocation *background_allocation_out,
+                                              GtkAllocation *layout_allocation_out,
+                                              GtkAllocation *button_allocation_out)
+{
+  GtkAllocation background_allocation, layout_allocation, button_allocation;
+  gint width, height, x, y, pix_width, pix_height;
+  gint layout_width, layout_height;
+  GtkBorder padding, border;
+  GtkStateFlags state;
+
+  width = gdk_window_get_width (tag->window);
+  height = gdk_window_get_height (tag->window);
+
+  state = gd_tagged_entry_tag_get_state (tag, entry);
+  gtk_style_context_get_margin (context, state, &padding);
+
+  width -= padding.left + padding.right;
+  height -= padding.top + padding.bottom;
+  x = padding.left;
+  y = padding.top;
+
+  background_allocation.x = x;
+  background_allocation.y = y;
+  background_allocation.width = width;
+  background_allocation.height = height;
+
+  layout_allocation = button_allocation = background_allocation;
+
+  gtk_style_context_get_padding (context, state, &padding);
+  gtk_style_context_get_border (context, state, &border);  
+
+  gd_tagged_entry_tag_ensure_layout (tag, entry);
+  pango_layout_get_pixel_size (tag->layout, &layout_width, &layout_height);
+
+  layout_allocation.x += border.left + padding.left;
+  layout_allocation.y += (layout_allocation.height - layout_height) / 2;
+
+  if (entry->priv->button_visible)
+    {
+      pix_width = gdk_pixbuf_get_width (tag->close_pixbuf);
+      pix_height = gdk_pixbuf_get_height (tag->close_pixbuf);
+    }
+  else
+    {
+      pix_width = 0;
+      pix_height = 0;
+    }
+
+  button_allocation.x += width - pix_width - border.right - padding.right;
+  button_allocation.y += (height - pix_height) / 2;
+  button_allocation.width = pix_width;
+  button_allocation.height = pix_height;
+
+  if (background_allocation_out)
+    *background_allocation_out = background_allocation;
+  if (layout_allocation_out)
+    *layout_allocation_out = layout_allocation;
+  if (button_allocation_out)
+    *button_allocation_out = button_allocation;
+}
+
+static gboolean
+gd_tagged_entry_tag_event_is_button (GdTaggedEntryTag *tag,
+                                     GdTaggedEntry *entry,
+                                     gdouble event_x,
+                                     gdouble event_y)
+{
+  GtkAllocation button_allocation;
+  GtkStyleContext *context;
+
+  if (!entry->priv->button_visible)
+    return FALSE;
+
+  context = gd_tagged_entry_tag_get_context (entry);
+  gd_tagged_entry_tag_get_relative_allocations (tag, entry, context, NULL, NULL, &button_allocation);
+
+  g_object_unref (context);
+
+  /* see if the event falls into the button allocation */
+  if ((event_x >= button_allocation.x && 
+       event_x <= button_allocation.x + button_allocation.width) &&
+      (event_y >= button_allocation.y &&
+       event_y <= button_allocation.y + button_allocation.height))
+    return TRUE;
+
+  return FALSE;
+}
+
+static void
+gd_tagged_entry_tag_draw (GdTaggedEntryTag *tag,
+                          cairo_t *cr,
+                          GdTaggedEntry *entry)
+{
+  GtkStyleContext *context;
+  GtkStateFlags state;
+  GtkAllocation background_allocation, layout_allocation, button_allocation;
+
+  context = gd_tagged_entry_tag_get_context (entry);
+  gd_tagged_entry_tag_get_relative_allocations (tag, entry, context,
+                                                &background_allocation,
+                                                &layout_allocation,
+                                                &button_allocation);
+
+  cairo_save (cr);
+  gtk_cairo_transform_to_window (cr, GTK_WIDGET (entry), tag->window);
+
+  gtk_style_context_save (context);
+
+  state = gd_tagged_entry_tag_get_state (tag, entry);
+  gtk_style_context_set_state (context, state);
+  gtk_render_background (context, cr,
+                         background_allocation.x, background_allocation.y,
+                         background_allocation.width, background_allocation.height); 
+  gtk_render_frame (context, cr,
+                    background_allocation.x, background_allocation.y,
+                    background_allocation.width, background_allocation.height); 
+
+  gtk_render_layout (context, cr,
+                     layout_allocation.x, layout_allocation.y,
+                     tag->layout);
+
+  gtk_style_context_restore (context);
+
+  gtk_style_context_add_class (context, GTK_STYLE_CLASS_BUTTON);
+  state = gd_tagged_entry_tag_get_button_state (tag, entry);
+  gtk_style_context_set_state (context, state);
+
+  /* if the state changed since last time we draw the pixbuf,
+   * clear and redraw it.
+   */
+  if (state != tag->last_button_state)
+    {
+      g_clear_object (&tag->close_pixbuf);
+      gd_tagged_entry_tag_ensure_close_pixbuf (tag, context);
+
+      tag->last_button_state = state;
+    }
+
+  gtk_render_background (context, cr,
+                         button_allocation.x, button_allocation.y,
+                         button_allocation.width, button_allocation.height);
+  gtk_render_frame (context, cr,
+                         button_allocation.x, button_allocation.y,
+                         button_allocation.width, button_allocation.height);
+
+  if (!entry->priv->button_visible)
+    goto done;
+
+  gtk_render_icon (context, cr,
+                   tag->close_pixbuf,
+                   button_allocation.x, button_allocation.y);
+
+done:
+  cairo_restore (cr);
+
+  g_object_unref (context);
+}
+
+static void
+gd_tagged_entry_tag_unrealize (GdTaggedEntryTag *tag)
+{
+  if (tag->window == NULL)
+    return;
+
+  gdk_window_set_user_data (tag->window, NULL);
+  gdk_window_destroy (tag->window);
+  tag->window = NULL;
+}
+
+static void
+gd_tagged_entry_tag_realize (GdTaggedEntryTag *tag,
+                             GdTaggedEntry *entry)
+{
+  GtkWidget *widget = GTK_WIDGET (entry);
+  GdkWindowAttr attributes;
+  gint attributes_mask;
+  gint tag_width, tag_height;
+
+  if (tag->window != NULL)
+    return;
+
+  attributes.window_type = GDK_WINDOW_CHILD;
+  attributes.wclass = GDK_INPUT_ONLY;
+  attributes.event_mask = gtk_widget_get_events (widget);
+  attributes.event_mask |= GDK_BUTTON_PRESS_MASK
+    | GDK_BUTTON_RELEASE_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_ENTER_NOTIFY_MASK
+    | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK;
+
+  gd_tagged_entry_tag_get_size (tag, entry, &tag_width, &tag_height);
+  attributes.x = 0;
+  attributes.y = 0;
+  attributes.width = tag_width;
+  attributes.height = tag_height;
+
+  attributes_mask = GDK_WA_X | GDK_WA_Y;
+
+  tag->window = gdk_window_new (gtk_widget_get_window (widget),
+                                &attributes, attributes_mask);
+  gdk_window_set_user_data (tag->window, widget);
+}
+
+static GdTaggedEntryTag *
+gd_tagged_entry_tag_new (const gchar *id,
+                         const gchar *label)
+{
+  GdTaggedEntryTag *tag;
+
+  tag = g_slice_new0 (GdTaggedEntryTag);
+
+  tag->id = g_strdup (id);
+  tag->label = g_strdup (label);
+  tag->last_button_state = GTK_STATE_FLAG_NORMAL;
+
+  return tag;
+}
+
+static void
+gd_tagged_entry_tag_free (gpointer _tag)
+{
+  GdTaggedEntryTag *tag = _tag;
+
+  if (tag->window != NULL)
+    gd_tagged_entry_tag_unrealize (tag);
+
+  g_clear_object (&tag->layout);
+  g_clear_object (&tag->close_pixbuf);
+  g_free (tag->id);
+  g_free (tag->label);
+
+  g_slice_free (GdTaggedEntryTag, tag);
+}
+
+static gboolean
+gd_tagged_entry_draw (GtkWidget *widget,
+                      cairo_t *cr)
+{
+  GdTaggedEntry *self = GD_TAGGED_ENTRY (widget);
+  GdTaggedEntryTag *tag;
+  GList *l;
+
+  GTK_WIDGET_CLASS (gd_tagged_entry_parent_class)->draw (widget, cr);
+
+  for (l = self->priv->tags; l != NULL; l = l->next)
+    {
+      tag = l->data;
+      gd_tagged_entry_tag_draw (tag, cr, self);
+    }
+
+  return FALSE;
+}
+
+static void
+gd_tagged_entry_map (GtkWidget *widget)
+{
+  GdTaggedEntry *self = GD_TAGGED_ENTRY (widget);
+  GdTaggedEntryTag *tag;
+  GList *l;
+
+  if (gtk_widget_get_realized (widget) && !gtk_widget_get_mapped (widget))
+    {
+      GTK_WIDGET_CLASS (gd_tagged_entry_parent_class)->map (widget);
+
+      for (l = self->priv->tags; l != NULL; l = l->next)
+        {
+          tag = l->data;
+          gdk_window_show (tag->window);
+        }
+    }
+}
+
+static void
+gd_tagged_entry_unmap (GtkWidget *widget)
+{
+  GdTaggedEntry *self = GD_TAGGED_ENTRY (widget);
+  GdTaggedEntryTag *tag;
+  GList *l;
+
+  if (gtk_widget_get_mapped (widget))
+    {
+      for (l = self->priv->tags; l != NULL; l = l->next)
+        {
+          tag = l->data;
+          gdk_window_hide (tag->window);
+        }
+
+      GTK_WIDGET_CLASS (gd_tagged_entry_parent_class)->unmap (widget);
+    }
+}
+
+static void
+gd_tagged_entry_realize (GtkWidget *widget)
+{
+  GdTaggedEntry *self = GD_TAGGED_ENTRY (widget);
+  GdTaggedEntryTag *tag;
+  GList *l;
+
+  GTK_WIDGET_CLASS (gd_tagged_entry_parent_class)->realize (widget);
+
+  for (l = self->priv->tags; l != NULL; l = l->next)
+    {
+      tag = l->data;
+      gd_tagged_entry_tag_realize (tag, self);
+    }
+}
+
+static void
+gd_tagged_entry_unrealize (GtkWidget *widget)
+{
+  GdTaggedEntry *self = GD_TAGGED_ENTRY (widget);
+  GdTaggedEntryTag *tag;
+  GList *l;
+
+  GTK_WIDGET_CLASS (gd_tagged_entry_parent_class)->unrealize (widget);
+
+  for (l = self->priv->tags; l != NULL; l = l->next)
+    {
+      tag = l->data;
+      gd_tagged_entry_tag_unrealize (tag);
+    }
+}
+
+static void
+gd_tagged_entry_get_text_area_size (GtkEntry *entry,
+                                    gint *x,
+                                    gint *y,
+                                    gint *width,
+                                    gint *height)
+{
+  GdTaggedEntry *self = GD_TAGGED_ENTRY (entry);
+  gint tag_panel_width;
+
+  GTK_ENTRY_CLASS (gd_tagged_entry_parent_class)->get_text_area_size (entry, x, y, width, height);
+
+  tag_panel_width = gd_tagged_entry_tag_panel_get_width (self);
+
+  if (width)
+    *width -= tag_panel_width;
+}
+
+static void
+gd_tagged_entry_size_allocate (GtkWidget *widget,
+                               GtkAllocation *allocation)
+{
+  GdTaggedEntry *self = GD_TAGGED_ENTRY (widget);
+  gint x, y, width, height;
+  GdTaggedEntryTag *tag;
+  GList *l;
+
+  gtk_widget_set_allocation (widget, allocation);
+  GTK_WIDGET_CLASS (gd_tagged_entry_parent_class)->size_allocate (widget, allocation);
+
+  if (gtk_widget_get_realized (widget))
+    {
+      gd_tagged_entry_tag_panel_get_position (self, &x, &y);
+
+      for (l = self->priv->tags; l != NULL; l = l->next)
+        {
+          tag = l->data;
+          gd_tagged_entry_tag_get_size (tag, self, &width, &height);
+          gdk_window_move_resize (tag->window, x, y, width, height);
+
+          x += width;
+        }
+
+      gtk_widget_queue_draw (widget);
+    }
+}
+
+static void
+gd_tagged_entry_get_preferred_width (GtkWidget *widget,
+                                     gint *minimum,
+                                     gint *natural)
+{
+  GdTaggedEntry *self = GD_TAGGED_ENTRY (widget);
+  gint tag_panel_width;
+
+  GTK_WIDGET_CLASS (gd_tagged_entry_parent_class)->get_preferred_width (widget, minimum, natural);
+
+  tag_panel_width = gd_tagged_entry_tag_panel_get_width (self);
+
+  if (minimum)
+    *minimum += tag_panel_width;
+  if (natural)
+    *natural += tag_panel_width;
+}
+
+static void
+gd_tagged_entry_finalize (GObject *obj)
+{
+  GdTaggedEntry *self = GD_TAGGED_ENTRY (obj);
+
+  if (self->priv->tags != NULL)
+    {
+      g_list_free_full (self->priv->tags, gd_tagged_entry_tag_free);
+      self->priv->tags = NULL;
+    }
+
+  G_OBJECT_CLASS (gd_tagged_entry_parent_class)->finalize (obj);
+}
+
+static GdTaggedEntryTag *
+gd_tagged_entry_find_tag_by_id (GdTaggedEntry *self,
+                                const gchar *id)
+{
+  GdTaggedEntryTag *tag = NULL, *elem;
+  GList *l;
+
+  for (l = self->priv->tags; l != NULL; l = l->next)
+    {
+      elem = l->data;
+      if (g_strcmp0 (elem->id, id) == 0)
+        {
+          tag = elem;
+          break;
+        }
+    }
+
+  return tag;
+}
+
+static GdTaggedEntryTag *
+gd_tagged_entry_find_tag_by_window (GdTaggedEntry *self,
+                                    GdkWindow *window)
+{
+  GdTaggedEntryTag *tag = NULL, *elem;
+  GList *l;
+
+  for (l = self->priv->tags; l != NULL; l = l->next)
+    {
+      elem = l->data;
+      if (elem->window == window)
+        {
+          tag = elem;
+          break;
+        }
+    }
+
+  return tag;
+}
+
+static gint
+gd_tagged_entry_enter_notify (GtkWidget        *widget,
+                              GdkEventCrossing *event)
+{
+  GdTaggedEntry *self = GD_TAGGED_ENTRY (widget);
+  GdTaggedEntryTag *tag;
+
+  tag = gd_tagged_entry_find_tag_by_window (self, event->window);
+
+  if (tag != NULL)
+    {
+      self->priv->in_child = tag;
+      gtk_widget_queue_draw (widget);
+    }
+
+  return GTK_WIDGET_CLASS (gd_tagged_entry_parent_class)->enter_notify_event (widget, event);
+}
+
+static gint
+gd_tagged_entry_leave_notify (GtkWidget        *widget,
+                              GdkEventCrossing *event)
+{
+  GdTaggedEntry *self = GD_TAGGED_ENTRY (widget);
+
+  if (self->priv->in_child != NULL)
+    {
+      self->priv->in_child = NULL;
+      gtk_widget_queue_draw (widget);
+    }
+
+  return GTK_WIDGET_CLASS (gd_tagged_entry_parent_class)->leave_notify_event (widget, event);
+}
+
+static gint
+gd_tagged_entry_motion_notify (GtkWidget      *widget,
+                               GdkEventMotion *event)
+{
+  GdTaggedEntry *self = GD_TAGGED_ENTRY (widget);
+  GdTaggedEntryTag *tag;
+
+  tag = gd_tagged_entry_find_tag_by_window (self, event->window);
+
+  if (tag != NULL)
+    {
+      gdk_event_request_motions (event);
+
+      self->priv->in_child = tag;
+      self->priv->in_child_button = gd_tagged_entry_tag_event_is_button (tag, self, event->x, event->y);
+      gtk_widget_queue_draw (widget);
+
+      return FALSE;
+    }
+
+  return GTK_WIDGET_CLASS (gd_tagged_entry_parent_class)->motion_notify_event (widget, event);
+}
+
+static gboolean
+gd_tagged_entry_button_release_event (GtkWidget *widget,
+                                      GdkEventButton *event)
+{
+  GdTaggedEntry *self = GD_TAGGED_ENTRY (widget);
+  GdTaggedEntryTag *tag;
+  GQuark id_quark;
+
+  tag = gd_tagged_entry_find_tag_by_window (self, event->window);
+
+  if (tag != NULL)
+    {
+      id_quark = g_quark_from_string (tag->id);
+      self->priv->in_child_active = FALSE;
+
+      if (gd_tagged_entry_tag_event_is_button (tag, self, event->x, event->y))
+        {
+          self->priv->in_child_button_active = FALSE;
+          g_signal_emit (self, signals[SIGNAL_TAG_BUTTON_CLICKED], id_quark, tag->id);
+        }
+      else
+        {
+          g_signal_emit (self, signals[SIGNAL_TAG_CLICKED], id_quark, tag->id);
+        }
+
+      gtk_widget_queue_draw (widget);
+
+      return TRUE;
+    }
+
+  return GTK_WIDGET_CLASS (gd_tagged_entry_parent_class)->button_release_event (widget, event);
+}
+
+static gboolean
+gd_tagged_entry_button_press_event (GtkWidget *widget,
+                                    GdkEventButton *event)
+{
+  GdTaggedEntry *self = GD_TAGGED_ENTRY (widget);
+  GdTaggedEntryTag *tag;
+
+  tag = gd_tagged_entry_find_tag_by_window (self, event->window);
+
+  if (tag != NULL)
+    {
+      if (gd_tagged_entry_tag_event_is_button (tag, self, event->x, event->y))
+        self->priv->in_child_button_active = TRUE;
+      else
+        self->priv->in_child_active = TRUE;
+
+      gtk_widget_queue_draw (widget);
+
+      return TRUE;
+    }
+
+  return GTK_WIDGET_CLASS (gd_tagged_entry_parent_class)->button_press_event (widget, event);
+}
+
+static void
+gd_tagged_entry_init (GdTaggedEntry *self)
+{
+  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GD_TYPE_TAGGED_ENTRY, GdTaggedEntryPrivate);
+  self->priv->button_visible = TRUE;
+}
+
+static void
+gd_tagged_entry_set_property (GObject      *object,
+                              guint         property_id,
+                              const GValue *value,
+                              GParamSpec   *pspec)
+{
+  switch (property_id)
+    {
+      case PROP_BUTTON_VISIBLE:
+        gd_tagged_entry_set_button_visible (GD_TAGGED_ENTRY (object),
+                                            g_value_get_boolean (value));
+        break;
+      default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+    }
+}
+
+static void
+gd_tagged_entry_class_init (GdTaggedEntryClass *klass)
+{
+  GtkWidgetClass *wclass = GTK_WIDGET_CLASS (klass);
+  GtkEntryClass *eclass = GTK_ENTRY_CLASS (klass);
+  GObjectClass *oclass = G_OBJECT_CLASS (klass);
+
+  oclass->finalize = gd_tagged_entry_finalize;
+  oclass->set_property = gd_tagged_entry_set_property;
+
+  wclass->realize = gd_tagged_entry_realize;
+  wclass->unrealize = gd_tagged_entry_unrealize;
+  wclass->map = gd_tagged_entry_map;
+  wclass->unmap = gd_tagged_entry_unmap;
+  wclass->size_allocate = gd_tagged_entry_size_allocate;
+  wclass->get_preferred_width = gd_tagged_entry_get_preferred_width;
+  wclass->draw = gd_tagged_entry_draw;
+  wclass->enter_notify_event = gd_tagged_entry_enter_notify;
+  wclass->leave_notify_event = gd_tagged_entry_leave_notify;
+  wclass->motion_notify_event = gd_tagged_entry_motion_notify;
+  wclass->button_press_event = gd_tagged_entry_button_press_event;
+  wclass->button_release_event = gd_tagged_entry_button_release_event;
+
+  eclass->get_text_area_size = gd_tagged_entry_get_text_area_size;
+
+  signals[SIGNAL_TAG_CLICKED] =
+    g_signal_new ("tag-clicked",
+                  GD_TYPE_TAGGED_ENTRY,
+                  G_SIGNAL_RUN_FIRST | G_SIGNAL_DETAILED,
+                  0, NULL, NULL, NULL,
+                  G_TYPE_NONE,
+                  1, G_TYPE_STRING);
+  signals[SIGNAL_TAG_BUTTON_CLICKED] =
+    g_signal_new ("tag-button-clicked",
+                  GD_TYPE_TAGGED_ENTRY,
+                  G_SIGNAL_RUN_FIRST | G_SIGNAL_DETAILED,
+                  0, NULL, NULL, NULL,
+                  G_TYPE_NONE,
+                  1, G_TYPE_STRING);
+
+  g_object_class_install_property (oclass, PROP_BUTTON_VISIBLE,
+                                   g_param_spec_boolean ("button-visible", "Button visibility",
+                                                         "Whether the close button should be shown in tags.", TRUE,
+                                                         G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS));
+
+  g_type_class_add_private (klass, sizeof (GdTaggedEntryPrivate));
+}
+
+GdTaggedEntry *
+gd_tagged_entry_new (void)
+{
+  return g_object_new (GD_TYPE_TAGGED_ENTRY, NULL);
+}
+
+gboolean
+gd_tagged_entry_add_tag (GdTaggedEntry *self,
+                         const gchar *id,
+                         const gchar *name)
+{
+  GdTaggedEntryTag *tag;
+
+  if (gd_tagged_entry_find_tag_by_id (self, id) != NULL)
+    return FALSE;
+
+  tag = gd_tagged_entry_tag_new (id, name);
+  self->priv->tags = g_list_append (self->priv->tags, tag);
+
+  if (gtk_widget_get_mapped (GTK_WIDGET (self)))
+    {
+      gd_tagged_entry_tag_realize (tag, self);
+      gdk_window_show_unraised (tag->window);
+    }
+
+  gtk_widget_queue_resize (GTK_WIDGET (self));
+
+  return TRUE;
+}
+
+gboolean
+gd_tagged_entry_remove_tag (GdTaggedEntry *self,
+                            const gchar *id)
+{
+  GdTaggedEntryTag *tag;
+  gboolean res = FALSE;
+
+  tag = gd_tagged_entry_find_tag_by_id (self, id);
+
+  if (tag != NULL)
+    {
+      res = TRUE;
+      self->priv->tags = g_list_remove (self->priv->tags, tag);
+      gd_tagged_entry_tag_free (tag);
+
+      gtk_widget_queue_resize (GTK_WIDGET (self));
+    }
+
+  return res;
+}
+
+gboolean
+gd_tagged_entry_set_tag_label (GdTaggedEntry *self,
+                               const gchar *tag_id,
+                               const gchar *label)
+{
+  GdTaggedEntryTag *tag;
+  gboolean res = FALSE;
+
+  tag = gd_tagged_entry_find_tag_by_id (self, tag_id);
+
+  if (tag != NULL)
+    {
+      res = TRUE;
+
+      if (g_strcmp0 (tag->label, label) != 0)
+        {
+          g_free (tag->label);
+          tag->label = g_strdup (label);
+          g_clear_object (&tag->layout);
+
+          gtk_widget_queue_resize (GTK_WIDGET (self));
+        }
+    }
+
+  return res;  
+}
+
+void
+gd_tagged_entry_set_button_visible (GdTaggedEntry *self,
+                                    gboolean       visible)
+{
+  g_return_if_fail (GD_IS_TAGGED_ENTRY (self));
+
+  if (self->priv->button_visible == visible)
+    return;
+
+  self->priv->button_visible = visible;
+  gtk_widget_queue_resize (GTK_WIDGET (self));
+}
diff -Nru totem-3.4.3/src/plugins/grilo/gd-tagged-entry.h totem-3.6.2/src/plugins/grilo/gd-tagged-entry.h
--- totem-3.4.3/src/plugins/grilo/gd-tagged-entry.h	1970-01-01 00:00:00.000000000 +0000
+++ totem-3.6.2/src/plugins/grilo/gd-tagged-entry.h	2012-08-29 23:07:45.000000000 +0000
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2011 Red Hat, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public 
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License 
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Author: Cosimo Cecchi 
+ *
+ */
+
+#ifndef __GD_TAGGED_ENTRY_H__
+#define __GD_TAGGED_ENTRY_H__
+
+#include 
+
+#include 
+
+G_BEGIN_DECLS
+
+#define GD_TYPE_TAGGED_ENTRY gd_tagged_entry_get_type()
+
+#define GD_TAGGED_ENTRY(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+   GD_TYPE_TAGGED_ENTRY, GdTaggedEntry))
+
+#define GD_TAGGED_ENTRY_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST ((klass), \
+   GD_TYPE_TAGGED_ENTRY, GdTaggedEntryClass))
+
+#define GD_IS_TAGGED_ENTRY(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+   GD_TYPE_TAGGED_ENTRY))
+
+#define GD_IS_TAGGED_ENTRY_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE ((klass), \
+   GD_TYPE_TAGGED_ENTRY))
+
+#define GD_TAGGED_ENTRY_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), \
+   GD_TYPE_TAGGED_ENTRY, GdTaggedEntryClass))
+
+typedef struct _GdTaggedEntry GdTaggedEntry;
+typedef struct _GdTaggedEntryClass GdTaggedEntryClass;
+typedef struct _GdTaggedEntryPrivate GdTaggedEntryPrivate;
+
+struct _GdTaggedEntry
+{
+  GtkSearchEntry parent;
+
+  GdTaggedEntryPrivate *priv;
+};
+
+struct _GdTaggedEntryClass
+{
+  GtkSearchEntryClass parent_class;
+};
+
+GType gd_tagged_entry_get_type (void) G_GNUC_CONST;
+
+GdTaggedEntry *gd_tagged_entry_new (void);
+
+void gd_tagged_entry_set_button_visible (GdTaggedEntry *self,
+					 gboolean       visible);
+
+gboolean gd_tagged_entry_add_tag (GdTaggedEntry *entry,
+                                  const gchar *id,
+                                  const gchar *label);
+
+gboolean gd_tagged_entry_remove_tag (GdTaggedEntry *self,
+                                     const gchar *id);
+
+gboolean gd_tagged_entry_set_tag_label (GdTaggedEntry *self,
+                                        const gchar *tag_id,
+                                        const gchar *label);
+
+G_END_DECLS
+
+#endif /* __GD_TAGGED_ENTRY_H__ */
diff -Nru totem-3.4.3/src/plugins/grilo/grilo.plugin.in totem-3.6.2/src/plugins/grilo/grilo.plugin.in
--- totem-3.4.3/src/plugins/grilo/grilo.plugin.in	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/plugins/grilo/grilo.plugin.in	2012-08-29 23:07:45.000000000 +0000
@@ -3,7 +3,7 @@
 Builtin=true
 IAge=1
 _Name=Grilo Browser
-_Description=A plugin to let you browse media content from various sources.
+_Description=A plugin to let you browse media content from various sources
 Authors=Iago Toral Quiroga , Juan A. Suarez Romero 
 Copyright=Copyright © 2011 Igalia S.L.
 Website=http://live.gnome.org/Grilo/
diff -Nru totem-3.4.3/src/plugins/grilo/grilo.ui totem-3.6.2/src/plugins/grilo/grilo.ui
--- totem-3.4.3/src/plugins/grilo/grilo.ui	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/plugins/grilo/grilo.ui	2012-08-29 23:07:45.000000000 +0000
@@ -100,16 +100,9 @@
           
         
         
-          
+          
             True
-            False
-            gw_search_store_sources
-            
-              
-              
-                1
-              
-            
+            True
           
           
             True
@@ -125,21 +118,6 @@
       
     
     
-      
-        True
-        True
-        ●
-        True
-        etched-out
-        False
-      
-      
-        False
-        True
-        1
-      
-    
-    
       
         True
         True
diff -Nru totem-3.4.3/src/plugins/grilo/totem-grilo.c totem-3.6.2/src/plugins/grilo/totem-grilo.c
--- totem-3.4.3/src/plugins/grilo/totem-grilo.c	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/plugins/grilo/totem-grilo.c	2012-10-25 08:53:23.000000000 +0000
@@ -44,7 +44,9 @@
 #include 
 #include 
 
-#include 
+#include 
+
+#include "totem-search-entry.h"
 
 #define TOTEM_TYPE_GRILO_PLUGIN                                         \
 	(totem_grilo_plugin_get_type ())
@@ -68,8 +70,9 @@
 	""
 
 #define BROWSE_FLAGS          (GRL_RESOLVE_FAST_ONLY | GRL_RESOLVE_IDLE_RELAY)
+#define RESOLVE_FLAGS 	      (GRL_RESOLVE_FULL | GRL_RESOLVE_IDLE_RELAY)
 #define PAGE_SIZE             50
-#define THUMB_SEARCH_SIZE     128
+#define THUMB_SEARCH_SIZE     256
 #define THUMB_BROWSE_SIZE     32
 #define SCROLL_GET_MORE_LIMIT 0.8
 
@@ -98,7 +101,7 @@
 	GHashTable *cache_thumbnails;
 
 	/* Search related information */
-	GrlMediaSource *search_source;
+	GrlSource *search_source;
 	guint search_id;
 	gint search_page;
 	gint search_remaining;
@@ -111,7 +114,7 @@
 	/* Search widgets */
 	GtkWidget *search_entry;
 	GtkTreeModel *search_results_model;
-	GtkTreeModel *search_sources_model;
+	GHashTable *search_sources_ht;
 	GtkWidget *search_sources_list;
 	GtkWidget *search_results_view;
 
@@ -155,7 +158,7 @@
 };
 
 static void play (TotemGriloPlugin *self,
-                  GrlMediaSource *source,
+                  GrlSource *source,
                   GrlMedia *media,
                   gboolean resolve_url);
 
@@ -393,18 +396,18 @@
 {
 	GList *sources, *source;
 	GtkTreeIter iter;
-	GrlPluginRegistry *registry;
+	GrlRegistry *registry;
 	const gchar *name;
 	GdkPixbuf *icon;
 
-	registry = grl_plugin_registry_get_default ();
-	sources = grl_plugin_registry_get_sources_by_operations (registry,
-	                                                         GRL_OP_BROWSE,
-	                                                         FALSE);
+	registry = grl_registry_get_default ();
+	sources = grl_registry_get_sources_by_operations (registry,
+	                                                  GRL_OP_BROWSE,
+	                                                  FALSE);
 
 	for (source = sources; source ; source = g_list_next (source)) {
 		icon = load_icon (self, ICON_BOX, THUMB_BROWSE_SIZE);
-		name = grl_metadata_source_get_name (GRL_METADATA_SOURCE (source->data));
+		name = grl_source_get_name (source->data);
 		gtk_tree_store_append (GTK_TREE_STORE (self->priv->browser_model), &iter, NULL);
 		gtk_tree_store_set (GTK_TREE_STORE (self->priv->browser_model),
 		                    &iter,
@@ -422,7 +425,7 @@
 }
 
 static void
-browse_cb (GrlMediaSource *source,
+browse_cb (GrlSource *source,
            guint browse_id,
            GrlMedia *media,
            guint remaining,
@@ -508,28 +511,37 @@
 static void
 browse (TotemGriloPlugin *self,
         GtkTreePath *path,
-        GrlMediaSource *source,
+        GrlSource *source,
         GrlMedia *container,
         gint page)
 {
 	if (source != NULL) {
-		BrowseUserData *bud = g_slice_new (BrowseUserData);
+		BrowseUserData *bud;
+		GrlOperationOptions *default_options;
+
+		default_options = grl_operation_options_new (NULL);
+		grl_operation_options_set_flags (default_options, BROWSE_FLAGS);
+		grl_operation_options_set_skip (default_options, (page - 1) * PAGE_SIZE);
+		grl_operation_options_set_count (default_options, PAGE_SIZE);
+
+		bud = g_slice_new (BrowseUserData);
 		bud->totem_grilo = g_object_ref (self);
 		bud->ref_parent = gtk_tree_row_reference_new (self->priv->browser_model, path);
-		grl_media_source_browse (source,
-		                         container,
-		                         browse_keys (),
-		                         (page - 1) * PAGE_SIZE, PAGE_SIZE,
-		                         BROWSE_FLAGS,
-		                         browse_cb,
-		                         bud);
+		grl_source_browse (source,
+		                   container,
+		                   browse_keys (),
+		                   default_options,
+		                   browse_cb,
+		                   bud);
+
+		g_object_unref (default_options);
 	} else {
 		show_sources (self);
 	}
 }
 
 static void
-resolve_url_cb (GrlMediaSource *source,
+resolve_url_cb (GrlSource *source,
                 guint op_id,
                 GrlMedia *media,
                 gpointer user_data,
@@ -545,7 +557,7 @@
 
 static void
 play (TotemGriloPlugin *self,
-      GrlMediaSource *source,
+      GrlSource *source,
       GrlMedia *media,
       gboolean resolve_url)
 {
@@ -554,29 +566,42 @@
 	url = grl_media_get_url (media);
 	if (url != NULL) {
 		totem_add_to_playlist_and_play (self->priv->totem, url,
-		                                grl_media_get_title (media),
-		                                TRUE);
+		                                grl_media_get_title (media));
 		return;
 	}
 
 	/* If url is a slow key, then we need to full resolve it */
-	if (resolve_url) {
+	if (resolve_url &&
+	    grl_source_supported_operations (source) & GRL_OP_RESOLVE) {
 		const GList *slow_keys;
-		GList *url_keys;
-		slow_keys = grl_metadata_source_slow_keys (GRL_METADATA_SOURCE (source));
-		if (g_list_find ((GList *) slow_keys, GRL_METADATA_KEY_URL) != NULL) {
+
+		slow_keys = grl_source_slow_keys (source);
+
+		if (g_list_find ((GList *) slow_keys, GINT_TO_POINTER (GRL_METADATA_KEY_URL)) != NULL) {
+			GList *url_keys;
+			GrlOperationOptions *resolve_options;
+
+			resolve_options = grl_operation_options_new (NULL);
+			grl_operation_options_set_flags (resolve_options, RESOLVE_FLAGS);
+
 			url_keys = grl_metadata_key_list_new (GRL_METADATA_KEY_URL, NULL);
-			grl_media_source_metadata (source, media, url_keys, 0, resolve_url_cb, self);
+			grl_source_resolve (source, media, url_keys, resolve_options, resolve_url_cb, self);
+
+			g_object_unref (resolve_options);
 			g_list_free (url_keys);
 			return;
 		}
+	} else if (resolve_url) {
+		/* If source does not support resolve() operation, then use the current media */
+		resolve_url_cb (source, 0, media, NULL, NULL);
+		return;
 	}
 
 	g_warning ("Current element has no URL to play");
 }
 
 static void
-search_cb (GrlMediaSource *source,
+search_cb (GrlSource *source,
            guint search_id,
            GrlMedia *media,
            guint remaining,
@@ -632,27 +657,64 @@
 	}
 }
 
+static GrlOperationOptions *
+get_search_options (TotemGriloPlugin *self)
+{
+	GrlOperationOptions *default_options;
+	GrlOperationOptions *supported_options;
+
+	default_options = grl_operation_options_new (NULL);
+	grl_operation_options_set_flags (default_options, BROWSE_FLAGS);
+	grl_operation_options_set_skip (default_options, self->priv->search_page * PAGE_SIZE);
+	grl_operation_options_set_count (default_options, PAGE_SIZE);
+	grl_operation_options_set_type_filter (default_options, GRL_TYPE_FILTER_VIDEO);
+
+	/* And now remove all the unsupported filters and options */
+	grl_operation_options_obey_caps (default_options,
+					 grl_source_get_caps (GRL_SOURCE (self->priv->search_source), GRL_OP_SEARCH),
+					 &supported_options,
+					 NULL);
+	g_object_unref (default_options);
+
+	return supported_options;
+}
+
 static void
 search_more (TotemGriloPlugin *self)
 {
+	GrlOperationOptions *search_options;
+
+	search_options = get_search_options (self);
+
 	gtk_widget_set_sensitive (self->priv->search_entry, FALSE);
 	self->priv->search_page++;
 	self->priv->search_remaining = PAGE_SIZE;
-	self->priv->search_id = grl_media_source_search (self->priv->search_source,
-	                                                 self->priv->search_text,
-	                                                 search_keys (),
-	                                                 (self->priv->search_page - 1) * PAGE_SIZE,
-	                                                 PAGE_SIZE,
-	                                                 BROWSE_FLAGS,
-	                                                 search_cb,
-	                                                 self);
+	if (self->priv->search_source != NULL) {
+		self->priv->search_id =
+			grl_source_search (self->priv->search_source,
+			                   self->priv->search_text,
+			                   search_keys (),
+			                   search_options,
+			                   search_cb,
+			                   self);
+	} else {
+		self->priv->search_id =
+			grl_multiple_search (NULL,
+			                     self->priv->search_text,
+			                     search_keys (),
+			                     search_options,
+			                     search_cb,
+			                     self);
+	}
+	g_object_unref (search_options);
+
 	if (self->priv->search_id == 0) {
 		search_cb (self->priv->search_source, 0, NULL, 0, self, NULL);
 	}
 }
 
 static void
-search (TotemGriloPlugin *self, GrlMediaSource *source, const gchar *text)
+search (TotemGriloPlugin *self, GrlSource *source, const gchar *text)
 {
 	gtk_list_store_clear (GTK_LIST_STORE (self->priv->search_results_model));
 	g_hash_table_remove_all (self->priv->cache_thumbnails);
@@ -665,51 +727,22 @@
 }
 
 static void
-search_entry_changed_cb (GtkEntry *entry, TotemGriloPlugin *self)
-{
-	if (g_strcmp0 (gtk_entry_get_text (entry), "") == 0) {
-		g_object_set (G_OBJECT (entry),
-		              "secondary-icon-name", "edit-find-symbolic",
-		              "secondary-icon-activatable", FALSE,
-		              "secondary-icon-sensitive", FALSE,
-		              NULL);
-	} else {
-		g_object_set (G_OBJECT (entry),
-		              "secondary-icon-name", "edit-clear-symbolic",
-		              "secondary-icon-activatable", TRUE,
-		              "secondary-icon-sensitive", TRUE,
-		              NULL);
-	}
-}
-
-static void
 search_entry_activate_cb (GtkEntry *entry, TotemGriloPlugin *self)
 {
-	GtkTreeIter iter;
-	GrlMediaSource *source = NULL;
-	const gchar *text;
-
-	if (gtk_widget_is_sensitive (self->priv->search_sources_list)) {
-		if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (self->priv->search_sources_list),
-		                                   &iter)) {
-			gtk_tree_model_get (self->priv->search_sources_model, &iter,
-			                    SEARCH_MODEL_SOURCES_SOURCE, &source,
-			                    -1);
-		}
-	}
+	GrlRegistry *registry;
+	const char *id;
+	const char *text;
+	GrlSource *source;
+
+	id = totem_search_entry_get_selected_id (TOTEM_SEARCH_ENTRY (self->priv->search_entry));
+	g_return_if_fail (id != NULL);
+	registry = grl_registry_get_default ();
+	source = grl_registry_lookup_source (registry, id);
+	g_return_if_fail (source != NULL);
 
-	text = gtk_entry_get_text (GTK_ENTRY (self->priv->search_entry));
+	text = totem_search_entry_get_text (TOTEM_SEARCH_ENTRY (self->priv->search_entry));
+	g_return_if_fail (text != NULL);
 	search (self, source, text);
-
-	if (source != NULL) {
-		g_object_unref (source);
-	}
-}
-
-static void
-search_entry_clear_cb (GtkEntry *entry, TotemGriloPlugin *self)
-{
-	gtk_entry_set_text (entry, "");
 }
 
 static void
@@ -723,7 +756,7 @@
 	GtkTreeModel *model;
 	GtkTreeIter iter;
 	GrlMedia *content;
-	GrlMediaSource *source;
+	GrlSource *source;
 	TotemGriloPlugin *self = TOTEM_GRILO_PLUGIN (user_data);
 
 	model = gtk_tree_view_get_model (tree_view);
@@ -769,9 +802,11 @@
 }
 
 static void
-search_source_changed_cb (GtkComboBox *combo,
-			  TotemGriloPlugin *self)
+search_entry_source_changed_cb (GObject          *object,
+                                GParamSpec       *pspec,
+                                TotemGriloPlugin *self)
 {
+	/* FIXME: Do we actually want to do that? */
 	if (self->priv->search_id > 0) {
 		grl_operation_cancel (self->priv->search_id);
 		self->priv->search_id = 0;
@@ -786,7 +821,7 @@
 {
 	GtkTreeModel *model;
 	GtkTreeIter iter;
-	GrlMediaSource *source;
+	GrlSource *source;
 	GrlMedia *content;
 
 	model = gtk_icon_view_get_model (icon_view);
@@ -808,9 +843,9 @@
 }
 
 static gboolean
-source_is_blacklisted (GrlMediaSource *source)
+source_is_blacklisted (GrlSource *source)
 {
-	const gchar *id = grl_metadata_source_get_id (GRL_METADATA_SOURCE (source));
+	const gchar *id = grl_source_get_id (source);
 	const gchar **s = BLACKLIST_SOURCES;
 
 	while (*s) {
@@ -824,8 +859,8 @@
 }
 
 static void
-source_added_cb (GrlPluginRegistry *registry,
-                 GrlMediaSource *source,
+source_added_cb (GrlRegistry *registry,
+                 GrlSource *source,
                  gpointer user_data)
 {
 	const gchar *name;
@@ -836,16 +871,16 @@
 	GrlSupportedOps ops;
 
 	if (source_is_blacklisted (source)) {
-		grl_plugin_registry_unregister_source (registry,
-		                                       GRL_MEDIA_PLUGIN (source),
-		                                       NULL);
+		grl_registry_unregister_source (registry,
+		                                source,
+		                                NULL);
 		return;
 	}
 
 	self = TOTEM_GRILO_PLUGIN (user_data);
 	icon = load_icon (self, ICON_BOX, THUMB_BROWSE_SIZE);
-	name = grl_metadata_source_get_name (GRL_METADATA_SOURCE (source));
-	ops = grl_metadata_source_supported_operations (GRL_METADATA_SOURCE (source));
+	name = grl_source_get_name (source);
+	ops = grl_source_supported_operations (source);
 	if (ops & GRL_OP_BROWSE) {
 		description = g_markup_printf_escaped ("%s", name);
 		gtk_tree_store_append (GTK_TREE_STORE (self->priv->browser_model), &iter, NULL);
@@ -860,17 +895,12 @@
 		g_free (description);
 	}
 	if (ops & GRL_OP_SEARCH) {
-		gtk_list_store_append (GTK_LIST_STORE (self->priv->search_sources_model), &iter);
-		gtk_list_store_set (GTK_LIST_STORE (self->priv->search_sources_model),
-		                    &iter,
-		                    SEARCH_MODEL_SOURCES_SOURCE, source,
-		                    SEARCH_MODEL_SOURCES_NAME, name,
-		                    -1);
-		/* Select one of them */
-		if (gtk_combo_box_get_active (GTK_COMBO_BOX (self->priv->search_sources_list)) == -1) {
-			gtk_combo_box_set_active (GTK_COMBO_BOX (self->priv->search_sources_list), 0);
-			gtk_widget_set_sensitive (self->priv->search_entry, TRUE);
-		}
+		/* FIXME:
+		 * Handle tracker/filesystem specifically, so that we have a "local" entry here */
+		totem_search_entry_add_source (TOTEM_SEARCH_ENTRY (self->priv->search_entry),
+					       grl_source_get_id (source),
+					       grl_source_get_name (source),
+					       0); /* FIXME: Use correct priority */
 	}
 
 	if (icon != NULL) {
@@ -884,8 +914,8 @@
                       GtkTreeIter *iter,
                       gpointer user_data)
 {
-	GrlMediaSource *removed_source = GRL_MEDIA_SOURCE (user_data);
-	GrlMediaSource *model_source;
+	GrlSource *removed_source = GRL_SOURCE (user_data);
+	GrlSource *model_source;
 	gboolean same_source;
 
 	gtk_tree_model_get (model, iter,
@@ -903,40 +933,15 @@
 	return same_source;
 }
 
-static gboolean
-remove_searchable_source (GtkTreeModel *model,
-                          GtkTreePath *path,
-                          GtkTreeIter *iter,
-                          gpointer user_data)
-{
-	GrlMediaSource *removed_source = GRL_MEDIA_SOURCE (user_data);
-	GrlMediaSource *model_source;
-	gboolean same_source;
-
-	gtk_tree_model_get (model, iter,
-	                    MODEL_RESULTS_SOURCE, &model_source,
-	                    -1);
-
-	same_source = (model_source == removed_source);
-
-	if (same_source) {
-		gtk_list_store_remove (GTK_LIST_STORE (model), iter);
-	}
-
-	g_object_unref (model_source);
-
-	return same_source;
-}
-
 static void
-source_removed_cb (GrlPluginRegistry *registry,
-                   GrlMediaSource *source,
+source_removed_cb (GrlRegistry *registry,
+                   GrlSource *source,
                    gpointer user_data)
 {
 	GrlSupportedOps ops;
 	TotemGriloPlugin *self = TOTEM_GRILO_PLUGIN (user_data);
 
-	ops = grl_metadata_source_supported_operations (GRL_METADATA_SOURCE (source));
+	ops = grl_source_supported_operations (source);
 
 	/* Remove source and content from browse results */
 	if (ops & GRL_OP_BROWSE) {
@@ -948,36 +953,32 @@
 	/* If current search results belongs to removed source, clear the results. In
 	   any case, remove the source from the list of searchable sources */
 	if (ops & GRL_OP_SEARCH) {
+		const char *id;
+
 		if (self->priv->search_source == source) {
 			gtk_list_store_clear (GTK_LIST_STORE (self->priv->search_results_model));
 			self->priv->search_source = NULL;
 		}
 
-		gtk_tree_model_foreach (self->priv->search_sources_model,
-		                        remove_searchable_source,
-		                        source);
-
-		/* Select one if the selected source was removed */
-		if (gtk_combo_box_get_active (GTK_COMBO_BOX (self->priv->search_sources_list)) == -1) {
-			gtk_combo_box_set_active (GTK_COMBO_BOX (self->priv->search_sources_list), 0);
-		}
+		id = grl_source_get_id (source);
+		totem_search_entry_remove_source (TOTEM_SEARCH_ENTRY (self->priv->search_entry), id);
 	}
 }
 
 static void
 load_grilo_plugins (TotemGriloPlugin *self)
 {
-	GrlPluginRegistry *registry;
+	GrlRegistry *registry;
 	GError *error = NULL;
 
-	registry = grl_plugin_registry_get_default ();
+	registry = grl_registry_get_default ();
 
 	g_signal_connect (registry, "source-added",
 	                  G_CALLBACK (source_added_cb), self);
 	g_signal_connect (registry, "source-removed",
 	                  G_CALLBACK (source_removed_cb), self);
 
-	if (grl_plugin_registry_load_all (registry, &error) == FALSE) {
+	if (grl_registry_load_all_plugins (registry, &error) == FALSE) {
 		g_warning ("Failed to load grilo plugins: %s", error->message);
 		g_error_free (error);
 	}
@@ -994,7 +995,7 @@
 	GList *sel_list = NULL;
 	GtkTreeModel *model;
 	GtkTreeIter iter;
-	GrlMediaSource *source;
+	GrlSource *source;
 	const gchar *url = NULL;
 
 	if (view == self->priv->browser) {
@@ -1123,7 +1124,7 @@
 	GtkTreePath *end_path;
 	GtkTreePath *parent_path;
 	GtkTreeIter iter;
-	GrlMediaSource *source;
+	GrlSource *source;
 	GrlMedia *container;
 	gint page;
 	gint remaining;
@@ -1225,21 +1226,10 @@
                       GtkBuilder *builder)
 {
 	self->priv->search_results_model = GTK_TREE_MODEL (gtk_builder_get_object (builder, "gw_search_store_results"));
-	self->priv->search_sources_model = GTK_TREE_MODEL (gtk_builder_get_object (builder, "gw_search_store_sources"));
 	self->priv->search_sources_list = GTK_WIDGET (gtk_builder_get_object (builder, "gw_search_select_source"));
 	self->priv->search_results_view = GTK_WIDGET (gtk_builder_get_object (builder, "gw_search_results_view"));
 	self->priv->search_entry =  GTK_WIDGET (gtk_builder_get_object (builder, "gw_search_text"));
 
-	gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (self->priv->search_sources_model),
-	                                      SEARCH_MODEL_SOURCES_NAME,
-	                                      GTK_SORT_ASCENDING);
-
-	gtk_widget_set_sensitive (self->priv->search_entry, FALSE);
-
-	g_signal_connect (self->priv->search_sources_list,
-			  "changed",
-			  G_CALLBACK (search_source_changed_cb), self);
-
 	g_signal_connect (self->priv->search_results_view,
 	                  "item-activated",
 	                  G_CALLBACK (search_activated_cb),
@@ -1250,24 +1240,12 @@
 	g_signal_connect (self->priv->search_results_view,
 	                  "button-press-event",
 	                  G_CALLBACK (context_button_pressed_cb), self);
-	g_signal_connect (self->priv->search_entry,
-	                  "changed",
-	                  G_CALLBACK (search_entry_changed_cb), self);
 
-	g_signal_connect (self->priv->search_entry,
-	                  "activate",
+	g_signal_connect (self->priv->search_entry, "activate",
 	                  G_CALLBACK (search_entry_activate_cb),
 	                  self);
-	g_signal_connect (self->priv->search_entry,
-	                  "icon-release",
-	                  G_CALLBACK (search_entry_clear_cb),
-	                  self);
-
-	g_object_set (G_OBJECT (self->priv->search_entry),
-	              "secondary-icon-name", "edit-find-symbolic",
-	              "secondary-icon-activatable", FALSE,
-	              "secondary-icon-sensitive", FALSE,
-	              NULL);
+	g_signal_connect (self->priv->search_entry, "notify::selected-id",
+			  G_CALLBACK (search_entry_source_changed_cb), self);
 
 	g_signal_connect (gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (gtk_builder_get_object (builder,
 		                    "gw_search_results_window"))),
@@ -1291,8 +1269,7 @@
 {
 	totem_add_to_playlist_and_play (self->priv->totem,
 	                                grl_media_get_url (self->priv->selected_media),
-	                                grl_media_get_title (self->priv->selected_media),
-	                                TRUE);
+	                                grl_media_get_title (self->priv->selected_media));
 }
 
 static void
@@ -1353,13 +1330,13 @@
 setup_config (TotemGriloPlugin *self)
 {
 	gchar *config_file;
-	GrlPluginRegistry *registry = grl_plugin_registry_get_default ();
+	GrlRegistry *registry = grl_registry_get_default ();
 
 	/* Setup system-wide plugins configuration */
 	config_file = totem_plugin_find_file ("grilo", TOTEM_GRILO_CONFIG_FILE);
 
 	if (g_file_test (config_file, G_FILE_TEST_EXISTS)) {
-		grl_plugin_registry_add_config_from_file (registry, config_file, NULL);
+		grl_registry_add_config_from_file (registry, config_file, NULL);
 	}
 	g_free (config_file);
 
@@ -1371,7 +1348,7 @@
 	                            NULL);
 
 	if (g_file_test (config_file, G_FILE_TEST_EXISTS)) {
-		grl_plugin_registry_add_config_from_file (registry, config_file, NULL);
+		grl_registry_add_config_from_file (registry, config_file, NULL);
 	}
 	g_free (config_file);
 }
@@ -1405,21 +1382,21 @@
 	TotemGriloPlugin *self = TOTEM_GRILO_PLUGIN (plugin);
 	GList *sources;
 	GList *s;
-	GrlPluginRegistry *registry;
+	GrlRegistry *registry;
 
 	totem_remove_sidebar_page (self->priv->totem, "grilo-browse");
 	totem_remove_sidebar_page (self->priv->totem, "grilo-search");
 
-	registry = grl_plugin_registry_get_default ();
+	registry = grl_registry_get_default ();
 	g_signal_handlers_disconnect_by_func (registry, source_added_cb, self);
 	g_signal_handlers_disconnect_by_func (registry, source_removed_cb, self);
 
 	/* Shutdown all sources */
-	sources  = grl_plugin_registry_get_sources (registry, FALSE);
+	sources  = grl_registry_get_sources (registry, FALSE);
 	for (s = sources; s; s = g_list_next (s)) {
-		grl_plugin_registry_unregister_source (registry,
-		                                       GRL_MEDIA_PLUGIN (s->data),
-		                                       NULL);
+		grl_registry_unregister_source (registry,
+		                                GRL_SOURCE (s->data),
+		                                NULL);
 	}
 	g_list_free (sources);
 
diff -Nru totem-3.4.3/src/plugins/grilo/totem-search-entry.c totem-3.6.2/src/plugins/grilo/totem-search-entry.c
--- totem-3.4.3/src/plugins/grilo/totem-search-entry.c	1970-01-01 00:00:00.000000000 +0000
+++ totem-3.6.2/src/plugins/grilo/totem-search-entry.c	2012-10-09 15:42:00.000000000 +0000
@@ -0,0 +1,291 @@
+/*
+ * Copyright (c) 2012 Red Hat, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public 
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License 
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Author: Bastien Nocera 
+ *
+ */
+
+#include "totem-search-entry.h"
+#include "gd-tagged-entry.h"
+
+G_DEFINE_TYPE (TotemSearchEntry, totem_search_entry, GTK_TYPE_BOX)
+
+/* To be used as the ID in the GdTaggedEntry */
+#define SOURCE_ID "source-id"
+
+enum {
+	SIGNAL_ACTIVATE,
+	LAST_SIGNAL
+};
+
+enum {
+	PROP_0,
+	PROP_SELECTED_ID
+};
+
+static guint signals[LAST_SIGNAL] = { 0, };
+
+struct _TotemSearchEntryPrivate {
+	GtkWidget *entry;
+	GtkWidget *button;
+	GtkWidget *menu;
+	GSList *group;
+};
+
+static void
+totem_search_entry_finalize (GObject *obj)
+{
+	TotemSearchEntry *self = TOTEM_SEARCH_ENTRY (obj);
+
+	/* FIXME */
+
+	G_OBJECT_CLASS (totem_search_entry_parent_class)->finalize (obj);
+}
+
+static void
+entry_activate_cb (GtkEntry *entry,
+		   TotemSearchEntry *self)
+{
+	const char *text;
+
+	text = gtk_entry_get_text (GTK_ENTRY (self->priv->entry));
+	if (text == NULL || *text == '\0')
+		return;
+	g_signal_emit (self, signals[SIGNAL_ACTIVATE], 0);
+}
+
+static void
+totem_search_entry_init (TotemSearchEntry *self)
+{
+	GtkWidget *entry;
+	GtkWidget *button;
+
+	self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, TOTEM_TYPE_SEARCH_ENTRY, TotemSearchEntryPrivate);
+
+	/* Entry */
+	entry = GTK_WIDGET (gd_tagged_entry_new ());
+	gd_tagged_entry_set_button_visible (GD_TAGGED_ENTRY (entry), FALSE);
+	gtk_box_pack_start (GTK_BOX (self),
+			    entry,
+			    TRUE, TRUE, 0);
+	gtk_widget_show (entry);
+
+	self->priv->entry = entry;
+
+	/* Button */
+	button = gtk_menu_button_new ();
+	gtk_box_pack_start (GTK_BOX (self),
+			    button,
+			    FALSE, TRUE, 0);
+	gtk_widget_show (button);
+
+	self->priv->button = button;
+
+	/* Connect signals */
+	g_signal_connect (self->priv->entry, "activate",
+			  G_CALLBACK (entry_activate_cb), self);
+}
+
+static void
+totem_search_entry_set_property (GObject *object,
+				 guint property_id,
+                                 const GValue *value,
+                                 GParamSpec * pspec)
+{
+	switch (property_id) {
+	case PROP_SELECTED_ID:
+		totem_search_entry_set_selected_id (TOTEM_SEARCH_ENTRY (object),
+						    g_value_get_string (value));
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+	}
+}
+
+static void
+totem_search_entry_get_property (GObject    *object,
+				 guint       property_id,
+                                 GValue     *value,
+                                 GParamSpec *pspec)
+{
+	switch (property_id) {
+	case PROP_SELECTED_ID:
+		g_value_set_string (value,
+				    totem_search_entry_get_selected_id (TOTEM_SEARCH_ENTRY (object)));
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+	}
+}
+
+static void
+totem_search_entry_class_init (TotemSearchEntryClass *klass)
+{
+	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+
+	gobject_class->finalize = totem_search_entry_finalize;
+	gobject_class->set_property = totem_search_entry_set_property;
+	gobject_class->get_property = totem_search_entry_get_property;
+
+	signals[SIGNAL_ACTIVATE] =
+		g_signal_new ("activate",
+			      TOTEM_TYPE_SEARCH_ENTRY,
+			      G_SIGNAL_RUN_FIRST | G_SIGNAL_DETAILED,
+			      0, NULL, NULL, NULL,
+			      G_TYPE_NONE,
+			      0, G_TYPE_NONE);
+
+	g_object_class_install_property (gobject_class, PROP_SELECTED_ID,
+					 g_param_spec_string ("selected-id", "Selected ID", "The ID for the currently selected source.",
+							      NULL,
+							      G_PARAM_READWRITE |
+							      G_PARAM_STATIC_STRINGS));
+
+	g_type_class_add_private (klass, sizeof (TotemSearchEntryPrivate));
+}
+
+TotemSearchEntry *
+totem_search_entry_new (void)
+{
+	return g_object_new (TOTEM_TYPE_SEARCH_ENTRY, NULL);
+}
+
+static void
+item_toggled (GtkCheckMenuItem *item,
+	      TotemSearchEntry *self)
+{
+	const char *label;
+
+	if (gtk_check_menu_item_get_active (item)) {
+		label = g_object_get_data (G_OBJECT (item), "label");
+		gd_tagged_entry_set_tag_label (GD_TAGGED_ENTRY (self->priv->entry),
+					       SOURCE_ID, label);
+		g_object_notify (G_OBJECT (self), "selected-id");
+	}
+}
+
+static void
+insert_item_sorted (TotemSearchEntry *self,
+		    int               priority,
+		    GtkWidget        *item)
+{
+	/* FIXME really do that sorted */
+	gtk_menu_shell_append (GTK_MENU_SHELL (self->priv->menu), item);
+	gtk_widget_show (item);
+}
+
+void
+totem_search_entry_add_source (TotemSearchEntry *self,
+			       const gchar      *id,
+			       const gchar      *label,
+			       int               priority)
+{
+	GtkWidget *item;
+
+	g_return_if_fail (TOTEM_IS_SEARCH_ENTRY (self));
+
+	if (self->priv->menu == NULL) {
+		self->priv->menu = gtk_menu_new ();
+		gtk_menu_button_set_popup (GTK_MENU_BUTTON (self->priv->button),
+					   self->priv->menu);
+		gd_tagged_entry_add_tag (GD_TAGGED_ENTRY (self->priv->entry),
+					 SOURCE_ID, label);
+	}
+
+	item = gtk_radio_menu_item_new_with_label (self->priv->group, label);
+	self->priv->group = g_slist_prepend (self->priv->group, item);
+
+	g_object_set_data_full (G_OBJECT (item), "id", g_strdup (id), g_free);
+	g_object_set_data_full (G_OBJECT (item), "label", g_strdup (label), g_free);
+	g_object_set_data (G_OBJECT (item), "priority", GINT_TO_POINTER (priority));
+
+	g_signal_connect (item, "toggled",
+			  G_CALLBACK (item_toggled), self);
+
+	insert_item_sorted (self, priority, item);
+}
+
+void
+totem_search_entry_remove_source (TotemSearchEntry *self,
+				  const gchar *id)
+{
+	guint num_items;
+
+	g_return_if_fail (TOTEM_IS_SEARCH_ENTRY (self));
+
+	/* FIXME
+	 * - implement
+	 * - don't forget to remove tag
+	 * - check if it's the currently selected source and notify of the change if so */
+
+	num_items = 1;
+
+	if (num_items == 0) {
+		gtk_menu_button_set_popup (GTK_MENU_BUTTON (self->priv->button), NULL);
+		g_clear_object (&self->priv->menu);
+		gd_tagged_entry_remove_tag (GD_TAGGED_ENTRY (self->priv->entry), SOURCE_ID);
+	}
+}
+
+const char *
+totem_search_entry_get_text (TotemSearchEntry *self)
+{
+	g_return_val_if_fail (TOTEM_IS_SEARCH_ENTRY (self), NULL);
+
+	return gtk_entry_get_text (GTK_ENTRY (self->priv->entry));
+}
+
+const char *
+totem_search_entry_get_selected_id (TotemSearchEntry *self)
+{
+	GSList *l;
+
+	g_return_val_if_fail (TOTEM_IS_SEARCH_ENTRY (self), NULL);
+
+	for (l = self->priv->group ; l != NULL; l = l->next) {
+		GtkCheckMenuItem *item = l->data;
+
+		if (gtk_check_menu_item_get_active (item) != FALSE)
+			return g_object_get_data (G_OBJECT (item), "id");
+	}
+
+	return NULL;
+}
+
+void
+totem_search_entry_set_selected_id (TotemSearchEntry *self,
+				    const char       *id)
+{
+	GSList *l;
+
+	g_return_if_fail (TOTEM_IS_SEARCH_ENTRY (self));
+	g_return_if_fail (id != NULL);
+
+	for (l = self->priv->group ; l != NULL; l = l->next) {
+		GtkCheckMenuItem *item = l->data;
+		const char *item_id;
+
+		item_id = g_object_get_data (G_OBJECT (item), "id");
+		if (g_strcmp0 (item_id, id) == 0) {
+			gtk_check_menu_item_set_active (item, TRUE);
+			return;
+		}
+	}
+
+	g_warning ("Could not find ID '%s' in TotemSearchEntry %p",
+		   id, self);
+}
diff -Nru totem-3.4.3/src/plugins/grilo/totem-search-entry.h totem-3.6.2/src/plugins/grilo/totem-search-entry.h
--- totem-3.4.3/src/plugins/grilo/totem-search-entry.h	1970-01-01 00:00:00.000000000 +0000
+++ totem-3.6.2/src/plugins/grilo/totem-search-entry.h	2012-08-29 23:07:45.000000000 +0000
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2011 Red Hat, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public 
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License 
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Author: Cosimo Cecchi 
+ *
+ */
+
+#ifndef __TOTEM_SEARCH_ENTRY_H__
+#define __TOTEM_SEARCH_ENTRY_H__
+
+#include 
+
+#include 
+
+G_BEGIN_DECLS
+
+#define TOTEM_TYPE_SEARCH_ENTRY totem_search_entry_get_type()
+#define TOTEM_SEARCH_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TOTEM_TYPE_SEARCH_ENTRY, TotemSearchEntry))
+#define TOTEM_SEARCH_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TOTEM_TYPE_SEARCH_ENTRY, TotemSearchEntryClass))
+#define TOTEM_IS_SEARCH_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TOTEM_TYPE_SEARCH_ENTRY))
+#define TOTEM_IS_SEARCH_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TOTEM_TYPE_SEARCH_ENTRY))
+#define TOTEM_SEARCH_ENTRY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TOTEM_TYPE_SEARCH_ENTRY, TotemSearchEntryClass))
+
+typedef struct _TotemSearchEntry TotemSearchEntry;
+typedef struct _TotemSearchEntryClass TotemSearchEntryClass;
+typedef struct _TotemSearchEntryPrivate TotemSearchEntryPrivate;
+
+struct _TotemSearchEntry
+{
+	GtkBox parent;
+
+	TotemSearchEntryPrivate *priv;
+};
+
+struct _TotemSearchEntryClass
+{
+	GtkBoxClass parent_class;
+};
+
+GType totem_search_entry_get_type (void) G_GNUC_CONST;
+
+TotemSearchEntry *totem_search_entry_new (void);
+
+void totem_search_entry_add_source (TotemSearchEntry *entry,
+                                  const gchar *id,
+                                  const gchar *label,
+                                  int priority);
+
+void totem_search_entry_remove_source (TotemSearchEntry *self,
+                                       const gchar *id);
+
+const char *totem_search_entry_get_text (TotemSearchEntry *self);
+
+const char *totem_search_entry_get_selected_id (TotemSearchEntry *self);
+void        totem_search_entry_set_selected_id (TotemSearchEntry *self,
+						const char       *id);
+
+G_END_DECLS
+
+#endif /* __TOTEM_SEARCH_ENTRY_H__ */
diff -Nru totem-3.4.3/src/plugins/gromit/Makefile.in totem-3.6.2/src/plugins/gromit/Makefile.in
--- totem-3.4.3/src/plugins/gromit/Makefile.in	2012-07-04 09:54:49.000000000 +0000
+++ totem-3.6.2/src/plugins/gromit/Makefile.in	2012-10-25 13:36:21.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.12.2 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,6 +16,23 @@
 
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -36,13 +52,11 @@
 build_triplet = @build@
 host_triplet = @host@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/depcomp \
 	$(top_srcdir)/src/plugins/Makefile.plugins
 subdir = src/plugins/gromit
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -84,9 +98,22 @@
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 libgromit_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libgromit_la_CFLAGS) \
 	$(CFLAGS) $(libgromit_la_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -99,22 +126,23 @@
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(libgromit_la_SOURCES)
 DIST_SOURCES = $(libgromit_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 DATA = $(plugin_DATA)
 ETAGS = etags
 CTAGS = ctags
@@ -130,7 +158,8 @@
 	$(DISABLE_DEPRECATED)		\
 	-I$(top_srcdir)/		\
 	-I$(top_srcdir)/src		\
-	-I$(top_srcdir)/src/plugins
+	-I$(top_srcdir)/src/plugins	\
+	-I$(top_srcdir)/src/gst
 
 AM_CXXFLAGS = @AM_CXXFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -140,6 +169,10 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BACKEND_CFLAGS = @BACKEND_CFLAGS@
+BACKEND_LIBS = @BACKEND_LIBS@
+BACKEND_TEST_CFLAGS = @BACKEND_TEST_CFLAGS@
+BACKEND_TEST_LIBS = @BACKEND_TEST_LIBS@
 BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
 BROWSER_PLUGIN_DIR = @BROWSER_PLUGIN_DIR@
 BROWSER_PLUGIN_LIBS = @BROWSER_PLUGIN_LIBS@
@@ -161,8 +194,6 @@
 DBUS_LIBS = @DBUS_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DEPENDENCY_CFLAGS = @DEPENDENCY_CFLAGS@
-DEPENDENCY_LIBS = @DEPENDENCY_LIBS@
 DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DISC_RECORDER_CFLAGS = @DISC_RECORDER_CFLAGS@
 DISC_RECORDER_LIBS = @DISC_RECORDER_LIBS@
@@ -176,7 +207,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-EXTRA_BACKEND_LIBS = @EXTRA_BACKEND_LIBS@
 FGREP = @FGREP@
 FULL_LIBEXECDIR = @FULL_LIBEXECDIR@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
@@ -184,19 +214,21 @@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GLIB_REQS = @GLIB_REQS@
+GLOW_BUTTON_CFLAGS = @GLOW_BUTTON_CFLAGS@
+GLOW_BUTTON_LIBS = @GLOW_BUTTON_LIBS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
-GST_CFLAGS = @GST_CFLAGS@
-GST_LIBS = @GST_LIBS@
+GST_PLUGINS_BAD_CFLAGS = @GST_PLUGINS_BAD_CFLAGS@
+GST_PLUGINS_BAD_LIBS = @GST_PLUGINS_BAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
 GTK_REQS = @GTK_REQS@
+HELPER_CFLAGS = @HELPER_CFLAGS@
+HELPER_LIBS = @HELPER_LIBS@
 HELP_DIR = @HELP_DIR@
 HTML_DIR = @HTML_DIR@
 INSTALL = @INSTALL@
@@ -222,11 +254,11 @@
 INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBEPC_CFLAGS = @LIBEPC_CFLAGS@
-LIBEPC_LIBS = @LIBEPC_LIBS@
 LIBGRILO_CFLAGS = @LIBGRILO_CFLAGS@
 LIBGRILO_LIBS = @LIBGRILO_LIBS@
 LIBOBJS = @LIBOBJS@
+LIBPLAYER_CFLAGS = @LIBPLAYER_CFLAGS@
+LIBPLAYER_LIBS = @LIBPLAYER_LIBS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBZEITGEIST_CFLAGS = @LIBZEITGEIST_CFLAGS@
@@ -243,8 +275,6 @@
 MISSING_PLUGINS_CFLAGS = @MISSING_PLUGINS_CFLAGS@
 MISSING_PLUGINS_LIBS = @MISSING_PLUGINS_LIBS@
 MKDIR_P = @MKDIR_P@
-MM_CFLAGS = @MM_CFLAGS@
-MM_LIBS = @MM_LIBS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 NAUTILUSDIR = @NAUTILUSDIR@
@@ -265,15 +295,21 @@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PEASGTK_CFLAGS = @PEASGTK_CFLAGS@
-PEASGTK_LIBS = @PEASGTK_LIBS@
-PEAS_CFLAGS = @PEAS_CFLAGS@
-PEAS_LIBS = @PEAS_LIBS@
+PIXBUF_HELPER_CFLAGS = @PIXBUF_HELPER_CFLAGS@
+PIXBUF_HELPER_LIBS = @PIXBUF_HELPER_LIBS@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLAYER_CFLAGS = @PLAYER_CFLAGS@
+PLAYER_LIBS = @PLAYER_LIBS@
 PLUGINDIR = @PLUGINDIR@
 PLUGINS = @PLUGINS@
+PLUGIN_VIEWER_CFLAGS = @PLUGIN_VIEWER_CFLAGS@
+PLUGIN_VIEWER_LIBS = @PLUGIN_VIEWER_LIBS@
+PREVIEW_CFLAGS = @PREVIEW_CFLAGS@
+PREVIEW_LIBS = @PREVIEW_LIBS@
+PROPERTIES_CFLAGS = @PROPERTIES_CFLAGS@
+PROPERTIES_LIBS = @PROPERTIES_LIBS@
 PYGOBJECT_CFLAGS = @PYGOBJECT_CFLAGS@
 PYGOBJECT_LIBS = @PYGOBJECT_LIBS@
 PYLINT = @PYLINT@
@@ -293,6 +329,10 @@
 SMCLIENT_CFLAGS = @SMCLIENT_CFLAGS@
 SMCLIENT_LIBS = @SMCLIENT_LIBS@
 STRIP = @STRIP@
+THUMBNAILER_CFLAGS = @THUMBNAILER_CFLAGS@
+THUMBNAILER_LIBS = @THUMBNAILER_LIBS@
+TIME_HELPER_CFLAGS = @TIME_HELPER_CFLAGS@
+TIME_HELPER_LIBS = @TIME_HELPER_LIBS@
 TOTEM_API_VERSION = @TOTEM_API_VERSION@
 TOTEM_PLPARSER_REQS = @TOTEM_PLPARSER_REQS@
 TOTEM_VERSION_MAJOR = @TOTEM_VERSION_MAJOR@
@@ -304,9 +344,6 @@
 WARN_CFLAGS = @WARN_CFLAGS@
 WARN_CXXFLAGS = @WARN_CXXFLAGS@
 XGETTEXT = @XGETTEXT@
-XMKMF = @XMKMF@
-XTEST_LIBS = @XTEST_LIBS@
-X_LIBS = @X_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -372,8 +409,7 @@
 DISTCLEANFILES = $(plugin_DATA)
 EXTRA_DIST = $(plugin_in_files)
 plugin_cflags = \
-	$(DEPENDENCY_CFLAGS)	\
-	$(PEAS_CFLAGS)		\
+	$(PLAYER_CFLAGS)	\
 	$(WARN_CFLAGS)
 
 plugin_ldflags = \
@@ -429,7 +465,6 @@
 $(am__aclocal_m4_deps):
 install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
 	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
@@ -437,6 +472,8 @@
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
 	}
@@ -452,12 +489,14 @@
 
 clean-pluginLTLIBRARIES:
 	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
-	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(plugin_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
 libgromit.la: $(libgromit_la_OBJECTS) $(libgromit_la_DEPENDENCIES) $(EXTRA_libgromit_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libgromit_la_LINK) -rpath $(plugindir) $(libgromit_la_OBJECTS) $(libgromit_la_LIBADD) $(LIBS)
 
@@ -470,25 +509,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgromit_la-totem-gromit.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
@@ -507,8 +543,11 @@
 	-rm -rf .libs _libs
 install-pluginDATA: $(plugin_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
 	@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -573,6 +612,20 @@
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
 
+cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
+	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
@@ -719,19 +772,19 @@
 .MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pluginLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pluginDATA \
-	install-pluginLTLIBRARIES install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-pluginDATA uninstall-pluginLTLIBRARIES
+	clean-libtool clean-pluginLTLIBRARIES cscopelist ctags \
+	distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pluginDATA install-pluginLTLIBRARIES install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-pluginDATA uninstall-pluginLTLIBRARIES
 
 %.plugin: %.plugin.in
 	$(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
diff -Nru totem-3.4.3/src/plugins/gromit/totem-gromit.c totem-3.6.2/src/plugins/gromit/totem-gromit.c
--- totem-3.4.3/src/plugins/gromit/totem-gromit.c	2011-08-25 18:35:01.000000000 +0000
+++ totem-3.6.2/src/plugins/gromit/totem-gromit.c	2012-08-29 23:07:45.000000000 +0000
@@ -94,13 +94,13 @@
 	char *path;
 	GError *error = NULL;
 
-	path = g_build_filename (g_get_home_dir (), ".gromitrc", NULL);
+	path = g_build_filename (g_get_user_config_dir (), "gromit", "gromitrc", NULL);
 	if (g_file_test (path, G_FILE_TEST_EXISTS) != FALSE) {
 		g_free (path);
 		return;
 	}
 
-	g_message ("%s doesn't exist", path);
+	g_debug ("%s doesn't exist so creating it", path);
 
 	if (g_file_set_contents (path, DEFAULT_CONFIG, sizeof (DEFAULT_CONFIG), &error) == FALSE) {
 		g_warning ("Could not write default config file: %s.", error->message);
diff -Nru totem-3.4.3/src/plugins/im-status/Makefile.in totem-3.6.2/src/plugins/im-status/Makefile.in
--- totem-3.4.3/src/plugins/im-status/Makefile.in	2012-07-04 09:54:49.000000000 +0000
+++ totem-3.6.2/src/plugins/im-status/Makefile.in	2012-10-25 13:36:21.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.12.2 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,6 +16,23 @@
 
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -36,13 +52,11 @@
 build_triplet = @build@
 host_triplet = @host@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/depcomp \
 	$(top_srcdir)/src/plugins/Makefile.plugins
 subdir = src/plugins/im-status
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -85,10 +99,23 @@
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 libtotem_im_status_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(libtotem_im_status_la_CFLAGS) $(CFLAGS) \
 	$(libtotem_im_status_la_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -101,22 +128,23 @@
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(libtotem_im_status_la_SOURCES)
 DIST_SOURCES = $(libtotem_im_status_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 DATA = $(plugin_DATA)
 ETAGS = etags
 CTAGS = ctags
@@ -132,7 +160,8 @@
 	$(DISABLE_DEPRECATED)		\
 	-I$(top_srcdir)/		\
 	-I$(top_srcdir)/src		\
-	-I$(top_srcdir)/src/plugins
+	-I$(top_srcdir)/src/plugins	\
+	-I$(top_srcdir)/src/gst
 
 AM_CXXFLAGS = @AM_CXXFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -142,6 +171,10 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BACKEND_CFLAGS = @BACKEND_CFLAGS@
+BACKEND_LIBS = @BACKEND_LIBS@
+BACKEND_TEST_CFLAGS = @BACKEND_TEST_CFLAGS@
+BACKEND_TEST_LIBS = @BACKEND_TEST_LIBS@
 BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
 BROWSER_PLUGIN_DIR = @BROWSER_PLUGIN_DIR@
 BROWSER_PLUGIN_LIBS = @BROWSER_PLUGIN_LIBS@
@@ -163,8 +196,6 @@
 DBUS_LIBS = @DBUS_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DEPENDENCY_CFLAGS = @DEPENDENCY_CFLAGS@
-DEPENDENCY_LIBS = @DEPENDENCY_LIBS@
 DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DISC_RECORDER_CFLAGS = @DISC_RECORDER_CFLAGS@
 DISC_RECORDER_LIBS = @DISC_RECORDER_LIBS@
@@ -178,7 +209,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-EXTRA_BACKEND_LIBS = @EXTRA_BACKEND_LIBS@
 FGREP = @FGREP@
 FULL_LIBEXECDIR = @FULL_LIBEXECDIR@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
@@ -186,19 +216,21 @@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GLIB_REQS = @GLIB_REQS@
+GLOW_BUTTON_CFLAGS = @GLOW_BUTTON_CFLAGS@
+GLOW_BUTTON_LIBS = @GLOW_BUTTON_LIBS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
-GST_CFLAGS = @GST_CFLAGS@
-GST_LIBS = @GST_LIBS@
+GST_PLUGINS_BAD_CFLAGS = @GST_PLUGINS_BAD_CFLAGS@
+GST_PLUGINS_BAD_LIBS = @GST_PLUGINS_BAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
 GTK_REQS = @GTK_REQS@
+HELPER_CFLAGS = @HELPER_CFLAGS@
+HELPER_LIBS = @HELPER_LIBS@
 HELP_DIR = @HELP_DIR@
 HTML_DIR = @HTML_DIR@
 INSTALL = @INSTALL@
@@ -224,11 +256,11 @@
 INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBEPC_CFLAGS = @LIBEPC_CFLAGS@
-LIBEPC_LIBS = @LIBEPC_LIBS@
 LIBGRILO_CFLAGS = @LIBGRILO_CFLAGS@
 LIBGRILO_LIBS = @LIBGRILO_LIBS@
 LIBOBJS = @LIBOBJS@
+LIBPLAYER_CFLAGS = @LIBPLAYER_CFLAGS@
+LIBPLAYER_LIBS = @LIBPLAYER_LIBS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBZEITGEIST_CFLAGS = @LIBZEITGEIST_CFLAGS@
@@ -245,8 +277,6 @@
 MISSING_PLUGINS_CFLAGS = @MISSING_PLUGINS_CFLAGS@
 MISSING_PLUGINS_LIBS = @MISSING_PLUGINS_LIBS@
 MKDIR_P = @MKDIR_P@
-MM_CFLAGS = @MM_CFLAGS@
-MM_LIBS = @MM_LIBS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 NAUTILUSDIR = @NAUTILUSDIR@
@@ -267,15 +297,21 @@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PEASGTK_CFLAGS = @PEASGTK_CFLAGS@
-PEASGTK_LIBS = @PEASGTK_LIBS@
-PEAS_CFLAGS = @PEAS_CFLAGS@
-PEAS_LIBS = @PEAS_LIBS@
+PIXBUF_HELPER_CFLAGS = @PIXBUF_HELPER_CFLAGS@
+PIXBUF_HELPER_LIBS = @PIXBUF_HELPER_LIBS@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLAYER_CFLAGS = @PLAYER_CFLAGS@
+PLAYER_LIBS = @PLAYER_LIBS@
 PLUGINDIR = @PLUGINDIR@
 PLUGINS = @PLUGINS@
+PLUGIN_VIEWER_CFLAGS = @PLUGIN_VIEWER_CFLAGS@
+PLUGIN_VIEWER_LIBS = @PLUGIN_VIEWER_LIBS@
+PREVIEW_CFLAGS = @PREVIEW_CFLAGS@
+PREVIEW_LIBS = @PREVIEW_LIBS@
+PROPERTIES_CFLAGS = @PROPERTIES_CFLAGS@
+PROPERTIES_LIBS = @PROPERTIES_LIBS@
 PYGOBJECT_CFLAGS = @PYGOBJECT_CFLAGS@
 PYGOBJECT_LIBS = @PYGOBJECT_LIBS@
 PYLINT = @PYLINT@
@@ -295,6 +331,10 @@
 SMCLIENT_CFLAGS = @SMCLIENT_CFLAGS@
 SMCLIENT_LIBS = @SMCLIENT_LIBS@
 STRIP = @STRIP@
+THUMBNAILER_CFLAGS = @THUMBNAILER_CFLAGS@
+THUMBNAILER_LIBS = @THUMBNAILER_LIBS@
+TIME_HELPER_CFLAGS = @TIME_HELPER_CFLAGS@
+TIME_HELPER_LIBS = @TIME_HELPER_LIBS@
 TOTEM_API_VERSION = @TOTEM_API_VERSION@
 TOTEM_PLPARSER_REQS = @TOTEM_PLPARSER_REQS@
 TOTEM_VERSION_MAJOR = @TOTEM_VERSION_MAJOR@
@@ -306,9 +346,6 @@
 WARN_CFLAGS = @WARN_CFLAGS@
 WARN_CXXFLAGS = @WARN_CXXFLAGS@
 XGETTEXT = @XGETTEXT@
-XMKMF = @XMKMF@
-XTEST_LIBS = @XTEST_LIBS@
-X_LIBS = @X_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -374,8 +411,7 @@
 DISTCLEANFILES = $(plugin_DATA)
 EXTRA_DIST = $(plugin_in_files)
 plugin_cflags = \
-	$(DEPENDENCY_CFLAGS)	\
-	$(PEAS_CFLAGS)		\
+	$(PLAYER_CFLAGS)	\
 	$(WARN_CFLAGS)
 
 plugin_ldflags = \
@@ -435,7 +471,6 @@
 $(am__aclocal_m4_deps):
 install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
 	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
@@ -443,6 +478,8 @@
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
 	}
@@ -458,12 +495,14 @@
 
 clean-pluginLTLIBRARIES:
 	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
-	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(plugin_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
 libtotem-im-status.la: $(libtotem_im_status_la_OBJECTS) $(libtotem_im_status_la_DEPENDENCIES) $(EXTRA_libtotem_im_status_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libtotem_im_status_la_LINK) -rpath $(plugindir) $(libtotem_im_status_la_OBJECTS) $(libtotem_im_status_la_LIBADD) $(LIBS)
 
@@ -476,25 +515,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_im_status_la-totem-im-status.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
@@ -513,8 +549,11 @@
 	-rm -rf .libs _libs
 install-pluginDATA: $(plugin_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
 	@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -579,6 +618,20 @@
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
 
+cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
+	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
@@ -725,19 +778,19 @@
 .MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pluginLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pluginDATA \
-	install-pluginLTLIBRARIES install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-pluginDATA uninstall-pluginLTLIBRARIES
+	clean-libtool clean-pluginLTLIBRARIES cscopelist ctags \
+	distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pluginDATA install-pluginLTLIBRARIES install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-pluginDATA uninstall-pluginLTLIBRARIES
 
 %.plugin: %.plugin.in
 	$(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
diff -Nru totem-3.4.3/src/plugins/im-status/totem-im-status.plugin.in totem-3.6.2/src/plugins/im-status/totem-im-status.plugin.in
--- totem-3.4.3/src/plugins/im-status/totem-im-status.plugin.in	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/plugins/im-status/totem-im-status.plugin.in	2012-08-29 23:07:45.000000000 +0000
@@ -2,7 +2,7 @@
 Module=totem-im-status
 IAge=1
 Builtin=false
-_Name=Instant Messenger status
+_Name=Instant Messenger Status
 _Description=Set your Instant Messenger status to away when a movie is playing
 Authors=Bastien Nocera, Philip Withnall
 Copyright=Copyright © 2007, 2011 Bastien Nocera, Philip Withnall
diff -Nru totem-3.4.3/src/plugins/iplayer/Makefile.am totem-3.6.2/src/plugins/iplayer/Makefile.am
--- totem-3.4.3/src/plugins/iplayer/Makefile.am	2011-08-25 18:35:01.000000000 +0000
+++ totem-3.6.2/src/plugins/iplayer/Makefile.am	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-include $(top_srcdir)/src/plugins/Makefile.plugins
-
-plugindir = $(PLUGINDIR)/iplayer
-plugin_PYTHON = iplayer.py iplayer2.py listparser.py
-
-plugin_in_files = iplayer.plugin.in
-
-uidir = $(plugindir)
-ui_DATA = iplayer.ui
-EXTRA_DIST += $(ui_DATA)
-
--include $(top_srcdir)/git.mk
diff -Nru totem-3.4.3/src/plugins/iplayer/Makefile.in totem-3.6.2/src/plugins/iplayer/Makefile.in
--- totem-3.4.3/src/plugins/iplayer/Makefile.in	2012-07-04 09:54:50.000000000 +0000
+++ totem-3.6.2/src/plugins/iplayer/Makefile.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,660 +0,0 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-DIST_COMMON = $(plugin_PYTHON) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in \
-	$(top_srcdir)/src/plugins/Makefile.plugins
-subdir = src/plugins/iplayer
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-SOURCES =
-DIST_SOURCES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__py_compile = PYTHON=$(PYTHON) $(SHELL) $(py_compile)
-am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" \
-	"$(DESTDIR)$(uidir)"
-py_compile = $(top_srcdir)/py-compile
-DATA = $(plugin_DATA) $(ui_DATA)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
-ALL_LINGUAS = @ALL_LINGUAS@
-ALL_PLUGINS = @ALL_PLUGINS@
-AMTAR = @AMTAR@
-AM_CFLAGS = @AM_CFLAGS@
-AM_CPPFLAGS = \
-	-DG_LOG_DOMAIN=\""Totem"\"	\
-	$(DISABLE_DEPRECATED)		\
-	-I$(top_srcdir)/		\
-	-I$(top_srcdir)/src		\
-	-I$(top_srcdir)/src/plugins
-
-AM_CXXFLAGS = @AM_CXXFLAGS@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_LDFLAGS = @AM_LDFLAGS@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-BROWSER_PLUGIN_DIR = @BROWSER_PLUGIN_DIR@
-BROWSER_PLUGIN_LIBS = @BROWSER_PLUGIN_LIBS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CHAPTERS_CFLAGS = @CHAPTERS_CFLAGS@
-CHAPTERS_LIBS = @CHAPTERS_LIBS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DBUS_BIND = @DBUS_BIND@
-DBUS_CFLAGS = @DBUS_CFLAGS@
-DBUS_LIBS = @DBUS_LIBS@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DEPENDENCY_CFLAGS = @DEPENDENCY_CFLAGS@
-DEPENDENCY_LIBS = @DEPENDENCY_LIBS@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
-DISC_RECORDER_CFLAGS = @DISC_RECORDER_CFLAGS@
-DISC_RECORDER_LIBS = @DISC_RECORDER_LIBS@
-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
-DLLTOOL = @DLLTOOL@
-DOC_USER_FORMATS = @DOC_USER_FORMATS@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-EXTRA_BACKEND_LIBS = @EXTRA_BACKEND_LIBS@
-FGREP = @FGREP@
-FULL_LIBEXECDIR = @FULL_LIBEXECDIR@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-GLIB_MKENUMS = @GLIB_MKENUMS@
-GLIB_REQS = @GLIB_REQS@
-GMSGFMT = @GMSGFMT@
-GREP = @GREP@
-GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
-GST_CFLAGS = @GST_CFLAGS@
-GST_LIBS = @GST_LIBS@
-GTKDOC_CHECK = @GTKDOC_CHECK@
-GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
-GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
-GTKDOC_MKPDF = @GTKDOC_MKPDF@
-GTKDOC_REBASE = @GTKDOC_REBASE@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTK_REQS = @GTK_REQS@
-HELP_DIR = @HELP_DIR@
-HTML_DIR = @HTML_DIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
-INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
-INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
-INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
-INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
-INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
-INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
-INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
-INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
-INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
-INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
-INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBEPC_CFLAGS = @LIBEPC_CFLAGS@
-LIBEPC_LIBS = @LIBEPC_LIBS@
-LIBGRILO_CFLAGS = @LIBGRILO_CFLAGS@
-LIBGRILO_LIBS = @LIBGRILO_LIBS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBZEITGEIST_CFLAGS = @LIBZEITGEIST_CFLAGS@
-LIBZEITGEIST_LIBS = @LIBZEITGEIST_LIBS@
-LIPO = @LIPO@
-LIRC_LIBS = @LIRC_LIBS@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MEDIA_PLAYER_KEYS_CFLAGS = @MEDIA_PLAYER_KEYS_CFLAGS@
-MEDIA_PLAYER_KEYS_LIBS = @MEDIA_PLAYER_KEYS_LIBS@
-MISSING_PLUGINS_CFLAGS = @MISSING_PLUGINS_CFLAGS@
-MISSING_PLUGINS_LIBS = @MISSING_PLUGINS_LIBS@
-MKDIR_P = @MKDIR_P@
-MM_CFLAGS = @MM_CFLAGS@
-MM_LIBS = @MM_LIBS@
-MSGFMT = @MSGFMT@
-MSGMERGE = @MSGMERGE@
-NAUTILUSDIR = @NAUTILUSDIR@
-NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
-NAUTILUS_LIBS = @NAUTILUS_LIBS@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OMF_DIR = @OMF_DIR@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PEASGTK_CFLAGS = @PEASGTK_CFLAGS@
-PEASGTK_LIBS = @PEASGTK_LIBS@
-PEAS_CFLAGS = @PEAS_CFLAGS@
-PEAS_LIBS = @PEAS_LIBS@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PLUGINDIR = @PLUGINDIR@
-PLUGINS = @PLUGINS@
-PYGOBJECT_CFLAGS = @PYGOBJECT_CFLAGS@
-PYGOBJECT_LIBS = @PYGOBJECT_LIBS@
-PYLINT = @PYLINT@
-PYTHON = @PYTHON@
-PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
-PYTHON_PLATFORM = @PYTHON_PLATFORM@
-PYTHON_PREFIX = @PYTHON_PREFIX@
-PYTHON_VERSION = @PYTHON_VERSION@
-RANLIB = @RANLIB@
-SAVE_FILE_CFLAGS = @SAVE_FILE_CFLAGS@
-SAVE_FILE_CHECK_CFLAGS = @SAVE_FILE_CHECK_CFLAGS@
-SAVE_FILE_CHECK_LIBS = @SAVE_FILE_CHECK_LIBS@
-SAVE_FILE_LIBS = @SAVE_FILE_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SMCLIENT_CFLAGS = @SMCLIENT_CFLAGS@
-SMCLIENT_LIBS = @SMCLIENT_LIBS@
-STRIP = @STRIP@
-TOTEM_API_VERSION = @TOTEM_API_VERSION@
-TOTEM_PLPARSER_REQS = @TOTEM_PLPARSER_REQS@
-TOTEM_VERSION_MAJOR = @TOTEM_VERSION_MAJOR@
-TOTEM_VERSION_MICRO = @TOTEM_VERSION_MICRO@
-TOTEM_VERSION_MINOR = @TOTEM_VERSION_MINOR@
-USE_NLS = @USE_NLS@
-VALAC = @VALAC@
-VERSION = @VERSION@
-WARN_CFLAGS = @WARN_CFLAGS@
-WARN_CXXFLAGS = @WARN_CXXFLAGS@
-XGETTEXT = @XGETTEXT@
-XMKMF = @XMKMF@
-XTEST_LIBS = @XTEST_LIBS@
-X_LIBS = @X_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-gsettingsschemadir = @gsettingsschemadir@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-intltool__v_merge_options_ = @intltool__v_merge_options_@
-intltool__v_merge_options_0 = @intltool__v_merge_options_0@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-pkgpyexecdir = @pkgpyexecdir@
-pkgpythondir = @pkgpythondir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-pyexecdir = @pyexecdir@
-pythondir = @pythondir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
-CLEANFILES = $(plugin_DATA)
-DISTCLEANFILES = $(plugin_DATA)
-EXTRA_DIST = $(plugin_in_files) $(ui_DATA)
-plugin_cflags = \
-	$(DEPENDENCY_CFLAGS)	\
-	$(PEAS_CFLAGS)		\
-	$(WARN_CFLAGS)
-
-plugin_ldflags = \
-	-export-dynamic \
-	-no-undefined \
-	-avoid-version \
-	-module
-
-plugin_libadd = \
-	$(top_builddir)/src/libtotem.la
-
-plugindir = $(PLUGINDIR)/iplayer
-plugin_PYTHON = iplayer.py iplayer2.py listparser.py
-plugin_in_files = iplayer.plugin.in
-uidir = $(plugindir)
-ui_DATA = iplayer.ui
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/plugins/Makefile.plugins $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/plugins/iplayer/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu src/plugins/iplayer/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-$(top_srcdir)/src/plugins/Makefile.plugins:
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-install-pluginPYTHON: $(plugin_PYTHON)
-	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
-	@list='$(plugin_PYTHON)'; dlist=; list2=; test -n "$(plugindir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
-	  if test -f $$b$$p; then \
-	    $(am__strip_dir) \
-	    dlist="$$dlist $$f"; \
-	    list2="$$list2 $$b$$p"; \
-	  else :; fi; \
-	done; \
-	for file in $$list2; do echo $$file; done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(plugindir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(plugindir)" || exit $$?; \
-	done || exit $$?; \
-	if test -n "$$dlist"; then \
-	  $(am__py_compile) --destdir "$(DESTDIR)" \
-	                    --basedir "$(plugindir)" $$dlist; \
-	else :; fi
-
-uninstall-pluginPYTHON:
-	@$(NORMAL_UNINSTALL)
-	@list='$(plugin_PYTHON)'; test -n "$(plugindir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	dir='$(DESTDIR)$(plugindir)'; \
-	filesc=`echo "$$files" | sed 's|$$|c|'`; \
-	fileso=`echo "$$files" | sed 's|$$|o|'`; \
-	st=0; \
-	for files in "$$files" "$$filesc" "$$fileso"; do \
-	  $(am__uninstall_files_from_dir) || st=$$?; \
-	done; \
-	exit $$st
-install-pluginDATA: $(plugin_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
-	@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(plugindir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(plugindir)" || exit $$?; \
-	done
-
-uninstall-pluginDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
-install-uiDATA: $(ui_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)"
-	@list='$(ui_DATA)'; test -n "$(uidir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(uidir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(uidir)" || exit $$?; \
-	done
-
-uninstall-uiDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(ui_DATA)'; test -n "$(uidir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(uidir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(DATA)
-installdirs:
-	for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(uidir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-pluginDATA install-pluginPYTHON \
-	install-uiDATA
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-pluginDATA uninstall-pluginPYTHON \
-	uninstall-uiDATA
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-pluginDATA install-pluginPYTHON \
-	install-ps install-ps-am install-strip install-uiDATA \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-pluginDATA uninstall-pluginPYTHON uninstall-uiDATA
-
-%.plugin: %.plugin.in
-	$(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-
-# Checking rules for Python plugins
-# Execute pylint on all the requisite files individually, returning non-zero
-# iff any of the calls to pylint returned non-zero.
-check-pylint: $(plugin_PYTHON)
-@ENABLE_PYTHON_TRUE@	@exitstatus=0; \
-@ENABLE_PYTHON_TRUE@	for py in $^; do \
-@ENABLE_PYTHON_TRUE@		$(PYLINT) -i y -d C0111 -d W0511 -d F0401 $$py; \
-@ENABLE_PYTHON_TRUE@		\
-@ENABLE_PYTHON_TRUE@		newexitstatus=$$?; \
-@ENABLE_PYTHON_TRUE@		if [ $$exitstatus == 0 ]; then \
-@ENABLE_PYTHON_TRUE@			exitstatus=$$newexitstatus; \
-@ENABLE_PYTHON_TRUE@		fi; \
-@ENABLE_PYTHON_TRUE@	done; \
-@ENABLE_PYTHON_TRUE@	exit $$exitstatus
-
-check: check-pylint
-
-.PHONY: check-pylint
-
--include $(top_srcdir)/git.mk
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff -Nru totem-3.4.3/src/plugins/iplayer/iplayer.plugin.in totem-3.6.2/src/plugins/iplayer/iplayer.plugin.in
--- totem-3.4.3/src/plugins/iplayer/iplayer.plugin.in	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/plugins/iplayer/iplayer.plugin.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-[Plugin]
-Loader=python
-Module=iplayer
-IAge=1
-_Name=BBC iPlayer
-_Description=Stream BBC programs from the last 7 days from the BBC iPlayer service.
-Authors=Philip Withnall 
-Copyright=Copyright © 2009 Philip Withnall
-Website=http://projects.gnome.org/totem/
diff -Nru totem-3.4.3/src/plugins/iplayer/iplayer.py totem-3.6.2/src/plugins/iplayer/iplayer.py
--- totem-3.4.3/src/plugins/iplayer/iplayer.py	2012-01-10 16:10:04.000000000 +0000
+++ totem-3.6.2/src/plugins/iplayer/iplayer.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,266 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import gettext
-from gi.repository import GObject, Peas, Totem # pylint: disable-msg=E0611
-import iplayer2
-import threading
-
-gettext.textdomain ("totem")
-
-D_ = gettext.dgettext
-_ = gettext.gettext
-
-class IplayerPlugin (GObject.Object, Peas.Activatable):
-    __gtype_name__ = 'IplayerPlugin'
-
-    object = GObject.property (type = GObject.Object)
-
-    def __init__ (self):
-        GObject.Object.__init__ (self)
-
-        self.debug = False
-        self.totem = None
-        self.programme_download_lock = threading.Lock ()
-
-        self.tv_feed = None
-        self.tv_tree_store = None
-
-    def do_activate (self):
-        self.totem = self.object
-        # Build the interface
-        builder = Totem.plugin_load_interface ("iplayer", "iplayer.ui", True,
-                                               self.totem.get_main_window (),
-                                               self)
-        container = builder.get_object ('iplayer_vbox')
-
-        self.tv_tree_store = builder.get_object ('iplayer_programme_store')
-        programme_list = builder.get_object ('iplayer_programme_list')
-        programme_list.connect ('row-expanded', self.__row_expanded_cb)
-        programme_list.connect ('row-activated', self.__row_activated_cb)
-
-        container.show_all ()
-
-        self.tv_feed = iplayer2.Feed ('tv')
-
-        # Add the interface to Totem's sidebar
-        self.totem.add_sidebar_page ("iplayer", _(u"BBC iPlayer"), container)
-
-        # Get the channel category listings
-        self._populate_channel_list (self.tv_feed, self.tv_tree_store)
-
-    def do_deactivate (self):
-        self.totem.remove_sidebar_page ("iplayer")
-
-    def _populate_channel_list (self, feed, tree_store):
-        if self.debug:
-            print "Populating channel list…"
-
-        # Add all the channels as top-level rows in the tree store
-        channels = feed.channels ()
-        for channel_id, title in channels.items ():
-            tree_store.append (None, (title, channel_id, None))
-
-        # Add the channels' categories in a thread, since they each require a
-        # network request
-        thread = PopulateChannelsThread (self.__populate_channel_list_cb,
-                                         feed, tree_store)
-        thread.start ()
-
-    def __populate_channel_list_cb (self, tree_store, parent_path, values):
-        # Callback from PopulateChannelsThread to add stuff to the tree store
-        if values == None:
-            self.totem.action_error (_(u'Error listing channel categories'),
-                                     _(u'There was an unknown error getting '\
-                                        'the list of television channels '\
-                                        'available on BBC iPlayer.'))
-            return False
-
-        parent_iter = tree_store.get_iter (parent_path)
-        category_iter = tree_store.append (parent_iter, values)
-
-        # Append a dummy child row so that the expander's visible; we can
-        # then queue off the expander to load the programme listing for this
-        # category
-        tree_store.append (category_iter, [_(u'Loading…'), None, None])
-
-        return False
-
-    def __row_expanded_cb (self, tree_view, row_iter, path):
-        tree_model = tree_view.get_model ()
-
-        if self.debug:
-            print "__row_expanded_cb called."
-
-        # We only care about the category level (level 1), and only when
-        # it has the "Loading..." placeholder child row
-        if (get_iter_level (tree_model, row_iter) != 1 or
-            tree_model.iter_n_children (row_iter) != 1):
-            return
-
-        # Populate it with programmes asynchronously
-        self._populate_programme_list (self.tv_feed, tree_model, row_iter)
-
-    def __row_activated_cb (self, tree_view, path, view_column):
-        tree_store = tree_view.get_model ()
-        tree_iter = tree_store.get_iter (path)
-        if tree_iter == None:
-            return
-
-        mrl = tree_store.get_value (tree_iter, 2)
-
-        # Only allow programme rows to be activated, not channel or category
-        # rows
-        if mrl == None:
-            return
-
-        # Add the programme to the playlist and play it
-        title = tree_store.get_value (tree_iter, 0)
-        self.totem.add_to_playlist_and_play (mrl, title, True)
-
-    def _populate_programme_list (self, feed, tree_store, category_iter):
-        if self.debug:
-            print "Populating programme list…"
-
-        category_path = tree_store.get_path (category_iter)
-        thread = PopulateProgrammesThread (self.programme_download_lock,
-                                           self.__populate_programme_list_cb,
-                                           feed, (tree_store, category_path))
-        thread.start ()
-
-    def __populate_programme_list_cb (self, tree_store, category_path, values,
-                                     remove_placeholder):
-        # Callback from PopulateProgrammesThread to add stuff to the tree store
-        if values == None:
-            # Translators: the "programme feed" is the list of TV shows
-            # available to watch online
-            self.totem.action_error (_(u'Error getting programme feed'),
-                                     _(u'There was an error getting the list '\
-                                        'of programmes for this channel and '\
-                                        'category combination.'))
-            return False
-
-        category_iter = tree_store.get_iter (category_path)
-        if category_iter != None:
-            tree_store.append (category_iter, values)
-
-        # Remove the placeholder row
-        children = tree_store.iter_children (category_iter)
-        if remove_placeholder and children != None:
-            tree_store.remove (children)
-
-        return False
-
-def get_iter_level (tree_model, tree_iter):
-    i = 0
-    while True:
-        tree_iter = tree_model.iter_parent (tree_iter)
-        if tree_iter == None:
-            break
-        i += 1
-    return i
-
-def category_name_to_id (category_name):
-    return category_name.lower ().replace (' ', '_').replace ('&', 'and')
-
-class PopulateChannelsThread (threading.Thread):
-    # Class to populate the channel list from the Internet
-    def __init__ (self, callback, feed, tree_model):
-        self.callback = callback
-        self.feed = feed
-        self.tree_model = tree_model
-        threading.Thread.__init__ (self)
-
-    def run (self):
-        shown_error = False
-        tree_iter = self.tree_model.get_iter_first ()
-        while (tree_iter != None):
-            channel_id = self.tree_model.get_value (tree_iter, 1)
-            parent_path = self.tree_model.get_path (tree_iter)
-
-            try:
-                # Add this channel's categories as sub-rows
-                # We have to pass a path because the model could theoretically
-                # be modified while the idle function is waiting in the queue,
-                # invalidating an iter
-                for name, _count in self.feed.get (channel_id).categories ():
-                    category_id = category_name_to_id (name)
-                    GObject.idle_add (self.callback,
-                                      self.tree_model, parent_path,
-                                      [name, category_id, None])
-            except StandardError:
-                # Only show the error once, rather than for each channel
-                # (it gets a bit grating)
-                if not shown_error:
-                    GObject.idle_add (self.callback,
-                                      self.tree_model, parent_path, None)
-                    shown_error = True
-
-            tree_iter = self.tree_model.iter_next (tree_iter)
-
-class PopulateProgrammesThread (threading.Thread):
-    # Class to populate the programme list for a channel/category combination
-    # from the Internet
-    def __init__ (self, download_lock, callback, feed,
-                  (tree_model, category_path)):
-        self.download_lock = download_lock
-        self.callback = callback
-        self.feed = feed
-        self.tree_model = tree_model
-        self.category_path = category_path
-        threading.Thread.__init__ (self)
-
-    def run (self):
-        self.download_lock.acquire ()
-
-        category_iter = self.tree_model.get_iter (self.category_path)
-        if category_iter == None:
-            GObject.idle_add (self.callback,
-                              self.tree_model, self.category_path, None, False)
-            self.download_lock.release ()
-            return
-
-        category_id = self.tree_model.get_value (category_iter, 1)
-        parent_iter = self.tree_model.iter_parent (category_iter)
-        channel_id = self.tree_model.get_value (parent_iter, 1)
-
-        # Retrieve the programmes and return them
-        feed = self.feed.get (channel_id).get (category_id)
-        if feed == None:
-            GObject.idle_add (self.callback,
-                              self.tree_model, self.category_path, None, False)
-            self.download_lock.release ()
-            return
-
-        # Get the programmes
-        try:
-            programmes = feed.list ()
-        except StandardError:
-            GObject.idle_add (self.callback,
-                              self.tree_model, self.category_path, None, False)
-            self.download_lock.release ()
-            return
-
-        # Add the programmes to the tree store
-        remove_placeholder = True
-        for programme in programmes:
-            programme_item = programme.programme
-
-            # Get the media, which gives the stream URI.
-            # We go for mobile quality, since the higher-quality streams are
-            # RTMP-only which isn't currently supported by GStreamer or xine
-            # TODO: Use higher-quality streams once
-            # http://bugzilla.gnome.org/show_bug.cgi?id=566604 is fixed
-            media = programme_item.get_media_for ('mobile')
-            if media == None:
-                # Not worth displaying an error in the interface for this
-                print "Programme has no HTTP streams"
-                continue
-
-            GObject.idle_add (self.callback,
-                              self.tree_model, self.category_path,
-                              [programme.get_title (), programme.get_summary (),
-                               media.url],
-                              remove_placeholder)
-            remove_placeholder = False
-
-        self.download_lock.release ()
diff -Nru totem-3.4.3/src/plugins/iplayer/iplayer.ui totem-3.6.2/src/plugins/iplayer/iplayer.ui
--- totem-3.4.3/src/plugins/iplayer/iplayer.ui	2011-08-25 18:35:01.000000000 +0000
+++ totem-3.6.2/src/plugins/iplayer/iplayer.ui	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-
-
-
-
-	
-		
-		
-		
-	
-
-
-
-	5
-	False
-	6
-	
-		
-			GTK_POLICY_AUTOMATIC
-			GTK_POLICY_AUTOMATIC
-			GTK_SHADOW_IN
-			
-				
-					iplayer_programme_store
-					iplayer_title_column
-					False
-					
-						
-							
-								
-								
-									0
-								
-							
-						
-					
-				
-			
-		
-	
-
-
diff -Nru totem-3.4.3/src/plugins/iplayer/iplayer2.py totem-3.6.2/src/plugins/iplayer/iplayer2.py
--- totem-3.4.3/src/plugins/iplayer/iplayer2.py	2012-01-10 16:10:04.000000000 +0000
+++ totem-3.6.2/src/plugins/iplayer/iplayer2.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,1045 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-# pylint: disable-msg=C0302
-
-# Python libs
-import re, os
-import urllib2
-#import logging
-#from pprint import pformat
-from socket import timeout as SocketTimeoutError
-#from time import time
-import gettext
-
-# external libs
-import httplib2
-import listparser
-from BeautifulSoup import BeautifulStoneSoup
-
-gettext.textdomain ("totem")
-
-D_ = gettext.dgettext
-_ = gettext.gettext
-
-IMG_DIR = os.path.join (os.getcwd (), 'resources', 'media')
-
-#try:
-#    logging.basicConfig (
-#        filename='iplayer2.log',
-#        filemode='w',
-#        format='%(asctime)s %(levelname)4s %(message)s',
-#        level=logging.DEBUG
-#    )
-#except IOError:
-#    #print "iplayer2 logging to stdout"
-#    logging.basicConfig (
-#        stream=sys.stdout,
-#        level=logging.DEBUG,
-#        format='iplayer2.py: %(asctime)s %(levelname)4s %(message)s',
-#    )
-
-# http://colinm.org/blog/on-demand-loading-of-flickr-photo-metadata
-# returns immediately for all previously-called functions
-def call_once (function):
-    called_by = {}
-    def result (self):
-        if self in called_by:
-            return
-        called_by[self] = True
-        function (self)
-    return result
-
-# runs loader before decorated function
-def loaded_by (loader):
-    def decorator (function):
-        def result (self, *args, **kwargs):
-            loader (self)
-            return function (self, *args, **kwargs)
-        return result
-    return decorator
-
-CHANNELS_TV_LIST = [
-    ('bbc_one', 'BBC One'),
-    ('bbc_two', 'BBC Two'),
-    ('bbc_three', 'BBC Three'),
-    ('bbc_four', 'BBC Four'),
-    ('cbbc', 'CBBC'),
-    ('cbeebies', 'CBeebies'),
-    ('bbc_news24', 'BBC News Channel'),
-    ('bbc_parliament', 'BBC Parliament'),
-    ('bbc_hd', 'BBC HD'),
-    ('bbc_alba', 'BBC Alba'),
-]
-CHANNELS_TV = dict (CHANNELS_TV_LIST)
-CHANNELS_NATIONAL_RADIO_LIST = [
-    ('bbc_radio_one', 'Radio 1'),
-    ('bbc_1xtra', '1 Xtra'),
-    ('bbc_radio_two', 'Radio 2'),
-    ('bbc_radio_three', 'Radio 3'),
-    ('bbc_radio_four', 'Radio 4'),
-    ('bbc_radio_five_live', '5 Live'),
-    ('bbc_radio_five_live_sports_extra', '5 Live Sports Extra'),
-    ('bbc_6music', '6 Music'),
-    ('bbc_7', 'BBC 7'),
-    ('bbc_asian_network', 'Asian Network'),
-    ('bbc_radio_scotland', 'BBC Scotland'),
-    ('bbc_radio_ulster', 'BBC Ulster'),
-    ('bbc_radio_foyle', 'Radio Foyle'),
-    ('bbc_radio_wales', 'BBC Wales'),
-    ('bbc_radio_cymru', 'BBC Cymru'),
-    ('bbc_world_service', 'World Service'),
-    ('bbc_radio_nan_gaidheal', 'BBC nan Gaidheal')
-]
-CHANNELS_LOCAL_RADIO_LIST = [
-    ('bbc_radio_cumbria', 'BBC Cumbria'),
-    ('bbc_radio_newcastle', 'BBC Newcastle'),
-    ('bbc_tees', 'BBC Tees'),
-    ('bbc_radio_lancashire', 'BBC Lancashire'),
-    ('bbc_radio_merseyside', 'BBC Merseyside'),
-    ('bbc_radio_manchester', 'BBC Manchester'),
-    ('bbc_radio_leeds', 'BBC Leeds'),
-    ('bbc_radio_sheffield', 'BBC Sheffield'),
-    ('bbc_radio_york', 'BBC York'),
-    ('bbc_radio_humberside', 'BBC Humberside'),
-    ('bbc_radio_lincolnshire', 'BBC Lincolnshire'),
-    ('bbc_radio_nottingham', 'BBC Nottingham'),
-    ('bbc_radio_leicester', 'BBC Leicester'),
-    ('bbc_radio_derby', 'BBC Derby'),
-    ('bbc_radio_stoke', 'BBC Stoke'),
-    ('bbc_radio_shropshire', 'BBC Shropshire'),
-    ('bbc_wm', 'BBC WM'),
-    ('bbc_radio_coventry_warwickshire', 'BBC Coventry Warwickshire'),
-    ('bbc_radio_hereford_worcester', 'BBC Hereford/Worcester'),
-    ('bbc_radio_northampton', 'BBC Northampton'),
-    ('bbc_three_counties_radio', 'BBC Three Counties Radio'),
-    ('bbc_radio_cambridge', 'BBC Cambridge'),
-    ('bbc_radio_norfolk', 'BBC Norfolk'),
-    ('bbc_radio_suffolk', 'BBC Suffolk'),
-    ('bbc_radio_essex', 'BBC Essex'),
-    ('bbc_london', 'BBC London'),
-    ('bbc_radio_kent', 'BBC Kent'),
-    ('bbc_southern_counties_radio', 'BBC Southern Counties Radio'),
-    ('bbc_radio_oxford', 'BBC Oxford'),
-    ('bbc_radio_berkshire', 'BBC Berkshire'),
-    ('bbc_radio_solent', 'BBC Solent'),
-    ('bbc_radio_gloucestershire', 'BBC Gloucestershire'),
-    ('bbc_radio_swindon', 'BBC Swindon'),
-    ('bbc_radio_wiltshire', 'BBC Wiltshire'),
-    ('bbc_radio_bristol', 'BBC Bristol'),
-    ('bbc_radio_somerset_sound', 'BBC Somerset'),
-    ('bbc_radio_devon', 'BBC Devon'),
-    ('bbc_radio_cornwall', 'BBC Cornwall'),
-    ('bbc_radio_guernsey', 'BBC Guernsey'),
-    ('bbc_radio_jersey', 'BBC Jersey')
-]
-
-LOGO_URI = 'http://www.bbc.co.uk/englandcms/'
-CHANNELS_LOGOS = {
-    'bbc_radio_cumbria': LOGO_URI + 'localradio/images/cumbria.gif',
-    'bbc_radio_newcastle': LOGO_URI + 'localradio/images/newcastle.gif',
-    'bbc_tees': LOGO_URI + 'localradio/images/tees.gif',
-    'bbc_radio_lancashire': LOGO_URI + 'images/rh_nav170_lancs.gif',
-    'bbc_radio_merseyside': LOGO_URI + 'localradio/images/merseyside.gif',
-    'bbc_radio_manchester': os.path.join (IMG_DIR, 'bbc_local_radio.png'),
-    'bbc_radio_leeds': LOGO_URI + 'images/rh_nav170_leeds.gif',
-    'bbc_radio_sheffield': LOGO_URI + 'images/rh_nav170_sheffield.gif',
-    'bbc_radio_york': LOGO_URI + 'localradio/images/york.gif',
-    'bbc_radio_humberside': 'http://www.bbc.co.uk/radio/images/home/'\
-                            'r-home-nation-regions.gif',
-    'bbc_radio_lincolnshire': LOGO_URI + 'localradio/images/lincs.gif',
-    'bbc_radio_nottingham': os.path.join (IMG_DIR, 'bbc_local_radio.png'),
-    'bbc_radio_leicester': LOGO_URI + 'localradio/images/leicester.gif',
-    'bbc_radio_derby': LOGO_URI + 'derby/images/rh_nav170_derby.gif',
-    'bbc_radio_stoke': LOGO_URI + 'localradio/images/stoke.gif',
-    'bbc_radio_shropshire': LOGO_URI + 'localradio/images/shropshire.gif',
-    'bbc_wm': os.path.join (IMG_DIR, 'bbc_local_radio.png'),
-    'bbc_radio_coventry_warwickshire': LOGO_URI + 'localradio/images/'\
-                                                  'cov_warks.gif',
-    'bbc_radio_hereford_worcester': LOGO_URI + 'localradio/images/'\
-                                               'hereford_worcester.gif',
-    'bbc_radio_northampton': LOGO_URI + 'localradio/images/northampton.gif',
-    'bbc_three_counties_radio': LOGO_URI + 'images/rh_nav170_3counties.gif',
-    'bbc_radio_cambridge': LOGO_URI + 'localradio/images/cambridgeshire.gif',
-    'bbc_radio_norfolk': LOGO_URI + 'localradio/images/norfolk.gif',
-    'bbc_radio_suffolk': LOGO_URI + 'localradio/images/suffolk.gif',
-    'bbc_radio_essex': LOGO_URI + 'images/rh_nav170_essex.gif',
-    'bbc_london': os.path.join (IMG_DIR, 'bbc_local_radio.png'),
-    'bbc_radio_kent': 'http://www.bbc.co.uk/radio/images/home/'\
-                      'r-home-nation-regions.gif',
-    'bbc_southern_counties_radio': os.path.join (IMG_DIR,
-                                                 'bbc_local_radio.png'),
-    'bbc_radio_oxford': LOGO_URI + 'images/rh_nav170_oxford.gif',
-    'bbc_radio_berkshire': LOGO_URI + 'images/rh_nav170_berks.gif',
-    'bbc_radio_solent': LOGO_URI + 'localradio/images/solent.gif',
-    'bbc_radio_gloucestershire': LOGO_URI + 'localradio/images/'\
-                                            'gloucestershire.gif',
-    'bbc_radio_swindon': os.path.join (IMG_DIR, 'bbc_local_radio.png'),
-    'bbc_radio_wiltshire': os.path.join (IMG_DIR, 'bbc_local_radio.png'),
-    'bbc_radio_bristol': LOGO_URI + 'localradio/images/bristol.gif',
-    'bbc_radio_somerset_sound': LOGO_URI + 'images/rh_nav170_somerset.gif',
-    'bbc_radio_devon': LOGO_URI + 'images/rh_nav170_devon.gif',
-    'bbc_radio_cornwall': LOGO_URI + 'localradio/images/cornwall.gif',
-    'bbc_radio_guernsey': LOGO_URI + 'localradio/images/guernsey.gif',
-    'bbc_radio_jersey': LOGO_URI + 'localradio/images/jersey.gif'
-}
-
-
-CHANNELS_NATIONAL_RADIO = dict (CHANNELS_NATIONAL_RADIO_LIST)
-CHANNELS_LOCAL_RADIO = dict (CHANNELS_LOCAL_RADIO_LIST)
-CHANNELS_RADIO_LIST = CHANNELS_NATIONAL_RADIO_LIST + CHANNELS_LOCAL_RADIO_LIST
-CHANNELS_RADIO = dict (CHANNELS_RADIO_LIST)
-
-CHANNELS = dict (CHANNELS_TV_LIST + CHANNELS_RADIO_LIST)
-CATEGORIES_LIST = [
-    ('childrens', 'Children\'s'),
-    ('comedy', 'Comedy'),
-    ('drama', 'Drama'),
-    ('entertainment', 'Entertainment'),
-    ('factual', 'Factual'),
-    ('films', 'Films'),
-    ('music', 'Music'),
-    ('news', 'News'),
-    ('religion_and_ethics', 'Religion & Ethics'),
-    ('sport', 'Sport'),
-    ('signed', 'Sign Zone'),
-    ('northern_ireland', 'Northern Ireland'),
-    ('scotland', 'Scotland'),
-    ('wales', 'Wales')
-]
-CATEGORIES = dict (CATEGORIES_LIST)
-
-ENGLAND_RADIO_URI = 'http://www.bbc.co.uk/england/'
-LIVE_RADIO_STATIONS = {
-    'Radio 1': 'http://www.bbc.co.uk/radio1/wm_asx/aod/radio1_hi.asx',
-    '1 Xtra':  'http://www.bbc.co.uk/1xtra/realmedia/1xtra_hi.asx',
-    'Radio 2': 'http://www.bbc.co.uk/radio2/wm_asx/aod/radio2_hi.asx',
-    'BBC 3': 'http://www.bbc.co.uk/radio3/wm_asx/aod/radio3_hi.asx',
-    'BBC 4': 'http://www.bbc.co.uk/radio4/wm_asx/aod/radio4.asx',
-    '5 Live':  'http://www.bbc.co.uk/fivelive/live/live.asx',
-    '5 Live Sports Extra': 'http://www.bbc.co.uk/fivelive/live/'\
-                           'live_sportsextra.asx',
-    '6 Music': 'http://www.bbc.co.uk/6music/ram/6music_hi.asx',
-    'BBC 7':   'http://www.bbc.co.uk/bbc7/realplayer/bbc7_hi.asx',
-    'Asian Network': 'http://www.bbc.co.uk/asiannetwork/rams/asiannet_hi.asx',
-    'Radio Scotland': 'http://www.bbc.co.uk/scotland/radioscotland/media/'\
-                      'radioscotland.ram',
-    'World Service': 'http://www.bbc.co.uk/worldservice/meta/tx/nb/'\
-                     'live_eneuk_au_nb.asx',
-    'BBC London': ENGLAND_RADIO_URI + 'london.ram',
-    'BBC Berkshire': ENGLAND_RADIO_URI + 'radioberkshire.ram',
-    'BBC Bristol': ENGLAND_RADIO_URI + 'bristol.ram',
-    'BBC Cambridgeshire': ENGLAND_RADIO_URI + 'cambridgeshire.ram',
-    'BBC Cornwall': ENGLAND_RADIO_URI + 'cornwall.ram',
-    'BBC Cumbria': ENGLAND_RADIO_URI + 'cumbria.ram',
-    'BBC Derby': ENGLAND_RADIO_URI + 'derby.ram',
-    'BBC Devon': ENGLAND_RADIO_URI + 'devon.ram',
-    'BBC Essex': ENGLAND_RADIO_URI + 'essex.ram',
-    'BBC Gloucestershire': ENGLAND_RADIO_URI + 'gloucestershire.ram',
-    'BBC Guernsey': ENGLAND_RADIO_URI + 'guernsey.ram',
-    'BBC Hereford/Worcester': ENGLAND_RADIO_URI + 'herefordandworcester.ram',
-    'BBC Humberside': ENGLAND_RADIO_URI + 'humberside.ram',
-    'BBC Jersey': ENGLAND_RADIO_URI + 'jersey.ram',
-    'BBC Kent': ENGLAND_RADIO_URI + 'kent.ram',
-    'BBC Lancashire': ENGLAND_RADIO_URI + 'lancashire.ram',
-    'BBC Leeds': ENGLAND_RADIO_URI + 'leeds.ram',
-    'BBC Leicester': ENGLAND_RADIO_URI + 'leicester.ram',
-    'BBC Lincolnshire': ENGLAND_RADIO_URI + 'lincolnshire.ram',
-    'BBC Manchester': ENGLAND_RADIO_URI + 'manchester.ram',
-    'BBC Merseyside': ENGLAND_RADIO_URI + 'merseyside.ram',
-    'BBC Newcastle': ENGLAND_RADIO_URI + 'newcastle.ram',
-    'BBC Norfolk': ENGLAND_RADIO_URI + 'norfolk.ram',
-    'BBC Northampton': ENGLAND_RADIO_URI + 'northampton.ram',
-    'BBC Nottingham': ENGLAND_RADIO_URI + 'nottingham.ram',
-    'BBC Oxford': ENGLAND_RADIO_URI + 'radiooxford.ram',
-    'BBC Sheffield': ENGLAND_RADIO_URI + 'sheffield.ram',
-    'BBC Shropshire': ENGLAND_RADIO_URI + 'shropshire.ram',
-    'BBC Solent': ENGLAND_RADIO_URI + 'solent.ram',
-    'BBC Somerset Sound': ENGLAND_RADIO_URI + 'somerset.ram',
-    'BBC Southern Counties Radio': ENGLAND_RADIO_URI + 'southerncounties.ram',
-    'BBC Stoke': ENGLAND_RADIO_URI + 'stoke.ram',
-    'BBC Suffolk': ENGLAND_RADIO_URI + 'suffolk.ram',
-    'BBC Swindon': ENGLAND_RADIO_URI + 'swindon.ram',
-    'BBC Three Counties Radio': ENGLAND_RADIO_URI + 'threecounties.ram',
-    'BBC Wiltshire': ENGLAND_RADIO_URI + 'wiltshire.ram',
-    'BBC York': ENGLAND_RADIO_URI + 'york.ram',
-    'BBC WM': ENGLAND_RADIO_URI + 'wm.ram',
-    'BBC Cymru': 'http://www.bbc.co.uk/cymru/live/rc-live.ram',
-    'Radio Foyle': 'http://www.bbc.co.uk/northernireland/realmedia/rf-live.ram',
-    'BBC Scotland': 'http://www.bbc.co.uk/scotland/radioscotland/media/'\
-                    'radioscotland.ram',
-    'BBC nan Gaidheal': 'http://www.bbc.co.uk/scotland/alba/media/live/'\
-                        'radio_ng.ram',
-    'BBC Ulster': 'http://www.bbc.co.uk/ni/realmedia/ru-live.ram',
-    'BBC Wales': 'http://www.bbc.co.uk/wales/live/rwg2.ram',
-    'BBC Tees': ENGLAND_RADIO_URI + 'cleveland.ram',
-}
-
-LIVE_WEBCAMS = {
-    'Radio 1': 'http://www.bbc.co.uk/radio1/webcam/images/live/webcam.jpg',
-    '1 Xtra':  'http://www.bbc.co.uk/1xtra/webcam/live/1xtraa.jpg',
-    'Radio 2': 'http://www.bbc.co.uk/radio2/webcam/live/radio2.jpg',
-    '5 Live':  'http://www.bbc.co.uk/fivelive/inside/webcam/5Lwebcam1.jpg',
-    '6 Music': 'http://www.bbc.co.uk/6music/webcam/live/6music.jpg',
-    'Asian Network': 'http://www.bbc.co.uk/asiannetwork/webcams/birmingham.jpg'
-}
-
-RSS_CACHE = {}
-
-SELF_CLOSING_TAGS = ['alternate', 'mediator']
-
-HTTP_OBJECT = httplib2.Http ()
-
-class NoItemsError (Exception):
-    def __init__ (self, reason=None):
-        Exception.__init__ (self)
-        self.reason = reason
-
-    def __str__ (self):
-        reason = self.reason or _(u'')
-        return _(u'Programme unavailable ("%s")') % (reason)
-
-def httpget (url):
-    _response, data = HTTP_OBJECT.request (url, 'GET')
-    return data
-
-def parse_entry_id (entry_id):
-    # tag:bbc.co.uk,2008:PIPS:b00808sc
-    regexp = re.compile ('PIPS:([0-9a-z]{8})')
-    matches = regexp.findall (entry_id)
-    if not matches:
-        return None
-    return matches[0]
-
-class Media (object): # pylint: disable-msg=R0902
-    def __init__ (self, item, media_node):
-        self.item = item
-        self.href = None
-        self.kind = None
-        self.method = None
-        self.width, self.height = None, None
-
-        self.mimetype = None
-        self.encoding = None
-        self.live = False
-        self.connection_href = None
-        self.connection_protocol = None
-        self.connection_method = None
-        self.connection_kind = None
-        self.connection_live = False
-
-        self.__read_media_node (media_node)
-
-    @property
-    def url (self):
-        if self.connection_method == 'resolve':
-            #logging.info ("Resolving URL %s", self.connection_href)
-            page = urllib2.urlopen (self.connection_href)
-            page.close ()
-            url = page.geturl ()
-            #logging.info ("URL resolved to %s", url)
-            return url
-        else:
-            return self.connection_href
-
-    @property
-    def application (self):
-        """
-        The type of stream represented as a string.
-        i.e. 'captions', 'flashhigh', 'flashmed', 'flashwii', 'mobile', 'mp3'
-        or 'real'
-        """
-        tep = {}
-        tep['captions', 'application/ttaf+xml', None, 'http'] = 'captions'
-        tep['video', 'video/mp4', 'h264', 'rtmp'] = 'flashhigh'
-        tep['video', 'video/x-flv', 'vp6', 'rtmp'] = 'flashmed'
-        tep['video', 'video/x-flv', 'spark', 'rtmp'] = 'flashwii'
-        tep['video', 'video/mpeg', 'h264', 'http'] = 'mobile'
-        tep['audio', 'audio/mpeg', 'mp3', 'rtmp'] = 'mp3'
-        tep['audio', 'audio/real', 'real', 'http'] = 'real'
-        media = (self.kind, self.mimetype, self.encoding,
-                 self.connection_protocol)
-        return tep.get (media, None)
-
-    def __read_media_node (self, media):
-        """
-        Reads media info from a media XML node
-        media: media node from BeautifulStoneSoup
-        """
-        self.kind = media.get ('kind')
-        self.mimetype = media.get ('type')
-        self.encoding = media.get ('encoding')
-        self.width, self.height = media.get ('width'), media.get ('height')
-        self.live = media.get ('live') == 'true'
-
-        conn = media.find ('connection')
-        self.connection_kind = conn.get ('kind')
-        self.connection_live = conn.get ('live') == 'true'
-        self.connection_protocol = None
-        self.connection_href = None
-        self.connection_method = None
-
-        if self.connection_kind in ['http', 'sis']: # http
-            self.connection_href = conn.get ('href')
-            self.connection_protocol = 'http'
-            if self.mimetype == 'video/mp4' and self.encoding == 'h264':
-                # iPhone, don't redirect or it goes to license failure page
-                self.connection_method = 'iphone'
-            elif self.kind == 'captions':
-                self.connection_method = None
-            else:
-                self.connection_method = 'resolve'
-        elif self.connection_kind in ['level3', 'akamai']: #rtmp
-            self.connection_protocol = 'rtmp'
-            server = conn.get ('server')
-            identifier = conn.get ('identifier')
-
-            if not self.connection_live:
-                #logging.error ("No support for live streams!")
-                auth = conn.get ('authstring')
-                params = dict (ip=server, server=server, auth=auth,
-                               identifier=identifier)
-                self.connection_href = "rtmp://%(ip)s:1935/ondemand"\
-                                       "?_fcs_vhost=%(server)s&auth=%(auth)s"\
-                                       "&aifp=v001"\
-                                       "&slist=%(identifier)s" % params
-        #else:
-        #    logging.error ("connectionkind %s unknown", self.connection_kind)
-
-        #if self.connection_protocol:
-        #    logging.info ("conn protocol: %s - conn kind: %s - media type: "\
-        #                  "%s - media encoding: %s" %
-        #                 (self.connection_protocol, self.connection_kind,
-        #                  self.mimetype, self.encoding))
-        #    logging.info ("conn href: %s", self.connection_href)
-
-    @property
-    def programme (self):
-        return self.item.programme
-
-class Item (object): # pylint: disable-msg=R0902
-    """
-    Represents an iPlayer programme item. Most programmes consist of 2 such
-    items, (1) the ident, and (2) the actual programme. The item specifies the
-    properties of the media available, such as whether it's a radio/TV
-    programme, if it's live, signed, etc.
-    """
-
-    def __init__ (self, programme, item_node):
-        """
-        programme: a programme object that represents the 'parent' of this item.
-        item_node: an XML <item> node representing this item.
-        """
-        self.programme = programme
-        self.identifier = None
-        self.service = None
-        self.guidance = None
-        self.masterbrand = None
-        self.alternate = None
-        self.duration = ''
-        self.medias = None
-        self.group = None
-        self.kind = None
-        self.live = False
-        self.__read_item_node (item_node)
-
-    def __read_item_node (self, node):
-        """
-        Reads the specified XML <item> node and sets this instance's
-        properties.
-        """
-        self.kind = node.get ('kind')
-        self.identifier = node.get ('identifier')
-        #logging.info ('Found item: %s, %s', self.kind, self.identifier)
-        if self.kind in ['programme', 'radioProgramme']:
-            self.live = node.get ('live') == 'true'
-            #self.title = node.get ('title')
-            self.group = node.get ('group')
-            self.duration = node.get ('duration')
-            #self.broadcast = node.broadcast
-            self.service = node.service and node.service.get ('id')
-            self.masterbrand = node.masterbrand and node.masterbrand.get ('id')
-            self.alternate = node.alternate and node.alternate.get ('id')
-            self.guidance = node.guidance
-
-    @property
-    def is_radio (self):
-        """ True if this stream is a radio programme. """
-        return self.kind == 'radioProgramme'
-
-    @property
-    def is_tv (self):
-        """ True if this stream is a TV programme. """
-        return self.kind == 'programme'
-
-    @property
-    def is_ident (self):
-        """ True if this stream is an ident. """
-        return self.kind == 'ident'
-
-    @property
-    def is_programme (self):
-        """ True if this stream is a programme (TV or Radio). """
-        return self.is_radio or self.is_tv
-
-    @property
-    def is_live (self):
-        """ True if this stream is being broadcast live. """
-        return self.live
-
-    @property
-    def is_signed (self):
-        """ True if this stream is 'signed' for the hard-of-hearing. """
-        return self.alternate == 'signed'
-
-    @property
-    def mediaselector_url (self):
-        url = "http://www.bbc.co.uk/mediaselector/4/mtis/stream/%s"
-        return url % self.identifier
-
-    @property
-    def media (self):
-        """
-        Returns a list of all the media available for this item.
-        """
-        if self.medias:
-            return self.medias
-        url = self.mediaselector_url
-        #logging.info ("Stream XML URL: %s", str (url))
-        _response, xml = HTTP_OBJECT.request (url)
-        entities = BeautifulStoneSoup.XML_ENTITIES
-        soup = BeautifulStoneSoup (xml, convertEntities = entities)
-        medias = [Media (self, m) for m in soup ('media')]
-        #logging.info ('Found media: %s', pformat (medias, indent=8))
-        self.medias = medias
-        return medias
-
-    def get_media_for (self, application):
-        """
-        Returns a media object for the given application type.
-        """
-        medias = [m for m in self.media if m.application == application]
-        if not medias:
-            return None
-        return medias[0]
-
-    def get_medias_for (self, applications):
-        """
-        Returns a dictionary of media objects for the given application types.
-        """
-        medias = [m for m in self.media if m.application in applications]
-        dictionary = {}.fromkeys (applications)
-        for media in medias:
-            dictionary[media.application] = media
-        return dictionary
-
-class Programme (object):
-    """
-    Represents an individual iPlayer programme, as identified by an 8-letter
-    PID, and contains the programme title, subtitle, broadcast time and list of
-    playlist items (e.g. ident and then the actual programme.)
-    """
-
-    def __init__ (self, pid):
-        self.pid = pid
-        self.meta = {}
-        self._items = []
-        self._related = []
-
-    @call_once
-    def __read_playlist (self):
-        #logging.info ('Read playlist for %s...', self.pid)
-        self.__parse_playlist (self.playlist)
-
-    def get_playlist_xml (self):
-        """ Downloads and returns the XML for a PID from the iPlayer site. """
-        try:
-            url = self.playlist_url
-            #logging.info ("Getting XML playlist at URL: %s", url)
-            _response, xml = HTTP_OBJECT.request (url, 'GET')
-            return xml
-        except SocketTimeoutError:
-            #logging.error ("Timed out trying to download programme XML")
-            raise
-
-    def __parse_playlist (self, xml):
-        #logging.info ('Parsing playlist XML... %s', xml)
-
-        entities = BeautifulStoneSoup.XML_ENTITIES
-        soup = BeautifulStoneSoup (xml, selfClosingTags = SELF_CLOSING_TAGS,
-                                   convertEntities = entities)
-
-        self.meta = {}
-        self._items = []
-        self._related = []
-
-        #logging.info ('  Found programme: %s', soup.playlist.title.string)
-        self.meta['title'] = soup.playlist.title.string.encode ('utf-8')
-        self.meta['summary'] = soup.playlist.summary.string.encode ('utf-8')
-        self.meta['updated'] = soup.playlist.updated.string
-
-        if soup.playlist.noitems:
-            #logging.info ('No playlist items: %s',
-            #              soup.playlist.noitems.get ('reason'))
-            self.meta['reason'] = soup.playlist.noitems.get ('reason')
-
-        self._items = [Item (self, i) for i in soup ('item')]
-        #for i in self._items:
-        #    print i, i.alternate , " ",
-        #print
-
-        id_regexp = re.compile ('concept_pid: ([a-z0-9]{8})')
-        for link in soup ('relatedlink'):
-            i = {}
-            i['title'] = link.title.string
-            #i['summary'] = item.summary # FIXME looks like a bug in BSS
-            i['pid'] = (id_regexp.findall (link.id.string) or [None])[0]
-            i['programme'] = Programme (i['pid'])
-            self._related.append (i)
-
-    def get_thumbnail (self, size='large', tvradio='tv'):
-        """
-        Returns the URL of a thumbnail.
-        size: '640x360'/'biggest'/'largest' or '512x288'/'big'/'large' or None
-        """
-        url_format = "http://www.bbc.co.uk/iplayer/images/episode/%s_%d_%d.jpg"
-
-        if size in ['640x360', '640x', 'x360', 'biggest', 'largest']:
-            return url_format % (self.pid, 640, 360)
-        elif size in ['512x288', '512x', 'x288', 'big', 'large']:
-            return url_format % (self.pid, 512, 288)
-        elif size in ['178x100', '178x', 'x100', 'small']:
-            return url_format % (self.pid, 178, 100)
-        elif size in ['150x84', '150x', 'x84', 'smallest']:
-            return url_format % (self.pid, 150, 84)
-        else:
-            return os.path.join (IMG_DIR, '%s.png' % tvradio)
-
-
-    def get_url (self):
-        """
-        Returns the programmes episode page.
-        """
-        return "http://www.bbc.co.uk/iplayer/episode/%s" % (self.pid)
-
-    @property
-    def playlist_url (self):
-        return "http://www.bbc.co.uk/iplayer/playlist/%s" % self.pid
-
-    @property
-    def playlist (self):
-        return self.get_playlist_xml ()
-
-    def get_updated (self):
-        return self.meta['updated']
-
-    @loaded_by (__read_playlist)
-    def get_title (self):
-        return self.meta['title']
-
-    @loaded_by (__read_playlist)
-    def get_summary (self):
-        return self.meta['summary']
-
-    @loaded_by (__read_playlist)
-    def get_related (self):
-        return self._related
-
-    @loaded_by (__read_playlist)
-    def get_items (self):
-        if not self._items:
-            raise NoItemsError (self.meta['reason'])
-        return self._items
-
-    @property
-    def programme (self):
-        for i in self.items:
-            if i.is_programme:
-                return i
-        return None
-
-    title = property (get_title)
-    summary = property (get_summary)
-    updated = property (get_updated)
-    thumbnail = property (get_thumbnail)
-    related = property (get_related)
-    items = property (get_items)
-
-class ProgrammeSimple (object):
-    """
-    Represents an individual iPlayer programme, as identified by an 8-letter
-    PID, and contains the programme pid, title, subtitle etc
-    """
-
-    def __init__ (self, pid, entry):
-        self.pid = pid
-        self.meta = {}
-        self.meta['title'] = entry.title
-        self.meta['summary'] = entry.summary
-        self.meta['updated'] = entry.updated
-        self.categories = []
-        for category in entry.categories:
-            if category != 'TV':
-                self.categories.append (category.rstrip ())
-        self._items = []
-        self._related = []
-
-    @call_once
-    def __read_playlist (self):
-        pass
-
-    def get_playlist_xml (self):
-        pass
-
-    def __parse_playlist (self, xml):
-        pass
-
-    def get_thumbnail (self, size='large', tvradio='tv'):
-        """
-        Returns the URL of a thumbnail.
-        size: '640x360'/'biggest'/'largest' or '512x288'/'big'/'large' or None
-        """
-        url_format = "http://www.bbc.co.uk/iplayer/images/episode/%s_%d_%d.jpg"
-
-        if size in ['640x360', '640x', 'x360', 'biggest', 'largest']:
-            return url_format % (self.pid, 640, 360)
-        elif size in ['512x288', '512x', 'x288', 'big', 'large']:
-            return url_format % (self.pid, 512, 288)
-        elif size in ['178x100', '178x', 'x100', 'small']:
-            return url_format % (self.pid, 178, 100)
-        elif size in ['150x84', '150x', 'x84', 'smallest']:
-            return url_format % (self.pid, 150, 84)
-        else:
-            return os.path.join (IMG_DIR, '%s.png' % tvradio)
-
-
-    def get_url (self):
-        """
-        Returns the programmes episode page.
-        """
-        return "http://www.bbc.co.uk/iplayer/episode/%s" % (self.pid)
-
-    @property
-    def playlist_url (self):
-        return "http://www.bbc.co.uk/iplayer/playlist/%s" % self.pid
-
-    @property
-    def playlist (self):
-        return self.get_playlist_xml ()
-
-    def get_updated (self):
-        return self.meta['updated']
-
-    @loaded_by (__read_playlist)
-    def get_title (self):
-        return self.meta['title']
-
-    @loaded_by (__read_playlist)
-    def get_summary (self):
-        return self.meta['summary']
-
-    @loaded_by (__read_playlist)
-    def get_related (self):
-        return self._related
-
-    @loaded_by (__read_playlist)
-    def get_items (self):
-        if not self._items:
-            raise NoItemsError (self.meta['reason'])
-        return self._items
-
-    @property
-    def programme (self):
-        for i in self.items:
-            if i.is_programme:
-                return i
-        return None
-
-    title = property (get_title)
-    summary = property (get_summary)
-    updated = property (get_updated)
-    thumbnail = property (get_thumbnail)
-    related = property (get_related)
-    items = property (get_items)
-
-
-class Feed (object): # pylint: disable-msg=R0921
-    def __init__ (self, tvradio = None, # pylint: disable-msg=R0913
-                  channel = None, category = None,
-                  subcategory = None, atoz = None, searchterm = None):
-        """
-        Creates a feed for the specified channel/category/whatever.
-        tvradio: type of channel - 'tv' or 'radio'. If a known channel is
-                 specified, use 'auto'.
-        channel: name of channel, e.g. 'bbc_one'
-        category: category name, e.g. 'drama'
-        subcategory: subcategory name, e.g. 'period_drama'
-        atoz: A-Z listing for the specified letter
-        """
-        if tvradio == 'auto':
-            if not channel and not searchterm:
-                raise Exception, "Must specify channel or searchterm when "\
-                                 "using 'auto'"
-            elif channel in CHANNELS_TV:
-                self.tvradio = 'tv'
-            elif channel in CHANNELS_RADIO:
-                self.tvradio = 'radio'
-            else:
-                raise Exception, "TV channel '%s' not "\
-                                 "recognised." % channel
-        elif tvradio in ['tv', 'radio']:
-            self.tvradio = tvradio
-        else:
-            self.tvradio = None
-        self.channel = channel
-        self.category = category
-        self.subcategory = subcategory
-        self.atoz = atoz
-        self.searchterm = searchterm
-
-    def __create_url (self, listing):
-        """
-        /['list'|'popular'|'highlights']
-        'categories'/ (/) \
-            (/['tv'/'radio'])/['list'|'popular'|'highlights']
-        """
-        assert listing in ['list', 'popular', 'highlights'], "Unknown "\
-                                                             "listing type"
-
-        if self.searchterm:
-            path = ['search']
-            if self.tvradio:
-                path += [self.tvradio]
-            path += ['?q=%s' % self.searchterm]
-        elif self.channel:
-            path = [self.channel]
-            if self.atoz:
-                path += ['atoz', self.atoz]
-            if self.category:
-                path += [self.category]
-            path += [listing]
-        elif self.category:
-            path = [self.category]
-            if self.atoz:
-                path += ['atoz', self.atoz]
-            path += [listing]
-        elif self.atoz:
-            path = ['atoz', self.atoz, listing]
-            if self.tvradio:
-                path += [self.tvradio]
-        else:
-            assert listing != 'list', "Can't list at tv/radio level'"
-            path = [listing, self.tvradio]
-
-        return "http://feeds.bbc.co.uk/iplayer/" + '/'.join (path)
-
-    def get_name (self, separator=' '):
-        """
-        A readable title for this feed, e.g. 'BBC One' or 'TV Drama' or
-        'BBC One Drama'
-        separator: string to separate name parts with, defaults to ' '.
-                   Use None to return a list (e.g. ['TV', 'Drama']).
-        """
-        path = []
-
-        # TODO: This is not i18n-friendly whatsoever
-        # if got a channel, don't need tv/radio distinction
-        if self.channel:
-            assert (self.channel in CHANNELS_TV or
-                    self.channel in CHANNELS_RADIO), 'Unknown channel'
-            #print self.tvradio
-            if self.tvradio == 'tv':
-                path.append (CHANNELS_TV.get (self.channel, ' (TV)'))
-            else:
-                path.append (CHANNELS_RADIO.get (self.channel, ' (Radio)'))
-        elif self.tvradio:
-            # no channel
-            medium = 'TV'
-            if self.tvradio == 'radio':
-                medium = 'Radio'
-            path.append (medium)
-
-        if self.searchterm:
-            path += ['Search results for %s' % self.searchterm]
-
-        if self.category:
-            assert self.category in CATEGORIES, 'Unknown category'
-            path.append (CATEGORIES.get (self.category, ' (Category)'))
-
-        if self.atoz:
-            path.append ("beginning with %s" % self.atoz.upper ())
-
-        if separator != None:
-            return separator.join (path)
-        else:
-            return path
-
-    def channels (self):
-        """
-        Return a list of available channels.
-        """
-        if self.channel:
-            return None
-        if self.tvradio == 'tv':
-            return CHANNELS_TV
-        if self.tvradio == 'radio':
-            return CHANNELS_RADIO
-        return None
-
-    def channels_feed (self):
-        """
-        Return a list of available channels as a list of feeds.
-        """
-        if self.channel:
-            #logging.warning ("%s doesn\'t have any channels!", self.channel)
-            return None
-        if self.tvradio == 'tv':
-            return [Feed ('tv', channel = ch)
-                    for (ch, _title) in CHANNELS_TV_LIST]
-        if self.tvradio == 'radio':
-            return [Feed ('radio', channel = ch)
-                    for (ch, _title) in CHANNELS_RADIO_LIST]
-        return None
-
-    # This causes pylint message R0913 on the class.
-    def subcategories (self):
-        raise NotImplementedError ('Sub-categories not yet supported')
-
-    @classmethod
-    def __is_atoz (cls, letter):
-        """
-        Return False if specified letter is not a valid 'A to Z' directory
-        entry. Otherwise returns the directory name.
-
-        >>> feed.__is_atoz ('a'), feed.__is_atoz ('z')
-        ('a', 'z')
-        >>> feed.__is_atoz ('0'), feed.__is_atoz ('9')
-        ('0-9', '0-9')
-        >>> feed.__is_atoz ('123'), feed.__is_atoz ('abc')
-        (False, False)
-        >>> feed.__is_atoz ('big british castle'), feed.__is_atoz ('')
-        (False, False)
-        """
-        letter = letter.lower ()
-        if len (letter) != 1 and letter != '0-9':
-            return False
-        if letter in '0123456789':
-            letter = "0-9"
-        if letter not in 'abcdefghijklmnopqrstuvwxyz0-9':
-            return False
-        return letter
-
-    def sub (self, *_args, **kwargs):
-        """
-        Clones this feed, altering the specified parameters.
-
-        >>> feed ('tv').sub (channel='bbc_one').channel
-        'bbc_one'
-        >>> feed ('tv', channel='bbc_one').sub (channel='bbc_two').channel
-        'bbc_two'
-        >>> feed ('tv', channel='bbc_one').sub (category='drama').category
-        'drama'
-        >>> feed ('tv', channel='bbc_one').sub (channel=None).channel
-        >>>
-        """
-        dictionary = self.__dict__.copy ()
-        dictionary.update (kwargs)
-        return Feed (**dictionary) # pylint: disable-msg=W0142
-
-    def get (self, subfeed):
-        """
-        Returns a child/subfeed of this feed.
-        child: can be channel/cat/subcat/letter, e.g. 'bbc_one'
-        """
-        if self.channel:
-            return self.sub (category = subfeed)
-        elif self.category:
-            # no children: TODO support subcategories
-            return None
-        elif self.__is_atoz (subfeed):
-            return self.sub (atoz=self.__is_atoz (subfeed))
-        else:
-            if subfeed in CHANNELS_TV:
-                return Feed ('tv', channel = subfeed)
-            if subfeed in CHANNELS_RADIO:
-                return Feed ('radio', channel = subfeed)
-        # TODO handle properly oh pants
-        return None
-
-    @classmethod
-    def __read_rss (cls, url):
-        #logging.info ('Read RSS: %s', url)
-        if url not in RSS_CACHE:
-            #logging.info ('Feed URL not in cache, requesting...')
-            xml = httpget (url)
-            progs = listparser.parse (xml)
-            if not progs:
-                return []
-            cached_programmes = []
-            for entry in progs.entries:
-                pid = parse_entry_id (entry.identifier)
-                programme = Programme (pid)
-                cached_programmes.append (programme)
-            #logging.info ('Found %d entries', len (d))
-            RSS_CACHE[url] = cached_programmes
-        #else:
-        #    logging.info ('RSS found in cache')
-        return RSS_CACHE[url]
-
-    def popular (self):
-        return self.__read_rss (self.__create_url ('popular'))
-
-    def highlights (self):
-        return self.__read_rss (self.__create_url ('highlights'))
-
-    def list (self):
-        return self.__read_rss (self.__create_url ('list'))
-
-    def categories (self):
-        # quick and dirty category extraction and count
-        xml_url = self.__create_url ('list')
-        xml = httpget (xml_url)
-        cat = re.findall ("')
-            category = category.replace ('<', '<')
-            alist.append ((category, name))
-        return alist
-
-    @property
-    def is_radio (self):
-        """ True if this feed is for radio. """
-        return self.tvradio == 'radio'
-
-    @property
-    def is_tv (self):
-        """ True if this feed is for tv. """
-        return self.tvradio == 'tv'
-
-    name = property (get_name)
-
-def test ():
-    tv_feed = Feed ('tv')
-    print tv_feed.popular ()
-    print tv_feed.channels ()
-    print tv_feed.get ('bbc_one')
-    print tv_feed.get ('bbc_one').list ()
-    for category in tv_feed.get ('bbc_one').categories ():
-        print category
-    #print tv_feed.get ('bbc_one').channels ()
-    #print tv_feed.categories ()
-    #print tv_feed.get ('drama').list ()
-    #print tv_feed.get ('drama').get_subcategory ('period').list ()
-
-if __name__ == '__main__':
-    test ()
diff -Nru totem-3.4.3/src/plugins/iplayer/listparser.py totem-3.6.2/src/plugins/iplayer/listparser.py
--- totem-3.4.3/src/plugins/iplayer/listparser.py	2012-01-10 16:10:04.000000000 +0000
+++ totem-3.6.2/src/plugins/iplayer/listparser.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,67 +0,0 @@
-#
-# Provides a simple and very quick way to parse list feeds
-#
-
-import re
-
-def xmlunescape (data):
-    data = data.replace ('&', '&')
-    data = data.replace ('>', '>')
-    data = data.replace ('<', '<')
-    return data
-
-class ListEntry (object): # pylint: disable-msg=R0903
-    def __init__ (self, title = None, # pylint: disable-msg=R0913
-                  identifier = None, updated = None,
-                  summary = None, categories = None):
-        self.title = title
-        self.identifier = identifier
-        self.updated = updated
-        self.summary = summary
-        self.categories = categories
-
-class ListEntries (object): # pylint: disable-msg=R0903
-    def __init__ (self):
-        self.entries = []
-
-def parse (xml_source):
-    #try:
-    #    regexp = "<\?xml version=\"[^\"]*\" encoding=\" ([^\"]*)\"\?>"
-    #    encoding = re.findall (regexp, xml_source)[0]
-    #except:
-    #    return None
-
-    elist = ListEntries ()
-    # gather all list entries
-    entries_src = re.findall ("(.*?)", xml_source, re.DOTALL)
-    datematch = re.compile (':\s+ ([0-9]+)/ ([0-9]+)/ ([0-9]{4})')
-
-    # enumerate thru the element list and gather info
-    for entry_src in entries_src:
-        title = re.findall ("]*>(.*?)",
-                            entry_src, re.DOTALL)[0]
-        identifier = re.findall ("]*>(.*?)",
-                                 entry_src, re.DOTALL)[0]
-        updated = re.findall ("]*>(.*?)",
-                              entry_src, re.DOTALL)[0]
-        summary = re.findall ("]*>(.*?)",
-                              entry_src, re.DOTALL)[0].splitlines ()[-3]
-        categories = re.findall ("]*term=\"(.*?)\"[^>]*>",
-                                 entry_src, re.DOTALL)
-
-        match = datematch.search (title)
-        if match:
-            # if the title contains a data at the end use that as the updated
-            # date YYYY-MM-DD
-            updated = "%s-%s-%s" % (match.group (3), match.group (2),
-                                    match.group (1))
-
-        e_categories = []
-        for category in categories:
-            e_categories.append (xmlunescape (category))
-        elist.entries.append (ListEntry (xmlunescape (title),
-                                         xmlunescape (identifier),
-                                         xmlunescape (updated),
-                                         xmlunescape (summary), e_categories))
-
-    return elist
diff -Nru totem-3.4.3/src/plugins/lirc/Makefile.in totem-3.6.2/src/plugins/lirc/Makefile.in
--- totem-3.4.3/src/plugins/lirc/Makefile.in	2012-07-04 09:54:50.000000000 +0000
+++ totem-3.6.2/src/plugins/lirc/Makefile.in	2012-10-25 13:36:22.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.12.2 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,6 +16,23 @@
 
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -36,13 +52,11 @@
 build_triplet = @build@
 host_triplet = @host@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/depcomp \
 	$(top_srcdir)/src/plugins/Makefile.plugins
 subdir = src/plugins/lirc
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -86,9 +100,22 @@
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 liblirc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(liblirc_la_CFLAGS) \
 	$(CFLAGS) $(liblirc_la_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -101,22 +128,23 @@
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(liblirc_la_SOURCES)
 DIST_SOURCES = $(liblirc_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 DATA = $(config_DATA) $(plugin_DATA)
 ETAGS = etags
 CTAGS = ctags
@@ -132,7 +160,8 @@
 	$(DISABLE_DEPRECATED)		\
 	-I$(top_srcdir)/		\
 	-I$(top_srcdir)/src		\
-	-I$(top_srcdir)/src/plugins
+	-I$(top_srcdir)/src/plugins	\
+	-I$(top_srcdir)/src/gst
 
 AM_CXXFLAGS = @AM_CXXFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -142,6 +171,10 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BACKEND_CFLAGS = @BACKEND_CFLAGS@
+BACKEND_LIBS = @BACKEND_LIBS@
+BACKEND_TEST_CFLAGS = @BACKEND_TEST_CFLAGS@
+BACKEND_TEST_LIBS = @BACKEND_TEST_LIBS@
 BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
 BROWSER_PLUGIN_DIR = @BROWSER_PLUGIN_DIR@
 BROWSER_PLUGIN_LIBS = @BROWSER_PLUGIN_LIBS@
@@ -163,8 +196,6 @@
 DBUS_LIBS = @DBUS_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DEPENDENCY_CFLAGS = @DEPENDENCY_CFLAGS@
-DEPENDENCY_LIBS = @DEPENDENCY_LIBS@
 DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DISC_RECORDER_CFLAGS = @DISC_RECORDER_CFLAGS@
 DISC_RECORDER_LIBS = @DISC_RECORDER_LIBS@
@@ -178,7 +209,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-EXTRA_BACKEND_LIBS = @EXTRA_BACKEND_LIBS@
 FGREP = @FGREP@
 FULL_LIBEXECDIR = @FULL_LIBEXECDIR@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
@@ -186,19 +216,21 @@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GLIB_REQS = @GLIB_REQS@
+GLOW_BUTTON_CFLAGS = @GLOW_BUTTON_CFLAGS@
+GLOW_BUTTON_LIBS = @GLOW_BUTTON_LIBS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
-GST_CFLAGS = @GST_CFLAGS@
-GST_LIBS = @GST_LIBS@
+GST_PLUGINS_BAD_CFLAGS = @GST_PLUGINS_BAD_CFLAGS@
+GST_PLUGINS_BAD_LIBS = @GST_PLUGINS_BAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
 GTK_REQS = @GTK_REQS@
+HELPER_CFLAGS = @HELPER_CFLAGS@
+HELPER_LIBS = @HELPER_LIBS@
 HELP_DIR = @HELP_DIR@
 HTML_DIR = @HTML_DIR@
 INSTALL = @INSTALL@
@@ -224,11 +256,11 @@
 INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBEPC_CFLAGS = @LIBEPC_CFLAGS@
-LIBEPC_LIBS = @LIBEPC_LIBS@
 LIBGRILO_CFLAGS = @LIBGRILO_CFLAGS@
 LIBGRILO_LIBS = @LIBGRILO_LIBS@
 LIBOBJS = @LIBOBJS@
+LIBPLAYER_CFLAGS = @LIBPLAYER_CFLAGS@
+LIBPLAYER_LIBS = @LIBPLAYER_LIBS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBZEITGEIST_CFLAGS = @LIBZEITGEIST_CFLAGS@
@@ -245,8 +277,6 @@
 MISSING_PLUGINS_CFLAGS = @MISSING_PLUGINS_CFLAGS@
 MISSING_PLUGINS_LIBS = @MISSING_PLUGINS_LIBS@
 MKDIR_P = @MKDIR_P@
-MM_CFLAGS = @MM_CFLAGS@
-MM_LIBS = @MM_LIBS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 NAUTILUSDIR = @NAUTILUSDIR@
@@ -267,15 +297,21 @@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PEASGTK_CFLAGS = @PEASGTK_CFLAGS@
-PEASGTK_LIBS = @PEASGTK_LIBS@
-PEAS_CFLAGS = @PEAS_CFLAGS@
-PEAS_LIBS = @PEAS_LIBS@
+PIXBUF_HELPER_CFLAGS = @PIXBUF_HELPER_CFLAGS@
+PIXBUF_HELPER_LIBS = @PIXBUF_HELPER_LIBS@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLAYER_CFLAGS = @PLAYER_CFLAGS@
+PLAYER_LIBS = @PLAYER_LIBS@
 PLUGINDIR = @PLUGINDIR@
 PLUGINS = @PLUGINS@
+PLUGIN_VIEWER_CFLAGS = @PLUGIN_VIEWER_CFLAGS@
+PLUGIN_VIEWER_LIBS = @PLUGIN_VIEWER_LIBS@
+PREVIEW_CFLAGS = @PREVIEW_CFLAGS@
+PREVIEW_LIBS = @PREVIEW_LIBS@
+PROPERTIES_CFLAGS = @PROPERTIES_CFLAGS@
+PROPERTIES_LIBS = @PROPERTIES_LIBS@
 PYGOBJECT_CFLAGS = @PYGOBJECT_CFLAGS@
 PYGOBJECT_LIBS = @PYGOBJECT_LIBS@
 PYLINT = @PYLINT@
@@ -295,6 +331,10 @@
 SMCLIENT_CFLAGS = @SMCLIENT_CFLAGS@
 SMCLIENT_LIBS = @SMCLIENT_LIBS@
 STRIP = @STRIP@
+THUMBNAILER_CFLAGS = @THUMBNAILER_CFLAGS@
+THUMBNAILER_LIBS = @THUMBNAILER_LIBS@
+TIME_HELPER_CFLAGS = @TIME_HELPER_CFLAGS@
+TIME_HELPER_LIBS = @TIME_HELPER_LIBS@
 TOTEM_API_VERSION = @TOTEM_API_VERSION@
 TOTEM_PLPARSER_REQS = @TOTEM_PLPARSER_REQS@
 TOTEM_VERSION_MAJOR = @TOTEM_VERSION_MAJOR@
@@ -306,9 +346,6 @@
 WARN_CFLAGS = @WARN_CFLAGS@
 WARN_CXXFLAGS = @WARN_CXXFLAGS@
 XGETTEXT = @XGETTEXT@
-XMKMF = @XMKMF@
-XTEST_LIBS = @XTEST_LIBS@
-X_LIBS = @X_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -374,8 +411,7 @@
 DISTCLEANFILES = $(plugin_DATA)
 EXTRA_DIST = $(plugin_in_files) $(config_DATA)
 plugin_cflags = \
-	$(DEPENDENCY_CFLAGS)	\
-	$(PEAS_CFLAGS)		\
+	$(PLAYER_CFLAGS)	\
 	$(WARN_CFLAGS)
 
 plugin_ldflags = \
@@ -439,7 +475,6 @@
 $(am__aclocal_m4_deps):
 install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
 	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
@@ -447,6 +482,8 @@
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
 	}
@@ -462,12 +499,14 @@
 
 clean-pluginLTLIBRARIES:
 	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
-	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(plugin_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
 liblirc.la: $(liblirc_la_OBJECTS) $(liblirc_la_DEPENDENCIES) $(EXTRA_liblirc_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(liblirc_la_LINK) -rpath $(plugindir) $(liblirc_la_OBJECTS) $(liblirc_la_LIBADD) $(LIBS)
 
@@ -480,25 +519,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblirc_la-totem-lirc.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
@@ -517,8 +553,11 @@
 	-rm -rf .libs _libs
 install-configDATA: $(config_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(configdir)" || $(MKDIR_P) "$(DESTDIR)$(configdir)"
 	@list='$(config_DATA)'; test -n "$(configdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(configdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(configdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -535,8 +574,11 @@
 	dir='$(DESTDIR)$(configdir)'; $(am__uninstall_files_from_dir)
 install-pluginDATA: $(plugin_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
 	@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -601,6 +643,20 @@
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
 
+cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
+	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
@@ -749,20 +805,20 @@
 .MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pluginLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-configDATA install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-pluginDATA install-pluginLTLIBRARIES install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-configDATA uninstall-pluginDATA \
-	uninstall-pluginLTLIBRARIES
+	clean-libtool clean-pluginLTLIBRARIES cscopelist ctags \
+	distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-configDATA \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-pluginDATA install-pluginLTLIBRARIES \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-configDATA \
+	uninstall-pluginDATA uninstall-pluginLTLIBRARIES
 
 %.plugin: %.plugin.in
 	$(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
diff -Nru totem-3.4.3/src/plugins/media-player-keys/Makefile.in totem-3.6.2/src/plugins/media-player-keys/Makefile.in
--- totem-3.4.3/src/plugins/media-player-keys/Makefile.in	2012-07-04 09:54:50.000000000 +0000
+++ totem-3.6.2/src/plugins/media-player-keys/Makefile.in	2012-10-25 13:36:22.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.12.2 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,6 +16,23 @@
 
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -36,13 +52,11 @@
 build_triplet = @build@
 host_triplet = @host@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/depcomp \
 	$(top_srcdir)/src/plugins/Makefile.plugins
 subdir = src/plugins/media-player-keys
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -89,10 +103,23 @@
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 libmedia_player_keys_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(libmedia_player_keys_la_CFLAGS) $(CFLAGS) \
 	$(libmedia_player_keys_la_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -105,22 +132,23 @@
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(libmedia_player_keys_la_SOURCES)
 DIST_SOURCES = $(libmedia_player_keys_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 DATA = $(plugin_DATA)
 ETAGS = etags
 CTAGS = ctags
@@ -136,7 +164,8 @@
 	$(DISABLE_DEPRECATED)		\
 	-I$(top_srcdir)/		\
 	-I$(top_srcdir)/src		\
-	-I$(top_srcdir)/src/plugins
+	-I$(top_srcdir)/src/plugins	\
+	-I$(top_srcdir)/src/gst
 
 AM_CXXFLAGS = @AM_CXXFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -146,6 +175,10 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BACKEND_CFLAGS = @BACKEND_CFLAGS@
+BACKEND_LIBS = @BACKEND_LIBS@
+BACKEND_TEST_CFLAGS = @BACKEND_TEST_CFLAGS@
+BACKEND_TEST_LIBS = @BACKEND_TEST_LIBS@
 BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
 BROWSER_PLUGIN_DIR = @BROWSER_PLUGIN_DIR@
 BROWSER_PLUGIN_LIBS = @BROWSER_PLUGIN_LIBS@
@@ -167,8 +200,6 @@
 DBUS_LIBS = @DBUS_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DEPENDENCY_CFLAGS = @DEPENDENCY_CFLAGS@
-DEPENDENCY_LIBS = @DEPENDENCY_LIBS@
 DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DISC_RECORDER_CFLAGS = @DISC_RECORDER_CFLAGS@
 DISC_RECORDER_LIBS = @DISC_RECORDER_LIBS@
@@ -182,7 +213,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-EXTRA_BACKEND_LIBS = @EXTRA_BACKEND_LIBS@
 FGREP = @FGREP@
 FULL_LIBEXECDIR = @FULL_LIBEXECDIR@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
@@ -190,19 +220,21 @@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GLIB_REQS = @GLIB_REQS@
+GLOW_BUTTON_CFLAGS = @GLOW_BUTTON_CFLAGS@
+GLOW_BUTTON_LIBS = @GLOW_BUTTON_LIBS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
-GST_CFLAGS = @GST_CFLAGS@
-GST_LIBS = @GST_LIBS@
+GST_PLUGINS_BAD_CFLAGS = @GST_PLUGINS_BAD_CFLAGS@
+GST_PLUGINS_BAD_LIBS = @GST_PLUGINS_BAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
 GTK_REQS = @GTK_REQS@
+HELPER_CFLAGS = @HELPER_CFLAGS@
+HELPER_LIBS = @HELPER_LIBS@
 HELP_DIR = @HELP_DIR@
 HTML_DIR = @HTML_DIR@
 INSTALL = @INSTALL@
@@ -228,11 +260,11 @@
 INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBEPC_CFLAGS = @LIBEPC_CFLAGS@
-LIBEPC_LIBS = @LIBEPC_LIBS@
 LIBGRILO_CFLAGS = @LIBGRILO_CFLAGS@
 LIBGRILO_LIBS = @LIBGRILO_LIBS@
 LIBOBJS = @LIBOBJS@
+LIBPLAYER_CFLAGS = @LIBPLAYER_CFLAGS@
+LIBPLAYER_LIBS = @LIBPLAYER_LIBS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBZEITGEIST_CFLAGS = @LIBZEITGEIST_CFLAGS@
@@ -249,8 +281,6 @@
 MISSING_PLUGINS_CFLAGS = @MISSING_PLUGINS_CFLAGS@
 MISSING_PLUGINS_LIBS = @MISSING_PLUGINS_LIBS@
 MKDIR_P = @MKDIR_P@
-MM_CFLAGS = @MM_CFLAGS@
-MM_LIBS = @MM_LIBS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 NAUTILUSDIR = @NAUTILUSDIR@
@@ -271,15 +301,21 @@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PEASGTK_CFLAGS = @PEASGTK_CFLAGS@
-PEASGTK_LIBS = @PEASGTK_LIBS@
-PEAS_CFLAGS = @PEAS_CFLAGS@
-PEAS_LIBS = @PEAS_LIBS@
+PIXBUF_HELPER_CFLAGS = @PIXBUF_HELPER_CFLAGS@
+PIXBUF_HELPER_LIBS = @PIXBUF_HELPER_LIBS@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLAYER_CFLAGS = @PLAYER_CFLAGS@
+PLAYER_LIBS = @PLAYER_LIBS@
 PLUGINDIR = @PLUGINDIR@
 PLUGINS = @PLUGINS@
+PLUGIN_VIEWER_CFLAGS = @PLUGIN_VIEWER_CFLAGS@
+PLUGIN_VIEWER_LIBS = @PLUGIN_VIEWER_LIBS@
+PREVIEW_CFLAGS = @PREVIEW_CFLAGS@
+PREVIEW_LIBS = @PREVIEW_LIBS@
+PROPERTIES_CFLAGS = @PROPERTIES_CFLAGS@
+PROPERTIES_LIBS = @PROPERTIES_LIBS@
 PYGOBJECT_CFLAGS = @PYGOBJECT_CFLAGS@
 PYGOBJECT_LIBS = @PYGOBJECT_LIBS@
 PYLINT = @PYLINT@
@@ -299,6 +335,10 @@
 SMCLIENT_CFLAGS = @SMCLIENT_CFLAGS@
 SMCLIENT_LIBS = @SMCLIENT_LIBS@
 STRIP = @STRIP@
+THUMBNAILER_CFLAGS = @THUMBNAILER_CFLAGS@
+THUMBNAILER_LIBS = @THUMBNAILER_LIBS@
+TIME_HELPER_CFLAGS = @TIME_HELPER_CFLAGS@
+TIME_HELPER_LIBS = @TIME_HELPER_LIBS@
 TOTEM_API_VERSION = @TOTEM_API_VERSION@
 TOTEM_PLPARSER_REQS = @TOTEM_PLPARSER_REQS@
 TOTEM_VERSION_MAJOR = @TOTEM_VERSION_MAJOR@
@@ -310,9 +350,6 @@
 WARN_CFLAGS = @WARN_CFLAGS@
 WARN_CXXFLAGS = @WARN_CXXFLAGS@
 XGETTEXT = @XGETTEXT@
-XMKMF = @XMKMF@
-XTEST_LIBS = @XTEST_LIBS@
-X_LIBS = @X_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -378,8 +415,7 @@
 DISTCLEANFILES = $(plugin_DATA)
 EXTRA_DIST = $(plugin_in_files) totem-marshal.list
 plugin_cflags = \
-	$(DEPENDENCY_CFLAGS)	\
-	$(PEAS_CFLAGS)		\
+	$(PLAYER_CFLAGS)	\
 	$(WARN_CFLAGS)
 
 plugin_ldflags = \
@@ -450,7 +486,6 @@
 $(am__aclocal_m4_deps):
 install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
 	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
@@ -458,6 +493,8 @@
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
 	}
@@ -473,12 +510,14 @@
 
 clean-pluginLTLIBRARIES:
 	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
-	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(plugin_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
 libmedia_player_keys.la: $(libmedia_player_keys_la_OBJECTS) $(libmedia_player_keys_la_DEPENDENCIES) $(EXTRA_libmedia_player_keys_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libmedia_player_keys_la_LINK) -rpath $(plugindir) $(libmedia_player_keys_la_OBJECTS) $(libmedia_player_keys_la_LIBADD) $(LIBS)
 
@@ -492,25 +531,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmedia_player_keys_la-totem-media-player-keys.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
@@ -536,8 +572,11 @@
 	-rm -rf .libs _libs
 install-pluginDATA: $(plugin_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
 	@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -602,6 +641,20 @@
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
 
+cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
+	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
@@ -748,19 +801,19 @@
 .MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pluginLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pluginDATA \
-	install-pluginLTLIBRARIES install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-pluginDATA uninstall-pluginLTLIBRARIES
+	clean-libtool clean-pluginLTLIBRARIES cscopelist ctags \
+	distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pluginDATA install-pluginLTLIBRARIES install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-pluginDATA uninstall-pluginLTLIBRARIES
 
 %.plugin: %.plugin.in
 	$(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
diff -Nru totem-3.4.3/src/plugins/media-player-keys/media-player-keys.plugin.in totem-3.6.2/src/plugins/media-player-keys/media-player-keys.plugin.in
--- totem-3.4.3/src/plugins/media-player-keys/media-player-keys.plugin.in	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/plugins/media-player-keys/media-player-keys.plugin.in	2012-08-29 23:07:45.000000000 +0000
@@ -1,8 +1,8 @@
 [Plugin]
 Module=media_player_keys
 IAge=1
-Name=Media Player Keys
-Description=Support additional media player keys
+_Name=Media Player Keys
+_Description=Support additional media player keys
 Builtin=true
 Authors=Jan Arne Petersen
 Copyright=Copyright © 2007 Jan Arne Petersen
diff -Nru totem-3.4.3/src/plugins/media-player-keys/totem-marshal.c totem-3.6.2/src/plugins/media-player-keys/totem-marshal.c
--- totem-3.4.3/src/plugins/media-player-keys/totem-marshal.c	2012-04-17 14:27:17.000000000 +0000
+++ totem-3.6.2/src/plugins/media-player-keys/totem-marshal.c	2012-10-25 13:47:47.000000000 +0000
@@ -8,7 +8,7 @@
 
 #ifdef G_ENABLE_DEBUG
 #define g_marshal_value_peek_boolean(v)  g_value_get_boolean (v)
-#define g_marshal_value_peek_char(v)     g_value_get_char (v)
+#define g_marshal_value_peek_char(v)     g_value_get_schar (v)
 #define g_marshal_value_peek_uchar(v)    g_value_get_uchar (v)
 #define g_marshal_value_peek_int(v)      g_value_get_int (v)
 #define g_marshal_value_peek_uint(v)     g_value_get_uint (v)
diff -Nru totem-3.4.3/src/plugins/ontop/Makefile.in totem-3.6.2/src/plugins/ontop/Makefile.in
--- totem-3.4.3/src/plugins/ontop/Makefile.in	2012-07-04 09:54:50.000000000 +0000
+++ totem-3.6.2/src/plugins/ontop/Makefile.in	2012-10-25 13:36:22.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.12.2 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,6 +16,23 @@
 
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -36,13 +52,11 @@
 build_triplet = @build@
 host_triplet = @host@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/depcomp \
 	$(top_srcdir)/src/plugins/Makefile.plugins
 subdir = src/plugins/ontop
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -84,9 +98,22 @@
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 libontop_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libontop_la_CFLAGS) \
 	$(CFLAGS) $(libontop_la_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -99,22 +126,23 @@
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(libontop_la_SOURCES)
 DIST_SOURCES = $(libontop_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 DATA = $(plugin_DATA)
 ETAGS = etags
 CTAGS = ctags
@@ -130,7 +158,8 @@
 	$(DISABLE_DEPRECATED)		\
 	-I$(top_srcdir)/		\
 	-I$(top_srcdir)/src		\
-	-I$(top_srcdir)/src/plugins
+	-I$(top_srcdir)/src/plugins	\
+	-I$(top_srcdir)/src/gst
 
 AM_CXXFLAGS = @AM_CXXFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -140,6 +169,10 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BACKEND_CFLAGS = @BACKEND_CFLAGS@
+BACKEND_LIBS = @BACKEND_LIBS@
+BACKEND_TEST_CFLAGS = @BACKEND_TEST_CFLAGS@
+BACKEND_TEST_LIBS = @BACKEND_TEST_LIBS@
 BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
 BROWSER_PLUGIN_DIR = @BROWSER_PLUGIN_DIR@
 BROWSER_PLUGIN_LIBS = @BROWSER_PLUGIN_LIBS@
@@ -161,8 +194,6 @@
 DBUS_LIBS = @DBUS_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DEPENDENCY_CFLAGS = @DEPENDENCY_CFLAGS@
-DEPENDENCY_LIBS = @DEPENDENCY_LIBS@
 DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DISC_RECORDER_CFLAGS = @DISC_RECORDER_CFLAGS@
 DISC_RECORDER_LIBS = @DISC_RECORDER_LIBS@
@@ -176,7 +207,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-EXTRA_BACKEND_LIBS = @EXTRA_BACKEND_LIBS@
 FGREP = @FGREP@
 FULL_LIBEXECDIR = @FULL_LIBEXECDIR@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
@@ -184,19 +214,21 @@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GLIB_REQS = @GLIB_REQS@
+GLOW_BUTTON_CFLAGS = @GLOW_BUTTON_CFLAGS@
+GLOW_BUTTON_LIBS = @GLOW_BUTTON_LIBS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
-GST_CFLAGS = @GST_CFLAGS@
-GST_LIBS = @GST_LIBS@
+GST_PLUGINS_BAD_CFLAGS = @GST_PLUGINS_BAD_CFLAGS@
+GST_PLUGINS_BAD_LIBS = @GST_PLUGINS_BAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
 GTK_REQS = @GTK_REQS@
+HELPER_CFLAGS = @HELPER_CFLAGS@
+HELPER_LIBS = @HELPER_LIBS@
 HELP_DIR = @HELP_DIR@
 HTML_DIR = @HTML_DIR@
 INSTALL = @INSTALL@
@@ -222,11 +254,11 @@
 INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBEPC_CFLAGS = @LIBEPC_CFLAGS@
-LIBEPC_LIBS = @LIBEPC_LIBS@
 LIBGRILO_CFLAGS = @LIBGRILO_CFLAGS@
 LIBGRILO_LIBS = @LIBGRILO_LIBS@
 LIBOBJS = @LIBOBJS@
+LIBPLAYER_CFLAGS = @LIBPLAYER_CFLAGS@
+LIBPLAYER_LIBS = @LIBPLAYER_LIBS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBZEITGEIST_CFLAGS = @LIBZEITGEIST_CFLAGS@
@@ -243,8 +275,6 @@
 MISSING_PLUGINS_CFLAGS = @MISSING_PLUGINS_CFLAGS@
 MISSING_PLUGINS_LIBS = @MISSING_PLUGINS_LIBS@
 MKDIR_P = @MKDIR_P@
-MM_CFLAGS = @MM_CFLAGS@
-MM_LIBS = @MM_LIBS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 NAUTILUSDIR = @NAUTILUSDIR@
@@ -265,15 +295,21 @@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PEASGTK_CFLAGS = @PEASGTK_CFLAGS@
-PEASGTK_LIBS = @PEASGTK_LIBS@
-PEAS_CFLAGS = @PEAS_CFLAGS@
-PEAS_LIBS = @PEAS_LIBS@
+PIXBUF_HELPER_CFLAGS = @PIXBUF_HELPER_CFLAGS@
+PIXBUF_HELPER_LIBS = @PIXBUF_HELPER_LIBS@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLAYER_CFLAGS = @PLAYER_CFLAGS@
+PLAYER_LIBS = @PLAYER_LIBS@
 PLUGINDIR = @PLUGINDIR@
 PLUGINS = @PLUGINS@
+PLUGIN_VIEWER_CFLAGS = @PLUGIN_VIEWER_CFLAGS@
+PLUGIN_VIEWER_LIBS = @PLUGIN_VIEWER_LIBS@
+PREVIEW_CFLAGS = @PREVIEW_CFLAGS@
+PREVIEW_LIBS = @PREVIEW_LIBS@
+PROPERTIES_CFLAGS = @PROPERTIES_CFLAGS@
+PROPERTIES_LIBS = @PROPERTIES_LIBS@
 PYGOBJECT_CFLAGS = @PYGOBJECT_CFLAGS@
 PYGOBJECT_LIBS = @PYGOBJECT_LIBS@
 PYLINT = @PYLINT@
@@ -293,6 +329,10 @@
 SMCLIENT_CFLAGS = @SMCLIENT_CFLAGS@
 SMCLIENT_LIBS = @SMCLIENT_LIBS@
 STRIP = @STRIP@
+THUMBNAILER_CFLAGS = @THUMBNAILER_CFLAGS@
+THUMBNAILER_LIBS = @THUMBNAILER_LIBS@
+TIME_HELPER_CFLAGS = @TIME_HELPER_CFLAGS@
+TIME_HELPER_LIBS = @TIME_HELPER_LIBS@
 TOTEM_API_VERSION = @TOTEM_API_VERSION@
 TOTEM_PLPARSER_REQS = @TOTEM_PLPARSER_REQS@
 TOTEM_VERSION_MAJOR = @TOTEM_VERSION_MAJOR@
@@ -304,9 +344,6 @@
 WARN_CFLAGS = @WARN_CFLAGS@
 WARN_CXXFLAGS = @WARN_CXXFLAGS@
 XGETTEXT = @XGETTEXT@
-XMKMF = @XMKMF@
-XTEST_LIBS = @XTEST_LIBS@
-X_LIBS = @X_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -372,8 +409,7 @@
 DISTCLEANFILES = $(plugin_DATA)
 EXTRA_DIST = $(plugin_in_files)
 plugin_cflags = \
-	$(DEPENDENCY_CFLAGS)	\
-	$(PEAS_CFLAGS)		\
+	$(PLAYER_CFLAGS)	\
 	$(WARN_CFLAGS)
 
 plugin_ldflags = \
@@ -429,7 +465,6 @@
 $(am__aclocal_m4_deps):
 install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
 	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
@@ -437,6 +472,8 @@
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
 	}
@@ -452,12 +489,14 @@
 
 clean-pluginLTLIBRARIES:
 	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
-	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(plugin_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
 libontop.la: $(libontop_la_OBJECTS) $(libontop_la_DEPENDENCIES) $(EXTRA_libontop_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libontop_la_LINK) -rpath $(plugindir) $(libontop_la_OBJECTS) $(libontop_la_LIBADD) $(LIBS)
 
@@ -470,25 +509,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libontop_la-totem-ontop.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
@@ -507,8 +543,11 @@
 	-rm -rf .libs _libs
 install-pluginDATA: $(plugin_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
 	@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -573,6 +612,20 @@
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
 
+cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
+	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
@@ -719,19 +772,19 @@
 .MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pluginLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pluginDATA \
-	install-pluginLTLIBRARIES install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-pluginDATA uninstall-pluginLTLIBRARIES
+	clean-libtool clean-pluginLTLIBRARIES cscopelist ctags \
+	distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pluginDATA install-pluginLTLIBRARIES install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-pluginDATA uninstall-pluginLTLIBRARIES
 
 %.plugin: %.plugin.in
 	$(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
diff -Nru totem-3.4.3/src/plugins/opensubtitles/Makefile.in totem-3.6.2/src/plugins/opensubtitles/Makefile.in
--- totem-3.4.3/src/plugins/opensubtitles/Makefile.in	2012-07-04 09:54:50.000000000 +0000
+++ totem-3.6.2/src/plugins/opensubtitles/Makefile.in	2012-10-25 13:36:22.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.12.2 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +15,23 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -37,13 +53,11 @@
 DIST_COMMON = $(plugin_PYTHON) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in \
 	$(srcdir)/org.gnome.totem.plugins.opensubtitles.gschema.xml.in.in \
+	$(top_srcdir)/py-compile \
 	$(top_srcdir)/src/plugins/Makefile.plugins
 subdir = src/plugins/opensubtitles
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -51,14 +65,25 @@
 CONFIG_CLEAN_FILES =  \
 	org.gnome.totem.plugins.opensubtitles.gschema.xml.in
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -103,7 +128,8 @@
 	$(DISABLE_DEPRECATED)		\
 	-I$(top_srcdir)/		\
 	-I$(top_srcdir)/src		\
-	-I$(top_srcdir)/src/plugins
+	-I$(top_srcdir)/src/plugins	\
+	-I$(top_srcdir)/src/gst
 
 AM_CXXFLAGS = @AM_CXXFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -113,6 +139,10 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BACKEND_CFLAGS = @BACKEND_CFLAGS@
+BACKEND_LIBS = @BACKEND_LIBS@
+BACKEND_TEST_CFLAGS = @BACKEND_TEST_CFLAGS@
+BACKEND_TEST_LIBS = @BACKEND_TEST_LIBS@
 BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
 BROWSER_PLUGIN_DIR = @BROWSER_PLUGIN_DIR@
 BROWSER_PLUGIN_LIBS = @BROWSER_PLUGIN_LIBS@
@@ -134,8 +164,6 @@
 DBUS_LIBS = @DBUS_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DEPENDENCY_CFLAGS = @DEPENDENCY_CFLAGS@
-DEPENDENCY_LIBS = @DEPENDENCY_LIBS@
 DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DISC_RECORDER_CFLAGS = @DISC_RECORDER_CFLAGS@
 DISC_RECORDER_LIBS = @DISC_RECORDER_LIBS@
@@ -149,7 +177,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-EXTRA_BACKEND_LIBS = @EXTRA_BACKEND_LIBS@
 FGREP = @FGREP@
 FULL_LIBEXECDIR = @FULL_LIBEXECDIR@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
@@ -157,19 +184,21 @@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GLIB_REQS = @GLIB_REQS@
+GLOW_BUTTON_CFLAGS = @GLOW_BUTTON_CFLAGS@
+GLOW_BUTTON_LIBS = @GLOW_BUTTON_LIBS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
-GST_CFLAGS = @GST_CFLAGS@
-GST_LIBS = @GST_LIBS@
+GST_PLUGINS_BAD_CFLAGS = @GST_PLUGINS_BAD_CFLAGS@
+GST_PLUGINS_BAD_LIBS = @GST_PLUGINS_BAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
 GTK_REQS = @GTK_REQS@
+HELPER_CFLAGS = @HELPER_CFLAGS@
+HELPER_LIBS = @HELPER_LIBS@
 HELP_DIR = @HELP_DIR@
 HTML_DIR = @HTML_DIR@
 INSTALL = @INSTALL@
@@ -195,11 +224,11 @@
 INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBEPC_CFLAGS = @LIBEPC_CFLAGS@
-LIBEPC_LIBS = @LIBEPC_LIBS@
 LIBGRILO_CFLAGS = @LIBGRILO_CFLAGS@
 LIBGRILO_LIBS = @LIBGRILO_LIBS@
 LIBOBJS = @LIBOBJS@
+LIBPLAYER_CFLAGS = @LIBPLAYER_CFLAGS@
+LIBPLAYER_LIBS = @LIBPLAYER_LIBS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBZEITGEIST_CFLAGS = @LIBZEITGEIST_CFLAGS@
@@ -216,8 +245,6 @@
 MISSING_PLUGINS_CFLAGS = @MISSING_PLUGINS_CFLAGS@
 MISSING_PLUGINS_LIBS = @MISSING_PLUGINS_LIBS@
 MKDIR_P = @MKDIR_P@
-MM_CFLAGS = @MM_CFLAGS@
-MM_LIBS = @MM_LIBS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 NAUTILUSDIR = @NAUTILUSDIR@
@@ -238,15 +265,21 @@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PEASGTK_CFLAGS = @PEASGTK_CFLAGS@
-PEASGTK_LIBS = @PEASGTK_LIBS@
-PEAS_CFLAGS = @PEAS_CFLAGS@
-PEAS_LIBS = @PEAS_LIBS@
+PIXBUF_HELPER_CFLAGS = @PIXBUF_HELPER_CFLAGS@
+PIXBUF_HELPER_LIBS = @PIXBUF_HELPER_LIBS@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLAYER_CFLAGS = @PLAYER_CFLAGS@
+PLAYER_LIBS = @PLAYER_LIBS@
 PLUGINDIR = @PLUGINDIR@
 PLUGINS = @PLUGINS@
+PLUGIN_VIEWER_CFLAGS = @PLUGIN_VIEWER_CFLAGS@
+PLUGIN_VIEWER_LIBS = @PLUGIN_VIEWER_LIBS@
+PREVIEW_CFLAGS = @PREVIEW_CFLAGS@
+PREVIEW_LIBS = @PREVIEW_LIBS@
+PROPERTIES_CFLAGS = @PROPERTIES_CFLAGS@
+PROPERTIES_LIBS = @PROPERTIES_LIBS@
 PYGOBJECT_CFLAGS = @PYGOBJECT_CFLAGS@
 PYGOBJECT_LIBS = @PYGOBJECT_LIBS@
 PYLINT = @PYLINT@
@@ -266,6 +299,10 @@
 SMCLIENT_CFLAGS = @SMCLIENT_CFLAGS@
 SMCLIENT_LIBS = @SMCLIENT_LIBS@
 STRIP = @STRIP@
+THUMBNAILER_CFLAGS = @THUMBNAILER_CFLAGS@
+THUMBNAILER_LIBS = @THUMBNAILER_LIBS@
+TIME_HELPER_CFLAGS = @TIME_HELPER_CFLAGS@
+TIME_HELPER_LIBS = @TIME_HELPER_LIBS@
 TOTEM_API_VERSION = @TOTEM_API_VERSION@
 TOTEM_PLPARSER_REQS = @TOTEM_PLPARSER_REQS@
 TOTEM_VERSION_MAJOR = @TOTEM_VERSION_MAJOR@
@@ -277,9 +314,6 @@
 WARN_CFLAGS = @WARN_CFLAGS@
 WARN_CXXFLAGS = @WARN_CXXFLAGS@
 XGETTEXT = @XGETTEXT@
-XMKMF = @XMKMF@
-XTEST_LIBS = @XTEST_LIBS@
-X_LIBS = @X_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -345,8 +379,7 @@
 DISTCLEANFILES = $(plugin_DATA)
 EXTRA_DIST = $(plugin_in_files) $(ui_DATA) opensubtitles.convert
 plugin_cflags = \
-	$(DEPENDENCY_CFLAGS)	\
-	$(PEAS_CFLAGS)		\
+	$(PLAYER_CFLAGS)	\
 	$(WARN_CFLAGS)
 
 plugin_ldflags = \
@@ -410,8 +443,11 @@
 	-rm -rf .libs _libs
 install-pluginPYTHON: $(plugin_PYTHON)
 	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
 	@list='$(plugin_PYTHON)'; dlist=; list2=; test -n "$(plugindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
 	  if test -f $$b$$p; then \
@@ -445,8 +481,11 @@
 	exit $$st
 install-convertDATA: $(convert_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(convertdir)" || $(MKDIR_P) "$(DESTDIR)$(convertdir)"
 	@list='$(convert_DATA)'; test -n "$(convertdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(convertdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(convertdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -463,8 +502,11 @@
 	dir='$(DESTDIR)$(convertdir)'; $(am__uninstall_files_from_dir)
 install-pluginDATA: $(plugin_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
 	@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -481,8 +523,11 @@
 	dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
 install-uiDATA: $(ui_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)"
 	@list='$(ui_DATA)'; test -n "$(uidir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -503,6 +548,8 @@
 ctags: CTAGS
 CTAGS:
 
+cscope cscopelist:
+
 
 distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
diff -Nru totem-3.4.3/src/plugins/opensubtitles/opensubtitles.plugin.in totem-3.6.2/src/plugins/opensubtitles/opensubtitles.plugin.in
--- totem-3.4.3/src/plugins/opensubtitles/opensubtitles.plugin.in	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/plugins/opensubtitles/opensubtitles.plugin.in	2012-08-29 23:07:45.000000000 +0000
@@ -3,7 +3,7 @@
 Module=opensubtitles
 IAge=1
 _Name=Subtitle Downloader
-_Description=Look for subtitles for the currently playing movie.
+_Description=Look for subtitles for the currently playing movie
 Authors=Xavier Queralt 
 Copyright=Copyright © 2008 Xavier Queralt
 Website=http://www.gnome.org/projects/totem/
diff -Nru totem-3.4.3/src/plugins/opensubtitles/opensubtitles.ui totem-3.6.2/src/plugins/opensubtitles/opensubtitles.ui
--- totem-3.4.3/src/plugins/opensubtitles/opensubtitles.ui	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/plugins/opensubtitles/opensubtitles.ui	2012-10-25 13:15:32.000000000 +0000
@@ -1,6 +1,6 @@
 
 
-  
+  
   
   
     
diff -Nru totem-3.4.3/src/plugins/properties/Makefile.in totem-3.6.2/src/plugins/properties/Makefile.in
--- totem-3.4.3/src/plugins/properties/Makefile.in	2012-07-04 09:54:50.000000000 +0000
+++ totem-3.6.2/src/plugins/properties/Makefile.in	2012-10-25 13:36:22.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.12.2 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,6 +16,23 @@
 
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -36,13 +52,11 @@
 build_triplet = @build@
 host_triplet = @host@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/depcomp \
 	$(top_srcdir)/src/plugins/Makefile.plugins
 subdir = src/plugins/properties
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -86,10 +100,23 @@
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 libmovie_properties_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(libmovie_properties_la_CFLAGS) $(CFLAGS) \
 	$(libmovie_properties_la_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -102,22 +129,23 @@
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(libmovie_properties_la_SOURCES)
 DIST_SOURCES = $(libmovie_properties_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 DATA = $(plugin_DATA)
 ETAGS = etags
 CTAGS = ctags
@@ -133,7 +161,8 @@
 	$(DISABLE_DEPRECATED)		\
 	-I$(top_srcdir)/		\
 	-I$(top_srcdir)/src		\
-	-I$(top_srcdir)/src/plugins
+	-I$(top_srcdir)/src/plugins	\
+	-I$(top_srcdir)/src/gst
 
 AM_CXXFLAGS = @AM_CXXFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -143,6 +172,10 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BACKEND_CFLAGS = @BACKEND_CFLAGS@
+BACKEND_LIBS = @BACKEND_LIBS@
+BACKEND_TEST_CFLAGS = @BACKEND_TEST_CFLAGS@
+BACKEND_TEST_LIBS = @BACKEND_TEST_LIBS@
 BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
 BROWSER_PLUGIN_DIR = @BROWSER_PLUGIN_DIR@
 BROWSER_PLUGIN_LIBS = @BROWSER_PLUGIN_LIBS@
@@ -164,8 +197,6 @@
 DBUS_LIBS = @DBUS_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DEPENDENCY_CFLAGS = @DEPENDENCY_CFLAGS@
-DEPENDENCY_LIBS = @DEPENDENCY_LIBS@
 DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DISC_RECORDER_CFLAGS = @DISC_RECORDER_CFLAGS@
 DISC_RECORDER_LIBS = @DISC_RECORDER_LIBS@
@@ -179,7 +210,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-EXTRA_BACKEND_LIBS = @EXTRA_BACKEND_LIBS@
 FGREP = @FGREP@
 FULL_LIBEXECDIR = @FULL_LIBEXECDIR@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
@@ -187,19 +217,21 @@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GLIB_REQS = @GLIB_REQS@
+GLOW_BUTTON_CFLAGS = @GLOW_BUTTON_CFLAGS@
+GLOW_BUTTON_LIBS = @GLOW_BUTTON_LIBS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
-GST_CFLAGS = @GST_CFLAGS@
-GST_LIBS = @GST_LIBS@
+GST_PLUGINS_BAD_CFLAGS = @GST_PLUGINS_BAD_CFLAGS@
+GST_PLUGINS_BAD_LIBS = @GST_PLUGINS_BAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
 GTK_REQS = @GTK_REQS@
+HELPER_CFLAGS = @HELPER_CFLAGS@
+HELPER_LIBS = @HELPER_LIBS@
 HELP_DIR = @HELP_DIR@
 HTML_DIR = @HTML_DIR@
 INSTALL = @INSTALL@
@@ -225,11 +257,11 @@
 INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBEPC_CFLAGS = @LIBEPC_CFLAGS@
-LIBEPC_LIBS = @LIBEPC_LIBS@
 LIBGRILO_CFLAGS = @LIBGRILO_CFLAGS@
 LIBGRILO_LIBS = @LIBGRILO_LIBS@
 LIBOBJS = @LIBOBJS@
+LIBPLAYER_CFLAGS = @LIBPLAYER_CFLAGS@
+LIBPLAYER_LIBS = @LIBPLAYER_LIBS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBZEITGEIST_CFLAGS = @LIBZEITGEIST_CFLAGS@
@@ -246,8 +278,6 @@
 MISSING_PLUGINS_CFLAGS = @MISSING_PLUGINS_CFLAGS@
 MISSING_PLUGINS_LIBS = @MISSING_PLUGINS_LIBS@
 MKDIR_P = @MKDIR_P@
-MM_CFLAGS = @MM_CFLAGS@
-MM_LIBS = @MM_LIBS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 NAUTILUSDIR = @NAUTILUSDIR@
@@ -268,15 +298,21 @@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PEASGTK_CFLAGS = @PEASGTK_CFLAGS@
-PEASGTK_LIBS = @PEASGTK_LIBS@
-PEAS_CFLAGS = @PEAS_CFLAGS@
-PEAS_LIBS = @PEAS_LIBS@
+PIXBUF_HELPER_CFLAGS = @PIXBUF_HELPER_CFLAGS@
+PIXBUF_HELPER_LIBS = @PIXBUF_HELPER_LIBS@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLAYER_CFLAGS = @PLAYER_CFLAGS@
+PLAYER_LIBS = @PLAYER_LIBS@
 PLUGINDIR = @PLUGINDIR@
 PLUGINS = @PLUGINS@
+PLUGIN_VIEWER_CFLAGS = @PLUGIN_VIEWER_CFLAGS@
+PLUGIN_VIEWER_LIBS = @PLUGIN_VIEWER_LIBS@
+PREVIEW_CFLAGS = @PREVIEW_CFLAGS@
+PREVIEW_LIBS = @PREVIEW_LIBS@
+PROPERTIES_CFLAGS = @PROPERTIES_CFLAGS@
+PROPERTIES_LIBS = @PROPERTIES_LIBS@
 PYGOBJECT_CFLAGS = @PYGOBJECT_CFLAGS@
 PYGOBJECT_LIBS = @PYGOBJECT_LIBS@
 PYLINT = @PYLINT@
@@ -296,6 +332,10 @@
 SMCLIENT_CFLAGS = @SMCLIENT_CFLAGS@
 SMCLIENT_LIBS = @SMCLIENT_LIBS@
 STRIP = @STRIP@
+THUMBNAILER_CFLAGS = @THUMBNAILER_CFLAGS@
+THUMBNAILER_LIBS = @THUMBNAILER_LIBS@
+TIME_HELPER_CFLAGS = @TIME_HELPER_CFLAGS@
+TIME_HELPER_LIBS = @TIME_HELPER_LIBS@
 TOTEM_API_VERSION = @TOTEM_API_VERSION@
 TOTEM_PLPARSER_REQS = @TOTEM_PLPARSER_REQS@
 TOTEM_VERSION_MAJOR = @TOTEM_VERSION_MAJOR@
@@ -307,9 +347,6 @@
 WARN_CFLAGS = @WARN_CFLAGS@
 WARN_CXXFLAGS = @WARN_CXXFLAGS@
 XGETTEXT = @XGETTEXT@
-XMKMF = @XMKMF@
-XTEST_LIBS = @XTEST_LIBS@
-X_LIBS = @X_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -375,8 +412,7 @@
 DISTCLEANFILES = $(plugin_DATA)
 EXTRA_DIST = $(plugin_in_files)
 plugin_cflags = \
-	$(DEPENDENCY_CFLAGS)	\
-	$(PEAS_CFLAGS)		\
+	$(PLAYER_CFLAGS)	\
 	$(WARN_CFLAGS)
 
 plugin_ldflags = \
@@ -440,7 +476,6 @@
 $(am__aclocal_m4_deps):
 install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
 	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
@@ -448,6 +483,8 @@
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
 	}
@@ -463,12 +500,14 @@
 
 clean-pluginLTLIBRARIES:
 	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
-	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(plugin_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
 libmovie-properties.la: $(libmovie_properties_la_OBJECTS) $(libmovie_properties_la_DEPENDENCIES) $(EXTRA_libmovie_properties_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libmovie_properties_la_LINK) -rpath $(plugindir) $(libmovie_properties_la_OBJECTS) $(libmovie_properties_la_LIBADD) $(LIBS)
 
@@ -481,25 +520,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmovie_properties_la-totem-movie-properties.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
@@ -518,8 +554,11 @@
 	-rm -rf .libs _libs
 install-pluginDATA: $(plugin_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
 	@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -584,6 +623,20 @@
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
 
+cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
+	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
@@ -730,19 +783,19 @@
 .MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pluginLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pluginDATA \
-	install-pluginLTLIBRARIES install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-pluginDATA uninstall-pluginLTLIBRARIES
+	clean-libtool clean-pluginLTLIBRARIES cscopelist ctags \
+	distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pluginDATA install-pluginLTLIBRARIES install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-pluginDATA uninstall-pluginLTLIBRARIES
 
 %.plugin: %.plugin.in
 	$(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
diff -Nru totem-3.4.3/src/plugins/properties/movie-properties.plugin.in totem-3.6.2/src/plugins/properties/movie-properties.plugin.in
--- totem-3.4.3/src/plugins/properties/movie-properties.plugin.in	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/plugins/properties/movie-properties.plugin.in	2012-08-29 23:07:45.000000000 +0000
@@ -2,8 +2,8 @@
 Module=movie-properties
 IAge=1
 Builtin=true
-Name=Movie Properties
-Description=Adds movie properties to the sidebar
+_Name=Movie Properties
+_Description=Adds movie properties to the sidebar
 Authors=Bastien Nocera
 Copyright=Copyright © 2007 Bastien Nocera
 Website=http://www.gnome.org/projects/totem/
diff -Nru totem-3.4.3/src/plugins/publish/Makefile.am totem-3.6.2/src/plugins/publish/Makefile.am
--- totem-3.4.3/src/plugins/publish/Makefile.am	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/plugins/publish/Makefile.am	1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-include $(top_srcdir)/src/plugins/Makefile.plugins
-
-plugindir = $(PLUGINDIR)/publish
-plugin_LTLIBRARIES = libpublish.la
-
-plugin_in_files = publish.plugin.in
-
-uidir = $(PLUGINDIR)/publish
-ui_DATA = publish-plugin.ui
-EXTRA_DIST += $(ui_DATA)
-
-libpublish_la_SOURCES = totem-publish.c
-libpublish_la_LDFLAGS = $(plugin_ldflags)
-libpublish_la_LIBADD = \
-	$(plugin_libadd)	\
-	$(LIBEPC_LIBS)
-libpublish_la_CFLAGS = \
-	$(plugin_cflags)	\
-	$(LIBEPC_CFLAGS)
-
-@INTLTOOL_XML_NOMERGE_RULE@
-@GSETTINGS_RULES@
-
-gsettings_SCHEMAS = org.gnome.totem.plugins.publish.gschema.xml
-CLEANFILES += $(gsettings_SCHEMAS)
-
-convertdir = $(datadir)/GConf/gsettings
-convert_DATA = publish.convert
-EXTRA_DIST += publish.convert
-
--include $(top_srcdir)/git.mk
diff -Nru totem-3.4.3/src/plugins/publish/Makefile.in totem-3.6.2/src/plugins/publish/Makefile.in
--- totem-3.4.3/src/plugins/publish/Makefile.in	2012-07-04 09:54:50.000000000 +0000
+++ totem-3.6.2/src/plugins/publish/Makefile.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,821 +0,0 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/org.gnome.totem.plugins.publish.gschema.xml.in.in \
-	$(top_srcdir)/src/plugins/Makefile.plugins
-subdir = src/plugins/publish
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = org.gnome.totem.plugins.publish.gschema.xml.in
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(convertdir)" \
-	"$(DESTDIR)$(plugindir)" "$(DESTDIR)$(uidir)"
-LTLIBRARIES = $(plugin_LTLIBRARIES)
-am__DEPENDENCIES_1 =
-libpublish_la_DEPENDENCIES = $(plugin_libadd) $(am__DEPENDENCIES_1)
-am_libpublish_la_OBJECTS = libpublish_la-totem-publish.lo
-libpublish_la_OBJECTS = $(am_libpublish_la_OBJECTS)
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-libpublish_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libpublish_la_CFLAGS) \
-	$(CFLAGS) $(libpublish_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_@AM_V@)
-am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_@AM_V@)
-am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = $(libpublish_la_SOURCES)
-DIST_SOURCES = $(libpublish_la_SOURCES)
-DATA = $(convert_DATA) $(plugin_DATA) $(ui_DATA)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
-ALL_LINGUAS = @ALL_LINGUAS@
-ALL_PLUGINS = @ALL_PLUGINS@
-AMTAR = @AMTAR@
-AM_CFLAGS = @AM_CFLAGS@
-AM_CPPFLAGS = \
-	-DG_LOG_DOMAIN=\""Totem"\"	\
-	$(DISABLE_DEPRECATED)		\
-	-I$(top_srcdir)/		\
-	-I$(top_srcdir)/src		\
-	-I$(top_srcdir)/src/plugins
-
-AM_CXXFLAGS = @AM_CXXFLAGS@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_LDFLAGS = @AM_LDFLAGS@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-BROWSER_PLUGIN_DIR = @BROWSER_PLUGIN_DIR@
-BROWSER_PLUGIN_LIBS = @BROWSER_PLUGIN_LIBS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CHAPTERS_CFLAGS = @CHAPTERS_CFLAGS@
-CHAPTERS_LIBS = @CHAPTERS_LIBS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DBUS_BIND = @DBUS_BIND@
-DBUS_CFLAGS = @DBUS_CFLAGS@
-DBUS_LIBS = @DBUS_LIBS@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DEPENDENCY_CFLAGS = @DEPENDENCY_CFLAGS@
-DEPENDENCY_LIBS = @DEPENDENCY_LIBS@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
-DISC_RECORDER_CFLAGS = @DISC_RECORDER_CFLAGS@
-DISC_RECORDER_LIBS = @DISC_RECORDER_LIBS@
-DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
-DLLTOOL = @DLLTOOL@
-DOC_USER_FORMATS = @DOC_USER_FORMATS@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-EXTRA_BACKEND_LIBS = @EXTRA_BACKEND_LIBS@
-FGREP = @FGREP@
-FULL_LIBEXECDIR = @FULL_LIBEXECDIR@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-GLIB_MKENUMS = @GLIB_MKENUMS@
-GLIB_REQS = @GLIB_REQS@
-GMSGFMT = @GMSGFMT@
-GREP = @GREP@
-GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
-GST_CFLAGS = @GST_CFLAGS@
-GST_LIBS = @GST_LIBS@
-GTKDOC_CHECK = @GTKDOC_CHECK@
-GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
-GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
-GTKDOC_MKPDF = @GTKDOC_MKPDF@
-GTKDOC_REBASE = @GTKDOC_REBASE@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTK_REQS = @GTK_REQS@
-HELP_DIR = @HELP_DIR@
-HTML_DIR = @HTML_DIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
-INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
-INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
-INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
-INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
-INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
-INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
-INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
-INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
-INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
-INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
-INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBEPC_CFLAGS = @LIBEPC_CFLAGS@
-LIBEPC_LIBS = @LIBEPC_LIBS@
-LIBGRILO_CFLAGS = @LIBGRILO_CFLAGS@
-LIBGRILO_LIBS = @LIBGRILO_LIBS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBZEITGEIST_CFLAGS = @LIBZEITGEIST_CFLAGS@
-LIBZEITGEIST_LIBS = @LIBZEITGEIST_LIBS@
-LIPO = @LIPO@
-LIRC_LIBS = @LIRC_LIBS@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MEDIA_PLAYER_KEYS_CFLAGS = @MEDIA_PLAYER_KEYS_CFLAGS@
-MEDIA_PLAYER_KEYS_LIBS = @MEDIA_PLAYER_KEYS_LIBS@
-MISSING_PLUGINS_CFLAGS = @MISSING_PLUGINS_CFLAGS@
-MISSING_PLUGINS_LIBS = @MISSING_PLUGINS_LIBS@
-MKDIR_P = @MKDIR_P@
-MM_CFLAGS = @MM_CFLAGS@
-MM_LIBS = @MM_LIBS@
-MSGFMT = @MSGFMT@
-MSGMERGE = @MSGMERGE@
-NAUTILUSDIR = @NAUTILUSDIR@
-NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
-NAUTILUS_LIBS = @NAUTILUS_LIBS@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OMF_DIR = @OMF_DIR@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PEASGTK_CFLAGS = @PEASGTK_CFLAGS@
-PEASGTK_LIBS = @PEASGTK_LIBS@
-PEAS_CFLAGS = @PEAS_CFLAGS@
-PEAS_LIBS = @PEAS_LIBS@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PLUGINDIR = @PLUGINDIR@
-PLUGINS = @PLUGINS@
-PYGOBJECT_CFLAGS = @PYGOBJECT_CFLAGS@
-PYGOBJECT_LIBS = @PYGOBJECT_LIBS@
-PYLINT = @PYLINT@
-PYTHON = @PYTHON@
-PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
-PYTHON_PLATFORM = @PYTHON_PLATFORM@
-PYTHON_PREFIX = @PYTHON_PREFIX@
-PYTHON_VERSION = @PYTHON_VERSION@
-RANLIB = @RANLIB@
-SAVE_FILE_CFLAGS = @SAVE_FILE_CFLAGS@
-SAVE_FILE_CHECK_CFLAGS = @SAVE_FILE_CHECK_CFLAGS@
-SAVE_FILE_CHECK_LIBS = @SAVE_FILE_CHECK_LIBS@
-SAVE_FILE_LIBS = @SAVE_FILE_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SMCLIENT_CFLAGS = @SMCLIENT_CFLAGS@
-SMCLIENT_LIBS = @SMCLIENT_LIBS@
-STRIP = @STRIP@
-TOTEM_API_VERSION = @TOTEM_API_VERSION@
-TOTEM_PLPARSER_REQS = @TOTEM_PLPARSER_REQS@
-TOTEM_VERSION_MAJOR = @TOTEM_VERSION_MAJOR@
-TOTEM_VERSION_MICRO = @TOTEM_VERSION_MICRO@
-TOTEM_VERSION_MINOR = @TOTEM_VERSION_MINOR@
-USE_NLS = @USE_NLS@
-VALAC = @VALAC@
-VERSION = @VERSION@
-WARN_CFLAGS = @WARN_CFLAGS@
-WARN_CXXFLAGS = @WARN_CXXFLAGS@
-XGETTEXT = @XGETTEXT@
-XMKMF = @XMKMF@
-XTEST_LIBS = @XTEST_LIBS@
-X_LIBS = @X_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-gsettingsschemadir = @gsettingsschemadir@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-intltool__v_merge_options_ = @intltool__v_merge_options_@
-intltool__v_merge_options_0 = @intltool__v_merge_options_0@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-pkgpyexecdir = @pkgpyexecdir@
-pkgpythondir = @pkgpythondir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-pyexecdir = @pyexecdir@
-pythondir = @pythondir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
-CLEANFILES = $(plugin_DATA) $(gsettings_SCHEMAS)
-DISTCLEANFILES = $(plugin_DATA)
-EXTRA_DIST = $(plugin_in_files) $(ui_DATA) publish.convert
-plugin_cflags = \
-	$(DEPENDENCY_CFLAGS)	\
-	$(PEAS_CFLAGS)		\
-	$(WARN_CFLAGS)
-
-plugin_ldflags = \
-	-export-dynamic \
-	-no-undefined \
-	-avoid-version \
-	-module
-
-plugin_libadd = \
-	$(top_builddir)/src/libtotem.la
-
-plugindir = $(PLUGINDIR)/publish
-plugin_LTLIBRARIES = libpublish.la
-plugin_in_files = publish.plugin.in
-uidir = $(PLUGINDIR)/publish
-ui_DATA = publish-plugin.ui
-libpublish_la_SOURCES = totem-publish.c
-libpublish_la_LDFLAGS = $(plugin_ldflags)
-libpublish_la_LIBADD = \
-	$(plugin_libadd)	\
-	$(LIBEPC_LIBS)
-
-libpublish_la_CFLAGS = \
-	$(plugin_cflags)	\
-	$(LIBEPC_CFLAGS)
-
-gsettings_SCHEMAS = org.gnome.totem.plugins.publish.gschema.xml
-convertdir = $(datadir)/GConf/gsettings
-convert_DATA = publish.convert
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/plugins/Makefile.plugins $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/plugins/publish/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu src/plugins/publish/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-$(top_srcdir)/src/plugins/Makefile.plugins:
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-org.gnome.totem.plugins.publish.gschema.xml.in: $(top_builddir)/config.status $(srcdir)/org.gnome.totem.plugins.publish.gschema.xml.in.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
-	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
-	list2=; for p in $$list; do \
-	  if test -f $$p; then \
-	    list2="$$list2 $$p"; \
-	  else :; fi; \
-	done; \
-	test -z "$$list2" || { \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
-	}
-
-uninstall-pluginLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$f"; \
-	done
-
-clean-pluginLTLIBRARIES:
-	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
-	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libpublish.la: $(libpublish_la_OBJECTS) $(libpublish_la_DEPENDENCIES) $(EXTRA_libpublish_la_DEPENDENCIES) 
-	$(AM_V_CCLD)$(libpublish_la_LINK) -rpath $(plugindir) $(libpublish_la_OBJECTS) $(libpublish_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpublish_la-totem-publish.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
-
-libpublish_la-totem-publish.lo: totem-publish.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpublish_la_CFLAGS) $(CFLAGS) -MT libpublish_la-totem-publish.lo -MD -MP -MF $(DEPDIR)/libpublish_la-totem-publish.Tpo -c -o libpublish_la-totem-publish.lo `test -f 'totem-publish.c' || echo '$(srcdir)/'`totem-publish.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libpublish_la-totem-publish.Tpo $(DEPDIR)/libpublish_la-totem-publish.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='totem-publish.c' object='libpublish_la-totem-publish.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpublish_la_CFLAGS) $(CFLAGS) -c -o libpublish_la-totem-publish.lo `test -f 'totem-publish.c' || echo '$(srcdir)/'`totem-publish.c
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-install-convertDATA: $(convert_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(convertdir)" || $(MKDIR_P) "$(DESTDIR)$(convertdir)"
-	@list='$(convert_DATA)'; test -n "$(convertdir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(convertdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(convertdir)" || exit $$?; \
-	done
-
-uninstall-convertDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(convert_DATA)'; test -n "$(convertdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(convertdir)'; $(am__uninstall_files_from_dir)
-install-pluginDATA: $(plugin_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
-	@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(plugindir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(plugindir)" || exit $$?; \
-	done
-
-uninstall-pluginDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
-install-uiDATA: $(ui_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)"
-	@list='$(ui_DATA)'; test -n "$(uidir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(uidir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(uidir)" || exit $$?; \
-	done
-
-uninstall-uiDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(ui_DATA)'; test -n "$(uidir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(uidir)'; $(am__uninstall_files_from_dir)
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(DATA)
-installdirs:
-	for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(convertdir)" "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(uidir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-convertDATA install-pluginDATA \
-	install-pluginLTLIBRARIES install-uiDATA
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-convertDATA uninstall-pluginDATA \
-	uninstall-pluginLTLIBRARIES uninstall-uiDATA
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pluginLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-convertDATA install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-pluginDATA install-pluginLTLIBRARIES install-ps \
-	install-ps-am install-strip install-uiDATA installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-convertDATA \
-	uninstall-pluginDATA uninstall-pluginLTLIBRARIES \
-	uninstall-uiDATA
-
-%.plugin: %.plugin.in
-	$(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-
-# Checking rules for Python plugins
-# Execute pylint on all the requisite files individually, returning non-zero
-# iff any of the calls to pylint returned non-zero.
-check-pylint: $(plugin_PYTHON)
-@ENABLE_PYTHON_TRUE@	@exitstatus=0; \
-@ENABLE_PYTHON_TRUE@	for py in $^; do \
-@ENABLE_PYTHON_TRUE@		$(PYLINT) -i y -d C0111 -d W0511 -d F0401 $$py; \
-@ENABLE_PYTHON_TRUE@		\
-@ENABLE_PYTHON_TRUE@		newexitstatus=$$?; \
-@ENABLE_PYTHON_TRUE@		if [ $$exitstatus == 0 ]; then \
-@ENABLE_PYTHON_TRUE@			exitstatus=$$newexitstatus; \
-@ENABLE_PYTHON_TRUE@		fi; \
-@ENABLE_PYTHON_TRUE@	done; \
-@ENABLE_PYTHON_TRUE@	exit $$exitstatus
-
-check: check-pylint
-
-.PHONY: check-pylint
-
-@INTLTOOL_XML_NOMERGE_RULE@
-@GSETTINGS_RULES@
-
--include $(top_srcdir)/git.mk
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff -Nru totem-3.4.3/src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in totem-3.6.2/src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in
--- totem-3.4.3/src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/plugins/publish/org.gnome.totem.plugins.publish.gschema.xml.in.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-
-
-	
-		
-			
-				
-				
-			
-			'http'
-			<_summary>Publisher protocol to use
-			<_description>The transport protocol to use when publishing playlists over the network.
-		
-		
-			
-				
-				'%a of %u on %h'
-			<_summary>Format for network service name
-			<_description>A format string used to build the network service name used when publishing playlists over the network. The following format placeholders can be used:
- • %a: the program name as returned by g_get_application_name()
- • %h: the machine's host name in title case
- • %u: the user's login name in title case
- • %U: the user's real name
- • %%: the percent sign
-		
-	
-
-
-
diff -Nru totem-3.4.3/src/plugins/publish/publish-plugin.ui totem-3.6.2/src/plugins/publish/publish-plugin.ui
--- totem-3.4.3/src/plugins/publish/publish-plugin.ui	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/plugins/publish/publish-plugin.ui	1970-01-01 00:00:00.000000000 +0000
@@ -1,111 +0,0 @@
-
-
-
-  
-    True
-    GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-    6
-    6
-    
-      
-        True
-        GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-        0
-        Service _Name:
-        True
-      
-      
-        False
-      
-    
-    
-      
-        True
-        True
-        GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-        64
-        
-      
-      
-        False
-        1
-      
-    
-    
-      
-        True
-        GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-        0
-        0
-        12
-        The name used for announcing the playlist service on the network.
-All occurrences of the string <b>%u</b> will be replaced by your name,
-and <b>%h</b> will be replaced by your computer's host name.
-        True
-        True
-        
-          
-        
-      
-      
-        False
-        2
-      
-    
-    
-      
-        True
-        True
-        GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-        Use _encrypted transport protocol (HTTPS)
-        True
-        True
-        
-      
-      
-        False
-        3
-      
-    
-  
-  
-    GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-    
-      
-        True
-        GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-        6
-        
-          
-            True
-            True
-            GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-            GTK_POLICY_AUTOMATIC
-            GTK_POLICY_NEVER
-            GTK_SHADOW_IN
-            
-              
-                True
-                True
-                GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-                False
-                True
-                
-              
-            
-          
-        
-        
-          
-            True
-            GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-          
-          
-            False
-            1
-          
-        
-      
-    
-  
-
diff -Nru totem-3.4.3/src/plugins/publish/publish.convert totem-3.6.2/src/plugins/publish/publish.convert
--- totem-3.4.3/src/plugins/publish/publish.convert	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/plugins/publish/publish.convert	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-[org.gnome.totem.plugins.publish]
-name-format = /apps/totem/plugins/publish/name
-protocol = /apps/totem/plugins/publish/protocol
diff -Nru totem-3.4.3/src/plugins/publish/publish.plugin.in totem-3.6.2/src/plugins/publish/publish.plugin.in
--- totem-3.4.3/src/plugins/publish/publish.plugin.in	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/plugins/publish/publish.plugin.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-[Plugin]
-Module=publish
-IAge=1
-_Name=Publish Playlist
-_Description=Share the current playlist via HTTP
-Authors=Mathias Hasselmann
-Copyright=Copyright © 2007 Openismus GmbH
-Website=http://www.gnome.org/projects/totem/
diff -Nru totem-3.4.3/src/plugins/publish/totem-publish.c totem-3.6.2/src/plugins/publish/totem-publish.c
--- totem-3.4.3/src/plugins/publish/totem-publish.c	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/plugins/publish/totem-publish.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,681 +0,0 @@
-/* * -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2007 Openismus GmbH
- *
- * 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 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
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
- *
- * The Totem project hereby grant permission for non-gpl compatible GStreamer
- * plugins to be used and distributed together with GStreamer and Totem. This
- * permission are above and beyond the permissions granted by the GPL license
- * Totem is covered by.
- *
- * See license_change file for details.
- *
- * Author:
- * 	Mathias Hasselmann
- *
- */
-
-#include "config.h"
-
-#include 
-#include 
-#include 
-
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include 
-#include 
-#include 
-#include 
-
-#include "totem-plugin.h"
-#include "totem-private.h"
-#include "totem-dirs.h"
-#include "totem.h"
-
-#define TOTEM_TYPE_PUBLISH_PLUGIN		(totem_publish_plugin_get_type ())
-#define TOTEM_PUBLISH_PLUGIN(o)			(G_TYPE_CHECK_INSTANCE_CAST ((o), TOTEM_TYPE_PUBLISH_PLUGIN, TotemPublishPlugin))
-#define TOTEM_PUBLISH_PLUGIN_CLASS(k)		(G_TYPE_CHECK_CLASS_CAST((k), TOTEM_TYPE_PUBLISH_PLUGIN, TotemPublishPluginClass))
-#define TOTEM_IS_PUBLISH_PLUGIN(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), TOTEM_TYPE_PUBLISH_PLUGIN))
-#define TOTEM_IS_PUBLISH_PLUGIN_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), TOTEM_TYPE_PUBLISH_PLUGIN))
-#define TOTEM_PUBLISH_PLUGIN_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), TOTEM_TYPE_PUBLISH_PLUGIN, TotemPublishPluginClass))
-
-#define TOTEM_PUBLISH_SCHEMA			TOTEM_GSETTINGS_SCHEMA ".plugins.publish"
-
-enum
-{
-	NAME_COLUMN,
-	INFO_COLUMN,
-	LAST_COLUMN
-};
-
-typedef struct {
-	TotemObject       *totem;
-	GSettings         *gsettings;
-	GtkWidget         *settings;
-	GtkWidget         *scanning;
-	GtkBuilder        *ui;
-
-	EpcPublisher      *publisher;
-	EpcServiceMonitor *monitor;
-	GtkListStore      *neighbours;
-	GSList            *playlist;
-
-	guint scanning_id;
-
-	gulong item_added_id;
-	gulong item_removed_id;
-} TotemPublishPluginPrivate;
-
-TOTEM_PLUGIN_REGISTER_CONFIGURABLE (TOTEM_TYPE_PUBLISH_PLUGIN, TotemPublishPlugin, totem_publish_plugin);
-
-void totem_publish_plugin_service_name_entry_changed_cb	   (GtkEntry        *entry,
-							    TotemPublishPlugin *self);
-void totem_publish_plugin_encryption_button_toggled_cb	   (GtkToggleButton *button,
-							    TotemPublishPlugin *self);
-void totem_publish_plugin_dialog_response_cb		   (GtkDialog       *dialog,
-							    gint             response,
-							    gpointer         data);
-void totem_publish_plugin_neighbours_list_row_activated_cb (GtkTreeView       *view,
-							    GtkTreePath       *path,
-							    GtkTreeViewColumn *column,
-							    gpointer           data);
-
-G_LOCK_DEFINE_STATIC(totem_publish_plugin_lock);
-
-static void
-totem_publish_plugin_name_changed_cb (GSettings *settings, const gchar *key, TotemPublishPlugin *self)
-{
-	gchar *pattern, *name;
-
-	pattern = g_settings_get_string (settings, "name-format");
-	name = epc_publisher_expand_name (pattern, NULL);
-	g_free (pattern);
-
-	epc_publisher_set_service_name (self->priv->publisher, name);
-
-	g_free (name);
-}
-
-void
-totem_publish_plugin_service_name_entry_changed_cb (GtkEntry *entry, TotemPublishPlugin *self)
-{
-	g_settings_set_string (self->priv->gsettings, "name-format", gtk_entry_get_text (entry));
-}
-
-void
-totem_publish_plugin_encryption_button_toggled_cb (GtkToggleButton *button, TotemPublishPlugin *self)
-{
-	g_settings_set_string (self->priv->gsettings, "protocol", gtk_toggle_button_get_active (button) ? "https" : "http");
-}
-
-static void
-totem_publish_plugin_protocol_changed_cb (GSettings *settings, const gchar *key, TotemPublishPlugin *self)
-{
-	gchar *protocol_name;
-	EpcProtocol protocol;
-	GError *error = NULL;
-
-	protocol_name = g_settings_get_string (settings, "protocol");
-	protocol = epc_protocol_from_name (protocol_name, EPC_PROTOCOL_HTTPS);
-	g_free (protocol_name);
-
-	epc_publisher_quit (self->priv->publisher);
-	epc_publisher_set_protocol (self->priv->publisher, protocol);
-	epc_publisher_run_async (self->priv->publisher, &error);
-
-	if (error) {
-		g_warning ("%s: %s", G_STRFUNC, error->message);
-		g_error_free (error);
-	}
-}
-
-static gchar*
-totem_publish_plugin_build_key (const gchar *filename)
-{
-	return g_strconcat ("media/", filename, NULL);
-}
-
-static EpcContents*
-totem_publish_plugin_playlist_cb (EpcPublisher *publisher,
-				  const gchar  *key,
-				  gpointer      data)
-{
-	TotemPublishPlugin *self = TOTEM_PUBLISH_PLUGIN (data);
-	GString *buffer = g_string_new (NULL);
-	EpcContents *contents = NULL;
-	GSList *iter;
-	gint i;
-
-	G_LOCK (totem_publish_plugin_lock);
-
-	g_string_append_printf (buffer,
-				"[playlist]\nNumberOfEntries=%d\n",
-				g_slist_length (self->priv->playlist));
-
-	for (iter = self->priv->playlist, i = 1; iter; iter = iter->next, ++i) {
-		gchar *file_key = iter->data;
-		gchar *uri;
-
-		uri = epc_publisher_get_uri (publisher, file_key, NULL);
-
-		g_string_append_printf (buffer,
-					"File%d=%s\nTitle%d=%s\n",
-					i, uri, i, file_key + 6);
-
-		g_free (uri);
-	}
-
-	G_UNLOCK (totem_publish_plugin_lock);
-
-	contents = epc_contents_new ("audio/x-scpls",
-				     buffer->str, buffer->len,
-				     g_free);
-
-	g_string_free (buffer, FALSE);
-
-	return contents;
-}
-
-static gboolean
-totem_publish_plugin_stream_cb (EpcContents *contents,
-				gpointer     buffer,
-				gsize       *length,
-				gpointer     data)
-{
-	GInputStream *stream = data;
-	gssize size = 65536;
-
-	g_return_val_if_fail (NULL != contents, FALSE);
-	g_return_val_if_fail (NULL != length, FALSE);
-
-	if (NULL == data || *length < (gsize)size) {
-		*length = MAX (*length, (gsize)size);
-		return FALSE;
-	}
-
-	size = g_input_stream_read (stream, buffer, size, NULL, NULL);
-	if (size == -1) {
-		g_input_stream_close (stream, NULL, NULL);
-		size = 0;
-	}
-
-	*length = size;
-
-	return size > 0;
-}
-
-static EpcContents*
-totem_publish_plugin_media_cb (EpcPublisher *publisher,
-			       const gchar  *key,
-			       gpointer      data)
-{
-	GFileInputStream *stream;
-	const gchar *url = data;
-	GFile *file;
-
-	file = g_file_new_for_uri (url);
-	stream = g_file_read (file, NULL, NULL);
-	g_object_unref (file);
-
-	if (stream) {
-		EpcContents *output = epc_contents_stream_new (
-			NULL, totem_publish_plugin_stream_cb,
-			stream, g_object_unref);
-
-		return output;
-	}
-
-	return NULL;
-}
-
-static void
-totem_publish_plugin_rebuild_playlist_cb (TotemPlaylist *playlist,
-					  const gchar   *filename,
-					  const gchar   *url,
-					  gpointer       data)
-{
-	TotemPublishPlugin *self = TOTEM_PUBLISH_PLUGIN (data);
-	gchar *key = totem_publish_plugin_build_key (filename);
-	self->priv->playlist = g_slist_prepend (self->priv->playlist, key);
-}
-
-static void
-totem_publish_plugin_playlist_changed_cb (TotemPlaylist *playlist,
-					  gpointer       data)
-{
-	TotemPublishPlugin *self = TOTEM_PUBLISH_PLUGIN (data);
-
-	G_LOCK (totem_publish_plugin_lock);
-
-	g_slist_foreach (self->priv->playlist, (GFunc) g_free, NULL);
-	g_slist_free (self->priv->playlist);
-	self->priv->playlist = NULL;
-
-	totem_playlist_foreach (playlist,
-				totem_publish_plugin_rebuild_playlist_cb,
-				self);
-
-	self->priv->playlist = g_slist_reverse (self->priv->playlist);
-
-	G_UNLOCK (totem_publish_plugin_lock);
-}
-
-static void
-totem_publish_plugin_playlist_item_added_cb (TotemPlaylist *playlist,
-					     const gchar   *filename,
-					     const gchar   *url,
-					     gpointer       data)
-{
-	TotemPublishPlugin *self = TOTEM_PUBLISH_PLUGIN (data);
-	gchar *key = totem_publish_plugin_build_key (filename);
-
-	epc_publisher_add_handler (self->priv->publisher, key,
-				   totem_publish_plugin_media_cb,
-				   g_strdup (url), g_free);
-
-	g_free (key);
-
-}
-
-static void
-totem_publish_plugin_playlist_item_removed_cb (TotemPlaylist *playlist,
-				      const gchar   *filename,
-				      const gchar   *url,
-				      gpointer       data)
-{
-	TotemPublishPlugin *self = TOTEM_PUBLISH_PLUGIN (data);
-	gchar *key = totem_publish_plugin_build_key (filename);
-	epc_publisher_remove (self->priv->publisher, key);
-	g_free (key);
-}
-
-static void
-totem_publish_plugin_service_found_cb (TotemPublishPlugin *self,
-				       const gchar        *name,
-				       EpcServiceInfo     *info)
-{
-	GtkTreeIter iter;
-
-	gtk_list_store_append (self->priv->neighbours, &iter);
-	gtk_list_store_set (self->priv->neighbours, &iter, NAME_COLUMN, name,
-						     INFO_COLUMN, info,
-						     -1);
-}
-
-static void
-totem_publish_plugin_service_removed_cb (TotemPublishPlugin *self,
-					 const gchar        *name,
-					 const gchar        *type)
-{
-	GtkTreeModel *model = GTK_TREE_MODEL (self->priv->neighbours);
-	GtkTreeIter iter;
-
-	if (gtk_tree_model_get_iter_first (model, &iter)) {
-		GSList *path_list = NULL, *path_iter;
-		GtkTreePath *path;
-		gchar *stored;
-
-		do {
-			gtk_tree_model_get (model, &iter, NAME_COLUMN, &stored, -1);
-
-			if (g_str_equal (stored, name)) {
-				path = gtk_tree_model_get_path (model, &iter);
-				path_list = g_slist_prepend (path_list, path);
-			}
-		} while (gtk_tree_model_iter_next (model, &iter));
-
-		for (path_iter = path_list; path_iter; path_iter = path_iter->next) {
-			path = path_iter->data;
-
-			if (gtk_tree_model_get_iter (model, &iter, path))
-				gtk_list_store_remove (self->priv->neighbours, &iter);
-
-			gtk_tree_path_free (path);
-		}
-
-		g_slist_free (path_list);
-	}
-}
-
-static void
-totem_publish_plugin_scanning_done_cb (TotemPublishPlugin *self,
-				       const gchar        *type)
-{
-	if (self->priv->scanning_id) {
-		g_source_remove (self->priv->scanning_id);
-		self->priv->scanning_id = 0;
-	}
-
-	if (self->priv->scanning)
-		gtk_widget_hide (self->priv->scanning);
-}
-
-static void
-totem_publish_plugin_load_playlist (TotemPublishPlugin   *self,
-				    const EpcServiceInfo *info)
-{
-	EpcConsumer *consumer = epc_consumer_new (info);
-	GKeyFile *keyfile = g_key_file_new ();
-	gchar *contents = NULL;
-	GError *error = NULL;
-	gsize length = 0;
-
-	contents = epc_consumer_lookup (consumer, "playlist.pls", &length, &error);
-
-	if (contents && g_key_file_load_from_data (keyfile, contents, length, G_KEY_FILE_NONE, &error)) {
-		gint i, n_entries;
-		GList *mrl_list = NULL;
-
-		/* returns zero in case of errors */
-		n_entries = g_key_file_get_integer (keyfile, "playlist", "NumberOfEntries", &error);
-
-		if (error)
-			goto out;
-
-		/* FIXME
-		ev_sidebar_set_current_page (EV_SIDEBAR (self->priv->totem->sidebar), "playlist"); */
-		totem_playlist_clear (self->priv->totem->playlist);
-
-		for (i = 0; i < n_entries; ++i) {
-			gchar *key, *mrl, *title;
-
-			key = g_strdup_printf ("File%d", i + 1);
-			mrl = g_key_file_get_string (keyfile, "playlist", key, NULL);
-			g_free (key);
-
-			key = g_strdup_printf ("Title%d", i + 1);
-			title = g_key_file_get_string (keyfile, "playlist", key, NULL);
-			g_free (key);
-
-			if (mrl)
-				mrl_list = g_list_prepend (mrl_list, totem_playlist_mrl_data_new (mrl, title));
-
-			g_free (title);
-			g_free (mrl);
-		}
-
-		/* Add the MRLs to the playlist asynchronously and in order */
-		if (mrl_list != NULL)
-			totem_playlist_add_mrls (self->priv->totem->playlist, g_list_reverse (mrl_list), FALSE, NULL, NULL, NULL);
-	}
-
-out:
-	if (error) {
-		g_warning ("Cannot load playlist: %s", error->message);
-		g_error_free (error);
-	}
-
-	g_key_file_free (keyfile);
-	g_free (contents);
-
-	g_object_unref (consumer);
-}
-
-void
-totem_publish_plugin_neighbours_list_row_activated_cb (GtkTreeView       *view,
-						       GtkTreePath       *path,
-						       GtkTreeViewColumn *column,
-						       gpointer           data)
-{
-	TotemPublishPlugin *self = TOTEM_PUBLISH_PLUGIN (data);
-	EpcServiceInfo *info = NULL;
-	GtkTreeIter iter;
-
-	if (gtk_tree_model_get_iter (GTK_TREE_MODEL (self->priv->neighbours), &iter, path)) {
-		gtk_tree_model_get (GTK_TREE_MODEL (self->priv->neighbours),
-				    &iter, INFO_COLUMN, &info, -1);
-		totem_publish_plugin_load_playlist (self, info);
-		epc_service_info_unref (info);
-	}
-}
-
-static gboolean
-totem_publish_plugin_scanning_cb (gpointer data)
-{
-	gtk_progress_bar_pulse (GTK_PROGRESS_BAR (data));
-	return TRUE;
-}
-
-static GtkWidget*
-totem_publish_plugin_create_neigbours_page (TotemPublishPlugin *self, GtkBuilder *builder)
-{
-	GtkWidget *page, *list;
-
-	page = GTK_WIDGET (gtk_builder_get_object (builder, "neighbours-page"));
-	list = GTK_WIDGET (gtk_builder_get_object (builder, "neighbours-list"));
-
-	self->priv->scanning = GTK_WIDGET (gtk_builder_get_object (builder, "neighbours-scanning"));
-	self->priv->scanning_id = g_timeout_add (100, totem_publish_plugin_scanning_cb, self->priv->scanning);
-
-	g_signal_connect_swapped (self->priv->monitor, "service-found",
-				  G_CALLBACK (totem_publish_plugin_service_found_cb),
-				  self);
-	g_signal_connect_swapped (self->priv->monitor, "service-removed",
-				  G_CALLBACK (totem_publish_plugin_service_removed_cb),
-				  self);
-	g_signal_connect_swapped (self->priv->monitor, "scanning-done",
-				  G_CALLBACK (totem_publish_plugin_scanning_done_cb),
-				  self);
-
-	self->priv->neighbours = gtk_list_store_new (LAST_COLUMN, G_TYPE_STRING, EPC_TYPE_SERVICE_INFO);
-
-	gtk_tree_view_set_model (GTK_TREE_VIEW (list),
-				 GTK_TREE_MODEL (self->priv->neighbours));
-
-	gtk_tree_view_append_column (GTK_TREE_VIEW (list),
-		gtk_tree_view_column_new_with_attributes (
-			NULL, gtk_cell_renderer_text_new (),
-			"text", NAME_COLUMN, NULL));
-
-	g_object_ref (page);
-	gtk_widget_unparent (page);
-
-	return page;
-}
-
-static void
-impl_activate (PeasActivatable *plugin)
-{
-	TotemPublishPlugin *self = TOTEM_PUBLISH_PLUGIN (plugin);
-	TotemPublishPluginPrivate *priv = self->priv;
-	EpcProtocol protocol = EPC_PROTOCOL_HTTPS;
-	GtkWindow *window;
-	GtkBuilder *builder;
-	GError *internal_error = NULL;
-
-	gchar *protocol_name;
-
-	gchar *service_pattern;
-	gchar *service_name;
-
-	g_return_if_fail (NULL == priv->publisher);
-	g_return_if_fail (NULL == priv->totem);
-
-	G_LOCK (totem_publish_plugin_lock);
-
-	priv->totem = g_object_ref (g_object_get_data (G_OBJECT (plugin), "object"));
-
-	window = totem_get_main_window (priv->totem);
-	builder = totem_plugin_load_interface ("publish", "publish-plugin.ui", TRUE, window, self);
-	epc_progress_window_install (window);
-	g_object_unref (window);
-
-	priv->gsettings = g_settings_new (TOTEM_PUBLISH_SCHEMA);
-
-	protocol_name = g_settings_get_string (priv->gsettings, "protocol");
-	service_pattern = g_settings_get_string (priv->gsettings, "name-format");
-
-	if (*protocol_name == '\0') {
-		protocol_name = g_strdup ("http");
-		g_settings_set_string (priv->gsettings, "protocol", protocol_name);
-	}
-
-	if (*service_pattern == '\0') {
-		service_pattern = g_strdup ("%a of %u on %h");
-		g_settings_set_string (priv->gsettings, "name-format", service_pattern);
-	}
-
-	g_signal_connect (priv->gsettings, "changed::name", (GCallback) totem_publish_plugin_name_changed_cb, self);
-	g_signal_connect (priv->gsettings, "changed::protocol", (GCallback) totem_publish_plugin_protocol_changed_cb, self);
-
-	protocol = epc_protocol_from_name (protocol_name, EPC_PROTOCOL_HTTPS);
-	service_name = epc_publisher_expand_name (service_pattern, &internal_error);
-	g_free (service_pattern);
-
-	if (internal_error) {
-		g_warning ("%s: %s", G_STRFUNC, internal_error->message);
-		g_clear_error (&internal_error);
-	}
-
-	priv->monitor = epc_service_monitor_new ("totem", NULL, EPC_PROTOCOL_UNKNOWN);
-	epc_service_monitor_set_skip_our_own (priv->monitor, TRUE);
-
-	/* Translators: computers on the local network which are publishing their playlists over the network */
-	totem_add_sidebar_page (priv->totem, "neighbours", _("Neighbors"),
-				totem_publish_plugin_create_neigbours_page (self, builder));
-	g_object_unref (builder);
-
-	priv->publisher = epc_publisher_new (service_name, "totem", NULL);
-	epc_publisher_set_protocol (priv->publisher, protocol);
-
-	g_free (protocol_name);
-	g_free (service_name);
-
-	epc_publisher_add_handler (priv->publisher, "playlist.pls",
-				   totem_publish_plugin_playlist_cb,
-				   self, NULL);
-	epc_publisher_add_bookmark (priv->publisher, "playlist.pls", NULL);
-
-	priv->item_added_id = g_signal_connect (priv->totem->playlist, "changed",
-		G_CALLBACK (totem_publish_plugin_playlist_changed_cb), self);
-	priv->item_added_id = g_signal_connect (priv->totem->playlist, "item-added",
-		G_CALLBACK (totem_publish_plugin_playlist_item_added_cb), self);
-	priv->item_removed_id = g_signal_connect (priv->totem->playlist, "item-removed",
-		G_CALLBACK (totem_publish_plugin_playlist_item_removed_cb), self);
-
-	G_UNLOCK (totem_publish_plugin_lock);
-
-	totem_playlist_foreach (priv->totem->playlist,
-				totem_publish_plugin_playlist_item_added_cb, self);
-
-	totem_publish_plugin_playlist_changed_cb (priv->totem->playlist, self);
-
-	epc_publisher_run_async (priv->publisher, NULL);
-
-	return;
-}
-
-static void
-impl_deactivate (PeasActivatable *plugin)
-{
-	TotemPublishPlugin *self = TOTEM_PUBLISH_PLUGIN (plugin);
-	TotemPublishPluginPrivate *priv = self->priv;
-	TotemPlaylist *playlist = NULL;
-
-	G_LOCK (totem_publish_plugin_lock);
-
-	if (priv->totem)
-		playlist = priv->totem->playlist;
-
-	if (priv->scanning_id) {
-		g_source_remove (priv->scanning_id);
-		priv->scanning_id = 0;
-	}
-
-	if (playlist && priv->item_added_id) {
-		g_signal_handler_disconnect (playlist, priv->item_added_id);
-		priv->item_added_id = 0;
-	}
-
-	if (playlist && priv->item_removed_id) {
-		g_signal_handler_disconnect (playlist, priv->item_removed_id);
-		priv->item_removed_id = 0;
-	}
-
-	if (priv->monitor) {
-		g_object_unref (priv->monitor);
-		priv->monitor = NULL;
-	}
-
-	if (priv->publisher) {
-		epc_publisher_quit (priv->publisher);
-		g_object_unref (priv->publisher);
-		priv->publisher = NULL;
-	}
-
-	if (priv->gsettings != NULL)
-		g_object_unref (priv->gsettings);
-	priv->gsettings = NULL;
-
-	if (priv->totem) {
-		totem_remove_sidebar_page (priv->totem, "neighbours");
-
-		g_object_unref (priv->totem);
-		priv->totem = NULL;
-	}
-
-	if (priv->settings) {
-		gtk_widget_destroy (priv->settings);
-		priv->settings = NULL;
-	}
-
-	if (priv->playlist) {
-		g_slist_foreach (priv->playlist, (GFunc) g_free, NULL);
-		g_slist_free (priv->playlist);
-		priv->playlist = NULL;
-	}
-
-	G_UNLOCK (totem_publish_plugin_lock);
-
-	priv->scanning = NULL;
-}
-
-static GtkWidget *
-impl_create_configure_widget (PeasGtkConfigurable *configurable)
-{
-	TotemPublishPlugin *self = TOTEM_PUBLISH_PLUGIN (configurable);
-	gchar *service_name, *protocol_name;
-	GtkBuilder *builder;
-	GtkWidget *widget;
-	EpcProtocol protocol;
-	GSettings *settings;
-
-	/* This function has to be independent of the rest of the plugin, as it's executed under a different plugin instance.
-	 * FIXME: bgo#624073 */
-	builder = totem_plugin_load_interface ("publish", "publish-plugin.ui", TRUE, NULL, self);
-
-	settings = g_settings_new (TOTEM_PUBLISH_SCHEMA);
-	service_name = g_settings_get_string (settings, "name-format");
-	protocol_name = g_settings_get_string (settings, "protocol");
-	g_object_unref (settings);
-
-	protocol = epc_protocol_from_name (protocol_name, EPC_PROTOCOL_HTTPS);
-	g_free (protocol_name);
-
-	widget = g_object_ref (gtk_builder_get_object (builder, "publish-settings-vbox"));
-
-	gtk_entry_set_text (GTK_ENTRY (gtk_builder_get_object (builder, "service-name-entry")), service_name);
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (builder, "encryption-button")), EPC_PROTOCOL_HTTPS == protocol);
-
-	g_free (service_name);
-
-	return widget;
-}
diff -Nru totem-3.4.3/src/plugins/pythonconsole/Makefile.in totem-3.6.2/src/plugins/pythonconsole/Makefile.in
--- totem-3.4.3/src/plugins/pythonconsole/Makefile.in	2012-07-04 09:54:50.000000000 +0000
+++ totem-3.6.2/src/plugins/pythonconsole/Makefile.in	2012-10-25 13:36:22.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.12.2 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +15,23 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -37,13 +53,11 @@
 DIST_COMMON = $(plugin_PYTHON) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in \
 	$(srcdir)/org.gnome.totem.plugins.pythonconsole.gschema.xml.in.in \
+	$(top_srcdir)/py-compile \
 	$(top_srcdir)/src/plugins/Makefile.plugins
 subdir = src/plugins/pythonconsole
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -51,14 +65,25 @@
 CONFIG_CLEAN_FILES =  \
 	org.gnome.totem.plugins.pythonconsole.gschema.xml.in
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -103,7 +128,8 @@
 	$(DISABLE_DEPRECATED)		\
 	-I$(top_srcdir)/		\
 	-I$(top_srcdir)/src		\
-	-I$(top_srcdir)/src/plugins
+	-I$(top_srcdir)/src/plugins	\
+	-I$(top_srcdir)/src/gst
 
 AM_CXXFLAGS = @AM_CXXFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -113,6 +139,10 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BACKEND_CFLAGS = @BACKEND_CFLAGS@
+BACKEND_LIBS = @BACKEND_LIBS@
+BACKEND_TEST_CFLAGS = @BACKEND_TEST_CFLAGS@
+BACKEND_TEST_LIBS = @BACKEND_TEST_LIBS@
 BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
 BROWSER_PLUGIN_DIR = @BROWSER_PLUGIN_DIR@
 BROWSER_PLUGIN_LIBS = @BROWSER_PLUGIN_LIBS@
@@ -134,8 +164,6 @@
 DBUS_LIBS = @DBUS_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DEPENDENCY_CFLAGS = @DEPENDENCY_CFLAGS@
-DEPENDENCY_LIBS = @DEPENDENCY_LIBS@
 DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DISC_RECORDER_CFLAGS = @DISC_RECORDER_CFLAGS@
 DISC_RECORDER_LIBS = @DISC_RECORDER_LIBS@
@@ -149,7 +177,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-EXTRA_BACKEND_LIBS = @EXTRA_BACKEND_LIBS@
 FGREP = @FGREP@
 FULL_LIBEXECDIR = @FULL_LIBEXECDIR@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
@@ -157,19 +184,21 @@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GLIB_REQS = @GLIB_REQS@
+GLOW_BUTTON_CFLAGS = @GLOW_BUTTON_CFLAGS@
+GLOW_BUTTON_LIBS = @GLOW_BUTTON_LIBS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
-GST_CFLAGS = @GST_CFLAGS@
-GST_LIBS = @GST_LIBS@
+GST_PLUGINS_BAD_CFLAGS = @GST_PLUGINS_BAD_CFLAGS@
+GST_PLUGINS_BAD_LIBS = @GST_PLUGINS_BAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
 GTK_REQS = @GTK_REQS@
+HELPER_CFLAGS = @HELPER_CFLAGS@
+HELPER_LIBS = @HELPER_LIBS@
 HELP_DIR = @HELP_DIR@
 HTML_DIR = @HTML_DIR@
 INSTALL = @INSTALL@
@@ -195,11 +224,11 @@
 INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBEPC_CFLAGS = @LIBEPC_CFLAGS@
-LIBEPC_LIBS = @LIBEPC_LIBS@
 LIBGRILO_CFLAGS = @LIBGRILO_CFLAGS@
 LIBGRILO_LIBS = @LIBGRILO_LIBS@
 LIBOBJS = @LIBOBJS@
+LIBPLAYER_CFLAGS = @LIBPLAYER_CFLAGS@
+LIBPLAYER_LIBS = @LIBPLAYER_LIBS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBZEITGEIST_CFLAGS = @LIBZEITGEIST_CFLAGS@
@@ -216,8 +245,6 @@
 MISSING_PLUGINS_CFLAGS = @MISSING_PLUGINS_CFLAGS@
 MISSING_PLUGINS_LIBS = @MISSING_PLUGINS_LIBS@
 MKDIR_P = @MKDIR_P@
-MM_CFLAGS = @MM_CFLAGS@
-MM_LIBS = @MM_LIBS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 NAUTILUSDIR = @NAUTILUSDIR@
@@ -238,15 +265,21 @@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PEASGTK_CFLAGS = @PEASGTK_CFLAGS@
-PEASGTK_LIBS = @PEASGTK_LIBS@
-PEAS_CFLAGS = @PEAS_CFLAGS@
-PEAS_LIBS = @PEAS_LIBS@
+PIXBUF_HELPER_CFLAGS = @PIXBUF_HELPER_CFLAGS@
+PIXBUF_HELPER_LIBS = @PIXBUF_HELPER_LIBS@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLAYER_CFLAGS = @PLAYER_CFLAGS@
+PLAYER_LIBS = @PLAYER_LIBS@
 PLUGINDIR = @PLUGINDIR@
 PLUGINS = @PLUGINS@
+PLUGIN_VIEWER_CFLAGS = @PLUGIN_VIEWER_CFLAGS@
+PLUGIN_VIEWER_LIBS = @PLUGIN_VIEWER_LIBS@
+PREVIEW_CFLAGS = @PREVIEW_CFLAGS@
+PREVIEW_LIBS = @PREVIEW_LIBS@
+PROPERTIES_CFLAGS = @PROPERTIES_CFLAGS@
+PROPERTIES_LIBS = @PROPERTIES_LIBS@
 PYGOBJECT_CFLAGS = @PYGOBJECT_CFLAGS@
 PYGOBJECT_LIBS = @PYGOBJECT_LIBS@
 PYLINT = @PYLINT@
@@ -266,6 +299,10 @@
 SMCLIENT_CFLAGS = @SMCLIENT_CFLAGS@
 SMCLIENT_LIBS = @SMCLIENT_LIBS@
 STRIP = @STRIP@
+THUMBNAILER_CFLAGS = @THUMBNAILER_CFLAGS@
+THUMBNAILER_LIBS = @THUMBNAILER_LIBS@
+TIME_HELPER_CFLAGS = @TIME_HELPER_CFLAGS@
+TIME_HELPER_LIBS = @TIME_HELPER_LIBS@
 TOTEM_API_VERSION = @TOTEM_API_VERSION@
 TOTEM_PLPARSER_REQS = @TOTEM_PLPARSER_REQS@
 TOTEM_VERSION_MAJOR = @TOTEM_VERSION_MAJOR@
@@ -277,9 +314,6 @@
 WARN_CFLAGS = @WARN_CFLAGS@
 WARN_CXXFLAGS = @WARN_CXXFLAGS@
 XGETTEXT = @XGETTEXT@
-XMKMF = @XMKMF@
-XTEST_LIBS = @XTEST_LIBS@
-X_LIBS = @X_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -345,8 +379,7 @@
 DISTCLEANFILES = $(plugin_DATA)
 EXTRA_DIST = $(plugin_in_files) pythonconsole.convert
 plugin_cflags = \
-	$(DEPENDENCY_CFLAGS)	\
-	$(PEAS_CFLAGS)		\
+	$(PLAYER_CFLAGS)	\
 	$(WARN_CFLAGS)
 
 plugin_ldflags = \
@@ -408,8 +441,11 @@
 	-rm -rf .libs _libs
 install-pluginPYTHON: $(plugin_PYTHON)
 	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
 	@list='$(plugin_PYTHON)'; dlist=; list2=; test -n "$(plugindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
 	  if test -f $$b$$p; then \
@@ -443,8 +479,11 @@
 	exit $$st
 install-convertDATA: $(convert_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(convertdir)" || $(MKDIR_P) "$(DESTDIR)$(convertdir)"
 	@list='$(convert_DATA)'; test -n "$(convertdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(convertdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(convertdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -461,8 +500,11 @@
 	dir='$(DESTDIR)$(convertdir)'; $(am__uninstall_files_from_dir)
 install-pluginDATA: $(plugin_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
 	@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -483,6 +525,8 @@
 ctags: CTAGS
 CTAGS:
 
+cscope cscopelist:
+
 
 distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
diff -Nru totem-3.4.3/src/plugins/pythonconsole/pythonconsole.plugin.in totem-3.6.2/src/plugins/pythonconsole/pythonconsole.plugin.in
--- totem-3.4.3/src/plugins/pythonconsole/pythonconsole.plugin.in	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/plugins/pythonconsole/pythonconsole.plugin.in	2012-08-29 23:07:45.000000000 +0000
@@ -3,7 +3,7 @@
 Module=pythonconsole
 IAge=1
 _Name=Python Console
-_Description=Interactive Python console.
+_Description=Interactive Python console
 Authors=Steve Frécinaux 
 Copyright=Copyright © 2006 Steve Frécinaux
 Website=http://www.gnome.org/projects/totem/
diff -Nru totem-3.4.3/src/plugins/recent/Makefile.am totem-3.6.2/src/plugins/recent/Makefile.am
--- totem-3.4.3/src/plugins/recent/Makefile.am	1970-01-01 00:00:00.000000000 +0000
+++ totem-3.6.2/src/plugins/recent/Makefile.am	2012-08-29 23:07:45.000000000 +0000
@@ -0,0 +1,13 @@
+include $(top_srcdir)/src/plugins/Makefile.plugins
+
+plugindir = $(PLUGINDIR)/recent
+plugin_LTLIBRARIES = librecent.la
+
+plugin_in_files = recent.plugin.in
+
+librecent_la_SOURCES = totem-recent.c
+librecent_la_LDFLAGS = $(plugin_ldflags)
+librecent_la_LIBADD = $(plugin_libadd)
+librecent_la_CFLAGS = $(plugin_cflags)
+
+-include $(top_srcdir)/git.mk
diff -Nru totem-3.4.3/src/plugins/recent/Makefile.in totem-3.6.2/src/plugins/recent/Makefile.in
--- totem-3.4.3/src/plugins/recent/Makefile.in	1970-01-01 00:00:00.000000000 +0000
+++ totem-3.6.2/src/plugins/recent/Makefile.in	2012-10-25 13:36:22.000000000 +0000
@@ -0,0 +1,815 @@
+# Makefile.in generated by automake 1.12.2 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+
+VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/depcomp \
+	$(top_srcdir)/src/plugins/Makefile.plugins
+subdir = src/plugins/recent
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"
+LTLIBRARIES = $(plugin_LTLIBRARIES)
+librecent_la_DEPENDENCIES = $(plugin_libadd)
+am_librecent_la_OBJECTS = librecent_la-totem-recent.lo
+librecent_la_OBJECTS = $(am_librecent_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+librecent_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(librecent_la_CFLAGS) \
+	$(CFLAGS) $(librecent_la_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(librecent_la_SOURCES)
+DIST_SOURCES = $(librecent_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+DATA = $(plugin_DATA)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ALL_LINGUAS = @ALL_LINGUAS@
+ALL_PLUGINS = @ALL_PLUGINS@
+AMTAR = @AMTAR@
+AM_CFLAGS = @AM_CFLAGS@
+AM_CPPFLAGS = \
+	-DG_LOG_DOMAIN=\""Totem"\"	\
+	$(DISABLE_DEPRECATED)		\
+	-I$(top_srcdir)/		\
+	-I$(top_srcdir)/src		\
+	-I$(top_srcdir)/src/plugins	\
+	-I$(top_srcdir)/src/gst
+
+AM_CXXFLAGS = @AM_CXXFLAGS@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_LDFLAGS = @AM_LDFLAGS@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BACKEND_CFLAGS = @BACKEND_CFLAGS@
+BACKEND_LIBS = @BACKEND_LIBS@
+BACKEND_TEST_CFLAGS = @BACKEND_TEST_CFLAGS@
+BACKEND_TEST_LIBS = @BACKEND_TEST_LIBS@
+BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
+BROWSER_PLUGIN_DIR = @BROWSER_PLUGIN_DIR@
+BROWSER_PLUGIN_LIBS = @BROWSER_PLUGIN_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CHAPTERS_CFLAGS = @CHAPTERS_CFLAGS@
+CHAPTERS_LIBS = @CHAPTERS_LIBS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DBUS_BIND = @DBUS_BIND@
+DBUS_CFLAGS = @DBUS_CFLAGS@
+DBUS_LIBS = @DBUS_LIBS@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
+DISC_RECORDER_CFLAGS = @DISC_RECORDER_CFLAGS@
+DISC_RECORDER_LIBS = @DISC_RECORDER_LIBS@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DLLTOOL = @DLLTOOL@
+DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+FULL_LIBEXECDIR = @FULL_LIBEXECDIR@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GLIB_MKENUMS = @GLIB_MKENUMS@
+GLIB_REQS = @GLIB_REQS@
+GLOW_BUTTON_CFLAGS = @GLOW_BUTTON_CFLAGS@
+GLOW_BUTTON_LIBS = @GLOW_BUTTON_LIBS@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
+GST_PLUGINS_BAD_CFLAGS = @GST_PLUGINS_BAD_CFLAGS@
+GST_PLUGINS_BAD_LIBS = @GST_PLUGINS_BAD_LIBS@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+GTK_REQS = @GTK_REQS@
+HELPER_CFLAGS = @HELPER_CFLAGS@
+HELPER_LIBS = @HELPER_LIBS@
+HELP_DIR = @HELP_DIR@
+HTML_DIR = @HTML_DIR@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBGRILO_CFLAGS = @LIBGRILO_CFLAGS@
+LIBGRILO_LIBS = @LIBGRILO_LIBS@
+LIBOBJS = @LIBOBJS@
+LIBPLAYER_CFLAGS = @LIBPLAYER_CFLAGS@
+LIBPLAYER_LIBS = @LIBPLAYER_LIBS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBZEITGEIST_CFLAGS = @LIBZEITGEIST_CFLAGS@
+LIBZEITGEIST_LIBS = @LIBZEITGEIST_LIBS@
+LIPO = @LIPO@
+LIRC_LIBS = @LIRC_LIBS@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MEDIA_PLAYER_KEYS_CFLAGS = @MEDIA_PLAYER_KEYS_CFLAGS@
+MEDIA_PLAYER_KEYS_LIBS = @MEDIA_PLAYER_KEYS_LIBS@
+MISSING_PLUGINS_CFLAGS = @MISSING_PLUGINS_CFLAGS@
+MISSING_PLUGINS_LIBS = @MISSING_PLUGINS_LIBS@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGMERGE = @MSGMERGE@
+NAUTILUSDIR = @NAUTILUSDIR@
+NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+NAUTILUS_LIBS = @NAUTILUS_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OMF_DIR = @OMF_DIR@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PIXBUF_HELPER_CFLAGS = @PIXBUF_HELPER_CFLAGS@
+PIXBUF_HELPER_LIBS = @PIXBUF_HELPER_LIBS@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLAYER_CFLAGS = @PLAYER_CFLAGS@
+PLAYER_LIBS = @PLAYER_LIBS@
+PLUGINDIR = @PLUGINDIR@
+PLUGINS = @PLUGINS@
+PLUGIN_VIEWER_CFLAGS = @PLUGIN_VIEWER_CFLAGS@
+PLUGIN_VIEWER_LIBS = @PLUGIN_VIEWER_LIBS@
+PREVIEW_CFLAGS = @PREVIEW_CFLAGS@
+PREVIEW_LIBS = @PREVIEW_LIBS@
+PROPERTIES_CFLAGS = @PROPERTIES_CFLAGS@
+PROPERTIES_LIBS = @PROPERTIES_LIBS@
+PYGOBJECT_CFLAGS = @PYGOBJECT_CFLAGS@
+PYGOBJECT_LIBS = @PYGOBJECT_LIBS@
+PYLINT = @PYLINT@
+PYTHON = @PYTHON@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
+RANLIB = @RANLIB@
+SAVE_FILE_CFLAGS = @SAVE_FILE_CFLAGS@
+SAVE_FILE_CHECK_CFLAGS = @SAVE_FILE_CHECK_CFLAGS@
+SAVE_FILE_CHECK_LIBS = @SAVE_FILE_CHECK_LIBS@
+SAVE_FILE_LIBS = @SAVE_FILE_LIBS@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SMCLIENT_CFLAGS = @SMCLIENT_CFLAGS@
+SMCLIENT_LIBS = @SMCLIENT_LIBS@
+STRIP = @STRIP@
+THUMBNAILER_CFLAGS = @THUMBNAILER_CFLAGS@
+THUMBNAILER_LIBS = @THUMBNAILER_LIBS@
+TIME_HELPER_CFLAGS = @TIME_HELPER_CFLAGS@
+TIME_HELPER_LIBS = @TIME_HELPER_LIBS@
+TOTEM_API_VERSION = @TOTEM_API_VERSION@
+TOTEM_PLPARSER_REQS = @TOTEM_PLPARSER_REQS@
+TOTEM_VERSION_MAJOR = @TOTEM_VERSION_MAJOR@
+TOTEM_VERSION_MICRO = @TOTEM_VERSION_MICRO@
+TOTEM_VERSION_MINOR = @TOTEM_VERSION_MINOR@
+USE_NLS = @USE_NLS@
+VALAC = @VALAC@
+VERSION = @VERSION@
+WARN_CFLAGS = @WARN_CFLAGS@
+WARN_CXXFLAGS = @WARN_CXXFLAGS@
+XGETTEXT = @XGETTEXT@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
+CLEANFILES = $(plugin_DATA)
+DISTCLEANFILES = $(plugin_DATA)
+EXTRA_DIST = $(plugin_in_files)
+plugin_cflags = \
+	$(PLAYER_CFLAGS)	\
+	$(WARN_CFLAGS)
+
+plugin_ldflags = \
+	-export-dynamic \
+	-no-undefined \
+	-avoid-version \
+	-module
+
+plugin_libadd = \
+	$(top_builddir)/src/libtotem.la
+
+plugindir = $(PLUGINDIR)/recent
+plugin_LTLIBRARIES = librecent.la
+plugin_in_files = recent.plugin.in
+librecent_la_SOURCES = totem-recent.c
+librecent_la_LDFLAGS = $(plugin_ldflags)
+librecent_la_LIBADD = $(plugin_libadd)
+librecent_la_CFLAGS = $(plugin_cflags)
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/src/plugins/Makefile.plugins $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/plugins/recent/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu src/plugins/recent/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+$(top_srcdir)/src/plugins/Makefile.plugins:
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
+	list2=; for p in $$list; do \
+	  if test -f $$p; then \
+	    list2="$$list2 $$p"; \
+	  else :; fi; \
+	done; \
+	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
+	}
+
+uninstall-pluginLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$f"; \
+	done
+
+clean-pluginLTLIBRARIES:
+	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
+	@list='$(plugin_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+librecent.la: $(librecent_la_OBJECTS) $(librecent_la_DEPENDENCIES) $(EXTRA_librecent_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(librecent_la_LINK) -rpath $(plugindir) $(librecent_la_OBJECTS) $(librecent_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librecent_la-totem-recent.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+librecent_la-totem-recent.lo: totem-recent.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(librecent_la_CFLAGS) $(CFLAGS) -MT librecent_la-totem-recent.lo -MD -MP -MF $(DEPDIR)/librecent_la-totem-recent.Tpo -c -o librecent_la-totem-recent.lo `test -f 'totem-recent.c' || echo '$(srcdir)/'`totem-recent.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/librecent_la-totem-recent.Tpo $(DEPDIR)/librecent_la-totem-recent.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='totem-recent.c' object='librecent_la-totem-recent.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(librecent_la_CFLAGS) $(CFLAGS) -c -o librecent_la-totem-recent.lo `test -f 'totem-recent.c' || echo '$(srcdir)/'`totem-recent.c
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-pluginDATA: $(plugin_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(plugindir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(plugindir)" || exit $$?; \
+	done
+
+uninstall-pluginDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	set x; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+
+cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
+	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES) $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-pluginDATA install-pluginLTLIBRARIES
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pluginLTLIBRARIES cscopelist ctags \
+	distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pluginDATA install-pluginLTLIBRARIES install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-pluginDATA uninstall-pluginLTLIBRARIES
+
+%.plugin: %.plugin.in
+	$(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+
+# Checking rules for Python plugins
+# Execute pylint on all the requisite files individually, returning non-zero
+# iff any of the calls to pylint returned non-zero.
+check-pylint: $(plugin_PYTHON)
+@ENABLE_PYTHON_TRUE@	@exitstatus=0; \
+@ENABLE_PYTHON_TRUE@	for py in $^; do \
+@ENABLE_PYTHON_TRUE@		$(PYLINT) -i y -d C0111 -d W0511 -d F0401 $$py; \
+@ENABLE_PYTHON_TRUE@		\
+@ENABLE_PYTHON_TRUE@		newexitstatus=$$?; \
+@ENABLE_PYTHON_TRUE@		if [ $$exitstatus == 0 ]; then \
+@ENABLE_PYTHON_TRUE@			exitstatus=$$newexitstatus; \
+@ENABLE_PYTHON_TRUE@		fi; \
+@ENABLE_PYTHON_TRUE@	done; \
+@ENABLE_PYTHON_TRUE@	exit $$exitstatus
+
+check: check-pylint
+
+.PHONY: check-pylint
+
+-include $(top_srcdir)/git.mk
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -Nru totem-3.4.3/src/plugins/recent/recent.plugin.in totem-3.6.2/src/plugins/recent/recent.plugin.in
--- totem-3.4.3/src/plugins/recent/recent.plugin.in	1970-01-01 00:00:00.000000000 +0000
+++ totem-3.6.2/src/plugins/recent/recent.plugin.in	2012-08-29 23:07:45.000000000 +0000
@@ -0,0 +1,9 @@
+[Plugin]
+Module=recent
+IAge=1
+Builtin=true
+_Name=Recent files
+_Description=Adds files that have been played to recent files
+Authors=Bastien Nocera
+Copyright=Copyright © 2012 Bastien Nocera
+Website=http://www.gnome.org/projects/totem/
diff -Nru totem-3.4.3/src/plugins/recent/totem-recent.c totem-3.6.2/src/plugins/recent/totem-recent.c
--- totem-3.4.3/src/plugins/recent/totem-recent.c	1970-01-01 00:00:00.000000000 +0000
+++ totem-3.6.2/src/plugins/recent/totem-recent.c	2012-10-16 06:34:34.000000000 +0000
@@ -0,0 +1,182 @@
+/*
+ *  Copyright (C) 2012 Bastien Nocera 
+ *
+ *  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 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
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
+ *
+ *
+ * The Totem project hereby grant permission for non-gpl compatible GStreamer
+ * plugins to be used and distributed together with GStreamer and Totem. This
+ * permission are above and beyond the permissions granted by the GPL license
+ * Totem is covered by.
+ *
+ * Monday 7th February 2005: Christian Schaller: Add exception clause.
+ * See license_change file for details.
+ *
+ */
+
+
+#include "config.h"
+
+#include 
+#include 
+
+#include "totem-plugin.h"
+#include "totem.h"
+
+#define TOTEM_TYPE_RECENT_PLUGIN	(totem_recent_plugin_get_type ())
+#define TOTEM_RECENT_PLUGIN(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), TOTEM_TYPE_RECENT_PLUGIN, TotemRecentPlugin))
+
+typedef struct {
+	guint signal_id;
+	TotemObject *totem;
+	GtkRecentManager *recent_manager;
+} TotemRecentPluginPrivate;
+
+TOTEM_PLUGIN_REGISTER(TOTEM_TYPE_RECENT_PLUGIN, TotemRecentPlugin, totem_recent_plugin)
+
+static void
+recent_info_cb (GFile *file,
+		GAsyncResult *res,
+		TotemRecentPlugin *pi)
+{
+	GtkRecentData data;
+	char *groups[] = { NULL, NULL };
+	GFileInfo *file_info;
+	const char *uri, *display_name;
+
+	memset (&data, 0, sizeof (data));
+
+	file_info = g_file_query_info_finish (file, res, NULL);
+	uri = g_object_get_data (G_OBJECT (file), "uri");
+	display_name = g_object_get_data (G_OBJECT (file), "display_name");
+
+	/* Probably an unsupported URI scheme */
+	if (file_info == NULL) {
+		data.display_name = g_strdup (display_name);
+		/* Bogus mime-type, we just want it added */
+		data.mime_type = g_strdup ("video/x-totem-stream");
+		groups[0] = (gchar*) "TotemStreams";
+	} else {
+		data.mime_type = g_strdup (g_file_info_get_content_type (file_info));
+		data.display_name = g_strdup (g_file_info_get_display_name (file_info));
+		g_object_unref (file_info);
+		groups[0] = (gchar*) "Totem";
+	}
+
+	data.app_name = g_strdup (g_get_application_name ());
+	data.app_exec = g_strjoin (" ", g_get_prgname (), "%u", NULL);
+	data.groups = groups;
+	if (gtk_recent_manager_add_full (pi->priv->recent_manager,
+					 uri, &data) == FALSE) {
+		g_warning ("Couldn't add recent file for '%s'", uri);
+	}
+
+	g_free (data.display_name);
+	g_free (data.mime_type);
+	g_free (data.app_name);
+	g_free (data.app_exec);
+
+	g_object_unref (file);
+}
+
+static void
+add_recent (TotemRecentPlugin *pi,
+	    const char *uri,
+	    const char *display_name,
+	    const char *content_type)
+{
+	GFile *file;
+
+	/* FIXME implement
+	if (totem_is_special_mrl (uri) != FALSE)
+		return; */
+
+	/* If we already have a content-type, the display_name is
+	 * probably decent as well */
+	if (content_type != NULL) {
+		GtkRecentData data;
+		char *groups[] = { NULL, NULL };
+
+		memset (&data, 0, sizeof (data));
+
+		data.mime_type = (char *) content_type;
+		data.display_name = (char *) display_name;
+		groups[0] = (char*) "Totem";
+		data.app_name = (char *) g_get_application_name ();
+		data.app_exec = g_strjoin (" ", g_get_prgname (), "%u", NULL);
+		data.groups = groups;
+
+		if (gtk_recent_manager_add_full (pi->priv->recent_manager,
+						 uri, &data) == FALSE) {
+			g_warning ("Couldn't add recent file for '%s'", uri);
+		}
+		g_free (data.app_exec);
+
+		return;
+	}
+
+	file = g_file_new_for_uri (uri);
+	g_object_set_data_full (G_OBJECT (file), "uri", g_strdup (uri), g_free);
+	g_object_set_data_full (G_OBJECT (file), "display_name", g_strdup (display_name), g_free);
+	g_file_query_info_async (file,
+				 G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE "," G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME,
+				 G_FILE_QUERY_INFO_NONE, 0, NULL, (GAsyncReadyCallback) recent_info_cb, pi);
+}
+
+static void
+file_has_played_cb (TotemObject       *totem,
+		    const char        *mrl,
+		    TotemRecentPlugin *pi)
+{
+	char *content_type;
+	char *display_name;
+
+	g_object_get (G_OBJECT (totem),
+		      "current-display-name", &display_name,
+		      "current-content-type", &content_type,
+		      NULL);
+
+	add_recent (pi, mrl, display_name, content_type);
+
+	g_free (display_name);
+	g_free (content_type);
+}
+
+static void
+impl_activate (PeasActivatable *plugin)
+{
+	TotemRecentPlugin *pi = TOTEM_RECENT_PLUGIN (plugin);
+
+	pi->priv->totem = g_object_ref (g_object_get_data (G_OBJECT (plugin), "object"));
+	pi->priv->recent_manager = gtk_recent_manager_get_default ();
+	pi->priv->signal_id = g_signal_connect (G_OBJECT (pi->priv->totem), "file-has-played",
+						G_CALLBACK (file_has_played_cb), pi);
+}
+
+static void
+impl_deactivate (PeasActivatable *plugin)
+{
+	TotemRecentPlugin *pi = TOTEM_RECENT_PLUGIN (plugin);
+
+	if (pi->priv->signal_id) {
+		g_signal_handler_disconnect (pi->priv->totem, pi->priv->signal_id);
+		pi->priv->signal_id = 0;
+	}
+
+	if (pi->priv->totem) {
+		g_object_unref (pi->priv->totem);
+		pi->priv->totem = NULL;
+	}
+}
diff -Nru totem-3.4.3/src/plugins/rotation/Makefile.am totem-3.6.2/src/plugins/rotation/Makefile.am
--- totem-3.4.3/src/plugins/rotation/Makefile.am	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/plugins/rotation/Makefile.am	2012-08-29 23:07:45.000000000 +0000
@@ -8,12 +8,12 @@
 # here we are explicitly specifying gtk+-3.0 and clutter-1.0 to use the vapi
 # because vala still cannot parse the gir
 VALAFLAGS = \
-	--girdir=$(top_srcdir)/src	\
-	--pkg Totem-1.0 --pkg libpeas-1.0 --pkg cogl-pango-1.0 --pkg GtkClutter-1.0 --pkg clutter-1.0 --pkg gtk+-3.0
+	--girdir=$(top_builddir)/src	\
+	--pkg Totem-1.0 --pkg libpeas-1.0 --pkg cogl-pango-1.0 --pkg GtkClutter-1.0 --pkg Clutter-1.0 --pkg gtk+-3.0 bacon-video.vapi
 
 librotation_la_SOURCES = totem-rotation-plugin.vala
 librotation_la_LDFLAGS = $(plugin_ldflags)
-librotation_la_CFLAGS = $(plugin_cflags) -include $(CONFIG_HEADER)
+librotation_la_CFLAGS = $(plugin_cflags) -include $(CONFIG_HEADER) -I $(top_srcdir)/src/backend
 librotation_la_LIBADD = $(plugin_libadd)
 
 GITIGNOREFILES = \
diff -Nru totem-3.4.3/src/plugins/rotation/Makefile.in totem-3.6.2/src/plugins/rotation/Makefile.in
--- totem-3.4.3/src/plugins/rotation/Makefile.in	2012-07-04 09:54:50.000000000 +0000
+++ totem-3.6.2/src/plugins/rotation/Makefile.in	2012-10-25 13:36:23.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.12.2 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,6 +16,23 @@
 
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -36,14 +52,12 @@
 build_triplet = @build@
 host_triplet = @host@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(srcdir)/librotation_la_vala.stamp $(top_srcdir)/depcomp \
 	$(top_srcdir)/src/plugins/Makefile.plugins \
-	librotation_la_vala.stamp totem-rotation-plugin.c
+	totem-rotation-plugin.c
 subdir = src/plugins/rotation
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -85,10 +99,23 @@
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 librotation_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(librotation_la_CFLAGS) $(CFLAGS) $(librotation_la_LDFLAGS) \
 	$(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -101,29 +128,31 @@
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 VALACOMPILE = $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS)
 LTVALACOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(VALAC) $(AM_VALAFLAGS) \
 	$(VALAFLAGS)
 AM_V_VALAC = $(am__v_VALAC_@AM_V@)
 am__v_VALAC_ = $(am__v_VALAC_@AM_DEFAULT_V@)
-am__v_VALAC_0 = @echo "  VALAC " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_VALAC_0 = @echo "  VALAC   " $@;
+am__v_VALAC_1 = 
 SOURCES = $(librotation_la_SOURCES)
 DIST_SOURCES = $(librotation_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 DATA = $(plugin_DATA)
 ETAGS = etags
 CTAGS = ctags
@@ -139,7 +168,8 @@
 	$(DISABLE_DEPRECATED)		\
 	-I$(top_srcdir)/		\
 	-I$(top_srcdir)/src		\
-	-I$(top_srcdir)/src/plugins
+	-I$(top_srcdir)/src/plugins	\
+	-I$(top_srcdir)/src/gst
 
 AM_CXXFLAGS = @AM_CXXFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -149,6 +179,10 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BACKEND_CFLAGS = @BACKEND_CFLAGS@
+BACKEND_LIBS = @BACKEND_LIBS@
+BACKEND_TEST_CFLAGS = @BACKEND_TEST_CFLAGS@
+BACKEND_TEST_LIBS = @BACKEND_TEST_LIBS@
 BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
 BROWSER_PLUGIN_DIR = @BROWSER_PLUGIN_DIR@
 BROWSER_PLUGIN_LIBS = @BROWSER_PLUGIN_LIBS@
@@ -170,8 +204,6 @@
 DBUS_LIBS = @DBUS_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DEPENDENCY_CFLAGS = @DEPENDENCY_CFLAGS@
-DEPENDENCY_LIBS = @DEPENDENCY_LIBS@
 DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DISC_RECORDER_CFLAGS = @DISC_RECORDER_CFLAGS@
 DISC_RECORDER_LIBS = @DISC_RECORDER_LIBS@
@@ -185,7 +217,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-EXTRA_BACKEND_LIBS = @EXTRA_BACKEND_LIBS@
 FGREP = @FGREP@
 FULL_LIBEXECDIR = @FULL_LIBEXECDIR@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
@@ -193,19 +224,21 @@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GLIB_REQS = @GLIB_REQS@
+GLOW_BUTTON_CFLAGS = @GLOW_BUTTON_CFLAGS@
+GLOW_BUTTON_LIBS = @GLOW_BUTTON_LIBS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
-GST_CFLAGS = @GST_CFLAGS@
-GST_LIBS = @GST_LIBS@
+GST_PLUGINS_BAD_CFLAGS = @GST_PLUGINS_BAD_CFLAGS@
+GST_PLUGINS_BAD_LIBS = @GST_PLUGINS_BAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
 GTK_REQS = @GTK_REQS@
+HELPER_CFLAGS = @HELPER_CFLAGS@
+HELPER_LIBS = @HELPER_LIBS@
 HELP_DIR = @HELP_DIR@
 HTML_DIR = @HTML_DIR@
 INSTALL = @INSTALL@
@@ -231,11 +264,11 @@
 INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBEPC_CFLAGS = @LIBEPC_CFLAGS@
-LIBEPC_LIBS = @LIBEPC_LIBS@
 LIBGRILO_CFLAGS = @LIBGRILO_CFLAGS@
 LIBGRILO_LIBS = @LIBGRILO_LIBS@
 LIBOBJS = @LIBOBJS@
+LIBPLAYER_CFLAGS = @LIBPLAYER_CFLAGS@
+LIBPLAYER_LIBS = @LIBPLAYER_LIBS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBZEITGEIST_CFLAGS = @LIBZEITGEIST_CFLAGS@
@@ -252,8 +285,6 @@
 MISSING_PLUGINS_CFLAGS = @MISSING_PLUGINS_CFLAGS@
 MISSING_PLUGINS_LIBS = @MISSING_PLUGINS_LIBS@
 MKDIR_P = @MKDIR_P@
-MM_CFLAGS = @MM_CFLAGS@
-MM_LIBS = @MM_LIBS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 NAUTILUSDIR = @NAUTILUSDIR@
@@ -274,15 +305,21 @@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PEASGTK_CFLAGS = @PEASGTK_CFLAGS@
-PEASGTK_LIBS = @PEASGTK_LIBS@
-PEAS_CFLAGS = @PEAS_CFLAGS@
-PEAS_LIBS = @PEAS_LIBS@
+PIXBUF_HELPER_CFLAGS = @PIXBUF_HELPER_CFLAGS@
+PIXBUF_HELPER_LIBS = @PIXBUF_HELPER_LIBS@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLAYER_CFLAGS = @PLAYER_CFLAGS@
+PLAYER_LIBS = @PLAYER_LIBS@
 PLUGINDIR = @PLUGINDIR@
 PLUGINS = @PLUGINS@
+PLUGIN_VIEWER_CFLAGS = @PLUGIN_VIEWER_CFLAGS@
+PLUGIN_VIEWER_LIBS = @PLUGIN_VIEWER_LIBS@
+PREVIEW_CFLAGS = @PREVIEW_CFLAGS@
+PREVIEW_LIBS = @PREVIEW_LIBS@
+PROPERTIES_CFLAGS = @PROPERTIES_CFLAGS@
+PROPERTIES_LIBS = @PROPERTIES_LIBS@
 PYGOBJECT_CFLAGS = @PYGOBJECT_CFLAGS@
 PYGOBJECT_LIBS = @PYGOBJECT_LIBS@
 PYLINT = @PYLINT@
@@ -302,6 +339,10 @@
 SMCLIENT_CFLAGS = @SMCLIENT_CFLAGS@
 SMCLIENT_LIBS = @SMCLIENT_LIBS@
 STRIP = @STRIP@
+THUMBNAILER_CFLAGS = @THUMBNAILER_CFLAGS@
+THUMBNAILER_LIBS = @THUMBNAILER_LIBS@
+TIME_HELPER_CFLAGS = @TIME_HELPER_CFLAGS@
+TIME_HELPER_LIBS = @TIME_HELPER_LIBS@
 TOTEM_API_VERSION = @TOTEM_API_VERSION@
 TOTEM_PLPARSER_REQS = @TOTEM_PLPARSER_REQS@
 TOTEM_VERSION_MAJOR = @TOTEM_VERSION_MAJOR@
@@ -313,9 +354,6 @@
 WARN_CFLAGS = @WARN_CFLAGS@
 WARN_CXXFLAGS = @WARN_CXXFLAGS@
 XGETTEXT = @XGETTEXT@
-XMKMF = @XMKMF@
-XTEST_LIBS = @XTEST_LIBS@
-X_LIBS = @X_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -381,8 +419,7 @@
 DISTCLEANFILES = $(plugin_DATA)
 EXTRA_DIST = $(plugin_in_files)
 plugin_cflags = \
-	$(DEPENDENCY_CFLAGS)	\
-	$(PEAS_CFLAGS)		\
+	$(PLAYER_CFLAGS)	\
 	$(WARN_CFLAGS)
 
 plugin_ldflags = \
@@ -401,12 +438,12 @@
 # here we are explicitly specifying gtk+-3.0 and clutter-1.0 to use the vapi
 # because vala still cannot parse the gir
 VALAFLAGS = \
-	--girdir=$(top_srcdir)/src	\
-	--pkg Totem-1.0 --pkg libpeas-1.0 --pkg cogl-pango-1.0 --pkg GtkClutter-1.0 --pkg clutter-1.0 --pkg gtk+-3.0
+	--girdir=$(top_builddir)/src	\
+	--pkg Totem-1.0 --pkg libpeas-1.0 --pkg cogl-pango-1.0 --pkg GtkClutter-1.0 --pkg Clutter-1.0 --pkg gtk+-3.0 bacon-video.vapi
 
 librotation_la_SOURCES = totem-rotation-plugin.vala
 librotation_la_LDFLAGS = $(plugin_ldflags)
-librotation_la_CFLAGS = $(plugin_cflags) -include $(CONFIG_HEADER)
+librotation_la_CFLAGS = $(plugin_cflags) -include $(CONFIG_HEADER) -I $(top_srcdir)/src/backend
 librotation_la_LIBADD = $(plugin_libadd)
 GITIGNOREFILES = \
 	$(librotation_la_SOURCES:.vala=.c) \
@@ -450,7 +487,6 @@
 $(am__aclocal_m4_deps):
 install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
 	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
@@ -458,6 +494,8 @@
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
 	}
@@ -473,12 +511,14 @@
 
 clean-pluginLTLIBRARIES:
 	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
-	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(plugin_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
 librotation.la: $(librotation_la_OBJECTS) $(librotation_la_DEPENDENCIES) $(EXTRA_librotation_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(librotation_la_LINK) -rpath $(plugindir) $(librotation_la_OBJECTS) $(librotation_la_LIBADD) $(LIBS)
 
@@ -491,25 +531,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librotation_la-totem-rotation-plugin.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
@@ -525,9 +562,9 @@
 	@if test -f $@; then :; else \
 	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/librotation_la_vala.stamp; \
 	fi
-$(srcdir)/librotation_la_vala.stamp: $(librotation_la_SOURCES)
+$(srcdir)/librotation_la_vala.stamp: totem-rotation-plugin.vala
 	$(AM_V_at)rm -f $@ && echo stamp > $@-t
-	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(librotation_la_SOURCES)
+	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C totem-rotation-plugin.vala
 	$(AM_V_at)mv -f $@-t $@
 
 mostlyclean-libtool:
@@ -537,8 +574,11 @@
 	-rm -rf .libs _libs
 install-pluginDATA: $(plugin_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
 	@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -603,6 +643,20 @@
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
 
+cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
+	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
@@ -675,7 +729,8 @@
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-rm -f librotation_la_vala.stamp
+	-rm -f $(srcdir)/librotation_la_vala.stamp
+	-rm -f $(srcdir)/totem-rotation-plugin.c
 	-rm -f totem-rotation-plugin.c
 clean: clean-am
 
@@ -751,19 +806,19 @@
 .MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pluginLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pluginDATA \
-	install-pluginLTLIBRARIES install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-pluginDATA uninstall-pluginLTLIBRARIES
+	clean-libtool clean-pluginLTLIBRARIES cscopelist ctags \
+	distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pluginDATA install-pluginLTLIBRARIES install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-pluginDATA uninstall-pluginLTLIBRARIES
 
 %.plugin: %.plugin.in
 	$(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
diff -Nru totem-3.4.3/src/plugins/rotation/rotation.plugin.in totem-3.6.2/src/plugins/rotation/rotation.plugin.in
--- totem-3.4.3/src/plugins/rotation/rotation.plugin.in	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/plugins/rotation/rotation.plugin.in	2012-08-29 23:07:45.000000000 +0000
@@ -2,7 +2,7 @@
 Module=rotation
 IAge=1
 _Name=Rotation Plugin
-_Description=Allows videos to be rotated if they're in the wrong orientation.
+_Description=Allows videos to be rotated if they are in the wrong orientation
 Authors=Simon Wenner 
 Copyright=Copyright © 2011 Simon Wenner
 Website=http://www.gnome.org/projects/totem/
diff -Nru totem-3.4.3/src/plugins/rotation/totem-rotation-plugin.c totem-3.6.2/src/plugins/rotation/totem-rotation-plugin.c
--- totem-3.4.3/src/plugins/rotation/totem-rotation-plugin.c	2012-07-04 10:16:19.000000000 +0000
+++ totem-3.6.2/src/plugins/rotation/totem-rotation-plugin.c	2012-09-07 11:06:28.000000000 +0000
@@ -1,4 +1,4 @@
-/* totem-rotation-plugin.c generated by valac 0.17.0.14-2d0e7, the Vala compiler
+/* totem-rotation-plugin.c generated by valac 0.17.5, the Vala compiler
  * generated from totem-rotation-plugin.vala, do not modify */
 
 /*
@@ -24,12 +24,9 @@
 #include 
 #include 
 #include 
-#include 
+#include "bacon-video-widget.h"
 #include 
-#include 
-#include 
 #include 
-#include 
 #include 
 #include 
 
@@ -44,8 +41,6 @@
 typedef struct _RotationPlugin RotationPlugin;
 typedef struct _RotationPluginClass RotationPluginClass;
 typedef struct _RotationPluginPrivate RotationPluginPrivate;
-
-#define ROTATION_PLUGIN_TYPE_ROTATION (rotation_plugin_rotation_get_type ())
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 #define _g_free0(var) (var = (g_free (var), NULL))
 #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
@@ -61,21 +56,11 @@
 	GObjectClass parent_class;
 };
 
-typedef enum  {
-	ROTATION_PLUGIN_ROTATION__IDENTITY = 0,
-	ROTATION_PLUGIN_ROTATION__90R = 1,
-	ROTATION_PLUGIN_ROTATION__180 = 2,
-	ROTATION_PLUGIN_ROTATION__90L = 3
-} RotationPluginRotation;
-
 struct _RotationPluginPrivate {
 	GObject* _object;
-	ClutterActor* video;
+	BaconVideoWidget* bvw;
 	guint ui_id;
 	GtkActionGroup* action_group;
-	RotationPluginRotation state;
-	gfloat width;
-	gfloat height;
 };
 
 struct _RotationPluginStoreStateData {
@@ -94,21 +79,24 @@
 	const gchar* _tmp5_;
 	GFile* _tmp6_;
 	GFile* file;
+	BvwRotation rotation;
 	GFile* _tmp7_;
 	GFileInfo* _tmp8_;
 	GFileInfo* file_info;
 	gchar* _tmp9_;
 	gchar* state_str;
-	RotationPluginRotation _tmp10_;
-	RotationPluginRotation _tmp11_;
-	gchar* _tmp12_;
-	GFileInfo* _tmp13_;
-	const gchar* _tmp14_;
-	GFile* _tmp15_;
-	GFileInfo* _tmp16_;
+	BaconVideoWidget* _tmp10_;
+	BvwRotation _tmp11_;
+	BvwRotation _tmp12_;
+	BvwRotation _tmp13_;
+	gchar* _tmp14_;
+	GFileInfo* _tmp15_;
+	const gchar* _tmp16_;
+	GFile* _tmp17_;
+	GFileInfo* _tmp18_;
 	GError* e;
-	GError* _tmp17_;
-	const gchar* _tmp18_;
+	GError* _tmp19_;
+	const gchar* _tmp20_;
 	GError * _inner_error_;
 };
 
@@ -130,9 +118,12 @@
 	const gchar* _tmp5_;
 	const gchar* _tmp6_;
 	guint64 _tmp7_;
+	gint state;
+	BaconVideoWidget* _tmp8_;
+	gint _tmp9_;
 	GError* e;
-	GError* _tmp8_;
-	const gchar* _tmp9_;
+	GError* _tmp10_;
+	const gchar* _tmp11_;
 	GError * _inner_error_;
 };
 
@@ -144,7 +135,6 @@
 #define GIO_ROTATION_FILE_ATTRIBUTE "metadata::totem::rotation"
 GType rotation_plugin_get_type (void) G_GNUC_CONST;
 GType rotation_plugin_register_type (GTypeModule * module);
-static GType rotation_plugin_rotation_get_type (void) G_GNUC_UNUSED;
 #define ROTATION_PLUGIN_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_ROTATION_PLUGIN, RotationPluginPrivate))
 enum  {
 	ROTATION_PLUGIN_DUMMY_PROPERTY,
@@ -158,15 +148,12 @@
 static void _rotation_plugin_cb_rotate_left_gtk_action_activate (GtkAction* _sender, gpointer self);
 static void rotation_plugin_try_restore_state (RotationPlugin* self, const gchar* mrl, GAsyncReadyCallback _callback_, gpointer _user_data_);
 static void rotation_plugin_try_restore_state_finish (RotationPlugin* self, GAsyncResult* _res_);
-static void rotation_plugin_cb_allocation_changed (RotationPlugin* self, ClutterActorBox* box, ClutterAllocationFlags flags);
-static void _rotation_plugin_cb_allocation_changed_clutter_actor_allocation_changed (ClutterActor* _sender, ClutterActorBox* box, ClutterAllocationFlags flags, gpointer self);
 static void rotation_plugin_cb_file_closed (RotationPlugin* self);
 static void _rotation_plugin_cb_file_closed_totem_object_file_closed (TotemObject* _sender, gpointer self);
 static void rotation_plugin_cb_file_opened (RotationPlugin* self, const gchar* mrl);
 static void _rotation_plugin_cb_file_opened_totem_object_file_opened (TotemObject* _sender, const gchar* mrl, gpointer self);
 static void rotation_plugin_real_deactivate (PeasActivatable* base);
 static void rotation_plugin_real_update_state (PeasActivatable* base);
-static void rotation_plugin_update_video_geometry (RotationPlugin* self);
 static void rotation_plugin_store_state (RotationPlugin* self, GAsyncReadyCallback _callback_, gpointer _user_data_);
 static void rotation_plugin_store_state_finish (RotationPlugin* self, GAsyncResult* _res_);
 static void rotation_plugin_store_state_data_free (gpointer _data);
@@ -183,18 +170,6 @@
 void peas_register_types (GTypeModule* module);
 
 
-static GType rotation_plugin_rotation_get_type (void) {
-	static volatile gsize rotation_plugin_rotation_type_id__volatile = 0;
-	if (g_once_init_enter (&rotation_plugin_rotation_type_id__volatile)) {
-		static const GEnumValue values[] = {{ROTATION_PLUGIN_ROTATION__IDENTITY, "ROTATION_PLUGIN_ROTATION__IDENTITY", "-identity"}, {ROTATION_PLUGIN_ROTATION__90R, "ROTATION_PLUGIN_ROTATION__90R", "-90r"}, {ROTATION_PLUGIN_ROTATION__180, "ROTATION_PLUGIN_ROTATION__180", "-180"}, {ROTATION_PLUGIN_ROTATION__90L, "ROTATION_PLUGIN_ROTATION__90L", "-90l"}, {0, NULL, NULL}};
-		GType rotation_plugin_rotation_type_id;
-		rotation_plugin_rotation_type_id = g_enum_register_static ("RotationPluginRotation", values);
-		g_once_init_leave (&rotation_plugin_rotation_type_id__volatile, rotation_plugin_rotation_type_id);
-	}
-	return rotation_plugin_rotation_type_id__volatile;
-}
-
-
 static void _rotation_plugin_cb_rotate_right_gtk_action_activate (GtkAction* _sender, gpointer self) {
 	rotation_plugin_cb_rotate_right (self);
 }
@@ -205,16 +180,6 @@
 }
 
 
-static gpointer _g_object_ref0 (gpointer self) {
-	return self ? g_object_ref (self) : NULL;
-}
-
-
-static void _rotation_plugin_cb_allocation_changed_clutter_actor_allocation_changed (ClutterActor* _sender, ClutterActorBox* box, ClutterAllocationFlags flags, gpointer self) {
-	rotation_plugin_cb_allocation_changed (self, box, flags);
-}
-
-
 static void _rotation_plugin_cb_file_closed_totem_object_file_closed (TotemObject* _sender, gpointer self) {
 	rotation_plugin_cb_file_closed (self);
 }
@@ -231,189 +196,102 @@
 	GObject* _tmp1_;
 	TotemObject* t;
 	TotemObject* _tmp2_;
-	GtkWidget* _tmp3_ = NULL;
-	GtkClutterEmbed* bvw;
-	GtkClutterEmbed* _tmp4_;
-	ClutterActor* _tmp5_ = NULL;
-	ClutterStage* stage;
-	TotemObject* _tmp6_;
-	gchar* _tmp7_ = NULL;
+	gchar* _tmp3_ = NULL;
 	gchar* mrl;
-	TotemObject* _tmp8_;
-	GtkUIManager* _tmp9_ = NULL;
+	TotemObject* _tmp4_;
+	GtkWidget* _tmp5_ = NULL;
+	TotemObject* _tmp6_;
+	GtkUIManager* _tmp7_ = NULL;
 	GtkUIManager* ui_manager;
+	GtkUIManager* _tmp8_;
+	guint _tmp9_ = 0U;
 	GtkUIManager* _tmp10_;
-	guint _tmp11_ = 0U;
+	guint _tmp11_;
 	GtkUIManager* _tmp12_;
 	guint _tmp13_;
-	GtkUIManager* _tmp14_;
-	guint _tmp15_;
-	const gchar* _tmp16_ = NULL;
-	GtkAction* _tmp17_;
+	const gchar* _tmp14_ = NULL;
+	GtkAction* _tmp15_;
 	GtkAction* rotate_right;
+	GtkAction* _tmp16_;
+	const gchar* _tmp17_ = NULL;
 	GtkAction* _tmp18_;
-	const gchar* _tmp19_ = NULL;
-	GtkAction* _tmp20_;
 	GtkAction* rotate_left;
-	GtkAction* _tmp21_;
-	GtkActionGroup* _tmp22_;
+	GtkAction* _tmp19_;
+	GtkActionGroup* _tmp20_;
+	GtkActionGroup* _tmp21_;
+	GtkAction* _tmp22_;
 	GtkActionGroup* _tmp23_;
 	GtkAction* _tmp24_;
-	GtkActionGroup* _tmp25_;
-	GtkAction* _tmp26_;
-	const gchar* _tmp27_;
-	GtkUIManager* _tmp29_;
-	GtkActionGroup* _tmp30_;
-	ClutterActor* _tmp45_;
-	ClutterActor* _tmp46_;
-	gfloat _tmp47_;
-	gfloat _tmp48_;
-	ClutterActor* _tmp49_;
-	gfloat _tmp50_;
-	gfloat _tmp51_;
-	const gchar* _tmp52_;
-	ClutterActor* _tmp54_;
-	TotemObject* _tmp55_;
-	TotemObject* _tmp56_;
+	const gchar* _tmp25_;
+	GtkUIManager* _tmp27_;
+	GtkActionGroup* _tmp28_;
+	const gchar* _tmp29_;
+	TotemObject* _tmp31_;
+	TotemObject* _tmp32_;
 	self = (RotationPlugin*) base;
 	g_object_get ((PeasActivatable*) self, "object", &_tmp0_, NULL);
 	_tmp1_ = _tmp0_;
-	t = TOTEM_OBJECT (_tmp1_);
+	t = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, totem_object_get_type (), TotemObject);
 	_tmp2_ = t;
-	_tmp3_ = totem_get_video_widget (_tmp2_);
-	bvw = GTK_CLUTTER_EMBED (_tmp3_);
-	_tmp4_ = bvw;
-	_tmp5_ = gtk_clutter_embed_get_stage (_tmp4_);
-	stage = CLUTTER_STAGE (_tmp5_);
+	_tmp3_ = totem_object_get_current_mrl (_tmp2_);
+	mrl = _tmp3_;
+	_tmp4_ = t;
+	_tmp5_ = totem_object_get_video_widget (_tmp4_);
+	_g_object_unref0 (self->priv->bvw);
+	self->priv->bvw = G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, BACON_TYPE_VIDEO_WIDGET) ? ((BaconVideoWidget*) _tmp5_) : NULL;
 	_tmp6_ = t;
-	_tmp7_ = totem_object_get_current_mrl (_tmp6_);
-	mrl = _tmp7_;
-	_tmp8_ = t;
-	_tmp9_ = totem_object_get_ui_manager (_tmp8_);
-	ui_manager = _tmp9_;
+	_tmp7_ = totem_object_get_ui_manager (_tmp6_);
+	ui_manager = _tmp7_;
+	_tmp8_ = ui_manager;
+	_tmp9_ = gtk_ui_manager_new_merge_id (_tmp8_);
+	self->priv->ui_id = _tmp9_;
 	_tmp10_ = ui_manager;
-	_tmp11_ = gtk_ui_manager_new_merge_id (_tmp10_);
-	self->priv->ui_id = _tmp11_;
+	_tmp11_ = self->priv->ui_id;
+	gtk_ui_manager_add_ui (_tmp10_, _tmp11_, "/ui/tmw-menubar/view/next-angle", "rotate-left", "rotate-left", GTK_UI_MANAGER_AUTO, FALSE);
 	_tmp12_ = ui_manager;
 	_tmp13_ = self->priv->ui_id;
-	gtk_ui_manager_add_ui (_tmp12_, _tmp13_, "/ui/tmw-menubar/view/next-angle", "rotate-left", "rotate-left", GTK_UI_MANAGER_AUTO, FALSE);
-	_tmp14_ = ui_manager;
-	_tmp15_ = self->priv->ui_id;
-	gtk_ui_manager_add_ui (_tmp14_, _tmp15_, "/ui/tmw-menubar/view/next-angle", "rotate-right", "rotate-right", GTK_UI_MANAGER_AUTO, FALSE);
-	_tmp16_ = _ ("_Rotate Clockwise");
-	_tmp17_ = gtk_action_new ("rotate-right", _tmp16_, NULL, NULL);
-	rotate_right = _tmp17_;
-	_tmp18_ = rotate_right;
-	g_signal_connect_object (_tmp18_, "activate", (GCallback) _rotation_plugin_cb_rotate_right_gtk_action_activate, self, 0);
-	_tmp19_ = _ ("Rotate Counterc_lockwise");
-	_tmp20_ = gtk_action_new ("rotate-left", _tmp19_, NULL, NULL);
-	rotate_left = _tmp20_;
-	_tmp21_ = rotate_left;
-	g_signal_connect_object (_tmp21_, "activate", (GCallback) _rotation_plugin_cb_rotate_left_gtk_action_activate, self, 0);
-	_tmp22_ = gtk_action_group_new ("RotationActions");
+	gtk_ui_manager_add_ui (_tmp12_, _tmp13_, "/ui/tmw-menubar/view/next-angle", "rotate-right", "rotate-right", GTK_UI_MANAGER_AUTO, FALSE);
+	_tmp14_ = _ ("_Rotate Clockwise");
+	_tmp15_ = gtk_action_new ("rotate-right", _tmp14_, NULL, NULL);
+	rotate_right = _tmp15_;
+	_tmp16_ = rotate_right;
+	g_signal_connect_object (_tmp16_, "activate", (GCallback) _rotation_plugin_cb_rotate_right_gtk_action_activate, self, 0);
+	_tmp17_ = _ ("Rotate Counterc_lockwise");
+	_tmp18_ = gtk_action_new ("rotate-left", _tmp17_, NULL, NULL);
+	rotate_left = _tmp18_;
+	_tmp19_ = rotate_left;
+	g_signal_connect_object (_tmp19_, "activate", (GCallback) _rotation_plugin_cb_rotate_left_gtk_action_activate, self, 0);
+	_tmp20_ = gtk_action_group_new ("RotationActions");
 	_g_object_unref0 (self->priv->action_group);
-	self->priv->action_group = _tmp22_;
+	self->priv->action_group = _tmp20_;
+	_tmp21_ = self->priv->action_group;
+	_tmp22_ = rotate_right;
+	gtk_action_group_add_action_with_accel (_tmp21_, _tmp22_, "R");
 	_tmp23_ = self->priv->action_group;
-	_tmp24_ = rotate_right;
-	gtk_action_group_add_action_with_accel (_tmp23_, _tmp24_, "R");
-	_tmp25_ = self->priv->action_group;
-	_tmp26_ = rotate_left;
-	gtk_action_group_add_action_with_accel (_tmp25_, _tmp26_, "R");
-	_tmp27_ = mrl;
-	if (_tmp27_ == NULL) {
-		GtkActionGroup* _tmp28_;
-		_tmp28_ = self->priv->action_group;
-		gtk_action_group_set_sensitive (_tmp28_, FALSE);
-	}
-	_tmp29_ = ui_manager;
-	_tmp30_ = self->priv->action_group;
-	gtk_ui_manager_insert_action_group (_tmp29_, _tmp30_, 0);
-	{
-		gint i;
-		i = 0;
-		{
-			gboolean _tmp31_;
-			_tmp31_ = TRUE;
-			while (TRUE) {
-				gboolean _tmp32_;
-				gint _tmp34_;
-				ClutterStage* _tmp35_;
-				gint _tmp36_ = 0;
-				ClutterStage* _tmp37_;
-				gint _tmp38_;
-				ClutterActor* _tmp39_ = NULL;
-				ClutterActor* _tmp40_;
-				ClutterActor* actor;
-				ClutterActor* _tmp41_;
-				const gchar* _tmp42_;
-				const gchar* _tmp43_;
-				_tmp32_ = _tmp31_;
-				if (!_tmp32_) {
-					gint _tmp33_;
-					_tmp33_ = i;
-					i = _tmp33_ + 1;
-				}
-				_tmp31_ = FALSE;
-				_tmp34_ = i;
-				_tmp35_ = stage;
-				_tmp36_ = clutter_group_get_n_children ((ClutterGroup*) _tmp35_);
-				if (!(_tmp34_ < _tmp36_)) {
-					break;
-				}
-				_tmp37_ = stage;
-				_tmp38_ = i;
-				_tmp39_ = clutter_group_get_nth_child ((ClutterGroup*) _tmp37_, _tmp38_);
-				_tmp40_ = _g_object_ref0 (_tmp39_);
-				actor = _tmp40_;
-				_tmp41_ = actor;
-				_tmp42_ = clutter_actor_get_name (_tmp41_);
-				_tmp43_ = _tmp42_;
-				if (g_strcmp0 (_tmp43_, "frame") == 0) {
-					ClutterActor* _tmp44_;
-					_tmp44_ = actor;
-					self->priv->video = _tmp44_;
-					_g_object_unref0 (actor);
-					break;
-				}
-				_g_object_unref0 (actor);
-			}
-		}
-	}
-	_tmp45_ = self->priv->video;
-	if (_tmp45_ == NULL) {
-		g_critical ("totem-rotation-plugin.vala:83: Could not find the clutter actor 'frame" \
-"'.");
-		_g_object_unref0 (rotate_left);
-		_g_object_unref0 (rotate_right);
-		_g_free0 (mrl);
-		_g_object_unref0 (bvw);
-		_g_object_unref0 (t);
-		return;
-	}
-	_tmp46_ = self->priv->video;
-	_tmp47_ = clutter_actor_get_width (_tmp46_);
-	_tmp48_ = _tmp47_;
-	self->priv->width = _tmp48_;
-	_tmp49_ = self->priv->video;
-	_tmp50_ = clutter_actor_get_height (_tmp49_);
-	_tmp51_ = _tmp50_;
-	self->priv->height = _tmp51_;
-	_tmp52_ = mrl;
-	if (_tmp52_ != NULL) {
-		const gchar* _tmp53_;
-		_tmp53_ = mrl;
-		rotation_plugin_try_restore_state (self, _tmp53_, NULL, NULL);
-	}
-	_tmp54_ = self->priv->video;
-	g_signal_connect_object (_tmp54_, "allocation-changed", (GCallback) _rotation_plugin_cb_allocation_changed_clutter_actor_allocation_changed, self, 0);
-	_tmp55_ = t;
-	g_signal_connect_object (_tmp55_, "file-closed", (GCallback) _rotation_plugin_cb_file_closed_totem_object_file_closed, self, 0);
-	_tmp56_ = t;
-	g_signal_connect_object (_tmp56_, "file-opened", (GCallback) _rotation_plugin_cb_file_opened_totem_object_file_opened, self, 0);
+	_tmp24_ = rotate_left;
+	gtk_action_group_add_action_with_accel (_tmp23_, _tmp24_, "R");
+	_tmp25_ = mrl;
+	if (_tmp25_ == NULL) {
+		GtkActionGroup* _tmp26_;
+		_tmp26_ = self->priv->action_group;
+		gtk_action_group_set_sensitive (_tmp26_, FALSE);
+	}
+	_tmp27_ = ui_manager;
+	_tmp28_ = self->priv->action_group;
+	gtk_ui_manager_insert_action_group (_tmp27_, _tmp28_, 0);
+	_tmp29_ = mrl;
+	if (_tmp29_ != NULL) {
+		const gchar* _tmp30_;
+		_tmp30_ = mrl;
+		rotation_plugin_try_restore_state (self, _tmp30_, NULL, NULL);
+	}
+	_tmp31_ = t;
+	g_signal_connect_object (_tmp31_, "file-closed", (GCallback) _rotation_plugin_cb_file_closed_totem_object_file_closed, self, 0);
+	_tmp32_ = t;
+	g_signal_connect_object (_tmp32_, "file-opened", (GCallback) _rotation_plugin_cb_file_opened_totem_object_file_opened, self, 0);
 	_g_object_unref0 (rotate_left);
 	_g_object_unref0 (rotate_right);
 	_g_free0 (mrl);
-	_g_object_unref0 (bvw);
 	_g_object_unref0 (t);
 }
 
@@ -423,38 +301,29 @@
 	GObject* _tmp0_ = NULL;
 	GObject* _tmp1_;
 	TotemObject* t;
-	ClutterActor* _tmp2_;
+	guint _tmp2_ = 0U;
 	guint _tmp3_ = 0U;
-	guint _tmp4_ = 0U;
-	guint _tmp5_ = 0U;
-	GtkUIManager* _tmp6_ = NULL;
+	GtkUIManager* _tmp4_ = NULL;
 	GtkUIManager* ui_manager;
-	guint _tmp7_;
-	GtkActionGroup* _tmp8_;
-	ClutterActor* _tmp9_;
-	ClutterActor* _tmp10_;
+	guint _tmp5_;
+	GtkActionGroup* _tmp6_;
+	BaconVideoWidget* _tmp7_;
 	self = (RotationPlugin*) base;
 	g_object_get ((PeasActivatable*) self, "object", &_tmp0_, NULL);
 	_tmp1_ = _tmp0_;
-	t = TOTEM_OBJECT (_tmp1_);
-	_tmp2_ = self->priv->video;
-	g_signal_parse_name ("allocation-changed", clutter_actor_get_type (), &_tmp3_, NULL, FALSE);
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _rotation_plugin_cb_allocation_changed_clutter_actor_allocation_changed, self);
-	g_signal_parse_name ("file-closed", totem_object_get_type (), &_tmp4_, NULL, FALSE);
-	g_signal_handlers_disconnect_matched (t, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _rotation_plugin_cb_file_closed_totem_object_file_closed, self);
-	g_signal_parse_name ("file-opened", totem_object_get_type (), &_tmp5_, NULL, FALSE);
-	g_signal_handlers_disconnect_matched (t, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _rotation_plugin_cb_file_opened_totem_object_file_opened, self);
-	_tmp6_ = totem_object_get_ui_manager (t);
-	ui_manager = _tmp6_;
-	_tmp7_ = self->priv->ui_id;
-	gtk_ui_manager_remove_ui (ui_manager, _tmp7_);
-	_tmp8_ = self->priv->action_group;
-	gtk_ui_manager_remove_action_group (ui_manager, _tmp8_);
-	self->priv->state = ROTATION_PLUGIN_ROTATION__IDENTITY;
-	_tmp9_ = self->priv->video;
-	clutter_actor_set_rotation (_tmp9_, CLUTTER_Z_AXIS, (gdouble) 0, (gfloat) 0, (gfloat) 0, (gfloat) 0);
-	_tmp10_ = self->priv->video;
-	clutter_actor_set_scale_full (_tmp10_, (gdouble) 1, (gdouble) 1, (gfloat) 0, (gfloat) 0);
+	t = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, totem_object_get_type (), TotemObject);
+	g_signal_parse_name ("file-closed", totem_object_get_type (), &_tmp2_, NULL, FALSE);
+	g_signal_handlers_disconnect_matched (t, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _rotation_plugin_cb_file_closed_totem_object_file_closed, self);
+	g_signal_parse_name ("file-opened", totem_object_get_type (), &_tmp3_, NULL, FALSE);
+	g_signal_handlers_disconnect_matched (t, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _rotation_plugin_cb_file_opened_totem_object_file_opened, self);
+	_tmp4_ = totem_object_get_ui_manager (t);
+	ui_manager = _tmp4_;
+	_tmp5_ = self->priv->ui_id;
+	gtk_ui_manager_remove_ui (ui_manager, _tmp5_);
+	_tmp6_ = self->priv->action_group;
+	gtk_ui_manager_remove_action_group (ui_manager, _tmp6_);
+	_tmp7_ = self->priv->bvw;
+	bacon_video_widget_set_rotation (_tmp7_, BVW_ROTATION_R_ZERO);
 	_g_object_unref0 (t);
 }
 
@@ -462,118 +331,47 @@
 static void rotation_plugin_real_update_state (PeasActivatable* base) {
 	RotationPlugin * self;
 	self = (RotationPlugin*) base;
-	rotation_plugin_update_video_geometry (self);
-}
-
-
-static void rotation_plugin_update_video_geometry (RotationPlugin* self) {
-	gfloat _tmp0_;
-	gfloat center_x;
-	gfloat _tmp1_;
-	gfloat center_y;
-	gdouble scale;
-	RotationPluginRotation _tmp2_;
-	ClutterActor* _tmp9_;
-	RotationPluginRotation _tmp10_;
-	gfloat _tmp11_;
-	gfloat _tmp12_;
-	ClutterActor* _tmp13_;
-	gdouble _tmp14_;
-	gdouble _tmp15_;
-	gfloat _tmp16_;
-	gfloat _tmp17_;
-	g_return_if_fail (self != NULL);
-	_tmp0_ = self->priv->width;
-	center_x = _tmp0_ * 0.5f;
-	_tmp1_ = self->priv->height;
-	center_y = _tmp1_ * 0.5f;
-	scale = 1.0;
-	_tmp2_ = self->priv->state;
-	if ((_tmp2_ % 2) == 1) {
-		gfloat _tmp3_;
-		gfloat _tmp4_;
-		_tmp3_ = self->priv->width;
-		_tmp4_ = self->priv->height;
-		if (_tmp3_ > _tmp4_) {
-			gfloat _tmp5_;
-			gfloat _tmp6_;
-			_tmp5_ = self->priv->height;
-			_tmp6_ = self->priv->width;
-			scale = _tmp5_ / ((gdouble) _tmp6_);
-		} else {
-			gfloat _tmp7_;
-			gfloat _tmp8_;
-			_tmp7_ = self->priv->width;
-			_tmp8_ = self->priv->height;
-			scale = _tmp7_ / ((gdouble) _tmp8_);
-		}
-	}
-	_tmp9_ = self->priv->video;
-	_tmp10_ = self->priv->state;
-	_tmp11_ = center_x;
-	_tmp12_ = center_y;
-	clutter_actor_set_rotation (_tmp9_, CLUTTER_Z_AXIS, 90.0 * _tmp10_, _tmp11_, _tmp12_, (gfloat) 0);
-	_tmp13_ = self->priv->video;
-	_tmp14_ = scale;
-	_tmp15_ = scale;
-	_tmp16_ = center_x;
-	_tmp17_ = center_y;
-	clutter_actor_set_scale_full (_tmp13_, _tmp14_, _tmp15_, _tmp16_, _tmp17_);
-}
-
-
-static void rotation_plugin_cb_allocation_changed (RotationPlugin* self, ClutterActorBox* box, ClutterAllocationFlags flags) {
-	ClutterActorBox _tmp0_;
-	gfloat _tmp1_;
-	ClutterActorBox _tmp2_;
-	gfloat _tmp3_;
-	ClutterActorBox _tmp4_;
-	gfloat _tmp5_;
-	ClutterActorBox _tmp6_;
-	gfloat _tmp7_;
-	g_return_if_fail (self != NULL);
-	g_return_if_fail (box != NULL);
-	_tmp0_ = *box;
-	_tmp1_ = _tmp0_.x2;
-	_tmp2_ = *box;
-	_tmp3_ = _tmp2_.x1;
-	self->priv->width = _tmp1_ - _tmp3_;
-	_tmp4_ = *box;
-	_tmp5_ = _tmp4_.y2;
-	_tmp6_ = *box;
-	_tmp7_ = _tmp6_.y1;
-	self->priv->height = _tmp5_ - _tmp7_;
-	rotation_plugin_update_video_geometry (self);
 }
 
 
 static void rotation_plugin_cb_rotate_left (RotationPlugin* self) {
-	RotationPluginRotation _tmp0_;
+	BaconVideoWidget* _tmp0_;
+	BvwRotation _tmp1_ = 0;
+	gint state;
+	BaconVideoWidget* _tmp2_;
 	g_return_if_fail (self != NULL);
-	_tmp0_ = self->priv->state;
-	self->priv->state = (_tmp0_ - 1) % ROTATION_PLUGIN_STATE_COUNT;
-	rotation_plugin_update_video_geometry (self);
+	_tmp0_ = self->priv->bvw;
+	_tmp1_ = bacon_video_widget_get_rotation (_tmp0_);
+	state = (gint) ((_tmp1_ - 1) % ROTATION_PLUGIN_STATE_COUNT);
+	_tmp2_ = self->priv->bvw;
+	bacon_video_widget_set_rotation (_tmp2_, (BvwRotation) state);
 	rotation_plugin_store_state (self, NULL, NULL);
 }
 
 
 static void rotation_plugin_cb_rotate_right (RotationPlugin* self) {
-	RotationPluginRotation _tmp0_;
+	BaconVideoWidget* _tmp0_;
+	BvwRotation _tmp1_ = 0;
+	gint state;
+	BaconVideoWidget* _tmp2_;
 	g_return_if_fail (self != NULL);
-	_tmp0_ = self->priv->state;
-	self->priv->state = (_tmp0_ + 1) % ROTATION_PLUGIN_STATE_COUNT;
-	rotation_plugin_update_video_geometry (self);
+	_tmp0_ = self->priv->bvw;
+	_tmp1_ = bacon_video_widget_get_rotation (_tmp0_);
+	state = (gint) ((_tmp1_ + 1) % ROTATION_PLUGIN_STATE_COUNT);
+	_tmp2_ = self->priv->bvw;
+	bacon_video_widget_set_rotation (_tmp2_, (BvwRotation) state);
 	rotation_plugin_store_state (self, NULL, NULL);
 }
 
 
 static void rotation_plugin_cb_file_closed (RotationPlugin* self) {
-	GtkActionGroup* _tmp0_;
+	BaconVideoWidget* _tmp0_;
+	GtkActionGroup* _tmp1_;
 	g_return_if_fail (self != NULL);
-	self->priv->state = ROTATION_PLUGIN_ROTATION__IDENTITY;
-	rotation_plugin_update_video_geometry (self);
-	_tmp0_ = self->priv->action_group;
-	gtk_action_group_set_sensitive (_tmp0_, FALSE);
+	_tmp0_ = self->priv->bvw;
+	bacon_video_widget_set_rotation (_tmp0_, BVW_ROTATION_R_ZERO);
+	_tmp1_ = self->priv->action_group;
+	gtk_action_group_set_sensitive (_tmp1_, FALSE);
 }
 
 
@@ -597,6 +395,11 @@
 }
 
 
+static gpointer _g_object_ref0 (gpointer self) {
+	return self ? g_object_ref (self) : NULL;
+}
+
+
 static void rotation_plugin_store_state (RotationPlugin* self, GAsyncReadyCallback _callback_, gpointer _user_data_) {
 	RotationPluginStoreStateData* _data_;
 	RotationPlugin* _tmp0_;
@@ -639,7 +442,7 @@
 	_data_->_tmp0_ = NULL;
 	g_object_get ((PeasActivatable*) _data_->self, "object", &_data_->_tmp0_, NULL);
 	_data_->_tmp1_ = _data_->_tmp0_;
-	_data_->t = TOTEM_OBJECT (_data_->_tmp1_);
+	_data_->t = G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp1_, totem_object_get_type (), TotemObject);
 	_data_->_tmp2_ = _data_->t;
 	_data_->_tmp3_ = NULL;
 	_data_->_tmp3_ = totem_object_get_current_mrl (_data_->_tmp2_);
@@ -674,24 +477,28 @@
 		}
 		_data_->_tmp9_ = g_strdup ("");
 		_data_->state_str = _data_->_tmp9_;
-		_data_->_tmp10_ = _data_->self->priv->state;
-		if (_data_->_tmp10_ != ROTATION_PLUGIN_ROTATION__IDENTITY) {
-			_data_->_tmp11_ = _data_->self->priv->state;
-			_data_->_tmp12_ = NULL;
-			_data_->_tmp12_ = g_strdup_printf ("%u", (guint) _data_->_tmp11_);
+		_data_->_tmp10_ = _data_->self->priv->bvw;
+		_data_->_tmp11_ = 0;
+		_data_->_tmp11_ = bacon_video_widget_get_rotation (_data_->_tmp10_);
+		_data_->rotation = _data_->_tmp11_;
+		_data_->_tmp12_ = _data_->rotation;
+		if (_data_->_tmp12_ != BVW_ROTATION_R_ZERO) {
+			_data_->_tmp13_ = _data_->rotation;
+			_data_->_tmp14_ = NULL;
+			_data_->_tmp14_ = g_strdup_printf ("%u", (guint) _data_->_tmp13_);
 			_g_free0 (_data_->state_str);
-			_data_->state_str = _data_->_tmp12_;
+			_data_->state_str = _data_->_tmp14_;
 		}
-		_data_->_tmp13_ = _data_->file_info;
-		_data_->_tmp14_ = _data_->state_str;
-		g_file_info_set_attribute_string (_data_->_tmp13_, GIO_ROTATION_FILE_ATTRIBUTE, _data_->_tmp14_);
-		_data_->_tmp15_ = _data_->file;
-		_data_->_tmp16_ = _data_->file_info;
+		_data_->_tmp15_ = _data_->file_info;
+		_data_->_tmp16_ = _data_->state_str;
+		g_file_info_set_attribute_string (_data_->_tmp15_, GIO_ROTATION_FILE_ATTRIBUTE, _data_->_tmp16_);
+		_data_->_tmp17_ = _data_->file;
+		_data_->_tmp18_ = _data_->file_info;
 		_data_->_state_ = 2;
-		g_file_set_attributes_async (_data_->_tmp15_, _data_->_tmp16_, G_FILE_QUERY_INFO_NONE, G_PRIORITY_DEFAULT, NULL, rotation_plugin_store_state_ready, _data_);
+		g_file_set_attributes_async (_data_->_tmp17_, _data_->_tmp18_, G_FILE_QUERY_INFO_NONE, G_PRIORITY_DEFAULT, NULL, rotation_plugin_store_state_ready, _data_);
 		return FALSE;
 		_state_2:
-		g_file_set_attributes_finish (_data_->_tmp15_, _data_->_res_, NULL, &_data_->_inner_error_);
+		g_file_set_attributes_finish (_data_->_tmp17_, _data_->_res_, NULL, &_data_->_inner_error_);
 		if (_data_->_inner_error_ != NULL) {
 			_g_free0 (_data_->state_str);
 			_g_object_unref0 (_data_->file_info);
@@ -705,9 +512,9 @@
 	{
 		_data_->e = _data_->_inner_error_;
 		_data_->_inner_error_ = NULL;
-		_data_->_tmp17_ = _data_->e;
-		_data_->_tmp18_ = _data_->_tmp17_->message;
-		g_warning ("totem-rotation-plugin.vala:203: Could not store file attribute: %s", _data_->_tmp18_);
+		_data_->_tmp19_ = _data_->e;
+		_data_->_tmp20_ = _data_->_tmp19_->message;
+		g_warning ("totem-rotation-plugin.vala:145: Could not store file attribute: %s", _data_->_tmp20_);
 		_g_error_free0 (_data_->e);
 	}
 	__finally0:
@@ -819,8 +626,10 @@
 			_data_->_tmp6_ = _data_->state_str;
 			_data_->_tmp7_ = 0ULL;
 			_data_->_tmp7_ = uint64_parse (_data_->_tmp6_);
-			_data_->self->priv->state = (RotationPluginRotation) _data_->_tmp7_;
-			rotation_plugin_update_video_geometry (_data_->self);
+			_data_->state = (gint) ((BvwRotation) _data_->_tmp7_);
+			_data_->_tmp8_ = _data_->self->priv->bvw;
+			_data_->_tmp9_ = _data_->state;
+			bacon_video_widget_set_rotation (_data_->_tmp8_, (BvwRotation) _data_->_tmp9_);
 		}
 		_g_free0 (_data_->state_str);
 		_g_object_unref0 (_data_->file_info);
@@ -830,9 +639,9 @@
 	{
 		_data_->e = _data_->_inner_error_;
 		_data_->_inner_error_ = NULL;
-		_data_->_tmp8_ = _data_->e;
-		_data_->_tmp9_ = _data_->_tmp8_->message;
-		g_warning ("totem-rotation-plugin.vala:219: Could not query file attribute: %s", _data_->_tmp9_);
+		_data_->_tmp10_ = _data_->e;
+		_data_->_tmp11_ = _data_->_tmp10_->message;
+		g_warning ("totem-rotation-plugin.vala:161: Could not query file attribute: %s", _data_->_tmp11_);
 		_g_error_free0 (_data_->e);
 	}
 	__finally1:
@@ -911,15 +720,15 @@
 
 static void rotation_plugin_instance_init (RotationPlugin * self) {
 	self->priv = ROTATION_PLUGIN_GET_PRIVATE (self);
-	self->priv->video = NULL;
-	self->priv->state = ROTATION_PLUGIN_ROTATION__IDENTITY;
+	self->priv->bvw = NULL;
 }
 
 
 static void rotation_plugin_finalize (GObject* obj) {
 	RotationPlugin * self;
-	self = ROTATION_PLUGIN (obj);
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ROTATION_PLUGIN, RotationPlugin);
 	_g_object_unref0 (self->priv->_object);
+	_g_object_unref0 (self->priv->bvw);
 	_g_object_unref0 (self->priv->action_group);
 	G_OBJECT_CLASS (rotation_plugin_parent_class)->finalize (obj);
 }
@@ -941,7 +750,7 @@
 
 static void _vala_rotation_plugin_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) {
 	RotationPlugin * self;
-	self = ROTATION_PLUGIN (object);
+	self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_ROTATION_PLUGIN, RotationPlugin);
 	switch (property_id) {
 		case ROTATION_PLUGIN_OBJECT:
 		g_value_take_object (value, rotation_plugin_real_get_object ((PeasActivatable*) self));
@@ -955,7 +764,7 @@
 
 static void _vala_rotation_plugin_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) {
 	RotationPlugin * self;
-	self = ROTATION_PLUGIN (object);
+	self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_ROTATION_PLUGIN, RotationPlugin);
 	switch (property_id) {
 		case ROTATION_PLUGIN_OBJECT:
 		rotation_plugin_real_set_object ((PeasActivatable*) self, g_value_get_object (value));
@@ -974,7 +783,7 @@
 	g_return_if_fail (module != NULL);
 	rotation_plugin_register_type (module);
 	_tmp0_ = module;
-	_tmp1_ = _g_object_ref0 (PEAS_IS_OBJECT_MODULE (_tmp0_) ? ((PeasObjectModule*) _tmp0_) : NULL);
+	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, peas_object_module_get_type ()) ? ((PeasObjectModule*) _tmp0_) : NULL);
 	objmodule = _tmp1_;
 	peas_object_module_register_extension_type (objmodule, peas_activatable_get_type (), TYPE_ROTATION_PLUGIN);
 	_g_object_unref0 (objmodule);
diff -Nru totem-3.4.3/src/plugins/rotation/totem-rotation-plugin.vala totem-3.6.2/src/plugins/rotation/totem-rotation-plugin.vala
--- totem-3.4.3/src/plugins/rotation/totem-rotation-plugin.vala	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/plugins/rotation/totem-rotation-plugin.vala	2012-08-29 23:07:45.000000000 +0000
@@ -26,29 +26,19 @@
 
 class RotationPlugin: GLib.Object, Peas.Activatable
 {
-    private enum Rotation
-    {
-        _IDENTITY = 0,
-        _90R = 1,
-        _180 = 2,
-        _90L = 3
-    }
     private const int STATE_COUNT = 4;
     public GLib.Object object { owned get; construct; }
-    private weak Clutter.Actor video = null;
+    private Bacon.VideoWidget bvw = null;
     private uint ui_id;
     private Gtk.ActionGroup action_group;
-    private Rotation state = Rotation._IDENTITY;
-    private float width;
-    private float height;
 
     public void activate ()
     {
         Totem.Object t = (Totem.Object) this.object;
-        GtkClutter.Embed bvw = (GtkClutter.Embed) Totem.get_video_widget (t);
-        unowned Clutter.Stage stage = (Clutter.Stage) bvw.get_stage ();
         string mrl = t.get_current_mrl ();
 
+        this.bvw = t.get_video_widget () as Bacon.VideoWidget;
+
         // add interface elements to control the rotation
         unowned Gtk.UIManager ui_manager = t.get_ui_manager ();
         this.ui_id = ui_manager.new_merge_id ();
@@ -70,31 +60,11 @@
         }
         ui_manager.insert_action_group (this.action_group, 0);
 
-        // search for the actor which contains the video
-        for (int i = 0; i < stage.get_n_children (); i++) {
-            Clutter.Actor actor = stage.get_nth_child (i);
-            if (actor.name == "frame") {
-                this.video = actor;
-                break;
-            }
-        }
-
-        if (video == null) {
-            GLib.critical ("Could not find the clutter actor 'frame'.");
-            return;
-        }
-
-        this.width = this.video.width;
-        this.height = this.video.height;
-
         // read the state of the current video from the GIO attribute
         if (mrl != null) {
             this.try_restore_state (mrl);
         }
 
-        // get notified if the video gets resized
-        this.video.allocation_changed.connect (this.cb_allocation_changed);
-
         t.file_closed.connect (this.cb_file_closed);
         t.file_opened.connect (this.cb_file_opened);
     }
@@ -104,7 +74,6 @@
         Totem.Object t = (Totem.Object) this.object;
 
         // disconnect callbacks
-        this.video.allocation_changed.disconnect (this.cb_allocation_changed);
         t.file_closed.disconnect (this.cb_file_closed);
         t.file_opened.disconnect (this.cb_file_opened);
 
@@ -114,61 +83,32 @@
         ui_manager.remove_action_group (this.action_group);
 
         // undo transformations
-        this.state = Rotation._IDENTITY;
-        this.video.set_rotation (Clutter.RotateAxis.Z_AXIS, 0, 0, 0, 0);
-        this.video.set_scale_full (1, 1, 0, 0);
+        this.bvw.set_rotation (Bacon.Rotation.R_ZERO);
     }
 
     public void update_state ()
     {
-        this.update_video_geometry ();
-    }
-
-    private void update_video_geometry ()
-    {
-        float center_x = this.width * 0.5f;
-        float center_y = this.height * 0.5f;
-        double scale = 1.0;
-
-        // scale so that the larger side fits the smaller side
-        if (this.state % 2 == 1) { // _90R or _90L
-            if (this.width > this.height) {
-                scale = this.height / (double) this.width;
-            } else {
-                scale = this.width / (double) this.height;
-            }
-        }
-
-        this.video.set_rotation (Clutter.RotateAxis.Z_AXIS, 90.0 * this.state, center_x, center_y, 0);
-        this.video.set_scale_full (scale, scale, center_x, center_y);
-    }
-
-    private void cb_allocation_changed (Clutter.ActorBox box, Clutter.AllocationFlags flags)
-    {
-        this.width = box.x2 - box.x1;
-        this.height = box.y2 - box.y1;
-        this.update_video_geometry ();
+        //no-op
     }
 
     private void cb_rotate_left ()
     {
-        this.state = (this.state - 1) % STATE_COUNT;
-        this.update_video_geometry ();
+        int state = (this.bvw.get_rotation() - 1) % STATE_COUNT;
+        this.bvw.set_rotation ((Bacon.Rotation) state);
         this.store_state ();
     }
 
     private void cb_rotate_right ()
     {
-        this.state = (this.state + 1) % STATE_COUNT;
-        this.update_video_geometry ();
+        int state = (this.bvw.get_rotation() + 1) % STATE_COUNT;
+        this.bvw.set_rotation ((Bacon.Rotation) state);
         this.store_state ();
     }
 
     private void cb_file_closed ()
     {
         // reset the rotation
-        this.state = Rotation._IDENTITY;
-        this.update_video_geometry ();
+        this.bvw.set_rotation (Bacon.Rotation.R_ZERO);
         this.action_group.sensitive = false;
     }
 
@@ -189,12 +129,14 @@
 
         var file = GLib.File.new_for_uri (mrl);
         try {
+            Bacon.Rotation rotation;
             var file_info = yield file.query_info_async (GIO_ROTATION_FILE_ATTRIBUTE,
                     GLib.FileQueryInfoFlags.NONE);
 
             string state_str = "";
-            if (this.state != Rotation._IDENTITY) {
-                state_str = "%u".printf ((uint) this.state);
+            rotation = this.bvw.get_rotation ();
+            if (rotation != Bacon.Rotation.R_ZERO) {
+                state_str = "%u".printf ((uint) rotation);
             }
             file_info.set_attribute_string (GIO_ROTATION_FILE_ATTRIBUTE, state_str);
             yield file.set_attributes_async (file_info, GLib.FileQueryInfoFlags.NONE,
@@ -212,8 +154,8 @@
                     GLib.FileQueryInfoFlags.NONE);
             string state_str = file_info.get_attribute_string (GIO_ROTATION_FILE_ATTRIBUTE);
             if (state_str != null) {
-                this.state = (Rotation) uint64.parse (state_str);
-                this.update_video_geometry ();
+                int state = (Bacon.Rotation) uint64.parse (state_str);
+                this.bvw.set_rotation ((Bacon.Rotation) state);
             }
         } catch (GLib.Error e) {
             GLib.warning ("Could not query file attribute: %s", e.message);
diff -Nru totem-3.4.3/src/plugins/sample-vala/Makefile.in totem-3.6.2/src/plugins/sample-vala/Makefile.in
--- totem-3.4.3/src/plugins/sample-vala/Makefile.in	2012-07-04 09:54:51.000000000 +0000
+++ totem-3.6.2/src/plugins/sample-vala/Makefile.in	2012-10-25 13:36:23.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.12.2 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,6 +16,23 @@
 
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -36,14 +52,12 @@
 build_triplet = @build@
 host_triplet = @host@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(srcdir)/libsample_vala_la_vala.stamp $(top_srcdir)/depcomp \
 	$(top_srcdir)/src/plugins/Makefile.plugins \
-	libsample_vala_la_vala.stamp totem-sample-vala-plugin.c
+	totem-sample-vala-plugin.c
 subdir = src/plugins/sample-vala
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -86,10 +100,23 @@
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 libsample_vala_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(libsample_vala_la_CFLAGS) $(CFLAGS) \
 	$(libsample_vala_la_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -102,29 +129,31 @@
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 VALACOMPILE = $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS)
 LTVALACOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(VALAC) $(AM_VALAFLAGS) \
 	$(VALAFLAGS)
 AM_V_VALAC = $(am__v_VALAC_@AM_V@)
 am__v_VALAC_ = $(am__v_VALAC_@AM_DEFAULT_V@)
-am__v_VALAC_0 = @echo "  VALAC " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_VALAC_0 = @echo "  VALAC   " $@;
+am__v_VALAC_1 = 
 SOURCES = $(libsample_vala_la_SOURCES)
 DIST_SOURCES = $(libsample_vala_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 DATA = $(plugin_DATA)
 ETAGS = etags
 CTAGS = ctags
@@ -140,7 +169,8 @@
 	$(DISABLE_DEPRECATED)		\
 	-I$(top_srcdir)/		\
 	-I$(top_srcdir)/src		\
-	-I$(top_srcdir)/src/plugins
+	-I$(top_srcdir)/src/plugins	\
+	-I$(top_srcdir)/src/gst
 
 AM_CXXFLAGS = @AM_CXXFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -150,6 +180,10 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BACKEND_CFLAGS = @BACKEND_CFLAGS@
+BACKEND_LIBS = @BACKEND_LIBS@
+BACKEND_TEST_CFLAGS = @BACKEND_TEST_CFLAGS@
+BACKEND_TEST_LIBS = @BACKEND_TEST_LIBS@
 BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
 BROWSER_PLUGIN_DIR = @BROWSER_PLUGIN_DIR@
 BROWSER_PLUGIN_LIBS = @BROWSER_PLUGIN_LIBS@
@@ -171,8 +205,6 @@
 DBUS_LIBS = @DBUS_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DEPENDENCY_CFLAGS = @DEPENDENCY_CFLAGS@
-DEPENDENCY_LIBS = @DEPENDENCY_LIBS@
 DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DISC_RECORDER_CFLAGS = @DISC_RECORDER_CFLAGS@
 DISC_RECORDER_LIBS = @DISC_RECORDER_LIBS@
@@ -186,7 +218,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-EXTRA_BACKEND_LIBS = @EXTRA_BACKEND_LIBS@
 FGREP = @FGREP@
 FULL_LIBEXECDIR = @FULL_LIBEXECDIR@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
@@ -194,19 +225,21 @@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GLIB_REQS = @GLIB_REQS@
+GLOW_BUTTON_CFLAGS = @GLOW_BUTTON_CFLAGS@
+GLOW_BUTTON_LIBS = @GLOW_BUTTON_LIBS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
-GST_CFLAGS = @GST_CFLAGS@
-GST_LIBS = @GST_LIBS@
+GST_PLUGINS_BAD_CFLAGS = @GST_PLUGINS_BAD_CFLAGS@
+GST_PLUGINS_BAD_LIBS = @GST_PLUGINS_BAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
 GTK_REQS = @GTK_REQS@
+HELPER_CFLAGS = @HELPER_CFLAGS@
+HELPER_LIBS = @HELPER_LIBS@
 HELP_DIR = @HELP_DIR@
 HTML_DIR = @HTML_DIR@
 INSTALL = @INSTALL@
@@ -232,11 +265,11 @@
 INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBEPC_CFLAGS = @LIBEPC_CFLAGS@
-LIBEPC_LIBS = @LIBEPC_LIBS@
 LIBGRILO_CFLAGS = @LIBGRILO_CFLAGS@
 LIBGRILO_LIBS = @LIBGRILO_LIBS@
 LIBOBJS = @LIBOBJS@
+LIBPLAYER_CFLAGS = @LIBPLAYER_CFLAGS@
+LIBPLAYER_LIBS = @LIBPLAYER_LIBS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBZEITGEIST_CFLAGS = @LIBZEITGEIST_CFLAGS@
@@ -253,8 +286,6 @@
 MISSING_PLUGINS_CFLAGS = @MISSING_PLUGINS_CFLAGS@
 MISSING_PLUGINS_LIBS = @MISSING_PLUGINS_LIBS@
 MKDIR_P = @MKDIR_P@
-MM_CFLAGS = @MM_CFLAGS@
-MM_LIBS = @MM_LIBS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 NAUTILUSDIR = @NAUTILUSDIR@
@@ -275,15 +306,21 @@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PEASGTK_CFLAGS = @PEASGTK_CFLAGS@
-PEASGTK_LIBS = @PEASGTK_LIBS@
-PEAS_CFLAGS = @PEAS_CFLAGS@
-PEAS_LIBS = @PEAS_LIBS@
+PIXBUF_HELPER_CFLAGS = @PIXBUF_HELPER_CFLAGS@
+PIXBUF_HELPER_LIBS = @PIXBUF_HELPER_LIBS@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLAYER_CFLAGS = @PLAYER_CFLAGS@
+PLAYER_LIBS = @PLAYER_LIBS@
 PLUGINDIR = @PLUGINDIR@
 PLUGINS = @PLUGINS@
+PLUGIN_VIEWER_CFLAGS = @PLUGIN_VIEWER_CFLAGS@
+PLUGIN_VIEWER_LIBS = @PLUGIN_VIEWER_LIBS@
+PREVIEW_CFLAGS = @PREVIEW_CFLAGS@
+PREVIEW_LIBS = @PREVIEW_LIBS@
+PROPERTIES_CFLAGS = @PROPERTIES_CFLAGS@
+PROPERTIES_LIBS = @PROPERTIES_LIBS@
 PYGOBJECT_CFLAGS = @PYGOBJECT_CFLAGS@
 PYGOBJECT_LIBS = @PYGOBJECT_LIBS@
 PYLINT = @PYLINT@
@@ -303,6 +340,10 @@
 SMCLIENT_CFLAGS = @SMCLIENT_CFLAGS@
 SMCLIENT_LIBS = @SMCLIENT_LIBS@
 STRIP = @STRIP@
+THUMBNAILER_CFLAGS = @THUMBNAILER_CFLAGS@
+THUMBNAILER_LIBS = @THUMBNAILER_LIBS@
+TIME_HELPER_CFLAGS = @TIME_HELPER_CFLAGS@
+TIME_HELPER_LIBS = @TIME_HELPER_LIBS@
 TOTEM_API_VERSION = @TOTEM_API_VERSION@
 TOTEM_PLPARSER_REQS = @TOTEM_PLPARSER_REQS@
 TOTEM_VERSION_MAJOR = @TOTEM_VERSION_MAJOR@
@@ -314,9 +355,6 @@
 WARN_CFLAGS = @WARN_CFLAGS@
 WARN_CXXFLAGS = @WARN_CXXFLAGS@
 XGETTEXT = @XGETTEXT@
-XMKMF = @XMKMF@
-XTEST_LIBS = @XTEST_LIBS@
-X_LIBS = @X_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -382,8 +420,7 @@
 DISTCLEANFILES = $(plugin_DATA)
 EXTRA_DIST = $(plugin_in_files)
 plugin_cflags = \
-	$(DEPENDENCY_CFLAGS)	\
-	$(PEAS_CFLAGS)		\
+	$(PLAYER_CFLAGS)	\
 	$(WARN_CFLAGS)
 
 plugin_ldflags = \
@@ -452,12 +489,14 @@
 
 clean-pluginLTLIBRARIES:
 	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
-	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(plugin_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
 libsample-vala.la: $(libsample_vala_la_OBJECTS) $(libsample_vala_la_DEPENDENCIES) $(EXTRA_libsample_vala_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libsample_vala_la_LINK) -rpath $(plugindir) $(libsample_vala_la_OBJECTS) $(libsample_vala_la_LIBADD) $(LIBS)
 
@@ -470,25 +509,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsample_vala_la-totem-sample-vala-plugin.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
@@ -504,9 +540,9 @@
 	@if test -f $@; then :; else \
 	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libsample_vala_la_vala.stamp; \
 	fi
-$(srcdir)/libsample_vala_la_vala.stamp: $(libsample_vala_la_SOURCES)
+$(srcdir)/libsample_vala_la_vala.stamp: totem-sample-vala-plugin.vala
 	$(AM_V_at)rm -f $@ && echo stamp > $@-t
-	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(libsample_vala_la_SOURCES)
+	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C totem-sample-vala-plugin.vala
 	$(AM_V_at)mv -f $@-t $@
 
 mostlyclean-libtool:
@@ -564,6 +600,20 @@
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
 
+cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
+	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
@@ -636,7 +686,8 @@
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-rm -f libsample_vala_la_vala.stamp
+	-rm -f $(srcdir)/libsample_vala_la_vala.stamp
+	-rm -f $(srcdir)/totem-sample-vala-plugin.c
 	-rm -f totem-sample-vala-plugin.c
 clean: clean-am
 
@@ -712,19 +763,19 @@
 .MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pluginLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pluginDATA \
-	install-pluginLTLIBRARIES install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-pluginDATA uninstall-pluginLTLIBRARIES
+	clean-libtool clean-pluginLTLIBRARIES cscopelist ctags \
+	distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pluginDATA install-pluginLTLIBRARIES install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-pluginDATA uninstall-pluginLTLIBRARIES
 
 %.plugin: %.plugin.in
 	$(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
diff -Nru totem-3.4.3/src/plugins/sample-vala/libsample_vala_la_vala.stamp totem-3.6.2/src/plugins/sample-vala/libsample_vala_la_vala.stamp
--- totem-3.4.3/src/plugins/sample-vala/libsample_vala_la_vala.stamp	2012-01-10 18:17:33.000000000 +0000
+++ totem-3.6.2/src/plugins/sample-vala/libsample_vala_la_vala.stamp	2012-07-13 11:47:36.000000000 +0000
@@ -0,0 +1 @@
+stamp
diff -Nru totem-3.4.3/src/plugins/sample-vala/totem-sample-vala-plugin.c totem-3.6.2/src/plugins/sample-vala/totem-sample-vala-plugin.c
--- totem-3.4.3/src/plugins/sample-vala/totem-sample-vala-plugin.c	2011-12-06 10:31:56.000000000 +0000
+++ totem-3.6.2/src/plugins/sample-vala/totem-sample-vala-plugin.c	2012-07-13 11:47:38.000000000 +0000
@@ -1,10 +1,9 @@
-/* totem-sample-vala-plugin.c generated by valac 0.14.1, the Vala compiler
+/* totem-sample-vala-plugin.c generated by valac 0.17.0.14-2d0e7, the Vala compiler
  * generated from totem-sample-vala-plugin.vala, do not modify */
 
 
 #include 
 #include 
-#include 
 #include 
 
 
@@ -51,9 +50,7 @@
 SampleValaPlugin* sample_vala_plugin_new (void);
 SampleValaPlugin* sample_vala_plugin_construct (GType object_type);
 static void sample_vala_plugin_finalize (GObject* obj);
-GObject* peas_activatable_get_object (PeasActivatable* self);
 static void _vala_sample_vala_plugin_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
-static void peas_activatable_set_object (PeasActivatable* self, GObject* value);
 static void _vala_sample_vala_plugin_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
 void peas_register_types (GTypeModule* module);
 
@@ -127,7 +124,7 @@
 	G_OBJECT_CLASS (klass)->get_property = _vala_sample_vala_plugin_get_property;
 	G_OBJECT_CLASS (klass)->set_property = _vala_sample_vala_plugin_set_property;
 	G_OBJECT_CLASS (klass)->finalize = sample_vala_plugin_finalize;
-	g_object_class_override_property (G_OBJECT_CLASS (klass), SAMPLE_VALA_PLUGIN_OBJECT, "object");
+	g_object_class_install_property (G_OBJECT_CLASS (klass), SAMPLE_VALA_PLUGIN_OBJECT, g_param_spec_object ("object", "object", "object", G_TYPE_OBJECT, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
 }
 
 
diff -Nru totem-3.4.3/src/plugins/samplepython/Makefile.in totem-3.6.2/src/plugins/samplepython/Makefile.in
--- totem-3.4.3/src/plugins/samplepython/Makefile.in	2012-07-04 09:54:51.000000000 +0000
+++ totem-3.6.2/src/plugins/samplepython/Makefile.in	2012-10-25 13:36:23.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.12.2 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +15,23 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -35,28 +51,36 @@
 build_triplet = @build@
 host_triplet = @host@
 DIST_COMMON = $(plugin_PYTHON) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.in $(top_srcdir)/py-compile \
 	$(top_srcdir)/src/plugins/Makefile.plugins
 subdir = src/plugins/samplepython
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -100,7 +124,8 @@
 	$(DISABLE_DEPRECATED)		\
 	-I$(top_srcdir)/		\
 	-I$(top_srcdir)/src		\
-	-I$(top_srcdir)/src/plugins
+	-I$(top_srcdir)/src/plugins	\
+	-I$(top_srcdir)/src/gst
 
 AM_CXXFLAGS = @AM_CXXFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -110,6 +135,10 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BACKEND_CFLAGS = @BACKEND_CFLAGS@
+BACKEND_LIBS = @BACKEND_LIBS@
+BACKEND_TEST_CFLAGS = @BACKEND_TEST_CFLAGS@
+BACKEND_TEST_LIBS = @BACKEND_TEST_LIBS@
 BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
 BROWSER_PLUGIN_DIR = @BROWSER_PLUGIN_DIR@
 BROWSER_PLUGIN_LIBS = @BROWSER_PLUGIN_LIBS@
@@ -131,8 +160,6 @@
 DBUS_LIBS = @DBUS_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DEPENDENCY_CFLAGS = @DEPENDENCY_CFLAGS@
-DEPENDENCY_LIBS = @DEPENDENCY_LIBS@
 DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DISC_RECORDER_CFLAGS = @DISC_RECORDER_CFLAGS@
 DISC_RECORDER_LIBS = @DISC_RECORDER_LIBS@
@@ -146,7 +173,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-EXTRA_BACKEND_LIBS = @EXTRA_BACKEND_LIBS@
 FGREP = @FGREP@
 FULL_LIBEXECDIR = @FULL_LIBEXECDIR@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
@@ -154,19 +180,21 @@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GLIB_REQS = @GLIB_REQS@
+GLOW_BUTTON_CFLAGS = @GLOW_BUTTON_CFLAGS@
+GLOW_BUTTON_LIBS = @GLOW_BUTTON_LIBS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
-GST_CFLAGS = @GST_CFLAGS@
-GST_LIBS = @GST_LIBS@
+GST_PLUGINS_BAD_CFLAGS = @GST_PLUGINS_BAD_CFLAGS@
+GST_PLUGINS_BAD_LIBS = @GST_PLUGINS_BAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
 GTK_REQS = @GTK_REQS@
+HELPER_CFLAGS = @HELPER_CFLAGS@
+HELPER_LIBS = @HELPER_LIBS@
 HELP_DIR = @HELP_DIR@
 HTML_DIR = @HTML_DIR@
 INSTALL = @INSTALL@
@@ -192,11 +220,11 @@
 INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBEPC_CFLAGS = @LIBEPC_CFLAGS@
-LIBEPC_LIBS = @LIBEPC_LIBS@
 LIBGRILO_CFLAGS = @LIBGRILO_CFLAGS@
 LIBGRILO_LIBS = @LIBGRILO_LIBS@
 LIBOBJS = @LIBOBJS@
+LIBPLAYER_CFLAGS = @LIBPLAYER_CFLAGS@
+LIBPLAYER_LIBS = @LIBPLAYER_LIBS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBZEITGEIST_CFLAGS = @LIBZEITGEIST_CFLAGS@
@@ -213,8 +241,6 @@
 MISSING_PLUGINS_CFLAGS = @MISSING_PLUGINS_CFLAGS@
 MISSING_PLUGINS_LIBS = @MISSING_PLUGINS_LIBS@
 MKDIR_P = @MKDIR_P@
-MM_CFLAGS = @MM_CFLAGS@
-MM_LIBS = @MM_LIBS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 NAUTILUSDIR = @NAUTILUSDIR@
@@ -235,15 +261,21 @@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PEASGTK_CFLAGS = @PEASGTK_CFLAGS@
-PEASGTK_LIBS = @PEASGTK_LIBS@
-PEAS_CFLAGS = @PEAS_CFLAGS@
-PEAS_LIBS = @PEAS_LIBS@
+PIXBUF_HELPER_CFLAGS = @PIXBUF_HELPER_CFLAGS@
+PIXBUF_HELPER_LIBS = @PIXBUF_HELPER_LIBS@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLAYER_CFLAGS = @PLAYER_CFLAGS@
+PLAYER_LIBS = @PLAYER_LIBS@
 PLUGINDIR = @PLUGINDIR@
 PLUGINS = @PLUGINS@
+PLUGIN_VIEWER_CFLAGS = @PLUGIN_VIEWER_CFLAGS@
+PLUGIN_VIEWER_LIBS = @PLUGIN_VIEWER_LIBS@
+PREVIEW_CFLAGS = @PREVIEW_CFLAGS@
+PREVIEW_LIBS = @PREVIEW_LIBS@
+PROPERTIES_CFLAGS = @PROPERTIES_CFLAGS@
+PROPERTIES_LIBS = @PROPERTIES_LIBS@
 PYGOBJECT_CFLAGS = @PYGOBJECT_CFLAGS@
 PYGOBJECT_LIBS = @PYGOBJECT_LIBS@
 PYLINT = @PYLINT@
@@ -263,6 +295,10 @@
 SMCLIENT_CFLAGS = @SMCLIENT_CFLAGS@
 SMCLIENT_LIBS = @SMCLIENT_LIBS@
 STRIP = @STRIP@
+THUMBNAILER_CFLAGS = @THUMBNAILER_CFLAGS@
+THUMBNAILER_LIBS = @THUMBNAILER_LIBS@
+TIME_HELPER_CFLAGS = @TIME_HELPER_CFLAGS@
+TIME_HELPER_LIBS = @TIME_HELPER_LIBS@
 TOTEM_API_VERSION = @TOTEM_API_VERSION@
 TOTEM_PLPARSER_REQS = @TOTEM_PLPARSER_REQS@
 TOTEM_VERSION_MAJOR = @TOTEM_VERSION_MAJOR@
@@ -274,9 +310,6 @@
 WARN_CFLAGS = @WARN_CFLAGS@
 WARN_CXXFLAGS = @WARN_CXXFLAGS@
 XGETTEXT = @XGETTEXT@
-XMKMF = @XMKMF@
-XTEST_LIBS = @XTEST_LIBS@
-X_LIBS = @X_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -342,8 +375,7 @@
 DISTCLEANFILES = $(plugin_DATA)
 EXTRA_DIST = $(plugin_in_files)
 plugin_cflags = \
-	$(DEPENDENCY_CFLAGS)	\
-	$(PEAS_CFLAGS)		\
+	$(PLAYER_CFLAGS)	\
 	$(WARN_CFLAGS)
 
 plugin_ldflags = \
@@ -404,6 +436,8 @@
 ctags: CTAGS
 CTAGS:
 
+cscope cscopelist:
+
 
 distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
diff -Nru totem-3.4.3/src/plugins/save-file/Makefile.in totem-3.6.2/src/plugins/save-file/Makefile.in
--- totem-3.4.3/src/plugins/save-file/Makefile.in	2012-07-04 09:54:51.000000000 +0000
+++ totem-3.6.2/src/plugins/save-file/Makefile.in	2012-10-25 13:36:23.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.12.2 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,6 +16,23 @@
 
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -36,13 +52,11 @@
 build_triplet = @build@
 host_triplet = @host@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/depcomp \
 	$(top_srcdir)/src/plugins/Makefile.plugins
 subdir = src/plugins/save-file
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -85,10 +99,23 @@
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 libsave_file_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(libsave_file_la_CFLAGS) $(CFLAGS) $(libsave_file_la_LDFLAGS) \
 	$(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -101,22 +128,23 @@
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(libsave_file_la_SOURCES)
 DIST_SOURCES = $(libsave_file_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 DATA = $(plugin_DATA)
 ETAGS = etags
 CTAGS = ctags
@@ -132,7 +160,8 @@
 	$(DISABLE_DEPRECATED)		\
 	-I$(top_srcdir)/		\
 	-I$(top_srcdir)/src		\
-	-I$(top_srcdir)/src/plugins
+	-I$(top_srcdir)/src/plugins	\
+	-I$(top_srcdir)/src/gst
 
 AM_CXXFLAGS = @AM_CXXFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -142,6 +171,10 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BACKEND_CFLAGS = @BACKEND_CFLAGS@
+BACKEND_LIBS = @BACKEND_LIBS@
+BACKEND_TEST_CFLAGS = @BACKEND_TEST_CFLAGS@
+BACKEND_TEST_LIBS = @BACKEND_TEST_LIBS@
 BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
 BROWSER_PLUGIN_DIR = @BROWSER_PLUGIN_DIR@
 BROWSER_PLUGIN_LIBS = @BROWSER_PLUGIN_LIBS@
@@ -163,8 +196,6 @@
 DBUS_LIBS = @DBUS_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DEPENDENCY_CFLAGS = @DEPENDENCY_CFLAGS@
-DEPENDENCY_LIBS = @DEPENDENCY_LIBS@
 DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DISC_RECORDER_CFLAGS = @DISC_RECORDER_CFLAGS@
 DISC_RECORDER_LIBS = @DISC_RECORDER_LIBS@
@@ -178,7 +209,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-EXTRA_BACKEND_LIBS = @EXTRA_BACKEND_LIBS@
 FGREP = @FGREP@
 FULL_LIBEXECDIR = @FULL_LIBEXECDIR@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
@@ -186,19 +216,21 @@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GLIB_REQS = @GLIB_REQS@
+GLOW_BUTTON_CFLAGS = @GLOW_BUTTON_CFLAGS@
+GLOW_BUTTON_LIBS = @GLOW_BUTTON_LIBS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
-GST_CFLAGS = @GST_CFLAGS@
-GST_LIBS = @GST_LIBS@
+GST_PLUGINS_BAD_CFLAGS = @GST_PLUGINS_BAD_CFLAGS@
+GST_PLUGINS_BAD_LIBS = @GST_PLUGINS_BAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
 GTK_REQS = @GTK_REQS@
+HELPER_CFLAGS = @HELPER_CFLAGS@
+HELPER_LIBS = @HELPER_LIBS@
 HELP_DIR = @HELP_DIR@
 HTML_DIR = @HTML_DIR@
 INSTALL = @INSTALL@
@@ -224,11 +256,11 @@
 INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBEPC_CFLAGS = @LIBEPC_CFLAGS@
-LIBEPC_LIBS = @LIBEPC_LIBS@
 LIBGRILO_CFLAGS = @LIBGRILO_CFLAGS@
 LIBGRILO_LIBS = @LIBGRILO_LIBS@
 LIBOBJS = @LIBOBJS@
+LIBPLAYER_CFLAGS = @LIBPLAYER_CFLAGS@
+LIBPLAYER_LIBS = @LIBPLAYER_LIBS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBZEITGEIST_CFLAGS = @LIBZEITGEIST_CFLAGS@
@@ -245,8 +277,6 @@
 MISSING_PLUGINS_CFLAGS = @MISSING_PLUGINS_CFLAGS@
 MISSING_PLUGINS_LIBS = @MISSING_PLUGINS_LIBS@
 MKDIR_P = @MKDIR_P@
-MM_CFLAGS = @MM_CFLAGS@
-MM_LIBS = @MM_LIBS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 NAUTILUSDIR = @NAUTILUSDIR@
@@ -267,15 +297,21 @@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PEASGTK_CFLAGS = @PEASGTK_CFLAGS@
-PEASGTK_LIBS = @PEASGTK_LIBS@
-PEAS_CFLAGS = @PEAS_CFLAGS@
-PEAS_LIBS = @PEAS_LIBS@
+PIXBUF_HELPER_CFLAGS = @PIXBUF_HELPER_CFLAGS@
+PIXBUF_HELPER_LIBS = @PIXBUF_HELPER_LIBS@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLAYER_CFLAGS = @PLAYER_CFLAGS@
+PLAYER_LIBS = @PLAYER_LIBS@
 PLUGINDIR = @PLUGINDIR@
 PLUGINS = @PLUGINS@
+PLUGIN_VIEWER_CFLAGS = @PLUGIN_VIEWER_CFLAGS@
+PLUGIN_VIEWER_LIBS = @PLUGIN_VIEWER_LIBS@
+PREVIEW_CFLAGS = @PREVIEW_CFLAGS@
+PREVIEW_LIBS = @PREVIEW_LIBS@
+PROPERTIES_CFLAGS = @PROPERTIES_CFLAGS@
+PROPERTIES_LIBS = @PROPERTIES_LIBS@
 PYGOBJECT_CFLAGS = @PYGOBJECT_CFLAGS@
 PYGOBJECT_LIBS = @PYGOBJECT_LIBS@
 PYLINT = @PYLINT@
@@ -295,6 +331,10 @@
 SMCLIENT_CFLAGS = @SMCLIENT_CFLAGS@
 SMCLIENT_LIBS = @SMCLIENT_LIBS@
 STRIP = @STRIP@
+THUMBNAILER_CFLAGS = @THUMBNAILER_CFLAGS@
+THUMBNAILER_LIBS = @THUMBNAILER_LIBS@
+TIME_HELPER_CFLAGS = @TIME_HELPER_CFLAGS@
+TIME_HELPER_LIBS = @TIME_HELPER_LIBS@
 TOTEM_API_VERSION = @TOTEM_API_VERSION@
 TOTEM_PLPARSER_REQS = @TOTEM_PLPARSER_REQS@
 TOTEM_VERSION_MAJOR = @TOTEM_VERSION_MAJOR@
@@ -306,9 +346,6 @@
 WARN_CFLAGS = @WARN_CFLAGS@
 WARN_CXXFLAGS = @WARN_CXXFLAGS@
 XGETTEXT = @XGETTEXT@
-XMKMF = @XMKMF@
-XTEST_LIBS = @XTEST_LIBS@
-X_LIBS = @X_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -374,8 +411,7 @@
 DISTCLEANFILES = $(plugin_DATA)
 EXTRA_DIST = $(plugin_in_files)
 plugin_cflags = \
-	$(DEPENDENCY_CFLAGS)	\
-	$(PEAS_CFLAGS)		\
+	$(PLAYER_CFLAGS)	\
 	$(WARN_CFLAGS)
 
 plugin_ldflags = \
@@ -437,7 +473,6 @@
 $(am__aclocal_m4_deps):
 install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
 	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
@@ -445,6 +480,8 @@
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
 	}
@@ -460,12 +497,14 @@
 
 clean-pluginLTLIBRARIES:
 	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
-	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(plugin_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
 libsave-file.la: $(libsave_file_la_OBJECTS) $(libsave_file_la_DEPENDENCIES) $(EXTRA_libsave_file_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libsave_file_la_LINK) -rpath $(plugindir) $(libsave_file_la_OBJECTS) $(libsave_file_la_LIBADD) $(LIBS)
 
@@ -478,25 +517,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsave_file_la-totem-save-file.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
@@ -515,8 +551,11 @@
 	-rm -rf .libs _libs
 install-pluginDATA: $(plugin_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
 	@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -581,6 +620,20 @@
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
 
+cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
+	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
@@ -727,19 +780,19 @@
 .MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pluginLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pluginDATA \
-	install-pluginLTLIBRARIES install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-pluginDATA uninstall-pluginLTLIBRARIES
+	clean-libtool clean-pluginLTLIBRARIES cscopelist ctags \
+	distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pluginDATA install-pluginLTLIBRARIES install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-pluginDATA uninstall-pluginLTLIBRARIES
 
 %.plugin: %.plugin.in
 	$(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
diff -Nru totem-3.4.3/src/plugins/save-file/save-file.plugin.in totem-3.6.2/src/plugins/save-file/save-file.plugin.in
--- totem-3.4.3/src/plugins/save-file/save-file.plugin.in	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/plugins/save-file/save-file.plugin.in	2012-08-29 23:07:45.000000000 +0000
@@ -2,7 +2,7 @@
 Module=save-file
 IAge=1
 Builtin=true
-_Name=Save copy
+_Name=Save Copy
 _Description=Save a copy of the currently playing movie
 Authors=Bastien Nocera
 Copyright=Copyright © 2010 Bastien Nocera
diff -Nru totem-3.4.3/src/plugins/screensaver/Makefile.am totem-3.6.2/src/plugins/screensaver/Makefile.am
--- totem-3.4.3/src/plugins/screensaver/Makefile.am	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/plugins/screensaver/Makefile.am	2012-08-29 23:07:45.000000000 +0000
@@ -7,15 +7,8 @@
 
 libscreensaver_la_SOURCES = totem-screensaver.c
 libscreensaver_la_LDFLAGS = $(plugin_ldflags)
-libscreensaver_la_LIBADD = \
-	$(plugin_libadd)			\
-	$(top_builddir)/lib/libtotemscrsaver.la	\
-	$(SCREENSAVER_LIBS)
-libscreensaver_la_CPPFLAGS = \
-	$(AM_CPPFLAGS)		\
-	-I$(top_srcdir)/lib
-libscreensaver_la_CFLAGS = \
-	$(plugin_cflags)	\
-	$(SCREENSAVER_CFLAGS)
+libscreensaver_la_LIBADD = $(plugin_libadd)
+libscreensaver_la_CPPFLAGS = $(AM_CPPFLAGS)
+libscreensaver_la_CFLAGS = $(plugin_cflags)
 
 -include $(top_srcdir)/git.mk
diff -Nru totem-3.4.3/src/plugins/screensaver/Makefile.in totem-3.6.2/src/plugins/screensaver/Makefile.in
--- totem-3.4.3/src/plugins/screensaver/Makefile.in	2012-07-04 09:54:51.000000000 +0000
+++ totem-3.6.2/src/plugins/screensaver/Makefile.in	2012-10-25 13:36:23.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.12.2 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,6 +16,23 @@
 
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -36,13 +52,11 @@
 build_triplet = @build@
 host_triplet = @host@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/depcomp \
 	$(top_srcdir)/src/plugins/Makefile.plugins
 subdir = src/plugins/screensaver
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -78,17 +92,29 @@
   }
 am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"
 LTLIBRARIES = $(plugin_LTLIBRARIES)
-libscreensaver_la_DEPENDENCIES = $(plugin_libadd) \
-	$(top_builddir)/lib/libtotemscrsaver.la
+libscreensaver_la_DEPENDENCIES = $(plugin_libadd)
 am_libscreensaver_la_OBJECTS = libscreensaver_la-totem-screensaver.lo
 libscreensaver_la_OBJECTS = $(am_libscreensaver_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 libscreensaver_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(libscreensaver_la_CFLAGS) $(CFLAGS) \
 	$(libscreensaver_la_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -101,22 +127,23 @@
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(libscreensaver_la_SOURCES)
 DIST_SOURCES = $(libscreensaver_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 DATA = $(plugin_DATA)
 ETAGS = etags
 CTAGS = ctags
@@ -132,7 +159,8 @@
 	$(DISABLE_DEPRECATED)		\
 	-I$(top_srcdir)/		\
 	-I$(top_srcdir)/src		\
-	-I$(top_srcdir)/src/plugins
+	-I$(top_srcdir)/src/plugins	\
+	-I$(top_srcdir)/src/gst
 
 AM_CXXFLAGS = @AM_CXXFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -142,6 +170,10 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BACKEND_CFLAGS = @BACKEND_CFLAGS@
+BACKEND_LIBS = @BACKEND_LIBS@
+BACKEND_TEST_CFLAGS = @BACKEND_TEST_CFLAGS@
+BACKEND_TEST_LIBS = @BACKEND_TEST_LIBS@
 BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
 BROWSER_PLUGIN_DIR = @BROWSER_PLUGIN_DIR@
 BROWSER_PLUGIN_LIBS = @BROWSER_PLUGIN_LIBS@
@@ -163,8 +195,6 @@
 DBUS_LIBS = @DBUS_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DEPENDENCY_CFLAGS = @DEPENDENCY_CFLAGS@
-DEPENDENCY_LIBS = @DEPENDENCY_LIBS@
 DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DISC_RECORDER_CFLAGS = @DISC_RECORDER_CFLAGS@
 DISC_RECORDER_LIBS = @DISC_RECORDER_LIBS@
@@ -178,7 +208,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-EXTRA_BACKEND_LIBS = @EXTRA_BACKEND_LIBS@
 FGREP = @FGREP@
 FULL_LIBEXECDIR = @FULL_LIBEXECDIR@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
@@ -186,19 +215,21 @@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GLIB_REQS = @GLIB_REQS@
+GLOW_BUTTON_CFLAGS = @GLOW_BUTTON_CFLAGS@
+GLOW_BUTTON_LIBS = @GLOW_BUTTON_LIBS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
-GST_CFLAGS = @GST_CFLAGS@
-GST_LIBS = @GST_LIBS@
+GST_PLUGINS_BAD_CFLAGS = @GST_PLUGINS_BAD_CFLAGS@
+GST_PLUGINS_BAD_LIBS = @GST_PLUGINS_BAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
 GTK_REQS = @GTK_REQS@
+HELPER_CFLAGS = @HELPER_CFLAGS@
+HELPER_LIBS = @HELPER_LIBS@
 HELP_DIR = @HELP_DIR@
 HTML_DIR = @HTML_DIR@
 INSTALL = @INSTALL@
@@ -224,11 +255,11 @@
 INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBEPC_CFLAGS = @LIBEPC_CFLAGS@
-LIBEPC_LIBS = @LIBEPC_LIBS@
 LIBGRILO_CFLAGS = @LIBGRILO_CFLAGS@
 LIBGRILO_LIBS = @LIBGRILO_LIBS@
 LIBOBJS = @LIBOBJS@
+LIBPLAYER_CFLAGS = @LIBPLAYER_CFLAGS@
+LIBPLAYER_LIBS = @LIBPLAYER_LIBS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBZEITGEIST_CFLAGS = @LIBZEITGEIST_CFLAGS@
@@ -245,8 +276,6 @@
 MISSING_PLUGINS_CFLAGS = @MISSING_PLUGINS_CFLAGS@
 MISSING_PLUGINS_LIBS = @MISSING_PLUGINS_LIBS@
 MKDIR_P = @MKDIR_P@
-MM_CFLAGS = @MM_CFLAGS@
-MM_LIBS = @MM_LIBS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 NAUTILUSDIR = @NAUTILUSDIR@
@@ -267,15 +296,21 @@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PEASGTK_CFLAGS = @PEASGTK_CFLAGS@
-PEASGTK_LIBS = @PEASGTK_LIBS@
-PEAS_CFLAGS = @PEAS_CFLAGS@
-PEAS_LIBS = @PEAS_LIBS@
+PIXBUF_HELPER_CFLAGS = @PIXBUF_HELPER_CFLAGS@
+PIXBUF_HELPER_LIBS = @PIXBUF_HELPER_LIBS@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLAYER_CFLAGS = @PLAYER_CFLAGS@
+PLAYER_LIBS = @PLAYER_LIBS@
 PLUGINDIR = @PLUGINDIR@
 PLUGINS = @PLUGINS@
+PLUGIN_VIEWER_CFLAGS = @PLUGIN_VIEWER_CFLAGS@
+PLUGIN_VIEWER_LIBS = @PLUGIN_VIEWER_LIBS@
+PREVIEW_CFLAGS = @PREVIEW_CFLAGS@
+PREVIEW_LIBS = @PREVIEW_LIBS@
+PROPERTIES_CFLAGS = @PROPERTIES_CFLAGS@
+PROPERTIES_LIBS = @PROPERTIES_LIBS@
 PYGOBJECT_CFLAGS = @PYGOBJECT_CFLAGS@
 PYGOBJECT_LIBS = @PYGOBJECT_LIBS@
 PYLINT = @PYLINT@
@@ -295,6 +330,10 @@
 SMCLIENT_CFLAGS = @SMCLIENT_CFLAGS@
 SMCLIENT_LIBS = @SMCLIENT_LIBS@
 STRIP = @STRIP@
+THUMBNAILER_CFLAGS = @THUMBNAILER_CFLAGS@
+THUMBNAILER_LIBS = @THUMBNAILER_LIBS@
+TIME_HELPER_CFLAGS = @TIME_HELPER_CFLAGS@
+TIME_HELPER_LIBS = @TIME_HELPER_LIBS@
 TOTEM_API_VERSION = @TOTEM_API_VERSION@
 TOTEM_PLPARSER_REQS = @TOTEM_PLPARSER_REQS@
 TOTEM_VERSION_MAJOR = @TOTEM_VERSION_MAJOR@
@@ -306,9 +345,6 @@
 WARN_CFLAGS = @WARN_CFLAGS@
 WARN_CXXFLAGS = @WARN_CXXFLAGS@
 XGETTEXT = @XGETTEXT@
-XMKMF = @XMKMF@
-XTEST_LIBS = @XTEST_LIBS@
-X_LIBS = @X_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -374,8 +410,7 @@
 DISTCLEANFILES = $(plugin_DATA)
 EXTRA_DIST = $(plugin_in_files)
 plugin_cflags = \
-	$(DEPENDENCY_CFLAGS)	\
-	$(PEAS_CFLAGS)		\
+	$(PLAYER_CFLAGS)	\
 	$(WARN_CFLAGS)
 
 plugin_ldflags = \
@@ -392,19 +427,9 @@
 plugin_in_files = screensaver.plugin.in
 libscreensaver_la_SOURCES = totem-screensaver.c
 libscreensaver_la_LDFLAGS = $(plugin_ldflags)
-libscreensaver_la_LIBADD = \
-	$(plugin_libadd)			\
-	$(top_builddir)/lib/libtotemscrsaver.la	\
-	$(SCREENSAVER_LIBS)
-
-libscreensaver_la_CPPFLAGS = \
-	$(AM_CPPFLAGS)		\
-	-I$(top_srcdir)/lib
-
-libscreensaver_la_CFLAGS = \
-	$(plugin_cflags)	\
-	$(SCREENSAVER_CFLAGS)
-
+libscreensaver_la_LIBADD = $(plugin_libadd)
+libscreensaver_la_CPPFLAGS = $(AM_CPPFLAGS)
+libscreensaver_la_CFLAGS = $(plugin_cflags)
 all: all-am
 
 .SUFFIXES:
@@ -442,7 +467,6 @@
 $(am__aclocal_m4_deps):
 install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
 	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
@@ -450,6 +474,8 @@
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
 	}
@@ -465,12 +491,14 @@
 
 clean-pluginLTLIBRARIES:
 	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
-	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(plugin_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
 libscreensaver.la: $(libscreensaver_la_OBJECTS) $(libscreensaver_la_DEPENDENCIES) $(EXTRA_libscreensaver_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libscreensaver_la_LINK) -rpath $(plugindir) $(libscreensaver_la_OBJECTS) $(libscreensaver_la_LIBADD) $(LIBS)
 
@@ -483,25 +511,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscreensaver_la-totem-screensaver.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
@@ -520,8 +545,11 @@
 	-rm -rf .libs _libs
 install-pluginDATA: $(plugin_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
 	@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -586,6 +614,20 @@
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
 
+cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
+	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
@@ -732,19 +774,19 @@
 .MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pluginLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pluginDATA \
-	install-pluginLTLIBRARIES install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-pluginDATA uninstall-pluginLTLIBRARIES
+	clean-libtool clean-pluginLTLIBRARIES cscopelist ctags \
+	distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pluginDATA install-pluginLTLIBRARIES install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-pluginDATA uninstall-pluginLTLIBRARIES
 
 %.plugin: %.plugin.in
 	$(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
diff -Nru totem-3.4.3/src/plugins/screensaver/screensaver.plugin.in totem-3.6.2/src/plugins/screensaver/screensaver.plugin.in
--- totem-3.4.3/src/plugins/screensaver/screensaver.plugin.in	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/plugins/screensaver/screensaver.plugin.in	2012-08-29 23:07:45.000000000 +0000
@@ -2,8 +2,8 @@
 Module=screensaver
 IAge=1
 Builtin=true
-Name=Screensaver
-Description=Deactivates the screensaver when a movie is playing
+_Name=Screen Saver
+_Description=Deactivates the screen saver when a movie is playing
 Authors=Bastien Nocera
 Copyright=Copyright © 2007 Bastien Nocera
 Website=http://www.gnome.org/projects/totem/
diff -Nru totem-3.4.3/src/plugins/screensaver/totem-screensaver.c totem-3.6.2/src/plugins/screensaver/totem-screensaver.c
--- totem-3.4.3/src/plugins/screensaver/totem-screensaver.c	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/plugins/screensaver/totem-screensaver.c	2012-10-25 13:15:32.000000000 +0000
@@ -37,7 +37,6 @@
 
 #include "totem-plugin.h"
 #include "totem.h"
-#include "totem-scrsaver.h"
 #include "backend/bacon-video-widget.h"
 
 #define TOTEM_TYPE_SCREENSAVER_PLUGIN		(totem_screensaver_plugin_get_type ())
@@ -52,33 +51,58 @@
 	BaconVideoWidget *bvw;
 	GSettings *settings;
 
-	TotemScrsaver *scr;
 	guint          handler_id_playing;
 	guint          handler_id_metadata;
+	guint          handler_id_inhibit;
 } TotemScreensaverPluginPrivate;
 
 TOTEM_PLUGIN_REGISTER(TOTEM_TYPE_SCREENSAVER_PLUGIN,
 		      TotemScreensaverPlugin,
 		      totem_screensaver_plugin)
 
+static gboolean
+has_video (BaconVideoWidget *bvw)
+{
+	GValue value = { 0, };
+	gboolean ret;
+
+	bacon_video_widget_get_metadata (bvw, BVW_INFO_HAS_VIDEO, &value);
+	ret = g_value_get_boolean (&value);
+	g_value_unset (&value);
+
+	return ret;
+}
+
 static void
 totem_screensaver_update_from_state (TotemObject *totem,
 				     TotemScreensaverPlugin *pi)
 {
-	gboolean lock_screensaver_on_audio, can_get_frames;
+	gboolean lock_screensaver_on_audio, has_video_frames;
 	BaconVideoWidget *bvw;
 
 	bvw = BACON_VIDEO_WIDGET (totem_get_video_widget ((Totem *)(totem)));
 
 	lock_screensaver_on_audio = g_settings_get_boolean (pi->priv->settings, "lock-screensaver-on-audio");
-	can_get_frames = bacon_video_widget_can_get_frames (bvw, NULL);
+	has_video_frames = has_video (bvw);
 
-	if (totem_is_playing (totem) != FALSE && can_get_frames)
-		totem_scrsaver_disable (pi->priv->scr);
-	else if (totem_is_playing (totem) != FALSE && !lock_screensaver_on_audio)
-		totem_scrsaver_disable (pi->priv->scr);
-	else
-		totem_scrsaver_enable (pi->priv->scr);
+	if ((totem_is_playing (totem) != FALSE && has_video_frames) ||
+	    (totem_is_playing (totem) != FALSE && !lock_screensaver_on_audio)) {
+		if (pi->priv->handler_id_inhibit == 0) {
+			GtkWindow *window;
+
+			window = totem_get_main_window (totem);
+			pi->priv->handler_id_inhibit = gtk_application_inhibit (GTK_APPLICATION (totem),
+										window,
+										GTK_APPLICATION_INHIBIT_IDLE,
+										_("Playing a movie"));
+			g_object_unref (window);
+		}
+	} else {
+		if (pi->priv->handler_id_inhibit != 0) {
+			gtk_application_uninhibit (GTK_APPLICATION (pi->priv->totem), pi->priv->handler_id_inhibit);
+			pi->priv->handler_id_inhibit = 0;
+		}
+	}
 }
 
 static void
@@ -106,18 +130,8 @@
 {
 	TotemScreensaverPlugin *pi = TOTEM_SCREENSAVER_PLUGIN (plugin);
 	TotemObject *totem;
-	GtkWindow *window;
 
 	totem = g_object_get_data (G_OBJECT (plugin), "object");
-	window = totem_get_main_window (totem);
-
-	pi->priv->scr = totem_scrsaver_new ();
-	g_object_set (pi->priv->scr,
-	              "reason", _("Playing a movie"),
-	              "window", window,
-	              NULL);
-	g_object_unref (window);
-
 	pi->priv->bvw = BACON_VIDEO_WIDGET (totem_get_video_widget (totem));
 
 	pi->priv->settings = g_settings_new (TOTEM_GSETTINGS_SCHEMA);
@@ -156,11 +170,12 @@
 		pi->priv->handler_id_metadata = 0;
 	}
 
+	if (pi->priv->handler_id_inhibit != 0) {
+		gtk_application_uninhibit (GTK_APPLICATION (pi->priv->totem), pi->priv->handler_id_inhibit);
+		pi->priv->handler_id_inhibit = 0;
+	}
+
 	g_object_unref (pi->priv->totem);
 	g_object_unref (pi->priv->bvw);
-
-	totem_scrsaver_enable (pi->priv->scr);
-
-	g_object_unref (pi->priv->scr);
 }
 
diff -Nru totem-3.4.3/src/plugins/screenshot/Makefile.am totem-3.6.2/src/plugins/screenshot/Makefile.am
--- totem-3.4.3/src/plugins/screenshot/Makefile.am	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/plugins/screenshot/Makefile.am	2012-08-29 23:07:45.000000000 +0000
@@ -6,16 +6,14 @@
 plugin_in_files = screenshot.plugin.in
 
 uidir = $(plugindir)
-ui_DATA = gallery.ui gnome-screenshot.ui
+ui_DATA = gallery.ui
 EXTRA_DIST += $(ui_DATA)
 
 libscreenshot_la_SOURCES = \
-	gnome-screenshot-widget.c	\
-	gnome-screenshot-widget.h	\
 	totem-screenshot-plugin.c	\
 	totem-screenshot-plugin.h	\
-	totem-screenshot.c		\
-	totem-screenshot.h		\
+	screenshot-filename-builder.c	\
+	screenshot-filename-builder.h	\
 	totem-gallery.c			\
 	totem-gallery.h			\
 	totem-gallery-progress.c	\
diff -Nru totem-3.4.3/src/plugins/screenshot/Makefile.in totem-3.6.2/src/plugins/screenshot/Makefile.in
--- totem-3.4.3/src/plugins/screenshot/Makefile.in	2012-07-04 09:54:51.000000000 +0000
+++ totem-3.6.2/src/plugins/screenshot/Makefile.in	2012-10-25 13:36:23.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.12.2 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,6 +16,23 @@
 
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -36,13 +52,11 @@
 build_triplet = @build@
 host_triplet = @host@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/depcomp \
 	$(top_srcdir)/src/plugins/Makefile.plugins
 subdir = src/plugins/screenshot
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -81,19 +95,31 @@
 LTLIBRARIES = $(plugin_LTLIBRARIES)
 libscreenshot_la_DEPENDENCIES = $(plugin_libadd)
 am_libscreenshot_la_OBJECTS =  \
-	libscreenshot_la-gnome-screenshot-widget.lo \
 	libscreenshot_la-totem-screenshot-plugin.lo \
-	libscreenshot_la-totem-screenshot.lo \
+	libscreenshot_la-screenshot-filename-builder.lo \
 	libscreenshot_la-totem-gallery.lo \
 	libscreenshot_la-totem-gallery-progress.lo
 libscreenshot_la_OBJECTS = $(am_libscreenshot_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 libscreenshot_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(libscreenshot_la_CFLAGS) $(CFLAGS) \
 	$(libscreenshot_la_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -106,22 +132,23 @@
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(libscreenshot_la_SOURCES)
 DIST_SOURCES = $(libscreenshot_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 DATA = $(plugin_DATA) $(ui_DATA)
 ETAGS = etags
 CTAGS = ctags
@@ -137,7 +164,8 @@
 	$(DISABLE_DEPRECATED)		\
 	-I$(top_srcdir)/		\
 	-I$(top_srcdir)/src		\
-	-I$(top_srcdir)/src/plugins
+	-I$(top_srcdir)/src/plugins	\
+	-I$(top_srcdir)/src/gst
 
 AM_CXXFLAGS = @AM_CXXFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -147,6 +175,10 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BACKEND_CFLAGS = @BACKEND_CFLAGS@
+BACKEND_LIBS = @BACKEND_LIBS@
+BACKEND_TEST_CFLAGS = @BACKEND_TEST_CFLAGS@
+BACKEND_TEST_LIBS = @BACKEND_TEST_LIBS@
 BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
 BROWSER_PLUGIN_DIR = @BROWSER_PLUGIN_DIR@
 BROWSER_PLUGIN_LIBS = @BROWSER_PLUGIN_LIBS@
@@ -168,8 +200,6 @@
 DBUS_LIBS = @DBUS_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DEPENDENCY_CFLAGS = @DEPENDENCY_CFLAGS@
-DEPENDENCY_LIBS = @DEPENDENCY_LIBS@
 DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DISC_RECORDER_CFLAGS = @DISC_RECORDER_CFLAGS@
 DISC_RECORDER_LIBS = @DISC_RECORDER_LIBS@
@@ -183,7 +213,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-EXTRA_BACKEND_LIBS = @EXTRA_BACKEND_LIBS@
 FGREP = @FGREP@
 FULL_LIBEXECDIR = @FULL_LIBEXECDIR@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
@@ -191,19 +220,21 @@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GLIB_REQS = @GLIB_REQS@
+GLOW_BUTTON_CFLAGS = @GLOW_BUTTON_CFLAGS@
+GLOW_BUTTON_LIBS = @GLOW_BUTTON_LIBS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
-GST_CFLAGS = @GST_CFLAGS@
-GST_LIBS = @GST_LIBS@
+GST_PLUGINS_BAD_CFLAGS = @GST_PLUGINS_BAD_CFLAGS@
+GST_PLUGINS_BAD_LIBS = @GST_PLUGINS_BAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
 GTK_REQS = @GTK_REQS@
+HELPER_CFLAGS = @HELPER_CFLAGS@
+HELPER_LIBS = @HELPER_LIBS@
 HELP_DIR = @HELP_DIR@
 HTML_DIR = @HTML_DIR@
 INSTALL = @INSTALL@
@@ -229,11 +260,11 @@
 INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBEPC_CFLAGS = @LIBEPC_CFLAGS@
-LIBEPC_LIBS = @LIBEPC_LIBS@
 LIBGRILO_CFLAGS = @LIBGRILO_CFLAGS@
 LIBGRILO_LIBS = @LIBGRILO_LIBS@
 LIBOBJS = @LIBOBJS@
+LIBPLAYER_CFLAGS = @LIBPLAYER_CFLAGS@
+LIBPLAYER_LIBS = @LIBPLAYER_LIBS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBZEITGEIST_CFLAGS = @LIBZEITGEIST_CFLAGS@
@@ -250,8 +281,6 @@
 MISSING_PLUGINS_CFLAGS = @MISSING_PLUGINS_CFLAGS@
 MISSING_PLUGINS_LIBS = @MISSING_PLUGINS_LIBS@
 MKDIR_P = @MKDIR_P@
-MM_CFLAGS = @MM_CFLAGS@
-MM_LIBS = @MM_LIBS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 NAUTILUSDIR = @NAUTILUSDIR@
@@ -272,15 +301,21 @@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PEASGTK_CFLAGS = @PEASGTK_CFLAGS@
-PEASGTK_LIBS = @PEASGTK_LIBS@
-PEAS_CFLAGS = @PEAS_CFLAGS@
-PEAS_LIBS = @PEAS_LIBS@
+PIXBUF_HELPER_CFLAGS = @PIXBUF_HELPER_CFLAGS@
+PIXBUF_HELPER_LIBS = @PIXBUF_HELPER_LIBS@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLAYER_CFLAGS = @PLAYER_CFLAGS@
+PLAYER_LIBS = @PLAYER_LIBS@
 PLUGINDIR = @PLUGINDIR@
 PLUGINS = @PLUGINS@
+PLUGIN_VIEWER_CFLAGS = @PLUGIN_VIEWER_CFLAGS@
+PLUGIN_VIEWER_LIBS = @PLUGIN_VIEWER_LIBS@
+PREVIEW_CFLAGS = @PREVIEW_CFLAGS@
+PREVIEW_LIBS = @PREVIEW_LIBS@
+PROPERTIES_CFLAGS = @PROPERTIES_CFLAGS@
+PROPERTIES_LIBS = @PROPERTIES_LIBS@
 PYGOBJECT_CFLAGS = @PYGOBJECT_CFLAGS@
 PYGOBJECT_LIBS = @PYGOBJECT_LIBS@
 PYLINT = @PYLINT@
@@ -300,6 +335,10 @@
 SMCLIENT_CFLAGS = @SMCLIENT_CFLAGS@
 SMCLIENT_LIBS = @SMCLIENT_LIBS@
 STRIP = @STRIP@
+THUMBNAILER_CFLAGS = @THUMBNAILER_CFLAGS@
+THUMBNAILER_LIBS = @THUMBNAILER_LIBS@
+TIME_HELPER_CFLAGS = @TIME_HELPER_CFLAGS@
+TIME_HELPER_LIBS = @TIME_HELPER_LIBS@
 TOTEM_API_VERSION = @TOTEM_API_VERSION@
 TOTEM_PLPARSER_REQS = @TOTEM_PLPARSER_REQS@
 TOTEM_VERSION_MAJOR = @TOTEM_VERSION_MAJOR@
@@ -311,9 +350,6 @@
 WARN_CFLAGS = @WARN_CFLAGS@
 WARN_CXXFLAGS = @WARN_CXXFLAGS@
 XGETTEXT = @XGETTEXT@
-XMKMF = @XMKMF@
-XTEST_LIBS = @XTEST_LIBS@
-X_LIBS = @X_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -379,8 +415,7 @@
 DISTCLEANFILES = $(plugin_DATA)
 EXTRA_DIST = $(plugin_in_files) $(ui_DATA)
 plugin_cflags = \
-	$(DEPENDENCY_CFLAGS)	\
-	$(PEAS_CFLAGS)		\
+	$(PLAYER_CFLAGS)	\
 	$(WARN_CFLAGS)
 
 plugin_ldflags = \
@@ -396,14 +431,12 @@
 plugin_LTLIBRARIES = libscreenshot.la
 plugin_in_files = screenshot.plugin.in
 uidir = $(plugindir)
-ui_DATA = gallery.ui gnome-screenshot.ui
+ui_DATA = gallery.ui
 libscreenshot_la_SOURCES = \
-	gnome-screenshot-widget.c	\
-	gnome-screenshot-widget.h	\
 	totem-screenshot-plugin.c	\
 	totem-screenshot-plugin.h	\
-	totem-screenshot.c		\
-	totem-screenshot.h		\
+	screenshot-filename-builder.c	\
+	screenshot-filename-builder.h	\
 	totem-gallery.c			\
 	totem-gallery.h			\
 	totem-gallery-progress.c	\
@@ -449,7 +482,6 @@
 $(am__aclocal_m4_deps):
 install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
 	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
@@ -457,6 +489,8 @@
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
 	}
@@ -472,12 +506,14 @@
 
 clean-pluginLTLIBRARIES:
 	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
-	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(plugin_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
 libscreenshot.la: $(libscreenshot_la_OBJECTS) $(libscreenshot_la_DEPENDENCIES) $(EXTRA_libscreenshot_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libscreenshot_la_LINK) -rpath $(plugindir) $(libscreenshot_la_OBJECTS) $(libscreenshot_la_LIBADD) $(LIBS)
 
@@ -487,43 +523,32 @@
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscreenshot_la-gnome-screenshot-widget.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscreenshot_la-screenshot-filename-builder.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscreenshot_la-totem-gallery-progress.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscreenshot_la-totem-gallery.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscreenshot_la-totem-screenshot-plugin.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscreenshot_la-totem-screenshot.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
-libscreenshot_la-gnome-screenshot-widget.lo: gnome-screenshot-widget.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscreenshot_la_CFLAGS) $(CFLAGS) -MT libscreenshot_la-gnome-screenshot-widget.lo -MD -MP -MF $(DEPDIR)/libscreenshot_la-gnome-screenshot-widget.Tpo -c -o libscreenshot_la-gnome-screenshot-widget.lo `test -f 'gnome-screenshot-widget.c' || echo '$(srcdir)/'`gnome-screenshot-widget.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libscreenshot_la-gnome-screenshot-widget.Tpo $(DEPDIR)/libscreenshot_la-gnome-screenshot-widget.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gnome-screenshot-widget.c' object='libscreenshot_la-gnome-screenshot-widget.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscreenshot_la_CFLAGS) $(CFLAGS) -c -o libscreenshot_la-gnome-screenshot-widget.lo `test -f 'gnome-screenshot-widget.c' || echo '$(srcdir)/'`gnome-screenshot-widget.c
-
 libscreenshot_la-totem-screenshot-plugin.lo: totem-screenshot-plugin.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscreenshot_la_CFLAGS) $(CFLAGS) -MT libscreenshot_la-totem-screenshot-plugin.lo -MD -MP -MF $(DEPDIR)/libscreenshot_la-totem-screenshot-plugin.Tpo -c -o libscreenshot_la-totem-screenshot-plugin.lo `test -f 'totem-screenshot-plugin.c' || echo '$(srcdir)/'`totem-screenshot-plugin.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libscreenshot_la-totem-screenshot-plugin.Tpo $(DEPDIR)/libscreenshot_la-totem-screenshot-plugin.Plo
@@ -531,12 +556,12 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscreenshot_la_CFLAGS) $(CFLAGS) -c -o libscreenshot_la-totem-screenshot-plugin.lo `test -f 'totem-screenshot-plugin.c' || echo '$(srcdir)/'`totem-screenshot-plugin.c
 
-libscreenshot_la-totem-screenshot.lo: totem-screenshot.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscreenshot_la_CFLAGS) $(CFLAGS) -MT libscreenshot_la-totem-screenshot.lo -MD -MP -MF $(DEPDIR)/libscreenshot_la-totem-screenshot.Tpo -c -o libscreenshot_la-totem-screenshot.lo `test -f 'totem-screenshot.c' || echo '$(srcdir)/'`totem-screenshot.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libscreenshot_la-totem-screenshot.Tpo $(DEPDIR)/libscreenshot_la-totem-screenshot.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='totem-screenshot.c' object='libscreenshot_la-totem-screenshot.lo' libtool=yes @AMDEPBACKSLASH@
+libscreenshot_la-screenshot-filename-builder.lo: screenshot-filename-builder.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscreenshot_la_CFLAGS) $(CFLAGS) -MT libscreenshot_la-screenshot-filename-builder.lo -MD -MP -MF $(DEPDIR)/libscreenshot_la-screenshot-filename-builder.Tpo -c -o libscreenshot_la-screenshot-filename-builder.lo `test -f 'screenshot-filename-builder.c' || echo '$(srcdir)/'`screenshot-filename-builder.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libscreenshot_la-screenshot-filename-builder.Tpo $(DEPDIR)/libscreenshot_la-screenshot-filename-builder.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='screenshot-filename-builder.c' object='libscreenshot_la-screenshot-filename-builder.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscreenshot_la_CFLAGS) $(CFLAGS) -c -o libscreenshot_la-totem-screenshot.lo `test -f 'totem-screenshot.c' || echo '$(srcdir)/'`totem-screenshot.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscreenshot_la_CFLAGS) $(CFLAGS) -c -o libscreenshot_la-screenshot-filename-builder.lo `test -f 'screenshot-filename-builder.c' || echo '$(srcdir)/'`screenshot-filename-builder.c
 
 libscreenshot_la-totem-gallery.lo: totem-gallery.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscreenshot_la_CFLAGS) $(CFLAGS) -MT libscreenshot_la-totem-gallery.lo -MD -MP -MF $(DEPDIR)/libscreenshot_la-totem-gallery.Tpo -c -o libscreenshot_la-totem-gallery.lo `test -f 'totem-gallery.c' || echo '$(srcdir)/'`totem-gallery.c
@@ -559,8 +584,11 @@
 	-rm -rf .libs _libs
 install-pluginDATA: $(plugin_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
 	@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -577,8 +605,11 @@
 	dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
 install-uiDATA: $(ui_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)"
 	@list='$(ui_DATA)'; test -n "$(uidir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -643,6 +674,20 @@
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
 
+cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
+	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
@@ -791,20 +836,20 @@
 .MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pluginLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pluginDATA \
-	install-pluginLTLIBRARIES install-ps install-ps-am \
-	install-strip install-uiDATA installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-pluginDATA uninstall-pluginLTLIBRARIES \
-	uninstall-uiDATA
+	clean-libtool clean-pluginLTLIBRARIES cscopelist ctags \
+	distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pluginDATA install-pluginLTLIBRARIES install-ps \
+	install-ps-am install-strip install-uiDATA installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-pluginDATA \
+	uninstall-pluginLTLIBRARIES uninstall-uiDATA
 
 %.plugin: %.plugin.in
 	$(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
diff -Nru totem-3.4.3/src/plugins/screenshot/gnome-screenshot-widget.c totem-3.6.2/src/plugins/screenshot/gnome-screenshot-widget.c
--- totem-3.4.3/src/plugins/screenshot/gnome-screenshot-widget.c	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/plugins/screenshot/gnome-screenshot-widget.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,437 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/*
- * GNOME Screenshot widget
- * Copyright (C) 2001-2006  Jonathan Blandford 
- * Copyright (C) Philip Withnall 2009 
- *
- * GNOME Screenshot widget 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.
- *
- * GNOME Screenshot widget 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNOME Screenshot widget.  If not, see .
- *
- * The Totem project hereby grant permission for non-GPL compatible GStreamer
- * plugins to be used and distributed together with GStreamer and Totem. This
- * permission are above and beyond the permissions granted by the GPL license
- * Totem is covered by.
- *
- * Monday 10th August 2009: Philip Withnall: Add exception clause.
- * Permission from the previous authors granted via e-mail.
- */
-
-#include 
-#include 
-#include 
-#include 
-
-#include "gnome-screenshot-widget.h"
-
-static void gnome_screenshot_widget_dispose (GObject *object);
-static void gnome_screenshot_widget_finalize (GObject *object);
-static void gnome_screenshot_widget_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec);
-static void gnome_screenshot_widget_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec);
-
-/* GtkBuilder callbacks */
-G_MODULE_EXPORT gboolean on_preview_button_press_event (GtkWidget *drawing_area, GdkEventButton *event, GnomeScreenshotWidget *self);
-G_MODULE_EXPORT void on_preview_expose_event (GtkWidget *drawing_area, GdkEventExpose *event, GnomeScreenshotWidget *self);
-G_MODULE_EXPORT gboolean on_preview_button_release_event (GtkWidget *drawing_area, GdkEventButton *event, GnomeScreenshotWidget *self);
-G_MODULE_EXPORT void on_preview_configure_event (GtkWidget *drawing_area, GdkEventConfigure *event, GnomeScreenshotWidget *self);
-G_MODULE_EXPORT void on_preview_drag_data_get (GtkWidget *widget, GdkDragContext *context, GtkSelectionData *selection_data, guint info, guint time,
-					       GnomeScreenshotWidget *self);
-G_MODULE_EXPORT void on_preview_drag_begin (GtkWidget *widget, GdkDragContext *context, GnomeScreenshotWidget *self);
-
-struct _GnomeScreenshotWidgetPrivate {
-	GdkPixbuf *screenshot;
-	GdkPixbuf *preview_image;
-	GtkFileChooser *file_chooser;
-	GtkEntry *filename_entry;
-	GtkWidget *preview_area;
-	gint drag_x;
-	gint drag_y;
-	gchar *temporary_filename;
-};
-
-enum {
-	PROP_TEMPORARY_FILENAME = 1
-};
-
-enum {
-	TYPE_TEXT_URI_LIST,
-	TYPE_IMAGE_PNG,
-	LAST_TYPE
-};
-
-static GtkTargetEntry drag_types[] = {
-	/* typecasts are to shut gcc up */
-	{ (gchar*) "text/uri-list", 0, TYPE_TEXT_URI_LIST },
-	{ (gchar*) "image/png", 0, TYPE_IMAGE_PNG }
-};
-
-static GtkTargetEntry *drag_types_no_uris = drag_types + sizeof (GtkTargetEntry);
-
-G_DEFINE_TYPE (GnomeScreenshotWidget, gnome_screenshot_widget, GTK_TYPE_BOX)
-#define GNOME_SCREENSHOT_WIDGET_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GNOME_TYPE_SCREENSHOT_WIDGET, GnomeScreenshotWidgetPrivate))
-
-static void
-gnome_screenshot_widget_class_init (GnomeScreenshotWidgetClass *klass)
-{
-	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-
-	g_type_class_add_private (klass, sizeof (GnomeScreenshotWidgetPrivate));
-
-	gobject_class->get_property = gnome_screenshot_widget_get_property;
-	gobject_class->set_property = gnome_screenshot_widget_set_property;
-	gobject_class->dispose = gnome_screenshot_widget_dispose;
-	gobject_class->finalize = gnome_screenshot_widget_finalize;
-
-	g_object_class_install_property (gobject_class, PROP_TEMPORARY_FILENAME,
-				g_param_spec_string ("temporary-filename",
-					"Temporary filename", "The filename of a temporary file for use in drag-and-drop.",
-					NULL,
-					G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-}
-
-static void
-gnome_screenshot_widget_init (GnomeScreenshotWidget *self)
-{
-	self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GNOME_TYPE_SCREENSHOT_WIDGET, GnomeScreenshotWidgetPrivate);
-}
-
-static void
-gnome_screenshot_widget_dispose (GObject *object)
-{
-	GnomeScreenshotWidgetPrivate *priv = GNOME_SCREENSHOT_WIDGET (object)->priv;
-
-	if (priv->screenshot != NULL)
-		g_object_unref (priv->screenshot);
-	priv->screenshot = NULL;
-
-	if (priv->preview_image != NULL)
-		g_object_unref (priv->preview_image);
-	priv->preview_image = NULL;
-
-	/* Chain up to the parent class */
-	G_OBJECT_CLASS (gnome_screenshot_widget_parent_class)->dispose (object);
-}
-
-static void
-gnome_screenshot_widget_finalize (GObject *object)
-{
-	GnomeScreenshotWidgetPrivate *priv = GNOME_SCREENSHOT_WIDGET (object)->priv;
-
-	g_free (priv->temporary_filename);
-
-	/* Chain up to the parent class */
-	G_OBJECT_CLASS (gnome_screenshot_widget_parent_class)->finalize (object);
-}
-
-static void
-gnome_screenshot_widget_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
-{
-	GnomeScreenshotWidgetPrivate *priv = GNOME_SCREENSHOT_WIDGET (object)->priv;
-
-	switch (property_id) {
-		case PROP_TEMPORARY_FILENAME:
-			g_value_set_string (value, priv->temporary_filename);
-			break;
-		default:
-			/* We don't have any other property... */
-			G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-			break;
-	}
-}
-
-static void
-gnome_screenshot_widget_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
-{
-	GnomeScreenshotWidget *self = GNOME_SCREENSHOT_WIDGET (object);
-
-	switch (property_id) {
-		case PROP_TEMPORARY_FILENAME:
-			gnome_screenshot_widget_set_temporary_filename (self, g_value_get_string (value));
-			break;
-		default:
-			/* We don't have any other property... */
-			G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-			break;
-	}
-}
-
-static void
-on_filename_entry_realize (GtkWidget *filename_entry, gchar *current_name)
-{
-	const gchar *ext;
-	gint pos;
-
-	/* Select the name of the file but leave out the extension if there's any;
-	 * the widget must be realized for select_region to work */
-	ext = g_utf8_strrchr (current_name, -1, '.');
-	if (ext)
-		pos = g_utf8_strlen (current_name, -1) - g_utf8_strlen (ext, -1);
-	else
-		pos = -1;
-
-	gtk_editable_select_region (GTK_EDITABLE (filename_entry), 0, pos);
-
-	/* Disconnect the signal and free the data */
-	g_signal_handlers_disconnect_by_func (filename_entry, on_filename_entry_realize, current_name);
-	g_free (current_name);
-}
-
-GtkWidget *
-gnome_screenshot_widget_new (const gchar *interface_filename, GdkPixbuf *screenshot, const gchar *initial_uri)
-{
-	GnomeScreenshotWidgetPrivate *priv;
-	GnomeScreenshotWidget *screenshot_widget;
-	GtkBuilder *builder;
-	GtkAspectFrame *aspect_frame;
-	gchar *current_folder, *current_name;
-	const gchar *dir;
-	GFile *tmp_file, *parent_file;
-	gint width, height;
-
-	builder = gtk_builder_new ();
-	if (gtk_builder_add_from_file (builder, interface_filename, NULL) == FALSE) {
-		g_object_unref (builder);
-		return NULL;
-	}
-
-	gtk_builder_set_translation_domain (builder, GETTEXT_PACKAGE);
-	screenshot_widget = GNOME_SCREENSHOT_WIDGET (gtk_builder_get_object (builder, "screenshot_widget"));
-	g_object_ref_sink (screenshot_widget);
-	gtk_builder_connect_signals (builder, screenshot_widget);
-
-	if (screenshot_widget == NULL) {
-		g_object_unref (builder);
-		return NULL;
-	}
-
-	/* Set up with the data we're passed */
-	priv = screenshot_widget->priv;
-	priv->screenshot = g_object_ref (screenshot);
-
-	/* Grab our child widgets */
-	priv->file_chooser = GTK_FILE_CHOOSER (gtk_builder_get_object (builder, "file_chooser_button"));
-	priv->filename_entry = GTK_ENTRY (gtk_builder_get_object (builder, "filename_entry"));
-	priv->preview_area = GTK_WIDGET (gtk_builder_get_object (builder, "preview_darea"));
-	aspect_frame = GTK_ASPECT_FRAME (gtk_builder_get_object (builder, "aspect_frame"));
-
-	/* Set up the file chooser and filename entry */
-	tmp_file = g_file_new_for_uri (initial_uri);
-	parent_file = g_file_get_parent (tmp_file);
-	current_name = g_file_get_basename (tmp_file);
-	current_folder = g_file_get_uri (parent_file);
-	g_object_unref (tmp_file);
-	g_object_unref (parent_file);
-
-	gtk_file_chooser_set_current_folder_uri (priv->file_chooser, current_folder);
-	gtk_entry_set_text (priv->filename_entry, current_name);
-	g_free (current_folder);
-
-	/* Add the special pictures directory to the file chooser */
-	dir = g_get_user_special_dir (G_USER_DIRECTORY_PICTURES);
-	if (dir != NULL)
-		gtk_file_chooser_add_shortcut_folder (priv->file_chooser, dir, NULL);
-
-	/* Select the filename (except the extension) when the filename entry is realised.
-	 * The on_filename_entry_realize function will free current_name. */
-	g_signal_connect (priv->filename_entry, "realize", G_CALLBACK (on_filename_entry_realize), current_name);
-
-	/* Set up the preview area */
-	width = gdk_pixbuf_get_width (screenshot) / 5;
-	height = gdk_pixbuf_get_height (screenshot) / 5;
-
-	gtk_widget_set_size_request (priv->preview_area, width, height);
-	gtk_aspect_frame_set (aspect_frame, 0.0, 0.5, (gfloat) gdk_pixbuf_get_width (screenshot) / (gfloat) gdk_pixbuf_get_height (screenshot), FALSE);
-
-	g_object_unref (builder);
-
-	/* We had to sink the object reference before to prevent it being destroyed when unreffing the builder,
-	 * but in order to return a floating-referenced widget (as is the convention), we need to force the
-	 * reference to be floating again. */
-	g_object_force_floating (G_OBJECT (screenshot_widget));
-
-	return GTK_WIDGET (screenshot_widget);
-}
-
-void
-on_preview_expose_event (GtkWidget *drawing_area, GdkEventExpose *event, GnomeScreenshotWidget *self)
-{
-	GdkPixbuf *pixbuf = NULL;
-	GtkStyleContext *context;
-	cairo_t *cr;
-
-	context = gtk_widget_get_style_context (drawing_area);
-
-	/* Stolen from GtkImage.  I really should just make the drawing area an
-	 * image some day (TODO) */
-	if (gtk_widget_get_state (drawing_area) != GTK_STATE_NORMAL) {
-		GtkIconSource *source;
-
-		source = gtk_icon_source_new ();
-		gtk_icon_source_set_pixbuf (source, self->priv->preview_image);
-		gtk_icon_source_set_size (source, GTK_ICON_SIZE_SMALL_TOOLBAR);
-		gtk_icon_source_set_size_wildcarded (source, FALSE);
-
-		pixbuf = gtk_render_icon_pixbuf (context, source, (GtkIconSize) -1);
-		gtk_icon_source_free (source);
-	} else {
-		pixbuf = g_object_ref (self->priv->preview_image);
-	}
-
-	cr = gdk_cairo_create (gtk_widget_get_window (drawing_area));
-
-	/* FIXME: Draw it insensitive in that case */
-	gdk_cairo_rectangle (cr, &(event->area));
-	cairo_clip (cr);
-	gdk_cairo_set_source_pixbuf (cr, pixbuf, 0.0, 0.0);
-	cairo_paint (cr);
-
-	cairo_destroy (cr);
-	g_object_unref (pixbuf);
-}
-
-gboolean
-on_preview_button_press_event (GtkWidget *drawing_area, GdkEventButton *event, GnomeScreenshotWidget *self)
-{
-	self->priv->drag_x = (gint) event->x;
-	self->priv->drag_y = (gint) event->y;
-
-	return FALSE;
-}
-
-gboolean
-on_preview_button_release_event (GtkWidget *drawing_area, GdkEventButton *event, GnomeScreenshotWidget *self)
-{
-	self->priv->drag_x = 0;
-	self->priv->drag_y = 0;
-
-	return FALSE;
-}
-
-void
-on_preview_configure_event (GtkWidget *drawing_area, GdkEventConfigure *event, GnomeScreenshotWidget *self)
-{
-	/* Re-scale the preview image */
-	if (self->priv->preview_image)
-		g_object_unref (self->priv->preview_image);
-	self->priv->preview_image = gdk_pixbuf_scale_simple (self->priv->screenshot, event->width, event->height, GDK_INTERP_BILINEAR);
-}
-
-void
-on_preview_drag_data_get (GtkWidget *widget, GdkDragContext *context, GtkSelectionData *selection_data, guint info, guint _time,
-			  GnomeScreenshotWidget *self)
-{
-	switch (info) {
-	case TYPE_TEXT_URI_LIST: {
-		gchar *uris[2];
-
-		g_assert (self->priv->temporary_filename != NULL);
-
-		uris[0] = g_filename_to_uri (self->priv->temporary_filename, NULL, NULL);
-		uris[1] = NULL;
-
-		gtk_selection_data_set_uris (selection_data, uris);
-		g_free (uris[0]);
-
-		break;
-	}
-	case TYPE_IMAGE_PNG:
-		gtk_selection_data_set_pixbuf (selection_data, self->priv->screenshot);
-		break;
-	case LAST_TYPE:
-	default:
-		g_warning ("Unknown type %d", info);
-	}
-}
-
-void
-on_preview_drag_begin (GtkWidget *widget, GdkDragContext *context, GnomeScreenshotWidget *self)
-{
-	gtk_drag_set_icon_pixbuf (context, self->priv->preview_image, self->priv->drag_x, self->priv->drag_y);
-}
-
-void
-gnome_screenshot_widget_focus_entry (GnomeScreenshotWidget *self)
-{
-	g_return_if_fail (GNOME_IS_SCREENSHOT_WIDGET (self));
-	gtk_widget_grab_focus (GTK_WIDGET (self->priv->filename_entry));
-}
-
-gchar *
-gnome_screenshot_widget_get_uri (GnomeScreenshotWidget *self)
-{
-	gchar *folder;
-	const gchar *filename;
-	gchar *uri, *file, *tmp;
-	GError *error = NULL;
-
-	g_return_val_if_fail (GNOME_IS_SCREENSHOT_WIDGET (self), NULL);
-
-	folder = gtk_file_chooser_get_current_folder_uri (self->priv->file_chooser);
-	filename = gtk_entry_get_text (self->priv->filename_entry);
-
-	tmp = g_filename_from_utf8 (filename, -1, NULL, NULL, &error);
-	if (error != NULL) {
-		g_warning ("Unable to convert \"%s\" to valid UTF-8: %s\nFalling back to default filename.", filename, error->message);
-		g_error_free (error);
-		tmp = g_strdup (_("Screenshot.png"));
-	}
-
-	file = g_uri_escape_string (tmp, NULL, FALSE);
-	uri = g_build_filename (folder, file, NULL);
-
-	g_free (folder);
-	g_free (tmp);
-	g_free (file);
-
-	return uri;
-}
-
-gchar *
-gnome_screenshot_widget_get_folder (GnomeScreenshotWidget *self)
-{
-	g_return_val_if_fail (GNOME_IS_SCREENSHOT_WIDGET (self), NULL);
-	return gtk_file_chooser_get_current_folder_uri (self->priv->file_chooser);
-}
-
-GdkPixbuf *
-gnome_screenshot_widget_get_screenshot (GnomeScreenshotWidget *self)
-{
-	g_return_val_if_fail (GNOME_IS_SCREENSHOT_WIDGET (self), NULL);
-	return self->priv->screenshot;
-}
-
-const gchar *
-gnome_screenshot_widget_get_temporary_filename (GnomeScreenshotWidget *self)
-{
-	g_return_val_if_fail (GNOME_IS_SCREENSHOT_WIDGET (self), NULL);
-	return self->priv->temporary_filename;
-}
-
-void
-gnome_screenshot_widget_set_temporary_filename (GnomeScreenshotWidget *self, const gchar *temporary_filename)
-{
-	GnomeScreenshotWidgetPrivate *priv = self->priv;
-
-	g_free (priv->temporary_filename);
-	priv->temporary_filename = g_strdup (temporary_filename);
-
-	/* Set/Unset the preview area as a drag source based on whether we have a temporary file */
-	if (priv->temporary_filename == NULL) {
-		/* We can only provide pixbuf data */
-		gtk_drag_source_set (priv->preview_area, GDK_BUTTON1_MASK | GDK_BUTTON3_MASK,
-				     drag_types_no_uris, G_N_ELEMENTS (drag_types_no_uris), GDK_ACTION_COPY);
-	} else {
-		/* We can provide pixbuf data and temporary file URIs */
-		gtk_drag_source_set (priv->preview_area, GDK_BUTTON1_MASK | GDK_BUTTON3_MASK,
-				     drag_types, G_N_ELEMENTS (drag_types), GDK_ACTION_COPY);
-	}
-}
diff -Nru totem-3.4.3/src/plugins/screenshot/gnome-screenshot-widget.h totem-3.6.2/src/plugins/screenshot/gnome-screenshot-widget.h
--- totem-3.4.3/src/plugins/screenshot/gnome-screenshot-widget.h	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/plugins/screenshot/gnome-screenshot-widget.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,71 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/*
- * GNOME Screenshot widget
- * Copyright (C) 2001-2006  Jonathan Blandford 
- * Copyright (C) Philip Withnall 2009 
- * 
- * GNOME Screenshot widget 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.
- *
- * GNOME Screenshot widget 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNOME Screenshot widget.  If not, see .
- *
- * The Totem project hereby grant permission for non-GPL compatible GStreamer
- * plugins to be used and distributed together with GStreamer and Totem. This
- * permission are above and beyond the permissions granted by the GPL license
- * Totem is covered by.
- *
- * Monday 10th August 2009: Philip Withnall: Add exception clause.
- * Permission from the previous authors granted via e-mail.
- */
-
-#ifndef GNOME_SCREENSHOT_WIDGET_H
-#define GNOME_SCREENSHOT_WIDGET_H
-
-#include 
-#include 
-#include 
-
-G_BEGIN_DECLS
-
-#define GNOME_TYPE_SCREENSHOT_WIDGET		(gnome_screenshot_widget_get_type ())
-#define GNOME_SCREENSHOT_WIDGET(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GNOME_TYPE_SCREENSHOT_WIDGET, GnomeScreenshotWidget))
-#define GNOME_SCREENSHOT_WIDGET_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), GNOME_TYPE_SCREENSHOT_WIDGET, GnomeScreenshotWidgetClass))
-#define GNOME_IS_SCREENSHOT_WIDGET(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), GNOME_TYPE_SCREENSHOT_WIDGET))
-#define GNOME_IS_SCREENSHOT_WIDGET_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), GNOME_TYPE_SCREENSHOT_WIDGET))
-#define GNOME_SCREENSHOT_WIDGET_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GNOME_TYPE_SCREENSHOT_WIDGET, GnomeScreenshotWidgetClass))
-
-typedef struct _GnomeScreenshotWidgetPrivate	GnomeScreenshotWidgetPrivate;
-
-typedef struct {
-	GtkBox parent;
-	GnomeScreenshotWidgetPrivate *priv;
-} GnomeScreenshotWidget;
-
-typedef struct {
-	GtkBoxClass parent;
-} GnomeScreenshotWidgetClass;
-
-GType gnome_screenshot_widget_get_type (void) G_GNUC_CONST;
-
-GtkWidget *gnome_screenshot_widget_new (const gchar *interface_filename, GdkPixbuf *screenshot,
-					const gchar *initial_uri) G_GNUC_WARN_UNUSED_RESULT;
-
-void gnome_screenshot_widget_focus_entry (GnomeScreenshotWidget *self);
-gchar *gnome_screenshot_widget_get_uri (GnomeScreenshotWidget *self) G_GNUC_WARN_UNUSED_RESULT;
-gchar *gnome_screenshot_widget_get_folder (GnomeScreenshotWidget *self) G_GNUC_WARN_UNUSED_RESULT;
-GdkPixbuf *gnome_screenshot_widget_get_screenshot (GnomeScreenshotWidget *self);
-
-const gchar *gnome_screenshot_widget_get_temporary_filename (GnomeScreenshotWidget *self);
-void gnome_screenshot_widget_set_temporary_filename (GnomeScreenshotWidget *self, const gchar *temporary_filename);
-
-G_END_DECLS
-
-#endif /* !GNOME_SCREENSHOT_WIDGET_H */
diff -Nru totem-3.4.3/src/plugins/screenshot/gnome-screenshot.ui totem-3.6.2/src/plugins/screenshot/gnome-screenshot.ui
--- totem-3.4.3/src/plugins/screenshot/gnome-screenshot.ui	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/plugins/screenshot/gnome-screenshot.ui	1970-01-01 00:00:00.000000000 +0000
@@ -1,148 +0,0 @@
-
-
-
-  
-    True
-    False
-    12
-    
-      
-        True
-        0
-        0
-        0
-        0
-        0
-        0
-        0
-        0
-        
-          
-            True
-            0
-            0
-            GTK_SHADOW_IN
-            0
-            0
-            1
-            True
-            
-              
-                True
-                
-                
-                
-                
-                
-                
-              
-            
-          
-        
-      
-      
-        0
-        False
-        True
-      
-    
-    
-      
-        True
-        2
-        2
-        False
-        6
-        12
-        
-          
-            True
-            _Name:
-            True
-            False
-            GTK_JUSTIFY_LEFT
-            False
-            False
-            0
-            0.5
-            0
-            0
-            filename_entry
-          
-          
-            0
-            1
-            0
-            1
-            fill
-            
-          
-        
-        
-          
-            True
-            Save in _folder:
-            True
-            False
-            GTK_JUSTIFY_LEFT
-            False
-            False
-            0
-            0.5
-            0
-            0
-          
-          
-            0
-            1
-            1
-            2
-            fill
-            
-          
-        
-        
-          
-            True
-            True
-            True
-            True
-            0
-            
-            True
-            True
-            24
-          
-          
-            1
-            2
-            0
-            1
-            
-          
-        
-        
-          
-            True
-            Select a folder
-            GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER
-            False
-          
-          
-            1
-            2
-            1
-            2
-            fill
-            fill
-          
-        
-      
-      
-        0
-        True
-        True
-      
-    
-  
-
diff -Nru totem-3.4.3/src/plugins/screenshot/screenshot-filename-builder.c totem-3.6.2/src/plugins/screenshot/screenshot-filename-builder.c
--- totem-3.4.3/src/plugins/screenshot/screenshot-filename-builder.c	1970-01-01 00:00:00.000000000 +0000
+++ totem-3.6.2/src/plugins/screenshot/screenshot-filename-builder.c	2012-08-29 23:07:45.000000000 +0000
@@ -0,0 +1,341 @@
+/* screenshot-filename-builder.c - Builds a filename suitable for a screenshot
+ *
+ * Copyright (C) 2008, 2011 Cosimo Cecchi 
+ *
+ * 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 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
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
+ *
+ * 28th June 2012: Bastien Nocera: Add exception clause.
+ * See license_change file for details.
+ */
+
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include "screenshot-filename-builder.h"
+
+typedef enum
+{
+  TEST_SAVED_DIR = 0,
+  TEST_DEFAULT,
+  TEST_FALLBACK,
+  NUM_TESTS
+} TestType;
+
+typedef struct 
+{
+  char *base_paths[NUM_TESTS];
+  char *screenshot_origin;
+  int iteration;
+  TestType type;
+
+  GSimpleAsyncResult *async_result;
+} AsyncExistenceJob;
+
+/* Taken from gnome-vfs-utils.c */
+static char *
+expand_initial_tilde (const char *path)
+{
+  char *slash_after_user_name, *user_name;
+  struct passwd *passwd_file_entry;
+
+  if (path[1] == '/' || path[1] == '\0') {
+    return g_build_filename (g_get_home_dir (), &path[1], NULL);
+  }
+  
+  slash_after_user_name = strchr (&path[1], '/');
+  if (slash_after_user_name == NULL) {
+    user_name = g_strdup (&path[1]);
+  } else {
+    user_name = g_strndup (&path[1],
+                           slash_after_user_name - &path[1]);
+  }
+  passwd_file_entry = getpwnam (user_name);
+  g_free (user_name);
+  
+  if (passwd_file_entry == NULL || passwd_file_entry->pw_dir == NULL) {
+    return g_strdup (path);
+  }
+  
+  return g_strconcat (passwd_file_entry->pw_dir,
+                      slash_after_user_name,
+                      NULL);
+}
+
+static gchar *
+get_fallback_screenshot_dir (void)
+{
+  return g_strdup (g_get_home_dir ());
+}
+
+static gchar *
+get_default_screenshot_dir (void)
+{
+  return g_strdup (g_get_user_special_dir (G_USER_DIRECTORY_PICTURES));
+}
+
+static gchar *
+sanitize_save_directory (const gchar *save_dir)
+{
+  gchar *retval = g_strdup (save_dir);
+
+  if (save_dir == NULL)
+    return NULL;
+
+  if (save_dir[0] == '~')
+    {
+      char *tmp = expand_initial_tilde (save_dir);
+      g_free (retval);
+      retval = tmp;
+    }
+  else if (strstr (save_dir, "://") != NULL)
+    {
+      GFile *file;
+
+      g_free (retval);
+      file = g_file_new_for_uri (save_dir);
+      retval = g_file_get_path (file);
+      g_object_unref (file);
+    }
+
+  return retval;
+}
+
+static char *
+build_path (AsyncExistenceJob *job)
+{
+  const gchar *base_path;
+  char *retval, *file_name;
+  char *origin;
+
+  base_path = job->base_paths[job->type];
+
+  if (base_path == NULL ||
+      base_path[0] == '\0')
+    return NULL;
+
+  if (job->screenshot_origin == NULL)
+    {
+      GDateTime *d;
+
+      d = g_date_time_new_now_local ();
+      origin = g_date_time_format (d, "%Y-%m-%d %H:%M:%S");
+      g_date_time_unref (d);
+    }
+  else
+    origin = g_strdup (job->screenshot_origin);
+
+  if (job->iteration == 0)
+    {
+      /* translators: this is the name of the file that gets made up
+       * with the screenshot if the entire screen is taken */
+      file_name = g_strdup_printf (_("Screenshot from %s.png"), origin);
+    }
+  else
+    {
+      /* translators: this is the name of the file that gets
+       * made up with the screenshot if the entire screen is
+       * taken */
+      file_name = g_strdup_printf (_("Screenshot from %s - %d.png"), origin, job->iteration);
+    }
+
+  retval = g_build_filename (base_path, file_name, NULL);
+  g_free (file_name);
+  g_free (origin);
+
+  return retval;
+}
+
+static void
+async_existence_job_free (AsyncExistenceJob *job)
+{
+  gint idx;
+
+  for (idx = 0; idx < NUM_TESTS; idx++)
+    g_free (job->base_paths[idx]);
+
+  g_free (job->screenshot_origin);
+
+  g_clear_object (&job->async_result);
+
+  g_slice_free (AsyncExistenceJob, job);
+}
+
+static gboolean
+prepare_next_cycle (AsyncExistenceJob *job)
+{
+  gboolean res = FALSE;
+
+  if (job->type != (NUM_TESTS - 1))
+    {
+      (job->type)++;
+      job->iteration = 0;
+
+      res = TRUE;
+    }
+
+  return res;
+}
+
+static gboolean
+try_check_file (GIOSchedulerJob *io_job,
+                GCancellable *cancellable,
+                gpointer data)
+{
+  AsyncExistenceJob *job = data;
+  GFile *file;
+  GFileInfo *info;
+  GError *error;
+  char *path, *retval;
+
+retry:
+  error = NULL;
+  path = build_path (job);
+
+  if (path == NULL)
+    {
+      (job->type)++;
+      goto retry;
+    }
+
+  file = g_file_new_for_path (path);
+  info = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_TYPE,
+			    G_FILE_QUERY_INFO_NONE, cancellable, &error);
+  if (info != NULL)
+    {
+      /* file already exists, iterate again */
+      g_object_unref (info);
+      g_object_unref (file);
+      g_free (path);
+
+      (job->iteration)++;
+
+      goto retry;
+    }
+  else
+    {
+      /* see the error to check whether the location is not accessible
+       * or the file does not exist.
+       */
+      if (error->code == G_IO_ERROR_NOT_FOUND)
+        {
+          GFile *parent;
+
+          /* if the parent directory doesn't exist as well, forget the saved
+           * directory and treat this as a generic error.
+           */
+
+          parent = g_file_get_parent (file);
+
+          if (!g_file_query_exists (parent, NULL))
+            {
+              if (!prepare_next_cycle (job))
+                {
+                  retval = NULL;
+
+                  g_object_unref (parent);
+                  goto out;
+                }
+
+              g_object_unref (file);
+              g_object_unref (parent);
+              goto retry;
+            }
+          else
+            {
+              retval = path;
+
+              g_object_unref (parent);
+              goto out;
+            }
+        }
+      else
+        {
+          /* another kind of error, assume this location is not
+           * accessible.
+           */
+          g_free (path);
+
+          if (prepare_next_cycle (job))
+            {
+              g_error_free (error);
+              g_object_unref (file);
+              goto retry;
+            }
+          else
+            {
+              retval = NULL;
+              goto out;
+            }
+        }
+    }
+
+out:
+  g_error_free (error);
+  g_object_unref (file);
+
+  g_simple_async_result_set_op_res_gpointer (job->async_result,
+                                             retval, NULL);
+  if (retval == NULL)
+    g_simple_async_result_set_error (job->async_result,
+                                     G_IO_ERROR,
+                                     G_IO_ERROR_FAILED,
+                                     "%s", "Failed to find a valid place to save");
+
+  g_simple_async_result_complete_in_idle (job->async_result);
+  async_existence_job_free (job);
+
+  return FALSE;
+}
+
+void
+screenshot_build_filename_async (const char *save_dir,
+				 const char *screenshot_origin,
+                                 GAsyncReadyCallback callback,
+                                 gpointer user_data)
+{
+  AsyncExistenceJob *job;
+
+  job = g_slice_new0 (AsyncExistenceJob);
+
+  job->base_paths[TEST_SAVED_DIR] = sanitize_save_directory (save_dir);
+  job->base_paths[TEST_DEFAULT] = get_default_screenshot_dir ();
+  job->base_paths[TEST_FALLBACK] = get_fallback_screenshot_dir ();
+  job->iteration = 0;
+  job->type = TEST_SAVED_DIR;
+
+  job->screenshot_origin = g_strdup (screenshot_origin);
+
+  job->async_result = g_simple_async_result_new (NULL,
+                                                 callback, user_data,
+                                                 screenshot_build_filename_async);
+
+  g_io_scheduler_push_job (try_check_file,
+                           job, NULL,
+                           G_PRIORITY_DEFAULT, NULL);
+}
+
+gchar *
+screenshot_build_filename_finish (GAsyncResult *result,
+                                  GError **error)
+{
+  if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error))
+    return NULL;
+
+  return g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (result));
+}
diff -Nru totem-3.4.3/src/plugins/screenshot/screenshot-filename-builder.h totem-3.6.2/src/plugins/screenshot/screenshot-filename-builder.h
--- totem-3.4.3/src/plugins/screenshot/screenshot-filename-builder.h	1970-01-01 00:00:00.000000000 +0000
+++ totem-3.6.2/src/plugins/screenshot/screenshot-filename-builder.h	2012-08-29 23:07:45.000000000 +0000
@@ -0,0 +1,36 @@
+/* screenshot-filename-builder.c - Builds a filename suitable for a screenshot
+ *
+ * Copyright (C) 2008, 2011 Cosimo Cecchi 
+ *
+ * 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 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
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
+ *
+ * 28th June 2012: Bastien Nocera: Add exception clause.
+ * See license_change file for details.
+ */
+
+#ifndef __SCREENSHOT_FILENAME_BUILDER_H__
+#define __SCREENSHOT_FILENAME_BUILDER_H__
+
+#include 
+
+void screenshot_build_filename_async (const char *save_dir,
+                                      const char *screenshot_origin,
+                                      GAsyncReadyCallback callback,
+                                      gpointer user_data);
+gchar *screenshot_build_filename_finish (GAsyncResult *result,
+                                         GError **error);
+
+#endif /* __SCREENSHOT_FILENAME_BUILDER_H__ */
diff -Nru totem-3.4.3/src/plugins/screenshot/screenshot.plugin.in totem-3.6.2/src/plugins/screenshot/screenshot.plugin.in
--- totem-3.4.3/src/plugins/screenshot/screenshot.plugin.in	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/plugins/screenshot/screenshot.plugin.in	2012-08-29 23:07:45.000000000 +0000
@@ -2,8 +2,8 @@
 Module=screenshot
 IAge=1
 Builtin=true
-Name=Screenshot
-Description=Allows screenshots and galleries to be taken of videos.
+_Name=Screenshot
+_Description=Allows screenshots and galleries to be taken of videos
 Authors=Philip Withnall, Bastien Nocera
 Copyright=Copyright © 2008 Philip Withnall, 2004 Bastien Nocera
 Website=http://www.gnome.org/projects/totem/
diff -Nru totem-3.4.3/src/plugins/screenshot/totem-screenshot-plugin.c totem-3.6.2/src/plugins/screenshot/totem-screenshot-plugin.c
--- totem-3.4.3/src/plugins/screenshot/totem-screenshot-plugin.c	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/plugins/screenshot/totem-screenshot-plugin.c	2012-08-29 23:07:45.000000000 +0000
@@ -33,13 +33,9 @@
 #include 
 #include 
 
-#ifdef HAVE_XFREE
-#include 
-#endif
-
 #include "totem-plugin.h"
 #include "totem-screenshot-plugin.h"
-#include "totem-screenshot.h"
+#include "screenshot-filename-builder.h"
 #include "totem-gallery.h"
 #include "totem-uri.h"
 #include "backend/bacon-video-widget.h"
@@ -70,13 +66,149 @@
 		      TotemScreenshotPlugin,
 		      totem_screenshot_plugin)
 
+typedef struct {
+	TotemScreenshotPlugin *plugin;
+	GdkPixbuf *pixbuf;
+} ScreenshotSaveJob;
+
+static void
+screenshot_save_job_free (ScreenshotSaveJob *job)
+{
+	g_object_unref (job->pixbuf);
+	g_slice_free (ScreenshotSaveJob, job);
+}
+
+static void
+save_pixbuf_ready_cb (GObject *source,
+		      GAsyncResult *res,
+		      gpointer user_data)
+{
+	GError *error = NULL;
+	ScreenshotSaveJob *job = (ScreenshotSaveJob *) user_data;
+
+	if (gdk_pixbuf_save_to_stream_finish (res, &error) == FALSE) {
+		g_warning ("Couldn't save screenshot: %s", error->message);
+		g_error_free (error);
+	}
+
+	screenshot_save_job_free (job);
+}
+
+static void
+save_file_create_ready_cb (GObject *source,
+			   GAsyncResult *res,
+			   gpointer user_data)
+{
+	GFileOutputStream *stream;
+	GError *error = NULL;
+	ScreenshotSaveJob *job = (ScreenshotSaveJob *) user_data;
+
+	stream = g_file_create_finish (G_FILE (source), res, &error);
+	if (stream == NULL) {
+		char *path;
+
+		path = g_file_get_path (G_FILE (source));
+		g_warning ("Couldn't create a new file at '%s': %s", path, error->message);
+		g_free (path);
+
+		g_error_free (error);
+		screenshot_save_job_free (job);
+		return;
+	}
+
+	gdk_pixbuf_save_to_stream_async (job->pixbuf,
+					 G_OUTPUT_STREAM (stream),
+					 "png", NULL,
+					 save_pixbuf_ready_cb, job,
+					 "tEXt::Software", "totem",
+					 NULL);
+
+	g_object_unref (stream);
+}
+
+static void
+screenshot_name_ready_cb (GObject *source,
+			  GAsyncResult *res,
+			  gpointer user_data)
+{
+	GFile *save_file;
+	char *save_path;
+	GError *error = NULL;
+	ScreenshotSaveJob *job = (ScreenshotSaveJob *) user_data;
+
+	save_path = screenshot_build_filename_finish (res, &error);
+	if (save_path == NULL) {
+		g_warning ("Could not find a valid location to save the screenshot: %s", error->message);
+		g_error_free (error);
+		screenshot_save_job_free (job);
+		return;
+	}
+
+	save_file = g_file_new_for_path (save_path);
+	g_free (save_path);
+
+	g_file_create_async (save_file,
+			     G_FILE_CREATE_NONE,
+			     G_PRIORITY_DEFAULT,
+			     NULL,
+			     save_file_create_ready_cb, job);
+
+	g_object_unref (save_file);
+}
+
+static void
+flash_area_done_cb (GObject *source_object,
+		    GAsyncResult *res,
+		    gpointer user_data)
+{
+	GVariant *variant;
+
+	variant = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object), res, NULL);
+	if (variant != NULL)
+		g_variant_unref (variant);
+}
+
+static void
+flash_area (GtkWidget *widget)
+{
+	GDBusProxy *proxy;
+	GdkWindow *window;
+	int x, y, w, h;
+
+	window = gtk_widget_get_window (widget);
+	gdk_window_get_origin (window, &x, &y);
+	w = gdk_window_get_width (window);
+	h = gdk_window_get_height (window);
+
+	proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
+					       G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES |
+					       G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS |
+					       G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
+					       NULL,
+					       "org.gnome.Shell",
+					       "/org/gnome/Shell",
+					       "org.gnome.Shell",
+					       NULL, NULL);
+	if (proxy == NULL)
+		g_warning ("no proxy");
+
+	g_dbus_proxy_call (proxy, "org.gnome.Shell.FlashArea",
+			   g_variant_new ("(iiii)", x, y, w, h),
+			   G_DBUS_CALL_FLAGS_NO_AUTO_START,
+			   -1,
+			   NULL,
+			   flash_area_done_cb,
+			   NULL);
+}
+
 static void
 take_screenshot_action_cb (GtkAction *action, TotemScreenshotPlugin *self)
 {
 	TotemScreenshotPluginPrivate *priv = self->priv;
 	GdkPixbuf *pixbuf;
-	GtkWidget *dialog;
 	GError *err = NULL;
+	ScreenshotSaveJob *job;
+	char *video_name;
 
 	if (bacon_video_widget_get_logo_mode (priv->bvw) != FALSE)
 		return;
@@ -90,17 +222,23 @@
 		return;
 	}
 
+	flash_area (GTK_WIDGET (priv->bvw));
+
 	pixbuf = bacon_video_widget_get_current_frame (priv->bvw);
 	if (pixbuf == NULL) {
 		totem_action_error (priv->totem, _("Totem could not get a screenshot of the video."), _("This is not supposed to happen; please file a bug report."));
 		return;
 	}
 
-	dialog = totem_screenshot_new (priv->totem, pixbuf);
+	video_name = totem_get_short_title (self->priv->totem);
+
+	job = g_slice_new (ScreenshotSaveJob);
+	job->plugin = self;
+	job->pixbuf = pixbuf;
+
+	screenshot_build_filename_async (NULL, video_name, screenshot_name_ready_cb, job);
 
-	gtk_dialog_run (GTK_DIALOG (dialog));
-	gtk_widget_destroy (dialog);
-	g_object_unref (pixbuf);
+	g_free (video_name);
 }
 
 static void
@@ -132,11 +270,9 @@
 window_key_press_event_cb (GtkWidget *window, GdkEventKey *event, TotemScreenshotPlugin *self)
 {
 	switch (event->keyval) {
-#ifdef HAVE_XFREE
-	case XF86XK_Save:
+	case GDK_KEY_Save:
 		take_screenshot_action_cb (NULL, self);
 		break;
-#endif /* HAVE_XFREE */
 	case GDK_KEY_s:
 	case GDK_KEY_S:
 		if (event->state & GDK_CONTROL_MASK)
@@ -194,7 +330,7 @@
 	TotemScreenshotPlugin *self = TOTEM_SCREENSHOT_PLUGIN (plugin);
 	TotemScreenshotPluginPrivate *priv = self->priv;
 	const GtkActionEntry menu_entries[] = {
-		{ "take-screenshot", "camera-photo", N_("Take _Screenshot..."), "S", N_("Take a screenshot"), G_CALLBACK (take_screenshot_action_cb) },
+		{ "take-screenshot", "camera-photo", N_("Take _Screenshot"), "S", N_("Take a screenshot"), G_CALLBACK (take_screenshot_action_cb) },
 		{ "take-gallery", NULL, N_("Create Screenshot _Gallery..."), NULL, N_("Create a gallery of screenshots"), G_CALLBACK (take_gallery_action_cb) }
 	};
 
@@ -230,13 +366,13 @@
 
 	priv->ui_merge_id = gtk_ui_manager_new_merge_id (manager);
 	gtk_ui_manager_add_ui (manager, priv->ui_merge_id,
-			       "/ui/tmw-menubar/edit/repeat-mode", "take-screenshot",
+			       "/ui/tmw-menubar/edit/clear-playlist", "take-screenshot",
 			       "take-screenshot", GTK_UI_MANAGER_AUTO, TRUE);
 	gtk_ui_manager_add_ui (manager, priv->ui_merge_id,
-			       "/ui/tmw-menubar/edit/repeat-mode", "take-gallery",
+			       "/ui/tmw-menubar/edit/clear-playlist", "take-gallery",
 			       "take-gallery", GTK_UI_MANAGER_AUTO, TRUE);
 	gtk_ui_manager_add_ui (manager, priv->ui_merge_id,
-			       "/ui/tmw-menubar/edit/repeat-mode", NULL,
+			       "/ui/tmw-menubar/edit/clear-playlist", NULL,
 			       NULL, GTK_UI_MANAGER_SEPARATOR, TRUE);
 
 	/* Set up a GSettings watch for lockdown keys */
diff -Nru totem-3.4.3/src/plugins/screenshot/totem-screenshot.c totem-3.6.2/src/plugins/screenshot/totem-screenshot.c
--- totem-3.4.3/src/plugins/screenshot/totem-screenshot.c	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/plugins/screenshot/totem-screenshot.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,185 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * Copyright (C) 2004 Bastien Nocera
- * Copyright (C) 2008 Philip Withnall 
- *
- * 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 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
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
- *
- * The Totem project hereby grant permission for non-gpl compatible GStreamer
- * plugins to be used and distributed together with GStreamer and Totem. This
- * permission are above and beyond the permissions granted by the GPL license
- * Totem is covered by.
- *
- * Monday 7th February 2005: Christian Schaller: Add exception clause.
- * See license_change file for details.
- */
-
-#include "config.h"
-#include "totem-screenshot.h"
-
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include "totem-dirs.h"
-#include "totem-interface.h"
-#include "totem-screenshot-plugin.h"
-#include "gnome-screenshot-widget.h"
-
-struct TotemScreenshotPrivate {
-	GnomeScreenshotWidget *widget;
-};
-
-G_DEFINE_TYPE (TotemScreenshot, totem_screenshot, GTK_TYPE_DIALOG)
-
-static void
-totem_screenshot_temp_file_create (TotemScreenshot *screenshot)
-{
-	char *dir, *fulldir, *temp_filename;
-	GdkPixbuf *pixbuf;
-
-	dir = g_strdup_printf ("totem-screenshot-%d", getpid ());
-	fulldir = g_build_filename (g_get_tmp_dir (), dir, NULL);
-	if (g_mkdir (fulldir, 0700) < 0) {
-		g_free (fulldir);
-		g_free (dir);
-		return;
-	}
-
-	/* Write the screenshot to the temporary file */
-	temp_filename = g_build_filename (g_get_tmp_dir (), dir, _("Screenshot.png"), NULL);
-	pixbuf = gnome_screenshot_widget_get_screenshot (screenshot->priv->widget);
-
-	if (gdk_pixbuf_save (pixbuf, temp_filename, "png", NULL, NULL) == FALSE)
-		goto error;
-
-	gnome_screenshot_widget_set_temporary_filename (screenshot->priv->widget, temp_filename);
-
-error:
-	g_free (temp_filename);
-}
-
-static void
-totem_screenshot_temp_file_remove (GnomeScreenshotWidget *widget)
-{
-	char *dirname;
-	const gchar *temp_filename;
-
-	temp_filename = gnome_screenshot_widget_get_temporary_filename (widget);
-	if (temp_filename == NULL)
-		return;
-
-	g_unlink (temp_filename);
-	dirname = g_path_get_dirname (temp_filename);
-	g_rmdir (dirname);
-	g_free (dirname);
-
-	gnome_screenshot_widget_set_temporary_filename (widget, NULL);
-}
-
-static void
-totem_screenshot_response (GtkDialog *dialog, int response)
-{
-	TotemScreenshot *screenshot = TOTEM_SCREENSHOT (dialog);
-	char *uri, *path;
-	GdkPixbuf *pixbuf;
-	GError *err = NULL;
-	GFile *file;
-
-	if (response != GTK_RESPONSE_ACCEPT)
-		return;
-
-	uri = gnome_screenshot_widget_get_uri (screenshot->priv->widget);
-	file = g_file_new_for_uri (uri);
-	path = g_file_get_path (file);
-
-	pixbuf = gnome_screenshot_widget_get_screenshot (screenshot->priv->widget);
-
-	if (gdk_pixbuf_save (pixbuf, path, "png", &err, NULL) == FALSE) {
-		totem_interface_error (_("There was an error saving the screenshot."),
-				       err->message,
-			 	       GTK_WINDOW (screenshot));
-		g_error_free (err);
-		g_free (uri);
-		g_free (path);
-		return;
-	}
-
-	totem_screenshot_plugin_update_file_chooser (uri);
-	g_free (uri);
-	g_free (path);
-}
-
-static void
-totem_screenshot_init (TotemScreenshot *screenshot)
-{
-	GtkBox *content_area;
-
-	screenshot->priv = G_TYPE_INSTANCE_GET_PRIVATE (screenshot, TOTEM_TYPE_SCREENSHOT, TotemScreenshotPrivate);
-
-	gtk_container_set_border_width (GTK_CONTAINER (screenshot), 5);
-	gtk_dialog_add_buttons (GTK_DIALOG (screenshot),
-				GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-				GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
-				NULL);
-	gtk_window_set_title (GTK_WINDOW (screenshot), _("Save Screenshot"));
-	gtk_dialog_set_default_response (GTK_DIALOG (screenshot), GTK_RESPONSE_ACCEPT);
-	gtk_window_set_resizable (GTK_WINDOW (screenshot), FALSE);
-
-	content_area = GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (screenshot)));
-	gtk_box_set_spacing (content_area, 2);
-}
-
-GtkWidget *
-totem_screenshot_new (Totem *totem, GdkPixbuf *screen_image)
-{
-	TotemScreenshot *screenshot;
-	GtkContainer *content_area;
-	gchar *movie_title, *interface_path, *initial_uri;
-
-	screenshot = TOTEM_SCREENSHOT (g_object_new (TOTEM_TYPE_SCREENSHOT, NULL));
-
-	movie_title = totem_get_short_title (totem);
-
-	/* Create the screenshot widget */
-	/* Translators: %s is the movie title and %d is an auto-incrementing number to make filename unique */
-	initial_uri = totem_screenshot_plugin_setup_file_chooser (N_("Screenshot-%s-%d.png"), movie_title);
-	g_free (movie_title);
-	interface_path = totem_plugin_find_file ("screenshot", "gnome-screenshot.ui");
-	screenshot->priv->widget = GNOME_SCREENSHOT_WIDGET (gnome_screenshot_widget_new (interface_path, screen_image, initial_uri));
-	g_free (interface_path);
-	g_free (initial_uri);
-
-	/* Ensure we remove the temporary file before we're destroyed */
-	g_signal_connect (screenshot->priv->widget, "destroy", G_CALLBACK (totem_screenshot_temp_file_remove), NULL);
-
-	content_area = GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (screenshot)));
-	gtk_container_add (content_area, GTK_WIDGET (screenshot->priv->widget));
-	gtk_container_set_border_width (GTK_CONTAINER (screenshot->priv->widget), 5);
-
-	totem_screenshot_temp_file_create (screenshot);
-
-	return GTK_WIDGET (screenshot);
-}
-
-static void
-totem_screenshot_class_init (TotemScreenshotClass *klass)
-{
-	g_type_class_add_private (klass, sizeof (TotemScreenshotPrivate));
-	GTK_DIALOG_CLASS (klass)->response = totem_screenshot_response;
-}
-
diff -Nru totem-3.4.3/src/plugins/screenshot/totem-screenshot.h totem-3.6.2/src/plugins/screenshot/totem-screenshot.h
--- totem-3.4.3/src/plugins/screenshot/totem-screenshot.h	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/plugins/screenshot/totem-screenshot.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * Copyright (C) 2004 Bastien Nocera
- * Copyright (C) 2008 Philip Withnall 
- *
- * 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 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
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
- *
- * The Totem project hereby grant permission for non-gpl compatible GStreamer
- * plugins to be used and distributed together with GStreamer and Totem. This
- * permission are above and beyond the permissions granted by the GPL license
- * Totem is covered by.
- *
- * Monday 7th February 2005: Christian Schaller: Add exception clause.
- * See license_change file for details.
- */
-
-#ifndef TOTEM_SCREENSHOT_H
-#define TOTEM_SCREENSHOT_H
-
-#include 
-
-#include "totem.h"
-
-G_BEGIN_DECLS
-
-#define TOTEM_TYPE_SCREENSHOT			(totem_screenshot_get_type ())
-#define TOTEM_SCREENSHOT(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), TOTEM_TYPE_SCREENSHOT, TotemScreenshot))
-#define TOTEM_SCREENSHOT_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), TOTEM_TYPE_SCREENSHOT, TotemScreenshotClass))
-#define TOTEM_IS_SCREENSHOT(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), TOTEM_TYPE_SCREENSHOT))
-#define TOTEM_IS_SCREENSHOT_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), TOTEM_TYPE_SCREENSHOT))
-
-typedef struct TotemScreenshot			TotemScreenshot;
-typedef struct TotemScreenshotClass		TotemScreenshotClass;
-typedef struct TotemScreenshotPrivate		TotemScreenshotPrivate;
-
-struct TotemScreenshot {
-	GtkDialog parent;
-	TotemScreenshotPrivate *priv;
-};
-
-struct TotemScreenshotClass {
-	GtkDialogClass parent_class;
-};
-
-GType totem_screenshot_get_type (void) G_GNUC_CONST;
-GtkWidget *totem_screenshot_new (Totem *totem, GdkPixbuf *screen_image) G_GNUC_WARN_UNUSED_RESULT;
-
-G_END_DECLS
-
-#endif /* !TOTEM_SCREENSHOT_H */
diff -Nru totem-3.4.3/src/plugins/sidebar-test/Makefile.in totem-3.6.2/src/plugins/sidebar-test/Makefile.in
--- totem-3.4.3/src/plugins/sidebar-test/Makefile.in	2012-07-04 09:54:51.000000000 +0000
+++ totem-3.6.2/src/plugins/sidebar-test/Makefile.in	2012-10-25 13:36:23.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.12.2 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,6 +16,23 @@
 
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -36,13 +52,11 @@
 build_triplet = @build@
 host_triplet = @host@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/depcomp \
 	$(top_srcdir)/src/plugins/Makefile.plugins
 subdir = src/plugins/sidebar-test
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -85,10 +99,23 @@
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 libsidebar_test_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(libsidebar_test_la_CFLAGS) $(CFLAGS) \
 	$(libsidebar_test_la_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -101,22 +128,23 @@
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(libsidebar_test_la_SOURCES)
 DIST_SOURCES = $(libsidebar_test_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 DATA = $(plugin_DATA)
 ETAGS = etags
 CTAGS = ctags
@@ -132,7 +160,8 @@
 	$(DISABLE_DEPRECATED)		\
 	-I$(top_srcdir)/		\
 	-I$(top_srcdir)/src		\
-	-I$(top_srcdir)/src/plugins
+	-I$(top_srcdir)/src/plugins	\
+	-I$(top_srcdir)/src/gst
 
 AM_CXXFLAGS = @AM_CXXFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -142,6 +171,10 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BACKEND_CFLAGS = @BACKEND_CFLAGS@
+BACKEND_LIBS = @BACKEND_LIBS@
+BACKEND_TEST_CFLAGS = @BACKEND_TEST_CFLAGS@
+BACKEND_TEST_LIBS = @BACKEND_TEST_LIBS@
 BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
 BROWSER_PLUGIN_DIR = @BROWSER_PLUGIN_DIR@
 BROWSER_PLUGIN_LIBS = @BROWSER_PLUGIN_LIBS@
@@ -163,8 +196,6 @@
 DBUS_LIBS = @DBUS_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DEPENDENCY_CFLAGS = @DEPENDENCY_CFLAGS@
-DEPENDENCY_LIBS = @DEPENDENCY_LIBS@
 DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DISC_RECORDER_CFLAGS = @DISC_RECORDER_CFLAGS@
 DISC_RECORDER_LIBS = @DISC_RECORDER_LIBS@
@@ -178,7 +209,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-EXTRA_BACKEND_LIBS = @EXTRA_BACKEND_LIBS@
 FGREP = @FGREP@
 FULL_LIBEXECDIR = @FULL_LIBEXECDIR@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
@@ -186,19 +216,21 @@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GLIB_REQS = @GLIB_REQS@
+GLOW_BUTTON_CFLAGS = @GLOW_BUTTON_CFLAGS@
+GLOW_BUTTON_LIBS = @GLOW_BUTTON_LIBS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
-GST_CFLAGS = @GST_CFLAGS@
-GST_LIBS = @GST_LIBS@
+GST_PLUGINS_BAD_CFLAGS = @GST_PLUGINS_BAD_CFLAGS@
+GST_PLUGINS_BAD_LIBS = @GST_PLUGINS_BAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
 GTK_REQS = @GTK_REQS@
+HELPER_CFLAGS = @HELPER_CFLAGS@
+HELPER_LIBS = @HELPER_LIBS@
 HELP_DIR = @HELP_DIR@
 HTML_DIR = @HTML_DIR@
 INSTALL = @INSTALL@
@@ -224,11 +256,11 @@
 INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBEPC_CFLAGS = @LIBEPC_CFLAGS@
-LIBEPC_LIBS = @LIBEPC_LIBS@
 LIBGRILO_CFLAGS = @LIBGRILO_CFLAGS@
 LIBGRILO_LIBS = @LIBGRILO_LIBS@
 LIBOBJS = @LIBOBJS@
+LIBPLAYER_CFLAGS = @LIBPLAYER_CFLAGS@
+LIBPLAYER_LIBS = @LIBPLAYER_LIBS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBZEITGEIST_CFLAGS = @LIBZEITGEIST_CFLAGS@
@@ -245,8 +277,6 @@
 MISSING_PLUGINS_CFLAGS = @MISSING_PLUGINS_CFLAGS@
 MISSING_PLUGINS_LIBS = @MISSING_PLUGINS_LIBS@
 MKDIR_P = @MKDIR_P@
-MM_CFLAGS = @MM_CFLAGS@
-MM_LIBS = @MM_LIBS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 NAUTILUSDIR = @NAUTILUSDIR@
@@ -267,15 +297,21 @@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PEASGTK_CFLAGS = @PEASGTK_CFLAGS@
-PEASGTK_LIBS = @PEASGTK_LIBS@
-PEAS_CFLAGS = @PEAS_CFLAGS@
-PEAS_LIBS = @PEAS_LIBS@
+PIXBUF_HELPER_CFLAGS = @PIXBUF_HELPER_CFLAGS@
+PIXBUF_HELPER_LIBS = @PIXBUF_HELPER_LIBS@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLAYER_CFLAGS = @PLAYER_CFLAGS@
+PLAYER_LIBS = @PLAYER_LIBS@
 PLUGINDIR = @PLUGINDIR@
 PLUGINS = @PLUGINS@
+PLUGIN_VIEWER_CFLAGS = @PLUGIN_VIEWER_CFLAGS@
+PLUGIN_VIEWER_LIBS = @PLUGIN_VIEWER_LIBS@
+PREVIEW_CFLAGS = @PREVIEW_CFLAGS@
+PREVIEW_LIBS = @PREVIEW_LIBS@
+PROPERTIES_CFLAGS = @PROPERTIES_CFLAGS@
+PROPERTIES_LIBS = @PROPERTIES_LIBS@
 PYGOBJECT_CFLAGS = @PYGOBJECT_CFLAGS@
 PYGOBJECT_LIBS = @PYGOBJECT_LIBS@
 PYLINT = @PYLINT@
@@ -295,6 +331,10 @@
 SMCLIENT_CFLAGS = @SMCLIENT_CFLAGS@
 SMCLIENT_LIBS = @SMCLIENT_LIBS@
 STRIP = @STRIP@
+THUMBNAILER_CFLAGS = @THUMBNAILER_CFLAGS@
+THUMBNAILER_LIBS = @THUMBNAILER_LIBS@
+TIME_HELPER_CFLAGS = @TIME_HELPER_CFLAGS@
+TIME_HELPER_LIBS = @TIME_HELPER_LIBS@
 TOTEM_API_VERSION = @TOTEM_API_VERSION@
 TOTEM_PLPARSER_REQS = @TOTEM_PLPARSER_REQS@
 TOTEM_VERSION_MAJOR = @TOTEM_VERSION_MAJOR@
@@ -306,9 +346,6 @@
 WARN_CFLAGS = @WARN_CFLAGS@
 WARN_CXXFLAGS = @WARN_CXXFLAGS@
 XGETTEXT = @XGETTEXT@
-XMKMF = @XMKMF@
-XTEST_LIBS = @XTEST_LIBS@
-X_LIBS = @X_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -374,8 +411,7 @@
 DISTCLEANFILES = $(plugin_DATA)
 EXTRA_DIST = $(plugin_in_files)
 plugin_cflags = \
-	$(DEPENDENCY_CFLAGS)	\
-	$(PEAS_CFLAGS)		\
+	$(PLAYER_CFLAGS)	\
 	$(WARN_CFLAGS)
 
 plugin_ldflags = \
@@ -432,12 +468,14 @@
 
 clean-pluginLTLIBRARIES:
 	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
-	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(plugin_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
 libsidebar-test.la: $(libsidebar_test_la_OBJECTS) $(libsidebar_test_la_DEPENDENCIES) $(EXTRA_libsidebar_test_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libsidebar_test_la_LINK) -rpath $(plugindir) $(libsidebar_test_la_OBJECTS) $(libsidebar_test_la_LIBADD) $(LIBS)
 
@@ -450,25 +488,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsidebar_test_la-totem-sidebar-test.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
@@ -535,6 +570,20 @@
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
 
+cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
+	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
@@ -681,19 +730,19 @@
 .MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pluginLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pluginDATA \
-	install-pluginLTLIBRARIES install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-pluginDATA uninstall-pluginLTLIBRARIES
+	clean-libtool clean-pluginLTLIBRARIES cscopelist ctags \
+	distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pluginDATA install-pluginLTLIBRARIES install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-pluginDATA uninstall-pluginLTLIBRARIES
 
 %.plugin: %.plugin.in
 	$(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
diff -Nru totem-3.4.3/src/plugins/skipto/Makefile.in totem-3.6.2/src/plugins/skipto/Makefile.in
--- totem-3.4.3/src/plugins/skipto/Makefile.in	2012-07-04 09:54:51.000000000 +0000
+++ totem-3.6.2/src/plugins/skipto/Makefile.in	2012-10-25 13:36:23.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.12.2 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,6 +16,23 @@
 
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -36,13 +52,11 @@
 build_triplet = @build@
 host_triplet = @host@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/depcomp \
 	$(top_srcdir)/src/plugins/Makefile.plugins
 subdir = src/plugins/skipto
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -86,9 +100,22 @@
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 libskipto_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libskipto_la_CFLAGS) \
 	$(CFLAGS) $(libskipto_la_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -101,22 +128,23 @@
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(libskipto_la_SOURCES)
 DIST_SOURCES = $(libskipto_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 DATA = $(plugin_DATA) $(ui_DATA)
 ETAGS = etags
 CTAGS = ctags
@@ -132,7 +160,8 @@
 	$(DISABLE_DEPRECATED)		\
 	-I$(top_srcdir)/		\
 	-I$(top_srcdir)/src		\
-	-I$(top_srcdir)/src/plugins
+	-I$(top_srcdir)/src/plugins	\
+	-I$(top_srcdir)/src/gst
 
 AM_CXXFLAGS = @AM_CXXFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -142,6 +171,10 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BACKEND_CFLAGS = @BACKEND_CFLAGS@
+BACKEND_LIBS = @BACKEND_LIBS@
+BACKEND_TEST_CFLAGS = @BACKEND_TEST_CFLAGS@
+BACKEND_TEST_LIBS = @BACKEND_TEST_LIBS@
 BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
 BROWSER_PLUGIN_DIR = @BROWSER_PLUGIN_DIR@
 BROWSER_PLUGIN_LIBS = @BROWSER_PLUGIN_LIBS@
@@ -163,8 +196,6 @@
 DBUS_LIBS = @DBUS_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DEPENDENCY_CFLAGS = @DEPENDENCY_CFLAGS@
-DEPENDENCY_LIBS = @DEPENDENCY_LIBS@
 DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DISC_RECORDER_CFLAGS = @DISC_RECORDER_CFLAGS@
 DISC_RECORDER_LIBS = @DISC_RECORDER_LIBS@
@@ -178,7 +209,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-EXTRA_BACKEND_LIBS = @EXTRA_BACKEND_LIBS@
 FGREP = @FGREP@
 FULL_LIBEXECDIR = @FULL_LIBEXECDIR@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
@@ -186,19 +216,21 @@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GLIB_REQS = @GLIB_REQS@
+GLOW_BUTTON_CFLAGS = @GLOW_BUTTON_CFLAGS@
+GLOW_BUTTON_LIBS = @GLOW_BUTTON_LIBS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
-GST_CFLAGS = @GST_CFLAGS@
-GST_LIBS = @GST_LIBS@
+GST_PLUGINS_BAD_CFLAGS = @GST_PLUGINS_BAD_CFLAGS@
+GST_PLUGINS_BAD_LIBS = @GST_PLUGINS_BAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
 GTK_REQS = @GTK_REQS@
+HELPER_CFLAGS = @HELPER_CFLAGS@
+HELPER_LIBS = @HELPER_LIBS@
 HELP_DIR = @HELP_DIR@
 HTML_DIR = @HTML_DIR@
 INSTALL = @INSTALL@
@@ -224,11 +256,11 @@
 INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBEPC_CFLAGS = @LIBEPC_CFLAGS@
-LIBEPC_LIBS = @LIBEPC_LIBS@
 LIBGRILO_CFLAGS = @LIBGRILO_CFLAGS@
 LIBGRILO_LIBS = @LIBGRILO_LIBS@
 LIBOBJS = @LIBOBJS@
+LIBPLAYER_CFLAGS = @LIBPLAYER_CFLAGS@
+LIBPLAYER_LIBS = @LIBPLAYER_LIBS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBZEITGEIST_CFLAGS = @LIBZEITGEIST_CFLAGS@
@@ -245,8 +277,6 @@
 MISSING_PLUGINS_CFLAGS = @MISSING_PLUGINS_CFLAGS@
 MISSING_PLUGINS_LIBS = @MISSING_PLUGINS_LIBS@
 MKDIR_P = @MKDIR_P@
-MM_CFLAGS = @MM_CFLAGS@
-MM_LIBS = @MM_LIBS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 NAUTILUSDIR = @NAUTILUSDIR@
@@ -267,15 +297,21 @@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PEASGTK_CFLAGS = @PEASGTK_CFLAGS@
-PEASGTK_LIBS = @PEASGTK_LIBS@
-PEAS_CFLAGS = @PEAS_CFLAGS@
-PEAS_LIBS = @PEAS_LIBS@
+PIXBUF_HELPER_CFLAGS = @PIXBUF_HELPER_CFLAGS@
+PIXBUF_HELPER_LIBS = @PIXBUF_HELPER_LIBS@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLAYER_CFLAGS = @PLAYER_CFLAGS@
+PLAYER_LIBS = @PLAYER_LIBS@
 PLUGINDIR = @PLUGINDIR@
 PLUGINS = @PLUGINS@
+PLUGIN_VIEWER_CFLAGS = @PLUGIN_VIEWER_CFLAGS@
+PLUGIN_VIEWER_LIBS = @PLUGIN_VIEWER_LIBS@
+PREVIEW_CFLAGS = @PREVIEW_CFLAGS@
+PREVIEW_LIBS = @PREVIEW_LIBS@
+PROPERTIES_CFLAGS = @PROPERTIES_CFLAGS@
+PROPERTIES_LIBS = @PROPERTIES_LIBS@
 PYGOBJECT_CFLAGS = @PYGOBJECT_CFLAGS@
 PYGOBJECT_LIBS = @PYGOBJECT_LIBS@
 PYLINT = @PYLINT@
@@ -295,6 +331,10 @@
 SMCLIENT_CFLAGS = @SMCLIENT_CFLAGS@
 SMCLIENT_LIBS = @SMCLIENT_LIBS@
 STRIP = @STRIP@
+THUMBNAILER_CFLAGS = @THUMBNAILER_CFLAGS@
+THUMBNAILER_LIBS = @THUMBNAILER_LIBS@
+TIME_HELPER_CFLAGS = @TIME_HELPER_CFLAGS@
+TIME_HELPER_LIBS = @TIME_HELPER_LIBS@
 TOTEM_API_VERSION = @TOTEM_API_VERSION@
 TOTEM_PLPARSER_REQS = @TOTEM_PLPARSER_REQS@
 TOTEM_VERSION_MAJOR = @TOTEM_VERSION_MAJOR@
@@ -306,9 +346,6 @@
 WARN_CFLAGS = @WARN_CFLAGS@
 WARN_CXXFLAGS = @WARN_CXXFLAGS@
 XGETTEXT = @XGETTEXT@
-XMKMF = @XMKMF@
-XTEST_LIBS = @XTEST_LIBS@
-X_LIBS = @X_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -374,8 +411,7 @@
 DISTCLEANFILES = $(plugin_DATA)
 EXTRA_DIST = $(plugin_in_files) $(ui_DATA)
 plugin_cflags = \
-	$(DEPENDENCY_CFLAGS)	\
-	$(PEAS_CFLAGS)		\
+	$(PLAYER_CFLAGS)	\
 	$(WARN_CFLAGS)
 
 plugin_ldflags = \
@@ -439,7 +475,6 @@
 $(am__aclocal_m4_deps):
 install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
 	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
@@ -447,6 +482,8 @@
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
 	}
@@ -462,12 +499,14 @@
 
 clean-pluginLTLIBRARIES:
 	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
-	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(plugin_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
 libskipto.la: $(libskipto_la_OBJECTS) $(libskipto_la_DEPENDENCIES) $(EXTRA_libskipto_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libskipto_la_LINK) -rpath $(plugindir) $(libskipto_la_OBJECTS) $(libskipto_la_LIBADD) $(LIBS)
 
@@ -482,25 +521,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libskipto_la-totem-time-entry.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
@@ -533,8 +569,11 @@
 	-rm -rf .libs _libs
 install-pluginDATA: $(plugin_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
 	@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -551,8 +590,11 @@
 	dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
 install-uiDATA: $(ui_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)"
 	@list='$(ui_DATA)'; test -n "$(uidir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -617,6 +659,20 @@
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
 
+cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
+	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
@@ -765,20 +821,20 @@
 .MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pluginLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pluginDATA \
-	install-pluginLTLIBRARIES install-ps install-ps-am \
-	install-strip install-uiDATA installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-pluginDATA uninstall-pluginLTLIBRARIES \
-	uninstall-uiDATA
+	clean-libtool clean-pluginLTLIBRARIES cscopelist ctags \
+	distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pluginDATA install-pluginLTLIBRARIES install-ps \
+	install-ps-am install-strip install-uiDATA installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-pluginDATA \
+	uninstall-pluginLTLIBRARIES uninstall-uiDATA
 
 %.plugin: %.plugin.in
 	$(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
diff -Nru totem-3.4.3/src/plugins/skipto/skipto.plugin.in totem-3.6.2/src/plugins/skipto/skipto.plugin.in
--- totem-3.4.3/src/plugins/skipto/skipto.plugin.in	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/plugins/skipto/skipto.plugin.in	2012-08-29 23:07:45.000000000 +0000
@@ -2,8 +2,8 @@
 Module=skipto
 IAge=1
 Builtin=true
-Name=Skip to
-Description=Provides the "Skip to" dialog.
+_Name=Skip To
+_Description=Provides the "Skip to" dialog
 Authors=Philip Withnall, Bastien Nocera
 Copyright=Copyright © 2007 Philip Withnall
 Website=http://www.gnome.org/projects/totem/
diff -Nru totem-3.4.3/src/plugins/skipto/totem-skipto.c totem-3.6.2/src/plugins/skipto/totem-skipto.c
--- totem-3.4.3/src/plugins/skipto/totem-skipto.c	2011-08-25 18:35:01.000000000 +0000
+++ totem-3.6.2/src/plugins/skipto/totem-skipto.c	2012-08-29 23:07:45.000000000 +0000
@@ -40,7 +40,6 @@
 #include "totem-dirs.h"
 #include "totem-skipto.h"
 #include "totem-uri.h"
-#include "backend/video-utils.h"
 #include "backend/bacon-video-widget.h"
 
 static void totem_skipto_dispose	(GObject *object);
diff -Nru totem-3.4.3/src/plugins/skipto/totem-time-entry.c totem-3.6.2/src/plugins/skipto/totem-time-entry.c
--- totem-3.4.3/src/plugins/skipto/totem-time-entry.c	2012-01-10 16:10:04.000000000 +0000
+++ totem-3.6.2/src/plugins/skipto/totem-time-entry.c	2012-08-29 23:07:45.000000000 +0000
@@ -33,7 +33,7 @@
 #include 
 #include 
 
-#include "backend/video-utils.h"
+#include "totem-time-helpers.h"
 #include "totem-time-entry.h"
 
 static void dispose (GObject *object);
diff -Nru totem-3.4.3/src/plugins/totem-plugin.h totem-3.6.2/src/plugins/totem-plugin.h
--- totem-3.4.3/src/plugins/totem-plugin.h	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/plugins/totem-plugin.h	2012-08-29 23:07:45.000000000 +0000
@@ -38,7 +38,7 @@
 G_BEGIN_DECLS
 
 /**
- * TOTEM_PLUGIN_REGISTER:
+ * _TOTEM_PLUGIN_REGISTER:
  * @TYPE_NAME: the name of the plugin type, in UPPER_CASE
  * @TypeName: the name of the plugin type, in CamelCase
  * @type_name: the name of the plugin type, in lower_case
diff -Nru totem-3.4.3/src/plugins/zeitgeist-dp/Makefile.am totem-3.6.2/src/plugins/zeitgeist-dp/Makefile.am
--- totem-3.4.3/src/plugins/zeitgeist-dp/Makefile.am	2012-07-04 10:15:49.000000000 +0000
+++ totem-3.6.2/src/plugins/zeitgeist-dp/Makefile.am	2012-08-29 23:07:45.000000000 +0000
@@ -8,7 +8,7 @@
 # here we are explicitly specifying gtk+-3.0 to use the vapi because vala still
 # cannot parse the gir
 VALAFLAGS = \
-	--girdir=$(top_srcdir)/src	\
+	--girdir=$(top_builddir)/src	\
 	--pkg Totem-1.0 --pkg Peas-1.0 --pkg gtk+-3.0 \
 	--pkg zeitgeist-1.0 \
 	bacon-video.vapi
diff -Nru totem-3.4.3/src/plugins/zeitgeist-dp/Makefile.in totem-3.6.2/src/plugins/zeitgeist-dp/Makefile.in
--- totem-3.4.3/src/plugins/zeitgeist-dp/Makefile.in	2012-07-04 10:16:32.000000000 +0000
+++ totem-3.6.2/src/plugins/zeitgeist-dp/Makefile.in	2012-10-25 13:36:24.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.12.2 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,6 +16,23 @@
 
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -36,15 +52,13 @@
 build_triplet = @build@
 host_triplet = @host@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(srcdir)/libtotem_zeitgeist_dp_plugin_la_vala.stamp \
+	$(top_srcdir)/depcomp \
 	$(top_srcdir)/src/plugins/Makefile.plugins \
-	libtotem_zeitgeist_dp_plugin_la_vala.stamp \
 	totem-zeitgeist-dp-plugin.c
 subdir = src/plugins/zeitgeist-dp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -90,10 +104,23 @@
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 libtotem_zeitgeist_dp_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(libtotem_zeitgeist_dp_plugin_la_CFLAGS) $(CFLAGS) \
 	$(libtotem_zeitgeist_dp_plugin_la_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -106,29 +133,31 @@
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 VALACOMPILE = $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS)
 LTVALACOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(VALAC) $(AM_VALAFLAGS) \
 	$(VALAFLAGS)
 AM_V_VALAC = $(am__v_VALAC_@AM_V@)
 am__v_VALAC_ = $(am__v_VALAC_@AM_DEFAULT_V@)
-am__v_VALAC_0 = @echo "  VALAC " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_VALAC_0 = @echo "  VALAC   " $@;
+am__v_VALAC_1 = 
 SOURCES = $(libtotem_zeitgeist_dp_plugin_la_SOURCES)
 DIST_SOURCES = $(libtotem_zeitgeist_dp_plugin_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 DATA = $(plugin_DATA)
 ETAGS = etags
 CTAGS = ctags
@@ -144,7 +173,8 @@
 	$(DISABLE_DEPRECATED)		\
 	-I$(top_srcdir)/		\
 	-I$(top_srcdir)/src		\
-	-I$(top_srcdir)/src/plugins
+	-I$(top_srcdir)/src/plugins	\
+	-I$(top_srcdir)/src/gst
 
 AM_CXXFLAGS = @AM_CXXFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -154,6 +184,10 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BACKEND_CFLAGS = @BACKEND_CFLAGS@
+BACKEND_LIBS = @BACKEND_LIBS@
+BACKEND_TEST_CFLAGS = @BACKEND_TEST_CFLAGS@
+BACKEND_TEST_LIBS = @BACKEND_TEST_LIBS@
 BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
 BROWSER_PLUGIN_DIR = @BROWSER_PLUGIN_DIR@
 BROWSER_PLUGIN_LIBS = @BROWSER_PLUGIN_LIBS@
@@ -175,8 +209,6 @@
 DBUS_LIBS = @DBUS_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DEPENDENCY_CFLAGS = @DEPENDENCY_CFLAGS@
-DEPENDENCY_LIBS = @DEPENDENCY_LIBS@
 DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DISC_RECORDER_CFLAGS = @DISC_RECORDER_CFLAGS@
 DISC_RECORDER_LIBS = @DISC_RECORDER_LIBS@
@@ -190,7 +222,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-EXTRA_BACKEND_LIBS = @EXTRA_BACKEND_LIBS@
 FGREP = @FGREP@
 FULL_LIBEXECDIR = @FULL_LIBEXECDIR@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
@@ -198,19 +229,21 @@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GLIB_REQS = @GLIB_REQS@
+GLOW_BUTTON_CFLAGS = @GLOW_BUTTON_CFLAGS@
+GLOW_BUTTON_LIBS = @GLOW_BUTTON_LIBS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
-GST_CFLAGS = @GST_CFLAGS@
-GST_LIBS = @GST_LIBS@
+GST_PLUGINS_BAD_CFLAGS = @GST_PLUGINS_BAD_CFLAGS@
+GST_PLUGINS_BAD_LIBS = @GST_PLUGINS_BAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
 GTK_REQS = @GTK_REQS@
+HELPER_CFLAGS = @HELPER_CFLAGS@
+HELPER_LIBS = @HELPER_LIBS@
 HELP_DIR = @HELP_DIR@
 HTML_DIR = @HTML_DIR@
 INSTALL = @INSTALL@
@@ -236,11 +269,11 @@
 INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBEPC_CFLAGS = @LIBEPC_CFLAGS@
-LIBEPC_LIBS = @LIBEPC_LIBS@
 LIBGRILO_CFLAGS = @LIBGRILO_CFLAGS@
 LIBGRILO_LIBS = @LIBGRILO_LIBS@
 LIBOBJS = @LIBOBJS@
+LIBPLAYER_CFLAGS = @LIBPLAYER_CFLAGS@
+LIBPLAYER_LIBS = @LIBPLAYER_LIBS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBZEITGEIST_CFLAGS = @LIBZEITGEIST_CFLAGS@
@@ -257,8 +290,6 @@
 MISSING_PLUGINS_CFLAGS = @MISSING_PLUGINS_CFLAGS@
 MISSING_PLUGINS_LIBS = @MISSING_PLUGINS_LIBS@
 MKDIR_P = @MKDIR_P@
-MM_CFLAGS = @MM_CFLAGS@
-MM_LIBS = @MM_LIBS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 NAUTILUSDIR = @NAUTILUSDIR@
@@ -279,15 +310,21 @@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PEASGTK_CFLAGS = @PEASGTK_CFLAGS@
-PEASGTK_LIBS = @PEASGTK_LIBS@
-PEAS_CFLAGS = @PEAS_CFLAGS@
-PEAS_LIBS = @PEAS_LIBS@
+PIXBUF_HELPER_CFLAGS = @PIXBUF_HELPER_CFLAGS@
+PIXBUF_HELPER_LIBS = @PIXBUF_HELPER_LIBS@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLAYER_CFLAGS = @PLAYER_CFLAGS@
+PLAYER_LIBS = @PLAYER_LIBS@
 PLUGINDIR = @PLUGINDIR@
 PLUGINS = @PLUGINS@
+PLUGIN_VIEWER_CFLAGS = @PLUGIN_VIEWER_CFLAGS@
+PLUGIN_VIEWER_LIBS = @PLUGIN_VIEWER_LIBS@
+PREVIEW_CFLAGS = @PREVIEW_CFLAGS@
+PREVIEW_LIBS = @PREVIEW_LIBS@
+PROPERTIES_CFLAGS = @PROPERTIES_CFLAGS@
+PROPERTIES_LIBS = @PROPERTIES_LIBS@
 PYGOBJECT_CFLAGS = @PYGOBJECT_CFLAGS@
 PYGOBJECT_LIBS = @PYGOBJECT_LIBS@
 PYLINT = @PYLINT@
@@ -307,6 +344,10 @@
 SMCLIENT_CFLAGS = @SMCLIENT_CFLAGS@
 SMCLIENT_LIBS = @SMCLIENT_LIBS@
 STRIP = @STRIP@
+THUMBNAILER_CFLAGS = @THUMBNAILER_CFLAGS@
+THUMBNAILER_LIBS = @THUMBNAILER_LIBS@
+TIME_HELPER_CFLAGS = @TIME_HELPER_CFLAGS@
+TIME_HELPER_LIBS = @TIME_HELPER_LIBS@
 TOTEM_API_VERSION = @TOTEM_API_VERSION@
 TOTEM_PLPARSER_REQS = @TOTEM_PLPARSER_REQS@
 TOTEM_VERSION_MAJOR = @TOTEM_VERSION_MAJOR@
@@ -318,9 +359,6 @@
 WARN_CFLAGS = @WARN_CFLAGS@
 WARN_CXXFLAGS = @WARN_CXXFLAGS@
 XGETTEXT = @XGETTEXT@
-XMKMF = @XMKMF@
-XTEST_LIBS = @XTEST_LIBS@
-X_LIBS = @X_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -386,8 +424,7 @@
 DISTCLEANFILES = $(plugin_DATA)
 EXTRA_DIST = $(plugin_in_files)
 plugin_cflags = \
-	$(DEPENDENCY_CFLAGS)	\
-	$(PEAS_CFLAGS)		\
+	$(PLAYER_CFLAGS)	\
 	$(WARN_CFLAGS)
 
 plugin_ldflags = \
@@ -406,7 +443,7 @@
 # here we are explicitly specifying gtk+-3.0 to use the vapi because vala still
 # cannot parse the gir
 VALAFLAGS = \
-	--girdir=$(top_srcdir)/src	\
+	--girdir=$(top_builddir)/src	\
 	--pkg Totem-1.0 --pkg Peas-1.0 --pkg gtk+-3.0 \
 	--pkg zeitgeist-1.0 \
 	bacon-video.vapi
@@ -464,7 +501,6 @@
 $(am__aclocal_m4_deps):
 install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
 	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
@@ -472,6 +508,8 @@
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
 	}
@@ -487,12 +525,14 @@
 
 clean-pluginLTLIBRARIES:
 	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
-	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(plugin_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
 libtotem-zeitgeist-dp-plugin.la: $(libtotem_zeitgeist_dp_plugin_la_OBJECTS) $(libtotem_zeitgeist_dp_plugin_la_DEPENDENCIES) $(EXTRA_libtotem_zeitgeist_dp_plugin_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libtotem_zeitgeist_dp_plugin_la_LINK) -rpath $(plugindir) $(libtotem_zeitgeist_dp_plugin_la_OBJECTS) $(libtotem_zeitgeist_dp_plugin_la_LIBADD) $(LIBS)
 
@@ -505,25 +545,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_zeitgeist_dp_plugin_la-totem-zeitgeist-dp-plugin.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
@@ -539,9 +576,9 @@
 	@if test -f $@; then :; else \
 	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/libtotem_zeitgeist_dp_plugin_la_vala.stamp; \
 	fi
-$(srcdir)/libtotem_zeitgeist_dp_plugin_la_vala.stamp: $(libtotem_zeitgeist_dp_plugin_la_SOURCES)
+$(srcdir)/libtotem_zeitgeist_dp_plugin_la_vala.stamp: totem-zeitgeist-dp-plugin.vala
 	$(AM_V_at)rm -f $@ && echo stamp > $@-t
-	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(libtotem_zeitgeist_dp_plugin_la_SOURCES)
+	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C totem-zeitgeist-dp-plugin.vala
 	$(AM_V_at)mv -f $@-t $@
 
 mostlyclean-libtool:
@@ -551,8 +588,11 @@
 	-rm -rf .libs _libs
 install-pluginDATA: $(plugin_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
 	@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -617,6 +657,20 @@
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
 
+cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
+	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
@@ -689,7 +743,8 @@
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-rm -f libtotem_zeitgeist_dp_plugin_la_vala.stamp
+	-rm -f $(srcdir)/libtotem_zeitgeist_dp_plugin_la_vala.stamp
+	-rm -f $(srcdir)/totem-zeitgeist-dp-plugin.c
 	-rm -f totem-zeitgeist-dp-plugin.c
 clean: clean-am
 
@@ -765,19 +820,19 @@
 .MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pluginLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pluginDATA \
-	install-pluginLTLIBRARIES install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-pluginDATA uninstall-pluginLTLIBRARIES
+	clean-libtool clean-pluginLTLIBRARIES cscopelist ctags \
+	distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pluginDATA install-pluginLTLIBRARIES install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-pluginDATA uninstall-pluginLTLIBRARIES
 
 %.plugin: %.plugin.in
 	$(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
diff -Nru totem-3.4.3/src/plugins/zeitgeist-dp/totem-zeitgeist-dp-plugin.c totem-3.6.2/src/plugins/zeitgeist-dp/totem-zeitgeist-dp-plugin.c
--- totem-3.4.3/src/plugins/zeitgeist-dp/totem-zeitgeist-dp-plugin.c	2012-06-27 17:34:58.000000000 +0000
+++ totem-3.6.2/src/plugins/zeitgeist-dp/totem-zeitgeist-dp-plugin.c	2012-09-07 11:06:44.000000000 +0000
@@ -1,4 +1,4 @@
-/* totem-zeitgeist-dp-plugin.c generated by valac 0.17.0.14-2d0e7, the Vala compiler
+/* totem-zeitgeist-dp-plugin.c generated by valac 0.17.5, the Vala compiler
  * generated from totem-zeitgeist-dp-plugin.vala, do not modify */
 
 
@@ -116,7 +116,7 @@
 };
 static void zeitgeist_dp_plugin_real_activate (PeasActivatable* base);
 GObject* peas_activatable_get_object (PeasActivatable* self);
-static void zeitgeist_dp_plugin_file_opened (ZeitgeistDpPlugin* self, const gchar* mrl, TotemObject* totem);
+static void zeitgeist_dp_plugin_file_has_played (ZeitgeistDpPlugin* self, const gchar* mrl, TotemObject* totem);
 static void _vala_array_add1 (gulong** array, int* length, int* size, gulong value);
 static void zeitgeist_dp_plugin_file_closed (ZeitgeistDpPlugin* self, TotemObject* totem);
 static void _vala_array_add2 (gulong** array, int* length, int* size, gulong value);
@@ -290,19 +290,17 @@
 	GPtrArray* _tmp12_;
 	GPtrArray* templates;
 	ZeitgeistEvent* _tmp13_;
-	ZeitgeistEvent* _tmp14_;
 	ZeitgeistEvent* event;
+	GPtrArray* _tmp14_;
 	GPtrArray* _tmp15_;
-	GPtrArray* _tmp16_;
-	ZeitgeistDataSource* _tmp17_;
-	ZeitgeistDataSource* _tmp18_;
+	ZeitgeistDataSource* _tmp16_;
 	ZeitgeistDataSource* ds;
-	ZeitgeistDataSourceRegistry* _tmp19_;
-	ZeitgeistDataSource* _tmp20_;
+	ZeitgeistDataSourceRegistry* _tmp17_;
+	ZeitgeistDataSource* _tmp18_;
 	self = (ZeitgeistDpPlugin*) base;
 	g_object_get ((PeasActivatable*) self, "object", &_tmp0_, NULL);
 	_tmp1_ = _tmp0_;
-	totem = TOTEM_OBJECT (_tmp1_);
+	totem = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, totem_object_get_type (), TotemObject);
 	_tmp2_ = zeitgeist_log_new ();
 	_g_object_unref0 (self->priv->zg_log);
 	self->priv->zg_log = _tmp2_;
@@ -313,7 +311,7 @@
 	memset (&self->priv->current_media, 0, sizeof (MediaInfo));
 	_tmp4_ = self->priv->signals;
 	_tmp4__length1 = self->priv->signals_length1;
-	_tmp5_ = g_signal_connect_swapped (totem, "file-opened", (GCallback) zeitgeist_dp_plugin_file_opened, self);
+	_tmp5_ = g_signal_connect_swapped (totem, "file-has-played", (GCallback) zeitgeist_dp_plugin_file_has_played, self);
 	_vala_array_add1 (&self->priv->signals, &self->priv->signals_length1, &self->priv->_signals_size_, _tmp5_);
 	_tmp6_ = self->priv->signals;
 	_tmp6__length1 = self->priv->signals_length1;
@@ -330,18 +328,18 @@
 	_tmp12_ = g_ptr_array_new ();
 	templates = _tmp12_;
 	_tmp13_ = zeitgeist_event_new_full ("", ZEITGEIST_ZG_USER_ACTIVITY, "application://totem.desktop", NULL, NULL);
-	_tmp14_ = g_object_ref_sink (_tmp13_);
-	event = _tmp14_;
+	g_object_ref_sink (_tmp13_);
+	event = _tmp13_;
+	_tmp14_ = templates;
+	g_ptr_array_add (_tmp14_, event);
 	_tmp15_ = templates;
-	g_ptr_array_add (_tmp15_, event);
-	_tmp16_ = templates;
 	templates = NULL;
-	_tmp17_ = zeitgeist_data_source_new_full ("org.gnome.Totem,dataprovider", "Totem dataprovider", "Logs access/leave events for media files played with Totem", _tmp16_);
-	_tmp18_ = g_object_ref_sink (_tmp17_);
-	ds = _tmp18_;
-	_tmp19_ = self->priv->zg_registry;
-	_tmp20_ = _g_object_ref0 (ds);
-	zeitgeist_data_source_registry_register_data_source (_tmp19_, _tmp20_, NULL, NULL, NULL);
+	_tmp16_ = zeitgeist_data_source_new_full ("org.gnome.Totem,dataprovider", "Totem dataprovider", "Logs access/leave events for media files played with Totem", _tmp15_);
+	g_object_ref_sink (_tmp16_);
+	ds = _tmp16_;
+	_tmp17_ = self->priv->zg_registry;
+	_tmp18_ = _g_object_ref0 (ds);
+	zeitgeist_data_source_registry_register_data_source (_tmp17_, _tmp18_, NULL, NULL, NULL);
 	_g_object_unref0 (ds);
 	_g_object_unref0 (event);
 	_g_ptr_array_free0 (templates);
@@ -362,7 +360,7 @@
 	self = (ZeitgeistDpPlugin*) base;
 	g_object_get ((PeasActivatable*) self, "object", &_tmp0_, NULL);
 	_tmp1_ = _tmp0_;
-	totem = TOTEM_OBJECT (_tmp1_);
+	totem = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, totem_object_get_type (), TotemObject);
 	_tmp2_ = totem;
 	zeitgeist_dp_plugin_file_closed (self, _tmp2_);
 	_tmp3_ = self->priv->signals;
@@ -445,7 +443,7 @@
 }
 
 
-static void zeitgeist_dp_plugin_file_opened (ZeitgeistDpPlugin* self, const gchar* mrl, TotemObject* totem) {
+static void zeitgeist_dp_plugin_file_has_played (ZeitgeistDpPlugin* self, const gchar* mrl, TotemObject* totem) {
 	MediaInfo _tmp0_;
 	const gchar* _tmp1_;
 	const gchar* _tmp3_;
@@ -571,7 +569,7 @@
 	g_return_val_if_fail (self != NULL, FALSE);
 	g_object_get ((PeasActivatable*) self, "object", &_tmp0_, NULL);
 	_tmp1_ = _tmp0_;
-	totem = TOTEM_OBJECT (_tmp1_);
+	totem = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, totem_object_get_type (), TotemObject);
 	_tmp2_ = self->priv->media_info_timeout;
 	if (_tmp2_ != ((guint) 0)) {
 		guint _tmp3_;
@@ -648,7 +646,7 @@
 	_data_->_tmp0_ = NULL;
 	g_object_get ((PeasActivatable*) _data_->self, "object", &_data_->_tmp0_, NULL);
 	_data_->_tmp1_ = _data_->_tmp0_;
-	_data_->totem = TOTEM_OBJECT (_data_->_tmp1_);
+	_data_->totem = G_TYPE_CHECK_INSTANCE_CAST (_data_->_tmp1_, totem_object_get_type (), TotemObject);
 	_data_->_tmp2_ = _data_->current_mrl;
 	_data_->_tmp3_ = g_strdup (_data_->_tmp2_);
 	_data_->mrl = _data_->_tmp3_;
@@ -744,7 +742,7 @@
 	g_return_val_if_fail (self != NULL, FALSE);
 	g_object_get ((PeasActivatable*) self, "object", &_tmp0_, NULL);
 	_tmp1_ = _tmp0_;
-	totem = TOTEM_OBJECT (_tmp1_);
+	totem = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, totem_object_get_type (), TotemObject);
 	_tmp3_ = self->priv->current_media;
 	_tmp4_ = _tmp3_.title;
 	if (_tmp4_ != NULL) {
@@ -772,8 +770,8 @@
 		const gchar* _tmp17_;
 		guint _tmp18_;
 		_tmp8_ = totem;
-		_tmp9_ = totem_get_video_widget (_tmp8_);
-		video = BACON_IS_VIDEO_WIDGET (_tmp9_) ? ((BaconVideoWidget*) _tmp9_) : NULL;
+		_tmp9_ = totem_object_get_video_widget (_tmp8_);
+		video = G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, BACON_TYPE_VIDEO_WIDGET) ? ((BaconVideoWidget*) _tmp9_) : NULL;
 		_tmp10_ = video;
 		bacon_video_widget_get_metadata (_tmp10_, BVW_INFO_HAS_VIDEO, &_tmp11_);
 		G_IS_VALUE (&val) ? (g_value_unset (&val), NULL) : NULL;
@@ -825,7 +823,7 @@
 	g_return_if_fail (self != NULL);
 	g_object_get ((PeasActivatable*) self, "object", &_tmp0_, NULL);
 	_tmp1_ = _tmp0_;
-	totem = TOTEM_OBJECT (_tmp1_);
+	totem = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, totem_object_get_type (), TotemObject);
 	_tmp3_ = self->priv->media_info_timeout;
 	if (_tmp3_ == ((guint) 0)) {
 		MediaInfo _tmp4_;
@@ -902,18 +900,16 @@
 		MediaInfo _tmp23_;
 		const gchar* _tmp24_;
 		ZeitgeistSubject* _tmp25_;
-		ZeitgeistSubject* _tmp26_;
 		ZeitgeistSubject* subject;
-		const gchar* _tmp27_;
-		ZeitgeistSubject* _tmp28_;
-		ZeitgeistEvent* _tmp29_;
-		ZeitgeistEvent* _tmp30_;
+		const gchar* _tmp26_;
+		ZeitgeistSubject* _tmp27_;
+		ZeitgeistEvent* _tmp28_;
 		ZeitgeistEvent* event;
-		ZeitgeistEvent* _tmp31_;
-		MediaInfo _tmp32_;
-		gint64 _tmp33_;
-		ZeitgeistLog* _tmp34_;
-		ZeitgeistEvent* _tmp35_;
+		ZeitgeistEvent* _tmp29_;
+		MediaInfo _tmp30_;
+		gint64 _tmp31_;
+		ZeitgeistLog* _tmp32_;
+		ZeitgeistEvent* _tmp33_;
 		_tmp7_ = leave_event;
 		if (_tmp7_) {
 			_tmp6_ = ZEITGEIST_ZG_LEAVE_EVENT;
@@ -940,20 +936,20 @@
 		_tmp23_ = self->priv->current_media;
 		_tmp24_ = _tmp23_.title;
 		_tmp25_ = zeitgeist_subject_new_full (_tmp14_, _tmp16_, _tmp19_, _tmp21_, _tmp22_, _tmp24_, "");
-		_tmp26_ = g_object_ref_sink (_tmp25_);
-		subject = _tmp26_;
-		_tmp27_ = event_interpretation;
-		_tmp28_ = subject;
-		_tmp29_ = zeitgeist_event_new_full (_tmp27_, ZEITGEIST_ZG_USER_ACTIVITY, "application://totem.desktop", _tmp28_, NULL, NULL);
-		_tmp30_ = g_object_ref_sink (_tmp29_);
-		event = _tmp30_;
-		_tmp31_ = event;
-		_tmp32_ = self->priv->current_media;
-		_tmp33_ = _tmp32_.timestamp;
-		zeitgeist_event_set_timestamp (_tmp31_, _tmp33_);
-		_tmp34_ = self->priv->zg_log;
-		_tmp35_ = event;
-		zeitgeist_log_insert_events_no_reply (_tmp34_, _tmp35_, NULL, NULL);
+		g_object_ref_sink (_tmp25_);
+		subject = _tmp25_;
+		_tmp26_ = event_interpretation;
+		_tmp27_ = subject;
+		_tmp28_ = zeitgeist_event_new_full (_tmp26_, ZEITGEIST_ZG_USER_ACTIVITY, "application://totem.desktop", _tmp27_, NULL, NULL);
+		g_object_ref_sink (_tmp28_);
+		event = _tmp28_;
+		_tmp29_ = event;
+		_tmp30_ = self->priv->current_media;
+		_tmp31_ = _tmp30_.timestamp;
+		zeitgeist_event_set_timestamp (_tmp29_, _tmp31_);
+		_tmp32_ = self->priv->zg_log;
+		_tmp33_ = event;
+		zeitgeist_log_insert_events_no_reply (_tmp32_, _tmp33_, NULL, NULL);
 		_g_object_unref0 (event);
 		_g_object_unref0 (subject);
 		_g_free0 (origin);
@@ -1025,7 +1021,7 @@
 
 static void zeitgeist_dp_plugin_finalize (GObject* obj) {
 	ZeitgeistDpPlugin * self;
-	self = ZEITGEIST_DP_PLUGIN (obj);
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ZEITGEIST_DP_PLUGIN, ZeitgeistDpPlugin);
 	media_info_destroy (&self->priv->current_media);
 	self->priv->signals = (g_free (self->priv->signals), NULL);
 	_g_object_unref0 (self->priv->zg_log);
@@ -1051,7 +1047,7 @@
 
 static void _vala_zeitgeist_dp_plugin_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) {
 	ZeitgeistDpPlugin * self;
-	self = ZEITGEIST_DP_PLUGIN (object);
+	self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_ZEITGEIST_DP_PLUGIN, ZeitgeistDpPlugin);
 	switch (property_id) {
 		case ZEITGEIST_DP_PLUGIN_OBJECT:
 		g_value_take_object (value, zeitgeist_dp_plugin_real_get_object ((PeasActivatable*) self));
@@ -1065,7 +1061,7 @@
 
 static void _vala_zeitgeist_dp_plugin_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) {
 	ZeitgeistDpPlugin * self;
-	self = ZEITGEIST_DP_PLUGIN (object);
+	self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_ZEITGEIST_DP_PLUGIN, ZeitgeistDpPlugin);
 	switch (property_id) {
 		case ZEITGEIST_DP_PLUGIN_OBJECT:
 		zeitgeist_dp_plugin_real_set_object ((PeasActivatable*) self, g_value_get_object (value));
@@ -1084,7 +1080,7 @@
 	g_return_if_fail (module != NULL);
 	zeitgeist_dp_plugin_register_type (module);
 	_tmp0_ = module;
-	_tmp1_ = _g_object_ref0 (PEAS_IS_OBJECT_MODULE (_tmp0_) ? ((PeasObjectModule*) _tmp0_) : NULL);
+	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, peas_object_module_get_type ()) ? ((PeasObjectModule*) _tmp0_) : NULL);
 	objmodule = _tmp1_;
 	peas_object_module_register_extension_type (objmodule, peas_activatable_get_type (), TYPE_ZEITGEIST_DP_PLUGIN);
 	_g_object_unref0 (objmodule);
diff -Nru totem-3.4.3/src/plugins/zeitgeist-dp/totem-zeitgeist-dp-plugin.vala totem-3.6.2/src/plugins/zeitgeist-dp/totem-zeitgeist-dp-plugin.vala
--- totem-3.4.3/src/plugins/zeitgeist-dp/totem-zeitgeist-dp-plugin.vala	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/plugins/zeitgeist-dp/totem-zeitgeist-dp-plugin.vala	2012-08-29 23:07:45.000000000 +0000
@@ -32,8 +32,8 @@
 
     current_media = MediaInfo ();
 
-    signals += Signal.connect_swapped (totem, "file-opened",
-                                       (Callback) file_opened, this);
+    signals += Signal.connect_swapped (totem, "file-has-played",
+                                       (Callback) file_has_played, this);
     signals += Signal.connect_swapped (totem, "file-closed",
                                        (Callback)file_closed, this);
     signals += Signal.connect_swapped (totem, "metadata-updated",
@@ -84,11 +84,9 @@
     timeout_id = Timeout.add (interval, timeout_cb);
   }
 
-  private void file_opened (string mrl, Totem.Object totem) {
-    if (current_media.mrl != null) {
-      /* we don't always get file-closed, so lets simulate it */
+  private void file_has_played (string mrl, Totem.Object totem) {
+    if (current_media.mrl != null)
       file_closed (totem);
-    }
 
     current_media = MediaInfo ();
     current_media.mrl = mrl;
@@ -155,7 +153,7 @@
     var f = File.new_for_uri (mrl);
 
     try {
-      var fi = yield f.query_info_async (FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
+      var fi = yield f.query_info_async (FileAttribute.STANDARD_CONTENT_TYPE,
                                          0, Priority.DEFAULT_IDLE, null);
 
       if (current_media.mrl != mrl || !totem.is_playing ()) return;
@@ -174,7 +172,7 @@
 
     if (current_media.title != null && totem.is_playing ()) {
       Value val;
-      var video = Totem.get_video_widget (totem) as Bacon.VideoWidget;
+      var video = totem.get_video_widget () as Bacon.VideoWidget;
       video.get_metadata (Bacon.MetadataType.HAS_VIDEO, out val);
       current_media.interpretation = val.get_boolean () ?
         Zeitgeist.NFO_VIDEO : Zeitgeist.NFO_AUDIO;
diff -Nru totem-3.4.3/src/properties/Makefile.am totem-3.6.2/src/properties/Makefile.am
--- totem-3.4.3/src/properties/Makefile.am	2011-08-25 18:35:01.000000000 +0000
+++ totem-3.6.2/src/properties/Makefile.am	2012-08-29 23:07:45.000000000 +0000
@@ -10,7 +10,7 @@
 	$(AM_CPPFLAGS)
 
 libbaconvideowidgetproperties_la_CFLAGS = \
-	$(DEPENDENCY_CFLAGS) \
+	$(PROPERTIES_CFLAGS) \
 	$(WARN_CFLAGS) \
 	$(AM_CFLAGS)
 
diff -Nru totem-3.4.3/src/properties/Makefile.in totem-3.6.2/src/properties/Makefile.in
--- totem-3.4.3/src/properties/Makefile.in	2012-07-04 09:54:52.000000000 +0000
+++ totem-3.6.2/src/properties/Makefile.in	2012-10-25 13:36:24.000000000 +0000
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.12.2 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +15,23 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -35,12 +51,10 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = src/properties
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -55,10 +69,23 @@
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 libbaconvideowidgetproperties_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(libbaconvideowidgetproperties_la_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -71,22 +98,23 @@
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(libbaconvideowidgetproperties_la_SOURCES)
 DIST_SOURCES = $(libbaconvideowidgetproperties_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -105,6 +133,10 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BACKEND_CFLAGS = @BACKEND_CFLAGS@
+BACKEND_LIBS = @BACKEND_LIBS@
+BACKEND_TEST_CFLAGS = @BACKEND_TEST_CFLAGS@
+BACKEND_TEST_LIBS = @BACKEND_TEST_LIBS@
 BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
 BROWSER_PLUGIN_DIR = @BROWSER_PLUGIN_DIR@
 BROWSER_PLUGIN_LIBS = @BROWSER_PLUGIN_LIBS@
@@ -126,8 +158,6 @@
 DBUS_LIBS = @DBUS_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DEPENDENCY_CFLAGS = @DEPENDENCY_CFLAGS@
-DEPENDENCY_LIBS = @DEPENDENCY_LIBS@
 DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 DISC_RECORDER_CFLAGS = @DISC_RECORDER_CFLAGS@
 DISC_RECORDER_LIBS = @DISC_RECORDER_LIBS@
@@ -141,7 +171,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-EXTRA_BACKEND_LIBS = @EXTRA_BACKEND_LIBS@
 FGREP = @FGREP@
 FULL_LIBEXECDIR = @FULL_LIBEXECDIR@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
@@ -149,19 +178,21 @@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_MKENUMS = @GLIB_MKENUMS@
 GLIB_REQS = @GLIB_REQS@
+GLOW_BUTTON_CFLAGS = @GLOW_BUTTON_CFLAGS@
+GLOW_BUTTON_LIBS = @GLOW_BUTTON_LIBS@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
-GST_CFLAGS = @GST_CFLAGS@
-GST_LIBS = @GST_LIBS@
+GST_PLUGINS_BAD_CFLAGS = @GST_PLUGINS_BAD_CFLAGS@
+GST_PLUGINS_BAD_LIBS = @GST_PLUGINS_BAD_LIBS@
 GTKDOC_CHECK = @GTKDOC_CHECK@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
 GTK_REQS = @GTK_REQS@
+HELPER_CFLAGS = @HELPER_CFLAGS@
+HELPER_LIBS = @HELPER_LIBS@
 HELP_DIR = @HELP_DIR@
 HTML_DIR = @HTML_DIR@
 INSTALL = @INSTALL@
@@ -187,11 +218,11 @@
 INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBEPC_CFLAGS = @LIBEPC_CFLAGS@
-LIBEPC_LIBS = @LIBEPC_LIBS@
 LIBGRILO_CFLAGS = @LIBGRILO_CFLAGS@
 LIBGRILO_LIBS = @LIBGRILO_LIBS@
 LIBOBJS = @LIBOBJS@
+LIBPLAYER_CFLAGS = @LIBPLAYER_CFLAGS@
+LIBPLAYER_LIBS = @LIBPLAYER_LIBS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBZEITGEIST_CFLAGS = @LIBZEITGEIST_CFLAGS@
@@ -208,8 +239,6 @@
 MISSING_PLUGINS_CFLAGS = @MISSING_PLUGINS_CFLAGS@
 MISSING_PLUGINS_LIBS = @MISSING_PLUGINS_LIBS@
 MKDIR_P = @MKDIR_P@
-MM_CFLAGS = @MM_CFLAGS@
-MM_LIBS = @MM_LIBS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 NAUTILUSDIR = @NAUTILUSDIR@
@@ -230,15 +259,21 @@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PEASGTK_CFLAGS = @PEASGTK_CFLAGS@
-PEASGTK_LIBS = @PEASGTK_LIBS@
-PEAS_CFLAGS = @PEAS_CFLAGS@
-PEAS_LIBS = @PEAS_LIBS@
+PIXBUF_HELPER_CFLAGS = @PIXBUF_HELPER_CFLAGS@
+PIXBUF_HELPER_LIBS = @PIXBUF_HELPER_LIBS@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLAYER_CFLAGS = @PLAYER_CFLAGS@
+PLAYER_LIBS = @PLAYER_LIBS@
 PLUGINDIR = @PLUGINDIR@
 PLUGINS = @PLUGINS@
+PLUGIN_VIEWER_CFLAGS = @PLUGIN_VIEWER_CFLAGS@
+PLUGIN_VIEWER_LIBS = @PLUGIN_VIEWER_LIBS@
+PREVIEW_CFLAGS = @PREVIEW_CFLAGS@
+PREVIEW_LIBS = @PREVIEW_LIBS@
+PROPERTIES_CFLAGS = @PROPERTIES_CFLAGS@
+PROPERTIES_LIBS = @PROPERTIES_LIBS@
 PYGOBJECT_CFLAGS = @PYGOBJECT_CFLAGS@
 PYGOBJECT_LIBS = @PYGOBJECT_LIBS@
 PYLINT = @PYLINT@
@@ -258,6 +293,10 @@
 SMCLIENT_CFLAGS = @SMCLIENT_CFLAGS@
 SMCLIENT_LIBS = @SMCLIENT_LIBS@
 STRIP = @STRIP@
+THUMBNAILER_CFLAGS = @THUMBNAILER_CFLAGS@
+THUMBNAILER_LIBS = @THUMBNAILER_LIBS@
+TIME_HELPER_CFLAGS = @TIME_HELPER_CFLAGS@
+TIME_HELPER_LIBS = @TIME_HELPER_LIBS@
 TOTEM_API_VERSION = @TOTEM_API_VERSION@
 TOTEM_PLPARSER_REQS = @TOTEM_PLPARSER_REQS@
 TOTEM_VERSION_MAJOR = @TOTEM_VERSION_MAJOR@
@@ -269,9 +308,6 @@
 WARN_CFLAGS = @WARN_CFLAGS@
 WARN_CXXFLAGS = @WARN_CXXFLAGS@
 XGETTEXT = @XGETTEXT@
-XMKMF = @XMKMF@
-XTEST_LIBS = @XTEST_LIBS@
-X_LIBS = @X_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -343,7 +379,7 @@
 	$(AM_CPPFLAGS)
 
 libbaconvideowidgetproperties_la_CFLAGS = \
-	$(DEPENDENCY_CFLAGS) \
+	$(PROPERTIES_CFLAGS) \
 	$(WARN_CFLAGS) \
 	$(AM_CFLAGS)
 
@@ -384,12 +420,14 @@
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(noinst_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
 libbaconvideowidgetproperties.la: $(libbaconvideowidgetproperties_la_OBJECTS) $(libbaconvideowidgetproperties_la_DEPENDENCIES) $(EXTRA_libbaconvideowidgetproperties_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libbaconvideowidgetproperties_la_LINK)  $(libbaconvideowidgetproperties_la_OBJECTS) $(libbaconvideowidgetproperties_la_LIBADD) $(LIBS)
 
@@ -402,25 +440,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libbaconvideowidgetproperties_la-bacon-video-widget-properties.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
@@ -487,6 +522,20 @@
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
 
+cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
+	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
@@ -628,17 +677,18 @@
 .MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am
+	clean-libtool clean-noinstLTLIBRARIES cscopelist ctags \
+	distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am
 
 
 -include $(top_srcdir)/git.mk
diff -Nru totem-3.4.3/src/properties/bacon-video-widget-properties.c totem-3.6.2/src/properties/bacon-video-widget-properties.c
--- totem-3.4.3/src/properties/bacon-video-widget-properties.c	2012-01-10 16:10:04.000000000 +0000
+++ totem-3.6.2/src/properties/bacon-video-widget-properties.c	2012-08-29 23:07:45.000000000 +0000
@@ -141,7 +141,7 @@
 }
 
 static char *
-totem_time_to_string_text (gint64 msecs)
+time_to_string_text (gint64 msecs)
 {
 	char *secs, *mins, *hours, *string;
 	int sec, min, hour, _time;
@@ -195,7 +195,7 @@
 	if (_time == props->priv->time)
 		return;
 
-	string = totem_time_to_string_text (_time);
+	string = time_to_string_text (_time);
 	bacon_video_widget_properties_set_label (props, "duration", string);
 	g_free (string);
 
diff -Nru totem-3.4.3/src/test-properties-page.c totem-3.6.2/src/test-properties-page.c
--- totem-3.4.3/src/test-properties-page.c	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/test-properties-page.c	2012-08-29 23:07:45.000000000 +0000
@@ -27,6 +27,7 @@
 
 #include 
 #include 
+#define GST_USE_UNSTABLE_API 1
 #include 
 #include 
 #include "totem-properties-view.h"
@@ -62,9 +63,6 @@
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	textdomain (GETTEXT_PACKAGE);
 
-#if !GLIB_CHECK_VERSION (2, 31, 0)
-	g_thread_init (NULL);
-#endif
 	gst_init (&argc, &argv);
 	gtk_init (&argc, &argv);
 
diff -Nru totem-3.4.3/src/totem-audio-preview.c totem-3.6.2/src/totem-audio-preview.c
--- totem-3.4.3/src/totem-audio-preview.c	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/totem-audio-preview.c	2012-08-29 23:07:45.000000000 +0000
@@ -87,33 +87,6 @@
 		exit (1);
 	case GST_MESSAGE_EOS:
 		exit (0);
-
-	case GST_MESSAGE_UNKNOWN:
-	case GST_MESSAGE_WARNING:
-	case GST_MESSAGE_INFO:
-	case GST_MESSAGE_TAG:
-	case GST_MESSAGE_BUFFERING:
-	case GST_MESSAGE_STATE_CHANGED:
-	case GST_MESSAGE_STATE_DIRTY:
-	case GST_MESSAGE_STEP_DONE:
-	case GST_MESSAGE_CLOCK_PROVIDE:
-	case GST_MESSAGE_CLOCK_LOST:
-	case GST_MESSAGE_NEW_CLOCK:
-	case GST_MESSAGE_STRUCTURE_CHANGE:
-	case GST_MESSAGE_STREAM_STATUS:
-	case GST_MESSAGE_APPLICATION:
-	case GST_MESSAGE_ELEMENT:
-	case GST_MESSAGE_SEGMENT_START:
-	case GST_MESSAGE_SEGMENT_DONE:
-	case GST_MESSAGE_DURATION:
-	case GST_MESSAGE_LATENCY:
-	case GST_MESSAGE_ASYNC_START:
-	case GST_MESSAGE_ASYNC_DONE:
-	case GST_MESSAGE_REQUEST_STATE:
-	case GST_MESSAGE_STEP_START:
-	case GST_MESSAGE_QOS:
-	case GST_MESSAGE_PROGRESS:
-	case GST_MESSAGE_ANY:
 	default:
 		/* Ignored */
 		;;
@@ -128,7 +101,7 @@
 	GstBus *bus;
 
 	bus = gst_element_get_bus (play);
-	gst_bus_set_sync_handler (bus, (GstBusSyncHandler) error_handler, play);
+	gst_bus_set_sync_handler (bus, (GstBusSyncHandler) error_handler, play, NULL);
 }
 
 static void
@@ -161,10 +134,6 @@
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	textdomain (GETTEXT_PACKAGE);
 
-#if !GLIB_CHECK_VERSION (2, 31, 0)
-	g_thread_init (NULL);
-#endif
-
 	g_set_application_name (_("Audio Preview"));
 	g_setenv("PULSE_PROP_application.icon_name", "totem", TRUE);
 	g_setenv("PULSE_PROP_media.role", "music", TRUE);
@@ -202,7 +171,7 @@
 		return 1;
 	}
 
-	play = gst_element_factory_make ("playbin2", "play");
+	play = gst_element_factory_make ("playbin", "play");
 	setup_play (play);
 	setup_filename (play);
 	setup_errors (play);
diff -Nru totem-3.4.3/src/totem-fullscreen.c totem-3.6.2/src/totem-fullscreen.c
--- totem-3.4.3/src/totem-fullscreen.c	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/totem-fullscreen.c	2012-08-29 23:07:45.000000000 +0000
@@ -36,7 +36,7 @@
 #include "totem-interface.h"
 #include "totem-time-label.h"
 #include "bacon-video-widget.h"
-#include "gsd-media-keys-window.h"
+#include "gd-fullscreen-filter.h"
 
 #define FULLSCREEN_POPUP_TIMEOUT 5
 #define FULLSCREEN_MOTION_TIME 200 /* in milliseconds */
@@ -51,7 +51,6 @@
 G_MODULE_EXPORT gboolean totem_fullscreen_vol_slider_released_cb (GtkWidget *widget, GdkEventButton *event, TotemFullscreen *fs);
 G_MODULE_EXPORT gboolean totem_fullscreen_seek_slider_pressed_cb (GtkWidget *widget, GdkEventButton *event, TotemFullscreen *fs);
 G_MODULE_EXPORT gboolean totem_fullscreen_seek_slider_released_cb (GtkWidget *widget, GdkEventButton *event, TotemFullscreen *fs);
-G_MODULE_EXPORT gboolean totem_fullscreen_motion_notify (GtkWidget *widget, GdkEventMotion *event, TotemFullscreen *fs);
 G_MODULE_EXPORT gboolean totem_fullscreen_control_enter_notify (GtkWidget *widget, GdkEventCrossing *event, TotemFullscreen *fs);
 G_MODULE_EXPORT gboolean totem_fullscreen_control_leave_notify (GtkWidget *widget, GdkEventCrossing *event, TotemFullscreen *fs);
 
@@ -59,7 +58,6 @@
 struct _TotemFullscreenPrivate {
 	BaconVideoWidget *bvw;
 	GtkWidget        *parent_window;
-	GtkWidget        *osd;
 
 	/* Fullscreen Popups */
 	GtkWidget        *exit_popup;
@@ -71,9 +69,9 @@
 	guint             popup_timeout;
 	gboolean          popup_in_progress;
 	gboolean          pointer_on_control;
-	guint             motion_handler_id;
-	guint             motion_start_time;
-	guint             motion_num_events;
+	GdFullscreenFilter *filter;
+	gint64             motion_start_time;
+	guint              motion_num_events;
 
 	gboolean          is_fullscreen;
 
@@ -275,24 +273,25 @@
 	return FALSE;
 }
 
-G_MODULE_EXPORT gboolean
-totem_fullscreen_motion_notify (GtkWidget *widget,
-				GdkEventMotion *event,
-				TotemFullscreen *fs)
+static void
+totem_fullscreen_motion_notify (GdFullscreenFilter *filter,
+				TotemFullscreen    *fs)
 {
-	int motion_delay;
+	gint64 motion_delay;
+	gint64 curr;
 
+	curr = g_get_monotonic_time ();
 	/* Only after FULLSCREEN_MOTION_NUM_EVENTS motion events,
 	   in FULLSCREEN_MOTION_TIME milliseconds will we show
 	   the popups */
-	motion_delay = event->time - fs->priv->motion_start_time;
+	motion_delay = (curr - fs->priv->motion_start_time) / 1000;
 
 	if (fs->priv->motion_start_time == 0 ||
 	    motion_delay < 0 ||
 	    motion_delay > FULLSCREEN_MOTION_TIME) {
-		fs->priv->motion_start_time = event->time;
+		fs->priv->motion_start_time = curr;
 		fs->priv->motion_num_events = 0;
-		return FALSE;
+		return;
 	}
 
 	fs->priv->motion_num_events++;
@@ -301,8 +300,6 @@
 	    fs->priv->motion_num_events > FULLSCREEN_MOTION_NUM_EVENTS) {
 		totem_fullscreen_show_popups (fs, TRUE);
 	}
-
-	return FALSE;
 }
 
 void
@@ -349,37 +346,12 @@
 				     const char *icon_name,
 				     gboolean show_cursor)
 {
-	GtkAllocation allocation;
-	GdkScreen *screen;
-	GdkWindow *window;
-	GdkRectangle rect;
-	int monitor;
-
 	if (icon_name == NULL) {
 		totem_fullscreen_show_popups (fs, show_cursor);
 		return;
 	}
 
-	gtk_widget_get_allocation (GTK_WIDGET (fs->priv->bvw), &allocation);
-	gtk_window_resize (GTK_WINDOW (fs->priv->osd),
-			   allocation.height / 8,
-			   allocation.height / 8);
-
-	window = gtk_widget_get_window (GTK_WIDGET (fs->priv->bvw));
-	screen = gtk_widget_get_screen (GTK_WIDGET (fs->priv->bvw));
-	monitor = gdk_screen_get_monitor_at_window (screen, window);
-	gdk_screen_get_monitor_geometry (screen, monitor, &rect);
-
-	if (gtk_widget_get_direction (GTK_WIDGET (fs->priv->bvw)) == GTK_TEXT_DIR_RTL)
-		gtk_window_move (GTK_WINDOW (fs->priv->osd),
-				 rect.width - 8 - allocation.height / 8,
-				 rect.y + 8);
-	else
-		gtk_window_move (GTK_WINDOW (fs->priv->osd), rect.x + 8, rect.y + 8);
-
-	gsd_media_keys_window_set_action_custom (GSD_MEDIA_KEYS_WINDOW (fs->priv->osd),
-						 icon_name, FALSE);
-	gtk_widget_show (fs->priv->osd);
+	bacon_video_widget_popup_osd (fs->priv->bvw, icon_name);
 }
 
 G_MODULE_EXPORT gboolean
@@ -411,19 +383,13 @@
 
 	bacon_video_widget_set_fullscreen (fs->priv->bvw, fullscreen);
 	totem_fullscreen_set_cursor (fs, !fullscreen);
-	if (fullscreen == FALSE)
-		gtk_widget_hide (fs->priv->osd);
 
 	fs->priv->is_fullscreen = fullscreen;
 
-	if (fullscreen == FALSE && fs->priv->motion_handler_id != 0) {
-		g_signal_handler_disconnect (G_OBJECT (fs->priv->bvw),
-					     fs->priv->motion_handler_id);
-		fs->priv->motion_handler_id = 0;
-	} else if (fullscreen != FALSE && fs->priv->motion_handler_id == 0 && fs->priv->bvw != NULL) {
-		fs->priv->motion_handler_id = g_signal_connect (G_OBJECT (fs->priv->bvw), "motion-notify-event",
-								G_CALLBACK (totem_fullscreen_motion_notify), fs);
-	}
+	if (fullscreen == FALSE)
+		gd_fullscreen_filter_stop (fs->priv->filter);
+	else
+		gd_fullscreen_filter_start (fs->priv->filter);
 }
 
 static void
@@ -469,11 +435,14 @@
 
 	/* Volume */
 	fs->volume = GTK_WIDGET (gtk_builder_get_object (fs->priv->xml, "tcw_volume_button"));
-	
+
 	/* Seek */
 	fs->seek = GTK_WIDGET (gtk_builder_get_object (fs->priv->xml, "tcw_seek_hscale"));
 
 	/* Motion notify */
+	fs->priv->filter = gd_fullscreen_filter_new ();
+	g_signal_connect (G_OBJECT (fs->priv->filter), "motion-event",
+			  G_CALLBACK (totem_fullscreen_motion_notify), fs);
 	gtk_widget_add_events (fs->seek, GDK_POINTER_MOTION_MASK);
 	gtk_widget_add_events (fs->exit_button, GDK_POINTER_MOTION_MASK);
 
@@ -489,11 +458,6 @@
 	g_return_if_fail (fs->priv->bvw == NULL);
 
 	fs->priv->bvw = bvw;
-
-	if (fs->priv->is_fullscreen != FALSE && fs->priv->motion_handler_id == 0) {
-		fs->priv->motion_handler_id = g_signal_connect (G_OBJECT (fs->priv->bvw), "motion-notify-event",
-								G_CALLBACK (totem_fullscreen_motion_notify), fs);
-	}
 }
 
 void
@@ -533,7 +497,6 @@
 			  G_CALLBACK (totem_fullscreen_exit_popup_draw_cb), self);
 	self->priv->control_popup = GTK_WIDGET (gtk_builder_get_object (self->priv->xml,
 				"totem_controls_window"));
-	self->priv->osd = gsd_media_keys_window_new ();
 
 	/* Motion notify */
 	gtk_widget_add_events (self->priv->exit_popup, GDK_POINTER_MOTION_MASK);
@@ -561,15 +524,9 @@
         TotemFullscreen *fs = TOTEM_FULLSCREEN (object);
 
 	totem_fullscreen_popup_timeout_remove (fs);
-	if (fs->priv->motion_handler_id != 0) {
-		g_signal_handler_disconnect (G_OBJECT (fs->priv->bvw),
-					     fs->priv->motion_handler_id);
-		fs->priv->motion_handler_id = 0;
-	}
-
-	if (fs->priv->osd != NULL) {
-		gtk_widget_destroy (fs->priv->osd);
-		fs->priv->osd = NULL;
+	if (fs->priv->filter) {
+		g_object_unref (fs->priv->filter);
+		fs->priv->filter = NULL;
 	}
 
 	g_signal_handlers_disconnect_by_func (fs->priv->parent_window,
diff -Nru totem-3.4.3/src/totem-interface.c totem-3.6.2/src/totem-interface.c
--- totem-3.4.3/src/totem-interface.c	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/totem-interface.c	2012-08-29 23:07:45.000000000 +0000
@@ -289,6 +289,7 @@
 	return filename;
 }
 
+#ifdef GDK_WINDOWING_X11
 static GdkWindow *
 totem_gtk_plug_get_toplevel (GtkPlug *plug)
 {
@@ -320,11 +321,18 @@
 	}
 	while (TRUE);
 }
+#endif /* GDK_WINDOWING_X11 */
 
 void
 totem_interface_set_transient_for (GtkWindow *window, GtkWindow *parent)
 {
-	if (GTK_IS_PLUG (parent)) {
+#ifdef GDK_WINDOWING_X11
+	GdkDisplay *display;
+
+	display = gdk_display_get_default ();
+
+	if (GDK_IS_X11_DISPLAY (display) &&
+	    GTK_IS_PLUG (parent)) {
 		GdkWindow *toplevel;
 
 		gtk_widget_realize (GTK_WIDGET (window));
@@ -334,10 +342,12 @@
 				(gtk_widget_get_window (GTK_WIDGET (window)), toplevel);
 			g_object_unref (toplevel);
 		}
-	} else {
-		gtk_window_set_transient_for (GTK_WINDOW (window),
-				GTK_WINDOW (parent));
+		return;
 	}
+#endif /* GDK_WINDOWING_X11 */
+
+	gtk_window_set_transient_for (GTK_WINDOW (window),
+				      GTK_WINDOW (parent));
 }
 
 char *
diff -Nru totem-3.4.3/src/totem-menu.c totem-3.6.2/src/totem-menu.c
--- totem-3.4.3/src/totem-menu.c	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/totem-menu.c	2012-09-05 18:59:40.000000000 +0000
@@ -24,6 +24,7 @@
 
 #include 
 #include 
+#define GST_USE_UNSTABLE_API 1
 #include 
 #include 
 #include 
@@ -42,14 +43,10 @@
 #define TOTEM_MAX_RECENT_ITEM_LEN 40
 
 /* Callback functions for GtkBuilder */
-G_MODULE_EXPORT void open_action_callback (GtkAction *action, Totem *totem);
-G_MODULE_EXPORT void open_location_action_callback (GtkAction *action, Totem *totem);
 G_MODULE_EXPORT void eject_action_callback (GtkAction *action, Totem *totem);
 G_MODULE_EXPORT void properties_action_callback (GtkAction *action, Totem *totem);
 G_MODULE_EXPORT void play_action_callback (GtkAction *action, Totem *totem);
 G_MODULE_EXPORT void quit_action_callback (GtkAction *action, Totem *totem);
-G_MODULE_EXPORT void preferences_action_callback (GtkAction *action, Totem *totem);
-G_MODULE_EXPORT void fullscreen_action_callback (GtkAction *action, Totem *totem);
 G_MODULE_EXPORT void zoom_1_2_action_callback (GtkAction *action, Totem *totem);
 G_MODULE_EXPORT void zoom_1_1_action_callback (GtkAction *action, Totem *totem);
 G_MODULE_EXPORT void zoom_2_1_action_callback (GtkAction *action, Totem *totem);
@@ -69,14 +66,118 @@
 G_MODULE_EXPORT void contents_action_callback (GtkAction *action, Totem *totem);
 G_MODULE_EXPORT void about_action_callback (GtkAction *action, Totem *totem);
 G_MODULE_EXPORT void plugins_action_callback (GtkAction *action, Totem *totem);
-G_MODULE_EXPORT void repeat_mode_action_callback (GtkToggleAction *action, Totem *totem);
-G_MODULE_EXPORT void shuffle_mode_action_callback (GtkToggleAction *action, Totem *totem);
 G_MODULE_EXPORT void show_controls_action_callback (GtkToggleAction *action, Totem *totem);
 G_MODULE_EXPORT void show_sidebar_action_callback (GtkToggleAction *action, Totem *totem);
 G_MODULE_EXPORT void aspect_ratio_changed_callback (GtkRadioAction *action, GtkRadioAction *current, Totem *totem);
 G_MODULE_EXPORT void select_subtitle_action_callback (GtkAction *action, Totem *totem);
 G_MODULE_EXPORT void clear_playlist_action_callback (GtkAction *action, Totem *totem);
 
+static void
+open_action_cb (GSimpleAction *action,
+		GVariant      *parameter,
+		gpointer       user_data)
+{
+	totem_action_open (TOTEM_OBJECT (user_data));
+}
+
+static void
+open_location_action_cb (GSimpleAction *action,
+			 GVariant      *parameter,
+			 gpointer       user_data)
+{
+	totem_action_open_location (TOTEM_OBJECT (user_data));
+}
+
+static void
+preferences_action_cb (GSimpleAction *action,
+		       GVariant      *parameter,
+		       gpointer       user_data)
+{
+	gtk_widget_show (TOTEM_OBJECT (user_data)->prefs);
+}
+
+static void
+fullscreen_change_state (GSimpleAction *action,
+			 GVariant      *value,
+			 gpointer       user_data)
+{
+	gboolean param;
+
+	param = g_variant_get_boolean (value);
+	totem_action_fullscreen (TOTEM_OBJECT (user_data), param);
+
+	g_simple_action_set_state (action, value);
+}
+
+static void
+shuffle_change_state (GSimpleAction *action,
+		      GVariant      *value,
+		      gpointer       user_data)
+{
+	gboolean param;
+
+	param = g_variant_get_boolean (value);
+	totem_playlist_set_shuffle (TOTEM_OBJECT (user_data)->playlist, param);
+
+	g_simple_action_set_state (action, value);
+}
+
+static void
+repeat_change_state (GSimpleAction *action,
+		     GVariant      *value,
+		     gpointer       user_data)
+{
+	gboolean param;
+
+	param = g_variant_get_boolean (value);
+	totem_playlist_set_repeat (TOTEM_OBJECT (user_data)->playlist, param);
+
+	g_simple_action_set_state (action, value);
+}
+
+static void
+toggle_action_cb (GSimpleAction *action,
+		  GVariant      *parameter,
+		  gpointer       user_data)
+{
+	GVariant *state;
+
+	state = g_action_get_state (G_ACTION (action));
+	g_action_change_state (G_ACTION (action), g_variant_new_boolean (!g_variant_get_boolean (state)));
+	g_variant_unref (state);
+}
+
+static void
+quit_action_cb (GSimpleAction *action,
+		GVariant      *parameter,
+		gpointer       user_data)
+{
+	totem_action_exit (TOTEM_OBJECT (user_data));
+}
+
+static GActionEntry app_entries[] = {
+	{ "open", open_action_cb, NULL, NULL, NULL },
+	{ "open-location", open_location_action_cb, NULL, NULL, NULL },
+	{ "fullscreen", toggle_action_cb, NULL, "false", fullscreen_change_state },
+	{ "preferences", preferences_action_cb, NULL, NULL, NULL },
+	{ "shuffle", toggle_action_cb, NULL, "false", shuffle_change_state },
+	{ "repeat", toggle_action_cb, NULL, "false", repeat_change_state },
+	{ "quit", quit_action_cb, NULL, NULL, NULL },
+};
+
+void
+totem_app_menu_setup (Totem *totem)
+{
+	GMenuModel *appmenu;
+
+	g_action_map_add_action_entries (G_ACTION_MAP (totem), app_entries, G_N_ELEMENTS (app_entries), totem);
+
+	appmenu = (GMenuModel *)gtk_builder_get_object (totem->xml, "appmenu");
+	gtk_application_set_app_menu (GTK_APPLICATION (totem), appmenu);
+
+	gtk_window_set_application (GTK_WINDOW (totem->win), GTK_APPLICATION (totem));
+}
+
 /* Helper function to escape underscores in labels
  * before putting them in menu items */
 static char *
@@ -215,7 +316,7 @@
 		add_lang_action (totem, action_group, ui_id, paths, prefix,
 				 action_data, i, num + 1, &group);
 		g_free (action_data);
- 		i++;
+		i++;
 	}
 
 	g_hash_table_destroy (lookup);
@@ -276,7 +377,7 @@
 		action = create_lang_actions (totem, totem->languages_action_group,
 				totem->languages_ui_id,
 				paths,
-			       	"languages", list, TRUE);
+				"languages", list, TRUE);
 		gtk_ui_manager_ensure_update (totem->ui_manager);
 
 		current = bacon_video_widget_get_language (totem->bvw);
@@ -316,7 +417,7 @@
 		action = create_lang_actions (totem, totem->subtitles_action_group,
 				totem->subtitles_ui_id,
 				paths,
-			       	"subtitles", list, FALSE);
+				"subtitles", list, FALSE);
 		gtk_ui_manager_ensure_update (totem->ui_manager);
 
 		current = bacon_video_widget_get_subtitle (totem->bvw);
@@ -386,7 +487,7 @@
 	uri = gtk_recent_info_get_uri (recent_info);
 	display_name = gtk_recent_info_get_display_name (recent_info);
 
-	totem_add_to_playlist_and_play (totem, uri, display_name, FALSE);
+	totem_add_to_playlist_and_play (totem, uri, display_name);
 }
 
 static gint
@@ -447,8 +548,8 @@
                 info = (GtkRecentInfo *) l->data;
 
                 if (gtk_recent_info_has_group (info, "Totem")) {
-                	gtk_recent_info_ref (info);
-                	totem_items = g_list_prepend (totem_items, info);
+			gtk_recent_info_ref (info);
+			totem_items = g_list_prepend (totem_items, info);
 		}
 	}
 	g_list_foreach (items, (GFunc) gtk_recent_info_unref, NULL);
@@ -532,492 +633,6 @@
 	totem_recent_manager_changed_callback (totem->recent_manager, totem);
 }
 
-static void
-recent_info_cb (GFile *file,
-		GAsyncResult *res,
-		Totem *totem)
-{
-	GtkRecentData data;
-	char *groups[] = { NULL, NULL };
-	GFileInfo *file_info;
-	const char *uri, *display_name;
-
-	memset (&data, 0, sizeof (data));
-
-	file_info = g_file_query_info_finish (file, res, NULL);
-	uri = g_object_get_data (G_OBJECT (file), "uri");
-	display_name = g_object_get_data (G_OBJECT (file), "display_name");
-
-	/* Probably an unsupported URI scheme */
-	if (file_info == NULL) {
-		data.display_name = g_strdup (display_name);
-		/* Bogus mime-type, we just want it added */
-		data.mime_type = g_strdup ("video/x-totem-stream");
-		groups[0] = (gchar*) "TotemStreams";
-	} else {
-		data.mime_type = g_strdup (g_file_info_get_content_type (file_info));
-		data.display_name = g_strdup (g_file_info_get_display_name (file_info));
-		g_object_unref (file_info);
-		groups[0] = (gchar*) "Totem";
-	}
-
-	data.app_name = g_strdup (g_get_application_name ());
-	data.app_exec = g_strjoin (" ", g_get_prgname (), "%u", NULL);
-	data.groups = groups;
-	if (gtk_recent_manager_add_full (totem->recent_manager,
-					 uri, &data) == FALSE) {
-		g_warning ("Couldn't add recent file for '%s'", uri);
-	}
-
-	g_free (data.display_name);
-	g_free (data.mime_type);
-	g_free (data.app_name);
-	g_free (data.app_exec);
-
-	g_object_unref (file);
-}
-
-void
-totem_action_add_recent (Totem      *totem,
-			 const char *uri,
-			 const char *display_name,
-			 const char *content_type)
-{
-	GFile *file;
-
-	if (totem_is_special_mrl (uri) != FALSE)
-		return;
-
-	/* If we already have a content-type, the display_name is
-	 * probably decent as well */
-	if (content_type != NULL) {
-		GtkRecentData data;
-		char *groups[] = { NULL, NULL };
-
-		memset (&data, 0, sizeof (data));
-
-		data.mime_type = (char *) content_type;
-		data.display_name = (char *) display_name;
-		groups[0] = (char*) "Totem";
-		data.app_name = (char *) g_get_application_name ();
-		data.app_exec = g_strjoin (" ", g_get_prgname (), "%u", NULL);
-		data.groups = groups;
-
-		if (gtk_recent_manager_add_full (totem->recent_manager,
-						 uri, &data) == FALSE) {
-			g_warning ("Couldn't add recent file for '%s'", uri);
-		}
-		g_free (data.app_exec);
-
-		return;
-	}
-
-	file = g_file_new_for_uri (uri);
-	g_object_set_data_full (G_OBJECT (file), "uri", g_strdup (uri), g_free);
-	g_object_set_data_full (G_OBJECT (file), "display_name", g_strdup (display_name), g_free);
-	g_file_query_info_async (file,
-				 G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE "," G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME,
-				 G_FILE_QUERY_INFO_NONE, 0, NULL, (GAsyncReadyCallback) recent_info_cb, totem);
-}
-
-/* Play Disc menu items */
-
-static void
-on_play_disc_activate (GtkAction *action, Totem *totem)
-{
-	char *device_path;
-
-	device_path = g_object_get_data (G_OBJECT (action), "device_path");
-	totem_action_play_media_device (totem, device_path);
-}
-
-static const char *
-get_icon_name_for_gicon (GtkIconTheme *theme,
-			 GIcon *icon)
-{
-	const char * const *icon_names;
-	const char *icon_name;
-	guint j;
-
-	icon_name = NULL;
-
-	if (G_IS_EMBLEMED_ICON (icon) != FALSE) {
-		GIcon *new_icon;
-		new_icon = g_emblemed_icon_get_icon (G_EMBLEMED_ICON (icon));
-		g_object_unref (icon);
-		icon = g_object_ref (new_icon);
-	}
-
-	if (G_IS_THEMED_ICON (icon)) {
-		icon_names = g_themed_icon_get_names (G_THEMED_ICON (icon));
-
-		for (j = 0; icon_names[j] != NULL; j++) {
-			icon_name = icon_names[j];
-			if (gtk_icon_theme_has_icon (theme, icon_name) != FALSE)
-				break;
-		}
-	}
-
-	return icon_name;
-}
-
-static char *
-unescape_archive_name (GFile *root)
-{
-	char *uri;
-	guint len;
-	char *escape1, *escape2;
-
-	uri = g_file_get_uri (root);
-
-	/* Remove trailing slash */
-	len = strlen (uri);
-	if (uri[len - 1] == '/')
-		uri[len - 1] = '\0';
-
-	/* Unescape the path */
-	escape1 = g_uri_unescape_string (uri + strlen ("archive://"), NULL);
-	escape2 = g_uri_unescape_string (escape1, NULL);
-	g_free (escape1);
-	g_free (uri);
-
-	return escape2;
-}
-
-static void
-add_mount_to_menu (GMount *mount,
-		   GtkIconTheme *theme,
-		   guint position,
-		   Totem *totem)
-{
-	char *name, *escaped_name, *label;
-	GtkAction *action;
-	GIcon *icon;
-	const char *icon_name;
-	char *device_path;
-
-	GVolume *volume;
-	GFile *root, *iso;
-	char **content_types;
-	gboolean has_content;
-	guint i;
-
-	/* Check whether we have an archive mount */
-	volume = g_mount_get_volume (mount);
-	if (volume != NULL) {
-		g_object_unref (volume);
-		return;
-	}
-
-	root = g_mount_get_root (mount);
-	if (g_file_has_uri_scheme (root, "archive") == FALSE) {
-		g_object_unref (root);
-		return;
-	}
-
-	/* Check whether it's a DVD or VCD image */
-	content_types = g_content_type_guess_for_tree (root);
-	if (content_types == NULL ||
-	    g_strv_length (content_types) == 0) {
-		g_strfreev (content_types);
-		g_object_unref (root);
-		return;
-	}
-
-	has_content = FALSE;
-	for (i = 0; content_types[i] != NULL; i++) {
-		/* XXX: Keep in sync with mime-type-list.txt */
-		if (g_str_equal (content_types[i], "x-content/video-dvd") ||
-		    g_str_equal (content_types[i], "x-content/video-vcd") ||
-		    g_str_equal (content_types[i], "x-content/video-svcd")) {
-			has_content = TRUE;
-			break;
-		}
-	}
-	g_strfreev (content_types);
-
-	if (has_content == FALSE) {
-		g_object_unref (root);
-		return;
-	}
-
-	device_path = unescape_archive_name (root);
-	g_object_unref (root);
-
-	/* And ensure it's a local path */
-	iso = g_file_new_for_uri (device_path);
-	g_free (device_path);
-	device_path = g_file_get_path (iso);
-	g_object_unref (iso);
-
-	/* Work out an icon to display */
-	icon = g_mount_get_icon (mount);
-	icon_name = get_icon_name_for_gicon (theme, icon);
-
-	/* Get the mount's pretty name for the menu label */
-	name = g_mount_get_name (mount);
-	g_strstrip (name);
-	escaped_name = escape_label_for_menu (name);
-	g_free (name);
-	/* Translators:
-	 * This is not a JPEG image, but a disc image, for example,
-	 * an ISO file */
-	label = g_strdup_printf (_("Play Image '%s'"), escaped_name);
-	g_free (escaped_name);
-
-	name = g_strdup_printf (_("device%d"), position);
-
-	action = gtk_action_new (name, label, NULL, NULL);
-	g_object_set (G_OBJECT (action),
-		      "icon-name", icon_name, NULL);
-	gtk_action_set_always_show_image (action, TRUE);
-	gtk_action_group_add_action (totem->devices_action_group, action);
-	g_object_unref (action);
-
-	gtk_ui_manager_add_ui (totem->ui_manager, totem->devices_ui_id,
-			       "/tmw-menubar/movie/devices-placeholder", name, name,
-			       GTK_UI_MANAGER_MENUITEM, FALSE);
-
-	g_free (name);
-	g_free (label);
-	g_object_unref (icon);
-
-	g_object_set_data_full (G_OBJECT (action),
-				"device_path", device_path,
-				(GDestroyNotify) g_free);
-
-	g_signal_connect (G_OBJECT (action), "activate",
-			  G_CALLBACK (on_play_disc_activate), totem);
-}
-
-static void
-add_volume_to_menu (GVolume *volume,
-		    GDrive *drive,
-		    GtkIconTheme *theme,
-		    guint position,
-		    Totem *totem)
-{
-	char *name, *escaped_name, *label;
-	GtkAction *action;
-	gboolean disabled;
-	GIcon *icon;
-	const char *icon_name;
-	char *device_path;
-	GtkWidget *menu_item;
-	char *menu_item_path;
-
-	disabled = FALSE;
-	device_path = NULL;
-
-	/* Add devices with blank CDs and audio CDs in them, but disable them */
-	if (drive != NULL) {
-		device_path = g_volume_get_identifier (volume, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE);
-		if (device_path == NULL)
-			return;
-	}
-
-	/* Check whether we have a media... */
-	if (drive != NULL &&
-	    g_drive_has_media (drive) == FALSE) {
-		disabled = TRUE;
-	} else {
-		/* ... Or an audio CD or a blank media */
-		GMount *mount;
-		GFile *root;
-
-		mount = g_volume_get_mount (volume);
-		if (mount != NULL) {
-			root = g_mount_get_root (mount);
-			g_object_unref (mount);
-
-			if (g_file_has_uri_scheme (root, "burn") != FALSE || g_file_has_uri_scheme (root, "cdda") != FALSE)
-				disabled = TRUE;
-			g_object_unref (root);
-		}
-	}
-
-	/* Work out an icon to display */
-	icon = g_volume_get_icon (volume);
-	icon_name = get_icon_name_for_gicon (theme, icon);
-
-	/* Get the volume's pretty name for the menu label */
-	name = g_volume_get_name (volume);
-	g_strstrip (name);
-	escaped_name = escape_label_for_menu (name);
-	g_free (name);
-	label = g_strdup_printf (_("Play Disc '%s'"), escaped_name);
-	g_free (escaped_name);
-
-	name = g_strdup_printf (_("device%d"), position);
-
-	action = gtk_action_new (name, label, NULL, NULL);
-	g_object_set (G_OBJECT (action),
-		      "icon-name", icon_name,
-		      "sensitive", !disabled, NULL);
-	gtk_action_group_add_action (totem->devices_action_group, action);
-	g_object_unref (action);
-
-	gtk_ui_manager_add_ui (totem->ui_manager, totem->devices_ui_id,
-			       "/tmw-menubar/movie/devices-placeholder", name, name,
-			       GTK_UI_MANAGER_MENUITEM, FALSE);
-
-	/* TODO: This can be made cleaner once bug #589842 is fixed */
-	menu_item_path = g_strdup_printf ("/tmw-menubar/movie/devices-placeholder/%s", name);
-	menu_item = gtk_ui_manager_get_widget (totem->ui_manager, menu_item_path);
-	g_free (menu_item_path);
-
-	if (menu_item != NULL)
-		gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (menu_item), TRUE);
-
-	g_free (name);
-	g_free (label);
-	g_object_unref (icon);
-
-	if (disabled != FALSE) {
-		g_free (device_path);
-		return;
-	}
-
-	g_object_set_data_full (G_OBJECT (action),
-				"device_path", device_path,
-				(GDestroyNotify) g_free);
-
-	g_signal_connect (G_OBJECT (action), "activate",
-			  G_CALLBACK (on_play_disc_activate), totem);
-}
-
-static void
-add_drive_to_menu (GDrive *drive,
-		   GtkIconTheme *theme,
-		   guint position,
-		   Totem *totem)
-{
-	GList *volumes, *i;
-
-	/* FIXME: We used to explicitly check whether it was a CD/DVD drive
-	 * Use:
-	 * udi = g_volume_get_identifier (i->data, G_VOLUME_IDENTIFIER_KIND_HAL_UDI); */
-	if (g_drive_can_eject (drive) == FALSE)
-		return;
-
-	/* Repeat for all the drive's volumes */
-	volumes = g_drive_get_volumes (drive);
-
-	for (i = volumes; i != NULL; i = i->next) {
-		GVolume *volume = i->data;
-		add_volume_to_menu (volume, drive, theme, position, totem);
-		g_object_unref (volume);
-	}
-
-	g_list_free (volumes);
-}
-
-static void
-update_drive_menu_items (GtkMenuItem *movie_menuitem, Totem *totem)
-{
-	GList *drives, *mounts, *i;
-	GtkIconTheme *theme;
-	guint position;
-
-	/* Add any suitable devices to the menu */
-	position = 0;
-
-	theme = gtk_icon_theme_get_default ();
-
-	drives = g_volume_monitor_get_connected_drives (totem->monitor);
-	for (i = drives; i != NULL; i = i->next) {
-		GDrive *drive = i->data;
-
-		position++;
-		add_drive_to_menu (drive, theme, position, totem);
-		g_object_unref (drive);
-	}
-	g_list_free (drives);
-
-	/* Look for mounted archives */
-	mounts = g_volume_monitor_get_mounts (totem->monitor);
-	for (i = mounts; i != NULL; i = i->next) {
-		GMount *mount = i->data;
-
-		position++;
-		add_mount_to_menu (mount, theme, position, totem);
-		g_object_unref (mount);
-	}
-	g_list_free (mounts);
-
-	totem->drives_changed = FALSE;
-}
-
-static void
-on_movie_menu_select (GtkMenuItem *movie_menuitem, Totem *totem)
-{
-	if (totem->drives_changed == FALSE)
-		return;
-
-	/* Remove old UI */
-	gtk_ui_manager_remove_ui (totem->ui_manager, totem->devices_ui_id);
-	gtk_ui_manager_ensure_update (totem->ui_manager);
-
-	/* Create new ActionGroup */
-	if (totem->devices_action_group) {
-		gtk_ui_manager_remove_action_group (totem->ui_manager,
-				totem->devices_action_group);
-		g_object_unref (totem->devices_action_group);
-	}
-	totem->devices_action_group = gtk_action_group_new ("devices-action-group");
-	gtk_ui_manager_insert_action_group (totem->ui_manager,
-			totem->devices_action_group, -1);
-
-	update_drive_menu_items (movie_menuitem, totem);
-
-	gtk_ui_manager_ensure_update (totem->ui_manager);
-}
-
-static void
-on_g_volume_monitor_event (GVolumeMonitor *monitor,
-			   gpointer *device,
-			   Totem *totem)
-{
-	totem->drives_changed = TRUE;
-}
-
-void
-totem_setup_play_disc (Totem *totem)
-{
-	GtkWidget *item;
-
-	item = gtk_ui_manager_get_widget (totem->ui_manager, "/tmw-menubar/movie");
-	g_signal_connect (G_OBJECT (item), "select",
-			G_CALLBACK (on_movie_menu_select), totem);
-
-	g_signal_connect (G_OBJECT (totem->monitor),
-			"volume-added",
-			G_CALLBACK (on_g_volume_monitor_event), totem);
-	g_signal_connect (G_OBJECT (totem->monitor),
-			"volume-removed",
-			G_CALLBACK (on_g_volume_monitor_event), totem);
-	g_signal_connect (G_OBJECT (totem->monitor),
-			"mount-added",
-			G_CALLBACK (on_g_volume_monitor_event), totem);
-	g_signal_connect (G_OBJECT (totem->monitor),
-			"mount-removed",
-			G_CALLBACK (on_g_volume_monitor_event), totem);
-
-	totem->drives_changed = TRUE;
-}
-
-void
-open_action_callback (GtkAction *action, Totem *totem)
-{
-	totem_action_open (totem);
-}
-
-void
-open_location_action_callback (GtkAction *action, Totem *totem)
-{
-	totem_action_open_location (totem);
-}
-
 void
 eject_action_callback (GtkAction *action, Totem *totem)
 {
@@ -1043,21 +658,9 @@
 }
 
 void
-preferences_action_callback (GtkAction *action, Totem *totem)
-{
-	gtk_widget_show (totem->prefs);
-}
-
-void
-fullscreen_action_callback (GtkAction *action, Totem *totem)
-{
-	totem_action_fullscreen_toggle (totem);
-}
-
-void
 zoom_1_2_action_callback (GtkAction *action, Totem *totem)
 {
-	totem_action_set_scale_ratio (totem, 0.5); 
+	totem_action_set_scale_ratio (totem, 0.5);
 }
 
 void
@@ -1085,7 +688,7 @@
 {
 	totem_playlist_select_subtitle_dialog (totem->playlist,
 					       TOTEM_PLAYLIST_DIALOG_PLAYING);
-} 
+}
 
 void
 next_angle_action_callback (GtkAction *action, Totem *totem)
@@ -1168,8 +771,6 @@
 void
 about_action_callback (GtkAction *action, Totem *totem)
 {
-	char *backend_version, *description;
-
 	const char *authors[] =
 	{
 		"Bastien Nocera ",
@@ -1180,20 +781,13 @@
 		NULL
 	};
 	const char *artists[] = { "Jakub Steiner ", NULL };
-	#include "../help/totem-docs.h"
 	char *license = totem_interface_get_license ();
 
-	backend_version = bacon_video_widget_get_backend_name (totem->bvw);
-	/* This lists the back-end type and version, such as
-	 * Movie Player using GStreamer 0.10.1 */
-	description = g_strdup_printf (_("Movie Player using %s"), backend_version);
-
 	gtk_show_about_dialog (GTK_WINDOW (totem->win),
 				     "version", VERSION,
 				     "copyright", _("Copyright \xc2\xa9 2002-2009 Bastien Nocera"),
-				     "comments", description,
+				     "comments", _("Videos"),
 				     "authors", authors,
-				     "documenters", documentation_credits,
 				     "artists", artists,
 				     "translator-credits", _("translator-credits"),
 				     "logo-icon-name", "totem",
@@ -1202,9 +796,6 @@
 				     "website-label", _("Totem Website"),
 				     "website", "http://projects.gnome.org/totem/",
 				     NULL);
-
-	g_free (backend_version);
-	g_free (description);
 	g_free (license);
 }
 
@@ -1262,20 +853,6 @@
 }
 
 void
-repeat_mode_action_callback (GtkToggleAction *action, Totem *totem)
-{
-	totem_playlist_set_repeat (totem->playlist,
-			gtk_toggle_action_get_active (action));
-}
-
-void
-shuffle_mode_action_callback (GtkToggleAction *action, Totem *totem)
-{
-	totem_playlist_set_shuffle (totem->playlist,
-			gtk_toggle_action_get_active (action));
-}
-
-void
 show_controls_action_callback (GtkToggleAction *action, Totem *totem)
 {
 	gboolean show;
diff -Nru totem-3.4.3/src/totem-menu.h totem-3.6.2/src/totem-menu.h
--- totem-3.4.3/src/totem-menu.h	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/totem-menu.h	2012-08-29 23:07:45.000000000 +0000
@@ -27,18 +27,14 @@
 
 G_BEGIN_DECLS
 
+void totem_app_menu_setup (Totem *totem);
+
 void totem_ui_manager_setup (Totem *totem);
 
 void totem_sublang_update (Totem *totem);
 void totem_sublang_exit (Totem *totem);
 
-void totem_setup_play_disc (Totem *totem);
-
 void totem_setup_recent (Totem *totem);
-void totem_action_add_recent (Totem      *totem,
-			      const char *uri,
-			      const char *display_name,
-			      const char *content_type);
 
 G_END_DECLS
 
diff -Nru totem-3.4.3/src/totem-object.c totem-3.6.2/src/totem-object.c
--- totem-3.4.3/src/totem-object.c	2012-07-04 10:15:49.000000000 +0000
+++ totem-3.6.2/src/totem-object.c	2012-10-25 13:15:32.000000000 +0000
@@ -41,22 +41,16 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
 
 #include 
 
-#ifdef GDK_WINDOWING_X11
-/* X11 headers */
-#include 
-#include 
-#endif
-
 #include "totem.h"
 #include "totemobject-marshal.h"
 #include "totem-private.h"
+#include "totem-options.h"
 #include "totem-plugins-engine.h"
 #include "totem-playlist.h"
 #include "bacon-video-widget.h"
@@ -93,7 +87,6 @@
 };
 
 static gboolean totem_action_open_files_list (TotemObject *totem, GSList *list);
-static gboolean totem_action_load_media (TotemObject *totem, TotemDiscMediaType type, const char *device);
 static void update_buttons (TotemObject *totem);
 static void update_fill (TotemObject *totem, gdouble level);
 static void update_media_menu_items (TotemObject *totem);
@@ -120,14 +113,18 @@
 	PROP_SEEKABLE,
 	PROP_CURRENT_TIME,
 	PROP_CURRENT_MRL,
-	PROP_AUTOLOAD_SUBTITLES,
+	PROP_CURRENT_CONTENT_TYPE,
+	PROP_CURRENT_DISPLAY_NAME,
 	PROP_REMEMBER_POSITION
 };
 
 enum {
 	FILE_OPENED,
 	FILE_CLOSED,
+	FILE_HAS_PLAYED,
 	METADATA_UPDATED,
+	GET_USER_AGENT,
+	GET_TEXT_SUBTITLE,
 	LAST_SIGNAL
 };
 
@@ -143,19 +140,95 @@
 
 static int totem_table_signals[LAST_SIGNAL] = { 0 };
 
-G_DEFINE_TYPE(TotemObject, totem_object, G_TYPE_OBJECT)
+G_DEFINE_TYPE(TotemObject, totem_object, GTK_TYPE_APPLICATION)
+
+static gboolean
+totem_object_local_command_line (GApplication              *application,
+				 gchar                   ***arguments,
+				 int                       *exit_status)
+{
+	GOptionContext *context;
+	GError *error = NULL;
+	char **argv;
+	int argc;
+
+	/* Dupe so that the remote arguments are listed, but
+	 * not removed from the list */
+	argv = g_strdupv (*arguments);
+	argc = g_strv_length (argv);
+
+	context = totem_options_get_context ();
+	if (g_option_context_parse (context, &argc, &argv, &error) == FALSE) {
+		g_print (_("%s\nRun '%s --help' to see a full list of available command line options.\n"),
+				error->message, argv[0]);
+		g_error_free (error);
+	        *exit_status = 1;
+	        goto bail;
+	}
+
+	/* Replace relative paths with absolute URIs */
+	if (optionstate.filenames != NULL) {
+		guint n_files;
+		int i, n_args;
+
+		n_args = g_strv_length (*arguments);
+		n_files = g_strv_length (optionstate.filenames);
+
+		i = n_args - n_files;
+		for ( ; i < n_args; i++) {
+			char *new_path;
+
+			new_path = totem_create_full_path ((*arguments)[i]);
+			if (new_path == NULL)
+				continue;
+
+			g_free ((*arguments)[i]);
+			(*arguments)[i] = new_path;
+		}
+	}
+
+	g_strfreev (optionstate.filenames);
+	optionstate.filenames = NULL;
+
+	*exit_status = 0;
+bail:
+	g_option_context_free (context);
+	g_strfreev (argv);
+
+	return FALSE;
+}
+
+static gboolean
+accumulator_first_non_null_wins (GSignalInvocationHint *ihint,
+				 GValue *return_accu,
+				 const GValue *handler_return,
+				 gpointer data)
+{
+	const gchar *str;
+
+	str = g_value_get_string (handler_return);
+	if (str == NULL)
+		return TRUE;
+	g_value_set_string (return_accu, str);
+
+	return FALSE;
+}
 
 static void
 totem_object_class_init (TotemObjectClass *klass)
 {
 	GObjectClass *object_class;
+	GApplicationClass *app_class;
 
 	object_class = (GObjectClass *) klass;
+	app_class = (GApplicationClass *) klass;
 
 	object_class->set_property = totem_object_set_property;
 	object_class->get_property = totem_object_get_property;
 	object_class->finalize = totem_object_finalize;
 
+	app_class->local_command_line = totem_object_local_command_line;
+
 	/**
 	 * TotemObject:fullscreen:
 	 *
@@ -213,14 +286,26 @@
 							      NULL, G_PARAM_READABLE));
 
 	/**
-	 * TotemObject:autoload-subtitles:
+	 * TotemObject:current-content-type:
 	 *
-	 * If %TRUE, Totem will automatically load any subtitle files it finds for each newly opened video.
+	 * The content-type of the current stream.
 	 **/
-	g_object_class_install_property (object_class, PROP_AUTOLOAD_SUBTITLES,
-					 g_param_spec_boolean ("autoload-subtitles", "Autoload subtitles?",
-					                       "Whether to automatically load any subtitle files Totem finds.",
-							       FALSE, G_PARAM_READWRITE));
+	g_object_class_install_property (object_class, PROP_CURRENT_CONTENT_TYPE,
+					 g_param_spec_string ("current-content-type",
+							      "Current stream's content-type",
+							      "Current stream's content-type.",
+							      NULL, G_PARAM_READABLE));
+
+	/**
+	 * TotemObject:current-display-name:
+	 *
+	 * The display name of the current stream.
+	 **/
+	g_object_class_install_property (object_class, PROP_CURRENT_DISPLAY_NAME,
+					 g_param_spec_string ("current-display-name",
+							      "Current stream's display name",
+							      "Current stream's display name.",
+							      NULL, G_PARAM_READABLE));
 
 	/**
 	 * TotemObject:remember-position:
@@ -249,6 +334,22 @@
 				G_TYPE_NONE, 1, G_TYPE_STRING);
 
 	/**
+	 * TotemObject::file-has-played:
+	 * @totem: the #TotemObject which received the signal
+	 * @mrl: the MRL of the opened stream
+	 *
+	 * The #TotemObject::file-has-played signal is emitted when a new stream has started playing in Totem.
+	 */
+	totem_table_signals[FILE_HAS_PLAYED] =
+		g_signal_new ("file-has-played",
+				G_TYPE_FROM_CLASS (object_class),
+				G_SIGNAL_RUN_LAST,
+				G_STRUCT_OFFSET (TotemObjectClass, file_has_played),
+				NULL, NULL,
+				g_cclosure_marshal_VOID__STRING,
+				G_TYPE_NONE, 1, G_TYPE_STRING);
+
+	/**
 	 * TotemObject::file-closed:
 	 * @totem: the #TotemObject which received the signal
 	 *
@@ -282,6 +383,44 @@
 				NULL, NULL,
 				totemobject_marshal_VOID__STRING_STRING_STRING_UINT,
 				G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT);
+
+	/**
+	 * TotemObject::get-user-agent:
+	 * @totem: the #TotemObject which received the signal
+	 * @mrl: the MRL of the opened stream
+	 *
+	 * The #TotemObject::get-user-agent signal is emitted before opening a stream, so that plugins
+	 * have the opportunity to return the user-agent to be set.
+	 *
+	 * Return value: allocated string representing the user-agent to use for @mrl
+	 */
+	totem_table_signals[GET_USER_AGENT] =
+		g_signal_new ("get-user-agent",
+			      G_TYPE_FROM_CLASS (object_class),
+			      G_SIGNAL_RUN_LAST,
+			      G_STRUCT_OFFSET (TotemObjectClass, get_user_agent),
+			      accumulator_first_non_null_wins, NULL,
+			      totemobject_marshal_STRING__STRING,
+			      G_TYPE_STRING, 1, G_TYPE_STRING);
+
+	/**
+	 * TotemObject::get-text-subtitle:
+	 * @totem: the #TotemObject which received the signal
+	 * @mrl: the MRL of the opened stream
+	 *
+	 * The #TotemObject::get-text-subtitle signal is emitted before opening a stream, so that plugins
+	 * have the opportunity to detect or download text subtitles for the stream if necessary.
+	 *
+	 * Return value: allocated string representing the URI of the subtitle to use for @mrl
+	 */
+	totem_table_signals[GET_TEXT_SUBTITLE] =
+		g_signal_new ("get-text-subtitle",
+			      G_TYPE_FROM_CLASS (object_class),
+			      G_SIGNAL_RUN_LAST,
+			      G_STRUCT_OFFSET (TotemObjectClass, get_text_subtitle),
+			      accumulator_first_non_null_wins, NULL,
+			      totemobject_marshal_STRING__STRING,
+			      G_TYPE_STRING, 1, G_TYPE_STRING);
 }
 
 static void
@@ -306,10 +445,6 @@
 	TotemObject *totem = TOTEM_OBJECT (object);
 
 	switch (property_id) {
-		case PROP_AUTOLOAD_SUBTITLES:
-			totem->autoload_subs = g_value_get_boolean (value);
-			g_object_notify (object, "autoload-subtitles");
-			break;
 		case PROP_REMEMBER_POSITION:
 			totem->remember_position = g_value_get_boolean (value);
 			g_object_notify (object, "remember-position");
@@ -349,8 +484,11 @@
 	case PROP_CURRENT_MRL:
 		g_value_set_string (value, totem->mrl);
 		break;
-	case PROP_AUTOLOAD_SUBTITLES:
-		g_value_set_boolean (value, totem->autoload_subs);
+	case PROP_CURRENT_CONTENT_TYPE:
+		g_value_take_string (value, totem_playlist_get_current_content_type (totem->playlist));
+		break;
+	case PROP_CURRENT_DISPLAY_NAME:
+		g_value_take_string (value, totem_playlist_get_current_title (totem->playlist));
 		break;
 	case PROP_REMEMBER_POSITION:
 		g_value_set_boolean (value, totem->remember_position);
@@ -384,10 +522,7 @@
 void
 totem_object_plugins_shutdown (TotemObject *totem)
 {
-	if (totem->engine != NULL) {
-		g_object_unref (totem->engine);
-		totem->engine = NULL;
-	}
+	g_clear_object (&totem->engine);
 }
 
 /**
@@ -425,7 +560,7 @@
 }
 
 /**
- * totem_get_video_widget:
+ * totem_object_get_video_widget:
  * @totem: a #TotemObject
  *
  * Gets Totem's video widget and increments its reference count.
@@ -433,7 +568,7 @@
  * Return value: (transfer full): Totem's video widget
  **/
 GtkWidget *
-totem_get_video_widget (TotemObject *totem)
+totem_object_get_video_widget (TotemObject *totem)
 {
 	g_return_val_if_fail (TOTEM_IS_OBJECT (totem), NULL);
 
@@ -443,21 +578,6 @@
 }
 
 /**
- * totem_get_video_widget_backend_name:
- * @totem: a #TotemObject
- *
- * Gets the name string of the backend video widget, typically the video library's
- * version string (e.g. what's returned by gst_version_string()). Free with g_free().
- *
- * Return value: a newly-allocated string of the name of the backend video widget
- **/
-char *
-totem_get_video_widget_backend_name (TotemObject *totem)
-{
-	return bacon_video_widget_get_backend_name (totem->bvw);
-}
-
-/**
  * totem_object_get_version:
  *
  * Gets the application name and version (e.g. "Totem 2.28.0").
@@ -491,7 +611,6 @@
 	TotemObject *totem;
 	gchar *uri;
 	gchar *display_name;
-	gboolean add_to_recent;
 } AddToPlaylistData;
 
 static void
@@ -502,8 +621,6 @@
 
 	playlist_changed = totem_playlist_add_mrl_finish (playlist, async_result);
 
-	if (data->add_to_recent != FALSE)
-		totem_action_add_recent (data->totem, data->uri, data->display_name, NULL);
 	end = totem_playlist_get_last (playlist);
 
 	totem_signal_unblock_by_data (playlist, data->totem);
@@ -531,15 +648,13 @@
  * @totem: a #TotemObject
  * @uri: the URI to add to the playlist
  * @display_name: the display name of the URI
- * @add_to_recent: if %TRUE, add the URI to the recent items list
  *
  * Add @uri to the playlist and play it immediately.
  **/
 void
 totem_object_add_to_playlist_and_play (TotemObject *totem,
 				const char *uri,
-				const char *display_name,
-				gboolean add_to_recent)
+				const char *display_name)
 {
 	AddToPlaylistData *data;
 
@@ -552,7 +667,6 @@
 	data->totem = g_object_ref (totem);
 	data->uri = g_strdup (uri);
 	data->display_name = g_strdup (display_name);
-	data->add_to_recent = add_to_recent;
 
 	totem_playlist_add_mrl (totem->playlist, uri, display_name, TRUE,
 	                        NULL, (GAsyncReadyCallback) add_to_playlist_and_play_cb, data);
@@ -633,7 +747,7 @@
 char *
 totem_get_short_title (TotemObject *totem)
 {
-	return totem_playlist_get_current_title (totem->playlist, NULL);
+	return totem_playlist_get_current_title (totem->playlist);
 }
 
 /**
@@ -723,6 +837,21 @@
 }
 
 /**
+ * totem_file_has_played:
+ * @totem: a #TotemObject
+ *
+ * Emits the #TotemObject::file-played signal on @totem.
+ **/
+void
+totem_file_has_played (TotemObject *totem,
+		       const char  *mrl)
+{
+	g_signal_emit (G_OBJECT (totem),
+		       totem_table_signals[FILE_HAS_PLAYED],
+		       0, mrl);
+}
+
+/**
  * totem_metadata_updated:
  * @totem: a #TotemObject
  * @artist: the stream's artist, or %NULL
@@ -960,12 +1089,7 @@
 		totem_object_plugins_shutdown (totem);
 
 	/* Exit forcefully if we can't do the shutdown in 10 seconds */
-#if GLIB_CHECK_VERSION (2, 31, 0)
 	g_thread_new ("force-exit", (GThreadFunc) totem_action_wait_force_exit, NULL);
-#else
-	g_thread_create ((GThreadFunc) totem_action_wait_force_exit,
-			 NULL, FALSE, NULL);
-#endif
 
 	if (gtk_main_level () > 0)
 		gtk_main_quit ();
@@ -990,19 +1114,14 @@
 		bacon_video_widget_close (totem->bvw);
 	}
 
-	if (totem->app != NULL)
-		g_object_unref (totem->app);
 	totem_action_save_state (totem, page_id);
 	g_free (page_id);
 
 	totem_sublang_exit (totem);
 	totem_destroy_file_filters ();
 
-	if (totem->settings)
-		g_object_unref (totem->settings);
-
-	if (totem->fs)
-		g_object_unref (totem->fs);
+	g_clear_object (&totem->settings);
+	g_clear_object (&totem->fs);
 
 	if (totem->win)
 		gtk_widget_destroy (GTK_WIDGET (totem->win));
@@ -1099,6 +1218,7 @@
 	totem->mrl = NULL;
 	bacon_video_widget_close (totem->bvw);
 	totem_file_closed (totem);
+	totem->has_played_emitted = FALSE;
 
 	/* The volume monitoring will take care of removing the items */
 	g_mount_eject_with_operation (mount, G_MOUNT_UNMOUNT_NONE, NULL, NULL, NULL, NULL);
@@ -1135,8 +1255,13 @@
 	retval = bacon_video_widget_play (totem->bvw,  &err);
 	play_pause_set_label (totem, retval ? STATE_PLAYING : STATE_STOPPED);
 
-	if (retval != FALSE)
+	if (retval != FALSE) {
+		if (totem->has_played_emitted == FALSE) {
+			totem_file_has_played (totem, totem->mrl);
+			totem->has_played_emitted = TRUE;
+		}
 		return;
+	}
 
 	disp = totem_uri_escape_for_display (totem->mrl);
 	msg = g_strdup_printf(_("Totem could not play '%s'."), disp);
@@ -1229,151 +1354,6 @@
 	return TRUE;
 }
 
-static gboolean
-totem_action_load_media (TotemObject *totem, TotemDiscMediaType type, const char *device)
-{
-	char **mrls;
-	GError *error = NULL;
-	const char *uri, *link_text, *secondary;
-	gboolean retval;
-
-	mrls = bacon_video_widget_get_mrls (totem->bvw, type, device, &error);
-	if (mrls == NULL) {
-		char *msg;
-
-		/* No errors? Weird */
-		if (error == NULL) {
-			msg = g_strdup_printf (_("Totem could not play this media (%s) although a plugin is present to handle it."), _(totem_cd_get_human_readable_name (type)));
-			totem_action_error (totem, msg, _("You might want to check that a disc is present in the drive and that it is correctly configured."));
-			g_free (msg);
-			return FALSE;
-		}
-
-		/* No plugin for the media type */
-		if (g_error_matches (error, BVW_ERROR, BVW_ERROR_NO_PLUGIN_FOR_FILE) != FALSE) {
-			uri = "http://projects.gnome.org/totem/#codecs";
-			link_text = _("More information about media plugins");
-			secondary = _("Please install the necessary plugins and restart Totem to be able to play this media.");
-			if (type == MEDIA_TYPE_DVD || type == MEDIA_TYPE_VCD)
-				msg = g_strdup_printf (_("Totem cannot play this type of media (%s) because it does not have the appropriate plugins to be able to read from the disc."), _(totem_cd_get_human_readable_name (type)));
-			else
-				msg = g_strdup_printf (_("Totem cannot play this type of media (%s) because you do not have the appropriate plugins to handle it."), _(totem_cd_get_human_readable_name (type)));
-		/* Unsupported type (ie. CDDA) */
-		} else if (g_error_matches (error, BVW_ERROR, BVW_ERROR_INVALID_LOCATION) != FALSE) {
-			msg = g_strdup_printf(_("Totem cannot play this type of media (%s) because it is not supported."), _(totem_cd_get_human_readable_name (type)));
-			totem_action_error (totem, msg, _("Please insert another disc to play back."));
-			g_free (msg);
-			return FALSE;
-		} else {
-			g_assert_not_reached ();
-		}
-
-		totem_interface_error_with_link (msg, secondary, uri, link_text, GTK_WINDOW (totem->win));
-		g_free (msg);
-		return FALSE;
-	}
-
-	retval = totem_action_open_files (totem, mrls);
-	g_strfreev (mrls);
-
-	return retval;
-}
-
-static gboolean
-totem_action_load_media_device (TotemObject *totem, const char *device)
-{
-	TotemDiscMediaType type;
-	GError *error = NULL;
-	char *device_path, *url;
-	gboolean retval;
-
-	if (g_str_has_prefix (device, "file://") != FALSE)
-		device_path = g_filename_from_uri (device, NULL, NULL);
-	else
-		device_path = g_strdup (device);
-
-	type = totem_cd_detect_type_with_url (device_path, &url, &error);
-
-	switch (type) {
-		case MEDIA_TYPE_ERROR:
-			totem_action_error (totem,
-					    _("Totem was not able to play this disc."),
-					    error ? error->message : _("No reason."));
-			retval = FALSE;
-			break;
-		case MEDIA_TYPE_DATA:
-			/* Set default location to the mountpoint of
-			 * this device */
-			retval = totem_action_open_dialog (totem, url, FALSE);
-			break;
-		case MEDIA_TYPE_DVD:
-		case MEDIA_TYPE_VCD:
-			retval = totem_action_load_media (totem, type, device_path);
-			break;
-		case MEDIA_TYPE_CDDA:
-			totem_action_error (totem,
-					    _("Totem does not support playback of Audio CDs"),
-					    _("Please consider using a music player or a CD extractor to play this CD"));
-			retval = FALSE;
-			break;
-		case MEDIA_TYPE_DVB:
-		default:
-			g_assert_not_reached ();
-	}
-
-	g_free (url);
-	g_free (device_path);
-
-	return retval;
-}
-
-/**
- * totem_action_play_media_device:
- * @totem: a #TotemObject
- * @device: the media device's path
- *
- * Attempts to play the media device (for example, a DVD drive or CD drive)
- * with the given @device path by first adding it to the playlist, then
- * playing it.
- *
- * An error dialog will be displayed if Totem cannot read or play what's on
- * the media device.
- **/
-void
-totem_action_play_media_device (TotemObject *totem, const char *device)
-{
-	char *mrl;
-
-	if (totem_action_load_media_device (totem, device) != FALSE) {
-		mrl = totem_playlist_get_current_mrl (totem->playlist, NULL);
-		totem_action_set_mrl_and_play (totem, mrl, NULL);
-		g_free (mrl);
-	}
-}
-
-/**
- * totem_action_play_media:
- * @totem: a #TotemObject
- * @type: the type of disc media
- * @device: the media's device path
- *
- * Attempts to play the media found on @device (for example, a DVD in a drive or a DVB
- * tuner) by first adding it to the playlist, then playing it.
- *
- * An error dialog will be displayed if Totem cannot support media of @type.
- **/
-void
-totem_action_play_media (TotemObject *totem, TotemDiscMediaType type, const char *device)
-{
-	char *mrl;
-
-	if (totem_action_load_media (totem, type, device) != FALSE) {
-		mrl = totem_playlist_get_current_mrl (totem->playlist, NULL);
-		totem_action_set_mrl_and_play (totem, mrl, NULL);
-		g_free (mrl);
-	}
-}
-
 /**
  * totem_object_action_stop:
  * @totem: a #TotemObject
@@ -1414,7 +1394,11 @@
 	}
 
 	if (bacon_video_widget_is_playing (totem->bvw) == FALSE) {
-		bacon_video_widget_play (totem->bvw, NULL);
+		if (bacon_video_widget_play (totem->bvw, NULL) != FALSE &&
+		    totem->has_played_emitted == FALSE) {
+			totem_file_has_played (totem, totem->mrl);
+			totem->has_played_emitted = TRUE;
+		}
 		play_pause_set_label (totem, STATE_PLAYING);
 	} else {
 		bacon_video_widget_pause (totem->bvw);
@@ -1448,6 +1432,8 @@
 window_state_event_cb (GtkWidget *window, GdkEventWindowState *event,
 		       TotemObject *totem)
 {
+	GAction *action;
+
 	if (event->changed_mask & GDK_WINDOW_STATE_MAXIMIZED) {
 		totem->maximised = (event->new_window_state & GDK_WINDOW_STATE_MAXIMIZED) != 0;
 		totem_action_set_sensitivity ("zoom-1-2", !totem->maximised);
@@ -1466,7 +1452,6 @@
 
 		totem->controls_visibility = TOTEM_CONTROLS_FULLSCREEN;
 		show_controls (totem, FALSE);
-		totem_action_set_sensitivity ("fullscreen", FALSE);
 	} else {
 		GtkAction *action;
 
@@ -1481,9 +1466,12 @@
 			totem->controls_visibility = TOTEM_CONTROLS_HIDDEN;
 
 		show_controls (totem, TRUE);
-		totem_action_set_sensitivity ("fullscreen", TRUE);
 	}
 
+	action = g_action_map_lookup_action (G_ACTION_MAP (totem), "fullscreen");
+	g_simple_action_set_state (G_SIMPLE_ACTION (action),
+				   g_variant_new_boolean (totem->controls_visibility == TOTEM_CONTROLS_FULLSCREEN));
+
 	g_object_notify (G_OBJECT (totem), "fullscreen");
 
 	return FALSE;
@@ -1524,7 +1512,10 @@
 void
 fs_exit1_activate_cb (GtkButton *button, TotemObject *totem)
 {
-	totem_action_fullscreen (totem, FALSE);
+	GAction *action;
+
+	action = g_action_map_lookup_action (G_ACTION_MAP (totem), "fullscreen");
+	g_action_change_state (action, g_variant_new_boolean (FALSE));
 }
 
 void
@@ -1664,7 +1655,7 @@
 		totem_fullscreen_set_title (totem->fs, NULL);
 
 		/* Title */
-		gtk_window_set_title (GTK_WINDOW (totem->win), _("Movie Player"));
+		gtk_window_set_title (GTK_WINDOW (totem->win), _("Videos"));
 	}
 }
 
@@ -1703,6 +1694,7 @@
 		totem->mrl = NULL;
 		bacon_video_widget_close (totem->bvw);
 		totem_file_closed (totem);
+		totem->has_played_emitted = FALSE;
 		play_pause_set_label (totem, STATE_STOPPED);
 		update_fill (totem, -1.0);
 	}
@@ -1733,9 +1725,6 @@
 		/* Subtitle selection */
 		totem_action_set_sensitivity ("select-subtitle", FALSE);
 
-		/* Fullscreen */
-		totem_action_set_sensitivity ("fullscreen", FALSE);
-
 		/* Set the logo */
 		bacon_video_widget_set_logo_mode (totem->bvw, TRUE);
 		update_mrl_label (totem, NULL);
@@ -1747,25 +1736,25 @@
 	} else {
 		gboolean caps;
 		gdouble volume;
-		char *autoload_sub = NULL;
-		GdkWindowState window_state;
+		char *user_agent;
+		char *autoload_sub;
 		GError *err = NULL;
 
 		bacon_video_widget_set_logo_mode (totem->bvw, FALSE);
 
-		if (subtitle == NULL && totem->autoload_subs != FALSE)
-			autoload_sub = totem_uri_get_subtitle_uri (mrl);
-
-		/* HACK: Bad bad Apple */
-		if (g_str_has_prefix (mrl, "http://movies.apple.com")
-				|| g_str_has_prefix (mrl, "http://trailers.apple.com"))
-			bacon_video_widget_set_user_agent (totem->bvw, "Quicktime/7.2.0");
-		else
-			bacon_video_widget_set_user_agent (totem->bvw, NULL);
+		autoload_sub = NULL;
+		if (subtitle == NULL)
+			g_signal_emit (G_OBJECT (totem), totem_table_signals[GET_TEXT_SUBTITLE], 0, mrl, &autoload_sub);
+
+		user_agent = NULL;
+		g_signal_emit (G_OBJECT (totem), totem_table_signals[GET_USER_AGENT], 0, mrl, &user_agent);
+		bacon_video_widget_set_user_agent (totem->bvw, user_agent);
+		g_free (user_agent);
 
 		totem_gdk_window_set_waiting_cursor (gtk_widget_get_window (totem->win));
 		totem_try_restore_position (totem, mrl);
-		retval = bacon_video_widget_open (totem->bvw, mrl, subtitle ? subtitle : autoload_sub, &err);
+		retval = bacon_video_widget_open (totem->bvw, mrl, &err);
+		bacon_video_widget_set_text_subtitle (totem->bvw, subtitle ? subtitle : autoload_sub);
 		g_free (autoload_sub);
 		gdk_window_set_cursor (gtk_widget_get_window (totem->win), NULL);
 		totem->mrl = g_strdup (mrl);
@@ -1788,10 +1777,6 @@
 		/* Subtitle selection */
 		totem_action_set_sensitivity ("select-subtitle", !totem_is_special_mrl (mrl) && retval);
 
-		/* Fullscreen */
-		window_state = gdk_window_get_state (gtk_widget_get_window (totem->win));
-		totem_action_set_sensitivity ("fullscreen", !(window_state & GDK_WINDOW_STATE_FULLSCREEN));
-
 		/* Set the playlist */
 		play_pause_set_label (totem, retval ? STATE_PAUSED : STATE_STOPPED);
 
@@ -1817,7 +1802,6 @@
 			totem->mrl = NULL;
 			bacon_video_widget_set_logo_mode (totem->bvw, TRUE);
 		} else {
-			char *display_name, *content_type;
 			/* cast is to shut gcc up */
 			const GtkTargetEntry source_table[] = {
 				{ (gchar*) "text/uri-list", 0, 0 }
@@ -1830,11 +1814,6 @@
 					     GDK_BUTTON1_MASK | GDK_BUTTON3_MASK,
 					     source_table, G_N_ELEMENTS (source_table),
 					     GDK_ACTION_COPY);
-
-			display_name = totem_playlist_get_current_title (totem->playlist, &content_type);
-			totem_action_add_recent (totem, totem->mrl, display_name, content_type);
-			g_free (display_name);
-			g_free (content_type);
 		}
 	}
 	update_buttons (totem);
@@ -1873,24 +1852,21 @@
 static void
 totem_action_direction (TotemObject *totem, TotemPlaylistDirection dir)
 {
-	if (totem_playing_dvd (totem->mrl) == FALSE &&
-		totem_playlist_has_direction (totem->playlist, dir) == FALSE
-		&& totem_playlist_get_repeat (totem->playlist) == FALSE)
+	if (bacon_video_widget_has_next_track (totem->bvw) == FALSE &&
+	    totem_playlist_has_direction (totem->playlist, dir) == FALSE &&
+	    totem_playlist_get_repeat (totem->playlist) == FALSE)
 		return;
 
-	if (totem_playing_dvd (totem->mrl) != FALSE)
-	{
-		bacon_video_widget_dvd_event (totem->bvw,
-				dir == TOTEM_PLAYLIST_DIRECTION_NEXT ?
-				BVW_DVD_NEXT_CHAPTER :
-				BVW_DVD_PREV_CHAPTER);
+	if (bacon_video_widget_has_next_track (totem->bvw) != FALSE) {
+		BvwDVDEvent event;
+		event = (dir == TOTEM_PLAYLIST_DIRECTION_NEXT ? BVW_DVD_NEXT_CHAPTER : BVW_DVD_PREV_CHAPTER);
+		bacon_video_widget_dvd_event (totem->bvw, event);
 		return;
 	}
-	
-	if (dir == TOTEM_PLAYLIST_DIRECTION_NEXT
-			|| bacon_video_widget_is_seekable (totem->bvw) == FALSE
-			|| totem_time_within_seconds (totem) != FALSE)
-	{
+
+	if (dir == TOTEM_PLAYLIST_DIRECTION_NEXT ||
+	    bacon_video_widget_is_seekable (totem->bvw) == FALSE ||
+	    totem_time_within_seconds (totem) != FALSE) {
 		char *mrl, *subtitle;
 
 		totem_playlist_set_direction (totem->playlist, dir);
@@ -2425,11 +2401,15 @@
 
 	bacon_video_widget_close (totem->bvw);
 	totem_file_closed (totem);
+	totem->has_played_emitted = FALSE;
 	totem_gdk_window_set_waiting_cursor (gtk_widget_get_window (totem->win));
-	bacon_video_widget_open (totem->bvw, new_mrl ? new_mrl : mrl, NULL, NULL);
+	bacon_video_widget_open (totem->bvw, new_mrl ? new_mrl : mrl, NULL);
 	totem_file_opened (totem, new_mrl ? new_mrl : mrl);
 	gdk_window_set_cursor (gtk_widget_get_window (totem->win), NULL);
-	bacon_video_widget_play (bvw, NULL);
+	if (bacon_video_widget_play (bvw, NULL) != FALSE) {
+		totem_file_has_played (totem, totem->mrl);
+		totem->has_played_emitted = TRUE;
+	}
 	g_free (new_mrl);
 }
 
@@ -2457,7 +2437,7 @@
 {
 	char *name;
 
-	name = totem_playlist_get_current_title (playlist, NULL);
+	name = totem_playlist_get_current_title (playlist);
 	if (name != NULL) {
 		update_mrl_label (totem, name);
 		g_free (name);
@@ -2482,7 +2462,7 @@
 
 static void
 on_error_event (BaconVideoWidget *bvw, char *message,
-                gboolean playback_stopped, gboolean fatal, TotemObject *totem)
+                gboolean playback_stopped, TotemObject *totem)
 {
 	/* Clear the seek if it's there, we only want to try and seek
 	 * the first file, even if it's not there */
@@ -2492,16 +2472,11 @@
 	if (playback_stopped)
 		play_pause_set_label (totem, STATE_STOPPED);
 
-	if (fatal == FALSE) {
-		totem_action_error (totem, _("An error occurred"), message);
-	} else {
-		totem_action_error_and_exit (_("An error occurred"),
-				message, totem);
-	}
+	totem_action_error (totem, _("An error occurred"), message);
 }
 
 static void
-on_buffering_event (BaconVideoWidget *bvw, int percentage, TotemObject *totem)
+on_buffering_event (BaconVideoWidget *bvw, gdouble percentage, TotemObject *totem)
 {
 	totem_statusbar_push (TOTEM_STATUSBAR (totem->statusbar), percentage);
 }
@@ -2671,12 +2646,12 @@
 gboolean
 seek_slider_pressed_cb (GtkWidget *widget, GdkEventButton *event, TotemObject *totem)
 {
-	/* HACK: we want the behaviour you get with the middle button, so we
+	/* HACK: we want the behaviour you get with the left button, so we
 	 * mangle the event.  clicking with other buttons moves the slider in
-	 * step increments, clicking with the middle button moves the slider to
+	 * step increments, clicking with the left button moves the slider to
 	 * the location of the click.
 	 */
-	event->button = 2;
+	event->button = GDK_BUTTON_PRIMARY;
 
 	totem->seek_lock = TRUE;
 	if (bacon_video_widget_can_direct_seek (totem->bvw) == FALSE) {
@@ -2715,7 +2690,7 @@
 	gdouble val;
 
 	/* HACK: see seek_slider_pressed_cb */
-	event->button = 2;
+	event->button = GDK_BUTTON_PRIMARY;
 
 	/* set to FALSE here to avoid triggering a final seek when
 	 * syncing the adjustments while being in direct seek mode */
@@ -2801,13 +2776,11 @@
 				changed = totem_playlist_clear (totem->playlist);
 				bacon_video_widget_close (totem->bvw);
 				totem_file_closed (totem);
+				totem->has_played_emitted = FALSE;
 				cleared = TRUE;
 			}
 
-			if (totem_is_block_device (filename) != FALSE) {
-				totem_action_load_media_device (totem, data);
-				changed = TRUE;
-			} else if (g_str_has_prefix (filename, "dvb:/") != FALSE) {
+			if (g_str_has_prefix (filename, "dvb:/") != FALSE) {
 				mrl_list = g_list_prepend (mrl_list, totem_playlist_mrl_data_new (data, NULL));
 				changed = TRUE;
 			} else {
@@ -3096,21 +3069,14 @@
 		if (url == NULL) {
 			bacon_video_widget_close (totem->bvw);
 			totem_file_closed (totem);
+			totem->has_played_emitted = FALSE;
 			totem_action_set_mrl (totem, NULL, NULL);
 			break;
 		}
-		if (strcmp (url, "dvd:") == 0) {
-			/* FIXME b0rked */
-			totem_action_play_media (totem, MEDIA_TYPE_DVD, NULL);
-		} else if (strcmp (url, "vcd:") == 0) {
-			/* FIXME b0rked */
-			totem_action_play_media (totem, MEDIA_TYPE_VCD, NULL);
-		} else {
-			totem_playlist_add_mrl (totem->playlist, url, NULL, TRUE, NULL, NULL, NULL);
-		}
+		totem_playlist_add_mrl (totem->playlist, url, NULL, TRUE, NULL, NULL, NULL);
 		break;
 	case TOTEM_REMOTE_COMMAND_SHOW:
-		gtk_window_present (GTK_WINDOW (totem->win));
+		gtk_window_present_with_time (GTK_WINDOW (totem->win), GDK_CURRENT_TIME);
 		break;
 	case TOTEM_REMOTE_COMMAND_TOGGLE_CONTROLS:
 		if (totem->controls_visibility != TOTEM_CONTROLS_FULLSCREEN)
@@ -3160,7 +3126,7 @@
 		icon_name = "media-eject";
 		break;
 	case TOTEM_REMOTE_COMMAND_PLAY_DVD:
-		/* TODO - how to see if can, and play the DVD (like the menu item) */
+		/* FIXME - focus the "Optical Media" section in Grilo */
 		break;
 	case TOTEM_REMOTE_COMMAND_MUTE:
 		totem_action_volume_toggle_mute (totem);
@@ -3175,8 +3141,7 @@
 	}
 
 	if (handled != FALSE
-			&& gtk_window_is_active (GTK_WINDOW (totem->win))
-			&& totem_fullscreen_is_fullscreen (totem->fs) != FALSE) {
+	    && gtk_window_is_active (GTK_WINDOW (totem->win))) {
 		totem_fullscreen_show_popups_or_osd (totem->fs, icon_name, TRUE);
 	}
 }
@@ -3294,9 +3259,8 @@
 {
 	char *mrl, *subtitle;
 
-	totem_action_stop (totem);
 	mrl = totem_playlist_get_current_mrl (totem->playlist, &subtitle);
-	totem_action_set_mrl_and_play (totem, mrl, subtitle);
+	bacon_video_widget_set_text_subtitle (totem->bvw, subtitle);
 
 	g_free (mrl);
 	g_free (subtitle);
@@ -3305,33 +3269,21 @@
 static void
 playlist_repeat_toggle_cb (TotemPlaylist *playlist, gboolean repeat, TotemObject *totem)
 {
-	GtkAction *action;
-
-	action = gtk_action_group_get_action (totem->main_action_group, "repeat-mode");
+	GAction *action;
 
-	g_signal_handlers_block_matched (G_OBJECT (action), G_SIGNAL_MATCH_DATA, 0, 0,
-			NULL, NULL, totem);
-
-	gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), repeat);
-
-	g_signal_handlers_unblock_matched (G_OBJECT (action), G_SIGNAL_MATCH_DATA, 0, 0,
-			NULL, NULL, totem);
+	action = g_action_map_lookup_action (G_ACTION_MAP (totem), "repeat");
+	g_simple_action_set_state (G_SIMPLE_ACTION (action),
+				   g_variant_new_boolean (repeat));
 }
 
 static void
 playlist_shuffle_toggle_cb (TotemPlaylist *playlist, gboolean shuffle, TotemObject *totem)
 {
-	GtkAction *action;
+	GAction *action;
 
-	action = gtk_action_group_get_action (totem->main_action_group, "shuffle-mode");
-
-	g_signal_handlers_block_matched (G_OBJECT (action), G_SIGNAL_MATCH_DATA, 0, 0,
-			NULL, NULL, totem);
-
-	gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), shuffle);
-
-	g_signal_handlers_unblock_matched (G_OBJECT (action), G_SIGNAL_MATCH_DATA, 0, 0,
-			NULL, NULL, totem);
+	action = g_action_map_lookup_action (G_ACTION_MAP (totem), "shuffle");
+	g_simple_action_set_state (G_SIMPLE_ACTION (action),
+				   g_variant_new_boolean (shuffle));
 }
 
 /**
@@ -3422,14 +3374,12 @@
 		totem_action_fullscreen_toggle(totem);
 		return TRUE;
 	} else if (event->type == GDK_BUTTON_PRESS && event->button == 2) {
-		if (totem_is_fullscreen (totem) != FALSE) {
-			const char *icon_name;
-			if (bacon_video_widget_is_playing (totem->bvw) == FALSE)
-				icon_name = "media-playback-start-symbolic";
-			else
-				icon_name = "media-playback-pause-symbolic";
-			totem_fullscreen_show_popups_or_osd (totem->fs, icon_name, FALSE);
-		}
+		const char *icon_name;
+		if (bacon_video_widget_is_playing (totem->bvw) == FALSE)
+			icon_name = "media-playback-start-symbolic";
+		else
+			icon_name = "media-playback-pause-symbolic";
+		totem_fullscreen_show_popups_or_osd (totem->fs, icon_name, FALSE);
 		totem_action_play_pause (totem);
 		return TRUE;
 	} else if (event->type == GDK_BUTTON_PRESS && event->button == 3) {
@@ -3602,6 +3552,7 @@
 		bacon_video_widget_step (totem->bvw, TRUE, NULL);
 		break;
 	case GDK_KEY_AudioPause:
+	case GDK_KEY_Pause:
 	case GDK_KEY_AudioStop:
 		totem_action_pause (totem);
 		icon_name = "media-playback-pause-symbolic";
@@ -3764,7 +3715,7 @@
 		retval = FALSE;
 	}
 
-	if (totem_is_fullscreen (totem) != FALSE && icon_name != NULL)
+	if (icon_name != NULL)
 		totem_fullscreen_show_popups_or_osd (totem->fs,
 						     icon_name,
 						     FALSE);
@@ -3842,8 +3793,6 @@
 		case GDK_KEY_l:
 		case GDK_KEY_q:
 		case GDK_KEY_Q:
-//		case GDK_KEY_S:
-//		case GDK_KEY_s:
 		case GDK_KEY_Right:
 		case GDK_KEY_Left:
 		case GDK_KEY_plus:
@@ -3927,19 +3876,13 @@
 	gboolean has_item;
 
 	/* Previous */
-	if (totem_playing_dvd (totem->mrl) != FALSE)
-		has_item = bacon_video_widget_has_previous_track (totem->bvw);
-	else
-		has_item = totem_playlist_has_previous_mrl (totem->playlist);
-
+	has_item = bacon_video_widget_has_previous_track (totem->bvw) ||
+		totem_playlist_has_previous_mrl (totem->playlist);
 	totem_action_set_sensitivity ("previous-chapter", has_item);
 
 	/* Next */
-	if (totem_playing_dvd (totem->mrl) != FALSE)
-		has_item = bacon_video_widget_has_next_track (totem->bvw);
-	else
-		has_item = totem_playlist_has_next_mrl (totem->playlist);
-
+	has_item = bacon_video_widget_has_next_track (totem->bvw) ||
+		totem_playlist_has_next_mrl (totem->playlist);
 	totem_action_set_sensitivity ("next-chapter", has_item);
 }
 
@@ -4055,14 +3998,15 @@
 	GtkAction *action;
 	GtkActionGroup *action_group;
 	GtkBox *box;
+	GAction *gaction;
 
 	/* Menu items */
-	action = gtk_action_group_get_action (totem->main_action_group, "repeat-mode");
-	gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
-		totem_playlist_get_repeat (totem->playlist));
-	action = gtk_action_group_get_action (totem->main_action_group, "shuffle-mode");
-	gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
-		totem_playlist_get_shuffle (totem->playlist));
+	gaction = g_action_map_lookup_action (G_ACTION_MAP (totem), "repeat");
+	g_simple_action_set_state (G_SIMPLE_ACTION (gaction),
+				   g_variant_new_boolean (totem_playlist_get_repeat (totem->playlist)));
+	gaction = g_action_map_lookup_action (G_ACTION_MAP (totem), "shuffle");
+	g_simple_action_set_state (G_SIMPLE_ACTION (gaction),
+				   g_variant_new_boolean (totem_playlist_get_shuffle (totem->playlist)));
 
 	/* Controls */
 	box = GTK_BOX (gtk_builder_get_object (totem->xml, "tmw_buttons_hbox"));
@@ -4101,13 +4045,14 @@
 	gtk_box_pack_start (box, item, FALSE, FALSE, 0);
 
 	/* Fullscreen button */
-	action = gtk_action_group_get_action (totem->main_action_group,
-			"fullscreen");
-	item = gtk_action_create_tool_item (action);
 	/* Translators: this is the tooltip text for the fullscreen button in the controls box in Totem's main window. */
+	item = GTK_WIDGET (gtk_toggle_tool_button_new ());
+	gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (item), "view-fullscreen-symbolic");
 	gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (item), _("Fullscreen"));
 	/* Translators: this is the accessibility text for the fullscreen button in the controls box in Totem's main window. */
 	atk_object_set_name (gtk_widget_get_accessible (item), _("Fullscreen"));
+	gtk_actionable_set_action_name (GTK_ACTIONABLE (item), "app.fullscreen");
+	gtk_widget_show (item);
 	gtk_box_pack_start (box, item, FALSE, FALSE, 0);
 
 	/* Sidebar button (Drag'n'Drop) */
@@ -4161,9 +4106,9 @@
 	gtk_widget_add_events (totem->win, GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK);
 
 	/* Connect the mouse wheel */
-	gtk_widget_add_events (GTK_WIDGET (gtk_builder_get_object (totem->xml, "tmw_main_vbox")), GDK_SCROLL_MASK);
-	gtk_widget_add_events (totem->seek, GDK_SCROLL_MASK);
-	gtk_widget_add_events (totem->fs->seek, GDK_SCROLL_MASK);
+	gtk_widget_add_events (GTK_WIDGET (gtk_builder_get_object (totem->xml, "tmw_main_vbox")), GDK_SCROLL_MASK | GDK_SMOOTH_SCROLL_MASK);
+	gtk_widget_add_events (totem->seek, GDK_SCROLL_MASK | GDK_SMOOTH_SCROLL_MASK);
+	gtk_widget_add_events (totem->fs->seek, GDK_SCROLL_MASK | GDK_SMOOTH_SCROLL_MASK);
 
 	/* FIXME Hack to fix bug #462286 and #563894 */
 	g_signal_connect (G_OBJECT (totem->fs->seek), "button-press-event",
@@ -4182,7 +4127,6 @@
 	 * and skip-* are back in the main action group. */
 	/*totem_action_set_sensitivity ("skip-forward", FALSE);
 	totem_action_set_sensitivity ("skip-backwards", FALSE);*/
-	totem_action_set_sensitivity ("fullscreen", FALSE);
 
 	action_group = GTK_ACTION_GROUP (gtk_builder_get_object (totem->xml, "skip-action-group"));
 
diff -Nru totem-3.4.3/src/totem-options.c totem-3.6.2/src/totem-options.c
--- totem-3.4.3/src/totem-options.c	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/totem-options.c	2012-10-10 14:41:27.000000000 +0000
@@ -70,6 +70,31 @@
 	{NULL} /* end the list */
 };
 
+GOptionContext *
+totem_options_get_context (void)
+{
+	GOptionContext *context;
+	GOptionGroup *baconoptiongroup;
+
+	context = g_option_context_new (N_("- Play movies and songs"));
+	baconoptiongroup = bacon_video_widget_get_option_group ();
+	if (baconoptiongroup == NULL) {
+		g_warning ("Clutter or GTK+ failed to initialise properly");
+		g_option_context_free (context);
+		return NULL;
+	}
+	g_option_context_add_main_entries (context, all_options, GETTEXT_PACKAGE);
+	g_option_context_set_translation_domain (context, GETTEXT_PACKAGE);
+	g_option_context_add_group (context, baconoptiongroup);
+
+	g_option_context_add_group (context, gtk_get_option_group (FALSE));
+	/* FIXME:
+	 * This seems to hang on startup */
+	/* totem_session_add_options (context); */
+
+	return context;
+}
+
 void
 totem_options_process_late (Totem *totem, const TotemCmdLineOptions *options)
 {
diff -Nru totem-3.4.3/src/totem-options.h totem-3.6.2/src/totem-options.h
--- totem-3.4.3/src/totem-options.h	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/totem-options.h	2012-08-29 23:07:45.000000000 +0000
@@ -56,6 +56,7 @@
 extern TotemCmdLineOptions optionstate;
 
 void totem_options_register_remote_commands (Totem *totem);
+GOptionContext *totem_options_get_context (void);
 void totem_options_process_early (Totem *totem,
 				  const TotemCmdLineOptions* options);
 void totem_options_process_late (Totem *totem, 
diff -Nru totem-3.4.3/src/totem-playlist.c totem-3.6.2/src/totem-playlist.c
--- totem-3.4.3/src/totem-playlist.c	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/totem-playlist.c	2012-08-29 23:07:45.000000000 +0000
@@ -146,6 +146,7 @@
 	TITLE_CUSTOM_COL,
 	SUBTITLE_URI_COL,
 	FILE_MONITOR_COL,
+	MOUNT_COL,
 	MIME_TYPE_COL,
 	NUM_COLS
 };
@@ -479,6 +480,8 @@
 {
 	totem_playlist_add_mrls_finish (playlist, result, NULL);
 
+	g_clear_pointer (&playlist->priv->tree_path, gtk_tree_path_free);
+
 	/* Emit the "changed" signal once the last dropped MRL has been added to the playlist */
 	g_signal_emit (G_OBJECT (playlist),
 	               totem_playlist_table_signals[CHANGED], 0,
@@ -487,12 +490,12 @@
 
 static void
 drop_cb (GtkWidget        *widget,
-         GdkDragContext   *context, 
+         GdkDragContext   *context,
 	 gint              x,
 	 gint              y,
-	 GtkSelectionData *data, 
-	 guint             info, 
-	 guint             _time, 
+	 GtkSelectionData *data,
+	 guint             info,
+	 guint             _time,
 	 TotemPlaylist    *playlist)
 {
 	char **list;
@@ -573,8 +576,6 @@
 	g_strfreev (list);
 	g_list_free (file_list);
 	gtk_drag_finish (context, TRUE, FALSE, _time);
-	gtk_tree_path_free (playlist->priv->tree_path);
-	playlist->priv->tree_path = NULL;
 }
 
 void
@@ -643,7 +644,7 @@
 	}
 
 	count = gtk_tree_selection_count_selected_rows (playlist->priv->selection);
-	
+
 	if (count == 0) {
 		return FALSE;
 	}
@@ -729,9 +730,9 @@
 	}
 }
 
-static gboolean 
+static gboolean
 button_press_cb (GtkWidget *treeview, GdkEventButton *event, gpointer data)
-{ 
+{
 	TotemPlaylist *playlist = (TotemPlaylist *)data;
 
 	if (playlist->priv->drop_disabled)
@@ -746,7 +747,7 @@
 	return FALSE;
 }
 
-static gboolean 
+static gboolean
 button_release_cb (GtkWidget *treeview, GdkEventButton *event, gpointer data)
 {
 	TotemPlaylist *playlist = (TotemPlaylist *)data;
@@ -766,7 +767,7 @@
 	return FALSE;
 }
 
-static void 
+static void
 drag_begin_cb (GtkWidget *treeview, GdkDragContext *context, gpointer data)
 {
 	TotemPlaylist *playlist = (TotemPlaylist *)data;
@@ -776,7 +777,7 @@
 	return;
 }
 
-static void 
+static void
 drag_end_cb (GtkWidget *treeview, GdkDragContext *context, gpointer data)
 {
 	TotemPlaylist *playlist = (TotemPlaylist *)data;
@@ -1044,8 +1045,6 @@
 
 	response = gtk_dialog_run (GTK_DIALOG (fs));
 	gtk_widget_hide (fs);
-	while (gtk_events_pending())
-		gtk_main_iteration();
 
 	if (response == GTK_RESPONSE_ACCEPT) {
 		char *fname;
@@ -1469,7 +1468,7 @@
 	} else {
 		current = -1;
 	}
-	
+
 	current_new = -1;
 
 	array = g_array_sized_new (FALSE, FALSE, sizeof (RandomData), PL_LEN);
@@ -1637,6 +1636,8 @@
 	if (playlist->priv->current != NULL)
 		gtk_tree_path_free (playlist->priv->current);
 
+	g_clear_pointer (&playlist->priv->tree_path, gtk_tree_path_free);
+
 	G_OBJECT_CLASS (totem_playlist_parent_class)->finalize (object);
 }
 
@@ -1747,6 +1748,7 @@
 	char *filename_for_display, *uri, *escaped_filename;
 	GtkTreeRowReference *ref;
 	GFileMonitor *monitor;
+	GMount *mount;
 	GFile *file;
 	int pos;
 
@@ -1785,20 +1787,23 @@
 				  "changed",
 				  G_CALLBACK (totem_playlist_file_changed),
 				  playlist);
+		mount = NULL;
 	} else {
+		mount = totem_get_mount_for_media (uri ? uri : mrl);
 		monitor = NULL;
 	}
 
 	escaped_filename = g_markup_escape_text (filename_for_display, -1);
 	gtk_list_store_insert_with_values (store, &iter, pos,
-			PLAYING_COL, TOTEM_PLAYLIST_STATUS_NONE,
-			FILENAME_COL, filename_for_display,
-			FILENAME_ESCAPED_COL, escaped_filename,
-			URI_COL, uri ? uri : mrl,
-			TITLE_CUSTOM_COL, display_name ? TRUE : FALSE,
-			FILE_MONITOR_COL, monitor,
-			MIME_TYPE_COL, content_type,
-			-1);
+					   PLAYING_COL, TOTEM_PLAYLIST_STATUS_NONE,
+					   FILENAME_COL, filename_for_display,
+					   FILENAME_ESCAPED_COL, escaped_filename,
+					   URI_COL, uri ? uri : mrl,
+					   TITLE_CUSTOM_COL, display_name ? TRUE : FALSE,
+					   FILE_MONITOR_COL, monitor,
+					   MOUNT_COL, mount,
+					   MIME_TYPE_COL, content_type,
+					   -1);
 	g_free (escaped_filename);
 
 	g_signal_emit (playlist,
@@ -2400,23 +2405,51 @@
 	playlist->priv->current_to_be_removed = FALSE;
 }
 
+static char *
+get_mount_default_location (GMount *mount)
+{
+	GFile *file;
+	char *path;
+
+	file = g_mount_get_root (mount);
+	if (file == NULL)
+		return NULL;
+	path = g_file_get_path (file);
+	g_object_unref (file);
+	return path;
+}
+
 static gboolean
 totem_playlist_compare_with_mount (TotemPlaylist *playlist, GtkTreeIter *iter, gconstpointer data)
 {
 	GMount *clear_mount = (GMount *) data;
-	char *mrl;
-
 	GMount *mount;
+	char *mount_path, *clear_mount_path;
 	gboolean retval = FALSE;
 
 	gtk_tree_model_get (playlist->priv->model, iter,
-			    URI_COL, &mrl, -1);
-	mount = totem_get_mount_for_media (mrl);
-	g_free (mrl);
+			    MOUNT_COL, &mount, -1);
+
+	if (mount == NULL)
+		return FALSE;
+
+	clear_mount_path = NULL;
+
+	mount_path = get_mount_default_location (mount);
+	if (mount_path == NULL)
+		goto bail;
 
-	if (mount == clear_mount)
+	clear_mount_path = get_mount_default_location (clear_mount);
+	if (clear_mount_path == NULL)
+		goto bail;
+
+	if (g_str_equal (mount_path, clear_mount_path))
 		retval = TRUE;
 
+bail:
+	g_free (mount_path);
+	g_free (clear_mount_path);
+
 	if (mount != NULL)
 		g_object_unref (mount);
 
@@ -2427,6 +2460,8 @@
 totem_playlist_clear_with_g_mount (TotemPlaylist *playlist,
 				   GMount *mount)
 {
+	g_return_if_fail (mount != NULL);
+
 	totem_playlist_clear_with_compare (playlist,
 					   (ClearComparisonFunc) totem_playlist_compare_with_mount,
 					   mount);
@@ -2465,10 +2500,10 @@
 }
 
 char *
-totem_playlist_get_current_title (TotemPlaylist *playlist, char **content_type)
+totem_playlist_get_current_title (TotemPlaylist *playlist)
 {
 	GtkTreeIter iter;
-	char *path;
+	char *title;
 
 	g_return_val_if_fail (TOTEM_IS_PLAYLIST (playlist), NULL);
 
@@ -2476,23 +2511,37 @@
 		return NULL;
 
 	gtk_tree_model_get_iter (playlist->priv->model,
-			&iter,
-			playlist->priv->current);
+				 &iter,
+				 playlist->priv->current);
 
-	if (content_type != NULL) {
-		gtk_tree_model_get (playlist->priv->model,
-				    &iter,
-				    FILENAME_COL, &path,
-				    MIME_TYPE_COL, content_type,
-				    -1);
-	} else {
-		gtk_tree_model_get (playlist->priv->model,
-				    &iter,
-				    FILENAME_COL, &path,
-				    -1);
-	}
+	gtk_tree_model_get (playlist->priv->model,
+			    &iter,
+			    FILENAME_COL, &title,
+			    -1);
+	return title;
+}
 
-	return path;
+char *
+totem_playlist_get_current_content_type (TotemPlaylist *playlist)
+{
+	GtkTreeIter iter;
+	char *content_type;
+
+	g_return_val_if_fail (TOTEM_IS_PLAYLIST (playlist), NULL);
+
+	if (update_current_from_playlist (playlist) == FALSE)
+		return NULL;
+
+	gtk_tree_model_get_iter (playlist->priv->model,
+				 &iter,
+				 playlist->priv->current);
+
+	gtk_tree_model_get (playlist->priv->model,
+			    &iter,
+			    MIME_TYPE_COL, &content_type,
+			    -1);
+
+	return content_type;
 }
 
 char *
@@ -2635,7 +2684,7 @@
 				      path, NULL,
 				      TRUE, 0.5, 0);
 	gtk_tree_path_free (path);
-	
+
 	return TRUE;
 }
 
@@ -2749,7 +2798,7 @@
 
 	return playlist->priv->repeat;
 }
-	
+
 void
 totem_playlist_set_repeat (TotemPlaylist *playlist, gboolean repeat)
 {
@@ -2953,37 +3002,3 @@
 				totemplaylist_marshal_VOID__STRING_STRING,
 				G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING);
 }
-
-static gboolean
-totem_playlist_foreach_cb (GtkTreeModel *model,
-			   GtkTreePath  *path,
-			   GtkTreeIter  *iter,
-			   gpointer      data)
-{
-	PlaylistForeachContext *context = data;
-	gchar *filename = NULL;
-	gchar *uri = NULL;
-
-	gtk_tree_model_get (model, iter, URI_COL, &uri, FILENAME_COL, &filename, -1);
-	context->callback (context->playlist, filename, uri, context->user_data);
-
-	g_free (filename);
-	g_free (uri);
-
-	return FALSE;
-}
-
-void
-totem_playlist_foreach (TotemPlaylist            *playlist,
-			TotemPlaylistForeachFunc  callback,
-			gpointer                  user_data)
-{
-	PlaylistForeachContext context = { playlist, callback, user_data };
-
-	g_return_if_fail (TOTEM_IS_PLAYLIST (playlist));
-	g_return_if_fail (NULL != callback);
-
-	gtk_tree_model_foreach (playlist->priv->model,
-				totem_playlist_foreach_cb,
-				&context);
-}
diff -Nru totem-3.4.3/src/totem-playlist.h totem-3.6.2/src/totem-playlist.h
--- totem-3.4.3/src/totem-playlist.h	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/totem-playlist.h	2012-08-29 23:07:45.000000000 +0000
@@ -130,8 +130,8 @@
 					      GMount *mount);
 char      *totem_playlist_get_current_mrl (TotemPlaylist *playlist,
 					   char **subtitle);
-char      *totem_playlist_get_current_title (TotemPlaylist *playlist,
-					     char         **content_type);
+char      *totem_playlist_get_current_title (TotemPlaylist *playlist);
+char      *totem_playlist_get_current_content_type (TotemPlaylist *playlist);
 char      *totem_playlist_get_title (TotemPlaylist *playlist,
 				     guint title_index);
 
@@ -165,10 +165,6 @@
 int        totem_playlist_get_last (TotemPlaylist *playlist);
 void       totem_playlist_set_current (TotemPlaylist *playlist, guint current_index);
 
-void       totem_playlist_foreach (TotemPlaylist *playlist,
-				   TotemPlaylistForeachFunc callback,
-				   gpointer user_data);
-
 G_END_DECLS
 
 #endif /* TOTEM_PLAYLIST_H */
diff -Nru totem-3.4.3/src/totem-preferences.c totem-3.6.2/src/totem-preferences.c
--- totem-3.4.3/src/totem-preferences.c	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/totem-preferences.c	2012-08-29 23:07:45.000000000 +0000
@@ -44,6 +44,9 @@
 #include "totem-subtitle-encoding.h"
 #include "totem-plugins-engine.h"
 
+#define PWID(x) (GtkWidget *) gtk_builder_get_object (totem->prefs_xml, x)
+#define POBJ(x) gtk_builder_get_object (totem->prefs_xml, x)
+
 /* Callback functions for GtkBuilder */
 G_MODULE_EXPORT void checkbutton2_toggled_cb (GtkToggleButton *togglebutton, Totem *totem);
 G_MODULE_EXPORT void audio_screensaver_button_toggled_cb (GtkToggleButton *togglebutton, Totem *totem);
@@ -59,15 +62,13 @@
 
 	g_settings_set_boolean (totem->settings, "show-visualizations", value);
 
-	item = GTK_WIDGET (gtk_builder_get_object (totem->xml, "tpw_visuals_type_label"));
+	item = PWID ("tpw_visuals_type_label");
 	gtk_widget_set_sensitive (item, value);
-	item = GTK_WIDGET (gtk_builder_get_object (totem->xml,
-			"tpw_visuals_type_combobox"));
+	item = PWID ("tpw_visuals_type_combobox");
 	gtk_widget_set_sensitive (item, value);
-	item = GTK_WIDGET (gtk_builder_get_object (totem->xml, "tpw_visuals_size_label"));
+	item = PWID ("tpw_visuals_size_label");
 	gtk_widget_set_sensitive (item, value);
-	item = GTK_WIDGET (gtk_builder_get_object (totem->xml,
-			"tpw_visuals_size_combobox"));
+	item = PWID ("tpw_visuals_size_combobox");
 	gtk_widget_set_sensitive (item, value);
 
 	bacon_video_widget_set_show_visualizations
@@ -97,7 +98,7 @@
 {
 	GObject *item;
 
-	item = gtk_builder_get_object (totem->xml, "tpw_visuals_checkbutton");
+	item = POBJ ("tpw_visuals_checkbutton");
 	g_signal_handlers_disconnect_by_func (item,
 			checkbutton2_toggled_cb, totem);
 
@@ -119,15 +120,15 @@
 	GObject *item, *radio;
 	gboolean value;
 
-	item = gtk_builder_get_object (totem->xml, "tpw_audio_toggle_button");
+	item = POBJ ("tpw_audio_toggle_button");
 	g_signal_handlers_disconnect_by_func (item,
 					      audio_screensaver_button_toggled_cb, totem);
 
 	value = g_settings_get_boolean (totem->settings, "lock-screensaver-on-audio");
 	if (value != FALSE) {
-		radio = gtk_builder_get_object (totem->xml, "tpw_audio_toggle_button");
+		radio = POBJ ("tpw_audio_toggle_button");
 	} else {
-		radio = gtk_builder_get_object (totem->xml, "tpw_video_toggle_button");
+		radio = POBJ ("tpw_video_toggle_button");
 	}
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio), TRUE);
 
@@ -163,7 +164,7 @@
 
 	for (i = 0; i < G_N_ELEMENTS (scales); i++) {
 		GtkRange *item;
-		item = GTK_RANGE (gtk_builder_get_object (totem->xml, scales[i]));
+		item = GTK_RANGE (POBJ (scales[i]));
 		gtk_range_set_value (item, 65535/2);
 	}
 }
@@ -193,7 +194,7 @@
 	gchar *font;
 	GtkFontButton *item;
 
-	item = GTK_FONT_BUTTON (gtk_builder_get_object (totem->xml, "font_sel_button"));
+	item = GTK_FONT_BUTTON (POBJ ("font_sel_button"));
 	font = g_settings_get_string (settings, "subtitle-font");
 	gtk_font_button_set_font_name (item, font);
 	bacon_video_widget_set_subtitle_font (totem->bvw, font);
@@ -206,7 +207,7 @@
 	gchar *encoding;
 	GtkComboBox *item;
 
-	item = GTK_COMBO_BOX (gtk_builder_get_object (totem->xml, "subtitle_encoding_combo"));
+	item = GTK_COMBO_BOX (POBJ ("subtitle_encoding_combo"));
 	encoding = g_settings_get_string (settings, "subtitle-encoding");
 	totem_subtitle_encoding_set (item, encoding);
 	bacon_video_widget_set_subtitle_encoding (totem->bvw, encoding);
@@ -259,7 +260,7 @@
 	show_visualizations = g_settings_get_boolean (settings, "show-visualizations");
 
 	/* Only enable the size combobox if the visualization-quality setting is writable, and visualizations are enabled */
-	gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (totem->xml, "tpw_visuals_size_combobox")), writable && show_visualizations);
+	gtk_widget_set_sensitive (PWID ("tpw_visuals_size_combobox"), writable && show_visualizations);
 }
 
 void
@@ -270,6 +271,7 @@
 	guint i, hidden;
 	char *visual, *font, *encoding;
 	GList *list, *l;
+	GtkWidget *widget;
 	GObject *item;
 
 	static struct {
@@ -291,7 +293,7 @@
 
 	/* Work-around builder dialogue not parenting properly for
 	 * On top windows */
-	item = gtk_builder_get_object (totem->xml, "tpw_notebook");
+	widget = PWID ("tpw_notebook");
 	totem->prefs = gtk_dialog_new_with_buttons (_("Preferences"),
 			GTK_WINDOW (totem->win),
 			GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -301,10 +303,10 @@
 	gtk_container_set_border_width (GTK_CONTAINER (totem->prefs), 5);
 	content_area = gtk_dialog_get_content_area (GTK_DIALOG (totem->prefs));
 	gtk_box_set_spacing (GTK_BOX (content_area), 2);
-	gtk_widget_reparent (GTK_WIDGET (item), content_area);
+	gtk_widget_reparent (widget, content_area);
 	gtk_widget_show_all (content_area);
-	item = gtk_builder_get_object (totem->xml, "totem_preferences_window");
-	gtk_widget_destroy (GTK_WIDGET (item));
+	widget = PWID ("totem_preferences_window");
+	gtk_widget_destroy (widget);
 
 	g_signal_connect (G_OBJECT (totem->prefs), "response",
 			G_CALLBACK (gtk_widget_hide), NULL);
@@ -314,39 +316,32 @@
                           G_CALLBACK (gtk_widget_destroyed), &totem->prefs);
 
 	/* Remember position */
-	item = gtk_builder_get_object (totem->xml, "tpw_remember_position_checkbutton");
+	item = POBJ ("tpw_remember_position_checkbutton");
 	g_settings_bind (totem->settings, "remember-position", item, "active", G_SETTINGS_BIND_DEFAULT);
 	g_settings_bind (totem->settings, "remember-position", totem, "remember-position", G_SETTINGS_BIND_DEFAULT | G_SETTINGS_BIND_NO_SENSITIVITY);
 
 	/* Auto-resize */
-	item = gtk_builder_get_object (totem->xml, "tpw_display_checkbutton");
+	item = POBJ ("tpw_display_checkbutton");
 	g_settings_bind (totem->settings, "auto-resize", item, "active", G_SETTINGS_BIND_DEFAULT);
 	g_settings_bind (totem->settings, "auto-resize", bvw, "auto-resize", G_SETTINGS_BIND_DEFAULT | G_SETTINGS_BIND_NO_SENSITIVITY);
 
 	/* Screensaver audio locking */
 	lock_screensaver_on_audio = g_settings_get_boolean (totem->settings, "lock-screensaver-on-audio");
 	if (lock_screensaver_on_audio != FALSE)
-		item = gtk_builder_get_object (totem->xml, "tpw_audio_toggle_button");
+		item = POBJ ("tpw_audio_toggle_button");
 	else
-		item = gtk_builder_get_object (totem->xml, "tpw_video_toggle_button");
+		item = POBJ ("tpw_video_toggle_button");
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (item), TRUE);
 	g_signal_connect (totem->settings, "changed::lock-screensaver-on-audio", (GCallback) lock_screensaver_on_audio_changed_cb, totem);
 
 	/* Disable deinterlacing */
-	item = gtk_builder_get_object (totem->xml, "tpw_no_deinterlace_checkbutton");
+	item = POBJ ("tpw_no_deinterlace_checkbutton");
 	g_settings_bind (totem->settings, "disable-deinterlacing", item, "active", G_SETTINGS_BIND_DEFAULT);
 	g_settings_bind (totem->settings, "disable-deinterlacing", bvw, "deinterlacing",
 	                 G_SETTINGS_BIND_DEFAULT | G_SETTINGS_BIND_NO_SENSITIVITY | G_SETTINGS_BIND_INVERT_BOOLEAN);
 
-	/* Connection Speed */
-	item = gtk_builder_get_object (totem->xml, "tpw_speed_combobox");
-	g_settings_bind (totem->settings, "connection-speed", bvw, "connection-speed", G_SETTINGS_BIND_DEFAULT | G_SETTINGS_BIND_NO_SENSITIVITY);
-	g_settings_bind_with_mapping (totem->settings, "connection-speed", item, "active", G_SETTINGS_BIND_DEFAULT,
-	                              (GSettingsBindGetMapping) int_enum_get_mapping, (GSettingsBindSetMapping) int_enum_set_mapping,
-	                              g_type_class_ref (BVW_TYPE_CONNECTION_SPEED), (GDestroyNotify) g_type_class_unref);
-
 	/* Enable visuals */
-	item = gtk_builder_get_object (totem->xml, "tpw_visuals_checkbutton");
+	item = POBJ ("tpw_visuals_checkbutton");
 	show_visuals = g_settings_get_boolean (totem->settings, "show-visualizations");
 
 	g_signal_handlers_disconnect_by_func (item, checkbutton2_toggled_cb, totem);
@@ -358,12 +353,11 @@
 	g_signal_connect (totem->settings, "changed::show-visualizations", (GCallback) show_vfx_changed_cb, totem);
 
 	/* Auto-load subtitles */
-	item = gtk_builder_get_object (totem->xml, "tpw_auto_subtitles_checkbutton");
+	item = POBJ ("tpw_auto_subtitles_checkbutton");
 	g_settings_bind (totem->settings, "autoload-subtitles", item, "active", G_SETTINGS_BIND_DEFAULT);
-	g_settings_bind (totem->settings, "autoload-subtitles", totem, "autoload-subtitles", G_SETTINGS_BIND_DEFAULT | G_SETTINGS_BIND_NO_SENSITIVITY);
 
 	/* Auto-load external chapters */
-	item = gtk_builder_get_object (totem->xml, "tpw_auto_chapters_checkbutton");
+	item = POBJ ("tpw_auto_chapters_checkbutton");
 	g_settings_bind (totem->settings, "autoload-chapters", item, "active", G_SETTINGS_BIND_DEFAULT);
 
 	/* Visuals list */
@@ -377,7 +371,7 @@
 		visual = g_strdup ("goom");
 	}
 
-	item = gtk_builder_get_object (totem->xml, "tpw_visuals_type_liststore");
+	item = POBJ ("tpw_visuals_type_liststore");
 
 	i = 0;
 	for (l = list; l != NULL; l = l->next) {
@@ -391,7 +385,7 @@
 		if (strcmp (name, visual) == 0) {
 			GObject *combobox;
 
-			combobox = gtk_builder_get_object (totem->xml, "tpw_visuals_type_combobox");
+			combobox = POBJ ("tpw_visuals_type_combobox");
 			gtk_combo_box_set_active (GTK_COMBO_BOX (combobox), i);
 		}
 
@@ -401,7 +395,7 @@
 
 	/* Visualisation quality. We have to bind the writability separately, as the sensitivity of the size combobox is also affected by whether
 	 * visualizations are enabled. */
-	item = gtk_builder_get_object (totem->xml, "tpw_visuals_size_combobox");
+	item = POBJ ("tpw_visuals_size_combobox");
 	g_settings_bind (totem->settings, "visualization-quality", bvw, "visualization-quality",
 	                 G_SETTINGS_BIND_DEFAULT | G_SETTINGS_BIND_NO_SENSITIVITY);
 	g_settings_bind_with_mapping (totem->settings, "visualization-quality", item, "active",
@@ -415,17 +409,17 @@
 	for (i = 0; i < G_N_ELEMENTS (props); i++) {
 		int prop_value;
 
-		item = gtk_builder_get_object (totem->xml, props[i].adjustment);
+		item = POBJ (props[i].adjustment);
 		g_settings_bind (totem->settings, props[i].key, item, "value", G_SETTINGS_BIND_DEFAULT);
 		g_settings_bind (totem->settings, props[i].key, bvw, props[i].key, G_SETTINGS_BIND_DEFAULT | G_SETTINGS_BIND_NO_SENSITIVITY);
 
 		prop_value = bacon_video_widget_get_video_property (totem->bvw, props[i].prop);
 		if (prop_value < 0) {
 			/* The property's unsupported, so hide the widget and its label */
-			item = gtk_builder_get_object (totem->xml, props[i].name);
+			item = POBJ (props[i].name);
 			gtk_range_set_value (GTK_RANGE (item), (gdouble) 65535/2);
 			gtk_widget_hide (GTK_WIDGET (item));
-			item = gtk_builder_get_object (totem->xml, props[i].label);
+			item = POBJ (props[i].label);
 			gtk_widget_hide (GTK_WIDGET (item));
 			hidden++;
 		}
@@ -433,12 +427,12 @@
 
 	/* If all the properties have been hidden, hide their section box */
 	if (hidden == G_N_ELEMENTS (props)) {
-		item = gtk_builder_get_object (totem->xml, "tpw_bright_contr_vbox");
+		item = POBJ ("tpw_bright_contr_vbox");
 		gtk_widget_hide (GTK_WIDGET (item));
 	}
 
 	/* Sound output type */
-	item = gtk_builder_get_object (totem->xml, "tpw_sound_output_combobox");
+	item = POBJ ("tpw_sound_output_combobox");
 	g_settings_bind (totem->settings, "audio-output-type", bvw, "audio-output-type",
 	                 G_SETTINGS_BIND_DEFAULT | G_SETTINGS_BIND_NO_SENSITIVITY);
 	g_settings_bind_with_mapping (totem->settings, "audio-output-type", item, "active", G_SETTINGS_BIND_DEFAULT,
@@ -446,7 +440,7 @@
 	                              g_type_class_ref (BVW_TYPE_AUDIO_OUTPUT_TYPE), (GDestroyNotify) g_type_class_unref);
 
 	/* Subtitle font selection */
-	item = gtk_builder_get_object (totem->xml, "font_sel_button");
+	item = POBJ ("font_sel_button");
 	gtk_font_button_set_title (GTK_FONT_BUTTON (item),
 				   _("Select Subtitle Font"));
 	font = g_settings_get_string (totem->settings, "subtitle-font");
@@ -458,7 +452,7 @@
 	g_signal_connect (totem->settings, "changed::subtitle-font", (GCallback) font_changed_cb, totem);
 
 	/* Subtitle encoding selection */
-	item = gtk_builder_get_object (totem->xml, "subtitle_encoding_combo");
+	item = POBJ ("subtitle_encoding_combo");
 	totem_subtitle_encoding_init (GTK_COMBO_BOX (item));
 	encoding = g_settings_get_string (totem->settings, "subtitle-encoding");
 	/* Make sure the default is UTF-8 */
diff -Nru totem-3.4.3/src/totem-private.h totem-3.6.2/src/totem-private.h
--- totem-3.4.3/src/totem-private.h	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/totem-private.h	2012-08-29 23:07:45.000000000 +0000
@@ -69,13 +69,14 @@
 } TotemStates;
 
 struct _TotemObject {
-	GObject parent;
+	GtkApplication parent;
 
 	/* Control window */
 	GtkBuilder *xml;
 	GtkWidget *win;
 	BaconVideoWidget *bvw;
 	GtkWidget *prefs;
+	GtkBuilder *prefs_xml;
 	GtkWidget *statusbar;
 
 	/* UI manager */
@@ -117,7 +118,6 @@
 	GtkWidget *languages;
 	GList *subtitles_list;
 	GList *language_list;
-	gboolean autoload_subs;
 
 	/* Fullscreen */
 	TotemFullscreen *fs;
@@ -152,11 +152,11 @@
 	gint64 seek_to;
 	TotemPlaylist *playlist;
 	GSettings *settings;
-	GtkApplication *app;
 	TotemStates state;
 	TotemOpenLocation *open_location;
 	gboolean remember_position;
 	gboolean disable_kbd_shortcuts;
+	gboolean has_played_emitted;
 };
 
 GtkWidget *totem_volume_create (void);
diff -Nru totem-3.4.3/src/totem-properties-main.c totem-3.6.2/src/totem-properties-main.c
--- totem-3.4.3/src/totem-properties-main.c	2012-04-02 14:15:40.000000000 +0000
+++ totem-3.6.2/src/totem-properties-main.c	2012-08-29 23:07:45.000000000 +0000
@@ -27,6 +27,7 @@
 #include 
 #include 
 #include 
+#define GST_USE_UNSTABLE_API 1
 #include 
 
 #include "totem-properties-view.h"
diff -Nru totem-3.4.3/src/totem-properties-view.c totem-3.6.2/src/totem-properties-view.c
--- totem-3.4.3/src/totem-properties-view.c	2012-01-10 16:10:04.000000000 +0000
+++ totem-3.6.2/src/totem-properties-view.c	2012-08-29 23:07:45.000000000 +0000
@@ -30,6 +30,9 @@
 
 #include 
 #include 
+
+#define GST_USE_UNSTABLE_API 1
+#include 
 #include 
 
 #include "totem-properties-view.h"
@@ -210,6 +213,7 @@
 		bacon_video_widget_properties_set_label (props->priv->props,
 							 "samplerate",
 							 string);
+		g_free (string);
 	} else {
 		bacon_video_widget_properties_set_label (props->priv->props,
 							 "samplerate",
@@ -230,6 +234,7 @@
 		bacon_video_widget_properties_set_label (props->priv->props,
 							 "channels",
 							 string);
+		g_free (string);
 	} else {
 		bacon_video_widget_properties_set_label (props->priv->props,
 							 "channels",
diff -Nru totem-3.4.3/src/totem-resources.c totem-3.6.2/src/totem-resources.c
--- totem-3.4.3/src/totem-resources.c	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/totem-resources.c	2012-08-29 23:07:45.000000000 +0000
@@ -34,7 +34,10 @@
 #include 
 #include 
 #include 
+
+#ifdef G_OS_UNIX
 #include 
+#endif
 
 #include "totem-resources.h"
 
@@ -48,6 +51,7 @@
 static void
 set_resource_limits (const char *input)
 {
+#ifdef G_OS_UNIX
 	struct rlimit limit;
 	struct stat buf;
 	rlim_t max;
@@ -77,6 +81,9 @@
 	limit.rlim_cur = MAX_HELPER_SECONDS;
 	limit.rlim_max = MAX_HELPER_SECONDS;
 	setrlimit (RLIMIT_CPU, &limit);
+#else
+#warning unimplemented
+#endif
 }
 
 G_GNUC_NORETURN static gpointer
@@ -112,11 +119,7 @@
 		sleep_time = wall_clock_time;
 
 	finished = FALSE;
-#if GLIB_CHECK_VERSION (2, 31, 0)
 	g_thread_new ("time-monitor", time_monitor, (gpointer) input);
-#else
-	g_thread_create (time_monitor, (gpointer) input, FALSE, NULL);
-#endif
 }
 
 void
diff -Nru totem-3.4.3/src/totem-statusbar.c totem-3.6.2/src/totem-statusbar.c
--- totem-3.4.3/src/totem-statusbar.c	2012-01-10 16:10:04.000000000 +0000
+++ totem-3.6.2/src/totem-statusbar.c	2012-08-29 23:07:45.000000000 +0000
@@ -27,12 +27,12 @@
 
 #include "config.h"
 
+#include 
 #include 
-
 #include 
 
 #include "totem-statusbar.h"
-#include "video-utils.h"
+#include "totem-time-helpers.h"
 
 #define SPACING 4
 #define NORMAL_CONTEXT "text"
@@ -49,7 +49,7 @@
   gint time;
   gint length;
   guint timeout;
-  guint percentage;
+  gdouble percentage;
 
   guint pushed : 1;
   guint seeking : 1;
@@ -225,7 +225,7 @@
 }
 
 void
-totem_statusbar_push (TotemStatusbar *statusbar, guint percentage)
+totem_statusbar_push (TotemStatusbar *statusbar, gdouble percentage)
 {
   TotemStatusbarPrivate *priv = statusbar->priv;
   GtkStatusbar *gstatusbar = GTK_STATUSBAR (statusbar);
@@ -247,11 +247,11 @@
     priv->percentage = percentage;
 
     /* eg: 75 % */
-    label = g_strdup_printf (_("%d %%"), percentage);
+    label = g_strdup_printf (_("%lf %%"), floorf (percentage));
     gtk_progress_bar_set_text (GTK_PROGRESS_BAR (priv->progress), label);
     g_free (label);
     gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (priv->progress),
-                                  percentage / 100.);
+                                  percentage);
     gtk_widget_show (priv->progress);
 
     need_update = TRUE;
@@ -327,9 +327,9 @@
 	gtk_label_get_text (GTK_LABEL (statusbar->priv->time_label)));
   } else {
     /* eg: Buffering, 75 % */
-    text = g_strdup_printf (_("%s, %d %%"),
+    text = g_strdup_printf (_("%s, %f %%"),
 	gtk_label_get_text (GTK_LABEL (label)),
-	statusbar->priv->percentage);
+	floorf (statusbar->priv->percentage));
   }
 
   atk_object_set_name (obj, text);
diff -Nru totem-3.4.3/src/totem-statusbar.h totem-3.6.2/src/totem-statusbar.h
--- totem-3.4.3/src/totem-statusbar.h	2011-08-25 18:35:01.000000000 +0000
+++ totem-3.6.2/src/totem-statusbar.h	2012-08-29 23:07:45.000000000 +0000
@@ -65,7 +65,7 @@
 						 const char *message);
 void       totem_statusbar_pop_help             (TotemStatusbar *statusbar);
 void	   totem_statusbar_push			(TotemStatusbar *statusbar,
-						 guint percentage);
+						 gdouble percentage);
 void       totem_statusbar_pop			(TotemStatusbar *statusbar);
 
 G_END_DECLS
diff -Nru totem-3.4.3/src/totem-time-label.c totem-3.6.2/src/totem-time-label.c
--- totem-3.4.3/src/totem-time-label.c	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/totem-time-label.c	2012-08-29 23:07:45.000000000 +0000
@@ -3,7 +3,7 @@
 
 #include "totem-time-label.h"
 #include 
-#include "video-utils.h"
+#include "totem-time-helpers.h"
 
 struct _TotemTimeLabelPrivate {
 	gint64 time;
@@ -48,8 +48,8 @@
 
 	g_return_if_fail (TOTEM_IS_TIME_LABEL (label));
 
-	if (_time / 1000 == label->priv->time / 1000
-			&& length / 1000 == label->priv->length / 1000)
+	if (_time / 1000 == label->priv->time / 1000 &&
+	    length / 1000 == label->priv->length / 1000)
 		return;
 
 	if (length <= 0) {
@@ -59,12 +59,13 @@
 
 		time_str = totem_time_to_string (_time);
 		length_str = totem_time_to_string (length);
-		if (label->priv->seeking == FALSE)
+		if (label->priv->seeking == FALSE) {
 			/* Elapsed / Total Length */
 			label_str = g_strdup_printf (_("%s / %s"), time_str, length_str);
-		else 
+		} else {
 			/* Seeking to Time / Total Length */
 			label_str = g_strdup_printf (_("Seek to %s / %s"), time_str, length_str);
+		}
 		g_free (time_str);
 		g_free (length_str);
 	}
diff -Nru totem-3.4.3/src/totem-uri.c totem-3.6.2/src/totem-uri.c
--- totem-3.4.3/src/totem-uri.c	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/totem-uri.c	2012-08-29 23:07:45.000000000 +0000
@@ -130,7 +130,7 @@
 		return NULL;
 
 	/* FIXME: We used to explicitly check whether it was a CD/DVD */
-	if (g_mount_can_eject (mount) == TRUE) {
+	if (g_mount_can_eject (mount) == FALSE) {
 		g_object_unref (mount);
 		return NULL;
 	}
@@ -288,6 +288,10 @@
 			  "mount-pre-unmount",
 			  G_CALLBACK (totem_action_on_unmount),
 			  totem);
+	g_signal_connect (G_OBJECT (totem->monitor),
+			  "mount-removed",
+			  G_CALLBACK (totem_action_on_unmount),
+			  totem);
 }
 
 /* List from xine-lib's demux_sputext.c.
@@ -317,173 +321,6 @@
 	return FALSE;
 }
 
-static inline gboolean
-totem_uri_exists (const char *uri)
-{
-	GFile *file = g_file_new_for_uri (uri);
-	if (file != NULL) {
-		if (g_file_query_exists (file, NULL)) {
-			g_object_unref (file);
-			return TRUE;
-		}
-		g_object_unref (file);
-	}
-	return FALSE;
-}
-
-static char *
-totem_uri_get_subtitle_for_uri (const char *uri)
-{
-	char *subtitle;
-	guint len, i;
-	gint suffix;
-
-	g_return_val_if_fail (uri != NULL, NULL);
-
-	/* Find the filename suffix delimiter */
-	len = strlen (uri);
-	for (suffix = len - 1; suffix > 0; suffix--) {
-		if (uri[suffix] == G_DIR_SEPARATOR ||
-		    (uri[suffix] == '/')) {
-			/* This filename has no extension; we'll need to 
-			 * add one */
-			suffix = len;
-			break;
-		}
-		if (uri[suffix] == '.') {
-			/* Found our extension marker */
-			break;
-		}
-	}
-	if (suffix < 0)
-		return NULL;
-
-	/* Generate a subtitle string with room at the end to store the
-	 * 3 character extensions for which we want to search */
-	subtitle = g_malloc0 (suffix + 4 + 1);
-	g_return_val_if_fail (subtitle != NULL, NULL);
-	g_strlcpy (subtitle, uri, suffix + 4 + 1);
-	g_strlcpy (subtitle + suffix, ".???", 5);
-
-	/* Search for any files with one of our known subtitle extensions */
-	for (i = 0; i < G_N_ELEMENTS (subtitle_ext) ; i++) {
-		char *subtitle_ext_upper;
-		memcpy (subtitle + suffix + 1, subtitle_ext[i], 3);
-
-		if (totem_uri_exists (subtitle))
-			return subtitle;
-
-		/* Check with upper-cased extension */
-		subtitle_ext_upper = g_ascii_strup (subtitle_ext[i], -1);
-		memcpy (subtitle + suffix + 1, subtitle_ext_upper, 3);
-		g_free (subtitle_ext_upper);
-
-		if (totem_uri_exists (subtitle))
-			return subtitle;
-	}
-	g_free (subtitle);
-	return NULL;
-}
-
-static char *
-totem_uri_get_subtitle_in_subdir (GFile *file, const char *subdir)
-{
-	char *filename, *subtitle, *full_path_str;
-	GFile *parent, *full_path, *directory;
-
-	/* Get the sibling directory @subdir of the file @file */
-	parent = g_file_get_parent (file);
-	directory = g_file_get_child (parent, subdir);
-	g_object_unref (parent);
-
-	/* Get the file of the same name as @file in the @subdir directory */
-	filename = g_file_get_basename (file);
-	full_path = g_file_get_child (directory, filename);
-	g_object_unref (directory);
-	g_free (filename);
-
-	/* Get the subtitles from that URI */
-	full_path_str = g_file_get_uri (full_path);
-	g_object_unref (full_path);
-	subtitle = totem_uri_get_subtitle_for_uri (full_path_str);
-	g_free (full_path_str);
-
-	return subtitle;
-}
-
-static char *
-totem_uri_get_cached_subtitle_for_uri (const char *uri)
-{
-	char *filename, *basename, *fake_filename, *fake_uri, *ret;
-
-	filename = g_filename_from_uri (uri, NULL, NULL);
-	if (filename == NULL)
-		return NULL;
-
-	basename = g_path_get_basename (filename);
-	g_free (filename);
-	if (basename == NULL || strcmp (basename, ".") == 0) {
-		g_free (basename);
-		return NULL;
-	}
-
-	fake_filename = g_build_filename (g_get_user_cache_dir (),
-				"totem",
-				"subtitles",
-				basename,
-				NULL);
-	g_free (basename);
-	fake_uri = g_filename_to_uri (fake_filename, NULL, NULL);
-	g_free (fake_filename);
-
-	ret = totem_uri_get_subtitle_for_uri (fake_uri);
-	g_free (fake_uri);
-
-	return ret;
-}
-
-char *
-totem_uri_get_subtitle_uri (const char *uri)
-{
-	GFile *file;
-	char *subtitle;
-
-	if (g_str_has_prefix (uri, "http") != FALSE ||
-	    g_str_has_prefix (uri, "rtsp") != FALSE ||
-	    g_str_has_prefix (uri, "rtmp") != FALSE)
-		return NULL;
-
-	/* Has the user specified a subtitle file manually? */
-	if (strstr (uri, "#subtitle:") != NULL)
-		return NULL;
-
-	/* Does the file exist? */
-	file = g_file_new_for_uri (uri);
-	if (g_file_query_exists (file, NULL) != TRUE) {
-		g_object_unref (file);
-		return NULL;
-	}
-
-	/* Try in the cached subtitles directory */
-	subtitle = totem_uri_get_cached_subtitle_for_uri (uri);
-	if (subtitle != NULL) {
-		g_object_unref (file);
-		return subtitle;
-	}
-
-	/* Try in the current directory */
-	subtitle = totem_uri_get_subtitle_for_uri (uri);
-	if (subtitle != NULL) {
-		g_object_unref (file);
-		return subtitle;
-	}
-
-	subtitle = totem_uri_get_subtitle_in_subdir (file, "subtitles");
-	g_object_unref (file);
-
-	return subtitle;
-}
-
 char *
 totem_uri_escape_for_display (const char *uri)
 {
@@ -643,6 +480,8 @@
 	return subtitle;
 }
 
+#define OPEN_DIRECTORY_RESPONSE 1
+
 GSList *
 totem_add_files (GtkWindow *parent, const char *path)
 {
@@ -654,11 +493,12 @@
 	gboolean set_folder;
 
 	fs = gtk_file_chooser_dialog_new (_("Select Movies or Playlists"),
-			parent,
-			GTK_FILE_CHOOSER_ACTION_OPEN,
-			GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-			GTK_STOCK_ADD, GTK_RESPONSE_ACCEPT,
-			NULL);
+					  parent,
+					  GTK_FILE_CHOOSER_ACTION_OPEN,
+					  GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+					  _("Add Directory"), OPEN_DIRECTORY_RESPONSE,
+					  GTK_STOCK_ADD, GTK_RESPONSE_ACCEPT,
+					  NULL);
 	gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (fs), filter_all);
 	gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (fs), filter_supported);
 	gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (fs), filter_audio);
@@ -691,13 +531,12 @@
 
 	response = gtk_dialog_run (GTK_DIALOG (fs));
 
-	if (response != GTK_RESPONSE_ACCEPT) {
-		gtk_widget_destroy (fs);
-		g_object_unref (settings);
-		return NULL;
+	filenames = NULL;
+	if (response == OPEN_DIRECTORY_RESPONSE ||
+	    response == GTK_RESPONSE_ACCEPT) {
+		filenames = gtk_file_chooser_get_uris (GTK_FILE_CHOOSER (fs));
 	}
 
-	filenames = gtk_file_chooser_get_uris (GTK_FILE_CHOOSER (fs));
 	if (filenames == NULL) {
 		gtk_widget_destroy (fs);
 		g_object_unref (settings);
diff -Nru totem-3.4.3/src/totem-uri.h totem-3.6.2/src/totem-uri.h
--- totem-3.4.3/src/totem-uri.h	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/totem-uri.h	2012-08-29 23:07:45.000000000 +0000
@@ -41,7 +41,6 @@
 void		totem_setup_file_monitoring	(Totem *totem);
 void		totem_setup_file_filters	(void);
 void		totem_destroy_file_filters	(void);
-char *		totem_uri_get_subtitle_uri	(const char *uri);
 char *		totem_uri_escape_for_display	(const char *uri);
 GSList *	totem_add_files			(GtkWindow *parent,
 						 const char *path);
diff -Nru totem-3.4.3/src/totem-video-list.c totem-3.6.2/src/totem-video-list.c
--- totem-3.4.3/src/totem-video-list.c	2012-01-10 16:10:04.000000000 +0000
+++ totem-3.6.2/src/totem-video-list.c	2012-10-25 13:15:32.000000000 +0000
@@ -378,7 +378,7 @@
 		goto finish;
 
 	if (mrl != NULL)
-		totem_add_to_playlist_and_play (self->priv->totem, mrl, display_name, FALSE);
+		totem_add_to_playlist_and_play (self->priv->totem, mrl, display_name);
 
 finish:
 	g_free (mrl);
diff -Nru totem-3.4.3/src/totem-video-thumbnailer.c totem-3.6.2/src/totem-video-thumbnailer.c
--- totem-3.4.3/src/totem-video-thumbnailer.c	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/totem-video-thumbnailer.c	2012-10-09 15:42:00.000000000 +0000
@@ -27,6 +27,8 @@
 
 #include "config.h"
 
+#define GST_USE_UNSTABLE_API 1
+
 #include 
 #include 
 #include 
@@ -44,6 +46,8 @@
 #include 
 
 #include "gst/totem-gst-helpers.h"
+#include "gst/totem-time-helpers.h"
+#include "gst/totem-gst-pixbuf-helpers.h"
 #include "video-utils.h"
 #include "totem-resources.h"
 
@@ -62,7 +66,7 @@
 #define GALLERY_MIN 3				/* minimum number of screenshots in a gallery */
 #define GALLERY_MAX 30				/* maximum number of screenshots in a gallery */
 #define GALLERY_HEADER_HEIGHT 66		/* header height (in pixels) for the gallery */
-#define DEFAULT_OUTPUT_SIZE 128
+#define DEFAULT_OUTPUT_SIZE 256
 
 static gboolean jpeg_output = FALSE;
 static gboolean raw_output = FALSE;
@@ -88,22 +92,23 @@
 static char *
 get_special_url (GFile *file)
 {
-	char *path, *uri, *mime_type;
+	char *path, *orig_uri, *uri, *mime_type;
 	TotemDiscMediaType type;
 
 	path = g_file_get_path (file);
 
 	mime_type = g_content_type_guess (path, NULL, 0, NULL);
+	g_free (path);
 	if (g_strcmp0 (mime_type, "application/x-cd-image") != 0) {
-		g_free (path);
 		g_free (mime_type);
 		return NULL;
 	}
 	g_free (mime_type);
 
 	uri = NULL;
-	type = totem_cd_detect_type_with_url (path, &uri, NULL);
-	g_free (path);
+	orig_uri = g_file_get_uri (file);
+	type = totem_cd_detect_type_with_url (orig_uri, &uri, NULL);
+	g_free (orig_uri);
 
 	if (type == MEDIA_TYPE_DVD ||
 	    type == MEDIA_TYPE_VCD)
@@ -162,32 +167,6 @@
 	case GST_MESSAGE_EOS:
 		exit (0);
 
-	case GST_MESSAGE_UNKNOWN:
-	case GST_MESSAGE_WARNING:
-	case GST_MESSAGE_INFO:
-	case GST_MESSAGE_TAG:
-	case GST_MESSAGE_BUFFERING:
-	case GST_MESSAGE_STATE_CHANGED:
-	case GST_MESSAGE_STATE_DIRTY:
-	case GST_MESSAGE_STEP_DONE:
-	case GST_MESSAGE_CLOCK_PROVIDE:
-	case GST_MESSAGE_CLOCK_LOST:
-	case GST_MESSAGE_NEW_CLOCK:
-	case GST_MESSAGE_STRUCTURE_CHANGE:
-	case GST_MESSAGE_STREAM_STATUS:
-	case GST_MESSAGE_APPLICATION:
-	case GST_MESSAGE_ELEMENT:
-	case GST_MESSAGE_SEGMENT_START:
-	case GST_MESSAGE_SEGMENT_DONE:
-	case GST_MESSAGE_DURATION:
-	case GST_MESSAGE_LATENCY:
-	case GST_MESSAGE_ASYNC_START:
-	case GST_MESSAGE_ASYNC_DONE:
-	case GST_MESSAGE_REQUEST_STATE:
-	case GST_MESSAGE_STEP_START:
-	case GST_MESSAGE_QOS:
-	case GST_MESSAGE_PROGRESS:
-	case GST_MESSAGE_ANY:
 	default:
 		/* Ignored */
 		;;
@@ -210,7 +189,7 @@
 	GstBus *bus;
 
 	bus = gst_element_get_bus (app->play);
-	gst_bus_set_sync_handler (bus, (GstBusSyncHandler) error_handler, app->play);
+	gst_bus_set_sync_handler (bus, (GstBusSyncHandler) error_handler, app->play, NULL);
 }
 
 static void
@@ -242,6 +221,7 @@
 static void
 thumb_app_check_for_cover (ThumbApp *app)
 {
+	PROGRESS_DEBUG ("Checking whether file has cover");
 	check_cover_for_stream (app, "get-audio-tags");
 	check_cover_for_stream (app, "get-video-tags");
 }
@@ -249,16 +229,25 @@
 static gboolean
 thumb_app_set_duration (ThumbApp *app)
 {
-	GstFormat fmt = GST_FORMAT_TIME;
 	gint64 len = -1;
 
-	if (gst_element_query_duration (app->play, &fmt, &len) && len != -1) {
+	if (gst_element_query_duration (app->play, GST_FORMAT_TIME, &len) && len != -1) {
 		app->duration = len / GST_MSECOND;
 		return TRUE;
 	}
+	app->duration = -1;
 	return FALSE;
 }
 
+static void
+assert_duration (ThumbApp *app)
+{
+	if (app->duration != -1)
+		return;
+	g_print ("totem-video-thumbnailer couldn't get the duration of file '%s'\n", app->input);
+	exit (1);
+}
+
 static gboolean
 thumb_app_get_has_video (ThumbApp *app)
 {
@@ -272,56 +261,35 @@
 {
 	GstBus *bus;
 	GstMessageType events;
+	gboolean terminate = FALSE;
+	gboolean async_received = FALSE;
 
 	gst_element_set_state (app->play, GST_STATE_PAUSED);
 	bus = gst_element_get_bus (app->play);
 	events = GST_MESSAGE_ASYNC_DONE | GST_MESSAGE_ERROR;
 
-	while (TRUE) {
+	while (terminate == FALSE) {
 		GstMessage *message;
 		GstElement *src;
 
-		message = gst_bus_poll (bus, events, -1);
+		message = gst_bus_timed_pop_filtered (bus,
+		                                      GST_CLOCK_TIME_NONE,
+		                                      events);
 
 		src = (GstElement*)GST_MESSAGE_SRC (message);
 
 		switch (GST_MESSAGE_TYPE (message)) {
 		case GST_MESSAGE_ASYNC_DONE:
 			if (src == app->play) {
-				gst_message_unref (message);
-				goto success;
+				async_received = TRUE;
+				terminate = TRUE;
 			}
 			break;
 		case GST_MESSAGE_ERROR:
 			totem_gst_message_print (message, app->play, "totem-video-thumbnailer-error");
-			return FALSE;
+			terminate = TRUE;
+			break;
 
-		case GST_MESSAGE_UNKNOWN:
-		case GST_MESSAGE_EOS:
-		case GST_MESSAGE_WARNING:
-		case GST_MESSAGE_INFO:
-		case GST_MESSAGE_TAG:
-		case GST_MESSAGE_BUFFERING:
-		case GST_MESSAGE_STATE_CHANGED:
-		case GST_MESSAGE_STATE_DIRTY:
-		case GST_MESSAGE_STEP_DONE:
-		case GST_MESSAGE_CLOCK_PROVIDE:
-		case GST_MESSAGE_CLOCK_LOST:
-		case GST_MESSAGE_NEW_CLOCK:
-		case GST_MESSAGE_STRUCTURE_CHANGE:
-		case GST_MESSAGE_STREAM_STATUS:
-		case GST_MESSAGE_APPLICATION:
-		case GST_MESSAGE_ELEMENT:
-		case GST_MESSAGE_SEGMENT_START:
-		case GST_MESSAGE_SEGMENT_DONE:
-		case GST_MESSAGE_DURATION:
-		case GST_MESSAGE_LATENCY:
-		case GST_MESSAGE_ASYNC_START:
-		case GST_MESSAGE_REQUEST_STATE:
-		case GST_MESSAGE_STEP_START:
-		case GST_MESSAGE_QOS:
-		case GST_MESSAGE_PROGRESS:
-		case GST_MESSAGE_ANY:
 		default:
 			/* Ignore */
 			;;
@@ -330,12 +298,14 @@
 		gst_message_unref (message);
 	}
 
-	g_assert_not_reached ();
+	gst_object_unref (bus);
 
-success:
-	/* state change succeeded */
-	GST_DEBUG ("state change to %s succeeded", gst_element_state_get_name (GST_STATE_PAUSED));
-	return TRUE;
+	if (async_received) {
+		/* state change succeeded */
+		GST_DEBUG ("state change to %s succeeded", gst_element_state_get_name (GST_STATE_PAUSED));
+	}
+
+	return async_received;
 }
 
 static void
@@ -344,7 +314,7 @@
 	GstElement *play;
 	GstElement *audio_sink, *video_sink;
 
-	play = gst_element_factory_make ("playbin2", "play");
+	play = gst_element_factory_make ("playbin", "play");
 	audio_sink = gst_element_factory_make ("fakesink", "audio-fake-sink");
 	video_sink = gst_element_factory_make ("fakesink", "video-fake-sink");
 	g_object_set (video_sink, "sync", TRUE, NULL);
@@ -642,6 +612,16 @@
 }
 
 static GdkPixbuf *
+capture_frame_at_time (ThumbApp   *app,
+		       gint64 milliseconds)
+{
+	if (milliseconds != 0)
+		thumb_app_seek (app, milliseconds);
+
+	return totem_gst_playbin_get_frame (app->play);
+}
+
+static GdkPixbuf *
 capture_interesting_frame (ThumbApp *app)
 {
 	GdkPixbuf* pixbuf;
@@ -654,6 +634,11 @@
 		0.5
 	};
 
+	if (app->duration == -1) {
+		PROGRESS_DEBUG("Video has no duration, so capture 1st frame");
+		return capture_frame_at_time (app, 0);
+	}
+
 	/* Test at multiple points in the file to see if we can get an
 	 * interesting frame */
 	for (current = 0; current < G_N_ELEMENTS(frame_locations); current++)
@@ -683,15 +668,6 @@
 }
 
 static GdkPixbuf *
-capture_frame_at_time (ThumbApp   *app,
-		       gint64 milliseconds)
-{
-	thumb_app_seek (app, milliseconds);
-
-	return totem_gst_playbin_get_frame (app->play);
-}
-
-static GdkPixbuf *
 cairo_surface_to_pixbuf (cairo_surface_t *surface)
 {
 	gint stride, width, height, x, y;
@@ -978,10 +954,6 @@
 	const char *input, *output;
 	ThumbApp app;
 
-#if !GLIB_CHECK_VERSION (2, 31, 0)
-	g_thread_init (NULL);
-#endif
-
 	context = g_option_context_new ("Thumbnail movies");
 	options = gst_init_get_option_group ();
 	g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
@@ -1057,13 +1029,10 @@
 	if (gallery == -1)
 		thumb_app_check_for_cover (&app);
 	if (thumb_app_get_has_video (&app) == FALSE) {
-		g_debug ("totem-video-thumbnailer couldn't find a video track in '%s'\n", input);
-		exit (1);
-	}
-	if (thumb_app_set_duration (&app) == FALSE) {
-		g_print ("totem-video-thumbnailer couldn't get the duration of file '%s'\n", input);
+		PROGRESS_DEBUG ("totem-video-thumbnailer couldn't find a video track in '%s'\n", input);
 		exit (1);
 	}
+	thumb_app_set_duration (&app);
 
 	PROGRESS_DEBUG("Opened video file: '%s'", input);
 	PRINT_PROGRESS (10.0);
@@ -1072,12 +1041,15 @@
 		/* If the user has told us to use a frame at a specific second
 		 * into the video, just use that frame no matter how boring it
 		 * is */
-		if (second_index != -1)
+		if (second_index != -1) {
+			assert_duration (&app);
 			pixbuf = capture_frame_at_time (&app, second_index * 1000);
-		else
+		} else {
 			pixbuf = capture_interesting_frame (&app);
+		}
 		PRINT_PROGRESS (90.0);
 	} else {
+		assert_duration (&app);
 		/* We're producing a gallery of screenshots from throughout the file */
 		pixbuf = create_gallery (&app);
 	}
diff -Nru totem-3.4.3/src/totem.c totem-3.6.2/src/totem.c
--- totem-3.4.3/src/totem.c	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/totem.c	2012-10-25 13:15:32.000000000 +0000
@@ -36,7 +36,6 @@
 
 #ifdef GDK_WINDOWING_X11
 /* X11 headers */
-#include 
 #include 
 #endif
 
@@ -53,13 +52,6 @@
 
 static gboolean startup_called = FALSE;
 
-static void
-long_action (void)
-{
-	while (gtk_events_pending ())
-		gtk_main_iteration ();
-}
-
 /* Debug log message handler: discards debug messages unless Totem is run with TOTEM_DEBUG=1.
  * If we're building in the source tree, enable debug messages by default. */
 static void
@@ -80,10 +72,14 @@
 static void
 app_init (Totem *totem, char **argv)
 {
+	GtkSettings *gtk_settings;
 	char *sidebar_pageid;
 
-	/* Settings */
-	totem->settings = g_settings_new (TOTEM_GSETTINGS_SCHEMA);
+	if (gtk_clutter_init (NULL, NULL) != CLUTTER_INIT_SUCCESS)
+		g_warning ("gtk-clutter failed to initialise, expect problems from here on.");
+
+	gtk_settings = gtk_settings_get_default ();
+	g_object_set (G_OBJECT (gtk_settings), "gtk-application-prefer-dark-theme", TRUE, NULL);
 
 	/* Debug log handling */
 	g_log_set_handler (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, (GLogFunc) debug_handler, totem->settings);
@@ -94,6 +90,9 @@
 		totem_action_exit (NULL);
 
 	totem->win = GTK_WIDGET (gtk_builder_get_object (totem->xml, "totem_main_window"));
+	g_object_bind_property (G_OBJECT (totem), "fullscreen",
+				G_OBJECT (totem->win), "show-menubar",
+				G_BINDING_INVERT_BOOLEAN);
 
 	/* Menubar */
 	totem_ui_manager_setup (totem);
@@ -116,16 +115,15 @@
 	totem_session_setup (totem, argv);
 	totem_setup_file_monitoring (totem);
 	totem_setup_file_filters ();
-	totem_setup_play_disc (totem);
+	totem_app_menu_setup (totem);
 	totem_callback_connect (totem);
+
 	sidebar_pageid = totem_setup_window (totem);
 
-	/* Show ! gtk_main_iteration trickery to show all the widgets
-	 * we have so far */
+	/* Show ! */
 	if (optionstate.fullscreen == FALSE) {
 		gtk_widget_show (totem->win);
 		totem_gdk_window_set_waiting_cursor (gtk_widget_get_window (totem->win));
-		long_action ();
 	} else {
 		gtk_widget_realize (totem->win);
 	}
@@ -144,6 +142,8 @@
 	}
 
 	/* The prefs after the video widget is connected */
+	totem->prefs_xml = totem_interface_load ("preferences.ui", TRUE, NULL, totem);
+
 	totem_setup_preferences (totem);
 
 	totem_setup_recent (totem);
@@ -171,7 +171,7 @@
 	if (optionstate.fullscreen == FALSE)
 		gdk_window_set_cursor (gtk_widget_get_window (totem->win), NULL);
 
-	gtk_window_set_application (GTK_WINDOW (totem->win), totem->app);
+	gtk_window_set_application (GTK_WINDOW (totem->win), GTK_APPLICATION (totem));
 }
 
 static void
@@ -190,8 +190,6 @@
 		  Totem                    *totem)
 {
 	GOptionContext *context;
-	GOptionGroup *baconoptiongroup;
-	GError *error = NULL;
 	int argc;
 	char **argv;
 
@@ -201,41 +199,27 @@
 	memset (&optionstate, 0, sizeof (optionstate));
 
 	/* Options parsing */
-	context = g_option_context_new (N_("- Play movies and songs"));
-	baconoptiongroup = bacon_video_widget_get_option_group();
-	if (baconoptiongroup == NULL) {
-		g_warning ("Clutter or GTK+ failed to initialise properly");
-		g_option_context_free (context);
-		return 1;
-	}
-	g_option_context_add_main_entries (context, all_options, GETTEXT_PACKAGE);
-	g_option_context_set_translation_domain(context, GETTEXT_PACKAGE);
-	g_option_context_add_group (context, baconoptiongroup);
-
-	g_option_context_add_group (context, gtk_get_option_group (TRUE));
-	/* Only add session options to the server process */
-	if (startup_called != FALSE)
-		totem_session_add_options (context);
-	if (g_option_context_parse (context, &argc, &argv, &error) == FALSE) {
-		g_print (_("%s\nRun '%s --help' to see a full list of available command line options.\n"),
-				error->message, argv[0]);
-		g_error_free (error);
+	context = totem_options_get_context ();
+	g_option_context_set_help_enabled (context, FALSE);
+	if (g_option_context_parse (context, &argc, &argv, NULL) == FALSE) {
 	        g_option_context_free (context);
 	        return 1;
 	}
 	g_option_context_free (context);
 
+	totem_options_process_early (totem, &optionstate);
+
 	/* Don't create another window if we're remote.
 	 * We can't use g_application_get_is_remote() because it's not registered yet */
 	if (startup_called != FALSE) {
 		app_init (totem, argv);
 
+		gdk_notify_startup_complete ();
+
 		/* Don't add files again through totem_options_process_for_server() */
 		g_strfreev (optionstate.filenames);
 		optionstate.filenames = NULL;
 		startup_called = FALSE;
-	} else {
-		gtk_window_present_with_time (GTK_WINDOW (totem->win), GDK_CURRENT_TIME);
 	}
 
 	/* Now do something with it */
@@ -249,7 +233,6 @@
 main (int argc, char **argv)
 {
 	Totem *totem;
-	GtkSettings *gtk_settings;
 
 	bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
@@ -259,35 +242,32 @@
 	if (XInitThreads () == 0)
 	{
 		gtk_init (&argc, &argv);
-		g_set_application_name (_("Totem Movie Player"));
+		g_set_application_name (_("Videos"));
 		totem_action_error_and_exit (_("Could not initialize the thread-safe libraries."), _("Verify your system installation. Totem will now exit."), NULL);
 	}
 #endif
 
-#if !GLIB_CHECK_VERSION (2, 31, 0)
-	g_thread_init (NULL);
-#endif
 	g_type_init ();
-	gtk_init (&argc, &argv);
 
-	g_set_application_name (_("Totem Movie Player"));
+	g_set_prgname ("totem");
+	g_set_application_name (_("Videos"));
 	gtk_window_set_default_icon_name ("totem");
 	g_setenv("PULSE_PROP_media.role", "video", TRUE);
 
-	gtk_settings = gtk_settings_get_default ();
-	g_object_set (G_OBJECT (gtk_settings), "gtk-application-prefer-dark-theme", TRUE, NULL);
-
 
 	/* Build the main Totem object */
-	totem = g_object_new (TOTEM_TYPE_OBJECT, NULL);
+	totem = g_object_new (TOTEM_TYPE_OBJECT,
+			      "application-id", "org.gnome.Totem",
+			      "flags", G_APPLICATION_HANDLES_COMMAND_LINE,
+			      NULL);
+	totem->settings = g_settings_new (TOTEM_GSETTINGS_SCHEMA);
 
-	totem->app = gtk_application_new ("org.gnome.Totem", G_APPLICATION_HANDLES_COMMAND_LINE);
-	g_signal_connect (G_OBJECT (totem->app), "startup",
+	g_signal_connect (G_OBJECT (totem), "startup",
 			  G_CALLBACK (app_startup), totem);
-	g_signal_connect (G_OBJECT (totem->app), "command-line",
+	g_signal_connect (G_OBJECT (totem), "command-line",
 			  G_CALLBACK (app_command_line), totem);
 
-	g_application_run (G_APPLICATION (totem->app), argc, argv);
+	g_application_run (G_APPLICATION (totem), argc, argv);
 
 	return 0;
 }
diff -Nru totem-3.4.3/src/totem.h totem-3.6.2/src/totem.h
--- totem-3.4.3/src/totem.h	2012-07-04 10:15:49.000000000 +0000
+++ totem-3.6.2/src/totem.h	2012-10-25 13:15:32.000000000 +0000
@@ -30,7 +30,6 @@
 
 #include 
 #include 
-#include 
 #include "totem-cell-renderer-video.h"
 
 /**
@@ -150,28 +149,21 @@
 typedef struct _TotemObject Totem;
 typedef struct _TotemObject TotemObject;
 
-/**
- * TotemObjectClass:
- * @parent_class: the parent class
- * @file_opened: the generic signal handler for the #TotemObject::file-opened signal,
- * which can be overridden by inheriting classes
- * @file_closed: the generic signal handler for the #TotemObject::file-closed signal,
- * which can be overridden by inheriting classes
- * @metadata_updated: the generic signal handler for the #TotemObject::metadata-updated signal,
- * which can be overridden by inheriting classes
- *
- * The class structure for the #TotemPlParser type.
- **/
 typedef struct {
-	GObjectClass parent_class;
+	GtkApplicationClass parent_class;
 
 	void (*file_opened)			(TotemObject *totem, const char *mrl);
 	void (*file_closed)			(TotemObject *totem);
+	void (*file_has_played)			(TotemObject *totem, const char *mrl);
 	void (*metadata_updated)		(TotemObject *totem,
 						 const char *artist,
 						 const char *title,
 						 const char *album,
 						 guint track_num);
+	char * (*get_user_agent)		(TotemObject *totem,
+						 const char  *mrl);
+	char * (*get_text_subtitle)		(TotemObject *totem,
+						 const char  *mrl);
 } TotemObjectClass;
 
 GType	totem_object_get_type			(void);
@@ -179,6 +171,8 @@
 void    totem_object_plugins_shutdown		(TotemObject *totem);
 void	totem_file_opened			(TotemObject *totem,
 						 const char *mrl);
+void	totem_file_has_played			(TotemObject *totem,
+						 const char *mrl);
 void	totem_file_closed			(TotemObject *totem);
 void	totem_metadata_updated			(TotemObject *totem,
 						 const char *artist,
@@ -223,10 +217,6 @@
 						 const char *subtitle,
 						 gboolean warn);
 
-void	totem_action_play_media			(TotemObject *totem,
-						 TotemDiscMediaType type,
-						 const char *device);
-
 void	totem_action_toggle_aspect_ratio	(TotemObject *totem);
 void	totem_action_set_aspect_ratio		(TotemObject *totem, int ratio);
 int	totem_action_get_aspect_ratio		(TotemObject *totem);
@@ -238,8 +228,6 @@
 void    totem_object_action_error               (TotemObject *totem,
 						 const char *title,
 						 const char *reason);
-void    totem_action_play_media_device		(TotemObject *totem,
-						 const char *device);
 
 gboolean totem_is_fullscreen			(TotemObject *totem);
 #define totem_is_playing totem_object_is_playing
@@ -252,8 +240,8 @@
 GtkWindow *totem_object_get_main_window		(TotemObject *totem);
 #define totem_get_ui_manager totem_object_get_ui_manager
 GtkUIManager *totem_object_get_ui_manager	(TotemObject *totem);
-GtkWidget *totem_get_video_widget		(TotemObject *totem);
-char *totem_get_video_widget_backend_name	(TotemObject *totem);
+ #define totem_get_video_widget totem_object_get_video_widget
+GtkWidget *totem_object_get_video_widget	(TotemObject *totem);
 #define totem_get_version totem_object_get_version
 char *totem_object_get_version			(void);
 
@@ -274,8 +262,7 @@
 #define totem_add_to_playlist_and_play totem_object_add_to_playlist_and_play
 void totem_object_add_to_playlist_and_play	(TotemObject *totem,
 						 const char *uri,
-						 const char *display_name,
-						 gboolean add_to_recent);
+						 const char *display_name);
 #define totem_get_current_mrl totem_object_get_current_mrl
 char *  totem_object_get_current_mrl		(TotemObject *totem);
 #define totem_set_current_subtitle totem_object_set_current_subtitle
diff -Nru totem-3.4.3/src/totemobject-marshal.c totem-3.6.2/src/totemobject-marshal.c
--- totem-3.4.3/src/totemobject-marshal.c	2012-07-04 09:55:12.000000000 +0000
+++ totem-3.6.2/src/totemobject-marshal.c	2012-10-25 13:47:24.000000000 +0000
@@ -100,6 +100,51 @@
             data2);
 }
 
+/* STRING:STRING (./totemobject-marshal.list:2) */
+extern void totemobject_marshal_STRING__STRING (GClosure     *closure,
+                                                GValue       *return_value,
+                                                guint         n_param_values,
+                                                const GValue *param_values,
+                                                gpointer      invocation_hint,
+                                                gpointer      marshal_data);
+void
+totemobject_marshal_STRING__STRING (GClosure     *closure,
+                                    GValue       *return_value G_GNUC_UNUSED,
+                                    guint         n_param_values,
+                                    const GValue *param_values,
+                                    gpointer      invocation_hint G_GNUC_UNUSED,
+                                    gpointer      marshal_data)
+{
+  typedef gchar* (*GMarshalFunc_STRING__STRING) (gpointer     data1,
+                                                 gpointer     arg_1,
+                                                 gpointer     data2);
+  register GMarshalFunc_STRING__STRING callback;
+  register GCClosure *cc = (GCClosure*) closure;
+  register gpointer data1, data2;
+  gchar* v_return;
+
+  g_return_if_fail (return_value != NULL);
+  g_return_if_fail (n_param_values == 2);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_STRING__STRING) (marshal_data ? marshal_data : cc->callback);
+
+  v_return = callback (data1,
+                       g_marshal_value_peek_string (param_values + 1),
+                       data2);
+
+  g_value_take_string (return_value, v_return);
+}
+
 G_END_DECLS
 
 #endif /* __totemobject_marshal_MARSHAL_H__ */
diff -Nru totem-3.4.3/src/totemobject-marshal.h totem-3.6.2/src/totemobject-marshal.h
--- totem-3.4.3/src/totemobject-marshal.h	2012-07-04 09:55:12.000000000 +0000
+++ totem-3.6.2/src/totemobject-marshal.h	2012-10-25 13:47:17.000000000 +0000
@@ -14,6 +14,14 @@
                                                                  gpointer      invocation_hint,
                                                                  gpointer      marshal_data);
 
+/* STRING:STRING (./totemobject-marshal.list:2) */
+extern void totemobject_marshal_STRING__STRING (GClosure     *closure,
+                                                GValue       *return_value,
+                                                guint         n_param_values,
+                                                const GValue *param_values,
+                                                gpointer      invocation_hint,
+                                                gpointer      marshal_data);
+
 G_END_DECLS
 
 #endif /* __totemobject_marshal_MARSHAL_H__ */
diff -Nru totem-3.4.3/src/totemobject-marshal.list totem-3.6.2/src/totemobject-marshal.list
--- totem-3.4.3/src/totemobject-marshal.list	2012-07-04 09:52:29.000000000 +0000
+++ totem-3.6.2/src/totemobject-marshal.list	2012-08-29 23:07:45.000000000 +0000
@@ -1 +1,2 @@
 VOID:STRING,STRING,STRING,UINT
+STRING:STRING
diff -Nru totem-3.4.3/totem.spec totem-3.6.2/totem.spec
--- totem-3.4.3/totem.spec	2012-07-04 09:54:58.000000000 +0000
+++ totem-3.6.2/totem.spec	2012-10-25 13:48:42.000000000 +0000
@@ -4,7 +4,7 @@
 
 Summary: Movie player for GNOME 2
 Name: totem
-Version: 3.4.3
+Version: 3.6.2
 Release: 1
 License: GPL
 Group: Applications/Multimedia